Merge branch 'master' into dev

locations/Gadhouse.qsrc

@@ -440,7 +440,7 @@ if $ARGS[0]='grandpa':
 
 		act 'Leave him alone':gt 'Gadhouse', 'Start'
 		
-		if grandpahelpday ! daystart:act 'Offer to help':grandpahelpday = daystart & gt'grandpahelp'
+		if grandpahelpday ! daystart:act 'Offer to help':grandpahelpday = daystart & gt'grandpahelp', 'start'
 		if grandpatalkforest = 0:
 			act 'Ask about the forest (0:10)':
 				*clr & cla

locations/Military.qsrc

@@ -3,8 +3,8 @@
 if $ARGS[0] = 'start':
 	CLOSE ALL
 	$metka = $ARGS[0]
-	$loc = $CURLOC
-	$sexloc = $CURLOC
+	$loc = 'Military'
+	$sexloc = 'Military'
 	$menu_loc = 'Military'
 	$menu_arg = 'start'
 	menu_off = 0

locations/NatBelVhod.qsrc

@@ -13,13 +13,13 @@ if hour > 20 : $byetext='It is to late to go to visit.' & GoInside = 0
 
 if hour < 8 : $byetext='It is to early to go to visit.' & GoInside = 0
 
+act 'Leave':gt'pod_ezd','etaj_4'
 if GoInside ! 0:
 	'You knock on the door. Natasha answers and invites you in.'
 	act 'Go into the apartment':gt'NatBelHome'
 else
 	'<<$byetext>>'
 end
-act 'Leave':gt'pod_ezd','etaj_4'
 
 --- NatBelVhod ---------------------------------
 

locations/billiard.qsrc

@@ -1,5 +1,5 @@
 # billiard
-$sexloc = $CURLOC
+$sexloc = 'billiard'
 $menu_loc = 'billiard'
 $menu_arg = ''
 menu_off = 0

locations/bordel.qsrc

@@ -21,9 +21,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 end
 
 if $ARGS[0] = 'brothel':
-	$sexloc = $CURLOC
+	$sexloc = 'bordel'
 	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc = 'bordel'
     $location_type = 'private'
 	$menu_loc = 'bordel'
 	$menu_arg = 'brothel'

locations/bouling.qsrc

@@ -1,7 +1,7 @@
 # bouling
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
-	$sexloc = $CURLOC
+	$sexloc = 'bouling'
 	*clr & cla
 	$loc = 'bouling'
 	$metka = 'start'

locations/club.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'start':
 	$menu_arg = 'start'
 	menu_off = 0
 	$location_type = 'public_outdoors'
-	$sexloc = $curloc
+	$sexloc = 'club'
 	*clr & cla
 	minut += 5
 	gs 'stat'

locations/etoexhib.qsrc

@@ -1633,7 +1633,7 @@ if $ARGS[0] = 'pos53':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/roof.jpg"></center>'
 	'The roof of your apartment building.'
 
-	act 'Go down to the fifth floor':
+	act 'Go down to the attic':
 		if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 			msg '<center><font color = red>You need to get dressed first</font></center>'
 			gt 'etoexhib','pos53'

locations/grandpahelp.qsrc

@@ -1,129 +1,132 @@
 # grandpahelp
 
-menu_off = 1
-gs'stat'
-
+*clr & cla
 '<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 'You walk up to your grandfather and ask if he needs any help. Grandpa thinks for a moment and says:'
+menu_off = 1
+gs'stat'
 
-if month <= 4 or month >= 10:
-	grandpahelping = rand(0,5)
-elseif month = 5:
-	grandpahelping = rand(3,8)
-elseif month = 6 or month = 9:
-	grandpahelping = rand(3,12)
-else
-	grandpahelping = rand(3,13)
-end
-
-if grandpahelping = 0:
-	'"<<$pcs_nickname>>, could you bring firewood for the stove?"'
+if $ARGS[0] = 'start':
 
-	act 'Fetch firewood (0:15)':
-		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood_winter.jpg"></center>'
-		end
-		'You put on some warm clothes and run over to the barn to collect some firewood. '
-		'"I''ve brought some firewood grandfather," you said to your grandfather.'
-		'"You are very quick <<$pcs_nickname>>." he replies with a smile. "That''s today''s youth for ya. There is no more work today."'
-		minut += 15
-		grandmahelp += 1
-		gs'stat'
-
-		act 'Go':gt'Gadhouse'
+	if month <= 4 or month >= 10:
+		grandpahelping = rand(0,5)
+	elseif month = 5:
+		grandpahelping = rand(3,8)
+	elseif month = 6 or month = 9:
+		grandpahelping = rand(3,12)
+	else
+		grandpahelping = rand(3,13)
 	end
-elseif grandpahelping = 1:
-	'"<<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
 
-	act 'Go to the barn (0:15)':
-		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
+	if grandpahelping = 0:
+		'"<<$pcs_nickname>>, could you bring firewood for the stove?"'
+
+		act 'Fetch firewood (0:15)':
+			*clr & cla
+			if month >= 4 and month <= 10:
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood_winter.jpg"></center>'
+			end
+			'You put on some warm clothes and run over to the barn to collect some firewood. '
+			'"I''ve brought some firewood grandfather," you said to your grandfather.'
+			'"You are very quick <<$pcs_nickname>>." he replies with a smile. "That''s today''s youth for ya. There is no more work today."'
+			minut += 15
+			grandmahelp += 1
+			gs'stat'
+
+			act 'Go':gt'Gadhouse'
 		end
-		'You went to the barn and fed the horse.'
-		feed_horse = 1
-		minut += 15
-		gs'stat'
-
-		act 'Continue':gt'Gadsarai'
-	end
-elseif grandpahelping = 2:
-	'"<<$pcs_nickname>>, go to the barn to feed the cows."'
-
-	act 'Go to the barn (0:15)':
-		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
+	elseif grandpahelping = 1:
+		'"<<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
+
+		act 'Go to the barn (0:15)':
+			*clr & cla
+			if month >= 4 and month <= 10:
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
+			end
+			'You went to the barn and fed the horse.'
+			feed_horse = 1
+			minut += 15
+			gs'stat'
+
+			act 'Continue':gt'Gadsarai'
 		end
-		'You went to the shed and fed the cows.'
-		minut += 15
-		feed_cow = 1
-		gs'stat'
-
-		act 'Continue':gt'Gadsarai'
-	end
-elseif grandpahelping = 3:
-	gt 'grandpahelp', 'cleanyard'
-elseif grandpahelping = 4:
-	gt 'grandpahelp', 'groomhorse'
-elseif grandpahelping = 5:
-	gt 'grandpahelp', 'feedhogs'
-elseif grandpahelping = 6 and hour >= 6 and hour < 9:
-	gt 'grandpahelp', 'grazehorse'
-elseif grandpahelping = 7 and hour >= 6 and hour < 9:
-	gt 'grandpahelp', 'leadcows'
-elseif grandpahelping = 8 and hour >= 6 and hour < 9:
-	gt 'grandpahelp', 'grazecows'
-elseif grandpahelping = 9 and temper >= 15 and sunWeather = 1 and week > 5:
-	gt 'grandpahelp', 'washhorse'
-elseif grandpahelping >= 10 and grandpahelping < 13 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
-	gt 'grandpahelp', 'pickforest'
-elseif grandpahelping = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
-	'"<<$pcs_nickname>>, we need to help out with hay gathering today. We have to go to the field and help out."'
-	'"Okay, grandfather," you replied. You grab a rake, and start walking towards the field.'
-
-	act 'Go to the field (0:40)':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_gadfield.jpg"></center>'
-		'With the rake in your hand you met up with the other local residents at the field. All the present at the field got assigned to a task. You work hard gathering the hay.'
-		haying_time = 1
-		minut += 40
-		gs'stat'
-
-		act 'Continue':gt'gadfield','field'
-	end
-else
-	if hour >= 9:
-		randmsg = rand(0,5)
-		if randmsg = 0:
-			'"You can rest today <<$pcs_nickname>>, you don''t need to help me today."'
-		elseif randmsg = 1:
-			'"You can rest today child, there is nothing to do."'
-		elseif randmsg = 2:
-			'"You can rest today <<$pcs_nickname>>, there is nothing to do."'
-		elseif randmsg = 3:
-			'"There''s no work today <<$pcs_nickname>>, go and rest up."'
-		elseif randmsg = 4:
-			'"You can rest today my dear granddaughter."'
-		else
-			'"You can take the day off to rest up."'
+	elseif grandpahelping = 2:
+		'"<<$pcs_nickname>>, go to the barn to feed the cows."'
+
+		act 'Go to the barn (0:15)':
+			*clr & cla
+			if month >= 4 and month <= 10:
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
+			end
+			'You went to the shed and fed the cows.'
+			minut += 15
+			feed_cow = 1
+			gs'stat'
+
+			act 'Continue':gt'Gadsarai'
+		end
+	elseif grandpahelping = 3:
+		gt 'grandpahelp', 'cleanyard'
+	elseif grandpahelping = 4:
+		gt 'grandpahelp', 'groomhorse'
+	elseif grandpahelping = 5:
+		gt 'grandpahelp', 'feedhogs'
+	elseif grandpahelping = 6 and hour >= 6 and hour < 9:
+		gt 'grandpahelp', 'grazehorse'
+	elseif grandpahelping = 7 and hour >= 6 and hour < 9:
+		gt 'grandpahelp', 'leadcows'
+	elseif grandpahelping = 8 and hour >= 6 and hour < 9:
+		gt 'grandpahelp', 'grazecows'
+	elseif grandpahelping = 9 and temper >= 15 and sunWeather = 1 and week > 5:
+		gt 'grandpahelp', 'washhorse'
+	elseif grandpahelping >= 10 and grandpahelping < 13 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
+		gt 'grandpahelp', 'pickforest'
+	elseif grandpahelping = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
+		'"<<$pcs_nickname>>, we need to help out with hay gathering today. We have to go to the field and help out."'
+		'"Okay, grandfather," you replied. You grab a rake, and start walking towards the field.'
+
+		act 'Go to the field (0:40)':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_gadfield.jpg"></center>'
+			'With the rake in your hand you met up with the other local residents at the field. All the present at the field got assigned to a task. You work hard gathering the hay.'
+			haying_time = 1
+			minut += 40
+			gs'stat'
+
+			act 'Continue':gt'gadfield','field'
 		end
 	else
-		randmsg = rand(0,1)
-		if randmsg = 0:
-			'"You don''t need to help out today <<$pcs_nickname>>."'
+		if hour >= 9:
+			randmsg = rand(0,5)
+			if randmsg = 0:
+				'"You can rest today <<$pcs_nickname>>, you don''t need to help me today."'
+			elseif randmsg = 1:
+				'"You can rest today child, there is nothing to do."'
+			elseif randmsg = 2:
+				'"You can rest today <<$pcs_nickname>>, there is nothing to do."'
+			elseif randmsg = 3:
+				'"There''s no work today <<$pcs_nickname>>, go and rest up."'
+			elseif randmsg = 4:
+				'"You can rest today my dear granddaughter."'
+			else
+				'"You can take the day off to rest up."'
+			end
 		else
-			'"You can take the day off."'
+			randmsg = rand(0,1)
+			if randmsg = 0:
+				'"You don''t need to help out today <<$pcs_nickname>>."'
+			else
+				'"You can take the day off."'
+			end
 		end
+		act 'Leave':gt'Gadhouse'
 	end
-	act 'Leave':gt'Gadhouse'
 end
 
 if $ARGS[0] = 'cleanyard':

locations/gschool_chats.qsrc

@@ -21,9 +21,7 @@ if $ARGS[0] = 'nerds':
 			*nl
 			'You go to one of the classrooms that the nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects, while the outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today.'
 		end
-		*nl
-		gs 'gschool_groups', 'nerds'
-		gs 'gschool_groups', 'outcasts'
+		'Sitting around the table is <a href="exec:gt ''gschool_chats2'',''artem''">Artem</a>, <a href="exec:gt ''gschool_chats2'',''feofan''">Feofan</a>, <a href="exec:gt ''gschool_chats2'',''gerasim''">Gerasim</a>, <a href="exec:gt ''gschool_chats2'',''evgeny''">Evgeny</a>, <a href="exec:gt ''gschool_chats2'',''petka''">Petka</a>, <a href="exec:gt ''gschool_chats2'',''zinaida''">Zinaida</a>, <a href="exec:gt ''gschool_chats2'',''natasha''">Natasha</a>, and <a href="exec:gt ''gschool_chats2'',''julia''">Julia</a>. The outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today. <a href="exec:gt ''gschool_chats2'',''petia''">Petia</a> is roaming around, like is is about to approach someone. Meanwhile <a href="exec:gt ''gschool_chats2'',''lesco''">Lesco</a> sits at a desk and reads a book.'+iif(soniaPS = 0, '', ' <a href="exec:gt ''gschool_chats2'',''sonia''">Sonia</a> is sitting at a desk typing on her phone.')+iif (fedormasha = 0, '', ' <a href="exec:gt ''gschool_chats2'',''fedor''">Fedor</a> is sitting at a window sill looking outside, looking lonely and depressed.')+iif (zverSlutQW < 2, '', ' While <a href="exec:gt ''gschool_chats2'',''christina''">Christina</a> is sitting at a desk looking forlorn.')+'.'
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	end
 end
@@ -40,8 +38,7 @@ if $ARGS[0] = 'gopniks':
 		*nl
 		'You go to the stairwell that the gopnik''s like to gather in. You find them leaning against the wall, sitting on the steps, or even just sitting on the landing of the stairs, engaged in a variety of conversations.'
 	end
-	*nl
-	gs 'gschool_groups', 'gopniks'
+	'Hanging around is <a href="exec:gt ''gschool_chats3'',''vitek''">Vitek</a>, <a href="exec:gt ''gschool_chats3'',''dan''">Dan</a>, <a href="exec:gt ''gschool_chats3'',''vasily''">Vasily</a>, <a href="exec:gt ''gschool_chats3'',''radomir''">Radomir</a>, <a href="exec:gt ''gschool_chats3'',''roman''">Roman</a>, <a href="exec:gt ''gschool_chats3'',''niko''">Niko</a>, <a href="exec:gt ''gschool_chats3'',''valentin''">Valentin</a>, <a href="exec:gt ''gschool_chats3'',''arkadi''">Arkadi</a>, <a href="exec:gt ''gschool_chats3'',''lavrenti''">Lavrenti</a>, <a href="exec:gt ''gschool_chats3'',''pauline''">Pauline</a>, <a href="exec:gt ''gschool_chats3'',''lena''">Lena</a>, <a href="exec:gt ''gschool_chats3'',''lera''">Lera</a>, <a href="exec:gt ''gschool_chats3'',''anushka''">Anushka</a>, <a href="exec:gt ''gschool_chats3'',''alyona''">Alyona</a>, and <a href="exec:gt ''gschool_chats3'',''ekaterina''">Ekaterina</a>.'
 	act 'Leave': gt 'gschool_lessons', 'short_break'
 end
 
@@ -50,11 +47,7 @@ if $ARGS[0] = 'cooljocks':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/cooljocks.jpg"></center>'
-	*nl
-	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building, but some are still hanging around the lockers.'
-	*nl
-	gs 'gschool_groups', 'popular'
-	gs 'gschool_groups', 'jocks'
+	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building. Around the lockers is <a href="exec:gt ''gschool_chats1'',''dimka''">Dimka</a>, <a href="exec:gt ''gschool_chats1'',''igor''">Igor</a>, <a href="exec:gt ''gschool_chats1'',''marcus''">Marcus</a>, <a href="exec:gt ''gschool_chats1'',''andrey''">Andrey</a>, <a href="exec:gt ''gschool_chats1'',''mefodiy''">Mefodiy</a>, <a href="exec:gt ''gschool_chats1'',''albina''">Albina</a>, <a href="exec:gt ''gschool_chats1'',''viktoriya''">Viktoriya</a>, <a href="exec:gt ''gschool_chats1'',''katja''">Katja</a>, <a href="exec:gt ''gschool_chats1'',''stasya''">Stasya</a>, <a href="exec:gt ''gschool_chats1'',''irina''">Irina</a>, <a href="exec:gt ''gschool_chats1'',''lizaveta''">Lizaveta</a>, <a href="exec:gt ''gschool_chats1'',''lazar''">Lazar</a>, <a href="exec:gt ''gschool_chats1'',''ivan''">Ivan</a>, <a href="exec:gt ''gschool_chats1'',''svyatoslav''">Svyatoslav</a>, <a href="exec:gt ''gschool_chats1'',''vanya''">Vanya</a>, <a href="exec:gt ''gschool_chats1'',''erast''">Erast</a>, <a href="exec:gt ''gschool_chats1'',''bella''">Bella</a>, <a href="exec:gt ''gschool_chats1'',''veronika''">Veronika</a>, <a href="exec:gt ''gschool_chats1'',''lariska''">Lariska</a>, <a href="exec:gt ''gschool_chats1'',''lina''">Lina</a>'+iif(soniaPS = 0, ', <a href="exec:gt ''gschool_chats1'',''sonia''">Sonia</a>', '')+iif (fedormasha = 0, ', <a href="exec:gt ''gschool_chats1'',''fedor''">Fedor</a>', '')+iif (zverSlutQW < 2, ' and <a href="exec:gt ''gschool_chats1'',''christina''">Christina</a>', '')+'.'
 	act 'Leave': gt 'gschool_lessons', 'short_break'
 end
 

locations/gschool_lessons.qsrc

@@ -239,6 +239,7 @@ if $ARGS[0] = 'skip':
 end
 
 if $ARGS[0] = 'schedule':
+	killvar '$breaktype'
 	gs 'stat'
 	if school_period = 0:
 		school_period = 1

locations/gschool_lessons2.qsrc

@@ -1261,7 +1261,7 @@ if $ARGS[0] = 'postphys':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/sex/school/chcoachbj.jpg"></center>'
 				'You crack the door open slightly and peek in. You''re flabbergasted by what you see: Christina is on her knees in front of Mr. Pavlovich, and is sucking him off like her life depended on it.'
-				gs 'arousal', 'voyeur', 5, 'unkown'
+				gs 'arousal', 'voyeur', 5
 				gs 'stat'
 				gs 'willpower', 'misc'
 				if will_cost <= pcs_willpwr:
@@ -1529,13 +1529,14 @@ if $ARGS[0] = 'dress':
 				act 'Return': gt 'gschool_lessons2', 'post_dress'
 			end
 		end
-	exit
+		exit
 	elseif rand(0,10) = 3:
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic<<rand(1,3)>>.jpg"></center>'
 		'While you are still naked, you hear a couple of girls giggling. You turn to look at them, but they are not looking at you. Confused, you follow their collective gaze and see Christina standing there with her phone out. Glancing back at them, you see them looking at you and giggling again - obviously, something happened that you missed; something that they thought was funny. You wonder what it was.'
 		'You can choose another outfit while you''re here.'
+		act 'Continue': gt 'gschool_lessons2', 'post_dress'
 	else
 		*clr & cla
 		gs 'stat'

locations/gschool_lessonsev3.qsrc

@@ -109,7 +109,7 @@ if $ARGS[0] = 'literature':
 				gs 'willpower', 'exhib'
 				if will_cost <= pcs_willpwr:
 					act 'Push his hand away (<<will_cost>> Willpower)':
-						cla & *nl
+						*clr & cla
 						npc_rel['A157'] -= 2
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/events/rejection.jpg"></center>'
 						'Knowing how aggressive the gopnik can be, you gently push his hand away and hope that doesn''t provoke him. From the corner of your eye, you catch Roman glaring at you, his eyes narrowed and jaw clenched in anger. You start to prepare yourself for what he''s going to say, but to your surprise he goes back to drawing in his notebook. For the rest of the class, Roman keeps his hands to himself.'

locations/gschool_lunch.qsrc

@@ -146,13 +146,20 @@ if $ARGS[0] = 'break':
 			gt 'gschool_lunch', 'events'
 		end
 		
-		if lunch_event ! daystart: lunch_event = daystart & gt 'gschool_lunch', 'events'
-		if soniaPS = 2: soniaPS = 3 & 'During break, while you''re wandering through the school hallways killing time, you notice Sonia Ivanko and Vitek Kotov talking about something. Sonia looks like she''s about to cry, but eventually she gives a quiet nod as Vitek whispers something in her ear.'
+		if school_period = 6:
+			if lunch_event ! daystart: lunch_event = daystart & gt 'gschool_lunch', 'events'
+			if soniaPS = 2: soniaPS = 3 & 'During break, while you''re wandering through the school hallways killing time, you notice Sonia Ivanko and Vitek Kotov talking about something. Sonia looks like she''s about to cry, but eventually she gives a quiet nod as Vitek whispers something in her ear.'
 
-	
-		act 'Use water cooler': $breaktype = 'long' & gt 'gschool_break', 'watercooler'
-		act 'Go to the girls restroom': $breaktype = 'long' & gt 'gschool_break', 'girls_restroom_events'
-		act 'Go to the boys restroom': $breaktype = 'long' & gt 'gschool_break', 'boys_restroom_events'
+			act 'Use water cooler': $breaktype = 'long' & gt 'gschool_break', 'watercooler'
+			act 'Go to the girls restroom': $breaktype = 'long' & gt 'gschool_break', 'girls_restroom_events'
+			act 'Go to the boys restroom': $breaktype = 'long' & gt 'gschool_break', 'boys_restroom_events'
+		else
+			if soniaPS = 2: soniaPS = 3 & 'During break, while you''re wandering through the school hallways killing time, you notice Sonia Ivanko and Vitek Kotov talking about something. Sonia looks like she''s about to cry, but eventually she gives a quiet nod as Vitek whispers something in her ear.'
+
+			act 'Use water cooler': $breaktype = 'short' & gt 'gschool_break', 'watercooler'
+			act 'Go to the girls restroom': $breaktype = 'short' &  & gt 'gschool_break', 'restroom'
+			act 'Go to the boys restroom': $breaktype = 'short' &  & gt 'gschool_break', 'restroom'
+		end
 	end
 
 	act 'Relax in a classroom': gt 'gschool_chats', 'nerds'
@@ -423,7 +430,7 @@ if $ARGS[0] = 'events':
 		cla
 		gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 0, 0, 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sex/lunchsleep.jpg"></center>'
-		'While in the cafeteria you notice <<rand_girl>> is laying down on her back on one of the benches. Her eyes are closed, her chest raises up slowly as she breathes. You think she has fallen asleep, despite all the noise around her. She must really be tired.'
+		'While in the cafeteria you notice <<$rand_girl>> is laying down on her back on one of the benches. Her eyes are closed, her chest raises up slowly as she breathes. You think she has fallen asleep, despite all the noise around her. She must really be tired.'
 		act 'Continue your break': gt 'gschool_lunch', 'break'
 	elseif rand(1,100) < 3:
 		cla

locations/katspalnya.qsrc

@@ -1,5 +1,5 @@
 # katspalnya
-$sexloc = $CURLOC
+$sexloc = 'katspalnya'
 
 if $ARGS[0] = 'start':
 	$metka = 'start'
@@ -23,9 +23,7 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'katslip':
-	cla
-	clr
-	*clr
+	*clr & cla
 	minut += 30
 
 	if katjob = 0 and npc_rel['A219'] > 60:gt 'katspalnya', 'katjobs'
@@ -39,9 +37,7 @@ if $ARGS[0] = 'katslip':
 end
 
 if $ARGS[0] = 'kat':
-	cla
-	clr
-	*clr
+	*clr & cla
 	minut += 30
 
 	if katjob = 0 and npc_rel['A219'] > 60:gt 'katspalnya', 'katjobs'
@@ -54,9 +50,7 @@ if $ARGS[0] = 'kat':
 	if npc_rel['A219'] > 50:act 'Seduce her':gt 'lezbsex', 'start'
 
 	act 'Chat with Kat':
-		cla
-		clr
-		*clr
+		*clr & cla
 
 		if telkat = 0:telkat = 1
 
@@ -70,9 +64,7 @@ if $ARGS[0] = 'kat':
 end
 
 if $ARGS[0] = 'katjobs':
-	cla
-	clr
-	*clr
+	*clr & cla
 	katjob = 1
 	minut += 30
 	'<center><img <<$set_imgh>> src="images/characters/city/katja/kat.jpg"></center>'

locations/metro.qsrc

@@ -174,6 +174,7 @@ end
 if $ARGS[0] = 'shop':
 	*clr & cla
 	menu_off = 1
+	gs 'stat'
 	'<b>What''s it gonna be?</b>'
 	'He shows you a small box filled with red and blue pills. There is about two dozen of each pill inside.'
 	act 'Leave':gt 'metro','start'

locations/narkopriton.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'start':
 		act 'Leave the drug den': minut += 5 & gt 'street'
 		act 'Ask for heroin': gt 'narkopriton', 'heroin'
 		act 'Ask for amphetamine': gt 'narkopriton', 'amphetamine'
-		act 'Ask for weed': gt 'narkopriton', 'joint'
+		act 'Ask for weed': gt 'narkopriton', 'joints'
 		if StoryLine = 1 and snarkozak = 0:
 			act 'Ask for a drop-off point in Pavlovsk':
 				minut +=5
@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 		act 'Leave the drug den': minut += 5 & gt 'street'
 		act 'Ask for heroin': gt 'narkopriton', 'heroin'
 		act 'Ask for amphetamine': gt 'narkopriton', 'amphetamine'
-		act 'Ask for weed': gt 'narkopriton', 'joint'
+		act 'Ask for weed': gt 'narkopriton', 'joints'
 	elseif (StrongNarkota > 23 and ampHigh > 23) or ampHigh > 23 or StrongNarkota > 23:
 		gt 'narkopriton', 'kiteHigh'
 	end
@@ -88,7 +88,7 @@ if $ARGS[0] = 'amphetamine':
 		end
 	end
 	act 'Buy some heroin instead': gt 'narkopriton', 'heroin'
-	act 'Buy some joints instead': gt 'narkopriton', 'joint'
+	act 'Buy some joints instead': gt 'narkopriton', 'joints'
 end
 
 if $ARGS[0] = 'joints':
@@ -105,7 +105,7 @@ if $ARGS[0] = 'joints':
 			drugUser = 1
 			joint += 20
 			minut += 5
-			gt 'narkopriton', 'joint'
+			gt 'narkopriton', 'joints'
 		end
 	end
 	if money >= 500:
@@ -114,7 +114,7 @@ if $ARGS[0] = 'joints':
 			drugUser = 1
 			joint += 10
 			minut += 5
-			gt 'narkopriton', 'joint'
+			gt 'narkopriton', 'joints'
 		end
 	end
 	if money >= 250:
@@ -123,7 +123,7 @@ if $ARGS[0] = 'joints':
 			drugUser = 1
 			joint += 5
 			minut += 5
-			gt 'narkopriton', 'joint'
+			gt 'narkopriton', 'joints'
 		end
 	end
 	if money >= 50:
@@ -132,7 +132,7 @@ if $ARGS[0] = 'joints':
 			drugUser = 1
 			joint += 1
 			minut += 5
-			gt 'narkopriton', 'joint'
+			gt 'narkopriton', 'joints'
 		end
 	end
 	act 'Buy some heroin instead': gt 'narkopriton', 'heroin'
@@ -195,7 +195,7 @@ if $ARGS[0] = 'heroin':
 		act 'Beg him to give you some':	gs 'narkopriton', 'drugslut'
 	end
 	act 'Buy some amphetamine instead':	gt 'narkopriton', 'amphetamine'
-	act 'Buy some joints instead': gt 'narkopriton', 'joint'
+	act 'Buy some joints instead': gt 'narkopriton', 'joints'
 end
 
 if $ARGS[0] = 'drugslut':

locations/natbelEv.qsrc

@@ -237,9 +237,13 @@ if $ARGS[0] = 'showerspy':
 					'Natasha quickly gets up and rinses off her entire body and you hand her a towel as she steps out of the shower.'
 					'"Don''t take too long. I''ll be in your room." You tell her and leave the bathroom.'
 					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'end'
+					gs 'stat'
 					act 'Leave': gt 'natbelapt','natroom'
 				end
 			else
+				gs 'arousal', 'end'
+				gs 'stat'
 				'When Natasha is done she quickly rinses off the remaining shaving cream and you hand her a towel as she steps out of the shower.'
 				'"I''ll let you finish up in here. I''ll be in your room." You tell her and leave the bathroom.'
 				act 'Leave': gt 'natbelapt','natroom'

locations/natbelapt.qsrc

@@ -1736,6 +1736,7 @@ if $ARGS[0] = 'natmother':
 	if rand(0,4) = 0 and hour > 21 and NatashaMotherHome = 1:
 		'As you walk through the hallway, you hear a buzzing noise coming from <<$NatashaMotherNickname>>''s room'
 		'Unable to resist your curiosity you push the door open a tiny bit so that you can peek inside.'
+		act 'Don''t peek':gt 'natbelapt','hallway'
 		act 'Look through the crack in the door':
 			*clr & cla
 			menu_off = 1
@@ -1777,6 +1778,24 @@ if $ARGS[0] = 'natmother':
 		if month < 4 or month > 9:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natmomsleep3.jpg"></center>'
 			'You look into the bedroom and see <<$NatashaMotherNickname>> sound asleep under the covers. Not wanting to disturb her you close the door and leave.'
+		else
+			imgrand = rand(1,2)
+			if imgrand = 1:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natmomsleep1.jpg"></center>'
+				'You look into the bedroom and see <<$NatashaMotherNickname>>, sound asleep in her bra and panties. You can see part of her pussy from where you''re standing. Not wanting to disturb her you close the door and leave.'
+				gs 'arousal', 'voyeur', 2
+			elseif imgrand = 2:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natmomsleep2.jpg"></center>'
+				'You look into the bedroom and see <<$NatashaMotherNickname>>, tossing in her sleep in her bra and panties. As you''re watching she rolls onto her back and puts her hand in her panties. "That must be one hell of an enjoyable dream." You think to yourself. Not wanting to disturb her you close the door and leave.'
+				gs 'arousal', 'voyeur', 4
+			end			
+			gs 'arousal', 'end'
+			gs 'stat'
+		end
+		act 'Leave':gt 'natbelapt','hallway'
+!{		if month < 4 or month > 9:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natmomsleep3.jpg"></center>'
+			'You look into the bedroom and see <<$NatashaMotherNickname>> sound asleep under the covers. Not wanting to disturb her you close the door and leave.'
 		end
 		imgrand = rand(1,2)
 		if imgrand = 1:
@@ -1799,8 +1818,9 @@ if $ARGS[0] = 'natmother':
 			gs 'arousal', 'voyeur', 2
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gt 'natbelapt','hallway'
 		end
+		act 'Leave':gt 'natbelapt','hallway'
+}
 	elseif hour > 7 or hour < 21 and NatashaLoc = 5:
 		*clr & cla
 		menu_off = 1

locations/nichBedroomTanja.qsrc

@@ -10,7 +10,7 @@ $nichLoc = 'bedroomTanya'
 $menu_arg = ''
 menu_off = 0
 
-$sexloc = $CURLOC
+$sexloc = 'nichBedroomTanja'
 gs 'stat'
 
 !! Argument return: PC has been in the room before, dont perform actions meant to be executed before or as she enters the room.

locations/park.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	$sexloc = $CURLOC
+	$sexloc = 'park'
 
 	if WalkInsidePark = 0:WalkInsidePark = 1
 	*clr & cla

locations/paysex.qsrc

@@ -212,7 +212,7 @@ if $ARGS[0] = 'end':
 		elseif picrand = 18:
 			gt 'husbSex', 'dolgend'
 		else
-			gt '<<$sexloc>>', 'start'
+			gt $sexloc, 'start'
 		end
 	end
 end

locations/poli.qsrc

@@ -3,7 +3,7 @@ $location_type = 'public_indoors'
 
 if $ARGS[0] = 'start':
 	CLOSE all
-	$sexloc = $CURLOC
+	$sexloc = 'poli'
 	$loc = 'poli'
 	$location_type = 'indoors'
 	$menu_loc = 'poli'

locations/saveupdater.qsrc

@@ -486,24 +486,11 @@ end
 if npc_updater = 0:
 	npc_updater = 1
 	
-	i = 1
-	
-	:npc_update_jump
-	
-	if (i >= 1 and i <= 26) or i = 69 or (i >= 128 and i <= 159) or i = 165 or i = 189:
-		npc_selfieon['A<<i>>'] = 1
-		$npc_selfie['A<<i>>'] = '<a href="exec:numnpc = <<i>> & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A<<i>>'']>> <<$npc_lastname[''A<<i>>'']>></a>'
-		schoolenable['A<<i>>'] = 1
-		discoenable['A<<i>>'] = 1
-		$npcGo['A<<i>>'] = '<a href="exec:numnpc = <<i>> & gt ''Snpc''"><<$npc_firstname[''A<<i>>'']>> <<$npc_lastname[''A<<i>>'']>></a>'
-		$school_static_num['A<<i>>'] = 'A<<i>>'
-	end	
-	
-	if i < 189: 
-		i += 1
-		jump 'npc_update_jump'
-	end
-	killvar 'i'
+	gs 'npcstatic1'
+	gs 'npcstatic2'
+	gs 'npcstatic3'
+	gs 'npcstatic4'
+	gs 'npcstatic5'
 end
 
 

locations/sexdvoe.qsrc

@@ -412,7 +412,7 @@ if $ARGS[0] = 'end':
 			kafesexrand = 0
 			gt 'kafe', 'workPred'
 		end
-		gt '<<$sexloc>>', 'start'
+		gt $sexloc, 'start'
 	end
 end
 

locations/tanroom.qsrc

@@ -8,7 +8,7 @@ $menu_loc = 'tanroom'
 $menu_arg = ''
 menu_off = 0
 
-$sexloc = $CURLOC
+$sexloc = 'tanroom'
 gs 'stat'
 '<center><b>Tanya''s Room</b></center>'
 '<center><img <<$set_imgh>> src="images/characters/city/nicholas/apartment/bedroomTanja.jpg"></center>'

locations/vipclub.qsrc

@@ -1,6 +1,6 @@
 # vipclub
 if $ARGS[0] = 'start':
-	$sexloc = $CURLOC
+	$sexloc = 'vipclub'
     $location_type = 'public_indoors'
 	$menu_loc = 'vipclub'
 	$menu_arg = 'start'

locations/young_shop.qsrc

@@ -1,7 +1,7 @@
 # young_shop
 
 if $ARGS[0] = 'start':
-	$sexloc = $CURLOC
+	$sexloc = 'young_shop'
 	gs 'themes', 'indoors'
 	$menu_loc = 'young_shop'
 	$menu_arg = 'start'