Merge remote-tracking branch 'julzor/master'

locations/Gadhouse.qsrc

@@ -1,6 +1,7 @@
 # Gadhouse
 
 if $ARGS[0]='' or $ARGS[0] = 'Start':
+	CLOSE ALL
 	$location_type = 'indoors'
 	$metka = ''
 	$loc = 'Gadhouse'
@@ -9,10 +10,8 @@ if $ARGS[0]='' or $ARGS[0] = 'Start':
 	menu_off = 0
 	$locclass = 'singleroom'
 	curr_home = 2
-	cla
-	*clr
+	*clr & cla
 	frost = 0
-	CLOSE ALL
 	mira_temp = rand(1,5)
 	!125s
 	!execute before everything
@@ -46,8 +45,7 @@ if $ARGS[0]='' or $ARGS[0] = 'Start':
 		act 'Further': gt 'Gadhouse', 'Start'
 
 	elseif go_in_boletus = 1 and boletus >= grandpa_boletus and hour >= 6 and hour < 22:
-		cla
-		*clr
+		*clr & cla
 		grandmahelp += 1
 		boletus -= grandpa_boletus
 		minut += 5
@@ -65,8 +63,7 @@ if $ARGS[0]='' or $ARGS[0] = 'Start':
 		act 'Further': grandpa_boletus = 0 & gt 'Gadhouse', 'Start'
 
 	elseif go_in_boletus_bilberry = 1 and boletus >= grandpa_boletus and bilberry >= grandpa_bilberry and hour >= 6 and hour < 22:
-		cla
-		*clr
+		*clr & cla
 		grandmahelp += 1
 		boletus -= grandpa_boletus
 		bilberry -= grandpa_bilberry
@@ -85,8 +82,7 @@ if $ARGS[0]='' or $ARGS[0] = 'Start':
 		act 'Further': grandpa_boletus = 0 & grandpa_bilberry = 0 & gt 'Gadhouse', 'Start'
 
 	elseif go_in_bilberry = 1 and bilberry >= grandpa_bilberry and hour >= 6 and hour < 22:
-		cla
-		*clr
+		*clr & cla
 		grandmahelp += 1
 		bilberry -= grandpa_bilberry
 		minut += 5
@@ -104,8 +100,7 @@ if $ARGS[0]='' or $ARGS[0] = 'Start':
 		act 'Further': grandpa_bilberry = 0 & gt 'Gadhouse', 'Start'
 
 	elseif mira_temp = 1 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 0 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or miragopQW >= 10 or mirasex > 1):
-		cla
-		*clr
+		*clr & cla
 		mira_guestday = daystart
 		minut += 5
 		mira_guest = 1
@@ -129,8 +124,7 @@ if $ARGS[0] = 'Main':
 	$menu_loc = 'Gadhouse'
 	$menu_arg = 'Main'
 	menu_off = 0
-	*clr
-	cla
+	*clr & cla
 	gs 'stat'
 	'<center><H4>Your Grandparents'' Cottage</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
@@ -139,10 +133,10 @@ if $ARGS[0] = 'Main':
 	'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)
+		temp = rand(0,9)
 		if temp = 0:'In a box filled with scraps of cloth, <a href="exec: gt ''Gadhouse'',''villagecat''">Boniface</a> is curled up sleeping peacefully.'
 	elseif hour >= 8 and hour < 12 and sunWeather = 1:
-		temp = RAND(0,2)
+		temp = rand(0,2)
 		if temp = 1:'On the table by the window <a href="exec: gt ''Gadhouse'',''villagecat''">Boniface</a> is busy cleaning himself with his tongue.'
 		if temp = 2:'On the table by the window <a href="exec: gt ''Gadhouse'',''villagecat''">Boniface</a> lies lazily, soaking up some sunshine rays.'
 	elseif hour >= 8 and hour < 12 and sunWeather = 0:
@@ -150,16 +144,16 @@ if $ARGS[0] = 'Main':
 		if temp = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''Gadhouse'',''villagecat''">Boniface</a> is curled up sleeping peacefully.'
 		if temp = 1: 'On the table by the window <a href="exec: gt ''Gadhouse'',''villagecat''">Boniface</a> is staring in disgust at the rain outside.'
 	elseif hour >= 12 and hour < 18:
-		temp = RAND(0,5)
+		temp = rand(0,5)
 		if temp = 3:'Next to the table by the window <a href="exec:feedcat = 1 & gt ''Gadhouse'',''villagecat''">Boniface</a> stretches and meows loudly, it''s time for dinner.'
 		if temp = 4 and sunWeather = 1: 'On the table by the window <a href="exec: gt ''Gadhouse'',''villagecat''">Boniface</a> lies lazily, soaking up some sunshine rays.'
 		if temp = 4 and sunWeather = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''Gadhouse'',''villagecat''">Boniface</a> is curled up sleeping peacefully.'
 	elseif hour >= 18 and hour < 22 and catout ! 2:
-		temp = RAND(0,3)
+		temp = rand(0,3)
 		if temp = 0:'<a href="exec: gt ''Gadhouse'',''villagecat''">Boniface</a> is stalking around the main floor, looking for a nice juicy mouse to play with.'
 		if temp = 1 and catout = 0: catout = 1 &'<a href="exec: gt ''Gadhouse'',''villagecat''">Boniface</a> twines around your ankles then goes to the door meowing pitifully.'
 	elseif hour >= 22:
-		temp = RAND(0,2)
+		temp = rand(0,2)
 		if temp = 1:'In a box filled with scraps of cloth, <a href="exec: gt ''Gadhouse'',''villagecat''">Boniface</a> is curled up sleeping peacefully.'
 	end
 
@@ -173,9 +167,9 @@ if $ARGS[0] = 'Main':
 
 	if mira_guest = 1: MiraLoc = 6 & '<a href="exec: gt ''Miroslava'', ''Start''">Mira</a> is sitting next to you.'
 
-	clr
 	gs 'stat'
 	gs 'themes', 'indoors'
+	gs 'kit_din'
 
 	!125s
 	!{
@@ -231,148 +225,15 @@ if $ARGS[0] = 'Main':
 
 	act 'Have a snack (0:15)':gs 'food', 'snack'
 
-	act 'Drink some water (0:05)':gs 'beverage', 'bev_wat'
-
-	act 'Have a cup of tea (0:05)':
-		*clr & cla
-		minut += 5
-		if pcs_hydra >= 100:
-			'There is no need for tea. You''re not thirsty.'
-		else
-			pcs_hydra += 80
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			'You make a cup of tea, quenching your thirst.'
-		end
-
-		gs 'stat'
-
-		act 'Get up from the table':gt 'Gadhouse', 'Main'
-	end
-
-	if pranik > 0:
-		'You have <<pranik>> tea biscuits on the plate.'
-
-		act 'Drink tea with biscuits (0:05)':
-			cla
-			*clr
-			menu_off = 1
-			minut += 5
-			pranik -= 1
-			pcs_health += 30
-			pcs_mood += 20
-			pcs_energy += 80
-			if pcs_hydra >= 100:
-				pcs_hydra += 30
-			else
-				pcs_hydra += 60
-			end
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			fat += 4
-			frost = 0
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/shared/food/food.jpg"></center>'
-			'You enjoy a cup of tea while you eat some of the tea biscuits. They''re too sweet and can''t be good for your figure, but they taste so good!'
-
-			act 'Get up from the table':gt 'Gadhouse', 'Main'
-		end
-	end
-
-	if edaD > 0:
-		act 'Prepare a diet meal (0:30)':
-			cla
-			*clr
-			menu_off = 1
-			frost = 0
-			minut += 30
-			pcs_health += 10
-			pcs_mood += 20
-			edaD -= 1
-			'<center><img <<$set_imgh>> src="images/shared/food/food.jpg"></center>'
-			if pcs_energy >= 100:
-				'You prepare a diet meal and try to eat it, but you''re full. You don''t even take a bite.'
-			elseif pcs_energy >= 80:
-				pcs_energy += 40
-				'You try to enjoy the meal, but half-way you realize you weren''t all that hungry. You manage to finish the meal, but feel like it was kind of a waste to prepare it.'
-			else
-				pcs_energy += 80
-				'The diet meal is tasty, and you enjoy eating it.'
-			end
-
-			if pcs_hydra >= 100:
-				'You''re not thirsty.'
-			else
-				pcs_hydra += 100
-				cumspclnt = 2
-				gs 'cum_cleanup'
-				pcs_breath = 0
-				'You make a cup of tea, quenching your thirst.'
-			end
-
-			act 'Get up from the table':gt 'Gadhouse', 'Main'
-		end
-	end
-
+	dynamic $sandwich
+	dynamic $driwater
+	dynamic $dritea
+	dynamic $fill_bottle
+	dynamic $edaD
+	dynamic $pranik
 	dynamic $fatdel
-
-	if lekarstvo > 0:
-		'You have <<lekarstvo>> tablet(s).'
-
-		if sick > 0 and lekarday ! daystart:
-			act 'Take a pill (0:05)':
-				cla
-				*clr
-				menu_off = 1
-				minut += 5
-				lekarday = daystart
-				lekarstvo -= 1
-				sick -= sick * 20 / 100
-				if pcs_hydra >= 100:
-					pcs_hydra += 25
-				else
-					pcs_hydra += 50
-				end
-				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/lekr<<picrand>>.jpg"></center>'
-				'You swallow the pill, and shortly after you feel a bit better.'
-
-				act 'Continue':gt 'Gadhouse', 'Main'
-			end
-		end
-	end
-
-	if vitamin > 0:
-		'You have <<vitamin>> vitamin pills.'
-
-		if vitaminday ! daystart:
-			act 'Take vitamins (0:05)':
-				cla
-				*clr
-				menu_off = 1
-
-				minut += 5
-				vitaminday = daystart
-				vitamin -= 1
-				frost = 0
-				if pcs_hydra >= 100:
-					pcs_hydra += 25
-				else
-					pcs_hydra += 50
-				end
-				if KandidozOnce = 1:Kandidoz -= 2
-				if GerpesOnce = 1:Gerpes -= 2
-				if SifacOnce = 1 and Sifilis >= 10:Sifilis -= rand(0, 1)
-
-				pcs_skin += 1
-
-				'You swallow a vitamin pill to stay healthy.'
-
-				act 'Continue':gt 'Gadhouse', 'Main'
-			end
-		end
-	end
+	dynamic $lekarstvo
+	dynamic $vitamin
 
 	gs 'events', 'read'
 	gs 'subkid'
@@ -415,11 +276,11 @@ if $ARGS[0] = 'Main':
 		end
 	end
 
-	if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+	if rand(0,2) ! 0: gs 'din_bad' & dynamic $mobile_check
 	act 'Relax on your bed': gt 'bed', 'start'
 end
 
-if $ARGS[0]='grandma':
+if $ARGS[0] = 'grandma':
 	*clr & cla
 	menu_off = 1
 	minut += 2
@@ -434,17 +295,13 @@ if $ARGS[0]='grandma':
 
 		act 'Maybe you should get dressed before talking to her':gt 'Gadhouse', 'Start'
 	else
-		if grigory_flower > 0 and grigory_flower < 10:
-			act 'Talk to her about the flowers': gt 'grigory', 'flower4'
-		end
-		if grandmahelpday ! daystart:
-			act 'Offer to help out': grandmahelpday = daystart & gt'grandmahelp'
-		end
-		!125s
+		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to her about the flowers': gt 'grigory', 'flower4'
+		
+		if grandmahelpday ! daystart: act 'Offer to help out': grandmahelpday = daystart & gt'grandmahelp'
+
 		if grandmatalkgad = 0:
 			act 'Ask about the village (0:10)':
-				cla
-				*clr
+				*clr & cla
 				grandmatalkgad = 1
 				minut += 10
 				pcs_mood += 5
@@ -468,8 +325,7 @@ if $ARGS[0]='grandma':
 		!125e
 		if hour >= grandmatalk + 3:
 			act 'Chat with your grandmother (0:10)':
-				cla
-				*clr
+				*clr & cla
 				grandmatalk = hour
 				grandmatalkday = daystart
 				minut += 10
@@ -485,17 +341,16 @@ if $ARGS[0]='grandma':
 
 		if grandmastory ! daystart:
 			act 'Ask her to tell you a story (0:20)':
-				cla
-				*clr
+				*clr & cla
 				grandmastory = daystart
 				minut += 20
-				pcs_mood += RAND(10,15)
+				pcs_mood += rand(10,15)
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/babushka.jpg"></center>'
 				'When you ask your grandmother to tell you a story, she mumbles something. Nevertheless, after a brief second or two, she decides on a story to share with you today, she begins to talk slowly.'
 
-				temp = RAND(0,7)
+				temp = rand(0,7)
 
 				if temp = 0:
 					'"There was this one time my parents allowed me to stay at my friend''s home for the night. During the night, a lot of snow fell... and we heard a soft knock on the door!" she says in an ominous voice.'
@@ -571,18 +426,16 @@ if $ARGS[0]='grandpa':
 		act 'Maybe you should get dressed before talking to him':gt 'Gadhouse', 'Start'
 	else
 
-		if grigory_flower > 0 and grigory_flower < 10:
-			act 'Talk to him about the flowers': gt 'grigory', 'flower3'
-		end
+		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to him about the flowers': gt 'grigory', 'flower3'
+		
 		if go_in_boletus = 1:'You promise to bring grandpa <<grandpa_boletus>> kg of mushrooms.'
 		if go_in_bilberry = 1:'You promise to bring grandpa <<grandpa_bilberry>> kg of berries.'
 		if go_in_boletus_bilberry = 1:'You promise to bring grandpa <<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries.'
-		!125s
+
 		if grandpahelpday ! daystart:act 'Offer to help':grandpahelpday = daystart & gt'grandpahelp'
 		if grandpatalkforest = 0:
 			act 'Ask about the forest (0:10)':
-				cla
-				*clr
+				*clr & cla
 				grandpatalkforest = 1
 				minut += 10
 				pcs_mood += 5
@@ -601,8 +454,7 @@ if $ARGS[0]='grandpa':
 		!125e
 		if hour >= grandpatalk + 3:
 			act 'Chat with your grandfather (0:10)':
-				cla
-				*clr
+				*clr & cla
 				grandpatalk = hour
 				grandpatalkday = daystart
 				minut += 10
@@ -630,8 +482,7 @@ if $ARGS[0]='villagecat':
 	'Your grandparents'' fat tomcat, Boniface, is aware of you approaching him, even though his eyes are closed. He tracks you with his ears and simply ignores you.'
 
 	act 'Pet Boniface':
-		cla
-		*clr
+		*clr & cla
 		minut += 5
 		pcs_mood += RAND(1,4)
 		gs 'stat'
@@ -644,8 +495,7 @@ if $ARGS[0]='villagecat':
 
 	if feedcat = 1:
 		act 'Feed Boniface':
-			cla
-			*clr
+			*clr & cla
 			minut +=5
 			gs 'stat'
 			feedcat = 2
@@ -658,15 +508,13 @@ if $ARGS[0]='villagecat':
 	if catout = 1:
 		act 'Let Boniface Out':
 			if sunWeather = 0:
-				cla
-				*clr
+				*clr & cla
 				minut += 10
 				gs 'stat'
 				'You open the door for Boniface who saunters around you only to stop in the doorway as he becomes aware that it is raining out. He glares up at you as if the rain was your fault. He stares out into the wet for another moment then sedately turns around and goes back to his box.'
 				act 'Continue': gt 'Gadhouse', 'Start'
 			else
-				cla
-				*clr
+				*clr & cla
 				minut +=10
 				gs 'stat'
 				catout = 2
@@ -750,5 +598,6 @@ if $ARGS[0] = 'intro':
 		end
 	end
 end
+
 --- Gadhouse ---------------------------------
 

locations/din_van.qsrc

@@ -1291,10 +1291,9 @@ end
 
 !!Private bathrooms: One of these text should be randomly selected if using a private restroom, such as one in a home.
 if $ARGS[0] = 'prvt_pee':
-	menu_off = 1
 	act 'Go pee':
-		*clr
-		cla
+		*clr & cla
+		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/pc/pee/pee-private/' + rand(1,19) + '.jpg"></center>'
 		!!Get random pee-private picture
 		rand_pee = rand(0,7)
@@ -1368,11 +1367,10 @@ end
 
 
 !!Public bathrooms: These texts should be randomly selected if using a public restroom
-if $ARGS[0] = 'pblc_pee':
-	menu_off = 1
+if $ARGS[0] = 'pblc_pee':	
 	act 'Go pee':
-		*clr
-		cla
+		*clr & cla
+		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/pc/pee/pee-public/' + rand(1,11) + '.jpg"></center>'
 		rand_pee = rand(0,7)
 		if rand_pee = 0:
@@ -1443,8 +1441,7 @@ if $ARGS[0] = 'pblc_pee':
 !!This may require an addition check to see if the PC has a purse since I think they need that to carry tampons with them.
 		if isprok = 1 and tampon > 0:
 			act 'Change tampon':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
 				'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one before unpackaging it and carefully inserting it into you.'
 
@@ -1456,8 +1453,7 @@ if $ARGS[0] = 'pblc_pee':
 !!This may require an addition check to see if the PC has a purse since I think they need that to carry pads with them.
 		if isprokp = 1 and sanpad > 0:
 			act 'Change pad':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/pad/' + rand(1,6) + '.jpg"></center>'
 				'Checking your pad, you decide it''s time for a new one. You carefully peel it off of your panties before folding it into thirds and setting it aside to be thrown away. Digging in your bag, you pull out a fresh pad, unpackage it, peel off the adhesive strip, and place it into your underwear. Finally, you wrap the wings around the sides of the gusset to make sure it is nice and secure.'
 
@@ -1472,8 +1468,7 @@ end
 
 if $ARGS[0] = 'pblc_pee_end':
 	act 'Finish and wipe':
-		*clr
-		cla
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/pc/pee/wiping/' + rand(1,9) + '.jpg"></center>'
 		rand_pee = rand(0,6)
 		if rand_pee = 0:

locations/dinfather.qsrc

@@ -579,6 +579,7 @@ if $ARGS[0] = 'garhelpchat':
 end
 
 if $ARGS[0] = 'gardrunkchat':
+	cla
 	menu_off = 1
     'Before you can even ask, your stepfather waves you over: "Oh, <<$pcs_nickname>>! Come join me and Misha, maybe you''ll learn something from your elders!"'
     fatherTalk = rand (1,3)
@@ -590,8 +591,7 @@ if $ARGS[0] = 'gardrunkchat':
         'You sit down and join the older men for a drink. You can tell your stepfather and your uncle are good friends.'
     end
     if pav_slut >= 75 and dyadyamishaevent = 1 and dmishaday ! daystart and fatherandmisha!1:
-        cla
-        *clr
+        *clr & cla
         '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
         'Uncle Misha kept staring at you. Suddenly he turns to your stepfather.'
         '"So, Vladimir, did you know your <<$pcs_nickname>> is a <<$gnikname>>?"'
@@ -607,10 +607,10 @@ if $ARGS[0] = 'gardrunkchat':
         'Uncle Misha realizes he''s onto something here, and decides to drive his point home: "Well Vladimir, don''t you think we should do something about it? I think <<$pcs_nickname>> needs to be punished!"'
         'You can see the lust in his eyes. Your stepfather understands perfectly well where he''s going with this, and agrees: "I think you''re right, Misha, <<$pcs_nickname>> does deserve to be punished."'
         act 'Accept whatever punishment they have in mind':gt 'misha','2'
-    elseif dyadyamishaevent = 1 and dmishaday ! daystart and fatherandmisha=1:
+    elseif dyadyamishaevent = 1 and dmishaday ! daystart and fatherandmisha = 1:
         'Uncle Misha grins at your stepfather and runs one hand over his groin, you can already see a significant bulge forming. "So, Vladimir, how about now? I think we can teach her a thing or two."'
         'Your stepfather simply nods and reaches for his zipper: "Absolutely."'
-        act 'Accept whatever punishment they have in mind':gt 'misha','2'
+        act 'Accept whatever punishment they have in mind': gt 'misha', '2'
     else
         act 'Move away':gt 'gargazel'
     end

locations/gadukino.qsrc

@@ -17,6 +17,7 @@ if $ARGS[0] = '':
 	mitkarand = rand(1,10)
 	if mitkaday ! daystart and hour >= 7 and hour < 20 and mitkarand = 1 and (npc_QW['A63'] < 11 or gadriver_gang > 2):
 		*clr & cla
+		menu_off = 1
 		minut += 5
 		gs 'stat'
 		'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'

locations/gschool_gossip.qsrc

@@ -555,7 +555,7 @@ if $ARGS[0] = 'boys':
 		'"Don''t forget that he also has connections with Vadim Bely."'
 		'"You shouldn''t talk about him. You remember the last guy that talked behind his back?"'
 		'"I remember.. They never did find his legs did they? Umm, let''s talk about something else now..."'
-	elseif chat_rand = 35
+	elseif chat_rand = 35:
 		'"Dude, you''re not gonna believe this. There''s this chick in my class, she''s always letting me look down her shirt!"'
 		'"Man, you''re so full of shit!"'
 	elseif chat_rand = 36:
@@ -935,51 +935,49 @@ if $ARGS[0] = 'gosip':
 			'"What do you mean, such a shame? Why do you even care?"'
 			'"Oh it''s nothing. I used to like her a lot, but back in the ninth grade she was such a prude, she wouldn''t even go on a date with me!"'
 		end
-
+	else
+		!!a place to talk about the sexual adventures of Svetlana
+		if pav_sex < 50:
+		*nl
+		'"Did you know <<$pcs_nickname>> is a huge tease? I heard she just undressed right in front of someone lately!"'
+		'"No way! How do you know?"'
+		'"A friend of mine told me! He saw her take all her clothes off, one item at a time!"'
+			'"Wow, what a lucky bastard! She''s hot!"'
+		elseif pav_sex < 75:
+			*nl
+			'"I heard, <<$pcs_nickname>> is great at sucking dicks!"'
+			'"No way! She seems like such a decent girl how do you know?"'
+			'"A friend of mine told me. He said it''s the best head he ever had!"'
+			'"Come on man, for real?"'
+			'"I swear, it''s true! Maybe he''ll shoot us a video next time..."'
+		elseif pav_sex < 100:
+			*nl
+			'"They say, <<$pcs_nickname>> took part in a blowbang recently!"'
+			'"What, really? How did she even get in that situation?"'
+			'"Apparently, she just got down on her knees and told all the guys to gather around her in a circle!"'
+			'"Wow, what a slut I can''t believe it."'
+			'"I know, right!?"'
+		elseif pav_sex < 125:
+			*nl
+			'"I heard <<$pcs_nickname>> got gangbanged just the other day!"'
+			'"Wow, she just let that happen?"'
+			'"Oh yea, she was even encouraging them! The guys were spinning her around every which way they liked and fucked her, no holes barred!"'
+			'"What a slut! Still, I wouldn''t mind getting in on that next time."'
+			'"Heh, you and me both! Maybe after gym class one day."'
+		elseif pav_sex < 150:
+			*nl
+			'"Man, <<$pcs_nickname>> is such a washed up whore."'
+			'"I know, right? It''s kind of sad, really."'
+			'"Sad, but kinda hot at the same time. I wouldn''t mind getting a piece, she must be great in the sack with how often she gets fucked."'
+			'"If you can even feel anything, she must be so stretched out by now."'
 		else
-			!!a place to talk about the sexual adventures of Svetlana
-			if pav_sex < 50:
-				*nl
-				'"Did you know <<$pcs_nickname>> is a huge tease? I heard she just undressed right in front of someone lately!"'
-				'"No way! How do you know?"'
-				'"A friend of mine told me! He saw her take all her clothes off, one item at a time!"'
-				'"Wow, what a lucky bastard! She''s hot!"'
-			elseif pav_sex < 75:
-				*nl
-				'"I heard, <<$pcs_nickname>> is great at sucking dicks!"'
-				'"No way! She seems like such a decent girl how do you know?"'
-				'"A friend of mine told me. He said it''s the best head he ever had!"'
-				'"Come on man, for real?"'
-				'"I swear, it''s true! Maybe he''ll shoot us a video next time..."'
-			elseif pav_sex < 100:
-				*nl
-				'"They say, <<$pcs_nickname>> took part in a blowbang recently!"'
-				'"What, really? How did she even get in that situation?"'
-				'"Apparently, she just got down on her knees and told all the guys to gather around her in a circle!"'
-				'"Wow, what a slut I can''t believe it."'
-				'"I know, right!?"'
-			elseif pav_sex < 125:
-				*nl
-				'"I heard <<$pcs_nickname>> got gangbanged just the other day!"'
-				'"Wow, she just let that happen?"'
-				'"Oh yea, she was even encouraging them! The guys were spinning her around every which way they liked and fucked her, no holes barred!"'
-				'"What a slut! Still, I wouldn''t mind getting in on that next time."'
-				'"Heh, you and me both! Maybe after gym class one day."'
-			elseif pav_sex < 150:
-				*nl
-				'"Man, <<$pcs_nickname>> is such a washed up whore."'
-				'"I know, right? It''s kind of sad, really."'
-				'"Sad, but kinda hot at the same time. I wouldn''t mind getting a piece, she must be great in the sack with how often she gets fucked."'
-				'"If you can even feel anything, she must be so stretched out by now."'
-			else
-				*nl
-				'"<<$pcs_nickname>> is such a washed up whore. She''ll do anything for money, nowadays."'
-				'"Yea, it''s sad. she used to be such a nice girl."'
-				'"Totally. Very sad. So, can you loan me 200 <b>₽</b>?"'
-				'"Dude, seriously!? Why would you even want to touch her at all, you''d just boldly go where every man has gone before!"'
-				'"Come on man, I''m in a bit of a dry spell. Please? I''ll try to negotiate you in on the deal. Surely 200 <b>₽</b> is enough for two."'
-				'"That''s just sick, I like it. Alright, I''m in."'
-			end
+			*nl
+			'"<<$pcs_nickname>> is such a washed up whore. She''ll do anything for money, nowadays."'
+			'"Yea, it''s sad. she used to be such a nice girl."'
+			'"Totally. Very sad. So, can you loan me 200 <b>₽</b>?"'
+			'"Dude, seriously!? Why would you even want to touch her at all, you''d just boldly go where every man has gone before!"'
+			'"Come on man, I''m in a bit of a dry spell. Please? I''ll try to negotiate you in on the deal. Surely 200 <b>₽</b> is enough for two."'
+			'"That''s just sick, I like it. Alright, I''m in."'
 		end
 	end
 end

locations/gschool_socialchg1.qsrc

@@ -3,6 +3,7 @@
 !Lazar
 if $ARGS[0] = 'tLazar':
 	cla & *clr
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/32.jpg"></center>'
 	'You decide on to walk over to see what the fuss is about. As usual Lazar is showing off his skills as he has some of the younger kids challenge him 1-on-1 or even 1-on-2 and he''s still managing to beat them quite easily.'
@@ -50,6 +51,7 @@ end
 !if player picks Ivan
 if $ARGS[0] = 'tIvan':
 	cla & *clr
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/3.jpg"></center>'
 	'Ivan is looking victorious as he greets you between the breaths, "What are you doing out here this early?" he asks.'
@@ -75,6 +77,7 @@ end
 !if player picks Fedor
 if $ARGS[0] = 'tFedor':
 	cla & *clr
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/3.jpg"> <img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
 	'A flustered Fedor is huffing and puffing, "You really need to take it easy. I can barely keep up with you, Ivan..."'
@@ -102,6 +105,7 @@ end
 !Svyatoslav
 if $ARGS[0] = 'tSvyatoslav':
 	cla & *clr
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/8.jpg"></center>'
 	'You wait patiently until Svyatoslav ends one of his runs. "You''re improving greatly," You complement him.'
@@ -137,6 +141,7 @@ end
 
 if $ARGS[0] = 'tVanya':
 	cla & *clr
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/59.jpg"></center>'
 	'Seeing you he stops in his tracks, "Hey, <<$pcs_nickname>>, you''re out early today!" he gives you a subtle smile.'
@@ -156,12 +161,13 @@ if $ARGS[0] = 'tVanya':
 		'"If it was anyone else I would say you were being really weird but I get that. I hope you find a decent spot and tell Vicky I said hi!" you give him a smile and a wink.'
 		'"Sure, sure!" he replies as he slowly starts scampering from you.'
 		
-		act 'Go back to what you were doing': gt 'gskver'
+		act 'Go back to what you were doing': gt 'gskver', 'start'
 	end
 end
 
 if $ARGS[0] = 'tErast':
 	cla & *clr
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/33.jpg"></center>'
 	'You walk up to him not really wanting to bother him but you feel the need to ask him how it works, "Sorry Erast, I don''t want to bother you..." you start as he puts down the weights.'
@@ -200,6 +206,7 @@ end
 
 if $ARGS[0] = 'tChristina':
 	cla & *clr
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/18.jpg"></center>'
 	'"What are you two up to?" you ask Christina ignoring Lina as you walk up to them.'
@@ -241,6 +248,7 @@ end
 
 if $ARGS[0] = 'tLina':
 	cla & *clr
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/18.jpg"></center>'
 	'"What are you two up to?" you ask Lina ignoring Christina as you walk up to them.'
@@ -273,6 +281,7 @@ end
 
 if $ARGS[0] = 'tBella':
 	cla & *clr
+	menu_off = 1
 	minut += 20
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/22.jpg"></center>'
@@ -309,6 +318,7 @@ end
 
 if $ARGS[0] = 'tVeronika':
 	cla & *clr
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/34.jpg"></center>'
 	'Noticing it''s Veronika, you start waving towards her trying to catch her attention. She barely bats an eye towards you as you try your hardest to get her attention.'
@@ -355,6 +365,7 @@ end
 
 if $ARGS[0] = 'tLariska':
 	cla & *clr
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/13.jpg"></center>'
 	'You carefully walk up to her, trying your best not the make your presence known. As you stand and observe her for a moment, you''re flabbergasted as Lariska is smashing the ball and have it effortlessly return to her hands over and over again...'

locations/kit_din.qsrc

@@ -1,7 +1,7 @@
 # kit_din
 
 $santehnikgr = {
-	cls
+	*clr & cla
 	ransloman = 0
 	minut += 25
 	gs 'stat'
@@ -11,7 +11,7 @@ $santehnikgr = {
 }
 
 $santehnikend3 = {
-	cls
+	*clr & cla
 	ransloman = 0
 	facial += 1
 	spafinloc = 11
@@ -32,7 +32,7 @@ $santehnikend3 = {
 }
 
 $santehnikend1 = {
-	cls
+	*clr & cla
 	kransloman = 0
 	minut += 1
 	gs 'stat'
@@ -42,14 +42,14 @@ $santehnikend1 = {
 	act 'Suggest a loan':dynamic $santehnikend2
 
 	act 'Another way?':
-		cls
+		*clr & cla
 		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s3.jpg"></center>'
 		'You ask the plumber what he has in mind. Instead of answering, he takes you by the shoulders and draws you to him. You rest your soft breasts against his chest and feel your stomach resting on something solid. He easily pushes your shoulders and whispers, "Come on baby, do not be shy."'
 
 		act 'Kneel':
-			cls
+			*clr & cla
 			minut += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/plumber/bj.jpg"></center>'
@@ -62,7 +62,7 @@ $santehnikend1 = {
 			end
 
 			act 'Suck':
-				cls
+				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/plumber/bj1.jpg"></center>'
 				'You cup the warm and hard cock between your lips and start sucking it, uttering slurping sounds. The plumber begins to move his hips trying to drive his cock deeper into your mouth. His solid organ fills almost your entire mouth and sticks in your throat, unwittingly choking you.'
@@ -78,7 +78,7 @@ $santehnikend1 = {
 }
 
 $santehnikend2 = {
-	cls
+	*clr & cla
 	kransloman = 0
 	minut += 15
 	santehnikDolg = 1500
@@ -94,21 +94,19 @@ $santehnikend2 = {
 }
 
 $santehnikend = {
-	cla
-	*clr
+	*clr & cla
 	kransloman = 0
 	minut += 30
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s3.jpg"></center>'
 	'Half an hour later he says he is finished, and it will be 1,500 <b>₽</b>'
 
-	if money>=1500:
+	if money >= 1500:
 		act 'Pay':
 			money -= 1500
 			gt'kuhr'
 		end
-	end
-	if money < 1500:
+	elseif money < 1500:
 		'You do not have enough cash on you.'
 		if money+stolmoney >= 1500:
 			'You remember the stash in your table and with that you''ll have enough.'
@@ -128,7 +126,7 @@ $santehnikend = {
 			end
 		elseif money+stolmoney < 1500:
 			act 'I did not have enough money':
-				cls
+				*clr & cla
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s3.jpg"></center>'
 				'You are embarrassed and tell the plumber, that you do not have enough money. He is visibly angry. "You call a fucking plumber and don''t have any money? What am I supposed to do now?"'
@@ -138,8 +136,7 @@ $santehnikend = {
 		end
 		if money+stolmoney<1500 and shameless > 14:
 			act 'Offer a favour instead':
-				cla
-				*clr
+				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s4.jpg"></center>'
 				'I do not have money, but you can take another form of payment? you say, dropping to her knees and starting to unbutton his pants. The guy obviously does not mind and watching your actions. You remove it even flaccid penis and tightly gripping his hand, start to kiss the head, gradually sucking it into his mouth.'
@@ -149,8 +146,7 @@ $santehnikend = {
 				
 				act 'Continue':
 					if pcs_apprnc < 60:
-						cla
-						*clr
+						*clr & cla
 						guy += 1
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s5.jpg"></center>'
 						'You diligently sucking his dick between his legs itched from all desires, you break off a couple of times to stop and go to the sex, but he took you by the head and continued to fuck your mouth, soon he came into your mouth and swallow once you come and pick it up again member, as he put his pants and silently walked to the door, to sleep with you, he was not even going. From rastrojstva you spat out semen on the floor, looks like you do not attract even plumbing.'
@@ -179,12 +175,10 @@ $santehnik1 = {
 	'You lead him into the kitchen and he starts to get to work. When you reached up to one of the shelves, you notice that he is staring at your ass.'
 
 	act 'Disregard':dynamic $santehnikend
-
 }
 
 $santehnik = {
-	cla
-	*clr
+	*clr & cla
 	kransloman = 0
 
 	if husband = 0 or husbandrink = 10:dynamic $santehnik1 & exit
@@ -195,16 +189,14 @@ $santehnik = {
 	gs 'boyStat', 53, 'a'
 
 	if husband > 0 and husbandrink ! 10:
-		cla
-		*clr
+		*clr & cla
 		minut += 20
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s7.jpg"></center>'
 		'You tell your husband about the leak and he makes a phone call. After 20 minutes, a plumber arrives.'
 		'Your husband walks him to the kitchen and the two of you began to observe his actions, you are sick of hearing about how the plumber hates cheap Chinese fittings and what people pushed into the sink, and you decided to wait in the living room.'
 
 		act 'Leave':
-			cla
-			*clr
+			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s8.jpg"></center>'
 			'You go into the room and sit on the couch, soon your husband comes in and sits down beside you. With one hand on your breast, he runs his other hand down under your panties and begins to massage your clitoris.'
@@ -215,8 +207,7 @@ $santehnik = {
 			gs 'arousal', 'foreplay', 10, 'sub'
 			gs 'stat'
 			act 'Start':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s9.jpg"></center>'
 				'The husband stands up and pulls from his unbuttoned pants his member, you drop to your knees and his cock is in your mouth, right then the plumber enters, "I''m finished." he says and freezes, seeing this picture.'
 
@@ -245,8 +236,7 @@ $santehnik = {
 						gs 'arousal', 'bj', 10, 'sub'
 						gs 'stat'
 						act 'Ride your husband':
-							cla
-							*clr
+							*clr & cla
 							gs 'cum_manage'
 							suprdolg += 1
 							husband += 1
@@ -360,8 +350,7 @@ $santehnik = {
 
 $dirtarm = {
 	if fairy > 0:
-		cla
-		*clr
+		*clr & cla
 		fairy -= 1
 		minut += dirttarelka * 3
 		cltarelka += dirttarelka
@@ -378,8 +367,7 @@ $dirtarm = {
 }
 
 $edagotd = {
-	cla
-	*clr
+	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
 	'What kind of meal would you like to make?'
@@ -391,8 +379,7 @@ $edagotd = {
 }
 
 $edagotpk = {
-	cla
-	*clr
+	*clr & cla
 	minut += 30
 	edahot += 1
 	eda -= 1
@@ -409,8 +396,7 @@ $edagotpk = {
 }
 
 $edahotd = {
-	cla
-	*clr
+	*clr & cla
 	edahot = 0
 	dirttarelka += 1
 	pcs_mood += 20
@@ -420,8 +406,7 @@ $edahotd = {
 }
 
 $eatout = {
-	cla
-	*clr
+	*clr & cla
 	edahot = 0
 	pcs_mood += 20
 	gs 'food', 'm_meal'
@@ -439,17 +424,15 @@ $posudomashina = {
 }
 
 $edasnack = {
-	act 'Have a snack (0:15)':
-		gs 'food', 'snack'
-	end
+	act 'Have a snack (0:15)': gs 'food', 'snack'
 }
 
 $pranik = {
 	if pranik > 0:
 		'You have <<pranik>> tea biscuits.'
 		act 'Have tea with biscuits (0:05)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			pranik -= 1
 			pcs_health += 30
@@ -475,17 +458,15 @@ $pranik = {
 }
 
 $dritea = {
-	act 'Have a cup of tea (0:10)':
-		gs 'beverage', 'bev_tea'
-	end
+	act 'Have a cup of tea (0:10)': gs 'beverage', 'bev_tea'
 }
 
 $edaD = {
 	if edaD > 0:
 		'The refrigerator contains <b><<edaD>></b> healthy meals.'
 		act 'Eat diet food (0:30)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			frost = 0
 			minut += 30
 			pcs_health += 10
@@ -501,6 +482,7 @@ $edaD = {
 				pcs_energy += 80
 				'The diet meal is tasty, and you enjoy eating it.'
 			end
+			gs 'stat'
 
 			act 'Get up from the table':gt $curloc
 		end
@@ -510,8 +492,8 @@ $edaD = {
 $fatdel = {
 	if fatdel > 0:
 		act 'Take fat burners (0:05)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			fatdel -= 1
 			if pcs_hydra >= 100:
@@ -522,6 +504,7 @@ $fatdel = {
 			fat -= 20
 
 			'You drink the fat burning capsule. These capsules are quick release and results can be seen soon.'
+			gs 'stat'
 
 			act 'Get up from the table':gt $loc, $metka
 		end
@@ -529,9 +512,7 @@ $fatdel = {
 }
 
 $driwater = {
-	act 'Drink some water (0:05)':
-		gs 'beverage', 'bev_wat'
-	end
+	act 'Drink some water (0:05)': gs 'beverage', 'bev_wat'
 }
 
 $fill_bottle = {
@@ -546,14 +527,24 @@ $fill_bottle = {
 	end
 }
 
+$sandwich = {
+	if bag > 0 and buterbrod = 0: 
+		act 'Make a sandwich to go (0:05)': 
+			minut += 5
+			buterbrod = 1
+			gt $loc, $metka
+		end
+	end
+}
+
 $lekarstvo = {
 	if lekarstvo > 0:
 		'You have <b><<lekarstvo>></b> tablets.'
 
 		if sick > 0 and lekarday ! daystart:
 			act 'Take a pill (0:05)':
-				cla
-				*clr
+				*clr & cla
+				menu_off = 1
 				minut += 5
 				lekarday = daystart
 				lekarstvo -= 1
@@ -565,6 +556,7 @@ $lekarstvo = {
 				end
 				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/lekr<<picrand>>.jpg"></center>'
 				'You took a pill'
+				gs 'stat'
 
 				act 'Move away':gt $loc, $metka
 			end
@@ -578,9 +570,8 @@ $vitamin = {
 
 		if vitaminday ! daystart:
 			act 'Take vitamins (0:05)':
-				cla
-				*clr
-
+				*clr & cla
+				menu_off = 1
 				minut += 5
 				vitaminday = daystart
 				vitamin -= 1
@@ -595,8 +586,8 @@ $vitamin = {
 				if SifacOnce = 1 and Sifilis >= 10:Sifilis -= rand(0, 1)
 
 				pcs_skin += 1
-
 				'You took some vitamins.'
+				gs 'stat'
 
 				act 'Move away':gt $loc, $metka
 			end

locations/kuhrPar.qsrc

@@ -36,15 +36,13 @@ else
 end
 gs 'family'
 
-act 'Eat a meal (0:30)': dynamic $edahotd
-dynamic $edasnack
-if bag > 0 and buterbrod = 0: 
-	act 'Make a sandwich to go (0:05)': 
-		minut += 5
-		buterbrod = 1
-		gt $loc, $metka
-	end
-end
+act 'Eat a full meal (0:30)':gs 'food', 'm_meal'
+
+act 'Eat a light meal (0:25)':gs 'food', 's_meal'
+
+act 'Have a snack (0:15)':gs 'food', 'snack'
+
+dynamic $sandwich
 dynamic $driwater
 dynamic $dritea
 dynamic $fill_bottle

locations/pavCommercial.qsrc

@@ -102,7 +102,7 @@ if week < 6 and hour >= 9 and hour <= 18:
 elseif week = 6 and hour >= 10 and hour <= 18:
 	$desc_txt4 = '<a href="exec:minut += 3 & gt ''postoffice'', ''start''">post office</a>'
 else
-	$desc_txt4 = '<a href="exec:msg ''post office, which is closed right now. It will reopen again at 9:00 and at 10:00 on saturdays.''">post office</a>'
+	$desc_txt4 = '<a href="exec:msg ''The post office, which is closed right now, will reopen again at 9:00 and at 10:00 on Saturdays.''">post office</a>'
 end
 
 if (week < 6 and hour >= 9 and hour <= 16) or (week = 6 and hour >= 9 and hour <= 13):