1
0
فهرست منبع

Merge remote-tracking branch 'Anya/master'

Kevin_Smarts 2 سال پیش
والد
کامیت
67c69f54cd

+ 16 - 53
locations/LariskaHome.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'front_door':
 				$text_home = 'Lariska is in the kitchen.'
 			elseif lariloc = 13:
 				$text_home = 'Lariska is in the shower. She should be out soon.'
-			elseif lariloc = 8:
+			elseif lariloc = 20:
 				$text_home = 'Lariska is cleaning in the bathroom.'
 			elseif lariloc = 14 or lariloc = 16 or lariloc = 18:
 				$text_home = 'Lariska is in the living room.'
@@ -200,6 +200,7 @@ if $ARGS[0] = 'kitchen':
 	*clr & cla
 	minut += 1
 	gs 'stat'
+	gs 'kit_din'
 	gs 'themes', 'indoors'
 	gs 'lariska_schedule'
 	'<center><b><font color="DeepSkyBlue">Kitchen</font></b></center>'
@@ -222,47 +223,12 @@ if $ARGS[0] = 'kitchen':
 	if lariloc = 19:'<a href="exec: gt ''LariskaHome'', ''kitchen_cleaning_1''">Lariska</a> is here cleaning.'
 	act 'Return to the hallway':gt 'LariskaHome', 'hallway'
 	if lariskalove >= 6:
-		act 'Eat a precooked meal (0:20)':
-			minut += 20
-			pcs_health += 20
-			pcs_mood += 20
-			fat += 6
-			if pcs_energy >= 70:
-				pcs_energy += 25
-			else
-				pcs_energy += 70
-			end
-			if pcs_hydra >= 50:
-				pcs_hydra += 50
-			else
-				pcs_hydra += 80
-			end
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			gs 'stat'
-		end
-	end
-	act 'Have a snack (0:10)':
-		minut += 10
-		pcs_health += 10
-		pcs_mood += 10
-		fat += 3
-		if pcs_energy >= 70:
-			pcs_energy += 25
-		else
-			pcs_energy += 35
-		end
-		if pcs_hydra >= 50:
-			pcs_hydra += 25
-		else
-			pcs_hydra += 40
-		end
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		gs 'stat'
+		act 'Eat a hearty meal (0:20)':gs 'food', 'l_meal'
+		act 'Eat a normal meal (0:15)':gs 'food', 'm_meal'
+		act 'Eat a light meal (0:10)':gs 'food', 's_meal'
 	end
+
+	dynamic $edasnack
 	dynamic $sandwich
 	dynamic $driwater
 	dynamic $dritea
@@ -280,23 +246,20 @@ if $ARGS[0] = 'kitchen_meal_1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_meal.jpg"></center>'
 	'You grab a plate of food and join Lariska at the table. The two of you chat about random things as you eat. When you''re done you place the dishes in the sink.'
 	gs 'npc_relationship', 'modify', 'A13', 'like'
-	minut += 30
-	pcs_health += 25
-	pcs_mood += 25
-	fat += 9
-	if pcs_energy >= 70:
-		pcs_energy += 30
-	else
-		pcs_energy += 80
-	end
-	if pcs_hydra >= 60:
-		pcs_hydra += 40
+	frost = 0
+	minut += 20
+	pcs_health += 10
+	fat += 8
+	pcs_energy += 60
+	if pcs_hydra >= 100:
+		pcs_hydra += 30
 	else
-		pcs_hydra += 80
+		pcs_hydra += 60
 	end
 	cumspclnt = 2
 	gs 'cum_cleanup'
 	pcs_breath = 0
+	pcs_mood += 25
 	gs 'stat'
 	act 'Finish eating':gt 'LariskaHome', 'kitchen'
 end

+ 18 - 39
locations/city_apt_building.qsrc

@@ -135,7 +135,7 @@ if $ARGS[0] = 'roof':
 	$menu_arg = 'roof'
 	killvar '$locclass'
 	menu_off = 0
-	minut +=1
+	minut += 1
 	gs 'stat'
 	'<center>Roof</center>'
 	if month >= 11 or month <= 3:
@@ -238,12 +238,12 @@ end
 if $ARGS[0] = 'lift':
 	menu_off = 1
 	*clr & cla
-	minut +=1
+	minut += 1
 	gs 'stat'
 	res_lift_ev = RAND(0,150)
 	if res_lift_ev <=5:
 		*clr & cla
-		minut +=1
+		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator1.jpg"></center>'
 		'When the elevator door opens, you are surprised to see a middle-aged naked woman handcuffed to the lift railing. She looks at you in panic, but you''re too baffled to do anything until she says "Can you please push floor three?"'
@@ -251,21 +251,21 @@ if $ARGS[0] = 'lift':
 		act 'Leave': gt 'city_apt_building',$ARGS[1]
 	elseif res_lift_ev <=10:
 		*clr & cla
-		minut +=1
+		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator2.jpg"></center>'
 		'When the elevator door opens, you see a woman dressed in lingerie standing inside, her tits hanging out of her bra with her coat pulled back to show off her body! At first her eyes are closed, but when she opens them, she looks at you in panic and begins frantically pressing all of the elevator buttons. You''re too baffled to do anything until it''s too late. The door is already closed again, and the elevator is moving away from you.'
 		act 'Leave': gt 'city_apt_building',$ARGS[1]
 	elseif res_lift_ev <=15:
 		*clr & cla
-		minut +=1
+		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator3_'+rand(1,2)+'.jpg"></center>'
 		'When the elevator door opens, you see a naked woman standing in it. She looks at you in panic and begins frantically pressing all of the elevator buttons. You''re too baffled to do anything until it''s too late. The door is already closed again, and the elevator is moving away from you.'
 		act 'Leave': gt 'city_apt_building',$ARGS[1]
 	elseif res_lift_ev <=20:
 		*clr & cla
-		minut +=1
+		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator4_'+rand(1,2)+'.jpg"></center>'
 		'When the elevator door opens, you see a young man standing it with his limp dick hanging out! He has a huge smile on his face.'
@@ -283,14 +283,14 @@ if $ARGS[0] = 'lift':
 		act 'Leave': gt 'city_apt_building',$ARGS[1]
 	elseif res_lift_ev <=25:
 		*clr & cla
-		minut +=1
+		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator5.jpg"></center>'
 		'When the elevator door opens, you see a woman standing in it. She looks at you and smiles, then pulls her top down to expose her tits, followed by pulling up her skirt and showing off her neatly trimmed pussy. She then reaches across and pushes one of the buttons. You''re too baffled to do anything until it''s too late. The door is already closed again, and the elevator is moving away from you.'
 		act 'Leave': gt 'city_apt_building',$ARGS[1]
 	elseif res_lift_ev <=30:
 		*clr & cla
-		minut +=1
+		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator6.jpg"></center>'
 		'When the elevator door opens, you see the couple from your floor inside. You''ve seen them around the building before. They are partially undressed and making out, seemingly looking like they''re about to have sex.'
@@ -304,7 +304,7 @@ if $ARGS[0] = 'lift':
 		act 'Leave': gt 'city_apt_building',$ARGS[1]
 	elseif res_lift_ev <=35:
 		*clr & cla
-		minut +=1
+		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator7.jpg"></center>'
 		'When the elevator door opens, you see two naked women standing in it. They look at you and then each other before laughing as one of them quickly reaches across and pushes one of the buttons. You''re too baffled to do anything until it''s too late. The door is already closed again, and the elevator is moving away from you.'
@@ -323,7 +323,7 @@ end
 
 if $ARGS[0] = 'elev_objava':
 		*clr & cla
-		minut +=1
+		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/elevator_ob'+rand(1,2)+'.jpg"></center>'
 	act 'Continue': gt 'city_apt_building','lift'
@@ -331,7 +331,7 @@ end
 
 if $ARGS[0] = 'pod_objava':
 		*clr & cla
-		minut +=1
+		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/pod_ob'+rand(1,2)+'.jpg"></center>'
 	act 'Continue': gt 'city_apt_building','floor_1'
@@ -351,7 +351,7 @@ if $ARGS[0] = 'floor1_events':
 	'A large group of gopnik boys are blocking the stairs up to the first floor. You''ve seen several of them in the building and most of the rest around the neighborhood. You don''t think most of them live here. You know gopniks can be dangerous, especially in large groups. You could try and walk past them, or just leave.'
 	act 'Leave': 
 		if $ARGS[1] = 'from_second_floor':
-			minut +=1 
+			minut += 1 
 			gt 'city_apt_building','floor_2'
 		elseif $ARGS[1] = 'from_lift':
 			*clr & cla
@@ -377,12 +377,12 @@ if $ARGS[0] = 'floor1_events':
 			'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them make comments, soon followed by them groping you. "Hey sweetheart, have a seat and drink with us.", "Damn girl you look fine, take a seat and take a load off, maybe help us get a load off!" which gets several of them to laugh. "Don''t be shy beautiful, we won''t bite, unless you ask us nicely." Several even ruder comments are said, followed by them laughing even more.'
 			*nl
 			'Several of them paw at your legs, or squeeze your ass. A few reach up and grab your breasts and squeeze, one even rubs your crotch. You do your best to fend off the groping hands but there are just too many of them. You feel yourself starting to panic, thinking they might not stop at just groping. Thankfully, when you finally get past them, they stay seated.'
-			gs 'arousal', 'forplay', 3, 'humiliation'
+			gs 'arousal', 'foreplay', 3, 'humiliation'
 			gs 'arousal', 'end'
 			gs 'stat'
 		else
 			minut += 2
-			pcs_mood -15
+			pcs_mood -= 15
 			gs 'stat'
 			'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them give you dirty looks and others make comments. "Watch where you''re stepping you fat cow.", "Anyone else smell rotten fish?" and other such comments. At one point you think one of them might do something, but you make it past them unharmed. However, you are a little upset at the comments made towards you.'
 		end
@@ -413,7 +413,6 @@ if $ARGS[0] = 'floor2_events':
 	elseif floor2 = 6:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor2_flash.jpg"></center>'
 		'A young woman stops on the stairs to the third floor in front of a young man. She pulls down her yoga pants, bending forward slightly, with her legs spread a bit. She gives the young man a nice view of her naked ass and pussy, and he stops dead in his tracks when confronted with the view. The girl then giggles, pulls up her pants and runs up the stairs. The young man takes off after her, gaining on her quickly. They soon disappear on the next floor up and shortly afterwards you hear her squealing in delight.'
 		gs 'arousal', 'erotic_nudity', 3
@@ -438,7 +437,6 @@ if $ARGS[0] = 'floor2_events':
 	elseif floor2 = 12:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor2_naked.jpg"></center>'
 		'You see a woman walking down the hall to the stairwell landing, completely naked. When she sees you, she smiles. "Hello!" she says, as if everything was normal. You greet her in return and try not to stare. She walks right past you and down the hallway of the other wing of the building, entering one of the apartments down there.'
 		gs 'arousal', 'erotic_nudity', 3
@@ -448,7 +446,6 @@ if $ARGS[0] = 'floor2_events':
 	elseif floor2 = 13:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor2_nudedoor.jpg"></center>'
 		'You see a woman standing outside, next to an apartment door. You are quite distracted as she is naked from the waist up, having been in the process of pulling her dress down while a man watched. When she sees you, she panics and quickly pulls her dress back up before running into the apartment. The young man laughs, looks at you and winks before following her inside.'
 		gs 'arousal', 'erotic_nudity', 3
@@ -458,7 +455,6 @@ if $ARGS[0] = 'floor2_events':
 	elseif floor2 = 14:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor2_up.jpg"></center>'
 		'As you get to the stairwell landing, you see a woman walking up to the third floor. You can''t help but notice her skirt is very short and she is not wearing any panties. As she nears the top of the stairs you get a clear view of her pussy. You are unsure if she is aware that she has herself on display or not, she acts like she isn''t aware but she might just enjoy it. Either way, a moment later she is on the next floor and out of sight.'
 		gs 'arousal', 'erotic_nudity', 3
@@ -468,7 +464,6 @@ if $ARGS[0] = 'floor2_events':
 	elseif floor2 = 15:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor2_bj.jpg"></center>'
 		'Sitting on the stairs is a naked man and a woman dressed in see through lingerie. She is squatting in front of him with her legs spread, showing off her pussy while she sucks his dick. He looks at you as you approach and gives you a huge smile. He backs up against the wall as best as he can and pulls her over a bit, giving you just enough room to squeeze past them. She never does stop giving him a blowjob, even as you brush past her.'
 		gs 'arousal', 'erotic_sex', 3
@@ -502,7 +497,7 @@ if $ARGS[0] = 'floor3_events':
 		act 'Help her': 
 			*clr & cla
 			minut += 5
-			pcs_mood +10
+			pcs_mood += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_drunk.jpg"></center>'
 			'You stop to check on her. She seems fine, but you can smell the alcohol on her before you even get to close to her. You shake her and she doesn''t wake up. You squat down next to her, grabbing both of her shoulders, and shake her really hard. It takes a few minutes of shaking but she finally wakes up, her breath having a near overwhelming smell of alcohol on it. She mutters something about five more minutes, but you finally manage to get her up and on her feet. You find out she lives on the next floor up and help her upstairs to her apartment. She tries to use her keys to open the door, but fails and drops them.'
@@ -512,7 +507,6 @@ if $ARGS[0] = 'floor3_events':
 	elseif floor3 = 5:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_flash.jpg"></center>'
 		'An older woman stops on the stairs to the fourth floor for a moment, in front of an older man. She pulls her skirt up, briefly exposing her pussy to him before she drops her skirt back in place and he walks up the few steps to her and gives her a kiss. After they kiss a bit, they walk down the stairs hand-in-hand.'
 		gs 'arousal', 'erotic_nudity', 3
@@ -535,7 +529,7 @@ if $ARGS[0] = 'floor3_events':
 		'In the stairwell between the floors is a large group of gopnik boys. You have seen several of them in the building, and most of the rest around the neighborhood. You don''t think most of them live here. You know gopniks can be dangerous especially in large groups. You could try and walk past them, or just leave.'
 		act 'Leave': 
 			if $ARGS[1]= 'from_second_floor':
-				minut +=1 
+				minut += 1 
 				gt 'city_apt_building','floor_2'
 			elseif $ARGS[1] = 'from_lift':
 				*clr & cla
@@ -566,7 +560,7 @@ if $ARGS[0] = 'floor3_events':
 				gs 'stat'
 			else
 				minut += 2
-				pcs_mood -15
+				pcs_mood -= 15
 				gs 'stat'
 				'You decide to push on and go past them. As you carefully step around them, you can''t help but brush up against them. Several of them give you dirty looks and others make comments. "Watch where you''re stepping you fat cow.", "Anyone else smell rotten fish?" and other such comments. You think one of them might do something, but you make it past them unharmed. However, you are a little upset at the comments directed towards you.'
 			end
@@ -577,7 +571,6 @@ if $ARGS[0] = 'floor3_events':
 	elseif floor3 = 12:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_naked.jpg"></center>'
 		'You see a woman walking down the stairs, completely naked. When she sees you she smiles. "Hello!" she says as if everything was normal. You greet her in return and try not to stare. She walks right past you and down one of the hallways, entering one of the apartments down there.'
 		gs 'arousal', 'erotic_nudity', 3
@@ -587,7 +580,6 @@ if $ARGS[0] = 'floor3_events':
 	elseif floor3 = 13:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_nudedoor.jpg"></center>'
 		if meet_nudedoor_woman3 = 0:
 			meet_nudedoor_woman3 = 1
@@ -606,7 +598,6 @@ if $ARGS[0] = 'floor3_events':
 	elseif floor3 = 14:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_up.jpg"></center>'
 		'As you get to the stairwell landing, you see a woman walking up to the fourth floor with a man following her. As she nears the top of the stairs, she lifts her skirt and shows off her naked ass. The guy laughs and then lunges for her, but she giggles and takes off up the stairs. A moment later they disappear, shortly followed by the sound of a door opening and closing.'
 		gs 'arousal', 'erotic_nudity', 3
@@ -672,7 +663,7 @@ if $ARGS[0] = 'floor4_events':
 		act 'Help her': 
 			*clr & cla
 			minut += 5
-			pcs_mood +10
+			pcs_mood += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor4_drunk.jpg"></center>'
 			'You stop to check on her. She seems fine, but you can smell the alcohol on her before you even get close to her. You shake her and she doesn''t wake up. You squat down next to her, grabbing both her shoulders, and shake her really hard. It takes a few minutes of shaking but she finally wakes up, her breath having a near overwhelming smell of alcohol on it. She mutters something about five more minutes, but you finally manage to get her up and on her feet. You find out she lives on this floor and you help her to her apartment. She tries to use her keys to open the door, but fails and drops them.'
@@ -682,7 +673,6 @@ if $ARGS[0] = 'floor4_events':
 	elseif floor4 = 6:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor4_flash.jpg"></center>'
 		'A middle-aged woman stops on the stairs to the fifth floor for a moment, in front of a man around her age. She pulls her skirt up, exposing her pussy to the man. She drops the skirt back in place and he walks up the few steps to her and gives her a kiss. After they kiss a bit, they walk down the stairs hand-in-hand.'
 		gs 'arousal', 'erotic_nudity', 3
@@ -708,7 +698,6 @@ if $ARGS[0] = 'floor4_events':
 	elseif floor4 = 13:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor4_naked.jpg"></center>'
 		'In the stairwell between the floors you see a girl, about your age, leaning against the wall. She is completely naked and smoking a cigarette. When she sees you, she smiles. "Hello!" she says, as if everything was normal. You greet her in return and try not to stare. She continues to smoke as you walk by her.'
 		gs 'arousal', 'erotic_nudity', 3
@@ -726,7 +715,6 @@ if $ARGS[0] = 'floor4_events':
 	elseif floor4 = 17:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor4_up.jpg"></center>'
 		'As you get to the stairwell landing you see a man looking up the stairs at a middle aged-woman. She is wearing a robe that is hanging wide open. She is completely naked, her breasts and trimmed pussy on full display. They both look at you and smile before the guy pulls out his phone and starts taking pictures. After that they both ignore you as you go on your way.'
 		gs 'arousal', 'erotic_nudity', 3
@@ -736,7 +724,6 @@ if $ARGS[0] = 'floor4_events':
 	elseif floor4 = 18:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor4_bdsm.jpg"></center>'
 		'On the landing, bent over the railing, is a woman. She is wearing black baby doll lingerie, stockings and black high heels, as well as ankle and wrist cuffs. The ankle cuffs are attached to the railing in a way that forces her legs apart. Her hands are attached on the other side of the railing together. She blushes when she sees you, but you also notice that she smiles as she looks away from you. You get the feeling she is enjoying the humiliation of being found like this.'
 		*nl
@@ -748,7 +735,6 @@ if $ARGS[0] = 'floor4_events':
 	elseif floor4 = 19:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor4_bottle.jpg"></center>'
 		'As you make your way to the stairs you notice a few gopnik boys, who seem focused on someone else as they are giving them encouragement to keep going. As you get close enough, you see a young woman naked from the waist down fucking her ass with a bottle. When she sees you, she blushes and quickly jumps up and runs down one of the hallways. She is quickly followed by the boys, one of whom pauses long enough to give you a dirty look for ruining their fun.'
 		gs 'arousal', 'erotic_sex', 3
@@ -758,7 +744,6 @@ if $ARGS[0] = 'floor4_events':
 	elseif floor4 = 20:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor4_bj.jpg"></center>'
 		'A young man stands on the stairs in the stairwell with his pants pulled down just enough for his cock to be free. A girl, about his age, is bent over and sucking his dick for all it is worth. As you move past them, he grins at you and grabs hold of the back of her head with his hands and starts face fucking the girl. He begins forcing his dick balls deep into her mouth and down her throat, and you can hear her gagging. Just before the sounds of them fade completely you hear him say "Fuck yeah, swallow it bitch!"'
 		gs 'arousal', 'erotic_sex', 3
@@ -768,7 +753,6 @@ if $ARGS[0] = 'floor4_events':
 	elseif floor4 = 21:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor4_fuck.jpg"></center>'
 		'As you approach the stairs, you hear moaning and grunting, the obvious sounds of people having sex. A man and woman, by the sounds of the moans. As you get to the landing you see, down one of the halls, a light-skinned black girl, about your age. Her pants are pulled down to her knees as she leans forward with her hands on the wall, her ass sticking out. A slightly older man is fucking her from behind. She looks in your direction, but you''re not sure if she noticed you or not. She looks, and sounds, like she is really enjoying herself. You decide to move on and leave them to it.'
 		gs 'arousal', 'erotic_sex', 3
@@ -828,7 +812,6 @@ if $ARGS[0] = 'floor5_events':
 	elseif floor5 = 6:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor5_flash.jpg"></center>'
 		'A middle-aged woman at the top of the stairs is looking down at a man near the landing of the stairs below. She pulls up her top to expose her tits to him and they both laugh before she hurries down the stairs to catch up to him. They exchange a quick kiss and then walk down the stairs hand-in-hand.'
 		gs 'arousal', 'erotic_nudity', 3
@@ -853,7 +836,6 @@ if $ARGS[0] = 'floor5_events':
 	elseif floor5 = 13:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor5_naked.jpg"></center>'
 		'You see a woman walking down the stairs to the fourth floor, completely naked. She seems to be in no hurry and doesn''t turn to look in your direction. You shake your head slightly and continue on your way.'
 		gs 'arousal', 'erotic_nudity', 3
@@ -863,7 +845,6 @@ if $ARGS[0] = 'floor5_events':
 	elseif floor5 = 14:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor5_bdsm.jpg"></center>'
 		'In the hallway are two young woman. One is blonde and she is wearing boots and a skirt, while naked from the waist up. The other, a brunette, is completely naked with her hands are tied behind her back. As you watch the blonde puts a large collar around the other one''s neck, and then attaches a leash to it. With the leash in place, she steps back, unbinds the brunette''s hands, and slaps her on the ass. She drops to the floor on all-fours and the blonde starts walking, holding onto the leash as the brunette follows behind like a dog. The blonde smiles at you and waves and you exchange hellos with her. The brunette never says a word as they move past you. After taking a moment to reflect on what you just seen, you continue on your way.'
 		gs 'arousal', 'erotic_sex', 3
@@ -880,7 +861,6 @@ if $ARGS[0] = 'floor5_events':
 	elseif floor5 = 17:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor5_bj.jpg"></center>'
 		'A man stands on the stairs in the stairwell completely naked with his back to the wall. A woman, about his age, stands on the stairs a couple of steps down, also completely naked. She is bent forward sucking his dick for all it is worth. As you go past them, he grins at you and takes hold of the back of her head with his hands and starts face fucking the girl. He begins forcing his dick balls-deep into her mouth and down her throat, you can hear her gagging as he does so. Just before the sounds of them fades completely you hear him shout "Oh my god, that was amazing!"'
 		gs 'arousal', 'erotic_sex', 3
@@ -890,7 +870,6 @@ if $ARGS[0] = 'floor5_events':
 	elseif floor5 = 18:
 		*clr & cla
 		menu_off = 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor5_fuck.jpg"></center>'
 		'As you approach the stairs, you hear moaning and grunting, the obvious sounds of people having sex. A man and woman by the sounds of the moans. As you get to the stairs, you see a woman on her back in the stairwell, but you can''t really make her out - other than her bare legs spread wide. A topless man with his pants pulled down is between her legs, thrusting. As you get closer, the man sees you and gives you a huge grin and a thumbs up. He doesn''t stop thrusting into the woman underneath him as he does. Feeling a little awkward, you continue on your way.'
 		gs 'arousal', 'erotic_sex', 3

+ 12 - 15
locations/city_mansion_residence_1.qsrc

@@ -166,14 +166,6 @@ if $ARGS[0] = 'ykitchen':
 
 	if ymanrem[6] = 2:
 		'A well stocked kitchen containing all the necessities to make whatever meal you please.'
-		if dirttarelka > 0 and fairy >= dirttarelka:
-			cltarelka += dirttarelka
-			fairy -= dirttarelka
-			dirttarelka = 0
-			'You wash the dirty dishes in the dishwasher.'
-		elseif fairy < dirttarelka:
-			'You can''t use the dishwasher. You have no detergent.'
-		end
 
 		if cltarelka > 0:
 			'You have <b><<cltarelka>></b> clean plates left.'
@@ -191,7 +183,7 @@ if $ARGS[0] = 'ykitchen':
 
 		if eda > 0:
 			if cltarelka = 0 or edahot > 0:$edagot = ''
-			if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook a meal (0:30)</a>'
+			if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook a meal</a>'
 
 			'There''s enough food for <b><<eda>></b> ' + iif(eda = 1, 'serving', 'servings') + '. <<$edagot>>'
 		elseif edaD = 0 and eda = 0:
@@ -200,22 +192,27 @@ if $ARGS[0] = 'ykitchen':
 
 		if edahot > 0:'<a href="exec:dynamic $edahotd">There''s a warm meal on the table.</a>'
 
+		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 husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
-			act 'Cook a meal for your husband, 2 servings (1:00)':
-				*clr & cla
+			act 'Cook a meal for your husband and yourself (1:00)':
+				cla
+				*clr
 				husband += 5
 				eda -= 2
 				minut += 60
 				huseatday = daystart
+				pcs_mood -= 25
 				'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
-				'You make some delicious food for you and your husband.'
+				'You prepare a meal for your husband and yourself.'
 
-				act 'Put the food on the table': gt 'city_mansion_residence_1', 'ykitchen'
+				act 'Leave the meal':gt 'kuhr'
 			end
 		end
 
-		act 'Have a snack (0:15)':gs 'food', 'snack'
-
+		dynamic $edasnack
 		dynamic $sandwich
 		dynamic $driwater
 		dynamic $dritea

+ 25 - 12
locations/dachain.qsrc

@@ -194,6 +194,7 @@ if $args[0] = 'dachakit':
 	menu_off = 0
 	$locclass = 'kitr'
 	*clr & cla
+	gs 'kit_din'
 	gs 'stat'
 	'<center><b><font color="maroon">Cottage Kitchen</font></b></center>'
 	if home_owned[3] = 2:
@@ -201,6 +202,9 @@ if $args[0] = 'dachakit':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/suburban/cottage/dachakit1.jpg"></center>'
 	end
+	
+	act 'Go into the main room': gt 'dachain', ''
+
 	if cltarelka > 0:
 		'<b><<cltarelka>></b> clean plates are stored in the cupboard.'
 	else
@@ -217,27 +221,36 @@ if $args[0] = 'dachakit':
 
 	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)</a>'
-		'In the refrigerator there''s food, enough for <b><<eda>></b> servings. <<$edagot>>'
-	end
+		if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook a meal</a>'
 
-	if edaD = 0 and eda = 0:'<b><font color="red">The refrigerator is empty, you have nothing to eat.</font></b>'
+		'There''s enough food for <b><<eda>></b> ' + iif(eda = 1, 'serving', 'servings') + '. <<$edagot>>'
+	elseif edaD = 0 and eda = 0:
+		'<b><font color="red">The fridge is empty. You have nothing to eat.</font></b>'
+	end
+	
+	if edahot > 0:'<a href="exec:dynamic $edahotd">There''s a warm meal on the table.</a>'
 
 	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.'
+	if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
+		act 'Cook a meal for your husband and yourself (1:00)':
+			cla
+			*clr
+			husband += 5
+			eda -= 2
+			minut += 60
+			huseatday = daystart
+			pcs_mood -= 25
+			'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
+			'You prepare a meal for your husband and yourself.'
+
+			act 'Leave the meal':gt 'kuhr'
 		end
 	end
 
-	act 'Go into the main room': gt 'dachain', ''
-	if edahot > 0: act 'A cooked meal is on the table (0:30).': dynamic $edahotd
-	act 'Have a snack (0:15)':gs 'food', 'snack'
+	dynamic $edasnack
 	dynamic $sandwich
 	dynamic $driwater
 	dynamic $dritea

+ 2 - 3
locations/food.qsrc

@@ -604,7 +604,7 @@ end
 if $ARGS[0] = 'm_meal':
 	*clr & cla
 	frost = 0
-	minut += 20
+	minut += 15
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
 	fat += 8
@@ -634,7 +634,7 @@ end
 if $ARGS[0] = 'l_meal':
 	*clr & cla
 	frost = 0
-	minut += 35
+	minut += 20
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
 	fat += 14
@@ -652,7 +652,6 @@ if $ARGS[0] = 'l_meal':
 	'You are almost overwhelmed by the delicious meal laid before you and enjoy it immensely. The meal was simply colossal and<<$mtxt>>'
 	gs 'stat'
 	killvar '$_eat'
-	if plcooked = 1: killvar 'plcooked'
 
 	if food_loc = 1:
 		act 'Finish': gt 'food_menu'

+ 29 - 10
locations/kit_din.qsrc

@@ -377,15 +377,24 @@ $edagotd = {
 	'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
 	'What kind of meal would you like to make?'
 
-	act 'Prepare a light meal (0:30)': $edameal = 's_meal' & dynamic $edagotpk
-	act 'Prepare a normal meal (0:30)': $edameal = 'm_meal' & dynamic $edagotpk
-	act 'Prepare a hearty meal (0:30)': $edameal = 'l_meal' & plcooked = 1 & dynamic $edagotpk
+	act 'Prepare a light meal (0:20)': $edameal = 's_meal' & dynamic $edagotpk
+	act 'Prepare a normal meal (0:25)': $edameal = 'm_meal' & dynamic $edagotpk
+	act 'Prepare a hearty meal (0:30)': $edameal = 'l_meal' & dynamic $edagotpk
 	act 'Nevermind':gt $loc, $loc_arg
 }
 
 $edagotpk = {
 	*clr & cla
-	minut += 30
+	if $edameal = 'l_meal':
+		minut += 30
+	elseif $edameal = 'm_meal':
+		minut += 25
+	elseif $edameal = 's_meal':
+		minut += 20
+	else
+		$edameal = 'm_meal'
+		minut += 25
+	end
 	edahot += 1
 	eda -= 1
 	kuhdrova = 0
@@ -396,7 +405,13 @@ $edagotpk = {
 	'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
 	'You prepare the meal.'
 
-	act 'Eat cooked food (0:30)':dynamic $edahotd
+	if $edameal = 'l_meal':
+		act 'Eat cooked food (0:20)':dynamic $edahotd
+	elseif $edameal = 'm_meal':
+		act 'Eat cooked food (0:15)':dynamic $edahotd
+	else
+		act 'Eat cooked food (0:10)':dynamic $edahotd
+	end
 	act 'Leave the meal':gt $loc, $loc_arg
 }
 
@@ -434,7 +449,11 @@ $edasnack = {
 
 $pranik = {
 	if pranik > 0:
-		'You have <<pranik>> tea biscuits.'
+		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
 		act 'Have tea with biscuits (0:05)':
 			*clr & cla
 			menu_off = 1
@@ -455,7 +474,7 @@ $pranik = {
 			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!'
+			'You drank some tea and enjoyed your 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, $loc_arg
 		end
@@ -469,11 +488,11 @@ $dritea = {
 $edaD = {
 	if edaD > 0:
 		'The refrigerator contains <b><<edaD>></b> healthy meals.'
-		act 'Eat diet food (0:30)':
+		act 'Eat diet food (0:20)':
 			*clr & cla
 			menu_off = 1
 			frost = 0
-			minut += 30
+			minut += 20
 			pcs_health += 10
 			pcs_mood += 20
 			edaD -= 1
@@ -559,7 +578,7 @@ $lekarstvo = {
 				else
 					pcs_hydra += 50
 				end
-				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/lekr<<picrand>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/lekr<<rand(1,3)>>.jpg"></center>'
 				'You took a pill'
 				gs 'stat'
 

+ 6 - 10
locations/kuhr.qsrc

@@ -41,10 +41,6 @@ if rand(0, 50) = 50 and santehnikDolg = 0 and remkuhr = 0 and daystart > kranslo
 	gt 'kuhr'
 end
 
-if posudomashina > 0:
-	dynamic $posudomashina
-end
-
 if cltarelka > 0:
 	'<b><<cltarelka>></b> clean plates are stored in the cupboard.'
 else
@@ -61,21 +57,21 @@ end
 
 if eda > 0:
 	if cltarelka = 0 or edahot > 0:$edagot = ''
-	if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook meal</a>'
+	if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook a meal</a>'
 
-	'There''s enough food in the fridge for <b><<eda>></b> servings. <<$edagot>>'
+	'There''s enough food for <b><<eda>></b> ' + iif(eda = 1, 'serving', 'servings') + '. <<$edagot>>'
+elseif edaD = 0 and eda = 0:
+	'<b><font color="red">The fridge is empty. You have nothing to eat.</font></b>'
 end
 
-if edaD = 0 and eda = 0:'<b><font color="red">The refrigerator is empty. You have nothing to eat.</font></b>'
-if posudomashina > 0:'The kitchen has a dishwasher.'
-if edahot > 0:'<a href="exec:dynamic $edahotd">A cooked meal is on the table.</a>'
+if edahot > 0:'<a href="exec:dynamic $edahotd">There''s a warm meal on the table.</a>'
 
 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 husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
-	act 'Cook a meal for your husband and yourself':
+	act 'Cook a meal for your husband and yourself (1:00)':
 		cla
 		*clr
 		husband += 5

+ 7 - 13
locations/kuhr2x.qsrc

@@ -40,10 +40,6 @@ if rand(0, 50) = 50 and santehnikDolg = 0 and daystart > kransloman[1] + 90:
 	gt'kuhr2x'
 end
 
-if posudomashina > 0:
-	dynamic $posudomashina
-end
-
 if cltarelka > 0:
 	'<b><<cltarelka>></b> clean plates are stored in the cupboard.'
 else
@@ -60,23 +56,21 @@ end
 
 if eda > 0:
 	if cltarelka = 0 or edahot > 0:$edagot = ''
-	if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook meal</a>'
+	if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook a meal</a>'
 
-	'There''s enough food in the fridge for <b><<eda>></b> servings. <<$edagot>>'
+	'There''s enough food for <b><<eda>></b> ' + iif(eda = 1, 'serving', 'servings') + '. <<$edagot>>'
+elseif edaD = 0 and eda = 0:
+	'<b><font color="red">The fridge is empty. You have nothing to eat.</font></b>'
 end
 
-if edaD = 0 and eda = 0:'<b><font color="red">The refrigerator is empty. You have nothing to eat.</font></b>'
-if posudomashina > 0:'The kitchen has a dishwasher.'
-if edahot > 0:'<a href="exec:dynamic $edahotd">A cooked meal is on the table.</a>'
+if edahot > 0:'<a href="exec:dynamic $edahotd">There''s a warm meal on the table.</a>'
 
 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 hour = 7 or hour = 17:'<a href="exec:gt ''husb'', ''start''">Your husband is eating at the table.</a>'
 end
 
 if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
-	act 'Cook meal for your husband and yourself':
+	act 'Cook meal for your husband and yourself (1:00)':
 		cla
 		*clr
 		husband += 5

+ 3 - 2
locations/kuhrPar.qsrc

@@ -183,11 +183,12 @@ else
 			act 'Get up from the table': gt $loc, $loc_arg
 		end
 	end
-	act 'Eat a full meal (0:20)':gs 'food', 'm_meal'
+	act 'Eat a hearty meal (0:20)':gs 'food', 'l_meal'
+	act 'Eat a normal meal (0:15)':gs 'food', 'm_meal'
 	act 'Eat a light meal (0:10)':gs 'food', 's_meal'
-	act 'Have a snack (0:05)':gs 'food', 'snack'
 end
 
+dynamic $edasnack
 dynamic $sandwich
 dynamic $driwater
 dynamic $dritea

+ 5 - 7
locations/mey_home.qsrc

@@ -165,25 +165,23 @@ if $ARGS[0] = '1':
 		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'
+	act 'Eat a hearty meal (0:20)':gs 'food', 'l_meal'
+	act 'Eat a normal meal (0:15)':gs 'food', 'm_meal'
+	act 'Eat a light meal (0:10)':gs 'food', 's_meal'
 
+	dynamic $edasnack
+	dynamic $sandwich
 	dynamic $driwater
 	dynamic $dritea
 	dynamic $fill_bottle
 	dynamic $edaD
 	dynamic $pranik
 	dynamic $fatdel
-	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin
 
 	gs 'events', 'read'
 
-	!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 end
 
 if $ARGS[0] = '2':

+ 4 - 3
locations/nichKitchen.qsrc

@@ -53,13 +53,14 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 		gs 'nichChore','inspect','kitchen'
 	end
 
-	act 'Eat a meal (0:30)': dynamic $edahotd
+	'<a href="exec:dynamic $edahotd">There''s a warm meal on the table.</a>'
+	
 	dynamic $edasnack
+	dynamic $sandwich
 	dynamic $driwater
-	dynamic $fill_bottle
 	dynamic $dritea
+	dynamic $fill_bottle
 	dynamic $edaD
-	dynamic $sandwich
 	dynamic $pranik
 	dynamic $fatdel
 	dynamic $lekarstvo

+ 7 - 12
locations/uni_dorm.qsrc

@@ -448,25 +448,20 @@ if $args[0] = 'dorm_kitchen':
 		gs 'uni_dorm', 'food'
 	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 $edaD
-	dynamic $fatdel
+	dynamic $edasnack
+	dynamic $sandwich
 	dynamic $driwater
+	dynamic $dritea
 	dynamic $fill_bottle
+	dynamic $edaD
+	dynamic $pranik
+	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin
 end
 
 if $args[0] = 'food':
-	act 'Eat cooked food':
+	act 'Eat cooked food (0:20)':
 		edahot = 0
 		gt 'food', 'm_meal'
 	end

+ 1 - 2
locations/uni_grounds.qsrc

@@ -82,7 +82,6 @@ if $ARGS[0] = 'main':
 	if university['semester_week'] > 0: gs 'uni_lessons', 'schedule'
 	if university['exam_week'] > 0: gs 'uni_lessons', 'exam_schedule'
 
-	!! I don''t think this should be locked if not attending UNI like it used to be, just Svetas room should be locked in dorm file, so she can visit friends if not enrolled
 	act 'Got to the dorms':
 		minut += 5
 		gt 'uni_dorm', 'start'
@@ -92,7 +91,7 @@ if $ARGS[0] = 'main':
 	!!	gt '', ''
 	!!end
 	if (week < 6 and hour > 7) or (hour > 8 and hour < 23):
-		act 'Got to the Library':
+		act 'Go to the Library':
 			minut += 2
 			gt 'uni_library', 'start'
 		end