From 7f067b5ac1217c88ef8718e96dc0fd6ceb972646 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 14 Jul 2019 19:24:50 -0500
Subject: [PATCH] MiscTweaks
---
src/endWeek/saServant.js | 3 +-
.../nursery/longChildDescription.tw | 150 +++++++++---------
src/js/economyJS.js | 2 +-
src/js/generateGenetics.js | 2 +-
src/pregmod/fMarry.tw | 26 +--
src/pregmod/slaveOnSlaveFeedingWorkAround.tw | 6 +-
src/uncategorized/REroyalblood.tw | 2 +-
src/uncategorized/dairyReport.tw | 2 +-
src/uncategorized/longSlaveDescription.tw | 150 +++++++++---------
src/uncategorized/managePenthouse.tw | 23 ++-
src/uncategorized/matchmaking.tw | 4 +-
src/uncategorized/prestigiousSlave.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 2 +-
src/uncategorized/seRaidingAssault.tw | 6 +-
src/uncategorized/servantsQuartersReport.tw | 2 +-
15 files changed, 193 insertions(+), 189 deletions(-)
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index d0923cdef03..a6769743186 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -9,6 +9,7 @@ window.saServant = function saServant(slave) {
he, him, his, hers, himself, boy,
He, His
} = getPronouns(slave);
+ let wife = (boy === "girl" ? "wife" : "husband");
/* eslint-enable */
let t = `works as a servant. ${He} performs the lowest jobs in your penthouse, cleaning up after your other slaves, bathing them, helping them dress, and giving them sexual relief.`;
@@ -73,7 +74,7 @@ window.saServant = function saServant(slave) {
if (slave.relationship === -2) {
t += ` ${He} does ${his} best to perfect your domesticity due to ${his} emotional bond to you.`;
} else if (slave.relationship === -3 && slave.devotion > 50) {
- t += ` ${He} does ${his} very best to be the perfect housewife, making ${him} an outstanding servant.`;
+ t += ` ${He} does ${his} very best to be the perfect house${wife}, making ${him} an outstanding servant.`;
}
if (setup.servantCareers.includes(slave.career)) {
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 52fb7d0019b..504812100fe 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -186,85 +186,87 @@ is
<<set _sortedCounts = []>>
<<set _sortedCounts.push({type: "anal", value: $activeChild.counter.anal}), _sortedCounts.push({type: "vaginal", value: $activeChild.counter.vaginal}), _sortedCounts.push({type: "oral", value: $activeChild.counter.oral/2}), _sortedCounts.push({type: "mammary", value: $activeChild.counter.mammary}), _sortedCounts.push({type: "penetrative", value: $activeChild.counter.penetrative})>>
<<set _sortedCounts = _sortedCounts.sort(function(a, b){return b.value-a.value})>>
- <<if _sortedCounts[0].type == "anal">>
- <<if (_weeksOwned*112)/$activeChild.counter.anal < 4>>
- Remarkably, this means that $he's been buttfucked
- <<if (_weeksOwned*112)/$activeChild.counter.anal < 1>>
- more than once every hour
- <<elseif (_weeksOwned*112)/$activeChild.counter.anal < 1.5>>
- about once every hour
- <<elseif (_weeksOwned*112)/$activeChild.counter.anal < 2.5>>
- about once every two hours
- <<elseif (_weeksOwned*112)/$activeChild.counter.anal < 3.5>>
- about once every three hours
- <<else>>
- about once every four hours
+ <<if _weeksOwned > 0>>
+ <<if _sortedCounts[0].type == "anal">>
+ <<if (_weeksOwned*112)/$activeChild.counter.anal < 4>>
+ Remarkably, this means that $he's been buttfucked
+ <<if (_weeksOwned*112)/$activeChild.counter.anal < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeChild.counter.anal < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeChild.counter.anal < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeChild.counter.anal < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
<</if>>
- $he's spent awake.
- <</if>>
- <<elseif _sortedCounts[0].type == "vaginal">>
- <<if (_weeksOwned*112)/$activeChild.counter.vaginal < 4>>
- Remarkably, this means that $his pussy has been fucked
- <<if (_weeksOwned*112)/$activeChild.counter.vaginal < 1>>
- more than once every hour
- <<elseif (_weeksOwned*112)/$activeChild.counter.vaginal < 1.5>>
- about once every hour
- <<elseif (_weeksOwned*112)/$activeChild.counter.vaginal < 2.5>>
- about once every two hours
- <<elseif (_weeksOwned*112)/$activeChild.counter.vaginal < 3.5>>
- about once every three hours
- <<else>>
- about once every four hours
+ <<elseif _sortedCounts[0].type == "vaginal">>
+ <<if (_weeksOwned*112)/$activeChild.counter.vaginal < 4>>
+ Remarkably, this means that $his pussy has been fucked
+ <<if (_weeksOwned*112)/$activeChild.counter.vaginal < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeChild.counter.vaginal < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeChild.counter.vaginal < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeChild.counter.vaginal < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
<</if>>
- $he's spent awake.
- <</if>>
- <<elseif _sortedCounts[0].type == "oral">>
- <<if (_weeksOwned*112)/$activeChild.counter.oral < 4>>
- Remarkably, this means that $he's sucked something off
- <<if (_weeksOwned*112)/$activeChild.counter.oral < 1>>
- more than once every hour
- <<elseif (_weeksOwned*112)/$activeChild.counter.oral < 1.5>>
- about once every hour
- <<elseif (_weeksOwned*112)/$activeChild.counter.oral < 2.5>>
- about once every two hours
- <<elseif (_weeksOwned*112)/$activeChild.counter.oral < 3.5>>
- about once every three hours
- <<else>>
- about once every four hours
+ <<elseif _sortedCounts[0].type == "oral">>
+ <<if (_weeksOwned*112)/$activeChild.counter.oral < 4>>
+ Remarkably, this means that $he's sucked something off
+ <<if (_weeksOwned*112)/$activeChild.counter.oral < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeChild.counter.oral < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeChild.counter.oral < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeChild.counter.oral < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
<</if>>
- $he's spent awake.
- <</if>>
- <<elseif _sortedCounts[0].type == "mammary">>
- <<if (_weeksOwned*112)/$activeChild.counter.mammary < 4>>
- Remarkably, this means that $he's put $his tits to work
- <<if (_weeksOwned*112)/$activeChild.counter.mammary < 1>>
- more than once every hour
- <<elseif (_weeksOwned*112)/$activeChild.counter.mammary < 1.5>>
- about once every hour
- <<elseif (_weeksOwned*112)/$activeChild.counter.mammary < 2.5>>
- about once every two hours
- <<elseif (_weeksOwned*112)/$activeChild.counter.mammary < 3.5>>
- about once every three hours
- <<else>>
- about once every four hours
+ <<elseif _sortedCounts[0].type == "mammary">>
+ <<if (_weeksOwned*112)/$activeChild.counter.mammary < 4>>
+ Remarkably, this means that $he's put $his tits to work
+ <<if (_weeksOwned*112)/$activeChild.counter.mammary < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeChild.counter.mammary < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeChild.counter.mammary < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeChild.counter.mammary < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
<</if>>
- $he's spent awake.
- <</if>>
- <<elseif _sortedCounts[0].type == "penetrative">>
- <<if (_weeksOwned*112)/$activeChild.counter.penetrative < 4>>
- Remarkably, this means that $he's pounded a hole
- <<if (_weeksOwned*112)/$activeChild.counter.penetrative < 1>>
- more than once every hour
- <<elseif (_weeksOwned*112)/$activeChild.counter.penetrative < 1.5>>
- about once every hour
- <<elseif (_weeksOwned*112)/$activeChild.counter.penetrative < 2.5>>
- about once every two hours
- <<elseif (_weeksOwned*112)/$activeChild.counter.penetrative < 3.5>>
- about once every three hours
- <<else>>
- about once every four hours
+ <<elseif _sortedCounts[0].type == "penetrative">>
+ <<if (_weeksOwned*112)/$activeChild.counter.penetrative < 4>>
+ Remarkably, this means that $he's pounded a hole
+ <<if (_weeksOwned*112)/$activeChild.counter.penetrative < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeChild.counter.penetrative < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeChild.counter.penetrative < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeChild.counter.penetrative < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
<</if>>
- $he's spent awake.
<</if>>
<</if>>
<</if>>
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index fdb79684546..b717b1ef668 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -1155,7 +1155,7 @@ window.slaveJobValues = function() {
let skilltarget = (100 + ((s.skill.anal - 100)*canA*(1.5 - .5*canV) + (s.skill.vaginal - 100)*canV*(1.5 - .5*canA) + (s.skill.oral - 100)*(3 - 1.5*canA - 1.5*canV + canA*canV))*3/10);
//Complicated, I know - but it should automatically account for what acts are possible to scale the injury risk smoothly between 90% when totally unskilled
//and 0% when perfectly skilled in the relevant method or methods.
-
+
if (jsRandom(1,100) > skilltarget) {
s.health -= 10 - 7*canA*canV; //Any limitations means an injury inflicts the harsher 10 instead of 3
s.minorInjury = 1;
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 516bf72f95e..f872ce1b403 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -10,7 +10,7 @@ window.generateGenetics = (function() {
let V;
// intelligence and face parameters are the same so we can use the same distribution for both values
- // clamping makes edge values (-100, 100) more likely; this is expected behaviour
+ // clamping makes edge values (-100, 100) more likely; this is expected behavior
// please see https://gitgud.io/pregmodfan/fc-pregmod/issues/852
const fuzzy = (a, b) => Math.clamp(normalRandInt((a+b)/2, 20), -100, 100);
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index ebd5cab28e0..e0dade52ffc 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -345,37 +345,37 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
"Slave redesignated," it responds immediately. The thing is done.
<<else>>
<<if $assistantAppearance == "monstergirl">>
- _HisA avatar snaps its fingers and shrugs off its surplice, revealing _hisA tentacle hair, pale skin, and cocks once more.
+ _HisA avatar snaps _hisA fingers and shrugs off _hisA surplice, revealing _hisA tentacle hair, pale skin, and cocks once more.
<<elseif $assistantAppearance == "shemale">>
- _HisA avatar snaps its fingers and starts to masturbate more energetically.
+ _HisA avatar snaps _hisA fingers and starts to masturbate more energetically.
<<elseif $assistantAppearance == "amazon">>
- _HisA avatar gives its medicine stick a shake.
+ _HisA avatar gives _hisA medicine stick a shake.
<<elseif $assistantAppearance == "businesswoman">>
- _HisA avatar snaps its fingers.
+ _HisA avatar snaps _hisA fingers.
<<elseif ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy")>>
- _HisA avatar claps its hands twice, looking a bit disappointed at the lack of celebration.
+ _HisA avatar claps _hisA hands twice, looking a bit disappointed at the lack of celebration.
<<elseif $assistantAppearance == "goddess">>
_HisA avatar makes a complex hand gesture, looking beatific.
<<elseif $assistantAppearance == "hypergoddess">>
_HisA avatar makes a complex hand gesture, looking beatific.
<<elseif $assistantAppearance == "loli">>
- _HisA avatar claps its hands together.
+ _HisA avatar claps _hisA hands together.
<<elseif $assistantAppearance == "preggololi">>
- _HisA avatar claps its hands together.
+ _HisA avatar claps _hisA hands together.
<<elseif $assistantAppearance == "schoolgirl">>
- _HisA avatar snaps its fingers and gives a little twirl.
+ _HisA avatar snaps _hisA fingers and gives a little twirl.
<<elseif $assistantAppearance == "angel">>
- _HisA avatar spreads its wings and arms and emits a flash of light.
+ _HisA avatar spreads _hisA wings and arms and emits a flash of light.
<<elseif $assistantAppearance == "cherub">>
- _HisA avatar claps its hands together, emitting a burst of light.
+ _HisA avatar claps _hisA hands together, emitting a burst of light.
<<elseif $assistantAppearance == "incubus">>
- _HisA avatar flicks the tip of its penis and blows _hisA load towards the both of you.
+ _HisA avatar flicks the tip of _hisA penis and blows _hisA load towards the both of you.
<<elseif $assistantAppearance == "succubus">>
_HisA avatar starts to masturbate furiously and orgasms lewdly.
<<elseif $assistantAppearance == "imp">>
- _HisA avatar claps its hands together, emitting a burst of darkness.
+ _HisA avatar claps _hisA hands together, emitting a burst of darkness.
<<elseif $assistantAppearance == "witch">>
- _HisA avatar pulls out its spell book and attempts a spell to bind you two; _heA manages to conjure a large ring around _himA, pinning _hisA arms to _hisA sides.
+ _HisA avatar pulls out _hisA spell book and attempts a spell to bind you two; _heA manages to conjure a large ring around _himselfA, pinning _hisA arms to _hisA sides.
<<elseif $assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
_HisA avatar splits open to reveal a number of tentacles and wraps them around each other.
<<else>>
diff --git a/src/pregmod/slaveOnSlaveFeedingWorkAround.tw b/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
index fbcdcd84565..3a4092593a7 100644
--- a/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
+++ b/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
@@ -59,7 +59,7 @@ __2 Liters__
<<case 4>>
lover
<<case 5>>
- slave wife
+ slave $wife
<</switch>>
<</if>>
<<if $slaves[_i].rivalryTarget == $activeSlave.ID>>
@@ -103,7 +103,7 @@ __4 Liters__
<<case 4>>
lover
<<case 5>>
- slave wife
+ slave $wife
<</switch>>
<</if>>
<<if $slaves[_i].rivalryTarget == $activeSlave.ID>>
@@ -146,7 +146,7 @@ __4 Liters__
<<case 4>>
lover
<<case 5>>
- slave wife
+ slave $wife
<</switch>>
<</if>>
<<if $slaves[_i].rivalryTarget == $activeSlave.ID>>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 9cc7a420f1f..e58bc1a485e 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -161,7 +161,7 @@ It seems a bastion of the old world has fallen, a royal family of ancient blood
Of course, nothing in the Free Cities is free and international aid is no exception. This new arcology owner is no fool, however, and has outlined a number of rewards to be delivered to his most generous benefactors.
-Though the King himself is dead, murdered in his bed by bloodthirsty revolutionaries, the rest of his family and the majority of his court have been captured and enslaved by their former subjects. The new arcology owner, having decided that a large injection of credits or a shipment of goods is superior to deflowering a royal pussy or asshole, has directed his followers to slake their lust and vengeance on the King's wife and court rather than his children, though they too are past the age of majority.
+Though the King himself is dead, murdered in his bed by bloodthirsty revolutionaries, the rest of his family and the majority of his court have been captured and enslaved by their former subjects. The new arcology owner, having decided that a large injection of credits or a shipment of goods is superior to deflowering a royal pussy or asshole, has directed his followers to slake their lust and vengeance on the King's _wife3 and court rather than his children, though they too are past the age of majority.
<br><br>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 32cec817a25..7ea3ebae45d 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -151,7 +151,7 @@
<<= SlaveFullName($Milkmaid)>> is serving as your Milkmaid.
<<if $Milkmaid.relationship == -3 && $Milkmaid.devotion > 50>>
<<set $milkmaidDevotionBonus += 2, $milkmaidTrustBonus += 2>>
- $He tries $his best to be your perfect farmwife.
+ $He tries $his best to be your perfect farm<<= $wife>>.
<</if>>
<<if _milkmaidImpregnated > 0>>
It's $his responsibility to keep $his charges pregnant, and $he constantly
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 360574e16d0..0d84ee8017d 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -432,85 +432,87 @@ is
<<set _sortedCounts = []>>
<<set _sortedCounts.push({type: "anal", value: $activeSlave.counter.anal}), _sortedCounts.push({type: "vaginal", value: $activeSlave.counter.vaginal}), _sortedCounts.push({type: "oral", value: $activeSlave.counter.oral/2}), _sortedCounts.push({type: "mammary", value: $activeSlave.counter.mammary}), _sortedCounts.push({type: "penetrative", value: $activeSlave.counter.penetrative})>>
<<set _sortedCounts = _sortedCounts.sort(function(a, b){return b.value-a.value})>>
- <<if _sortedCounts[0].type == "anal">>
- <<if (_weeksOwned*112)/$activeSlave.counter.anal < 4>>
- Remarkably, this means that $he's been buttfucked
- <<if (_weeksOwned*112)/$activeSlave.counter.anal < 1>>
- more than once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.counter.anal < 1.5>>
- about once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.counter.anal < 2.5>>
- about once every two hours
- <<elseif (_weeksOwned*112)/$activeSlave.counter.anal < 3.5>>
- about once every three hours
- <<else>>
- about once every four hours
+ <<if _weeksOwned > 0>>
+ <<if _sortedCounts[0].type == "anal">>
+ <<if (_weeksOwned*112)/$activeSlave.counter.anal < 4>>
+ Remarkably, this means that $he's been buttfucked
+ <<if (_weeksOwned*112)/$activeSlave.counter.anal < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.anal < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.anal < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.anal < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
<</if>>
- $he's spent awake.
- <</if>>
- <<elseif _sortedCounts[0].type == "vaginal">>
- <<if (_weeksOwned*112)/$activeSlave.counter.vaginal < 4>>
- Remarkably, this means that $his pussy has been fucked
- <<if (_weeksOwned*112)/$activeSlave.counter.vaginal < 1>>
- more than once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.counter.vaginal < 1.5>>
- about once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.counter.vaginal < 2.5>>
- about once every two hours
- <<elseif (_weeksOwned*112)/$activeSlave.counter.vaginal < 3.5>>
- about once every three hours
- <<else>>
- about once every four hours
+ <<elseif _sortedCounts[0].type == "vaginal">>
+ <<if (_weeksOwned*112)/$activeSlave.counter.vaginal < 4>>
+ Remarkably, this means that $his pussy has been fucked
+ <<if (_weeksOwned*112)/$activeSlave.counter.vaginal < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.vaginal < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.vaginal < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.vaginal < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
<</if>>
- $he's spent awake.
- <</if>>
- <<elseif _sortedCounts[0].type == "oral">>
- <<if (_weeksOwned*112)/$activeSlave.counter.oral < 4>>
- Remarkably, this means that $he's sucked something off
- <<if (_weeksOwned*112)/$activeSlave.counter.oral < 1>>
- more than once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.counter.oral < 1.5>>
- about once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.counter.oral < 2.5>>
- about once every two hours
- <<elseif (_weeksOwned*112)/$activeSlave.counter.oral < 3.5>>
- about once every three hours
- <<else>>
- about once every four hours
+ <<elseif _sortedCounts[0].type == "oral">>
+ <<if (_weeksOwned*112)/$activeSlave.counter.oral < 4>>
+ Remarkably, this means that $he's sucked something off
+ <<if (_weeksOwned*112)/$activeSlave.counter.oral < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.oral < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.oral < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.oral < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
<</if>>
- $he's spent awake.
- <</if>>
- <<elseif _sortedCounts[0].type == "mammary">>
- <<if (_weeksOwned*112)/$activeSlave.counter.mammary < 4>>
- Remarkably, this means that $he's put $his tits to work
- <<if (_weeksOwned*112)/$activeSlave.counter.mammary < 1>>
- more than once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.counter.mammary < 1.5>>
- about once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.counter.mammary < 2.5>>
- about once every two hours
- <<elseif (_weeksOwned*112)/$activeSlave.counter.mammary < 3.5>>
- about once every three hours
- <<else>>
- about once every four hours
+ <<elseif _sortedCounts[0].type == "mammary">>
+ <<if (_weeksOwned*112)/$activeSlave.counter.mammary < 4>>
+ Remarkably, this means that $he's put $his tits to work
+ <<if (_weeksOwned*112)/$activeSlave.counter.mammary < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.mammary < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.mammary < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.mammary < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
<</if>>
- $he's spent awake.
- <</if>>
- <<elseif _sortedCounts[0].type == "penetrative">>
- <<if (_weeksOwned*112)/$activeSlave.counter.penetrative < 4>>
- Remarkably, this means that $he's pounded a hole
- <<if (_weeksOwned*112)/$activeSlave.counter.penetrative < 1>>
- more than once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.counter.penetrative < 1.5>>
- about once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.counter.penetrative < 2.5>>
- about once every two hours
- <<elseif (_weeksOwned*112)/$activeSlave.counter.penetrative < 3.5>>
- about once every three hours
- <<else>>
- about once every four hours
+ <<elseif _sortedCounts[0].type == "penetrative">>
+ <<if (_weeksOwned*112)/$activeSlave.counter.penetrative < 4>>
+ Remarkably, this means that $he's pounded a hole
+ <<if (_weeksOwned*112)/$activeSlave.counter.penetrative < 1>>
+ more than once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.penetrative < 1.5>>
+ about once every hour
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.penetrative < 2.5>>
+ about once every two hours
+ <<elseif (_weeksOwned*112)/$activeSlave.counter.penetrative < 3.5>>
+ about once every three hours
+ <<else>>
+ about once every four hours
+ <</if>>
+ $he's spent awake.
<</if>>
- $he's spent awake.
<</if>>
<</if>>
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index e8203908a4e..f12008d487a 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -3,9 +3,9 @@
<<set $nextButton = "Back", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "What the Upgrades Do">>
<<if $cheatMode == 1>>
-<center>
-//[[Cheat Edit Arcology|MOD_Edit Arcology Cheat][$cheater = 1]]//
-</center>
+ <center>
+ //[[Cheat Edit Arcology|MOD_Edit Arcology Cheat][$cheater = 1]]//
+ </center>
<</if>>
<<include "Office Description">>
@@ -156,7 +156,7 @@ __Penthouse Upgrades__
//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>//
<</if>>
<<else>>
- The entire penthouse has been remodeled to make life with enormous breasts easier. The doorways have been widened, and tables, sinks and other items now have two levels: one at shoulder height for slaves to use, and another at waist height for them to rest their tits on while they do.
+ The entire penthouse has been remodeled to make life with enormous breasts easier. The doorways have been widened, and tables, sinks, and other items now have two levels: one at shoulder height for slaves to use, and another at waist height for them to rest their tits on while they do.
<</if>>
<<if $seeHyperPreg == 1>>
@@ -170,7 +170,7 @@ __Penthouse Upgrades__
//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>//
<</if>>
<<else>>
- The entire penthouse has been remodeled to make life with enormous pregnancies easier. The doorways have been widened, and tables, sinks and other items are now designed to work around a massively distended belly.
+ The entire penthouse has been remodeled to make life with enormous pregnancies easier. The doorways have been widened, and tables, sinks, and other items are now designed to work around a massively distended belly.
<</if>>
<</if>>
@@ -194,7 +194,7 @@ __Penthouse Upgrades__
//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>//
<</if>>
<<else>>
- The entire penthouse has been remodeled to make life with enormous testicles easier. The doorways have been widened, tables, sinks and other items are now designed to fit over giant balls, drains have been widened to allow excessive cum to flow easier, and seats have been specially altered to allow plenty of ball room for seated slaves.
+ The entire penthouse has been remodeled to make life with enormous testicles easier. The doorways have been widened, tables, sinks, and other items are now designed to fit over giant balls, drains have been widened to allow excessive cum to flow easier, and seats have been specially altered to allow plenty of ball room for seated slaves.
<</if>>
<br>
@@ -209,13 +209,12 @@ __Penthouse Upgrades__
<<else>>
The entire penthouse has been remodeled to make life with enormous rears easier. The doorways have been widened, and anything that can be sat on is now extra, extra wide and reinforced to allow even the heaviest, biggest asses to comfortably rest upon it.
<</if>>
+<</if>>
- <<if $boobAccessibility > 0 || $pregAccessibility > 0 || $dickAccessibility > 0 || $ballsAccessibility > 0 || $buttAccessibility > 0>>
- <<set _removeCost = Math.trunc(((5000*($boobAccessibility+$pregAccessibility+$dickAccessibility+$ballsAccessibility+$buttAccessibility)))*$upgradeMultiplierArcology)>>
- <br>
- //[[Remove the accessibility renovations|Manage Penthouse][cashX(forceNeg(_removeCost), "capEx"), $boobAccessibility = 0, $pregAccessibility = 0, $dickAccessibility = 0, $ballsAccessibility = 0, $buttAccessibility = 0]] Will cost <<print cashFormat(_removeCost)>>//
- <</if>>
-
+<<if $boobAccessibility > 0 || $pregAccessibility > 0 || $dickAccessibility > 0 || $ballsAccessibility > 0 || $buttAccessibility > 0>>
+ <<set _removeCost = Math.trunc(((5000*($boobAccessibility+$pregAccessibility+$dickAccessibility+$ballsAccessibility+$buttAccessibility)))*$upgradeMultiplierArcology)>>
+ <br>
+ //[[Remove the accessibility renovations|Manage Penthouse][cashX(forceNeg(_removeCost), "capEx"), $boobAccessibility = 0, $pregAccessibility = 0, $dickAccessibility = 0, $ballsAccessibility = 0, $buttAccessibility = 0]] Will cost <<print cashFormat(_removeCost)>>//
<</if>>
<br>
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index 917cd6568c4..32ffe5bcec7 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -159,13 +159,13 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
<<elseif $assistantAppearance == "cherub">>
_HisA avatar claps _hisA hands together, emitting a burst of light.
<<elseif $assistantAppearance == "incubus">>
- _HisA avatar flick the tip of _hisA penis and blows _hisA load towards the both of you.
+ _HisA avatar flicks the tip of _hisA penis and blows _hisA load towards the both of you.
<<elseif $assistantAppearance == "succubus">>
_HisA avatar starts to masturbate furiously and orgasms lewdly.
<<elseif $assistantAppearance == "imp">>
_HisA avatar claps _hisA hands together, emitting a burst of darkness.
<<elseif $assistantAppearance == "witch">>
- _HisA avatar pulls out _hisA spell book and attempts a spell to bind you two; _heA manages to conjure a large ring around _himA, pinning _hisA arms to _hisA sides.
+ _HisA avatar pulls out _hisA spell book and attempts a spell to bind you two; _heA manages to conjure a large ring around _himselfA, pinning _hisA arms to _hisA sides.
<<elseif $assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
_HisA avatar splits open to reveal a number of tentacles and wraps them around each other.
<<else>>
diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw
index fe44dcf6f4a..e68fab575c4 100644
--- a/src/uncategorized/prestigiousSlave.tw
+++ b/src/uncategorized/prestigiousSlave.tw
@@ -91,7 +91,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You bought $him at auction.">>
<<set $activeSlave.prestige = 1>>
- <<set $activeSlave.prestigeDesc = "$He was once the young trophy wife of a powerful man in the old world, but he sold $him into slavery in revenge for $his infidelity.">>
+ <<set $activeSlave.prestigeDesc = "$He was once the young trophy $wife of a powerful man in the old world, but he sold $him into slavery in revenge for $his infidelity.">>
<<set $activeSlave.career = "a trophy wife">>
<<set $activeSlave.boobsImplant += random(1,3)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 0bb207973b4..a546ecbbd0e 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -7913,7 +7913,7 @@
<<else>>
$His giant pregnancy makes life a struggle: <<if $buttAccessibility == 1 || $boobAccessibility == 1 || $ballsAccessibility == 1>>$he has trouble using appliances and furniture, and constantly bumps into things, but at least the doors have already been widened for your other slaves<<else>>$he barely fits through doors, has trouble using appliances and furniture, and constantly bumps into things<</if>>.
<<if $slaves[$i].sexualFlaw == "breeder">>
- But all this justs feeds $his obsession with being a breeder.
+ But all this just feeds $his obsession with being a breeder.
<<elseif ($slaves[$i].devotion > 50)>>
Since $he's devoted to you, $he just does $his best.
<<elseif ($slaves[$i].trust >= -20)>>
diff --git a/src/uncategorized/seRaidingAssault.tw b/src/uncategorized/seRaidingAssault.tw
index ca4689ba1b3..6aab60bcb15 100644
--- a/src/uncategorized/seRaidingAssault.tw
+++ b/src/uncategorized/seRaidingAssault.tw
@@ -22,12 +22,12 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<switch $origin>>
<<case "housewife">>
<<if $targetEscape >= _MercCapture>>
- Somehow the housewife manages to evade your mercenaries.
+ Somehow the house<<= $wife>> manages to evade your mercenaries.
<<elseif _raidescape == 1>>
Your $mercenariesTitle pry open the door to the mansion's panic room to find that the $woman has hung $himself to escape capture. A waste.
<<else>>
- Your $mercenariesTitle pry open the door to the mansion's panic room and pull the protesting housewife from its depths.
- The housewife watches in terror as your $mercenariesTitle slake their lust on $his servants and maids, knowing that $his respite from a brutal rape must only be a temporary blessing.
+ Your $mercenariesTitle pry open the door to the mansion's panic room and pull the protesting house<<= $wife>> from its depths.
+ The house<<= $wife>> watches in terror as your $mercenariesTitle slake their lust on $his servants and maids, knowing that $his respite from a brutal rape must only be a temporary blessing.
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "university professor">>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index 498421c9dc1..0fa47fa9957 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -44,7 +44,7 @@
<</if>>
<<set $Stewardess = $slaves[_FLs]>>
<<setLocalPronouns $Stewardess>>
- <<= SlaveFullName($Stewardess)>> is serving as your Stewardess.<<if $Stewardess.relationship == -3 && $Stewardess.devotion > 50>> $He does $his best to be your perfect lovely housewife.<</if>>
+ <<= SlaveFullName($Stewardess)>> is serving as your Stewardess.<<if $Stewardess.relationship == -3 && $Stewardess.devotion > 50>> $He does $his best to be your perfect lovely house<<= $wife>>.<</if>>
<<if ($stewardessImpregnates == 1) && (_DL > 0) && (canPenetrate($Stewardess)) && $Stewardess.pubertyXY == 1>>
<<set _stewardessImpregnated = 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
--
GitLab