Merge branch 'activeSlave-marry-fixes' into 'pregmod-master'

remove more activeSlave

Closes #2324

See merge request pregmodfan/fc-pregmod!7902

src/npc/agent/agentCompany.tw

 :: Agent Company [nobr]
 
-<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Neighbor Interact", _ID = $activeSlave.ID>>
+<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Neighbor Interact">>
 
-<<= assignJob($activeSlave, "live with your agent")>>
+<<= assignJob(getSlave($AS), "live with your agent")>>
 
 <<set $reservedChildren = FetusGlobalReserveCount("incubator")>>
 <<set $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
 
-<<if $activeSlave.rivalry > 0>>
-	<<set _i = $slaveIndices[$activeSlave.rivalryTarget]>>
+<<if getSlave($AS).rivalry > 0>>
+	<<set _i = $slaveIndices[getSlave($AS).rivalryTarget]>>
 	<<if def _i>>
 		<<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0>>
 	<<else>>
 		@@.red;Error, activeSlave rival not found.@@
 	<</if>>
-	<<set $activeSlave.rivalry = 0, $activeSlave.rivalryTarget = 0>>
+	<<set getSlave($AS).rivalry = 0, getSlave($AS).rivalryTarget = 0>>
 <</if>>
 
 <<set _neighborArcology = $arcologies.find(function(s) { return $subSlave.ID == s.leaderID; })>>
@@ -25,12 +25,12 @@ Working in _neighborArcology.name's penthouse office, $subSlave.slaveName gets a
 
 <br><br>
 
-_His2 question is answered when you bring <<= contextualIntro($subSlave, $activeSlave)>> in close, putting $him in $subSlave.slaveName's view. $subSlave.slaveName's <<= App.Desc.eyesColor($subSlave)>> fly open with pleased surprise, but before _he2 can speak, $activeSlave.slaveName goes first.
-<<if !canTalk($activeSlave)>>
-	Unable to speak $himself, $he simply makes a heart shape with $his hand<<if hasBothArms($activeSlave)>>s<</if>> in view of the video call, and blows $his <<if $activeSlave.relationship == 4>>lover<<else>>_wife2<</if>> a kiss.
+_His2 question is answered when you bring <<= contextualIntro($subSlave, getSlave($AS))>> in close, putting $him in $subSlave.slaveName's view. $subSlave.slaveName's <<= App.Desc.eyesColor($subSlave)>> fly open with pleased surprise, but before _he2 can speak, <<= getSlave($AS).slaveName>> goes first.
+<<if !canTalk(getSlave($AS))>>
+	Unable to speak $himself, $he simply makes a heart shape with $his hand<<if hasBothArms(getSlave($AS))>>s<</if>> in view of the video call, and blows $his <<if getSlave($AS).relationship == 4>>lover<<else>>_wife2<</if>> a kiss.
 <<else>>
-	<<run Enunciate($activeSlave)>>
-	"Hi <<if $activeSlave.relationship == 4>>lover<<else>><<s>>weetheart<</if>>," $he <<say>>s in a syrupy tone. "Mi<<ss>> me?"
+	<<run Enunciate(getSlave($AS))>>
+	"Hi <<if getSlave($AS).relationship == 4>>lover<<else>><<s>>weetheart<</if>>," $he <<say>>s in a syrupy tone. "Mi<<ss>> me?"
 <</if>>
 
 <br><br>

src/npc/interaction/passage/fMarry.tw

 :: FMarry [nobr]
 
 <<set $nextButton = "Back", $nextLink = "Slave Interact">>
-<<set $AS = $activeSlave.ID>>
-<<run App.Utils.setLocalPronouns(getSlave($activeSlave.ID))>>
+<<run App.Utils.setLocalPronouns(getSlave($AS))>>
 <<run Enunciate(getSlave($AS))>>
 <<set _belly = bellyAdjective(getSlave($AS))>>
 

src/npc/interaction/passage/matchmaking.tw

@@ -6,7 +6,6 @@
 	<<set $nextLink = "Slave Interact">>
 <</if>>
 <<set $nextButton = "Continue">>
-<<set $AS = $activeSlave.ID>>
 
 <<if $subSlave == 0>>