Merge remote-tracking branch 'julzor/master'

locations/artemEv.qsrc

@@ -1197,6 +1197,7 @@ if $ARGS[0] = 'artemGopSkver':
 end &! --- artemgopSkver ---
 
 if $ARGS[0] = 'start':
+	*clr & cla
 	'<center><b><font color="maroon"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
 	if kotovLoveQW > 0 and artemVitokQW = 0:
@@ -1238,9 +1239,8 @@ if $ARGS[0] = 'start':
 
 			act 'Continue':gs 'gschool_grounds','main'
 		end
-	end
-
-	if fedorKozlovQW >= 10 and FedorArtemTalk = 0:
+	elseif fedorKozlovQW >= 10 and FedorArtemTalk = 0:
+		cla
 		FedorArtemTalk = 1
 		'As you leave the school courtyard with Artem to go study, Fedor stops you.'
 		'He looks questioningly at Artem and asks: "Artem, what''s going on? Are you taking <<$pcs_nickname>> somewhere? She''s with me, you know..."'
@@ -1251,15 +1251,15 @@ if $ARGS[0] = 'start':
 		gs 'stat'
 
 		act 'Do homework with Artem': gt 'artemEv','learn'
+	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','inside'
 	end
-
-	'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','inside'
-	!!act 'Do homework with Artem': gt 'artemEv','learn'
 end
 
 --- artemEv ---------------------------------

locations/bedrPar.qsrc

@@ -299,7 +299,7 @@ if $ARGS[0] = 'intro':
 	wait 2000
 	$npc_nickname['A29'] = input('<center>What name do you address your mother by?<br><br>Mother (default), Mum, Mom, Mama, etc.</center>')
 
-	act 'continue':
+	act 'Continue':
 		cla & *clr
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'

locations/cloakroom.qsrc

@@ -32,7 +32,7 @@ $coat_list_line = {
 
 	$RESULT += '<TD>'
 	if i = defaultcoat:
-		$RESULT += 'Yes<'
+		$RESULT += 'Yes'
 	end
 	$RESULT += '</TD>'
 

locations/gdksex.qsrc

@@ -597,7 +597,7 @@ if $ARGS[0] = 'handjob':
 			end		
 			gs 'stat'
 
-			if gdk_nice_guy = 1 and $ARGS[1] = 'unpaid':
+			if gdk_nice_guy = 1 or $ARGS[1] = 'unpaid':
 				if boynumBlock = 0:guy += 1
 				if boynumBlock > 0 and bmTOTSEX[Tboynum] = 0:guy += 1
 

locations/gdksport.qsrc

@@ -19,7 +19,9 @@ fixed Lariska quest start to run even if the fight was more than a week ago
 if $ARGS[0] = 'start':
 	CLOSE ALL
 	$metka = $ARGS[0]
+	$metkaM = $ARGS[0]
 	$loc = $CURLOC
+	$locM = $CURLOC
 	$location_type = 'public_indoors'
 	gs 'stat'
 	if night_mode = 1:
@@ -34,7 +36,10 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon">community center</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
 	'The community center sports club offers lessons in <a href="exec: gt ''gdksport'',''racing1''">Racing</a>, <a href="exec:gt ''gdksport'',''dance1''">Dance</a> and <a href="exec:gt ''gdksport'',''vball1''">Volleyball</a>.'
-
+	*nl
+	'In the locker room is a <a href="exec:GT ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+	*nl
+	
 	if kotovLoveQW > 0 and hour = 16:
 		'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> with a large sports bag entering the sports club.'
 	elseif npc_rel['A3'] >= 80 and hour = 17 and ivansportday ! daystart:
@@ -119,9 +124,9 @@ if $ARGS[0] = 'start':
 			end
 		end
 	elseif $clothingworntype ! 'exercise':
-		'You need to wear exercise clothing before you can take any lessons.'
+		'You need to wear exercise clothing before you can take a volleyball or track lesson.'
 	elseif $shoeworntype ! 'trainers':
-		'You need to wear exercise shoes before you can take any lessons.'
+		'You need to wear exercise shoes before you can take a volleyball or track lesson.'
 	else
 		'You are too tired to do any exercise. You need to rest and replenish your stamina.'
 	end
@@ -934,7 +939,6 @@ if $ARGS[0] = 'shower':
 	dynamic $showerdin
 	minut += 15
 	pcs_horny += 1
-	pcs_hairbsh = 1
 	pcs_makeup = 1
 	if frost > 0:frost = 0
 	gs 'stat'

locations/gdktoilet.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon">Bathroom Entrance</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/bathroom_entrance.jpg"></center>'
 
-	act 'Go Outside': 
+	act 'Go outside': 
 		gs 'arousal', 'end'
 		gs 'stat'
 		gt 'gdk'

locations/gschool_lessons.qsrc

@@ -2959,14 +2959,10 @@ end
 if $ARGS[0] = 'post_dress':
 	*clr & cla
 	$metka = 'post_dress'
+	$metkaM = 'post_dress'
 	$loc = 'gschool_lessons'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
-	act 'Choose a different outfit':postphys_event = daystart & gt 'wardrobe', 'start'
-	act 'Use the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0:
-		act 'Brush your hair': gt 'mirror', 'brush'
-	end
 	act 'Leave school':
 		if $clothingworntype = 'nude':
 			msg'<b><font color = red>You need to get dressed before you leave the changing rooms.</font></b>'
@@ -2975,6 +2971,11 @@ if $ARGS[0] = 'post_dress':
 			gt 'gschool_lessons', 'short_break'
 		end
 	end
+	act 'Choose a different outfit':postphys_event = daystart & gt 'wardrobe', 'start'
+	act 'Use the mirror': gt 'mirror', 'start'
+	if pcs_hairbsh = 0:
+		act 'Brush your hair': gt 'mirror', 'brush'
+	end
 end
 
 if $ARGS[0] = 'npc_data':

locations/postdeliveries.qsrc

@@ -877,7 +877,7 @@ if $ARGS[0] = '26':
 		'The boy gives you the note with a big smile on his face, and you quickly walk in the direction you last saw the woman and her daughter go.'
 		'You lose track of them for a moment, but after a quick search you see them walking. "Excuse me, miss! I have a note for you!" you shout after them, and walk towards them.'
 		'The mother looks at you a bit surprised, but you stop her before she can say something and say: "Not for you... but for you!" as you hand the note to the little girl.'
-		'She needs her mother''s help to read the note, but a big grin appears on her face when her mother explains who it''s from. It may have cost you a few minutes, and it will cost you a few minutes more to get back on track, but the feeling you get from seeing her genuine happiness is amazing! When you''re about to leave, her mother stops you and gives you 100 rubles and says: "What a nice thing of you to do! Thank you so much, that made her day!"'
+		'She needs her mother''s help to read the note, but a big grin appears on her face when her mother explains who it''s from. It may have cost you a few minutes, and it will cost you a few minutes more to get back on track, but the feeling you get from seeing her genuine happiness is amazing! When you''re about to leave, her mother stops you and gives you 100 <b>₽</b> and says: "What a nice thing of you to do! Thank you so much, that made her day!"'
 		act 'Continue your round':gt 'postdeliveries', 'resume'
 	end
 	act 'Decline and say you''re in a hurry':
@@ -954,7 +954,7 @@ if $ARGS[0] = 'bandits':
 	if postbandQW = 0:
 		cla
 		'"New at the job? Most of you know to avoid this area, unless you''re looking to play!" he grins at you, while his friend begins to rummage through your bag. "Anything good?" he asks his friend.'
-		'"Nice, someone sent money to Nikolai!" the other laughs. "That bastard owed me 5000 rubles, I thought I was never going to see that money again. Guess he just paid me back... thanks, Nikolai! Asshole..."'
+		'"Nice, someone sent money to Nikolai!" the other laughs. "That bastard owed me 5000 <b>₽</b>, I thought I was never going to see that money again. Guess he just paid me back... thanks, Nikolai! Asshole..."'
 		'He pockets the money and tosses the envelope away.'
 		''
 		act 'Tell them they can''t do that':
@@ -1352,7 +1352,7 @@ if $ARGS[0] = 'finishround':
 	if posteventQW4 = 1:posteventQW4 = 2 & '"One missing signatu- oh never mind, it''s him!" the postmaster remarks dryly when he notices the missing signature of the pervert who tried to to blackmail you. "No need to explain. I hope you didn''t listen to him? He tries that with every girl we hire. I''ve reported him to captain Katalkin several times, but nothing ever happens..."'
 	if postjobQW ! 999:
 		money += 450
-		'You receive your pay for the day, 450 rubles.'
+		'You receive your pay for the day, 450 <b>₽</b>.'
 	end
 	if postjobQW = 999: '"I better let Aleksiy know he needs to come in again on Saturdays, from now on. I knew I shouldn''t have trusted you!" he sighs, shaking his head in disappointment as he walks off. Guess you''re not getting paid for the day...'
 !! actions after your round is finished, default plus options if a long scene was triggered during your round

locations/postevents.qsrc

@@ -65,7 +65,7 @@ if $ARGS[0] = '1':
 				'The man snaps out of his daydream and instantly feels guilty for lusting over you. He mutters: "Erm, yes! Thank you! That was exactly what I needed to see, it looks great..."'
 				'"Great on me, you mean?" you laugh at him, nodding at the tenting erection in his pants. The man nods embarrassedly and leaves so you can change.'
 				'You put your regular clothes back on and go find him outside, who clearly looks relieved.'
-				'He offers you 300 rubles and a wide smile: "Thank you so much! I know it was weird of me to ask, but you really helped me out today. Please take this for your time."'
+				'He offers you 300 <b>₽</b> and a wide smile: "Thank you so much! I know it was weird of me to ask, but you really helped me out today. Please take this for your time."'
 				act 'Take the money and leave': gt 'pavResidential'		
 			end
 		end
@@ -77,7 +77,7 @@ if $ARGS[0] = '1':
 			'"Uhh... that''s all you needed from me, right?" you ask the man, after he''s been staring at your outfit for a while.'
 			'The man snaps out of his daydream and nods: "Erm, yes! Thank you! That was exactly what I needed to see, it looks great!"'
 			'You change back into your regular clothes and go find the man outside, who clearly looks relieved.'
-			'"If this won''t do it, I don''t know what will," he mutters. He offers you 300 rubles and a wide smile: "Thank you so much! I know it was weird of me to ask..."'
+			'"If this won''t do it, I don''t know what will," he mutters. He offers you 300 <b>₽</b> and a wide smile: "Thank you so much! I know it was weird of me to ask..."'
 			act 'Take the money and leave': gt 'pavResidential'
 		end
 	end
@@ -748,7 +748,7 @@ if $ARGS[0] = '4':
 			'You don''t want his cum on your face, or on your clothes! How would you explain that?'
 			'Closing your lips tightly around the head, you flick your tongue over his cock a few times and feel his warm, tangy sperm spurt against the back of your mouth. The taste is really not that bad!'
 			'When he''s mostly done, you let his cock slide out of his mouth and lick the head a few times, showing the man his load on your tongue before swallowing it.'
-			'"Oh wow! You''re... I''ve visited whores that weren''t as good..." he pants, simply amazed. He signs for his mail, and gives you 200 rubles: "Here, take this. If you ever want to make some extra cash during your round, you know where I live! Knock twice."'
+			'"Oh wow! You''re... I''ve visited whores that weren''t as good..." he pants, simply amazed. He signs for his mail, and gives you 200 <b>₽</b>: "Here, take this. If you ever want to make some extra cash during your round, you know where I live! Knock twice."'
 			'"Uhh, I''ll keep it in mind," you tell him, as you stand up to leave his apartment.'
 			act 'Continue your round':gs 'arousal', 'end' & gt 'postdeliveries', 'resume'
 		end			
@@ -769,12 +769,12 @@ if $ARGS[0] = '4':
 				act 'Tell him that''s not good enough':
 					cla
 					'"Not good enough!" you yell at him, as you tighten your grip on his junk even more. "You take advantage of me, while I''m just trying to do my job!? How many girls have you degraded like this, before me? I really should make you suffer..."'
-					'"N-no! Please! I can pay! I''ll give you 1000 rubles, just please let go! I won''t bother anyone ever again! I promise!" he cries out. You''d swear he''s nearly in tears now.'
+					'"N-no! Please! I can pay! I''ll give you 1000 <b>₽</b>, just please let go! I won''t bother anyone ever again! I promise!" he cries out. You''d swear he''s nearly in tears now.'
 					''
 					act 'Accept the money':
 						cla
 						money += 1000
-						'"Now you''re talking!" you say menacingly. Without you even letting go, the man promptly reaches for his wallet on the nightstand and pulls out the 1000 rubles he promised you.'
+						'"Now you''re talking!" you say menacingly. Without you even letting go, the man promptly reaches for his wallet on the nightstand and pulls out the 1000 <b>₽</b> he promised you.'
 						'You let go of his cock and balls to take the money from his trembling hand, causing the man to sigh in relief: "Oh thank God... I thought you were going to crush them!"'
 						'"I was seriously considering it," you tell him. "And you definitely would''ve deserved it if I did. Now sign, so I never have to see your face again."'
 						'He promptly signs, and you leave his apartment. You cast a quick look at your watch: fortunately you didn''t lose too much time over this. You still have mail to deliver, though.'

locations/postmaster.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 			'"A job? Haven''t got any jobs," the postmaster shrugs.'
 			'Just when you were about to turn around to leave, he ponders: "Actually, Aleksiy has been mentioning he wants to spend more time with his sick daughter on weekends. Maybe... come back here, girl."'
 			'He takes another good look at you and seems to be in deep thought for a moment, before humming contently.'
-			'"Alright, I''ll give you a chance to prove yourself. You can deliver some urgent letters and packages on Saturday afternoon. You''ll get the same pay Aleksiy gets, assuming you do a good job. 450 rubles total, for about three hours of work - from 12:00 to roughly 15:00. If you do well, you can do it every week," he offers.'
+			'"Alright, I''ll give you a chance to prove yourself. You can deliver some urgent letters and packages on Saturday afternoon. You''ll get the same pay Aleksiy gets, assuming you do a good job. 450 <b>₽</b> total, for about three hours of work - from 12:00 to roughly 15:00. If you do well, you can do it every week," he offers.'
 			''
 			act 'Accept the job':
 				cla
@@ -47,7 +47,7 @@ if $ARGS[0] = 'start':
 		minut += 2
 		'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 		'"Wait... weren''t you here before?" the postmaster asks when he sees your face. "Right, you were here about that Saturday job! It''s still available if you want it?"'
-		'When you ask him about the details, he reminds you: "You can deliver some urgent letters and packages on Saturday afternoon. You''ll get the same pay Aleksiy gets, assuming you do a good job. 450 rubles total, for about three hours of work - from 12:00 to roughly 15:00. If you do well, you can do it every week."'
+		'When you ask him about the details, he reminds you: "You can deliver some urgent letters and packages on Saturday afternoon. You''ll get the same pay Aleksiy gets, assuming you do a good job. 450 <b>₽</b> total, for about three hours of work - from 12:00 to roughly 15:00. If you do well, you can do it every week."'
 		''
 		act 'Accept the job':
 			cla
@@ -94,7 +94,7 @@ if $ARGS[0] = 'start':
 					'He probably warned you for a reason, better play it safe! Especially on your first day!'
 					'You stick to the route he suggested, and have a fairly uneventful day delivering the rest. You return to the post office a bit before 15:00.'
 					'"You managed to deliver all of them? That''s great!" the postmaster beams as you put the empty bag back where it belongs. He seems very relieved this experiment worked out well.'
-					'He hands you your pay right away, with another 50 rubles extra. "From Aleksiy, he says thanks for his first Saturday off in months! He and his little girl dropped by earlier, he looked so happy!" he explains. "So... as far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
+					'He hands you your pay right away, with another 50 <b>₽</b> extra. "From Aleksiy, he says thanks for his first Saturday off in months! He and his little girl dropped by earlier, he looked so happy!" he explains. "So... as far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
 					'You can do this work every Saturday from now on, from 12:00 to roughly 15:00.'
 					act 'Accept the job':
 						cla
@@ -130,7 +130,7 @@ if $ARGS[0] = 'start':
 						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 						'"I looked carefully, those streets seemed mostly deserted... but yes," you admit. You quickly add: "I can take care of myself, though!"'
 						'He lets out an exasperated sigh but nods: "I drew out that map for your safety, girl... but fine. As long as you do a good job and everyone gets their mail on time, I won''t ask how you do it. Just be careful, okay?"'
-						'He hands you the pay for your work, the full amount despite you being done quicker. You even find 50 rubles extra. "From Aleksiy, he says thanks for his first Saturday off in months! He and his little girl dropped by earlier, he looked so happy!" he explains. "Anyway... as far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
+						'He hands you the pay for your work, the full amount despite you being done quicker. You even find 50 <b>₽</b> extra. "From Aleksiy, he says thanks for his first Saturday off in months! He and his little girl dropped by earlier, he looked so happy!" he explains. "Anyway... as far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
 						'You can do this work every Saturday from now on, from 12:00 to roughly 15:00.'
 						''
 						act 'Accept the job':
@@ -161,7 +161,7 @@ if $ARGS[0] = 'start':
 						gs'stat'
 						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 						'The postmaster sees right through your lie, but can''t help but laugh: "You kids and your youthful hubris! I drew out that map for your safety... but fine. As long as you do a good job and everyone gets their mail on time, I won''t ask how you do it. Just be careful, okay?"'
-						'He hands you the pay for your work, the full amount despite you being done quicker. You even find 50 rubles extra. "From Aleksiy, he says thanks for his first Saturday off in months! He and his little girl dropped by earlier, he looked so happy!" he explains. "Anyway... as far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
+						'He hands you the pay for your work, the full amount despite you being done quicker. You even find 50 <b>₽</b> extra. "From Aleksiy, he says thanks for his first Saturday off in months! He and his little girl dropped by earlier, he looked so happy!" he explains. "Anyway... as far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
 						'You can do this work every Saturday from now on, from 12:00 to roughly 15:00.'
 						''
 						act 'Accept the job':

locations/sister.qsrc

@@ -351,7 +351,7 @@ if hour >= 7 and hour < 24:
 			npc_QW['A33'] = 1
 			gs'stat'
 			*pl $sisterLocationTitle
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
 			'You ask Anya about her boyfriend. She smiles.'
 			'"Well, I have a boyfriend. Although nothing serious. He is more of a friend who I have sex with."'
 			'"Awesome, now when I think out about it, you simply must introduce me to him!"'