From 0bb7eda91f2494a8af62ac34bf5e891938f6bf47 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 12 Sep 2021 10:18:22 -0400
Subject: [PATCH] srop setLocalPronouns
---
src/Mods/DinnerParty/dinnerPartyExecution.tw | 6 +++---
src/cheats/mod_EditChildCheatNew.tw | 2 +-
src/cheats/mod_EditInfantCheatNew.tw | 2 +-
src/npc/infants/infantInteract.tw | 2 +-
src/pregmod/widgets/pregmodWidgets.tw | 14 --------------
src/uncategorized/dairy.tw | 12 ++++++------
6 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/src/Mods/DinnerParty/dinnerPartyExecution.tw b/src/Mods/DinnerParty/dinnerPartyExecution.tw
index 5b2c353a5f2..a78bdb119d4 100644
--- a/src/Mods/DinnerParty/dinnerPartyExecution.tw
+++ b/src/Mods/DinnerParty/dinnerPartyExecution.tw
@@ -420,7 +420,7 @@
/% Head Girl abuse %/
<<if ($HeadGirlID != 0) && ($activeSlave.assignment != "be your Head Girl")>>
- <<setLocalPronouns _S.HeadGirl 2>>
+ <<run App.Utils.setLocalPronouns(_S.HeadGirl, 2)>>
<br><br>
You notice a group of guests corner your Head Girl. The group consists of some very powerful people. Most of them arcology owners themselves, some of them have more powerful arcologies than yours.
_S.HeadGirl.slaveName tries to slip away, but _he2 was grabbed at the neck by the leader of the pack. He pulls _him2 down to the ground forcefully.
@@ -466,7 +466,7 @@
/% Clean up and slaves reactions %/
When the last of your guests has stumbled drunkenly out your door, your slaves begin the daunting task of cleanup.
<<for _dpe = 0; _dpe < $slaves.length; _dpe++>>
- <<setLocalPronouns $slaves[_dpe] 2>>
+ <<run App.Utils.setLocalPronouns($slaves[_dpe], 2)>>
<<if $activeSlave.mother == $slaves[_dpe].ID>>
$slaves[_dpe].slaveName is @@.mediumorchid;distraught@@ that you ate _his2 $daughter. _He2 also @@.gold;fears@@ that _he2 will be next.
<br><br>
@@ -504,7 +504,7 @@
<</for>>
<<if $activeSlave.relationship != 0>>
<<for _dpe = 0; _dpe < $slaves.length; _dpe++>>
- <<setLocalPronouns $slaves[_dpe]>>
+ <<run App.Utils.setLocalPronouns($slaves[_dpe])>>
<<if ($slaves[_dpe].ID == $activeSlave.relationshipTarget) && ($slaves[_dpe].fetish != "mindbroken")>>
$slaves[_dpe].slaveName is @@.mediumorchid;distraught@@ that you ate _his2 best source of comfort and companionship in a life of bondage.
<<set $slaves[_dpe].devotion -= $slaves[_dpe].relationship*5>>
diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index 4ae66c67063..7c66c1620dd 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -1,7 +1,7 @@
:: MOD_Edit Child Cheat New [nobr]
<<set $nextButton = "Continue", $nextLink = "MOD_Edit Child Cheat Datatype Cleanup New", $tempSlave = clone($activeSlave)>>
-<<setLocalPronouns $tempSlave>>
+<<run App.Utils.setLocalPronouns($tempSlave)>>
<<widget COptions>>
<<link "[$args[0]]">>
diff --git a/src/cheats/mod_EditInfantCheatNew.tw b/src/cheats/mod_EditInfantCheatNew.tw
index b3b21515221..eef125b22ec 100644
--- a/src/cheats/mod_EditInfantCheatNew.tw
+++ b/src/cheats/mod_EditInfantCheatNew.tw
@@ -3,7 +3,7 @@
/* TODO: all of this */
<<set $nextButton = "Continue", $nextLink = "MOD_Edit Child Cheat Datatype Cleanup New", $tempSlave = clone($activeChild)>>
-<<setLocalPronouns $tempSlave>>
+<<run App.Utils.setLocalPronouns($tempSlave)>>
<<widget COptions>>
<<link "[$args[0]]">>
diff --git a/src/npc/infants/infantInteract.tw b/src/npc/infants/infantInteract.tw
index 8f77e8fd46e..b282fcde360 100644
--- a/src/npc/infants/infantInteract.tw
+++ b/src/npc/infants/infantInteract.tw
@@ -7,7 +7,7 @@
<<set _i = App.Facilities.Nursery.childIndexForID($activeChild.ID)>>
<<set $nextButton = "Confirm changes", $nextLink = "AC Dump", $returnTo = "Nursery", _SL = $slaves.length, _CL = $cribs.length, $cribs[_i] = $activeChild>>
-<<setLocalPronouns $activeChild>>
+<<run App.Utils.setLocalPronouns($activeChild)>>
/* TODO: the encyclopedia will need to be updated for children as well */
<<set $encyclopedia = "Nursery">>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 4eff51c3778..23ef9f62201 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1,19 +1,5 @@
:: pregmod widgets [nobr widget]
-<<widget "setLocalPronouns">>
-/*
- "He has a camera. The camera belongs to him. It is his camera. The camera is his."
- "She has a diamond ring. The diamond ring belongs to her. It is her diamond ring. The diamond ring is hers."
-
- Pronouns are tricky to get right, and this widget should make it easier to use variables naturally in writing. There are two problems in English pronouns that matter here:
-
- 1. Her/her vs his/him. To solve this ambiguity, variables use male pronouns throughout, although players will of course see the contents of the variable. "$He glared" can be printed as "She glared."
-
- 2. Her/hers vs his/his. Here, the opposite problem. In this one case and this alone, where you would use "hers," (the possessive pronoun) the variable is female, since the distinction is only important there. I am very sorry for English.
-*/
- <<run App.Utils.setLocalPronouns($args[0], $args[1])>>
-<</widget>>
-
<<widget "setNonlocalPronouns">>
/* a fake slave object, we need the .pronoun attribute only */
<<set _fSlave = {pronoun: App.Data.Pronouns.Kind.female}>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 640200d3c63..bb2d34f5d9e 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -19,7 +19,7 @@
<p>
<<if ($MilkmaidID != 0) && ($dairyRestraintsSetting == 2)>>
- <<setLocalPronouns _S.Milkmaid>>
+ <<run App.Utils.setLocalPronouns(_S.Milkmaid)>>
_S.Milkmaid.slaveName has been removed from $his position as Milkmaid, since an industrialized dairy automates $his duties.
<<= removeJob(_S.Milkmaid, "be the Milkmaid")>>
<</if>>
@@ -37,7 +37,7 @@
<<if $dairyPregSettingChanged == 1>>
<<set _purgedSlaves = false>>
<<for _slave range _slaves>>
- <<setLocalPronouns _slave>>
+ <<run App.Utils.setLocalPronouns(_slave)>>
<<if (_slave.vagina > -1) && (_slave.vagina < 3)>>
_slave.slaveName's milking machine ejects $him, since it cannot fit the mandated dildo into $his tight cunt.
<<= removeJob(_slave, Job.DAIRY)>>
@@ -80,7 +80,7 @@
<<set _purgedSlaves = false>>
<<for _slave range _slaves>>
<<if (_slave.anus < 3)>>
- <<setLocalPronouns _slave>>
+ <<run App.Utils.setLocalPronouns(_slave)>>
_slave.slaveName's milking machine ejects $him, since it cannot fit its massive anal dildo up $his tight asshole.
<<= removeJob(_slave, Job.DAIRY)>>
<<set _purgedSlaves = true>>
@@ -113,7 +113,7 @@
<<if $dairyRestraintsSetting == 1>>
<<set _purgedSlaves = false>>
<<for _slave range _slaves>>
- <<setLocalPronouns _slave>>
+ <<run App.Utils.setLocalPronouns(_slave)>>
<<if (_slave.indentureRestrictions >= 2)>>
_slave.slaveName's milking machine declines to restrain $him, since $he is encoded as an indentured servant protected from restraint for milking.
<<= removeJob(_slave, Job.DAIRY)>>
@@ -133,7 +133,7 @@
<<set _purgedSlaves = false>>
<<for _slave range _slaves>>
<<if (_slave.indentureRestrictions >= 1)>>
- <<setLocalPronouns _slave>>
+ <<run App.Utils.setLocalPronouns(_slave)>>
_slave.slaveName's milking machine declines to restrain $him, since $he is encoded as an indentured servant protected from being restrained for milking.
<<= removeJob(_slave, "work in the dairy")>>
<<set _purgedSlaves = true>>
@@ -761,7 +761,7 @@
<<if (_S.Milkmaid)>>
<<includeDOM App.UI.SlaveList.displayManager(_facility)>>
<<if canAchieveErection(_S.Milkmaid) && _S.Milkmaid.pubertyXY == 1>>
- <<setLocalPronouns _S.Milkmaid>>
+ <<run App.Utils.setLocalPronouns(_S.Milkmaid)>>
<<if $milkmaidImpregnates == 1>>
Keeping the cows pregnant is part of $his job.
<div class="choices">
--
GitLab