Merge branch 'feature-career-custom-slave' into 'pregmod-master'

Allow maintaining indefinitely the custom slave request

See merge request pregmodfan/fc-pregmod!5397

src/uncategorized/customSlave.tw

@@ -9,7 +9,7 @@
 <br><br>
 
 <span id = "age">
-<<if $customSlave.age < 3>>2- years old.
+<<if $customSlave.age < 3>>2-3 years old.
 <<elseif $customSlave.age < 5>>3-4 years old.
 <<elseif $customSlave.age < 7>>5-6 years old.
 <<elseif $customSlave.age < 10>>7-9 years old.
@@ -1358,7 +1358,9 @@ Nationality: $customSlave.nationality.
 <br><br>
 
 <<if $customSlaveOrdered == 1>>
-[[Withdraw custom slave order|Main][$customSlaveOrdered = 0]]
+[[Update custom slave order|Buy Slaves]]
+<br>
+[[Withdraw custom slave order|Buy Slaves][$customSlaveOrdered = 0]]
 <<else>>
-[[Post custom slave order|Main][$customSlaveOrdered = 1]]
+[[Post custom slave order|Buy Slaves][$customSlaveOrdered = 1]]
 <</if>>

src/uncategorized/scheduledEvent.tw

@@ -178,7 +178,7 @@
 	<<goto "SE recruiter success">>
 <<elseif ($Recruiter != 0 && $recruiterEugenics == 1 && $recruiterProgress >= (13 + ($IntelligenceEugenicsSMR+$HeightEugenicsSMR+$FaceEugenicsSMR)*6))>>
 	<<goto "SE recruiter success">>
-<<elseif ($customSlaveOrdered == 1)>>
+<<elseif ($customSlaveOrdered == 1 && $customSlaveOrderedReorder != 1)>>
 	<<goto "SE custom slave delivery">>
 <<elseif ($JFCOrder == 1 && $JFCReorder != 1)>>
 	<<goto "JobFulfillmentCenterDelivery">>
@@ -233,5 +233,6 @@
 	<<goto "SE nicaea council">>
 <<else>>
 	<<run delete $JFCReorder>>
+	<<run delete $customSlaveOrderedReorder>>
 	<<goto "Nonrandom Event">>
 <</if>>
\ No newline at end of file

src/uncategorized/seCustomSlaveDelivery.tw

 :: SE custom slave delivery [nobr]
 
-<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "Enslaving People", $customSlaveOrdered = 0>>
+<<set $customSlaveOrdered = 0, $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "Enslaving People">>
 
 <<if $customSlave.age == 2>>
 	<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
@@ -232,9 +232,16 @@ $His price is <<print cashFormat($slaveCost)>>.
 		<<replace "#result">>
 			$He has been reasonably broken by the dealer that offered $him to you. $He has also picked up on the fact that $he was specially selected, and is a little hopeful that this means $he may be treated well. $He is now awaiting your instructions.
 			<<include "New Slave Intro">>
+			<<if def $customSlaveOrderedReorder>><<run delete $customSlaveOrderedReorder>><</if>>
 		<</replace>>
 	<</link>>
 <<else>>
 	//You lack the necessary funds to accept the offered slave.//
 <</if>>
+<br>
+<<link "Reject this offer and place the same order again">>
+	<<set $customSlaveOrdered = 1>>
+	<<set $customSlaveOrderedReorder = 1>>
+	<<goto $nextLink>>
+<</link>>
 </span>