Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into work

locations/Gadbana.qsrc

@@ -134,7 +134,8 @@ if mira = 0:
 			end
 		end
 	end
-	if stanok > 0:'Your razor will last for <b><<stanok>></b> more shavings. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>. There''s a small shaving <a href="exec:gt ''mirror'', ''start''">mirror</a> resting on the window sill, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+	if stanok > 0:'Your razor will last for <b><<stanok>></b> more shavings. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>.'
+	'There''s a small shaving <a href="exec:gt ''mirror'', ''start''">mirror</a> resting on the window sill, which you can use to ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 
 	!WD: heal chafe
 	if mosolmaz>0:'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'
@@ -174,26 +175,6 @@ if mira = 0:
 
 	dynamic $brit
 
-	if dirtyclothes = 1 and $loc = 'Gadbana':
-		act 'Wash your clothes (1:00)':
-			cla
-			*clr
-			minut += 60
-			dirtyclothes = 0
-			pcs_mood -= 10
-			cumspclnt = 6 & gs 'cum_cleanup'
-			gs 'stat'
-			if $clothingworntype = 'nude':
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basinwash.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
-				 'You undress and wash your dirty clothes.'
-			end
-			*nl
-			'You soak your muddy clothes and underwear in the basin and pour in washing powder, then you scrub them until they are finally clean.'
-			act 'Finish':gt $loc, $metka
-		end
-	end
 	if breastpump > 0 and bp_unbox >= 1:
 		act 'Use breast pump':
 			gt 'lact_lib', 'bp_milking'

locations/Gadhouse.qsrc

@@ -134,9 +134,9 @@ if $ARGS[0] = 'Main':
 	gs 'stat'
 	'<center><H4>Your Grandparents'' Cottage</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
-	'A fairly simple cottage in the village of Gadukino which your grandparents call home. In the main room there is a huge <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gad = 1 & gt ''bed2''">bed</a> where you can rest. The bed is more comfortable than it looks.'
+	'A fairly simple cottage in the village of Gadukino which your grandparents call home. In the main room there is a huge <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gad = 1 & gt ''bed'', ''start''">bed</a> where you can rest. The bed is more comfortable than it looks.'
 	'There is an old <a href="exec:gt ''TV'',''gad''">television</a> in the living room. It''s positioned next to a body length <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
-	'You can check your weight on your grandma''s old mechanical <a href="exec:msg ''<center>Your weight is <<pcs_weight>> kg<br>Your body mass index (BMI) is <<bmi_calc>>. <<$bmi_desc>></center>''">scales</a>.'
+	'You can check your weight on your grandma''s old mechanical <a href="exec:msg ''<center>Your weight is <<pcs_weight>> kg<br>Your body mass index (BMI) is <<bmi_calc>>.<br><<$bmi_desc>></center>''">scales</a>.'
 
 	if hour < 8:
 		temp = RAND(0,9)
@@ -195,10 +195,10 @@ if $ARGS[0] = 'Main':
 	end
 
 	act 'Go outside':
-		if $clothingworntype ! 'nude':
+		if $clothingworntype ! 'nude' and swamp_clothes = 0:
 			minut += 1 & gt 'Gaddvor'
-		else
-			msg'<b><font color = red>You can''t leave the house naked! You need to get dressed first.</font></b>'
+		elseif $clothingworntype = 'nude' or swamp_clothes = 1:
+			msg'<b><font color = red>You can''t leave the like this! You need to put some clothes on first.</font></b>'
 			gt 'Gadhouse', 'Main'
 		end
 	end
@@ -388,6 +388,7 @@ if $ARGS[0] = 'Main':
 	end
 
 	if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+	act 'Relax on your bed': gt 'bed', 'start'
 end
 
 if $ARGS[0]='grandma':

locations/HotelHole.qsrc

@@ -126,6 +126,7 @@ if maidqw >= 1 and hour >= 16 and hour < 17:
 			cla
 			*clr
 			maid_cloth = 1
+			if pcs_inhib < 30: inhib_exp += 1
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/maid.cloth'+rand(0,5)+'.jpg"></center>'
 			'You sit down in the locker room and look at the maid uniform. You run your hands over the delicate fabric while you think: "Hmm, it''s a bit skimpy. I bet that''s why the hotel manager thinks this is important, the guests probably love seeing the maids like this!"'
 			'You quickly take off your own clothes, and put the maid uniform on as instructed. After a few quick poses in the mirror you''re convinced: the manager is a pervert! Then again, it does look cute on you. All you have to is clean and prepare rooms for guests... why not look good while you do?'

locations/ParkKafe.qsrc

@@ -9,26 +9,25 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	'<center><B><font color=maroon>Park Cafe</font></B></center>'
-	*nl
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/parkcafe.jpg"></center>'
+	*nl
+
+	act 'Leave the cafe': killvar 'pk_rand' & minut += 5 & gt 'park', 'start'
 
-	act 'See the menu':gs 'food_menu'
+	act 'Order from the menu (0:05)':pk_rand = rand(1, 7) & gs 'food_menu'
 	if money >= 350:
-		act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
+		act 'Order take-out (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 	end
 	'Whilst sitting and eating in the summer cafe. You take a moment and enjoy the beautiful scenery.'
 
-	arand = rand(1, 7)
+	if pk_rand = 1:'You look around and notice the cafe visitors, strolling past is a <a href="exec:gt ''ParkKafe'', ''youth''">Youth</a>.'
+	if pk_rand = 2:'You look around and notice the cafe visitors, sitting alone is a young <a href="exec:gt ''ParkKafe'', ''the_boy''">Man</a>.'
+	if pk_rand = 3:'You are watching the world go by, when you see some <a href="exec:gt ''ParkKafe'', ''negros''">Africans</a>.'
+	if pk_rand = 4:'You are watching the world go by, when you see a <a href="exec:gt ''ParkKafe'', ''woman''">woman</a> looking imperious.'
+	if pk_rand = 5:'You look around and notice the cafe visitors, you see a solid older <a href="exec:gt ''ParkKafe'', ''man''">man</a>.'
+	if pk_rand = 6:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''Armenians''">Armenians</a> sitting at a table.'
+	if pk_rand = 7:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''guys''">sporty guys</a> sitting at a table and drinking beer.'
 
-	if arand = 1:'You look around and notice the cafe visitors, strolling past is a <a href="exec:gt ''ParkKafe'', ''youth''">Youth</a>.'
-	if arand = 2:'You look around and notice the cafe visitors, sitting alone is a young <a href="exec:gt ''ParkKafe'', ''the_boy''">Man</a>.'
-	if arand = 3:'You are watching the world go by, when you see some <a href="exec:gt ''ParkKafe'', ''negros''">Africans</a>.'
-	if arand = 4:'You are watching the world go by, when you see a <a href="exec:gt ''ParkKafe'', ''woman''">woman</a> looking imperious.'
-	if arand = 5:'You look around and notice the cafe visitors, you see a solid older <a href="exec:gt ''ParkKafe'', ''man''">man</a>.'
-	if arand = 6:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''Armenians''">Armenians</a> sitting at a table.'
-	if arand = 7:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''guys''">sporty guys</a> sitting at a table and drinking beer.'
-
-	act 'Leave': minut += 5 & gt 'park', 'start'
 end
 
 if $ARGS[0] = 'guys':

locations/anushapt.qsrc

@@ -1516,7 +1516,11 @@ if $ARGS[0] = 'holodilnik':
 			pcs_mood += 20
 			fat += 2
 			pcs_energy += 50
-			water += 40
+			if pcs_hydra >= 100:
+				pcs_hydra += 20
+			else
+				pcs_hydra += 40
+			end
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 0

locations/backwater.qsrc

@@ -1,56 +1,18 @@
 # backwater
 
 $location_type = 'secluded'
-$metka = ''
 $loc = 'backwater'
+$metka = ''
+$menu_loc = 'backwater'
+$menu_arg = ''
+menu_off = 0
 gs 'gadukino_event', 'sound'
 cls
 gs'stat'
 clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
 
-!events before everything
-if $clothingworntype = 'nude' and hantersKnowSlut = 0 and hanters = 1 and hour > 8 and hour < 20 and hanterknowday < day:
-	cla
-	*clr
-	minut += 5
-	gs 'stat'
-	'<center><B>Backwater</B></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hunter_looks.jpg"></center>'
-	'While cleaning yourself in the backwater, you suddenly get the feeling that you are not alone here. Turning around, you see one of the hunters. He''s just standing there watching you, his camouflage is almost indistinguishable compared to the bushes and trees.'
-
-	if clothesAtLocation = 1 and clearclothes = 0 :
-		act'Get dressed':
-			cls
-			minut += 5
-			gs 'underwear', 'wear'
-			gs 'clothing', 'recover_lost_clothes', 'backwater', 1
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude1.jpg"></center>'
-			'Noticing the hunter, you rush over to your clothes and begin dressing yourself in panic. As you get fully dressed, you look over your shoulder, expecting the hunter standing there, but there is no one there.'
-			act'Further':gt 'backwater'
-		end
-	else
-		act'Hide':
-			cls
-			minut += 1
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude2.jpg"></center>'
-			'Covering your breasts and crotch you jump into the nearest bush. In your state of fear and confusion, you start scanning the area but you don''t see anyone there. You quickly run back towards the cabin.'
-			act'Go back to the hut':gt 'swamp_yard'
-		end
-	end
-	act'Stay naked':
-		cls
-		hanterslut += 1
-		hanterknowday = day
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude3.jpg"></center>'
-		'You decide that you have nothing to be afraid of, and continue on completely nude. The hunter looks at you for a minute or so, all of a sudden you hear a "Hmph", him turning around and going away.'
-		act'Further':gt 'backwater'
-	end
-	exit
-end
+act 'Go back to the hut':minut += 5 & gt'swamp_yard'
 
-!start location
 '<center><B>Backwater</B></center>'
 
 if month >= 4 and month <= 10:
@@ -66,14 +28,114 @@ else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwater_winter_night.jpg"></center>'
 	end
 end
+*nl
 
 'A small creek with relatively clean water. If the weather is warm you can clean yourself up. Also, if your clothes are dirty you can wash them here.'
+*nl
 if clothesAtLocation = 1:'Your clothes lie on the shore.'
 
-!re-arrange it, there should be no logic error now by illume
+if $clothingworntype = 'nude':
+	act 'Wash self':
+		cla
+		*clr
+		dynamic $showerdin
+		face_write = 0
+		body_write = 0
+		minut += 30
+		pcs_mood += 10
+		pcs_willpwr += 5
+		inhib_exp += rand(1,3)
+		if hantersRape = 1: hantersRape = 2
+
+		if $pantyworntype = 'none':
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim2.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
+		end
+			*nl
+		'You washed yourself in the creek.'
+
+		act 'Finish':gt 'backwater'
+	end
+end
+if cumloc[11] = 1 or cumloc[12] = 1:
+	act 'Clean the sperm from your face (0:10)':
+		cla
+		*clr
+		pcs_makeup = 1
+		cumspclnt = 9
+		gs 'cum_cleanup'
+		cumspclnt = 13
+		gs 'cum_cleanup'
+		if pcs_sweat > 19 : pcs_sweat -= 5
+		minut += 10
+		if hantersRape = 1: hantersRape = 2
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
+		*nl
+		'You carefully wash off the sperm in the creek.'
+		act 'Finish':gt 'backwater'
+	end
+end
+if body_write > 0 or face_write > 0:
+	act 'Wash the writings off your body (0:10)':
+		cla
+		*clr
+		body_write = 0
+		face_write = 0
+		minut += 10
+		gs'stat'
+
+		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash1.jpg"></center>'
+		*nl
+		'You wash off the indecent inscriptions on your body.'
+
+		act 'Finish':menu_off = 0 & gt $loc, $metka
+	end
+end
+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
+		if hantersRape = 1: hantersRape = 2
+		gs'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/cumwash.jpg"></center>'
+		*nl
+		'You clean the cum stains off your clothes.'
+
+		act 'Finish':gt 'backwater'
+	end
+end
+
+if spdirty > 0:
+	act 'Quick wash (0:15)':
+		cla
+		*clr
+		cumspclnt = 4
+		gs 'cum_cleanup'
+		if pcs_sweat < 30:
+			pcs_sweat = 15 + rand(0,4)
+		else
+			pcs_sweat -= 10 + rand(0,4)
+		end
+		minut += 15
+		if hantersRape = 1: hantersRape = 2
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/facesp.jpg"></center>'
+		*nl
+		'You carefully wash your face, removing any impurities.'
+		act 'Finish':gt 'backwater'
+	end
+end
+
 if clothesAtLocation = 0:
 	if $clothingworntype ! 'nude' and temper >= 15:
-		act'Undress':
+		act'Get undressed':
 			if hantersKnowSlut > 0 or hanters = 0 or hour < 8 or hour >= 20 or pcs_inhib > 35:
 				cla
 				*clr
@@ -97,6 +159,8 @@ if clothesAtLocation = 0:
 				act'Back':gt'backwater'
 			end
 		end
+	else
+	'It''s too cold to undress. Maybe you should bathe inside the hut'
 	end
 else
 	if $clothingworntype ! 'nude':
@@ -116,152 +180,50 @@ else
 			'You pick up your clothes laying on the ground and get dressed.'
 			gt $loc, $metka
 		end
-
 	end
 end
 
-if $clothingworntype = 'nude':
-	act 'Wash self':
-		cla
-		*clr
-		dynamic $showerdin
-		face_write = 0
-		body_write = 0
-		minut += 30
-		pcs_mood += 10
-		pcs_willpwr += 5
-		inhib_exp += rand(1,3)
-		if hantersRape = 1: hantersRape = 2
-
-		if $pantyworntype = 'none':
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim2.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
-		end
-		'You washed yourself in the creek.'
-
-		act 'Further':gt 'backwater'
-	end
-	if arrsize('sparrvol') > 0:
-		act 'Wash off sperm':
-			cla
-			*clr
-			dynamic $showerdin
-			lubonus = 0
-			pcs_sweat -= 1
-			minut += 10
-			if hantersRape = 1: hantersRape = 2
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
-			'You carefully wash off the sperm in the creek.'
-			act 'Further':gt 'backwater'
-		end
-	end
-	if dirtyclothes = 1 and clothesAtLocation = 1:
-		act 'Wash your clothes':
-			cla
-			*clr
-			if hantersRape = 1: hantersRape = 2
-			minut += 60
-			dirtyclothes = 0
-			cumspclnt = 6 & gs 'cum_cleanup'
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterwash.jpg"></center>'
-			'You get undressed and wash your dirty clothes. Unfortunately the clothes didn''t get fully clean because of the cold water.'
-			!fix logic by illume
-			act 'Hang the clothes in the hut':
-				cla
-				*clr
-				minut += 5
-				clearclothes = 5
-				gs 'clothing','recover_lost_clothes','backwater', 1
-				gs 'clothing', 'strip', 'swamphouse'
-				if $clothingworntype = 'nude':
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basinwash1.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
-				end
-				'You hang the clothes near the stove so they could dry.'
-
-				act 'Further':gt $loc, $metka
-			end
-			if month >= 5 and month <= 9:
-				act 'Hang clothes on the clothesline':
-					cla
-					*clr
-					minut += 10
-					clearclothes = 3
-					gs 'clothing','recover_lost_clothes','backwater', 1
-					gs 'clothing', 'strip', 'clothesline_swamp'
-					if $clothingworntype = 'nude':
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basinwash2.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
-					end
-					'You hang the clothes on the clothesline to dry.'
-
-					act 'Further':gt'swamp_yard'
-				end
-			end
-		end
-	end
-else
-	!not nude
-	if dirtyclothes = 1 and temper >= 10:
-		act 'Clean your dirty clothes':
-			cla
-			*clr
-			if hantersRape = 1: hantersRape = 2
-			minut += 30
-			dirtyclothes = 0
-			cumspclnt = 6 & gs 'cum_cleanup'
-			gs 'stat'
+if $clothingworntype = 'nude' and hantersKnowSlut = 0 and hanters = 1 and hour > 8 and hour < 20 and hanterknowday < day:
+	cla
+	*clr
+	minut += 5
+	gs 'stat'
+	'<center><B>Backwater</B></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hunter_looks.jpg"></center>'
+	'While cleaning yourself in the backwater, you suddenly get the feeling that you are not alone here. Turning around, you see one of the hunters. He''s just standing there watching you, his camouflage is almost indistinguishable compared to the bushes and trees.'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterwash2.jpg"></center>'
-			'You start undressing as you enter the water thinking you''ll be able to clean your dirty clothes. Unfortunately you don''t seem able to get the clothes clean because you didn''t want to get undressed not wanting to freeze your butt off in the cold water.'
+	if clothesAtLocation = 1:
+		act'Get dressed':
+			cls
+			minut += 5
+			gs 'underwear', 'wear'
+			gs 'clothing', 'recover_lost_clothes', 'backwater', 1
 
-			act 'Further':gt'swamp_yard'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude1.jpg"></center>'
+			'Noticing the hunter, you rush over to your clothes and begin dressing yourself in panic. As you get fully dressed, you look over your shoulder, expecting the hunter standing there, but there is no one there.'
+			act'Further':gt 'backwater'
 		end
-	end
-	if (cumloc[6] = 1 or cumloc[7] = 1):
-		act 'Clean the sperm off your clothes':
-			cla
-			cumspclnt = 6 & gs 'cum_cleanup'
-			minut += 5
-			if hantersRape = 1: hantersRape = 2
-			gs'stat'
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/cumwash.jpg"></center>'
-			'You clean the cum stains off your clothes.'
-				act 'Finish':gt 'backwater'
+	else
+		act'Hide':
+			cls
+			minut += 1
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude2.jpg"></center>'
+			'Covering your breasts and crotch you jump into the nearest bush. In your state of fear and confusion, you start scanning the area but you don''t see anyone there. You quickly run back towards the cabin.'
+			act'Go back to the hut':gt 'swamp_yard'
 		end
 	end
-end
-
-if temper >= 10:
-	act 'Wash your face':
-		cla
-		*clr
-		minut += 5
-		pcs_makeup = 1
-		cumspclnt = 9
-		face_write = 0
-		gs 'cum_cleanup'
-		cumspclnt = 11
-		gs 'cum_cleanup'
-		cumspclnt = 13
-		gs 'cum_cleanup'
-		if pcs_sweat > 19 : pcs_sweat -= 5
+	act'Stay naked':
+		cls
+		hanterslut += 1
+		hanterknowday = day
 		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/facesp.jpg"></center>'
-		*nl
-		'You carefully wash your face, removing any impurities.'
-		act 'Further':gt 'backwater'
-		if hantersRape = 1: hantersRape = 2
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude3.jpg"></center>'
+		'You decide that you have nothing to be afraid of, and continue on completely nude. The hunter looks at you for a minute or so, all of a sudden you hear a "Hmph", him turning around and going away.'
+		act'Further':gt 'backwater'
 	end
+	exit
 end
 
-act 'Go back to the hut':minut += 5 & gt'swamp_yard'
-
 if hantersRape = 2:
 	cla
 	*clr

locations/bed2.qsrc

@@ -1,45 +1,20 @@
 # bed2
 
-if $ARGS[0] = 'options':
-	cla
-	act 'Set Alarm Clock':gt 'budilnik', 'start'
-	if bedPanty = 0:
-		act 'You will wear underwear in the morning, click to turn off':bedpanty = 1 & gt 'bed2', 'options'
-	else
-		act 'You will not wear underwear in the morning, click to turn on':bedpanty = 0 & gt 'bed2', 'options'
-	end
-	if analplug = 1:
-		if bedanal = 0:
-			act 'If worn, you will remove your analplug at night, click to always leave it in':bedanal = 1 & gt 'bed2', 'options'
-		else
-			act 'If worn, you will wear your analplug through the night, click to always remove it':bedanal = 0 & gt 'bed2', 'options'
-		end
-	end
-
-	if vibrator = 1 and cheatVib = 1:
-		if bedvibrator = 0:
-			act 'If worn, you will remove your vibrator at night, click to always leave it in':bedvibrator = 1 & gt 'bed2', 'options'
-		else
-			act 'If worn, you will wear your vibrator through the night, click to always remove it':bedvibrator = 0 & gt 'bed2', 'options'
-		end
-	end
-
-	act 'Return':gt 'bed2'
-end
-
 if $ARGS[0] = '':
 	cla & *clr
+	menu_off = 1
 	gs 'stat'
 	if $clothingworntype ! 'nude':
 		'<center><img <<$set_imgh>> src="images/shared/home/bed.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
 	end
+	*nl
 
 	if budilnikOn = 0:
-		'You lie on the bed. Your alarm is set to <<timer>>:<<timerM>> and is currently turned <a href="exec: budilnikOn = 1 & GT ''bed2''">off</a>.'
+		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & GT ''<<$loc>>''">off</a>.'
 	else
-		'You lie on the bed. Your alarm is set to <<timer>>:<<timerM>> and is currently turned <a href="exec: budilnikOn = 0 & GT ''bed2''">on</a>.'
+		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
 	end
 
 	if pcs_makeup ! 1:'<b><font color="red">You need to wash off your makeup before going to bed.</font></b>'
@@ -52,7 +27,10 @@ if $ARGS[0] = '':
 		end
 		if succubusQW = 2:
 			act '<<$sleep_txt>>':
-				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
+				if $clothingworntype ! 'nude':
+					strip_here = 1
+					gs 'clothing', 'strip'
+				end
 				gt 'bed2', 'succhoice'
 			end
 		else
@@ -64,7 +42,10 @@ if $ARGS[0] = '':
 						savegame 'autosave_alt.sav'
 					end
 				end
-				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
+				if $clothingworntype ! 'nude':
+					strip_here = 1
+					gs 'clothing', 'strip'
+				end
 				if magf2bdo = 2:
 					gt 'bed2', 'magbstchoice'
 				else
@@ -74,8 +55,25 @@ if $ARGS[0] = '':
 			killvar '$sleep_txt'
 		end
 	end
+	act 'Take a nap (1:00)':
+		if pcs_sleep >= 10 and pcs_sleep <= 90:
+			pcs_sleep += 10
+			pcs_health += 5
+			minut += 60
+			gs 'stat'
+			*nl
+			'You sleep about an hour.'
+		elseif pcs_sleep < 10:
+			gt 'bed2', 'sleep'
+		else
+			minut += 5
+			gs 'stat'
+			*nl
+			'You are not tired enough to sleep, even for a short nap.'
+		end
+	end
 
-	act 'Options':gt 'bed2', 'options'
+	act 'Get out of bed': killvar '$sleep_txt' & gt $loc, $metka
 
 !!Braid hair skill
 
@@ -98,13 +96,16 @@ if $ARGS[0] = '':
 			act 'Return to bed':gt 'bed2'
 		end
 	end
-
-	act 'Get out of bed':killvar '$sleep_txt' & gt $loc, $metka
+	act 'Sleep options':gt 'bed2', 'options'
 end
 
 if $ARGS[0] = 'sleep':
 	cls
-	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
+	if $clothingworntype ! 'nude':
+		'<center><img <<$set_imgh>> src="images/shared/home/bed.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
+	end
 	gs 'stat'
 	pcs_hairbsh = 0
 	InSleep = 1
@@ -234,23 +235,23 @@ if $ARGS[0] = 'wake_horny':
 
 	act 'Get out of bed (0:10)':
 		minut += 10
-		slept_in = 0
 		gs 'bed2', 'end'
 	end
-	act 'Get out of bed and get dressed (0:15)':
-		gs 'clothing', 'wear_last_worn'
-		slept_in = 0
-		minut += 15
-		gs 'bed2', 'end'
+	if strip_here = 1:
+		act 'Get out of bed and get dressed (0:15)':
+			minut += 15
+			gs 'clothing', 'wear_last_worn'
+			gs 'bed2', 'end'
+		end
 	end
 
 	if $loc = 'bedrPar' and SisterLesb = 5 and hour < 6:
-		act 'Wake Anya and see if she''s in the mood': InSleep = 0 & gt 'sistersleep'
+		act 'Wake Anya and see if she''s in the mood': strip_here = 0 & InSleep = 0 & gt 'sistersleep'
 	elseif $loc = 'FedorEv4':
-		act 'Wake Fedor and see if he''s in the mood': InSleep = 0 & gt 'FedorEv4', 'Bedroom 1'
+		act 'Wake Fedor and see if he''s in the mood': strip_here = 0 & InSleep = 0 & gt 'FedorEv4', 'Bedroom 1'
 		!!Intro text doesn''t quite fit event (but doesn''t quite fit - try for baby - scenario either) - custom scene from VK?
 	elseif ($loc = 'bedr' or $loc = bedr2x) and husband > 0:
-		act 'Wake your husband and see if he''s in the mood': InSleep = 0 & gt 'husbSex', 'variant'
+		act 'Wake your husband and see if he''s in the mood': strip_here = 0 & InSleep = 0 & gt 'husbSex', 'variant'
 		!!Should be custom scene - maybe boyfriend/husband overhaul can cover this?
 	end
 end
@@ -270,7 +271,6 @@ if $ARGS[0] = 'wake':
 			msg '<center>Damn it''s <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, you''ve slept too long! You''re going to be late for school!</center>'
 		end
 		act 'Get up out of bed and get dressed for school (0:15)':
-			slept_in = 0
 			minut += 15
 			if schtype = 0:schtype = 6
 			if schoolH[schtype] = 0:schtype = 6
@@ -279,18 +279,18 @@ if $ARGS[0] = 'wake':
 		end
 	end
 
-	act 'Get out of bed and get dressed (0:15)':
-		gs 'clothing', 'wear_last_worn'
-		slept_in = 0
-		minut += 15
-		gs 'bed2', 'end'
+	if strip_here = 1:
+		act 'Get out of bed and get dressed (0:15)':
+			minut += 15
+			gs 'clothing', 'wear_last_worn'
+			gs 'bed2', 'end'
+		end
 	end
 	if enfullmorrout = 1 and hour >= 4 and hour < 12:
 		act 'Full morning routine (01:00)':
-			gs 'clothing', 'wear_last_worn'
-			slept_in = 0
 			minut += 15
 			fullmorrout = 1
+			gs 'clothing', 'wear_last_worn'
 			gs 'bed2', 'end'
 		end
 		if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:
@@ -301,7 +301,6 @@ if $ARGS[0] = 'wake':
 			end
 			act 'Full morning routine for School (01:00)':
 				fullmorrout = 1
-				slept_in = 0
 				minut += 15
 				if schtype = 0:schtype = 6
 				if schoolH[schtype] = 0:schtype = 6
@@ -331,8 +330,11 @@ end
 
 if $ARGS[0] = 'end':
 	InSleep = 0
-	if bedpanty = 1: gs 'underwear', 'remove'
-
+	slept_in = 0
+	strip_here = 0
+	if bedpanty = 1:
+		gs 'underwear', 'remove'
+	end
 	if fullmorrout = 1 and $loc = 'bedrPar':
 		gt 'vanrPar'
 	elseif fullmorrout = 1 and $loc = 'bedr':
@@ -436,10 +438,13 @@ if $ARGS[0] = 'succubinit':
 	sucwalkday = daystart + 2 + rand(0,5)
 	$sucself1 = 'that feeling'
 	pcs_horny = 100
+	InSleep = 0
+	slept_in = 0
+	strip_here = 0
 	'<center><img <<$set_imgh>> src="images/pc/body/succubusself.jpg"></center>'
 	*nl
 	'<font color="red">You feel the power flowing around your body for several minutes, leaking through your skin and making changes all throughout you, before fading to a presence deep in your core leaving you looking the same as before... but feeling so different! </font>'
-	
+
 	if preg = 1:
 		preg = 0
 		pregtime = 0
@@ -448,7 +453,7 @@ if $ARGS[0] = 'succubinit':
 		knowpreg = 0
 		pregchem = 0
 		cycle = 4
-		
+
 		nextbaby = arrsize('yearkid')
 		:poliabortloop
 		if yearkid[nextbaby-1] = 0:
@@ -472,7 +477,7 @@ if $ARGS[0] = 'succubinit':
 			jump 'poliabortloop'
 		end
 	end
-	
+
 	act 'Finish': gt $loc, $metka
 end
 
@@ -493,5 +498,32 @@ if $ARGS[0] = 'magbstchoice':
 	act 'Eh, I don''t like them like that.': magf2bdo = 0 & mgf2bnocnt += 1 & gt 'bed2', 'sleep'
 end
 
+if $ARGS[0] = 'options':
+	cla
+	act 'Set Alarm Clock':gt 'budilnik', 'start'
+	if bedPanty = 0:
+		act 'Wear underwear in the morning: Currently (ON)':bedpanty = 1 & gt 'bed2', 'options'
+	else
+		act 'Wear underwear in the morning: Currently (OFF)':bedpanty = 0 & gt 'bed2', 'options'
+	end
+	if analplug = 1:
+		if bedanal = 0:
+			act 'Remove your analplug at night: Currently (ON)':bedanal = 1 & gt 'bed2', 'options'
+		else
+			act 'Remove your analplug at night: Currently (OFF)':bedanal = 0 & gt 'bed2', 'options'
+		end
+	end
+
+	if vibrator = 1 and cheatVib = 1:
+		if bedvibrator = 0:
+			act 'Remove your vibrator at night: Currently (ON)':bedvibrator = 1 & gt 'bed2', 'options'
+		else
+			act 'Remove your vibrator at night: Currently (OFF)':bedvibrator = 0 & gt 'bed2', 'options'
+		end
+	end
+
+	act 'Return':gt 'bed2'
+end
+
 --- bed2 ---------------------------------
 

locations/bedr.qsrc

@@ -233,36 +233,7 @@ if pornMagazine > 0:'Under your mattress you hide a porn magazine.'
 gs 'events', 'read_porn'
 gs 'subkid'
 
-if pcs_sleep <= 80:
-	if $clothingworntype = 'nude':
-		$sleep_txt = 'Go to sleep'
-	else
-		$sleep_txt = 'Undress and go to sleep'
-	end
-	if succubusQW = 2:
-		act '<<$sleep_txt>>':
-			if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-			gt 'bed2', 'succhoice'
-		end
-	else
-		act '<<$sleep_txt>>':
-			if disable_autosave = 0:
-				if StoryLine = 0:
-					savegame 'autosave.sav'
-				else
-					savegame 'autosave_alt.sav'
-				end
-			end
-			if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-			if magf2bdo = 2:
-				gt 'bed2', 'magbstchoice'
-			else
-				gt 'bed2', 'sleep'
-			end
-		end
-		killvar '$sleep_txt'
-	end
-end
+act 'Relax on your bed': gt 'bed', 'start'
 
 --- bedr ---------------------------------
 

locations/bedr2x.qsrc

@@ -17,10 +17,19 @@ elektro = elektro + 1
 gs'stat'
 gs 'themes', 'indoors'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr2.jpg"></center>'
+*nl
 if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
-'Bright and beautiful bedroom, with modern and stylish furniture. The room is dominated by <a href="exec:GT ''bed'',''start''">full sized bed</a> with an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
-'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). Against the wall is a table with a <a href="exec:GT ''mirror'',''start''">mirror</a> above it.'
-if komp = 1:'On the bedside table is your <a href="exec:GT ''Komp'',''start''">laptop</a>.'
+'A bright and beautiful bedroom, with modern and stylish furniture.'
+*nl
+'The room is dominated by <a href="exec:GT ''bed'',''start''">full sized bed</a>'
+'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table.'
+*nl
+'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
+*nl
+'Against the wall is a table with a <a href="exec:GT ''mirror'',''start''">mirror</a> above it.'
+*nl
+if komp = 1:'On the other bedside table is your <a href="exec:GT ''Komp'',''start''">laptop</a>.'
+*nl
 if husbandrinkday = daystart:
 	if husbanstrapon = 1:'Your husband is still passed out drunk, after you used a anal plug on him.'
 	if husbanstrapon = 2:'Your husband is still passed out drunk, after you stuck a dildo in his ass.'
@@ -217,5 +226,7 @@ end
 gs 'events', 'read_porn'
 gs 'subkid'
 
+act 'Relax on your bed': gt 'bed', 'start'
+
 --- bedr2x ---------------------------------
 

locations/bedrPar.qsrc

@@ -1,16 +1,18 @@
 # bedrPar
+
 CLOSE ALL
-$metka = ''
 $loc = 'bedrPar'
+$metka = ''
 $location_type = 'private'
 $locclass = 'bedr'
 $menu_loc = 'bedrPar'
 $menu_arg = ''
 menu_off = 0
-clr
+*clr & cla
 minut += 1
 gs 'stat'
 gs 'themes', 'indoors'
+
 if saveparQW = 2:
 	cls
 	'As soon as you enter the room you rush over to <<$namepopu2>>''s  cage and pour the contents of the vial in to his water bowl.'
@@ -62,7 +64,7 @@ end
 *nl
 'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
 *nl
-'Your <a href="exec:gt ''bed2''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it. Your sister''s bed is in the other corner.'
+'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it. Your sister''s bed is in the other corner.'
 *nl
 if popugai2 = 1:
 	'<a href="exec:GT ''popu'',''start2''"><<$namepopu2>></a> is sitting in his cage'
@@ -242,36 +244,9 @@ elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inbition > 30:
 end
 gs 'lact_lib', 'massage'
 
-if pcs_sleep <= 80:
-	if $clothingworntype = 'nude':
-		$sleep_txt = 'Go to sleep'
-	else
-		$sleep_txt = 'Undress and go to sleep'
-	end
-	if succubusQW = 2:
-		act '<<$sleep_txt>>':
-			if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-			gt 'bed2', 'succhoice'
-		end
-	else
-		act '<<$sleep_txt>>':
-			if disable_autosave = 0:
-				if StoryLine = 0:
-					savegame 'autosave.sav'
-				else
-					savegame 'autosave_alt.sav'
-				end
-			end
-			if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-			if magf2bdo = 2:
-				gt 'bed2', 'magbstchoice'
-			else
-				gt 'bed2', 'sleep'
-			end
-		end
-		killvar '$sleep_txt'
-	end
-end
+
+act 'Relax on your bed': gt 'bed', 'start'
+
 
 if $ARGS[0] = 'intro':
 	cla & *clr

locations/bicycle.qsrc

@@ -132,7 +132,6 @@ if $ARGS[0] = 'forest':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
 
 	act 'Bike to the village (0:25)':
-		dirtyclothes = 0
 		gs 'clothing', 'swamp_clothes', 0
 		if $clothingworntype ! 'nude' or pcs_inhib > 50:
 			cls
@@ -182,7 +181,6 @@ if $ARGS[0] = 'swamp':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
 
 	act 'Bike to the village (1:15)':
-		dirtyclothes = 0
 		gs 'clothing', 'swamp_clothes', 0
 		if $clothingworntype ! 'nude' or pcs_inhib > 50:
 			cls

locations/brothel.qsrc

@@ -66,9 +66,9 @@ if $ARGS[0] = 'lobby':
 	*nl
 	'Alongside the windows are tables, each for about four to six people.'
 	nroad = 20
-	act 'Hotel bar': gt 'brothel', 'bar'
-	act 'Lobby bathroom': gt 'brothel', 'lobby:toilet'
-	act 'Leave':gt 'road'
+	act 'Leave the hotel':gt 'road'
+	act 'Visit the Hotel bar': gt 'brothel', 'bar'
+	act 'Visit the bathroom': gt 'brothel', 'lobby:toilet'
 end
 
 if $ARGS[0] = 'lobby:toilet':
@@ -87,7 +87,7 @@ if $ARGS[0] = 'lobby:toilet':
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/hoteltoilet.jpg"></center>'
 	*nl
 
-	act 'Leave':gt 'brothel', 'lobby'
+	act 'Return to the lobby':gt 'brothel', 'lobby'
 
 	act 'Look into the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
@@ -123,9 +123,9 @@ if $ARGS[0] = 'bar':
 		*nl
 		'<font color=#<<$red_font>>>You are wasted. Lying your head on the bar, barely keeping awake. The barman starts to be nervous, probably afraid of scaring away the regular guests.</font>'
 	end
+	act 'Leave the bar':gt 'brothel', 'lobby'
 	act 'Order something':gt 'brothel', 'bar:order'
 	act 'Just sit here':gt 'brothel', 'bar:sit'
-	act 'Leave the bar':gt 'brothel', 'lobby'
 end
 
 if $ARGS[0] = 'bar:sit':
@@ -184,8 +184,8 @@ if $ARGS[0] = 'bar:order':
 		! if hotelWhore = 1:
 			! act 'Order a Blue-blooded Russian.':gt 'brothel','bar:order:password'
 		! end
-		act 'See the menu': gs 'food_menu'
-		act 'Return':gt 'brothel', 'bar'
+		act 'Cancel order':gt 'brothel', 'bar'
+		act 'Order from the menu (0:05)': gs 'food_menu'
 	end
 end
 

locations/burger.qsrc

@@ -18,15 +18,15 @@ if $ARGS[0] = 'start':
 
 	if BistroBoss > 0:'<a href="exec:gt ''burger'', ''boss''">The Office of the Director</a> Anatoly Borisovich'
 
-	act 'Leave':
+	act 'Leave the diner':
 		cla
 		minut += 1
 		gt 'down'
 	end
 
-	act 'See the menu':gs 'food_menu'
+	act 'Order from the menu (0:05)':gs 'food_menu'
 	if money >= 315:
-		act 'Eat and run (0:20) (315 <b>₽</b>)':money -= 315 & gt 'food', 'f_food'
+		act 'Order take-out (0:20) (315<b>₽</b>)':money -= 315 & gt 'food', 'f_food'
 	end
 
 	if IvanPodstavaQW = 2:

locations/cafe_parco.qsrc

@@ -11,9 +11,9 @@ if $args[0]= 'start':
 	'The newly opened cafe "Del Parco", with its striking facade, there are lots of tables and a summer terrace. Opening hours between 14.00 to 21.00.'
 
 	if hour >= 14 and hour < 21:
-		act 'Enter': gt 'cafe_parco', 'inner'
+		act 'Enter the cafe': gt 'cafe_parco', 'inner'
 	end
-	act 'Go back to the square': gt 'gskver', 'start'
+	act 'Return to the square': gt 'gskver', 'start'
 end
 
 if $args[0]= 'inner':
@@ -24,13 +24,13 @@ if $args[0]= 'inner':
 	$loc = 'cafe_parco'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/cafe/caffe_del_parco_in.jpg"></center>'
 
-	act 'See the menu':gs 'food_menu'
+	act 'Exit the cafe': gt 'gskver', 'start'
+
+	act 'Order from the menu (0:05)':gs 'food_menu'
 	if money >= 350:
-		act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
+		act 'Order take-out (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 	end
 
-	act 'Go back outside': gt 'gskver', 'start'
-
 	gs 'family'
 
 	if (sunWeather = 0 or temper < 5) and week mod 2 = 0 and (hour >= 14 and hour < 20) and mey_vika_qw_day ! daystart:

locations/clothing.qsrc

@@ -831,6 +831,7 @@ end
 
 if $ARGS[0] = 'swamp_clothes':
 	if ARGS[1] = 1:
+	!hessian clothing to owned, sets size and equipped.
 		cheap[414] = 1
 		cheapS[414] = 0
 		cheapH[414] = 100
@@ -839,6 +840,7 @@ if $ARGS[0] = 'swamp_clothes':
 		gs 'clothing', 'wear', 'cheap', 414
 	end
 	if ARGS[1] = 0:
+	!hessian clothing no longer owned, but not unequipped.
 		cheap[414] = 0
 		swamp_clothes = 0
 	end

locations/din_van.qsrc

@@ -905,7 +905,7 @@ if $ARGS[0] = 'private':
 		dynamic $toymanage
 	end
 
-	'<a href="exec:msg ''<center>Your weight is <<pcs_weight>> kg<br>Your body mass index (BMI) is <<bmi_calc>>. <<$bmi_desc>></center>''">Check weight on the scales</a>'
+	'<a href="exec:msg ''<center>Your weight is <<pcs_weight>> kg<br>Your body mass index (BMI) is <<bmi_calc>>.<br><<$bmi_desc>></center>''">Check weight on the scales</a>'
 
 	gs 'din_van', 'prvt_pee'
 

locations/food_menu.qsrc

@@ -4,8 +4,12 @@ food_loc = 1
 gs 'themes', 'food_menu'
 
 *clr & cla
-act 'Back':killvar 'food_loc' & gt $loc, $metka
-
+act 'Return':
+	killvar 'food_loc'
+	minut += 5
+	gs 'stat'
+	gt $loc, $metka
+end
 killvar '$_drink'
 killvar '$_eat'
 if $loc = 'burger':
@@ -52,7 +56,7 @@ if $loc = 'gkafe':
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
-	if storyline > 0 and SchoolBlock = 0:
+	if home_owned[2] = 1 or SchoolBlock = 0:
 		$_eat['0,name'] = 'Vegetarian Piroshki'
 		$_eat['0,type'] = 'pirosh'
 		$_eat['0,price'] = 'Free'

locations/gadforest.qsrc

@@ -9,27 +9,27 @@
 !MiraLoc = 4 (Mira at field)
 !MiraLoc = 5 (Mira with gop)
 !---------------------------------------------
-	
+
 if $ARGS[0] = '1':
 	*clr & cla
 	! figure out if Sveta came from Mira code or not. events play out differently whether with Mira or not
 	PC_arrive = iif($loc ! 'Miroslava', 1 , 0)
 
 	! edge of forest
-	$loc = 'gadforest'	
+	$loc = 'gadforest'
 	$metka = '1'
 	$location_type = 'secluded'
-	
+
 	$menu_loc = 'gadforest'
 	$menu_arg = '1'
 	menu_off = 0
-	
+
 	clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
 	gs 'gadukino_event', 'sound'
 	gs'stat'
-	
+
 	*clr & cla
-	
+
 	! Add to knowledge of forest
 	if goforest < 20:goforest += rand(0,1)
 	! chance to get lost
@@ -58,13 +58,13 @@ if $ARGS[0] = '1':
 			'You are at the edge of the forest. Night in the forest during wintertime is very scary and uncomfortable.'
 		end
 	end
-	
+
 	if forestpicnic = 1:'On the edge of the forest you see people. Apparently they are having a family <a href="exec:gt ''gadforest_event'',''picnic''">picnic</a>.'
 	if MiraLoc = 3:'Nearby is <a href="exec: gt ''Miroslava'' ">Mira</a>.'
 	if clothesAtLocation = 1:'Your clothes are nearby on the ground.'
 	if findvel = 2:'Leaning up against a tree is your old <a href="exec:gt ''bicycle'',''forest''">bike</a>.'
 	if goforest < 10:'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
-	
+
 	! Sveta arrive without Mira events
 	if PC_arrive = 1:
 		if temper >= 15 and sunWeather = 1 and hour>=6 and hour<=20 and miratalkforest = 1:gt 'gadforest_event', 'nude_event'
@@ -92,7 +92,7 @@ if $ARGS[0] = '1':
 				gs 'clothing', 'strip', 'gadforest'
 				gs 'exhibitionism', 3
 				gs 'stat'
-				
+
 				'You don''t hesitate and quickly get undressed, your clothes are left laying in a pile.'
 
 				act'Continue':gt'gadforest','1'
@@ -106,7 +106,7 @@ if $ARGS[0] = '1':
 			end
 		end
 	end
-	
+
 	if clothesAtLocation = 1 and $clothingworntype = 'nude':
 		act 'Get dressed':
 			cla
@@ -122,7 +122,7 @@ if $ARGS[0] = '1':
 			act 'Back': gt 'gadforest','1'
 		end
 	end
-	
+
 	! if Sveta left the forest without retrieving her clothes
 	if clothesAtLocation = 1 and $clothingworntype ! 'nude':
 		if $clothingworntype = 'cheap' and clothingwornnumber = 414:
@@ -151,7 +151,7 @@ if $ARGS[0] = '1':
 			end
 		end
 	end
-	
+
 	if hour >= 6 and hour <= 20 and sunWeather = 1:
 		act 'Go for a walk in the woods':
 			cla
@@ -186,11 +186,11 @@ if $ARGS[0] = '1':
 					'You walk with Mira through the snowy woods, enjoying the sounds of the forest and the fresh air.'
 				end
 			end
-			
+
 			act 'Continue':gt 'gadforest','1'
 		end
 	end
-	
+
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and edge_forestday ! daystart:
 		act 'Look for mushrooms and berries':
 			cla
@@ -200,7 +200,7 @@ if $ARGS[0] = '1':
 			edge_forestday = daystart
 			if goforest < 20:goforest += rand(0,1)
 			gs 'stat'
-			
+
 			! no mushroom pickers or mushroom pickers moved deeper into the forest
 			if mushroom_pickers = 0 or mushroom_pickers = 2:
 				cla
@@ -238,14 +238,14 @@ if $ARGS[0] = '1':
 			act 'Continue':gt 'gadforest','1'
 		end
  	end
- 	
+
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and MiraLoc ! 3:
 		act 'Go further into the forest':
 			if goforest >= lostrand:minut += 30 & gt 'gadforest','2'
 			if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
 	 	end
 	end
-	
+
 	if goswamp = 1 and MiraLoc ! 3:
 		! day time chance to get stuck in swamp. ps. use bike to get there 100% of the time by illume
 		if hour >= 6 and hour < 20:
@@ -262,13 +262,10 @@ if $ARGS[0] = '1':
 			act 'Go to the swamp':gt 'gadforest_event', 'swamp_road'
 		end
 	end
-	
+
 	act 'Leave the woods':
-		dirtyclothes = 0
-		gs 'clothing', 'swamp_clothes', 0
-		gs 'stat'
-		if $clothingworntype = 'nude':
-			if $CloLosTyp[$CURLOC] = '' or gadforest_clothestorn = 1:
+		if $clothingworntype = 'nude' or swamp_clothes = 1:
+			if ($CloLosTyp[$CURLOC] = '' or gadforest_clothestorn = 1) swamp_clothes = 0:
 				! no clothes here, they must be ripped apart enough times in the woods or swamp to get destroyed.
 				! This may be a good exhibition or rape event entry point
 				inhib_exp += rand(0,2)
@@ -276,12 +273,16 @@ if $ARGS[0] = '1':
 				'You sneak out the woods, hiding your naked body in the shadows and moving toward grandparents house.'
 				'You successfully reach home without anyone noticing.'
 				cla
+				minut += 30
+				gs 'stat'
 				act 'Go home':gt'Gadhouse'
 			else
-				'<B>You should get dressed before leaving the woods.</B>'
+				'<B>You should pick up your clothes and get dressed before leaving the woods.</B>'
 			end
 		else
-			minut += 30 & gt'gadroad'
+			minut += 30
+			gs 'stat'
+			gt 'gadroad'
 		end
 	end
 	if rand(1,10)> 9: gs 'gadforest', 'torncloth'
@@ -291,17 +292,17 @@ end
 if $ARGS[0] = '2':
 	*clr & cla
 	! slightly inside forest
-	$loc = 'gadforest'	
+	$loc = 'gadforest'
 	$metka = '2'
 	$location_type = 'secluded'
-	
+
 	$menu_loc = 'gadforest'
 	$menu_arg = '2'
 	menu_off = 0
-	
+
 	gs 'gadukino_event', 'sound'
 	gs'stat'
-	
+
 	! Add to knowledge of forest
 	if goforest < 40:goforest += rand(0,1)
 	! Determine where Sveta got lost in the forest
@@ -311,7 +312,7 @@ if $ARGS[0] = '2':
 	foresteventrand = rand(1,10)
 	new_boletus = 0
 	new_bilberry = 0
-	
+
 	'<center><H4>Forest</H4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
@@ -388,7 +389,7 @@ if $ARGS[0] = '2':
 			act 'Continue':gt 'gadforest','2'
 		end
 	end
-	
+
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9:
 		act 'Go further into the forest':
 			if goforest >= lostrand:minut += 30 & gt 'gadforest','3'
@@ -401,17 +402,17 @@ end
 if $ARGS[0] = '3':
 	*clr & cla
 	! deep inside forest
-	$loc = 'gadforest'	
+	$loc = 'gadforest'
 	$metka = '3'
 	$location_type = 'secluded'
-	
+
 	$menu_loc = 'gadforest'
 	$menu_arg = '3'
 	menu_off = 0
-	
+
 	gs 'gadukino_event', 'sound'
 	gs'stat'
-	
+
 	! Add to knowledge of forest
 	if goforest < 60:goforest += rand(0,1)
 	lost = 3
@@ -421,7 +422,7 @@ if $ARGS[0] = '3':
 	foresteventrand = rand(1,10)
 	new_boletus = 0
 	new_bilberry = 0
-	
+
 	'<center><H4>Deep Forest</H4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
@@ -452,7 +453,7 @@ if $ARGS[0] = '3':
 		if goforest >= lostrand:minut += 30 & gt 'gadforest','2'
 		if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
 	end
-	
+
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and thicketday ! daystart:
 
 	act 'Look for mushrooms and berries':
@@ -472,7 +473,7 @@ if $ARGS[0] = '3':
 			act 'Continue':gt 'gadforest','3'
 		end
 	end
-	
+
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9:
 
 		act 'Go further into the forest':
@@ -486,17 +487,17 @@ end
 if $ARGS[0] = '4':
 	*clr & cla
 	! forest near swamp
-	$loc = 'gadforest'	
+	$loc = 'gadforest'
 	$metka = '4'
 	$location_type = 'secluded'
-	
+
 	$menu_loc = 'gadforest'
 	$menu_arg = '4'
 	menu_off = 0
-	
+
 	gs 'gadukino_event', 'sound'
 	gs'stat'
-	
+
 	! Add to knowledge of forest
 	if goforest < 80:goforest += rand(0,1)
 	lost = 4
@@ -507,7 +508,7 @@ if $ARGS[0] = '4':
 	dirty = 0
 	new_boletus = 0
 	new_bilberry = 0
-	
+
 	'<center><H4>Forest near the Swamp</H4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
@@ -557,7 +558,7 @@ if $ARGS[0] = '4':
 			act 'Continue':gt 'gadforest','4'
 		end
 	end
-	
+
 	act 'Go further into the swamp':
 		if goforest >= lostrand and goswamp = 1:minut += 30 & gt 'swamp'
 		if goforest >= lostrand and goswamp = 0:minut += 30 & gt 'gadforestswamp','1'

locations/gadforestlost.qsrc

@@ -16,7 +16,6 @@ if $ARGS[0] = 'forestrescue':
 
 	minut += 150
 	lost_girl = 0
-	dirtyclothes = 0
 	forest_lostday = 0
 	hanters = 0
 	gs 'clothing', 'swamp_clothes', 0
@@ -39,11 +38,11 @@ if $ARGS[0] = 'forestrescue':
 
 	'You get ready quickly and follow the forest ranger out of the woods.'
 
-	if $clothingworntype ! 'nude':
+	if $clothingworntype ! 'nude' or swamp_clothes = 0:
 		'You can''t wait to get back to your grandparents house and have a bath and a nice hot meal.'
 
 		act 'To your grandparents house':gt'Gadhouse'
-	elseif $clothingworntype = 'nude':
+	elseif $clothingworntype = 'nude' or swamp_clothes = 1:
 		'The ranger looks you up and down and you feel like he is about to ask you something but he decides against it.'
 		'You remember you left your clothes by the edge of the woods and ask the ranger to take you there instead.'
 
@@ -257,9 +256,8 @@ if $ARGS[0] = 'gadforestlostfinish':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadjoy.jpg"></center>'
 	'You look over and realize that you finally see lights shining from distant houses, glad to get out of this alive you rush forward.'
 
-	!clear lost flags by illume, clear dirtyclothes flag by rachels
+	!clear lost flags by illume
 	lost_girl = 0
-	dirtyclothes = 0
 	forest_lostday = 0
 	hanters = 0
 	gs 'clothing', 'swamp_clothes', 0

locations/gadforestswamp.qsrc

@@ -36,7 +36,7 @@ if $ARGS[0] = '1':
 		*clr & cla
 		minut += 10
 		swamprand = pcs_stren + pcs_agil
-		pcs_sweat += 10
+		pcs_sweat += 15
 		gs 'stat'
 
 		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp.jpg"></center>'
@@ -72,8 +72,8 @@ if $ARGS[0] = '2':
 	pcs_hairbsh = 0
 	if pcs_makeup > 1:pcs_makeup = 0
 
-	! clothes wear out, "dirty" to avoid at a time
-	if dirty = 0 and ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):dirty = 1 & dirtyclothes = 1 & dynamic $clothingworntype + 'H[<<clothingwornnumber>>] -= 10'
+	! clothes wear out
+	if dirty = 0 and ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):dirty = 1 & dynamic $clothingworntype + 'H[<<clothingwornnumber>>] -= 10'
 	! add remove clothes if worn out
 	if dyneval('RESULT = <<$clothingworntype>>H[<<clothingwornnumber>>]') <= 0:
 		'Your ripped clothes were barely holding together, but now they have finally fell apart.'

locations/gadukino.qsrc

@@ -172,7 +172,7 @@ if $ARGS[0] = '':
 			act 'Go Hunting (this can take a lot of time)': suchunt = 1 & gt 'gadukino', 'succubus_hunt'
 		end
 
-		act 'Go to the highway':minut += 30 & nroad = 10 & dirtyclothes = 0 & gt 'road'
+		act 'Go to the highway':minut += 30 & nroad = 10 & gt 'road'
 	end
 end
 

locations/gadukino_event.qsrc

@@ -817,7 +817,6 @@ end
 if $ARGS[0] = 'go_home_ender':
 	*clr & cla
 	minut += rand(15,25)
-	dirtyclothes = 0
 	if grandmahelp > 0:
 		'<center><b><font color="maroon">Your grandmother</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'

locations/gkafe.qsrc

@@ -12,12 +12,14 @@ if $ARGS[0] = '':
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe.jpg"></center>'
+	*nl
 	'A small cafe, attached to the train station. It looks rather shabby.'
 	'The cafe is closed right now, it''s usually open between 8:00 and 20:00.'
 
 	if mother_go = 1 and hour = 16 and indorf = 0:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe.jpg"></center>'
+		*nl
 		'A small cafe, attached to the train station. It looks rather shabby.'
 		'The door is currently locked, and the sign on the door says "Closed". That''s strange, the cafe is supposed to be open at this time.'
 
@@ -32,6 +34,7 @@ if $ARGS[0] = '':
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/event/momslut.jpg"></center>'
+				*nl
 
 				if momslut >= 1:
 					'You carefully climb on top of the boxes, and stand on your toes to reach the small window. It gives you a view into the back room of the cafe. Through the window you see your mother on her knees, giving the cafe owner a blowjob. She''s very enthusiastic about it, and alternates between sucking his dick and licking his balls. Then she begins to deepthroat him, sliding his dick further and further down her mouth until his balls rest on her chin.'
@@ -46,6 +49,7 @@ if $ARGS[0] = '':
 					mother_go = 0
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/event/momslut2.jpg"></center>'
+					*nl
 					'The cafe owner abruptly pulls his groin away from your mother''s mouth, a string of saliva still attached to his dick as he roughly pulls your mother up by her shoulders and tells her to lean against the wall. You can''t hear them talking but he definitely seems to be in charge, and your mother is all too willing in following up his every demand. Your mother lewdly turns her back to him and gently wiggles her ass, and he immediately drove his cock in her pussy. His thrusting is fast and furious and you figure he doesn''t intend to stay here much longer, knowing he has to open the cafe again before too many people notice. Your mother is moaning loudly as she is getting her pussy roughly pounded by her boss, you can easily hear it despite the window between you and them. And sure enough, a few moments later he grabs her ass as his body spasms, dumping his load deep inside her. Your mother drops to her knees quickly without needing a prompt and cleans him up with her tongue, after which he pulls up his pants and goes to re-open the cafe. Your mother sits on the ground for a while to recuperate, licking her lips with a dreamy look in her eyes. You quickly get off the crates, before she sees you.'
 
 					act 'Go back to the train station':gt 'pavtrain'
@@ -59,9 +63,22 @@ if $ARGS[0] = '':
 		if hour >= 8 and hour <= 19:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe2.jpg"></center>'
+			*nl
 			'A small cafe, attached to the train station. It looks rather shabby.'
 
-			if StoryLine > 0:'Since your <<$npc_nickname[''A29'']>> works here, you can eat here for free.'
+			act 'Leave the cafe':gt 'pavtrain'
+			
+			gs 'gkafe', 'menu'
+
+			if StoryLine > 0 and home_owned[2] = 1 and SchoolBlock = 0:
+				'Since your <<$npc_nickname[''A29'']>> works here at the cafe, you can eat-in for free.'
+			elseif StoryLine > 0 and home_owned[2] = 0 and SchoolBlock = 0:
+				'Since your <<$npc_nickname[''A29'']>> kicked you out of home, you can no longer eat here for free.'
+			elseif StoryLine > 0 and home_owned[2] = 1 and SchoolBlock = 0:
+				'Since you got kicked out of school, you can no longer eat here for free, your <<$npc_nickname[''A29'']>> wants you to earn a living.'
+			elseif StoryLine > 0 and home_owned[2] = 0 and SchoolBlock = 1:
+				'Since you got kicked out of school and your <<$npc_nickname>> kicked you out of home, you can no longer eat here for free.'
+			end
 
 			if week < 6:
 				if hour >= 6 and hour < 16 and StoryLine > 0:
@@ -78,12 +95,12 @@ if $ARGS[0] = '':
 					''
 					'A male figure walks closely by your table. You look up and recognize uncle Misha, your neighbor. He stops and recognizes you as well, and sits down with you. He gives you a friendly smile as he says: "Oh, <<$pcs_nickname>>, hello. Listen, me and your stepfather were working late in the garage yesterday, and went for a nightcap at my place when we were finished. When your stepfather left, he accidentally left some of his tools behind. I''m fairly sure he needs them again today, and I could use a hand bringing them back to the garage. Could you help me out? I''ll give you money so you can get some ice cream for your troubles."'
 
-					act 'Agree to help uncle Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1'
+					act 'Go help uncle Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1'
 				elseif razvrand > 7 and hour > 16 and hour < 20 and dyadyamishaevent = 1 and dmishaday ! daystart:
 					''
 					'Suddenly, a man slides in the seat next to you while you eat your meal. You look up and see it''s uncle Misha. He has a greedy look in his eyes, the kind that is already stripping you naked in his thoughts. His eyes are fixated on your boobs as he says: "Hey, <<$pcs_nickname>>. Would you like to join me for some tea at my place? We can have a bit of fun just like last time, and you can earn some more money..."'
 
-					act 'Agree to go ''drink tea'' with uncle Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1-1'
+					act '"Drink tea" with uncle Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1-1'
 				end
 			end
 			if StoryLine = 1 and SchoolAtestat = 0:
@@ -91,8 +108,6 @@ if $ARGS[0] = '':
 					'You see your classmates <a href="exec:minut += 3 & gt ''gopskver''">Vitek, Dan and Vasily</a> sitting at a table in the far corner, drinking beer.'
 			end
 		end
-		act 'Leave':gt 'pavtrain'
-		if hour >= 8 and hour <= 19:gs 'gkafe', 'menu'
 	end
 end
 
@@ -100,12 +115,9 @@ if $ARGS[0] = 'menu':
 	menu_off = 1
 	$loc = 'gkafe'
 	$metka = ''
-	act 'See the menu':gs 'food_menu'
-	if (StoryLine = 0 or (StoryLine > 0 and SchoolBlock = 1)) and money >= 350:
-		act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
-	end
-	if storyline > 0 and SchoolBlock = 0:
-		act 'Eat and run (0:20)': gt 'food', 'f_food'
+	act 'Order from the menu (0:05)':gs 'food_menu'
+	if money >= 350:
+		act 'Order take-out (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 	end
 end
 
@@ -113,9 +125,10 @@ if $ARGS[0] = 'boris':
 	menu_off = 1
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/cafe/Borislav.jpg"></center>'
+	*nl
 	'The owner of the cafe, called Borislav. He is a tall, thin man in his forties. Most people call him Slava.'
 
-	act 'Leave':gt 'gkafe'
+	act 'Return':gt 'gkafe'
 end
 
 --- gkafe ---------------------------------

locations/hantersex.qsrc

@@ -35,12 +35,12 @@ if $ARGS[0] = 'sexafterstrip1':
 
 	act 'Stroke him':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi.jpg"></center>'
 		'The alcohol had dulled your sense of shame and you quickly took his cock your in hand and began to stroke it...'
 
 		act 'Put his cock in your mouth':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi1.jpg"></center>'
 			'You slowly wrap your mouth around his member...'
 			'Sensing his chance, Igor suddenly shoves his entire dick down your throat before you can protest. Tears begin to well up in your eyes...'
 			gs 'arousal', 'bj',5, 'dick[2]', 'sub', 'deepthroat'
@@ -48,14 +48,14 @@ if $ARGS[0] = 'sexafterstrip1':
 
 			act 'Suck on':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi2.jpg"></center>'
 				'Igor continues to batter your mouth, while Andrei and Sergei watch and even help him, pushing your head deeper on his cock...'
 				gs 'arousal', 'bj', 5, 'dick[2]', 'sub', 'deepthroat'
 				gs 'stat'
 
 				act 'Suck them all':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoasi1.'+rand(1,3)+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOasi1.'+rand(1,3)+'.jpg"></center>'
 					'Andrei and Sergei aren''t content to just watch you all night and put hands on their dicks as well. You began to suck and stroke the circle of guys around you, alternating attention to each member.'
 					gs 'arousal', 'bj', 5,'dick[1]', 'sub', 'gangbang'
 					gs 'arousal', 'bj', 5,'dick[3]', 'sub', 'gangbang'
@@ -63,7 +63,7 @@ if $ARGS[0] = 'sexafterstrip1':
 
 					act 'Lie down on your back':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvaosi1.'+rand(1,2)+'.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVaOsi1.'+rand(1,2)+'.jpg"></center>'
 						'The guys put you on the bed and Andrei settles down between your legs, while Igor and Sergei hover over you and put their members in front of your face...'
 						gs 'arousal', 'bj', 5, 'dick[2]', 'sub', 'gangbang'
 						gs 'arousal', 'bj', 5, 'dick[3]', 'sub', 'gangbang'
@@ -73,7 +73,7 @@ if $ARGS[0] = 'sexafterstrip1':
 						
 						act 'Lie on your side':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrv2aosi1.'+rand(1,3)+'.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrV2aOsi1.'+rand(1,3)+'.jpg"></center>'
 							'Andrei rolls you to the side and without even moving from between your legs, and Igor and Sergei reposition to put their dicks in the face again...'
 							gs 'arousal', 'bj', 5, 'dick[3]', 'sub', 'gangbang'
 							gs 'arousal', 'bj', 5, 'dick[2]', 'sub', 'gangbang'
@@ -83,7 +83,7 @@ if $ARGS[0] = 'sexafterstrip1':
 
 							act 'Get on all fours':
 								*clr & cla
-								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvioas1.'+rand(1,4)+'.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrViOas1.'+rand(1,4)+'.jpg"></center>'
 								'Igor pushes you down on all fours and then moves behind you. He begins to pound you from behind with increasing frequency. Sergei and Andrei refuse to give you a rest and shove their dicks in your mouth...'
 								gs 'arousal', 'bj', 5, 'dick[3]', 'sub', 'gangbang'
 								gs 'arousal', 'bj', 5, 'dick[1]', 'sub', 'gangbang'
@@ -93,7 +93,7 @@ if $ARGS[0] = 'sexafterstrip1':
 
 								act 'Sit down':
 									*clr & cla
-									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvsoia1.'+rand(1,3)+'.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVsOia1.'+rand(1,3)+'.jpg"></center>'
 									'Sergei sits on the bed, and pulls you on top of him. Igor and Andrei adjust to this new position accordingly...'
 									gs 'arousal', 'bj', 5, 'dick[2]', 'sub', 'gangbang'
 									gs 'arousal', 'bj', 5, 'dick[1]', 'sub', 'gangbang'
@@ -103,7 +103,7 @@ if $ARGS[0] = 'sexafterstrip1':
 
 									act 'Further':
 										*clr & cla
-										'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi3.jpg"></center>'
+										'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi3.jpg"></center>'
 										'You continue to suck Igor, but then you feel someone''s finger begins to penetrate your ass...'
 										gs 'arousal', 'bj', 5, 'dick[2]','sub', 'gangbang'
 										gs 'arousal', 'anal_finger', 2, 'sub', 'gangbang'
@@ -113,7 +113,7 @@ if $ARGS[0] = 'sexafterstrip1':
 										act 'Further':
 											*clr & cla
 											pcs_mood += 25
-											'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi4.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi4.jpg"></center>'
 											'Andrei greased your ass with vaseline...'
 											'- Well, even so, not dry, " you thought with relief.'
 											lubri +=1
@@ -122,7 +122,7 @@ if $ARGS[0] = 'sexafterstrip1':
 
 											act 'Lie down on the ground':
 												*clr & cla
-												'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrdpvaaios1.'+rand(1,2)+'.jpg"></center>'
+												'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrDPVaAiOs1.'+rand(1,2)+'.jpg"></center>'
 												'Andrei gets on the ground and pulls you down with him. You feel his dick pop into your ass.'
 												'Igor moves in front of you and lines up on your second exposed hole.'
 												'You think, "At least I only have to suck one dick at a time now..."'
@@ -135,7 +135,7 @@ if $ARGS[0] = 'sexafterstrip1':
 												act 'Kneel in front of the guys':
 													*clr & cla
 													minut += 1
-													'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi5.jpg"></center>'
+													'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi5.jpg"></center>'
 													'Without a word all three guys pull out of you and drag you to your knees.'
 													'They all begin to masturbate in front of your face, and you prepare yourself for the amount of cum that is about to cover you...'
 
@@ -150,7 +150,7 @@ if $ARGS[0] = 'sexafterstrip1':
 														gs 'cum_call','breasts',$boy[3],1,'','',20
 														swallow += 1
 														gs 'stat'
-														'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi6.jpg"></center>'
+														'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi6.jpg"></center>'
 														'Finally, the guys started to cum. Jets of sperm struck your face, some got in your mouth and dripped onto your breast and stomach as well...'
 
 														act 'Pass out':
@@ -245,7 +245,7 @@ if $ARGS[0] = 'sexafterstrip3':
 
 	act 'Suck':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi2.'+rand(0,4)+'.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi2.'+rand(0,4)+'.jpg"></center>'
 		'You wrap your lips  around Igor''s member..'
 		gs 'boyStat', 'A173' &! Igor ... need data for oral procedure
 		gs 'oral','start'
@@ -1382,7 +1382,7 @@ end
 
 if $ARGS[0] = 'hantersgrOasi':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoasi1.'+rand(1,3)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOasi1.'+rand(1,3)+'.jpg"></center>'
 	'You began to suck all the guys around you, alternating between each member.'
 	pose = 0
 	pcs_horny += rand(10,20)
@@ -1404,7 +1404,7 @@ end
 if $ARGS[0] = 'hantersgrVaOsi':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvaosi1.'+rand(1,2)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVaOsi1.'+rand(1,2)+'.jpg"></center>'
 	'The guys put you on the bed, Andrei gets down between your legs, while Igor and Sergei put their members in front of your face...'
 
 	gs 'boyStat', 'A174'
@@ -1430,7 +1430,7 @@ end
 if $ARGS[0] = 'hantersgrVOsi':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvosi.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVOsi.jpg"></center>'
 	'Andrei roughly fucks you for a while before deciding he has better things to do and unceremoniously cumming inside you...'
 
 	gs 'boyStat', 'A174'
@@ -1459,7 +1459,7 @@ end
 if $ARGS[0] = 'hantersgrVaO':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvao.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVaO.jpg"></center>'
 	'Sergei and Igor enjoy being sucked by you for a while before deciding they have better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A174'
@@ -1496,7 +1496,7 @@ end
 if $ARGS[0] = 'hantersgrVaOi':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvaoi.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVaOi.jpg"></center>'
 	'Sergei enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A174'
@@ -1527,7 +1527,7 @@ end
 if $ARGS[0] = 'hantersgrVsOai':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvsoai1.'+rand(1,4)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVsOai1.'+rand(1,4)+'.jpg"></center>'
 	'The guys put you on the bed, Sergei gets down between your legs, while Igor and Andrei put their members in front of your face...'
 
 	gs 'boyStat', 'A172'
@@ -1555,7 +1555,7 @@ end
 if $ARGS[0] = 'hantersgrVOai':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvoai.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVOai.jpg"></center>'
 	'Sergei roughly fucks you for a while before deciding he has better things to do and unceremoniously cumming inside you...'
 
 	gs 'boyStat', 'A172'
@@ -1584,7 +1584,7 @@ end
 if $ARGS[0] = 'hantersgrVsOi':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvsoi.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVsOi.jpg"></center>'
 	'Andrei enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A172'
@@ -1616,7 +1616,7 @@ end
 if $ARGS[0] = 'hantersgrVsO':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvso.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVsO.jpg"></center>'
 	'Sergei and Igor enjoy being sucked by you for a while before deciding they have better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A172'
@@ -1654,7 +1654,7 @@ end
 if $ARGS[0] = 'hantersgrViOas':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvioas1.'+rand(1,4)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrViOas1.'+rand(1,4)+'.jpg"></center>'
 	'You get down on all fours. Igor begins to penetrate you from behind, while Sergei and Andrei put their members in front of your face...'
 
 	gs 'boyStat', 'A172'
@@ -1683,7 +1683,7 @@ if $ARGS[0] = 'hantersgrViO':
 	*clr & cla
 	pose = 1
 
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvio.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrViO.jpg"></center>'
 	'Sergei and Andrei enjoy being sucked by you for a while before deciding they have better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A172'
@@ -1723,7 +1723,7 @@ end
 if $ARGS[0] = 'hantersgrVsOia':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvsoia1.'+rand(1,3)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVsOia1.'+rand(1,3)+'.jpg"></center>'
 	'Sergei sat down on the bed, and pulled you on top of him, while Igor and Andrei put their dicks in front of your face...'
 
 	gs 'boyStat', 'A172'
@@ -1750,7 +1750,7 @@ end
 if $ARGS[0] = 'hantersgrVsOi1':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvsoi1.1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVsOi1.1.jpg"></center>'
 	'Andrei enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A172'
@@ -1782,7 +1782,7 @@ end
 if $ARGS[0] = 'hantersgrVaOis':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvaois1.'+rand(1,3)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVaOis1.'+rand(1,3)+'.jpg"></center>'
 	'Andrei sat down on the bed, and pulled you on top of him, while Igor and Sergei put their dicks in front of your face...'
 
 	gs 'boyStat', 'A174'
@@ -1810,7 +1810,7 @@ end
 if $ARGS[0] = 'hantersgrVaOs':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvaos.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVaOs.jpg"></center>'
 	'Igor enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A174'
@@ -1841,7 +1841,7 @@ end
 if $ARGS[0] = 'hantersgrVO':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvo.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVO.jpg"></center>'
 	'You begin to cum after the marathon of sex you have engaged in.'
 	'Seeing you cum the guys around you quickly do as well.'
 
@@ -1882,7 +1882,7 @@ end
 if $ARGS[0] = 'hantersgrV2aOsi':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrv2aosi1.'+rand(1,3)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrV2aOsi1.'+rand(1,3)+'.jpg"></center>'
 	'Andrei put you on your side and began to get down between your legs, while Igor and Sergei stood in front of your face with their dicks waiting...'
 
 	gs 'boyStat', 'A174'
@@ -1911,7 +1911,7 @@ end
 if $ARGS[0] = 'hantersgrV2aOs':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrv2aos.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrV2aOs.jpg"></center>'
 	'Igor enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A174'
@@ -1941,7 +1941,7 @@ end
 if $ARGS[0] = 'hantersgrDPVaAiOs':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrdpvaaios1.'+rand(1,2)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrDPVaAiOs1.'+rand(1,2)+'.jpg"></center>'
 	'Andrei lays down on the couch and pulls you on top of him, Igor straddles you and lines up to penetrate your second hole, while Sergei expects you to suck his dick too...'
 	
 	gs 'boyStat', 'A174'
@@ -1968,7 +1968,7 @@ end
 if $ARGS[0] = 'hantersgrDPVaAOs':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrdpvaaos.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrDPVaAOs.jpg"></center>'
 	'After a while <<$boydesc2>> moaned and you felt like your ass fills with heat. He gets up and walks away.'
 
 	gs 'boyStat', 'A174'
@@ -1992,7 +1992,7 @@ end
 if $ARGS[0] = 'hantersgrAiOsa':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgraiosa.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrAiOsa.jpg"></center>'
 	'The guys put you on your back, Igor spreads your legs and puts the tip of his dick against your ass, while Andrei and Sergei over you and put their members in front of your face...'
 
 	gs 'boyStat', 'A174'
@@ -2021,7 +2021,7 @@ end
 if $ARGS[0] = 'hantersgrAiO':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgraio.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrAiO.jpg"></center>'
 	'Andrei and Sergei enjoy being sucked by you for a while before deciding they have better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A174'
@@ -2060,7 +2060,7 @@ if $ARGS[0] = 'hantersgrO3':
 	*clr & cla
 	minut += 1
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgro3.'+rand(1,4)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrO3.'+rand(1,4)+'.jpg"></center>'
 	'The guys drag you to your kness and surround you. They began to masturbate in front of your face, sometimes inserting their member into your mouth, and you get ready for the cum about to cover you...'
 
 	act 'Wait patiently':
@@ -2072,7 +2072,7 @@ if $ARGS[0] = 'hantersgrO3':
 		gs 'cum_call', 'mouth', $boy, 1
 		swallow += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgro3cum1.'+rand(1,6)+'.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrO3cum1.'+rand(1,6)+'.jpg"></center>'
 		'Finally all the guys start to cum. Jets of sperm cover your face, hit you in the mouth and drip all over your body too...'
 
 		if hantersexnude = 0:act 'Pass out': gt 'hantersex', 'hantersGrEnd'
@@ -2083,7 +2083,7 @@ end
 if $ARGS[0] = 'hantersgrAOsa':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgraosa.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrAOsa.jpg"></center>'
 	'Igor roughly fucks you for a while before deciding he has better things to do and unceremoniously cumming inside you...'
 
 	gs 'boyStat', 'A174'
@@ -2111,7 +2111,7 @@ end
 if $ARGS[0] = 'hantersgr2VaOi':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2vaoi.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2VaOi.jpg"></center>'
 	'The guys put you on your back, Andrei spreads your legs and puts the tip of his dick against your pussy, while Igor puts his member in front of your face...'
 
 	gs 'boyStat', 'A173'
@@ -2133,7 +2133,7 @@ end
 if $ARGS[0] = 'hantersgr2VOi':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2voi.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2VOi.jpg"></center>'
 	'Andrei roughly fucks you for a while before deciding he has better things to do and unceremoniously cumming inside you...'
 
 	gs 'boyStat', 'A173'
@@ -2157,7 +2157,7 @@ end
 if $ARGS[0] = 'hantersgr2VO':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2vo.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2VO.jpg"></center>'
 	'The guys climax at the same time and cover you in their cum.'
 	'They get you to clean their dicks off before walking away and leaving you alone.'
 
@@ -2209,7 +2209,7 @@ end
 if $ARGS[0] = 'hantersgr2ViO':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2vio.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2ViO.jpg"></center>'
 	'Andrei enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A172'
@@ -2237,7 +2237,7 @@ end
 if $ARGS[0] = 'hantersgr2VsO':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2vso.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2VsO.jpg"></center>'
 	'Igor enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A173'
@@ -2266,7 +2266,7 @@ end
 if $ARGS[0] = 'hantersgr2VaOs':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2vaos.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2VaOs.jpg"></center>'
 	'Andrei put you on your side and began penetrate you from behind, while Sergei put his dick in your face...'
 
 	gs 'boyStat', 'A174'
@@ -2289,7 +2289,7 @@ end
 if $ARGS[0] = 'hantersgr2VaO':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2vao.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2VaO.jpg"></center>'
 	'Sergei enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A174'
@@ -2318,7 +2318,7 @@ end
 if $ARGS[0] = 'hantersgr2AiOs':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2aios.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2AiOs.jpg"></center>'
 	'The guys put you on your back, with Igor in between your legs, and Sergei with his dick in front of your face...'
 
 	gs 'boyStat', 'A174'
@@ -2343,7 +2343,7 @@ if $ARGS[0] = 'hantersgr2AOs':
 	*clr & cla
 	pose = 0
 
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2aos.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2AOs.jpg"></center>'
 	'Igor roughly fucks you for a while before deciding he has better things to do and unceremoniously cumming inside you...'
 
 	gs 'boyStat', 'A174'
@@ -2366,7 +2366,7 @@ end
 if $ARGS[0] = 'hantersgr2AiO':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2aio.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2AiO.jpg"></center>'
 	'Sergei enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A174'
@@ -2396,7 +2396,7 @@ end
 if $ARGS[0] = 'hantersgr2AOi':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2aoi.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2AOi.jpg"></center>'
 	'Sergei enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A173'
@@ -2419,7 +2419,7 @@ end
 if $ARGS[0] = 'hantersgr2AsO':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2aso.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2AsO.jpg"></center>'
 	'Igor enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A173'
@@ -2493,7 +2493,7 @@ if $ARGS[0] = 'hantersgrO2':
 	body_write += 1
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgro2cum1.'+rand(1,2)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrO2cum1.'+rand(1,2)+'.jpg"></center>'
 	'Sergei and Igor put you on your back and begin to cum on you. A jet of sperm hit in your mouth and face and another hit your breasts and stomach. For fun, the guys wrote on your body to commemorate the event...'
 
 	act 'Pass out': gt 'hantersex', 'hantersGrEnd'
@@ -2518,7 +2518,7 @@ end
 if $ARGS[0] = 'hantersgr1Ai':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr1ai.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr1Ai.jpg"></center>'
 	'Igor quickened his pace and you feel him cum deep inside of you.'
 	'Andrei gets up and walks away.'
 	
@@ -2532,7 +2532,7 @@ end
 
 if $ARGS[0] = 'hantersgr1Aa':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr1aa.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr1Aa.jpg"></center>'
 	'Andrei quickened his pace and you feel him cum deep inside of you.'
 	'Andrei gets up and walks away.'
 	
@@ -2546,7 +2546,7 @@ end
 
 if $ARGS[0] = 'hantersgr1As':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr1as.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr1As.jpg"></center>'
 	'Sergei quickened his pace and you feel him cum deep inside of you.'
 	'Sergei gets up and walks away.'
 	
@@ -2566,7 +2566,7 @@ if $ARGS[0] = 'hantersgrO1':
 	swallow += 1
 	body_write += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgro1cum.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrO1cum.jpg"></center>'
 	'Andrei put you on your back and then shot his cum all over you. Jets of sperm hit in your mouth, and on your face and hair.'
 
 	act 'Pass out': gt 'hantersex', 'hantersGrEnd'

locations/kafe.qsrc

@@ -17,15 +17,14 @@ if $ARGS[0] = 'start':
 	'Sitting at one end of the bar, you see <a href="exec:gt ''kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
 	*nl
 	'They serve American style meals'
+
+	act 'Leave the diner': minut += 5 & gt 'street'
+
 	if QWdogReiq = 3 and week = 7 and hour >= 12:
-		act 'Sit down at the table and wait for Margaret':gt 'kafe2', 'margo'
+		act 'Sit down and wait for Margaret':gt 'kafe2', 'margo'
 	end
 
-	!!act 'Agree':gt 'cafe3', 'wc'
-
 	act 'Sit down at a table': gt 'kafe', 'table'
-
-	act 'Leave': minut += 5 & gt 'street'
 end
 
 if $ARGS[0] = 'table':
@@ -43,14 +42,15 @@ if $ARGS[0] = 'table':
 	'Sitting at one end of the bar, you see <a href="exec:gt ''kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
 	*nl
 	'They serve American style meals'
-	act 'See the menu':gs 'food_menu'
+
+	act 'Get up from the table':gt 'kafe', 'start'
+
+	act 'Order from the menu (0:05)':gs 'food_menu'
 	if rand(1, 10) > 5:
 		gs 'boy'
 		'A man comes over to your table <<$boybody>> <<$boybod>> <<$boyface>> introducing himself as <<$boydesc>>.'
 		xgt 'kafe', 'razvod'
 	end
-
-	act 'Get up from the table':gt 'kafe', 'start'
 end
 
 if $ARGS[0] = 'vlad':
@@ -851,43 +851,45 @@ if $ARGS[0] = 'razvod':
 	menu_off = 0
 	$location_type = 'event'
 	cla
-	!!*clr
-	!!act 'Get up from the table':gt 'kafe', 'start'
+	act 'Get up from the table':gt 'kafe', 'start'
+
+	act 'Order from the menu (0:05)':gs 'food_menu'
+
 	deyst = rand(0, 3)
 	if deyst = 0:
 		'<<$boydesc>> invites you to dance.'
-		act 'Dance':gt 'cafe2', 'dance'
+		act 'Dance with him':gt 'cafe2', 'dance'
 		if pcs_horny < 75:
 			act 'Leave': minut += 5 & gt 'street'
 		end
 	elseif deyst = 1:
 		'<<$boydesc>> asks permission to sit down at the same table as you.'
-		act 'Drink':gt 'cafe2', 'booze'
+		act 'Drink with him':gt 'cafe2', 'booze'
 		if pcs_horny < 75:
 			act 'Leave': minut += 5 & gt 'street'
 		end
 	elseif deyst = 2:
 		'<<$boydesc>> invites you to a nearby party which he is going to.'
-		act 'Agree':gt 'cafe2', 'kompashka'
+		act 'Agree to party':gt 'cafe2', 'kompashka'
 		if pcs_horny < 75:
 			act 'Leave': minut += 5 & gt 'street'
 		end
 	elseif deyst = 3:
 		'<<$boydesc>> is incredibly drunk and you feel tipsy just from the smell of booze on him. "Hey baby, got some spare time? Come have fun in the outhouse."'
-		act 'Agree':gt 'cafe3', 'toilet'
+		act 'Meet in bathroom':gt 'cafe3', 'toilet'
 		if pcs_horny < 95:
 			act 'Leave':
 				cla
 				if rand(0, 400) < pcs_apprnc:
 					'"Come on, baby, I will give you two thousand <b>₽</b>. Daddy wants to have fun."'
-					act 'Agree':
+					act 'Meet in bathroom':
 						money += 2000
 						gt 'cafe3', 'toilet'
 					end
 				else
 					'"Well, okay, get out of here, you are ugly anyway."'
 				end
-				act 'Fuck you': minut += 5 & gt 'street'
+				act 'Tell him to fuck off': minut += 5 & gt 'street'
 			end
 		end
 	end

locations/lakecafe.qsrc

@@ -18,6 +18,8 @@ if $ARGS[0] = 'main':
 	'Opening hours: 14:00 to 04:00'
 	*nl
 
+	act 'Leave the cafe':minut += 2 & gt 'nord'
+
 	if hour >= 14 or hour < 4:
 		if npc_Qstlvl['A89'] = 0:
 			if barrnd = 1:'Behind the bar you see a smiling <a href="exec:gt ''lakecafe'', ''barmensha''">barmaid</a>, who is currently polishing some glasses.'
@@ -60,17 +62,15 @@ if $ARGS[0] = 'main':
 
 		'The diner has a single <a href="exec:gt ''laketoilet'', ''main''">toilet</a> available, for both males and females.'
 
-		act 'See the menu':gs 'food_menu'
+		act 'Order from the menu (0:05)':gs 'food_menu'
 		if money >= 350:
-			act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
+			act 'Order take-out (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 		end
 	end
 
 	if LCwork2 >= 1 and LCwork2day ! daystart and hour = 18:
-		act 'Offer to help out the kitchen (1:30)':gt 'LCwork', 'Kitchen'
+		act 'Help out the kitchen (1:30)':gt 'LCwork', 'Kitchen'
 	end
-
-	act 'Leave':minut += 2 & gt 'nord'
 end
 
 if $ARGS[0] = 'barmensha':
@@ -104,6 +104,8 @@ if $ARGS[0] = 'barmensha':
 		'Eugene smiles as she sees you approach the bar, and says cheerfully: "Hi, <<$pcs_nickname>>! What''s up?"'
 	end
 
+	act 'Leave Eugene so she can work':gt 'lakecafe', 'main'
+
 	if hour >= 14 or hour < 4:
 		if npc_Qstlvl['A89'] = 0:
 			act 'Chat with the barmaid (0:30)':
@@ -329,8 +331,6 @@ if $ARGS[0] = 'barmensha':
 		end
 	end
 
-	act 'Leave Eugene so she can work':gt 'lakecafe', 'main'
-
 	if npc_horny['A89'] > 50:
 		'Eugene smiles at you, with a glimmer in her eye.'
 		if LCEugenefirst > 0:

locations/liamelkafe.qsrc

@@ -9,7 +9,11 @@ if $ARGS[0] = 'start':
 	'<center><B><font color=maroon>Tiny Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/cafe/larek.jpg" ></center>'
+	*nl
 	'You enter a tiny cafe, consisting of very little floor space packed with small tables.'
+
+	act 'Leave the cafe':gt 'liames'
+
 	if hour > 11 and hour < 13:
 		'The cafe is packed with people eating their afternoon meal.'
 		if stallionQ = 1: stallionQ = 2
@@ -20,7 +24,6 @@ if $ARGS[0] = 'start':
 	if money > 45:
 		act 'Sit down for a meal': money -= 45 & gt 'liamelkafe', 'food'
 	end
-	act 'Leave':gt 'liames'
 end
 
 if $ARGS[0] = 'food':
@@ -32,9 +35,11 @@ if $ARGS[0] = 'food':
 	'<center><B><font color=maroon>Tiny Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/cafe/larek.jpg" ></center>'
-	act 'See the menu':gs 'food_menu'
+
+	act 'Leave the table':gt 'liamelkafe', 'start'
+	act 'Order from the menu (0:05)':gs 'food_menu'
 	if stallionQ = 2:
-		if FocH > (Foch_Max - 10): 
+		if FocH > (Foch_Max - 10):
 			stallionQ = 3
 			FocH = Foch_Max
 			EggRH += 300
@@ -44,8 +49,7 @@ if $ARGS[0] = 'food':
 	end
 	'The tiny cafe is wonderfully situated and you enjoy the beautiful scenery as you eat.'
 	if stallionQ = 0: StallionQ = 1
-	
-	act 'Leave the table':gt 'liamelkafe', 'start'
+
 end
 
 --- liamelkafe ---------------------------------

locations/pavSharedApt.qsrc

@@ -846,37 +846,8 @@ if $ARGS[0] = 'pcsRoom':
 	dynamic $wearpan
 	dynamic $removepan
 	!gs 'subkid'
-	if pcs_sleep <= 80:
-		if $clothingworntype = 'nude':
-			$sleep_txt = 'Go to sleep'
-		else
-			$sleep_txt = 'Undress and go to sleep'
-		end
-		if succubusQW = 2:
-			act '<<$sleep_txt>>':
-				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-				gt 'bed2', 'succhoice'
-			end
-		else
-			act '<<$sleep_txt>>':
-				if disable_autosave = 0:
-					if StoryLine = 0:
-						savegame 'autosave.sav'
-					else
-						savegame 'autosave_alt.sav'
-					end
-				end
-				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-				if magf2bdo = 2:
-					gt 'bed2', 'magbstchoice'
-				else
-					gt 'bed2', 'sleep'
-				end
-			end
-			killvar '$sleep_txt'
-		end
-	end
-end
+
+	act 'Relax on your bed': gt 'bed', 'start'
 
 if $ARGS[0] = 'sofabed':
 	$menu_loc = 'pavSharedApt'

locations/restoran.qsrc

@@ -15,8 +15,9 @@ if $ARGS[0] = 'start':
 
 	if vladimirday = daystart and vladimirQW = 21 and hour = 20: gt 'qwmeet'
 
-	act 'Approach the maître d'' ': gt 'restoran', 'maitred'
 	act 'Leave the restaurant': minut += 5 & gt 'down'
+
+	act 'Approach the maître d'' ': gt 'restoran', 'maitred'
 end
 
 if $ARGS[0] = 'maitred':
@@ -108,7 +109,7 @@ if $ARGS[0] = 'comtable':
 	'<center><b><font color="maroon">Babel, Common Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/maitredseat.jpg"></center>'
 	'You are escorted to your seat by the maître d''. You sit and and prepare to order a wonderful meal in the busy restaurant.'
-	act 'See the menu': gs 'food_menu'
+	act 'Order from the menu (0:05)': gs 'food_menu'
 
 	act 'Get up from the table': gt 'restoran', 'zal'
 end
@@ -124,7 +125,7 @@ if $ARGS[0] = 'viptable':
 	'<center><b><font color="maroon">Babel, VIP room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/chefrecommends.jpg"></center>'
 	'You sit and prepare to order a wonderful meal, recommended by the chef. You''ll be dining with pleasure in the peaceful and luxurious VIP Room.'
-	act 'See the menu': gs 'food_menu'
+	act 'Order from the menu (0:05)': gs 'food_menu'
 
 	act 'Get up from the table': gt 'restoran', 'vip'
 end

locations/stat.qsrc

@@ -569,7 +569,6 @@ if minut >= 60:
 	end
 
 	! vovan edition, from 1.2.5
-	if clearclothes > 0: clearclothes -= 1
 	if hantersAndreisex > 0: hantersAndreisex -= 1
 	if hantersSergeisex > 0: hantersSergeisex -= 1
 	if hantersIgorsex > 0: hantersIgorsex -= 1

locations/stat_display.qsrc

@@ -676,14 +676,6 @@ if cheatNoSweat = 0:
 	:statDswtEnd
 end
 
-if dirtyclothes = 1 and swamp_clothes = 0:
-	if pcs_sweat > 40:
-		$stat_msg +='<br><font color = red>You are <a href="exec:view''images/locations/gadukino/hunters/dirtyclothes1.jpg''">covered</a> from head to toe in the mud.</font><BR>'
-	else
-		$stat_msg +='<br><font color = red>Your <a href="exec:view''images/locations/gadukino/hunters/dirtyclothes2.jpg''">clothes</a> are dirty.</font><BR>'
-	end
-end
-
 if lactate <= 0 and prolactinlvl >= 100:
 	$stat_msg += '<BR>'+iif(night_mode > 0,'<font color = white>','<font color = black>')+'Your breasts feel weirdly engorged and sore.</font><BR>'
 end
@@ -1099,6 +1091,8 @@ elseif $pantyworntype = 'none' and $clothingworntype ! 'swimwear':
 		$stat_msg += '<BR><b><font color= #AB052A>You are not wearing panties, but you are dressed as a hooker, so that''s hardly surprising.</font></b>'
 	elseif PCloBimbo = 1 or bimbolevel > 0 and PCloSkirt > 3 and cheatBimbo = 0:
 		$stat_msg += '<BR><b><font color = #FF00FF>You like, totally forgot to put on any panties. You are such a bimbo.</font></b>'
+	elseif $clothingworntype = 'cheap' and clothingwornnumber = '414':
+		$stat_msg += '<BR><b><font color = "yellow">You are wearing an old hessian sack the hunters gave you.</font></b>'
 	elseif PCloSkirt > 3:
 		if pcs_inhib > 50:
 			$stat_msg += '<BR><b><font color=#0064FF>You feel liberated not wearing panties as your naked ass flashes from under your short skirt.</font></b>'
@@ -1122,8 +1116,9 @@ elseif $pantyworntype = 'none' and $clothingworntype ! 'swimwear':
 	end
 elseif PCloBimbo = 1 and cheatBimbo = 0:
 	$stat_msg += '<BR><b><font color = #FF00FF>You are dressed as a bimbo</font></b>'
+elseif $clothingworntype = 'cheap' and clothingwornnumber = '414':
+	$stat_msg += '<BR><b><font color = "yellow">You are wearing an old hessian sack the hunters gave you.</font></b>'
 end
-!$stat_msg += '<BR>'
 
 if mosol >= 50:
 	$stat_msg += '<BR><b><font color="red">Your pussy itches a great deal and is affecting your mood, you should use some cream or stop wearing pants without underwear.</font></b>'

locations/swamp.qsrc

@@ -15,7 +15,7 @@ goswamp = 1
 gs 'gadukino_event', 'sound'
 gs 'stat'
 
-cls
+*clr * cla
 
 '<center><H4>Swamp</H4></center>'
 
@@ -32,12 +32,15 @@ else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_winter_night.jpg"></center>'
 	end
 end
-
+*nl
 'You are in the swamp area of the forest.'
-'It is considered dangerous to hike here day unless extremely physically fit and should be avoided at night no matter what.'
-'But you can find a lot of mushrooms and berries here.'
-
+'It is considered dangerous to hike in this area, unless physically fit, and should always be avoided at night.'
+*nl
+'You can find a lot of mushrooms and berries here.'
+*nl
 'There''s a small visible path to a clearing that leads to <a href="exec: gt ''swamp_yard'' ">the hut</a>, used by the hunters.'
+*nl
+act 'Go to the hut': gt 'swamp_yard'
 
 if hour >= 6 and hour <= 21 and month >= 6 and month <= 9:
 	act 'Walk into the forest':gs 'clothing', 'swamp_clothes', 0 & minut += 30 & gt 'gadforest','4'

locations/swamp_yard.qsrc

@@ -1,8 +1,11 @@
 # swamp_yard
 
-$location_type = 'secluded'
-$metka = ''
 $loc = 'swamp_yard'
+$metka = ''
+$menu_loc = 'swamp_yard'
+$menu_arg = ''
+menu_off = 0
+$location_type = 'secluded'
 
 gs 'gadukino_event', 'sound'
 gs 'stat'
@@ -55,7 +58,6 @@ end
 'The yard in front of the hut.'
 'Behind the hut there is a <a href="exec: gt ''swampspring'' ">spring</a>, if you continue a little further down there is a small <a href="exec: gt ''backwater'' ">creek</a> with relatively clean water.'
 if findvel = 3:'On the side of the hut is an old <a href="exec:gt ''bicycle'',''swamp''">bike</a>.'
-if clearclothes > 0 and clearclothesH = 0: 'You can dry your clothes in the meadow.'
 if hanters > 0 and hantersKnow = 0:'You spot some unfamiliar <a href="exec: gt ''hanters'', ''start'' ">people</a> standing in front of the hut.'
 if hanters > 0 and hantersKnow > 0 and hour >= 8 and hour < 20:'You notice the <a href="exec: gt ''hanters'', ''start'' ">hunters</a> standing in the front yard.'
 
@@ -148,7 +150,7 @@ if hanterhelp = 2 and hantersKnow = 0:
 			'"I''m Andrei," replied the older man, "and these are my friends, from the city, Igor and Sergei."'
 			'"Is your lastname possibly <<$pcs_lastname>>?" he asked. You look at him and nodded approvingly.'
 			'"Don''t be afraid <<$pcs_nickname>>, you look a lot like your mother when she was younger. I... Hmmm... that''s good to know, I''m also from Gadukino." said Andrei.'
-			if pcs_sweat > 0 or dirtyclothes = 1:
+			if pcs_sweat > 0:
 				'"Go on, take a bath and wash your clothes, they''re quite dirty," Andrei continued.'
 				'"Where?"'
 				'"Well, it''s still warm outside, so you can wash up in the creek, just follow the path behind the hut, you can''t miss it. Or if you want use the basin over there, collect the water from the spring and heat it on the oven." said Andrei.'
@@ -161,7 +163,7 @@ if hanterhelp = 2 and hantersKnow = 0:
 			'You look at him feeling a bit uncomfortable.'
 			'"Don''t be afraid, I''m also from Gadukino, you look just like your mother when she was younger, and I see you''re also been blessed with good looks." he said.'
 			'"I''m Andrei," he says, adding "and these are my friends, from the city, Igor and Sergei.'
-			if pcs_sweat > 3 or dirtyclothes = 1:
+			if pcs_sweat > 3:
 				hantersKnowSlut = 1
 				hantersRape = 1
 				'"Go and take a bath and wash your clothes, you''re dirty as hell... and you look disgusting..." said Andrei. "Go on now, while we think what to do with you.'
@@ -383,7 +385,7 @@ if hour >= 8 and hour < 20:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude.jpg"></center>'
 			'Seeing some men in the yard, you try to cover up your private parts...'
 
-			if FUNC('lost_clothes_here','swamphouse') = 1 and clearclothes = 0 and $lastwornclothingtype ! 'nude':
+			if FUNC('lost_clothes_here','swamphouse') = 1 and $lastwornclothingtype ! 'nude':
 				act'Get dressed':
 					*clr & cla
 					minut += 5
@@ -1018,10 +1020,7 @@ if StoryLine = 1 and lost_girl > 0 and daystart > lost_girl:
 	minut += 150
 	lost_girl = 0
 	forest_lostday = 0
-	dirtyclothes = 0
 	hanters = 0
-	gs 'clothing', 'swamp_clothes', 0
-	gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/forester.jpg"></center>'

locations/swampspring.qsrc

@@ -1,8 +1,11 @@
 # swampspring
 
-$location_type = 'secluded'
-$metka = ''
 $loc = 'swampspring'
+$metka = ''
+$menu_loc = 'swamp_yard'
+$menu_arg = ''
+menu_off = 0
+$location_type = 'secluded'
 
 gs 'gadukino_event', 'sound'
 gs 'stat'
@@ -22,9 +25,10 @@ else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampspring_winter_night.jpg"></center>'
 	end
 end
-
+*nl
 'You''ve come across a natural spring with pure natural water.'
 
+act 'Go back to the hut':minut += 5 & gt 'swamp_yard'
 
 if pcs_hydra < 150:
 	act 'Drink the water':
@@ -56,7 +60,6 @@ if bucket < 10:
 		act 'Finish':gt 'swampspring'
 	end
 end
-act 'Leave':minut += 5 & gt 'swamp_yard'
 
 --- swampspring ---------------------------------
 

locations/wardrobe.qsrc

@@ -7,8 +7,8 @@ if $ARGS[0] = 'start':
 	PShoStyle = ShoStyle
 	$wloc = 'wardrobe'
 	if $clothingworntype = 'cheap' and clothingwornnumber = '414':
-		gs 'clothing', 'strip'
 		gs 'clothing', 'swamp_clothes', 0
+		gs 'clothing', 'strip'
 	end
 	if ward_img_hgt = 0:ward_img_hgt = 150
 	'<h3><center><b><font color="maroon">Wardrobe overview</b></h3><br><center><font color="maroon">These are the clothes you are currently wearing - Click on an item to change it</font></center>'

locations/ybedr.qsrc

@@ -15,7 +15,9 @@ if ymanrem[4] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/
 if ymanrem[4] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
 if ymanrem[4] = 2:
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ybedr.jpg"></center>'
-	'It''s a bright and beautiful room, with a large <a href="exec:gt ''bed'', ''start''">continental bed</a>. On one of the sides there''s an entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
+	*nl
+	'It''s a bright and beautiful room, with a large <a href="exec:gt ''bed'', ''start''">continental bed</a>.'
+	'On one side of the bed is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start'', ''start''">wardrobe</a>.'
 	'There''s a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a> placed in one of the corners.'
 end