Merge remote-tracking branch 'Anjuna/master'

# Conflicts:
#	locations/foto_events2.qsrc

locations/MartinTalk.qsrc

@@ -259,7 +259,7 @@ if $ARGS[0] = '':
 			end
 		end
 		
-		if swinbeggor > 0:
+		if runnerQW['pav_wins2'] > 0:
 			act 'Athletics':
 				cla
 				$MartinHobby = 'athletics training'

locations/anushaptbr.qsrc

@@ -254,64 +254,9 @@ if $ARGS[0] = 'brotherroom':
 						'He frowns. "Fine then! Get out of my room. Just get out!"'
 						'You back out of the doorway. "Okay... Okay, I''m going."'
 						act 'Leave': gt 'anushapt', 'hallway'
-					end	
-					act 'Deal':
-						*clr & cla
-						minut += 20
-						gs 'exp_gain', 'gaming', rand(1,3)
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksimplay.jpg"></center>'
-						if pcs_gaming <= 40:
-							'The two of you start playing, and it quickly becomes obvious he''s played this game a lot and is very good at it. You try, but you''re unable to keep up with him. You come close a few times, but you''re mostly hopelessly outmatched. After a few matches, he pauses the game and looks at you with a lustful grin. "Haha you lost! Now show me your boobs."'
-							gs 'willpower', 'exhib', 'resist'
-							if will_cost <= pcs_willpwr:	
-								act 'Refuse (<<will_cost>> Willpower)':
-									*clr & cla
-									gs 'willpower', 'pay', 'resist'
-									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
-									'You shake your head. "No, I don''t think so. You''re too young anyways."'
-									'His eyes flash in fury. "You promised!"'
-									'You shrug. "I lied."'
-									'"GET OUT! Get out of my room!" he yells.'
-									'Not wanting anyone to come and find out what''s going on, you quickly get up and leave.'
-									act 'Leave': gt 'anushapt', 'hallway'
-								end
-							else
-								act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end
-							act 'Show him your boobs':
-								*clr & cla
-								gs 'flash', 'tits', 'indoors', 1, 1
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksimshow.jpg"></center>'
-								'"A bet''s a bet," you shrug.'
-								'You stand and pull your top up, his eyes growing wide as he stares at your breasts. Before either of you can say anything, you hear the front door slam. "Maksim... Maksim... Come see... Come see!" Timofey yells as he runs down the hall.'
-								'You pull your top back into place just before he bursts into the room and Maksim gives him a dirty look. "Why do you always have to ruin everything?!"'
-								'Timofey stops, obviously not understanding what''s going on. He looks between the two of you completely confused. "I just wanted to show you something..." You use this as an opportunity to slip out of the room and close the door behind you, leaving the two of them behind to argue.'
-								act 'Leave': gt 'anushapt', 'hallway'
-							end
-						else
-							'You play a game with him. He''s pretty good, but not good enough to beat you. After a while, he grows frustrated. "I''m bored with this game!" he declares, turning it off in the middle of your last game and pulling out a single player one.'
-							'You smile, knowing he only switched games because he couldn''t win. "Well?"'
-							'He glances at you. "Well what?"'
-							'You smile at him. "You said you would tell me a secret about your sister, so what is it?"'
-							if maksimQW['secret1'] = 0 and hotcat >= 6 and npc_rel['A144'] >= 50:
-								maksimQW['secret1'] = 1
-								'He makes a ''V'' shape with his fingers and puts it against his mouth before sticking his tongue between them in the universal sign for eating pussy, mimicking licking for a few seconds. "She <i>likes</i> you."' 
-								'You just shake your head. You should have known he wouldn''t actually tell you anything you didn''t already know.'
-							elseif maksimQW['secret2'] = 0:
-								maksimQW['secret2'] = 1
-								'He looks around for a few seconds. "She keeps a bunch of drugs in her dresser."'
-								'You smile. "How would you know that? Have you been going through her panty drawer?" you ask in a teasing tone.'
-								'He turns bright red. "NO! Shut up and get out of my room!"' 
-								'You sigh and get up, leaving his room before he throws a fit.'
-							else
-								'He sighs and tells you about some nonsense thing she did as a kid that no one would care about, once again learning nothing worth knowing. You don''t know why you keep playing against him. You just shake your head and leave.'
-							end
-							act 'Leave': gt 'anushapt', 'hallway'
-						end
 					end
+					act 'Deal': gt 'anushaptbr', 'race_maksim_result'
+					if pcs_inhib > 30: act 'Deal (Go easy on Maksim)': gt 'anushaptbr', 'race_maksim_result', 1
 				end	
 			end
 		else
@@ -324,6 +269,65 @@ if $ARGS[0] = 'brotherroom':
 	end
 end 
 
+
+if $ARGS[0] = 'race_maksim_result':
+	minut += 20
+	gs 'exp_gain', 'gaming', rand(1 - ARGS[1], 3 - 2 * ARGS[1])
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksimplay.jpg"></center>'
+	if pcs_gaming <= 40 or ARGS[1] > 0:
+		'The two of you start playing, and it quickly becomes obvious he''s played this game a lot and is very good at it. You try, but you''re unable to keep up with him. You come close a few times, but you''re mostly hopelessly outmatched. After a few matches, he pauses the game and looks at you with a lustful grin. "Haha you lost! Now show me your boobs."'
+		gs 'willpower', 'exhib', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
+				'You shake your head. "No, I don''t think so. You''re too young anyways."'
+				'His eyes flash in fury. "You promised!"'
+				'You shrug. "I lied."'
+				'"GET OUT! Get out of my room!" he yells.'
+				'Not wanting anyone to come and find out what''s going on, you quickly get up and leave.'
+				act 'Leave': gt 'anushapt', 'hallway'
+			end
+		else
+			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		act 'Show him your boobs':
+			*clr & cla
+			gs 'flash', 'tits', 'indoors', 1, 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksimshow.jpg"></center>'
+			'"A bet''s a bet," you shrug.'
+			'You stand and pull your top up, his eyes growing wide as he stares at your breasts. Before either of you can say anything, you hear the front door slam. "Maksim... Maksim... Come see... Come see!" Timofey yells as he runs down the hall.'
+			'You pull your top back into place just before he bursts into the room and Maksim gives him a dirty look. "Why do you always have to ruin everything?!"'
+			'Timofey stops, obviously not understanding what''s going on. He looks between the two of you completely confused. "I just wanted to show you something..." You use this as an opportunity to slip out of the room and close the door behind you, leaving the two of them behind to argue.'
+			act 'Leave': gt 'anushapt', 'hallway'
+		end
+	else
+		'You play a game with him. He''s pretty good, but not good enough to beat you. After a while, he grows frustrated. "I''m bored with this game!" he declares, turning it off in the middle of your last game and pulling out a single player one.'
+		'You smile, knowing he only switched games because he couldn''t win. "Well?"'
+		'He glances at you. "Well what?"'
+		'You smile at him. "You said you would tell me a secret about your sister, so what is it?"'
+		if maksimQW['secret1'] = 0 and hotcat >= 6 and npc_rel['A144'] >= 50:
+			maksimQW['secret1'] = 1
+			'He makes a ''V'' shape with his fingers and puts it against his mouth before sticking his tongue between them in the universal sign for eating pussy, mimicking licking for a few seconds. "She <i>likes</i> you."' 
+			'You just shake your head. You should have known he wouldn''t actually tell you anything you didn''t already know.'
+		elseif maksimQW['secret2'] = 0:
+			maksimQW['secret2'] = 1
+			'He looks around for a few seconds. "She keeps a bunch of drugs in her dresser."'
+			'You smile. "How would you know that? Have you been going through her panty drawer?" you ask in a teasing tone.'
+			'He turns bright red. "NO! Shut up and get out of my room!"' 
+			'You sigh and get up, leaving his room before he throws a fit.'
+		else
+			'He sighs and tells you about some nonsense thing she did as a kid that no one would care about, once again learning nothing worth knowing. You don''t know why you keep playing against him. You just shake your head and leave.'
+		end
+		act 'Leave': gt 'anushapt', 'hallway'
+	end
+end
+
+
 if $ARGS[0] = 'rematch':
 	$menu_loc = 'anushaptbr'
 	$menu_arg = 'rematch'

locations/beg.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 	end
 end
 
-if begsec > 0:
+if runnerQW['joined_team'] > 0:
 	act 'Go to your coach':
 		cla
 		'Igor Yurisovich is your coach, a man with a rough voice who never seems to gets tired of motivational one-liners. "The only one who can keep you from winning is you" is his current favorite.'
@@ -31,7 +31,7 @@ if begsec > 0:
 			'"You have to train harder, girl. With a time like this, you would come in dead last. Hell, you wouldn''t even qualify for the main race! If you want to be better, you have to watch your diet, maybe go to the banya after training, but most importantly: Practice, practice, practice!"'
 
 			act 'Leave':gt 'beg', 'start'
-		elseif pcs_run >= 50 and razradbegEG = 0:
+		elseif pcs_run >= 50 and runnerQW['champ_gold'] = 0:
 			'Despite looking occupied with the other trainees, Igor Yurisovich not only watched your practice runs but timed them as well. And while you''re pretty sure he is physically incapable of looking excited or even content, you think that he looks a little less grim than usual as he looks at you.'
 			'"You''re doing fine, girl. Better than fine; you could have a great future in athletics if you play your cards right. If you keep working hard, you might even have it in you to become European champion, perhaps more. But remember, girl, the key to victory is your spirit: If you have the right mindset, you can do anything."'
 			

locations/beg1.qsrc

@@ -5,45 +5,45 @@ if $ARGS[0] = 'start':
 	menu_off = 1
 	gs 'stat'
 	minut += 30
-	kolsorev += 1
-	razdtumbler = 0
-	begmon = month
-	begminus = 0
+	runnerQW['races_ran'] += 1
+	!razdtumbler = 0	& !these do not appear anywhere else
+	!begmon = month		& !these do not appear anywhere else
+	runnerQW['bmi_penalty'] = 0
 
-	if razradbeg = 0:
+	if runnerQW['prof_stage'] = 0:
 		'You''re registered for an amateur''s race. The results will determine if you join the club''s junior squad and entry in the semi-professional runner circuit.'
 
 		act 'Go to the track field.':gt 'beg1', 'br'
-	elseif razradbeg = 1:
+	elseif runnerQW['prof_stage'] = 1:
 		'As a member of your club''s junior squad, you''re registered for a semi-professional''s race. The results will determine if you join the veteran squad.'
 
 		act 'Go to the track field.':gt 'beg1', 'kms'
-	elseif razradbeg = 2:
+	elseif runnerQW['prof_stage'] = 2:
 		'As a member of your club''s veteran squad, you''re registered for a semi-professional''s race. The results will determine your entry in the professional runner circuit.'
 
 		act 'Go to the track field.':gt 'beg1', 'ross'
-	elseif razradbeg >= 3 and razradbeg < 14:
+	elseif runnerQW['prof_stage'] >= 3 and runnerQW['prof_stage'] < 14:
 		'As one of your club''s best athletes, you can take part in a series of qualifying races in the professional circuit. Winning 9 out of 11 would qualify you for the St. Petersburg Track Championship, that is celebrated seasonally.'
 		nl
-		'Qualifying Races Attended: <<razradbeg - 3>>'
-		'Top 3 finishes in Qualifying Races: <<razradbegK>>'
+		'Qualifying Races Attended: <<runnerQW[''prof_stage''] - 3>>'
+		'Top 3 finishes in Qualifying Races: <<runnerQW[''qualifiers'']>>'
 
 		act 'Go to the stadium':gt 'beg1', 'kval'
-	elseif razradbeg = 14 and razradbegK < 9:
+	elseif runnerQW['prof_stage'] = 14 and runnerQW['qualifiers'] < 9:
 		cla
-		razradbegK = 0
-		razradbeg = 3
+		runnerQW['qualifiers'] = 0
+		runnerQW['prof_stage'] = 3
 		'You were unable to qualify for the St. Petersburg Championship.'
 
 		! WD: Argument is 'dressing room'
 		act 'Go back to the dressing room':gt 'fit', 'dressing_room'
-	elseif razradbeg = 14 and razradbegK >= 9:
+	elseif runnerQW['prof_stage'] = 14 and runnerQW['qualifiers'] >= 9:
 		cla
-		razradbegK = 0
-		razradbeg = 3
+		runnerQW['qualifiers'] = 0
+		runnerQW['prof_stage'] = 3
 		'You qualified for the <<year>> St. Petersburg Track Championship, taking place this season in the Petrovsky Stadium.'
 
-		act 'Go to the stadium':gt 'beg1', 'evro'
+		act 'Go to the stadium': gt 'beg1', 'evro'
 	end
 end
 
@@ -51,13 +51,13 @@ if $ARGS[0] = 'br':
 	cla
 	gs 'exercise', 'tier2', 30, 'run'
 
-	begminus = 0
+	runnerQW['bmi_penalty'] = 0
 	if pcs_bmi > 25:
-		begminus = ((pcs_bmi - 25)*4)
+		runnerQW['bmi_penalty'] = ((pcs_bmi - 25)*4)
 	elseif pcs_bmi < 20:
-		begminus = ((20 - pcs_bmi)*(20-pcs_bmi))
+		runnerQW['bmi_penalty'] = ((20 - pcs_bmi)*(20-pcs_bmi))
 	end
-	begresult = pcs_run - begminus
+	runnerQW['result'] = pcs_run - runnerQW['bmi_penalty']
 
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/ready.jpg"></center>'
 	'Your discipline: The Women''s 400 Meter Dash.'
@@ -73,35 +73,35 @@ if $ARGS[0] = 'br':
 	'Go! - You''re away!'
 	wait 725
 
-	if begresult < 5:
+	if runnerQW['result'] < 5:
 		grupvalue[2] -= 3
 		'Sadly, you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made a bit of a fool of yourself.'
-	elseif begresult < 10:
+	elseif runnerQW['result'] < 10:
 		grupvalue[2] -= 2
 		'You performed well for an amateur but still only came in last (8th place).'
-	elseif begresult < 15:
+	elseif runnerQW['result'] < 15:
 		grupvalue[2] -= 1
 		'You fought hard, but managed to only take the penultimate place (7th place).'
-	elseif begresult < 20:
+	elseif runnerQW['result'] < 20:
 		'You fought hard, but only managed to take 6th place.'
-	elseif begresult < 35:
+	elseif runnerQW['result'] < 35:
 		grupvalue[2] += 1
 		'You fought hard, but only managed to take 5th place.'
-	elseif begresult < 40:
+	elseif runnerQW['result'] < 40:
 		grupvalue[2] += 2
 		'You fought hard, but only managed to take 4th place.'
-	elseif begresult < 45:
+	elseif runnerQW['result'] < 45:
 		grupvalue[2] += 3
 		gs 'fame', 'city', 'running', 14
-		bronzebeg += 1 & money += 150 & 'You fought hard and managed to take 3rd place, earning a prize: You receive a bronze badge and a prize of 150 <b>₽</b>'
-	elseif begresult < 50:
+		runnerQW['bronze_medals'] += 1 & money += 150 & 'You fought hard and managed to take 3rd place, earning a prize: You receive a bronze badge and a prize of 150 <b>₽</b>'
+	elseif runnerQW['result'] < 50:
 		grupvalue[2] += 4
 		gs 'fame', 'city', 'running', rand(14,15)
-		silverbeg += 1 & money += 300 & 'You fought hard and managed to take 2nd place, earning a prize: You receive a silver badge and a prize of 300 <b>₽</b>'
+		runnerQW['silver_medals'] += 1 & money += 300 & 'You fought hard and managed to take 2nd place, earning a prize: You receive a silver badge and a prize of 300 <b>₽</b>'
 	else
 		grupvalue[2] += 5
 		gs 'fame', 'city', 'running', rand(14,16)
-		razradbeg = 1 & goldbeg += 1 & money += 600 & 'You fought hard and managed to take 1st place! You receive a gold badge, a prize of 600 <b>₽</b> and are now part of your club''s junior squad, performing at the semi-professional level.'
+		runnerQW['prof_stage'] = 1 & runnerQW['gold_medals'] += 1 & money += 600 & 'You fought hard and managed to take 1st place! You receive a gold badge, a prize of 600 <b>₽</b> and are now part of your club''s junior squad, performing at the semi-professional level.'
 	end
 
 	act 'Leave':gt 'fit', 'dressing_room'
@@ -111,13 +111,13 @@ if $ARGS[0] = 'kms':
 	cla
 	gs 'exercise', 'tier2', 30, 'run'
 
-	begminus = 0
+	runnerQW['bmi_penalty'] = 0
 	if pcs_bmi > 25:
-		begminus = ((pcs_bmi - 25)*4)
+		runnerQW['bmi_penalty'] = ((pcs_bmi - 25)*4)
 	elseif pcs_bmi < 20:
-		begminus = ((20 - pcs_bmi)*(20-pcs_bmi))
+		runnerQW['bmi_penalty'] = ((20 - pcs_bmi)*(20-pcs_bmi))
 	end
-	begresult = pcs_run - begminus
+	runnerQW['result'] = pcs_run - runnerQW['bmi_penalty']
 
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/ready.jpg"></center>'
 	'Your discipline: The Women''s 400 Meter Dash.'
@@ -133,38 +133,38 @@ if $ARGS[0] = 'kms':
 	'Go! - You''re away!'
 	wait 725
 
-	if begresult < 20:
+	if runnerQW['result'] < 20:
 		grupvalue[2] -= 2
-		razradbeg = 0 & 'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself. People on the ranks seem to be asking themselves how you even managed to make it this far. Maybe they are right? Your performance is so atrocious that the coach decides to return you to the amateur rank.'
-	elseif begresult < 25:
+		runnerQW['prof_stage'] = 0 & 'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself. People on the ranks seem to be asking themselves how you even managed to make it this far. Maybe they are right? Your performance is so atrocious that the coach decides to return you to the amateur rank.'
+	elseif runnerQW['result'] < 25:
 		grupvalue[2] -= 1
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You didn''t manage to reach any classification.'
-	elseif begresult < 30:
+	elseif runnerQW['result'] < 30:
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You only came in last (8th place).'
-	elseif begresult < 35:
+	elseif runnerQW['result'] < 35:
 		'You fought hard, but managed to only take the penultimate place (7th place).'
-	elseif begresult < 40:
+	elseif runnerQW['result'] < 40:
 		grupvalue[2] += 1
 		'You fought hard, but only managed to take 6th place.'
-	elseif begresult < 45:
+	elseif runnerQW['result'] < 45:
 		grupvalue[2] += 2
 		'You fought hard, but only managed to take 5th place.'
-	elseif begresult < 50:
+	elseif runnerQW['result'] < 50:
 		grupvalue[2] += 3
 		gs 'fame', 'city', 'running', 14
 		'You fought hard, but only managed to take 4th place.'
-	elseif begresult < 55:
+	elseif runnerQW['result'] < 55:
 		grupvalue[2] += 4
 		gs 'fame', 'city', 'running', rand(14,15)
-		bronzebeg += 1 & money += 300 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 300 <b>₽</b>'
-	elseif begresult < 60:
+		runnerQW['bronze_medals'] += 1 & money += 300 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 300 <b>₽</b>'
+	elseif runnerQW['result'] < 60:
 		grupvalue[2] += 5
 		gs 'fame', 'city', 'running', rand(14,16)
-		silverbeg += 1 & money += 600 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 600 <b>₽</b>'
+		runnerQW['silver_medals'] += 1 & money += 600 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 600 <b>₽</b>'
 	else
 		grupvalue[2] += 6
 		gs 'fame', 'city', 'running', rand(14,17)
-		razradbeg = 3 & goldbeg += 1 & money += 1000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 1,000 <b>₽</b> and are now part of your club''s veteran squad, performing at the semi-professional level.'
+		runnerQW['prof_stage'] = 3 & runnerQW['gold_medals'] += 1 & money += 1000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 1,000 <b>₽</b> and are now part of your club''s veteran squad, performing at the semi-professional level.'
 	end
 	act 'Leave':gt 'fit', 'dressing_room'
 end
@@ -173,13 +173,13 @@ if $ARGS[0] = 'ross':
 	cla
 	gs 'exercise', 'tier2', 30, 'run'
 
-	begminus = 0
+	runnerQW['bmi_penalty'] = 0
 	if pcs_bmi > 25:
-		begminus = ((pcs_bmi - 25)*4)
+		runnerQW['bmi_penalty'] = ((pcs_bmi - 25)*4)
 	elseif pcs_bmi < 20:
-		begminus = ((20 - pcs_bmi)*(20-pcs_bmi))
+		runnerQW['bmi_penalty'] = ((20 - pcs_bmi)*(20-pcs_bmi))
 	end
-	begresult = pcs_run - begminus
+	runnerQW['result'] = pcs_run - runnerQW['bmi_penalty']
 
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/ready.jpg"></center>'
 	'Your discipline: The Women''s 400 Meter Dash.'
@@ -195,38 +195,38 @@ if $ARGS[0] = 'ross':
 	'Go! - You''re away!'
 	wait 725
 
-	if begresult < 30:
-		razradbeg = 1 & 'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself. People on the ranks seem to be asking themselves how you even managed to make it this far. Maybe they are right? Your performance is so atrocious that the coach decides to return you to the junior rank.'
-	elseif begresult < 35:
+	if runnerQW['result'] < 30:
+		runnerQW['prof_stage'] = 1 & 'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself. People on the ranks seem to be asking themselves how you even managed to make it this far. Maybe they are right? Your performance is so atrocious that the coach decides to return you to the junior rank.'
+	elseif runnerQW['result'] < 35:
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You didn''t manage to reach any classification.'
-	elseif begresult < 40:
+	elseif runnerQW['result'] < 40:
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You only came in last (8th place).'
-	elseif begresult < 45:
+	elseif runnerQW['result'] < 45:
 		grupvalue[2] += 1
 		'You fought hard, but managed to only take the penultimate place (7th place).'
-	elseif begresult < 50:
+	elseif runnerQW['result'] < 50:
 		grupvalue[2] += 2
 		'You fought hard, but only managed to take 6th place.'
-	elseif begresult < 55:
+	elseif runnerQW['result'] < 55:
 		grupvalue[2] += 3
 		gs 'fame', 'city', 'running', 14
 		'You fought hard, but only managed to take 5th place.'
-	elseif begresult < 60:
+	elseif runnerQW['result'] < 60:
 		grupvalue[2] += 4
 		gs 'fame', 'city', 'running', rand(14,15)
 		'You fought hard, but only managed to take 4th place.'
-	elseif begresult < 65:
+	elseif runnerQW['result'] < 65:
 		grupvalue[2] += 5
 		gs 'fame', 'city', 'running', rand(14,16)
-		bronzebeg += 1 & money += 600 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 600 <b>₽</b>'
-	elseif begresult < 70:
+		runnerQW['bronze_medals'] += 1 & money += 600 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 600 <b>₽</b>'
+	elseif runnerQW['result'] < 70:
 		grupvalue[2] += 6
 		gs 'fame', 'city', 'running', rand(14,17)
-		silverbeg += 1 & money += 1000 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 1,000 <b>₽</b>'
+		runnerQW['silver_medals'] += 1 & money += 1000 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 1,000 <b>₽</b>'
 	else
 		grupvalue[2] += 7
 		gs 'fame', 'city', 'running', rand(14,18)
-		razradbeg = 3 & goldbeg += 1 & money += 1500 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 1,500 <b>₽</b> and gain entry to the professional circuit.'
+		runnerQW['prof_stage'] = 3 & runnerQW['gold_medals'] += 1 & money += 1500 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 1,500 <b>₽</b> and gain entry to the professional circuit.'
 	end
 	act 'Leave':gt 'fit', 'dressing_room'
 end
@@ -234,16 +234,16 @@ end
 if $ARGS[0] = 'kval':
 	cla
 	gs 'exercise', 'tier2', 30, 'run'
-	razradbeg += 1
+	runnerQW['prof_stage'] += 1
 	minut += 60
 
-	begminus = 0
+	runnerQW['bmi_penalty'] = 0
 	if pcs_bmi > 25:
-		begminus = ((pcs_bmi - 25)*4)
+		runnerQW['bmi_penalty'] = ((pcs_bmi - 25)*4)
 	elseif pcs_bmi < 20:
-		begminus = ((20 - pcs_bmi)*(20-pcs_bmi))
+		runnerQW['bmi_penalty'] = ((20 - pcs_bmi)*(20-pcs_bmi))
 	end
-	begresult = pcs_run - begminus
+	runnerQW['result'] = pcs_run - runnerQW['bmi_penalty']
 
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/ready.jpg"></center>'
 	'Your discipline: The Women''s 400 Meter Dash.'
@@ -260,40 +260,40 @@ if $ARGS[0] = 'kval':
 	'Go! - You''re away!'
 	wait 725
 
-	if begresult < 40:
+	if runnerQW['result'] < 40:
 		grupvalue[2] -= 1
-		razradbeg = 2 & razradbegK = 0 & 'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself. People on the ranks seem to be asking themselves how you even managed to make it this far. Maybe they are right? Your performance is so atrocious that the coach decides to return you to the semi-professional rank.'
-	elseif begresult < 45:
+		runnerQW['prof_stage'] = 2 & runnerQW['qualifiers'] = 0 & 'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself. People on the ranks seem to be asking themselves how you even managed to make it this far. Maybe they are right? Your performance is so atrocious that the coach decides to return you to the semi-professional rank.'
+	elseif runnerQW['result'] < 45:
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You didn''t manage to reach any classification.'
-	elseif begresult < 50:
+	elseif runnerQW['result'] < 50:
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You only came in last (8th place).'
-	elseif begresult < 55:
+	elseif runnerQW['result'] < 55:
 		grupvalue[2] += 2
 		'You fought hard, but managed to only take the penultimate place (7th place).'
-	elseif begresult < 60:
+	elseif runnerQW['result'] < 60:
 		grupvalue[2] += 3
 		gs 'fame', 'city', 'running', 14
 		'You fought hard, but only managed to take 6th place.'
-	elseif begresult < 65:
+	elseif runnerQW['result'] < 65:
 		grupvalue[2] += 4
 		gs 'fame', 'city', 'running', rand(14,15)
 		'You fought hard, but only managed to take 5th place.'
-	elseif begresult < 70:
+	elseif runnerQW['result'] < 70:
 		grupvalue[2] += 5
 		gs 'fame', 'city', 'running', rand(14,16)
 		'You fought hard, but only managed to take 4th place.'
-	elseif begresult < 75:
+	elseif runnerQW['result'] < 75:
 		grupvalue[2] += 6
 		gs 'fame', 'city', 'running', rand(14,17)
-		razradbegK += 1 & bronzebeg += 1 & money += 1000 & 'You fought hard and managed to take 3rd place, earning a prize. You get a bronze badge and a prize of 1,000 <b>₽</b>, but sadly, only the 1st place adds to your qualification for the European championship.'
-	elseif begresult < 80:
+		runnerQW['qualifiers'] += 1 & runnerQW['bronze_medals'] += 1 & money += 1000 & 'You fought hard and managed to take 3rd place, earning a prize. You get a bronze badge and a prize of 1,000 <b>₽</b>, but sadly, only the 1st place adds to your qualification for the European championship.'
+	elseif runnerQW['result'] < 80:
 		grupvalue[2] += 7
 		gs 'fame', 'city', 'running', rand(14,18)
-		razradbegK += 1 & silverbeg += 1 & money += 1500 & 'You fought hard and managed to take 2nd place, earning a prize. You get a silver medal and a prize of 1,500 <b>₽</b>, but sadly, only the 1st place adds to your qualification for the European championship.'
+		runnerQW['qualifiers'] += 1 & runnerQW['silver_medals'] += 1 & money += 1500 & 'You fought hard and managed to take 2nd place, earning a prize. You get a silver medal and a prize of 1,500 <b>₽</b>, but sadly, only the 1st place adds to your qualification for the European championship.'
 	else
 		grupvalue[2] += 8
 		gs 'fame', 'city', 'running', rand(14,19)
-		razradbegK += 1 & goldbeg += 1 & money += 2000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 2,000 <b>₽</b> and are one step closer to qualifying for the St. Petersburg Championship.'
+		runnerQW['qualifiers'] += 1 & runnerQW['gold_medals'] += 1 & money += 2000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 2,000 <b>₽</b> and are one step closer to qualifying for the St. Petersburg Championship.'
 	end
 	act 'Leave':gt 'fit', 'dressing_room'
 end
@@ -303,13 +303,13 @@ if $ARGS[0] = 'evro':
 	gs 'exercise', 'tier2', 30, 'run'
 	minut += 120
 
-	begminus = 0
+	runnerQW['bmi_penalty'] = 0
 	if pcs_bmi > 25:
-		begminus = ((pcs_bmi - 25)*4)
+		runnerQW['bmi_penalty'] = ((pcs_bmi - 25)*4)
 	elseif pcs_bmi < 20:
-		begminus = ((20 - pcs_bmi)*(20-pcs_bmi))
+		runnerQW['bmi_penalty'] = ((20 - pcs_bmi)*(20-pcs_bmi))
 	end
-	begresult = pcs_run - begminus
+	runnerQW['result'] = pcs_run - runnerQW['bmi_penalty']
 
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/ready.jpg"></center>'
 	'Your discipline: The Women''s 400 Meter Dash.'
@@ -326,57 +326,57 @@ if $ARGS[0] = 'evro':
 	'Go! - You''re away!'
 	wait 725
 
-	if begresult < 50:
+	if runnerQW['result'] < 50:
 		grupvalue[2] -= 1
-		razradbeg = 2 & razradbegK = 0 & 'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself. People on the ranks seem to be asking themselves how you even managed to make it this far. Maybe they are right? Your performance is so atrocious that the coach decide to return you to the semi-proffessional rank.'
+		runnerQW['prof_stage'] = 2 & runnerQW['qualifiers'] = 0 & 'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself. People on the ranks seem to be asking themselves how you even managed to make it this far. Maybe they are right? Your performance is so atrocious that the coach decide to return you to the semi-proffessional rank.'
 		gs 'fame', 'city', 'running', rand(14,19)
 		act 'Leave':gt 'fit', 'dressing_room'
-	elseif begresult < 55:
+	elseif runnerQW['result'] < 55:
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You didn''t manage to reach any classification.'
 		gs 'fame', 'city', 'running', rand(15,21)
 		act 'Leave':gt 'fit', 'dressing_room'
-	elseif begresult < 60:
+	elseif runnerQW['result'] < 60:
 		gs 'fame', 'city', 'running', rand(16,23)
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You only came in last (8th place).'
 		act 'Leave':gt 'fit', 'dressing_room'
-	elseif begresult < 65:
+	elseif runnerQW['result'] < 65:
 		grupvalue[2] += 1
 		gs 'fame', 'city', 'running', rand(18,25)
 		'You fought hard, but managed to only take the penultimate place (7th place).'
 		act 'Leave':gt 'fit', 'dressing_room'
-	elseif begresult < 70:
+	elseif runnerQW['result'] < 70:
 		grupvalue[2] += 2
 		gs 'fame', 'city', 'running', rand(20,25)
 		'You fought hard, but only managed to take 6th place.'
 		act 'Leave':gt 'fit', 'dressing_room'
-	elseif begresult < 75:
+	elseif runnerQW['result'] < 75:
 		grupvalue[2] += 3
 		gs 'fame', 'city', 'running', rand(25,50)
 		'You fought hard, but only managed to take 5th place.'
 		act 'Leave':gt 'fit', 'dressing_room'
-	elseif begresult < 80:
+	elseif runnerQW['result'] < 80:
 		grupvalue[2] += 4
 		gs 'fame', 'city', 'running', rand(50,100)
 		'You fought hard, but only managed to take 4th place.'
 		act 'Leave':gt 'fit', 'dressing_room'
-	elseif begresult < 85:
+	elseif runnerQW['result'] < 85:
 		grupvalue[2] += 6
 		gs 'fame', 'city', 'running', 'BronzeMedal'
-		razradbegEB += 1
+		runnerQW['champ_bronze'] += 1
 		money += 10000
 		'You fought hard and managed to take 3rd place, earning a prize. You get a bronze medal and a prize of 10,000 <b>₽</b>'
 		act 'Leave':gt 'fit', 'dressing_room'
-	elseif begresult < 90:
+	elseif runnerQW['result'] < 90:
 		grupvalue[2] += 8
 		gs 'fame', 'city', 'running', 'SilverMedal'
-		razradbegES += 1
+		runnerQW['champ_silver'] += 1
 		money += 15000
 		'You fought hard and managed to take 2nd place, earning a prize. You get a silver medal and a prize of 15,000 <b>₽</b>'
 		act 'Leave':gt 'fit', 'dressing_room'
 	else
 		grupvalue[2] += 10
 		gs 'fame', 'city', 'running', 'GoldMedal'
-		razradbegEG += 1
+		runnerQW['champ_gold'] += 1
 		money += 20000
 		'You fought hard and managed to take 1st place. You get a gold medal, a prize of 20,000 <b>₽</b> and are now the "St. Petersburg Track Champion"!'
 		act 'Continue': gt 'beg1', 'Family extension'

locations/fame_events.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'boy':
 		if $fame['activity'] = 'kickboxing':
 			'"I try to watch all you matches, you are best kickboxer in the city. I am sure you will beat all your opponents!"'
 		elseif $fame['activity'] = 'running':
-			if razradbegEG > 0:
+			if runnerQW['champ_gold'] > 0:
 				'"I try to watch all you races, you are best runner in the city. I am sure you will also win the next championship!"'
 			else
 				'"I try to watch all you races, you are best runner in the city. I am sure you will become the next champion in no time!"'
@@ -169,7 +169,7 @@ if $ARGS[0] = 'girl':
 		if $fame['activity'] = 'kickboxing':
 			'"I try to watch all you matches, you are best kickboxer in the city. I am sure you will beat all your opponents!"'
 		elseif $fame['activity'] = 'running':
-			if razradbegEG > 0:
+			if runnerQW['champ_gold'] > 0:
 				'"I try to watch all you races, you are best runner in the city. I am sure you will also win the next championship!"'
 			else
 				'"I try to watch all you races, you are best runner in the city. I am sure you will become the next champion in no time!"'

locations/fit.qsrc

@@ -174,12 +174,12 @@ if $ARGS[0] = 'dressing_room':
 			end
 		end
 
-		if begsec = 0:
+		if runnerQW['joined_team'] = 0:
 			act 'Join track team':
 				cla
 				*clr
 				minut += 5
-				begsec = 1
+				runnerQW['joined_team'] = 1
 				'You signed up for the track team.'
 
 				act 'Leave':gt 'fit', 'dressing_room'
@@ -187,17 +187,17 @@ if $ARGS[0] = 'dressing_room':
 			end
 		elseif $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and pcs_stam >= stammax / 5 and pcs_energy >= 20:
 			act 'Go to team practice':gt 'beg', 'start'
-			if week = 6 and pcs_run >= 20 and run_comp_day ! daystart:
-				act '<b>Enter competition race</b>':run_comp_day = daystart & gt 'beg1', 'start'
+			if week = 6 and pcs_run >= 20 and runnerQW['comp_day'] ! daystart:
+				act '<b>Enter competition race</b>':runnerQW['comp_day'] = daystart & gt 'beg1', 'start'
 			end
 		elseif $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and pcs_stam >= stammax / 5:
 			act 'Go to team practice': '<br><font color="red">You feel too hungry to do this.</font>'
-			if week = 6 and pcs_run >= 20 and run_comp_day ! daystart:
+			if week = 6 and pcs_run >= 20 and runnerQW['comp_day'] ! daystart:
 				act '<b>Enter competition race</b>': '<br><font color="red">You feel too hungry to do this.</font>'
 			end
 		elseif $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
 			act 'Go to team practice': '<br><font color="red">You are to exhausted to do this. Recover your stamina before trying to train.</font>'
-			if week = 6 and pcs_run >= 20 and run_comp_day ! daystart:
+			if week = 6 and pcs_run >= 20 and runnerQW['comp_day'] ! daystart:
 				act '<b>Enter competition race</b>': '<br><font color="red">You are to exhausted to do this. Recover your stamina before entering the race.</font>'
 			end
 		end

locations/foto_events2.qsrc

@@ -80,10 +80,10 @@ if $ARGS[0] = 'champagne1.2':
 	pcs_lipbalm += 8
 	modelpay = (pcs_mdlng/2 * 10) + min(fame['city_modelling'], 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
-	modelfoto['nude']  += 1
-	modelfoto['fullnude']  += 1
-	modelfoto['nip']  += 1
-	modelfoto['pussy']  += 1
+	modelfoto['nude'] += 1
+	modelfoto['fullnude'] += 1
+	modelfoto['nip'] += 1
+	modelfoto['pussy'] += 1
 	gs 'exp_gain', 'mdlng', rand(9,10)
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 	'You walk over to the makeup department and the dressers get your hair and face ready before going to meet the photographer on set. Just before you leave, they have you slip on a gold thong and then send you on your way.'
@@ -102,12 +102,8 @@ if $ARGS[0] = 'champagne1.2':
 			act'Continue':
 				*clr & cla
 				pcs_sweat += 25
-				if $model['pay_method'] = 'direct_deposit':
-					karta += modelpayfin
-				else
-					money += modelpayfin
-				end
-				modelfoto['earnings']  += modelpayfin
+				money += modelpayfin
+				modelfoto['earnings'] += modelpayfin
 				gs 'fame', 'city', 'modelling', 'medium'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
@@ -125,75 +121,71 @@ end
 !! ----------------------------------------------------------------------------------------------------
 
 if $ARGS[0] = 'kickboxing_documentary':
-    cla & *clr
-    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-    '"A kickboxing documentary?" you ask.'
-    '"Yea. The local sports magazine, is doing a coverage of the Female Kickboxing League. We are doing the graphic part, lots of work doing artistic naked pics, making you women look badass and beautiful. As you are gaining in popularity, they will want a journalist to do an interview. The royalties and the advertising are great. Are you interested?."'
-    '"Hmmm..."'
-    act'Back to the list':gt'foto_events','list'
-    act'Yeah! I''m in!':
-        cla
-        *nl
-        specialjob7 = 0
-        '"Great! The photographers are all ready doing their job in the Havanna Fitness Center. You will meet the journalist there."'
-        act'Do the shoot':
-            cla & *clr
-            '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD1.jpg"></center>'
-            minut += 120
-            modelpayfin = 900 + (modelpay * 2) + (50*rand(0,7)) + ((fame['city_kickboxing'] + pcs_apprnc)/2)*2
-            modelfoto['nude'] += 1
-            gs 'exp_gain', 'mdlng', rand(1,2)
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'"A kickboxing documentary?" you ask.'
+	'"Yea. The local sports magazine, is doing a coverage of the Female Kickboxing League. We are doing the graphic part, lots of work doing artistic naked pics, making you women look badass and beautiful. As you are gaining in popularity, they will want a journalist to do an interview. The royalties and the advertising are great. Are you interested?."'
+	'"Hmmm..."'
+	act'Back to the list':gt'foto_events','list'
+	act'Yeah! I''m in!':
+		cla
+		*nl
+		specialjob7 = 0
+		'"Great! The photographers are all ready doing their job in the Havanna Fitness Center. You will meet the journalist there."'
+		act'Do the shoot':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD1.jpg"></center>'
+			minut += 120
+			modelpayfin = 900 + (modelpay * 2) + (50*rand(0,7)) + ((fame['city_kickboxing'] + pcs_apprnc)/2)*2
+			modelfoto['nude'] += 1
+			gs 'exp_gain', 'mdlng', rand(1,2)
 			gs 'fame', 'city', 'kickboxing', 'medium'
-            gs 'fame', 'city', 'modelling', 'medium'
+			gs 'fame', 'city', 'modelling', 'medium'
 			gs 'arousal', 'flash', 5
 			gs 'arousal', 'end'
-			if $model['pay_method'] = 'direct_deposit':
-				karta += modelpayfin
-			else
-				money += modelpayfin
-			end
-            modelfoto['earnings']  += modelpayfin
-            inhib_exp += 2
-            gs 'stat'
-            'You aren''t the only one doing this documentay. Around you, walking between photographers, there are others kickboxers trying to follow the instructions to be "dynamic". Beyond that, the modeling, is fairlly artistic, showing skin, but hidding the important bits, between props and poses.'
-            *nl
-            'After doing several shots, finally a journalist has time to talk with you.'
-            act'Do the interview.':
-                cla & *clr
-                gs 'stat'
-                '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD2.jpg"></center>'
-                if fame['city_kickboxing'] >=400 and kickbox['sash'] >= 5:
-                    '"You are <<$pcs_lastname>> Isn''t it?"'
-                    'The journalist shakes your hand with a big smile on his face. Interviewing you, must be a great thing, as practically without stopping, you are showered with questions, from the sport-related to the personal, passing for the absolute trivial.'
-                    '"Your feeling about that victory? Your favorite color? A man in your life?"'
-                    'The interview goes and goes like this during a long time, until your allocated time end, and then reluctantly the journalist leaves you to talk to another kickboxer.'            
-                elseif fame['city_kickboxing'] >=200 and kickbox['sash'] >= 2:
-                    'Between shots, a journalist comes and asks you questions. Most of them, are fairly generic. Personal data, your opinions about the league, confirmation on their information. In general, it doesn''t seem too deep but it is evident that the journalist has his hands more than full, catching up with all the women in the gymnasium.'
-                else
-                    'You wait between shots, but the journalist seems to find somebody else more interesting and forgets to talk with you.'
+			money += modelpayfin
+			modelfoto['earnings'] += modelpayfin
+			inhib_exp += 2
+			gs 'stat'
+			'You aren''t the only one doing this documentay. Around you, walking between photographers, there are others kickboxers trying to follow the instructions to be "dynamic". Beyond that, the modeling, is fairlly artistic, showing skin, but hidding the important bits, between props and poses.'
+			*nl
+			'After doing several shots, finally a journalist has time to talk with you.'
+			act'Do the interview.':
+				cla & *clr
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD2.jpg"></center>'
+				if fame['city_kickboxing'] >=400 and kickbox['sash'] >= 5:
+					'"You are <<$pcs_lastname>> Isn''t it?"'
+					'The journalist shakes your hand with a big smile on his face. Interviewing you, must be a great thing, as practically without stopping, you are showered with questions, from the sport-related to the personal, passing for the absolute trivial.'
+					'"Your feeling about that victory? Your favorite color? A man in your life?"'
+					'The interview goes and goes like this during a long time, until your allocated time end, and then reluctantly the journalist leaves you to talk to another kickboxer.'
+				elseif fame['city_kickboxing'] >=200 and kickbox['sash'] >= 2:
+					'Between shots, a journalist comes and asks you questions. Most of them, are fairly generic. Personal data, your opinions about the league, confirmation on their information. In general, it doesn''t seem too deep but it is evident that the journalist has his hands more than full, catching up with all the women in the gymnasium.'
+				else
+					'You wait between shots, but the journalist seems to find somebody else more interesting and forgets to talk with you.'
 				end
-                act' Finally the job is done':                        
-                    cla & *clr   
-                    gs 'stat'
-                    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD3.jpg"></center>'
-                    if fame['city_kickboxing'] >=400 and kickbox['sash'] >= 5:						                               
-                        'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.'
-                        'Sometime later, the article is sent to your phone...' 
-                        'And is a little awkward... The realization, that you are getting famous, as one of the best, if not the BEST, female kickboxer in all St. Petersburg. Practically, the article turns around you. With even fans asking all kinds of personal questions. Damn! You are Hot, Mean and Famous!'                            
-                    elseif fame['city_kickboxing'] >=200 and kickbox['sash'] >= 2:
-                        'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
-                        'Sometime later, the article is sent to your phone...' 
-                        'Being true, is a little dry, mentioning your name, general information and that you are an up-and-coming kickboxer.'
-                    else
-                        'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
-                        'Sometime later, the article is sent to your phone...' 
-                        'And is disappointing! Beyond your photo is only your name, and the mention, that you are a participant in the League.'
-                    end
-					act'Go back to the main floor':gt'foto','studio'    
-                end
-            end                   
-        end
-    end
+				act' Finally the job is done':
+					cla & *clr
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD3.jpg"></center>'
+					if fame['city_kickboxing'] >=400 and kickbox['sash'] >= 5:
+						'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.'
+						'Sometime later, the article is sent to your phone...' 
+						'And is a little awkward... The realization, that you are getting famous, as one of the best, if not the BEST, female kickboxer in all St. Petersburg. Practically, the article turns around you. With even fans asking all kinds of personal questions. Damn! You are Hot, Mean and Famous!'
+					elseif fame['city_kickboxing'] >=200 and kickbox['sash'] >= 2:
+						'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
+						'Sometime later, the article is sent to your phone...' 
+						'Being true, is a little dry, mentioning your name, general information and that you are an up-and-coming kickboxer.'
+					else
+						'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
+						'Sometime later, the article is sent to your phone...' 
+						'And is disappointing! Beyond your photo is only your name, and the mention, that you are a participant in the League.'
+					end
+					act'Go back to the main floor':gt'foto','studio'
+				end
+			end
+		end
+	end
 end
 
 !! ----------------------------------------------------------------------------------------------------
@@ -203,78 +195,74 @@ end
 !! ----------------------------------------------------------------------------------------------------
 
 if $ARGS[0] = 'track_&_field_documentary':
-    cla & *clr
-    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-    '"A Track & Field documentary?" you ask.'
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'"A Track & Field documentary?" you ask.'
 	'"Aja. During the warmer seasons, local sports magazines, they like to do articles about the women on the running business. With the sun and heat, they can take them to the field and do some artistic photos. We are doing the graphic part in a reserved field. Most photos will be naked, and as they want you to do some runs, it will not be possible to hide all of your bodyparts. As you are gaining in popularity, they will want a journalist to do an interview. The royalties and the advertising are great. Are you interested?."'
 	'"Hmmm..."'
 	act'Back to the list':gt'foto_events','list'
 	act'I''d like to do this one':
-        cla
-        *nl
-        specialjob8 = 0
-        '"I''d like to do this one."'
-        '"Great! The photographers are all ready doing their job in the field near the Havanna Fitness Center. You will meet a journalist there."'
-        act'Do the shoot':
-            cla & *clr
-            '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD1.jpg"></center>'
-            minut += 120
-            modelpayfin = 1800 + (modelpay * 2) + (50*rand(0,7)) + ((fame['city_running'] + pcs_apprnc)/2)*2
-            modelfoto['nude']  += 1
-            gs 'exp_gain', 'mdlng', rand(1,2)
+		cla
+		*nl
+		specialjob8 = 0
+		'"I''d like to do this one."'
+		'"Great! The photographers are all ready doing their job in the field near the Havanna Fitness Center. You will meet a journalist there."'
+		act'Do the shoot':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD1.jpg"></center>'
+			minut += 120
+			modelpayfin = 1800 + (modelpay * 2) + (50*rand(0,7)) + ((fame['city_running'] + pcs_apprnc)/2)*2
+			modelfoto['nude'] += 1
+			gs 'exp_gain', 'mdlng', rand(1,2)
 			gs 'fame', 'city', 'running', 'small'
-            gs 'fame', 'city', 'modelling', 'small'
-			if $model['pay_method'] = 'direct_deposit':
-				karta += modelpayfin
-			else
-				money += modelpayfin
-			end
-            modelfoto['earnings'] += modelpayfin
-            modelfoto['topless'] += 1
+			gs 'fame', 'city', 'modelling', 'small'
+			money += modelpayfin
+			modelfoto['earnings'] += modelpayfin
+			modelfoto['topless'] += 1
 			gs 'arousal', 'flash', 5
 			gs 'arousal', 'end'
-            gs 'stat'
-            'You aren''t the only one doing this documentary. Around you, walking between photographers, there are other runners trying to follow the instructions to be "dynamic". Beyond that, the models, try to be fairlly artistic, showing skin, but hiding the important bits, between props and poses, sadlly with all the movement, that is easier said than done, and the security have their hands full, shooing away all the voyeurs trying to catch a peek.'
-            *nl
-            'After doing several shots, finally a journalist has time to talk with you.'
-            act'Do the interview.':
-                cla & *clr   
-                gs 'stat' 
-                '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD2.jpg"></center>'              
-                if fame['city_running'] >=400 and razradbeg >= 3:
-                    '"You are <<$pcs_lastname>> Isn''t it?"'
-                    'The journalist shakes your hand with a big smile on his face. Interviewing you must be a great thing, as practically without stopping, you are showered with questions, from the sport-related to the personal, passing for the absolute trivial.'
-                    '"Your feeling about that victory? Your favorite color? A man in your life?"'
-                    'The interview goes on and on like this for a long time, until you''re allocated time ends, and then reluctantly the journalist leaves you to talk to another runner.'            
-                elseif fame['city_running'] >=200 and razradbeg >= 1:
-                    'Between shots, a journalist comes and asks you questions. Most of them, are fairly generic. Personal data, your opinions about the Championship, confirmation on their information. In general, it doesn''t seem too deep but it is evident that the journalist has his hands more than full, catching up with all the women in the field.'
-                else
-                    'You wait between shots, but the journalist seems to find somebody else more interesting and forgets to talk with you.'
+			gs 'stat'
+			'You aren''t the only one doing this documentary. Around you, walking between photographers, there are other runners trying to follow the instructions to be "dynamic". Beyond that, the models, try to be fairlly artistic, showing skin, but hiding the important bits, between props and poses, sadlly with all the movement, that is easier said than done, and the security have their hands full, shooing away all the voyeurs trying to catch a peek.'
+			*nl
+			'After doing several shots, finally a journalist has time to talk with you.'
+			act'Do the interview.':
+				cla & *clr
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD2.jpg"></center>'
+				if fame['city_running'] >=400 and runnerQW['prof_stage'] >= 3:
+					'"You are <<$pcs_lastname>> Isn''t it?"'
+					'The journalist shakes your hand with a big smile on his face. Interviewing you must be a great thing, as practically without stopping, you are showered with questions, from the sport-related to the personal, passing for the absolute trivial.'
+					'"Your feeling about that victory? Your favorite color? A man in your life?"'
+					'The interview goes on and on like this for a long time, until you''re allocated time ends, and then reluctantly the journalist leaves you to talk to another runner.'
+				elseif fame['city_running'] >=200 and razradbeg >= 1:
+					'Between shots, a journalist comes and asks you questions. Most of them, are fairly generic. Personal data, your opinions about the Championship, confirmation on their information. In general, it doesn''t seem too deep but it is evident that the journalist has his hands more than full, catching up with all the women in the field.'
+				else
+					'You wait between shots, but the journalist seems to find somebody else more interesting and forgets to talk with you.'
 				end
 				
-                act' Finally the job is done':
-                    cla & *clr   
-                    gs 'stat'
-                    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD3.jpg"></center>'                      
-                    if fame['city_running'] >=400 and razradbeg >= 3:					
-                        'Two hours later, the model session/interviews ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.'
-                        'Sometime later, the article is sent to your phone...' 
-                        'And is a little awkward... The realization, that you are getting famous, as one of the best, if not THE best runner in The Women''s 400 Meter Dash category in all of St. Petersburg. Practically, the article turns around you. With even fans asking all kinds of personal questions. Damn! You are Hot, Fast and Famous!'                            
-                    elseif fame['city_running'] >=200 and razradbeg >= 1:
-                        'Two hours later, the model session/interviews ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
-                        'Sometime later, the article is sent to your phone...' 
-                        'Being true, is a little dry, mentioning your name, general information and that you are an up-and-coming runner in The Women''s 400 Meter Dash category.'
-                    else
-                        '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD2.jpg"></center>'
-                        'Two hours later, the model session/interview ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
-                        'Sometime later, the article is sent to your phone...' 
-                        'And is disappointing! Beyond your photo is only your name, and the mention, that you are a new runner in The Women''s 400 Meter Dash category.' 
+				act' Finally the job is done':
+					cla & *clr
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD3.jpg"></center>'
+					if fame['city_running'] >=400 and runnerQW['prof_stage'] >= 3:
+						'Two hours later, the model session/interviews ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.'
+						'Sometime later, the article is sent to your phone...'
+						'And is a little awkward... The realization, that you are getting famous, as one of the best, if not THE best runner in The Women''s 400 Meter Dash category in all of St. Petersburg. Practically, the article turns around you. With even fans asking all kinds of personal questions. Damn! You are Hot, Fast and Famous!'							
+					elseif fame['city_running'] >=200 and runnerQW['prof_stage'] >= 1:
+						'Two hours later, the model session/interviews ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
+						'Sometime later, the article is sent to your phone...'
+						'Being true, is a little dry, mentioning your name, general information and that you are an up-and-coming runner in The Women''s 400 Meter Dash category.'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD2.jpg"></center>'
+						'Two hours later, the model session/interview ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
+						'Sometime later, the article is sent to your phone...'
+						'And is disappointing! Beyond your photo is only your name, and the mention, that you are a new runner in The Women''s 400 Meter Dash category.' 
 					end
-                    act'Go back to the main floor':gt'foto','studio'   
-                end
-            end                   
-        end
-    end
+					act'Go back to the main floor':gt'foto','studio'
+				end
+			end
+		end
+	end
 end
 
 
@@ -283,4 +271,3 @@ end
 
 
 --- foto_events2 ---------------------------------
-

locations/gschool_grounds.qsrc

@@ -379,7 +379,7 @@ if $ARGS[0] = 'sports':
 
 	if hour >= 9 and hour < 18 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0: 'With the school open, you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
 
-	if week = 6 and SchoolSorev = 2 and hour = 10 and SchoolBlock = 0:
+	if week = 6 and runnerQW['pav_racetype'] = 2 and hour = 10 and SchoolBlock = 0:
 		*nl
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
 		if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
@@ -389,7 +389,7 @@ if $ARGS[0] = 'sports':
 		end
 	end
 
-	if week = 6 and SchoolSorev = 1 and hour = 10 and SchoolBlock = 0:
+	if week = 6 and runnerQW['pav_racetype'] = 1 and hour = 10 and SchoolBlock = 0:
 		*nl
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
 
@@ -509,8 +509,8 @@ if $ARGS[0] = 'SchoolRun':
 	act 'Go to the start':
 		*clr & cla
 		minut += 30
-		SchoolSorev = 0
-		kolsorev += 1
+		runnerQW['pav_racetype'] = 0
+		runnerQW['races_ran'] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/begsor.jpg"></center>'
 		'The 400m sprint event for girls is up next. You take off your jacket and go the starting line, mentally preparing yourself for the race.'
@@ -522,19 +522,19 @@ if $ARGS[0] = 'SchoolRun':
 		'Go!'
 		wait 725
 
-		begminus = 0
+		runnerQW['bmi_penalty'] = 0
 		if pcs_bmi > 25:
-			begminus = ((pcs_bmi - 25)*4)
+			runnerQW['bmi_penalty'] = ((pcs_bmi - 25)*4)
 		elseif pcs_bmi < 20:
-			begminus = ((20 - pcs_bmi)*(20-pcs_bmi))
+			runnerQW['bmi_penalty'] = ((20 - pcs_bmi)*(20-pcs_bmi))
 		end
-		begresult = pcs_run - begminus
+		runnerQW['result'] = pcs_run - runnerQW['bmi_penalty']
 
 		act 'Run': gs 'gschool_grounds', 'SchoolRun_result'
 		gs 'willpower', 'skill', 'run_lvl', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Give it your best (<<will_cost>> Willpower)':
-				begresult += 10
+				runnerQW['result'] += 10
 				gs 'willpower', 'pay', 'self'
 				gs 'gschool_grounds', 'SchoolRun_result'
 			end
@@ -546,30 +546,30 @@ end
 
 if $ARGS[0] = 'SchoolRun_result':
 	cla
-	if begresult < 10:
+	if runnerQW['result'] < 10:
 		grupvalue[2] -= 2
 		'You barely manage to reach the finish line at all. There''s no point in checking where you finished, you already know you were last by quite a large margin.'
-	elseif begresult < 15:
+	elseif runnerQW['result'] < 15:
 		grupvalue[2] -= 1
 		'You struggle to keep up with the other girls, and finish in last place.'
-	elseif begresult < 20:
+	elseif runnerQW['result'] < 20:
 		'You run as fast as you can, but only manage to finish second to last.'
-	elseif begresult < 25:
+	elseif runnerQW['result'] < 25:
 		'You run as fast as you can, but only manage to take 6th place.'
-	elseif begresult < 30:
+	elseif runnerQW['result'] < 30:
 		grupvalue[2] += 1
 		'You run as fast as you can, but only manage to take 5th place.'
-	elseif begresult < 35:
+	elseif runnerQW['result'] < 35:
 		grupvalue[2] += 1
 		'You run as fast as you can, but only manage to take 4th place.'
-	elseif begresult < 45:
+	elseif runnerQW['result'] < 45:
 		grupvalue[2] += 2
 		'You run as fast as you can, and manage to take 3rd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you.'
-	elseif begresult < 50:
+	elseif runnerQW['result'] < 50:
 		grupvalue[2] += 3
 		'You run as fast as you can, and manage to take 2nd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on your achievement.'
 	else
-		swinbeg += 1
+		runnerQW['pav_wins1'] += 1
 		grupvalue[2] += 5
 		'You run as fast as you can, and manage to reach the finish line first. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on winning the competition as you walk around with your arms raised in triumph.'
 	end
@@ -577,18 +577,18 @@ if $ARGS[0] = 'SchoolRun_result':
 	gs 'exp_gain', 'run', 1
 	fat -= 2
 
-	if swinbeg = 3 and LocalRun = 0:
-		LocalRun = 1
-		if razradbeg < 1:
+	if runnerQW['pav_wins1'] = 3 and runnerQW['pav_stage'] = 0:
+		runnerQW['pav_stage'] = 1
+		if runnerQW['prof_stage'] < 1:
 			'You have won the school running competition three times now and Mr. Pavlovich, the P.E. teacher at your school, announces that your success has not gone unnoticed. He smiles and awards you the third tier sports trophy in running, which you proudly accept and show to everyone.'
-			razradbeg = 1
+			runnerQW['prof_stage'] = 1
 		else
 			'You have won the school running competition three times now and Mr. Pavlovich, the P.E. teacher at your school, smiles and awards you a local competition trophy which you proudly accept and show to everyone.'
 		end
 	end
 
 	gs 'stat'
-	if begresult > 50:
+	if runnerQW['result'] >= 50:
 		act 'Continue': gt 'gschool_grounds','Family extension'
 	else
 		act 'Return to town': gt 'gschool_grounds', 'main'
@@ -604,28 +604,28 @@ if $ARGS[0] = 'SchoolRun2':
 	'You think you might be able to win, and sign up to participate in the competition. After quickly changing into your running gear you return to the track. The guys are having their race first, and you watch them as you prepare. As expected, Ivan Prokhorov wins. When the guys have finished, it is the girls'' turn.'
 
 	if christinaQW['fight'] = 1 or christinaQW['blackmail'] = 2:
-		if swinbeggor = 0:
+		if runnerQW['pav_wins2'] = 0:
 			'You find Lina at the starting line with a smile on her face. Seeing you she waves and calls out cheerfully "Good luck, <<$pcs_nickname>>!"'
-		elseif swinbeggor = 1:
+		elseif runnerQW['pav_wins2'] = 1:
 			'You find Lina at the starting line with a smile on her face. Seeing you she waves and calls out cheerfully "I am going to get you this time, <<$pcs_nickname>>!"'
-		elseif swinbeggor = 2:
+		elseif runnerQW['pav_wins2'] = 2:
 			'You find Lina at the starting line with a smile on her face. Seeing you she waves and calls out cheerfully "Not going to get me a third time, <<$pcs_nickname>>!"'
 		end
 	else
-		if swinbeggor = 0:
+		if runnerQW['pav_wins2'] = 0:
 			'Getting ready at the starting line is Christina, one of the girls in your class. She just scoffs at you. "You''ll never beat me!"'
-		elseif swinbeggor = 1:
+		elseif runnerQW['pav_wins2'] = 1:
 			'Getting ready at the starting line is Christina, one of the girls in your class. She looks at you angrily and says "You beat me once, but never again!"'
-		elseif swinbeggor = 2:
+		elseif runnerQW['pav_wins2'] = 2:
 			'Getting ready at the starting line is Christina, one of the girls in your class. She looks at you with pure hatred. "You again, bitch? You''re going down this time, I promise you!"'
 		end
 	end
 
 	act 'Go to the start':
 		*clr & cla
-		kolsorev += 1
+		runnerQW['races_ran'] += 1
 		minut += 30
-		SchoolSorev = 0
+		runnerQW['pav_racetype'] = 0
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/begsor.jpg"></center>'
 		'The 400m sprint event for girls is up next. You take off your jacket and go the starting line, mentally preparing yourself for the race.'
@@ -637,19 +637,19 @@ if $ARGS[0] = 'SchoolRun2':
 		'Go!'
 		wait 725
 
-		begminus = 0
+		runnerQW['bmi_penalty'] = 0
 		if pcs_bmi > 25:
-			begminus = ((pcs_bmi - 25)*4)
+			runnerQW['bmi_penalty'] = ((pcs_bmi - 25)*4)
 		elseif pcs_bmi < 18:
-			begminus = ((25 - pcs_bmi)*6)
+			runnerQW['bmi_penalty'] = ((25 - pcs_bmi)*6)
 		end
-		begresult = pcs_run - begminus
+		runnerQW['result'] = pcs_run - runnerQW['bmi_penalty']
 
 		act 'Run': gs 'gschool_grounds', 'SchoolRun2_result'
 		gs 'willpower', 'skill', 'run_lvl', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Give it your best (<<will_cost>> Willpower)':
-				begresult += 10
+				runnerQW['result'] += 10
 				gs 'willpower', 'pay', 'self'
 				gs 'gschool_grounds', 'SchoolRun2_result'
 			end
@@ -661,30 +661,30 @@ end
 
 if $ARGS[0] = 'SchoolRun2_result':
 	cla
-	if begresult < 10:
+	if runnerQW['result'] < 10:
 		grupvalue[2] -= 2
 		'You barely manage to reach the finish line at all. There''s no point in checking where you finished, you already know you were last by quite a large margin.'
-	elseif begresult < 15:
+	elseif runnerQW['result'] < 15:
 		grupvalue[2] -= 1
 		'You struggle to keep up with the other girls, and finish in last place.'
-	elseif begresult < 20:
+	elseif runnerQW['result'] < 20:
 		'You run as fast as you can, but only manage to finish second to last.'
-	elseif begresult < 25:
+	elseif runnerQW['result'] < 25:
 		'You run as fast as you can, but only manage to take 6th place.'
-	elseif begresult < 30:
+	elseif runnerQW['result'] < 30:
 		grupvalue[2] += 1
 		'You run as fast as you can, but only manage to take 5th place.'
-	elseif begresult < 35:
+	elseif runnerQW['result'] < 35:
 		grupvalue[2] += 1
 		'You run as fast as you can, but only manage to take 4th place.'
-	elseif begresult < 40:
+	elseif runnerQW['result'] < 40:
 		grupvalue[2] += 2
 		'You run as fast as you can, and manage to take 3rd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you.'
-	elseif begresult < 50:
+	elseif runnerQW['result'] < 50:
 		grupvalue[2] += 3
 		'You run as fast as you can, and manage to take 2nd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on your achievement.'
 	else
-		swinbeggor += 1
+		runnerQW['pav_wins2'] += 1
 		grupvalue[2] += 5
 		'You run as fast as you can, and manage to reach the finish line first. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on winning the competition yet again while you walk around with your arms raised in triumph.'
 	end
@@ -692,11 +692,11 @@ if $ARGS[0] = 'SchoolRun2_result':
 	gs 'exp_gain', 'run', 1
 	fat -= 2
 
-	if swinbeggor = 3 and LocalRun = 1:
-		LocalRun = 2
-		if razradbeg < 2:
+	if runnerQW['pav_wins2'] = 3 and runnerQW['pav_stage'] = 1:
+		runnerQW['pav_stage'] = 2
+		if runnerQW['prof_stage'] < 2:
 			'You have won the competition three more times and Mr. Pavlovich awards you the second tier sports trophy in running.'
-			razradbeg = 2
+			runnerQW['prof_stage'] = 2
 		else
 			'You have won the competition three more times and Mr. Pavlovich awards you another trophy.'
 		end
@@ -706,7 +706,7 @@ if $ARGS[0] = 'SchoolRun2_result':
 		else
 			'Christina stands nearby glaring at you the whole time, her hands balled into fists. She''s seething with rage, realizing she cannot beat you.'
 		end
-	elseif swinbeggor = 2 and begresult >= 130:
+	elseif runnerQW['pav_wins2'] = 2 and runnerQW['result'] >= 130:
 		if christinaQW['fight'] = 1 or christinaQW['blackmail'] = 2:
 			gs 'npc_relationship', 'modify', 'A19', 'love'
 			'Lina stands at at the finish line, gasping for breath. Even though you beat her a second time, she flashes you a bright smile in congratulations.'
@@ -714,7 +714,7 @@ if $ARGS[0] = 'SchoolRun2_result':
 			gs 'npc_relationship', 'modify', 'A18', 'loathe'
 			'Christina is gasping for breath at the finish line. She was unable to overtake you, and came second again. Christina avoids your gaze, not wanting to look you in the eye.'
 		end
-	elseif swinbeggor = 1 and begresult >= 130:
+	elseif runnerQW['pav_wins2'] = 1 and runnerQW['result'] >= 130:
 		if christinaQW['fight'] = 1 or christinaQW['blackmail'] = 2:
 			gs 'npc_relationship', 'modify', 'A19', 'love'
 			'Lina stands at at the finish line, gasping for breath. Even though you beat her, she flashes you a bright smile in congratulations.'
@@ -725,7 +725,7 @@ if $ARGS[0] = 'SchoolRun2_result':
 	end
 
 	gs 'stat'
-	if begresult > 50:
+	if runnerQW['result'] > 50:
 		act 'Continue': gt 'gschool_grounds','Family extension'
 	else
 		act 'Leave': gt 'gschool_grounds', 'main'

locations/gschool_lessons.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'morning':
 		lernSkill += 1
 		lernHome += 1
 
-		if SchoolSorev = 1: SchoolSorev = 0
+		if runnerQW['pav_racetype'] = 1: runnerQW['pav_racetype'] = 0
 		if hour < 8: gs 'gschool_socialchg', 'test'
 	end
 		

locations/gschool_lessons4.qsrc

@@ -656,11 +656,11 @@ if $ARGS[0] = 'pe':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra.jpg"></center>'
 	'You arrive in the gym and head straight to the girls locker room. Once inside, you quickly change into your athletic clothes before heading back out into the hall. Once everyone is ready, Coach Pavlovich conducts a roll call to ensure everyone is present.'
-	if week = 5 and LocalRun = 0:
-		if SchoolSorev = 0:SchoolSorev = 1
+	if week = 5 and runnerQW['pav_stage'] = 0:
+		if runnerQW['pav_racetype'] = 0: runnerQW['pav_racetype'] = 1
 		'Coach Pavlovich announces that the inter-school running competition will be held this Saturday at 11:00. If you want to participate, you should come to school between 10:00 and 11:00.'
-	elseif week = 5 and LocalRun = 1:
-		if SchoolSorev = 0:SchoolSorev = 2
+	elseif week = 5 and runnerQW['pav_stage'] = 1:
+		if runnerQW['pav_racetype'] = 0: runnerQW['pav_racetype'] = 2
 		'Coach Pavlovich announces that the inter-school running competition will be held this Saturday at 11:00. If you want to participate, you should come to school between 10:00 and 11:00.'
 	end
 	act 'Continue':

locations/natbel_chat.qsrc

@@ -511,7 +511,7 @@ if $ARGS[0] = 'lover_chat':
 	elseif NatbelQW['FriendLover'] = 6:
 		if daystart => NatbelQW['evt_day'] + 14 and money > 4350 and hour < 18 and week < 7: act 'Start shopping trip': gt 'natbel_friend', 'shopping_trip2'
 	
-	elseif NatbelQW['FriendLover'] = 7:
+	elseif NatbelQW['FriendLover'] >= 7:
 		if money >= 25 and (week = 5 or week = 6) and (hour = 20 or hour = 21): act 'Ask Natasha to the disco': gt 'natbel_friend', 'disco_2'
 
 	elseif NatbelQW['FriendLover'] >= 8:
@@ -599,6 +599,300 @@ if $ARGS[0] = 'arrange_shop_trip2':
 end
 
 
+if $ARGS[0] = 'job_question':
+	act 'Natasha asks a question':
+		menu_off = 1
+		*clr & cla
+		minut += 5
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha7.jpg"></center>'
+		'You sit together and both flick through some of Natasha''s fashion magazines as you chat about school and life in general when Natasha turns to you.'
+		'"Erm... <<$pcs_nickname>>..."'
+		'"Yes Natasha what is it? Spit it out..."'
+		'"Well, okay... Umm. Can you tell me what job or jobs you do please?"'
+		'"Umm..."'
+		'Natasha looks a little embarrassed. "Look <<$pcs_nickname>> if you don''t want to I guess that''s fine at least for now. I''m just interested and if you need any help with anything you know I''ll be here for you."'
+		
+		act 'Don''t tell her':
+			*clr & cla
+			'"Umm... Well maybe at some point but not now Natasha unless it really bothers you?"'
+			'"No, <<$pcs_nickname>> I guess that''s fine. I''m just curious as I want to know more about you." She pauses. "I guess it really doesn''t matter."'
+			'"Okay can leave it there for now?" You reply.'
+			'Natasha fidgets and doesn''t reply immediately.'
+			'With a sigh you continue. "Okay fine Natashas I''ll tell you but don''t judge okay?"'
+			
+			act 'Tell her':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha7.jpg"></center>'
+				'"Of course I won''t <<$pcs_nickname>>. I''m just asking because I care about you."'
+				killvar 'temp_pav_work'
+				if maidQW > 0: $temp_pav_work[] = 'a maid in the pavlovsk hotel'
+				if post_wrk > 0: $temp_pav_work[] = 'a post delivery girl in the post office'
+
+				killvar 'temp_city_work'
+				temp_runner = 0
+				if runnerQW['joined_team'] > 0 and (runnerQW['bronze_medals'] + runnerQW['silver_medals'] + runnerQW['gold_medals']) > 0: temp_runner = 1 & $temp_city_work[] = 'an athlete in the Havana Fitness Center'
+				if photography_start > 0: $temp_city_work[] = 'a photographer for the Camera & Photography Store'
+				if masseuse['jobtype'] > 0: $temp_city_work[] = 'a masseuse in the Beauty Bar'
+				if model['status'] > 0: $temp_city_work[] = 'a model for Aphrodite Photography'
+				if firstkasting > 0 and pfilmNo = 0 and pfilmSTOP = 0: $temp_city_work[] = 'a porn star'
+
+				if arrsize('temp_pav_work') > 0:
+					$temp_text = '"Right, well I work in Pav as '
+					if arrsize('temp_pav_work') = 1:
+						$temp_text += $temp_pav_work[0] + '."'
+					elseif arrsize('temp_pav_work') = 2:
+						$temp_text += $temp_pav_work[0] + ' and ' + $temp_pav_work[1] + '."'
+					else
+						temp_i = 0
+						:pav_work_loop
+						$temp_text += $temp_pav_work[temp_i] + ', '
+						temp_i += 1
+						if temp_i < arrsize('temp_pav_work') - 1: jump 'pav_work_loop'
+						$temp_text += 'and ' + $temp_pav_work[temp_i] + '."'
+						killvar 'temp_i'
+					end
+
+					'<<$temp_text>> You pause then giggle. "Happy little Miss nosey?" You say tapping her gently on the nose."'
+					killvar 'temp_text'
+					'"Thank you <<$pcs_nickname>>." Natasha smiles at you. "I was just curious as I thought you might work in St. Petersburg.'
+				end
+				if arrsize('temp_city_work') = 0 and arrsize('temp_pav_work') > 0:
+					'You return her smile. "No only in Pav at the moment and don''t worry, it''s not a problem telling you.'
+				elseif arrsize('temp_city_work') > 0:
+					'"Right. Well I work in St. Petersburg but I won''t tell you just yet. Soon... Okay?" You look quizzically at Natasha.'
+					'"Okay <<$pcs_nickname>> that''s fine and umm..."'
+					'"Haha! Just kidding Natasha, I do work there as well and..."'
+					'Natasha jumps up.'
+				end
+				'"One second <<$pcs_nickname>>, I''l be back in a moment. Just need to go to the kitchen quickly. I left something on the stove..."'
+
+				if temp_runner = 1:
+					gs 'natbel_chat', 'job_questions_runner'
+				else
+					gs 'natbel_chat', 'job_questions_natbel_returns'
+				end
+				killvar 'temp_runner'
+			end
+		end
+	end
+end
+
+
+
+![If Sveta is on the Track team at St. Petersburg.]
+
+if $ARGS[0] = 'job_questions_runner':
+	act 'Tell Natasha to get her sports kit on':
+		menu_off = 1
+		*clr & cla
+		minut += 10
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha6.jpg"></center>'
+		'Natasha leaves the kitchen and rejoins you in her bedroom. You are looking through some of her fashion magazines and look up at her as she sits with you. "Right Natasha, go and put your sports clothes on; we''re going for a jog!"'
+		'Natasha looks at you a bit confused. "Eh?! Why''s that <<$pcs_nickname>>?"'
+		'"Well I fancy going for a jog and you''re coming with me. No arguments!" You pause. Come on, I''ll get my kit and meet you back here in 5 minutes."'
+		'"Erm... But..."'
+		'You give her a stern look. "Natasha come on... No more arguments! I''ll get changed. See you in a few minutes."'
+		'With that you leave to cut short any further possible objections.'
+
+		act 'Natasha isn''t ready!':
+			*clr & cla
+			minut += 5
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha34.jpg"></center>'
+			'When you return Bella answers the door and tells you that Natasha is in her room so you head in there to get her... Only she''s not ready yet!'
+			'When you enter her room you are greeted with the sight of Natasha finishing an ice cream and reading a book butt naked!'
+			'Admiring the view you laugh and say "So Natasha I take it you''re planning on a naked jog?!"'
+			'"Oh! Shit sorry <<$pcs_nickname>> I got a bit sidetracked!"'
+			'"Well yeah! I can see that and just as well we''re going for a jog or you''ll be moaning about keeping your figure." You reply pointing to the ice cream cone in her hand and giggling."'
+			'Natasha blushes and mutters something you can''t properly catch but guess it''s about the ice cream being nice.'
+			'"Come on girlfriend get a shift on or I might have to take you jogging more often!"'
+			'"Okay <<$pcs_nickname>> I won''t be a sec."'
+			'True to her word Natasha quickly gets her gym kit on and you head out.'
+
+			act 'Go for a jog':
+				*clr & cla
+				minut += 30
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha35.jpg"></center>'
+				'You both head down to the park and go for a jog. You have to adjust your pace so as not to leave Natasha behind.'
+				'Despite this Natasha struggles to keep up with you and you have to have a short break.'
+				'"Pant... Pant... Are you trying to kill me <<$pcs_nickname>>?!"'
+				'"Oh really Natasha?! It''s just a gentle jog." You say with a giggle. "Okay, shall we head back?"'
+				'A rather red in the face Natasha just nods at you still trying to catch her breath.'
+
+				act 'Shower':
+					*clr & cla
+					minut += 10
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha36.jpg"></center>'
+					'"Oh <<$pcs_nickname>> I desperately need a shower after that... Erm... Join me?"'
+					'"Absolutely! That was never in doubt!" You respond smiling.'
+					'You both head to the bathroom and undress. Natasha turns the shower on pausing for a passionate kiss before getting in and lathering each other.'
+
+					act 'Escalation':
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha37.jpg"></center>'
+						'Unable to keep your hands off each other the kissing quickly escalates.'
+						'Natasha''s hand is soon between your legs as her fingers begin to work their magic.'
+						'You, in turn, push your leg between Natasha''s as she starts to ride your leg.'
+
+						act 'Grind':
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha38.jpg"></center>'
+							'It''s not long before you lean forward and push your arse back into Natasha''s pussy and start grinding on her.'
+							'Oh! Fuck! <<$pcs_nickname>>! I''m going to..."'
+							'You decide to pull back at the last second...'
+
+							act 'Licking':
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha39.jpg"></center>'
+								'You push Natasha''s head down to your pussy and hold it there'
+								'Your legs start to feel like jelly so you sit on the small ledge.'
+								'Natasha kneels in front of you and spreads your legs and immediately starts playing with your clit and licking you out.'
+								'Although the build and crescendo seems to take an age it could only have been a couple of minutes before you''re ready to cum in her mouth.'
+								'"No... Not... yet..." You pant. "Bedroom... Now!"'
+
+								act 'Bed':
+									*clr & cla
+									minut += 5
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha40.jpg"></center>'
+									'Once on the bed after another long and very passionate kiss you both lie back astride each other''s leg and start rubbing back and forth... back and forth.'
+									'You both gradually speed up as your excitement grows.'
+									'As your movements get faster and you push against each other you both rapidly near the point of no return.'
+									'Every muscle in your body tightens and pulsate. Your pussy is soaking as your vagina pulses uncontrollably.'
+									'Suddenly juices pour from Natasha''s clit as you both reach an orgasm simultaneously and bite your lips so as not to scream.'
+									'As you slowly come down in your afterglow and cuddle up Natasha whispers to you with a cheeky grin. "Umm, that was nice <<$pcs_nickname>>, we''ll have to have a repeat performance at some point."'
+									'You give her a hug as you reply. "Yep, 100% but we''ll need to be careful we don''t end up too wrinkly from all the water."'
+
+									act 'Back to jobs':
+										*clr & cla
+										minut += 5
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha40.jpg"></center>'
+										'After relaxing in each other''s arms for a couple of minutes you both slowly come down from your high.'
+										'You turn to Natasha. "Well Natasha you remember you asked me about my jobs?"'
+										'"Yes... <<$pcs_nickname>>." She looks confused; probably because of your choice of post passion topic.'
+										'"Right... Well I thought I''d show you one of my sources of income."'
+										'Natasha continues to look confused and the expression on her face is an absolute picture. "Sorry <<$pcs_nickname>>; you mean..." She stops, goes bright red and turns to you looking worried and somewhat horrified.'
+										'It takes you a moment to realise what she''s thinking then you respond after a brief giggle, "Oh! I get it, no not that, the running silly! You know that you''ve got a filthy mind girl!"'
+										'Natasha is now even redder as she replies. "Oh! Right! I thought you meant... Shit! Sorry!" She leans over and gives you a warm hug but still looks confused.'
+
+										if runnerQW['champ_gold'] > 0:
+											act 'St. Petersburg reigning 400M champion':
+												*clr & cla
+												minut += 5
+												'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/run_win.jpg"></center>'
+												'You look at Natasha and smile. "I take it you don''t look at the sports pages in the local press then?"'
+												'Natasha just continues looking at you only now in total confusion.'
+												'You continue... "Okay... Hang on I think I''ve got a photo here somewhere." You have a look in your bag. "Yeah here it is; I thought that I hadn''t taken it out of my bag yet."'
+												'You show her a picture of you in your sports gear arms raised in triumph receiving your medal.'
+												'Natasha''s mouth drops open and she looks at you in shock muttering something you can''t make out but sounds suspiciously like: "Holy shit!"'
+												'"Well that probably explains why you were out of breath when I went for a light jog! You still don''t realise do you?"'
+												'Natasha simply shakes her head looking at you still somewhat bewildered.'
+												'"Right... Well Natasha you can tell your <<$npc_nickname[''A29'']>> that you just went for a jog with the St. Petersburg 400 meter track champion!"'
+											
+												act 'Agree trip to St. Petersburg':
+													*clr & cla
+													minut += 5
+													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha33.jpg"></center>'
+													'"Natasha... Hey Natasha..." You click your fingers in front of her face.'
+													'"Sorry! Wow! Fuck! Sorry Umm... Sorry I didn''t know! You must think I''m a really shitty girlfriend not to have known that! I''m really sorry <<$pcs_nickname>>!"'
+													'"Hey! Don''t stress it''s not a problem." You pause and click your fingers at her again as she spaces out. "Hey! I race there on a Saturdays so we''ll go together sometime soon... Okay?"'
+													'Natasha slowly regains her composure. "Oh yes <<$pcs_nickname>>! I''d love that! Thank you so much." She pauses then gives you a big hug then jumps up.'
+													'"One second <<$pcs_nickname>>, I''ll be back in a moment. Just need to go to the kitchen quickly. I left something on the stove and it should be cooked by now..."'
+													'Natasha returns still holding a wooden spoon and sits next to you so you continue.'
+													gs 'natbel_chat', 'job_questions_natbel_returns'
+												end
+											end
+
+										else
+											act 'On the track team for the 400 meter races': 
+												*clr & cla
+												minut += 5
+												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha33.jpg"></center>'
+												'"Well Natasha, I race for the St. Petersburg Track team in the 400 meter event and the races are on Saturdays."'
+												'Slowly recovering her poise Natasha smiles and replies. "Well I guess that''ll explain it then... Even if I didn''t have a fondness for ice creams I guess I''d have still been out of breath!... Umm... Maybe I can come along and watch one time?" She asks.'
+												'"Yes of course Natasha, that''s why I told you about it. We''ll arrange a trip very soon."'
+												'Your reply obviously doesn''t register immediately.'
+												'"Natasha... Hey Natasha..." You click your fingers in front of her face. "Hey! I said yes! I race there on a Saturday so we''ll go together sometime soon... Okay?"'
+												'"Sorry! Wow! Oh yes <<$pcs_nickname>> I''d love that! Thank you so much."'
+												'Natasha leans over and kisses you then cuddles up with you for a moment then she jumps up.'
+												'"One second <<$pcs_nickname>>, I''ll be back in a moment. Just need to go to the kitchen quickly. I left something on the stove and it should be cooked by now..."'
+												'Natasha returns still holding a wooden spoon and sits next to you so you continue.'
+											
+												act 'Agree trip to St. Petersburgh':
+													*clr & cla
+													minut += 5
+													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha33.jpg"></center>'
+													'"Anyway... As I was saying, I''ve been thinking about what we can do next. So if we arrange a trip to St. Petersburg Saturday we can have a look in some of the shops and maybe see if there''s anything we like. So how about I pick you up outside between 12:00 and 2:00PM? Whilst we''re there I''ll tell you where I work and I''ll get you a ticket so you can watch the race."'
+													'Natasha''s smile widens. "Oh yes <<$pcs_nickname>>! That''ll be lovely. Umm... However, you need to give me a couple of weeks as I want to arrange a small surprise for you as a thank you for all your help."'
+													'"There''s really no need for anything special Natasha. I was just thinking about a day out and having a browse."'
+													'"Yes I know <<$pcs_nickname>> but I want to. I''ll need a couple of weeks if that''s okay?"'
+												
+													act 'Slap':
+														*clr & cla
+														minut += 5
+														'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha41.jpg"></center>'
+														'"Of course Natasha, no problem, a couple of weeks it is." You pause then continue. "Just make sure it doesn..."'
+														'Natasha interrupts. "Yes <<$npc_nickname[''A29'']>>!" She says grinning and rolling her eyes.'
+														'"You cheeky mere! If you keep that up you''re asking for a butt slap!" You respond laughing.'
+														'Natasha laughs and stands up then slowly lifts her dress higher and higher exposing her butt and green panties.'
+														'Slap!'
+														'"Ouch!"'
+														'"Well I did warn you not to be so cheeky! Nice hot butt by the way." You say slowly massaging her arse.'
+														'Natasha pushes her butt against your hand "Umm... You like?"'
+														'"Yeah." You slowly massage her butt before deciding that it''s gone far enough... for now.'
+
+														killvar 'temp_city_work'
+														killvar 'temp_pav_work'
+														act 'Keep talking': gt 'natbel_chat', 'chat'
+														act 'Stop talking': gt 'natbelapt', 'natroom'
+													end
+												end
+											end
+										end
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+
+if $ARGS[0] = 'job_questions_natbel_returns':
+	act 'Natasha returns':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha33.jpg"></center>'
+		'Natasha returns still holding a wooden spoon as you continue.'
+
+		if arrsize('temp_pav_work') > 0:
+			'"Anyway... I''ve been thinking about what we can do next. How about we arrange a trip to St. Petersburg one Saturday and have a look in some of the shops? Maybe see if there''s anything we like? How about I pick you up outside between 12:00 and 2:00PM?"'
+		elseif arrsize('temp_city_work') > 0:
+			'"Okay... I''ve been thinking about what we can do next. How about we arrange a trip to St. Petersburg one Saturday and have a look in some of the shops? Maybe see if there''s anything we like. Whilst we''re there I''ll tell you where I work. So how about I pick you up outside between 12:00 and 2:00PM? "'
+		end
+
+		'Natasha''s smile widens. "Oh yes <<$pcs_nickname>>! That''ll be lovely. Umm... However, you need to give me a couple of weeks as I want to arrange a small surprise for you as a thank you for all your help."'
+		'"There''s really no need for anything special Natasha. I was just thinking about a day out and having a browse."'
+		'"Yes I know <<$pcs_nickname>> but I want to. I''ll need a couple of weeks if that''s okay?"'
+		act 'Cheeky mere':
+			*clr & cla
+			'"Of course Natasha, no problem, a couple of weeks it is." You pause then continue. "Just make sure it doesn..."'
+			'Natasha interrupts. "Yes <<$npc_nickname[''A29'']>>!" She says grinning and rolling her eyes.'
+			'"You cheeky mere! If you keep up with that you''re asking for a butt slap!" You respond laughing.'
+			'Natasha laughs and stands up then slowly lifts her dress and taps her butt with the spoon.'
+			'Slap!'
+			'"Ouch!"'
+			'"Well I did warn you not to be so cheeky! Nice hot butt cheeks by the way." You say slowly massaging her arse.'
+			'Natasha pushes her butt against your hand "Umm... You like?"'
+			'You slowly remove her skirt and massage her butt further before deciding that it''s gone far enough... for now.'
+
+			killvar 'temp_city_work'
+			killvar 'temp_pav_work'
+			act 'Keep talking': gt 'natbel_chat', 'chat'
+			act 'Stop talking': gt 'natbelapt', 'natroom'
+		end
+	end
+end
+
+
+
 
 	!! ---- FRIEND chat ---- !!
 

locations/natbel_friend.qsrc

@@ -395,6 +395,9 @@ if $ARGS[0] = 'love_jct':
 	end
 end
 
+
+
+
 if $ARGS[0] = 'disco_1':
 
 	*clr & cla

locations/obj_din.qsrc

@@ -705,21 +705,21 @@ if $ARGS[0] = 'stats':
 		*nl
 	end
 
-    if kolsorev > 0: 'You have run in <<kolsorev>> races'
-	if swinbeg >= 1: 'You have <<swinbeg/3>> trophies from local racing competitions'
-	if bronzebeg > 0: '<<bronzebeg>> - bronze medals for running'
-	if silverbeg > 0: '<<silverbeg>> - silver medals for running'
-	if goldbeg > 0: '<<goldbeg>> - gold medals for running'
-	if razradbegEB > 0: '<<razradbegEB>> times bronze medalist at the St. Petersburg Track Championship'
-	if razradbegES > 0: '<<razradbegES>> times silver medalist at the St. Petersburg Track Championship'
-	if razradbegEG > 0: '<<razradbegEG>> times St. Petersburg Track Champion.'
-	if razradbeg > 0:
-		if razradbeg = 1: 'You''re registered for a semi-professional''s race, in the junior squad'
-		if razradbeg = 2: 'You''re registered for a semi-professional''s race, in the veteran squad'
-		if razradbeg >= 3 and razradbeg < 14: 'You can run in the qualifiing races for the championship on the professional circuit.'
-		if razradbeg = 14 and razradbegK < 9: 'You failed to quaify for the championship.'
-		if razradbeg = 5: 'You are one of the best track athletes in Russia and thus qualified for the Russian National Championship.'
-		if razradbeg = 14 and razradbegK >= 9: 'You qualified for the <<year>> St. Petersburg Track Championship, taking place this season in the Petrovsky Stadium.'
+	if runnerQW['races_ran'] > 0: 'You have run in <<runnerQW[''races_ran'']>> races'
+	if runnerQW['pav_wins1'] >= 1: 'You have <<runnerQW[''pav_wins1'']/3>> trophies from local racing competitions'
+	if runnerQW['bronze_medals'] > 0: '<<runnerQW[''bronze_medals'']>> - bronze medals for running'
+	if runnerQW['silver_medals'] > 0: '<<runnerQW[''silver_medals'']>> - silver medals for running'
+	if runnerQW['gold_medals'] > 0: '<<runnerQW[''gold_medals'']>> - gold medals for running'
+	if runnerQW['champ_bronze'] > 0: '<<runnerQW[''champ_bronze'']>> times bronze medalist at the St. Petersburg Track Championship'
+	if runnerQW['champ_silver'] > 0: '<<runnerQW[''champ_silver'']>> times silver medalist at the St. Petersburg Track Championship'
+	if runnerQW['champ_gold'] > 0: '<<runnerQW[''champ_gold'']>> times St. Petersburg Track Champion.'
+	if runnerQW['prof_stage'] > 0:
+		if runnerQW['prof_stage'] = 1: 'You''re registered for a semi-professional''s race, in the junior squad'
+		if runnerQW['prof_stage'] = 2: 'You''re registered for a semi-professional''s race, in the veteran squad'
+		if runnerQW['prof_stage'] >= 3 and runnerQW['prof_stage'] < 14: 'You can run in the qualifiing races for the championship on the professional circuit.'
+		if runnerQW['prof_stage'] = 14 and runnerQW['qualifiers'] < 9: 'You failed to quaify for the championship.'
+		if runnerQW['prof_stage'] = 5: 'You are one of the best track athletes in Russia and thus qualified for the Russian National Championship.'
+		if runnerQW['prof_stage'] = 14 and runnerQW['qualifiers'] >= 9: 'You qualified for the <<year>> St. Petersburg Track Championship, taking place this season in the Petrovsky Stadium.'
 		*nl
 	end
 

locations/pav_parkev.qsrc

@@ -1334,7 +1334,7 @@ if $ARGS[0] = 'male_gopnik_beer':
 					if grupTipe = 4:
 						'With that, everyone drinks the last of the beers, and you notice the area around you is littered with empty beer bottles. Once the final beer is gone, the talking starts to wind down, and people drift off either alone or in small groups. You get up and head out as well.'
 						act 'Leave':gt 'pav_park', 'deeper_park'
-					elseif grupTipe = 4 and fame['pav_slut'] >= 200 and hotcat >= 5:
+					elseif fame['pav_slut'] >= 200 and hotcat >= 5:
 						'With that, everyone drinks the last of the beers, and you notice the area around you is littered with empty beer bottles. Once the final beer is gone, the talking starts to wind down, and people drift off either alone or in small groups. You get up and head out as well.'
 						'"You''re pretty drunk, <<$pcs_nickname>>. Let me take you home." you hear Dan say as he takes you by the arm.'
 						gs 'willpower', 'misc', 'resist', 'medium'

locations/post_deliveries.qsrc

@@ -1037,23 +1037,23 @@ if $ARGS[0] = 'bandits':
 				'You quickly snatch your bag and try to run away from them.'
 				
 				!!running check
-				begminus = 0
-				if pcs_mass['body'] > 30: begminus = ((pcs_mass['body'] - 25)/5)
-				begresult = pcs_run - begminus
+				runnerQW['bmi_penalty'] = 0
+				if pcs_mass['body'] > 30: runnerQW['bmi_penalty'] = ((pcs_mass['body'] - 25)/5)
+				runnerQW['result'] = pcs_run - runnerQW['bmi_penalty']
 				randrun = rand(1,6)
-				if begresult >= 23 and randrun >= 3:
+				if runnerQW['result'] >= 23 and randrun >= 3:
 					'"Hey, come back here!" the guy yells, but you running away clearly caught them by surprise.'
 					'You''re a good enough runner to outrun them, despite the bag you''re carrying.'
 					'Once you''re sure you''ve lost them, you stop to catch your breath. They probably gave up on chasing you.'
 					'You smile to yourself. "Nice try, idiots..."'
 					act 'Continue your round': gt 'post_deliveries', 'resume'
-				elseif begresult >= 23 and randrun = 1:
+				elseif runnerQW['result'] >= 23 and randrun = 1:
 					'You manage to break free from them and start running, but the strap of your bag gets caught on a fence when you try to run away.'
 					'The guys are upon you moments later, grabbing onto you tightly to make sure you can''t escape again.'
 					'"Nice try, bitch! You almost got away... almost, but not quite!" one of them pants, gasping for breath.'
 					'They drag you away from the street, entering an alleyway between two buildings. They have a firm grip on you, and the two of them look way too tough to fight. Looks like you have no choice...'
 					act 'Continue': gt 'post_deliveries', 'bandsex'
-				elseif begresult >= 23 and randrun = 2:
+				elseif runnerQW['result'] >= 23 and randrun = 2:
 					'You manage to break free from them and start running, but you almost immediately trip over a loose rock you failed to notice.'
 					'The guys are upon you moments later, and one of them places his knee between your shoulder blades as you scramble to try and get back on your feet.'
 					'"Nice try, bitch! Looks like you''re ours, though!" one of them grins, somewhat amused at how clumsily you tripped over.'

locations/pre_sleep_events.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			$sleep_events_priority[] = 'gs ''pre_sleep_events'', ''nichServentSleepEvents_handler'', 1 '
 		end
 
-		gs 'sleep_reflections', 'event_check'
+		if daystart > sleepVars['sleep_reflection_day']: gs 'sleep_reflections', 'event_check'
 
 		gt 'pre_sleep_events', 'mod_sleepevents'
 	end

locations/saveupdater.qsrc

@@ -2591,8 +2591,8 @@ if temp_current_save_version < 00090201:
 	killvar 'rej_sz'
 end
 
-!!------------------------------------!!Version 0.9.2.2!!-----------------------------------------------!!
 
+!!------------------------------------!!Version 0.9.2.2!!-----------------------------------------------!!
 
 if temp_current_save_version < 00090202:
 	!!updating of BDSM club variables to use array and be generally better
@@ -2623,6 +2623,7 @@ end
 
 
 !!------------------------------------!!Version 0.9.3.0!!-----------------------------------------------!!
+
 if temp_current_save_version < 00090300:
 	!!updates the exp to the new scale so you don''t go down in stat
 	gs 'stat_sklattrib'
@@ -2743,12 +2744,28 @@ if temp_current_save_version < 00090300:
 	end
 	killvar 'npc_pref_traits'
 
-end
+	! Professional runner variable migration
+	if begsec		> 0:	runnerQW['joined_team']		= begsec		& killvar 'begsec'
+	if run_comp_day	> 0:	runnerQW['comp_day']		= run_comp_day	& killvar 'run_comp_day'
+	if kolsorev		> 0:	runnerQW['races_ran']		= kolsorev		& killvar 'kolsorev'
+	if razradbeg	> 0:	runnerQW['prof_stage']		= razradbeg		& killvar 'razradbeg'
+	if bronzebeg	> 0:	runnerQW['bronze_medals']	= bronzebeg 	& killvar 'bronzebeg'
+	if silverbeg	> 0:	runnerQW['silver_medals']	= silverbeg 	& killvar 'silverbeg'
+	if goldbeg		> 0:	runnerQW['gold_medals']		= goldbeg		& killvar 'goldbeg'
+	if razradbegK	> 0:	runnerQW['qualifiers']		= razradbegK	& killvar 'razradbegK'
+	if razradbegEB	> 0:	runnerQW['champ_bronze']	= razradbegEB	& killvar 'razradbegEB'
+	if razradbegES	> 0:	runnerQW['champ_silver']	= razradbegES	& killvar 'razradbegES'
+	if razradbegEG	> 0:	runnerQW['champ_gold']		= razradbegEG	& killvar 'razradbegEG'
+
+	if SchoolSorev	> 0:	runnerQW['pav_racetype']	= SchoolSorev	& killvar 'SchoolSorev'
+	if LocalRun		> 0:	runnerQW['pav_stage']		= LocalRun		& killvar 'LocalRun'
+	if swinbeg		> 0:	runnerQW['pav_wins1']		= swinbeg		& killvar 'swinbeg'
+	if swinbeggor	> 0:	runnerQW['pav_wins2']		= swinbeggor	& killvar 'swinbeggor'
 
+end
 
 
 killvar 'temp_current_save_version'
 gs 'saveg'
 
 --- saveupdater ---------------------------------
-

locations/sister.qsrc

@@ -458,7 +458,7 @@ if $ARGS[0] = 'scene1':
 				'You turn down the invitation. "I''d love to, but I can''t get behind at school. I have homework to do and books to read. You know what it''s like."'
 				act 'Finish': gt 'sister', 'pav_commcenter'
 			end
-			if razradbeg > 0:
+			if runnerQW['prof_stage'] > 0:
 				act 'No (training)':
 					sisterQW['party'] = -1
 					*clr & cla

locations/sister_chat.qsrc

@@ -991,7 +991,7 @@ if $ARGS[0] = 'party_invite':
 		'She smiles at you. "My nerdy little sister. Well have fun studying!"'
 		act 'Continue': gt 'sister_chat', 'talking'
 	end
-	if razradbeg > 0:
+	if runnerQW['prof_stage'] > 0:
 !!Not exactly sure if this is the correct variable to check if Sveta runs track
 		act 'No (training)':
 			sisterQW['party'] = -1

locations/sleep_reflections.qsrc

@@ -2,15 +2,22 @@
 
 if $ARGS[0] = 'event_check':
 	if test_var = 1: $sleep_events_priority[] = 'gs ''sleep_reflections'', ''test_reflection'' '
-
+!!check I did the code correct for these two
+	if daystart >= anushkaQW['sleep_reflection_day'] + 7:
+		if anushkaQW['sveta_love'] = 10: $sleep_events_priority[] = 'gs ''sleep_reflections'', ''anushka_love'' '
+	end
+	if daystart >= artemQW['sleep_reflection_day'] + 7:
+		if artemQW['bf'] >= 1: $sleep_events_priority[] = 'gs ''sleep_reflections'', ''artem_love'' '
+	end
 end
 
 if $ARGS[0] = 'end':
+	sleepVars['sleep_reflection_day'] = daystart
 	gs 'pre_sleep_events', 'event_end'
 end
 
 if $ARGS[0] = 'test_reflection':
-	if ARGS[1] = 0: gt 'sleep_reflections', 'test_reflection', 1
+	if ARGS[1] = 0: gt 'sleep_reflections', $ARGS[0], 1
 
 	'This is a test reflection!'
 	'Sveta is thinking deeply about "TEST_PERSON"'
@@ -34,5 +41,55 @@ if $ARGS[0] = 'test_reflection':
 
 end
 
+!!check I did the code correctly for these two and at the top
+if $ARGS[0] = 'anushka_love':
+	if ARGS[1] = 0: gt 'sleep_reflections', $ARGS[0], 1
+	anushkaQW['sleep_reflection_day'] = daystart
+
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/set1/pose4.jpg"></center>'
+	'As you drift off to sleep you start thinking about all the time you have been spending with Anushka and how you feel around her. She is one of your best friends but something tugs at you that it might be something more. Perhaps you are falling in love with her?'
+	act 'Yes you love her':
+		*clr & cla
+		anushkaQW['sveta_love'] += 1
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
+		'The more you think about your time with Anushka the more you think about how her hair smells, the sound of her soft laugh, or how cute she looks when she has that trouble making smirk on her lips, how soft her skin feels under your touch... You suddenly realize that you have fallen in love with her, but what does this mean for the future? You know she has made it pretty clear she is not interested in being romantically involved with anyone, but maybe you can change her mind? Finally you drift off to sleep wonder what your future with Anushka will hold.'
+		act 'Go to sleep': gs 'sleep_reflections', 'end'
+	end
+	act 'You are just friends':
+		*clr & cla
+		anushkaQW['sveta_love'] = -20
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
+		'The more you think about your time with Anushka, the more you realize you are not in love with her. You love spending time with her, but she is just one of your best friends, that''s all.'
+		act 'Go to sleep': gs 'sleep_reflections', 'end'
+	end
+	act 'ignore': gs 'sleep_reflections', 'end'
+end
+
+if $ARGS[0] = 'artem_love':
+	if ARGS[1] = 0: gt 'sleep_reflections', $ARGS[0], 1
+	artemQW['sleep_reflection_day'] = daystart
+
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
+	'As you drift off to sleep you start thinking about all the time you have been spending with Artem and how you agreed to be his girl friend. You have no doubts he is in love with you, but you are not sure how you feel about him. You like him, you care about him, but do you love him?'
+	act 'Yes you love him':
+		*clr & cla
+		artemQW['love'] = 1
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
+		'The more you think about your time with Artem the more you realize you have fallen in love with him. You finally drift off to sleep imagining your life with Artem.'
+		act 'Go to sleep': gs 'sleep_reflections', 'end'
+	end
+	act 'No you don''t love him':
+		*clr & cla
+		artemQW['love'] = -1
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
+		'The more you think about your time with Artem, the more you realize you are not in love with him. You love spending time with him and he is a great guy, but you just don''t love him. You finally drift off to sleep wonder what the future will hold for you and Artem.'
+		act 'Go to sleep': gs 'sleep_reflections', 'end'
+	end
+	act 'ignore': gs 'sleep_reflections', 'end'
+end
 
 --- sleep_reflections ---------------------------------

locations/transport_functions.qsrc

@@ -252,7 +252,7 @@ if $ARGS[0] = 'display_train_schedule':
 				$train_schedule += '<td colspan=5></td>'
 			end
 			$train_schedule += '<td style="border-right:2px solid black; border-left:2px solid black"> </td>'
-			$train_schedule += '<td><<$th[4]>>:22</td><td><<$th[4]>>:37</td><td><<$th[4]>>:47</td><td><<$th[4]>>:57</td><td><<$th[5]>>:02</td></tr>'
+			$train_schedule += '<td><<$th[4]>>:37</td><td><<$th[4]>>:52</td><td><<$th[5]>>:02</td><td><<$th[5]>>:12</td><td><<$th[5]>>:17</td></tr>'
 
 			if th[0] >= 4 or th[3] <= 21:
 				$train_schedule += '<tr>'

locations/wakeup_events.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			$sleep_events[] = 'gs ''wakeup_events'', ''vomiting_check'' '
 		end
 
-		if MarishaQW['marisha_sleepover'] = 1: $sleep_events[] = 'gs ''wakeup_events'', ''marisha_ev_morning'' '
+		if MarishaQW['marisha_sleepover'] = 1: $sleep_events_priority[] = 'gs ''wakeup_events'', ''marisha_ev_morning'' '
 		if $start_type[1] = 'tg' and daystart < 10:
 			$sleep_events_priority[] = 'gs ''wakeup_events'', ''trans_early_shocked'' '
 		elseif $start_type[1] = 'tg' and daystart < 30: