From 924b04ae1d49b14fb4914ba75d57060602091424 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Wed, 29 Jan 2020 20:06:04 -0800
Subject: [PATCH] Pronoun fixes
---
src/uncategorized/saRules.tw | 38 ++++++++++++-------------
src/uncategorized/surgeryDegradation.tw | 4 +--
src/utility/saRulesWidgets.tw | 8 +++---
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 10ea88cd74d..c0463a1e649 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -92,7 +92,7 @@
<<else>> /* hasNonassignmentSex is true */
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release must be coming from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>,@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>,@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -299,7 +299,7 @@
<<set _whom = (_release.slaves === 1) ? "other slaves" : $his + " family">>
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>,@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>,@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -619,7 +619,7 @@
<<else>> /* hasNonassignmentSex is true */
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>,@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>,@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -834,7 +834,7 @@
<<set _whom = (_release.slaves === 1) ? "other slaves" : $his + " family">>
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>,@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>,@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -1127,7 +1127,7 @@
<<else>> /* hasNonassignmentSex is true */
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>,@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>,@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -1565,7 +1565,7 @@
<<else>>
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>,@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>,@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<else>>
@@ -1855,7 +1855,7 @@
<<else>> /* hasNonassignmentSex is true */
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -2055,7 +2055,7 @@
<<set _whom = (_release.slaves === 1) ? "other slaves" : $his + " family">>
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -2392,7 +2392,7 @@
<<else>> /* hasNonassignmentSex is true */
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -2592,7 +2592,7 @@
<<set _whom = (_release.slaves === 1) ? "other slaves" : $his + " family">>
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -2945,7 +2945,7 @@
<<else>> /* hasNonassignmentSex is true */
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -3182,7 +3182,7 @@
<<set _whom = (_release.slaves === 1) ? "other slaves" : $his + " family">>
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -3475,7 +3475,7 @@
<<else>> /* hasNonassignmentSex is true */
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -3680,7 +3680,7 @@
<<set _whom = (_release.slaves === 1) ? "other slaves" : $his + " family">>
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -4006,7 +4006,7 @@
<<else>> /* hasNonassignmentSex is true */
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -4222,7 +4222,7 @@
<<set _whom = (_release.slaves === 1) ? "other slaves" : $his + " family">>
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -4592,7 +4592,7 @@
<<else>> /* hasNonassignmentSex is true */
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -4796,7 +4796,7 @@
<<set _whom = (_release.slaves === 1) ? "other slaves" : $his + " family">>
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
@@ -5578,7 +5578,7 @@
<<set _whom = (_release.slaves === 1) ? "other slaves" : $his + " family">>
<<if (!App.Utils.hasFamilySex($slaves[$i]) && _release.slaves === 0)>>
/* no family and no other slaves, so release comes from her partner */
- finds frequent sexual release with his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
+ finds frequent sexual release with $his <<= relationshipTerm($slaves[$i])>> @@.lightgreen;<<= getSlave($slaves[$i].relationshipTarget).slaveName>>@@ which $he is @@.mediumaquamarine;thankful for.@@
<<set $slaves[$i].trust++, $slaves[$i].need -= 20>> /* TODO: probably should be based on BOTH slaves' need, leaving the less needy partner slightly frustrated */
<<saRulesPartnerDrugEffects>>
<<elseif ($universalRulesConsent == 0)>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 3c4e29e0a7e..ab2ac1f3526 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -456,7 +456,7 @@ As the remote surgery's long recovery cycle completes,
<<case "newEars">>
The implant surgery is @@.red;invasive@@ and $he spends some time in the autosurgery recovering. As soon as the bandages around $his ears are removed, $he
<<if $activeSlave.fetish == "mindbroken">>
- returns to his normal activities, none the wiser.
+ returns to $his normal activities, none the wiser.
<<else>>
initially believes nothing has changed, but soon discovers $his hearing is no longer technologically enhanced.
<</if>>
@@ -1173,7 +1173,7 @@ As the remote surgery's long recovery cycle completes,
When $he finally figures it out, $he begins to bawl, not understanding what $he did to earn this. After a short expurgation of @@.gold;grief and terror,@@ $he takes a deep breath and visibly suppresses $his emotions.
<<set $activeSlave.trust -= 5>>
<<else>>
- When $he realizes what's happened, $his face @@.mediumorchid;clouds with rage.@@ Reflexively, $he begins to peer around, looking for the source of $his woes. $He finally understands the true import of muffled hearing when your hands grab him from behind, and begins to @@.gold;shake with fear.@@
+ When $he realizes what's happened, $his face @@.mediumorchid;clouds with rage.@@ Reflexively, $he begins to peer around, looking for the source of $his woes. $He finally understands the true import of muffled hearing when your hands grab $him from behind, and begins to @@.gold;shake with fear.@@
<<set $activeSlave.trust -= 10, $activeSlave.devotion -= 10>>
<</if>>
<</if>>
diff --git a/src/utility/saRulesWidgets.tw b/src/utility/saRulesWidgets.tw
index 01f6603e354..c12d79220bf 100644
--- a/src/utility/saRulesWidgets.tw
+++ b/src/utility/saRulesWidgets.tw
@@ -487,7 +487,7 @@ and
<<set _fuckCount = random(10,25)>>
<<set $slaves[$i].counter.mammary += _fuckCount, $mammaryTotal += _fuckCount>>
<<elseif ($slaves[$i].fetish == "sadist")>>
- force the most reluctant <<if $slaves[$i].rules.release.slaves === 1>>slaves<<else>>members of his family<</if>> to let $him fuck them.
+ force the most reluctant <<if $slaves[$i].rules.release.slaves === 1>>slaves<<else>>members of $his family<</if>> to let $him fuck them.
<<if !$slaves[$i].rivalry>>
<<set _rival = randomRapeRivalryTarget($slaves[$i], (s) => { return (s.devotion <= 50 && s.sexualFlaw !== "none"); })>>
<<if def _rival>>
@@ -976,7 +976,7 @@ and
Forbidden to masturbate or seek relief through sex, he @@.mediumorchid;can't find relief@@ and @@.red;the situation harms $his health.@@
<<set $slaves[$i].devotion -= 2>>
<<else>>
- $His terribly swollen balls ache, cultivating a need for sex that @@.mediumorchid;$he can't fulfill@@ and @@.red;harming his health.@@
+ $His terribly swollen balls ache, cultivating a need for sex that @@.mediumorchid;$he can't fulfill@@ and @@.red;harming $his health.@@
<<set $slaves[$i].devotion -= 2>>
<</if>>
<<run healthDamage($slaves[$i], 3)>>
@@ -991,7 +991,7 @@ and
Forbidden to masturbate or seek relief through sex, he @@.mediumorchid;can't find relief@@ and @@.red;the situation harms $his health.@@
<<set $slaves[$i].devotion -= 4>>
<<else>>
- $His grotesquely swollen balls ache, cultivating a need for sex that @@.mediumorchid;$he can't fulfill@@ and @@.red;harming his health.@@
+ $His grotesquely swollen balls ache, cultivating a need for sex that @@.mediumorchid;$he can't fulfill@@ and @@.red;harming $his health.@@
<<set $slaves[$i].devotion -= 4>>
<</if>>
<<run healthDamage($slaves[$i], 6)>>
@@ -1008,7 +1008,7 @@ and
<</if>>
<</if>>
<<if $slaves[$i].energy > 50>>
- $His enforced chastity @@.red;habituates him to a lack of release.@@
+ $His enforced chastity @@.red;habituates $him to a lack of release.@@
<<set $slaves[$i].energy -= 2>>
<</if>>
--
GitLab