From 2160cc3334bfd987200a425faaadc826218f3e65 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 15 Jul 2019 00:17:47 -0500
Subject: [PATCH] SpaceHunted
---
src/endWeek/saWhore.js | 2 +-
.../nursery/longChildDescription.tw | 150 +++++++++---------
src/js/descriptionWidgets.js | 2 +-
src/js/economyJS.js | 2 +-
src/js/generateGenetics.js | 2 +-
src/js/slaveSummaryWidgets.js | 9 +-
src/pregmod/FSuckle.tw | 2 +-
src/pregmod/geneLab.tw | 2 -
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/longSlaveDescription.tw | 150 +++++++++---------
src/uncategorized/managePenthouse.tw | 23 ++-
src/uncategorized/reNickname.tw | 2 +-
src/uncategorized/recETS.tw | 4 +-
src/uncategorized/summaryOptions.tw | 8 +-
14 files changed, 180 insertions(+), 180 deletions(-)
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 98752fcf421..ebc75b4c97a 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -486,7 +486,7 @@ window.saWhore = (function saWhore() {
slave.health -= 10 - 7*canA*canV; //Any limitations means an injury inflicts the harsher 10 instead of 3
injury = 1;
}
-
+
if (slave.vagina < 0) {
if (!injury) {
r += ` ${He}'s such an expert whore that ${he} copes with the stress of being a ${SlaveTitle(slave)} slut.`;
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/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 1389cdef5c6..5a95d5dd355 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -553,7 +553,7 @@ App.Desc.ageAndHealth = function(slave) {
} else if (slave.health <= 20) {
r += `<span class="yellow">healthy</span>`;
} else if (slave.health <= 50) {
- r += `<span class="green">very health</span>`;
+ r += `<span class="green">very healthy</span>`;
} else {
r += `<span class="green">extremely healthy</span>`;
}
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 324ea171d5a..da6d8c8b450 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/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index b46061f8b7f..0856691790f 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -2166,17 +2166,16 @@ window.SlaveSummaryUncached = (function() {
} else {
r.textContent += `Underage.`;
}
- r.textContent += " ";
/*
- ** No NCS, then do the standard, However because of the wrinkes of Incubators, as long as visual age is greater
+ ** No NCS, then do the standard, However because of the wrinkles of Incubators, as long as visual age is greater
** than or equal to physical age, we do the old physical body/Looks for fresh out of the can NCS slaves.
*/
if (((slave.geneMods.NCS === 0) || (slave.visualAge >= slave.physicalAge))) {
if (slave.actualAge !== slave.physicalAge) {
- r.textContent += `${slave.physicalAge}` + ` year old body. `;
+ r.textContent += ` ${slave.physicalAge}` + ` year old body.`;
}
if (slave.visualAge !== slave.physicalAge) {
- r.textContent += `Looks ` + `${slave.visualAge}` + `. `;
+ r.textContent += ` Looks ` + `${slave.visualAge}` + `.`;
}
} else {
/*
@@ -2188,7 +2187,7 @@ window.SlaveSummaryUncached = (function() {
** say: 'Age 1. 11 year old body.' -- this conflicts with the way NCS works though, because she hasn't
** visually aged, so our change here makes it say 'Age 1. Appears to have a 10 year old body.'
*/
- r.textContent += `Appears to have a ` + `${slave.visualAge}` + ` year old body. `;
+ r.textContent += ` Appears to have a ` + `${slave.visualAge}` + ` year old body.`;
}
if (slave.geneMods.NCS === 1) {
makeSpan(r, "NCS", "orange");
diff --git a/src/pregmod/FSuckle.tw b/src/pregmod/FSuckle.tw
index f241eaffef5..2bbbf1a6030 100644
--- a/src/pregmod/FSuckle.tw
+++ b/src/pregmod/FSuckle.tw
@@ -376,7 +376,7 @@ $his other breast<<if $PC.dick == 1>><<if $PC.balls > 1>> and backflowing hard f
Your <<if $PC.dick == 1>>dick slips out<<else>>pussy separates<</if>> from $his other breast with a delicate pop, followed by lewd dripping noises and the sight of <<if $PC.dick == 1>>semen<<else>>girlcum<</if>> and milk oozing from $his <<if $PC.dick == 1>>newly expanded hole<<else>>nippleslit<</if>>.
<</if>>
<<if _mood == 2>>
- For a moment, $he though you were finished, but with your hormone fueled libido, $he'll be feeling a lot more than sore nipples but the time you tire of $his touch.
+ For a moment, $he thought you were finished, but with your hormone fueled libido, $he'll be feeling a lot more than sore nipples but the time you tire of $his touch.
<<elseif _mood == 1>>
You cuddle up against $him, holding close to $him as you snooze off your milky meal.
<<if $activeSlave.fetish == "mindbroken">>
diff --git a/src/pregmod/geneLab.tw b/src/pregmod/geneLab.tw
index 5084f806e5e..6c37d50260a 100644
--- a/src/pregmod/geneLab.tw
+++ b/src/pregmod/geneLab.tw
@@ -6,8 +6,6 @@
The Gene Lab
<hr>
-
-
<<if $geneticMappingUpgrade == 1>>
//The gene lab is fully operational. It is capable of mapping a slave's genes, identifying genetic traits and abnormalities. It can be used to modify a slave's genome should you obtain the data necessary to adjust it.//
<br>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 88e9ab7e0e3..1592619e73d 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -14708,7 +14708,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
cross-legged
<</if>>
- next to you. $He <<if canHear($activeSlave)>>listens raptly<<elseif canSee($activeSlave)>>reads along<<else>>focuses intently<</if>>, parroting obediently and clearly doing $his best to please, but you notice a certain incredulity that slowly fades as the lesson goes on. $He's obviously having trouble believing that $his owner would trouble _himselfP with $his vocabulary lessons. You work with $his several times a day, and $he's so diligent that by the end of the week $he's @@.green;beginning to make $himself understood,@@ though $his accent is still pretty atrocious.
+ next to you. $He <<if canHear($activeSlave)>>listens raptly<<elseif canSee($activeSlave)>>reads along<<else>>focuses intently<</if>>, parroting obediently and clearly doing $his best to please, but you notice a certain incredulity that slowly fades as the lesson goes on. $He's obviously having trouble believing that $his owner would trouble _himselfP with $his vocabulary lessons. You work with $him several times a day, and $he's so diligent that by the end of the week $he's @@.green;beginning to make $himself understood,@@ though $his accent is still pretty atrocious.
<<set $activeSlave.accent-->>
<</replace>>
<</link>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 9ca4d6b520a..5b57ad27de9 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -428,85 +428,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/reNickname.tw b/src/uncategorized/reNickname.tw
index 67f4dbed1c6..3723f53ae8f 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -1003,7 +1003,7 @@
<<set $nickname = either("'Aegis'", "'Amazon'", "'Athena'", "'Battle'", "'Bloody'", "'Body Armor'", "'Bodyguard'", "'Diana'", "'Guard'", "'Gunsmoke'", "'Hired Gun'", "'Mercenary'", "'Officer'", "'Paladin'", "'Protection'", "'Secret Service'", "'Security'", "'Soldier'", "'Terminatrix'", "'Threat Neutralizer'", "'Warrior'", "'Widow'")>>
<<set $situationDesc = "divides your other slaves. $He is a physically intimidating sight, wearing normal slave attire and obviously sexually available, but also carrying a sword across $his back and an automatic weapon at $his hip. Some revere $his unique position of responsibility, while others mock how far $he steps outside the bounds of sexual slavery.">>
<<set $applyDesc = "knew a while ago that $he was likely to spend some time shadowing your every move. But now, $he understands that not only is your life in $his hands, it is going to remain so. $He is almost awed by the responsibility.">>
- <<set $notApplyDesc = "realizes to $his apprehension that $he may someday be a simple sex slave again, respected for $his holes rather than $his swords<<= $woman>>ship.">>
+ <<set $notApplyDesc = "realizes to $his apprehension that $he may someday be a simple sex slave again, respected for $his holes rather than for $his swords<<= $woman>>ship.">>
<<case "server">>
<<set $nickname = either("'Bedwarmer'", "'Bottom Rung'", "'Bottom'", "'Doormat'", "'Girltoy'", "'Group Whore'", "'House Slave'", "'Kick Me'", "'Lovergirl'", "'Please No'", "'Rapebait'", "'Servant'", "'Server'", "'Servile'", "'Slave Slut'", "'Sub'", "'Submissive'")>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index ca227f57414..190f08f1e51 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -1650,7 +1650,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<run newSlave($activeSlave)>>
<<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
<<replace "#result">>
- The poor sissy isn't happy to become a slave, but $he's clearly relieved to be away from $his sister. The bitch isn't likely to have an easy time; the sale didn't clear _him2 from debt. $activeSlave.slaveName describes $his basic sexual experience, which includes a lot of sucking and anal whoring. Without further ado $he moves from practical sexual slavery at the hands of $his sister to actual sexual slavery.
+ The poor sissy isn't happy to become a slave, but $he's clearly relieved to be away from $his _sister2. The bitch isn't likely to have an easy time; the sale didn't clear _him2 from debt. $activeSlave.slaveName describes $his basic sexual experience, which includes a lot of sucking and anal whoring. Without further ado $he moves from practical sexual slavery at the hands of $his _sister2 to actual sexual slavery.
<</replace>>
<</link>>
@@ -1699,7 +1699,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<case "addict mother daughter" "posh mother daughter">>
-<<link "Manipulate $him to enslave both mother and daughter">>
+<<link "Manipulate $him to enslave both mother and _daughter2">>
<<replace "#result">>
<<switch $RecETSevent>>
<<case "addict mother daughter">>
diff --git a/src/uncategorized/summaryOptions.tw b/src/uncategorized/summaryOptions.tw
index 7f5c9dfbb8c..04c1edc13df 100644
--- a/src/uncategorized/summaryOptions.tw
+++ b/src/uncategorized/summaryOptions.tw
@@ -18,18 +18,18 @@
<br>
<<options $sortSlavesMain>>
- Sortting main menu options are
+ Sorting main menu options are
<<option 1 "Shown">>
<<option 0 "Hidden">>
<</options>>
-<<if $sortSlavesMain > 0>>
+<<if $sortSlavesMain > 0>>
<<options $sortSlavesOrder>>
, sorted by
<<option "ascending" "Ascending">>
<<option "descending" "Descending">>
<</options>>
-
+
<br>
<<options $sortSlavesBy>>
and
@@ -146,7 +146,7 @@
<</options>>
<<options $rulesAssistantMain>>
- Rules Assistant visability:
+ Rules Assistant visibility:
<<option 1 "Shown">>
<<option 0 "Hidden">>
<</options>>
--
GitLab