From 2448231e3f49297fcf38495e74446fd942b80b45 Mon Sep 17 00:00:00 2001
From: fcanon <fcanon@nowhere.na>
Date: Sun, 28 May 2017 16:46:04 -0400
Subject: [PATCH] vanilla sync
---
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/REroyalblood.tw | 12 ++++----
src/uncategorized/genericPlotEvents.tw | 14 ++++------
src/uncategorized/newSlaveIntro.tw | 8 ++++--
src/uncategorized/pCoupAttempt.tw | 4 +--
src/uncategorized/pHostageAcquisition.tw | 5 +---
src/uncategorized/pRivalryVictory.tw | 5 ++--
src/uncategorized/pSlaveMedic.tw | 7 ++---
src/uncategorized/pSnatchAndGrabResult.tw | 12 ++------
src/uncategorized/peConcubineInterview.tw | 7 +----
src/uncategorized/reAWOL.tw | 3 +-
src/uncategorized/reFSAcquisition.tw | 8 +-----
src/uncategorized/reMalefactor.tw | 32 ++++++----------------
src/uncategorized/reMilfTourist.tw | 4 +--
src/uncategorized/reRecruit.tw | 12 ++------
src/uncategorized/reRelativeRecruiter.tw | 4 ---
src/uncategorized/reShelterInspection.tw | 5 +---
src/uncategorized/reShippingContainer.tw | 6 ++--
src/uncategorized/resFailure.tw | 15 +++++-----
src/uncategorized/seCoursing.tw | 6 ++--
src/uncategorized/seCustomSlaveDelivery.tw | 7 +----
src/uncategorized/seRecruiterSuccess.tw | 14 ++--------
src/utility/slaveCreationWidgets.tw | 4 ++-
23 files changed, 63 insertions(+), 133 deletions(-)
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index c001e60497a..5e936fe0af8 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -7739,7 +7739,7 @@ She's obviously @@.mediumaquamarine;becoming more comfortable@@ playing the part
<<set $activeSlave.attrXY = random(60,90)>>
<<set $activeSlave.attrXX = random(10,20)>>
<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</for>>
<<set $fixedNationality = 0>>
<br><br><span id="result2">
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 5df3db47c5b..aa045d27cc1 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -72,7 +72,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
- <<AddSlave $activeSlave>>
+ <<include "New Slave Intro">>
<br><br>
<</replace>>
<</link>> // You will need to utilize a portion of your reputation and ¤50000 to enslave her.//
@@ -123,7 +123,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
- <<AddSlave $activeSlave>>
+ <<include "New Slave Intro">>
<br><br>
<</replace>>
<</link>> // Purchasing the goods and hiring the VTOLs will cost about ¤35000.//
@@ -187,7 +187,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
<</if>>
<<set _princess = clone($activeSlave)>>
- <<AddSlave _princess>>
+ <<AddSlave _princess>> /* skip New Slave Intro */
/* prince */
<<set $activeSlave.ID = $activeSlave.ID + 1000>>
<<set $activeSlave.actualAge = $activeSlave.actualAge+1>>
@@ -235,7 +235,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.relation = "sister">>
<<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
<</if>>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<br><br>
<</replace>>
<</link>> // You will need to utilize a sizable portion of your reputation and ¤100000 to enslave them.//
@@ -286,7 +286,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</for>>
<br><br>
<</replace>>
@@ -338,7 +338,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.pubertyXX = 1>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
- <<AddSlave $activeSlave>>
+ <<include "New Slave Intro">>
<br><br>
<</replace>>
<</link>> // It will cost about ¤15000 to enslave her.//
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 2138fb5672d..a2f95db8396 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -2,7 +2,7 @@
/* GENERIC PLOT EVENTS */
-<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $returnTo = "RIE Eligibility Check">>
+<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $returnTo = "Random Nonindividual Event">>
<<switch $Event>>
<<case "bad curatives">>
@@ -635,7 +635,6 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<if $PStrip != 3>>
<<if $cash >= $contractCost>>
<<link "Enslave her">>
- <<AddSlave $activeSlave>>
<<set $cash -= $contractCost>>
<<replace "#result">>
<<if $PStrip == 1>>
@@ -643,8 +642,6 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<else>>
She smiles with gratitude as the biometric scanners scrupulously record her every particular as belonging not to a person but to a piece of human property. She's seen what Free Cities life is, and she seems to have come to the conclusion that being a slave in the penthouse is better than being a free whore on the lower levels.
<</if>>
- <<set $nextLink = "AS Dump">>
- <<set $returnTo = "RIE Eligibility Check">>
<<include "New Slave Intro">>
<</replace>>
<</link>>
@@ -721,7 +718,6 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<case "shoot result">>
<<set $PShoot = 0>>
-<<set $nextLink = "AS Dump">>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "You won her at a shotgun match against other arcology owners.">>
<<set $activeSlave.butt = either(1, 2, 2, 3, 3, 4)>>
@@ -766,7 +762,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlave.fetish = "none">>
<<set $activeSlave.behavioralFlaw = "arrogant">>
<<set $activeSlave.sexualFlaw = "idealistic">>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</replace>>
<</link>>
<<if $pedo_mode == 1 && $minimumSlaveAge <= 8>>
@@ -841,7 +837,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlave.fetish to "none">>
<<set $activeSlave.behavioralFlaw to "bitchy">>
<<set $activeSlave.sexualFlaw to "hates anal">>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</replace>>
<</link>>
<br><<link "Hit the slave with the tits, pussy and impressive dick">>
@@ -881,7 +877,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlave.fetish to "none">>
<<set $activeSlave.behavioralFlaw to "none">>
<<set $activeSlave.behavioralFlaw to "odd">>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</replace>>
<</link>>
@@ -924,7 +920,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<br><<link "Enslave them all">>
<<replace "#result">>
<<for _i = 0; _i < _newSlaves.length; _i++>>
- <<AddSlave _newSlaves[_i]>>
+ <<AddSlave _newSlaves[_i]>> /* skip New Slave Intro - TODO: use Bulk Slave Intro */
<</for>>
You simply enslave all of the escapees yourself. These slaves will more than make up for the costs you expended, in the long run.
<</replace>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index cc4422a3cb3..e60f2513cb9 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1,6 +1,10 @@
:: New Slave Intro [nobr]
-<<set $showEncyclopedia = 0>>
+<<set $nextButton = "Continue", $showEncyclopedia = 0>>
+
+<<if $nextLink != "AS Dump" && passage() != "Bulk Slave Intro">>
+ <<set $returnTo = $nextLink, $nextLink = "AS Dump">>
+<</if>>
<<SlaveTitle $activeSlave>>
@@ -40,7 +44,7 @@ The legalities completed, ''__@@.pink;$activeSlave.slaveName@@__'' <<if ($active
looking shyly at you and blushing.
<</if>>
-<<if $gingering != 0>>
+<<if $gingering != 0 && $beforeGingering != 0 && $beforeGingering.ID == $activeSlave.ID>> /* extra checks to ensure gingering state is not left over from a different slave that was inspected but not purchased */
<<set _seed = "sale">>
<<if $gingeringDetected == 1>>
<<if $gingeringDetection == "slaver">>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index f7c3c313200..3e16dc6ce29 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -126,7 +126,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<</if>>
<<set $traitor.health = random(-80,-60)>>
<<set $traitor.origin = "She was your slave, but you freed her, which she repaid by participating in a coup attempt against you. It failed, and she is again your chattel.">>
- <<AddSlave $traitor>>
+ <<AddSlave $traitor>> /* skip New Slave Intro */
<</if>>
<br><br>
@@ -153,7 +153,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<br><<link "Enslave all of your prisoners">>
<<replace "#result">>
<<for $i = 0; $i < _newSlaves.length; $i++>>
- <<AddSlave _newSlaves[$i]>>
+ <<AddSlave _newSlaves[$i]>> /* skip New Slave Intro */
<</for>>
You simply enslave all of the prisoners yourself. You will make them pay for attacking your arcology.
<</replace>>
diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw
index d9288844324..1effaacc06f 100644
--- a/src/uncategorized/pHostageAcquisition.tw
+++ b/src/uncategorized/pHostageAcquisition.tw
@@ -1,13 +1,10 @@
:: P hostage acquisition [nobr]
-<<set $nextButton = "Continue">>
-<<set $nextLink = "AS Dump">>
-<<set $returnTo = "RIE Eligibility Check">>
+<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check">>
<<set $hostageRescued = 0>>
<<set $activeSlave = $hostage>>
<<set $activeSlave.ID += 55555>>
-<<AddSlave $activeSlave>>
$activeSlave.slaveName, once
<<switch $PC.career>>
diff --git a/src/uncategorized/pRivalryVictory.tw b/src/uncategorized/pRivalryVictory.tw
index e0262ea253a..0ac15ed9003 100644
--- a/src/uncategorized/pRivalryVictory.tw
+++ b/src/uncategorized/pRivalryVictory.tw
@@ -74,7 +74,7 @@ For the first time, you receive a direct call from your rival. You pictured the
<br><<link "Refuse, and place a bounty of ¤50000 on your rival's death">>
<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
<<replace "#result">>
- You coldly decline. "That was a mistake," your rival replies, entering computer command. "All my remaining liquid assets have just been @@.red;expended in an attack on the value of your holdings,@@ and my arcology has been heavily sabotaged. You'll get nothing from me." It's not entirely true, but the damage to your holdings does outweigh your gains by a significant margin. Your rival vanishes back into the old world
+ You coldly decline. "That was a mistake," your rival replies, entering a computer command. "All my remaining liquid assets have just been @@.red;expended in an attack on the value of your holdings,@@ and my arcology has been heavily sabotaged. You'll get nothing from me." It's not entirely true, but the damage to your holdings does outweigh your gains by a significant margin. Your rival vanishes back into the old world
- but only for a few days.
<br><br>
Your bounty is quickly claimed, and you are treated to the delicious moment of finding your rival's head delivered to your doorstep. It might not have done much good, but damn did it feel good.
@@ -528,9 +528,8 @@ For the first time, you receive a direct call from your rival. You pictured the
<<if $activeSlave.physicalAge > 35>><<set $activeSlave.ageImplant = 1>><<AgeImplantAdjustment>><</if>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
- <<AddSlave $activeSlave>>
+ <<set $nextLink = "AS Dump", $returnTo = "P rival initiation">>
<<include "New Slave Intro">>
- <<set $nextLink = "P rival initiation">>
<</replace>>
<</link>>
</span>
diff --git a/src/uncategorized/pSlaveMedic.tw b/src/uncategorized/pSlaveMedic.tw
index a98d8e56170..9c41ff1284b 100644
--- a/src/uncategorized/pSlaveMedic.tw
+++ b/src/uncategorized/pSlaveMedic.tw
@@ -1,9 +1,6 @@
:: P slave medic [nobr]
-
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Random Nonindividual Event">>
-<<set $returnTo = "Random Nonindividual Event">>
+<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $returnTo = "Random Nonindividual Event">>
<<set $slaveMedic = 0>>
@@ -112,9 +109,9 @@ When you enter the lounge of their <<if $barracks>>barracks<<else>>main living a
<</link>>
<br><<link "Offer a very generous ¤25000 for her">>
<<replace "#result">>
- <<AddSlave $activeSlave>>
<<set $cash -= 25000>>
"Huh," says the mercenary. "She's popular, but for that we could probably buy two of her. Might be fun to train a couple of new nurses. Let me ask the boys and girls." He speaks into his helmet for a few minutes, and then turns back to you. "Sold. Enjoy, she's a good fuck."
+ <<include "New Slave Intro">>
<</replace>>
<</link>>
</span>
diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw
index fe05cbf9784..b5e0456017e 100644
--- a/src/uncategorized/pSnatchAndGrabResult.tw
+++ b/src/uncategorized/pSnatchAndGrabResult.tw
@@ -2,10 +2,7 @@
<<nobr>>
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Random Nonindividual Event">>
-
-<<set $PSnatch = 0>>
+<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $returnTo = "Random Nonindividual Event", $PSnatch = 0>>
<<if $pedo_mode == 1>>
@@ -129,9 +126,6 @@ The case prompts you for a handprint code; your hand works just fine. It contain
When you state that, apparently, you are, she climbs out of the case, prostrates herself in the hall before you, and says reverentially into the floor, "I love you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>."
-<<set $saleDescription = 0>>\
-<<include "Long Slave Description">>\
- <<AddSlave $activeSlave>>\
- <<set $nextLink = "AS Dump">>\
- <<set $returnTo = "Random Nonindividual Event">>\
+<<set $saleDescription = 0, $applyLaw = 0>>\
+ <<include "Long Slave Description">>\
<<include "New Slave Intro">>
diff --git a/src/uncategorized/peConcubineInterview.tw b/src/uncategorized/peConcubineInterview.tw
index f4c4c1b95b2..726cf9a4e59 100644
--- a/src/uncategorized/peConcubineInterview.tw
+++ b/src/uncategorized/peConcubineInterview.tw
@@ -2,12 +2,7 @@
<<nobr>>
-<<set $nextButton = "Continue">>
-<<set $nextLink = "AS Dump">>
-<<set $returnTo = "RIE Eligibility Check">>
-
-<<set $activeSlave = $Concubine>>
-<<set $oldRep = $rep>>
+<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check", $activeSlave = $Concubine, $oldRep = $rep>>
<</nobr>>\
\
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index 33aaad00844..7ae829b5e17 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -1,6 +1,6 @@
:: RE AWOL [nobr]
-<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check">>
+<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check">>
Human soldiers are superior to drones in a number of ways - they have the capability for suspicion, the ability to understand human interactions, and are impervious to the ever-present threat of cyber-warfare. That said, a crucial failing of any sentient warrior is their agency.
@@ -93,7 +93,6 @@ Your window of opportunity to act is closing. If you have plans for punishing th
<<set $activeSlave.hStyle = "shaved into a mohawk">>
<<set $activeSlave.customTat = "She has a number of tattoos from a variety of mercenary companies.">>
<<include "New Slave Intro">>
- <<AddSlave $activeSlave>>
<<set $cash -= 5000>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 8a3a99ca821..4e6511e6651 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -2,10 +2,7 @@
<<nobr>>
-<<set $nextButton = "Continue">>
-<<set $nextLink = "RIE Eligibility Check">>
-<<set $returnTo = "RIE Eligibility Check">>
-<<set $showEncyclopedia = 1>><<set $encyclopedia = "Enslaving People">>
+<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check", $showEncyclopedia = 1, $encyclopedia = "Enslaving People">>
<<set $FSAcquisition = $FSAcquisitionEvents.random()>>
@@ -602,7 +599,6 @@ The call comes in from an office, and you suppress the urge to check whether $as
<span id="result">
<<if $cash >= $contractCost>>\
<<link "Enslave her">>
- <<AddSlave $activeSlave>>
<<set $cash -= $contractCost>>
<<replace "#result">>
<<switch $FSAcquisition>>\
@@ -654,13 +650,11 @@ The call comes in from an office, and you suppress the urge to check whether $as
<<case "Chinese Revivalist">>\
She arrives in a simple, sturdy suit, which she obviously wore in the correct anticipation of immediately removing and never seeing again. She cooperates with the enslavement process as best she can, her glance confident and watchful. She's obviously calculating how to get ahead within this new place, and she pays particularly close attention as the ebb and flow of business through your office brings your various slaves into her view for the first time.
<</switch>>\
- <<set $nextLink = "AS Dump">>\
<<include "New Slave Intro">>
<</replace>>
<</link>> //This will cost ¤$contractCost//
<<link "Sell her immediately">>
<<set $cash += $slaveCost>>
- <<include "Remove activeSlave">>
<<replace "#result">>
<<switch $FSAcquisition>>\
<<case "Pastoralist">>\
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index b43b8e23c72..d3d0e750b2a 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -1,11 +1,6 @@
:: RE malefactor [nobr]
-<<set $nextButton = "Continue">>
-<<set $nextLink = "RIE Eligibility Check">>
-<<set $returnTo = "RIE Eligibility Check">>
-<<set $showEncyclopedia = 1>><<set $encyclopedia = "Free Cities Justice">>
-
-<<set $applyLaw = 0>>
+<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check", $showEncyclopedia = 1, $encyclopedia = "Free Cities Justice">>
<<if $malefactor == "addict">>
@@ -252,7 +247,7 @@
<br><br>
-<<set $saleDescription = 1>>
+<<set $saleDescription = 1, $applyLaw = 0>>
<<include "Long Slave Description">>
<<set $saleDescription = 0>>
@@ -261,7 +256,6 @@
<span id="result">
<<if $cash >= $contractCost>>
<<link "Enslave her">>
- <<AddSlave $activeSlave>>
<<set $cash -= $contractCost>>
<<replace "#result">>
<<if $malefactor == "addict">>
@@ -281,7 +275,6 @@
<<else>>
You complete the legalities and biometric scanning quickly and cautiously. Though the would-be liberator is of course restrained, disarmed, and still sedated, she could awake at any time. Based on the drone logs, she is likely to be violent when she does.
<</if>>
- <<set $nextLink = "AS Dump">>
<<include "New Slave Intro">>
<</replace>>
<</link>>
@@ -297,7 +290,6 @@
<</if>>
<</if>>
<<if $activeSlave.publicCount>><<set $activeSlave.publicCount += 47>><<else>><<set $activeSlave.publicCount = 47>><</if>>
- <<AddSlave $activeSlave>>
<<set $cash -= $contractCost>>
<<replace "#result">>
<<if $malefactor == "addict">>
@@ -320,15 +312,14 @@
<</if>>
<<set $rep += 100>>
<<set $arcologies[0].prosperity += 2>>
- <<set $nextLink = "AS Dump">>
<<include "New Slave Intro">>
<</replace>>
<</link>>
<<if $arcade > 0>>
<br><<link "Enslave her and sentence her to a month in the arcade">>
+ <<assignJob $activeSlave "be confined in the arcade">>
<<set $activeSlave.choosesOwnAssignment = 0>>
<<set $activeSlave.sentence = 4>>
- <<AddSlave $activeSlave>>
<<set $cash -= $contractCost>>
<<replace "#result">>
<<if $malefactor == "addict">>
@@ -349,8 +340,7 @@
You complete the legalities and biometric scanning quickly and cautiously. Though the would-be liberator is of course restrained, disarmed, and still sedated, she could awake at any time. It would be best to have her restrained for public use in the arcade first. The public @@.green;looks forward@@ to seeing her there.
<</if>>
<<set $rep += 50>>
- <<set $nextLink = "AS Dump">>
- <<include "New Slave Intro">>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</replace>>
<</link>>
<</if>>
@@ -358,7 +348,6 @@
<<if $dairyRestraintsSetting > 1>>
<br><<link "Enslave her and send her straight to the industrial dairy">>
<<assignJob $activeSlave "work in the dairy">>
- <<AddSlave $activeSlave>>
<<set $cash -= $contractCost>>
<<replace "#result">>
<<if $malefactor == "addict">>
@@ -379,7 +368,7 @@
You complete the legalities and biometric scanning quickly and cautiously. The condemned resists installation in $dairyName with energy born of desperation. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the criminal's <<if ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>discomfort as her pussy adapts to industrial reproduction<<elseif $dairyStimulatorsSetting > 1>>discomfort as her anus adapts to accommodate rectal dildo hydration<<else>>breasts as they are roughly milked<</if>>, together with a report on the likely productivity of such a fit body capable of withstanding the stress of high throughput.
<</if>>
<<set $rep += 50>>
- <<set $nextLink = "AS Dump">>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</replace>>
<</link>>
<</if>>
@@ -390,7 +379,6 @@
<<set $activeSlave.amp = 1>>
<<set $activeSlave.heels = 0>>
<<set $activeSlave.behavioralFlaw = "odd">>
- <<AddSlave $activeSlave>>
<<set $cash -= $contractCost>>
<<replace "#result">>
<<if $malefactor == "addict">>
@@ -411,7 +399,6 @@
An example must be made. Slave ownership is the cornerstone of the society you're building in your arcology, and this woman attempted to undermine it. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since she will scarcely be able to liberate anyone without arms or legs.
<</if>>
<<set $rep += 100>>
- <<set $nextLink = "AS Dump">>
<<include "New Slave Intro">>
<</replace>>
<</link>>
@@ -421,25 +408,25 @@
<<set $activeSlave.balls = 0>>
<<set $activeSlave.devotion -= 25>>
<<set $activeSlave.trust -= 25>>
- <<AddSlave $activeSlave>>
<<set $cash -= $contractCost>>
<<replace "#result">>
Video feeds from your remote surgery are made public as the protesting criminal is strapped down and gelded. She is so utterly broken by this turn of events that you complete the legalities and biometric scanning without fuss. The condemned sobs weakly throughout the process until you grow tired of the whining and apply punishment. Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ which increases your arcology's prosperity by @@.green;giving it a reputation for swift and terrible justice.@@
<<set $rep += 100>>
<<set $arcologies[0].prosperity += 10>>
+ <<include "New Slave Intro">>
<</replace>>
<</link>>
<</if>>
<</if>> /* closes seeExtreme */
- <<if $malefactor is "orphanloli">>
+ <<if $malefactor == "orphanloli">>
<br><<link "'adopt' her">>
<<set $activeSlave.devotion = 25>>
<<set $activeSlave.trust = 25>>
- <<AddSlave $activeSlave>>
<<set $cash -= $contractCost>>
<<replace "#result">>
You sit down and talk to the exhausted girl, handing her a contract cleverly altered to resemble adoption papers. Once she comprehends what she is looking at, she eagerly signs it. Only once she has reached the penthouse and been introduced to the slave life does she realize she willingly signed away her freedom. Though she can't complain. A warm cot and plenty of food await, which to her is a huge improvement over a slow death on the streets. The public @@.red;feels you let this criminal off too easy.@@
<<set $rep -= 100>>
+ <<include "New Slave Intro">>
<</replace>>
<</link>>
<</if>>\
@@ -452,7 +439,6 @@
<<replace "#result">>
You help the exhausted mother to her feet and hand her her second newborn. She watches you, uncertain of your motives, until you have her escorted to the proper welcoming facility and put in a good word for having her added to your arcology's free population. You announce to the public that such a fertile <<if $activeSlave.physicalAge > 30>>milf<<elseif $activeSlave.physicalAge > 19>>woman<<elseif $activeSlave.physicalAge > 12>>teen<<else>>youth<</if>> will be a boon to Repopulationism, and that the contract she is signing mandates she be on powerful fertility agents whenever she isn't pregnant. During her residency, free or not, she will provide society with dozens of future children. The public @@.green;approves of breeders, free or not,@@ and word spreads that any and all mothers are welcome into your arcology @@.green;adding to its prosperity.@@
<<set $rep += 10>>
- <<set $nextLink = "RIE Eligibility Check">>
<<set $arcologies[0].prosperity += 1>>
<<set $ACitizens++>>
<</replace>>
@@ -479,7 +465,6 @@
An example must be made. Slave ownership is the cornerstone of the society you're building in your arcology, and this woman attempted to undermine it. The protesting bitch is stripped and flogged on the promenade before being escorted bleeding from the arcology. The public @@.green;approves of this harshness.@@
<</if>>
<<set $rep += 100>>
- <<set $nextLink = "RIE Eligibility Check">>
<</replace>>
<</link>>
<<if $malefactor == "liberator">>
@@ -496,7 +481,6 @@
<<if $cash4Babies == 1>>
<<set $cash += random(20,30)>>
<</if>>
- <<include "Remove activeSlave">>
<<replace "#result">>
<<if $malefactor == "addict">>
You complete the legalities and biometric scanning quickly and without fuss. The condemned recovers enough by the end of the process to start masturbating weakly, even as she begins begging for a fix. Then it's off to slave markets for sale.
diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw
index f1fbdd01035..18d4788ca0e 100644
--- a/src/uncategorized/reMilfTourist.tw
+++ b/src/uncategorized/reMilfTourist.tw
@@ -2,9 +2,7 @@
<<nobr>>
-<<set $nextButton = "Continue">>
-<<set $nextLink = "AS Dump">>
-<<set $returnTo = "Next Week">>
+<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check">>
<<set $subSlave = $eventSlave>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index c72e25fdcf4..79ae507949d 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1,11 +1,6 @@
:: RE recruit [nobr]
-<<set $nextButton = "Continue">>
-<<set $nextLink = "RIE Eligibility Check">>
-<<set $returnTo = "RIE Eligibility Check">>
-<<set $showEncyclopedia = 1>><<set $encyclopedia = "Enslaving People">>
-
-<<set $applyLaw = 0>>
+<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check", $showEncyclopedia = 1, $encyclopedia = "Enslaving People">>
<<set $recruit = $recruit.random()>>
@@ -1577,7 +1572,7 @@ Your desk flags a video message as having potential. It's a desperate refugee fr
<br><br>
-<<set $saleDescription = 1>>
+<<set $saleDescription = 1, $applyLaw = 0>>
<<include "Long Slave Description">>
<<set $saleDescription = 0>>
@@ -1586,7 +1581,6 @@ Your desk flags a video message as having potential. It's a desperate refugee fr
<span id="result">
<<if $cash >= $contractCost>>
<<link "Enslave her">>
- <<AddSlave $activeSlave>>
<<set $cash -= $contractCost>>
<<replace "#result">>
<<if $recruit == "female recruit">>
@@ -1668,7 +1662,6 @@ Your desk flags a video message as having potential. It's a desperate refugee fr
<<else>>
She comes immediately from the immigration center to your arcology. You patiently explain the realities of the situation to her. She isn't too bright and it takes a while for things to sink in. The scanners finally do it, though. She sobs as the biometric scanners scrupulously record her every particular as belonging not to a person but to a piece of human property. She tries to resist placing her biometric signature in testament to the truth of her debt, but when you observe that the alternative is death, she complies. The process is completed with a distinct anticlimax: she is one of your slaves now.
<</if>>
- <<set $nextLink = "AS Dump">>
<<include "New Slave Intro">>
<</replace>>
<</link>>
@@ -1692,7 +1685,6 @@ Your desk flags a video message as having potential. It's a desperate refugee fr
<<else>>
<br><<link "Sell her immediately">>
<<set $cash += $slaveCost>>
- <<include "Remove activeSlave">>
<<replace "#result">>
<<if $recruit == "female recruit">>
You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on her heels. Finally she works up her courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your answer appears in the form of a purchasing agent, here to take her away. As he restrains the disbelieving girl, you tell her she's been purchased by a brothel, so she's going to be fucked about 70,000 times before she gets to be too old and is retired, so she can be sure she won't be bored. She releases a wail of utter despair, quickly cut off by a sturdy bag being fastened over her head.
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index cb8643f892b..ffef6685912 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -724,11 +724,9 @@ You look up the _relationType. She costs ¤$slaveCost, a bargain, but you won't
<<set $missingParentID-->>
<</if>>
<</switch>>
- <<AddSlave $activeSlave>>
<<SlaveTitle $eventSlave>>
<<replace "#result">>
You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName arrives shortly. The two slaves remember each other only dimly - they parted a long time ago - but they embrace. The devoted $desc explains the situation and encourages her _relationType to be a good slave to you. $activeSlave.slaveName looks a little fearful but clearly realizes that she's lucky to be here.
- <<set $nextLink = "AS Dump">>
<<include "New Slave Intro">>
<</replace>>
<</link>>
@@ -1014,11 +1012,9 @@ You look up the $activeSlave.relation. She costs ¤$slaveCost, a bargain, but yo
/* update $slaves[$i] (eventSlave) before calling any widgets */
<<set $slaves[$i].relation = relationTargetWord($activeSlave)>>
<<set $slaves[$i].relationTarget = $activeSlave.ID>>
- <<AddSlave $activeSlave>>
<<set $cash -= $slaveCost>>
<<SlaveTitle $eventSlave>>
You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName arrives shortly. The two slaves remember each other only dimly - they parted a long time ago - but they embrace. The devoted $desc explains the situation and encourages her $activeSlave.relation to be a good slave to you. $activeSlave.slaveName looks a little fearful but clearly realizes that she's lucky to be here.
- <<set $nextLink = "AS Dump">>
<<include "New Slave Intro">>
<</replace>>
<</link>>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 652c2144071..39e1ab0df15 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -89,12 +89,10 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
<span id="result">
<<link "Amusing. Enslave her">>
- <<AddSlave $activeSlave>>
<<set $cash -= $contractCost>>
<<replace "#result">>
<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> ushers her into your penthouse and keeps her busy for the few minutes you need to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing. Fortunately, you're cleverer and richer than most, and you succeed. You have her brought into your office, and you are pleased to see her. She's not young and she's not pretty, but her suit cannot disguise her big bottom, and she's using the tablet she has clasped protectively against her chest to conceal a huge pair of mature breasts. She knows exactly what's happened, and fixes you with a gimlet stare. "In a couple of months," she says with venom, "when you've filled me full of hormones and drugs and training, and I'm begging you to <<if $PC.dick == 1>>stick your tiny little dick up<<else>>fist<</if>> my asshole, remember this. It'll be conditioning and self-preservation and Stockholm Syndrome talking, not me. I think you're a <<if $PC.title == 1>>sad bastard<<else>>vile cunt<</if>>, and I always will."
<<set $shelterAbuse += 10>>
- <<set $nextLink = "AS Dump">>
<<include "New Slave Intro">>
<</replace>>
<</link>> //This will cost ¤$contractCost//
@@ -102,12 +100,11 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
<br><<link "The slave is attached to a milking machine, and so will be the inspector">>
<<assignJob $activeSlave "work in the dairy">>
<<set $activeSlave.clothes = "no clothing">>
- <<AddSlave $activeSlave>>
<<set $cash -= $contractCost/2>>
<<replace "#result">>
$subSlave.slaveName is attached to a milking machine, so it would be extremely unwise to let the inspector report on $subSlave.slaveName's industrial fate in all its gorgeous productivity. So, you greet her politely, and bring her down to $dairyName to show her $subSlave.slaveName. The inspector has a single moment to stiffen in shock at the sight before she stiffens involuntarily due to the security drone tazing her unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by one more big-boobed milk producer. You leave the inspector's drug dosage low to start, so she can appreciate her situation for a while. When the inspector awakes, her visor is set to show an overhead view of her bay in $dairyName. She sees her breasts, already larger than she remembers, gently swaying with the pumping of the milkers.<<if $dairyFeedersSetting > 1>> She sees the huge phallus occupying her mouth, and feels nutrition sliding down her throat.<</if>><<if $dairyPregSetting > 1>> She sees her vagina drooling as it's fucked in preparation for pregnancy.<</if>><<if $dairyPregSetting > 1>> She sees a massive piston moving slowly back and forth beneath her buttocks, and understands what the ache of impossible fullness in her bottom is.<</if>> Her hands ball into fists.
<<set $shelterAbuse += 10>>
- <<set $nextLink = "AS Dump">>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</replace>>
<</link>> //This will cost ¤<<print $contractCost/2>>//
<</if>>
diff --git a/src/uncategorized/reShippingContainer.tw b/src/uncategorized/reShippingContainer.tw
index c78346910f9..81dbb1e366c 100644
--- a/src/uncategorized/reShippingContainer.tw
+++ b/src/uncategorized/reShippingContainer.tw
@@ -52,7 +52,7 @@ For now, the crowd around you is looking at the helpless human cargo with
<br><<link "Keep them">>
<<replace "#result">>
<<for _i = 0; _i < _newSlaves.length; _i++>>
- <<AddSlave _newSlaves[_i]>>
+ <<AddSlave _newSlaves[_i]>> /* skip New Slave Intro */
<</for>>
You announce that the shipment is in violation of shipping and slave market regulations, and is being confiscated. There's a certain @@.red;disappointment@@ in the crowd that nothing more interesting came of it, but it's minor when compared to the chattel you just seized.
<<set $rep -= 50>>
@@ -65,7 +65,7 @@ For now, the crowd around you is looking at the helpless human cargo with
<<if _newSlaves[_i].vagina > -1>><<set _newSlaves[_i].vagina = 3>><</if>>
<<set _newSlaves[_i].anus = 3>>
<<set _newSlaves[_i].health -= 20>>
- <<AddSlave _newSlaves[_i]>>
+ <<AddSlave _newSlaves[_i]>> /* skip New Slave Intro */
<</for>>
You use the container handling systems to segregate the obvious menials from the those with any potential as sex slaves. The menials go into a different container, which is whisked off, leaving a little shivering knot of frightened bodies, vulnerable and naked. The crowd watched all this with good humor, and there's silence enough that everyone hears your quiet announcement. You announce that the shipment is in violation of shipping and slave market regulations, and is being confiscated; however, you don't expect to see these particular slaves delivered to your penthouse for a couple of hours. Then you turn your back and walk away. The crowd gives a kind of @@.green;appreciative howl@@ which, understandably, produces a wail of terror from the slaves. As you head off, the sobbing turns into screaming. It sounds like your new slaves might be a bit stretched out, here and there.
<<set $rep += 200>>
@@ -84,4 +84,4 @@ For now, the crowd around you is looking at the helpless human cargo with
<</replace>>
<</link>>
<</if>>
-</span>
\ No newline at end of file
+</span>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index 2afd61ab06d..5bdff76dfd9 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -79,7 +79,7 @@
<<set $activeSlave.behavioralFlaw = either("none")>>
<<set $activeSlave.hStyle = "tails">>
<<set $activeSlave.customTat = "She has the simple logo of the corporation that operates The Slavegirl School tattooed on her left cheek.">>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</for>>
<<elseif $RESFailure == "GRI">>
<<set $GRI.schoolPresent = 0>>
@@ -130,7 +130,7 @@
<<set $activeSlave.hStyle = "shaved">>
<<set $activeSlave.hLength = 0>>
<<set $activeSlave.customTat = "She has a barcode that identified her when she was a test subject at the Growth Research Institute tattooed on her left cheek.">>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</for>>
<<elseif $RESFailure == "SCP">>
<<set $SCP.schoolPresent = 0>>
@@ -199,7 +199,7 @@
<<if $activeSlave.race != "white">><<set $activeSlave.race = "surgically altered to look white">><</if>>
<<set $activeSlave.skin = "tanned">>
<<set $activeSlave.customTat = "She has the coat of arms of St. Claver Preparatory tattooed on her left cheek.">>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</for>>
<<elseif $RESFailure == "LDE">>
<<set $LDE.schoolPresent = 0>>
@@ -260,7 +260,7 @@
<<set $activeSlave.hStyle = "tails">>
<<set $activeSlave.hLength = 100>>
<<set $activeSlave.customTat = "She has the buttock-shaped symbol of the École des Enculées that created her tattooed on her left cheek.">>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</for>>
<<elseif $RESFailure == "TGA">>
<<set $TGA.schoolPresent = 0>>
@@ -314,7 +314,7 @@
<<set $activeSlave.hStyle = "short">>
<<set $activeSlave.hLength = 2>>
<<set $activeSlave.customTat = "She has the baroque crest of the Gymnasium-Academy that trained her branded into her left cheek.">>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</for>>
<<else>>
<<set $TFS.schoolPresent = 0>>
@@ -476,7 +476,7 @@
<<set $activeSlave.hLength = 150>>
<<set $activeSlave.customTat = "She has a simple pink heart tattooed on her right temple.">>
<<set $REFutaSisterCheckinIDs.push($activeSlave.ID)>>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</for>>
<<include "Generate XY Slave">>
<<set $activeSlave.origin to "She was the leader of your arcology's Futanari Sisters until you engineered her community's failure and enslavement.">>
@@ -546,7 +546,7 @@
<<set $activeSlave.hStyle = "neat">>
<<set $activeSlave.hLength = 150>>
<<set $activeSlave.customTat = "She has a simple pink heart tattooed on her right temple.">>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<</if>>
<<if $RESFailure == "TSS">>
@@ -593,6 +593,7 @@ The failure of a prominent organization within your arcology has @@.red;affected
<<replace "#result">>
<<nobr>>
<<for $i = 0; $i < $slaves.length; $i++>>
+ <<set $activeSlave = $slaves[$i]>>
<<if $RESFailure == "TSS">>
<<if ($slaves[$i].origin == "She was given to you by a failed branch campus of The Slavegirl School right after her majority.") || ($slaves[$i].origin == "She was given to you by a failed branch campus of The Slavegirl School after she was retrained as a slave girl.")>>
<<slaveCost $slaves[$i]>>
diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw
index 532bc164a46..6ffdbc9a950 100644
--- a/src/uncategorized/seCoursing.tw
+++ b/src/uncategorized/seCoursing.tw
@@ -607,7 +607,7 @@ You place your hand on the leash's quick release and whisper your direction into
<</if>>
<<set $Lurcher.penetrativeCount += 1>>
<<set $penetrativeTotal += 1>>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<<else>>
<<if $Lurcher.devotion > 50>>
She makes her way back to you dejectedly, hanging her head.
@@ -947,7 +947,7 @@ You place your hand on the leash's quick release and whisper your direction into
<</if>>
<<set $Lurcher.penetrativeCount += 1>>
<<set $penetrativeTotal += 1>>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<<else>>
<<if $Lurcher.devotion > 50>>
She makes her way back to you dejectedly, hanging her head.
@@ -1287,7 +1287,7 @@ You place your hand on the leash's quick release and whisper your direction into
<</if>>
<<set $Lurcher.penetrativeCount += 1>>
<<set $penetrativeTotal += 1>>
- <<AddSlave $activeSlave>>
+ <<AddSlave $activeSlave>> /* skip New Slave Intro */
<<else>>
<<if $Lurcher.devotion > 50>>
She makes her way back to you dejectedly, hanging her head.
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 40a446defb8..4256a3301d0 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -2,10 +2,7 @@
<<nobr>>
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Scheduled Event">>
-<<set $returnTo = "Scheduled Event">>
-<<set $showEncyclopedia = 1>><<set $encyclopedia = "Enslaving People">>
+<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "Enslaving People">>
<<set $customSlaveOrdered = 0>>
@@ -95,8 +92,6 @@ Her price is ¤<<print $slaveCost>>.
<<set $cash -= $slaveCost>>
<<replace "#result">>
She has been reasonably broken by the dealer that offered her to you. She has also picked up on the fact that she was specially selected, and is a little hopeful that this means she may be treated well. She is now awaiting your instructions.
- <<set $nextLink = "AS Dump">>\
- <<set $returnTo = "Random Nonindividual Event">>\
<<include "New Slave Intro">>
<</replace>>
<</link>>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index 3ffbf4585ad..4b61f35ccd5 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -2,13 +2,7 @@
<<nobr>>
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Scheduled Event">>
-<<set $returnTo = "Scheduled Event">>
-<<set $showEncyclopedia = 1>><<set $encyclopedia = "Enslaving People">>
-<<set $recruiterProgress = 0>>
-
-<<set $applyLaw = 0>>
+<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "Enslaving People", $recruiterProgress = 0>>
<<if $recruiterTarget == "young migrants">>
@@ -190,24 +184,20 @@ Your recruiter $Recruiter.slaveName has succeeded; she's convinced a desperate o
<</nobr>>\
\
-<<set $saleDescription = 1>>\
+<<set $saleDescription = 1, $applyLaw = 0>>\
<<include "Long Slave Description">>\
<<set $saleDescription = 0>>\
<span id="result">
<<if $cash >= $contractCost>>\
<<link "Enslave her">>
- <<AddSlave $activeSlave>>
<<set $cash -= $contractCost>>
<<replace "#result">>
- <<set $nextLink = "AS Dump">>\
- <<set $returnTo = "Nonrandom Event">>\
<<include "New Slave Intro">>
<</replace>>
<</link>> //This will cost ¤$contractCost//
<<link "Sell her immediately">>
<<set $cash += $slaveCost>>
- <<include "Remove activeSlave">>
<<replace "#result">>
$activeSlave.slaveName accepts being resold without much fuss. She's merely exchanged one unknown owner for another. For all she knows her new buyer will be less abusive than you would have been. She would be less complacent if she knew who her buyers are; she'll be immured in an arcade within the hour.
<</replace>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index b39f64a70ce..7a3f80adf7d 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -114,8 +114,10 @@
Called from newSlaveIntro, lawCompliance
%/
<<widget "RemoveGingering">>
- <<if $gingering != 0>>
+ <<if $gingering != 0 && $beforeGingering != 0 && $activeSlave != 0 && $beforeGingering.ID == $activeSlave.ID>> /* extra checks to ensure gingering state is not left over from a different slave that was inspected but not purchased */
<<set $activeSlave = $beforeGingering, $beforeGingering = 0>>
+ <<else>>
+ <<set $gingering = 0, $beforeGingering = 0>> /* clear left over state from a different slave without modifying activeSlave */
<</if>>
<</widget>>
--
GitLab