Merge remote-tracking branch 'julzor/master'

locations/Nord.qsrc

@@ -154,7 +154,11 @@ if $ARGS[0] = 'redlight':
 	elseif pornstudio >= 1 and (hour < 10 or hour >= 22):
 		'At the <a href="exec:msg ''The Porn Studio is closed for the day and will reopen at 10:00''">Porn Studio</a>, where a variety of naughty movies are created'
 	end
-	'A shop for <a href="exec:gt ''sexshop'', ''start''">Sex Toys</a> is open for perverts from all around the city.'
+	if hour < 3 or hour >= 11: 
+		'A shop for <a href="exec:minut += 5 & gt ''sexshop'', ''start''">Sex Toys</a> is open for perverts from all around the city.'
+	else
+		'A shop for sex toys is closed and will open at 11:00.'
+	end
 	if bordel > 0 and hour >= 20 or bordel > 0 and hour <= 3:'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
 
 	act 'Return to the Industrial Region (0:05)': minut += 5 & gt 'Nord'

locations/dinSex.qsrc

@@ -1007,6 +1007,7 @@ end &! --- pc_puts_condom ---
 !! gs 'dinsex','boy_wants_anal' [, $boydesc [, 'lubri']]
 if $ARGS[0] = 'boy_wants_anal':
 	$bwa_boy = iif($ARGS[1] = '',$boydesc,$ARGS[1])
+	if $bwa_boy = 'lubri': $bwa_boy = $boydesc
 	if analplugin = 1:
 		'<<$bwa_boy>> pulls the plug out of your narrow and tight ass.'
 		analplugout = 1
@@ -1036,6 +1037,7 @@ end &! --- boy_wants_anal ---
 !! gs 'dinsex', 'girl_wants_anal'[, $boydesc [, 'lubri']]
 if $ARGS[0] = 'girl_wants_anal':
 	$bwa_girl = iif($ARGS[1] = '',$boydesc,$ARGS[1])
+	if $bwa_girl = 'lubri': $bwa_girl = $boydesc
 	if analplugin = 1:
 		'<<$bwa_girl>> pulls the plug out of your narrow and tight ass.'
 		analplugin = 0

locations/gdksport.qsrc

@@ -100,8 +100,7 @@ if $ARGS[0] = 'start':
 		end
 		if gsAboDance > 0 and albinaQWdance = 0 and npc_pregtalk['A23'] = 0:
 			act 'Take a dance lesson, you have <<gsAboDance>> lessons remaining':gt 'gdksport', 'dance2'
-		end
-		if albinaQWdance > 0 and AlbinaBlokDance = 0 and ZvezdEnd = 0 and npc_pregtalk['A23'] = 0 and startletsday ! daystart:
+		elseif albinaQWdance > 0 and AlbinaBlokDance = 0 and ZvezdEnd = 0 and npc_pregtalk['A23'] = 0 and startletsday ! daystart:
 			if pregtime >= 90:
 				act 'Train with Starlets':gt 'gdksport', 'Starletsreact'
 			else
@@ -399,7 +398,7 @@ if $ARGS[0] = 'albina4':
 					'Albina thought about it and looked at the other girls; some nodded, others shrugged.'
 					'Finally she answered you, "Okay, we''ll take a shot. Maybe you''ll learn something and be worthwhile."'
 
-					act 'Leave':gt 'gdk'
+					act 'Leave':gt 'gdksport', 'start'
 				end
 			end
 		end

locations/glake.qsrc

@@ -231,7 +231,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 				if pcs_inhib < 50:inhib_exp += rand(1,2)
 			end
 			'You swim and play in the lake, feeling refreshed and invigorated by the clean lake water.'
-			if $clothingworntype = 'nude':pcs_willpwr -= 5 & pcs_mood -= 5 & 'After a few minutes, you feel the piercing gaze of several nearby women on you. They''re making an effort of whispering to one another, yet loud enough so you can hear them: "Look at that <<$pcs_lastname>> slut! She has no decency whatsoever, shamelessly flaunting her naked body like that!" The men at the lake are much more appreciative, and openly stare at your attractive body. You can see bulges forming in the shorts of some of them.'
+			if $clothingworntype = 'nude':pcs_willpwr -= 5 & pcs_mood -= 5 & 'After a few minutes, you feel the piercing gaze of several nearby women on you. They''re making an effort of whispering to one another, yet loud enough so you can hear them: "Look at that'+iif(StoryLine = 1, ' <<$pcs_lastname>> ', ' ')+'slut! She has no decency whatsoever, shamelessly flaunting her naked body like that!" The men at the lake are much more appreciative, and openly stare at your attractive body. You can see bulges forming in the shorts of some of them.'
 
 			act 'Get out of the water':gt'glake'
 		end

locations/gskver.qsrc

@@ -112,9 +112,7 @@ if $ARGS[0] = 'start':
 		act 'Go and see Rex':gt 'reks', 'skver'
 	end
 	
-	if week >= 6 and hour >= 8 and hour <= 9:
-		'<a href="exec:gt ''gschool_socialchg1'',''tVanya''">Vanya</a> is out on a light jog and is slowly approaching you.'
-	end
+	if week >= 6 and hour >= 8 and hour <= 9 and StoryLine = 1: '<a href="exec:gt ''gschool_socialchg1'',''tVanya''">Vanya</a> is out on a light jog and is slowly approaching you.'
 
 	act 'Go for a walk (0:15)':
 		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1

locations/pavComplex.qsrc

@@ -50,11 +50,7 @@ if $ARGS[0] = 'start':
 		if (hour < 8 or hour > 20) and rand (1,8) = 1: gt 'pavaptcourtev', 'events2'
 	end	
 
-	if week = 1 or week = 3 or week = 5:
-		if hour >= 17 and hour <= 19:
-			'Walking along the apartment complex you can hear a bouncing sound. Turning the corner you see <a href="exec:gt ''gschool_socialchg1'', ''tLariska''">Lariska</a> hitting a ball against the wall...'
-		end
-	end
+	if week = 1 or week = 3 or week = 5 and hour >= 17 and hour <= 19 and Storyline > 0: 'Walking along the apartment complex you can hear a bouncing sound. Turning the corner you see <a href="exec:gt ''gschool_socialchg1'', ''tLariska''">Lariska</a> hitting a ball against the wall...'
 	
 	if car > 0 and cardrive = 20:
 		cardrive = 20

locations/sexshop.qsrc

@@ -15,7 +15,6 @@ if $ARGS[0] = 'start':
 	if kendra > 0 and rand(1, 10) = 10:gt 'sexshop', 'kendra'
 	if $pantyworntype = 'none' and rand(1, 10) = 10:gt 'sexshop', 'shprod'
 
-	minut += 5
 	clr
 	gs 'stat'
 	gs 'themes', 'indoors'
@@ -28,31 +27,20 @@ if $ARGS[0] = 'start':
 	'Butt plug 1,200 <b>₽</b>'
 	'In the basement are the private booths for viewing porn movies (50 <b>₽</b> 15 minutes).'
 
-	act 'Leave':
-		cla
-		ghnow = 0
-		minut += 5
-		gt 'Nord', 'redlight'
-	end
+	act 'Leave': minut += 5 & gt 'Nord', 'redlight'
 
-	if SUB >= 100 and analplug = 1 and dildo = 1 and pcs_apprnc > 104 and Peter = 0:
-		if rand(0, 1) = 1:
+	if sub >= 100 and analplug = 1 and dildo = 1 and pcs_apprnc > 104 and Peter = 0:
+		if rand(0,1) = 1:
 			'You see an interesting looking middle-aged man, apparently he is the owner of this store.'
 
 			act 'Introduce yourself to the owner of the store' :
-				cla
-				*clr
+				*clr & cla
+				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/characters/city/peter/peter.jpg"></center>'
 				'I''m Peter, I''ve been watching you for a long time. I often see you here. I think it will be interesting...'
 
-				act 'Go with Peter':gt 'Peterroom', 'start'
-
-				act 'Leave':
-					cla
-					ghnow = 0
-					minut += 5
-					gt 'Nord', 'redlight'
-				end
+				act 'Leave': minut += 5 & gt 'Nord', 'redlight'
+				act 'Go with Peter': gt 'Peterroom', 'start'
 			end
 		end
 	end
@@ -63,14 +51,13 @@ if $ARGS[0] = 'start':
 		'You notice out of the corner your eye, that the seller is trying to get your attention.'
 
 		act 'Approach to learn what we wants':
-			cla
-			*clr
+			*clr & cla
 			minut += 5
+			menu_off = 1
 			'In general, you give a great blowjob, everyone knows that. Do you want to earn extra money in the porn business as an actress? The pay there is certainly better than here, and cocks, maybe even more. Well? Other options will not be as good!'
 
 			act 'Agree':
-				cla
-				*clr
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/pierre_1.jpg"></center>'
@@ -78,58 +65,50 @@ if $ARGS[0] = 'start':
 				'To you approached by a young man who introduced Peter, you are greeted and met.'
 
 				act 'Set out the purpose of your visit':
-					cla
-					*clr
+					*clr & cla
 					minut = minut + 60
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/pierre_2.jpg"></center>'
 					'Peter smiled and said that the new actresses are always welcome, just terrible, of course, in the business do not take. On the first couple of auditions will take place, if you like the public - you can not take them.'
 					'I''ll tell you that here and how, but under one condition - you have to undress.'
 
 					act 'Undress':
-						cla
-						*clr
+						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/casting_3.jpg"></center>'
 						'First there is a casting actresses - as I said, if you are terrible - you can not hope only comes when you have a beautiful appearance.'
 
 						act '......':
-							cla
-							*clr
+							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/model_0.jpg"></center>'
 							'Then she selected for the lead role.'
 							'Here you have to be the most beautiful.'
 
 							act '......':
-								cla
-								*clr
+								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/film_0.jpg"></center>'
 								'Well then filming itself - an interesting and exciting process'
 								'And the output we get ....'
 
 								act '......':
-									cla
-									*clr
+									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/dvd-disx.jpg"></center>'
 									'Then on what I make money.'
 
 									act 'Everything is clear, but how and where everything is for sale? Maybe I want to see for yourself ..':
-										cla
-										*clr
+										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/pierre_2.jpg"></center>'
 										'The sauna is in a residential area we have one man .. And in a sex shop, how could you understand there garters. Now here are thinking about selling in the university. If we have this who helped - increased profits used well, with dividend entitlements assistant, of course.'
 
 										act 'And any problems with the law?':
-											cla
-											*clr
+											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/ment_0.jpg"></center>'
 											'Specifically for you - yet. We''ve got their contracts with the cops, maybe in the future you will be able to help us to keep them in power, but for now - I told you all have to try on the weekend.'
 
 											act 'Well like all realized':
-												cla
-												*clr
+												*clr & cla
 												'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/pierre_2.jpg"></center>'
 												'Boy, girl, enjoy yourself and do not take away I have more time'
 												pornstudio = 3
-												gt 'pornstudio', 'start'
+												act 'Continue': gt 'pornstudio', 'start'
 											end
 										end
 									end
@@ -140,55 +119,32 @@ if $ARGS[0] = 'start':
 				end
 			end
 
-			act 'Refuse':
-				cla
-				*clr
-				pornstudio = 1
-				gt 'sexshop', 'start'
-			end
+			act 'Refuse': pornstudio = 1 & 	gt 'sexshop', 'start'
 		end
 	end
 
-	act 'Look through the fetish clothing':
-		minut += 5
-		gt 'sexshop', 'clo'
-	end
-
-	act 'Look through the burlesque clothing':
-		minut += 5
-		gt 'sexshop', 'clo2'
-	end
-
-	act 'Look through the panties':
-		minut += 5
-		gt 'sexshop', 'panties'
-	end
-
-	act 'Look through the bras':
-		minut += 5
-		gt 'sexshop', 'bras'
-	end
-
-	act 'Look through the fetish shoes':
-		minut += 5
-		gt 'sexshop', 'shoes'
-	end
+	act 'Look through the fetish clothing':	minut += 1 & gt 'sexshop', 'clo'
+	act 'Look through the burlesque clothing': minut += 1 & gt 'sexshop', 'clo2'
+	act 'Look through the panties':	minut += 1 & gt 'sexshop', 'panties'
+	act 'Look through the bras': minut += 1 & gt 'sexshop', 'bras'
+	act 'Look through the fetish shoes': minut += 1 & gt 'sexshop', 'shoes'
 	
 	if money >= 300:
 		act 'Buy lubricant 300 <b>₽</b>':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			portion = input ("How much you want to buy?")
 
-			if portion*300 > money:'You do not have enough money.'
-
-			if portion*300 <= money:
+			if portion * 300 > money:
+				'You do not have enough money.'
+			else
 				lubri += portion * 5
 				money -= portion * 300
 				minut += 5
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 				'You bought some lubricant and paid the cashier.'
 			end
+			gs 'stat'
 
 			act 'Move away from the counter':gt 'sexshop', 'start'
 		end
@@ -198,7 +154,8 @@ if $ARGS[0] = 'start':
 
 	if pornMagazine <= 1 and money >= 400:
 		act 'Buy a porn magazine (400 <b>₽</b>)':
-			cls
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			money -= 400
 			pornMagazine = 50
@@ -213,11 +170,12 @@ if $ARGS[0] = 'start':
 
 	if money >= 800 and dildo = 0:
 		act 'Buy 10cm dildo (800 <b>₽</b>)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			dildo = 1
 			money -= 800
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a dildo and paid the cashier.'
 
@@ -229,11 +187,12 @@ if $ARGS[0] = 'start':
 
 	if money >= 850 and middildo = 0:
 		act 'Buy 15cm long dildo (850 <b>₽</b>)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			middildo = 1
 			money -= 850
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a 15cm long dildo and paid the cashier.'
 
@@ -245,11 +204,12 @@ if $ARGS[0] = 'start':
 
 	if money >= 900 and largedildo = 0:
 		act 'Buy 20cm long dildo (900 <b>₽</b>)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			largedildo = 1
 			money -= 900
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a 20cm long dildo and paid the cashier.'
 
@@ -261,11 +221,12 @@ if $ARGS[0] = 'start':
 
 	if money >= 950 and bigdildo = 0:
 		act 'Buy 25cm long dildo (950 <b>₽</b>)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			bigdildo = 1
 			money -= 950
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a 25cm long dildo and paid the cashier.'
 
@@ -277,11 +238,12 @@ if $ARGS[0] = 'start':
 
 	if money >= 1000 and extradildo = 0:
 		act 'Buy 30cm long dildo (1,000 <b>₽</b>)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			extradildo = 1
 			money -= 1000
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a 30cm long dildo and paid the cashier.'
 
@@ -293,11 +255,12 @@ if $ARGS[0] = 'start':
 
 	if money >= 1100 and superdildo = 0:
 		act 'Buy 35cm long dildo (1,100 <b>₽</b>)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			superdildo = 1
 			money -= 1100
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a 35cm long dildo and paid the cashier.'
 
@@ -309,11 +272,12 @@ if $ARGS[0] = 'start':
 
 	if money >= 1200 and maddildo = 0:
 		act 'Buy 40cm long dildo (1,200 <b>₽</b>)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			maddildo = 1
 			money -= 1200
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a 40cm long dildo and paid the cashier.'
 
@@ -325,11 +289,12 @@ if $ARGS[0] = 'start':
 
 	if money >= 800 and vibrator = 0:
 		act 'Buy vibrator (800 <b>₽</b>)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			vibrator = 1
 			money -= 800
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a vibrator and paid the cashier.'
 
@@ -341,11 +306,12 @@ if $ARGS[0] = 'start':
 
 	if money >= 1200 and strapon = 0 and dildo = 0:
 		act 'Buy a strapon with a 15cm dildo (1,200 <b>₽</b>)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			strapon = 1
 			money -= 1200
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a strapon and paid the cashier.'
 
@@ -353,11 +319,12 @@ if $ARGS[0] = 'start':
 		end
 	elseif money >= 500 and strapon = 0 and dildo = 1:
 		act 'Buy a strapon harness (500 <b>₽</b>)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			strapon = 1
 			money -= 500
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a strapon and paid the cashier.'
 
@@ -369,11 +336,12 @@ if $ARGS[0] = 'start':
 
 	if money >= 800 and analplug = 0:
 		act 'Buy butt plug 800 <b>₽</b>':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			analplug = 1
 			money -= 800
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a butt plug and paid the cashier.'
 
@@ -387,18 +355,17 @@ end
 if $ARGS[0] = 'clo':
 	$metka = 'clo'
 	$loc = 'sexshop'
-	cls
+	$menu_loc = 'sexshop'
+	$menu_arg = 'clo'
+	menu_off = 0
+	*clr & cla
 	gs'stat'
 	'<center><b><font color="maroon">Fetish clothing - for all your personal needs</font></b></center>'
 	*nl
 
 	gs 'clothing_QV', 'shop_header'
 
-	act 'Return':
-		cla
-		minut += 1
-		gt 'sexshop', 'start'
-	end
+	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
 	i = Clothingstock + 1
 
@@ -439,7 +406,10 @@ end
 if $ARGS[0] = 'clo2':
 	$metka = 'clo2'
 	$loc = 'sexshop'
-	cls
+	$menu_loc = 'sexshop'
+	$menu_arg = 'clo2'
+	menu_off = 0
+	*clr & cla
 	gs'stat'
 	'<center><b><font color="maroon">Burlesque clothing - for entertainers and those most special of occasions</font></b></center>'
 	*nl
@@ -481,11 +451,7 @@ if $ARGS[0] = 'clo2':
 
 	'<center><table border=1><<$Headerstring>></center>'
 
-	act 'Return':
-		cla
-		minut += 1
-		gt 'sexshop', 'start'
-	end
+	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
 	if Clothingstock > 11:
 		i = 1
@@ -522,14 +488,13 @@ end
 if $ARGS[0] = 'shoes':
 	$metka = 'shoes'
 	$loc = 'sexshop'
-	cls
+	$menu_loc = 'sexshop'
+	$menu_arg = 'shoes'
+	menu_off = 0
+	*clr & cla
 	gs'stat'
 
-	act 'Return':
-		cla
-		minut += 1
-		gt 'sexshop', 'start'
-	end
+	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
 	if Clothingstock > 11:
 		i = 1
@@ -548,14 +513,13 @@ if $ARGS[0] = 'fetish_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'fetish',i,
 if $ARGS[0] = 'panties':
 	$metka = 'panties'
 	$loc = 'sexshop'
-	cls
+	$menu_loc = 'sexshop'
+	$menu_arg = 'panties'
+	menu_off = 0
+	*clr & cla
 	gs'stat'
 
-	act 'Return':
-		cla
-		minut += 1
-		gt 'sexshop', 'start'
-	end
+	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
 	i = 1
 
@@ -574,20 +538,18 @@ if $ARGS[0] = 'panties2':
 	end
 
 	gt 'panties', 'view_panty_item', 'shop', 'sexshop',i, 500
-
 end
 
 if $ARGS[0] = 'bras':
 	$metka = 'bras'
 	$loc = 'sexshop'
-	cls
+	$menu_loc = 'sexshop'
+	$menu_arg = 'bras'
+	menu_off = 0
+	*clr & cla
 	gs'stat'
 
-	act 'Return':
-		cla
-		minut += 1
-		gt 'sexshop', 'start'
-	end
+	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
 	i = 1
 
@@ -610,10 +572,13 @@ if $ARGS[0] = 'bras2':
 end
 
 if $ARGS[0] = 'podval':
-	cla
-	clr
-	*clr
-	minut += 5
+	$menu_loc = 'sexshop'
+	$loc = 'sexshop'
+	$metka = 'podval'
+	$menu_arg = 'podval'
+	menu_off = 0
+	*clr & cla
+	minut += 1
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Basement with cubicles for watching movies</font></b></center>'
@@ -629,18 +594,19 @@ end
 
 if $ARGS[0] = 'toi':
 	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc = $curloc
 	$location_type = 'bathroom'
 	$locM = 'sexshop'
 	$metkaM = 'toi'
-	cla
-	*clr
-	minut += 5
+	$menu_loc = 'sexshop'
+	$menu_arg = 'toi'
+	menu_off = 0
+	*clr & cla
+	minut += 1
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">WC</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
-	''
 
 	act 'Leave the toilet':gt 'sexshop', 'podval'
 	
@@ -655,12 +621,10 @@ end
 
 if $ARGS[0] = 'pip':
 	$location_type = 'private'
-	cla
-	clr
-	*clr
+	*clr & cla
+	menu_off = 1
 	minut += 5
 	gs 'stat'
-	!!gloryholeBooths
 	gs 'themes', 'indoors'
 
 	'<center><b><font color="maroon">Booth movies</font></b></center>'
@@ -668,8 +632,7 @@ if $ARGS[0] = 'pip':
 	'Small cabinet with a TV on the wall, terminal and two holes in the walls at waist level.'
 	if mistressqwest > 0 and mistressqwest <= 20:
 		GHchance = rand(6,10)
-		ghnowcheck = ghnow
-		
+		ghnowcheck = ghnow		
 	else
 		GHchance = rand(1,10)
 		ghnowcheck = ghnow * 2
@@ -679,7 +642,7 @@ if $ARGS[0] = 'pip':
 
 	act 'Get out of the booth':gt 'sexshop', 'podval'
 
-	if money >= 50 and hour < 23:
+	if money >= 50 and (hour >= 11 or hour < 3):
 		act 'Stick 50 <b>₽</b> in the machine':
 			cla
 			money -= 50
@@ -771,8 +734,8 @@ end
 
 if $ARGS[0] = 'kendra':
 	$location_type = 'event'
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	minut += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend.jpg"></center>'
@@ -784,10 +747,8 @@ if $ARGS[0] = 'kendra':
 	if pcs_dom > 10:act 'First serve':gt 'sexshop', 'kendra4'
 
 	act 'Serve Kendra':
-		cla
-		*clr
-		SUB += 1
-		!!girl += 1
+		*clr & cla
+		sub += 1
 		lesbian += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend1.jpg"></center>'
 		'You quickly throw off clothes and knelt before her pussy and lick her eagerly. As long as you carefully suck Kendra as squeals and praises your tongue, saying that no tongue has pleased her much as yours.'
@@ -800,26 +761,23 @@ end
 
 if $ARGS[0] = 'kendra1':
 	$location_type = 'event'
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	minut += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend2.jpg"></center>'
 	'You take a dildo, and licking her pussy insert into Kendra. While you with one hand fucks the dildo in her pussy, the second caress her clit trying to bring her to orgasm. Kendra writhes sitting on the table carefully adjusting your movements to the beat.'
 
-	pipirand = rand(0, 3)
+	pipirand = rand(0,3)
 
 	if pipirand > 0:
 		orgasm += 1
 		'Then Kendra starts spasming as her whole body orgasms, you also feel yourself crest the wave of orgasm. Slightly recovering yourself, Kendra looks at you: "You are a beautiful bitch, totaly committed to serving me."'
 
 		act 'Finish':gt 'sexshop', 'start'
-	end
-
-	if pipirand = 0:
+	else
 		act 'Oops ...':
-			cla
-			*clr
+			*clr & cla
 			pcs_sweat += 10
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend4.jpg"></center>'
 			'Suddenly, when she is ready to cum, Kendra begin pissin, her urine flowing allong the dildo and your coating your hand.'
@@ -829,11 +787,11 @@ if $ARGS[0] = 'kendra1':
 			act 'Leave her':gt 'sexshop', 'kendra3'
 
 			act 'Continue':
-				cla
-				*clr
+				*clr & cla
 				pcs_sweat += 30
-				SUB += 2
+				sub += 2
 				pcs_horny = 0
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend3.jpg"></center>'
 				'You dutifully continue to thrust the dildo, still stroking her clit, but the excitement is already gone. Her urine dripping from the dildo on your hand and now your stomach and thighs, your are totally covered in her urine.'
 				'Finally she finished, "And now Carney me, and then I become dirty." commanded Kendra'
@@ -841,9 +799,8 @@ if $ARGS[0] = 'kendra1':
 				act 'Leave her':gt 'sexshop', 'kendra3'
 
 				act 'Lick':
-					cla
-					*clr
-					SUB += 2
+					*clr & cla
+					sub += 2
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend5.jpg"></center>'
 					'You dutifully move closer to her pussy and began to slowly lick the urine from her thighs and pussy.'
 					'"Keep going you slut," Kendra orders you. You began to lick faster, eeping from retching from urine taste in the mouth with difficulty.'
@@ -858,20 +815,20 @@ end
 
 if $ARGS[0] = 'kendra2':
 	$location_type = 'event'
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	minut += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend8.jpg"></center>'
 	'Kendra slides on the strapon and looking at you asks, "Well, beauty in which hole do you want it?"'
 
 	act 'In the vagina':
-		cla
-		*clr
+		*clr & cla
 		stat['vaginal'] += 1
 		pcs_vag += 1
 		orgasm += 1
 		pcs_horny = 0
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend10.jpg"></center>'
 		'Kendra sits in a chair and you jump on top of her strap-on, slding it into your pussy. You ride the strapon, and Kendra drives up from he bottom you trying to shove it as far into your pussy as possible. Several minutes pass and such thrust force you to orgasm, and you slide off the chair with Kendra.'
 		'"That''s clever, come see me often. Have fun." With these words Kendra dresses and leaves.'
@@ -880,12 +837,12 @@ if $ARGS[0] = 'kendra2':
 	end
 
 	act 'In the ass':
-		cla
-		*clr
+		*clr & cla
 		stat['anal'] += 1
 		orgasm += 1
 		pcs_ass += 1
 		pcs_horny = 0
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend9.jpg"></center>'
 		'You jump up on the table and spreads your legs, Kendra gently slides in the strapon into your aas and gives your ass time to adjust to it. Then she begins to thrust, the strapon slides inside your ass and you soon start to moan. Seeing that you enjoy the process, Kendra begins to slowly accelerate, and you slide yoru hand to your pussy and finger your clit. After a few minutes you orgasm, as your hole body convulsies and shuders you sldie down cuddle and cuddle Kendra so that the strapon is buired all the way in your ass, you close your eyes and drift off.'
 		'When you come to, Kendra is already dressed, "Well, you orgasmed slut, I will have to find a double dildoed strapon. I want to see what you will do with two shafts buried in you" with that Kendra leaves.'
@@ -896,12 +853,13 @@ end
 
 if $ARGS[0] = 'kendra3':
 	$location_type = 'event'
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	minut += 10
 	stat['anal'] += 1
 	pcs_ass += 1
 	rape += 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend6.jpg"></center>'
 	'"Oh damn, now I''m going to teach obedience," with these words Kendra jumps up and throws you on to the table that she sat on a moment ago. Falling on the table you swipe back, and while you''re writhing in pain on the table, Kendra slides on a strapon. Pressing your hands to the table your hips are forced back and she pushes it into your ass, with out any lubricant on it. Added pain to the pain of your burning ass your asshole is torn open. Kendra fucks with you with force into your ass calling you a worthless bitch fit only to be used.'
 	'When she finally tires, you just slump to the floor from the table and land with a thud.'
@@ -922,8 +880,8 @@ end
 
 if $ARGS[0] = 'kendra4':
 	$location_type = 'event'
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	minut += 10
 	orgasm += 1
 	pcs_horny = 0
@@ -932,9 +890,12 @@ if $ARGS[0] = 'kendra4':
 	'Kendra looks surprised at you until you tear off your clothes.'
 	'Naked you turned to her and stick out your ass "Well look, you bring me to orgasm and we can try strapon"'
 
-	if picrand = 11:'Kendra kneels down and begins to lick your pussy, her tongue slides all over your sex, your sensitive clit and dipping into the vagina a few minutes of her effort, you left off.'
-	if picrand = 12:'Kendra kneels down and her tongue sticks out tryign to slide into your ass, you writhe as she her tongue saneks and twists inside your ass. Her fingers penetrating your pussy for a few minutes, and the feeling of her tounge in your ass and her fingers in your pussy brings you to a shuddering orgasm.'
-
+	if picrand = 11:
+		'Kendra kneels down and begins to lick your pussy, her tongue slides all over your sex, your sensitive clit and dipping into the vagina a few minutes of her effort, you left off.'
+	elseif picrand = 12:
+		'Kendra kneels down and her tongue sticks out tryign to slide into your ass, you writhe as she her tongue saneks and twists inside your ass. Her fingers penetrating your pussy for a few minutes, and the feeling of her tounge in your ass and her fingers in your pussy brings you to a shuddering orgasm.'
+	end
+	
 	'"Well, I will try to fulfill your desires?" Kendra says, catching her breath. "Now my turn."'
 
 	act 'Give her strapon':gt 'sexshop', 'kendra2'
@@ -944,8 +905,8 @@ end
 
 if $ARGS[0] = 'shprod':
 	$location_type = 'event'
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/shprod.jpg"></center>'
 	'The cashier is right in front of you offering to help and holding a miniskirt "Girl this is very you, will you try it on"'
@@ -953,8 +914,7 @@ if $ARGS[0] = 'shprod':
 	act 'Refuse':gt 'sexshop', 'start'
 
 	act 'Try':
-		cla
-		*clr
+		*clr & cla
 		picrand = 47
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/shprod1.jpg"></center>'
 		'You wear the skirt out of the booth and pose in the mirror, you do not have panties on and the skirt is so short that looks more like a belt and does not cover anything.	All your charms are visible from all directions.'