Browse Source

Merge remote-tracking branch 'hornguy6/master'

KevinSmarts 4 years ago
parent
commit
921d840b9e
3 changed files with 49 additions and 30 deletions
  1. 1 1
      locations/exercise.qsrc
  2. 3 2
      locations/foto.qsrc
  3. 45 27
      locations/foto_models2.qsrc

+ 1 - 1
locations/exercise.qsrc

@@ -385,7 +385,7 @@ if $ARGS[0] = 'yoga':
 	elseif $pantyworntype ! 'none':
 		'<center><video autoplay loop src="images/pc/activities/yoga_underwear.mp4"></video></center>'
 	else
-		'<center><video autoplay loop src="images/pc/activities/yoga_naked.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/pc/activities/yoga_naked.jpg"></center>'
 	end
 
 	'You spend <<$timestring>> minutes stretching and straining your muscles in various poses, improving your will and flexibility.'

+ 3 - 2
locations/foto.qsrc

@@ -175,9 +175,10 @@ if $ARGS[0] = 'studio':
 	end
 
 	anastasia_in = rand(0,1)
-	mari_in = rand(0,1)
+	emily_in = rand(0,1)
 	krystal_in = rand(0,1)
 	jeff_in = rand(0,1)
+	mari_in = rand(0,1)
 
 	'<center><b><font color="maroon">Photography studio</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
@@ -198,7 +199,7 @@ if $ARGS[0] = 'studio':
 			if anastasia_in = 1:'<a href="exec:gt ''foto_models'',''anastasia1''">unknown model</a>'
 		end
 
-		if emily >= 2:
+		if foto_models['emily'] >= 2:
 			if emily_in = 1:'<a href="exec:gt ''foto_models'',''emily_1''">Emily</a>'
 		else
 			if emily_in = 1:'<a href="exec:gt ''foto_models'',''emily_1''">unknown model</a>'

+ 45 - 27
locations/foto_models2.qsrc

@@ -9,9 +9,10 @@ menu_off = 1
 !! ---------------------------------------- Emily Model ---------------------------------------------------------
 
 if $ARGS[0] = 'emily_1':
-	if emily = 2:gt 'foto_models2','emily_2'
-	if emily = 5:gt 'foto_models2','emily_chat'
-	if emily >= 3:gt 'foto_models2','emily_model'
+	if foto_models['emily'] = 2:gt 'foto_models2','emily_2'
+	if foto_models['emily'] = 5:gt 'foto_models2','emily_chat'
+	if foto_models['emily'] >= 3:gt 'foto_models2','emily_model'
+	foto_models['emily'] = 2
 	*clr & cla
 	'<center><img src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'You''re walking through the studio when you hear someone shout from behind you.'
@@ -104,6 +105,7 @@ if $ARGS[0] = 'emily_1':
 end
 
 if $ARGS[0] = 'emily_2':
+	foto_models['emily'] = 3
 	*clr & cla
 	'<center><img src="images/locations/city/citycenter/photo/portraits/emily_r/talking/face.jpg"></center>'
 	if emily_hate = 1:
@@ -161,11 +163,10 @@ if $ARGS[0] = 'emily_2':
 					'<center><img src="images/locations/city/citycenter/photo/portraits/emily_r/talking/3.jpg"></center>'
 					'"Why would I? At least I don''t need mine to distract from an ass ugly face!"'
 					'"<i>Excuuuuuuuse me?!</i>"'
-					'Your words seem to catch her off guard and she steps back as though she''s genuinely offended and hurt. Sensing you have the upper hand, you push your advantage. "Oh yeah! I bet when the boys come by your house they all bring blindfolds! They love using your tits to get off, they just don''t want to see your face while they do it!"'
+					'Your words seem to catch her off guard and she steps back as though she''s genuinely offended and hurt. Sensing you have the upper hand, you push your advantage. "Oh yeah, I bet when the boys come by your house they all bring a paper bag to put over that face of yours. They love using your tits to get off, they just don''t want to see your face while they do it!"'
 					'"H-how dare you!" Emily begins to stammer in fury. "I-! You-!"'
 					'"I don''t have time for this," you interrupt her. "Let me know if any of them manage to cum without a blindfold. I''ll take them to the doctor to get them some glasses!" Her jaw drops as you saunter past feeling good about yourself.' 
 					act'Leave':gt'foto','studio'
-					
 				end
 			
 			elseif tits >= 5:
@@ -175,8 +176,8 @@ if $ARGS[0] = 'emily_2':
 				act'"What''s wrong with having big breasts?"':
 					*clr & cla
 					'<center><img src="images/locations/city/citycenter/photo/portraits/emily_r/talking/2.jpg"></center>'
-					'"What''s wrong with having big breasts?!" you exclaim. "Yours are pretty big too!"'
-					'"True," she says while walking up to you so you''re shoulder to shoulder. "But mine are soft and perky and <i>just</i> the right size. Any bigger and they end up like yours where you have to worry about knocking someone out if you turn too fast." And then paying no more attention to you at all, she strides off while your jaw hits the floor. By the time you recover from this offense, she''s already long gone.'
+					'"What''s wrong with having big breasts?!" you exclaim. "Yours are big too!"'
+					'"True," she says while walking up to you so you''re shoulder to shoulder. "But mine are soft and perky and <i>just</i> the right size. Any bigger and they end up fat and saggy like yours where you have to worry about knocking someone out if you turn too fast." And then paying no more attention to you at all, she strides off while your jaw hits the floor. By the time you recover from this offense, she''s already long gone.'
 					'<i><b>This. Fucking. Bitch!</b></i>'
 					act'Leave':gt'foto','studio'
 				end
@@ -207,30 +208,33 @@ if $ARGS[0] = 'emily_2':
 			'You blink, taken aback. "Excuse me?"'
 			'"I''m asking if you''re just trying to waste my time. Because everywhere, I go, that''s all you ever seem to do: get in my way and waste my fucking time."'
 			'She brushes past you rolling her eyes. You hear her muttering under her breath as she walks away. "Fucking amateurs, why do they even waste time with girls like that here..."'
-			act'Continue':gt'foto','studio'
+			act'Leave':gt'foto','studio'
 		end
 		act'"What''s your problem bitch?"':
 !!			emily_hate += 1
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/emily_r/talking/face.jpg"></center>'
 			'"Okay, what''s your problem bitch?" you snap back at her. "I''ve only spoken to you two times and both times you''ve been nothing but a vicious cunt. What the fuck did I ever do to you?"'
-			'Emily gets in your face, spitting back at you, "My problem with you is that you''re always in my fucking way! You come here, standing around like you''re going to get famous, and wasting everyone else''s time that they should be spending on me!"'
+			'Emily gets in your face and snaps back at you. "My problem with you is that you''re always in my fucking way! You come here, standing around like you''re going to get famous, and wasting everyone else''s time that they should be spending on me!"'
 			'"Oh, and you are going to get famous?" you retort.'
 			'"Yes. Because unlike you, I''ve been getting ready for this my whole life. I spent all of high school eating right and working out, getting a thin body and the most volouptuous ass. I started working here the moment I turned 18 and have spent every day since working with the photographers to become the perfect model. I''ve done hundreds of shoots, I''m sponsored by lingerie and clothing companies, and currently I''m working on breaking into the actress business. And then here <i>you</i> are, coming in probably just here for easy money like some kind of cheap whore and you expect me to treat you as some kind of special snowflake?"'
-			act'"I didn''t realize how serious you are"':
+			act'"I didn''t realize how serious you were"':
 				*clr & cla
+				emily_hate -= 1
 				'<center><img src="images/locations/city/citycenter/photo/portraits/emily_r/talking/face.jpg"></center>'
 				'You find yourself taken aback by her tirade and step away from her.'
 				'"I-, I''m sorry Emily. I didn''t realize you were so serious about your work here. I never meant to bother you, I just... we just bumped into each other by accident, I swear."'
 				'She sighs a bit in exhasperation but otherwise recomposes herself. "Okay, whatever. It''s not a big deal I guess, just don''t make a habit of it," she says and brushes past you. You hear her muttering under her breath as she walks away. "Fucking amateurs, why do they even waste time with girls like that here..."'
-				act'Continue':gt'foto','studio'
+				act'Leave':gt'foto','studio'
 			end
 			act'"Who gave you the right?"':
 				*clr & cla
 				emily_hate += 1
 				'<center><img src="images/locations/city/citycenter/photo/portraits/emily_r/talking/face.jpg"></center>'
-				'"And you think that gives you the right to act the way you do?"'
-				act'Continue':gt'foto','studio'
+				'"And you think that gives you the right to act the way you do?" you shout back. "Plenty of other people are working hard here, why does your own work make you deserve it more than the rest? What, just because you were born with big tits and a pretty face makes you ''destined'' to make it big? You''re such a self-entitled brat!"'
+				'"A filthy amateur like you wouldn''t understand," she huffs. "And that''s always what you''re going to be. Just another picture of tits on the internet with a forgotten name to go along with them."'
+				'Without another word, she walks away, leaving you in fumes.'
+				act'Leave':gt'foto','studio'
 			end
 		end
 	end	
@@ -252,6 +256,7 @@ end
 
 if $ARGS[0] = 'emily_model':
 	*clr & cla
+	foto_models['emily'] = rand(3,5)
 	emily_model = rand(1,4)
 	if emily_model = 1:
 		'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/emily_r/modelling/nude1.mp4"></video></center>'
@@ -273,7 +278,7 @@ if $ARGS[0] = 'emily_model':
 		if anastasia > 0:
 			'Looking around for Emily, you find her on set in the middle of a lingerie shoot with Anastasia. The two of them sit on the ground together taking cues from each other and the photographers as they go through poses. Anastasia doesn''t seem to notice but something about Emily''s face makes her seem bitter, like she''s annoyed to be working with her. Maybe it has something to do with her rankings in the studio. You watch for a few more moments before walking away.'
 		else
-			'Looking around for Emily, you find her on set in the middle of a lingerie shoot with another model you feel like you''ve seen around. The two of them sit on the ground together taking cues from each other and the photographers as they go through poses. The other woman doesn''t seem to notice but something about Emily''s face makes her seem bitter, like she''s annoyed to be working with her. You wonder what that''s about as you watch for a few more moments before walking away.'
+			'Looking around for Emily, you find her on set in the middle of a lingerie shoot with another model you feel like you''ve seen around. The two of them sit on the ground together taking cues from each other and the photographers as they go through poses. The other woman doesn''t seem to notice but Emily seems really bitter, like she''s annoyed to be working with her. You wonder what that''s about as you watch for a few more moments before walking away.'
 		end
 	end
 		
@@ -281,13 +286,27 @@ if $ARGS[0] = 'emily_model':
 end
 
 if $ARGS[0] = 'emily_chat':
+	foto_models['emily'] = rand(3,5)
 	*clr & cla
 	'<center><img src="images/locations/city/citycenter/photo/portraits/emily_r/talking/5.jpg"></center>'
 	'Looking around for Emily, you find her standing around on an empty set, seemingly waiting between shoots for something.'
 	'"Oh. It''s you. What do you want?"'
+	
+	act'Leave':
+		*clr & cla
+		'<center><img src="images/locations/city/citycenter/photo/portraits/emily_r/talking/turnback.jpg"></center>'
+		'"I''m gonna go now," you say.'
+		if emily_hate > 0:
+			'"Good. Stop bothering me."'
+		else
+			'"Whatever."'
+		end
+		'With that lovely parting, you walk back towards the main floor of the studio.'
+		act'Keep chatting':gt'foto_models2','emily_chat'
+	end
 
 	if emily_model_exp ! daystart:
-		act 'Ask for modelling advice':
+		act'Ask for modelling advice':
 			*clr & cla
 			emily_model_exp = daystart
 			'<center><img src="images/locations/city/citycenter/photo/portraits/emily_r/talking/face.jpg"></center>'
@@ -299,14 +318,13 @@ if $ARGS[0] = 'emily_chat':
 				act'Keep chatting':gt'foto_models2','emily_chat'
 			end
 			
-			act'Try go get on her good side':
+			act'Suck up to her':
 				cla & *clr
 				'<center><img src="images/locations/city/citycenter/photo/portraits/emily_r/talking/2.jpg"></center>'
 				mdlng_exp += 2
 				'"Oh. I mean, I just thought I''d ask you because you''re the best model here. I thought you would have the best advice to give."'
-				'"Well, it''s not like you''re wrong." She shrugs and acts like what you said was just stating facts but you can tell she''s secretly pleased by what you said. "I suppose I could give some advice to a poor unfortunate soul like you. At the very least maybe you''d stop embarrassing yourself on set and making the studio look bad."'
-				'You stomach the verbal abuse and keep yourself in check, recognizing that with Emily you''re going to have to take her attitude if you want to get anywhere with her.'
-				'"The most important things about modelling is how to hold yourself. If you can''t pull off the pose to make yourself or the clothes you''re wearing look sexy then you''ve failed. Practice the poses, spend time in front of the mirror testing looks. And when you''re on set, keep changing it up. Taking direction from the photographers is important but if you want to act like a professional then you need to take initiative. Every time the camera flashes, alter your position, even if just a little bit. They''re only looking for one perfect shot, either they have it or they don''t. But help them search."'
+				'"Well, it''s not like you''re wrong." She shrugs and acts like what you said was just stating facts but you can tell she''s secretly pleased by what you said. "I suppose I could give some advice to a poor unfortunate soul like you. At the very least maybe you''d stop embarrassing yourself on set and making the studio look bad." You stomach the verbal abuse and keep yourself in check, recognizing that with Emily you''re going to have to take her attitude if you want to get anywhere with her.'
+				'"The most important things about modelling is how to hold yourself. If you can''t pull off the pose to make yourself or the clothes you''re wearing look sexy then you''ve failed. Practice the poses, spend time in front of the mirror testing looks. And when you''re on set, keep changing it up. Taking direction from the photographers is important but if you want to act like a professional then you need to take initiative. Every time the camera flashes, alter your position, even if just a little bit. They''re only looking for one perfect shot, either they have it or they don''t. But help them search. And don''t waste their time."'
 				act'Keep chatting':gt'foto_models2','emily_chat'
 			end
 			act'Taunt her into helping you':
@@ -322,25 +340,25 @@ if $ARGS[0] = 'emily_chat':
 		end
 	end
 	
-	act 'Ask why she wanted to become a model':
+	act'Ask why she wanted to become a model':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/emily_r/talking/1.jpg"></center>'
 		'"I was just curious. Why is it you wanted to become a model? I mean, you seem really serious about it and it sounds like you''ve been working at it for all your life but... I guess I was just wondering why?"'
-		'"Are you fucking blind?"'
+		'"Are you blind?"'
 		'You blink. "What?"'
-		'"I asked if you''re fucking blind. Come on, be serious. Okay, fine. Let''s spell this out for retards. Look at my face. Now look at my tits. Now look at my stomach, my legs, my ass, my pussy. Do you notice something? It''s that every single part of me is fucking beautiful. My body is sexy and perfect. Men want me, women want to be me, and boys dream about me while jerking themselves off in their bedrooms. Now with all of that, why would I want to be anything other than a model? Huh? So, are you blind or are you just fucking stupid?"'
+		'"I asked if you''re fucking blind. Come on, be serious. Okay, fine. Let''s spell this out for retards. Look at my face. Now look at my tits. Now look at my stomach, my legs, my ass, my pussy. Do you notice something? It''s that I''m fucking gorgeous. Everything about my body is sexy and perfect. Men want me, women want to be me, and boys dream about me while jerking themselves off in their bedrooms. Now with all of that, why would I want to be anything other than a model? Huh? So, are you blind or are you just fucking stupid?"'
 		act'Keep chatting':gt'foto_models2','emily_chat'
 	end
 
-	act 'Ask how she stays in shape':
+	act'Ask how she stays in shape':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/emily_r/talking/1.jpg"></center>'
-		'"I was wondering if you could give some advice about keeping a model''s body. Do you have any?"'
-		'"Yeah, don''t live like a filthy pig. What do you want? Me to write you out a diet plan so you can ingore it to eat ice cream and chocolate instead?"'
+		'"I was wondering if you could give some advice about keeping a model''s figure. Do you have any?"'
+		'"Yeah, don''t live like a filthy pig. What, do you want me to write out a diet plan for you that lets you keep stuffing your face ice cream and chocolate? Cause that doesn''t exist, stupid."'
 		act'Keep chatting':gt'foto_models2','emily_chat'
 	end
 
-	act 'Talk about movies':
+	act'Talk about movies':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/emily_r/talking/face.jpg"></center>'
 		'"See any good movies lately?"'
@@ -350,7 +368,7 @@ if $ARGS[0] = 'emily_chat':
 		act'Keep chatting':gt'foto_models2','emily_chat'
 	end
 	
-!!	act 'Talk about sex':gt'foto_models2',''
+!!	act'Talk about sex':gt'foto_models2',''
 end
 
 !! ---------------------------------------- Jeff Model ---------------------------------------------------------