Browse Source

[fixed] split time and makeup checks so that you get correct message, error spotted by Regularity

Kevin_Smarts 9 months ago
parent
commit
b904b01e6f
1 changed files with 79 additions and 74 deletions
  1. 79 74
      locations/stwork.qsrc

+ 79 - 74
locations/stwork.qsrc

@@ -75,102 +75,107 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if (mc_inventory['cosmetics'] >= 3 or pcs_makeup >= 4) and (hour >= 11 or hour <= 2):
-		act 'Prepare for your show':
-			*clr & cla
-			if pcs_sweat >= 20 or (pcs_leghair > 3 or ((pcs_pubes > 3 and pubestyle = 1) or (pubestyle >= 2 and pubestyle <=7) and pcs_pubes > 11)):
-				dynamic $showerdin
-				minut += 5
-				'<h3>Staff Bathroom</h3>'
-				'<h5>Shower</h5>'
-				'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelshower.jpg"></center>'
-				dynamic $brit
-				*nl
-				'After stripping from your clothes, you gather up your towel, washcloth and soap and head to the shower, where you thoroughly wash yourself.'
-				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-			end
-			if pcs_makeup < 4:
-				gs 'exp_gain', 'makupskl', rand(1,3)
-				mc_inventory['cosmetics'] -= 3
-				vidageday -= 1
-				pcs_makeup = 4
-				minut += 5
-				'You brush your hair and put on heavy makeup for the customers.'
-			end
-			pcs_hairbsh = 1
-			!!gs 'clothing', 'wear_last_worn'
-			!!'You put your clothes back on before heading back onto the stage.'
-			if pcs_leghair <= 3:
-				if fingal <= 0:
-					if strippermission = 0:
-						act 'Go to the manager':
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripinspection.jpg"></center>'
-							'Before going on stage, you head to the manager''s office for your inspection.'
-							if $clothingworntype ! 'nude':
-								'"Take off your clothes," he sternly demands.'
-								'Once you''re done undressing, he walks up to you and inspects you closely.'
-								if pcs_sweat < 20:
-									'"Good, you have a clean scent. That is very important in this business."'
-									'He briefly runs his hand over your legs.'
-									if pcs_leghair <= 3:
-										'"Smooth legs. Very good."'
-										'He walks around you, looking you up and down from every side.'
-										if fingal <= 0:
-											'"No bruises. Good. The better you look, the easier it is to make money once you''re on that stage."'
-											'"And the last thing. I need to check if you''ve rid yourself of all your pubic hair."'
-											'He places his hand on your mound and slowly starts rubbing it, taking a little longer than he did on your legs.'
-											'You feel your pussy get a little wet from his touch and hope that he doesn''t notice.'
-											gs 'arousal', 'foreplay', 2
-											gs 'stat'
-											!! This allows different pubic styles but anything from small bush up is still not permitted.
-											if (pubestyle = 1 and pcs_pubes <= 3) or lashair = 1:
-												strippermission = 1
-												'"Very smooth. Good. Looks like you''re ready to get on the stage. You can get to work," he says and ushers you out of his office.'
-												stpredmet = 3
-												act 'Go back stage': gt 'stwork2', 'strip'
-											elseif ((pubestyle >= 2 and pubestyle <=7) or (pubestyle >= 12 and pubestyle <=14)) and pcs_pubes <= 25:
-												strippermission = 1
-												'"Very cute pubic hair, I''m sure the customers will appreciate it. Now get on stage. You can work," he says and ushers you out of his office.'
-												stpredmet = 3
-												act 'Go back stage': gt 'stwork2', 'strip'
+	if 	hour >= 11 or hour <= 2:
+		if (mc_inventory['cosmetics'] >= 3 or pcs_makeup >= 4):
+			act 'Prepare for your show':
+				*clr & cla
+				if pcs_sweat >= 20 or (pcs_leghair > 3 or ((pcs_pubes > 3 and pubestyle = 1) or (pubestyle >= 2 and pubestyle <=7) and pcs_pubes > 11)):
+					dynamic $showerdin
+					minut += 5
+					'<h3>Staff Bathroom</h3>'
+					'<h5>Shower</h5>'
+					'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelshower.jpg"></center>'
+					dynamic $brit
+					*nl
+					'After stripping from your clothes, you gather up your towel, washcloth and soap and head to the shower, where you thoroughly wash yourself.'
+					if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+				end
+				if pcs_makeup < 4:
+					gs 'exp_gain', 'makupskl', rand(1,3)
+					mc_inventory['cosmetics'] -= 3
+					vidageday -= 1
+					pcs_makeup = 4
+					minut += 5
+					'You brush your hair and put on heavy makeup for the customers.'
+				end
+				pcs_hairbsh = 1
+				!!gs 'clothing', 'wear_last_worn'
+				!!'You put your clothes back on before heading back onto the stage.'
+				if pcs_leghair <= 3:
+					if fingal <= 0:
+						if strippermission = 0:
+							act 'Go to the manager':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripinspection.jpg"></center>'
+								'Before going on stage, you head to the manager''s office for your inspection.'
+								if $clothingworntype ! 'nude':
+									'"Take off your clothes," he sternly demands.'
+									'Once you''re done undressing, he walks up to you and inspects you closely.'
+									if pcs_sweat < 20:
+										'"Good, you have a clean scent. That is very important in this business."'
+										'He briefly runs his hand over your legs.'
+										if pcs_leghair <= 3:
+											'"Smooth legs. Very good."'
+											'He walks around you, looking you up and down from every side.'
+											if fingal <= 0:
+												'"No bruises. Good. The better you look, the easier it is to make money once you''re on that stage."'
+												'"And the last thing. I need to check if you''ve rid yourself of all your pubic hair."'
+												'He places his hand on your mound and slowly starts rubbing it, taking a little longer than he did on your legs.'
+												'You feel your pussy get a little wet from his touch and hope that he doesn''t notice.'
+												gs 'arousal', 'foreplay', 2
+												gs 'stat'
+												!! This allows different pubic styles but anything from small bush up is still not permitted.
+												if (pubestyle = 1 and pcs_pubes <= 3) or lashair = 1:
+													strippermission = 1
+													'"Very smooth. Good. Looks like you''re ready to get on the stage. You can get to work," he says and ushers you out of his office.'
+													stpredmet = 3
+													act 'Go back stage': gt 'stwork2', 'strip'
+												elseif ((pubestyle >= 2 and pubestyle <=7) or (pubestyle >= 12 and pubestyle <=14)) and pcs_pubes <= 25:
+													strippermission = 1
+													'"Very cute pubic hair, I''m sure the customers will appreciate it. Now get on stage. You can work," he says and ushers you out of his office.'
+													stpredmet = 3
+													act 'Go back stage': gt 'stwork2', 'strip'
+												else
+													'"You need to shave everything off <<$pcs_stagename>>, although a small and cute pubic style is popular at the moment if you feel creative." He smiles and pats you on the ass as he says "Go take care of that and then come back."'
+													act 'Go to the dressing room': gt 'stwork', 'start'
+												end
 											else
-												'"You need to shave everything off <<$pcs_stagename>>, although a small and cute pubic style is popular at the moment if you feel creative." He smiles and pats you on the ass as he says "Go take care of that and then come back."'
+												'"I can''t let you up on the stage with a black eye like that. You''ll have to wait until it''s gone. Come back when it''s healed."'
 												act 'Go to the dressing room': gt 'stwork', 'start'
 											end
 										else
-											'"I can''t let you up on the stage with a black eye like that. You''ll have to wait until it''s gone. Come back when it''s healed."'
+											'"Shave your legs! A customer doesn''t want to feel any stubble during a lap dance. Go take care of that and then come back."'
 											act 'Go to the dressing room': gt 'stwork', 'start'
 										end
 									else
-										'"Shave your legs! A customer doesn''t want to feel any stubble during a lap dance. Go take care of that and then come back."'
+										'"Damn it <<$pcs_stagename>>, you stink! Go and take a shower. We can''t have the club smelling like a locker room."'
 										act 'Go to the dressing room': gt 'stwork', 'start'
 									end
 								else
-									'"Damn it <<$pcs_stagename>>, you stink! Go and take a shower. We can''t have the club smelling like a locker room."'
+									'You can''t do a striptease if you haven''t got any clothes to strip out of <<$pcs_stagename>>. Find something sexy in the wardrobe first.'
 									act 'Go to the dressing room': gt 'stwork', 'start'
 								end
-							else
-								'You can''t do a striptease if you haven''t got any clothes to strip out of <<$pcs_stagename>>. Find something sexy in the wardrobe first.'
-								act 'Go to the dressing room': gt 'stwork', 'start'
+							end
+						else
+							act 'Go back stage':
+								stpredmet = 3 & gt 'stwork2', 'strip'
 							end
 						end
 					else
-						act 'Go back stage':
-							stpredmet = 3 & gt 'stwork2', 'strip'
-						end
+						'You aren''t allowed on stage because of your black eye.'
 					end
 				else
-					'You aren''t allowed on stage because of your black eye.'
+					'Nobody wants to see a stripper with hairy legs and untrimmed pubes. Have a shave before you go on stage!'
 				end
-			else
-				'Nobody wants to see a stripper with hairy legs and untrimmed pubes. Have a shave before you go on stage!'
+				act 'Leave':gt $loc, $loc_arg
 			end
-			act 'Leave':gt $loc, $loc_arg
+		else
+			*nl
+			'<font color="red">You don''t have enough make-up to get ready.</font>'
 		end
 	else
 		*nl
-		'<font color="red">You don''t have enough make-up to get ready.</font>'
+		'There are no shows at this time, the stage is open between 11:00 and 2:00.'
 	end
 	!act '<b>Go back stage</b>':
 	!	if hour >= 11 or hour <= 2: