Merge remote-tracking branch 'CroWke/master'

locations/artemEv.qsrc

@@ -93,15 +93,16 @@ if $ARGS[0] = 'learn':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 	'You spend an hour doing your homework together with Artem. He''s a very smart guy, and explains several things to you. At the end of the hour, you feel like you had a very productive homework session, and that you learned a lot from Artem''s tutoring.'
 	minut += 60
-	
+	lernHome = 0
+	lern += rand(3, 6)
 !!counts as doing 2 hours of homework alone
 	intel_exp += rand(1, 2)
 	gs 'stat'
-	act 'Take a break from studying':gt 'artemhome', 'artemroom'
-	act 'Talk instead': gt 'artemhome', 'chat'
+	!act 'Take a break from studying':gt 'artemhome', 'artemroom'
+	!act 'Talk instead': gt 'artemhome', 'chat'
 	if pav_slut > 100:
 !!this triggers instead of the two above if pav slut is high enough
-		*clr & cla
+		*nl
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
 		'After you finish your homework, Artem has a serious look on his face when he says: "<<$pcs_nickname>>, everyone in the school is talking about how much of a slut you are. With how much I''ve been helping you... I think it''s only fair you give me a little something in return."'
 		'You frown at him. "What did you have in mind?"'
@@ -356,7 +357,7 @@ if $ARGS[0] = 'learn':
 			end
 		end
 	else
-		*clr & cla
+		*nl
 		'<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.'
 		act 'Talk for a bit': gt 'artemhome', 'chat'

locations/artemdate.qsrc

@@ -9,7 +9,6 @@ if $ARGS[0] = 'firstdate':
 	'After a while you end up near the movie theater. When Artem sees it, he suggests: "Hey, let''s go see a movie!"'
 	minut += 15
 	gs 'stat'
-	gs 'artemdate','artemGopSkver'
 	act 'A movie sounds like fun!':
 		*clr & cla
 		npc_rel['A2'] += 1
@@ -42,12 +41,11 @@ if $ARGS[0] = 'firstdate':
 		minut += 30
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/park/walk_<<rand(1,2)>>.jpg"></center>'
+		'You don''t really feel like going the cinema, and tell him: "Nah, let''s just enjoy the walk we''re on."'
 		if rand(1,5) = 1 and hour >= 20:
-			'You don''t really feel like going the cinema, and tell him: "Nah, let''s just enjoy the walk we''re on."'
 			'Artem is happy enough to just spend time with you, regardless of what the two of you are doing. He nods as you continue on your walk, talking about everyday things. After the two of you walk for awhile, you see a group of older gopniks hanging out around a bench just ahead. They are drinking and you can hear them from here, they are obviously already a bit drunk.'
 			act 'Just walk past them': gt 'artemdate','artemGopSkver'
 		else
-			'You don''t really feel like going the cinema, and tell him: "Nah, let''s just enjoy the walk we''re on."'
 			'Artem is happy enough to just spend time with you, regardless of what the two of you are doing. He nods as you continue on your walk, talking about everyday things. After the two of you walk for a while talking, he checks his watch and says, "We should be getting back, I will walk you to your door."'
 			'Artem walks you back to your apartment door. Once you are just outside your apartment door he stops and looks at you. "I had fun <<$pcs_nickname>>."'
 			'You smile at him. "I had fun too Artem."'
@@ -64,7 +62,8 @@ if $ARGS[0] = 'artem_date':
 	*clr & cla
 	npc_rel['A2'] += 1
 	menu_off = 1
-!!this is what it will look like when batman finishes the dates, 3 special dates that each happen once and then three repeatable dates. For now can we just temporarily have it repeat the first date above so we can get the artem revamp in the dev builds to bug hunt and then we can add the others when he finishes them.
+	gt 'artemdate', 'firstdate'
+!{this is what it will look like when batman finishes the dates, 3 special dates that each happen once and then three repeatable dates. For now can we just temporarily have it repeat the first date above so we can get the artem revamp in the dev builds to bug hunt and then we can add the others when he finishes them.
 	if artem_date = 1:
 	
 	elseif artem_date = 2:
@@ -80,7 +79,9 @@ if $ARGS[0] = 'artem_date':
 		elseif repeat_date = 3:
 		
 		else
-	end
+		
+		end
+	end}
 end
 
 if $ARGS[0] = 'artemGopSkver':
@@ -105,7 +106,6 @@ if $ARGS[0] = 'artemGopSkver':
 			'"Bye Artem, I have a wonderful time." You tell him and with that he walks back down the stairs to the first floor and presumably his apartment.'
 			act 'Go home': gt 'pod_ezd', 'etaj_2'
 		end
-	end
 	else
 		'Just as you are about to make it past them several of the gopniks get in your way, they make somewhat of a circle around you and Artem. They don''t look familiar to you.'
 		'Somehow, one of them knows your name. They look at you with disdain and the leader of their group says: "<<$pcs_nickname>>? What are you doing with this bitch?"'

locations/artemhome.qsrc

@@ -172,6 +172,10 @@ if $ARGS[0] = 'hallway':
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
 	$location_type = 'indoors'
+	$metkaM = $ARGS[0]
+	$locM = 'hallway'
+	$metka = $ARGS[0]
+	$loc = 'hallway'
 	*clr & cla
 	minut += 1
 	gs 'stat'
@@ -193,14 +197,14 @@ if $ARGS[0] = 'hallway':
 end
 
 if $ARGS[0] = 'bathroom':
-	if ArtemLoc ! 3:
-		CLOSE ALL
+	CLOSE ALL
 		$menu_loc = 'artemhome'
 		$menu_arg = 'bathroom'
 		$metka = 'bathroom'
 		$loc = 'artemhome'
 		$metkaM = 'bathroom'
 		$locM = 'artemhome'
+	if ArtemLoc ! 3:
 		menu_off = 0
 		*clr & cla
 		minut += 1
@@ -248,6 +252,10 @@ end
 if $ARGS[0] = 'artemroom':
 	$menu_loc = 'artemhome'
 	$menu_arg = 'artemroom'
+	$metkaM = $ARGS[0]
+	$locM = 'artemroom'
+	$metka = $ARGS[0]
+	$loc = 'artemroom'
 	menu_off = 0
 	$locclass = 'bedr'
 	CLOSE ALL
@@ -553,6 +561,10 @@ end
 if $ARGS[0] = 'livingroom':
 	$menu_loc = 'artemhome'
 	$menu_arg = 'livingroom'
+	$metkaM = $ARGS[0]
+	$locM = 'livingroom'
+	$metka = $ARGS[0]
+	$loc = 'livingroom'
 	menu_off = 0
 	CLOSE ALL
 	*clr & cla
@@ -816,13 +828,15 @@ if $ARGS[0] = 'livingroom':
 		end
 	else
 		'Nobody''s here right now.'
-		act 'Leave':gt 'artemhome','hallway'
+		!act 'Leave':gt 'artemhome','hallway'
 	end
 end
 
 if $ARGS[0] = 'kitchen':
-	$loc = 'artemhome'
-	$metka = 'kitchen'
+	$metkaM = $ARGS[0]
+	$locM = 'kitchen'
+	$metka = $ARGS[0]
+	$loc = 'kitchen'
 	$menu_loc = 'artemhome'
 	$menu_arg = 'kitchen'
 	menu_off = 0
@@ -1077,6 +1091,10 @@ end
 if $ARGS[0] = 'artemparents':
 	$menu_loc = 'artemhome'
 	$menu_arg = 'artemparents'
+	$metkaM = $ARGS[0]
+	$locM = 'artemparents'
+	$metka = $ARGS[0]
+	$loc = 'artemparents'
 	menu_off = 0
 	CLOSE ALL
 	*clr & cla
@@ -1232,7 +1250,7 @@ if $ARGS[0] = 'chat':
 			'After you gather your things you leave his apartment, ignoring his pleas.'
 			act 'Leave Artem''s apartment':minut += 5 & artemblok = 1 & gt 'pod_ezd','etaj_1'
 		end
-	elseif artdate = 0 and artfall = 10 and pav_slut < 75:
+	elseif artdate = 0 and artfall >= 10 and pav_slut < 75:
 		*clr & cla
 		gs 'stat'
 		'Artem smiles at you, and suggests: "<<$pcs_nickname>>, do you want to go for a walk in the park?"'
@@ -1635,7 +1653,7 @@ if $ARGS[0] = 'artemgirlfriend':
 		gs 'stat'
 		act 'Give him a handjob': gt 'artemEv', 'hj'
 		act 'Give him a blowjob': gt 'artemEv', 'bj'
-		act 'Have sex with him': gt 'artemEv', 'artem_sex'
+		act 'Have sex with him': gt 'artemEv', 'sex'
 		gs 'willpower', 'bj', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Pull away and stop (<<will_cost>> Willpower)':

locations/gschool_lessons1.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'russian':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 2
 					gs 'fame', 'pav', 'sex', 5
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt1.jpg"></center>'
 					'Near the end of class you get up and head towards Mr. Yenotin''s desk.  You make a point of acting like you are checking one of the books for something. With a final glance to make sure Mr. Yenotin isn''t looking, you pull up the back of your skirt and expose your naked butt to the class. A couple of the others students notice what you are doing and draw other kids attention to it, most of them either grin, smile or even laugh at your antics, all but Lesco who openly stares with his mouth open.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 				end
@@ -558,7 +558,7 @@ if $ARGS[0] = 'geography':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 2
 					gs 'fame', 'pav', 'sex', 5
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt1.jpg"></center>'
 					'Near the end of class you get up and act like you are checking one of the books for something near Mrs. Sokoloff desk. Making sure Mrs. Sokoloff isn''t looking you pull up the back of your skirt and expose your naked butt to anyone in class looking. Vitek tries to take a picture but you close your shirt before he gets his phone up. Artem''s mouth drops open and he just stares at your naked butt, Andrey, Valentin, Vanya, and Lazar grins at what you are doing. While Stasya starts texting on his phone likely telling everyone in school what you just did.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 				end
@@ -1049,7 +1049,7 @@ if $ARGS[0] = 'history':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 2
 					gs 'fame', 'pav', 'sex', 5
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt1.jpg"></center>'
 					'Near the end of class you get up and act like you are checking one of the books for something near Mrs. Sokoloff desk. Making sure Mrs. Sokoloff isn''t looking you pull up the back of your skirt and expose your naked butt to anyone in class looking. Roman tries to take a picture but you drop you skirt back in place before he gets his phone up. Petka''s mouth drops open and he just stares at your naked butt, the rest of the students either grin or smile at what you are doing. While Lina starts texting on his phone likely telling everyone in school what you just did.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 				end

locations/gschool_lessons2.qsrc

@@ -72,7 +72,7 @@ if $ARGS[0] = 'computer':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 2
 					gs 'fame', 'pav', 'sex', 5
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt1.jpg"></center>'
 					'Near the end of class you get up and act like you are checking one of the books for something near Mr. Ivanov desk. Making sure Mr. Ivanov isn''t looking you pull up the back of your skirt and expose your naked butt to anyone in class looking. Vasily tries to take a picture but you drop you skirt back in place before he gets his phone up. Artem''s mouth drops open and he just stares at your naked butt, Sonia grins at what you are doing, Zinaida gives you a slightly disgusted look before turning away, Albina and Alyona smile about it, while Lizaveta starts texting on her phone at once. You are sure she is texting everyone what you just did.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 				end
@@ -571,7 +571,7 @@ if $ARGS[0] = 'science':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 2
 					gs 'fame', 'pav', 'sex', 5
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt1.jpg"></center>'
 					'Near the end of class you get up and act like you are checking one of the books for something near Miss Orlov desk. Making sure Miss Orlov isn''t looking you pull up the back of your skirt and expose your naked butt to anyone in class looking. Fedor''s mouth drops open and he just stares at your naked butt, Andrey and Vanya grin as they watch, Stasya gives you a annoyed look when Andrey reacts, while Irina starts texting on her phone at once. You are sure she is texting everyone what you just did.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 				end
@@ -945,7 +945,7 @@ if $ARGS[0] = 'music':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 2
 					gs 'fame', 'pav', 'sex', 5
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt1.jpg"></center>'
 					'Near the end of class you get up and act like you are checking one of the books for something near Mr. Vasilyev desk. Making sure Mr. Vasilyev isn''t looking you pull up the back of your skirt and expose your naked butt to anyone in class looking. Lavrenti tries to take a picture but you drop you skirt back in place before he gets his phone up. Petka''s mouth drops open and he just stares at your naked butt, Katja looks shocked then grins at what you are doing, Bella gives you a slightly disgusted look before turning away, Lariska and Lina smile about it, then Lina starts texting on her phone at once. You are sure she is texting everyone what you just did.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 				end
@@ -1421,7 +1421,7 @@ if $ARGS[0] = 'biology':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 2
 					gs 'fame', 'pav', 'sex', 5
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt1.jpg"></center>'
 					'Near the end of class you get up and act like you are checking one of the books for something near Miss Orlov desk. Making sure Miss Orlov isn''t looking you pull up the back of your skirt and expose your naked butt to anyone in class looking. Lesco''s and Artem''s mouths drops open as they just stare at your naked butt, Dan, Lavrenti and Lazar grin as they watch, while Irina starts texting on her phone at once. You are sure she is texting everyone what you just did.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 				end

locations/gschool_lessons3.qsrc

@@ -563,7 +563,7 @@ if $ARGS[0] = 'art':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 2
 						gs 'fame', 'pav', 'sex', 5
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt1.jpg"></center>'
 						'Near the end of class you get up and act like you are checking one of the books for something near Mr. Vasilyev desk. Making sure Mr. Vasilyev isn''t looking you pull up the back of your skirt and expose your naked butt to anyone in class looking. Svyatoslav tries to take a picture but you drop you skirt back in place before he gets his phone up. Feofan''s mouth drops open and he just stares at your naked butt, Anushka grins at what you are doing, Zinaida gives you a slightly disgusted look before turning away, Katja and Albina smile about it.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 					end
@@ -1085,7 +1085,7 @@ if $ARGS[0] = 'shop':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 2
 						gs 'fame', 'pav', 'sex', 5
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashbutt1.jpg"></center>'
 						'Near the end of class you get up and act like you are checking one of the books for something near Mr. Kuznetsov desk. Making sure Mr. Kuznetsov isn''t looking you pull up the back of your skirt and expose your naked butt to anyone in class looking. Dan tries to take a picture but you drop you skirt back in place before he gets his phone up. Fedor''s mouth drops open and he just stares at your naked butt, Anushka grins at what you are doing, Viktoria gives you a slightly disgusted look before turning away, Vitek and Paulina smile about it. While Dimka starts texting on his phone likely telling everyone in school what you just did.'
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 					end

locations/gschool_lessons4.qsrc

@@ -1401,7 +1401,7 @@ if $ARGS[0] = 'long_shower':
 						'She walks up to you and then turns you till you are facing the lockers and gives your butt a slap and then a squeeze. "What a dirty girl you are, what ever am I going to do with you?" You can tell it is a rhetorical question as you feel her hand sliding down between your legs.'
 						gs 'arousal', 'foreplay', 2
 						gs 'stat'
-						act 'Give in': gt 'gschool_sex', 'ablina_lockerroom'
+						act 'Give in': gt 'gschool_sex', 'albina_lockerroom'
 						gs 'willpower', 'sex', 'resist', 'medium'
 						if will_cost <= pcs_willpwr:
 							act 'Pull away (<<will_cost>> Willpower)':

locations/pavComplex.qsrc

@@ -93,7 +93,7 @@ if $ARGS[0] = 'start':
 	
 	if Enable_tablemap = 0:
 		if storyline = 1:'<a href="exec:minut += 15 & gt ''shulgahome''">The Shulgin family</a> live in the apartment above your parents.'
-		if ArtemBeInHome > 0 and artemblok = 0:'<a href="exec:minut += 15 & gt ''artemhome''">Artem Chebotarev</a>, one of your classmates, lives in the same apartment building as your parents, on the first floor.'
+		if ArtemBeInHome > 0 and artemblok = 0:'<a href="exec:minut += 15 & gt ''artemhome'', ''home''">Artem Chebotarev</a>, one of your classmates, lives in the same apartment building as your parents, on the first floor.'
 		if BeInJulMilHome = 1:
 			if (hour >= 15 and hour <= 20 and week < 6) or (hour >= 8 and hour <= 20 and week >= 6):
 				'<a href="exec:minut += 15 & gt ''JuliaMilVhod''">Julia Milova</a>, one of your classmates, lives in the same apartment building as your parents, on the third floor.'