diff --git a/src/pregmod/fatGraftingWorkaround.tw b/src/pregmod/fatGraftingWorkaround.tw index 0913e20d5ec1f90e34d9b57fa51feb3c61e7a7a9..31f43a970152ac69cc00e16b733b2ebc5571fc18 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 9c409a6f210025545ca1f0182c32190820972e83..42064edb598c3280e177c8123eb0cc740b6ade00 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>> diff --git a/src/pregmod/surrogacy.tw b/src/pregmod/surrogacy.tw index 4c5f98cc67baf2749b5585d2748eba8f329251e5..dbebf1dbc0e5933a64fdc20982a6e512c1172746 100644 --- a/src/pregmod/surrogacy.tw +++ b/src/pregmod/surrogacy.tw @@ -59,12 +59,12 @@ <<case "transplant">> <<if $receptrix.ID == -1>> - Since the surgery required only a local anesthetic, you are very aware that you are now carrying $activeSlave.slaveName's child. You slowly rise to your feet, a hand to your lower belly, appreciating the new life growing within you. - <<set _fetus = WombRemoveFetus($activeSlave, $wombIndex)>> + Since the surgery required only a local anesthetic, you are very aware that you are now carrying <<= getSlave($AS).slaveName>>'s child. You slowly rise to your feet, a hand to your lower belly, appreciating the new life growing within you. + <<set _fetus = WombRemoveFetus(getSlave($AS), $wombIndex)>> <<run WombAddFetus($PC, _fetus)>> - <<set $PC.pregKnown = 1, $PC.preg = WombMaxPreg($PC), $activeSlave.preg = WombMaxPreg($activeSlave)>> + <<set $PC.pregKnown = 1, $PC.preg = WombMaxPreg($PC), getSlave($AS).preg = WombMaxPreg(getSlave($AS))>> <<run WombNormalizePreg($PC)>> - <<run WombNormalizePreg($activeSlave)>> + <<run WombNormalizePreg(getSlave($AS))>> <<else>> <<set _fetus = WombRemoveFetus($donatrix, $wombIndex)>> <<run WombAddFetus($receptrix, _fetus)>> @@ -75,7 +75,7 @@ <<set $PC = $donatrix>> <<else>> <<set _surr = $slaves.findIndex(function(s) { return s.ID == $donatrix.ID; })>> - <<set $activeSlave = $donatrix>> + <<set $slaves[$slaveIndices[$AS]] = $donatrix>> <</if>> <<setLocalPronouns $receptrix>> <<if $receptrix.fetish == "mindbroken">>