From 243634a80ac79e019ddc33be0e6608c434356a17 Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Sat, 19 Sep 2020 15:23:39 -0400 Subject: [PATCH] pronoun fixes --- src/npc/interaction/fFeelings.tw | 9 ++++++--- src/npc/interaction/passage/fMarry.tw | 6 ++++-- src/uncategorized/pHostageAcquisition.tw | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/npc/interaction/fFeelings.tw b/src/npc/interaction/fFeelings.tw index b918d272ac1..2dd8439aca7 100644 --- a/src/npc/interaction/fFeelings.tw +++ b/src/npc/interaction/fFeelings.tw @@ -58,7 +58,8 @@ "You're my <<Master>>, and I'll do my be<<s>>t to obey you," $he <<say>>s <</if>> <<elseif (getSlave($AS).devotion <= 95)>> - <<setSpokenLocalPronouns getSlave($AS) getSlave($AS)>> + <<set _slave = getSlave($AS)>> + <<setSpokenLocalPronouns _slave _slave>> <<if !canTalk(getSlave($AS))>> $He gestures that you're $his beloved <<Master>>. $He continues to sign<<if getSlave($AS).accent == 3>>, using gestures to supplant $his poor $language<</if>>: <<else>> @@ -1252,7 +1253,8 @@ My favorite part of my body i<<s>> <<set _partnerName = $slaves[_partner].slaveName>> <</if>> <<setLocalPronouns $slaves[_partner] 2>> - <<setSpokenLocalPronouns getSlave($AS) $slaves[_partner]>> + <<set _slave = getSlave($AS)>> + <<setSpokenLocalPronouns _slave $slaves[_partner]>> <<else>> @@.red;Error, relationshipTarget not found.@@ <</if>> @@ -1314,7 +1316,8 @@ My favorite part of my body i<<s>> <</if>> <</if>> <<elseif (getSlave($AS).relationship == -3)>> - <<setSpokenLocalPronouns getSlave($AS) getSlave($AS)>> + <<set _slave = getSlave($AS)>> + <<setSpokenLocalPronouns _slave _slave>> <<if getSlave($AS).devotion+getSlave($AS).trust >= 175>> Of cour<<s>>e, I'm your <<wife>>, <<Master>>." $He laughs. "Not e<<x>>actly traditional married life, but I'll do my be<<s>>t to help redefine it. <<elseif getSlave($AS).devotion < -20 && getSlave($AS).trust > 20>> diff --git a/src/npc/interaction/passage/fMarry.tw b/src/npc/interaction/passage/fMarry.tw index 37008dddbca..35c817587cc 100644 --- a/src/npc/interaction/passage/fMarry.tw +++ b/src/npc/interaction/passage/fMarry.tw @@ -13,7 +13,8 @@ <<set _m = $slaveIndices[getSlave($AS).relationshipTarget]>> <<if def _m>> <<setLocalPronouns $slaves[_m] 2>> - <<setSpokenLocalPronouns getSlave($AS) $slaves[_m]>> + <<set _slave = getSlave($AS)>> + <<setSpokenLocalPronouns _slave $slaves[_m]>> <<if SlaveStatsChecker.checkForLisp(getSlave($AS))>> <<set _name = lispReplace($slaves[_m].slaveName)>> <<else>> @@ -55,7 +56,8 @@ You tell <<= getSlave($AS).slaveName>> that you're going to marry $him. (A propo $He continues, <</if>> "Thank you, <<Master>>. I am going to do my be<<s>>t to be a - <<setSpokenLocalPronouns getSlave($AS) getSlave($AS)>> + <<set _slave = getSlave($AS)>> + <<setSpokenLocalPronouns _slave _slave>> <<if (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60)>> <<if (getSlave($AS).fetish == "submissive")>> perfect <<s>>ubmi<<ss>>ive <<wife>> to you, diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw index ad7df99a5f8..7e82a33f98e 100644 --- a/src/uncategorized/pHostageAcquisition.tw +++ b/src/uncategorized/pHostageAcquisition.tw @@ -12,7 +12,7 @@ <<if $hostageWife != 0>> <<setLocalPronouns $hostageWife 2>> - <<setSpokenLocalPronouns getSlave($AS) $hostageWife>> + <<setSpokenLocalPronouns $activeSlave $hostageWife>> <</if>> <span id="art-frame"> -- GitLab