[fixed] dead ends in gschool_break and gopskver

locations/gopskver.qsrc

@@ -105,9 +105,7 @@ else
 		elseif alko >= 9 and alko < 9 and DansOralSlut = 1:
 			'You''re quite drunk, and before going to the disco Dan offers to walk you home.'
 
-			if pcs_dom >= 5:
-				act '"No need, I can find my own way home"': pcs_dom -= 5 & gt 'gskver', 'start'
-			end
+			if pcs_dom >= 5: act '"No need, I can find my own way home"': gt 'pavComplex', 'start'
 
 			act 'Go with Dan':
 				*clr & cla
@@ -124,15 +122,13 @@ else
 					'You push him away from you and say indignantly: "No way, Dan! Leave me alone!"'
 					'Dan''s eyes look murderous, but he doesn''t touch you. After a few seconds he bounces back, and he grins as he says: "Suit yourself, whore... your reputation in town will be ruined", and then walks away before you can get another word in.'
 
-					act 'Go home':gt 'korrPar'
+					act 'Go home': gt 'pavComplex', 'start'
 				end
 			end
 		elseif alko >= 6 and alko < 9 and DansOralSlut = 0:
 			'You''re quite drunk, and before going to the disco Dan offers to walk you home.'
 
-			if pcs_dom >= 5:
-				act 'Decline': pcs_dom -= 1 & gt 'gskver', 'start'
-			end
+			if pcs_dom >= 5: act 'Decline': gt 'pavComplex', 'start'
 
 			act 'Go with Dan':
 				*clr & cla
@@ -141,9 +137,7 @@ else
 				gs 'stat'
 				'You''re walking down the street, feeling a bit wobbly from the alcohol while Dan supports your weight. He tells you funny stories and anecdotes along the way, and before you know it you''re at your apartment building. When you open the door and enter the building, Dan suddenly pulls you to the side. He''s quite rough about it, and shoves you into a dark corner of the stairwell. He takes your hand by the chin and kisses your lips hard.'
 
-				if pcs_dom >= 10:
-					act 'Push him away and go home': pcs_dom -= 2 & gt 'korrPar'
-				end
+				if pcs_dom >= 10: act 'Push him away and go home': pcs_dom -= 2 & gt 'pavComplex', 'start'
 
 				act 'Kiss him back':
 					*clr & cla
@@ -151,9 +145,7 @@ else
 					gs 'stat'
 					'You return his kiss, unsure why he''s kissing you... he never seemed to be that interested in you. Then you feel his hands on your shoulders, and Dan firmly presses down on them trying to get you to drop to your knees. He whispers reassuringly: "Don''t worry, <<$pcs_nickname>>... I didn''t tell anyone about all the things you did. Do a good job, and your secret will stay safe."'
 
-					if pcs_dom >= 15:
-						act 'Push him away and go home': pcs_dom -= 5 & gt 'korrPar'
-					end
+					if pcs_dom >= 15: act 'Push him away and go home': pcs_dom -= 5 & gt 'pavComplex', 'start'
 
 					gs 'gopskver', 'dan_blowjob'
 				end
@@ -161,9 +153,7 @@ else
 		elseif alko >= 9:
 			'You got absolutely hammered in the park, and are swaying from side to side when you walk down the pathway. Suddenly Vasily hugs your waist tightly and begins to lead you somewhere, with his friends following him.'
 
-			if pcs_dom >= 5:
-				act 'Say you have to go and leave them': pcs_dom -= 1 & gt 'gskver', 'start'
-			end
+			if pcs_dom >= 5: act 'Say you have to go and leave them': pcs_dom -= 1 & gt 'pavComplex', 'start'
 
 			act 'Go with the guys':
 				*clr & cla
@@ -1045,7 +1035,7 @@ if $ARGS[0] = 'dan_blowjob':
 		'When Dan is finally finished, he lets go of your hair and lets you get up. He tucks his cock back into his pants while you wipe your mouth with the back of your hand, feeling that some of his semen ended up on your chin. The taste of his cum still in your mouth is very noticeable too. Dan nods happily: "Not bad, <<$pcs_nickname>>. Your technique is still a bit lacking, but we''ll work on that next time."'
 		'Indicating that he''s done with you now, he wishes you a good night and leaves.'
 
-		act 'Go home':gt 'korrPar'
+		act 'Go home': gt 'pavComplex', 'start'
 	end
 	
 	act'Bend over for Dan':
@@ -1059,7 +1049,7 @@ if $ARGS[0] = 'dan_blowjob':
 		dynamic $vagstart
 		'You bend over seductively and pull your clothes aside to give Dan easier access. He doesn''t require any further invitation and immediately pulls his already hard cock out of his sweatpants, and eases it in before he begins to fuck you.'
 		dynamic $vagend
-		act 'Go home':gt'korrPar'
+		act 'Go home': gt 'pavComplex', 'start'
 	end
 end
 

locations/gschool_boys_bathroom.qsrc

@@ -1,5 +1,6 @@
 # gschool_boys_bathroom
 
+!!This bathroom file is for the bathroom scenes when Sveta is skiping class
 if $ARGS[0] = 'start':
 	*clr & cla
 	$menu_loc = 'gschool_boys_bathroom'

locations/gschool_break.qsrc

@@ -4,6 +4,7 @@ $loc = 'gschool_break'
 $locM = 'gschool_break'
 $menu_loc = 'gschool_break'
 
+
 if $ARGS[0] = 'watercooler':
 	*clr & cla
 	minut += 2
@@ -90,6 +91,7 @@ if $ARGS[0] = 'girls_restroom':
 end
 
 if $ARGS[0] = 'restroom_actions':
+	$location_type = 'bathroom'
 	act 'Leave the restroom': 
 		if $breaktype = 'long':
 			gt 'gschool_lunch', 'break'
@@ -115,11 +117,12 @@ if $ARGS[0] = 'girls_restroom_events':
 	$metka = 'girls_restroom'
 	$metkaM = 'girls_restroom'
 	minut += 2
+	menu_off = 0
+	gs 'stat'
 	girls_event_rand = rand(1,22)
 	if girls_event_rand = 1:
-		*clr & cla
 		menu_off = 1
-		gs 'stat'
+		gs 'stat'	
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/sex/teacher1.mp4"></video></center>'
 		'You walk into the girls bathroom and, as you are washing your hands, you hear some noise coming from the last stall. You creep down and see the stall door is partially open. Inside you see Vice Principal Kuznetsov standing next to the toilet with his dick out and his hand on the back of Ms. Orlov''s head as she sucks his cock. His dick glistens, wet with her saliva down its length to his balls. A strand of saliva, and likely a good amount of precum, droops from the base of his cock to her bottom lip. It sways and stretches with each slide of her mouth over the length of his cock. She is sitting on the toilet with her blouse off and her tits hanging out of her bra, while her skirt is pulled up and her panties down around her ankles. With both her hands she rubs her clit vigorously, completely exposing her soaking wet pussy as her labia slightly spreads apart and back together with the motion of her hands.'
 		gs 'arousal', 'voyeur', 2
@@ -143,48 +146,36 @@ if $ARGS[0] = 'girls_restroom_events':
 			end
 		end
 	elseif girls_event_rand = 2:
-		*clr & cla
 		menu_off = 1
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/occupied.jpg"></center>'
 		'You head into the girls bathroom only to find all the stalls occupied. A gopnik girl is in each of the stalls, standing on the toilets so they can look over the top of the doors. They talk loudly to each other, some snicker, as a joke or insult, has just been tossed out. They''re obviously just being bitches to keep the other girls from using the bathroom. Luckily you just needed to wash your hands, is all. Lera spots you. "Occupied, you will just have to wait." She says with a slight laugh. 
 		You know it is pointless to reply to her, so you just finish up washing your hands and leave.'
 		act 'Leave the restroom': gt 'gschool_lessons', 'short_break'
 	elseif girls_event_rand = 3:
-		*clr & cla
-		menu_off = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/pose.jpg"></center>'
 		'You head into the girls bathroom. Inside you find Christina, laying across several of the sinks in a somewhat sexy pose. She is obviously trying to strike a sexy pose while Lariska snaps photos of her while Lina watches. After each picture Lariska shows Christina the photo, each time she says: "No that''s not good enough, it needs to be perfect! When he sees this, his dick needs to get so hard it almost rips his pants."
 		As you leave, you wonder who Christina wants to send such a perfect photo to, you haven''t heard she is dating anyone.'
 		
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand = 4 and npc_rel['A14'] >= 25 and npc_rel['A15'] >= 25 and (meynoldQW > 0 or mey_vika['mey_vika_qw'] > 0):
-		*clr & cla
-		menu_off = 0
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sisters.jpg"></center>'
 		'As you walk into the girls bathroom, Katja grabs you and drags you over against the wall next to the door. "Come on <<$pcs_nickname>>, pose for a photo with us."' 
 		'She pulls you in close on her right side and wraps one of her legs halfway around you, as you hold it. Vicky wraps an arm and almost a leg around Katja from the left. The three of you do your best to strike several sexy poses, as Lizaveta takes your picture. After several such pictures, the Meynold sisters each kiss you on the cheek before hurrying out. Lizaveta is a bit slower and gives you a knowing smile, before leaving as well. You wonder just what Lizaveta knows and, being the gossip that she is, who else knows as you finish your business and go back to your lunch break.'
 		
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand <= 10:
-		*clr & cla
-		menu_off = 0
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsgossip'+rand(1,2)+'.jpg"></center>'
 		'As you enter the restroom, there is a group of girls clustered together gossiping about the latest gossip or whatever has caught their interest of late. As you go about your business, you over hear them saying.'
 		gs 'gschool_gossip', 'mixed'
 
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand = 11:
-		*clr & cla
-		menu_off = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlspose'+rand(1,2)+'.jpg"></center>'
 		'As you enter the restroom, there is a group of girls clustered together. They are taking turns, posing as a group, while one girl takes their picture. Then the girl that was taking the picture, switches with one of the other girls. They do this over and over until every girl has her picture taken in a group and they all like the pictures.'
 		
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand = 12:
-		*clr & cla
-		menu_off = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/gopniks.jpg"></center>'
 		if grupTipe = 4:
 			'As you enter the restroom, you see Paulina, Lena and Lera hanging around the stalls, chatting and tormenting some of the other girls. You exchange smiles and hello''s with them, as you go about your business.'
@@ -194,8 +185,6 @@ if $ARGS[0] = 'girls_restroom_events':
 
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand = 13:
-		*clr & cla
-		menu_off = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seemypanties.jpg"></center>'
 		'As you enter the restroom, you see Anushka on her way out. She pauses long enough to pull up her skirt and show off her panties. "Do you think these are cute panties?"'
 		'Not all that phased by her anymore, you just nod yes. "Yes very cute." With that she drops her skirt and leaves the restroom, while you go about your business.'
@@ -204,8 +193,6 @@ if $ARGS[0] = 'girls_restroom_events':
 		gs 'stat'
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand = 14:
-		*clr & cla
-		menu_off = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/showass'+rand(1,2)+'.jpg"></center>'
 		'As you enter the restroom, there are three girls, one of them taking the picture of the other two. After a couple of pictures the two having their pictures taken, turn and raise their skirts to show their panty clad asses to the third girl, who laughs and keeps taking their picture. They keep this up as you go about your business.'
 		gs 'arousal', 'voyeur', 2
@@ -213,7 +200,8 @@ if $ARGS[0] = 'girls_restroom_events':
 		gs 'stat'
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand = 15 and pcs_vag ! 0:
-		*clr & cla
+		menu_off = 1
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sweettalk1.jpg"></center>'
 		if grupTipe = 4 and hotcat >= 6:
 			'As you enter the bathroom, you see Lena standing in the corner. She watches you as you come in, then bites her lower lip. You notice her watching you and decide to ask what''s up. "You ok, Lena? You are looking a bit flushed."'
@@ -297,7 +285,8 @@ if $ARGS[0] = 'girls_restroom_events':
 			gs 'gschool_break', 'restroom_actions'
 		end
 	elseif girls_event_rand = 16 and pcs_vag ! 0 and uniform_steal_day ! daystart:
-		*clr & cla
+		menu_off = 1
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlspose1.jpg"></center>'
 		if grupTipe = 4:
 			'As you walk in, you see a group of gopnik girls all talking, you know Lena, Lera, Paulina, and Ekaterina but the other ones are from your brother''s class. They exchange causal greetings with you, but seem engrossed in there conversation.'
@@ -469,7 +458,7 @@ if $ARGS[0] = 'boys_restroom_events':
 			'You glance at him as you walk to the sinks. "Shut up. I just need to use the mirrors, not like it''s hurting you." You tell him, as you take a look at yourself in the mirror, checking your hair and makeup.'
 			gs 'gschool_break', 'restroom_actions'
 		end
-	elseif boys_event_rand = 3:
+	elseif boys_event_rand = 3 and soniaPS >= 3:
 		if soniaPS = 3:
 			soniasexrand = 1
 		elseif soniaPS = 4:

locations/gschool_girls_bathroom.qsrc

@@ -1,5 +1,6 @@
 # gschool_girls_bathroom
 
+!!This bathroom file is for the bathroom scenes when Sveta is skiping class
 if $ARGS[0] = 'start':
 	$location_type = 'bathroom'
 	*clr & cla