Browse Source

[fixed] in bordel, (1) prevent the player from continuing to wait for clients after the brothel closes, (2) block the wait for customers action from showing up when the player has hit the clients per night limit instead of the button being clickable but just looping the player back to the same place so that it looks like nothing happened, (3) add lines of text explaining why the player cannot work when the player can't, (4) add a line of text warning the player that the brothel is closing when they get a client offer so that they know they can't get another until the next night if they refuse this one

Spackled Lanturn 3 years ago
parent
commit
589898b334
1 changed files with 37 additions and 21 deletions
  1. 37 21
      locations/bordel.qsrc

+ 37 - 21
locations/bordel.qsrc

@@ -53,22 +53,31 @@ if $ARGS[0] = 'brothel':
 		end
 	end
 
-	if func('bordel', 'is_open'):
-		act 'Go to the reception room and wait for customers':
-
-			if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1 or pcs_makeup < 2 or pcs_leghair > 3 or pcs_pubes > 3 or sweat > 25 or pcs_hairbsh = 0:
-				cla
-				'The brothel madam comes over to you and says, "Our customers expect you to be clean, shaven, made-up and with your hair looking nice. Go and sort yourself out, now!"'
-
-				act 'Go to the bathroom':gt 'bordel', 'dysh'
-			elseif $clothingworntype ! 'fancy_burlesque' and PCloStyle ! 4 and $clothingworntype ! 'nude':
-				cla
-				'You need to wear an outfit that can be used for prostitution. If you haven''t got anything suitable and you are desperate, you could work naked, but you will get paid less and might get treated badly.'
-				'You can change your clothes in the bathroom.'
-
-				act 'Go to the bathroom':gt 'bordel', 'dysh'
-			else
-				gt 'bordel', 'var'
+	if func('bordel', 'is_open') = 0:
+		'The brothel is closed for the night however, so you won''t be able to work now regardless.'
+	else
+		if borsexkol >= 2:
+			!! borsexkol is reset in cikl, meaning that it is reset at midnight, not when the brothel
+			!! opens or closes. if this is not desired behavior, will need to handle resetting this var
+			!! in brothel specific code.
+			'You have already hit this limit, so you won''t be able to work again until midnight.'
+		else
+			act 'Go to the reception room and wait for customers':
+
+				if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1 or pcs_makeup < 2 or pcs_leghair > 3 or pcs_pubes > 3 or sweat > 25 or pcs_hairbsh = 0:
+					cla
+					'The brothel madam comes over to you and says, "Our customers expect you to be clean, shaven, made-up and with your hair looking nice. Go and sort yourself out, now!"'
+
+					act 'Go to the bathroom':gt 'bordel', 'dysh'
+				elseif $clothingworntype ! 'fancy_burlesque' and PCloStyle ! 4 and $clothingworntype ! 'nude':
+					cla
+					'You need to wear an outfit that can be used for prostitution. If you haven''t got anything suitable and you are desperate, you could work naked, but you will get paid less and might get treated badly.'
+					'You can change your clothes in the bathroom.'
+
+					act 'Go to the bathroom':gt 'bordel', 'dysh'
+				else
+					gt 'bordel', 'var'
+				end
 			end
 		end
 	end
@@ -112,7 +121,6 @@ end
 if $ARGS[0] = 'var':
     $location_type = 'event'
 	menu_off = 1
-	if borsexkol >= 2:gt 'bordel', 'brothel'
 	if $clothingworntype = 'nude':
 		bordelpay = 8
 	else
@@ -121,6 +129,7 @@ if $ARGS[0] = 'var':
 	gs 'npcgeneratec', 0, 'Client', rand(18,40)
 	gs 'boyStat', $npclastgenerated
 	minut += 30
+	gs 'stat'
 	borrand = rand(0, 10)
 
 	if borrand = 0:
@@ -276,11 +285,18 @@ if $ARGS[0] = 'var':
 			gs 'boyStat', $npclastgenerated,'2'
 			gt 'paysex', 'start'
 		end
-	elseif borrand > 4:
-		'You are not chosen.'
-
+	else
 		act 'Go to your room':gt 'bordel', 'brothel'
-		act 'Wait for another':gt 'bordel', 'var'
+		if func('bordel', 'is_open'):
+			'You are not chosen.'
+			act 'Wait for another':gt 'bordel', 'var'
+		else
+			'You are not chosen, and the brothel is now closed.'
+		end
+	end
+
+	if borrand <= 4 and func('bordel', 'is_open') = 0:
+		'The brothel is closing now, so this is your last chance to work today.'
 	end
 end