From 49c5eeddfb67117a95dd5b1153dc54945b2f7042 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 28 Sep 2020 20:03:34 -0400
Subject: [PATCH] revert using activeSlave less
---
src/pregmod/incubatorRetrievalWorkaround.tw | 22 +++++++++------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/pregmod/incubatorRetrievalWorkaround.tw b/src/pregmod/incubatorRetrievalWorkaround.tw
index 43676e38f09..8826d551814 100644
--- a/src/pregmod/incubatorRetrievalWorkaround.tw
+++ b/src/pregmod/incubatorRetrievalWorkaround.tw
@@ -8,13 +8,14 @@
<br><br>
+ <<set $activeSlave = $readySlave>>
<<set $incubatorSlaves-->>
- <<includeDOM App.Desc.longSlave(V.readySlave)>>
+ <<includeDOM App.Desc.longSlave(V.activeSlave)>>
<<if $readySlave.tankBaby != 3>>
<<if $incubatorOrgans.length > 0>>
<<for _irw = 0; _irw < $incubatorOrgans.length; _irw++>>
<<if $incubatorOrgans[_irw].ID == $incubatorOldID>>
- <<set _newOrgan = {type: $incubatorOrgans[_irw].type, weeksToCompletion: $incubatorOrgans[_irw].weeksToCompletion, ID: $readySlave.ID}>>
+ <<set _newOrgan = {type: $incubatorOrgans[_irw].type, weeksToCompletion: $incubatorOrgans[_irw].weeksToCompletion, ID: $activeSlave.ID}>>
<<if _newOrgan.weeksToCompletion <= 0>>
<<set $completedOrgans.push($incubatorOrgans[_irw])>>
<<else>>
@@ -24,7 +25,7 @@
<</if>>
<</for>>
<</if>>
- <<run newSlave($readySlave)>>
+ <<run newSlave($activeSlave)>>
<<include "New Child Intro">>
<<else>>
A husk is ready to be used.
@@ -32,17 +33,12 @@
//As expected, $he is a complete vegetable, but that is what you wanted after all. You lack the facilities to care for $him in this state, so you should do what you are planning quickly. Or you could sell $him to the Flesh Heap.//
<span id="result">
<<if $cash >= $surgeryCost>>
- <br>
- <<link "Contact the bodyswap surgeon.">>
- <<set $activeSlave = $readySlave>>
- <<goto "husk Slave Swap Workaround">>
- <</link>>
- //Will significantly increase the selected slave's upkeep.//
- <br>[[Sell the husk to Flesh Heap.|Main][cashX(Math.trunc(slaveCost($readySlave)/3), "slaveTransfer")]]
- //This body can be bought by the Flesh Heap for <<print cashFormat(Math.trunc(slaveCost($readySlave)/3))>>//.
+ <br>[[Contact the bodyswap surgeon.|husk Slave Swap Workaround]] //Will significantly increase the selected slave's upkeep.//
+ <br>[[Sell the husk to Flesh Heap.|Main][cashX(Math.trunc(slaveCost($activeSlave)/3), "slaveTransfer")]]
+ //This body can be bought by the Flesh Heap for <<print cashFormat(Math.trunc(slaveCost($activeSlave)/3))>>//.
<<else>>
- <<run cashX(Math.trunc(slaveCost($readySlave)/3), "slaveTransfer")>>
- //You can't sustain $him and thus must sell $him for <<print cashFormat(Math.trunc(slaveCost($readySlave)/3))>>.//
+ <<run cashX(Math.trunc(slaveCost($activeSlave)/3), "slaveTransfer")>>
+ //You can't sustain $him and thus must sell $him for <<print cashFormat(Math.trunc(slaveCost($activeSlave)/3))>>.//
<</if>>
</span>
<</if>>
--
GitLab