From 4fc31452f0e0c16013e9ce02f2e502e3cf6aaf5c Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 1 Oct 2020 09:23:08 -0400
Subject: [PATCH] fix more activeSlave
---
src/npc/interaction/fAbuse.tw | 2 +-
src/npc/interaction/fAnus.tw | 2 +-
src/npc/interaction/fBellyFuck.tw | 2 +-
src/npc/interaction/fBoobs.tw | 2 +-
src/npc/interaction/fDance.tw | 4 ++--
src/npc/interaction/fRival.tw | 2 +-
src/npc/interaction/passage/fSlaveSlaveDick.tw | 10 +++++-----
src/npc/interaction/passage/fSlaveSlaveVag.tw | 10 +++++-----
src/npc/interaction/passage/matchmaking.tw | 6 ++----
9 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/src/npc/interaction/fAbuse.tw b/src/npc/interaction/fAbuse.tw
index 5cb7471b4fc..502df8cbda3 100644
--- a/src/npc/interaction/fAbuse.tw
+++ b/src/npc/interaction/fAbuse.tw
@@ -1,6 +1,6 @@
:: FAbuse [nobr no-history]
-<<run App.Utils.setLocalPronouns($activeSlave)>>
+<<run App.Utils.setLocalPronouns(getSlave($AS))>>
<<if (getSlave($AS).ID == $BodyguardID)>>
<<if (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
diff --git a/src/npc/interaction/fAnus.tw b/src/npc/interaction/fAnus.tw
index 424a4ad360e..cc63e339374 100644
--- a/src/npc/interaction/fAnus.tw
+++ b/src/npc/interaction/fAnus.tw
@@ -1,6 +1,6 @@
:: FAnus [nobr no-history]
-<<run App.Utils.setLocalPronouns($activeSlave)>>
+<<run App.Utils.setLocalPronouns(getSlave($AS))>>
<<set getSlave($AS).counter.anal++, $analTotal++>>
You call $him over so you can
diff --git a/src/npc/interaction/fBellyFuck.tw b/src/npc/interaction/fBellyFuck.tw
index 8e101255f79..1b4718bcfaa 100644
--- a/src/npc/interaction/fBellyFuck.tw
+++ b/src/npc/interaction/fBellyFuck.tw
@@ -1,6 +1,6 @@
:: FBellyFuck [nobr no-history]
-<<run App.Utils.setLocalPronouns($activeSlave)>>
+<<run App.Utils.setLocalPronouns(getSlave($AS))>>
You have $him brought to you so that you can fuck $his hyperpregnant body.
<<if tooBigBelly(getSlave($AS))>>
diff --git a/src/npc/interaction/fBoobs.tw b/src/npc/interaction/fBoobs.tw
index 373bd98bac2..0325fa7a627 100644
--- a/src/npc/interaction/fBoobs.tw
+++ b/src/npc/interaction/fBoobs.tw
@@ -1,6 +1,6 @@
:: FBoobs [nobr no-history]
-<<run App.Utils.setLocalPronouns($activeSlave)>>
+<<run App.Utils.setLocalPronouns(getSlave($AS))>>
<<set getSlave($AS).counter.mammary++, $mammaryTotal++>>
You call $him over so you can play with $his
diff --git a/src/npc/interaction/fDance.tw b/src/npc/interaction/fDance.tw
index 42e952c2aa2..5f9d8d0dd11 100644
--- a/src/npc/interaction/fDance.tw
+++ b/src/npc/interaction/fDance.tw
@@ -1307,10 +1307,10 @@ It's not over yet, though. You tell your slave that it's time to incorporate som
<<case "mindbroken">>
"Free Slut"
<<default>>
- <<print App.Desc.inscrip($activeSlave)>>
+ <<print App.Desc.inscrip(getSlave($AS))>>
<</switch>>
<<else>>
- <<print App.Desc.inscrip($activeSlave)>>
+ <<print App.Desc.inscrip(getSlave($AS))>>
<</if>>
<</switch>>
is written across $his chest in large, vibrant letters.
diff --git a/src/npc/interaction/fRival.tw b/src/npc/interaction/fRival.tw
index ae4ab6de929..d6578d87f94 100644
--- a/src/npc/interaction/fRival.tw
+++ b/src/npc/interaction/fRival.tw
@@ -1,7 +1,7 @@
:: FRival [nobr no-history]
<<set _partnerID = getSlave($AS).rivalryTarget>>
-<<run App.Utils.setLocalPronouns($activeSlave)>>
+<<run App.Utils.setLocalPronouns(getSlave($AS))>>
<<setLocalPronouns getSlave(_partnerID) 2>>
You call <<= getSlave($AS).slaveName>> to your office and let $him know you'll be abusing <<= getSlave(_partnerID).slaveName>> together.
diff --git a/src/npc/interaction/passage/fSlaveSlaveDick.tw b/src/npc/interaction/passage/fSlaveSlaveDick.tw
index d97314d7e1c..95cdaf86699 100644
--- a/src/npc/interaction/passage/fSlaveSlaveDick.tw
+++ b/src/npc/interaction/passage/fSlaveSlaveDick.tw
@@ -3,22 +3,22 @@
<<set $slaverapistx = 0>>
<p class="scene-intro">
- Select a slave that will ride $activeSlave.slaveName.
+ Select a slave that will ride <<= getSlave($AS).slaveName>>.
</p>
<h2>Select an eligible slave</h2>
-<<set _eligibles = $slaves.filter((s) => (s.ID != $activeSlave.ID) && isSlaveAvailable(s) && canDoVaginal(s) && canStand(s) /* amp-amp scene is not written */)>>
+<<set _eligibles = $slaves.filter((s) => (s.ID != getSlave($AS).ID) && isSlaveAvailable(s) && canDoVaginal(s) && canStand(s) /* amp-amp scene is not written */)>>
<<for _i = 0; _i < _eligibles.length; _i++>>
<div>
<<set _name = SlaveFullName(_eligibles[_i])>>
<<print "[[_name|FSlaveSlaveDick Consummate][$slaverapistx = _eligibles[" + _i + "]]]">>
<<if _eligibles[_i].custom.label>> (@@.yellow;''<<print _eligibles[_i].custom.label>>''@@)<</if>>
- <<if (canImpreg(_eligibles[_i], $activeSlave))>>
+ <<if (canImpreg(_eligibles[_i], getSlave($AS)))>>
@@.green;Fertile@@
<</if>>
- <<if totalRelatives($activeSlave) > 0>>
- <<set _relTerm = relativeTerm($activeSlave, _eligibles[_i])>>
+ <<if totalRelatives(getSlave($AS)) > 0>>
+ <<set _relTerm = relativeTerm(getSlave($AS), _eligibles[_i])>>
<<if _relTerm != null>>
@@.lightgreen;<<= capFirstChar(_relTerm)>>@@
<</if>>
diff --git a/src/npc/interaction/passage/fSlaveSlaveVag.tw b/src/npc/interaction/passage/fSlaveSlaveVag.tw
index 322dd7590a6..f9ba29ce393 100644
--- a/src/npc/interaction/passage/fSlaveSlaveVag.tw
+++ b/src/npc/interaction/passage/fSlaveSlaveVag.tw
@@ -3,23 +3,23 @@
<<set $slaverapistx = 0>>
<p class="scene-intro">
- Select a slave that will fuck $activeSlave.slaveName.
+ Select a slave that will fuck <<= getSlave($AS).slaveName>>.
</p>
<h2>Select an eligible slave</h2>
-<<set _eligibles = $slaves.filter((s) => (s.ID != $activeSlave.ID) && isSlaveAvailable(s) && (canPenetrate(s) || s.clit >= 4))>>
+<<set _eligibles = $slaves.filter((s) => (s.ID != getSlave($AS).ID) && isSlaveAvailable(s) && (canPenetrate(s) || s.clit >= 4))>>
<<for _i = 0; _i < _eligibles.length; _i++>>
<div>
<<set _name = SlaveFullName(_eligibles[_i])>>
<<print "[[_name|FSlaveSlaveVag Consummate][$slaverapistx = _eligibles[" + _i + "]]]">>
<<if _eligibles[_i].custom.label>> (@@.yellow;''<<print _eligibles[_i].custom.label>>''@@)<</if>>
- <<if (canImpreg($activeSlave, _eligibles[_i]))>>
+ <<if (canImpreg(getSlave($AS), _eligibles[_i]))>>
@@.green;Virile@@
<</if>>
- <<if totalRelatives($activeSlave) > 0>>
- <<set _relTerm = relativeTerm($activeSlave, _eligibles[_i])>>
+ <<if totalRelatives(getSlave($AS)) > 0>>
+ <<set _relTerm = relativeTerm(getSlave($AS), _eligibles[_i])>>
<<if _relTerm != null>>
@@.lightgreen;<<= capFirstChar(_relTerm)>>@@
<</if>>
diff --git a/src/npc/interaction/passage/matchmaking.tw b/src/npc/interaction/passage/matchmaking.tw
index 9ed13bcb75c..dcccc4f229b 100644
--- a/src/npc/interaction/passage/matchmaking.tw
+++ b/src/npc/interaction/passage/matchmaking.tw
@@ -38,7 +38,7 @@ Their relationship would probably be somewhat artificial at first, and they'd ha
<br><br>__Put $him with another worshipful <<if getSlave($AS).relationship == -2>>emotionally bonded slave<<else>>emotional slut<</if>>:__
<<includeDOM App.UI.SlaveList.slaveSelectionList(
- s => s.devotion >= 100 && s.relationship === $activeSlave.relationship && s.ID !== $activeSlave.ID,
+ s => s.devotion >= 100 && s.relationship === getSlave($AS).relationship && s.ID !== getSlave($AS).ID,
App.UI.SlaveList.SlaveInteract.stdInteract,
null,
(s) => App.UI.DOM.passageLink('Match them', 'Matchmaking', () => { variables().subSlave = s; })
@@ -183,7 +183,7 @@ Being ordered into a relationship would be difficult for anyone, but they're so
<</if>>
<<set $subSlave.relationship = 4>>
-<<set $subSlave.relationshipTarget = $activeSlave.ID>>
+<<set $subSlave.relationshipTarget = getSlave($AS).ID>>
<<set $subSlave.devotion -= 20>>
<<set getSlave($AS).relationship = 4>>
<<set getSlave($AS).relationshipTarget = $subSlave.ID>>
@@ -192,5 +192,3 @@ Being ordered into a relationship would be difficult for anyone, but they're so
<<set $slaves[$slaveIndices[$subSlave.ID]] = $subSlave>>
<</if>>
-
-<<set $activeSlave = getSlave($AS)>> /* this should be harmless, keyword should */
--
GitLab