Browse Source

Merge remote-tracking branch 'Alaratt/master'

# Conflicts:
#	locations/pav_residential.qsrc
KevinSmarts 3 years ago
parent
commit
84e1af8b37

+ 2 - 2
locations/LariskaGo.qsrc

@@ -17,12 +17,12 @@ act 'Go with Lariska':
 	act 'Enter her apartment':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/home_1.jpg"></center>'
-		if LariskaQW['story'] = 4:
+		if LariskaQW['story'] = 5:
 			'Entering the apartment, you see that it is decorated in a Japanese style.'
 			'"You have a nice apartment, Lariska," you say, looking around with interest.'
 			'"Thank you. Mother makes a good living, although she is usually only home on the weekends," she says a bit sadly.'
 			'You follow Lariska to her room.'
-			LariskaQW['story'] = 5
+			LariskaQW['story'] = 6
 		else
 			'You go into the japanese styled apartment, then follow Lariska to her room.'
 		end

+ 4 - 1
locations/LariskaHome.qsrc

@@ -551,10 +551,11 @@ if $ARGS[0] = 'lariska_bedroom':
 			end
 		end
 	end
-	if lariskaroomfun ! daystart and npc_rel['A13'] >= 80 and (lariloc = 2 or lariloc = 8 or lariloc = 22 or lariloc = 15 or lariloc = 17):
+	if lariskaroomfun ! daystart and LariskaQW['story'] >= 7 and npc_rel['A13'] >= 80 and (lariloc = 2 or lariloc = 8 or lariloc = 22 or lariloc = 15 or lariloc = 17):
 		act 'Flirt with her':
 			*clr & cla
 			menu_off = 1
+			LariskaQW['story'] = 7: LariskaQW['story'] = 8
 			lariskaroomfun = daystart
 			pcs_horny += 5
 			gs 'stat'
@@ -639,6 +640,8 @@ if $ARGS[0] = 'homework':
 	menu_off = 1
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big13.jpg"></center>'
+	npc_rel['A13'] += 2
+	if LariskaQW['story'] = 6: LariskaQW['story'] = 7
 	lernHome = 0
 	lern += 1
 	minut += 30

+ 8 - 6
locations/dachain.qsrc

@@ -216,7 +216,6 @@ if $args[0] = 'dachakit':
 	end
 
 	if edaD = 0 and eda = 0:'<b><font color="red">The refrigerator is empty, you have nothing to eat.</font></b>'
-	if edahot > 0: act 'A cooked meal is on the table (0:30).': dynamic $edahotd
 
 	if husband > 0 and husbandrink ! 10:
 		if hour = 7 or hour = 17:'<a href="exec:gt ''husb'', ''start''">Your husband is eating at the table.</a>'
@@ -228,17 +227,21 @@ if $args[0] = 'dachakit':
 		else
 			'You have enough tea biscuits for <b><<pranik>></b> more snacks.'
 		end
-		dynamic $pranik
 	end
 
+	act 'Go into the main room': gt 'dachain', ''
+	if edahot > 0: act 'A cooked meal is on the table (0:30).': dynamic $edahotd
+	act 'Have a snack (0:15)':gs 'food', 'snack'
+	dynamic $sandwich
+	dynamic $driwater
+	dynamic $dritea
+	dynamic $fill_bottle
 	dynamic $edaD
+	dynamic $pranik
 	dynamic $fatdel
-	dynamic $driwater
 	dynamic $lekarstvo
 	dynamic $vitamin
 
-	act 'Go into the main room': gt 'dachain', ''
-	act 'Go to the Bathroom':  gt 'dachain', 'dachavann'
 end
 
 if $args[0] = 'dachavann':
@@ -257,7 +260,6 @@ if $args[0] = 'dachavann':
 		'<center><img <<$set_imgh>> src="images/locations/suburban/cottage/dachavan1.jpg"></center>'
 	end
 	gs 'din_van', 'private'
-	act 'Go to the kitchen alcove': gt 'dachain', 'dachakit'
 	act 'Go into the main room': gt 'dachain', ''
 end
 

+ 84 - 71
locations/gschool_chats1.qsrc

@@ -169,19 +169,19 @@ if $ARGS[0] = 'igor':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
-	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-	
+	!!act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+	!! The event is confusing because it has no effect. 
+	!!Somebody really wanted Igor to help with homework. This whole conversation chain could use a revamp. - Alaratt 2/14/2021
 	if IgorloverQW > 0:
 		npc_rel['A4'] += 1
-		'When Igor sees you, his face lights up and he smiles warmly. "I was hoping I''d see you. I, uh, kinda missed you..." he says shyly and it makes you giggle. While you talk with each other, his warm hand finds yours. You remain holding hands and chatting until break is over. With a smile, you give him a quick kiss goodbye.'
-		
-!! The event is confusing because it has no effect
-!!		act 'Help with homework':
-!!			*clr & cla
-!!			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
-!!			'Igor is almost offended that you''d even have to ask that. "What kind of boyfriend would I be if I didn''t help my girlfriend?" he chuckles. "Of course I''ll help you."'
-!!			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-!!		end
+		'When Igor sees you, his face lights up and he smiles warmly. "I was hoping I''d see you. I, uh, kinda missed you..." he says shyly and it makes you giggle. While you talk with each other, his warm hand finds yours.'
+
+		!!act 'Help with homework':
+		!!	*clr & cla
+		!!	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
+		!!	'Igor is almost offended that you''d even have to ask that. "What kind of boyfriend would I be if I didn''t help my girlfriend?" he chuckles. "Of course I''ll help you."'
+		!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+		!!end
 		
 		if igorstrap = 1:
 			act 'Tease him':
@@ -192,7 +192,7 @@ if $ARGS[0] = 'igor':
 				act 'Just chat':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
-					'You don''t press it anymore and start talking to him about a variety of topics.'
+					'You don''t press it anymore and start talking to him about a variety of topics while holding hands and until break is over. With a smile, you give him a quick kiss goodbye.'
 					act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 				end
 				act 'Tell him you have a surprise':
@@ -203,94 +203,106 @@ if $ARGS[0] = 'igor':
 					'You pat him on the cheek. "Trust me, I know a place and no one will ever find out." He thinks on it for a moment and then finally nods.'
 					act 'Take him somewhere private': gt 'gschool_chats1', 'igor_peg'
 				end
-				act 'Help with homework':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
-					'"Oh... yeah I can help you with your homework..." Igor smiles but glances down and shuffles a bit restlessly.'
-					'You smirk and lean in closer. "Don''t look so disappointed. Who knows, the quicker we finish with that, the more time we have for <i>other</i> things."'
-					'Hearing this, Igor''s eyes widen and his cheeks flush as he tries to play it cool, but you notice how he''s suddenly more excited.'
-					act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-				end
+				!!act 'Help with homework':
+				!!	*clr & cla
+				!!	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
+				!!	'"Oh... yeah I can help you with your homework..." Igor smiles but glances down and shuffles a bit restlessly.'
+				!!	'You smirk and lean in closer. "Don''t look so disappointed. Who knows, the quicker we finish with that, the more time we have for <i>other</i> things."'
+				!!	'Hearing this, Igor''s eyes widen and his cheeks flush as he tries to play it cool, but you notice how he''s suddenly more excited.'
+				!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+				!!end
 			end
+		else
+			'You remain holding hands and chatting until break is over. With a smile, you give him a quick kiss goodbye.'
+			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif npc_rel['A4'] >= 50 and trait['loveable_slut'] > 0:
+		npc_rel['A4'] += 1
 		if grupTipe = 1:
 			'You know he doesn''t have many friends, so he''s more than happy that you want to hang out with him. Unlike most boys, Igor is really attentive and listens to everything you say, even taking an interest in the more "girly" topics.'
 			'"Oh, it''s not that weird." Igor blushes a bit. "I have a sister, so I hear about these things all the time..."'
-			act 'Help with homework':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
-				'Igor''s face lights up. "Yeah, of course I''ll help you."'
-				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-			end
+			!!act 'Help with homework':
+			!!	*clr & cla
+			!!	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
+			!!	'Igor''s face lights up. "Yeah, of course I''ll help you."'
+			!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			!!end
+			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		else
 			'As usual, Igor is hanging around Dimka, but he pays closer attention to you. With a smile, he asks you how your day has been so far and before long you''re talking about all kinds of things, even taking an interest in the more "girly" topics.'
-			act 'Help with homework':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
-				'"Oh, you need my help?" Igor asks curiously, a bit surprised that you would ask him of all people. After a moment, he smiles and nods. "Yeah, of course I''ll help you."'
-				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-			end
+			!!act 'Help with homework':
+			!!	*clr & cla
+			!!	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
+			!!	'"Oh, you need my help?" Igor asks curiously, a bit surprised that you would ask him of all people. After a moment, he smiles and nods. "Yeah, of course I''ll help you."'
+			!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			!!end
+			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif npc_rel['A4'] >= 50 and pav_slut < 200:
 		npc_rel['A4'] += 1
 		if grupTipe = 1:
 			'You know he doesn''t have many friends, so he''s more than happy that you want to hang out with him. Unlike most boys, Igor is really attentive and listens to everything you say, even taking an interest in the more "girly" topics.'
 			'"Oh, it''s not that weird." Igor blushes a bit. "I have a sister, so I hear about these things all the time..."'
-			act 'Help with homework':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
-				'Igor''s face lights up. "Yeah, of course I''ll help you."'
-				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-			end
+			!!act 'Help with homework':
+			!!	*clr & cla
+			!!	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
+			!!	'Igor''s face lights up. "Yeah, of course I''ll help you."'
+			!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			!!end
+			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		else
 			'As usual, Igor is hanging around Dimka, but he pays closer attention to you. With a smile, he asks you how your day has been so far and before long you''re talking about all kinds of things, even taking an interest in the more "girly" topics.'
-			act 'Help with homework':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
-				'"Oh, you need my help?" Igor asks curiously, a bit surprised that you would ask him of all people. After a moment, he smiles and nods. "Yeah, of course I''ll help you."'
-				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-			end
+			!!act 'Help with homework':
+			!!	*clr & cla
+			!!	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
+			!!	'"Oh, you need my help?" Igor asks curiously, a bit surprised that you would ask him of all people. After a moment, he smiles and nods. "Yeah, of course I''ll help you."'
+			!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			!1end
+			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif npc_rel['A4'] <= 20 and pav_slut < 200:
 		npc_rel['A4'] += 1
 		if grupTipe = 1:
-			'The conversation feels forced as Igor does little to keep talking to you. You get the feeling he''s just doing this as a courtesy since you''re in the same clique.'
-			act 'Help with homework':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
-				'Igor hesitates, making the whole encounter extremely awkward. "I would... but I can''t. I''ve got... other things I need to do."'
-				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-			end
+			'The conversation feels forced as Igor makes almost no effort to talk to you. You get the feeling he''s just doing this as a courtesy since you''re in the same clique.'
+			!!act 'Help with homework':
+			!!	*clr & cla
+			!!	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
+			!!	'Igor hesitates, making the whole encounter extremely awkward. "I would... but I can''t. I''ve got... other things I need to do."'
+			!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			!!end
+			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		else
 			npc_rel['A4'] += 1
 			'"Uh, hello?" Igor is unamused to see you and completely ignores you as you try to keep a one-sided conversation going. Eventually, he just walks away without saying a word.'
-			act 'Help with homework':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
-				'"No." Igor says flatly as he slams his locker closed and walks away.'
-				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-			end
-		end
-	elseif pav_slut >= 200:
-		'Igor is hanging with Dimka, Stasya and Bella when you approach. The others are quick to throw some insults your way, but Igor hesitates. It isn''t until Stasya puts him on the spot for being so silent that he finally speaks up to agree with the rest of the group. "I''m surprised the gopniks are finished with her so early. Must have had another cocksleeve waiting for them, or maybe she''s just gotten too loose."'
-		act 'Help with homework':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
-			'Igor can''t help but laugh a bit at your request. "Of course you''re behind on your work. Maybe if you spent less time whoring around..." He doesn''t finish the sentence before walking away with a look of disgust.'
+			!!act 'Help with homework':
+			!!	*clr & cla
+			!!	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
+			!!	'"No." Igor says flatly as he slams his locker closed and walks away.'
+			!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			!!end
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
+	elseif pav_slut >= 200:
+		'Igor is hanging with Dimka, Stasya, and Bella when you approach. The others are quick to throw some insults your way, but Igor hesitates. It isn''t until Stasya puts him on the spot for being so silent that he finally speaks up to agree with the rest of the group. "I''m surprised the gopniks are finished with her so early. Must have had another cocksleeve waiting for them, or maybe she''s just gotten too loose."'
+		!!act 'Help with homework':
+		!!	*clr & cla
+		!!	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
+		!!	'Igor can''t help but laugh a bit at your request. "Of course you''re behind on your work. Maybe if you spent less time whoring around..." He doesn''t finish the sentence before walking away with a look of disgust.'
+		!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+		!!end
+		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	else 
 		npc_rel['A4'] += 1
 		'"Hey Igor, what are you doing?" you ask as you see him looking around for someone.'
 		'Igor kind of shrugs. "Just waiting for Dimka."'
 		'The two of you spend some time chatting while he waits for Dimka. Eventually he shows up and Igor is ready to leave. "Maybe we can talk some other time?" he says with a small smile as he waves goodbye.'
-		act 'Help with homework':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
-			'Igor smiles apologetically. "I would but I''ve kinda got my hands full at the moment. Maybe some other time?"'
-			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-		end
+		!!act 'Help with homework':
+		!!	*clr & cla
+		!!	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
+		!!	'Igor smiles apologetically. "I would but I''ve kinda got my hands full at the moment. Maybe some other time?"'
+		!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+		!!end
+		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -1339,7 +1351,7 @@ if $ARGS[0] = 'lariska':
 					'When she sees the ball, her eyes go wide and her face turns bright red. She grabs the ball like it''s evidence of a conspiracy and stuffs it out of sight.'
 					'"So why did you run away? Didn''t you enjoy what we did?"'
 					'"I...uh...I panicked. I''m sorry, <<$pcs_nickname>>, it was too sudden," her face turns even more red as she thinks about the kiss.'
-					'"Wee I enjoyed it, just so you know. If you want to do it again sometime..."'
+					'"Well, I enjoyed it, just so you know. If you want to do it again sometime..."'
 					'She looks at you, a bit dazed, and says softly "I liked it too. I just need to think about it some more, ok?"'
 					'"Ok," you say with a soft smile, and head off to your next class.'
 				end
@@ -1365,6 +1377,7 @@ if $ARGS[0] = 'lariska':
 			'"O-Oh. I''m sorry, I just keep thinking about it. Hopefully you will manage to convince her." She gives you a sad smile.'
 			'"Hang in there, sweetie. I will convince her, I promise."'
 		elseif LariskaQW['story'] = 4:
+			LariskaQW['story'] = 5
 			npc_rel['A13'] += 1
 			'"Ok, <<$pcs_nickname>>. I guess Christina wont stop me from hanging out with you now." She smiles a bit shyly and says "Do you want to come over afterschool and work on our homework together?"'
 			'You smile in response, and say "Sure, Lariska. I will meet up with you afterschool!"'

+ 2 - 2
locations/gschool_grounds.qsrc

@@ -240,7 +240,7 @@ if $ARGS[0] = 'main':
 
 		if Enable_tablemap = 0:
 			if anushkaFirstvisit = 0 and meet_after_school = 1: '<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka Konstantinov</a> is leaning against a tree just in front of the school.'
-			if LariskaQW['story'] >= 4 and cheerleaders_on = 0: '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
+			if LariskaQW['story'] >= 5 and cheerleaders_on = 0: '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
 			if JuliaMilLernQW >= 1: '<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a> is sitting somewhere on the school courtyard, reading a book.'
 			if NatbelQW['QWstage'] > 0: '<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a> is standing in a corner.'
 			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0 and artlie ! 2 and artembrokenheart ! 1: '<a href="exec:minut += 15 & gt ''artem_events'', ''start''">Artem Chebotarev</a> is waiting for you near the school entrance.'
@@ -270,7 +270,7 @@ if $ARGS[0] = 'main':
 			!display friends in table if switch is on.
 			st_count=0 & $show_table=''
 			if anushkaFirstvisit = 0 and meet_after_school = 1: gs 'show_table', '<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka Konstantinov</a>', '5'
-			if LariskaQW['story'] >= 4 and cheerleaders_on = 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a>', '5'
+			if LariskaQW['story'] >= 5 and cheerleaders_on = 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a>', '5'
 			if JuliaMilLernQW >= 1: gs 'show_table', '<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a>', '5'
 			if NatbelQW['QWstage'] > 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a>', '5'
 			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0 and artlie ! 2 and artembrokenheart ! 1: gs 'show_table', '<a href="exec:minut += 15 & gt ''artem_events'', ''start''">Artem Chebotarev</a>', '5'

+ 72 - 0
locations/journal_quests.qsrc

@@ -35,6 +35,43 @@ if $ARGS[0] = 'start':
 		end
 		*nl
 		*nl
+		'<center><h1>Christina Zvereva</h1></center>'
+		*nl
+		if christinaQW['dompath'] >= 1 or christinaQW['subpath'] >= 1:
+			if christinaQW['dompath'] >= 1:
+				if christinaQW['dompath'] = 7:
+					'I own Christina now. I completely ruined her life, took away everything she loves, gave her new rules to follow, or she gets punished. I am the Queen Bitch now!'
+				elseif christinaQW['dompath'] = 6:
+					'I won the fight! First I ruined her school rep, then beat the shit out of her, and then blackmailed the coach. She is ruined! Only time will tell what the fallout of all this will be.'
+				elseif christinaQW['dompath'] = 5:
+					'Just like I thought, she attacked me the moment school let out. This is going to be a rough fight...'
+				elseif christinaQW['dompath'] = 4:
+					'Christina is going to know who spread those rumors about her. I hope I prepared enough, otherwise my plan could backfire pretty badly...'
+				elseif christinaQW['dompath'] = 3:
+					'I have managed to successfully blackmail Christina. She can''t say no to me now! Of course, I could tell some people about the dirt I found, but I shouldn''t do that unless I am ready for one hell of a fight...'
+				elseif christinaQW['dompath'] = 2:
+					'I need to chat with Christina at school, let her know what I have on her. Unless she does what I want, I am going to ruin her reputation.'
+				else
+					'I shouild wait, and see what opportunities come up to get some dirt on Christina.'
+				end
+			else
+				if christinaQW['subpath'] = 3:
+					'Christina owns me now. After gym classes, in the showers, she makes me do things.'
+				elseif christinaQW['subpath'] = 2:
+					if christinaQW['fight'] = -1:
+						'I challenged Christina ... and lost. I have a feeling that is going to catch up to me somehow...'
+					else
+						'I submitted myself to Christina''s control. I am just going to have to wait and see what the future brings...'
+					end
+				else
+					'I have heard Christina trains Lina by the lake afterschool. I should pay them a visit.'
+				end
+			end
+		else
+			'I should talk to Christina at school sometime. I cannot decide what I think about her...'
+		end
+		*nl
+		*nl
 		'<center><h1>Julia Milov</h1></center>'
 		*nl
 		if pav_slut < 200:
@@ -70,6 +107,41 @@ if $ARGS[0] = 'start':
 		end
 		*nl
 		*nl
+		'<center><h1>Lariska Gruzdeva</h1></center>'
+		*nl
+		if LariskaQW['story'] = 8:
+			'This is the end of current storyline content for now'
+		if LariskaQW['story'] = 7:
+			'I should try to flirt with Lariska afterschool, when I get the chance.'
+		if LariskaQW['story'] = 6:
+			'I should do my homework with Lariska afterschool.'
+		elseif LariskaQW['story'] = 5:
+			'Lariska invited me to come over afterschool and do our homework together.'
+		elseif LariskaQW['story'] = 4:
+			'I should talk to Lariska at school again.'
+		elseif LariskaQW['story'] = 3:
+			if christinaQW['dompath'] >= 3 or christinaQW['subpath'] >= 2:
+				'I should talk to Lariska at school.'
+			else
+				'I have to find a way to deal with Christina, before Lariska is willing to be more involved with me.'
+			end
+		elseif LariskaQW['story'] = 2:
+			'I should return the volleyball Lariska left behind during school. Maybe I can figure out why she freaked out.'
+		elseif LariskaQW['story'] = 1:
+			if npc_rel['A13'] > 40:
+				'I should try talking to her outside of the Five Eight Estates again. Maybe I should be a little nicer this time, though.'
+			else
+				'I need to get to know Lariska better before she would hang out with me.'
+			end
+		else
+			if npc_rel['A13'] > 40:
+				'I think I heard the sound of a ball outside the Five Eight Estates.'
+			else
+				'I need to get to know Lariska better before she would hang out with me.'
+			end
+		end
+		*nl
+		*nl
 		'<center><h1>Natasha Belova</h1></center>'
 		*nl
 		!! This might need a note about debt required for most actions to be available, was not sure how to handle that part though.

+ 2 - 2
locations/pav_residential.qsrc

@@ -125,14 +125,14 @@ if Enable_tablemap = 0:
 	if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:'<a href="exec:minut += 10 & gt ''dimaHome'', ''home''">Dimka Nosov</a>, one of your classmates, lives in one of the fancier houses in town.'
 	if IgorLoverQW > 0 and IdorBlock = 0:'<a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>, one of your classmates, lives in one of the fancier houses in town.'
 	if katjaFirstKiss >= 1 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: 'Nearby is a large house where the <a href="exec:minut += 10 & gt''mey_home'', ''door''">Meynold twins</a> live.'
-	if LariskaQW['story'] >= 5: '<a href="exec:minut += 10 & gt ''LariskaHome'', ''front_door''">Lariska Gruzdev</a>, one of your classmates, lives about 10 minutes away from your parents.'
+	if LariskaQW['story'] >= 6: '<a href="exec:minut += 10 & gt ''LariskaHome'', ''front_door''">Lariska Gruzdev</a>, one of your classmates, lives about 10 minutes away from your parents.'
 	if AlbinaQW['KnowsHouse'] = 1:'<a href="exec:minut += 10 & gt ''albinaporog''">Albina Barlovskaya</a>, one of your classmates, lives in one of the few luxurious mansions Pavlovsk has to offer.'
 else
 	st_count=0 & $show_table=''
 	if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''dimaHome'', ''home''">Dimka Nosov</a>','3'
 	if IgorLoverQW > 0 and IdorBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>', '3'
 	if katjaFirstKiss >= 1 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: gs'show_table','The house of the <a href="exec:minut += 10 & gt''mey_home'', ''door''">Meynold twins</a>','3'
-	if LariskaQW['story'] >= 5:gs'show_table','House of <a href="exec:minut += 10 & gt ''LariskaHome'', ''front_door''" >Lariska Gruzdev</a> in the richer part of town','3'
+	if LariskaQW['story'] >= 6:gs'show_table','House of <a href="exec:minut += 10 & gt ''LariskaHome'', ''front_door''" >Lariska Gruzdev</a> in the richer part of town','3'
 	if AlbinaQW['KnowsHouse'] = 1:gs'show_table','A luxurious mansion that''s home to <a href="exec:minut += 10 & gt ''albinaporog''">Albina Barlovskaya</a>','3'
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end