Merge branch 'master' of https://git.catrenelle.com/sovietmercader/glife

locations/EvOtelMan.qsrc

@@ -340,7 +340,7 @@ if $ARGS[0] = 'sex':
 					gs 'cum_manage'
 					bmANAL[Tboynum] += 1
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/anal2.jpg"></center>'
-					'Since you are on your back, you are a bit lower than what would be ideal and <<$boydesc>> is having trouble getting enough leverage to fuck your ass with as much force as he''d like, so he pulls his cock out of your hole and flips you over. You get yourself up on your hands and knees, he pulls your hips back towards him and within a second you feel him thrust his cock balls deep back up your ass. He grabs a hold of your hips and starts pounding your asshole as hard as he can, his balls slapping against your clit with every thrust, the sound of slapping flesh getting louder as his hips join in, smacking against your butt.'
+					'Since you are on your back, you are a bit lower than what would be ideal and <<$boydesc>> is having trouble getting enough leverage to fuck your ass with as much force as he''d like, so he pulls his cock out of your hole and flips you over. You get yourself up on your hands and knees, he pulls your hips back towards him and within a second you feel him thrust his cock balls deep back up your ass. He grabs a hold of your hips and starts pounding your asshole as hard as he can, his balls slapping against your clit with every thrust, the sound of slapping flesh getting louder as his hips join in, smacking against your butt. You feel him begin to cum in your ass but he''s not done with you yet.'
 					gs 'arousal', 'anal', 10, 'prostitution'
 					gs 'stat'
 					act 'Finish him off':
@@ -532,9 +532,11 @@ if $ARGS[0] = 'sex':
 						act 'Continue':
 							*clr
 							cla
+							spafinloc = 3
+							gs 'cum_manage'
 							bmANAL[Tboynum] += 1
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/anal2.jpg"></center>'
-							'Since you are on your back, you are a bit lower than what would be ideal and <<$boydesc>> is having trouble getting enough leverage to fuck your ass with as much force as he''d like, so he pulls his cock out of your hole and flips you over. You get yourself up on your hands and knees, he pulls your hips back towards him and within a second you feel him thrust his cock balls deep back up your ass. He grabs a hold of your hips and starts pounding your asshole as hard as he can, his balls slapping against your clit with every thrust, the sound of slapping flesh getting louder as his hips join in, smacking against your butt.'
+							'Since you are on your back, you are a bit lower than what would be ideal and <<$boydesc>> is having trouble getting enough leverage to fuck your ass with as much force as he''d like, so he pulls his cock out of your hole and flips you over. You get yourself up on your hands and knees, he pulls your hips back towards him and within a second you feel him thrust his cock balls deep back up your ass. He grabs a hold of your hips and starts pounding your asshole as hard as he can, his balls slapping against your clit with every thrust, the sound of slapping flesh getting louder as his hips join in, smacking against your butt. You feel him begin to cum in your ass but he''s not done with you yet.'
 							gs 'arousal', 'anal', 10, 'prostitution'
 							gs 'stat'
 							act 'Finish him off':
@@ -564,7 +566,7 @@ if $ARGS[0] = 'End':
 	'<center><video autoplay loop src="images/pc/activities/otel1.mp4"></video></center>'
 	'After the two of you relax for a while longer, you smile at <<$boydesc>> and say: "That was fun! But I should really get going..."'
 	'<<$boydesc>> stretches lazily on the bed, not bothering to get up. "You were great, <<$pcs_nickname>>! I hope I''ll run into you again, next time I''m in Pavlovsk!"'
-	if sparrloc[temp] = 11 and sparrvol > 0:cumspclnt = 12 & gs 'cum_cleanup' & 'When you look around the room, you find a packet of sanitary napkins. You take one and quickly wipe the sperm off your face, in an attempt to make yourself presentable enough to go outside.'
+	if arrpos('sparrloc', 11) ! -1 and sparrvol > 0:cumspclnt = 12 & gs 'cum_cleanup' & 'When you look around the room, you find a packet of sanitary napkins. You take one and quickly wipe the sperm off your face, in an attempt to make yourself presentable enough to go outside.'
 	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Leave the hotel':gt 'vokzalG'

locations/gdktoilet.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/bathroom_entrance.jpg"></center>'
 
 	if hour >= 8 and hour <= 23:
-		act 'Go in the Men''s toilet': gt 'gdktoilet', 'mens'
+		act 'Go in the Men''s toilet': gt 'gdktoilet', 'mens_entrance_events'
 		act 'Go in the Women''s toilet': gt 'gdktoilet', 'womens'
 	end
 
@@ -66,24 +66,8 @@ if $ARGS[0] = 'start':
 	end
 end
 
-if $ARGS[0] = 'mens':
-	$metka = 'mens'
-	$loc = 'gdktoilet'
-	cls
+if $ARGS[0] = 'mens_entrance_events':
 	temp = RAND(1,100)
-	gs 'stat'
-	if hour >=20 and hour <=23:
-		if music_on = 1:
-			$track_loop = 'sound/komb.mp3'
-			volume = 50
-			music_loop = 1
-			pl '<a href="exec: music_on = 0 & gt $loc">Turn off the music</a>'
-		else
-			music_loop = 0
-			close all
-			pl '<a href="exec: music_on = 1 & gt $loc">Play music</a>'
-		end
-	end
 !!Gloryhole1
 	if temp >= 80:
 		'<center><b><font color="maroon">Men''s Room</font></b></center>'
@@ -161,7 +145,7 @@ if $ARGS[0] = 'mens':
 								act 'Leave': gt'gdktoilet', 'start'
 							end
 						else
-							act 'leave': gt'gdktoilet', 'start'
+							act 'Leave': gt'gdktoilet', 'start'
 						end
 					end
 				else
@@ -169,13 +153,13 @@ if $ARGS[0] = 'mens':
 					'You look at his naked body and you wonder who''s on the other side. You feel a little turned on by the man''s naked body. You decide to leave.'
 					gs 'arousal', 'voyeur', 10
 					gs 'stat'
-					act 'leave': gt'gdktoilet', 'start'
+					act 'Leave': gt'gdktoilet', 'start'
 				end
 			else
 				pcs_horny += 5
 				gs 'stat'
 				'You look at his naked body and you''re not sure what''s going on. You decide to leave before things get too awkward.'
-				act 'leave': gt'gdktoilet', 'start'
+				act 'Leave': gt'gdktoilet', 'start'
 			end
 		end
 !!Sonia
@@ -293,39 +277,67 @@ if $ARGS[0] = 'mens':
 		minut += 1
 		temp = RAND(1,2)
 		gs 'stat'
+		gt 'gdktoilet', 'mens'
+	end
+end
+
+if $ARGS[0] = 'mens':
+	$metka = 'mens'
+	$loc = 'gdktoilet'
+	$metkaM = 'mens'
+	$locM = 'gdktoilet'
+	$location_type = 'bathroom'
+	cls
+	gs 'stat'
+	
+	if hour >=20 and hour <=23:
+		if music_on = 1:
+			$track_loop = 'sound/komb.mp3'
+			volume = 50
+			music_loop = 1
+			pl '<a href="exec: music_on = 0 & gt $loc">Turn off the music</a>'
+		else
+			music_loop = 0
+			close all
+			pl '<a href="exec: music_on = 1 & gt $loc">Play music</a>'
+		end
+	end
+	
+	'<center><b><font color="maroon">Men''s Room</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/bathroom_mens.jpg"></center>'
+	'You peek around the corner. Inside this room, stalls line the right side, with urinals on the far wall and rows of sinks and <a href="exec:gt ''mirror'', ''start''">mirrors</a> to the left. The room has a smell of disinfectant and stale piss. As you look around you notice a hole in the wall.'
+	
+	act 'Leave': gt 'gdktoilet', 'start'
+	
+	act 'Look at the hole':
+		cls
+		gs 'stat'
 		'<center><b><font color="maroon">Men''s Room</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/bathroom_mens.jpg"></center>'
-		'You peek around the corner. Inside this room, stalls line the right side, with urinals on the far wall and rows of sinks and <a href="exec:gt ''mirror'', ''start''">mirrors</a> to the left. The room has a smell of disinfectant and stale piss. As you look around you notice a hole in the wall.'
-		act 'Look at the hole':
-			cls
-			gs 'stat'
-			'<center><b><font color="maroon">Men''s Room</font></b></center>'
-			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/menghpeek.mp4"></video></center>'
-			'You look at the hole and see a girl fingering her pussy. You feel your pussy moisten and start to itch.'
-			gs 'arousal', 'voyeur', 5
-			gs 'stat'
-			if pcs_horny >=50:
-				act 'Masturbate':
-					cla
-					gs 'stat'
-					'You walk into one of the men''s stalls.'
-					gs 'arousal', 'masturbate', 5
-					gs 'stat'
-					act 'start': gt 'gdktoilet', 'mensmast'
-				end
-			end
-			act 'Move away':
-				cls
-				minut += 1
+		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/menghpeek.mp4"></video></center>'
+		'You look at the hole and see a girl fingering her pussy. You feel your pussy moisten and start to itch.'
+		gs 'arousal', 'voyeur', 5
+		gs 'stat'
+		if pcs_horny >=50:
+			act 'Masturbate':
+				cla
 				gs 'stat'
-				'<center><b><font color="maroon">Men''s Room</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/bathroom_mens.jpg"></center>'
-				'You decide to leave before things get too crazy.'
-				act 'Leave': gt'gdktoilet', 'start'
+				'You walk into one of the men''s stalls.'
+				gs 'arousal', 'masturbate', 5
+				gs 'stat'
+				act 'start': gt 'gdktoilet', 'mensmast'
 			end
 		end
-		act 'Leave': gt'gdktoilet', 'start'
+		act 'Move away':
+			cls
+			minut += 1
+			gs 'stat'
+			gt'gdktoilet', 'mens'
+		end
 	end
+	
+	dynamic $tampon
+	dynamic $quickwash
+	dynamic $basin
 end
 
 if $ARGS[0] = 'mensmast':
@@ -384,13 +396,13 @@ if $ARGS[0] = 'mensmast':
 								gs 'underwear', 'dispose'
 								minut += 2
 								gs 'stat'
-								'You run out of the stall and in doing so quickly you leave your underwear behind.'
-								act 'Leave': gt 'gdk'
+								'You slip past the man and run out of the bathroom so quickly you leave your underwear behind.'
+								act 'Leave': gt 'gdktoilet', 'start'
 							else
 								minut += 2
 								gs 'stat'
-								'You run out of the stall.'
-								act 'Leave': gt 'gdk'
+								'You slip past the man and run out of the bathroom.'
+								act 'Leave': gt 'gdktoilet', 'start'
 							end
 						end
 					else
@@ -422,14 +434,14 @@ if $ARGS[0] = 'mensmast':
 									minut += 5
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/mensmast5.jpg"></center>'
-									'The man leaves the stall, he mumbles something but you are too far gone and woozy. You stay crouched on the floor with cum all over your mouth as you try to recover. You get up and leave.'
-									act 'Leave':gt 'gdktoilet', 'start'
+									'The man leaves the stall, he mumbles something but you are too far gone and woozy. You stay crouched on the floor with cum all over your mouth as you try to recover.'
+									act 'Leave the stall':gt 'gdktoilet', 'mens'
 								end
 							end
 						end
 					end
 				end
-				act 'Leave Stall':gt 'gdktoilet', 'start'
+				act 'Leave Stall':gt 'gdktoilet', 'mens'
 			end
 		end
 	else
@@ -440,7 +452,7 @@ if $ARGS[0] = 'mensmast':
 		minut += 1
 		gs 'stat'
 		'You decide that you shouldn''t continue in fear of being discovered.'
-		act 'Leave Stall':gt 'gdktoilet', 'start'
+		act 'Leave Stall':gt 'gdktoilet', 'mens'
 	end
 end
 

locations/vokmantoiev.qsrc

@@ -28,8 +28,7 @@ if $ARGS[0] = 'female':
 	act 'Leave':minut += 1 & gt 'vokmantoiev', 'start'
 	
 	act 'Look in the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
-
+	
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
@@ -40,7 +39,7 @@ if $ARGS[0] = 'male':
 	$locM = $CURLOC
 	$metka = $ARGS[0]
 	$loc = $CURLOC
-    $location_type = 'public_indoors'
+    $location_type = 'bathroom'
 	cls
 	vokzalToilet = 2
 	gs 'stat'
@@ -48,28 +47,15 @@ if $ARGS[0] = 'male':
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
 	'You open the door to the men''s room and go in.'
 
+	act 'Leave':minut += 1 & gt 'vokmantoiev', 'start'
+	
 	if bimbolevel >= 1:
 		act 'Wait and see if someone finds you':gt 'vokBimbo', 'pos1'
 		act 'Quickly enter a stall':gt 'vokBimbo', 'pos5'
 	end
-	act 'Leave':minut += 1 & gt 'vokmantoiev', 'start'
-
+	
 	act 'Look in the mirror':gt 'mirror', 'start'
-
-	if (cumloc[6] = 1 or cumloc[7] = 1):
-		act 'Wipe the cum off your clothes (0:10)':
-			cla
-			*clr
-			cumspclnt = 6
-			gs 'cum_cleanup'
-			minut += 10
-
-			'You wipe the cum off your clothes and thoroughly rinse out the stains with water.'
-
-			act 'Finish':gt 'vokmantoiev', 'female'
-		end
-	end
-
+	
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin