Merge remote-tracking branch 'Creamel/master'

locations/artemhome.qsrc

@@ -81,10 +81,8 @@ if $ARGS[0] = 'home':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptdoor.jpg"></center>'
 	if hour >= 22:
 		'It would be rude to even ring the doorbell at this time. Artem is probably asleep, so you decide against it and lower your hand.'
-		act 'Move away from the door':gt'pod_ezd','etaj_1'
 	elseif hour < 8:
 		'It would be rude to even ring the doorbell at this time. Artem is probably asleep, so you decide against it and lower your hand.'
-		act 'Move away from the door':gt'pod_ezd','etaj_1'
 	else
 		menu_off = 1
 		gs 'stat'
@@ -119,13 +117,15 @@ if $ARGS[0] = 'home':
 					if artemQW['artlie'] = 2 or artemQW['artembrokenheart'] = 1 or artemQW['artemblok'] = 1:
 						'When she hears your name, her demeanor changes swiftly. "Oh, it''s you," she frowns. "I don''t know what you did to my sweet Artem, but he says he never wants to see you again, so please leave."' 
 						'She closes the door in your face without another word.'
-						act 'Leave': gt 'pod_ezd','etaj_1'
 					else
 						'She keeps up her smile. "Is he going to tutor you, dear?"'
 						'You smile. "Something like that. Is he here?"'
-						'Her face tightens ever so slightly. "Yes, he''s in his room." She turns to face down the hall. "Artem dear, <<$pcs_nickname>> from your school is here." She then turns back to you. "Go on in. He''s in his room."'
-						act 'Leave': gt 'pod_ezd','etaj_1'
-						act 'Enter': ArtemLoc = 2 & gt 'artemhome','hallway'
+						if ArtemLoc = 0:
+							'Her face tightens ever so slightly. "Well, he isn''t home." You understand it''s time for you to leave'
+						else
+							'Her face tightens ever so slightly. "Yes, he''s in his room." She turns to face down the hall. "Artem dear, <<$pcs_nickname>> from your school is here." She then turns back to you. "Go on in. He''s in his room."'
+							act 'Enter': ArtemLoc = 2 & gt 'artemhome','hallway'
+						end
 					end
 				else
 					if artemQW['artlie'] = 2 or artemQW['artembrokenheart'] = 1 or artemQW['artemblok'] = 1:
@@ -133,39 +133,46 @@ if $ARGS[0] = 'home':
 						'"I''m <<$pcs_nickname>>."'
 						'When she hears your name, her demeanor changes swiftly. "Oh, it''s you," she frowns. I don''t know what you did to my sweet Artem, but he says he never wants to see you again, so please leave."' 
 						'She closes the door in your face without another word.'
-						act 'Leave': gt'pod_ezd','etaj_1'
 					else
 						'She seems pleased. "You must be one of Artem''s little friends. I''m Glinina, Artem''s mother. What''s your name, dear?"'
 						'"<<$pcs_nickname>>, we go to school together.'
-						'"Come in, come in." She turns to face down the hall. "Artem dear, one of your little friends is here." She then turns back to you. "Go on in. He''s in his room."'
-						act 'Leave': gt'pod_ezd','etaj_1'
-						act 'Enter': gt 'artemhome','hallway'
+						if ArtemLoc = 0:
+							'"Well, he isn''t home actually, you can come back later" You understand it''s time for you to leave'
+						else
+							'"Come in, come in." She turns to face down the hall. "Artem dear, one of your little friends is here." She then turns back to you. "Go on in. He''s in his room."'
+							act 'Enter': gt 'artemhome','hallway'
+						end
 					end
 				end
 			else
 				if artemQW['artlie'] =2 or artemQW['artembrokenheart'] = 1 or artemQW['artemblok'] = 1:
 					'You stand outside the Chebotarev household and knock on the door, which is quickly answered by Artem''s mother, who has a friendly smile on her face until she recognizes you and it turns into a frown. "Oh, it''s you. I don''t know what you did to my sweet Artem, but he says he never wants to see you again. I thought you were such a sweet girl, but he says you''re not, so please leave."'
 					'She closes the door in your face without another word.'
-					act 'Leave': gt'pod_ezd','etaj_1'
 				elseif fame['pav_slut'] >= 200 or grupTipe = 4:
 					'You stand outside the Chebotarev household and knock on the door, which is quickly answered by Artem''s mother, who has a friendly smile on her face that falters when she sees you. "Oh. Hello again, <<$pcs_firstname>>. Can I help you?"'
 					'You return her smile. "Yes, I''m here to see Artem."'
-					'She doesn''t seem pleased. "Oh. Well come in then." She turns to face down the hall. "Artem dear, ''that girl'' is here to see you again." You can hear the judgment in her voice before she turns back to you. "Go on back. He''s in his room."'
-					act 'Leave': gt'pod_ezd','etaj_1'
-					act 'Enter': gt 'artemhome','hallway'
+					if ArtemLoc = 0:
+						'She doesn''t seem pleased. "Well, he isn''t home." You understand it''s time for you to leave'
+					else
+						'She doesn''t seem pleased. "Oh. Well come in then." She turns to face down the hall. "Artem dear, ''that girl'' is here to see you again." You can hear the judgment in her voice before she turns back to you. "Go on back. He''s in his room."'
+						act 'Enter': gt 'artemhome','hallway'
+					end
 				else
 					'You stand outside the Chebotarev household and knock on the door, which is quickly answered by Artem''s mother, who has a friendly smile on her face. "Hello again, <<$pcs_nickname>>. Are you here to see Artem?"'
 					'You return her smile. "Yes."'
-					'She seems pleased to see you. "Come in, come in." She turns to face down the hall. "Artem dear, one that nice girl <<$pcs_nickname>> is here to see you." She then turns back to you. "Go on back. He''s in his room."'
-					act 'Leave': gt'pod_ezd','etaj_1'
-					act 'Enter': gt 'artemhome','hallway'
+					if ArtemLoc = 0:
+						'She seems pleased to see you. "Well, he isn''t home, but you''re welcome to come back later." You understand it''s time for you to leave'
+					else
+						'She seems pleased to see you. "Come in, come in." She turns to face down the hall. "Artem dear, one that nice girl <<$pcs_nickname>> is here to see you." She then turns back to you. "Go on back. He''s in his room."'
+						act 'Enter': gt 'artemhome','hallway'
+					end
 				end
 			end
 		else	
 			'You stand in the hallway, but it appears that nobody is home.'
-			act 'Leave': gt'pod_ezd','etaj_1'
 		end
 	end
+	act 'Leave': gt'pod_ezd','etaj_1'
 end
 
 if $ARGS[0] = 'hallway':

locations/olu.qsrc

@@ -725,6 +725,7 @@ if $ARGS[0] = 'nusholusvet':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/anushka/nusholusvet2.jpg"></center>'
 		'He steps away from her, pulling his dick out of her mouth and then in front of you says the same thing. "Open." You open your mouth and he slides his wet dick in your mouth, wet from Anushka''s slobber. You suck on it and take as much of it as you can into your mouth.'
+		gs 'boyStat', 'A55'
 		gs 'arousal', 'bj', 5, 'group'
 		gs 'stat'
 		act 'Ride him cowgirl':
@@ -737,7 +738,7 @@ if $ARGS[0] = 'nusholusvet':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/anushka/nusholusvet4.jpg"></center>'
 				'He smacks her on the ass and says. "Get off." Then he turns and looks at you. "Come." Anushka crawls off him and you crawl on top of him. You lower yourself down and feel his wet dick press against your slit. You feel your lips part and then stretch as the massive dick slides inside of you. You go down as far as you find comfortable, taking as much of him into you as you can and then start riding him. Anushka not wanting to be left out, scoots up to his face and straddles it. He starts licking her pussy as you ride him.'
-				gs 'arousal', 'voyeur_sex', 5, 'group'
+				gs 'arousal', 'vaginal', 5, 'group'
 				gs 'stat'
 				act 'Up your ass':
 					*clr & cla
@@ -746,7 +747,7 @@ if $ARGS[0] = 'nusholusvet':
 					'You both turn around and get on all fours, as you both do. He grabs a bottle of lube out of the nightstand and squirts some lube on your butt and her''s and then uses one hands on each of you. He rubs the lube around, then sticks one finger up your butt and then another working the lube into your butt really well. Once he is done he squirts some lube on his dick and lubes it up really nice.'
 					*nl
 					'He stands on the bed behind you, your feel the massive head of his cock pressing against your asshole, it takes a moment before you feel it pop inside of you. You hiss a bit in pain, he gently starts fucking your butt, as he does he grabs ahold of your hair and Anushka''s hair with his other hand and pulls on it. Not too hard just enough you feel the tugs. He works his way deeper into your ass, you don''t know how far but it feels like it is about to push your stomach up into your throat.'
-					gs 'arousal', 'voyeur_sex', 5, 'group'
+					gs 'arousal', 'anal', 5, 'group'
 					gs 'stat'
 					act 'Anushka''s butt':
 						*clr & cla
@@ -758,7 +759,7 @@ if $ARGS[0] = 'nusholusvet':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/anushka/nusholusvet7.jpg"></center>'
 							'You hear Anushka moan loudly and you feel Olu moving around behind you again. This time his dick slides in your ass much easier, as it is still gapping from the last time. He starts going deeper than before, you start to scoot forward a bit but he places his hands on your hips and holds you in place. He keeps going deeper and deeper until you finally feel his balls slapping against your twat, as he starts fucking your butt balls deep, with his massively long and thick cock.'
-							gs 'arousal', 'voyeur_sex', 5, 'group'
+							gs 'arousal', 'anal', 5, 'group'
 							gs 'stat'
 							act 'Her anal pounding':
 								*clr & cla
@@ -781,7 +782,7 @@ if $ARGS[0] = 'nusholusvet':
 									'She takes you by the hand and starts to pull your towards the door. "Come on lets go."'
 									'A little shocked at the thought of walking out into the apartment stairwell with cum on your face. "But I have cum on my face."'
 									'She pulls on your a little harder and grins back at you. "Exactly, now come on."'
-									gs 'arousal', 'voyeur_sex', 5, 'group'
+									gs 'arousal', 'bj', 5, 'group'
 									gs 'cum_call', 'face', 'A55', 1
 									gs 'cum_call', 'mouth', 'A55', 1
 									gs 'arousal', 'end'

locations/pornstudio.qsrc

@@ -987,6 +987,7 @@ if $ARGS[0] = 'medical':
 		if venera > 0:
 			pfilmNO = 1
 			pfilmNoVenera = 1
+			pornstack = 0
 			killvar 'prodcosttrue'
 			killvar 'pfilmday'
 			killvar 'pornplan'

locations/stwork.qsrc

@@ -91,6 +91,12 @@ if $ARGS[0] = 'start':
 					if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 				end
 				if pcs_makeup < 4:
+					if mc_inventory['cosmetics'] < 3:
+						*nl
+						'Once showered, you realize you don''t have enough makeup to go on stage.'
+						act 'Go back to the dressing room':gt 'stwork', 'start'
+						exit
+					end
 					gs 'exp_gain', 'makupskl', rand(1,3)
 					mc_inventory['cosmetics'] -= 3
 					vidageday -= 1