Browse Source

[fixed] changed the walk from home to end up in artem's room where they can study, also added the "blocking" triggers so artem won't wait for sveta if she's broken his heart etc.

CroWke 4 years ago
parent
commit
ad4794d309
3 changed files with 105 additions and 102 deletions
  1. 3 3
      locations/artemEv.qsrc
  2. 101 98
      locations/artemhome.qsrc
  3. 1 1
      locations/gschool_grounds.qsrc

+ 3 - 3
locations/artemEv.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = 'start':
 				'Still, he drives his point home by punching Artem in the shoulder. He sneers: "You''re lucky, four-eyes. Still... if I even suspect that you''ve laid a finger on <<$pcs_nickname>>, I''ll put you in a wheelchair and have you pissing blood for the rest of your life! Got that?"'
 				'Artem is terrified, and quickly nods while he rubs his painful shoulder: "Yes, yes! I understand!"'
 				'Vitek leaves you be, and you go to Artem''s home with him to study. You can see Artem''s body still trembling as you walk down the streets.'
-				act 'Go with Artem': gt 'artemhome', 'hallway'
+				act 'Go with Artem': ArtemLoc = 2 & gt 'artemhome', 'artemroom'
 			end
 		else
 			act 'Reassure Vitek he can trust you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -75,14 +75,14 @@ if $ARGS[0] = 'start':
 		'Fedor sighs, but concedes: "Well... alright, <<$pcs_nickname>>. I don''t like you going with <b>him</b>, but I trust you."'
 		'After that he walks away, and you and Artem leave the schoolyard.'
 		gs 'stat'
-		act 'Go with Artem': gt 'artemhome','hallway'
+		act 'Go with Artem': ArtemLoc = 2 & gt 'artemhome','artemroom'
 	else 
 		cla
 		'You walk across the school courtyard to meet up with Artem and go study at his place. He gives you a friendly nod as you approach, and asks: "You ready to go?"'
 		'You smile: "Let''s go study!"'
 		'The two of you don''t have much to talk about on the way there, and after a few minutes just decide to walk in silence.'
 		gs 'stat'
-		act 'Go to Artem''s home':gt 'artemhome','hallway'
+		act 'Go to Artem''s home': ArtemLoc = 2 & gt 'artemhome','artemroom'
 	end
 end
 

+ 101 - 98
locations/artemhome.qsrc

@@ -11,7 +11,7 @@
 !! artembf = 1  they are boy friend and girl friend
 !! artdryhump = number of dryhumps
 !! artlove = 2 Pc rejected Artems love
-!! artlie =1  Pc lied to artem about the dimka video, blocks love content
+!! artlie = 1 Pc lied to artem about the dimka video, blocks love content
 !! artfall = 10 Artem wants to asks her out on a date
 !! artdate =  number of dates after 10 he is in love
 !! artdim =1 Artem removed the blackmail video
@@ -245,7 +245,7 @@ if $ARGS[0] = 'artemroom':
 	gs 'stat'
 	'<center><h4><font color="maroon">Artem''s Room</font></h4></center>'
 	'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom.jpg"></center>'
-	'The room very clean and neat. Right next to the window is a bed, with a small <a href="exec:gt ''artemhome'',''night_stand''">night stand</a> next to it. Against the opposite wall is a small computer desk and a chair, with a <a href="exec:gt ''artemhome'',''computer''">laptop</a> on it. Next to the desk is a <a href="exec:gt ''artemhome'',''artemdresser''">dresser</a>. On the other side of the desk there is a <a href="exec:gt ''artemhome'',''bookshelf''">bookshelf</a> with a fairly large collection of books.'
+	'The room is very clean and neat. Right next to the window is a bed, with a small <a href="exec:gt ''artemhome'',''night_stand''">night stand</a> next to it. Against the opposite wall is a small computer desk and a chair, with a <a href="exec:gt ''artemhome'',''computer''">laptop</a> on it. Next to the desk is a <a href="exec:gt ''artemhome'',''artemdresser''">dresser</a>. On the other side of the desk there is a <a href="exec:gt ''artemhome'',''bookshelf''">bookshelf</a> with a fairly large collection of books.'
 	if $clothingworntype = 'nude': 
 		act 'Dress yourself': gs 'shortgs','dress' & gt 'artemhome','artemroom'
 	end
@@ -257,49 +257,67 @@ if $ARGS[0] = 'artemroom':
 		'Artem is sitting there, watching you with a friendly smile.'
 		act 'Talk to Artem': ArtemLoc = 2 & gt 'artemhome', 'chat'
 		act 'Do homework with Artem': gt 'artemEv','learn'
-		gs 'willpower', 'misc', 'self', 'easy'
-		if will_cost <= pcs_willpwr:
-			act 'Kiss him (<<will_cost>> Willpower)':
-				*clr & cla
-				npc_rel['A2'] += 3
-				if artkissing ! daystart:
-					artfall + 1
-					artkissing = daystart
-				end
-				gs 'willpower', 'pay', 'self'
-				gs 'stat'
-				'<center><h4><font color="maroon">Artem''s Room</font></h4></center>'
-				'<center><img src="images/characters/pavlovsk/school/boy/artem/hugging.jpg"></center>'
-				'As you sit side by side you look at him for a moment, maybe too long, because he turns to look at you. You lean over and give him a kiss. He returns your kiss fully.'
-				gs 'arousal', 'foreplay', 3
-				gs 'stat'
-				act 'Stop kissing and talk': gt 'atremhome', 'chat'
-				act 'Make out':
+!! Nutluck needs to say at which point this should be enabled, set it to artfall > 5 for now		
+		if artfall > 5:
+			gs 'willpower', 'misc', 'self', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Kiss him (<<will_cost>> Willpower)':
 					*clr & cla
+					npc_rel['A2'] += 3
+					if artkissing ! daystart:
+						artfall + 1
+						artkissing = daystart
+					end
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
 					'<center><h4><font color="maroon">Artem''s Room</font></h4></center>'
-					'<center><img src="images/characters/pavlovsk/school/boy/artem/makeout.jpg"></center>'
-					'He wraps his arms around you and pulls you close, soon the two of you are kissing passionately. The kisses are full of eager lust and urgent need. You feel yourself getting more and more aroused, he scoots back until his back is against the wall and pulls you onto his lap, as you straddle him as you make out, you can feel the hard bulge in his pants.'
+					'<center><img src="images/characters/pavlovsk/school/boy/artem/hugging.jpg"></center>'
+					'As you sit side by side you look at him for a moment, maybe too long, because he turns to look at you. You lean over and give him a kiss. He returns your kiss fully.'
 					gs 'arousal', 'foreplay', 3
 					gs 'stat'
-					act 'Stop making out': 
+					act 'Stop kissing and talk': gt 'atremhome', 'chat'
+					act 'Make out':
 						*clr & cla
-						npc_rel['A2'] -= 1
 						'<center><h4><font color="maroon">Artem''s Room</font></h4></center>'
-						'<center><img src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
-						'You pull away before things go too far and catch your breath. You see his slightly confused look and you feel a bit bad about it. "Sorry, I got carried away. Can we just go back to talking?"'
-						'He frowns a little. "Yes of course." He leans back and when he thinks you are not looking you see him trying to adjust his pants, obviously trying to get having a hard-on more comfortable.'
-						act 'Talk about something else': gt 'atremhome', 'chat'
-					end
-					act 'Enjoy his touch':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/makeout.jpg"></center>'
-						if artdryhump = 0:
-							'Artem trips over his words when he tries to suggest something: "<<$pcs_nickname>>, maybe we could... maybe I... I really want you... can I touch your ass? Please?"'
-							act 'Let him caress your ass': gt 'artemEv','artdryhump'
-						elseif artdryhump <= 1:
-							if $pantyworntype ! 'none':
-								'Artem looks at you with embarrassment, but gathers the courage to ask: "<<$pcs_nickname>>, you''re the best thing that''s ever happened to me. I enjoyed last time so much... but could you strip down to your underwear?"'
-								act 'Strip to your panties': gt 'artemEv','artdryhump1'
+						'<center><img src="images/characters/pavlovsk/school/boy/artem/makeout.jpg"></center>'
+						'He wraps his arms around you and pulls you close, soon the two of you are kissing passionately. The kisses are full of eager lust and urgent need. You feel yourself getting more and more aroused, he scoots back until his back is against the wall and pulls you onto his lap, as you straddle him as you make out, you can feel the hard bulge in his pants.'
+						gs 'arousal', 'foreplay', 3
+						gs 'stat'
+						act 'Stop making out': 
+							*clr & cla
+							npc_rel['A2'] -= 1
+							'<center><h4><font color="maroon">Artem''s Room</font></h4></center>'
+							'<center><img src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
+							'You pull away before things go too far and catch your breath. You see his slightly confused look and you feel a bit bad about it. "Sorry, I got carried away. Can we just go back to talking?"'
+							'He frowns a little. "Yes of course." He leans back and when he thinks you are not looking you see him trying to adjust his pants, obviously trying to get having a hard-on more comfortable.'
+							act 'Talk about something else': gt 'atremhome', 'chat'
+						end
+						act 'Enjoy his touch':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/makeout.jpg"></center>'
+							if artdryhump = 0:
+								'Artem trips over his words when he tries to suggest something: "<<$pcs_nickname>>, maybe we could... maybe I... I really want you... can I touch your ass? Please?"'
+								act 'Let him caress your ass': gt 'artemEv','artdryhump'
+							elseif artdryhump <= 1:
+								if $pantyworntype ! 'none':
+									'Artem looks at you with embarrassment, but gathers the courage to ask: "<<$pcs_nickname>>, you''re the best thing that''s ever happened to me. I enjoyed last time so much... but could you strip down to your underwear?"'
+									act 'Strip to your panties': gt 'artemEv','artdryhump1'
+									gs 'willpower', 'exhib', 'resist'
+									if will_cost <= pcs_willpwr:
+										act 'Refuse to strip (<<will_cost>> Willpower)': 
+											gs 'willpower', 'pay', 'resist'
+											gt 'artemEv','artdryhump'
+										end
+									else
+										act 'Refuse to strip (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+									end
+								else
+									'Artem trips over his words when he tries to suggest something: "<<$pcs_nickname>>, maybe we could... I really want you... can I touch your ass again? Please?"'
+									act 'Let him caress your ass': gt 'artemEv','artdryhump'
+								end
+							elseif artdryhump <= 2 and artemStripSee = 1:
+								'Artem looks at you with embarrassment, but gathers the courage to ask: "<<$pcs_nickname>>, last time you let me rub your ass it was great, but now that I have seen you naked... could you strip naked first?"'
+								act 'Strip': gt 'artemEv','artdryhump2'
 								gs 'willpower', 'exhib', 'resist'
 								if will_cost <= pcs_willpwr:
 									act 'Refuse to strip (<<will_cost>> Willpower)': 
@@ -310,74 +328,59 @@ if $ARGS[0] = 'artemroom':
 									act 'Refuse to strip (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 								end
 							else
-								'Artem trips over his words when he tries to suggest something: "<<$pcs_nickname>>, maybe we could... I really want you... can I touch your ass again? Please?"'
-								act 'Let him caress your ass': gt 'artemEv','artdryhump'
-							end
-						elseif artdryhump <= 2 and artemStripSee = 1:
-							'Artem looks at you with embarrassment, but gathers the courage to ask: "<<$pcs_nickname>>, last time you let me rub your ass it was great, but now that I have seen you naked... could you strip naked first?"'
-							act 'Strip': gt 'artemEv','artdryhump2'
-							gs 'willpower', 'exhib', 'resist'
-							if will_cost <= pcs_willpwr:
-								act 'Refuse to strip (<<will_cost>> Willpower)': 
-									gs 'willpower', 'pay', 'resist'
-									gt 'artemEv','artdryhump'
+								'His hands roam all over you body, but he pays special attention to your breasts kneading and squeezing them repeatedly. As you keep making out after a bit you can feel the bulge growing in his pants as you sit on his lap.'
+								gs 'arousal', 'kiss', 5
+								gs 'stat'
+								if artemhj > 0:
+									act 'Give him a handjob': gt 'artemEv', 'hj'
 								end
-							else
-								act 'Refuse to strip (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end
-						else
-							'His hands roam all over you body, but he pays special attention to your breasts kneading and squeezing them repeatedly. As you keep making out after a bit you can feel the bulge growing in his pants as you sit on his lap.'
-							gs 'arousal', 'kiss', 5
-							gs 'stat'
-							if artemhj > 0:
-								act 'Give him a handjob': gt 'artemEv', 'hj'
-							end
-							if artembj > 0:
-								act 'Give him a blowjob': gt 'artemEv', 'bj'
-							end
-							if artemsex > 0:
-								act 'Have sex with him': gt 'artemEv', 'sex'
-							end
-							gs 'willpower', 'bj', 'resist', 'medium'
-							if will_cost <= pcs_willpwr:
-								act 'Pull away and stop (<<will_cost>> Willpower)':
-									*clr & cla
-									gs 'willpower', 'pay', 'resist'
-									gs 'arousal', 'end'
-									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-									'You pull your hand away and then climb off him. "No, I can''t... not yet. I want to wait still."'
-									'He looks visibly disappointed but then he nods and smiles. "Sure I understand, I don''t want to pressure you, when ever you are ready is fine."'
-									act 'Talk to him': gt 'atremhome', 'chat'
+								if artembj > 0:
+									act 'Give him a blowjob': gt 'artemEv', 'bj'
 								end
-							else
-								act 'Pull away and stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end
-							act 'Keep making out':
-								*clr & cla
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/makeout.jpg"></center>'
-								'You pull your hand away from the bulge in his pants but keep kissing him, he lets go and stops trying to force your hand down to his crotch and instead focuses on kissing and fondling you. The two of you spend some time on his bed making out, like... well the couple of horny teenagers you are.'
-								if artemStripSee > 0:
-									'Artem has a embarrassed look on his face, as he pulls away from you when he says: "I enjoyed seeing your naked last time, I want you to strip for me again but can you make a bit more of a show of it this time?"'
-									gs 'arousal', 'kiss', 5
-									gs 'stat'
-									gs 'artemhome', 'askedstrip'
+								if artemsex > 0:
+									act 'Have sex with him': gt 'artemEv', 'sex'
+								end
+								gs 'willpower', 'bj', 'resist', 'medium'
+								if will_cost <= pcs_willpwr:
+									act 'Pull away and stop (<<will_cost>> Willpower)':
+										*clr & cla
+										gs 'willpower', 'pay', 'resist'
+										gs 'arousal', 'end'
+										gs 'stat'
+										'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
+										'You pull your hand away and then climb off him. "No, I can''t... not yet. I want to wait still."'
+										'He looks visibly disappointed but then he nods and smiles. "Sure I understand, I don''t want to pressure you, when ever you are ready is fine."'
+										act 'Talk to him': gt 'atremhome', 'chat'
+									end
 								else
-									'As the two of you are making out, you are interrupted by his mothers voice just out in the hallway. "Artem I will be doing laundry in a couple of minutes, make sure your dirty clothes are in the hamper."'
-									'Artem gently but in some haste pushes you off his lap, as he quickly stands up. "Um yes mom, I will." He looks at you with a panicked looked, obviously afraid his mom almost caught him making out with a girl in his room. "I should really get my clothes sorted, see you tomorrow?"'
-									'You smile at him. "Maybe, I will have to see whats going on." With that you gather up your stuff and leave.'
-									gs 'arousal', 'kiss', 20
-									gs 'arousal', 'end'
-									gs 'stat'
-									act 'Move away from the door':gt'pod_ezd','etaj_1'
+									act 'Pull away and stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+								end
+								act 'Keep making out':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/makeout.jpg"></center>'
+									'You pull your hand away from the bulge in his pants but keep kissing him, he lets go and stops trying to force your hand down to his crotch and instead focuses on kissing and fondling you. The two of you spend some time on his bed making out, like... well the couple of horny teenagers you are.'
+									if artemStripSee > 0:
+										'Artem has a embarrassed look on his face, as he pulls away from you when he says: "I enjoyed seeing your naked last time, I want you to strip for me again but can you make a bit more of a show of it this time?"'
+										gs 'arousal', 'kiss', 5
+										gs 'stat'
+										gs 'artemhome', 'askedstrip'
+									else
+										'As the two of you are making out, you are interrupted by his mothers voice just out in the hallway. "Artem I will be doing laundry in a couple of minutes, make sure your dirty clothes are in the hamper."'
+										'Artem gently but in some haste pushes you off his lap, as he quickly stands up. "Um yes mom, I will." He looks at you with a panicked looked, obviously afraid his mom almost caught him making out with a girl in his room. "I should really get my clothes sorted, see you tomorrow?"'
+										'You smile at him. "Maybe, I will have to see whats going on." With that you gather up your stuff and leave.'
+										gs 'arousal', 'kiss', 20
+										gs 'arousal', 'end'
+										gs 'stat'
+										act 'Move away from the door':gt'pod_ezd','etaj_1'
+									end
 								end
 							end
 						end
 					end
 				end
+			else
+				act 'Kiss him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Kiss him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Snacks':
 			*clr & cla

+ 1 - 1
locations/gschool_grounds.qsrc

@@ -232,7 +232,7 @@ if $ARGS[0] = 'main':
 			if LariskaHomeIn > 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 NatashaQW > 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:'<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a> is waiting for you near the school entrance.'
+			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0 and artlie ! 2 and artembrokenheart ! 1:'<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a> is waiting for you near the school entrance.'
 			if npc_QW['A231'] = 1 or npc_QW['A231'] = 3 or npc_QW['A231'] >= 5:'<a href="exec:minut += 1 & gt ''AleksandraGo'', ''Start''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a> is waiting for you at the end of the school courtyard, listening to music.'
 
 			if katjaMeynoldday ! daystart and meynoldQW >= 2:'<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a> is walking across the school courtyard, getting ready to go home.'