17 Commits ad7cfeb11f ... 849330f177

Author SHA1 Message Date
  KevinSmarts 849330f177 Merge branch 'master' of https://git.catrenelle.com/sovietmercader/glife 5 years ago
  3xpurt d114ac14fb [fixed] missing variable in family and duplication duplication of kolka links on weekend. 5 years ago
  3xpurt 9ade9b5638 [Changed] font colour of red vibrator and dildo stat display, so it doesn't seem like a warning. 5 years ago
  sovietmercader c0188aa1f9 [fixed] only clean face cum even when other cum is present and missing ass cum 5 years ago
  sovietmercader ee9ca57ba1 [fixed] no more teleporting bathrooms for pavlovsk community center or pavlovsk train station 5 years ago
  3xpurt b3eaa894c2 [fixed] clothing recovery for swamp_yard exit 5 years ago
  3xpurt a817698034 [fixed] conditions for skinny dipping vs swimming nude and duplication of actions at gadriver. 5 years ago
  3xpurt 947f694b73 [fixed] abduction maximum dildo size. 5 years ago
  3xpurt c142b2a150 [Fixed] park sleep on bench message display condition in gskver. 5 years ago
  3xpurt 2f054d731a [fixed] no exit in lact_lib exhibition check and changed to inhibition 5 years ago
  3xpurt 70e4d3579f [changed] laketoilet random event hours from 22-4. Event now working. 5 years ago
  3xpurt a32f9f89d4 [fixed] fixed accommodation debt for non-slaves, and no longer lose all your money from sleeping in saunawhore. 5 years ago
  julzor caed1ff087 [fixes] changed old A191 to the new $petID in soba 5 years ago
  julzor 5f926e076c [fixes] missing names of random boys and girls in gschool_detention 5 years ago
  julzor 6e96f9c59a [fixes] [text edit] really minor text edits and changes 5 years ago
  julzor a8ed85b0bb [fixes] fixed a dead end in placer_sex 5 years ago
  julzor e137bc1fcb [fixes] matched the if statements and descriptions in gadbana and miroslava to make them consistent when the sauna is available 5 years ago

+ 5 - 3
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'

+ 4 - 4
locations/Gadbana.qsrc

@@ -74,10 +74,10 @@ if mira = 0:
 				end
 			end
 		else
-			'The banya is not in use at this time, it is available between 19:00 and 22:00 during the week.'
+			'The banya is not in use at this time, it is available between 19:00 and 22:00 during the weekend.'
 		end
-	elseif week ! 6:
-		'The banya is not used at the weekend, it is usually ready to use from 19:00 during the week.'
+	elseif week < 6:
+		'The banya is not used during the week, it is usually ready to use from 19:00 during the weekend.'
 	end
 
 	act 'Wash your body (0:25)':
@@ -89,7 +89,7 @@ if mira = 0:
 
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mit.jpg"></center>'
-		'You lather your body washcloth and start scrubbing your body. You rinse off the soap and start to lather your hair with the shampoo. After rinsing off the shampoo you are completely clean.'
+		'You lather your body washcloth and start scrubbing your body. You rinse off the soap and start to lather the hair with the shampoo. After rising off the shampoo you are completely clean.'
 
 		act 'Leave':gt $loc, $metka
 	end

+ 1 - 1
locations/Gaddvor.qsrc

@@ -59,7 +59,7 @@ if $ARGS[0]='':
 		*nl
 		'You are naked and can only go to your grandparents to get dressed or go to the banya.'
 	else
-		if hour >= 6 and hour < 20 and month >= 4 and month <= 10:'In the yard there are <a href="exec:gt ''Gaddvor'',''chickens''">chickens</a> running around.'
+		if feed_chickens = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):'In the yard there are <a href="exec:gt ''Gaddvor'',''chickens''">chickens</a> running around.'
 
 		if mira_guest = 1: Miraloc = 7 & 'Your friend <a href="exec: gt ''Miroslava'', ''Start''">Mira</a> stands next to you.'
 

+ 1 - 1
locations/Miroslava.qsrc

@@ -344,7 +344,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 		end
 
-		if npc_rel['A60'] >= 20 and week = 6 and hour > 18 and hour < 22:
+		if npc_rel['A60'] >= 20 and week >= 6 and hour > 18 and hour < 22:
 
 			act 'Suggest taking a steam bath in your grandparents sauna':
 				if Mira_no = 0:

+ 2 - 1
locations/MiroslavaHome.qsrc

@@ -121,7 +121,8 @@ if $ARGS[0] = 'start':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
 					'Mira''s father tells you that she''s not home, she is over at the river.'
 
-					act 'Go to river':gt 'gadriver','start'
+					act 'Go to the river':gt 'gadriver','start'
+					act 'Leave':gt 'Gadukino'
 				elseif mira_temp >= 10 and sunWeather = 0 and hour < 20 and MiraLoc ! 0 and Mira_no = 0:
 					*clr & cla
 					minut += 2

+ 2 - 1
locations/Nord.qsrc

@@ -114,10 +114,11 @@ if $ARGS[0] = 'redlight':
 	'A shop for <a href="exec:gt ''sexshop'', ''start''">sex toys</a> is open for perverts from all around the city.'
 	if bordel > 0 and hour >= 20 or bordel > 0 and hour <= 3:'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
 
-	gs 'taxi'
 	act 'Return to the Industrial Region (0:05)': minut += 5 & gt 'Nord'
 
 	act 'Wait':gs 'obj_din', 'wait'
+	
+	gs 'taxi'
 end
 
 

+ 7 - 7
locations/abduction.qsrc

@@ -1273,7 +1273,7 @@ if $ARGS[0] = 'abdTrainDildos':
 	dildoSmall = 10
 	dildoRegular = 20
 	dildoBig = 30
-	dildoHorse = 40
+	dildoHorse = 35
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/slavewhoredildos1.jpg"></center>'
 	'You take the dildos from the ground and clean them up a bit in the shower.'
 	'There are four of them: small, regular, big and one that''s horse sized.'
@@ -1422,7 +1422,7 @@ if $ARGS[0] = 'abdTrainDildosHorse':
 end
 
 if $ARGS[0] = 'abdTrainDildosHorseUse':
-	dick = 40
+	dick = 35
 	if pcs_vag > dildoHorse:
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildoshorse.mp4"></video></center>'
 		'You start fucking the dildo with ease, your pussy swallows it whole without any problem.'
@@ -1548,7 +1548,7 @@ if $ARGS[0] = 'abdTrainDildosAnalHorse':
 end
 
 if $ARGS[0] = 'abdTrainDildosAnalHorseUse':
-	dick = 40
+	dick = 35
 	if pcs_ass > dildoBig:
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosanalhorse.mp4"></video></center>'
 		'You start fucking the dildo with ease, your anus swallows it whole without any problem.'
@@ -1659,10 +1659,10 @@ if $ARGS[0] = 'abdTrainDildosMouthBigUse':
 end
 
 if $ARGS[0] = 'abdTrainDildosMouthHorse':
-	if pcs_throat >= 35:
+	if pcs_throat >= dildoHorse:
 		'You feel that your throat can accomodate this dildo easily.'
 		act 'Use it':gt 'abduction', 'abdTrainDildosMouthHorseUse'
-	elseif pcs_throat <= 35 and pcs_throat > dildoBig:
+	elseif pcs_throat <= dildoHorse and pcs_throat > dildoBig:
 		'You feel that this dildo will stretch your throat, making it a bit deeper.'
 		act 'Use it':gt 'abduction', 'abdTrainDildosMouthHorseUse'
 	else
@@ -1673,8 +1673,8 @@ if $ARGS[0] = 'abdTrainDildosMouthHorse':
 end
 
 if $ARGS[0] = 'abdTrainDildosMouthHorseUse':
-	dick = 35
-	if pcs_throat > 35:
+	dick = dildoHorse
+	if pcs_throat > dildoHorse:
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosmouthhorse.mp4"></video></center>'
 		'You start sucking the dildo with ease, your throat swallows it whole without any problem.'
 		gs 'stat'

+ 3 - 1
locations/family.qsrc

@@ -121,8 +121,10 @@ if StoryLine = 1:
 
 		 if $loc = 'sitrPar' or ($loc = 'family' and $metka = 'sofa'):
 			if hour < 7 and brothemorningsex = daystart:
+				ocpd_room = 1
 				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is getting ready for school.'
 			elseif hour < 7 and brothermorningsex ! daystart:
+				ocpd_room = 1
 				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the sofa.'
 			elseif hour >= 23:
 				ocpd_room = 1
@@ -165,7 +167,7 @@ if StoryLine = 1:
 					end
 				end
 
-				if hour >= 18 and hour <= 23:
+				if hour >= 18 and hour < 23:
 					ocpd_room = 1
 					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, watching TV.'
 				end

+ 3 - 3
locations/gLakeNude.qsrc

@@ -44,7 +44,7 @@ if month=1 or month=2 or month=12:
 	''
 end
 
-'This small natural beach is hidden away from the general public.  To reach it you had to travel around the lake along a forest trail.  On this secluded beach you can often find sunbathers and people skinny dipping, including people from other towns and even some from the city.'
+'This small natural beach is hidden away from the general public. To reach it you had to travel around the lake along a forest trail. On this secluded beach you can often find sunbathers and people skinny dipping, including people from other towns and even some from the city.'
 
 if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 	act'Get dressed':
@@ -208,7 +208,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 				minut += 5
 				voyeurism += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/lake_legs.jpg"></center>'
-				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br>  You can''t remember a single instance in your life when you were watching someone. So is it worth to start doing it now? YES!'
+				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> You can''t remember a single instance in your life when you were watching someone. So is it worth to start doing it now? YES!'
 				act'Stop Watching!': gt'gLakeNude'
 			else
 				voyeurism_start = 2
@@ -216,7 +216,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 				pcs_horny += 75
 				voyeurism += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event.jpg"></center>'
-				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br>  But then you remember how you recently were watching others on the beach and think: <dh>"That was scary, cool, and hot. I need to keep at least one eye always watching."</dh>'
+				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> But then you remember how you recently were watching others on the beach and think: <dh>"That was scary, cool, and hot. I need to keep at least one eye always watching."</dh>'
 				act'Watch the couple': 
 					gs'gLakeNudeEvent','gLakeNude_sex'
 				end

+ 16 - 13
locations/gadforestlost.qsrc

@@ -23,8 +23,12 @@ if $ARGS[0] = 'forestrescue':
 			'Staying in one place is a good idea when you are lost.'
 		end
 	end
-	'You get ready quickly and you follow the forest ranger home.'
-	act 'Further':gt'Gadhouse'
+	'You get ready quickly and you follow the forest ranger out of the woods.'
+	if $clothingworntype ! 'nude':
+		act 'Further':gt'Gadhouse'
+	elseif $clothingworntype = 'nude':
+		act 'Further':gt'gadforest', '1'
+	end
 end
 if $ARGS[0] = '1':
 	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 7: gt 'gadforestlost', 'forestrescue' & !add rescue by illume
@@ -53,9 +57,9 @@ if $ARGS[0] = '1':
 
 		gs 'gadforestlost', 'lostclothes'
 		if goforest > lostrand:
-			act 'Look for the road on':gs 'gadforestlost', 'gadforestlostfinish1'
+			act 'Look for the road':gs 'gadforestlost', 'gadforestlostfinish1'
 		else
-			act 'Look for the road on':gt 'gadforestlost','1'
+			act 'Look for the road':gt 'gadforestlost','1'
 		end
 		act 'To take a break':gt 'gadforestrelax'
 	end
@@ -88,9 +92,9 @@ if $ARGS[0] = '2':
 
 		gs 'gadforestlost', 'lostclothes'
 		if goforest > lostrand:
-			act 'Look for the road on ':gs 'gadforestlost', 'gadforestlostfinish2'
+			act 'Look for the road ':gs 'gadforestlost', 'gadforestlostfinish2'
 		else
-			act 'Look for the road on':gt 'gadforestlost','2'
+			act 'Look for the road':gt 'gadforestlost','2'
 		end
 		act 'To take a break':gt 'gadforestrelax'
 	end
@@ -122,9 +126,9 @@ if $ARGS[0] = '3':
 
 		gs 'gadforestlost', 'lostclothes'
 		if goforest > lostrand:
-			act 'Look for the road on ':gs 'gadforestlost', 'gadforestlostfinish3'
+			act 'Look for the road ':gs 'gadforestlost', 'gadforestlostfinish3'
 		else
-			act 'Look for the road on':gt 'gadforestlost','3'
+			act 'Look for the road':gt 'gadforestlost','3'
 		end
 		act 'To take a break':gt 'gadforestrelax'
 	end
@@ -157,7 +161,7 @@ if $ARGS[0] = '4':
 		gs 'stat'
 
 		gs 'gadforestlost', 'lostclothes'
-		act 'Look for the road on ':
+		act 'Look for the road ':
 			if goforest > lostrand: gs 'gadforestlost', 'gadforestlostfinish4'
 			if goforest < lostrand and temp > 7:gt 'gadforestswamp','1'
 			if goforest < lostrand and temp <= 7:gt 'gadforestlost','4'
@@ -196,7 +200,7 @@ end
 if $ARGS[0] = 'gadforestlostfinish':
 	'<center><H4>Somewhere in the woods</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadjoy.jpg"></center>'
-	'You look over and realize that you finally see houses, glad to get out of this alive you rush forward.'
+	'You look over and realize that you finally see lights shining from distnat houses, glad to get out of this alive you rush forward.'
 	!clear lost flags by illume, clear dirtyclothes flag by rachels
 	lost_girl = 0
 	dirtyclothes = 0 & swamp_clothes = 0
@@ -205,10 +209,9 @@ if $ARGS[0] = 'gadforestlostfinish':
 	if $clothingworntype = 'nude':
 		act 'Out of the woods':
 			minut += 25
-			'You sneak out the woods, hiding your naked body in shadow and moving toward grandparents house.'
-			'You Successfully reach home without witness.'
+			'You find your way out of the woods, hiding your naked body in shadow and moving toward the edge of the forest, where you left your clothes.'
 			cla
-			act 'Further':gt'Gadhouse'
+			act 'Continue':gt'gadforest', '1'
 		end
 		temp=0
 		!disable further act add.

+ 87 - 104
locations/gadriver.qsrc

@@ -183,52 +183,44 @@ if $ARGS[0] = 'Gadbitch':
 	if MiraLoc ! 1 and npc_QW['A63'] >= 13 and RAND(0,10) = 0 and hour >= 8 and hour < 20 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1:'<a href="exec: gt ''Gadriver'', ''GuysRiver'' ">Bob Colby</a> is resting on the riverbank.'
 
 	if temper >= 15 and month >= 5 and month <= 9:
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+		temp_gr = RAND(0,9)
+		if $clothingworntype ! 'nude':
+			act 'Strip naked':
+				cla
+				minut += 5
+				gs 'underwear', 'remove'
+				gs 'clothing', 'strip', 'VillageRiver'
+				'Without hesitation, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
+				act 'Continue': gt 'Gadriver', 'Gadbitch'
+			end
+		end
+		if $clothingworntype = 'swimwear':
 			act 'Go for a swim':
 				cla
 				*clr
 				cumspclnt = 4
 				gs 'cum_cleanup'
 				minut += 30
-				if $clothingworntype = 'nude':
-					gs 'exercise', 'tier1', 1, 'stren_exp'
-					inhib_exp += rand(1,3)
-				else
-					gs 'exercise', 'tier1', 1, 'stren_exp'
-					if pcs_inhib < 50:inhib_exp += rand(1,3)
-				end
+				gs 'exercise', 'tier1', 1, 'stren_exp'
+				if pcs_inhib < 50:inhib_exp += rand(1,3)
 				pcs_sweat = 10 + rand(0,4)
-				if $clothingworntype = 'swimwear':
-					if hour >= 22 or hour <= 6:
-						if RAND(0,10) < 5 and MiraLoc = 1:
-							'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
-							'You and Mira take a nighttime swim in the river, splashing water at each other and having fun.'
-						else
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverswim.jpg"></center>'
-							'You take a nighttime swim in the river, feeling the refreshing and invigorating water flowing across your body.'
-						end
+				if hour >= 22 or hour <= 6:
+					if RAND(0,10) < 5 and MiraLoc = 1:
+						'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
+						'You and Mira take a nighttime swim in the river, splashing water at each other and having fun.'
 					else
-						if RAND(0,10) < 5 and MiraLoc = 1:
-							'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
-							'You and Mira take a swim in the river, splashing water at each other and having fun.'
-						else
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverswim.jpg"></center>'
-							'You take a swim in the river, feeling the refreshing and invigorating water flowing across your body.'
-						end
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverswim.jpg"></center>'
+						'You take a nighttime swim in the river, feeling the refreshing and invigorating water flowing across your body.'
 					end
 				else
-					temp_gr = RAND(0,15)
-					if temp_gr >= 10 and MiraLoc = 1:
-						pcs_horny += RAND(5,15)
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
-						'You step in to the river, you and Mira have a good old fashioned water fight, splashing each other until one of you finally surrenders.'
+					if RAND(0,10) < 5 and MiraLoc = 1:
+						'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
+						'You and Mira take a swim in the river, splashing water at each other and having fun.'
 					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/watergirls.jpg"></center>'
-						'You take your clothes off and swiftly step into the river, you sigh, feeling the cold refreshing and invigorating water.'
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriverswim.jpg"></center>'
+						'You take a swim in the river, feeling the refreshing and invigorating water flowing across your body.'
 					end
 				end
-				temp_gr = RAND(0,9)
 
 				act 'Get out of the water':
 					if MiraLoc ! 1 and npc_QW['A63'] >= 13 and temp_gr = 0 and hour >= 8 and hour < 20:
@@ -286,80 +278,71 @@ if $ARGS[0] = 'Gadbitch':
 					end
 				end
 			end
-
 		else
-
-			act 'Go skinny dipping':
-				cla
-				*clr
-				temp_gr = RAND(0,15)
-				cumspclnt = 4
-				gs 'cum_cleanup'
-				minut = minut + 20
-				pcs_sweat = 10 + rand(0,4)
-				pcs_mood += 5
-				pcs_willpwr = pcs_willpwr + 5
-				inhib_exp += rand(1,3)
-				if pcs_stren < 30: stren_exp += 1
-				if hour >= 22 and hour <= 6:
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/watergirls1.jpg"></center>'
-					'You strip your clothes off and slowly step in to the cold river, knowing that the darkness hides your nudity. You swim around feeling the refreshing and invigorating water caressing your body.'
-				else
-					if temp_gr >= 10 and MiraLoc = 1:
-						pcs_horny += RAND(5,15)
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
-						'You step in to the river, you and Mira have a good old fashioned water fight, splashing each other until one of you finally surrenders.'
+			if $clothingworntype = 'nude':
+				act 'Go skinny dipping':
+					cla
+					*clr
+					temp_gr = RAND(0,15)
+					cumspclnt = 4
+					gs 'cum_cleanup'
+					minut = minut + 20
+					pcs_sweat = 10 + rand(0,4)
+					pcs_mood += 5
+					pcs_willpwr = pcs_willpwr + 5
+					inhib_exp += rand(1,3)
+					if pcs_stren < 30: stren_exp += 1
+					if hour >= 22 and hour <= 6:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/watergirls1.jpg"></center>'
+						'You strip your clothes off and slowly step in to the cold river, knowing that the darkness hides your nudity. You swim around feeling the refreshing and invigorating water caressing your body.'
 					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/watergirls.jpg"></center>'
-						'You take your clothes off and swiftly step into the river, you sigh, feeling the cold refreshing and invigorating water.'
+						if temp_gr >= 10 and MiraLoc = 1:
+							pcs_horny += RAND(5,15)
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
+							'You step in to the river, you and Mira have a good old fashioned water fight, splashing each other until one of you finally surrenders.'
+						else
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/watergirls.jpg"></center>'
+							'You take your clothes off and swiftly step into the river, you sigh, feeling the cold refreshing and invigorating water.'
+						end
 					end
-				end
-				act 'Get out of the water':
-					if MiraLoc ! 1 and npc_QW['A63'] >= 13 and temp_gr = 0 and hour >= 8 and hour < 20:
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex12.jpg"></center>'
-						'As soon as you step out of the water, you find yourself standing naked in front of a couple of the village boys, judging from the fishing poles they are carrying, you know they were coming to the river to do some fishing.'
-						'But, seeing you skinny dipping, they instead start talking amongst themselves about how much of a slut you are and the only good thing you are for is sucking cock. You tell them to fuck off, but they are too worked up and not listening to you at all.'
-						gs 'boyStat', 'A63'
-						npc_sex[$boy] += 1
-						gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-						gs 'cum_call','butt',$boy, 1
-						gs 'boyStat', 'A61'
-						npc_sex[$boy] += 1
-						gs 'arousal', 'bj', 5, 'gangbang', 'sub', 'rough'
-						minut -= 10
-						gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-						gs 'cum_call','anus',$boy, 1,'','',20
-						gs 'boyStat', 'A62'
-						npc_sex[$boy] += 1
-						gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
-						minut -= 10
-						gs 'cum_call','mouth',$boy
-						swallow += RAND(0,1)
-						gs 'stat'
-						gs 'arousal', 'end'
-						gs 'stat'
-						gang +=1
-
-						act 'Finish':minut += 5 & gt'Gadriver', 'Gadbitch'
-					else
-						minut += 5 & gt'Gadriver', 'Gadbitch'
+					act 'Get out of the water':
+						if MiraLoc ! 1 and npc_QW['A63'] >= 13 and temp_gr = 0 and hour >= 8 and hour < 20:
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex12.jpg"></center>'
+							'As soon as you step out of the water, you find yourself standing naked in front of a couple of the village boys, judging from the fishing poles they are carrying, you know they were coming to the river to do some fishing.'
+							'But, seeing you skinny dipping, they instead start talking amongst themselves about how much of a slut you are and the only good thing you are for is sucking cock. You tell them to fuck off, but they are too worked up and not listening to you at all.'
+							gs 'boyStat', 'A63'
+							npc_sex[$boy] += 1
+							gs 'arousal', 'vaginal', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
+							gs 'cum_call','butt',$boy, 1
+							gs 'boyStat', 'A61'
+							npc_sex[$boy] += 1
+							gs 'arousal', 'bj', 5, 'gangbang', 'sub', 'rough'
+							minut -= 10
+							gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
+							gs 'cum_call','anus',$boy, 1,'','',20
+							gs 'boyStat', 'A62'
+							npc_sex[$boy] += 1
+							gs 'arousal', 'bj', 10, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
+							gs 'arousal', 'hj', 5, 'gangbang', 'sub', 'rough'
+							minut -= 10
+							gs 'cum_call','mouth',$boy
+							swallow += RAND(0,1)
+							gs 'stat'
+							gs 'arousal', 'end'
+							gs 'stat'
+							gang +=1
+
+							act 'Finish':minut += 5 & gt'Gadriver', 'Gadbitch'
+						else
+							minut += 5 & gt'Gadriver', 'Gadbitch'
+						end
 					end
 				end
-				
-			end
-			act 'Strip naked':
-				cla
-				minut += 5
-				gs 'underwear', 'remove'
-				 gs 'clothing', 'strip', 'VillageRiver'
-				'Without hesitation, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
-				act 'Continue': gt 'Gadriver', 'Gadbitch'
 			end
 		end
 		if hour >= 8 and hour < 20 and sunWeather = 1:
@@ -505,13 +488,13 @@ if $ARGS[0] = 'Gadbitch':
 								gt'Gadriver', 'Gadbitch'
 							end
 						end
-					end 
+					end
 				end
 			end
 		end
 	end
 	if $clothingworntype ! 'nude': act 'Get changed':gt 'changingroom', 'view_swim_list'
-	if $clothingworntype = 'nude': 
+	if $clothingworntype = 'nude':
 		act 'Get dressed':
 			clothesAtLocation = FUNC('lost_clothes_here','VillageRiver')
 			cla

+ 2 - 0
locations/gadukino.qsrc

@@ -63,8 +63,10 @@ if $ARGS[0] = '':
 		if car > 0 and cardrive = 23: '<a href="exec:GS ''carF'',''start''">Your <<$car>></a> is close by.'
 		if StoryLine = 1 :
 			'Nearby are a series of small farms, on one of which <a href="exec:minut += 5 & gt ''Gaddvor''">your grandparents</a> live.'
+			act 'Grandparent''s house': gt 'Gaddvor'
 		else
 			'Nearby are a series of small farms, on one of which <a href="exec:minut += 5 & gt ''Gaddvor''">old couple</a> live.'
+			act 'Old couple''s house': gt 'Gaddvor'
 		end
 		if npc_rel['A60'] > 0: 'Just down the road from your grandparents house is <a href="exec:minut += 5 & gt ''MiroslavaHome'', ''start''">Mira''s</a> house.'
 		*nl

+ 69 - 57
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
 

+ 26 - 10
locations/gschool_detention.qsrc

@@ -269,12 +269,14 @@ if $ARGS[0] = 'incidental_events':
 	end
 end
 
+!!can be any of the girls from school but a nerd, Veronika, Ekaterina, or Anushka.
 if $ARGS[0] = 'upskirt1':
 	*clr
 	cla
 	minut += 60
-	gs 'gschool_events', 'rand_teacher_arg'
-!!can be any of the girls from school but a nerd, Veronika, Ekaterina, or Anushka.
+	:newupskirtgirl1
+	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
+	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina' or $rand_girl = 'Anushka': jump'newupskirtgirl1'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/spreadg.jpg"></center>'
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting at a table across from you, after a few minutes she leans back in her chair and relaxes. Spreading her legs slightly as she does, the movement draws your eyes and you are given a eye full. Apparently she forgot her panties today because her pussy is now on full display for any to see, well any from the right vantage point, like yourself.'
@@ -302,12 +304,14 @@ if $ARGS[0] = 'upskirt1':
 	end
 end
 
+!!can be any of the girls from school but a nerd, Veronika, or Anushka.
 if $ARGS[0] = 'upskirt2':
 	*clr
 	cla
 	minut += 60
-	gs 'gschool_events', 'rand_teacher_arg'
-!!can be any of the girls from school but a nerd, Veronika, or Anushka.
+	:newupskirtgirl2
+	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
+	if $rand_girl = 'Veronika' or $rand_girl = 'Anushka': jump'newupskirtgirl2'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/upskirt.jpg"></center>'
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> climbing up the small ladder uses to get to the top shelves of the books. As you watch her climb you quickly realize she is not wearing any panties and is giving everyone watching a clear view of her pussy. Before you can say anything someone whistles, which causes the teacher to start demanding who did it. During the distraction she quickly climbs back down and returns to her seat, blushing slightly but also smiling.'
@@ -317,14 +321,16 @@ if $ARGS[0] = 'upskirt2':
 	act 'Go home': gt 'gschool_detention', 'end'
 end
 
+!!can be any of the girls from school but a nerd, Veronika, or Ekaterina
 if $ARGS[0] = 'flashing girl':
 	*clr
 	cla
 	minut += 60
-	gs 'gschool_events', 'rand_teacher_arg'
+	:newflashinggirl
+	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
+	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina': jump'newflashinggirl'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/detflash1.mp4"></video></center>'
-!!can be any of the girls from school but a nerd, Veronika, or Ekaterina
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting in a spot that blocks almost everyones view of her, but yours. She has her phone held in front of her, obviously having a video conversation with someone, then you see her lift her shirt and flash who ever it is on the phone. She laughs a bit apparently at their reaction, the teacher clears his throat at her outburst. She quickly ends the call and spends the rest of the time playing on her phone. After watching her a bit more, you realize she is not going to do anything more so you play on your phone as well, at least there was a little excitement today.'
 	gs 'arousal', 'voyeur', 5
 	gs 'arousal', 'end'
@@ -332,14 +338,16 @@ if $ARGS[0] = 'flashing girl':
 	act 'Go home': gt 'gschool_detention', 'end'
 end
 
+!!can be any of the girls from school but a nerd, Veronika, or Ekaterina
 if $ARGS[0] = 'teasing girl':
 	*clr
 	cla
 	minut += 60
-	gs 'gschool_events', 'rand_teacher_arg'
+	:newteasinggirl
+	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
+	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina': jump'newteasinggirl'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/tease.jpg"></center>'
-!!can be any of the girls from school but a nerd, Veronika, or Ekaterina
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> has snuck off into the book stacks, she is watching some boys watch her, she pulls down her pants and starts to pull down her panties but she stops just before she shows anything, grins as she pulls her clothes back up. After  doing this a few times, each time the boys look hopefully this might be the time, but it never is. Finally she gets bored teasing them and wanders off. After that you start playing on your phone again, at least there was a little excitement today.'
 	gs 'arousal', 'voyeur', 5
 	gs 'arousal', 'end'
@@ -347,14 +355,18 @@ if $ARGS[0] = 'teasing girl':
 	act 'Go home': gt 'gschool_detention', 'end'
 end
 
+!!boy can be Dimka, Andrey, Ivan, Lazar, Svyatoslav, or any of the gopnik boys but Niko. If Sveta is dating any of the boys then they should not be called either.
 if $ARGS[0] = 'handjob':
 	*clr
 	cla
 	minut += 60
-	gs 'gschool_events', 'rand_teacher_arg'
+	gs 'gschool_events', 'rand_boy_arg', 0, 0, 0, 1, 0, 0
+	
+!!fixed the gs, but the other boys must still be included and niko and lovers excluded, if somebody fixes that, remove this comment and the next line (julzor)
+	$rand_boy = 'a boy you don''t know'
+	
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/sex/handjob.jpg"></center>'
-!!boy can be Dimka, Andrey, Ivan, Lazar, Svyatoslav, or any of the gopnik boys but Niko. If Sveta is dating any of the boys then they should not be called either.
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice a girl, you have seen her around but she is from another grade and you can''t recall her name. She is sitting next to <<$rand_boy>> she has his shorts pulled down in front and is jerking him off under the desk. Both of them do a fairly good job of acting like nothing is going on, but from your seat, you have a perfect view of the action.'
 	*nl
 	'Some time later, she has to switch hands one than once, but he finally leans back and closes his eyes. Sensing he is close she tilts his dick down as she keeps jerking him off and cups her other hand under the head of his dick. Moment later he is shooting his load into her hand, a bit of it shoots out onto the floor as well. Once he finishes she lets go of him and brings her hands up to her face, where she starts to lick all his cum off them, as he tucks his dick away. Not long after they sit side by side playing on their phones, pretending like nothing happened. Soon you start playing on your phone as well, at least there was a little excitement today.'
@@ -374,6 +386,7 @@ end
 !!If outcast social group random girl is Sonia or any girl Sveta has a friendship of 50+
 if $ARGS[0] = 'Chat with <<$rand_girl>>':
 	*clr & cla
+	gs 'gschool_events', 'rand_girl_arg', 1, 1, 1, 1, 1, 0
 	!!npc_rel['A?'] += 3
 	gs 'stat'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -391,6 +404,7 @@ end
 !!If outcast social group random boy is Lesco Tsarev, Petia Alkaev or any boy Sveta has a friendship of 50+
 if $ARGS[0] = 'Chat with <<$rand_boy>>':
 	*clr & cla
+	gs 'gschool_events', 'rand_boy_arg', 1, 1, 1, 1, 1, 0
 	!!npc_rel['A?'] += 3
 	gs 'stat'
 	'<center><b><font color="maroon">Detention</font></b></center>'
@@ -440,6 +454,7 @@ if $ARGS[0] = 'Help Friends in need':
 	'They have a whispered argument or discussion - you are not sure which - but when they are done, they both look around and you can tell they are up to something. <<$rand_girl>> leans over to you and whispers: "Can you distract Mr <<$rand_teacher>> for us, so we can slip away?" Both of them give you pleading looks.'
 !!I changed this to give the player a choice if they want to help the couple or not.
 	act 'No':
+		cla & *clr
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/detflirt.jpg"></center>'
 !!not sure if you can code it to give a friend boost to which ever NPC it is, but if so I put in the code but blank number.
@@ -449,6 +464,7 @@ if $ARGS[0] = 'Help Friends in need':
 		act 'Go home': gt 'gschool_detention', 'end'
 	end
 	act 'Yes':
+		cla & *clr
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/detflirt.jpg"></center>'
 !!not sure if you can code it to give a friend boost to which ever NPC it is, but if so I put in the code but blank number.

+ 1 - 1
locations/gskver.qsrc

@@ -102,10 +102,10 @@ if $ARGS[0] = 'start':
 		if home_owned[2] = 0 and workPTU <= 2 and HotelRoom < 1:
 			!nowhere to live in town
 			'It''s quite dark now, and you have no where to stay nearby. Maybe you should try to sleep on a bench?'
+			if StoryLine = 1:*P ' Or try your luck, go Uncle Shulgin''s Apartment?'
 		else
 			'It''s quite dark now, and you don''t feel like walking. Maybe you Should try sleeping on a bench?'
 		end
-		if StoryLine = 1:*P ' Or try your luck, go Uncle Shulgin''s Apartment?'
 		act 'Sleep on a bench': gt'placer_sex','sleeping_park_bench'
 	end
 

+ 15 - 11
locations/lact_lib.qsrc

@@ -365,17 +365,19 @@ end
 if $ARGS[0] = 'bp_milking':
 	pumptime = 0
 	pumptype = 0
-	if $location_type ! 'bathroom' and pcs_exhibition < 60:
+	if $location_type ! 'bathroom' and pcs_inhib < 50:
 		'You can''t use it here.'
+		act 'Don''t pump':gt $loc, $metka
 	else
 		*clr
 		cla
-		pumptime = input ("How long do you plan to pump your breasts? (Not more than 60 minutes)")
-		if pumptime <= 0 or pumptime > 60:
+		pumptime = input ("How long do you plan to pump your breasts?<br>(Defaults 15 minutes, maximum 60 minutes)")
+		if pumptime = '':pumptime = 15
+		if pumptime > 0 and pumptime <= 60:
+			gt 'lact_lib', 'milking'
+		elseif pumptime <= 0 or pumptime > 60:
 			minut += 2
 			act 'Don''t pump':gt $loc, $metka
-		elseif pumptime > 0 and pumptime <= 60:
-			gt 'lact_lib', 'milking'
 		end
 	end
 end
@@ -386,17 +388,19 @@ end
 if $ARGS[0] = 'man_milking':
 	pumptime = 0
 	pumptype = 1
-	if $location_type ! 'bathroom' and pcs_exhibition < 60:
+	if $location_type ! 'bathroom' and pcs_inhib < 50:
 		'You can''t do this here.'
+		act 'Don''t pump':gt $loc, $metka
 	else
 		*clr
 		cla
-		pumptime = input ("How long would you like to milk your breasts? (Not more than 60 minutes)")
-		if pumptime <= 0 or pumptime > 60:
-			minut += 2
-			act 'Don''t milk':gt $loc, $metka
-		elseif pumptime > 0 and pumptime <= 60:
+		pumptime = input ("How long would you like to milk your breasts?<br>(Default 15 minutes, maximum 60 minutes)")
+		if pumptime = '':pumptime = 15
+		if pumptime > 0 and pumptime <= 60:
 			gt 'lact_lib', 'milking'
+		elseif pumptime <= 0 or pumptime > 60:
+			minut += 2
+			act 'Don''t pump':gt $loc, $metka
 		end
 	end
 end

+ 2 - 2
locations/laketoilet.qsrc

@@ -11,9 +11,9 @@ if $ARGS[0] = 'main':
 
 	cla
 	*clr
-	LCtoiletiventrand = rand(1, 100)
+	LCtoiletiventrand = rand(1,100)
 
-	if hour < 4 and LCtoiletiventrand >= 83:
+	if (hour >= 22 or hour <= 4) and LCtoiletiventrand >= 75:
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bbq/sex/toiletsexstart.jpg"></center>'
 		'When you enter the restroom, you see a naked man slowly jerking himself off. He hasn''t noticed you yet.'
 

+ 1 - 1
locations/mitka.qsrc

@@ -154,7 +154,7 @@ else
 					elseif pcs_ass >= 25:
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaanalhome2.jpg"></center>'
 					end
-					'Mitka takes you to his house and onto the veranda.  He has you sit on the couch and begins pawing at your cloths pulling them off you.'
+					'Mitka takes you to his house and onto the veranda. He has you sit on the couch and begins pawing at your cloths pulling them off you.'
 					gs 'boyStat', 'A63'
 					npc_sex[$boy] += 1
 					npc_QW['A63'] += 1

+ 21 - 27
locations/placer_sex.qsrc

@@ -41,32 +41,26 @@ if $args[0] = 'meet':
 		'After the guys show you around their apartment, they begin to prepare a table in the kitchen. You offer to help them and they gladly accept, and the three of you have the table ready in no time. Then one of them produces a bottle of vodka and asks: "Thanks for the help, <<$pcs_nickname>>... would you like a drink?"'
 		Act 'Drink with the guys': gt 'placer_sex', 'vodka'
 		Act 'Decline the drink':gt 'placer_sex', 'game'
-
 	else
-		if dormrape = 0:
+		cls
+		alko += 10
+		cumspclnt = 2
+		gs 'cum_cleanup'
+		pcs_breath = 0
+		minut += 30
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/sex/sleep/drunk.jpg"></center>'
+		'They can stomach their alcohol a lot better than you, and before you know it you''re absolutely hammered. The guys look like they''re still feeling fine.'
+		'Once they realize you''re drunk enough for them to make their move, they begin tugging at your clothes and undress you on one of their beds. You''re too drunk to fight them off, and just let it happen.'
+		'Once they have you naked, you hear the <<$kol_man_text>> discussing among one another: "Alright, we got her here... that was easy! Whose turn is it to go first?"'
+		act 'Continue':
 			cls
-			alko += 10
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			minut += 30
-			gs'stat'
-			'<center><img <<$set_imgh>> src="images/shared/sex/sleep/drunk.jpg"></center>'
-			'They can stomach their alcohol a lot better than you, and before you know it you''re absolutely hammered. The guys look like they''re still feeling fine.'
-			'Once they realize you''re drunk enough for them to make their move, they begin tugging at your clothes and undress you on one of their beds. You''re too drunk to fight them off, and just let it happen.'
-			'Once they have you naked, you hear the <<$kol_man_text>> discussing among one another: "Alright, we got her here... that was easy! Whose turn is it to go first?"'
-			act 'Continue':
-				cls
-				rape += 1
-				gang += 1
-				dormrape += 1
-				minut += 5
-				guy += kol_man
-				ciklkm = kol_man
-				if dormrapeQW = 0:dormrapeQW = 1
-				gt $curloc
-			end
-		elseif dormrape = 1:
+			rape += 1
+			gang += 1
+			minut += 5
+			guy += kol_man
+			ciklkm = kol_man
+			if dormrapeQW = 0:dormrapeQW = 1
 			rand1=rand(0,100)
 			if rand1<10:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/sex/gop/gopgang2.jpg"></center>'
 			if rand1>=10:'<center><video autoplay loop src="images/locations/pavlovsk/park/sex/orgy1,'+rand(0,4)+'.mp4"></video></center>'
@@ -98,10 +92,10 @@ if $args[0] = 'meet':
 			gs'stat'
 			endrandom = RAND (0,1)
 			if endrandom = 0:
-			'Finally the last guy spills his seed over your exhausted body, and they all leave the room except for <<$boydesc2>>. He sits down on a different bed, chuckling while he watches you sluggishly brush up. Your legs are shaky from the exhaustion, and the alcohol is also still in your system. Both of those factors make you feel rather disoriented, and you try to ignore <<$boydesc2>>''s smug grin. When you''re ready to leave, he waves you goodbye with a smirk on his face: "You were a nice fuck, <<$pcs_nickname>>. I see why Pavlovsk girls are so popular... we''ll definitely be visiting again."'
+				'Finally the last guy spills his seed over your exhausted body, and they all leave the room except for <<$boydesc2>>. He sits down on a different bed, chuckling while he watches you sluggishly brush up. Your legs are shaky from the exhaustion, and the alcohol is also still in your system. Both of those factors make you feel rather disoriented, and you try to ignore <<$boydesc2>>''s smug grin. When you''re ready to leave, he waves you goodbye with a smirk on his face: "You were a nice fuck, <<$pcs_nickname>>. I see why Pavlovsk girls are so popular... we''ll definitely be visiting again."'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Leave the hostel':podvalrape = 0 & dormrape = 0 & gt'pavResidential'
+				act 'Leave the hostel':podvalrape = 0 & gt'pavResidential'
 
 			elseif endrandom = 1:
 				act 'Open your eyes':
@@ -118,7 +112,7 @@ if $args[0] = 'meet':
 					'Those bastards! You quickly get dressed and try to cover up the writings as much as you can before leaving the room. Hopefully you can clean that up before anyone sees it on you!'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave the hostel':podvalrape = 0 & dormrape = 0 & gt'pavResidential'
+					act 'Leave the hostel':podvalrape = 0 & gt'pavResidential'
 				end
 			end
 		end

+ 14 - 4
locations/sauna.qsrc

@@ -97,7 +97,13 @@ if $ARGS[0] = 'saunaroom':
 		'<br>Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
 	end
 
-	if money > 0 and workDolg > 0:workDolg -= money & money = 0
+	if SaunaWhore > 0 and money > 0 and workDolg > 0:
+		workDolg = dolg_temp
+		workDolg -= money
+		money -= dolg_temp
+		if money < 0: money = 0
+		if workDolg < 0: workDolg = 0
+	end
 	if workDolg > 0:'Your debt is <<workDolg>> <b>₽</b>'
 
 	act '<b>Exit to the sauna</b>':gt 'saunawhore', 'saunawork'
@@ -105,7 +111,7 @@ if $ARGS[0] = 'saunaroom':
 	if workDolg > 0:
 
 		act 'Have some food (0:15)':
-			gs 'food', 'snack'
+			gs 'food', 'm_meal'
 			workDolg += 100
 		end
 		act 'Drink some water (0:05)':
@@ -122,7 +128,7 @@ if $ARGS[0] = 'saunaroom':
 
 		if money >= 100:
 			act 'Buy some food (0:15) (100 <b>₽</b>)':
-				gs 'food', 'snack'
+				gs 'food', 'm_meal'
 				money -= 100
 			end
 		end
@@ -157,7 +163,11 @@ if $ARGS[0] = 'saunaroom':
 			end
 		else
 			act '<<$sleep_txt>>':
-				workDolg += 850
+				if SaunaWhore > 0:
+					workDolg += 850
+				elseif SaunaWhore = 0:
+					money -= 850
+				end
 				if disable_autosave = 0:
 					if StoryLine = 0:
 						savegame 'autosave.sav'

+ 13 - 4
locations/saunawhore.qsrc

@@ -140,9 +140,15 @@ if $ARGS[0] = 'clientGate':
 	'He seems to be in a <<$moodType>> mood.'
 
 	gs 'stat'
-
-	act 'Take off your clothes':gt 'saunawhore', 'simplystrip'
-	if pcs_dancero >= 10:act 'Do a little striptease':gt 'saunawhore', 'striptease'
+	if $clothingworntype = 'nude':
+		moodTypeRand += 1
+		act 'Get straight to business':gt 'saunawhore', 'strippedGate'
+		gs 'arousal', 'foreplay', 3, 'prostitution'
+		gs 'stat'
+	else
+		act 'Take off your clothes':gt 'saunawhore', 'simplystrip'
+		if pcs_dancero >= 10:act 'Do a little striptease':gt 'saunawhore', 'striptease'
+	end
 end
 
 if $ARGS[0] = 'striptease':
@@ -168,7 +174,7 @@ end
 if $ARGS[0] = 'strippedGate':
 	minut += 2
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/nakedstand.jpg"></center>'
-	'You are now fully naked in front of the client, his eyes devouring every inch of your young body.'
+	'You are fully naked in front of the client, his eyes devouring every inch of your young body.'
 
 	if pcs_dancero >= 20:act 'Dance naked':gt 'saunawhore', 'nakeddance'
 	act 'Kneel and open your mouth':gt 'saunawhore', 'blowjob'
@@ -1061,6 +1067,9 @@ if $ARGS[0] = 'bathroom':
 	dynamic $quickwash
 	dynamic $bteeth
 	dynamic $basin
+	if breastpump > 0:
+		act 'Use breast pump':gt 'lact_lib', 'bp_milking'
+	end
 end
 
 if $ARGS[0] = 'saunabrit':

+ 12 - 12
locations/soba.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'polactdog':
 
 		act '....':
 			cls
-			gs 'cum_call', '', 'A191', 1, 0, -1, 60
+			gs 'cum_call', '', $petID, 1, 0, -1, 60
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/beast/zoo/vag2.jpg"></center>'
 			'You push your ass higher and rest his paws on the ground, becoming more comfortable for the males dick. Your pussy greedily swallows every centimeter of this member, milking him, squeezing along the entire length. Your Pussy burns and drips with love juice, some of it tricklomg down his thighs and dripping to the ground. The thrusts of the dog became more violent and stronger. Soon he began to growl and you began to push your ass into his penis, trying to swallow more of it. Your pussy walls squeeze as his cock grows inside, and he drives his cock to the balls. His unit expands in your pussy, pushing against your wall, his knot tightly binding you together. The dog begins to escape but the member is firmly stuck in your pussy. You squeeze it tight at the base, determined not to be released until it pumps his bitch full of sperm. You scream when the sperm finally hits, filling your throbbing pussy completely, his thick, hot sperm is warm inside you. His member spent and throbbing in your depths, your pussy milking him of his semen, sucking in every last drop. Cum begins to flow down your legs trickling down your thighs. You are completely filled with his sperm. The dog struggles and moves around but you stay pressed together for a few minutes with his knot in his prize. Eventually his knot loosens and you are released from him. You fall to the ground, the dogs thick spunk flowing out of your pussy and pooling around you on the ground'
@@ -96,7 +96,7 @@ if $ARGS[0] = 'polactdog':
 
 		act '....':
 			cls
-			gs 'cum_call', 'anus', 'A191', 1, 0, -1, 60
+			gs 'cum_call', 'anus', $petID, 1, 0, -1, 60
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/beast/zoo/anal2.jpg"></center>'
 			'You feel it as he starts spewing his liquid inside your ass. Having stood in the positiong for a few minutes, but the ball on his penis doesn''t decrease and the bored dog begins to pull out of your anus growling. In pain you started yelling, feeling like his huge cock will rip your anus in two. There is a distinctive "schlpop!" sound as his cock pops out of your ass, which gushes sperm mixed with secretions from your anus down your belly.'
@@ -119,7 +119,7 @@ if $ARGS[0] = 'dogreiqdi':
 	minut += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/beast/zoo/girl.jpg"></center>'
-	'once you calm down and adjust yourself you kiss the dog and decide to head home. recovering yourself after intercourse, you struggle to your feet, adjusting your clothes you notice a girl. she watches with curiosity and excitement explicitly looking for all your shows. The girl opens her mouth and wants to say something, but stops and runs away. You watch in a mild surprise but also the fact that you were watched getting filled. you call the dog and go home.'
+	'Once you calm down and adjust yourself you kiss <<$namesob>> and decide to head home. Recovering yourself after intercourse, you struggle to your feet, adjusting your clothes you notice a girl. She watches with curiosity and excitement explicitly looking for all your shows. The girl opens her mouth and wants to say something, but stops and runs away. You watch in a mild surprise but also the fact that you were watched getting filled. You call <<$namesob>> and go home.'
 
 	act 'Leave':gt 'korr'
 end
@@ -194,7 +194,7 @@ if $ARGS[0] = 'gamedog':
 			act 'Take it':
 				cla
 				*clr
-				gs 'cum_call', 'face', 'A191', 1, 0, -1, 60
+				gs 'cum_call', 'face', $petID, 1, 0, -1, 60
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/beast/zoo/9.jpg"></center>'
 				'My sexy dog completes with a powerful ejaculation, which blasts all over your face, getting a few drops in your mouth.'
@@ -317,7 +317,7 @@ if $ARGS[0] = 'hardcoredog':
 										act 'Take me to Nivarna <<$namesob>>':
 											cla
 											*clr
-											gs 'cum_call', '', 'A191', 1, 0, -1, 60
+											gs 'cum_call', '', $petID, 1, 0, -1, 60
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/beast/zoo/spa7.jpg"></center>'
 											'You clung to the dog and he starts cumming inside you.'
@@ -452,7 +452,7 @@ end
 if $ARGS[0] = 'cumshot2':
 	cla
 	*clr
-	gs 'cum_call', '', 'A191', 1, 0, -1, 60
+	gs 'cum_call', '', $petID, 1, 0, -1, 60
 	'<center><img <<$set_imgh>> src="images/beast/zoo/zoof8.jpg"></center>'
 	'<<$namesob>> discharges into your vagina, you stick together with the dog passionately'
 
@@ -472,7 +472,7 @@ if $ARGS[0] = 'cumshot1':
 	cla
 	*clr
 	swallow += 1
-	gs 'cum_call', 'mouth', 'A191', 1, 0, -1, 60
+	gs 'cum_call', 'mouth', $petID, 1, 0, -1, 60
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/beast/zoo/zoof11.jpg"></center>'
@@ -493,7 +493,7 @@ end
 if $ARGS[0] = 'zoof14':
 	cla
 	*clr
-	gs 'cum_call', '', 'A191', 1, 0, -1, 60
+	gs 'cum_call', '', $petID, 1, 0, -1, 60
 	'<center><img <<$set_imgh>> src="images/beast/zoo/yl4.jpg"></center>'
 	'You take the hold of <<$namesob>>s cock and start to fuck yourself with it.'
 
@@ -512,7 +512,7 @@ end
 if $ARGS[0] = 'zoof15':
 	cla
 	*clr
-	gs 'cum_call', '', 'A191', 1, 0, -1, 60
+	gs 'cum_call', '', $petID, 1, 0, -1, 60
 	pcs_vag += 3
 	'<center><img <<$set_imgh>> src="images/beast/zoo/yl5.jpg"></center>'
 	'You turn your back on <<$namesob>>, he jumps on you and starts to fuck you.'
@@ -581,7 +581,7 @@ if $ARGS[0] = 'zoof27':
 	act 'Undress and play lady dog':
 		cla
 		*clr
-		gs 'cum_call', '', 'A191', 1, 0, -1, 60
+		gs 'cum_call', '', $petID, 1, 0, -1, 60
 		'<center><img <<$set_imgh>> src="images/beast/zoo/kuh.jpg"></center>'
 		'You assume the position, doggy ​​jumps on you and starts fucking.'
 		'It doesn''t take for <<$namesob>> to cum inside you.'
@@ -666,7 +666,7 @@ end
 if $ARGS[0] = 'dogcancerstyle':
 	cla
 	*clr
-	gs 'cum_call', '', 'A191', 1, 0, -1, 60
+	gs 'cum_call', '', $petID, 1, 0, -1, 60
 	'<center><img <<$set_imgh>> src="images/beast/zoo/zal3.jpg"></center>'
 	'You get on all fours and your dog ​​jumps you and starts fucking your pussy.'
 	'It doesn''t take for <<$namesob>> to cum inside you.'
@@ -685,7 +685,7 @@ end
 if $ARGS[0] = 'dogmissionarystyle':
 	cla
 	*clr
-	gs 'cum_call', '', 'A191', 1, 0, -1, 60
+	gs 'cum_call', '', $petID, 1, 0, -1, 60
 	'<center><img <<$set_imgh>> src="images/beast/zoo/zal2.jpg"></center>'
 	'You push yourself up on ti your feet, from this better angle <<$namesob>> easily finds his way into your pussy.'
 	'It doesn''t take for <<$namesob>> to cum inside you.'

+ 2 - 2
locations/stat_display.qsrc

@@ -1099,8 +1099,8 @@ elseif mosol >= 30:
 	$stat_msg += '<BR><b><font color="red">Your pussy feels a little itchy, it seems to be from rubbing against your clothing.</font></b>'
 end
 
-if analplugIN = 1:$stat_msg += '<BR><b><font color="red">You have a butt plug inserted in your ass.</font></b>'
-if vibratorin = 1:$stat_msg += '<BR><b><font color="red">You have a vibrator inserted in your vagina.</font></b>'
+if analplugIN = 1:$stat_msg += '<BR><b><font color = #FF1493>You have a butt plug inserted in your ass.</font></b>'
+if vibratorin = 1:$stat_msg += '<BR><b><font color = #FF1493>You have a vibrator inserted in your vagina.</font></b>'
 !$stat_msg += '<BR>'
 if young_shop_work = 1:
 	if hour = 16 and minut <= 5 and week < 6 and inWorkYoungShop = 0:

+ 9 - 9
locations/swamp.qsrc

@@ -10,7 +10,7 @@ new_bilberry = 0
 gs'stat'
 !gs'time'
 goswamp = 1
-	
+
 '<center><H4>Swamp</H4></center>'
 if month >= 4 and month <= 10:
 	if hour >= 6 and hour < 22:
@@ -32,20 +32,20 @@ end
 if hour >= 6 and hour <= 21 and month >= 6 and month <= 9:
 	act 'Walk into the forest':swamp_clothes = 0 & minut += 30 & gt 'gadforest','4'
 end
-if hour >= 6 and hour < 21:	
-    act 'Return to the edge of the forest':swamp_clothes = 0 & hanters = 0 & minut += 150 & gt 'gadforest','1'
+if hour >= 6 and hour < 21:
+	act 'Return to the edge of the forest':swamp_clothes = 0 & hanters = 0 & minut += 150 & gt 'gadforest','1'
 else
-    act 'Return to the edge of the forest':swamp_clothes = 0 & hanters = 0 & gt 'gadforest_event', 'forest_road'
+	act 'Return to the edge of the forest':swamp_clothes = 0 & hanters = 0 & gt 'gadforest_event', 'forest_road'
 end
 
 if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and swamp_day ! daystart:
-   	act 'Look for berries (0:30)':
-   	    cla
-        *clr
+	act 'Look for berries (0:30)':
+		cla
+		*clr
 		minut += 30
 		temp = RAND(1,2)
 		swamp_day = daystart
-		if goforest < 20:goforest += rand(0,1)		
+		if goforest < 20:goforest += rand(0,1)
 		new_bilberry += rand(4,5)
 		bilberry += new_bilberry
 		pcs_mood += 5
@@ -54,7 +54,7 @@ if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry
 		gs 'gadforest', 'clothes1'
 		'You spend half an hour wandering through the woods in search of mushrooms or berries and manage to found <<new_bilberry>> kg of berries.'
 		act 'Further': gt'swamp'
- 	end
+	end
 end
 
 --- swamp ---------------------------------

+ 6 - 5
locations/swamp_yard.qsrc

@@ -218,24 +218,24 @@ if hanterhelp = 2 and hantersKnow = 0:
 
 	!swamp_clothes - temporary clothing if he came naked
 	if $clothingworntype = 'nude' and hantersKnowSlut = 0:
-		act 'Take the burlap and walk away':
+		act 'Take the hessian and walk away':
 			*clr & cla
 			hanterhelp = 0
 			swamp_clothes = 1
 			gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
-			'You thank them and quickly cover yourself with the piece of burlap... It''s not much but it''s at least better than nothing.'
+			'You thank them and quickly cover yourself with the piece of hessian... It''s not much but it''s at least better than nothing.'
 			act'Further':gt 'swamp_yard'
 		end
-		act 'Take the burlap and stay':
+		act 'Take the hessian and stay':
 			*clr & cla
 			hanterhelp = 0
 			swamp_clothes = 1
 			gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
-			'You thank them and quickly cover yourself with the piece of burlap... It''s not much but it''s at least better than nothing.'
+			'You thank them and quickly cover yourself with the piece of hessian... It''s not much but it''s at least better than nothing.'
 			act'Further':gt 'hanters', 'start'
 		end
 	else
@@ -403,7 +403,7 @@ if hour >= 8 and hour < 20:
 					minut+=5
 					swamp_clothes = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
-					'You quickly rush inside the hut and hide behind a piece of burlap... It''s not much, but at least it''s better than nothing.'
+					'You quickly rush inside the hut and hide behind a piece of hessian... It''s not much, but at least it''s better than nothing.'
 					act'Further':gt 'swamphouse'
 				end
 			end
@@ -1022,6 +1022,7 @@ if StoryLine = 1 and lost_girl > 0 and daystart > lost_girl:
 	forest_lostday = 0
 	dirtyclothes = 0 & swamp_clothes = 0
 	hanters = 0
+	gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/forester.jpg"></center>'

+ 6 - 20
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