[added] some new dynamics to kit_din, and updated various kitchens with new dynamics. pavSharedApt, kuhr, kuhr2x, kuhrPar

[changed] some old kit_din dynamics to use beverage and food gosubs.
[added] shulgakuh and igorhome allow water, snacks and tea.
[added] menu_loc

locations/igorhome.qsrc

@@ -3,6 +3,9 @@
 !!Igor = A4
 
 if $ARGS[0] = 'entrance':
+	$menu_loc = 'igorhome'
+	$menu_arg = 'entrance'
+	menu_off = 0
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor Kruglov</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
@@ -15,8 +18,8 @@ if $ARGS[0] = 'entrance':
 		act 'Go with Fedor':IdorBlock = 1 & gt 'FedorEv', 'Start'
 		exit
 	end
-!!this is all new and replaces how Sveta goes to Igor''s house with him from school.
-!!This one is if Igor and Sveta are dating
+	!!this is all new and replaces how Sveta goes to Igor''s house with him from school.
+	!!This one is if Igor and Sveta are dating
 	if IgorLove > 0:
 		'Igor is waiting for you after school. As you approach he eagerly asks you, "Do you want to come to my house?"'
 		act 'Go to Igor''s house':
@@ -39,22 +42,25 @@ if $ARGS[0] = 'entrance':
 		'As you walk towards Igor''s house, he starts having second thoughts "<<$pcs_firstname>>, you know I love you very much, but we don''t know each other well enough, so I''m wondering if we should let it be."'
 		act 'Leave': gt 'pavResidential'
 	end
-!!this one is if Igor is a tutor in history
-!!	if igor_history = 1:
-!!		'Igor is waiting for you after school. As you approach he asks you, "You ready to go?"'
-!!		act 'Go to Igor''s house':
-!!			cls
-!!			minut += 15
-!!			gs 'stat'
-!!			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homeb1.jpg"></center>'
-!!			'You follow Igor home. Once you get to his place, he unlocks the door and invites you in.'
-!!			act 'Walk around his home': gt 'igorhome','hallway'
-!!			act 'Go to his room': gt 'igorhome', 'igorroom'
-!!		end
-!!	end
+	!!this one is if Igor is a tutor in history
+	! if igor_history = 1:
+		! 'Igor is waiting for you after school. As you approach he asks you, "You ready to go?"'
+		! act 'Go to Igor''s house':
+			! cls
+			! minut += 15
+			! gs 'stat'
+			! '<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homeb1.jpg"></center>'
+			! 'You follow Igor home. Once you get to his place, he unlocks the door and invites you in.'
+			! act 'Walk around his home': gt 'igorhome','hallway'
+			! act 'Go to his room': gt 'igorhome', 'igorroom'
+		! end
+	! end
 end
 
 if $ARGS[0] = 'hallway':
+	$menu_loc = 'igorhome'
+	$menu_arg = 'hallway'
+	menu_off = 0
 	$location_type = 'indoors'
 	cls
 	minut += 1
@@ -63,62 +69,51 @@ if $ARGS[0] = 'hallway':
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kor.jpg"></center>'
 	'This is the entrance hall to Igor''s house, it is tastefully decorated. It leads to all the other rooms in the house.'
+	act 'Leave Igor''s home': gt 'pavResidential'
 	act 'Igor''s Room': gt 'igorhome','igorroom'
 	act 'Bathroom': gt 'igorhome','bathroom'
 	act 'Igor''s sister''s room': gt 'igorhome','sisterroom'
 	act 'Living Room': gt 'igorhome','livingroom'
 	act 'Kitchen': gt 'igorhome','kitchen'
 	act 'Parents Room': gt 'igorhome','igorparents'
-	act 'Leave Igor''s home': gt 'pavResidential'
 !!going to add the parents bedroom, living room and kitchen. They will be down below, they will need to be moved where you want and coded of course.
 end
 
 if $ARGS[0] = 'bathroom':
 	cls
 	minut += 1
-	$metka = 'bathroom'
 	$loc = 'igorhome'
-	$metkaM = 'bathroom'
+	$metka = 'bathroom'
 	$locM = 'igorhome'
+	$metkaM = 'bathroom'
+	$menu_loc = 'igorhome'
+	$menu_arg = 'bathroom'
+	menu_off = 0
 	gs 'stat'
 	$location_type = 'bathroom'
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/vann.jpg"></center>'
 	'The bathroom has a large sink area and tile floors. The toilet sits along the far wall. There is also a walk-in shower and bath tub. It all looks very nice.'
-	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
+	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 	*nl
-
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
-
-	act 'Take a shower':
-		cls
-		minut += 10
-		dynamic $showerdin
-		gs 'stat'
-		'<center><h4><font color="maroon">Bathroom</font></h4></center>'
-		'<center><video autoplay loop  src="images/characters/pavlovsk/school/boy/igor/mitsa.mp4"></video></center>'
-		'You take a quick shower.'
-		act 'Get out of the shower': gt 'igorhome','bathroom'
-	end
-	dynamic $bath
-	gs 'din_van', 'prvt_pee'
-	dynamic $bteeth
-	dynamic $tampon
-	dynamic $basin
-	dynamic $removepan
-
 	act 'Leave the bathroom': gt 'igorhome','hallway'
+	gs 'din_van', 'private'
 end
 
 if $ARGS[0] = 'igorroom':
 	cls
+	$menu_loc = 'igorhome'
+	$menu_arg = 'igorroom'
+	menu_off = 0
 	minut += 1
 	$locclass = 'bedr'
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kom.jpg"></center>'
 	'The room is surprisingly clean and organized for a boys room. It is fairly tastefully decorated. In the center of the room against one wall is a single narrow bed. Against the opposite wall is a desk and a chair, with a computer sitting on the desk. Next to the desk is a book shelf with a fairly large collection of books, just below the shelves leaning against the wall rests a guitar.'
-!!This one I think is if he is dating Dima, not sure.
+
+	act 'Leave Igor''s room': gt 'igorhome','hallway'
+	!!This one I think is if he is dating Dima, not sure.
 	if DimaLoveIgor > 1:'Sitting on the bed is a Teddy Bear with a red heart in its little hands.'
 	!!if igor is home the following is added.
 	'You see sitting on the edge of his bed.'
@@ -164,11 +159,11 @@ if $ARGS[0] = 'igorroom':
 			act 'Chat just a little longer':gt 'igorhome','Chat'
 		end
 	end
-	act 'Leave Igor''s room': gt 'igorhome','hallway'
 end
 
 if $ARGS[0] = 'Chat':
 	*clr & cla
+	menu_off = 1
 	minut += 5
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
@@ -264,6 +259,7 @@ if $ARGS[0] = 'Chat':
 end
 
 if $ARGS[0] = 'study':
+	menu_off = 1
 	minut += 60
 	npc_rel['A4'] += 5
 	pcs_grades += rand(0,2)
@@ -272,14 +268,15 @@ if $ARGS[0] = 'study':
 	'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/study.jpg"></center>'
 	'You sit down next to Igor and he pulls out his history book and notes. He starts tutoring you in history, he is very good tutor and your learn a lot.'
-	act 'Study More':gt 'igorhome','study'
+	act 'Leave Igor''s room': gt 'igorhome','hallway'
 	act 'Chat':gt 'igorhome','Chat'
+	act 'Study More':gt 'igorhome','study'
 	act 'Excuse yourself': gt 'igorhome','hallway'
-	act 'Leave Igor''s room': gt 'igorhome','hallway'
 end
 
 if $ARGS[0] = 'sisterroom':
 	*clr & cla
+	menu_off = 1
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Igor''s sister''s room</font></b></center>'
@@ -442,6 +439,9 @@ end
 !!adding all the new rooms to the bottom here, put them where you like and make sure I got the code right.
 if $ARGS[0] = 'livingroom':
 	*clr & cla
+	$menu_loc = 'igorhome'
+	$menu_arg = 'livingroom'
+	menu_off = 0
 	minut += 1
 	$locclass = 'livingr'
 	gs 'stat'
@@ -471,6 +471,7 @@ end
 
 
 if $ARGS[0] = 'livingroom1':
+	menu_off = 1
 !!if Sveta is alone and attractive
 	act 'Talk':
 		*clr & cla
@@ -544,7 +545,8 @@ if $ARGS[0] = 'livingroom1':
 end
 
 if $ARGS[0] = 'livingroom2':
-!! else Sveta alone and regular/ugly looks
+	menu_off = 1
+	!! else Sveta alone and regular/ugly looks
 	act 'Talk':
 		*clr & cla
 		met_IgorDad = 1
@@ -599,8 +601,9 @@ if $ARGS[0] = 'livingroom2':
 end
 
 if $ARGS[0] = 'livingroom3':
-!!Sveta with Igor only friends
-!!if attractive
+	menu_off = 1
+	!!Sveta with Igor only friends
+	!!if attractive
 	act 'Talk':
 		*clr & cla
 		met_IgorDad = 1
@@ -674,7 +677,8 @@ if $ARGS[0] = 'livingroom3':
 end
 
 if $ARGS[0] = 'livingroom4':
-!!else regular/ugly Sveta
+	menu_off = 1
+	!!else regular/ugly Sveta
 	act 'Talk':
 		*clr & cla
 		met_IgorDad = 1
@@ -729,13 +733,20 @@ end
 
 if $ARGS[0] = 'kitchen':
 	*clr & cla
+	$loc = 'igorhome'
+	$metka = 'kitchen'
+	$menu_loc = 'igorhome'
+	$menu_arg = 'kitchen'
+	menu_off = 0
 	minut += 1
 	$locclass = 'kitr'
 	gs 'stat'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kitchen.jpg"></center>'
 	'The room is very clean and neat. Everything is perfectly in place, the counters are polished to a near mirror like quality. The wood floor is also highly polished.'
-!!this is a elseif, if it is 06:00 to 07:00 igors mother is here, or if it is 18:00 to 23:00 she is here during the week. On weekends she is here from 08:00 to 23:00
+
+	act 'Leave the kitchen': gt 'igorhome','hallway'
+	!!this is a elseif, if it is 06:00 to 07:00 igors mother is here, or if it is 18:00 to 23:00 she is here during the week. On weekends she is here from 08:00 to 23:00
 	if (week <=5 and (hour = 6 or (hour >= 18 and hour < 23))) or (week > 5 and hour >= 8 and hour < 23):
 		'You see Igor''s mother Inga is in the kitchen drinking tea. She is very neatly dressed, you don''t think she has noticed you yet.'
 		if met_IgorMother = 0:
@@ -768,12 +779,17 @@ if $ARGS[0] = 'kitchen':
 		else
 			act 'Leave the kitchen': gt 'igorhome','hallway'
 		end
+	else
+		'Igor''s mother isn''t here, so this might be a good time to grab a snack.'
+		dynamic $edasnack
+		dynamic $dritea
 	end
-	act 'Leave the kitchen': gt 'igorhome','hallway'
+	dynamic $driwater
 end
 
 if $ARGS[0] = 'kitchen1':
-!!if Sveta is friends with Igor and they''re together in the kitchen + Sveta is wearing Bimbo/slutty outfit
+	menu_off = 1
+	!!if Sveta is friends with Igor and they''re together in the kitchen + Sveta is wearing Bimbo/slutty outfit
 	'As the two of you walk into the kitchen, you notice a woman in her mid-forties sitting by the table drinking tea. Igor whispers that that''s his mother.'
 	'She looks up eyeing you from head to toe, turning to Igor saying...'
 	'"Igor, dear, what have I told you about inviting strangers into our home without letting me know?"'
@@ -848,7 +864,8 @@ if $ARGS[0] = 'kitchen1':
 end
 
 if $ARGS[0] = 'kitchen2':
-!!elseif Walking alone in the house + Bimbo/slutty outfit
+	menu_off = 1
+	!!elseif Walking alone in the house + Bimbo/slutty outfit
 	'You hear someone clearing their throat as you walk by the kitchen. You stop seeing a woman in her forties sitting by the table enjoying her tea.'
 	'Looking up the woman asks you "And who might you be? What is this god awful outfit you''re wearing? You should tell your mother to buy you some proper clothes. I can''t believe that my sweet little Igor is hanging out with the likes of someone like you..."'
 	act 'Try to be friendly':
@@ -880,7 +897,7 @@ if $ARGS[0] = 'kitchen2':
 		end
 	end
 
-!!Must have confidence even if Sveta is a slut/bimbo, maybe even being a dom
+	!!Must have confidence even if Sveta is a slut/bimbo, maybe even being a dom
 	act 'You''ve had enough':
 		*clr & cla
 		'Tired of her yapping you angirly answer, "A grown woman shouldn''t act this way. What does it matter how I dress? Are you really that judgmental of someone you''ve just met?"'
@@ -908,7 +925,8 @@ end
 
 
 if $ARGS[0] = 'kitchen3':
-!!elseif Good girl + friends with Igor
+	menu_off = 1
+	!!elseif Good girl + friends with Igor
 	'As the two of you walk into the kitchen, you notice a woman in her mid-forties sitting by the table drinking tea. Igor walks up to this woman and hugs her.'
 	'"Igor, dear, who''s this lovely girl you brought home with you?"'
 	'"It''s a friend from school." Igor proudly proclaims.'
@@ -978,7 +996,8 @@ if $ARGS[0] = 'kitchen3':
 end
 
 if $ARGS[0] = 'kitchen4':
-!!elseif Good girl + walking around alone
+	menu_off = 1
+	!!elseif Good girl + walking around alone
 	'As you walk around the house you hear someone calling you over from the kitchen.'
 	'"Who are you? My god I didn''t know that my little boy was friends with such a lovely girl."'
 	'You blush and thank her for the compliment.'
@@ -1024,7 +1043,8 @@ end
 
 
 if $ARGS[0] = 'kitchen5':
-!!elseif Gopnik, friends with Igor
+	menu_off = 1
+	!!elseif Gopnik, friends with Igor
 	'As soon as Igor''s mother notices you her face turns red, turning towards Igor she starts screaming...'
 	'"What is this Igor? Explain yourself! When have you started hanging out with a hoodlum? I taught you better than this, just look at her, you should know better."'
 	'Igor tries to explain that you''re only friends but she''s not having it...'
@@ -1042,7 +1062,8 @@ if $ARGS[0] = 'kitchen5':
 end
 
 if $ARGS[0] = 'kitchen6':
-!!elseif You''re Igor''s girlfriend and a Gopnik, Igor is keeping it a secret, it ends with him telling his mother that he''s helping you out studying
+	menu_off = 1
+	!!elseif You''re Igor''s girlfriend and a Gopnik, Igor is keeping it a secret, it ends with him telling his mother that he''s helping you out studying
 	'As soon as Igor''s mother notices you her face turns red, turning towards Igor she starts screaming...'
 	'"What is this Igor? Explain yourself! When have you started hanging out with a hoodlum? I taught you better than this, just look at her, you should know better."'
 	'Igor tries to explain that you''re only friends but she''s not having it...'
@@ -1071,7 +1092,8 @@ if $ARGS[0] = 'kitchen6':
 end
 
 if $ARGS[0] = 'kitchen7':
-!!elseif Gopnik + Walking around the house without Igor
+	menu_off = 1
+	!!elseif Gopnik + Walking around the house without Igor
 	'As you''re walking into the kitchen you suddenly hear Igor''s mother...'
 	'"Who are you? Why are you dressed like that? Are you one of those hoodlums I''ve heard of?"'
 	act 'Answer her':
@@ -1110,6 +1132,9 @@ end
 
 if $ARGS[0] = 'igorparents':
 	*clr & cla
+	$menu_loc = 'igorhome'
+	$menu_arg = 'igorparents'
+	menu_off = 0
 	minut += 1
 	$locclass = 'bedr'
 	gs 'stat'
@@ -1130,9 +1155,10 @@ end
 
 !!new scene for going to Igors house with out following him from school.
 if $ARGS[0] = 'home':
+	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/house.jpg"></center>'
 	'You walk up to the front door and knock.'
-!!This will have a lot of if's and elseif's.
+	!!This will have a lot of if's and elseif's.
 	if SchoolAtestat = 1 and kanikuli > 0:
 		if (week < 6 and (hour > 14 or (hour = 15 and minut >= 30)) and hour < 18) or (week >= 6 and hour >= 9 and hour < 18):
 			if rand (0,3) = 0: gt 'igorhome', 'home2'
@@ -1161,8 +1187,9 @@ if $ARGS[0] = 'home':
 end
 
 if $ARGS[0] = 'home2':
-!!There is a 25% chance this happens instead of Igor answers then door in the above one. He is home just currently cross dressing and is afraid to answer the door.
-!!Igor in drag
+	menu_off = 1
+	!!There is a 25% chance this happens instead of Igor answers then door in the above one. He is home just currently cross dressing and is afraid to answer the door.
+	!!Igor in drag
 	'No one answers and you are just about to leave when you see movement inside. Maybe they don''t want to be disturbed or maybe they didn''t hear you knocking, or maybe someone broke into their house. What should you do?'
 	act 'Leave': gt 'pavResidential'
 	act 'Knock again':

locations/kit_din.qsrc

@@ -438,40 +438,71 @@ $posudomashina = {
 	end
 }
 
+$edasnack = {
+	act 'Have a snack (0:15)':
+		gs 'food', 'snack'
+	end
+}
+
 $pranik = {
-	act 'Have tea with biscuits (0:05)':
-		cla
-		*clr
-		minut += 5
-		pranik -= 1
-		pcs_health += 30
-		pcs_mood += 20
-		pcs_energy += 20
-		if pcs_hydra >= 100:
-			pcs_hydra += 30
-		else
-			pcs_hydra += 60
+	if pranik > 0:
+		'You have <<pranik>> tea biscuits.'
+		act 'Have tea with biscuits (0:05)':
+			cla
+			*clr
+			minut += 5
+			pranik -= 1
+			pcs_health += 30
+			pcs_mood += 20
+			pcs_energy += 20
+			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 drank tea and enjoyed the tea biscuits. You know they''re too sweet and can''t be good for your figure, but they taste so good!'
+
+			act 'Get up from the table':gt $loc, $metka
 		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 have tea with biscuits. Sweet and very bad for your figure, but so good.'
+	end
+}
 
-		act 'Get up from the table':gt $loc, $metka
+$dritea = {
+	act 'Have a cup of tea (0:05)':
+		gs 'beverage', 'bev_tea'
 	end
 }
 
 $edaD = {
 	if edaD > 0:
-		'Your refrigerator contains <b><<edaD>></b> healthy meals.'
+		'The refrigerator contains <b><<edaD>></b> healthy meals.'
 		act 'Eat diet food (0:30)':
+			cla
+			*clr
+			frost = 0
+			minut += 30
+			pcs_health += 10
+			pcs_mood += 20
 			edaD -= 1
-			pcs_mood += 15
-			gs 'food', 'm_meal'
+			'<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 really not hungry at all. You can''t finish the meal.'
+			elseif pcs_energy >= 80:
+				pcs_energy += 40
+				'You try to enjoy the diet meal, but half-way in you realize you weren''t all that hungry yet. You manage to finish the meal, but feel like it was kind of wasted.'
+			else
+				pcs_energy += 80
+				'The diet meal is tasty, and you enjoy eating it.'
+			end
+
+			act 'Get up from the table':gt $curloc
 		end
 	end
 }
@@ -500,21 +531,8 @@ $fatdel = {
 }
 
 $driwater = {
-	act 'Drink water (0:05)':
-		cla
-		minut += 5
-
-		if pcs_hydra >= 100:
-			'You don''t need any more water.'
-		else
-			pcs_hydra += 80
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			'You gladly drink a glass of water.'
-		end
-
-		act 'Get up from the table':gt $loc, $metka
+	act 'Drink some water (0:05)':
+		gs 'beverage', 'bev_wat'
 	end
 }
 

locations/kuhr.qsrc

@@ -1,8 +1,11 @@
 # kuhr
 CLOSE ALL
 
-$metka = ''
 $loc = 'kuhr'
+$metka = ''
+$menu_loc = 'kuhr'
+$menu_arg = ''
+menu_off = 0
 $locclass = 'kitr'
 clr
 minut += 1
@@ -12,6 +15,11 @@ gs 'kit_din'
 gs 'themes', 'indoors'
 '<center><b><font color="maroon">Kitchen</font></b></center>'
 
+act 'Return to the corridor':
+	killvar 'fullmorrout'
+	gt'korr'
+end
+
 if remkuhr = 0:'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/kuhr.jpg"></center>'
 if remkuhr = 1:'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/kuhr2.jpg"></center>'
 
@@ -65,15 +73,7 @@ if husband > 0 and husbandrink ! 10:
 	if hour = 7 or hour = 17:'<a href="exec:gt ''husb'', ''start''">Your husband is eating at the table.</a>'
 end
 
-if pranik > 0:
-	if pranik = 1:
-		'You only have one more portion of tea biscuits.'
-	else
-		'You have enough tea biscuits for <b><<pranik>></b> more snacks.'
-	end
-	dynamic $pranik
-end
-
+dynamic $pranik
 dynamic $edaD
 dynamic $fatdel
 dynamic $driwater
@@ -528,10 +528,5 @@ if fullmorrout = 1:
 	end
 end
 
-act 'Return to the corridor':
-	killvar 'fullmorrout'
-	gt'korr'
-end
-
 --- kuhr ---------------------------------
 

locations/kuhr2x.qsrc

@@ -1,7 +1,10 @@
 # kuhr2x
 CLOSE ALL
-$metka = ''
 $loc = 'kuhr2x'
+$metka = ''
+$menu_loc = 'kuhr2x'
+$menu_arg = ''
+menu_off = 0
 $locclass = 'kitr'
 
 clr
@@ -15,6 +18,10 @@ gs 'themes', 'indoors'
 '<center><b><font color = maroon>Kitchen</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/oldtown/apartment/kuhr2x.jpg"></center>'
 
+act 'Return to the corridor':
+	gt 'korr2x'
+end
+
 if kransloman = 1:
 	cla
 	'You notice your sink is leaking, unable to fix it yourself you call a plumber.'
@@ -70,15 +77,7 @@ if husband > 0 and husbandrink ! 10:
 	end
 end
 
-if pranik > 0:
-	if pranik = 1:
-		'You only have a couple of tea biscuits for a snack.'
-	else
-		'You have enough tea biscuits for <b><<pranik>></b> more snacks.'
-	end
-	dynamic $pranik
-end
-
+dynamic $pranik
 dynamic $edaD
 dynamic $fatdel
 dynamic $driwater
@@ -510,9 +509,5 @@ if dildo > 0 and pcs_horny >= 50:
 	end
 end
 
-act 'Return to the corridor':
-	gt 'korr2x'
-end
-
 --- kuhr2x ---------------------------------
 

locations/kuhrPar.qsrc

@@ -40,94 +40,12 @@ else
 end
 gs 'family'
 
-act 'Eat a meal (0:30)':gs 'food', 'm_meal'
-
-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)':
-	cls
-	if pcs_hydra >= 100:
-		'You don''t need any more tea.'
-	else
-		minut += 5
-		pcs_hydra += 80
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		pcs_mood += rand(3, 6)
-		'You make a refreshing cup of tea and everything seems a little better.'
-	end
-	
-	gs 'stat'
-
-	act 'Get up from the table':gt $loc, $metka
-end
-
-if pranik > 0:
-	'You have <<pranik>> tea biscuits.'
-
-	act 'Drink tea with biscuits (0:05)':
-		cla
-		*clr
-		minut += 5
-		pranik -= 1
-		pcs_health += 30
-		pcs_mood += 20
-		pcs_energy += 20
-		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 drank tea and enjoyed the tea biscuits. You know they''re too sweet and can''t be good for your figure, but they taste so good!'
-
-		act 'Get up from the table':gt $curloc
-	end
-end
-
-if edaD > 0:
-	act 'Eat diet food (0:30)':
-		cla
-		*clr
-		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 really not hungry at all. You can''t finish the meal.'
-		elseif pcs_energy >= 80:
-			pcs_energy += 40
-			'You try to enjoy the diet meal, but half-way in you realize you weren''t all that hungry yet. You manage to finish the meal, but feel like it was kind of wasted.'
-		else
-			pcs_energy += 80
-			'The diet meal is tasty, and you enjoy eating it.'
-		end
-
-		if pcs_hydra >= 80:
-			'You don''t need any more tea.'
-		else
-			pcs_hydra += 100
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			'You have a cup of tea, quenching your thirst.'
-		end
-
-		act 'Get up from the table':gt $curloc
-	end
-end
-
+act 'Eat a meal (0:30)': dynamic $edahotd
+dynamic $edasnack
+dynamic $driwater
+dynamic $dritea
+dynamic $edaD
+dynamic $pranik
 dynamic $fatdel
 dynamic $lekarstvo
 dynamic $vitamin

locations/pavSharedApt.qsrc

@@ -622,7 +622,9 @@ if $ARGS[0] = 'kitchen':
 	! food
 	if eda > 0:
 		if cltarelka = 0 or edahot > 0:$edagot = ''
-		if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook meal (0:30) for yourself</a>'
+		if cltarelka > 0 and edahot = 0:
+			$edagot = '<a href="exec:dynamic $edagotd">Cook a meal  for yourself (0:30)</a>'
+		end
 		'In the refrigerator there''s enough (your own) food for <b><<eda>></b> servings. <<$edagot>>'
 	end
 	if edahot > 0:'<a href="exec: dynamic $edahotd ">On the table is ready meal (0:30).</a>'
@@ -632,30 +634,10 @@ if $ARGS[0] = 'kitchen':
 		'<a href="exec: gt ''pavSharedApt'', ''cookForGuys''">Cook meal (1:30) for the guys</a>'
 	end
 
-	act 'Have a snack (0:05)':gs 'food', 'snack'
-
-	act 'Drink some water (0:05)':gs 'beverage', 'bev_wat'
-
-	act 'Have a cup of tea (0:05)':
-		minut += 5
-		if pcs_hydra >= 100:
-			'You don''t need any more tea.'
-		else
-			pcs_hydra += 80
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			pcs_mood += rand(3, 6)
-			gs 'stat'
-			'You make a refreshing cup of tea and everything seems a little better.'
-		end
-		act 'Get up from the table':gt 'pavSharedApt', 'kitchen'
-	end
-
-	if pranik > 0:
-		'You have <<pranik>> tea biscuits.'
-		dynamic $pranik
-	end
+	dynamic $edasnack
+	dynamic $driwater
+	dynamic $dritea
+	dynamic $pranik
 	dynamic $edaD
 	dynamic $fatdel
 	dynamic $lekarstvo

locations/shulgakuh.qsrc

@@ -1,7 +1,8 @@
 # shulgakuh
+
 CLOSE ALL
-$metka = ''
 $loc = 'shulgakuh'
+$metka = ''
 $location_type = 'private'
 $locclass = 'kitr'
 
@@ -15,6 +16,8 @@ if $ARGS[0] = '':
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh.jpg"></center>'
 	*nl
+	'An uninspiring kitchen, with the basic amenities for life.'
+	*nl
 
 	if hour >= 18 and hour < 21 and ARGS[0] = 0:
 		if rand(1,100) < 10:
@@ -24,9 +27,9 @@ if $ARGS[0] = '':
 		end
 	end
 	act 'Return to the hallway': gt 'shulgahall'
-
 	act 'Look in the fridge': gt 'shulgakuh', 'holodil'
-
+	dynamic $dritea
+	dynamic $edasnack
 	dynamic $driwater
 
 
@@ -80,7 +83,7 @@ if $ARGS[0] = 'holodil':
 	if beer_count = 0 and vodka_count = 0 and sup_count = 0:$r_pusto = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/holodpusto.jpg"></center><br><font color = red>empty shelves.</font>'
 	if beer_count > 0 and vodka_count > 0 and sup_count > 0:$r_pusto = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/holod'+rand(1,3)+'.jpg"></center>'
 	*nl
-		'You open the fridge and see:<<$r_vodka>><<$r_beer>><<$r_sup>><<$r_pusto>>'
+	'You open the fridge and see:<<$r_vodka>><<$r_beer>><<$r_sup>><<$r_pusto>>'
 
 	act 'Close the refrigerator': gt 'shulgakuh'
 
@@ -179,7 +182,7 @@ if $ARGS[0] = 'holodil':
 			act 'Further': gt 'shulgakuh', 'holodil'
 		end
 	end
-end &!--- holodil ----
+end
 
 !Event in the kitchen with gopotoy:
 if $ARGS[0] = 'gang_sex_ev1':