Merge branch 'gloryhole-promiscuity' into 'master'

gloryhole-changes

See merge request Vrelnir/degrees-of-lewdity!869

game/overworld-town/loc-brothel/basement.twee

@@ -21,8 +21,14 @@
 	<br><br>
 	A sign by the stairs reads <<printmoney $brothel_basement_price>>.
 	<br><br>
-	<<if $promiscuity gte 55>>
-		<<link [[Occupy a room (0:10)|Brothel Gloryhole]]>><<pass 10>><<set $phase to 1>><</link>><<promiscuous4>>
+	<<if $promiscuity gte 15>>
+		<<link [[Occupy a room (0:10)|Brothel Gloryhole]]>><<pass 10>><<set $phase to 1>><</link>><<promiscuous1>>
+		<br>
+	<<elseif $uncomfortable.prostituting is false>>
+		<br>
+		The thought repulses you, but you need the money.
+		<br><br>
+		<<link [[Occupy a room (0:10)|Brothel Gloryhole]]>><<pass 10>><<set $desperateaction to 1>><<set $phase to 1>><</link>><<promiscuous1>>
 		<br>
 	<<else>>
 		You aren't promiscuous enough to work at the gloryholes.

game/overworld-town/loc-school/toilets.twee

@@ -17,9 +17,16 @@ You are in the antechamber outside the school toilets.
 		<<link [[Secret tunnel to drain system (0:02)|Commercial Drain]]>><<pass 2>><</link>>
 		<br><br>
 	<</if>>
-	<<if $brothel_basement_intro is 1 and $promiscuity gte 55>>
-		<<link [[Set up gloryhole in antechamber|School Gloryhole Start]]>><</link>><<promiscuous4>>
-		<br><br>
+	<<if $brothel_basement_intro is 1>>
+		<<if $promiscuity gte 15>>
+			<<link [[Set up gloryhole in antechamber|School Gloryhole Start]]>><</link>><<promiscuous1>>
+			<br><br>
+		<<elseif $uncomfortable.prostituting is false>>
+			The thought repulses you, but you need the money.
+			<br>
+			<<link [[Set up gloryhole in antechamber|School Gloryhole Start]]>><</link>><<set $desperateaction to 1>><<promiscuous1>>
+			<br><br>
+		<</if>>
 	<</if>>
 	<<link [[Leave the toilets (0:01)|Hallways]]>><<pass 1>><</link>>
 	<br>