From 5c71a761402562eb7bcbc23584fd8c57c7b37166 Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Wed, 29 Apr 2020 13:30:28 -0400 Subject: [PATCH] other workarounds --- src/pregmod/fatGraftingWorkaround.tw | 6 +++--- src/pregmod/huskSlaveSwapWorkaround.tw | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pregmod/fatGraftingWorkaround.tw b/src/pregmod/fatGraftingWorkaround.tw index 0913e20d5ec..31f43a97015 100644 --- a/src/pregmod/fatGraftingWorkaround.tw +++ b/src/pregmod/fatGraftingWorkaround.tw @@ -2,7 +2,7 @@ <<set $nextButton = "Finalize fat transfer", $nextLink = "Surgery Degradation">> -Enough graftable body fat was harvested for an additional <<print $availabeFat*100>>ccs per breast or an additional <<if $activeSlave.butt <= 10>><<print $availabeFat/2>><<else>><<print $availabeFat/5>><</if>> sizes to $his rear. <<if $availabeFat == 0>>All fat marked for use<<else>>A total of $availabeFat unit<<if $availabeFat > 1>>s<</if>> remain<</if>>. +Enough graftable body fat was harvested for an additional <<print $availabeFat*100>>ccs per breast or an additional <<if getSlave($AS).butt <= 10>><<print $availabeFat/2>><<else>><<print $availabeFat/5>><</if>> sizes to $his rear. <<if $availabeFat == 0>>All fat marked for use<<else>>A total of $availabeFat unit<<if $availabeFat > 1>>s<</if>> remain<</if>>. <br><br> $boobFat units of fat will be added to $his breasts for a size gain of <<print $boobFat*100>>ccs. @@ -19,8 +19,8 @@ $boobFat units of fat will be added to $his breasts for a size gain of <<print $ <</if>> <br><br> -<<if $activeSlave.butt <= 10>><<print $buttFat*2>><<else>><<print $buttFat*5>><</if>> units of fat will be added to $his ass for a size gain of $buttFat. -<<if $activeSlave.butt > 10>> +<<if getSlave($AS).butt <= 10>><<print $buttFat*2>><<else>><<print $buttFat*5>><</if>> units of fat will be added to $his ass for a size gain of $buttFat. +<<if getSlave($AS).butt > 10>> <br> <<if $availabeFat > 0>> [[Increase|fat grafting workaround][$buttFat += .2, $availabeFat -= 1]] | diff --git a/src/pregmod/huskSlaveSwapWorkaround.tw b/src/pregmod/huskSlaveSwapWorkaround.tw index 9c409a6f210..42064edb598 100644 --- a/src/pregmod/huskSlaveSwapWorkaround.tw +++ b/src/pregmod/huskSlaveSwapWorkaround.tw @@ -1,6 +1,6 @@ :: husk Slave Swap Workaround [nobr] -<<if $activeSlave.tankBaby != 3>> +<<if getSlave($AS).tankBaby != 3>> <<set $nextButton = "Abort Operation", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event">> <<else>> <<set $nextButton = "Abort Operation", $nextLink = "Main", $returnTo = "Incubator">> @@ -20,7 +20,7 @@ __Select an eligible slave:__ <<if $slaves[_i].indenture == -1>> <<if $slaves[_i].breedingMark == 0 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset">> <<if WombReserveCount($slaves[_i]) == 0>> - <<if $slaves[_i].ID != $activeSlave.ID>> + <<if $slaves[_i].ID != $AS>> <<set _name = SlaveFullName($slaves[_i])>> <br>[[_name|Husk Slave Swap][$swappingSlave = $slaves[_i], cashX(-10000, "slaveSurgery", $slaves[_i])]] <</if>> -- GitLab