Browse Source

[Added] Lariska storyline to the journal quest page and fixed some variables

Alaratt 3 years ago
parent
commit
fb18f21128

+ 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

+ 2 - 1
locations/gschool_chats1.qsrc

@@ -1339,7 +1339,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 +1365,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'

+ 35 - 0
locations/journal_quests.qsrc

@@ -70,6 +70,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'] > 0 or AlbinaQW['StarletsShutDown'] = 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'] > 0 or AlbinaQW['StarletsShutDown'] = 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