1
0
Quellcode durchsuchen

[fixed] More fixes to the new artem files

CroWke vor 4 Jahren
Ursprung
Commit
89a11f27cc
3 geänderte Dateien mit 115 neuen und 77 gelöschten Zeilen
  1. 4 2
      locations/artemEv.qsrc
  2. 110 74
      locations/artemhome.qsrc
  3. 1 1
      locations/pod_ezd.qsrc

+ 4 - 2
locations/artemEv.qsrc

@@ -19,6 +19,7 @@
 !! artsveslut =1 .. Artem knows that Pc is a slut but they stay friends
 !! artsveslut =1 .. Artem knows that Pc is a slut but they stay friends
 
 
 if $ARGS[0] = 'start':
 if $ARGS[0] = 'start':
+	ArtemBeInHome = 1
 	*clr & cla
 	*clr & cla
 	menu_off = 1
 	menu_off = 1
 	'<center><b><font color="maroon"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></font></b></center>'
 	'<center><b><font color="maroon"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></font></b></center>'
@@ -354,7 +355,8 @@ if $ARGS[0] = 'learn':
 				end
 				end
 			end
 			end
 		end
 		end
-	else:
+	else
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
 		'After you finish doing your homework with Artem, you both put your books aside and relax for a few moments on his bed.'
 		'After you finish doing your homework with Artem, you both put your books aside and relax for a few moments on his bed.'
 		act 'Talk for a bit': gt 'artemhome', 'chat'
 		act 'Talk for a bit': gt 'artemhome', 'chat'
@@ -385,7 +387,7 @@ if $ARGS[0] = 'striptease':
 				*clr & cla
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/strip5.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/strip5.jpg"></center>'
 				'You pull your panties all the way off until you are completely naked, you dance around a bit before you finally face away from him on your knees. Then you slowly bend over with your legs spread about, getting down on all fours. Giving a perfect look at your pretty pussy.'
 				'You pull your panties all the way off until you are completely naked, you dance around a bit before you finally face away from him on your knees. Then you slowly bend over with your legs spread about, getting down on all fours. Giving a perfect look at your pretty pussy.'
-				'He looks like he is about to start drooling as he stars at your pussy, you give him a few more moments and then you get up and start getting dressed again. Once you finish dressing he says. "Thank you, but I need to do a few things, so perhaps you should go for now." You just smile as you can likely guess what he needs to do, but you respect his wishes and leave.'
+				'He looks like he is about to start drooling as he stares at your pussy, you give him a few more moments and then you get up and start getting dressed again. Once you finish dressing he says. "Thank you, but I need to do a few things, so perhaps you should go for now." You just smile as you can likely guess what he needs to do, but you respect his wishes and leave.'
 				gs 'arousal', 'flash', 2
 				gs 'arousal', 'flash', 2
 				gs 'arousal', 'end'
 				gs 'arousal', 'end'
 				gs 'stat'
 				gs 'stat'

+ 110 - 74
locations/artemhome.qsrc

@@ -54,7 +54,8 @@ if $ARGS[0] = 'home':
 	if week = 3 and hour >= 15 and hour < 22:
 	if week = 3 and hour >= 15 and hour < 22:
 		ArtemLoc = 0
 		ArtemLoc = 0
 	else
 	else
-		ArtemLoc = rand(1,6)
+		ArtemLoc = rand(1,5)
+		if ArtemLoc = 4: ArtemLoc = 2
 	end
 	end
 
 
 !! Parents location, for now they''re always in the livingroom
 !! Parents location, for now they''re always in the livingroom
@@ -67,15 +68,15 @@ if $ARGS[0] = 'home':
 	end
 	end
 	
 	
 !! Checking who opens the door
 !! Checking who opens the door
-		if ArtemLoc ! 0 and ArtemParentsLoc = 5:
-			DoorOpenedBy = rand(0,1)
-		elseif ArtemLoc ! 0:
-			DoorOpenedBy = 0
-		elseif ArtemParentsLoc = 5:
-			DoorOpenedBy = 1
-		else
-			DoorOpenedBy = -1
-		end
+	if ArtemLoc ! 0 and ArtemParentsLoc = 5:
+		DoorOpenedBy = rand(0,1)
+	elseif ArtemLoc ! 0:
+		DoorOpenedBy = 0
+	elseif ArtemParentsLoc = 5:
+		DoorOpenedBy = 1
+	else
+		DoorOpenedBy = -1
+	end
 	*clr & cla
 	*clr & cla
 	'<center><img src="images/locations/pavlovsk/resident/apartment/aptdoor.jpg"></center>'
 	'<center><img src="images/locations/pavlovsk/resident/apartment/aptdoor.jpg"></center>'
 	if hour >= 22:
 	if hour >= 22:
@@ -94,7 +95,7 @@ if $ARGS[0] = 'home':
 		
 		
 		if DoorOpenedBy = 0:
 		if DoorOpenedBy = 0:
 			*clr & cla
 			*clr & cla
-			'<center><img src="images/pc/npc_headshots/big144.jpg"></center>'
+			'<center><img src="images/pc/npc_headshots/big2.jpg"></center>'
 			if artlie = 2 or artembrokenheart = 1 or artemblok = 1:
 			if artlie = 2 or artembrokenheart = 1 or artemblok = 1:
 				'You stand outside the Chebotarev household, knocking on the door. The door is answered by Artem, as soon as he sees you he frowns. "I told you I never wanted to see you again, now please go away." With that he closes the door in your face.'
 				'You stand outside the Chebotarev household, knocking on the door. The door is answered by Artem, as soon as he sees you he frowns. "I told you I never wanted to see you again, now please go away." With that he closes the door in your face.'
 				act 'Leave': gt'pod_ezd','etaj_1'
 				act 'Leave': gt'pod_ezd','etaj_1'
@@ -192,44 +193,56 @@ if $ARGS[0] = 'hallway':
 end
 end
 
 
 if $ARGS[0] = 'bathroom':
 if $ARGS[0] = 'bathroom':
-	CLOSE ALL
-	$menu_loc = 'artemhome'
-	$menu_arg = 'bathroom'
-	$metka = 'bathroom'
-	$loc = 'artemhome'
-	$metkaM = 'bathroom'
-	$locM = 'artemhome'
-	menu_off = 0
-	*clr & cla
-	minut += 1
-	gs 'stat'
-	$location_type = 'bathroom'
-	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
-	'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/bathroom.jpg"></center>'
-	'The first thing you notice is the god awful green tile, with matching sink in the bathroom. You don''t know who picked it but they obviously don''t have any good taste. Other than that it is a fairly typical bathroom, other than this might be the cleanest bathroom you have ever been in. It looks practically brand new it is so shinny and it smells wonderful as well.'
-	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
-	*nl
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
-	act 'Leave the bathroom': gt 'artemhome','hallway'
-	act 'Take a shower':
+	if ArtemLoc ! 3:
+		CLOSE ALL
+		$menu_loc = 'artemhome'
+		$menu_arg = 'bathroom'
+		$metka = 'bathroom'
+		$loc = 'artemhome'
+		$metkaM = 'bathroom'
+		$locM = 'artemhome'
+		menu_off = 0
 		*clr & cla
 		*clr & cla
-		menu_off = 1
-		minut += 10
-		dynamic $showerdin
+		minut += 1
 		gs 'stat'
 		gs 'stat'
+		$location_type = 'bathroom'
 		'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 		'<center><h4><font color="maroon">Bathroom</font></h4></center>'
-		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-		'You take a quick shower.'
-		act 'Take a selfie':
-			gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
+		'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/bathroom.jpg"></center>'
+		'The first thing you notice is the god awful green tile, with matching sink in the bathroom. You don''t know who picked it but they obviously don''t have any good taste. Other than that it is a fairly typical bathroom, other than this might be the cleanest bathroom you have ever been in. It looks practically brand new it is so shinny and it smells wonderful as well.'
+		'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
+		*nl
+		if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+		act 'Leave the bathroom': gt 'artemhome', 'hallway'
+		act 'Take a shower':
+			*clr & cla
+			menu_off = 1
+			minut += 10
+			dynamic $showerdin
+			gs 'stat'
+			'<center><h4><font color="maroon">Bathroom</font></h4></center>'
+			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
+			'You take a quick shower.'
+			act 'Take a selfie':
+				gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
+			end
+			act 'Get out of the shower': gt 'artemhome','bathroom'
+		end
+		dynamic $bath
+		dynamic $bteeth
+		dynamic $tampon
+		dynamic $basin
+		gs 'din_van', 'prvt_pee'
+	else
+		'As you aproach the bathroom door you can hear the shower running.'
+		act 'Knock on the door':
+			*clr & cla
+			'"Hey Artem are you in there?"'
+			'"<<$pcs_nickname>> is that you?" You hear him reply through the door.'
+			'"Yeah, it''s me. I hope it''s ok that I dropped by?"'
+			'"Ofcourse. Uhm, Give me a minute, I''ll be out in a bit. You can wait in my room."'
+			act 'Go to his room': gt 'artemhome', 'artemroom'
 		end
 		end
-		act 'Get out of the shower': gt 'artemhome','bathroom'
 	end
 	end
-	dynamic $bath
-	dynamic $bteeth
-	dynamic $tampon
-	dynamic $basin
-	gs 'din_van', 'prvt_pee'
 end
 end
 
 
 if $ARGS[0] = 'artemroom':
 if $ARGS[0] = 'artemroom':
@@ -253,12 +266,31 @@ if $ARGS[0] = 'artemroom':
 		act 'Leave Artem''s room': gt 'artemhome','hallway'
 		act 'Leave Artem''s room': gt 'artemhome','hallway'
 	end
 	end
 	
 	
+	if ArtemLoc = 3:
+		ArtemLoc = 2
+		'You take a seat on his bed and wait for Artem to finish showering.'
+		'It only takes a minute or 2 before he shows up. His hair still wet. He must have rushed to get out of the shower.'
+		act 'That was fast':
+			*clr & cla
+			'<center><h4><font color="maroon">Artem''s Room</font></h4></center>'
+			'<center><img src="images/pc/npc_headshots/big2.jpg"></center>'
+			'You grin and point out his still wet hair to him.'
+			'"Are you and your towel having a fight? It looks like she abandoned you." You giggle.'
+			'He sheepishly runs a hand through his hair and then inspects it.'
+			'"You uhm... You might have a point. I just didn''t want you to get too bored waiting."'
+			act 'Talk with him': gt 'artemhome', 'chat'
+		end
+	end
+	
 	if ArtemLoc = 2:
 	if ArtemLoc = 2:
 		'Artem is sitting there, watching you with a friendly smile.'
 		'Artem is sitting there, watching you with a friendly smile.'
+		act 'Let''s go to the livingroom': ArtemLoc = 5 & gt 'artemhome', 'livingroom'
 		act 'Talk to Artem': ArtemLoc = 2 & gt 'artemhome', 'chat'
 		act 'Talk to Artem': ArtemLoc = 2 & gt 'artemhome', 'chat'
-		act 'Do homework with Artem': gt 'artemEv','learn'
+		if lernHome ! 0:
+			act 'Do homework with Artem': gt 'artemEv','learn'
+		end
 !! Nutluck needs to say at which point this should be enabled, set it to artfall > 5 for now		
 !! Nutluck needs to say at which point this should be enabled, set it to artfall > 5 for now		
-		if artfall > 5:
+		if artfall > 5 and artkissing ! daystart:
 			gs 'willpower', 'misc', 'self', 'easy'
 			gs 'willpower', 'misc', 'self', 'easy'
 			if will_cost <= pcs_willpwr:
 			if will_cost <= pcs_willpwr:
 				act 'Kiss him (<<will_cost>> Willpower)':
 				act 'Kiss him (<<will_cost>> Willpower)':
@@ -275,7 +307,7 @@ if $ARGS[0] = 'artemroom':
 					'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.'
 					'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 'arousal', 'foreplay', 3
 					gs 'stat'
 					gs 'stat'
-					act 'Stop kissing and talk': gt 'atremhome', 'chat'
+					act 'Stop kissing and talk': gt 'artemhome', 'chat'
 					act 'Make out':
 					act 'Make out':
 						*clr & cla
 						*clr & cla
 						'<center><h4><font color="maroon">Artem''s Room</font></h4></center>'
 						'<center><h4><font color="maroon">Artem''s Room</font></h4></center>'
@@ -290,7 +322,7 @@ if $ARGS[0] = 'artemroom':
 							'<center><img src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></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?"'
 							'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.'
 							'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'
+							act 'Talk about something else': gt 'artemhome', 'chat'
 						end
 						end
 						act 'Enjoy his touch':
 						act 'Enjoy his touch':
 							*clr & cla
 							*clr & cla
@@ -350,7 +382,7 @@ if $ARGS[0] = 'artemroom':
 										'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 										'<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."'
 										'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."'
 										'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'
+										act 'Talk to him': gt 'artemhome', 'chat'
 									end
 									end
 								else
 								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>'
 									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>'
@@ -539,8 +571,10 @@ if $ARGS[0] = 'livingroom':
 	if ArtemLoc = 5 and ArtemParentsLoc = 5 and artemmeetdad = 0 and hour < 22:
 	if ArtemLoc = 5 and ArtemParentsLoc = 5 and artemmeetdad = 0 and hour < 22:
 		metArtemDad = 1
 		metArtemDad = 1
 		menu_off = 1
 		menu_off = 1
-		minut +10
+		minut += 10
 		gs 'stat'
 		gs 'stat'
+		*clr & cla
+		'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 		if pav_slut >= 100 or grupTipe = 4:
 		if pav_slut >= 100 or grupTipe = 4:
 			'As the two of you walk into the living room he turns towards you, looking a bit appalled at you, "So <<$pcs_firstname>> how did you and my boy become friends?"'
 			'As the two of you walk into the living room he turns towards you, looking a bit appalled at you, "So <<$pcs_firstname>> how did you and my boy become friends?"'
 			'Stretching out your clothes so they cover you up a little, "I don'' really remember. We kinda just connected and started hanging out... It doesn''t hurt that Artem is really hot so that made it much easier." Artem blushes at the comment.'
 			'Stretching out your clothes so they cover you up a little, "I don'' really remember. We kinda just connected and started hanging out... It doesn''t hurt that Artem is really hot so that made it much easier." Artem blushes at the comment.'
@@ -654,7 +688,7 @@ if $ARGS[0] = 'livingroom':
 				end
 				end
 			end
 			end
 		else
 		else
-			'Artem''s dad and mom are here watching tv. You could disturb them and talk to them, maybe it would just be better if you snuck back out before they see you.'
+			'Artem''s dad and mom are here watching tv. You could disturb them and talk to them, maybe it would be better if you snuck back out before they see you.'
 			act 'Sneak out':
 			act 'Sneak out':
 				*clr & cla
 				*clr & cla
 				menu_off = 1
 				menu_off = 1
@@ -772,11 +806,13 @@ if $ARGS[0] = 'livingroom':
 				act 'Leave': gt'pod_ezd','etaj_1'
 				act 'Leave': gt'pod_ezd','etaj_1'
 			end
 			end
 		end
 		end
-		act 'I think we should do our homework':
-			*clr & cla
-			'<center><b><font color = maroon>Living room</font></b></center>'
+		if lernHome ! 0:
+			act 'I think we should do our homework':
+				*clr & cla
+				'<center><b><font color = maroon>Living room</font></b></center>'
 !! Needs some text to skip the gaming			
 !! Needs some text to skip the gaming			
-			act 'Follow Artem to his room': ArtemLoc = 2 & gt 'artemhome','artemroom'
+				act 'Follow Artem to his room': ArtemLoc = 2 & gt 'artemhome','artemroom'
+			end
 		end
 		end
 	else
 	else
 		'Nobody''s here right now.'
 		'Nobody''s here right now.'
@@ -1100,7 +1136,7 @@ if $ARGS[0] = 'chat':
 				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 				'You lie to him: "I got very drunk in the disco, a few nights ago. He made a video of it and threatened to tell my <<$npc_nickname[''A29'']>>. My <<$npc_nickname[''A29'']>> would kill me!"'
 				'You lie to him: "I got very drunk in the disco, a few nights ago. He made a video of it and threatened to tell my <<$npc_nickname[''A29'']>>. My <<$npc_nickname[''A29'']>> would kill me!"'
 				'Artem nods: "Alright, I''ll see what I can do."'
 				'Artem nods: "Alright, I''ll see what I can do."'
-				act 'Keep talking': gt 'atremhome', 'chat'
+				act 'Keep talking': gt 'artemhome', 'chat'
 				act 'Stop talking': gt 'artemhome', 'artemroom'
 				act 'Stop talking': gt 'artemhome', 'artemroom'
 			end
 			end
 			act 'Tell him the truth':
 			act 'Tell him the truth':
@@ -1111,7 +1147,7 @@ if $ARGS[0] = 'chat':
 				'You have to gather some courage to tell him the truth, and remain silent for a second.'
 				'You have to gather some courage to tell him the truth, and remain silent for a second.'
 				'You stare at your feet, afraid to look him in the eye when you tell him: "I thought I loved him. He made a video of me giving him a blowjob... he''s blackmailing me with it now, forcing me to do all sorts of nasty things. Please, it would mean the world to me if you could make that video disappear.'
 				'You stare at your feet, afraid to look him in the eye when you tell him: "I thought I loved him. He made a video of me giving him a blowjob... he''s blackmailing me with it now, forcing me to do all sorts of nasty things. Please, it would mean the world to me if you could make that video disappear.'
 				'Artem nods: "That sounds horrible! Okay, I''ll see what I can do."'
 				'Artem nods: "That sounds horrible! Okay, I''ll see what I can do."'
-				act 'Keep talking': gt 'atremhome', 'chat'
+				act 'Keep talking': gt 'artemhome', 'chat'
 				act 'Stop talking': gt 'artemhome', 'artemroom'
 				act 'Stop talking': gt 'artemhome', 'artemroom'
 			end
 			end
 		end
 		end
@@ -1121,7 +1157,7 @@ if $ARGS[0] = 'chat':
 			artdimhelp = daystart
 			artdimhelp = daystart
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'You''re too embarassed to even broach the subject.'
 			'You''re too embarassed to even broach the subject.'
-			act 'Keep talking': gt 'atremhome', 'chat'
+			act 'Keep talking': gt 'artemhome', 'chat'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 		end
 		end
 !! This is triggered after Sveta has asked Artem to steal the video
 !! This is triggered after Sveta has asked Artem to steal the video
@@ -1145,7 +1181,7 @@ if $ARGS[0] = 'chat':
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'You jump up and hug him. His surprise is obvious but eventually he loosens up and puts his arms around you too.'
 			'You jump up and hug him. His surprise is obvious but eventually he loosens up and puts his arms around you too.'
 			'"Thank you." You murmer. "I don''t know what I would have done if he''d been able to keep tormenting me with it."'
 			'"Thank you." You murmer. "I don''t know what I would have done if he''d been able to keep tormenting me with it."'
-			act 'Keep talking': gt 'atremhome', 'chat'
+			act 'Keep talking': gt 'artemhome', 'chat'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 		end
 		end
 !! If Sveta has fallen because of her slut reputation in Pavlovsk
 !! If Sveta has fallen because of her slut reputation in Pavlovsk
@@ -1216,7 +1252,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			gs 'stat'
 			'You shake your head. "No thanks, but thank you for asking."'
 			'You shake your head. "No thanks, but thank you for asking."'
 			'He looks a little disappointed. "Oh, ok."'
 			'He looks a little disappointed. "Oh, ok."'
-			act 'Keep talking': gt 'atremhome', 'chat'
+			act 'Keep talking': gt 'artemhome', 'chat'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 		end
 		end
 	elseif artdate > 0 and artdate <= 3 and pav_slut < 75:
 	elseif artdate > 0 and artdate <= 3 and pav_slut < 75:
@@ -1238,7 +1274,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			gs 'stat'
 			'You shake your head. "No thanks, but thank you for asking."'
 			'You shake your head. "No thanks, but thank you for asking."'
 			'He looks a little disappointed. "Oh, ok."'
 			'He looks a little disappointed. "Oh, ok."'
-			act 'Keep talking': gt 'atremhome', 'chat'
+			act 'Keep talking': gt 'artemhome', 'chat'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 		end
 		end
 	elseif artdate = 4 and pav_slut < 100:
 	elseif artdate = 4 and pav_slut < 100:
@@ -1276,7 +1312,7 @@ if $ARGS[0] = 'chat':
 					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 					'You push his hands away: "Wait... you''re going too fast, please stop!"'
 					'You push his hands away: "Wait... you''re going too fast, please stop!"'
 					'Artem does as you ask and pulls his hands back as he apologizes: "Sorry..."'
 					'Artem does as you ask and pulls his hands back as he apologizes: "Sorry..."'
-					act 'Just talk': gt 'atremhome', 'chat'
+					act 'Just talk': gt 'artemhome', 'chat'
 				end
 				end
 			else
 			else
 				act 'Tell him to stop it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				act 'Tell him to stop it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1299,7 +1335,7 @@ if $ARGS[0] = 'chat':
 						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 						'<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."'
 						'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."'
 						'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'
+						act 'Talk to him': gt 'artemhome', 'chat'
 					end
 					end
 				else
 				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>'
 					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>'
@@ -1321,7 +1357,7 @@ if $ARGS[0] = 'chat':
 				'You quietly walk past him and say: "Come on, let''s study?"'
 				'You quietly walk past him and say: "Come on, let''s study?"'
 				'You can tell he''s unhappy, and he mutters: "Fine..."'
 				'You can tell he''s unhappy, and he mutters: "Fine..."'
 				'You really hurt his feelings.'
 				'You really hurt his feelings.'
-				act 'Just talk': gt 'atremhome', 'chat'
+				act 'Just talk': gt 'artemhome', 'chat'
 			end
 			end
 		end
 		end
 	elseif artdate >= 6 and artdate <= 8 and pav_slut < 100:
 	elseif artdate >= 6 and artdate <= 8 and pav_slut < 100:
@@ -1343,7 +1379,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			gs 'stat'
 			'You shake your head. "No thanks, but thank you for asking."'
 			'You shake your head. "No thanks, but thank you for asking."'
 			'He looks a little disappointed. "Oh, ok."'
 			'He looks a little disappointed. "Oh, ok."'
-			act 'Keep talking': gt 'atremhome', 'chat'
+			act 'Keep talking': gt 'artemhome', 'chat'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 		end
 		end
 	elseif artdate = 9:
 	elseif artdate = 9:
@@ -1415,7 +1451,7 @@ if $ARGS[0] = 'chat':
 			'<center><h4><font color="maroon">Artem''s Room</font></h4></center>'
 			'<center><h4><font color="maroon">Artem''s Room</font></h4></center>'
 			'<center><img src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
 			'<center><img src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
 			'The two of you chat about a variety of things, mostly school, movies, books, video games, his gaming night, and what has been going on in Pavlovsk lately.'
 			'The two of you chat about a variety of things, mostly school, movies, books, video games, his gaming night, and what has been going on in Pavlovsk lately.'
-			act 'Keep talking': gt 'atremhome', 'chat'
+			act 'Keep talking': gt 'artemhome', 'chat'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 		end
 		end
 		act 'Ask about the future':
 		act 'Ask about the future':
@@ -1436,7 +1472,7 @@ if $ARGS[0] = 'chat':
 				'He nods a bit. "Well you still have some time to decided what you want to do."'
 				'He nods a bit. "Well you still have some time to decided what you want to do."'
 				'Not sure what more to say about it, you decided to change the subject.'
 				'Not sure what more to say about it, you decided to change the subject.'
 				act 'Stop talking': gt 'artemhome', 'artemroom'
 				act 'Stop talking': gt 'artemhome', 'artemroom'
-				act 'Keep talking': gt 'atremhome', 'chat'
+				act 'Keep talking': gt 'artemhome', 'chat'
 			end
 			end
 			act 'Go to the University':
 			act 'Go to the University':
 				*clr & cla
 				*clr & cla
@@ -1447,7 +1483,7 @@ if $ARGS[0] = 'chat':
 				'You get a bit excited. "I am planning to attend the University too. Now I will for sure know someone there."'
 				'You get a bit excited. "I am planning to attend the University too. Now I will for sure know someone there."'
 				'He grins. "That''s great maybe we can hang out there as well."'
 				'He grins. "That''s great maybe we can hang out there as well."'
 				act 'Stop talking': gt 'artemhome', 'artemroom'
 				act 'Stop talking': gt 'artemhome', 'artemroom'
-				act 'Keep talking': gt 'atremhome', 'chat'
+				act 'Keep talking': gt 'artemhome', 'chat'
 			end
 			end
 			
 			
 			!! Checking who Sveta is dating
 			!! Checking who Sveta is dating
@@ -1485,7 +1521,7 @@ if $ARGS[0] = 'chat':
 					end
 					end
 					'Not sure what more to say on the topic.'
 					'Not sure what more to say on the topic.'
 					act 'Stop talking': gt 'artemhome', 'artemroom'
 					act 'Stop talking': gt 'artemhome', 'artemroom'
-					act 'Keep talking': gt 'atremhome', 'chat'
+					act 'Keep talking': gt 'artemhome', 'chat'
 				end
 				end
 			end
 			end
 		end
 		end
@@ -1509,7 +1545,7 @@ if $ARGS[0] = 'chat':
 				'Artem shines up in the biggest smile, "Oh it''s about this hero that needs to fight for a kingdom and the bad guy has all sorts of weird creatures that he forces to attack him and then he finds this hidden world in his own world so the book takes a completly different path than the one you expected it to take..."'
 				'Artem shines up in the biggest smile, "Oh it''s about this hero that needs to fight for a kingdom and the bad guy has all sorts of weird creatures that he forces to attack him and then he finds this hidden world in his own world so the book takes a completly different path than the one you expected it to take..."'
 				'Artem is so excited while explaining that you''re having a hard time to follow him but you immerse yourself in it just to make him happy...'
 				'Artem is so excited while explaining that you''re having a hard time to follow him but you immerse yourself in it just to make him happy...'
 				act 'Stop talking': gt 'artemhome', 'artemroom'
 				act 'Stop talking': gt 'artemhome', 'artemroom'
-				act 'Keep talking': gt 'atremhome', 'chat'
+				act 'Keep talking': gt 'artemhome', 'chat'
 			end
 			end
 			act 'A book?':
 			act 'A book?':
 				*clr & cla
 				*clr & cla
@@ -1520,7 +1556,7 @@ if $ARGS[0] = 'chat':
 				'You sigh, "It''s okay, Artem. Fantasy is not really my cup of tea, but as long as it makes you happy..."'
 				'You sigh, "It''s okay, Artem. Fantasy is not really my cup of tea, but as long as it makes you happy..."'
 				'He nods, and you can notice the disappointment in him as he puts the book back.'
 				'He nods, and you can notice the disappointment in him as he puts the book back.'
 				act 'Stop talking': gt 'artemhome', 'artemroom'
 				act 'Stop talking': gt 'artemhome', 'artemroom'
-				act 'Keep talking': gt 'atremhome', 'chat'
+				act 'Keep talking': gt 'artemhome', 'chat'
 			end
 			end
 		end
 		end
 	end
 	end
@@ -1551,7 +1587,7 @@ if $ARGS[0] = 'askedstrip':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
 					'You shake your head. "I''m sorry Artem I am just not comfortable doing that."'
 					'You shake your head. "I''m sorry Artem I am just not comfortable doing that."'
 					'He frowns deeply but nods his head. "Yeah ok..."'
 					'He frowns deeply but nods his head. "Yeah ok..."'
-					act 'Keep talking': gt 'atremhome', 'chat'
+					act 'Keep talking': gt 'artemhome', 'chat'
 					act 'Stop talking': gt 'artemhome', 'artemroom'
 					act 'Stop talking': gt 'artemhome', 'artemroom'
 				end
 				end
 			else
 			else
@@ -1589,7 +1625,7 @@ if $ARGS[0] = 'artemgirlfriend':
 		'You finish the bottle of wine with Artem, and thank him for a nice time before you gather your things and leave.'
 		'You finish the bottle of wine with Artem, and thank him for a nice time before you gather your things and leave.'
 		minut += 5
 		minut += 5
 		gs 'stat'
 		gs 'stat'
-		act 'Talk to him': gt 'atremhome', 'chat'
+		act 'Talk to him': gt 'artemhome', 'chat'
 	end
 	end
 	act 'Enjoy his touch':
 	act 'Enjoy his touch':
 		*clr & cla
 		*clr & cla
@@ -1610,7 +1646,7 @@ if $ARGS[0] = 'artemgirlfriend':
 				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 				'<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."'
 				'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."'
 				'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'
+				act 'Talk to him': gt 'artemhome', 'chat'
 			end
 			end
 		else
 		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>'
 			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>'

+ 1 - 1
locations/pod_ezd.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = 'etaj_1' or $ARGS[0] = '':
 		end
 		end
 	end
 	end
 	act 'Go up to the second floor': minut += 1 & gt 'pod_ezd','etaj_2'
 	act 'Go up to the second floor': minut += 1 & gt 'pod_ezd','etaj_2'
-	if ArtemBeInHome > 0 and artemblok = 0: act 'Apartment 2: Artem Chebotarev': gt 'artemhome'
+	if ArtemBeInHome > 0 and artemblok = 0: act 'Apartment 2: Artem Chebotarev': gt 'artemhome', 'home'
 	act 'Take the elevator': gt 'pod_ezd','lift','etaj_1'
 	act 'Take the elevator': gt 'pod_ezd','lift','etaj_1'
 end
 end