Merge branch 'transplant' into 'pregmod-master'

Ova transplant fix

Closes #1748

See merge request pregmodfan/fc-pregmod!6724

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]] |

src/pregmod/huskSlaveSwapWorkaround.tw

 :: 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>>

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">>