From b735bf2c2188b7df6068e65e01f0d2d69baf74bd Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 4 Aug 2020 18:00:11 -0500
Subject: [PATCH] WifePronouns
---
src/cheats/mod_EditArcologyCheat.tw | 2 +-
src/data/newGamePlus.js | 2 +-
src/gui/storyCaptionWidgets.tw | 4 ++--
src/npc/descriptions/descriptionWidgets.js | 2 +-
src/npc/interaction/passage/fSlaveImpreg.tw | 10 +++++-----
src/pregmod/analyzePregnancy.tw | 6 +++---
src/uncategorized/pRivalryActions.tw | 14 +++++++-------
src/uncategorized/remoteSurgery.tw | 2 +-
src/uncategorized/subordinateTargeting.tw | 2 +-
src/uncategorized/surgeryDegradation.tw | 2 +-
10 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/cheats/mod_EditArcologyCheat.tw b/src/cheats/mod_EditArcologyCheat.tw
index b1eec155dd2..2e87694c943 100644
--- a/src/cheats/mod_EditArcologyCheat.tw
+++ b/src/cheats/mod_EditArcologyCheat.tw
@@ -202,7 +202,7 @@ Custom: <<textbox "$language" $language "MOD_Edit Arcology Cheat">>
<br>TSS Failed: ''$TSS.schoolAnnexed'' |
<<radiobutton "$TSS.schoolAnnexed" 0>> 0
| <<radiobutton "$TSS.schoolAnnexed" 1>> 1 (Failed)
-
+
<br>TUO Upgrades: ''$TUO.schoolUpgrade'' |
<<radiobutton "$TUO.schoolUpgrade" 0>> 0
| <<radiobutton "$TUO.schoolUpgrade" 1>> 1
diff --git a/src/data/newGamePlus.js b/src/data/newGamePlus.js
index bc771401033..8d65a18363a 100644
--- a/src/data/newGamePlus.js
+++ b/src/data/newGamePlus.js
@@ -95,7 +95,7 @@ App.Data.NewGamePlus = (function() {
s.mother -= NGPOffset;
if (!(s.mother in newTable) && needed.indexOf(s.mother + NGPOffset) === -1)
needed.push(s.mother + NGPOffset);
- }
+ }
if (s.father in missingTable) {
s.father -= NGPOffset;
if (!(s.father in newTable) && needed.indexOf(s.father + NGPOffset) === -1)
diff --git a/src/gui/storyCaptionWidgets.tw b/src/gui/storyCaptionWidgets.tw
index 3242e2b91f5..ce839f41640 100644
--- a/src/gui/storyCaptionWidgets.tw
+++ b/src/gui/storyCaptionWidgets.tw
@@ -7,7 +7,7 @@
<<if _Pass != "End Week">>
<<if _Pass == "Main">>
<strong>
- <div id="endWeekButton">
+ <div id="endWeekButton">
<<link "END WEEK">>
<<run endWeek()>>
<</link>>
@@ -24,7 +24,7 @@
<<if $nextButton != " ">>
<<link "$nextButton">>
<<goto $nextLink>>
- <</link>>
+ <</link>>
<span class="hotkey">
<<print App.UI.Hotkeys.hotkeys("nextLink")>>
</span>
diff --git a/src/npc/descriptions/descriptionWidgets.js b/src/npc/descriptions/descriptionWidgets.js
index 291c36663b3..36983303e74 100644
--- a/src/npc/descriptions/descriptionWidgets.js
+++ b/src/npc/descriptions/descriptionWidgets.js
@@ -576,7 +576,7 @@ App.Desc.ageAndHealth = function(slave) {
}
}
}
-
+
if (slave.actualAge !== slave.physicalAge) {
r += ` However, ${he} has the body of a ${num(slave.physicalAge)}-year-old; `;
if (slave.physicalAge < 18 && slave.actualAge >= 18) {
diff --git a/src/npc/interaction/passage/fSlaveImpreg.tw b/src/npc/interaction/passage/fSlaveImpreg.tw
index e81aeecbf96..526587a0cf1 100644
--- a/src/npc/interaction/passage/fSlaveImpreg.tw
+++ b/src/npc/interaction/passage/fSlaveImpreg.tw
@@ -27,15 +27,15 @@
<<if $inbreeding && _kinship[_eligibles[_i].ID] > 0>>
<<set _thisKinship = _kinship[_eligibles[_i].ID]>>
<<if _thisKinship >= 0.5>>
- (Extreme
+ (Extreme
<<elseif _thisKinship >= 0.25>>
- (Major
+ (Major
<<elseif _thisKinship >= 0.125>>
- (Some
+ (Some
<<elseif _thisKinship >= 0.0625>>
- (Minor
+ (Minor
<<else>>
- (Slight
+ (Slight
<</if>>
inbreeding, CoI of <<print _thisKinship>>)
<</if>>
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index 4a64fa0b204..45c768136ca 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -377,11 +377,11 @@
<<elseif getSlave($activeSlave.ID).pregWeek < 0>> /*special states*/
Subject is in the postpartem period.
<<elseif getSlave($activeSlave.ID).ovaryAge >= 47 >>
- $His infertility is due to menopausal ovaries.
+ $His infertility is due to menopausal ovaries.
<<elseif getSlave($activeSlave.ID).ovaries === 0 && getSlave($activeSlave.ID).mpreg === 0>>
- $His infertility is due to missing ovaries.
+ $His infertility is due to missing ovaries.
<<elseif getSlave($activeSlave.ID).preg == -2>> /*special states*/
- $His infertility is due to sterilization; $his ovaries could still work.
+ $His infertility is due to sterilization; $his ovaries could still work.
<<elseif getSlave($activeSlave.ID).preg == -1>> /*special states*/
Contreceptive agents detected in subject.
<</if>>
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 88fdb6eda38..1a8334f6f7d 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -170,7 +170,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.counter.anal += 1>>
<<set $hostage.behavioralFlaw = "bitchy">>
<<set $hostage.sexualFlaw = "idealistic">>
- bound and offered to an older woman.
+ bound and offered to an older _woman2.
<<case "Maturity Preferentialism">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -179,7 +179,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.counter.anal += 1>>
<<set $hostage.behavioralFlaw = "bitchy">>
<<set $hostage.sexualFlaw = "idealistic">>
- bound and offered to a young woman.
+ bound and offered to a young _woman2.
<<case "Slimness Enthusiasm">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -270,7 +270,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.counter.anal += 1>>
<<set $hostage.behavioralFlaw = "liberated">>
<<set $hostage.sexualFlaw = "idealistic">>
- bound and offered to a towering woman.
+ bound and offered to a towering _woman2.
<<case "Statuesque Glorification">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -279,7 +279,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.counter.anal += 1>>
<<set $hostage.behavioralFlaw = "liberated">>
<<set $hostage.sexualFlaw = "judgemental">>
- tied down and offered to a tiny woman.
+ tied down and offered to a tiny _woman2.
<<default>>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -846,7 +846,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.behavioralQuirk = "adores women">>
<<set $hostage.sexualQuirk = "romantic">>
<<set $hostage.fetishStrength = 65>>
- beginning to fall in love with $his loving mother figure.
+ beginning to fall in love with $his loving _mother2 figure.
<<case "Maturity Preferentialism">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -2276,7 +2276,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.counter.oral += 1>>
<<set $hostage.counter.vaginal += 1>>
<<set $hostage.counter.anal += 1>>
- <<set _hostageAction.push("struggling to escape the grasp of a motherly woman.")>>
+ <<set _hostageAction.push("struggling to escape the grasp of a motherly _woman2.")>>
<<set _hostageAction.push("hiding from $his MILF partner, sobbing quietly.")>>
<<set _hostageAction.push("struggling to escape being mothered by $his older partner.")>>
<<elseif $rivalryDuration <= 10>>
@@ -2286,7 +2286,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.counter.oral += 5>>
<<set $hostage.counter.vaginal += 5>>
<<set $hostage.counter.anal += 5>>
- <<set _hostageAction.push("crying gently while a motherly woman fondles $him.")>>
+ <<set _hostageAction.push("crying gently while a <<= _mother2>>ly _woman2 fondles $him.")>>
<<set _hostageAction.push("cringing as $he massages $his MILF partner's back.")>>
<<set _hostageAction.push("cautiously tasting $his MILF partner's milk.")>>
<<elseif $rivalryDuration <= 15>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 66cece0c3f6..eb3fe0a1644 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -2205,7 +2205,7 @@
[[Induced superfetation treatment|Surgery Degradation][getSlave($AS).geneticQuirks.superfetation = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 40,$surgeryType = "gene treatment"]] <span class="note">This will induce <span class="orange">superfetation</span> in $his genetic code</span>
<</if>>
</div>
-
+
<div>
<<if getSlave($AS).geneticQuirks.uterineHypersensitivity == 2>>
[[Correct uterine hypersensitivity|Surgery Degradation][getSlave($AS).geneticQuirks.uterineHypersensitivity = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 100,$surgeryType = "gene treatment"]]
diff --git a/src/uncategorized/subordinateTargeting.tw b/src/uncategorized/subordinateTargeting.tw
index 7f9a8f115e9..6ddfde0a201 100644
--- a/src/uncategorized/subordinateTargeting.tw
+++ b/src/uncategorized/subordinateTargeting.tw
@@ -37,5 +37,5 @@
(!isAmputee(State.variables.activeSlave) || !isAmputee(s)),
(s) => App.UI.DOM.passageLink(SlaveFullName(s), 'Subordinate Targeting', () => { V.activeSlave.subTarget = s.ID; }),
)>>
-
+
<</if>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 5d3d7c8ae16..b8e424eed16 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -2654,7 +2654,7 @@ As the remote surgery's long recovery cycle completes,
above $his crotch.
<</if>>
<<if hasAnyArms(getSlave($AS))>>
- As $he reaches to scratch it,
+ As $he reaches to scratch it,
<<elseif canSee(getSlave($AS))>>
<<if $surgeryType != "restoreHairPubes">>
When $he investigates,
--
GitLab