Browse Source

[not integrated] someone please fix this costuming code for me

hornguy6 2 years ago
parent
commit
970ac382f0

+ 20 - 20
locations/act_extras1.qsrc

@@ -13,15 +13,15 @@
 
 
 if $ARGS[0] = 'setup':
-	if $role = 'Background Shower Girl':gt'act_extras1','back_shower'
-	if $role = 'Spring Break Flasher':gt'act_extras1','car_flash'
-	if $role = 'Valya Zakharovna aka Corpse Girl':gt'act_extras1','cadaver'
-	if $role = 'Dildo Girl':gt'act_extras1','cucumber'
-	if $role = 'Naked Locker Girl':gt'act_extras1','lockertits1'
-	if $role = 'Undressing Locker Girl':gt'act_extras1','lockertits2'
-	if $role = 'Modest Cheerleader' or $role = 'Underwear Cheerleader' or $role = 'Topless Cheerleader 3':gt'act_extras1','lockertits3'
-	if $role = 'Hot Shower Girl':gt'act_extras1','showertits'
-	if $role = 'Werewolf Victim':gt'act_extras1','werewolf'
+	if $acting['role'] = 'Background Shower Girl':gt'act_extras1','back_shower'
+	if $acting['role'] = 'Spring Break Flasher':gt'act_extras1','car_flash'
+	if $acting['role'] = 'Valya Zakharovna aka Corpse Girl':gt'act_extras1','cadaver'
+	if $acting['role'] = 'Dildo Girl':gt'act_extras1','cucumber'
+	if $acting['role'] = 'Naked Locker Girl':gt'act_extras1','lockertits1'
+	if $acting['role'] = 'Undressing Locker Girl':gt'act_extras1','lockertits2'
+	if $acting['role'] = 'Modest Cheerleader' or $acting['role'] = 'Underwear Cheerleader' or $acting['role'] = 'Topless Cheerleader 3':gt'act_extras1','lockertits3'
+	if $acting['role'] = 'Hot Shower Girl':gt'act_extras1','showertits'
+	if $acting['role'] = 'Werewolf Victim':gt'act_extras1','werewolf'
 end
 
 !! EXTRAS
@@ -66,24 +66,24 @@ end
 
 if $ARGS[0] = 'cadaver':
 	cla & *clr
-	'<center><img <<$set_imgh>> src="images/locations/industrial/studio/acting/misc/cadaver/set1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/acting/extra/cadaver/set1.jpg"></center>'
 	'You arrive on set where the everything has been designed to look like an autopsy room you might find in a hospital or medical center. A production assistant comes by and after confirming who you are takes your robe from you. Your nipples immediately stiffen in the chilly room and the PA sends you over to the director. You walk over to him, naked but "in costume" as far as the scene requires and receive his instructions.'
 	act'Speak to the director':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/industrial/studio/acting/misc/cadaver/set2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/acting/extra/cadaver/set2.jpg"></center>'
 		'As you converse with the director, you confirm your role in the scene as a lifeless cadaver, the victim of a brutal rape and murder who''s body is now being autopsied as part of the police investigation. Not that any of the backstory matters for your role in this. "Just lay there and don''t move no matter how anybody else touches you. Just act like you''re my wife in bed."'
 		*nl
 		'With the instructions clear, you take off your robe and lay down on the examination table and wait for the director to call action.'
 		act'Filming start':
-			'<center><video autoplay loop src="images/locations/city/industrial/studio/acting/misc/cadaver/1.mp4"></video></center>'
+			'<center><video autoplay loop src="images/locations/city/industrial/studio/acting/extra/cadaver/1.mp4"></video></center>'
 			'Filming quickly begins with establishing wide shots of the scene.'
 			act'Next shot':
 				cla & *clr
-				'<center><video autoplay loop src="images/locations/city/industrial/studio/acting/misc/cadaver/2.mp4"></video></center>'
+				'<center><video autoplay loop src="images/locations/city/industrial/studio/acting/extra/cadaver/2.mp4"></video></center>'
 				'Filming ccontinues moving onto a closeup of your face as other actors poke and prod you.'
 				act'Next shot':
 					cla & *clr
-					'<center><video autoplay loop src="images/locations/city/industrial/studio/acting/misc/cadaver/3.mp4"></video></center>'
+					'<center><video autoplay loop src="images/locations/city/industrial/studio/acting/extra/cadaver/3.mp4"></video></center>'
 					'The shots get even closer to your face with the camera looking straight into one of your bloodshot eyes, courtesy of the makeup department.'
 					if pcs_perform < 30:
 						minut += 5
@@ -94,11 +94,11 @@ if $ARGS[0] = 'cadaver':
 					end
 					act'Next shot':
 						cla & *clr
-						'<center><video autoplay loop src="images/locations/city/industrial/studio/acting/misc/cadaver/4.mp4"></video></center>'
+						'<center><video autoplay loop src="images/locations/city/industrial/studio/acting/extra/cadaver/4.mp4"></video></center>'
 						'The next shot is a close up of your breasts. Well, technically your body covered in makeup bruises and decomposition, but it''s impossible to ignore the fact that your breasts are at the center of the frame. You continue to play dead as the other actors prod your arms and body in the same way they did your face.'
 						act'More shots':
 							cla & *clr
-							'<center><video autoplay loop src="images/locations/city/industrial/studio/acting/misc/cadaver/5.mp4"></video></center>'
+							'<center><video autoplay loop src="images/locations/city/industrial/studio/acting/extra/cadaver/5.mp4"></video></center>'
 							'With all the main shots out of the way, they spend the rest of the time getting inserts of the actors investigating your "corpse" to try and sell their expertise as forensic doctors on screen.'
 							*nl
 							'As the filming of the inserts continue, you let your mind wander a bit about your part in this movie and how it might pertain to yourself and your career.'
@@ -113,7 +113,7 @@ if $ARGS[0] = 'cadaver':
 								cla & *clr
 								minut += 45
 								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/locations/industrial/studio/acting/misc/cadaver/set.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/acting/extra/cadaver/set.jpg"></center>'
 								'Eventually your part in the movie really is over and the shoot is finished. You climb off the table, slightly stiff from having lain still for so long and nipples even stiffer from the air conditioning and slip back into a robe. With everything wrapped, now all that''s left is to collect your pay.'
 								actress['pay'] += 1
 								acting['jobdone'] = 1
@@ -169,19 +169,19 @@ if $ARGS[0] = 'lockertits3':
 	cla & *clr
 	minut += 15
 	'<center><video autoplay loop src="images/locations/city/industrial/studio/acting/extra/lockertits3.mp4"></video></center>'
-	if $role = 'Modest Cheerleader':
+	if $acting['role'] = 'Modest Cheerleader':
 		'You are one of the shy and modestly dressed cheerleaders in the locker room when the main character comes to spice up your outfits to inspire the school''s football team to succeed.'
 		*nl
 		'On the director''s signal you do a syncronized cheer with the other girls, pumping up your hand and yelling.'
 		'<i>"Yayyy!!"</i>'
 		'It''s cheesy and weird and doesn''t make much sense, but it''s you didn''t write it.'
-	elseif $role = 'Underwear Cheerleader':
+	elseif $acting['role'] = 'Underwear Cheerleader':
 		'You are one of the shy and modestly dressed cheerleaders in the middle of changing when the main character comes to spice up your outfits to inspire the school''s football team to succeed.'
 		*nl
 		'On the director''s signal you do a syncronized cheer with the other girls, jumping and releasing your long skirt so it falls down and reveals your panties.'
 		'<i>"Yayyy!!"</i>'
 		'It''s cheesy and weird and doesn''t make much sense, but it''s you didn''t write it.'
-	elseif $role = 'Topless Cheerleader 3':
+	elseif $acting['role'] = 'Topless Cheerleader 3':
 		actress['nude_scene'] += 1
 		'You are one of the shy and modestly dressed cheerleaders in the middle of changing when the main character comes to spice up your outfits to inspire the school''s football team to succeed.'
 		if pcs_perform < 20:

+ 7 - 4
locations/act_minor1.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'setup':
 	if $role = 'Diner Waitress':
 		if costuming['check'] = 1:
 			gt'act_minor1','diner_waitress1'
-		else
+		elseif costuming['check'] = 1:
 			gt'act_minor1','diner_waitress2'
 		end
 	end
@@ -24,6 +24,7 @@ end
 !! Minor Roles
 
 if $ARGS[0] = 'club_flash':
+	acting['scene_count'] = 1
 	*clr & cla
 	if pcs_perform < 50:perform_exp + 10
 	'<center><img <<$set_imgh>> src="images/locations/industrial/studio/set1.jpg"></center>'
@@ -122,6 +123,7 @@ if $ARGS[0] = 'club_flash':
 end
 
 if $ARGS[0] = 'diner_waitress1':
+	acting['scene_count'] = 2
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/backgrounds/diner.jpg"></center>'
 	'You go on a set constructed to look like a diner and everyone is getting ready. You pass the time by continuing to study your lines until someone comes over to you and puts you on your mark. The director quickly runs through the scene with you and all the other actors to make sure there isn''t any confusion. With you and everybody else nodding in confirmation you all get back into place and the director yells, "Quiet on the set!"'
@@ -159,9 +161,9 @@ if $ARGS[0] = 'diner_waitress1':
 end
 
 if $ARGS[0] = 'diner_waitress2':
-	if pcs_perform < 50:perform_exp + 5
+	if pcs_perform < 50:perform_exp += 5
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/backgrounds/bedroom1.jpg"></center>'
-	'You step on set while everybody else is setting up. Your co-star for the scene and the main character is already naked on the bed. A production assistant notices your arrival and instructs you to take of your robe and get up there with him so they can frame the shot.'
+	'You step on set while everybody else is setting up. Your co-star for the scene and the main character for the show is already naked on the bed. A production assistant notices your arrival and instructs you to take of your robe and get up there with him so they can frame the shot.'
 	act'Get on the bed':
 		*clr & cla
 		robe = 0
@@ -169,7 +171,7 @@ if $ARGS[0] = 'diner_waitress2':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/backgrounds/bedroom1.jpg"></center>'
 		if pcs_inhib < 50:
-			'You do as they say, blushing as you strip out of your robe and mount your co-star. He''s wearing a dancer''s pad so thankfully you aren''t rubbing genitalia, but based on where they want you, your pussy is right against the fabric. Your face is hot, being naked on top of a guy like this, surrounded by all these people. You hope no one sees it.'
+			'You do as they say, blushing as you strip out of your robe and mount your co-star. He''s wearing a dancer''s pad so thankfully you aren''t rubbing genitalia, but based on where they want you, your pussy is right against the fabric. Your face is hot, being naked on top of a guy like this, surrounded by all these people. You half hope no one ends up watching this show.'
 		else
 			'You do as they say, stripping out of your robe and mounting your co-star. He''s wearing a dancer''s pad so thankfully you aren''t rubbing genitalia, but based on where they want you, your pussy is right against the fabric.'
 		end
@@ -224,6 +226,7 @@ end
 
 
 if $ARGS[0] = 'hot_bartender1':
+	acting['scene_count'] = 3
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/backgrounds/bar.jpg"></center>'
 	

+ 4 - 4
locations/audition_sex1.qsrc

@@ -137,7 +137,7 @@ if $ARGS[0] = 'reluctant_bj1':
 							'"Okay," you whisper, closing your eyes. "Okay. I''ll let you... fuck me..."'
 							'<<$boydesc>> grins wolfishly.'
 							'"Then let''s get those clothes off," he says, now pulling at your clothes with renewed vigor.'
-							act'Take off your clothes':gt'auditions','reluctant_virgin'
+							act'Take off your clothes':gt'audition_sex1','reluctant_virgin'
 						end
 
 						act'Freeze in panic':
@@ -289,7 +289,7 @@ if $ARGS[0] = 'reluctant_bj2':
 				'"Mmmph!" you mumble around his cock and hot liquid begins pouring into your mouth.'
 				act'Spit it out':
 					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/spit3.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit3.mp4"></video></center>'
 					audition['penalty'] += 5
 					'You are immediately revolted and gag, a small globule of cum escaping over your bottom lip. <<$boydesc>> is unrelenting and continues to face fuck you, his semen still pouring out into your mouth. You try your best to keep it all in but it''s just too much for you and you gag again. Choking, you forcibly push yourself off and retch, spilling a thick mixture of saliva and cum all over his cock and onto the floor.'
 					'You swallow involuntarily and gasp for breath before looking up at <<$boydesc>>.'
@@ -336,7 +336,7 @@ if $ARGS[0] = 'reluctant_bj2':
 						gs 'cum_call', 'breasts', $boydesc
 						gs 'stat'
 						cla & *clr
-						'<center><video autoplay loop src="images/shared/sex/cum/gag1.mp4"></video></center>'
+						'<center><video autoplay loop src="images/shared/sex/cum/mouth/gag1.mp4"></video></center>'
 						'With a deep breath through your nose, you try to swallow but just feel too disgusted to do it. You gag hard and cough it all back up. Instinctively, you put your hands up to catch some but the most spatters all down your neck and across your breasts.'
 						if trt_cumeater = 1:
 							'It''s not that you''re unaccustomed to swallowing cum or even mind most of the time, you just don''t want to do it <i>this</i> time. Everything about this situation turns you off.'
@@ -782,7 +782,7 @@ if $ARGS[0] = 'reluctant_fuck_cum':
 					gs 'cum_call', 'hands', $boydesc
 					gs 'stat'
 					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/spit2.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit2.mp4"></video></center>'
 					'You wait until the torrent of cum stops filling your mouth and <<$boydesc>> pulls away. The moment he does you spit the cum out into your hand. Looking up at <<$boydesc>>, he has an irritated expression on his face.'
 					'"Tch."'
 					'He pulls a packet of tissues from the desk and wipes himself clean. He sees the cum on your hands, but just puts the pack back in the desk without offering you any.'

+ 12 - 12
locations/audition_sex2.qsrc

@@ -105,7 +105,7 @@ if $ARGS[0] = 'neutral_bj1':
 						cla & *clr
 						audition['cast_couch'] = 2
 						audition['penalty'] += 5
-						'<center><video autoplay loop src="images/shared/sex/cum/spit3.mp4"></video></center>'
+						'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit3.mp4"></video></center>'
 						'The cum piling up at the back of your throat making it impossible to breathe, even through your nose. The moment <<$boydesc>> lets up on the pressure you heave yourself off his cock and retch onto the ground, a flood of saliva mixed with cum splattering all over the floor. For the first time, you notice there are older but similar looking stains elsewhere in the room.'
 						'"Tch."'
 						'<<$boydesc>> has an irritated expression on his face as you look up at him from all fours, still drooling cum into the carpet. He pulls a packet of tissues from the desk and wipes his cock clean before tossing it over to you on the floor.'
@@ -234,7 +234,7 @@ if $ARGS[0] = 'neutral_bj1':
 						audition['bonus'] += 10
 						swallow += 1
 						cla & *clr
-						'<center><video autoplay loop src="images/shared/sex/cum/swallow3.mp4"></video></center>'
+						'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow3.mp4"></video></center>'
 						'Making firm eye contact with <<$boydesc>>, you take a deep breath and gather the cum in your mouth and gulp it down, sticking your tongue out after to show you swallowed everything.'
 						'"Outstanding," <<$boydesc>> says, grinning ear to ear. He pulls a pack of tissues from the desk and wipes himself off before pulling up his pants. You stand to face him and find out the result of the audition.'
 						act'Find out the results of your audition':gt'auditions','neutral_results'
@@ -246,7 +246,7 @@ if $ARGS[0] = 'neutral_bj1':
 						gs 'cum_call', 'hands', $boydesc
 						gs 'stat'
 						cla & *clr
-						'<center><video autoplay loop src="images/shared/sex/cum/spit2.mp4"></video></center>'
+						'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit2.mp4"></video></center>'
 						'You know he told you to, but you don''t really like the idea of swallowing and spit the cum out into your hand. Looking up at <<$boydesc>>, he has an irritated expression on his face.'
 						'"Tch."'
 						'He pulls a packet of tissues from the desk and wipes himself clean. He sees the cum on your hands, but just puts the pack back in the desk without offering you any.'
@@ -263,7 +263,7 @@ if $ARGS[0] = 'neutral_bj1':
 						audition['bonus'] += 10
 						swallow += 1
 						cla & *clr
-						'<center><video autoplay loop src="images/shared/sex/cum/swallow3.mp4"></video></center>'
+						'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow3.mp4"></video></center>'
 						'Making firm eye contact with <<$boydesc>>, you take a deep breath and gather the cum in your mouth and gulp it down, sticking your tongue out after to show you swallowed everything.'
 						'"Outstanding," <<$boydesc>> says, grinning ear to ear. He pulls a pack of tissues from the desk and wipes himself off before pulling up his pants. You stand to face him and find out the result of the audition.'
 						act'Find out the results of your audition':gt'auditions','neutral_results'
@@ -275,7 +275,7 @@ if $ARGS[0] = 'neutral_bj1':
 						gs 'cum_call', 'hands', $boydesc
 						gs 'stat'
 						cla & *clr
-						'<center><video autoplay loop src="images/shared/sex/cum/spit2.mp4"></video></center>'
+						'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit2.mp4"></video></center>'
 						'You know he told you to, but you don''t really like the idea of swallowing and spit the cum out into your hand. Looking up at <<$boydesc>>, he has an irritated expression on his face.'
 						'"Tch."'
 						'He pulls a packet of tissues from the desk and wipes himself clean. He sees the cum on your hands, but just puts the pack back in the desk without offering you any.'
@@ -331,7 +331,7 @@ if $ARGS[0] = 'neutral_bj1':
 !!						gs 'cum_call', 'hands', $boydesc
 !!						gs 'stat'
 !!						cla & *clr
-!!						'<center><video autoplay loop src="images/shared/sex/cum/spit2.mp4"></video></center>'
+!!						'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit2.mp4"></video></center>'
 !!						'You know he told you to, but you don''t really like the idea of swallowing and spit the cum out into your hand. After using your other hand to wipe your eyes, you look up at <<$boydesc>> and see he has curious expression on his face.'
 !!						'"So you stick your tongue out for a facial but don''t swallow?" You just shrug in response. He pulls a packet of tissues from the desk and wipes himself clean before tossing it over to you.'
 !!						act'Clean yourself up':
@@ -914,7 +914,7 @@ if $ARGS[0] = 'neutral_fuck_cum':
 					audition['bonus'] += 10
 					swallow += 1
 					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/swallow3.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow3.mp4"></video></center>'
 					'Making firm eye contact with <<$boydesc>>, you take a deep breath and gather the cum in your mouth and gulp it down, sticking your tongue out after to show you swallowed everything.'
 					'"Outstanding," <<$boydesc>> says, grinning ear to ear. He pulls a pack of tissues from the desk and wipes himself off before pulling up his pants. You stand to face him and find out the result of the audition.'
 					act'Find out the results of your audition':gt'auditions','neutral_results'
@@ -926,7 +926,7 @@ if $ARGS[0] = 'neutral_fuck_cum':
 					gs 'cum_call', 'hands', $boydesc
 					gs 'stat'
 					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/spit2.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit2.mp4"></video></center>'
 					'You know he told you to, but you don''t really like the idea of swallowing and spit the cum out into your hand. Looking up at <<$boydesc>>, he has an irritated expression on his face.'
 					'"Tch."'
 					'He pulls a packet of tissues from the desk and wipes himself clean. He sees the cum on your hands, but just puts the pack back in the desk without offering you any.'
@@ -1406,7 +1406,7 @@ if $ARGS[0] = 'neutral_virgin_cum':
 					audition['bonus'] += 10
 					swallow += 1
 					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/swallow3.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow3.mp4"></video></center>'
 					'Making firm eye contact with <<$boydesc>>, you take a deep breath and gather the cum in your mouth and gulp it down, sticking your tongue out after to show you swallowed everything.'
 					'"Outstanding," <<$boydesc>> says, grinning ear to ear. He pulls a pack of tissues from the desk and wipes himself off before pulling up his pants. You stand to face him and find out the result of the audition.'
 					act'Find out the results of your audition':gt'auditions','neutral_virgin_results'
@@ -1418,7 +1418,7 @@ if $ARGS[0] = 'neutral_virgin_cum':
 					gs 'cum_call', 'hands', $boydesc
 					gs 'stat'
 					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/spit2.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit2.mp4"></video></center>'
 					'You know he told you to, but you don''t really like the idea of swallowing and spit the cum out into your hand. Looking up at <<$boydesc>>, he has an irritated expression on his face.'
 					'"Tch."'
 					'He pulls a packet of tissues from the desk and wipes himself clean. He sees the cum on your hands, but just puts the pack back in the desk without offering you any.'
@@ -1705,7 +1705,7 @@ if $ARGS[0] = 'neutral_assfuck_cum':
 					audition['bonus'] += 10
 					swallow += 1
 					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/swallow3.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow3.mp4"></video></center>'
 					'Making firm eye contact with <<$boydesc>>, you take a deep breath and gather the cum in your mouth and gulp it down, sticking your tongue out after to show you swallowed everything.'
 					'"Outstanding," <<$boydesc>> says, grinning ear to ear. He pulls a pack of tissues from the desk and wipes himself off before pulling up his pants. You stand to face him and find out the result of the audition.'
 					act'Find out the results of your audition':gt'auditions','neutral_results'
@@ -1717,7 +1717,7 @@ if $ARGS[0] = 'neutral_assfuck_cum':
 					gs 'cum_call', 'hands', $boydesc
 					gs 'stat'
 					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/spit2.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit2.mp4"></video></center>'
 					'You know he told you to, but you don''t really like the idea of swallowing and spit the cum out into your hand. Looking up at <<$boydesc>>, he has an irritated expression on his face.'
 					'"Tch."'
 					'He pulls a packet of tissues from the desk and wipes himself clean. He sees the cum on your hands, but just puts the pack back in the desk without offering you any.'

+ 10 - 10
locations/audition_sex3.qsrc

@@ -228,7 +228,7 @@ if $ARGS[0] = 'slutty_bj1':
 						audition['bonus'] += 10
 						swallow += 1
 						cla & *clr
-						'<center><video autoplay loop src="images/shared/sex/cum/swallow3.mp4"></video></center>'
+						'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow3.mp4"></video></center>'
 						'Making firm eye contact with <<$boydesc>>, you take a deep breath and gather the cum in your mouth and gulp it down, sticking your tongue out after to show you swallowed everything.'
 						'"Outstanding," <<$boydesc>> says, grinning ear to ear. He pulls a pack of tissues from the desk and wipes himself off before pulling up his pants. You stand to face him and find out the result of the audition.'
 						act'Find out the results of your audition':gt'auditions','slutty_results'
@@ -240,7 +240,7 @@ if $ARGS[0] = 'slutty_bj1':
 						gs 'cum_call', 'hands', $boydesc
 						gs 'stat'
 						cla & *clr
-						'<center><video autoplay loop src="images/shared/sex/cum/spit2.mp4"></video></center>'
+						'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit2.mp4"></video></center>'
 						'You know he told you to, but you don''t really like the idea of swallowing and spit the cum out into your hand. Looking up at <<$boydesc>>, he has an irritated expression on his face.'
 						'"Tch."'
 						'He pulls a packet of tissues from the desk and wipes himself clean. He sees the cum on your hands, but just puts the pack back in the desk without offering you any.'
@@ -257,7 +257,7 @@ if $ARGS[0] = 'slutty_bj1':
 						audition['bonus'] += 10
 						swallow += 1
 						cla & *clr
-						'<center><video autoplay loop src="images/shared/sex/cum/swallow3.mp4"></video></center>'
+						'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow3.mp4"></video></center>'
 						'Making firm eye contact with <<$boydesc>>, you take a deep breath and gather the cum in your mouth and gulp it down, sticking your tongue out after to show you swallowed everything.'
 						'"Outstanding," <<$boydesc>> says, grinning ear to ear. He pulls a pack of tissues from the desk and wipes himself off before pulling up his pants. You stand to face him and find out the result of the audition.'
 						act'Find out the results of your audition':gt'auditions','slutty_results'
@@ -269,7 +269,7 @@ if $ARGS[0] = 'slutty_bj1':
 						gs 'cum_call', 'hands', $boydesc
 						gs 'stat'
 						cla & *clr
-						'<center><video autoplay loop src="images/shared/sex/cum/spit2.mp4"></video></center>'
+						'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit2.mp4"></video></center>'
 						'You know he told you to, but you don''t really like the idea of swallowing and spit the cum out into your hand. Looking up at <<$boydesc>>, he has an irritated expression on his face.'
 						'"Tch."'
 						'He pulls a packet of tissues from the desk and wipes himself clean. He sees the cum on your hands, but just puts the pack back in the desk without offering you any.'
@@ -325,7 +325,7 @@ if $ARGS[0] = 'slutty_bj1':
 !!						gs 'cum_call', 'hands', $boydesc
 !!						gs 'stat'
 !!						cla & *clr
-!!						'<center><video autoplay loop src="images/shared/sex/cum/spit2.mp4"></video></center>'
+!!						'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit2.mp4"></video></center>'
 !!						'You know he told you to, but you don''t really like the idea of swallowing and spit the cum out into your hand. After using your other hand to wipe your eyes, you look up at <<$boydesc>> and see he has curious expression on his face.'
 !!						'"So you stick your tongue out for a facial but don''t swallow?" You just shrug in response. He pulls a packet of tissues from the desk and wipes himself clean before tossing it over to you.'
 !!						act'Clean yourself up':
@@ -979,7 +979,7 @@ if $ARGS[0] = 'slutty_fuck_cum':
 					audition['bonus'] += 10
 					swallow += 1
 					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/swallow3.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow3.mp4"></video></center>'
 					'Making firm eye contact with <<$boydesc>>, you take a deep breath and gather the cum in your mouth and gulp it down, smiling with your tongue out after to show you swallowed everything.'
 					'"Outstanding," <<$boydesc>> says, grinning ear to ear. He pulls a pack of tissues from the desk and wipes himself off before pulling up his pants. You stand to face him and find out the result of the audition.'
 					act'Find out the results of your audition':gt'auditions','slutty_results'
@@ -1402,7 +1402,7 @@ if $ARGS[0] = 'slutty_virgin_cum':
 					audition['bonus'] += 10
 					swallow += 1
 					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/swallow3.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow3.mp4"></video></center>'
 					'Making firm eye contact with <<$boydesc>>, you take a deep breath and gather the cum in your mouth and gulp it down, sticking your tongue out after to show you swallowed everything.'
 					'"Outstanding," <<$boydesc>> says, grinning ear to ear. He pulls a pack of tissues from the desk and wipes himself off before pulling up his pants. You stand to face him and find out the result of the audition.'
 					act'Find out the results of your audition':gt'auditions','slutty_virgin_results'
@@ -1414,7 +1414,7 @@ if $ARGS[0] = 'slutty_virgin_cum':
 					gs 'cum_call', 'hands', $boydesc
 					gs 'stat'
 					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/spit2.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit2.mp4"></video></center>'
 					'You know he told you to, but you don''t really like the idea of swallowing and spit the cum out into your hand. Looking up at <<$boydesc>>, he has an irritated expression on his face.'
 					'"Tch."'
 					'He pulls a packet of tissues from the desk and wipes himself clean. He sees the cum on your hands, but just puts the pack back in the desk without offering you any.'
@@ -1708,7 +1708,7 @@ if $ARGS[0] = 'slutty_assfuck_cum':
 					audition['bonus'] += 10
 					swallow += 1
 					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/swallow3.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow3.mp4"></video></center>'
 					'Making firm eye contact with <<$boydesc>>, you take a deep breath and gather the cum in your mouth and gulp it down, sticking your tongue out after to show you swallowed everything.'
 					'"Outstanding," <<$boydesc>> says, grinning ear to ear. He pulls a pack of tissues from the desk and wipes himself off before pulling up his pants. You stand to face him and find out the result of the audition.'
 					act'Find out the results of your audition':gt'auditions','slutty_results'
@@ -1720,7 +1720,7 @@ if $ARGS[0] = 'slutty_assfuck_cum':
 					gs 'cum_call', 'hands', $boydesc
 					gs 'stat'
 					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/spit2.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit2.mp4"></video></center>'
 					'You know he told you to, but you don''t really like the idea of swallowing and spit the cum out into your hand. Looking up at <<$boydesc>>, he has an irritated expression on his face.'
 					'"Tch."'
 					'He pulls a packet of tissues from the desk and wipes himself clean. He sees the cum on your hands, but just puts the pack back in the desk without offering you any.'

+ 11 - 12
locations/auditions.qsrc

@@ -51,16 +51,16 @@
 !! audition['cast_couch'] = 12 - assfucked and anal creampie
 
 if $ARGS[0] = 'setup':
-	if audition['number'] > 0 and audition['roletype'] > 3 and audition['roletype'] =< 5:
-		if audition['number'] ! '':
-			gt'auditions_minor1','minor<<audition[''number'']>>'
+	if audition['unique'] > 0 and audition['roletype'] > 3 and audition['roletype'] =< 5:
+		if audition['unique'] > 0:
+			gt'auditions_minor1', 'unique'
 		else
 			gt'auditions_minor1','general_dialogue'
 		end
-	elseif audition['number'] > 0 and (audition['roletype'] = 6 or audition['roletype'] = 7):
-		gt'auditions_secondary','secondary<<audition[''number'']>>'
-	elseif audition['number'] > 0 and audition['roletype'] >= 8:
-		gt'auditions_main','main<<audition[''number'']>>'
+	elseif audition['roletype'] = 6 or audition['roletype'] = 7:
+		gt'auditions_secondary', $audition['role']
+	elseif audition['roletype'] >= 8:
+		gt'auditions_main', $audition['role']
 	else
 		if $audition['type'] = 'general':gt'auditions','general_dialogue'
 		if $audition['type'] = 'extra':gt'auditions','extra'
@@ -89,7 +89,6 @@ if $ARGS[0] = 'role_success':
 	$acting['role'] = $audition['role']
 	room = 0
 	audition_success += 1
-	acting['cast'] = 1
 	acting['setnumber'] = rand(1,100)
 	killvar 'audition'
 	gs'stat'
@@ -197,7 +196,7 @@ if $ARGS[0] = 'tit_audition':
 				*nl
 				act 'Show her your tits (<<will_cost>> Willpower)':
 					cla & *clr
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/hallway.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/showtits.jpg"></center>'
 					'You blush with embarassment at the request but do as she says anyways seeing how you signed up for this in the first place. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
 					'"How big are those? <<$titsize>>s?"'
 					'"Uhh... yeah..." you respond nervously.'
@@ -243,7 +242,7 @@ if $ARGS[0] = 'tit_audition_result':
 		'"Well, you''ve got great tits! You''re hired."'
 		'You blink in surprise.'
 		'"Wait really? That''s it?"'
-		'"Yeah, of course. We''re not looking for the next Olga Kuzubov or an already established star. You''re only in this role to show your tits on camera. Oh, also you can put those away now. Thank you for coming, you have officially secured the role of <<$audition[''role'']>>. Now if you''ll excuse me, I still need other titty extras for this movie and have to keep auditioning. Next please!"'
+		'"Yeah, of course. We''re not looking for the next Olga Kuzubov. You''re only in this movie for the perverts to enjoy your tits. Oh, also you can put those away now. Thank you for coming, you have officially secured the role of <<$audition[''role'']>>. Filming is in <<acting[''shoot_day''] - daystart>> days. Don''t be late. Now if you''ll excuse me, I still need other titty extras for this movie and have to keep auditioning. Next please!"'
 		if audition['scene_prep'] < 30:
 			'You start as you suddenly realize you were so surprised you never pulled your top back into place when she said you were hired. As you put everything back in place, you''re not sure what to make of all this, but you guess that''s that and gather your things to leave.'
 		else
@@ -253,7 +252,7 @@ if $ARGS[0] = 'tit_audition_result':
 	else
 		'"Welp, you''ve got great tits! You''re hired."'
 		'"Really? Great! Thank you!"'
-		'"Mhmm, yeah. Sure thing. Congratulations on landing the role of <<$audition[''role'']>>. Now clear out please, I need to keep auditioning other roles."'
+		'"Mhmm, yeah. Sure thing. Congratulations on landing the role of <<$audition[''role'']>>. Filming is in <<acting[''shoot_day''] - daystart>> days. Don''t be late Now clear out please, I need to keep auditioning other roles."'
 		'You knew this audition was never going to test your acting skills, you''ve done these before, but it still feels nice to be hired, even if it''s just for your breasts.'
 		!!insert variable to say the audition was successful
 		act'Leave':gt'auditions','reflection'
@@ -968,7 +967,7 @@ if $ARGS[0] = 'facial_signature_upset':
 	*nl
 	'As the pen scribbles on paper, a drop of cum falls from your face and spatters on the page next to your name, as if dotting it with finality.'
 	'"Congratulations! You officially cast as <<$audition[''role'']>>. Thank you for auditioning," he says, his smile breaking into a grin.'
-	'"Thank you for casting me," you say flatly, taking your copy of the contract and step out into the hallway.'
+	'"Thank you for casting me," you say quietly, taking your copy of the contract and step out into the hallway.'
 	act'Leave':gt'auditions','reflection'
 end
 

+ 7 - 1
locations/auditions_minor1.qsrc

@@ -451,7 +451,13 @@ if $ARGS[0] = 'casting_couch':
 !!	end
 end
 
-if $ARGS[0] = 'minor1':
+if $ARGS[0] = 'unique':
+	!! this is to leave room for the possibility of having more files than just this one
+	if $audition['role'] = 'Slutty Club Girl':gt'auditions_minor1','SluttyClubGirl'
+	
+end
+
+if $ARGS[0] = 'SluttyClubGirl':
 	audition['requirement'] = 60
 	gs 'npcgeneratec', 0, '', rand(30,50)
 	gs 'boyStat', $npclastgenerated

+ 70 - 81
locations/casting.qsrc

@@ -33,7 +33,7 @@
 
 !! costuming['pantytype'] - the kind of panties for the role: normal, cute, or thong
 
-if $ARGS[0] = 'start':
+if $ARGS[0] = 'callboard':
 
 	act'Leave':gt'talent_agency','start'
 	
@@ -63,8 +63,8 @@ if $ARGS[0] = 'start':
 	*nl
 end
 
-if $ARGS[0] = 'callboard_update':
 
+if $ARGS[0] = 'callboard_extras_update':
 	casting_extra1 = rand(1,100)
 	casting_extra2 = rand(1,100)
 	casting_extra3 = rand(1,100)
@@ -74,7 +74,10 @@ if $ARGS[0] = 'callboard_update':
 	casting_extra7 = rand(1,100)
 	casting_extra8 = rand(1,100)
 	casting_extra9 = rand(1,100)
-	
+end
+
+if $ARGS[0] = 'callboard_update':
+
 	casting_minor1 = rand(1,100)
 	casting_minor2 = rand(1,100)
 end
@@ -112,16 +115,34 @@ if $ARGS[0] = 'tryout':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/front.jpg"></center>'
 	'You decide to try for this one and go to the front desk to schedule the audition. The lady at the desk quickly puts your information into her computer and rummages through a file cabinet to pull out a script for you.'
 	'"Okay! You''re all set! Don''t be late!"'
+	act'Take the script and leave':gt'talent_agency','start'
+end
+
+if $ARGS[0] = 'general_tryout':
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/front.jpg"></center>'
+	'You walk over to the receptionist.'
+	'"Hi, I was just looking at the callboard and saw that they were holding auditions for <<$audition[''role'']>> today?"'
+	'"Yes! They are! Just go to the general audition room at the end of the hall. If the door is open, you''re free to go in."'
+	'"Thanks," you nod.'
+	act'Continue':gt'talent_agency','start'
 end
 
 !! ----------------------  Automation ---------------------------------------
 
 if $ARGS[0] = 'details':
+	gs'casting','audition_schedule'
 	'Pay: <<acting[''pay'']>> <b>₽</b>'
 	'Audition time: 16:00-18:00, <<$week[audition[''week'']]>>, <<audition[''calendar_day'']>> of <<$audition[''month'']>>.'
 !!	'Shoot time: <<acting_shoot_time>>:00'
 end
 
+if $ARGS[0] = 'general_details':
+	gs'casting','audition_schedule'
+	'Pay: <<acting[''pay'']>> <b>₽</b>'
+	'Walk in auditions today. Ask receptionist for details.'
+!!	'Shoot time: <<acting_shoot_time>>:00'
+end
+
 !! ----------------------  ROLES AS AN EXTRA ---------------------------------------
 
 if $ARGS[0] = 'BackShowerGirl':
@@ -129,39 +150,33 @@ if $ARGS[0] = 'BackShowerGirl':
 	$audition['type'] = 'titty'
 	$costuming['outfit'] = 'nude'
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15 * rand(0,roletype))
-	gs'casting','audition_schedule'
 	'Uninhibited girls wanted for the role of <b>Background Shower Girl.</b>'
-	gs'casting','details'
+	gs'casting','general_details'
 	act 'Return':
 		gs'casting','clearcasting'
 		gt'casting', 'callboard'
 	end
-	act'Try out for this role':
-		gs'casting','tryout'
+	act'Talk to the receptionist':
 		$audition['role'] = 'Background Shower Girl'
-		act'Take the script and leave':gt'talent_agency','start'
+		gt'casting','general_tryout'
 	end
 end
 
 if $ARGS[0] = 'SpringBreakFlasher':
 	audition['roletype'] = 3
 	$audition['type'] = 'titty'
-	$costuming['outfit'] = 'slutty_pants'
-	$costuming['type'] = 'slutty'
-	$costuming['bra'] = 'none'
+!!	acting['costume_unique'] = 1
 	audition['roletits'] = 4
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15*rand(0,roletype))
-	gs'casting','audition_schedule'
 	'Big boobed girl wanted for the role of <b>Spring Break Flasher.</b>'
-	gs'casting','details'
+	gs'casting','general_details'
 	act 'Return':
 		gs'casting','clearcasting'
 		gt'casting', 'callboard'
 	end
-	act'Try out for this role':
-		gs'casting','tryout'
+	act'Talk to the receptionist':
 		$audition['role'] = 'Spring Break Flasher'
-		act'Take the script and leave':gt'talent_agency','start'
+		gt'casting','general_tryout'
 	end
 end
 
@@ -170,16 +185,15 @@ if $ARGS[0] = 'Cadaver':
 	$costuming['outfit'] = 'nude'
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15*rand(0,roletype))
 	gs'casting','audition_schedule'
-	'Young pretty girl wanted for the role of <b>Spring Break Flasher.</b>'
+	'Young pretty girl wanted for the role of <b>Dead Girl 2</b>'
 	gs'casting','details'
 	act 'Return':
 		gs'casting','clearcasting'
 		gt'casting', 'callboard'
 	end
-	act'Try out for this role':
-		gs'casting','tryout'
+	act'Talk to the receptionist':
 		$audition['role'] = 'cadaver'
-		act'Take the script and leave':gt'talent_agency','start'
+		gt'casting','general_tryout'
 	end
 end
 
@@ -190,17 +204,15 @@ if $ARGS[0] = 'DildoGirl':
 	$costuming['panties'] = 'cheap'
 	costuming['pantynumber'] = 31
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15*rand(0,roletype))
-	gs'casting','audition_schedule'
 	'Big boobed girl wanted for the role of <b>Dildo Girl.</b>'
-	gs'casting','details'
+	gs'casting','general_details'
 	act 'Return':
 		gs'casting','clearcasting'
 		gt'casting', 'callboard'
 	end
-	act'Try out for this role':
-		gs'casting','tryout'
+	act'Talk to the receptionist':
 		$audition['role'] = 'Dildo Girl'
-		act'Take the script and leave':gt'talent_agency','start'
+		gt'casting','general_tryout'
 	end
 end
 
@@ -209,17 +221,15 @@ if $ARGS[0] = 'NakedLockerGirl':
 	$audition['type'] = 'titty'
 	$costuming['outfit'] = 'nude'
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15*rand(0,roletype))
-	gs'casting','audition_schedule'
 	'Young pretty girl wanted for the role of <b>Naked Locker Girl.</b>'
-	gs'casting','details'
+	gs'casting','general_details'
 	act 'Return':
 		gs'casting','clearcasting'
 		gt'casting', 'callboard'
 	end
-	act'Try out for this role':
-		gs'casting','tryout'
+	act'Talk to the receptionist':
 		$audition['role'] = 'Naked Locker Girl'
-		act'Take the script and leave':gt'talent_agency','start'
+		gt'casting','general_tryout'
 	end
 end
 
@@ -233,17 +243,15 @@ if $ARGS[0] = 'UndressingLockerGirl':
 	$costuming['pantytype'] = 'thong'
 	$costuming['pantydrawer'] = 'filled with thongs. She picks one out and'
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15 * rand(0,roletype))
-	gs'casting','audition_schedule'
 	'Big boobed girls wanted for the role of <b>Undressing Locker Girl.</b>'
-	gs'casting','details'
+	gs'casting','general_details'
 	act 'Return':
 		gs'casting','clearcasting'
 		gt'casting', 'callboard'
 	end
-	act'Try out for this role':
-		gs'casting','tryout'
+	act'Talk to the receptionist':
 		$audition['role'] = 'Undressing Locker Girl'
-		act'Take the script and leave':gt'talent_agency','start'
+		gt'casting','general_tryout'
 	end
 end
 
@@ -253,17 +261,15 @@ if $ARGS[0] = 'ModestCheerleader':
 	$costuming['type'] = 'normal'
 	$costuming['outfit'] = 'cheerleader'
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15 * rand(0,roletype))
-	gs'casting','audition_schedule'
 	'Pretty girls wanted for the role of <b>Modest Cheerleader.</b>'
-	gs'casting','details'
+	gs'casting','general_details'
 	act 'Return':
 		gs'casting','clearcasting'
 		gt'casting', 'callboard'
 	end
-	act'Try out for this role':
-		gs'casting','tryout'
+	act'Talk to the receptionist':
 		$audition['role'] = 'Modest Cheerleader'
-		act'Take the script and leave':gt'talent_agency','start'
+		gt'casting','general_tryout'
 	end
 end
 
@@ -274,17 +280,15 @@ if $ARGS[0] = 'UnderwearCheerleader':
 	$costuming['outfit'] = 'underwear'
 	$costuming['underwear'] = 'kats'
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15 * rand(0,roletype))
-	gs'casting','audition_schedule'
 	'Pretty girls wanted for the role of <b>Underwear Cheerleader.</b>'
-	gs'casting','details'
+	gs'casting','general_details'
 	act 'Return':
 		gs'casting','clearcasting'
 		gt'casting', 'callboard'
 	end
-	act'Try out for this role':
-		gs'casting','tryout'
+	act'Talk to the receptionist':
 		$audition['role'] = 'Underwear Cheerleader'
-		act'Take the script and leave':gt'talent_agency','start'
+		gt'casting','general_tryout'
 	end
 end
 
@@ -296,17 +300,15 @@ if $ARGS[0] = 'ToplessCheerleader':
 	$costuming['pantytype'] = 'normal'
 	$costuming['pantydrawer'] = 'to pull out a random pair of panties'
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15*rand(0,roletype))
-	gs'casting','audition_schedule'
 	'Young pretty girl wanted for the role of <b>Topless Cheerleader 3.</b>'
-	gs'casting','details'
+	gs'casting','general_details'
 	act 'Return':
 		gs'casting','clearcasting'
 		gt'casting', 'callboard'
 	end
-	act'Try out for this role':
-		gs'casting','tryout'
+	act'Talk to the receptionist':
 		$audition['role'] = 'Topless Cheerleader 3'
-		act'Take the script and leave':gt'talent_agency','start'
+		gt'casting','general_tryout'
 	end
 end
 
@@ -315,17 +317,15 @@ if $ARGS[0] = 'HotShowerGirl':
 	$audition['type'] = 'titty'
 	$costuming['outfit'] = 'nude'
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15*rand(0,roletype))
-	gs'casting','audition_schedule'
 	'Young pretty girl wanted for the role of <b>Hot Shower Girl.</b>'
-	gs'casting','details'
+	gs'casting','general_details'
 	act 'Return':
 		gs'casting','clearcasting'
 		gt'casting', 'callboard'
 	end
-	act'Try out for this role':
-		gs'casting','tryout'
+	act'Talk to the receptionist':
 		$audition['role'] = 'Hot Shower Girl'
-		act'Take the script and leave':gt'talent_agency','start'
+		gt'casting','general_tryout'
 	end
 end
 
@@ -334,17 +334,16 @@ if $ARGS[0] = 'WerewolfGirl':
 	$audition['type'] = 'titty'
 	$costuming['outfit'] = 'nude'
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15*rand(0,roletype))
-	gs'casting','audition_schedule'
-	'Young pretty girl wanted for the role of <b>Werewolf Victim.</b>'
-	gs'casting','details'
+	audition['roletits'] = 4
+	'Big boobed girl wanted for the role of <b>Werewolf Victim.</b>'
+	gs'casting','general_details'
 	act 'Return':
 		gs'casting','clearcasting'
 		gt'casting', 'callboard'
 	end
-	act'Try out for this role':
-		gs'casting','tryout'
+	act'Talk to the receptionist':
 		$audition['role'] = 'Werewolf Victim'
-		act'Take the script and leave':gt'talent_agency','start'
+		gt'casting','general_tryout'
 	end
 end
 
@@ -354,10 +353,7 @@ if $ARGS[0] = 'DinerWaitress':
 	audition['roletype'] = 5
 	audition['room'] = rand(1,5)
 	audition['requirement'] = 50
-	$costuming['outfit1'] = 'normal_cheap'
-	$costuming['type'] = 'slutty'
-	$costuming['worntype'] = 'cheap'
-	costuming['wornnumber'] = 397
+!!	acting['costume_unique'] = 1
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15*rand(0,roletype))
 	acting['scenecount'] = 2
 	gs'casting','audition_schedule'
@@ -373,9 +369,8 @@ if $ARGS[0] = 'DinerWaitress':
 		gt'casting', 'callboard'
 	end
 	act'Try out for this role':
-		gs'casting','tryout'
 		$audition['role'] = 'Diner Waitress'
-		act'Take the script and leave':gt'talent_agency','start'
+		gs'casting','tryout'
 	end
 end
 
@@ -383,14 +378,12 @@ if $ARGS[0] = 'HotBartender':
 	audition['roletype'] = 5
 	audition['room'] = rand(1,5)
 	audition['requirement'] = 50
-	$costuming['outfit1'] = 'normal_cheap'
-	$costuming['type'] = 'slutty'
-
+!!	acting['costume_unique'] = 1
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15*rand(0,roletype))
 	acting['scenecount'] = 3
 	gs'casting','audition_schedule'
 	'Casting for the role of <b>Vera:</b> Female, 18-25'
-	'Description: Vera is an attractive bartender who tries to hook up with the main character after his girlfriend has just broken up with him. She appears again later to talk to him when he shows up at the bar later.'
+	'Description: Vera is an attractive bartender who hooks up with the main character after his girlfriend has just broken up with him. She appears again to talk to him when he shows up at the bar later.'
 	'Requires nudity: Yes'
 	'Must be comfortable with simulated sex scenes'
 	'Number of scenes: <<acting[''scenecount'']>>'
@@ -401,20 +394,18 @@ if $ARGS[0] = 'HotBartender':
 		gt'casting', 'callboard'
 	end
 	act'Try out for this role':
-		gs'casting','tryout'
 		$audition['role'] = 'Vera'
-		act'Take the script and leave':gt'talent_agency','start'
+		gs'casting','tryout'
 	end
 end
 
 if $ARGS[0] = 'SluttyClubGirl':
 	audition['roletype'] = 5
-	audition['number'] = 1
+!!	audition['number'] = 1
 	audition['room'] = rand(1,5)
 	audition['requirement'] = 60
-	$costuming['outfit'] = 'braless_pants'
-	$costuming['type'] = 'slutty'
-
+!!	acting['costume_unique'] = 1
+	audition['unique'] = 1
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15*rand(0,roletype))
 	acting['scenecount'] = 1
 	gs'casting','audition_schedule'
@@ -429,9 +420,8 @@ if $ARGS[0] = 'SluttyClubGirl':
 		gt'casting', 'callboard'
 	end
 	act'Try out for this role':
-		gs'casting','tryout'
 		$audition['role'] = 'Slutty Club Girl'
-		act'Take the script and leave':gt'talent_agency','start'
+		gs'casting','tryout'
 	end
 end
 
@@ -457,9 +447,8 @@ if $ARGS[0] = 'YulyaGavrikov':
 		gt'casting', 'callboard'
 	end
 	act'Try out for this role':
-		gs'casting','tryout'
 		$audition['role'] = 'Yulya Gavrikov'
-		act'Take the script and leave':gt'talent_agency','start'
+		gs'casting','tryout'
 	end
 end
 

+ 102 - 96
locations/costuming.qsrc

@@ -8,16 +8,16 @@ if $ARGS[0] = 'start':
 	$menu_loc = 'movie_studio'
 	$menu_arg = 'makeup'
 	menu_off = 0
-	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/makeup.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/makeup.jpg"></center>'
 	'The backstage area where you and the other actors have your makeup put on by the artists.'
 	act'Back to the entrance':gt'movie_studio','start'
 	act'Go to the sets':gt'movie_studio','sets'
 	act'Go to the showers':gt'movie_studio','showers'
 	
-	if acting['shoot_day'] = daystart:
-		if (costuming['check'] = 0 or pcs_makeup ! acting['scene_makeup']) and acting['cast'] = 1:
+	if acting['shoot_day'] = daystart and acting['jobdone'] < 2:
+		if (costuming['check'] = 0 or pcs_makeup ! acting['scene_makeup']) and $acting['role'] ! '':
 			act'Get your makeup done':gt'costuming','makeup'
-		elseif acting['finished'] = 1:
+		elseif acting['jobdone'] = 1:
 			act'Change out of your costume':
 				$lastwornclothingtype = $backup['clothingtype']
 				$lastwornclothingnumber = $backup['lastwornclothingnumber']
@@ -26,13 +26,13 @@ if $ARGS[0] = 'start':
 				$lastwornpantytype = $backup['pantytype']
 				lastwornpantynumber = $backup['pantywornnumber']
 				robe = 0
-				acting['finished'] = 2
+				acting['jobdone'] = 2
 				killvar 'costuming'
 				killvar 'backup'
 				gs 'clothing', 'wear_last_worn'
 				gt'costuming','start'
 			end
-		elseif acting['scenes_filmed'] >= 1:
+		elseif acting['scenes_filmed'] ! acting['scene_count'] and acting['jobdone'] ! 1:
 			act'Change costumes for your next scene':gt'costuming','next_scene'
 		end
 	end
@@ -43,63 +43,69 @@ if $ARGS[0] = 'makeup':
 !!	gs 'costuming','role_makeup_check'
 	gs'stat'
 	menu_off = 1
-	if costuming['check'] = acting['scene_outfit'] and $costuming['outfit'] = 'nude' and pcs_makeup ! acting['scene_makeup']:
-		minut += 30
-		pcs_hairbsh = 1
-		pcs_makeup = acting['scene_makeup']
-		pcs_lipbalm += 8
-		'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/makeup.jpg"></center>'
-		'Now that they''ve got your costume all in order, they sit you down in a chair and begin to do your makeup. They quickly get to work to put on everything that needs to be done including wigs, bruises if your character has them, or any other special makeup effect. Soon enough, you''re TV ready.'
-		*nl
-		'Once that''s done, they give you a robe to wear so you don''t have to be naked until the scene is over.'
-		act'Put on the robe':
-			robe = 1
-			gt'costuming','start'
-		end
-		!! act'Don''t put on the robe':gt'costuming','robe_skip'
-	elseif acting['body_tattoos'] = 1:
-		minut += 120
-		pcs_hairbsh = 1
-		pcs_makeup = acting['scene_makeup']
-		pcs_lipbalm += 8
-		gs 'costuming','backup_clothes'
-		gs 'clothing', 'strip'
-		gs 'underwear', 'remove'
-		acting['came_from_makeup'] = 1
-		gs 'stat'
-!!		----------------------------------------------- INSERT IMAGE LINK -------------------------------------------------------------------------------------------------------
-		'Upon arriving at makeup, they check your costume notes and see that your character has body tattoos. They have you strip naked and lay down on a cloth table. Given the nature of the tattoos and the care with which it has to be applied, it takes them an hour and a half to fake ink your body. After that''s done they sit you on a chair and spend another 30 minutes getting your hair and face straightened out.'
-		*nl
-		if $costuming['outfit'] = 'nude':
-			costuming['check'] = acting['scene_outfit']
-			'With all your makeup done, they hand you a robe to wear on your way to your nude scene and to wear it loosely to make sure you don''t smear the ink.'
-			act'Put on the robe':robe = 1 & gt'costuming','start'
+	if costuming['check'] = acting['scene_outfit']:
+		if $costuming['outfit'] = 'nude' and pcs_makeup ! acting['scene_makeup'] and acting['body_tattoos'] < 1:
+			minut += 30
+			pcs_hairbsh = 1
+			pcs_makeup = acting['scene_makeup']
+			pcs_lipbalm += 8
+			'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/makeup.jpg"></center>'
+			'Now that they''ve got your costume all in order, they sit you down in a chair and begin to do your makeup. They quickly get to work to put on everything that needs to be done including wigs, bruises if your character has them, or any other special makeup effect. Soon enough, you''re TV ready.'
+			*nl
+			'Once that''s done, they give you a robe to wear so you don''t have to be naked until the scene is over.'
+			act'Put on the robe':
+				robe = 1
+				costuming['check'] += 1
+				gt'costuming','start'
+			end
 			!! act'Don''t put on the robe':gt'costuming','robe_skip'
-		else
-			'With all your makeup done, they send you on your way to costuming.'
-			act'Go to costuming':gt'costuming','costume_check'
+		elseif acting['body_tattoos'] = 1:
+			minut += 120
+			pcs_hairbsh = 1
+			pcs_makeup = acting['scene_makeup']
+			pcs_lipbalm += 8
+			gs 'costuming','backup_clothes'
+			gs 'clothing', 'strip'
+			gs 'underwear', 'remove'
+			acting['came_from_makeup'] = 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/back_tattoo.jpg"></center>'
+			'Upon arriving at makeup, they check your costume notes and see that your character has body tattoos. They have you strip naked and lay down on a cloth table. Given the nature of the tattoos and the care with which it has to be applied, it takes them an hour and a half to fake ink your body. After that''s done they sit you on a chair and spend another 30 minutes getting your hair and face straightened out.'
+			*nl
+			if $costuming['outfit'] = 'nude':
+				costuming['check'] += 1
+				costuming['check'] = acting['scene_outfit']
+				'With all your makeup done, they hand you a robe to wear on your way to your nude scene and to wear it loosely to make sure you don''t smear the ink.'
+				act'Put on the robe':robe = 1 & gt'costuming','start'
+				!! act'Don''t put on the robe':gt'costuming','robe_skip'
+			else
+				'With all your makeup done, they send you on your way to costuming.'
+				act'Go to costuming':gt'costuming','costume_check'
+			end
+		elseif acting['scene_outfit'] > 1 and pcs_makeup ! acting['scene_makeup']:
+			minut += 15
+			costuming['check'] += 1
+			pcs_hairbsh = 1
+			pcs_makeup = acting['scene_makeup']
+			'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/makeup.jpg"></center>'
+			'You get sat down back in front of the mirrors so they can adjust your makeup for the next scene.'
+			*nl
+			'15 minutes later, you''re all adjusted and good to go.'
+			act'Finish':gt'costuming','start'
+		elseif acting['scene_outfit'] > 1 and pcs_makeup = acting['scene_makeup']:
+			'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/makeup.jpg"></center>'
+			'You get sent back to makeup where they double check you one more time to make sure you''re right for your next scene. They decide that everything still looks fine and you can go to back to filming for your next scene.'
+			act'Finish':gt'costuming','start'
+		elseif pcs_makeup ! acting['scene_makeup']:
+			minut += 30
+			pcs_hairbsh = 1
+			pcs_makeup = acting['scene_makeup']
+			pcs_lipbalm += 8
+			costuming['check'] += 1
+			'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/makeup.jpg"></center>'
+			'Now that they''ve got your costume all in order, they sit you down in a chair and begin to do your makeup. They quickly get to work to put on everything that needs to be done including wigs, distinguishing features your character has and any other special makeup effect. Soon enough, you''re TV ready.'
+			act'Finish':gt'costuming','start'
 		end
-	elseif costuming['check'] = acting['scene_outfit'] and pcs_makeup ! acting['scene_makeup']:
-		minut += 30
-		pcs_hairbsh = 1
-		pcs_makeup = acting['scene_makeup']
-		pcs_lipbalm += 8
-		'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/makeup.jpg"></center>'
-		'Now that they''ve got your costume all in order, they sit you down in a chair and begin to do your makeup. They quickly get to work to put on everything that needs to be done including wigs, bruises if your character has them, or any other special makeup effect. Soon enough, you''re TV ready.'
-		act'Finish':gt'costuming','start'
-	elseif costuming['check'] = acting['scene_outfit'] and pcs_makeup ! acting['scene_makeup']:
-		minut += 15
-		pcs_hairbsh = 1
-		pcs_makeup = acting['scene_makeup']
-		'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/makeup.jpg"></center>'
-		'You get sat down back in front of the mirrors so they can adjust your makeup for the next scene.'
-		*nl
-		'15 minutes later, you''re all adjusted and good to go.'
-		act'Finish':gt'costuming','start'
-	elseif costuming['check'] = acting['scene_outfit'] and pcs_makeup = acting['scene_makeup']:
-		'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/makeup.jpg"></center>'
-		'You get sent back to makeup where they double check you one more time to make sure you''re right for your next scene. They decide that everything still looks fine and you can go to back to filming for your next scene.'
-		act'Finish':gt'costuming','start'
 	else
 		'The makeup artists want you dressed before applying your makeup and send you to costuming.'
 		act'Go to costuming':gt'costuming','costume_check'
@@ -130,7 +136,7 @@ end
 
 if $ARGS[0] = 'costume_check':
 	if $backup['clothingtype'] ! '':gs 'costuming','backup_clothes'
-	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/costuming.jpg"></center>'
 	if $costuming['outfit'] = 'nude':
 		gs 'clothing', 'strip'
 		gs 'underwear', 'remove'
@@ -155,11 +161,9 @@ if $ARGS[0] = 'costume_check':
 end
 
 if $ARGS[0] = 'costume_dress':
-	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming.jpg"></center>'
-	
-	gs'costuming_outfits','start'
-	
-	if acting['came_from_makeup'] > 0:
+	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/costuming.jpg"></center>'
+		
+	if pcs_makeup ! acting['scene_makeup']:
 		act'Get dressed': gt'costuming','costume_end'
 	else
 		act'Get dressed and go back to makeup':gt'costuming','makeup'
@@ -174,30 +178,31 @@ end
 
 
 if $ARGS[0] = 'nude_costume':
-	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming.jpg"></center>'
-	if costuming['check'] > 1 and costuming['check'] = acting['scene_outfit']:
-		'You head back into the costume department and take off your clothes, handing them back to the people you got them from.'
+	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/costuming.jpg"></center>'
+	if acting['scene_outfit'] > 0:
+		'Your next scene is a nude scene so you head back into the costume department and take off your clothes, returning them to the people you got them from. They give you a robe for modesty and send you back to makeup'
 	else
 		'You quickly undress and one of the workers in the department takes your clothes from you to take care of while you''re filming.'
+		*nl
+		if $backup['bratype'] = '' and $braworntype ! 'none' and $backup['pantytype'] = '' and $pantyworntype ! 'none':
+			$backup['bratype'] = $lastwornbratype
+			$backup['branumber'] = brawornnumber
+			$backup['pantytype'] = $lastwornpantytype
+			$backup['pantynumber'] = pantywornnumber
+			'You also hand off your underwear but since that actually belongs to you, they put it in the bin with the rest of your clothes.'
+		elseif $backup['bratype'] = '' and $braworntype ! 'none':
+			$backup['bratype'] = $lastwornbratype
+			$backup['branumber'] = brawornnumber
+			'You also hand off your bra but since that actually belongs to you, they put it in the bin with the rest of your clothes.'
+		elseif $backup['pantytype'] = '' and $pantyworntype ! 'none':
+			$backup['pantytype'] = $lastwornpantytype
+			$backup['pantynumber'] = pantywornnumber
+			'You also hand off your panties but since those actually belong to you, they put them in the bin with the rest of your clothes.'
+		end
+		*nl
+		'Once you''ve stripped down completely they hand you a robe and send you back to makeup.'
 	end
-	*nl
-	if $backup['bratype'] = '' and $braworntype ! 'none' and $backup['pantytype'] = '' and $pantyworntype ! 'none':
-		$backup['bratype'] = $lastwornbratype
-		$backup['branumber'] = brawornnumber
-		$backup['pantytype'] = $lastwornpantytype
-		$backup['pantynumber'] = pantywornnumber
-		'You also hand off your underwear but since that actually belongs to you, they put it in the bin with the rest of your clothes.'
-	elseif $backup['bratype'] = '' and $braworntype ! 'none':
-		$backup['bratype'] = $lastwornbratype
-		$backup['branumber'] = brawornnumber
-		'You also hand off your bra but since that actually belongs to you, they put it in the bin with the rest of your clothes.'
-	elseif $backup['pantytype'] = '' and $pantyworntype ! 'none':
-		$backup['pantytype'] = $lastwornpantytype
-		$backup['pantynumber'] = pantywornnumber
-		'You also hand off your panties but since those actually belong to you, they put them in the bin with the rest of your clothes.'
-	end
-	*nl
-	'Once you''ve stripped down completely they send you back to makeup.'
+	
 	gs 'stat'
 	costuming['check'] = acting['scene_outfit']
 	act'Put on the robe':
@@ -218,7 +223,7 @@ if $ARGS[0] = 'panty_react':
 end
 
 if $ARGS[0] = 'panty_costume':
-	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/costuming.jpg"></center>'
 	if $pantyworntype = 'none' and costuming['check'] < 1:
 		if costuming['pantynumber'] = '':
 			if $costuming['panties'] = 'cheap':
@@ -235,10 +240,11 @@ if $ARGS[0] = 'panty_costume':
 		end
 		costuming['return_panties'] = 1
 		costuming['check'] = acting['scene_outfit']
+		'"So it looks like your scene today calls for some panties. Whatever you''re wearing ought to be fine, so...'
 		'As you begin to strip down, you suddenly remember that the scene calls for you to wear panties and you... don''t happen to have any today...'
 		act'Ask to borrow some panties (embarrassed)':
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/makeup.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/makeup.jpg"></center>'
 			'You catch the attention of a girl passing by and whisper to her.'
 			'"Hey... uhh, listen, I actually am supposed to be wearing panties for my scene and I uhmm... don''t have any with me today... Can I borrow some?"'
 			'The girl gives you an amused look and reaches into a nearby drawer <<$costuming[''pantydrawer'']>> and hands it to you.'
@@ -248,7 +254,7 @@ if $ARGS[0] = 'panty_costume':
 		end
 		act'Ask to borrow some panties (slutty)':
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/panty_borrow.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/panty_borrow.jpg"></center>'
 			if CloPanties = 1 or CloPantsShortness > 0:
 				'A girl passes by and you try to catch her attention. She turns towards you, you call out, "Hey can I borrow some panties? I''m supposed to wear some for the scene but I didn''t put any on today," you grin as you drop your pants and bare your pussy to the room.'
 			elseif CloDress = 1:
@@ -296,19 +302,19 @@ if $ARGS[0] = 'panty_costume':
 			end
 			act'Blush hard':
 				cla & *clr
-				'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/makeup.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/makeup.jpg"></center>'
 				'Your face flushes with heat as it turns beet red but otherwise don''t say anything while she rummages aroundin a drawer to find you an appropriate pair of panties to put on. She hands them to you, sternly saying, "Remember to return these," before walking away shaking her head.'
 				act'Back to makeup':gt'costuming','costume_end'
 			end
 			act'Smile shyly':
 				cla & *clr
-				'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/panty_borrow.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/panty_borrow.jpg"></center>'
 				'You give a shy smile but otherwise don''t say anything as she rummages around in a drawer to find you an appropriate pair of panties to wear for your scene. She hands them to you, sternly saying, "Remember to return these," before walking away shaking her head.'
 				act'Back to makeup':gt'costuming','costume_end'
 			end
 			act'I like it this way':
 				cla & *clr
-				'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/panty_borrow.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/panty_borrow.jpg"></center>'
 				'"I like the breeze, what can I say?"'
 				'You smirk back and shrug shamelessly. She scoffs in disgust and hands you a pair of panties to put on sternly saying, "Remember to return these."'
 				'"I''ll try not to lose them before I get back here," you reply as you slip them on. She rolls her eyes again and shoos you back to makeup.'
@@ -357,8 +363,8 @@ end
 
 if $ARGS[0] = 'costume_end':
 	costuming['check'] = acting['scene_outfit']
-	if acting['came_from_makeup'] = 1:
-		'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/makeup.jpg"></center>'
+	if pcs_makeup = acting['scene_makeup']:
+		'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/makeup.jpg"></center>'
 		'You get dressed and head back to makeup where they quickly do one final check to make sure you''re all set.'
 		*nl
 		'Satisfied, they release you to film your scene.'

+ 134 - 21
locations/costuming_outfits1.qsrc

@@ -1,48 +1,161 @@
 # costuming_outfits1
 
 if $ARGS[0] = 'start':
-	!! ----- extra roles -------------------
-	if $acting['role'] = 'Spring Break Flasher':gs'costuming_outfits','HotBartender'
-	if $acting['role'] = 'Vera':gs'costuming_outfits','HotBartender'
-	if $acting['role'] = 'Vera':gs'costuming_outfits','HotBartender'
-	if $acting['role'] = 'Vera':gs'costuming_outfits','HotBartender'
-	!! ----- minor roles ------------------
-	if $acting['role'] = 'Diner Waitress':gs'costuming_outfits','DinerWaitress'
-	if $acting['role'] = 'Slutty Club Girl':gs'costuming_outfits','SluttyClubGirl'
-	if $acting['role'] = 'Vera':gs'costuming_outfits','HotBartender'
+	if acting['costume_unique'] = 1:
+
+		!! ----- extra roles -------------------
+		if $acting['role'] = 'Spring Break Flasher':gs'costuming_outfits','SpringBreakFlasher'
+	!!	if $acting['role'] = 'Vera':gs'costuming_outfits','HotBartender'
+	!!	if $acting['role'] = 'Vera':gs'costuming_outfits','HotBartender'
+	!!	if $acting['role'] = 'Vera':gs'costuming_outfits','HotBartender'
+		!! ----- minor roles ------------------
+		if $acting['role'] = 'Diner Waitress':gs'costuming_outfits','DinerWaitress'
+		if $acting['role'] = 'Slutty Club Girl':gs'costuming_outfits','SluttyClubGirl'
+		if $acting['role'] = 'Vera':gs'costuming_outfits','HotBartender'
+		
+		
+	else
+		!! if there is no specific outfit assigned, player will be given a random one from a corresponding shop
+		
+		if $acting['outfit_type'] = 'gm_outfits':
+			gs 'clothing', 'wear', 'gm_outfits', rand(1,150)
+			'Put you in some cheap casual clothes'
+			
+		elseif $acting['outfit_type'] = 'gm_dress':
+			gs 'clothing', 'wear', 'gm_dress', rand(1,50)
+			'Put you in a cheap casual outfit with a skirt'
+		elseif $acting['outfit_type'] = 'cats_outfits':
+			gs 'clothing', 'wear', 'cats_outfits', rand(1,100)
+			'They give you some girly clothes to wear with tight pants that really emphasize your ass.'
+		elseif $acting['outfit_type'] = 'cats_dress':
+			gs 'clothing', 'wear', 'cats_dress', rand(1,110)
+			'They give you a girly outfit with a skirt to wear.'
+		elseif $acting['outfit_type'] = 'coco_outfits':
+			gs 'clothing', 'wear', 'coco_outfits', rand(1,90)
+			'They give you a trendy outfit to wear.'
+		elseif $acting['outfit_type'] = 'coco_dress':
+			gs 'clothing', 'wear', 'coco_dress', rand(1,100)
+			'They give you a trendy outfit with a skirt to wear.'
+		elseif $acting['outfit_type'] = 'bomba_outfits':
+			gs 'clothing', 'wear', 'bomba_outfits', rand(1,50)
+			'They give you a goth girl outfit to wear.'
+		elseif $acting['outfit_type'] = 'bomba_dress':
+			gs 'clothing', 'wear', 'bomba_dress', rand(1,70)
+			'They give you a goth girl outfit with a skirt to wear.'
+		elseif $acting['outfit_type'] = 'dolls_outfits':
+			gs 'clothing', 'wear', 'dolls_outfits', rand(1,50)
+			
+		elseif $acting['outfit_type'] = 'dolls_dress':
+			gs 'clothing', 'wear', 'dolls_dress', rand(1,110)
+			
+		elseif $acting['outfit_type'] = 'eroto_outfits':
+			gs 'clothing', 'wear', 'eroto_outfits', rand(1,100)
+			
+		elseif $acting['outfit_type'] = 'eroto_dress':
+			gs 'clothing', 'wear', 'eroto_dress', rand(1,120)
+			
+		elseif $acting['outfit_type'] = 'flamingos_outfits':
+			gs 'clothing', 'wear', 'flamingos_outfits', rand(1,50)
+			
+		elseif $acting['outfit_type'] = 'flamingos_dress':
+			gs 'clothing', 'wear', 'flamingos_dress', rand(1,90)
+			
+		elseif $acting['outfit_type'] = 'moncheri_dress':
+			gs 'clothing', 'wear', 'moncheri_dress', rand(1,80)
+		
+		elseif $acting['outfit_type'] = 'moncheri_gown':
+			gs 'clothing', 'wear', 'moncheri_gown', rand(1,160)
+			
+		elseif $acting['outfit_type'] = 'nerdvana_outfits':
+			gs 'clothing', 'wear', 'nerdvana_outfits', rand(1,60)
+			
+		elseif $acting['outfit_type'] = 'fashionista_dress':
+			gs 'clothing', 'wear', 'bomba_outfits', rand(1,200)
+			
+		elseif $acting['outfit_type'] = 'danilovich_outfits':
+			gs 'clothing', 'wear', 'bomba_outfits', rand(1,170)
+			
+		elseif $acting['outfit_type'] = 'salacious_outfits':
+			gs 'clothing', 'wear', 'flamingos_outfits', rand(1,20)
+			
+		elseif $acting['outfit_type'] = 'salacious_dress':
+			gs 'clothing', 'wear', 'flamingos_dress', rand(1,150)
+		
+		elseif $acting['outfit_type'] = 'scandalicious_outfits':
+			gs 'clothing', 'wear', 'flamingos_outfits', rand(1,20)
+			
+		elseif $acting['outfit_type'] = 'scandalicious_dress':
+			gs 'clothing', 'wear', 'flamingos_dress', rand(1,50)
+		
+		
+		!!REMINDER: add swimwear
+		
+		
+		end
+		
+!!{		
+		if $acting['costume_underwear'] = 'none':
+			
+		elseif $acting['costume_underwear'] = 'braless':
+			if $braworntype ! 'none':
+				gs 'bras','remove'
+				
+			else
+				if $costuming['panties'] = 'fashionista':
+			
+			end
+		elseif $acting['costume_underwear'] = 'pantyless':
+		
+		else
+		
+		end
+		
+	end
+}
 	
+	costuming['check'] = acting['scene_outfit']
 end
 !! ------------------------------------------- Extra Roles -------------------------------------------
+if $ARGS[0] = 'SpringBreakFlasher':
+	gs 'clothing', 'wear', 'gm_outfits', 149
+	gs 'bras','remove'
+	costuming['check'] = acting['scene_outfit']
+	if $braworntype ! 'none':
+		'They give you an outfit with a bright yellow top, thin enough for your nipples to poke through on a warm day. The costume notes say that you''re supposed to be braless so they take yours from you with the rest of your clothing and leave you to get into costume.'
+	else
+		'They give you an outfit with a bright yellow top, thin enough for your nipples to poke through on a warm day. They take your clothing from you for safe keeping and leave you to get into costume.'
+	end
+end
+
 if $ARGS[0] = 'UndressingLockerGirl':
-	gs 'clothing', 'wear', 'exercise', 90
+	gs 'clothing', 'wear', 'danilovich_outfits', 90
 	gs 'panties','wear', 'fashionista', 66
 	gs 'bras','remove'
 	costuming['check'] = acting['scene_outfit']
 	if $braworntype ! 'none':
-		'They give some athletic clothes, the kind a teenage schoolgirl might wear during gym class. In addition, they give you a colorful thong to wear. The costume notes specifically state that you''re supposed to be braless so they take yours from you with the rest of your clothing for safe keeping.'
+		'They give some athletic clothes, the kind a teenage schoolgirl might wear during gym class. In addition, they give you a colorful thong to wear. The costume notes say that you''re supposed to be braless so they take yours from you with the rest of your things and leave you to get into costume.'
 	else
-		'They give some athletic clothes, the kind a teenage schoolgirl might wear during gym class. In addition, they give you a colorful thong to wear. While you undress they take the rest of your clothing for safe keeping.'
+		'They give some athletic clothes, the kind a teenage schoolgirl might wear during gym class. In addition, they give you a colorful thong to wear. After taking your things for safe keeping, they leave you to get into costume.'
 	end
 end
 
 !! ------------------------------------------- Minor Roles -------------------------------------------
 if $ARGS[0] = 'DinerWaitress':
-	gs 'clothing', 'wear', 'cheap', 397
+	gs 'clothing', 'wear', 'nerdvana_outfits', 17
 	acting['scene_makeup'] = 3
 	costuming['check'] = acting['scene_outfit']
-	'They give you cheap casual clothes to put on, ones that are suitable for your role as a waitress on the midnight shift at a diner. While you undress, they take your discarded clothing for safekeeping.'
+	'They give you cheap casual clothes to put on, ones that are suitable for your role as a waitress on the midnight shift at a diner. After taking your things for safe keeping, they leave you to get into costume.'
 end
 
 if $ARGS[0] = 'HotBartender':
 	if acting['scene_outfit'] = 2:
-		gs 'clothing', 'wear', 'average', 22
+		gs 'clothing', 'wear', 'coco_outfits', 3
 		acting['scene_makeup'] = 4
 		costuming['check'] = acting['scene_outfit']
 	elseif acting['scene_outfit'] = 3:
 		
 	else
-	!!	PICK OUTFIT
-		gs 'clothing', 'wear', 'cheap', 218
+		gs 'clothing', 'wear', 'gm_dress', 38
 		acting['scene_makeup'] = 4
 		costuming['check'] = acting['scene_outfit']
 		
@@ -53,12 +166,12 @@ end
 if $ARGS[0] = 'SluttyClubGirl':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming.jpg"></center>'
 	if $braworntype ! 'none':
-		'They give you a thin top with spaghetti straps to wear, something that a trendy girl might wear to a club. The costume notes specifically state that you''re supposed to be braless so they take yours from you with the rest of your clothing for safe keeping.'
+		gs 'bras','remove'
+		'They give you a thin top with spaghetti straps to wear, something that a trendy girl might wear to a club. The costume notes say that you''re supposed to be braless so they take yours from you with the rest of your clothing and leave you to get into costume.'
 	else
-		'They give you a thin top with spaghetti straps to wear, something that a trendy girl might wear to a club. While you undress they take the rest of your clothing for safe keeping.'
+		'They give you a thin top with spaghetti straps to wear, something that a trendy girl might wear to a club. After taking your things for safe keeping, they leave you to get into costume.'
 	end
-	gs 'clothing', 'wear', 'kats', 209
-	gs 'bras','remove'
+	gs 'clothing', 'wear', 'coco_outfits', 60
 	acting['scene_makeup'] = 4
 	costuming['check'] = acting['scene_outfit']
 end

+ 1 - 1
locations/movie_studio.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'sets':
 	act 'Go to makeup':gt'costuming','start'
 	act 'Go to the payment center':gt'movie_studio','paycenter'
 	!!act 'Go to the bathroom':gt'movie_studio','bathroom' 
-	if acting['cast'] = 1 and acting['jobdone'] ! 1 and acting['shoot_day'] = daystart:
+	if $acting['role'] ! '' and acting['jobdone'] ! 1 and acting['shoot_day'] = daystart:
 		act'Go to set <<acting[''setnumber'']>>':
 			if costuming['check'] < 1:
 				cla & *clr

+ 113 - 14
locations/talent_agency.qsrc

@@ -1,10 +1,29 @@
 # talent_agency
 
+!! Job Categories:
+!! audition['roletype'] = 1 - Just a background extra
+!! audition['roletype'] = 2 - An extra that appears in skimpy clothing or underwear
+!! audition['roletype'] = 3 - An extra with one or more nude scenes
+!! audition['roletype'] = 4 - A minor speaking part
+!! audition['roletype'] = 5 - A minor speaking part with a nude scene
+!! audition['roletype'] = 6 - A secondary or recurring character
+!! audition['roletype'] = 7 - A secondary or recurring character with nude scenes
+!! audition['roletype'] = 8 - A main character
+!! audition['roletype'] = 9 - A main character with nude scenes
+
+!! Stat variables
+!! pcs_perform - player''s total skill in their ability to act
+!! scene_prep - represents work done at home to prepare for the audition and the actual filming of the scene
+!! audition['day'] - the day of your audition
+!! actress_cast = 1 - the player is currently cast in a role
+
 if $ARGS[0] = 'start':
 	cls
 	minut += 5
 	$menu_loc = 'talent_agency'
 	$menu_arg = 'start'
+	$loc = 'talent_agency'
+	$loc_arg = 'start'
 	menu_off = 0
 	gs 'stat'
 	gs 'themes', 'indoors'
@@ -24,10 +43,18 @@ if $ARGS[0] = 'start':
 !!	end
 	!!act 'Ask about auditions': gt 'talent_agency', 'audition'
 	act 'Go to the interview rooms':gt'talent_agency', 'hallway'
+	if audition['day'] = '' and actress_cast = 0:
+		act'Check the callboard':gt'casting','callboard'
+	elseif audition['day'] > 0:
+		act'Check the callboard':msg'You can''t tryout for more roles when you already have an audition lined up. You should back after the audition is over.'
+	elseif actress_cast > 0:
+		act'Check the callboard':msg'You can''t tryout for more roles while you already have one. You should come back once filming is finished.'
+	end
 end
 
-if $ARGS[0] = 'jobs':
-	*clr & cla
+
+!!if $ARGS[0] = 'jobs':
+!!	*clr & cla
 !! IMAGE GOES HERE
 !!	'The jobs are displayed on a bulletin board'
 !! The mid function is used to identify a single digit, don''t use 1,1 as that is there just to ensure the numbers all generate
@@ -46,29 +73,76 @@ if $ARGS[0] = 'jobs':
 !!			act 'Return': gt'talent_agency', 'start'
 !!		end
 !!	end
-end
+!!end
 
 if $ARGS[0] = 'hallway':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/hallway.jpg"></center>'
 	act 'Leave':gt 'talent_agency','start'
-	act 'Room 1':gt 'talent_agency','room', 1
-	act 'Room 2':gt 'talent_agency','room', 2
-	act 'Room 3':gt 'talent_agency','room', 3
-	act 'Room 4':gt 'talent_agency','room', 4
-	act 'Room 5':gt 'talent_agency','room', 5
+	act 'Room 1':gt 'talent_agency','room1'
+	act 'Room 2':gt 'talent_agency','room2'
+	act 'Room 3':gt 'talent_agency','room3'
+	act 'Room 4':gt 'talent_agency','room4'
+	act 'Room 5':gt 'talent_agency','room5'
+	act 'General Audition Room':gt 'talent_agency','room6'
 end
 
-if $ARGS[0] = 'audition':
+if $ARGS[0] = 'room1':
 	*clr & cla
-	'<center><video autoplay loop src="images/locations/city/citycenter/aurora/auditions/wrong/12.mp4"></video></center>'
-	act 'Leave':gt 'talent_agency','start'
+	if audition['room'] ! 1 or audition['day'] ! daystart: 
+		gt'talent_agency','wrong_room'
+	else
+		gt'auditions','setup'
+	end
+end
+
+if $ARGS[0] = 'room2':
+	*clr & cla
+	if audition['room'] ! 2 or audition['day'] ! daystart:
+		gt'talent_agency','wrong_room'
+	else
+		gt'auditions','setup'
+	end
+end
+
+if $ARGS[0] = 'room3':
+	*clr & cla
+	if casting = 3: 
+		gt'talent_agency','SMTV_intro'
+	elseif audition['room'] ! 3 or audition['day'] ! daystart:
+		gt'talent_agency','wrong_room'
+	else
+		gt'auditions','setup'
+	end
 end
 
-if $ARGS[0] = 'room':
+if $ARGS[0] = 'room4':
 	*clr & cla
-	if room ! ARGS[1]: gt'talent_agency','wrong_room'
-	if casting = 3: gt'talent_agency','SMTV_intro'
+	if audition['room'] ! 4 or audition['day'] ! daystart:
+		gt'talent_agency','wrong_room'
+	else
+		gt'auditions','setup'
+	end
+end
+
+if $ARGS[0] = 'room5':
+	*clr & cla
+	if audition['room'] ! 5 or audition['day'] ! daystart:
+		gt'talent_agency','wrong_room'
+	else
+		gt'auditions','setup'
+	end
+end
+
+if $ARGS[0] = 'room6':
+	*clr & cla
+	if room > 0 and room =< 5:
+		gt'talent_agency','wrong_room2'
+	elseif $audition['role'] = '':
+		gt'talent_agency','wrongday'
+	else
+		gt'auditions','setup'
+	end
 end
 
 if $ARGS[0] = 'end':
@@ -76,9 +150,34 @@ if $ARGS[0] = 'end':
 	gt 'talent_agency','start'
 end
 
+if $ARGS[0] = 'wrongday':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
+	'You poke your head into the room and see someone at a desk reviewing papers while people bustle in and out. They look up at you.'
+	'"Yes?"'
+	'"Hi, uhh, is this the audition for <<$role>>?"'
+	'"No, this isn''t the audition for that," they say as they look back at you with annoyance." "You have the day wrong. Go check your time for casting again."'
+	'Cringing with embarrassment, you apologize and leave the room.'
+	act'Leave':gt'talent_agency','hallway'
+end
+
+if $ARGS[0] = 'wrong_room2':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
+	'You poke your head into the room and see someone at a desk reviewing papers while people bustle in and out. They look up at you.'
+	'"Yes?"'
+	'"Hi, uhh, is this the audition for <<$role>>?"'
+	'"No, that''s a speaking role, we don''t do auditions for those in here. Try one of the other rooms."'
+	'Cringing with embarrassment, you apologize and leave the room.'
+	act'Leave':gt'talent_agency','hallway'
+end
+
+
 
 if $ARGS[0] = 'SMTV_intro':
 	*clr & cla
+	$actresslife['Yanovich'] = 1
+	$actresslife['SMTV_commercial'] = 1
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	'You enter the interview room, and someone is there waiting for you.'
 	'"Ahh! Hello! You must be Miss <<$pcs_lastname>>. I''m Artur Yanovich. But you can call me Mr. Yanovich," he says, holding out his hand.'