Merge remote-tracking branch 'julzor/master'

locations/ParkKafe.qsrc

@@ -207,7 +207,7 @@ if $ARGS[0] = 'Armenians':
 				'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/parkbj.jpg"></center>'
 				'The Armenians shove you on your knees as they take out their mighty members. They use them to poke you in your face, until you start sucking both members.'
 
-				if rand(1,100) <= bj:
+				if rand(1,100) <= stat['bj']:
 					pcs_horny = 0
 					orgasm += 1
 					'You orgasmed.'
@@ -233,7 +233,7 @@ if $ARGS[0] = 'Armenians':
 				'<center><img <<$set_imgh>> src="images/locations/city/centralpark/sex/cafe/ara2.jpg"></center>'
 				'The Armenians bend you over, one of them shoves his cock in your mouth. The other one stands behind you and shoves his penis deep into your vagina. They go on and eagerly fuck you in both holes.'
 
-				if rand(1,100) <= bj:
+				if rand(1,100) <= stat['bj']:
 					pcs_horny = 0
 					orgasm += 1
 					'You orgasm.'

locations/Voltrener.qsrc

@@ -154,11 +154,11 @@ if $ARGS[0] = 'talk':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
 				gs 'stat'
 				if pav_slut <= 25:
-					if pcs_vball < 50:
-						'You ask the coach about joining the team, but he shakes his head. "<<$pcs_lastname>> it''s not personal, you have good amateur skills. Just not enough to make the team."'
-					elseif trenerSex = 1:
+					if trenerSex = 1:
 						volleysostav = 1
 						'You ask the coach about joining the team, he smiles and says, "<<$pcs_nickname>>, honey. I can do that, but you''ll have to start as a sub or people might be suspicious."'
+					elseif pcs_vball < 65:
+						'You ask the coach about joining the team, but he shakes his head. "<<$pcs_lastname>> it''s not personal, you have good amateur skills. Just not enough to make the team."'
 					elseif pcs_vball >= 65:
 						'You ask the coach about joining the team, the coach thinks for a minute. "You have good skills for an amateur but you''re still not good enough to start on the team. However, I have a spot for a substitute and we can put you there. How does that sound?"'
 
@@ -200,11 +200,7 @@ if $ARGS[0] = 'talk':
 							act 'Persuade him to let you join the team (<font color="red"><will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to persuade him to join the team.'
 						end
 					end
-					act 'Okay, it''s true, I am a <<$gnikname>>':
-						*clr & cla
-						gs 'stat'
-						gt'Voltrener', 'gorslut'
-					end
+					act 'Okay, it''s true, I am a <<$gnikname>>': gt'Voltrener', 'gorslut'
 				else
 					'You ask the coach about joining the team, the coach thinks for a minute. "I have a spot for a substitute, but I do not know if you have what it takes."'
 					gs 'willpower', 'misc', 'self'

locations/burger.qsrc

@@ -230,9 +230,9 @@ if $ARGS[0] = 'dishes':
 							minut += 1
 							bistroQW = 50
 							guy += 1
-							dress[24] = 1
-							dressH[24] = 160
-							dressB[24] = pcs_hips
+							average[24] = 1
+							averageH[24] = 160
+							averageB[24] = pcs_hips
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/sex/pr.jpg"></center>'
 							'You look up at him startled as you notice the hot head of his cock resting on your lips. Anatoly pushes his dick to your lips. "Don''t shy baby, lick it with your tongue."'

locations/din_van.qsrc

@@ -1314,57 +1314,61 @@ 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':
-	act 'Go pee (0:04)':
-		*clr & cla
-		menu_off = 1
-		minut += 4
-		'<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)
-		if rand_pee = 0:
-			'You take a seat on the toilet and begin peeing, glad to feel the pressure released.'
-		elseif rand_pee = 1:
-			'After sitting on the toilet you finally release your bladder. A shiver runs down your spine as the stream flows out of you. "Wow," you think, "I had to go more than I thought."'
-		elseif rand_pee = 2:
-			'Settling into the toilet seat you pull out your phone and begin checking for messages and doing other things to occupy the time until the stream slows to a trickle and finally stops.'
-		elseif rand_pee = 3:
-			'You plop down onto the porcelain throne and begin to unleash a torrent of urine into the bowl. As you wait for nature to finish it''s business you begin to daydream a bit as your mind wanders off.'
-		elseif rand_pee = 4:
-			'While relaxing your bladder and beginning to pee you decide to reflect on your recent interactions with the people in your life. "What do they think of me? Do they talk behind my back?" You continue contemplating until your body signals that the flow has ended.'
-		elseif rand_pee = 5:
-			'You nearly piss yourself as you rush to seat yourself onto the toilet. Unable to hold back the flood anymore, your body releases a seemingly endless stream as you moan quietly in relief, thankful that you made it in time.'
-		elseif rand_pee = 6:
-			'After situating yourself on the toilet, you relax and begin peeing. The urine tickles your labia as it sprays out of you into the toilet bowl.'
-		else
-			'As you begin to sit down you nearly jump back to your feet as the cold toilet seat stings your bare bottom. You shake your head and sigh before settling back onto the icy seat and doing your business.'
-		end
+	if pee_hour ! hour or (pee_hour = hour and pee_day ! daystart): 
+		act 'Go pee (0:04)':
+			*clr & cla
+			menu_off = 1
+			pee_hour = hour
+			pee_day = daystart
+			minut += 4
+			'<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)
+			if rand_pee = 0:
+				'You take a seat on the toilet and begin peeing, glad to feel the pressure released.'
+			elseif rand_pee = 1:
+				'After sitting on the toilet you finally release your bladder. A shiver runs down your spine as the stream flows out of you. "Wow," you think, "I had to go more than I thought."'
+			elseif rand_pee = 2:
+				'Settling into the toilet seat you pull out your phone and begin checking for messages and doing other things to occupy the time until the stream slows to a trickle and finally stops.'
+			elseif rand_pee = 3:
+				'You plop down onto the porcelain throne and begin to unleash a torrent of urine into the bowl. As you wait for nature to finish it''s business you begin to daydream a bit as your mind wanders off.'
+			elseif rand_pee = 4:
+				'While relaxing your bladder and beginning to pee you decide to reflect on your recent interactions with the people in your life. "What do they think of me? Do they talk behind my back?" You continue contemplating until your body signals that the flow has ended.'
+			elseif rand_pee = 5:
+				'You nearly piss yourself as you rush to seat yourself onto the toilet. Unable to hold back the flood anymore, your body releases a seemingly endless stream as you moan quietly in relief, thankful that you made it in time.'
+			elseif rand_pee = 6:
+				'After situating yourself on the toilet, you relax and begin peeing. The urine tickles your labia as it sprays out of you into the toilet bowl.'
+			else
+				'As you begin to sit down you nearly jump back to your feet as the cold toilet seat stings your bare bottom. You shake your head and sigh before settling back onto the icy seat and doing your business.'
+			end
 
-!!If PC is on her period and using tampon, then the following options should appear as well as the standard "Finish and wipe" act:
-!!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 (0:02)':
-				*clr & cla
-				minut += 2
-				'<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.'
+	!!If PC is on her period and using tampon, then the following options should appear as well as the standard "Finish and wipe" act:
+	!!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 (0:02)':
+					*clr & cla
+					minut += 2
+					'<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.'
 
-				gs 'din_van', 'prvt_pee_end'
+					gs 'din_van', 'prvt_pee_end'
+				end
 			end
-		end
-!!If PC is on her period and using pad, then the following options should appear as well as the standard "Finish and wipe" act:
-!!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 (0:02)':
-				*clr & cla
-				minut += 2
-				'<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.'
+	!!If PC is on her period and using pad, then the following options should appear as well as the standard "Finish and wipe" act:
+	!!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 (0:02)':
+					*clr & cla
+					minut += 2
+					'<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.'
 
-				gs 'din_van', 'prvt_pee_end'
+					gs 'din_van', 'prvt_pee_end'
+				end
 			end
-		end
 
-		gs 'din_van', 'prvt_pee_end'
+			gs 'din_van', 'prvt_pee_end'
+		end
 	end
 end
 
@@ -1387,99 +1391,103 @@ end
 
 !!Public bathrooms: These texts should be randomly selected if using a public restroom
 if $ARGS[0] = 'pblc_pee':
-	act 'Go pee (0:04)':
-		*clr & cla
-		menu_off = 1
-		minut += 4
-		'<center><img <<$set_imgh>> src="images/pc/pee/pee-public/' + rand(1,11) + '.jpg"></center>'
-		rand_pee = rand(0,7)
-		if rand_pee = 0:
-			'Settling into the toilet seat you pull out your phone and begin checking for messages and doing other things to occupy the time until the stream slows to a trickle and finally stops.'
-		elseif rand_pee = 1:
-			'While relaxing your bladder and beginning to pee you decide to reflect on your recent interactions with the people in your life. "What do they think of me? Do they talk behind my back?" You continue contemplating until your body signals that the flow has ended.'
-		elseif rand_pee = 2:
-			'You nearly piss yourself as you rush to seat yourself onto the toilet. Unable to hold back the flood anymore, your body releases a seemingly endless stream as you moan quietly in relief, thankful that you made it in time.'
-		elseif rand_pee = 3:
-			'Immediately up entering the restroom, your nostrils are assaulted by the most heinous stench. Knowing that you have no other option, you try to suppress your gags as you sit in a stall and do your business.'
-		elseif rand_pee = 4:
-			*clr
-			'<center><img <<$set_imgh>> src="images/pc/pee/pee-public/hovercraft' + rand(1,2) + '.jpg"></center>'
-			'You enter the stall and groan in disgust at the sight of the gross facilities. Realizing that you have no choice, you decided to "hovercraft" it. Instead of sitting down on the filthy seat, you hover your ass above the bowl before letting go of the pee you''d been holding, not caring if all of the stream gets into the toilet or elsewhere.'
-		else
-			!!Graffiti trigger text
-			rand_pee = rand(0,21)
-			'As you sit down to relieve your bladder you get distracted reading some of the graffiti on the wall of the stall.'
-			$rand_girl = func('gschool_randperson', 1, '', 1, 1, 1, 1, 1, 0)
+	if pee_hour ! hour or (pee_hour = hour and pee_day ! daystart): 
+		act 'Go pee (0:04)':
+			*clr & cla
+			menu_off = 1
+			pee_hour = hour
+			pee_day = daystart
+			minut += 4
+			'<center><img <<$set_imgh>> src="images/pc/pee/pee-public/' + rand(1,11) + '.jpg"></center>'
+			rand_pee = rand(0,7)
 			if rand_pee = 0:
-				'Albina and her Starlettes are a bunch of dirty whores.'
+				'Settling into the toilet seat you pull out your phone and begin checking for messages and doing other things to occupy the time until the stream slows to a trickle and finally stops.'
 			elseif rand_pee = 1:
-				'<<$rand_girl>>''s vagina smells like puke!'
+				'While relaxing your bladder and beginning to pee you decide to reflect on your recent interactions with the people in your life. "What do they think of me? Do they talk behind my back?" You continue contemplating until your body signals that the flow has ended.'
 			elseif rand_pee = 2:
-				'Beware of Dimka! He''s not as nice as he seems!'
+				'You nearly piss yourself as you rush to seat yourself onto the toilet. Unable to hold back the flood anymore, your body releases a seemingly endless stream as you moan quietly in relief, thankful that you made it in time.'
 			elseif rand_pee = 3:
-				'If you''re on the rag, check the seat when you get up and WIPE IT OFF!!! No one wants a nasty seat!'
+				'Immediately up entering the restroom, your nostrils are assaulted by the most heinous stench. Knowing that you have no other option, you try to suppress your gags as you sit in a stall and do your business.'
 			elseif rand_pee = 4:
-				'If you smell fish, it''s probably your dirty twat! Hahaha!'
-			elseif rand_pee = 5:
-				'Shave your punani, bitches! No one likes digging through a forest, LOL.'
-			elseif rand_pee = 6:
-				'Shaved pussies stink and are prone to infection! Don''t believe the lies!'
-			elseif rand_pee = 7:
-				'Fight the Patriarchy!'
-			elseif rand_pee = 8:
-				'Tampons vs. Pads, cast your vote! Below this text are hash marks indicating various girl''s preference. One person also wrote “Freebleeder for life!” Ewww.'
-			elseif rand_pee = 9:
-				'Petra''s cock is smaller than my lipstick tube, LOL!'
-			elseif rand_pee = 10:
-				'You''re beautiful! Believe that!'
-			elseif rand_pee = 11:
-				'Putin is a chauvinist pig!'
-			elseif rand_pee = 12:
-				'Suck dick! It''s good for you!'
-			elseif rand_pee = 13:
-				'"I''ll pull out, I swear! is the most dangerous lie you can believe." This text is followed by a crude drawing of a pregnant woman.'
-			elseif rand_pee = 14:
-				'Cut back on the perfume, ladies. It smells like a unicorn farted in here.'
-			elseif rand_pee = 15:
-				'<<$rand_girl>> is a slut and everyone knows it!'
-			elseif rand_pee = 16:
-				'Men are like pantyhose; They either run, cling, or don''t fit right in the crotch!'
-			elseif rand_pee = 17:
-				'Gopnik guys are SO HOT!!!'
-			elseif rand_pee = 18:
-				'That rumor about black guys is true! Just ask Marcus for a sneak peek.'
-			elseif rand_pee = 19:
-				'Butt sex is the best sex!'
-			elseif rand_pee = 20:
-				'I just wrote on the wall. Take THAT, society!'
+				*clr
+				'<center><img <<$set_imgh>> src="images/pc/pee/pee-public/hovercraft' + rand(1,2) + '.jpg"></center>'
+				'You enter the stall and groan in disgust at the sight of the gross facilities. Realizing that you have no choice, you decided to "hovercraft" it. Instead of sitting down on the filthy seat, you hover your ass above the bowl before letting go of the pee you''d been holding, not caring if all of the stream gets into the toilet or elsewhere.'
 			else
-				'Never quit loving your clit.'
+				!!Graffiti trigger text
+				rand_pee = rand(0,21)
+				'As you sit down to relieve your bladder you get distracted reading some of the graffiti on the wall of the stall.'
+				$rand_girl = func('gschool_randperson', 1, '', 1, 1, 1, 1, 1, 0)
+				if rand_pee = 0:
+					'Albina and her Starlettes are a bunch of dirty whores.'
+				elseif rand_pee = 1:
+					'<<$rand_girl>>''s vagina smells like puke!'
+				elseif rand_pee = 2:
+					'Beware of Dimka! He''s not as nice as he seems!'
+				elseif rand_pee = 3:
+					'If you''re on the rag, check the seat when you get up and WIPE IT OFF!!! No one wants a nasty seat!'
+				elseif rand_pee = 4:
+					'If you smell fish, it''s probably your dirty twat! Hahaha!'
+				elseif rand_pee = 5:
+					'Shave your punani, bitches! No one likes digging through a forest, LOL.'
+				elseif rand_pee = 6:
+					'Shaved pussies stink and are prone to infection! Don''t believe the lies!'
+				elseif rand_pee = 7:
+					'Fight the Patriarchy!'
+				elseif rand_pee = 8:
+					'Tampons vs. Pads, cast your vote! Below this text are hash marks indicating various girl''s preference. One person also wrote “Freebleeder for life!” Ewww.'
+				elseif rand_pee = 9:
+					'Petra''s cock is smaller than my lipstick tube, LOL!'
+				elseif rand_pee = 10:
+					'You''re beautiful! Believe that!'
+				elseif rand_pee = 11:
+					'Putin is a chauvinist pig!'
+				elseif rand_pee = 12:
+					'Suck dick! It''s good for you!'
+				elseif rand_pee = 13:
+					'"I''ll pull out, I swear! is the most dangerous lie you can believe." This text is followed by a crude drawing of a pregnant woman.'
+				elseif rand_pee = 14:
+					'Cut back on the perfume, ladies. It smells like a unicorn farted in here.'
+				elseif rand_pee = 15:
+					'<<$rand_girl>> is a slut and everyone knows it!'
+				elseif rand_pee = 16:
+					'Men are like pantyhose; They either run, cling, or don''t fit right in the crotch!'
+				elseif rand_pee = 17:
+					'Gopnik guys are SO HOT!!!'
+				elseif rand_pee = 18:
+					'That rumor about black guys is true! Just ask Marcus for a sneak peek.'
+				elseif rand_pee = 19:
+					'Butt sex is the best sex!'
+				elseif rand_pee = 20:
+					'I just wrote on the wall. Take THAT, society!'
+				else
+					'Never quit loving your clit.'
+				end
 			end
-		end
 
-		if mesec > 0 and (isprok = 1 or (isprok = 0 and isprokp = 0)) and tampon > 0 and bag = 1:
-			act 'Change tampon (0:02)':
-				*clr & cla
-				minut += 2
-				'<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.'
+			if mesec > 0 and (isprok = 1 or (isprok = 0 and isprokp = 0)) and tampon > 0 and bag = 1:
+				act 'Change tampon (0:02)':
+					*clr & cla
+					minut += 2
+					'<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.'
 
-				gs 'din_van', 'pblc_pee_end'
+					gs 'din_van', 'pblc_pee_end'
+				end
 			end
-		end
 
-		if mesec > 0 and (isprokp = 1 or (isprok = 0 and isprokp = 0)) and sanpad > 0 and bag = 1:
-			act 'Change pad (0:02)':
-				*clr & cla
-				minut += 2
-				'<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.'
+			if mesec > 0 and (isprokp = 1 or (isprok = 0 and isprokp = 0)) and sanpad > 0 and bag = 1:
+				act 'Change pad (0:02)':
+					*clr & cla
+					minut += 2
+					'<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.'
 
-				gs 'din_van', 'pblc_pee_end'
+					gs 'din_van', 'pblc_pee_end'
+				end
 			end
-		end
 
-		gs 'din_van', 'pblc_pee_end'
+			gs 'din_van', 'pblc_pee_end'
+		end
 	end
 end
 

locations/gLakeNude.qsrc

@@ -292,6 +292,7 @@ if $ARGS[0] = 'sauna':
 	*clr & cla
 	$menu_loc = 'gLakeNude'
 	$menu_arg = 'sauna'
+	$metka = 'sauna'
 	menu_off = 0
 	minut += 3
 	gs 'stat'

locations/gskver.qsrc

@@ -92,9 +92,9 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Walk to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
-	act 'Walk to the Old Town':minut += 10 & gt 'liam'
+	act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pavResidential'
+	act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pavCommercial'
+	act 'Walk to the Old Town (0:10)':minut += 10 & gt 'liam'
 
 	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
 	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace. Two paths lead out of the park. One brings you to the <a href="exec:minut += 5 & gt ''pavcommercial''">commercial</a> the other to the <a href="exec:minut += 5 & gt ''pavresidential''">residential</a> area.'

locations/kit_din.qsrc

@@ -516,7 +516,7 @@ $driwater = {
 }
 
 $fill_bottle = {
-	if refillable_bottle = 1 or refillable_bottle = 2:
+	if refillable_bottle > 0 and refillable_bottle < 4:
 		*nl
 		'You can fill your sports water bottle with filtrated tap water.'
 		act 'Fill your water bottle (0:01)':

locations/liam.qsrc

@@ -56,7 +56,7 @@ if hour >= 13 and hour <= 15 and bodimodel = 1 and arts = 0 and tusa = 1:
 		gs'dibodi'
 
 		'<center><img <<$set_imgh>> src="images/characters/oldtown/marinka/marinka.jpg"></center>'
-		'Suddenly you notice a girlfriend from the local hangouts Marinka, I am standing at the door.'
+		'Suddenly you notice a girl from the local hangouts Marinka, I am standing at the door.'
 
 		act 'Ask':gt 'dibodi', 'sptusa'
 	end
@@ -64,10 +64,9 @@ end
 
 if arts = 1:'Apartment <a href="exec:gt ''Marin'',''start''">Marina</a>'
 
-
-act 'Walk to the train station (15 min)':minut += 5 & nroad = 15 & gt 'pavTrain'
-act 'Walk to Pavlovsk park (10 min)':minut += 5 & nroad = 10 & gt 'gskver', 'start'
-act 'Walk to the St Petersburg to Pavlovsk road (5 min)':minut += 5 & nroad = 15 & gt 'road'
+act 'Walk to the train station (0:15)':minut += 15 & nroad = 15 & gt 'pavTrain'
+act 'Walk to Pavlovsk park (0:10)':minut += 10 & nroad = 10 & gt 'gskver', 'start'
+act 'Walk to the highway (0:05)':minut += 5 & nroad = 15 & gt 'road'
 
 act 'Wait':gs 'obj_din', 'wait'
 

locations/nichUtil.qsrc

@@ -151,13 +151,9 @@ elseif $ARGS[0] = 'debug':
 	'The last time you fucked Tanya was '+(daystart-nichTanyaFuckLast)+' days ago'
 	'Tanya has a dominance of <<nichTanyaDominance>> (range: -100 - 100)'
 	
-	act 'DEBUG: New Workday':
-		gs 'nichUtil', 'startWorkday'
-	end
+	act 'DEBUG: New Workday': gs 'nichUtil', 'startWorkday'
 	
-	act 'Back':
-		gt $menu_loc
-	end
+	act 'Back': gt $menu_loc, $menu_arg
 	
 elseif $ARGS[0] = 'startWorkday':
 	!! Sveta has free Wednesdays.
@@ -166,9 +162,7 @@ elseif $ARGS[0] = 'startWorkday':
 	end
 	
 	nichMissedWorkdays = daystart - nichLastWorkDay - 1
-	
-	
-	
+		
 	if nickHired + 1 = daystart:
 		!! this is the first workday ever
 		nichMissedWorkdays = 0
@@ -215,8 +209,6 @@ elseif $ARGS[0] = 'startWorkday':
 		end
 	end
 	
-	
-	
 	nichLastWorkDay = daystart
 	
 	if nichWorkState > 0:
@@ -259,7 +251,6 @@ elseif $ARGS[0] = 'startWorkday':
 		nichSalaryNext = nichSalaryBase
 	end
 	
-	
 	!! NPC behaviour
 	!! Gala will give up talking smack about Sveta after 5 days
 	if nichGalaOpponent >= 10 and nichGalaOpponent < 20 and daystart > nichGalaOpponentDay + 5:
@@ -327,8 +318,7 @@ elseif $ARGS[0] = 'clearVars':
 	!!Do not kill Tanyas fuck vars since Sveta might meet her after leaving her job
 	killvar 'nichTanyaSpyLast'
 	killvar 'nichTanyaSpyCounter'
-	
-	
+		
 elseif $ARGS[0] = 'fired':
 	'It takes you a few moments to process what just happened:'
 	'You have just been fired. And kind of lost your home, too.'
@@ -343,7 +333,6 @@ elseif $ARGS[0] = 'fired':
 	act 'Take your belongings and leave the apartment':gt 'down'
 end
 
-
 !! initializes variables when hired, might mess everything up if called at any other time
 if $ARGS[0] = 'hired':
 	home_owned[7] = 1

locations/pavCommercial.qsrc

@@ -141,11 +141,11 @@ end
 
 if workPTU > 2:act '<b>Go to the hostel</b>':gt 'etoexhib', 'pos40'
 
-act 'Walk to the residential area':minut += 5 & gt 'pavResidential'
-act 'Walk to the Industrial region':minut += 5 & gt 'pavIndustrial'
-act 'Walk to the Five Eight estate':minut += 2 & gt 'pavcomplex', 'start'
-act 'Walk to the train station':minut += 15 & gt 'pavtrain'
-act 'Walk to the city highway':minut += 15 & nroad = 20 & gt 'road'
+act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pavResidential'
+act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pavIndustrial'
+act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pavcomplex', 'start'
+act 'Walk to the train station (0:10)':minut += 10 & gt 'pavtrain'
+act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 
 act 'Wait':gs 'obj_din', 'wait'
 

locations/pavComplex.qsrc

@@ -143,9 +143,9 @@ if $ARGS[0] = 'start':
 	
 	if home_owned[2] = 1: act '<b>Go Home</b> (Parents'' Apartment)': minut += 4 & pavhome_enter = 1 & gt 'korrPar'
 	if pavSharedAptEnabled = 1: act '<b>Go Home</b> (Shared Apartment)': minut += 5 & gt 'pavSharedApt', 'start'
-	act 'Walk to the residential area':minut += 2 & gt 'pavResidential'
-	act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
-	act 'Walk to the Industrial region':minut += 5 & gt 'pavIndustrial'
+	act 'Walk to the residential area (0:02)':minut += 2 & gt 'pavResidential'
+	act 'Walk to the commercial area (0:05)':minut += 5 & gt 'pavCommercial'
+	act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pavIndustrial'
 	if storyline = 1 and home_owned[2] = 1: 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	elseif storyline = 1 and (home_owned[2] = 0 or pavSharedAptEnabled = 1):

locations/pavIndustrial.qsrc

@@ -81,9 +81,9 @@ else
 	*pl 'The local G&M Store is currently closed. Opening hours are Monday to Friday, between 08:00 to 20:00.'
 end
 
-act 'Walk to the Five Eight estate':minut += 2 & gt 'pavcomplex', 'start'
-act 'Walk to the residential area':minut += 5 & gt 'pavResidential'
-act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
+act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pavcomplex', 'start'
+act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pavResidential'
+act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pavCommercial'
 
 if week < 7 and hour >= 8 and hour < 18: 
 	act 'Visit the tailor': gt 'Gshveyfab', 'tailor'

locations/pavResidential.qsrc

@@ -143,9 +143,9 @@ elseif InvitationToDimkaNYparty = 1 and month ! 12:
 	killvar 'InvitationToDimkaNYparty'
 end
 
-act 'Walk to the Five Eight estate':minut += 2 & gt 'pavcomplex', 'start'
-act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
-act 'Walk to the Industrial region':minut += 5 & gt 'pavIndustrial'
+act 'Walk to the Five Eight estate (0:02)':minut += 2 & gt 'pavcomplex', 'start'
+act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pavCommercial'
+act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pavIndustrial'
 
 act 'Wait':gs 'obj_din', 'wait'
 

locations/pavtrain.qsrc

@@ -177,9 +177,9 @@ end
 
 gs 'family'
 
-act 'Walk to the Commercial area':minut += 10 & gt 'pavCommercial'
-act 'Walk to the City Highway':minut += 15 & nroad = 20 & gt 'road'
-act 'Walk to the Old Town':minut += 15 & nroad = 19 & gt 'liam'
+act 'Walk to the Commercial area (0:10)':minut += 10 & gt 'pavCommercial'
+act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
+act 'Walk to the Old Town (0:15)':minut += 15 & nroad = 19 & gt 'liam'
 
 act 'Enter the station building': gt 'pavtrainhall'
 

locations/pavtrain_market.qsrc

@@ -87,7 +87,7 @@ if $ARGS[0] = 'start':
 					'Roman welcomes you. He is interested and businesslike as he asks what you have for sale.'
 				elseif gobQW = 1:
 					gobQW = 2
-					minute += 5
+					minut += 5
 					'The man greets you and introduces himself as Roman, you tell him that your name is <<$pcs_nickname>>. After a brief chat Roman says that he is interested in seeing what you have for sale.'
 				end
 				act 'Leave':gt 'pavtrain_market', 'start'

locations/stat_display.qsrc

@@ -315,6 +315,9 @@ else
 end
 if $stat_school_msg ! '': $stat_school_icon_msg = $stat_school_msg + $stat_school_schedule
 
+$stat_bra_msg = ''
+$stat_bra_text = ''
+
 if $clothingworntype ! 'nude':
 	if CloThinness = 6:
 		if $clothingworntype = 'swimwear':
@@ -356,11 +359,11 @@ if $clothingworntype ! 'nude':
 		$stat_bra_msg = 'You are not wearing a bra.'
 		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 	end
-else
-	$stat_bra_msg = ''
-	$stat_bra_text = ''
 end
 
+$stat_panty_msg = ''
+$stat_panty_text = ''
+
 if $pantyworntype = 'none' and $clothingworntype ! 'swimwear':
 	if PCloStyle = 4:
 		$stat_panty_msg = 'You are not wearing panties, but you are dressed as a hooker, so that''s hardly surprising.'
@@ -398,9 +401,6 @@ elseif $pantyworntype = 'exhibitionist' and $clothingworntype ! 'swimwear':
 		$stat_panty_msg = 'Your face is flushed with shame, you are wearing panties so thin, they leave your ass clearly visible, as it flashes from under your short skirt.'
 		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
 	end
-else
-	$stat_panty_msg = ''
-	$stat_panty_text = ''
 end
 
 $stat_clothes_msg = ''
@@ -1132,9 +1132,23 @@ if cheatStatusIcons = 0:
 		$statusIconBarTab += '<td><a href="exec:msg ''You are feeling a tingling sensation between your legs.''"><img title="You are feeling a bit aroused." height = 54 src="images/system/icon/status_icons/arousal_low.png"></a></td>'
 	end
 
-	if cheatNoEat = 0 and $stat_hunger_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_hunger_msg"><img title="<<$stat_hunger_tooltip>>" height = 54 src="images/system/icon/status_icons/need_food.png"></a></td>'
-	
-	if cheatNoDrink = 0 and $stat_thirst_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="<<$stat_thirst_tooltip>>" height = 54 src="images/system/icon/status_icons/need_drink.png"></a></td>'
+	if cheatNoEat = 0 and $stat_hunger_msg ! '' and buterbrod = 0: 
+		$statusIconBarTab += '<td><a href="exec:msg $stat_hunger_msg"><img title="<<$stat_hunger_tooltip>>" height = 54 src="images/system/icon/status_icons/need_food.png"></a></td>'
+	elseif cheatNoEat = 0 and $stat_hunger_msg ! '' and buterbrod = 1 and menu_off = 0:
+		$statusIconBarTab += '<td><a href="exec: buterbrod = 0 & pcs_energy += 40 & cumspclnt = 2 & gs ''cum_cleanup'' & fat += 1 & gs ''stat''"><img title="Click to eat your sandwich." height = 54 src="images/system/icon/status_icons/need_food.png"></a></td>'
+	elseif cheatNoEat = 0 and $stat_hunger_msg ! '' and buterbrod = 1 and menu_off = 1:
+		$statusIconBarTab += '<td><a href="exec: $stat_hunger_msg"><img title="Your sandwich has to wait until you can spare a minute." height = 54 src="images/system/icon/status_icons/need_food.png"></a></td>'
+	end
+		
+	if cheatNoDrink = 0 and $stat_thirst_msg ! '' and bottle = 0 and refillable_bottle < 2: 
+		$statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="<<$stat_thirst_tooltip>>" height = 54 src="images/system/icon/status_icons/need_drink.png"></a></td>'
+	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and refillable_bottle > 1 and menu_off = 0: 
+		$statusIconBarTab += '<td><a href="exec: refillable_bottle -= 1 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><img title="Click to drink from your refillable water bottle." height = 54 src="images/system/icon/status_icons/need_drink.png"></a></td>'
+	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and bottle > 0 and menu_off = 0: 
+		$statusIconBarTab += '<td><a href="exec: bottle = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><img title="Click to drink from your water bottle." height = 54 src="images/system/icon/status_icons/need_drink.png"></a></td>'
+	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and (bottle > 0 or refillable_bottle > 1) and menu_off = 1:
+		$statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="Your water bottle has to wait until you can spare a minute." height = 54 src="images/system/icon/status_icons/need_drink.png"></a></td>'
+	end
 		
 	if cheatNoSleep= 0 and $stat_sleep_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_sleep_msg"><img title="<<$stat_sleep_tooltip>>" height = 54 src="images/system/icon/status_icons/need_sleep.png"></a></td>'