diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a65b78b2e51d6715047f525f9c395a1bdd8a30f..44476b886aee7790061eed5971d527d76a2f9607 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ variables:
# precompiled / assets
# the URLs are the same as inside the game, change both if updating
WEBGL_NAME: "WebGL art assets"
- WEBGL_URL: "https://mega.nz/folder/DtoyiSwC#5FLXDYr1Uy90PZjxmfrKXA"
+ WEBGL_URL: "https://mega.nz/folder/bwozybJa#h8fEEdKtXLAz-ZkcK1XbRA"
RENDER_NAME: "Rendered imagepack (outdated)"
RENDER_URL: "https://mega.nz/file/upoAlBaZ#EbZ5wCixxZxBhMN_ireJTXt0SIPOywO2JW9XzTIPhe0"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b9326fcdb3f42a10095c153bd6490a31dfde781..1ca348de1b89ac3732475603fa38bcda14fc1a85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,41 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
## Unreleased
+## 0.10.7.1-4.0.0-alpha.21 - 2022-10-10
+
+* fixed major issue
+
+## 0.10.7.1-4.0.0-alpha.20 - 2022-10-10
+
+* added player mobility
+* added porn studio for better porn control
+* added new slimness enthusiast food policy
+* overhauled the neighbor FS selection process
+* locate slave improvements
+* removed dTree in favor of lodash and d3
+* fixes
+
+## 0.10.7.1-4.0.0-alpha.19 - 2022-08-27
+
+* fixes and code improvements
+
+## 0.10.7.1-4.0.0-alpha.18 - 2022-08-26
+
+* added player drugs
+* added player health
+* added Doctor Consultation for all your health and drug needs
+* added player salon
+* genePool player object record
+* Chattel religionist "Holy Nudism" policy
+* chooses own clothing now slightly less restrictive wth Chattel religionist
+* RA simple mode
+* RA can now report which rule made a change
+* New Game++ (Start in new arcology at same week.)
+* Elohiem's webGL art update 9
+* webGL animations
+* added event peFoodplay
+* fixes
+
## 0.10.7.1-4.0.0-alpha.17 - 2022-06-09
* PC endWeek effects added
diff --git a/FCHost/fchost/fchost_handler_linux.cc b/FCHost/fchost/fchost_handler_linux.cc
index f960f287892e3759892627a28edfd9076d77931f..d78e9f63c1c85af0a4f46e901d59204d1f4b7ebf 100644
--- a/FCHost/fchost/fchost_handler_linux.cc
+++ b/FCHost/fchost/fchost_handler_linux.cc
@@ -70,7 +70,7 @@ namespace {
switch (mode) {
case CefDialogHandler::FileDialogMode::FILE_DIALOG_OPEN_MULTIPLE:
- cmdLine << " --multiple"; [[fallthrough]]
+ cmdLine << " --multiple"; [[fallthrough]];
case CefDialogHandler::FileDialogMode::FILE_DIALOG_OPEN:
cmdLine << " --getopenfilename";
break;
@@ -171,7 +171,8 @@ namespace {
// we will try to launch kdialog or zenity
std::string dialogExecutable;
// try to determine which environment we run inside
- std::string desktop = getenv("XDG_CURRENT_DESKTOP");
+ const char* desktop_env = getenv("XDG_CURRENT_DESKTOP");
+ std::string desktop = desktop_env == nullptr ? "" : desktop_env;
const auto checkExeExists = [](const char* name) {
int ec = ::system((std::string(name) + " --help > /dev/null").c_str());
diff --git a/css/art/art.css b/css/art/art.css
index 42ed6dfc5832a29a957093c60c908ea8fdf90917..566a9223e4372382761ec2d9321b83f6cb41385c 100644
--- a/css/art/art.css
+++ b/css/art/art.css
@@ -42,6 +42,7 @@ img {
height: 16em;
width: 16em;
float: right;
+ margin: 1em;
}
.medImg > img, .medImg > video {
diff --git a/css/facilities/incubator.css b/css/facilities/incubator.css
deleted file mode 100644
index 6099fd74697e4f6ab1b0dd4d617088f7f572a939..0000000000000000000000000000000000000000
--- a/css/facilities/incubator.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.incubator-underscore {
- border-bottom: 1px solid;
-}
-
-.incubator-tank {
- border-bottom: 2px solid cyan;
- border-top: 2px solid cyan;
- border-radius: 15px;
- padding: 0.5em;
-}
diff --git a/css/facilities/studio.css b/css/facilities/studio.css
new file mode 100644
index 0000000000000000000000000000000000000000..57c8e3aed053d70f4f33b4d430ffa2c560a7faa7
--- /dev/null
+++ b/css/facilities/studio.css
@@ -0,0 +1,29 @@
+/* these colors have to be accessed directly for graph colors */
+:root {
+ --genre-color-paraphilia: yellow;
+ --genre-color-fetish: lightcoral;
+ --genre-color-generic: gray;
+ --genre-color-quirk: lawngreen;
+ --genre-color-general: white;
+}
+
+/* and they have to be accessed through classes for text */
+.genre.paraphilia {
+ color: var(--genre-color-paraphilia);
+}
+
+.genre.fetish {
+ color: var(--genre-color-fetish);
+}
+
+.genre.generic {
+ color: var(--genre-color-generic);
+}
+
+.genre.quirk {
+ color: var(--genre-color-quirk);
+}
+
+.genre.general {
+ color: var(--genre-color-general);
+}
diff --git a/css/futureSocieties/fsPassage.css b/css/futureSocieties/fsPassage.css
new file mode 100644
index 0000000000000000000000000000000000000000..6c61e92f93fa9d49e9469076acd6114a9eedec96
--- /dev/null
+++ b/css/futureSocieties/fsPassage.css
@@ -0,0 +1,26 @@
+.fs-recommend {
+ border: 1px solid;
+ padding: 2px;
+ border-radius: 3px;
+ font-size: smaller;
+}
+
+.fs-recommend-great {
+ border-color: green;
+ color: green;
+}
+
+.fs-recommend-good {
+ border-color: greenyellow;
+ color: greenyellow;
+}
+
+.fs-recommend-neutral {
+ border-color: gold;
+ color: gold;
+}
+
+.fs-recommend-bad {
+ border-color: red;
+ color: red;
+}
\ No newline at end of file
diff --git a/css/general/layout.css b/css/general/layout.css
index ba770051df7155ef4cb68119dad2b134f8fdc6ee..959c99af5c2e14c4f6fe402cf9adc2429e4764f1 100644
--- a/css/general/layout.css
+++ b/css/general/layout.css
@@ -49,6 +49,10 @@ div.grid-3columns-auto {
grid-column-gap: 1em;
}
+.border-bottom {
+ border-bottom: 1px solid;
+}
+
.margin-top {
margin-top: 1em;
}
diff --git a/css/general/textColors.css b/css/general/textColors.css
index 7cd98be1785c161dd64e47bcac96c257916b80c8..03fec45d8fef64e8c1b1632aa2a2e2d424b68ec6 100644
--- a/css/general/textColors.css
+++ b/css/general/textColors.css
@@ -131,11 +131,11 @@
/* generally between red and green, and a lot of other places */
.orange, .orange a, .stupid, .stupid a, .change.negative, .change.negative a, .defiant.careful, .defiant.careful a,
-.ncs, .ncs a, .miscarriage, .miscarriage a, .intro.question {
+.ncs, .ncs a, .miscarriage, .miscarriage a, .hindrance.mid, .intro.question {
color: orange
}
-.orangered, .orangered a, .defiant.inc, .defiant.inc a, .defiant.bold, .defiant.bold a, .education.neg a, .unintelligent {
+.orangered, .orangered a, .defiant.inc, .defiant.inc a, .defiant.bold, .defiant.bold a, .education.neg a, .unintelligent, .hindrance.high {
color: orangered
}
@@ -147,7 +147,7 @@
/* generally bad stuff */
/* note: .error is for unexpected behavior, .warning for player feedback */
.red, .red a, .health.dec, .health.dec a, .cash.dec, .cash.dec a, .food.dec, .food.dec a, .stat.drop, .stat.drop a, .flaw, .flaw a, .flaw.gain, .flaw.gain a,
-.mindbreak, .mindbreak a, .error, .error a, .elites.loss, .elites.loss a, .reputation.dec, .reputation.dec a,
+.mindbreak, .mindbreak a, .error, .error a, .elites.loss, .elites.loss a, .reputation.dec, .reputation.dec a, .immobile, .hindrance.max,
.warning, .warning a, .prosperity.dec {
color: red
}
@@ -177,7 +177,7 @@
color: teal
}
-.yellow, .yellow a, .noteworthy, .noteworthy a, .paraphilia.gain, .paraphilia.gain a,
+.yellow, .yellow a, .noteworthy, .noteworthy a, .paraphilia.gain, .paraphilia.gain a, .hindrance.low,
.devotion.ambivalent, .devotion.ambivalent a, .trust.fearful, .trust.fearful a, .job.change {
color: yellow
}
diff --git a/css/gui/encyclopedia.css b/css/gui/encyclopedia.css
index 099ff21636e2db96c5a31036604d6faacfa40236..0ed81266dcd5ea2f061ce444a05ed7307ee4c75f 100644
--- a/css/gui/encyclopedia.css
+++ b/css/gui/encyclopedia.css
@@ -20,3 +20,7 @@
.encyclopedia-source .article {
font-style: italic;
}
+
+.encyclopedia.emphasize {
+ text-decoration-line: underline
+}
diff --git a/css/gui/slaveList/cardStyle.css b/css/gui/slaveList/cardStyle.css
index f560bfb0c5a6dff5e87726ca532b2e13be610abb..e40715994d1ae142f24da540a033169d474c15da 100644
--- a/css/gui/slaveList/cardStyle.css
+++ b/css/gui/slaveList/cardStyle.css
@@ -1,8 +1,6 @@
.card {
border: 2px solid #333333;
background-color: #1a1a1a;
- box-shadow: 10px 10px 10px black,
- -10px 10px 10px black;
padding: 1em;
margin-bottom: 1em;
}
diff --git a/css/gui/tooltips/tippy.css b/css/gui/tooltips/tippy.css
index ab4273b3700380a1de20978f2830d372b0b6b375..020f60d5d539062a097b435a48003672c64127a4 100644
--- a/css/gui/tooltips/tippy.css
+++ b/css/gui/tooltips/tippy.css
@@ -4,6 +4,7 @@
.tippy-content {
text-indent: initial;
+ font-weight: initial;
}
.tippy-content ul {
diff --git a/css/interaction/export.css b/css/interaction/export.css
index d54575954576d2049ff25d425cc8a7b9d21871b9..5fe2a1109fa2dd87edbeec36d69cdcd77bc9e4ca 100644
--- a/css/interaction/export.css
+++ b/css/interaction/export.css
@@ -1,6 +1,7 @@
-div.output {
+.export-field {
width: 100vw;
max-width: 100%;
word-break: break-all;
white-space: normal;
+ height: 80vh;
}
diff --git a/css/interaction/slaveInteract.css b/css/interaction/slaveInteract.css
index 403f30d2892fa168071b423359ded448114626f9..30f21dd02d1d07b842e419a8cc42fd0225c9dc25 100644
--- a/css/interaction/slaveInteract.css
+++ b/css/interaction/slaveInteract.css
@@ -10,6 +10,24 @@
font-size: 1.5em;
}
+.si-slave-title {
+ color: coral;
+ font-weight: bold;
+}
+
+.si-relationship {
+ color: lightgreen;
+ font-weight: bold;
+}
+
+.si-family {
+ color: lightgreen;
+}
+
+.si-rival {
+ color: salmon;
+}
+
/* notification */
a.with-note::after /*notification for links with notes in tooltips */
{
diff --git a/css/rulesAssistant/conditionEditor.css b/css/rulesAssistant/conditionEditor.css
index a84be73f23a161bb6857d698520f36decc11be97..25933dc095660540bd5c1115e72f3e9879dee8a5 100644
--- a/css/rulesAssistant/conditionEditor.css
+++ b/css/rulesAssistant/conditionEditor.css
@@ -123,12 +123,22 @@
margin: 4px;
color: black;
}
+.rule-trash:first-child {
+ display: inline-block;
+ padding: 8px;
+ width: 1.9em;
+ height: 1.9em;
+}
.rule-trash::before {
font-family: "tme-fa-icons";
content: "\e828";
}
+.condition-custom {
+ width: 90%;
+}
+
/* Encyclopedia help entry */
.rule-help-table {
diff --git a/devNotes/jsEventCreationGuide.md b/devNotes/jsEventCreationGuide.md
index f480c1d823a26880e1bbe52182b1cd73afcea8a7..f9292d1d6cf425fe8fb2ebf0e946292991bef76c 100644
--- a/devNotes/jsEventCreationGuide.md
+++ b/devNotes/jsEventCreationGuide.md
@@ -23,7 +23,7 @@ App.Events.MyEvent = class MyEvent extends App.Events.BaseEvent {
return [
[
s => canWalk(s),
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.devotion >= 50,
s => s.trust <= 20
]
@@ -33,7 +33,7 @@ App.Events.MyEvent = class MyEvent extends App.Events.BaseEvent {
return [
[ // first actor
s => canWalk(s),
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.devotion >= 50,
s => s.trust <= 20
],
diff --git a/devNotes/legacy files/bellyImplant.js b/devNotes/legacy files/bellyImplant.js
index eb4db89db8c861c3b66dfe55acae8f6abf902edd..edb3cf3f21d90338e2e63e7cc61e43aa13a9059d 100644
--- a/devNotes/legacy files/bellyImplant.js
+++ b/devNotes/legacy files/bellyImplant.js
@@ -83,7 +83,7 @@ App.Desc.bellyImplant = function(slave, {market, eventDescription} = {}) {
} else if (slave.bellyImplant >= 8000) {
r.push(`${He} looks hugely pregnant,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant. ${He} can barely move ${him}self and resembles an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant. ${He} can barely move ${him}self and resembles an overinflated blow-up doll.`);
} else if (slave.physicalAge <= 12) {
r.push(`and ${his} massive, drum-taut belly dominates ${his} poor little frame.`);
} else if (slave.height >= 185) {
@@ -186,7 +186,7 @@ App.Desc.bellyImplant = function(slave, {market, eventDescription} = {}) {
break;
case "a latex catsuit":
case "restrictive latex":
- r.push(`${slave.slaveName}'s titanic bulging implant-filled greatly distends ${his} latex suit. ${He} looks like an over inflated balloon ready to pop. Only ${his} popped navel sticking out the front of ${his} belly disrupts the smoothness.`);
+ r.push(`${slave.slaveName}'s titanic bulging implant-filled greatly distends ${his} latex suit. ${He} looks like an overinflated balloon ready to pop. Only ${his} popped navel sticking out the front of ${his} belly disrupts the smoothness.`);
break;
case "a military uniform":
if (slave.boobs > 6000) {
@@ -530,7 +530,7 @@ App.Desc.bellyImplant = function(slave, {market, eventDescription} = {}) {
break;
case "a latex catsuit":
case "restrictive latex":
- r.push(`${slave.slaveName}'s gigantic implant-filled belly greatly distends ${his} latex suit. ${He} looks like an over inflated balloon ready to pop. Only ${his} popped navel sticking out the front of ${his} belly disrupts the smoothness.`);
+ r.push(`${slave.slaveName}'s gigantic implant-filled belly greatly distends ${his} latex suit. ${He} looks like an overinflated balloon ready to pop. Only ${his} popped navel sticking out the front of ${his} belly disrupts the smoothness.`);
break;
case "a military uniform":
if (slave.boobs > 6000) {
@@ -872,7 +872,7 @@ App.Desc.bellyImplant = function(slave, {market, eventDescription} = {}) {
break;
case "a latex catsuit":
case "restrictive latex":
- r.push(`${slave.slaveName}'s huge implant-filled belly greatly distends ${his} latex suit. ${He} looks like an over inflated balloon ready to pop. Only ${his} popped navel sticking out the front of ${his} belly disrupts the smoothness.`);
+ r.push(`${slave.slaveName}'s huge implant-filled belly greatly distends ${his} latex suit. ${He} looks like an overinflated balloon ready to pop. Only ${his} popped navel sticking out the front of ${his} belly disrupts the smoothness.`);
break;
case "a military uniform":
if (slave.boobs > 6000) {
@@ -1210,7 +1210,7 @@ App.Desc.bellyImplant = function(slave, {market, eventDescription} = {}) {
break;
case "a latex catsuit":
case "restrictive latex":
- r.push(`${slave.slaveName}'s implant-filled belly greatly distends ${his} latex suit. ${He} looks like an over inflated balloon. Only ${his} popped navel sticking out the front of ${his} belly disrupts the smoothness.`);
+ r.push(`${slave.slaveName}'s implant-filled belly greatly distends ${his} latex suit. ${He} looks like an overinflated balloon. Only ${his} popped navel sticking out the front of ${his} belly disrupts the smoothness.`);
break;
case "a military uniform":
if (slave.boobs > 6000) {
diff --git a/devNotes/legacy files/bellyInflation.js b/devNotes/legacy files/bellyInflation.js
index 516e8b3226e7e04307696ce05ede56a07757b0d5..fdad1c3c211ca692f54d1c36845422ce47f0dc68 100644
--- a/devNotes/legacy files/bellyInflation.js
+++ b/devNotes/legacy files/bellyInflation.js
@@ -13,7 +13,7 @@ App.Desc.bellyInflation = function(slave, {market, eventDescription} = {}) {
if (slave.inflation === 3) {
r.push(`${His} middle is enormously distended with ${slave.inflationType},`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} bloated innards. ${He} can barely move ${him}self and resembles an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} bloated innards. ${He} can barely move ${him}self and resembles an overinflated blow-up doll.`);
} else if (slave.physicalAge <= 12) {
r.push(`and ${his} massive, drum-taut belly dominates ${his} poor little frame.`);
} else if (slave.height >= 185) {
@@ -114,7 +114,7 @@ App.Desc.bellyInflation = function(slave, {market, eventDescription} = {}) {
break;
case "a latex catsuit":
case "restrictive latex":
- r.push(`${slave.slaveName}'s hugely swollen belly greatly distends ${his} latex suit. ${He} looks like an over inflated balloon ready to pop. Only ${his} popped navel sticking out the front of ${his} belly disrupts the smoothness.`);
+ r.push(`${slave.slaveName}'s hugely swollen belly greatly distends ${his} latex suit. ${He} looks like an overinflated balloon ready to pop. Only ${his} popped navel sticking out the front of ${his} belly disrupts the smoothness.`);
break;
case "a military uniform":
case "a schutzstaffel uniform":
@@ -424,7 +424,7 @@ App.Desc.bellyInflation = function(slave, {market, eventDescription} = {}) {
break;
case "a latex catsuit":
case "restrictive latex":
- r.push(`${slave.slaveName}'s jiggling ${slave.inflationType}-filled belly greatly distends ${his} latex suit. ${He} looks like an over inflated balloon. Only ${his} popped navel sticking out the front of ${his} belly disrupts the smoothness.`);
+ r.push(`${slave.slaveName}'s jiggling ${slave.inflationType}-filled belly greatly distends ${his} latex suit. ${He} looks like an overinflated balloon. Only ${his} popped navel sticking out the front of ${his} belly disrupts the smoothness.`);
break;
case "a military uniform":
case "a schutzstaffel uniform":
@@ -636,7 +636,7 @@ App.Desc.bellyInflation = function(slave, {market, eventDescription} = {}) {
r.push(`${slave.slaveName}'s tight leotard shows off every movement within ${his} jiggling ${slave.inflationType}-filled belly. The material tightly clings to ${his} popped navel.`);
break;
case "a monokini":
- r.push(`${slave.slaveName}'s monokini overs only half of ${his} jiggling ${slave.inflationType}-filled belly.`);
+ r.push(`${slave.slaveName}'s monokini covers only half of ${his} jiggling ${slave.inflationType}-filled belly.`);
break;
case "overalls":
if (slave.boobs > (slave.belly + 250)) {
diff --git a/devNotes/scene guide.md b/devNotes/scene guide.md
index 103d454d903863a7e6e39da434392237de07f45a..83cabe45b8c396cf6739dbf212d622b3c7ca3239 100644
--- a/devNotes/scene guide.md
+++ b/devNotes/scene guide.md
@@ -1,20 +1,24 @@
-Most writing is basically just plain text with branches for different cases.
+# Writing scenes
+
+Most writing is basically just plain text with branches for different cases.
Important cases to remember:
--Does the slave have a dick/vagina/tits?
--Does the PC have a dick/tits/vagina?
--If the slave has a dick and you plan to use it, can they get erect on their own?
--Is the PC pregnant?
--Is the slave mindbroken?
--Is the slave blind?
--Is the slave pregnant?
--If you penetrate an orifice, is the slave a virgin in that orifice?
--Can the slave move (i.e. is the slave amputated and/or have massive tits and/or a massive dick)?
--Does the slave like/hate trust/fear you?
--Does the slave have fetishes or personality/sexual quirks/flaws that would impact how they react?
+
+- Does the slave have a dick/vagina/tits?
+- Does the PC have a dick/tits/vagina?
+- If the slave has a dick and you plan to use it, can they get erect on their own?
+- Is the PC pregnant?
+- Is the slave mindbroken?
+- Is the slave blind?
+- Is the slave pregnant?
+- If you penetrate an orifice, is the slave a virgin in that orifice?
+- Can the slave move (i.e. is the slave amputated and/or have massive tits and/or a massive dick)?
+- Does the slave like/hate trust/fear you?
+- Does the slave have fetishes or personality/sexual quirks/flaws that would impact how they react?
It's important to handle every RELEVANT variation of the above cases. Depending on what you're writing, other cases may also warrant consideration; e.g. a breast-play scene will probably need to account for breast size and lactation a lot more than a generic fuck scene. If a scene only applies to a specific type of slave, you can restrict the cases you account for to the ones that are only possible for that type of slave.
There are, broadly speaking, two main ways to do this:
+
1. Write the same big block of text and then copy/paste it into each relevant case, and tweak the wording slightly.
++Less thinking required
--LOTS of duplicate text; if you need to change something later, you have to change it in many places
@@ -29,19 +33,21 @@ It can also be easier if you split the scene into a "prep", "main", and "finish"
All the variables for you and the slave are, generally, held in the variables $PC and $activeSlave, respectively. When the PC and the slave have the same attributes, they usually have the same name, but exactly what they do and mean can vary a little bit. RTFM for details. To access a specific variable, you do $var.attribName, so e.g. pregnancy is checked by $activeSlave.preg or $PC.preg. In rarer cases, you'll be dealing with an indexed entry in the $slaves array; if that's the case, you'd use $slaves[_u] or $slaves[$i] (or whatever) instead of $activeSlave. If a second (or third?) slave is present, it will be stored in another variable, the name of which will depend on the scene; for example, when impregnating a slave with another slave, the sperm donor is in $impregnatrix
Conditions are usually checked by
-```
+
+```sugarcube
<<if CONDITION>>
- SHOW THIS TEXT
+ SHOW THIS TEXT
<<elseif CONDITION2>>
- SHOW THIS TEXT INSTEAD
+ SHOW THIS TEXT INSTEAD
<<else>>
- IF NEITHER CONDITION IS MET, SHOW THIS
+ IF NEITHER CONDITION IS MET, SHOW THIS
<</if>>
```
-Conditions are usually comparative (i.e. $a < $b or $b == 5 or $c != $d.e) and can be chained together with && (and) or || (or) and grouped with parentheses () - for example:
+
+Conditions are usually comparative (i.e. `$a < $b or $b == 5 or $c != $d.e`) and can be chained together with `&&` (AND) or `||` (OR) and grouped with `()` - for example:
`<<if($a > 1 || ($b == 2 && $c != $a))>>`
lets you check that either variable A is greater than one, or both B equals two and C is not equal to A.
-There are also a few misc functions that let you check things like whether a slave can get pregnant or whether two slaves are mutually fertile
+There are also a few miscellaneous functions that let you check things like whether a slave can get pregnant or whether two slaves are mutually fertile
Variable names are interpolated straight into the text, so if you have a slave named "Beth" then the text
"You fuck $activeSlave.slaveName" becomes "You fuck Beth"
@@ -53,102 +59,112 @@ Which would, in this case, give a devotion increase of 5.
Color is changed with YOUR @@.colorname;COLORED TEXT@@ HERE
So a random (really stupid) example might be:
-```
+
+```sugarcube
<<if $activeSlave.fetish == 'mindbroken'>>
- Special big block of mindbroken text here.
+ Special big block of mindbroken text here.
<<elseif isAmputee($activeSlave)>>
- Special big block of amputee text here.
+ Special big block of amputee text here.
<<if $PC.dick > 0>>
- <<set _wasVirgin = ''>>
- <<if $activeSlave.vagina > -1>>
- <<set _orifice = 'vagina'>>
- <<if $activeSlave.vagina == 0>>
- <<set _wasVirgin = 'vaginal'>>
- <</if>>
- <<else>>
- <<set _orifice = 'ass'>>
- <<if $activeSlave.anus == 0>>
- <<set _wasVirgin = "anal">>
- <</if>>
- <</if>>
- You fuck $activeSlave.slaveName's _orifice.
- <<if _wasVirgin != ''>>
- <<if $activeSlave.devotion > 50>>
- $He @@.hotpink;loves@@ losing $his <<print _wasVirgin>> virginity to you.
- <<set $activeSlave.devotion += 5>>
- <<else>>
- $He @@.mediumorchid;@@dislikes losing $his <<print _wasVirgin>> virginity to you.
- <<set $activeSlave.devotion -= 5>>
- <</if>>
- <</if>>
+ <<set _wasVirgin = ''>>
+ <<if $activeSlave.vagina > -1>>
+ <<set _orifice = 'vagina'>>
+ <<if $activeSlave.vagina == 0>>
+ <<set _wasVirgin = 'vaginal'>>
+ <</if>>
+ <<else>>
+ <<set _orifice = 'ass'>>
+ <<if $activeSlave.anus == 0>>
+ <<set _wasVirgin = "anal">>
+ <</if>>
+ <</if>>
+ You fuck $activeSlave.slaveName's _orifice.
+ <<if _wasVirgin != ''>>
+ <<if $activeSlave.devotion > 50>>
+ $He @@.hotpink;loves@@ losing $his <<print _wasVirgin>> virginity to you.
+ <<set $activeSlave.devotion += 5>>
+ <<else>>
+ $He @@.mediumorchid;@@dislikes losing $his <<print _wasVirgin>> virginity to you.
+ <<set $activeSlave.devotion -= 5>>
+ <</if>>
+ <</if>>
<<elseif $PC.vagina > 0 && $activeSlave.dick > 0>>
- $activeSlave.slaveName
- <<if $activeSlave.devotion > 50>>
- @@.hotpink;lovingly penetrates@@
- <<set $activeSlave.devotion += 5>>
- <<else>>
- indifferently hammers
- <</if>>
- your pussy.
+ $activeSlave.slaveName
+ <<if $activeSlave.devotion > 50>>
+ @@.hotpink;lovingly penetrates@@
+ <<set $activeSlave.devotion += 5>>
+ <<else>>
+ indifferently hammers
+ <</if>>
+ your pussy.
<<elseif $activeSlave.vagina > -1>>
- Lesbian sex here.
+ Lesbian sex here.
<<else>>
- ERROR - PC doesn't have dick or vagina?
+ ERROR - PC doesn't have dick or vagina?
<</if>>
```
+
If you need to set a temp variable, prefix it with _ instead of $. This way, you don't go cluttering up the world with variables that only matter inside your little writing segment.
You can "hot-test" stuff by text editing your HTML copy of FC, but it's a little more tedious because you have to "escape" double quotes, <, >, and & with " < > and & respectively.
-Some hints:
-1. Write your logic first, so you don't forget to close tags. In other words, it's better to do
-```
+Some tips:
+
+- Write your logic first, so you don't forget to close tags. In other words, it's better to do
+
+```sugarcube
<<if $cond>
- TODO
+ TODO
<<else>>
- TODO
+ TODO
<</if>>
```
+
And then fill it in later than it is to end up with a situation where you have a dozen unclosed tags and you can't remember where they are or what they do.
-2. For very simple stuff, it's fine to "inline" your stuff. For example, when penetrating a slave, doing `"you fuck $his <<if $activeSlave.vagina > -1>>pussy<<else>>ass<</if>>"` to show "pussy" or "ass" as necessary. However, if you need to do the same comparison a bunch of times, do something like
-```
+- For very simple stuff, it's fine to "inline" your stuff. For example, when penetrating a slave, doing `"you fuck $his <<if $activeSlave.vagina > -1>>pussy<<else>>ass<</if>>"` to show "pussy" or "ass" as necessary. However, if you need to do the same comparison a bunch of times, do something like
+
+```sugarcube
<<if $activeSlave.vagina > -1>>
- <<set _targetOrifice = "vagina">>
+ <<set _targetOrifice = "vagina">>
<<else>>
- <<set _targetOrifice = "asshole">>
+ <<set _targetOrifice = "asshole">>
<</if>>
```
+
And then, when you need it, do `"you fuck $his _targetOrifice"` in sixteen different places without having the pain in the ass of copy/pasting the same if/else clause every time.
-3. INDENT YOUR LOGIC. USE TABS. I'm serious. Don't question me. It will make EVERYONE hate you, when they have to deal with your code, if it's not indented properly.
+- INDENT YOUR LOGIC. USE TABS. I'm serious. Don't question me. It will make EVERYONE hate you, when they have to deal with your code, if it's not indented properly.
This is much easier to read:
-```
+
+```sugarcube
<<if $cond1>>
- <<if $cond2>>
- whatever
- <<elseif $cond3>>
- whatever
- <<elseif $cond4>>
- <<if $cond5>>
- whatever
- <<else>>
- <<if $cond6>>
- whatever
- <</if>>
- <</if>>
- <<else>>
- whatever
- <<if $cond7>>
- <<if $cond8>>
- whatever
- <</if>>
- <</if>>
- <</if>>
+ <<if $cond2>>
+ whatever
+ <<elseif $cond3>>
+ whatever
+ <<elseif $cond4>>
+ <<if $cond5>>
+ whatever
+ <<else>>
+ <<if $cond6>>
+ whatever
+ <</if>>
+ <</if>>
+ <<else>>
+ whatever
+ <<if $cond7>>
+ <<if $cond8>>
+ whatever
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
```
+
than this:
-```
+
+```sugarcube
<<if $cond1>>
<<if $cond2>>
whatever
@@ -172,4 +188,5 @@ whatever
<</if>>
<</if>>
```
-4. Proof-read your shit before posting it. Spell-check wouldn't hurt.
+
+- Proof-read your shit before posting it. Spell-check wouldn't hurt.
diff --git a/devTools/DL-Loop.sh b/devTools/DL-Loop.sh
index 7bb002154e303a221515720397da287ce0c4d0b1..c40a20c96842825d83c5736e0ed88335261790d0 100755
--- a/devTools/DL-Loop.sh
+++ b/devTools/DL-Loop.sh
@@ -1,35 +1,27 @@
#!/bin/bash
-echo "Use temp [0], dump file to current directory [1] or overwrite file in place [2]" && read varname1
-echo "Use upstream [1] or origin [0]" && read varname2
-if [[ $varname2 == 0 ]];then
- echo "Use master [1] or current branch [0]." && read varname3
-else
- varname3=1;
-fi
-echo "Dry run? 1:0" && read varname4
+branch='pregmod-master'
+usr='pregmodfan'
-if [[ $varname2 == 1 ]];then
- varname2='pregmodfan'
-else
- varname2=$(git remote show origin|grep -e /|head -n 1|sed s#git@ssh.gitgud.io:#https://gitgud.io/#|cut -c 32-|sed s#/fc-pregmod.git##)
-fi
-if [[ $varname3 == 1 ]];then
- varname3='pregmod-master'
-else
- varname3=$(git rev-parse --abbrev-ref HEAD)
+echo "Use temp [0], dump file to current directory [1] or overwrite file in place [2]" && read opt
+echo "Use upstream [1] or origin [0]" && read usrSelection
+echo "Dry run? 1, 0" && read dryRun
+
+if [[ $usrSelection == 0 ]];then
+ usr=$(git remote show origin|grep -e /|head -n 1 | sed s'/Fetch URL: //' | sed s%/fc-pregmod.git%% | sed s%git@ssh.gitgud.io:%% || sed %https://gitgud.io/%%)
+ echo "Use master [1] or current branch [0]." && read targetBranch
+ if [[ $targetBranch == 0 ]];then branch=$(git rev-parse --abbrev-ref HEAD); fi
fi
-if [[ $varname4 == 1 ]];then
- echo "https://gitgud.io/$varname2/fc-pregmod/raw/$varname3/"
+if [[ $dryRun == 1 ]];then
+ echo "https://gitgud.io/$usr/fc-pregmod/raw/$branch/"
else
- for ((i=1; i<=$#; i++))
- do
- if [[ $varname1 == 0 ]]; then
- wget -q -P /tmp/ https://gitgud.io/$varname2/fc-pregmod/raw/$varname3/${!i}
- elif [[ $varname1 == 1 ]]; then
- wget -q https://gitgud.io/$varname2/fc-pregmod/raw/$varname3/${!i}
+ for ((i=1; i<=$#; i++)); do
+ if [[ $opt == 0 ]]; then
+ wget -q -P /tmp/ https://gitgud.io/$usr/fc-pregmod/raw/$branch/${!i}
+ elif [[ $opt == 1 ]]; then
+ wget -q https://gitgud.io/$usr/fc-pregmod/raw/$branch/${!i}
else
- curl -s https://gitgud.io/$varname2/fc-pregmod/raw/$varname3/${!i} > ${!i}
+ curl -s https://gitgud.io/$usr/fc-pregmod/raw/$branch/${!i} > ${!i}
fi
done
fi
diff --git a/devTools/minify/README.md b/devTools/minify/README.md
index 79dee7f67b3c98b8d1fe611a8a81f562415096f2..d1544d4026118b9197b02799fc279a12378b95b0 100644
--- a/devTools/minify/README.md
+++ b/devTools/minify/README.md
@@ -38,6 +38,12 @@ yay -Syu minify
pkg install minify
```
+### Alpine Linux
+Enable the [https://wiki.alpinelinux.org/wiki/Enable_Community_Repository](community repo) and run
+```
+apk add minify
+```
+
### MacOS
Using Homebrew:
@@ -66,11 +72,12 @@ Pull the image:
docker pull tdewolff/minify
```
+> The `ENTRYPOINT` of the container is the `minify` command
+
and run the image, for example in interactive mode:
-```
-docker run -i tdewolff/minify
-echo "(function(){ if (a == false) { return 0; } else { return 1; } })();" | minify --type js
+```bash
+docker run -i --entrypoint "" tdewolff/minify sh -c 'echo "(function(){ if (a == false) { return 0; } else { return 1; } })();" | minify --type js'
```
which will output
diff --git a/devTools/minify/minify_darwin_amd64 b/devTools/minify/minify_darwin_amd64
index 3d7867ddf8c6256cab6735ef723dcc226aaff8e0..9493dd5d13eec83e639df82e2bb70860f4489c6a 100755
Binary files a/devTools/minify/minify_darwin_amd64 and b/devTools/minify/minify_darwin_amd64 differ
diff --git a/devTools/minify/minify_linux_amd64 b/devTools/minify/minify_linux_amd64
index c5bd2be54251b96ca241f2831df07b7767731694..417be68018bdfdfac2ec2917fdfcb513076a81d8 100755
Binary files a/devTools/minify/minify_linux_amd64 and b/devTools/minify/minify_linux_amd64 differ
diff --git a/devTools/minify/minify_win_amd64.exe b/devTools/minify/minify_win_amd64.exe
index c478435ac99942f89aa492c3c14e5ddb1f71ef98..606bf006036f38751bebaec597db5e0890545e4f 100755
Binary files a/devTools/minify/minify_win_amd64.exe and b/devTools/minify/minify_win_amd64.exe differ
diff --git a/devTools/switchBranch.sh b/devTools/switchBranch.sh
new file mode 100644
index 0000000000000000000000000000000000000000..bca3f4fb8e95acb059433eb9d912d747dd9ebfb2
--- /dev/null
+++ b/devTools/switchBranch.sh
@@ -0,0 +1,21 @@
+# git push --set-upstream origin origin/pregmod-master / git checkout -b pregmod-master --track origin/pregmod-master
+previousBranch="Not found"
+if [[ $(git rev-parse --quiet --abbrev-ref @{-1} 2>/dev/null) && $? -eq 0 ]]; then
+ previousBranch=$(git rev-parse --abbrev-ref @{-1})
+fi
+
+read -p "Push commits/branch? Y/N: " commit
+read -p "Sync Master? Y/N: " sync
+read -p "Switch to supplied branch ($1) / previous ($previousBranch)? Y/N: " switch
+
+if [[ $commit == "Y" ]]; then
+ git push -q 2>/dev/null || git push -qu origin $(git rev-parse --abbrev-ref HEAD) 1>/dev/null
+fi
+if [[ $sync == "Y" ]]; then
+ git stash save * && git checkout -q pregmod-master && git reset --hard upstream/pregmod-master -q && git push -q && git checkout -q @{-1} && git stash pop
+fi
+if [[ $switch == "Y" ]]; then
+ if [[ -n $1 ]];then git checkout -q $1; else git checkout -q @{-1}; fi
+fi
+read -p "Delete previous branch ($(git rev-parse --abbrev-ref @{-1}))? Y/N: " del
+if [[ $del == "Y" ]]; then git branch -qD @{-1}; fi
diff --git a/devTools/types/FC/RA.d.ts b/devTools/types/FC/RA.d.ts
index d9c75fff29ffea78e0b574b757ee501e71f33834..38b1bf69b2e63a1a06d4f3b13274054e2c0f15d4 100644
--- a/devTools/types/FC/RA.d.ts
+++ b/devTools/types/FC/RA.d.ts
@@ -8,8 +8,12 @@ declare namespace FC {
type NumericTarget = GenericNumericTarget<number>;
type ExpressiveNumericTarget = GenericNumericTarget<number | string>;
- interface RuleConditions {
+ interface RuleConditionEditorArguments {
activation: PostFixRule;
+ advancedMode: boolean;
+ }
+
+ interface RuleConditions extends RuleConditionEditorArguments{
selectedSlaves: number[];
excludedSlaves: number[];
applyRuleOnce: boolean;
@@ -65,6 +69,8 @@ declare namespace FC {
master: number;
}
+ //type Piercings = ;
+
interface RuleSetters {
releaseRules: RuleReleaseSetters;
lactationRules: WithNone<"induce" | "maintain"> | null;
@@ -111,7 +117,7 @@ declare namespace FC {
markings: "remove beauty marks" | "remove birthmarks" | "remove both";
pubicHColor: string;
pubicHStyle: string;
- piercing: Object;
+ piercing: InstanceType<typeof App.Entity.completePiercingStateRA>;
vaginaLube: number;
boobsTat: string | number;
buttTat: string | number;
@@ -127,6 +133,7 @@ declare namespace FC {
birthsTat: string | number;
abortionTat: string | number;
pitRules: number;
+ arenaRules: number;
curatives: number;
livingRules: Rules.Living;
relationshipRules: Rules.Relationship;
@@ -134,7 +141,7 @@ declare namespace FC {
standardReward: Rules.Reward;
weight: NumericRange;
diet: string;
- dietCum: number;
+ dietCum: 0 | 1 | 2;
dietMilk: FC.dietMilkType;
onDiet: number;
muscles: NumericTarget;
diff --git a/devTools/types/FC/arcology.d.ts b/devTools/types/FC/arcology.d.ts
index 35660ea4796b78d23a93a49010d2c34efabba2eb..f116eae9487c80d83061d6bda0d6ed47a5c16c1a 100644
--- a/devTools/types/FC/arcology.d.ts
+++ b/devTools/types/FC/arcology.d.ts
@@ -50,7 +50,7 @@ declare namespace FC {
};
FSSlimnessEnthusiast: {
noun: "Slimness Enthusiasm", adj: "Slimness Enthusiast", deco: "Slimness Enthusiast",
- research: true, SMR: true, policy: "Law", choice: undefined
+ research: true, SMR: true, policy: "Law" | "FoodLaw", choice: undefined
};
FSAssetExpansionist: {
noun: "Asset Expansionism", adj: "Asset Expansionist", deco: "Asset Expansionist",
@@ -74,7 +74,7 @@ declare namespace FC {
};
FSChattelReligionist: {
noun: "Chattel Religionism", adj: "Chattel Religionist", deco: "Chattel Religionist",
- research: undefined, SMR: true, policy: "Law", choice: undefined
+ research: undefined, SMR: true, policy: "Law" | "Law2", choice: undefined
};
FSNull: {
noun: "Multiculturalism", adj: "Multiculturalist", deco: undefined,
@@ -171,11 +171,11 @@ declare namespace FC {
type FSName<T extends string> = T extends `FS${infer Name}` ? Name : never;
// direction with respect to the player's arcology
- type ArcologyDirection = "east" | "north" | "northeast" | "northwest" | "south" | "southeast" | "southwest" | "west";
+ type ArcologyDirection = 0 /* player */ | "east" | "north" | "northeast" | "northwest" | "south" | "southeast" | "southwest" | "west";
type ArcologyStateBase = {
name: string;
- direction: Zeroable<ArcologyDirection>;
+ direction: ArcologyDirection;
government: string;
leaderID: number;
honeymoon: number;
@@ -185,19 +185,16 @@ declare namespace FC {
PCminority: number;
demandFactor: number;
embargo: number;
- embargoTarget: Zeroable<ArcologyDirection>;
- influenceTarget: Zeroable<ArcologyDirection>;
+ embargoTarget: -1|ArcologyDirection;
+ influenceTarget: -1|ArcologyDirection;
influenceBonus: number;
CyberEconomic: number;
- CyberEconomicTarget: Zeroable<ArcologyDirection>;
+ CyberEconomicTarget: -1|ArcologyDirection;
CyberReputation: number;
- CyberReputationTarget: Zeroable<ArcologyDirection>;
+ CyberReputationTarget: -1|ArcologyDirection;
rival: number;
childhoodFertilityInducedNCSResearch: Bool;
- hackingEconomic: number;
- hackingEconomicTarget: number;
- hackingReputationTarget: number;
- hackingReputation: number;
+ weeks: number;
}
type ArcologyStateFSPeculiarities = {
diff --git a/devTools/types/FC/desc.d.ts b/devTools/types/FC/desc.d.ts
index 913ff2eaff7dbd03d921fba98109432dbfe290c0..92de5e62b2c4435f889be53556860ece8168ee33 100644
--- a/devTools/types/FC/desc.d.ts
+++ b/devTools/types/FC/desc.d.ts
@@ -5,6 +5,8 @@ declare namespace FC {
market?: Zeroable<SlaveMarketName | SpecialMarketName | "starting">;
marketText?: string; /* extra text to be appended to the first line of the description, dependent on the original market */
noArt?: boolean;
+ /** Allow linking to other passages, for example to other slaves */
+ links?:boolean;
}
}
}
diff --git a/devTools/types/FC/facilities.d.ts b/devTools/types/FC/facilities.d.ts
index d506384103756c3cad822b247186462f4e2a3beb..36c3bbd4d028d28fa1659b11fdff2175f13ed95b 100644
--- a/devTools/types/FC/facilities.d.ts
+++ b/devTools/types/FC/facilities.d.ts
@@ -34,9 +34,70 @@ declare namespace FC {
*
* If none are given, the upgrade will always be available.
*/
- prereqs?: Array<() => boolean>
+ prereqs?: boolean[];
/** Any additional nodes to attach. */
- nodes?: Array<string|HTMLElement|DocumentFragment>
+ nodes?: Array<string|HTMLElement|DocumentFragment>;
+ }
+
+ interface IFacilityAssignment {
+ /** The name of the assignment. */
+ position: string;
+ /** The assignment type. */
+ assignment: Assignment;
+ /** Whether the assigned slaves engage in sex with the public. */
+ publicSexUse: boolean;
+ /** Whether fuckdolls can work here. */
+ fuckdollAccepted: boolean;
+ /** Whether slaves assigned here can work at another assignment at the same time. */
+ partTime?: boolean;
+ }
+
+ interface IManagerAssignment {
+ /** The name of the assignment. */
+ position: string;
+ /** The assignment name's abbreviated form, if any. */
+ positionAbbreviation?: string;
+ /** The assignment type. */
+ assignment: Assignment;
+ /** A list of careers that count towards past experience. */
+ careers: string[];
+ /** Which of a slave's manager skills is affected. */
+ skill: string;
+ /** Whether the assigned slaves engage in sex with the public. */
+ publicSexUse: boolean;
+ /** Whether fuckdolls can work here. */
+ fuckdollAccepted: boolean;
+ /** Whether broodmothers can work here. */
+ broodmotherAccepted: boolean;
+ /** If slaves assigned here must be able to walk. */
+ shouldWalk: boolean;
+ /** If slaves assigned here must be able to hold items. */
+ shouldHold: boolean;
+ /** If slaves assigned here must be able to see. */
+ shouldSee: boolean;
+ /** If slaves assigned here must be able to hear. */
+ shouldHear: boolean;
+ /** If slaves assigned here must be able to talk. */
+ shouldTalk: boolean;
+ /** If slaves assigned here must have cognitive function. */
+ shouldThink: boolean;
+ /** The minimum required devotion level to be assigned here. */
+ requiredDevotion: number;
+ }
+
+ interface FacilityFramework {
+ /** The variable name of the facility. */
+ baseName: string;
+ /** The generic form of the facility. */
+ genericName: string|null;
+ /** An object listing all the available positions in the facility. */
+ jobs: Record<string, IFacilityAssignment>;
+ /** The default job in the facility. */
+ defaultJob: string;
+ /** Properties pertaining to the facility's manager. */
+ manager: IManagerAssignment;
+ /** Whether the facility can use FS decorations. */
+ decorated: boolean;
}
namespace Facilities {
@@ -47,9 +108,9 @@ declare namespace FC {
interface Rule {
/** The variable name of the rule. */
- property: string
+ property: string;
/** Any prerequisites that must be met for the rule to be displayed. */
- prereqs: Array<() => boolean>
+ prereqs: boolean[];
/** Properties pertaining to any options available. */
options: Array<{
/** The text displayed when the rule is active. */
@@ -63,10 +124,10 @@ declare namespace FC {
/** Any additional information to display with on the link. */
note?: string;
/** Any prerequisites that must be met for the option to be displayed. */
- prereqs?: Array<() => boolean>;
- }>
+ prereqs?: boolean[];
+ }>;
/** Any additional nodes to attach. */
- nodes?: Array<string|HTMLElement|DocumentFragment>
+ nodes?: Array<string|HTMLElement|DocumentFragment>;
/** Any object the rule property is part of, if not the default `V`. */
object?: Object;
}
@@ -117,7 +178,10 @@ declare namespace FC {
interface Pit {
/** Defaults to "the Pit" if not otherwise set. */
name: string;
+ // Arena section
+ trainingIDs: number[];
+ // Pit section
/** The animal fighting a slave if not null. */
animal: string | "random";
/** The type of audience the Pit has. */
diff --git a/devTools/types/FC/gameState.d.ts b/devTools/types/FC/gameState.d.ts
index 7226eeb1442ceba8177858fd7c32d68225308b7f..53338f89c27c7ec8801427a3840c66c5e78fc29c 100644
--- a/devTools/types/FC/gameState.d.ts
+++ b/devTools/types/FC/gameState.d.ts
@@ -18,7 +18,7 @@ declare namespace FC {
- 1: Not established
- 2: Established
- 3: Captured
- - 4: Killed
+ - 4: Killed / Accepted offer
- 5: Enslaved
*/
state: number;
diff --git a/devTools/types/FC/human.d.ts b/devTools/types/FC/human.d.ts
index 23ef528c941aa38f747d8df9d0c601c561d67594..ca374b34e8787db4daec42b53a8b21e764020f2c 100644
--- a/devTools/types/FC/human.d.ts
+++ b/devTools/types/FC/human.d.ts
@@ -72,7 +72,7 @@ declare global {
// Other
'choose her own job' |
// Pseudo-jobs
- '@Lurcher' | '@Pit' | '@be imported' | '@lay in tank';
+ '@Lurcher' | '@Pit' | "@Arena" | '@be imported' | '@lay in tank';
interface AssignmentFreeze extends Record<string, Assignment> {
// Penthouse Assignments
@@ -124,11 +124,29 @@ declare global {
// Pseudo-jobs
LURCHER: '@Lurcher';
PIT: '@Pit';
+ ARENA: "@Arena";
IMPORTED: '@be imported';
TANK: '@lay in tank';
}
+
type Fetish = WithNone<"mindbroken" | "submissive" | "cumslut" | "humiliation" | "buttslut" | "boobs" | "sadist" |
- "masochist" | "dom" | "pregnancy">;
+ "masochist" | "dom" | "pregnancy" | "bestiality">;
+
+ interface FetishFreeze extends Record<string, Fetish> {
+ NONE: "none";
+ MINDBROKEN: "mindbroken";
+ SUBMISSIVE: "submissive";
+ CUMSLUT: "cumslut";
+ HUMILIATION: "humiliation";
+ BUTTSLUT: "buttslut";
+ BOOBS: "boobs";
+ SADIST: "sadist";
+ MASOCHIST: "masochist";
+ DOM: "dom";
+ PREGNANCY: "pregnancy";
+ BESTIALITY: "bestiality";
+ }
+
type BehavioralFlaw = WithNone<
| "arrogant" // clings to her dignity, thinks slavery is beneath her
| "bitchy" // : can 't keep her opinions to herself
@@ -198,7 +216,9 @@ declare global {
/** hates herself */
| "self hating"
/** addicted to being pregnant */
- | "breeder">;
+ | "breeder"
+ /** addicted to fucking animals */
+ | "animal lover">;
type SexualQuirk = WithNone<
/** can take a facefucking */
@@ -464,6 +484,8 @@ declare global {
}
//#endregion
+ type LimbType = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10
+
type ArmState = InstanceType<typeof App.Entity.ArmState>;
type LegState = InstanceType<typeof App.Entity.LegState>;
@@ -476,7 +498,7 @@ declare global {
left: LegState,
right: LegState;
};
- PLimb: number;
+ PLimb: 0 | 1 | 2 | 3;
}
interface PregnancyData {
diff --git a/devTools/types/extensions.d.ts b/devTools/types/extensions.d.ts
index 07c495c194f1cb1f82c91c0135b92ea8b7d30e03..dc832d2fe297695691cf4463eae41518226d85e2 100644
--- a/devTools/types/extensions.d.ts
+++ b/devTools/types/extensions.d.ts
@@ -19,107 +19,3 @@ interface ObjectConstructor {
keys<K extends PropertyKey, V>(o: Partial<Record<K, V>>): EnumerablePropertyKey<K>[];
entries<K extends PropertyKey, V>(o: Partial<Record<K, V>>): [EnumerablePropertyKey<K>, V][];
}
-
-// d3-dtree
-
-declare namespace d3dTree {
- interface Person {
- name: string;
- }
- interface Marriage {
- spouse: Person;
- /**
- * List of children nodes
- */
- children: Person[];
- }
-
- interface DataItem {
- /**
- * The name of the node
- */
- name: string;
- /**
- * The CSS class of the node
- */
- class: string;
- /**
- * The CSS class of the text in the node
- */
- textClass: string;
- /**
- * Generational height offset
- */
- depthOffset?: number;
- /** Marriages is a list of nodes
- * Each marriage has one spouse
- */
- marriages: Marriage[];
- /**
- * Custom data passed to renderers
- */
- extra?: object;
- }
-
- interface Options {
- target: string;
- debug: boolean;
- width: number;
- height: number;
- hideMarriageNodes: boolean;
- marriageNodeSize: number;
- /**
- * Callbacks should only be overwritten on a need to basis.
- * See the section about callbacks below.
- */
- callbacks: {
- },
- margin: {
- top: number;
- right: number;
- bottom: number;
- left: number;
- },
- nodeWidth: number;
- styles: {
- node: string;
- linage: string;
- marriage: string;
- text: string;
- }
- }
-
- interface Tree {
- /**
- * Reset zoom and position to initial state
- * @param duration Default is 500
- */
- resetZoom(duration?: number): void;
- /**
- * Zoom to a specific position
- * @param x
- * @param y
- * @param zoom = 1
- * @param duration = 500
- */
- zoomTo(x: number, y: number, zoom?: number, duration?: number): void;
- /**
- * Zoom to a specific node
- * @param nodeId
- * @param zoom = 2
- * @param duration = 500
- */
- zoomToNode(nodeId: string, zoom?: number, duration?: number): void;
- /**
- * Zoom to fit the entire tree into the viewport
- * @param duration = 500
- */
- zoomToFit(duration?: number): void;
- }
-
- interface dTree {
- init(data: DataItem[], options: Partial<Options>): Tree;
- }
-}
-
-declare const dTree: d3dTree.dTree;
diff --git a/devTools/updateTool.sh b/devTools/updateTool.sh
new file mode 100644
index 0000000000000000000000000000000000000000..e2a3cb46c45c8f75e6ef7c4bb30ff36529fc3bd9
--- /dev/null
+++ b/devTools/updateTool.sh
@@ -0,0 +1,8 @@
+git fetch upstream -q
+check=$(git rev-list HEAD..upstream/pregmod-master) # https://adamj.eu/tech/2020/01/18/a-git-check-for-missing-commits-from-a-remote/
+if [[ $check ]];then echo "Updated: Yes"; else echo "Updated: No"; fi
+if [[ ($1 || $check) && $(git rev-parse --abbrev-ref HEAD) = "pregmod-master" ]];then
+ git reset --hard upstream/pregmod-master -q
+elif [[ ($1 || $check) && $(git rev-parse --abbrev-ref HEAD) != "pregmod-master" ]]; then
+ git merge upstream/pregmod-master -q
+fi
diff --git a/js/001-lib/d3.min.js b/js/001-lib/d3.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..1b05c90b864985684059d9b2811a91b8035ec96c
--- /dev/null
+++ b/js/001-lib/d3.min.js
@@ -0,0 +1,2 @@
+// https://d3js.org v7.6.1 Copyright 2010-2022 Mike Bostock
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports):"function"==typeof define&&define.amd?define(["exports"],n):n((t="undefined"!=typeof globalThis?globalThis:t||self).d3=t.d3||{})}(this,(function(t){"use strict";function n(t,n){return null==t||null==n?NaN:t<n?-1:t>n?1:t>=n?0:NaN}function e(t,n){return null==t||null==n?NaN:n<t?-1:n>t?1:n>=t?0:NaN}function r(t){let r,o,a;function u(t,n,e=0,i=t.length){if(e<i){if(0!==r(n,n))return i;do{const r=e+i>>>1;o(t[r],n)<0?e=r+1:i=r}while(e<i)}return e}return 2!==t.length?(r=n,o=(e,r)=>n(t(e),r),a=(n,e)=>t(n)-e):(r=t===n||t===e?t:i,o=t,a=t),{left:u,center:function(t,n,e=0,r=t.length){const i=u(t,n,e,r-1);return i>e&&a(t[i-1],n)>-a(t[i],n)?i-1:i},right:function(t,n,e=0,i=t.length){if(e<i){if(0!==r(n,n))return i;do{const r=e+i>>>1;o(t[r],n)<=0?e=r+1:i=r}while(e<i)}return e}}}function i(){return 0}function o(t){return null===t?NaN:+t}function*a(t,n){if(void 0===n)for(let n of t)null!=n&&(n=+n)>=n&&(yield n);else{let e=-1;for(let r of t)null!=(r=n(r,++e,t))&&(r=+r)>=r&&(yield r)}}const u=r(n),c=u.right,f=u.left,s=r(o).center;var l=c;const h=p(v),d=p((function(t){const n=v(t);return(t,e,r,i,o)=>{n(t,e,(r<<=2)+0,(i<<=2)+0,o<<=2),n(t,e,r+1,i+1,o),n(t,e,r+2,i+2,o),n(t,e,r+3,i+3,o)}}));function p(t){return function(n,e,r=e){if(!((e=+e)>=0))throw new RangeError("invalid rx");if(!((r=+r)>=0))throw new RangeError("invalid ry");let{data:i,width:o,height:a}=n;if(!((o=Math.floor(o))>=0))throw new RangeError("invalid width");if(!((a=Math.floor(void 0!==a?a:i.length/o))>=0))throw new RangeError("invalid height");if(!o||!a||!e&&!r)return n;const u=e&&t(e),c=r&&t(r),f=i.slice();return u&&c?(g(u,f,i,o,a),g(u,i,f,o,a),g(u,f,i,o,a),y(c,i,f,o,a),y(c,f,i,o,a),y(c,i,f,o,a)):u?(g(u,i,f,o,a),g(u,f,i,o,a),g(u,i,f,o,a)):c&&(y(c,i,f,o,a),y(c,f,i,o,a),y(c,i,f,o,a)),n}}function g(t,n,e,r,i){for(let o=0,a=r*i;o<a;)t(n,e,o,o+=r,1)}function y(t,n,e,r,i){for(let o=0,a=r*i;o<r;++o)t(n,e,o,o+a,r)}function v(t){const n=Math.floor(t);if(n===t)return function(t){const n=2*t+1;return(e,r,i,o,a)=>{if(!((o-=a)>=i))return;let u=t*r[i];const c=a*t;for(let t=i,n=i+c;t<n;t+=a)u+=r[Math.min(o,t)];for(let t=i,f=o;t<=f;t+=a)u+=r[Math.min(o,t+c)],e[t]=u/n,u-=r[Math.max(i,t-c)]}}(t);const e=t-n,r=2*t+1;return(t,i,o,a,u)=>{if(!((a-=u)>=o))return;let c=n*i[o];const f=u*n,s=f+u;for(let t=o,n=o+f;t<n;t+=u)c+=i[Math.min(a,t)];for(let n=o,l=a;n<=l;n+=u)c+=i[Math.min(a,n+f)],t[n]=(c+e*(i[Math.max(o,n-s)]+i[Math.min(a,n+s)]))/r,c-=i[Math.max(o,n-f)]}}function _(t,n){let e=0;if(void 0===n)for(let n of t)null!=n&&(n=+n)>=n&&++e;else{let r=-1;for(let i of t)null!=(i=n(i,++r,t))&&(i=+i)>=i&&++e}return e}function b(t){return 0|t.length}function m(t){return!(t>0)}function x(t){return"object"!=typeof t||"length"in t?t:Array.from(t)}function w(t,n){let e,r=0,i=0,o=0;if(void 0===n)for(let n of t)null!=n&&(n=+n)>=n&&(e=n-i,i+=e/++r,o+=e*(n-i));else{let a=-1;for(let u of t)null!=(u=n(u,++a,t))&&(u=+u)>=u&&(e=u-i,i+=e/++r,o+=e*(u-i))}if(r>1)return o/(r-1)}function M(t,n){const e=w(t,n);return e?Math.sqrt(e):e}function A(t,n){let e,r;if(void 0===n)for(const n of t)null!=n&&(void 0===e?n>=n&&(e=r=n):(e>n&&(e=n),r<n&&(r=n)));else{let i=-1;for(let o of t)null!=(o=n(o,++i,t))&&(void 0===e?o>=o&&(e=r=o):(e>o&&(e=o),r<o&&(r=o)))}return[e,r]}class T{constructor(){this._partials=new Float64Array(32),this._n=0}add(t){const n=this._partials;let e=0;for(let r=0;r<this._n&&r<32;r++){const i=n[r],o=t+i,a=Math.abs(t)<Math.abs(i)?t-(o-i):i-(o-t);a&&(n[e++]=a),t=o}return n[e]=t,this._n=e+1,this}valueOf(){const t=this._partials;let n,e,r,i=this._n,o=0;if(i>0){for(o=t[--i];i>0&&(n=o,e=t[--i],o=n+e,r=e-(o-n),!r););i>0&&(r<0&&t[i-1]<0||r>0&&t[i-1]>0)&&(e=2*r,n=o+e,e==n-o&&(o=n))}return o}}class InternMap extends Map{constructor(t,n=N){if(super(),Object.defineProperties(this,{_intern:{value:new Map},_key:{value:n}}),null!=t)for(const[n,e]of t)this.set(n,e)}get(t){return super.get(S(this,t))}has(t){return super.has(S(this,t))}set(t,n){return super.set(E(this,t),n)}delete(t){return super.delete(k(this,t))}}class InternSet extends Set{constructor(t,n=N){if(super(),Object.defineProperties(this,{_intern:{value:new Map},_key:{value:n}}),null!=t)for(const n of t)this.add(n)}has(t){return super.has(S(this,t))}add(t){return super.add(E(this,t))}delete(t){return super.delete(k(this,t))}}function S({_intern:t,_key:n},e){const r=n(e);return t.has(r)?t.get(r):e}function E({_intern:t,_key:n},e){const r=n(e);return t.has(r)?t.get(r):(t.set(r,e),e)}function k({_intern:t,_key:n},e){const r=n(e);return t.has(r)&&(e=t.get(r),t.delete(r)),e}function N(t){return null!==t&&"object"==typeof t?t.valueOf():t}function C(t){return t}function P(t,...n){return I(t,C,C,n)}function z(t,...n){return I(t,Array.from,C,n)}function D(t,n){for(let e=1,r=n.length;e<r;++e)t=t.flatMap((t=>t.pop().map((([n,e])=>[...t,n,e]))));return t}function R(t,n,...e){return I(t,C,n,e)}function F(t,n,...e){return I(t,Array.from,n,e)}function q(t){if(1!==t.length)throw new Error("duplicate key");return t[0]}function I(t,n,e,r){return function t(i,o){if(o>=r.length)return e(i);const a=new InternMap,u=r[o++];let c=-1;for(const t of i){const n=u(t,++c,i),e=a.get(n);e?e.push(t):a.set(n,[t])}for(const[n,e]of a)a.set(n,t(e,o));return n(a)}(t,0)}function O(t,n){return Array.from(n,(n=>t[n]))}function U(t,...n){if("function"!=typeof t[Symbol.iterator])throw new TypeError("values is not iterable");t=Array.from(t);let[e]=n;if(e&&2!==e.length||n.length>1){const r=Uint32Array.from(t,((t,n)=>n));return n.length>1?(n=n.map((n=>t.map(n))),r.sort(((t,e)=>{for(const r of n){const n=Y(r[t],r[e]);if(n)return n}}))):(e=t.map(e),r.sort(((t,n)=>Y(e[t],e[n])))),O(t,r)}return t.sort(B(e))}function B(t=n){if(t===n)return Y;if("function"!=typeof t)throw new TypeError("compare is not a function");return(n,e)=>{const r=t(n,e);return r||0===r?r:(0===t(e,e))-(0===t(n,n))}}function Y(t,n){return(null==t||!(t>=t))-(null==n||!(n>=n))||(t<n?-1:t>n?1:0)}var L=Array.prototype.slice;function j(t){return()=>t}var $=Math.sqrt(50),H=Math.sqrt(10),X=Math.sqrt(2);function G(t,n,e){var r,i,o,a,u=-1;if(e=+e,(t=+t)===(n=+n)&&e>0)return[t];if((r=n<t)&&(i=t,t=n,n=i),0===(a=V(t,n,e))||!isFinite(a))return[];if(a>0){let e=Math.round(t/a),r=Math.round(n/a);for(e*a<t&&++e,r*a>n&&--r,o=new Array(i=r-e+1);++u<i;)o[u]=(e+u)*a}else{a=-a;let e=Math.round(t*a),r=Math.round(n*a);for(e/a<t&&++e,r/a>n&&--r,o=new Array(i=r-e+1);++u<i;)o[u]=(e+u)/a}return r&&o.reverse(),o}function V(t,n,e){var r=(n-t)/Math.max(0,e),i=Math.floor(Math.log(r)/Math.LN10),o=r/Math.pow(10,i);return i>=0?(o>=$?10:o>=H?5:o>=X?2:1)*Math.pow(10,i):-Math.pow(10,-i)/(o>=$?10:o>=H?5:o>=X?2:1)}function W(t,n,e){var r=Math.abs(n-t)/Math.max(0,e),i=Math.pow(10,Math.floor(Math.log(r)/Math.LN10)),o=r/i;return o>=$?i*=10:o>=H?i*=5:o>=X&&(i*=2),n<t?-i:i}function Z(t,n,e){let r;for(;;){const i=V(t,n,e);if(i===r||0===i||!isFinite(i))return[t,n];i>0?(t=Math.floor(t/i)*i,n=Math.ceil(n/i)*i):i<0&&(t=Math.ceil(t*i)/i,n=Math.floor(n*i)/i),r=i}}function K(t){return Math.ceil(Math.log(_(t))/Math.LN2)+1}function Q(){var t=C,n=A,e=K;function r(r){Array.isArray(r)||(r=Array.from(r));var i,o,a,u=r.length,c=new Array(u);for(i=0;i<u;++i)c[i]=t(r[i],i,r);var f=n(c),s=f[0],h=f[1],d=e(c,s,h);if(!Array.isArray(d)){const t=h,e=+d;if(n===A&&([s,h]=Z(s,h,e)),(d=G(s,h,e))[0]<=s&&(a=V(s,h,e)),d[d.length-1]>=h)if(t>=h&&n===A){const t=V(s,h,e);isFinite(t)&&(t>0?h=(Math.floor(h/t)+1)*t:t<0&&(h=(Math.ceil(h*-t)+1)/-t))}else d.pop()}for(var p=d.length;d[0]<=s;)d.shift(),--p;for(;d[p-1]>h;)d.pop(),--p;var g,y=new Array(p+1);for(i=0;i<=p;++i)(g=y[i]=[]).x0=i>0?d[i-1]:s,g.x1=i<p?d[i]:h;if(isFinite(a)){if(a>0)for(i=0;i<u;++i)null!=(o=c[i])&&s<=o&&o<=h&&y[Math.min(p,Math.floor((o-s)/a))].push(r[i]);else if(a<0)for(i=0;i<u;++i)if(null!=(o=c[i])&&s<=o&&o<=h){const t=Math.floor((s-o)*a);y[Math.min(p,t+(d[t]<=o))].push(r[i])}}else for(i=0;i<u;++i)null!=(o=c[i])&&s<=o&&o<=h&&y[l(d,o,0,p)].push(r[i]);return y}return r.value=function(n){return arguments.length?(t="function"==typeof n?n:j(n),r):t},r.domain=function(t){return arguments.length?(n="function"==typeof t?t:j([t[0],t[1]]),r):n},r.thresholds=function(t){return arguments.length?(e="function"==typeof t?t:Array.isArray(t)?j(L.call(t)):j(t),r):e},r}function J(t,n){let e;if(void 0===n)for(const n of t)null!=n&&(e<n||void 0===e&&n>=n)&&(e=n);else{let r=-1;for(let i of t)null!=(i=n(i,++r,t))&&(e<i||void 0===e&&i>=i)&&(e=i)}return e}function tt(t,n){let e,r=-1,i=-1;if(void 0===n)for(const n of t)++i,null!=n&&(e<n||void 0===e&&n>=n)&&(e=n,r=i);else for(let o of t)null!=(o=n(o,++i,t))&&(e<o||void 0===e&&o>=o)&&(e=o,r=i);return r}function nt(t,n){let e;if(void 0===n)for(const n of t)null!=n&&(e>n||void 0===e&&n>=n)&&(e=n);else{let r=-1;for(let i of t)null!=(i=n(i,++r,t))&&(e>i||void 0===e&&i>=i)&&(e=i)}return e}function et(t,n){let e,r=-1,i=-1;if(void 0===n)for(const n of t)++i,null!=n&&(e>n||void 0===e&&n>=n)&&(e=n,r=i);else for(let o of t)null!=(o=n(o,++i,t))&&(e>o||void 0===e&&o>=o)&&(e=o,r=i);return r}function rt(t,n,e=0,r=t.length-1,i){for(i=void 0===i?Y:B(i);r>e;){if(r-e>600){const o=r-e+1,a=n-e+1,u=Math.log(o),c=.5*Math.exp(2*u/3),f=.5*Math.sqrt(u*c*(o-c)/o)*(a-o/2<0?-1:1);rt(t,n,Math.max(e,Math.floor(n-a*c/o+f)),Math.min(r,Math.floor(n+(o-a)*c/o+f)),i)}const o=t[n];let a=e,u=r;for(it(t,e,n),i(t[r],o)>0&&it(t,e,r);a<u;){for(it(t,a,u),++a,--u;i(t[a],o)<0;)++a;for(;i(t[u],o)>0;)--u}0===i(t[e],o)?it(t,e,u):(++u,it(t,u,r)),u<=n&&(e=u+1),n<=u&&(r=u-1)}return t}function it(t,n,e){const r=t[n];t[n]=t[e],t[e]=r}function ot(t,e=n){let r,i=!1;if(1===e.length){let o;for(const a of t){const t=e(a);(i?n(t,o)>0:0===n(t,t))&&(r=a,o=t,i=!0)}}else for(const n of t)(i?e(n,r)>0:0===e(n,n))&&(r=n,i=!0);return r}function at(t,n,e){if(r=(t=Float64Array.from(a(t,e))).length){if((n=+n)<=0||r<2)return nt(t);if(n>=1)return J(t);var r,i=(r-1)*n,o=Math.floor(i),u=J(rt(t,o).subarray(0,o+1));return u+(nt(t.subarray(o+1))-u)*(i-o)}}function ut(t,n,e=o){if(r=t.length){if((n=+n)<=0||r<2)return+e(t[0],0,t);if(n>=1)return+e(t[r-1],r-1,t);var r,i=(r-1)*n,a=Math.floor(i),u=+e(t[a],a,t);return u+(+e(t[a+1],a+1,t)-u)*(i-a)}}function ct(t,n,e){if(r=(t=Float64Array.from(a(t,e))).length){if((n=+n)<=0||r<2)return et(t);if(n>=1)return tt(t);var r,i=Math.floor((r-1)*n),o=rt(Uint32Array.from(t,((t,n)=>n)),i,0,r-1,((n,e)=>Y(t[n],t[e])));return ot(o.subarray(0,i+1),(n=>t[n]))}}function ft(t){return Array.from(function*(t){for(const n of t)yield*n}(t))}function st(t,n){return[t,n]}function lt(t,n,e){t=+t,n=+n,e=(i=arguments.length)<2?(n=t,t=0,1):i<3?1:+e;for(var r=-1,i=0|Math.max(0,Math.ceil((n-t)/e)),o=new Array(i);++r<i;)o[r]=t+r*e;return o}function ht(t,e=n){if(1===e.length)return et(t,e);let r,i=-1,o=-1;for(const n of t)++o,(i<0?0===e(n,n):e(n,r)<0)&&(r=n,i=o);return i}var dt=pt(Math.random);function pt(t){return function(n,e=0,r=n.length){let i=r-(e=+e);for(;i;){const r=t()*i--|0,o=n[i+e];n[i+e]=n[r+e],n[r+e]=o}return n}}function gt(t){if(!(i=t.length))return[];for(var n=-1,e=nt(t,yt),r=new Array(e);++n<e;)for(var i,o=-1,a=r[n]=new Array(i);++o<i;)a[o]=t[o][n];return r}function yt(t){return t.length}function vt(t){return t instanceof InternSet?t:new InternSet(t)}function _t(t,n){const e=t[Symbol.iterator](),r=new Set;for(const t of n){const n=bt(t);if(r.has(n))continue;let i,o;for(;({value:i,done:o}=e.next());){if(o)return!1;const t=bt(i);if(r.add(t),Object.is(n,t))break}}return!0}function bt(t){return null!==t&&"object"==typeof t?t.valueOf():t}function mt(t){return t}var xt=1e-6;function wt(t){return"translate("+t+",0)"}function Mt(t){return"translate(0,"+t+")"}function At(t){return n=>+t(n)}function Tt(t,n){return n=Math.max(0,t.bandwidth()-2*n)/2,t.round()&&(n=Math.round(n)),e=>+t(e)+n}function St(){return!this.__axis}function Et(t,n){var e=[],r=null,i=null,o=6,a=6,u=3,c="undefined"!=typeof window&&window.devicePixelRatio>1?0:.5,f=1===t||4===t?-1:1,s=4===t||2===t?"x":"y",l=1===t||3===t?wt:Mt;function h(h){var d=null==r?n.ticks?n.ticks.apply(n,e):n.domain():r,p=null==i?n.tickFormat?n.tickFormat.apply(n,e):mt:i,g=Math.max(o,0)+u,y=n.range(),v=+y[0]+c,_=+y[y.length-1]+c,b=(n.bandwidth?Tt:At)(n.copy(),c),m=h.selection?h.selection():h,x=m.selectAll(".domain").data([null]),w=m.selectAll(".tick").data(d,n).order(),M=w.exit(),A=w.enter().append("g").attr("class","tick"),T=w.select("line"),S=w.select("text");x=x.merge(x.enter().insert("path",".tick").attr("class","domain").attr("stroke","currentColor")),w=w.merge(A),T=T.merge(A.append("line").attr("stroke","currentColor").attr(s+"2",f*o)),S=S.merge(A.append("text").attr("fill","currentColor").attr(s,f*g).attr("dy",1===t?"0em":3===t?"0.71em":"0.32em")),h!==m&&(x=x.transition(h),w=w.transition(h),T=T.transition(h),S=S.transition(h),M=M.transition(h).attr("opacity",xt).attr("transform",(function(t){return isFinite(t=b(t))?l(t+c):this.getAttribute("transform")})),A.attr("opacity",xt).attr("transform",(function(t){var n=this.parentNode.__axis;return l((n&&isFinite(n=n(t))?n:b(t))+c)}))),M.remove(),x.attr("d",4===t||2===t?a?"M"+f*a+","+v+"H"+c+"V"+_+"H"+f*a:"M"+c+","+v+"V"+_:a?"M"+v+","+f*a+"V"+c+"H"+_+"V"+f*a:"M"+v+","+c+"H"+_),w.attr("opacity",1).attr("transform",(function(t){return l(b(t)+c)})),T.attr(s+"2",f*o),S.attr(s,f*g).text(p),m.filter(St).attr("fill","none").attr("font-size",10).attr("font-family","sans-serif").attr("text-anchor",2===t?"start":4===t?"end":"middle"),m.each((function(){this.__axis=b}))}return h.scale=function(t){return arguments.length?(n=t,h):n},h.ticks=function(){return e=Array.from(arguments),h},h.tickArguments=function(t){return arguments.length?(e=null==t?[]:Array.from(t),h):e.slice()},h.tickValues=function(t){return arguments.length?(r=null==t?null:Array.from(t),h):r&&r.slice()},h.tickFormat=function(t){return arguments.length?(i=t,h):i},h.tickSize=function(t){return arguments.length?(o=a=+t,h):o},h.tickSizeInner=function(t){return arguments.length?(o=+t,h):o},h.tickSizeOuter=function(t){return arguments.length?(a=+t,h):a},h.tickPadding=function(t){return arguments.length?(u=+t,h):u},h.offset=function(t){return arguments.length?(c=+t,h):c},h}var kt={value:()=>{}};function Nt(){for(var t,n=0,e=arguments.length,r={};n<e;++n){if(!(t=arguments[n]+"")||t in r||/[\s.]/.test(t))throw new Error("illegal type: "+t);r[t]=[]}return new Ct(r)}function Ct(t){this._=t}function Pt(t,n){return t.trim().split(/^|\s+/).map((function(t){var e="",r=t.indexOf(".");if(r>=0&&(e=t.slice(r+1),t=t.slice(0,r)),t&&!n.hasOwnProperty(t))throw new Error("unknown type: "+t);return{type:t,name:e}}))}function zt(t,n){for(var e,r=0,i=t.length;r<i;++r)if((e=t[r]).name===n)return e.value}function Dt(t,n,e){for(var r=0,i=t.length;r<i;++r)if(t[r].name===n){t[r]=kt,t=t.slice(0,r).concat(t.slice(r+1));break}return null!=e&&t.push({name:n,value:e}),t}Ct.prototype=Nt.prototype={constructor:Ct,on:function(t,n){var e,r=this._,i=Pt(t+"",r),o=-1,a=i.length;if(!(arguments.length<2)){if(null!=n&&"function"!=typeof n)throw new Error("invalid callback: "+n);for(;++o<a;)if(e=(t=i[o]).type)r[e]=Dt(r[e],t.name,n);else if(null==n)for(e in r)r[e]=Dt(r[e],t.name,null);return this}for(;++o<a;)if((e=(t=i[o]).type)&&(e=zt(r[e],t.name)))return e},copy:function(){var t={},n=this._;for(var e in n)t[e]=n[e].slice();return new Ct(t)},call:function(t,n){if((e=arguments.length-2)>0)for(var e,r,i=new Array(e),o=0;o<e;++o)i[o]=arguments[o+2];if(!this._.hasOwnProperty(t))throw new Error("unknown type: "+t);for(o=0,e=(r=this._[t]).length;o<e;++o)r[o].value.apply(n,i)},apply:function(t,n,e){if(!this._.hasOwnProperty(t))throw new Error("unknown type: "+t);for(var r=this._[t],i=0,o=r.length;i<o;++i)r[i].value.apply(n,e)}};var Rt="http://www.w3.org/1999/xhtml",Ft={svg:"http://www.w3.org/2000/svg",xhtml:Rt,xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"};function qt(t){var n=t+="",e=n.indexOf(":");return e>=0&&"xmlns"!==(n=t.slice(0,e))&&(t=t.slice(e+1)),Ft.hasOwnProperty(n)?{space:Ft[n],local:t}:t}function It(t){return function(){var n=this.ownerDocument,e=this.namespaceURI;return e===Rt&&n.documentElement.namespaceURI===Rt?n.createElement(t):n.createElementNS(e,t)}}function Ot(t){return function(){return this.ownerDocument.createElementNS(t.space,t.local)}}function Ut(t){var n=qt(t);return(n.local?Ot:It)(n)}function Bt(){}function Yt(t){return null==t?Bt:function(){return this.querySelector(t)}}function Lt(t){return null==t?[]:Array.isArray(t)?t:Array.from(t)}function jt(){return[]}function $t(t){return null==t?jt:function(){return this.querySelectorAll(t)}}function Ht(t){return function(){return this.matches(t)}}function Xt(t){return function(n){return n.matches(t)}}var Gt=Array.prototype.find;function Vt(){return this.firstElementChild}var Wt=Array.prototype.filter;function Zt(){return Array.from(this.children)}function Kt(t){return new Array(t.length)}function Qt(t,n){this.ownerDocument=t.ownerDocument,this.namespaceURI=t.namespaceURI,this._next=null,this._parent=t,this.__data__=n}function Jt(t){return function(){return t}}function tn(t,n,e,r,i,o){for(var a,u=0,c=n.length,f=o.length;u<f;++u)(a=n[u])?(a.__data__=o[u],r[u]=a):e[u]=new Qt(t,o[u]);for(;u<c;++u)(a=n[u])&&(i[u]=a)}function nn(t,n,e,r,i,o,a){var u,c,f,s=new Map,l=n.length,h=o.length,d=new Array(l);for(u=0;u<l;++u)(c=n[u])&&(d[u]=f=a.call(c,c.__data__,u,n)+"",s.has(f)?i[u]=c:s.set(f,c));for(u=0;u<h;++u)f=a.call(t,o[u],u,o)+"",(c=s.get(f))?(r[u]=c,c.__data__=o[u],s.delete(f)):e[u]=new Qt(t,o[u]);for(u=0;u<l;++u)(c=n[u])&&s.get(d[u])===c&&(i[u]=c)}function en(t){return t.__data__}function rn(t){return"object"==typeof t&&"length"in t?t:Array.from(t)}function on(t,n){return t<n?-1:t>n?1:t>=n?0:NaN}function an(t){return function(){this.removeAttribute(t)}}function un(t){return function(){this.removeAttributeNS(t.space,t.local)}}function cn(t,n){return function(){this.setAttribute(t,n)}}function fn(t,n){return function(){this.setAttributeNS(t.space,t.local,n)}}function sn(t,n){return function(){var e=n.apply(this,arguments);null==e?this.removeAttribute(t):this.setAttribute(t,e)}}function ln(t,n){return function(){var e=n.apply(this,arguments);null==e?this.removeAttributeNS(t.space,t.local):this.setAttributeNS(t.space,t.local,e)}}function hn(t){return t.ownerDocument&&t.ownerDocument.defaultView||t.document&&t||t.defaultView}function dn(t){return function(){this.style.removeProperty(t)}}function pn(t,n,e){return function(){this.style.setProperty(t,n,e)}}function gn(t,n,e){return function(){var r=n.apply(this,arguments);null==r?this.style.removeProperty(t):this.style.setProperty(t,r,e)}}function yn(t,n){return t.style.getPropertyValue(n)||hn(t).getComputedStyle(t,null).getPropertyValue(n)}function vn(t){return function(){delete this[t]}}function _n(t,n){return function(){this[t]=n}}function bn(t,n){return function(){var e=n.apply(this,arguments);null==e?delete this[t]:this[t]=e}}function mn(t){return t.trim().split(/^|\s+/)}function xn(t){return t.classList||new wn(t)}function wn(t){this._node=t,this._names=mn(t.getAttribute("class")||"")}function Mn(t,n){for(var e=xn(t),r=-1,i=n.length;++r<i;)e.add(n[r])}function An(t,n){for(var e=xn(t),r=-1,i=n.length;++r<i;)e.remove(n[r])}function Tn(t){return function(){Mn(this,t)}}function Sn(t){return function(){An(this,t)}}function En(t,n){return function(){(n.apply(this,arguments)?Mn:An)(this,t)}}function kn(){this.textContent=""}function Nn(t){return function(){this.textContent=t}}function Cn(t){return function(){var n=t.apply(this,arguments);this.textContent=null==n?"":n}}function Pn(){this.innerHTML=""}function zn(t){return function(){this.innerHTML=t}}function Dn(t){return function(){var n=t.apply(this,arguments);this.innerHTML=null==n?"":n}}function Rn(){this.nextSibling&&this.parentNode.appendChild(this)}function Fn(){this.previousSibling&&this.parentNode.insertBefore(this,this.parentNode.firstChild)}function qn(){return null}function In(){var t=this.parentNode;t&&t.removeChild(this)}function On(){var t=this.cloneNode(!1),n=this.parentNode;return n?n.insertBefore(t,this.nextSibling):t}function Un(){var t=this.cloneNode(!0),n=this.parentNode;return n?n.insertBefore(t,this.nextSibling):t}function Bn(t){return t.trim().split(/^|\s+/).map((function(t){var n="",e=t.indexOf(".");return e>=0&&(n=t.slice(e+1),t=t.slice(0,e)),{type:t,name:n}}))}function Yn(t){return function(){var n=this.__on;if(n){for(var e,r=0,i=-1,o=n.length;r<o;++r)e=n[r],t.type&&e.type!==t.type||e.name!==t.name?n[++i]=e:this.removeEventListener(e.type,e.listener,e.options);++i?n.length=i:delete this.__on}}}function Ln(t,n,e){return function(){var r,i=this.__on,o=function(t){return function(n){t.call(this,n,this.__data__)}}(n);if(i)for(var a=0,u=i.length;a<u;++a)if((r=i[a]).type===t.type&&r.name===t.name)return this.removeEventListener(r.type,r.listener,r.options),this.addEventListener(r.type,r.listener=o,r.options=e),void(r.value=n);this.addEventListener(t.type,o,e),r={type:t.type,name:t.name,value:n,listener:o,options:e},i?i.push(r):this.__on=[r]}}function jn(t,n,e){var r=hn(t),i=r.CustomEvent;"function"==typeof i?i=new i(n,e):(i=r.document.createEvent("Event"),e?(i.initEvent(n,e.bubbles,e.cancelable),i.detail=e.detail):i.initEvent(n,!1,!1)),t.dispatchEvent(i)}function $n(t,n){return function(){return jn(this,t,n)}}function Hn(t,n){return function(){return jn(this,t,n.apply(this,arguments))}}Qt.prototype={constructor:Qt,appendChild:function(t){return this._parent.insertBefore(t,this._next)},insertBefore:function(t,n){return this._parent.insertBefore(t,n)},querySelector:function(t){return this._parent.querySelector(t)},querySelectorAll:function(t){return this._parent.querySelectorAll(t)}},wn.prototype={add:function(t){this._names.indexOf(t)<0&&(this._names.push(t),this._node.setAttribute("class",this._names.join(" ")))},remove:function(t){var n=this._names.indexOf(t);n>=0&&(this._names.splice(n,1),this._node.setAttribute("class",this._names.join(" ")))},contains:function(t){return this._names.indexOf(t)>=0}};var Xn=[null];function Gn(t,n){this._groups=t,this._parents=n}function Vn(){return new Gn([[document.documentElement]],Xn)}function Wn(t){return"string"==typeof t?new Gn([[document.querySelector(t)]],[document.documentElement]):new Gn([[t]],Xn)}Gn.prototype=Vn.prototype={constructor:Gn,select:function(t){"function"!=typeof t&&(t=Yt(t));for(var n=this._groups,e=n.length,r=new Array(e),i=0;i<e;++i)for(var o,a,u=n[i],c=u.length,f=r[i]=new Array(c),s=0;s<c;++s)(o=u[s])&&(a=t.call(o,o.__data__,s,u))&&("__data__"in o&&(a.__data__=o.__data__),f[s]=a);return new Gn(r,this._parents)},selectAll:function(t){t="function"==typeof t?function(t){return function(){return Lt(t.apply(this,arguments))}}(t):$t(t);for(var n=this._groups,e=n.length,r=[],i=[],o=0;o<e;++o)for(var a,u=n[o],c=u.length,f=0;f<c;++f)(a=u[f])&&(r.push(t.call(a,a.__data__,f,u)),i.push(a));return new Gn(r,i)},selectChild:function(t){return this.select(null==t?Vt:function(t){return function(){return Gt.call(this.children,t)}}("function"==typeof t?t:Xt(t)))},selectChildren:function(t){return this.selectAll(null==t?Zt:function(t){return function(){return Wt.call(this.children,t)}}("function"==typeof t?t:Xt(t)))},filter:function(t){"function"!=typeof t&&(t=Ht(t));for(var n=this._groups,e=n.length,r=new Array(e),i=0;i<e;++i)for(var o,a=n[i],u=a.length,c=r[i]=[],f=0;f<u;++f)(o=a[f])&&t.call(o,o.__data__,f,a)&&c.push(o);return new Gn(r,this._parents)},data:function(t,n){if(!arguments.length)return Array.from(this,en);var e=n?nn:tn,r=this._parents,i=this._groups;"function"!=typeof t&&(t=Jt(t));for(var o=i.length,a=new Array(o),u=new Array(o),c=new Array(o),f=0;f<o;++f){var s=r[f],l=i[f],h=l.length,d=rn(t.call(s,s&&s.__data__,f,r)),p=d.length,g=u[f]=new Array(p),y=a[f]=new Array(p),v=c[f]=new Array(h);e(s,l,g,y,v,d,n);for(var _,b,m=0,x=0;m<p;++m)if(_=g[m]){for(m>=x&&(x=m+1);!(b=y[x])&&++x<p;);_._next=b||null}}return(a=new Gn(a,r))._enter=u,a._exit=c,a},enter:function(){return new Gn(this._enter||this._groups.map(Kt),this._parents)},exit:function(){return new Gn(this._exit||this._groups.map(Kt),this._parents)},join:function(t,n,e){var r=this.enter(),i=this,o=this.exit();return"function"==typeof t?(r=t(r))&&(r=r.selection()):r=r.append(t+""),null!=n&&(i=n(i))&&(i=i.selection()),null==e?o.remove():e(o),r&&i?r.merge(i).order():i},merge:function(t){for(var n=t.selection?t.selection():t,e=this._groups,r=n._groups,i=e.length,o=r.length,a=Math.min(i,o),u=new Array(i),c=0;c<a;++c)for(var f,s=e[c],l=r[c],h=s.length,d=u[c]=new Array(h),p=0;p<h;++p)(f=s[p]||l[p])&&(d[p]=f);for(;c<i;++c)u[c]=e[c];return new Gn(u,this._parents)},selection:function(){return this},order:function(){for(var t=this._groups,n=-1,e=t.length;++n<e;)for(var r,i=t[n],o=i.length-1,a=i[o];--o>=0;)(r=i[o])&&(a&&4^r.compareDocumentPosition(a)&&a.parentNode.insertBefore(r,a),a=r);return this},sort:function(t){function n(n,e){return n&&e?t(n.__data__,e.__data__):!n-!e}t||(t=on);for(var e=this._groups,r=e.length,i=new Array(r),o=0;o<r;++o){for(var a,u=e[o],c=u.length,f=i[o]=new Array(c),s=0;s<c;++s)(a=u[s])&&(f[s]=a);f.sort(n)}return new Gn(i,this._parents).order()},call:function(){var t=arguments[0];return arguments[0]=this,t.apply(null,arguments),this},nodes:function(){return Array.from(this)},node:function(){for(var t=this._groups,n=0,e=t.length;n<e;++n)for(var r=t[n],i=0,o=r.length;i<o;++i){var a=r[i];if(a)return a}return null},size:function(){let t=0;for(const n of this)++t;return t},empty:function(){return!this.node()},each:function(t){for(var n=this._groups,e=0,r=n.length;e<r;++e)for(var i,o=n[e],a=0,u=o.length;a<u;++a)(i=o[a])&&t.call(i,i.__data__,a,o);return this},attr:function(t,n){var e=qt(t);if(arguments.length<2){var r=this.node();return e.local?r.getAttributeNS(e.space,e.local):r.getAttribute(e)}return this.each((null==n?e.local?un:an:"function"==typeof n?e.local?ln:sn:e.local?fn:cn)(e,n))},style:function(t,n,e){return arguments.length>1?this.each((null==n?dn:"function"==typeof n?gn:pn)(t,n,null==e?"":e)):yn(this.node(),t)},property:function(t,n){return arguments.length>1?this.each((null==n?vn:"function"==typeof n?bn:_n)(t,n)):this.node()[t]},classed:function(t,n){var e=mn(t+"");if(arguments.length<2){for(var r=xn(this.node()),i=-1,o=e.length;++i<o;)if(!r.contains(e[i]))return!1;return!0}return this.each(("function"==typeof n?En:n?Tn:Sn)(e,n))},text:function(t){return arguments.length?this.each(null==t?kn:("function"==typeof t?Cn:Nn)(t)):this.node().textContent},html:function(t){return arguments.length?this.each(null==t?Pn:("function"==typeof t?Dn:zn)(t)):this.node().innerHTML},raise:function(){return this.each(Rn)},lower:function(){return this.each(Fn)},append:function(t){var n="function"==typeof t?t:Ut(t);return this.select((function(){return this.appendChild(n.apply(this,arguments))}))},insert:function(t,n){var e="function"==typeof t?t:Ut(t),r=null==n?qn:"function"==typeof n?n:Yt(n);return this.select((function(){return this.insertBefore(e.apply(this,arguments),r.apply(this,arguments)||null)}))},remove:function(){return this.each(In)},clone:function(t){return this.select(t?Un:On)},datum:function(t){return arguments.length?this.property("__data__",t):this.node().__data__},on:function(t,n,e){var r,i,o=Bn(t+""),a=o.length;if(!(arguments.length<2)){for(u=n?Ln:Yn,r=0;r<a;++r)this.each(u(o[r],n,e));return this}var u=this.node().__on;if(u)for(var c,f=0,s=u.length;f<s;++f)for(r=0,c=u[f];r<a;++r)if((i=o[r]).type===c.type&&i.name===c.name)return c.value},dispatch:function(t,n){return this.each(("function"==typeof n?Hn:$n)(t,n))},[Symbol.iterator]:function*(){for(var t=this._groups,n=0,e=t.length;n<e;++n)for(var r,i=t[n],o=0,a=i.length;o<a;++o)(r=i[o])&&(yield r)}};var Zn=0;function Kn(){return new Qn}function Qn(){this._="@"+(++Zn).toString(36)}function Jn(t){let n;for(;n=t.sourceEvent;)t=n;return t}function te(t,n){if(t=Jn(t),void 0===n&&(n=t.currentTarget),n){var e=n.ownerSVGElement||n;if(e.createSVGPoint){var r=e.createSVGPoint();return r.x=t.clientX,r.y=t.clientY,[(r=r.matrixTransform(n.getScreenCTM().inverse())).x,r.y]}if(n.getBoundingClientRect){var i=n.getBoundingClientRect();return[t.clientX-i.left-n.clientLeft,t.clientY-i.top-n.clientTop]}}return[t.pageX,t.pageY]}Qn.prototype=Kn.prototype={constructor:Qn,get:function(t){for(var n=this._;!(n in t);)if(!(t=t.parentNode))return;return t[n]},set:function(t,n){return t[this._]=n},remove:function(t){return this._ in t&&delete t[this._]},toString:function(){return this._}};const ne={passive:!1},ee={capture:!0,passive:!1};function re(t){t.stopImmediatePropagation()}function ie(t){t.preventDefault(),t.stopImmediatePropagation()}function oe(t){var n=t.document.documentElement,e=Wn(t).on("dragstart.drag",ie,ee);"onselectstart"in n?e.on("selectstart.drag",ie,ee):(n.__noselect=n.style.MozUserSelect,n.style.MozUserSelect="none")}function ae(t,n){var e=t.document.documentElement,r=Wn(t).on("dragstart.drag",null);n&&(r.on("click.drag",ie,ee),setTimeout((function(){r.on("click.drag",null)}),0)),"onselectstart"in e?r.on("selectstart.drag",null):(e.style.MozUserSelect=e.__noselect,delete e.__noselect)}var ue=t=>()=>t;function ce(t,{sourceEvent:n,subject:e,target:r,identifier:i,active:o,x:a,y:u,dx:c,dy:f,dispatch:s}){Object.defineProperties(this,{type:{value:t,enumerable:!0,configurable:!0},sourceEvent:{value:n,enumerable:!0,configurable:!0},subject:{value:e,enumerable:!0,configurable:!0},target:{value:r,enumerable:!0,configurable:!0},identifier:{value:i,enumerable:!0,configurable:!0},active:{value:o,enumerable:!0,configurable:!0},x:{value:a,enumerable:!0,configurable:!0},y:{value:u,enumerable:!0,configurable:!0},dx:{value:c,enumerable:!0,configurable:!0},dy:{value:f,enumerable:!0,configurable:!0},_:{value:s}})}function fe(t){return!t.ctrlKey&&!t.button}function se(){return this.parentNode}function le(t,n){return null==n?{x:t.x,y:t.y}:n}function he(){return navigator.maxTouchPoints||"ontouchstart"in this}function de(t,n,e){t.prototype=n.prototype=e,e.constructor=t}function pe(t,n){var e=Object.create(t.prototype);for(var r in n)e[r]=n[r];return e}function ge(){}ce.prototype.on=function(){var t=this._.on.apply(this._,arguments);return t===this._?this:t};var ye=.7,ve=1/ye,_e="\\s*([+-]?\\d+)\\s*",be="\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)\\s*",me="\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)%\\s*",xe=/^#([0-9a-f]{3,8})$/,we=new RegExp(`^rgb\\(${_e},${_e},${_e}\\)$`),Me=new RegExp(`^rgb\\(${me},${me},${me}\\)$`),Ae=new RegExp(`^rgba\\(${_e},${_e},${_e},${be}\\)$`),Te=new RegExp(`^rgba\\(${me},${me},${me},${be}\\)$`),Se=new RegExp(`^hsl\\(${be},${me},${me}\\)$`),Ee=new RegExp(`^hsla\\(${be},${me},${me},${be}\\)$`),ke={aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074};function Ne(){return this.rgb().formatHex()}function Ce(){return this.rgb().formatRgb()}function Pe(t){var n,e;return t=(t+"").trim().toLowerCase(),(n=xe.exec(t))?(e=n[1].length,n=parseInt(n[1],16),6===e?ze(n):3===e?new qe(n>>8&15|n>>4&240,n>>4&15|240&n,(15&n)<<4|15&n,1):8===e?De(n>>24&255,n>>16&255,n>>8&255,(255&n)/255):4===e?De(n>>12&15|n>>8&240,n>>8&15|n>>4&240,n>>4&15|240&n,((15&n)<<4|15&n)/255):null):(n=we.exec(t))?new qe(n[1],n[2],n[3],1):(n=Me.exec(t))?new qe(255*n[1]/100,255*n[2]/100,255*n[3]/100,1):(n=Ae.exec(t))?De(n[1],n[2],n[3],n[4]):(n=Te.exec(t))?De(255*n[1]/100,255*n[2]/100,255*n[3]/100,n[4]):(n=Se.exec(t))?Le(n[1],n[2]/100,n[3]/100,1):(n=Ee.exec(t))?Le(n[1],n[2]/100,n[3]/100,n[4]):ke.hasOwnProperty(t)?ze(ke[t]):"transparent"===t?new qe(NaN,NaN,NaN,0):null}function ze(t){return new qe(t>>16&255,t>>8&255,255&t,1)}function De(t,n,e,r){return r<=0&&(t=n=e=NaN),new qe(t,n,e,r)}function Re(t){return t instanceof ge||(t=Pe(t)),t?new qe((t=t.rgb()).r,t.g,t.b,t.opacity):new qe}function Fe(t,n,e,r){return 1===arguments.length?Re(t):new qe(t,n,e,null==r?1:r)}function qe(t,n,e,r){this.r=+t,this.g=+n,this.b=+e,this.opacity=+r}function Ie(){return`#${Ye(this.r)}${Ye(this.g)}${Ye(this.b)}`}function Oe(){const t=Ue(this.opacity);return`${1===t?"rgb(":"rgba("}${Be(this.r)}, ${Be(this.g)}, ${Be(this.b)}${1===t?")":`, ${t})`}`}function Ue(t){return isNaN(t)?1:Math.max(0,Math.min(1,t))}function Be(t){return Math.max(0,Math.min(255,Math.round(t)||0))}function Ye(t){return((t=Be(t))<16?"0":"")+t.toString(16)}function Le(t,n,e,r){return r<=0?t=n=e=NaN:e<=0||e>=1?t=n=NaN:n<=0&&(t=NaN),new He(t,n,e,r)}function je(t){if(t instanceof He)return new He(t.h,t.s,t.l,t.opacity);if(t instanceof ge||(t=Pe(t)),!t)return new He;if(t instanceof He)return t;var n=(t=t.rgb()).r/255,e=t.g/255,r=t.b/255,i=Math.min(n,e,r),o=Math.max(n,e,r),a=NaN,u=o-i,c=(o+i)/2;return u?(a=n===o?(e-r)/u+6*(e<r):e===o?(r-n)/u+2:(n-e)/u+4,u/=c<.5?o+i:2-o-i,a*=60):u=c>0&&c<1?0:a,new He(a,u,c,t.opacity)}function $e(t,n,e,r){return 1===arguments.length?je(t):new He(t,n,e,null==r?1:r)}function He(t,n,e,r){this.h=+t,this.s=+n,this.l=+e,this.opacity=+r}function Xe(t){return(t=(t||0)%360)<0?t+360:t}function Ge(t){return Math.max(0,Math.min(1,t||0))}function Ve(t,n,e){return 255*(t<60?n+(e-n)*t/60:t<180?e:t<240?n+(e-n)*(240-t)/60:n)}de(ge,Pe,{copy(t){return Object.assign(new this.constructor,this,t)},displayable(){return this.rgb().displayable()},hex:Ne,formatHex:Ne,formatHex8:function(){return this.rgb().formatHex8()},formatHsl:function(){return je(this).formatHsl()},formatRgb:Ce,toString:Ce}),de(qe,Fe,pe(ge,{brighter(t){return t=null==t?ve:Math.pow(ve,t),new qe(this.r*t,this.g*t,this.b*t,this.opacity)},darker(t){return t=null==t?ye:Math.pow(ye,t),new qe(this.r*t,this.g*t,this.b*t,this.opacity)},rgb(){return this},clamp(){return new qe(Be(this.r),Be(this.g),Be(this.b),Ue(this.opacity))},displayable(){return-.5<=this.r&&this.r<255.5&&-.5<=this.g&&this.g<255.5&&-.5<=this.b&&this.b<255.5&&0<=this.opacity&&this.opacity<=1},hex:Ie,formatHex:Ie,formatHex8:function(){return`#${Ye(this.r)}${Ye(this.g)}${Ye(this.b)}${Ye(255*(isNaN(this.opacity)?1:this.opacity))}`},formatRgb:Oe,toString:Oe})),de(He,$e,pe(ge,{brighter(t){return t=null==t?ve:Math.pow(ve,t),new He(this.h,this.s,this.l*t,this.opacity)},darker(t){return t=null==t?ye:Math.pow(ye,t),new He(this.h,this.s,this.l*t,this.opacity)},rgb(){var t=this.h%360+360*(this.h<0),n=isNaN(t)||isNaN(this.s)?0:this.s,e=this.l,r=e+(e<.5?e:1-e)*n,i=2*e-r;return new qe(Ve(t>=240?t-240:t+120,i,r),Ve(t,i,r),Ve(t<120?t+240:t-120,i,r),this.opacity)},clamp(){return new He(Xe(this.h),Ge(this.s),Ge(this.l),Ue(this.opacity))},displayable(){return(0<=this.s&&this.s<=1||isNaN(this.s))&&0<=this.l&&this.l<=1&&0<=this.opacity&&this.opacity<=1},formatHsl(){const t=Ue(this.opacity);return`${1===t?"hsl(":"hsla("}${Xe(this.h)}, ${100*Ge(this.s)}%, ${100*Ge(this.l)}%${1===t?")":`, ${t})`}`}}));const We=Math.PI/180,Ze=180/Math.PI,Ke=.96422,Qe=.82521,Je=4/29,tr=6/29,nr=3*tr*tr;function er(t){if(t instanceof ir)return new ir(t.l,t.a,t.b,t.opacity);if(t instanceof lr)return hr(t);t instanceof qe||(t=Re(t));var n,e,r=cr(t.r),i=cr(t.g),o=cr(t.b),a=or((.2225045*r+.7168786*i+.0606169*o)/1);return r===i&&i===o?n=e=a:(n=or((.4360747*r+.3850649*i+.1430804*o)/Ke),e=or((.0139322*r+.0971045*i+.7141733*o)/Qe)),new ir(116*a-16,500*(n-a),200*(a-e),t.opacity)}function rr(t,n,e,r){return 1===arguments.length?er(t):new ir(t,n,e,null==r?1:r)}function ir(t,n,e,r){this.l=+t,this.a=+n,this.b=+e,this.opacity=+r}function or(t){return t>.008856451679035631?Math.pow(t,1/3):t/nr+Je}function ar(t){return t>tr?t*t*t:nr*(t-Je)}function ur(t){return 255*(t<=.0031308?12.92*t:1.055*Math.pow(t,1/2.4)-.055)}function cr(t){return(t/=255)<=.04045?t/12.92:Math.pow((t+.055)/1.055,2.4)}function fr(t){if(t instanceof lr)return new lr(t.h,t.c,t.l,t.opacity);if(t instanceof ir||(t=er(t)),0===t.a&&0===t.b)return new lr(NaN,0<t.l&&t.l<100?0:NaN,t.l,t.opacity);var n=Math.atan2(t.b,t.a)*Ze;return new lr(n<0?n+360:n,Math.sqrt(t.a*t.a+t.b*t.b),t.l,t.opacity)}function sr(t,n,e,r){return 1===arguments.length?fr(t):new lr(t,n,e,null==r?1:r)}function lr(t,n,e,r){this.h=+t,this.c=+n,this.l=+e,this.opacity=+r}function hr(t){if(isNaN(t.h))return new ir(t.l,0,0,t.opacity);var n=t.h*We;return new ir(t.l,Math.cos(n)*t.c,Math.sin(n)*t.c,t.opacity)}de(ir,rr,pe(ge,{brighter(t){return new ir(this.l+18*(null==t?1:t),this.a,this.b,this.opacity)},darker(t){return new ir(this.l-18*(null==t?1:t),this.a,this.b,this.opacity)},rgb(){var t=(this.l+16)/116,n=isNaN(this.a)?t:t+this.a/500,e=isNaN(this.b)?t:t-this.b/200;return new qe(ur(3.1338561*(n=Ke*ar(n))-1.6168667*(t=1*ar(t))-.4906146*(e=Qe*ar(e))),ur(-.9787684*n+1.9161415*t+.033454*e),ur(.0719453*n-.2289914*t+1.4052427*e),this.opacity)}})),de(lr,sr,pe(ge,{brighter(t){return new lr(this.h,this.c,this.l+18*(null==t?1:t),this.opacity)},darker(t){return new lr(this.h,this.c,this.l-18*(null==t?1:t),this.opacity)},rgb(){return hr(this).rgb()}}));var dr=-.14861,pr=1.78277,gr=-.29227,yr=-.90649,vr=1.97294,_r=vr*yr,br=vr*pr,mr=pr*gr-yr*dr;function xr(t){if(t instanceof Mr)return new Mr(t.h,t.s,t.l,t.opacity);t instanceof qe||(t=Re(t));var n=t.r/255,e=t.g/255,r=t.b/255,i=(mr*r+_r*n-br*e)/(mr+_r-br),o=r-i,a=(vr*(e-i)-gr*o)/yr,u=Math.sqrt(a*a+o*o)/(vr*i*(1-i)),c=u?Math.atan2(a,o)*Ze-120:NaN;return new Mr(c<0?c+360:c,u,i,t.opacity)}function wr(t,n,e,r){return 1===arguments.length?xr(t):new Mr(t,n,e,null==r?1:r)}function Mr(t,n,e,r){this.h=+t,this.s=+n,this.l=+e,this.opacity=+r}function Ar(t,n,e,r,i){var o=t*t,a=o*t;return((1-3*t+3*o-a)*n+(4-6*o+3*a)*e+(1+3*t+3*o-3*a)*r+a*i)/6}function Tr(t){var n=t.length-1;return function(e){var r=e<=0?e=0:e>=1?(e=1,n-1):Math.floor(e*n),i=t[r],o=t[r+1],a=r>0?t[r-1]:2*i-o,u=r<n-1?t[r+2]:2*o-i;return Ar((e-r/n)*n,a,i,o,u)}}function Sr(t){var n=t.length;return function(e){var r=Math.floor(((e%=1)<0?++e:e)*n),i=t[(r+n-1)%n],o=t[r%n],a=t[(r+1)%n],u=t[(r+2)%n];return Ar((e-r/n)*n,i,o,a,u)}}de(Mr,wr,pe(ge,{brighter(t){return t=null==t?ve:Math.pow(ve,t),new Mr(this.h,this.s,this.l*t,this.opacity)},darker(t){return t=null==t?ye:Math.pow(ye,t),new Mr(this.h,this.s,this.l*t,this.opacity)},rgb(){var t=isNaN(this.h)?0:(this.h+120)*We,n=+this.l,e=isNaN(this.s)?0:this.s*n*(1-n),r=Math.cos(t),i=Math.sin(t);return new qe(255*(n+e*(dr*r+pr*i)),255*(n+e*(gr*r+yr*i)),255*(n+e*(vr*r)),this.opacity)}}));var Er=t=>()=>t;function kr(t,n){return function(e){return t+e*n}}function Nr(t,n){var e=n-t;return e?kr(t,e>180||e<-180?e-360*Math.round(e/360):e):Er(isNaN(t)?n:t)}function Cr(t){return 1==(t=+t)?Pr:function(n,e){return e-n?function(t,n,e){return t=Math.pow(t,e),n=Math.pow(n,e)-t,e=1/e,function(r){return Math.pow(t+r*n,e)}}(n,e,t):Er(isNaN(n)?e:n)}}function Pr(t,n){var e=n-t;return e?kr(t,e):Er(isNaN(t)?n:t)}var zr=function t(n){var e=Cr(n);function r(t,n){var r=e((t=Fe(t)).r,(n=Fe(n)).r),i=e(t.g,n.g),o=e(t.b,n.b),a=Pr(t.opacity,n.opacity);return function(n){return t.r=r(n),t.g=i(n),t.b=o(n),t.opacity=a(n),t+""}}return r.gamma=t,r}(1);function Dr(t){return function(n){var e,r,i=n.length,o=new Array(i),a=new Array(i),u=new Array(i);for(e=0;e<i;++e)r=Fe(n[e]),o[e]=r.r||0,a[e]=r.g||0,u[e]=r.b||0;return o=t(o),a=t(a),u=t(u),r.opacity=1,function(t){return r.r=o(t),r.g=a(t),r.b=u(t),r+""}}}var Rr=Dr(Tr),Fr=Dr(Sr);function qr(t,n){n||(n=[]);var e,r=t?Math.min(n.length,t.length):0,i=n.slice();return function(o){for(e=0;e<r;++e)i[e]=t[e]*(1-o)+n[e]*o;return i}}function Ir(t){return ArrayBuffer.isView(t)&&!(t instanceof DataView)}function Or(t,n){var e,r=n?n.length:0,i=t?Math.min(r,t.length):0,o=new Array(i),a=new Array(r);for(e=0;e<i;++e)o[e]=Hr(t[e],n[e]);for(;e<r;++e)a[e]=n[e];return function(t){for(e=0;e<i;++e)a[e]=o[e](t);return a}}function Ur(t,n){var e=new Date;return t=+t,n=+n,function(r){return e.setTime(t*(1-r)+n*r),e}}function Br(t,n){return t=+t,n=+n,function(e){return t*(1-e)+n*e}}function Yr(t,n){var e,r={},i={};for(e in null!==t&&"object"==typeof t||(t={}),null!==n&&"object"==typeof n||(n={}),n)e in t?r[e]=Hr(t[e],n[e]):i[e]=n[e];return function(t){for(e in r)i[e]=r[e](t);return i}}var Lr=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,jr=new RegExp(Lr.source,"g");function $r(t,n){var e,r,i,o=Lr.lastIndex=jr.lastIndex=0,a=-1,u=[],c=[];for(t+="",n+="";(e=Lr.exec(t))&&(r=jr.exec(n));)(i=r.index)>o&&(i=n.slice(o,i),u[a]?u[a]+=i:u[++a]=i),(e=e[0])===(r=r[0])?u[a]?u[a]+=r:u[++a]=r:(u[++a]=null,c.push({i:a,x:Br(e,r)})),o=jr.lastIndex;return o<n.length&&(i=n.slice(o),u[a]?u[a]+=i:u[++a]=i),u.length<2?c[0]?function(t){return function(n){return t(n)+""}}(c[0].x):function(t){return function(){return t}}(n):(n=c.length,function(t){for(var e,r=0;r<n;++r)u[(e=c[r]).i]=e.x(t);return u.join("")})}function Hr(t,n){var e,r=typeof n;return null==n||"boolean"===r?Er(n):("number"===r?Br:"string"===r?(e=Pe(n))?(n=e,zr):$r:n instanceof Pe?zr:n instanceof Date?Ur:Ir(n)?qr:Array.isArray(n)?Or:"function"!=typeof n.valueOf&&"function"!=typeof n.toString||isNaN(n)?Yr:Br)(t,n)}function Xr(t,n){return t=+t,n=+n,function(e){return Math.round(t*(1-e)+n*e)}}var Gr,Vr=180/Math.PI,Wr={translateX:0,translateY:0,rotate:0,skewX:0,scaleX:1,scaleY:1};function Zr(t,n,e,r,i,o){var a,u,c;return(a=Math.sqrt(t*t+n*n))&&(t/=a,n/=a),(c=t*e+n*r)&&(e-=t*c,r-=n*c),(u=Math.sqrt(e*e+r*r))&&(e/=u,r/=u,c/=u),t*r<n*e&&(t=-t,n=-n,c=-c,a=-a),{translateX:i,translateY:o,rotate:Math.atan2(n,t)*Vr,skewX:Math.atan(c)*Vr,scaleX:a,scaleY:u}}function Kr(t,n,e,r){function i(t){return t.length?t.pop()+" ":""}return function(o,a){var u=[],c=[];return o=t(o),a=t(a),function(t,r,i,o,a,u){if(t!==i||r!==o){var c=a.push("translate(",null,n,null,e);u.push({i:c-4,x:Br(t,i)},{i:c-2,x:Br(r,o)})}else(i||o)&&a.push("translate("+i+n+o+e)}(o.translateX,o.translateY,a.translateX,a.translateY,u,c),function(t,n,e,o){t!==n?(t-n>180?n+=360:n-t>180&&(t+=360),o.push({i:e.push(i(e)+"rotate(",null,r)-2,x:Br(t,n)})):n&&e.push(i(e)+"rotate("+n+r)}(o.rotate,a.rotate,u,c),function(t,n,e,o){t!==n?o.push({i:e.push(i(e)+"skewX(",null,r)-2,x:Br(t,n)}):n&&e.push(i(e)+"skewX("+n+r)}(o.skewX,a.skewX,u,c),function(t,n,e,r,o,a){if(t!==e||n!==r){var u=o.push(i(o)+"scale(",null,",",null,")");a.push({i:u-4,x:Br(t,e)},{i:u-2,x:Br(n,r)})}else 1===e&&1===r||o.push(i(o)+"scale("+e+","+r+")")}(o.scaleX,o.scaleY,a.scaleX,a.scaleY,u,c),o=a=null,function(t){for(var n,e=-1,r=c.length;++e<r;)u[(n=c[e]).i]=n.x(t);return u.join("")}}}var Qr=Kr((function(t){const n=new("function"==typeof DOMMatrix?DOMMatrix:WebKitCSSMatrix)(t+"");return n.isIdentity?Wr:Zr(n.a,n.b,n.c,n.d,n.e,n.f)}),"px, ","px)","deg)"),Jr=Kr((function(t){return null==t?Wr:(Gr||(Gr=document.createElementNS("http://www.w3.org/2000/svg","g")),Gr.setAttribute("transform",t),(t=Gr.transform.baseVal.consolidate())?Zr((t=t.matrix).a,t.b,t.c,t.d,t.e,t.f):Wr)}),", ",")",")");function ti(t){return((t=Math.exp(t))+1/t)/2}var ni=function t(n,e,r){function i(t,i){var o,a,u=t[0],c=t[1],f=t[2],s=i[0],l=i[1],h=i[2],d=s-u,p=l-c,g=d*d+p*p;if(g<1e-12)a=Math.log(h/f)/n,o=function(t){return[u+t*d,c+t*p,f*Math.exp(n*t*a)]};else{var y=Math.sqrt(g),v=(h*h-f*f+r*g)/(2*f*e*y),_=(h*h-f*f-r*g)/(2*h*e*y),b=Math.log(Math.sqrt(v*v+1)-v),m=Math.log(Math.sqrt(_*_+1)-_);a=(m-b)/n,o=function(t){var r=t*a,i=ti(b),o=f/(e*y)*(i*function(t){return((t=Math.exp(2*t))-1)/(t+1)}(n*r+b)-function(t){return((t=Math.exp(t))-1/t)/2}(b));return[u+o*d,c+o*p,f*i/ti(n*r+b)]}}return o.duration=1e3*a*n/Math.SQRT2,o}return i.rho=function(n){var e=Math.max(.001,+n),r=e*e;return t(e,r,r*r)},i}(Math.SQRT2,2,4);function ei(t){return function(n,e){var r=t((n=$e(n)).h,(e=$e(e)).h),i=Pr(n.s,e.s),o=Pr(n.l,e.l),a=Pr(n.opacity,e.opacity);return function(t){return n.h=r(t),n.s=i(t),n.l=o(t),n.opacity=a(t),n+""}}}var ri=ei(Nr),ii=ei(Pr);function oi(t){return function(n,e){var r=t((n=sr(n)).h,(e=sr(e)).h),i=Pr(n.c,e.c),o=Pr(n.l,e.l),a=Pr(n.opacity,e.opacity);return function(t){return n.h=r(t),n.c=i(t),n.l=o(t),n.opacity=a(t),n+""}}}var ai=oi(Nr),ui=oi(Pr);function ci(t){return function n(e){function r(n,r){var i=t((n=wr(n)).h,(r=wr(r)).h),o=Pr(n.s,r.s),a=Pr(n.l,r.l),u=Pr(n.opacity,r.opacity);return function(t){return n.h=i(t),n.s=o(t),n.l=a(Math.pow(t,e)),n.opacity=u(t),n+""}}return e=+e,r.gamma=n,r}(1)}var fi=ci(Nr),si=ci(Pr);function li(t,n){void 0===n&&(n=t,t=Hr);for(var e=0,r=n.length-1,i=n[0],o=new Array(r<0?0:r);e<r;)o[e]=t(i,i=n[++e]);return function(t){var n=Math.max(0,Math.min(r-1,Math.floor(t*=r)));return o[n](t-n)}}var hi,di,pi=0,gi=0,yi=0,vi=0,_i=0,bi=0,mi="object"==typeof performance&&performance.now?performance:Date,xi="object"==typeof window&&window.requestAnimationFrame?window.requestAnimationFrame.bind(window):function(t){setTimeout(t,17)};function wi(){return _i||(xi(Mi),_i=mi.now()+bi)}function Mi(){_i=0}function Ai(){this._call=this._time=this._next=null}function Ti(t,n,e){var r=new Ai;return r.restart(t,n,e),r}function Si(){wi(),++pi;for(var t,n=hi;n;)(t=_i-n._time)>=0&&n._call.call(void 0,t),n=n._next;--pi}function Ei(){_i=(vi=mi.now())+bi,pi=gi=0;try{Si()}finally{pi=0,function(){var t,n,e=hi,r=1/0;for(;e;)e._call?(r>e._time&&(r=e._time),t=e,e=e._next):(n=e._next,e._next=null,e=t?t._next=n:hi=n);di=t,Ni(r)}(),_i=0}}function ki(){var t=mi.now(),n=t-vi;n>1e3&&(bi-=n,vi=t)}function Ni(t){pi||(gi&&(gi=clearTimeout(gi)),t-_i>24?(t<1/0&&(gi=setTimeout(Ei,t-mi.now()-bi)),yi&&(yi=clearInterval(yi))):(yi||(vi=mi.now(),yi=setInterval(ki,1e3)),pi=1,xi(Ei)))}function Ci(t,n,e){var r=new Ai;return n=null==n?0:+n,r.restart((e=>{r.stop(),t(e+n)}),n,e),r}Ai.prototype=Ti.prototype={constructor:Ai,restart:function(t,n,e){if("function"!=typeof t)throw new TypeError("callback is not a function");e=(null==e?wi():+e)+(null==n?0:+n),this._next||di===this||(di?di._next=this:hi=this,di=this),this._call=t,this._time=e,Ni()},stop:function(){this._call&&(this._call=null,this._time=1/0,Ni())}};var Pi=Nt("start","end","cancel","interrupt"),zi=[];function Di(t,n,e,r,i,o){var a=t.__transition;if(a){if(e in a)return}else t.__transition={};!function(t,n,e){var r,i=t.__transition;function o(t){e.state=1,e.timer.restart(a,e.delay,e.time),e.delay<=t&&a(t-e.delay)}function a(o){var f,s,l,h;if(1!==e.state)return c();for(f in i)if((h=i[f]).name===e.name){if(3===h.state)return Ci(a);4===h.state?(h.state=6,h.timer.stop(),h.on.call("interrupt",t,t.__data__,h.index,h.group),delete i[f]):+f<n&&(h.state=6,h.timer.stop(),h.on.call("cancel",t,t.__data__,h.index,h.group),delete i[f])}if(Ci((function(){3===e.state&&(e.state=4,e.timer.restart(u,e.delay,e.time),u(o))})),e.state=2,e.on.call("start",t,t.__data__,e.index,e.group),2===e.state){for(e.state=3,r=new Array(l=e.tween.length),f=0,s=-1;f<l;++f)(h=e.tween[f].value.call(t,t.__data__,e.index,e.group))&&(r[++s]=h);r.length=s+1}}function u(n){for(var i=n<e.duration?e.ease.call(null,n/e.duration):(e.timer.restart(c),e.state=5,1),o=-1,a=r.length;++o<a;)r[o].call(t,i);5===e.state&&(e.on.call("end",t,t.__data__,e.index,e.group),c())}function c(){for(var r in e.state=6,e.timer.stop(),delete i[n],i)return;delete t.__transition}i[n]=e,e.timer=Ti(o,0,e.time)}(t,e,{name:n,index:r,group:i,on:Pi,tween:zi,time:o.time,delay:o.delay,duration:o.duration,ease:o.ease,timer:null,state:0})}function Ri(t,n){var e=qi(t,n);if(e.state>0)throw new Error("too late; already scheduled");return e}function Fi(t,n){var e=qi(t,n);if(e.state>3)throw new Error("too late; already running");return e}function qi(t,n){var e=t.__transition;if(!e||!(e=e[n]))throw new Error("transition not found");return e}function Ii(t,n){var e,r,i,o=t.__transition,a=!0;if(o){for(i in n=null==n?null:n+"",o)(e=o[i]).name===n?(r=e.state>2&&e.state<5,e.state=6,e.timer.stop(),e.on.call(r?"interrupt":"cancel",t,t.__data__,e.index,e.group),delete o[i]):a=!1;a&&delete t.__transition}}function Oi(t,n){var e,r;return function(){var i=Fi(this,t),o=i.tween;if(o!==e)for(var a=0,u=(r=e=o).length;a<u;++a)if(r[a].name===n){(r=r.slice()).splice(a,1);break}i.tween=r}}function Ui(t,n,e){var r,i;if("function"!=typeof e)throw new Error;return function(){var o=Fi(this,t),a=o.tween;if(a!==r){i=(r=a).slice();for(var u={name:n,value:e},c=0,f=i.length;c<f;++c)if(i[c].name===n){i[c]=u;break}c===f&&i.push(u)}o.tween=i}}function Bi(t,n,e){var r=t._id;return t.each((function(){var t=Fi(this,r);(t.value||(t.value={}))[n]=e.apply(this,arguments)})),function(t){return qi(t,r).value[n]}}function Yi(t,n){var e;return("number"==typeof n?Br:n instanceof Pe?zr:(e=Pe(n))?(n=e,zr):$r)(t,n)}function Li(t){return function(){this.removeAttribute(t)}}function ji(t){return function(){this.removeAttributeNS(t.space,t.local)}}function $i(t,n,e){var r,i,o=e+"";return function(){var a=this.getAttribute(t);return a===o?null:a===r?i:i=n(r=a,e)}}function Hi(t,n,e){var r,i,o=e+"";return function(){var a=this.getAttributeNS(t.space,t.local);return a===o?null:a===r?i:i=n(r=a,e)}}function Xi(t,n,e){var r,i,o;return function(){var a,u,c=e(this);if(null!=c)return(a=this.getAttribute(t))===(u=c+"")?null:a===r&&u===i?o:(i=u,o=n(r=a,c));this.removeAttribute(t)}}function Gi(t,n,e){var r,i,o;return function(){var a,u,c=e(this);if(null!=c)return(a=this.getAttributeNS(t.space,t.local))===(u=c+"")?null:a===r&&u===i?o:(i=u,o=n(r=a,c));this.removeAttributeNS(t.space,t.local)}}function Vi(t,n){return function(e){this.setAttribute(t,n.call(this,e))}}function Wi(t,n){return function(e){this.setAttributeNS(t.space,t.local,n.call(this,e))}}function Zi(t,n){var e,r;function i(){var i=n.apply(this,arguments);return i!==r&&(e=(r=i)&&Wi(t,i)),e}return i._value=n,i}function Ki(t,n){var e,r;function i(){var i=n.apply(this,arguments);return i!==r&&(e=(r=i)&&Vi(t,i)),e}return i._value=n,i}function Qi(t,n){return function(){Ri(this,t).delay=+n.apply(this,arguments)}}function Ji(t,n){return n=+n,function(){Ri(this,t).delay=n}}function to(t,n){return function(){Fi(this,t).duration=+n.apply(this,arguments)}}function no(t,n){return n=+n,function(){Fi(this,t).duration=n}}function eo(t,n){if("function"!=typeof n)throw new Error;return function(){Fi(this,t).ease=n}}function ro(t,n,e){var r,i,o=function(t){return(t+"").trim().split(/^|\s+/).every((function(t){var n=t.indexOf(".");return n>=0&&(t=t.slice(0,n)),!t||"start"===t}))}(n)?Ri:Fi;return function(){var a=o(this,t),u=a.on;u!==r&&(i=(r=u).copy()).on(n,e),a.on=i}}var io=Vn.prototype.constructor;function oo(t){return function(){this.style.removeProperty(t)}}function ao(t,n,e){return function(r){this.style.setProperty(t,n.call(this,r),e)}}function uo(t,n,e){var r,i;function o(){var o=n.apply(this,arguments);return o!==i&&(r=(i=o)&&ao(t,o,e)),r}return o._value=n,o}function co(t){return function(n){this.textContent=t.call(this,n)}}function fo(t){var n,e;function r(){var r=t.apply(this,arguments);return r!==e&&(n=(e=r)&&co(r)),n}return r._value=t,r}var so=0;function lo(t,n,e,r){this._groups=t,this._parents=n,this._name=e,this._id=r}function ho(t){return Vn().transition(t)}function po(){return++so}var go=Vn.prototype;lo.prototype=ho.prototype={constructor:lo,select:function(t){var n=this._name,e=this._id;"function"!=typeof t&&(t=Yt(t));for(var r=this._groups,i=r.length,o=new Array(i),a=0;a<i;++a)for(var u,c,f=r[a],s=f.length,l=o[a]=new Array(s),h=0;h<s;++h)(u=f[h])&&(c=t.call(u,u.__data__,h,f))&&("__data__"in u&&(c.__data__=u.__data__),l[h]=c,Di(l[h],n,e,h,l,qi(u,e)));return new lo(o,this._parents,n,e)},selectAll:function(t){var n=this._name,e=this._id;"function"!=typeof t&&(t=$t(t));for(var r=this._groups,i=r.length,o=[],a=[],u=0;u<i;++u)for(var c,f=r[u],s=f.length,l=0;l<s;++l)if(c=f[l]){for(var h,d=t.call(c,c.__data__,l,f),p=qi(c,e),g=0,y=d.length;g<y;++g)(h=d[g])&&Di(h,n,e,g,d,p);o.push(d),a.push(c)}return new lo(o,a,n,e)},selectChild:go.selectChild,selectChildren:go.selectChildren,filter:function(t){"function"!=typeof t&&(t=Ht(t));for(var n=this._groups,e=n.length,r=new Array(e),i=0;i<e;++i)for(var o,a=n[i],u=a.length,c=r[i]=[],f=0;f<u;++f)(o=a[f])&&t.call(o,o.__data__,f,a)&&c.push(o);return new lo(r,this._parents,this._name,this._id)},merge:function(t){if(t._id!==this._id)throw new Error;for(var n=this._groups,e=t._groups,r=n.length,i=e.length,o=Math.min(r,i),a=new Array(r),u=0;u<o;++u)for(var c,f=n[u],s=e[u],l=f.length,h=a[u]=new Array(l),d=0;d<l;++d)(c=f[d]||s[d])&&(h[d]=c);for(;u<r;++u)a[u]=n[u];return new lo(a,this._parents,this._name,this._id)},selection:function(){return new io(this._groups,this._parents)},transition:function(){for(var t=this._name,n=this._id,e=po(),r=this._groups,i=r.length,o=0;o<i;++o)for(var a,u=r[o],c=u.length,f=0;f<c;++f)if(a=u[f]){var s=qi(a,n);Di(a,t,e,f,u,{time:s.time+s.delay+s.duration,delay:0,duration:s.duration,ease:s.ease})}return new lo(r,this._parents,t,e)},call:go.call,nodes:go.nodes,node:go.node,size:go.size,empty:go.empty,each:go.each,on:function(t,n){var e=this._id;return arguments.length<2?qi(this.node(),e).on.on(t):this.each(ro(e,t,n))},attr:function(t,n){var e=qt(t),r="transform"===e?Jr:Yi;return this.attrTween(t,"function"==typeof n?(e.local?Gi:Xi)(e,r,Bi(this,"attr."+t,n)):null==n?(e.local?ji:Li)(e):(e.local?Hi:$i)(e,r,n))},attrTween:function(t,n){var e="attr."+t;if(arguments.length<2)return(e=this.tween(e))&&e._value;if(null==n)return this.tween(e,null);if("function"!=typeof n)throw new Error;var r=qt(t);return this.tween(e,(r.local?Zi:Ki)(r,n))},style:function(t,n,e){var r="transform"==(t+="")?Qr:Yi;return null==n?this.styleTween(t,function(t,n){var e,r,i;return function(){var o=yn(this,t),a=(this.style.removeProperty(t),yn(this,t));return o===a?null:o===e&&a===r?i:i=n(e=o,r=a)}}(t,r)).on("end.style."+t,oo(t)):"function"==typeof n?this.styleTween(t,function(t,n,e){var r,i,o;return function(){var a=yn(this,t),u=e(this),c=u+"";return null==u&&(this.style.removeProperty(t),c=u=yn(this,t)),a===c?null:a===r&&c===i?o:(i=c,o=n(r=a,u))}}(t,r,Bi(this,"style."+t,n))).each(function(t,n){var e,r,i,o,a="style."+n,u="end."+a;return function(){var c=Fi(this,t),f=c.on,s=null==c.value[a]?o||(o=oo(n)):void 0;f===e&&i===s||(r=(e=f).copy()).on(u,i=s),c.on=r}}(this._id,t)):this.styleTween(t,function(t,n,e){var r,i,o=e+"";return function(){var a=yn(this,t);return a===o?null:a===r?i:i=n(r=a,e)}}(t,r,n),e).on("end.style."+t,null)},styleTween:function(t,n,e){var r="style."+(t+="");if(arguments.length<2)return(r=this.tween(r))&&r._value;if(null==n)return this.tween(r,null);if("function"!=typeof n)throw new Error;return this.tween(r,uo(t,n,null==e?"":e))},text:function(t){return this.tween("text","function"==typeof t?function(t){return function(){var n=t(this);this.textContent=null==n?"":n}}(Bi(this,"text",t)):function(t){return function(){this.textContent=t}}(null==t?"":t+""))},textTween:function(t){var n="text";if(arguments.length<1)return(n=this.tween(n))&&n._value;if(null==t)return this.tween(n,null);if("function"!=typeof t)throw new Error;return this.tween(n,fo(t))},remove:function(){return this.on("end.remove",function(t){return function(){var n=this.parentNode;for(var e in this.__transition)if(+e!==t)return;n&&n.removeChild(this)}}(this._id))},tween:function(t,n){var e=this._id;if(t+="",arguments.length<2){for(var r,i=qi(this.node(),e).tween,o=0,a=i.length;o<a;++o)if((r=i[o]).name===t)return r.value;return null}return this.each((null==n?Oi:Ui)(e,t,n))},delay:function(t){var n=this._id;return arguments.length?this.each(("function"==typeof t?Qi:Ji)(n,t)):qi(this.node(),n).delay},duration:function(t){var n=this._id;return arguments.length?this.each(("function"==typeof t?to:no)(n,t)):qi(this.node(),n).duration},ease:function(t){var n=this._id;return arguments.length?this.each(eo(n,t)):qi(this.node(),n).ease},easeVarying:function(t){if("function"!=typeof t)throw new Error;return this.each(function(t,n){return function(){var e=n.apply(this,arguments);if("function"!=typeof e)throw new Error;Fi(this,t).ease=e}}(this._id,t))},end:function(){var t,n,e=this,r=e._id,i=e.size();return new Promise((function(o,a){var u={value:a},c={value:function(){0==--i&&o()}};e.each((function(){var e=Fi(this,r),i=e.on;i!==t&&((n=(t=i).copy())._.cancel.push(u),n._.interrupt.push(u),n._.end.push(c)),e.on=n})),0===i&&o()}))},[Symbol.iterator]:go[Symbol.iterator]};function yo(t){return((t*=2)<=1?t*t:--t*(2-t)+1)/2}function vo(t){return((t*=2)<=1?t*t*t:(t-=2)*t*t+2)/2}var _o=function t(n){function e(t){return Math.pow(t,n)}return n=+n,e.exponent=t,e}(3),bo=function t(n){function e(t){return 1-Math.pow(1-t,n)}return n=+n,e.exponent=t,e}(3),mo=function t(n){function e(t){return((t*=2)<=1?Math.pow(t,n):2-Math.pow(2-t,n))/2}return n=+n,e.exponent=t,e}(3),xo=Math.PI,wo=xo/2;function Mo(t){return(1-Math.cos(xo*t))/2}function Ao(t){return 1.0009775171065494*(Math.pow(2,-10*t)-.0009765625)}function To(t){return((t*=2)<=1?Ao(1-t):2-Ao(t-1))/2}function So(t){return((t*=2)<=1?1-Math.sqrt(1-t*t):Math.sqrt(1-(t-=2)*t)+1)/2}var Eo=4/11,ko=7.5625;function No(t){return(t=+t)<Eo?ko*t*t:t<.7272727272727273?ko*(t-=.5454545454545454)*t+.75:t<.9090909090909091?ko*(t-=.8181818181818182)*t+.9375:ko*(t-=.9545454545454546)*t+.984375}var Co=1.70158,Po=function t(n){function e(t){return(t=+t)*t*(n*(t-1)+t)}return n=+n,e.overshoot=t,e}(Co),zo=function t(n){function e(t){return--t*t*((t+1)*n+t)+1}return n=+n,e.overshoot=t,e}(Co),Do=function t(n){function e(t){return((t*=2)<1?t*t*((n+1)*t-n):(t-=2)*t*((n+1)*t+n)+2)/2}return n=+n,e.overshoot=t,e}(Co),Ro=2*Math.PI,Fo=function t(n,e){var r=Math.asin(1/(n=Math.max(1,n)))*(e/=Ro);function i(t){return n*Ao(- --t)*Math.sin((r-t)/e)}return i.amplitude=function(n){return t(n,e*Ro)},i.period=function(e){return t(n,e)},i}(1,.3),qo=function t(n,e){var r=Math.asin(1/(n=Math.max(1,n)))*(e/=Ro);function i(t){return 1-n*Ao(t=+t)*Math.sin((t+r)/e)}return i.amplitude=function(n){return t(n,e*Ro)},i.period=function(e){return t(n,e)},i}(1,.3),Io=function t(n,e){var r=Math.asin(1/(n=Math.max(1,n)))*(e/=Ro);function i(t){return((t=2*t-1)<0?n*Ao(-t)*Math.sin((r-t)/e):2-n*Ao(t)*Math.sin((r+t)/e))/2}return i.amplitude=function(n){return t(n,e*Ro)},i.period=function(e){return t(n,e)},i}(1,.3),Oo={time:null,delay:0,duration:250,ease:vo};function Uo(t,n){for(var e;!(e=t.__transition)||!(e=e[n]);)if(!(t=t.parentNode))throw new Error(`transition ${n} not found`);return e}Vn.prototype.interrupt=function(t){return this.each((function(){Ii(this,t)}))},Vn.prototype.transition=function(t){var n,e;t instanceof lo?(n=t._id,t=t._name):(n=po(),(e=Oo).time=wi(),t=null==t?null:t+"");for(var r=this._groups,i=r.length,o=0;o<i;++o)for(var a,u=r[o],c=u.length,f=0;f<c;++f)(a=u[f])&&Di(a,t,n,f,u,e||Uo(a,n));return new lo(r,this._parents,t,n)};var Bo=[null];var Yo=t=>()=>t;function Lo(t,{sourceEvent:n,target:e,selection:r,mode:i,dispatch:o}){Object.defineProperties(this,{type:{value:t,enumerable:!0,configurable:!0},sourceEvent:{value:n,enumerable:!0,configurable:!0},target:{value:e,enumerable:!0,configurable:!0},selection:{value:r,enumerable:!0,configurable:!0},mode:{value:i,enumerable:!0,configurable:!0},_:{value:o}})}function jo(t){t.stopImmediatePropagation()}function $o(t){t.preventDefault(),t.stopImmediatePropagation()}var Ho={name:"drag"},Xo={name:"space"},Go={name:"handle"},Vo={name:"center"};const{abs:Wo,max:Zo,min:Ko}=Math;function Qo(t){return[+t[0],+t[1]]}function Jo(t){return[Qo(t[0]),Qo(t[1])]}var ta={name:"x",handles:["w","e"].map(ca),input:function(t,n){return null==t?null:[[+t[0],n[0][1]],[+t[1],n[1][1]]]},output:function(t){return t&&[t[0][0],t[1][0]]}},na={name:"y",handles:["n","s"].map(ca),input:function(t,n){return null==t?null:[[n[0][0],+t[0]],[n[1][0],+t[1]]]},output:function(t){return t&&[t[0][1],t[1][1]]}},ea={name:"xy",handles:["n","w","e","s","nw","ne","sw","se"].map(ca),input:function(t){return null==t?null:Jo(t)},output:function(t){return t}},ra={overlay:"crosshair",selection:"move",n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},ia={e:"w",w:"e",nw:"ne",ne:"nw",se:"sw",sw:"se"},oa={n:"s",s:"n",nw:"sw",ne:"se",se:"ne",sw:"nw"},aa={overlay:1,selection:1,n:null,e:1,s:null,w:-1,nw:-1,ne:1,se:1,sw:-1},ua={overlay:1,selection:1,n:-1,e:null,s:1,w:null,nw:-1,ne:-1,se:1,sw:1};function ca(t){return{type:t}}function fa(t){return!t.ctrlKey&&!t.button}function sa(){var t=this.ownerSVGElement||this;return t.hasAttribute("viewBox")?[[(t=t.viewBox.baseVal).x,t.y],[t.x+t.width,t.y+t.height]]:[[0,0],[t.width.baseVal.value,t.height.baseVal.value]]}function la(){return navigator.maxTouchPoints||"ontouchstart"in this}function ha(t){for(;!t.__brush;)if(!(t=t.parentNode))return;return t.__brush}function da(t){return t[0][0]===t[1][0]||t[0][1]===t[1][1]}function pa(t){var n,e=sa,r=fa,i=la,o=!0,a=Nt("start","brush","end"),u=6;function c(n){var e=n.property("__brush",g).selectAll(".overlay").data([ca("overlay")]);e.enter().append("rect").attr("class","overlay").attr("pointer-events","all").attr("cursor",ra.overlay).merge(e).each((function(){var t=ha(this).extent;Wn(this).attr("x",t[0][0]).attr("y",t[0][1]).attr("width",t[1][0]-t[0][0]).attr("height",t[1][1]-t[0][1])})),n.selectAll(".selection").data([ca("selection")]).enter().append("rect").attr("class","selection").attr("cursor",ra.selection).attr("fill","#777").attr("fill-opacity",.3).attr("stroke","#fff").attr("shape-rendering","crispEdges");var r=n.selectAll(".handle").data(t.handles,(function(t){return t.type}));r.exit().remove(),r.enter().append("rect").attr("class",(function(t){return"handle handle--"+t.type})).attr("cursor",(function(t){return ra[t.type]})),n.each(f).attr("fill","none").attr("pointer-events","all").on("mousedown.brush",h).filter(i).on("touchstart.brush",h).on("touchmove.brush",d).on("touchend.brush touchcancel.brush",p).style("touch-action","none").style("-webkit-tap-highlight-color","rgba(0,0,0,0)")}function f(){var t=Wn(this),n=ha(this).selection;n?(t.selectAll(".selection").style("display",null).attr("x",n[0][0]).attr("y",n[0][1]).attr("width",n[1][0]-n[0][0]).attr("height",n[1][1]-n[0][1]),t.selectAll(".handle").style("display",null).attr("x",(function(t){return"e"===t.type[t.type.length-1]?n[1][0]-u/2:n[0][0]-u/2})).attr("y",(function(t){return"s"===t.type[0]?n[1][1]-u/2:n[0][1]-u/2})).attr("width",(function(t){return"n"===t.type||"s"===t.type?n[1][0]-n[0][0]+u:u})).attr("height",(function(t){return"e"===t.type||"w"===t.type?n[1][1]-n[0][1]+u:u}))):t.selectAll(".selection,.handle").style("display","none").attr("x",null).attr("y",null).attr("width",null).attr("height",null)}function s(t,n,e){var r=t.__brush.emitter;return!r||e&&r.clean?new l(t,n,e):r}function l(t,n,e){this.that=t,this.args=n,this.state=t.__brush,this.active=0,this.clean=e}function h(e){if((!n||e.touches)&&r.apply(this,arguments)){var i,a,u,c,l,h,d,p,g,y,v,_=this,b=e.target.__data__.type,m="selection"===(o&&e.metaKey?b="overlay":b)?Ho:o&&e.altKey?Vo:Go,x=t===na?null:aa[b],w=t===ta?null:ua[b],M=ha(_),A=M.extent,T=M.selection,S=A[0][0],E=A[0][1],k=A[1][0],N=A[1][1],C=0,P=0,z=x&&w&&o&&e.shiftKey,D=Array.from(e.touches||[e],(t=>{const n=t.identifier;return(t=te(t,_)).point0=t.slice(),t.identifier=n,t}));Ii(_);var R=s(_,arguments,!0).beforestart();if("overlay"===b){T&&(g=!0);const n=[D[0],D[1]||D[0]];M.selection=T=[[i=t===na?S:Ko(n[0][0],n[1][0]),u=t===ta?E:Ko(n[0][1],n[1][1])],[l=t===na?k:Zo(n[0][0],n[1][0]),d=t===ta?N:Zo(n[0][1],n[1][1])]],D.length>1&&U(e)}else i=T[0][0],u=T[0][1],l=T[1][0],d=T[1][1];a=i,c=u,h=l,p=d;var F=Wn(_).attr("pointer-events","none"),q=F.selectAll(".overlay").attr("cursor",ra[b]);if(e.touches)R.moved=O,R.ended=B;else{var I=Wn(e.view).on("mousemove.brush",O,!0).on("mouseup.brush",B,!0);o&&I.on("keydown.brush",Y,!0).on("keyup.brush",L,!0),oe(e.view)}f.call(_),R.start(e,m.name)}function O(t){for(const n of t.changedTouches||[t])for(const t of D)t.identifier===n.identifier&&(t.cur=te(n,_));if(z&&!y&&!v&&1===D.length){const t=D[0];Wo(t.cur[0]-t[0])>Wo(t.cur[1]-t[1])?v=!0:y=!0}for(const t of D)t.cur&&(t[0]=t.cur[0],t[1]=t.cur[1]);g=!0,$o(t),U(t)}function U(t){const n=D[0],e=n.point0;var r;switch(C=n[0]-e[0],P=n[1]-e[1],m){case Xo:case Ho:x&&(C=Zo(S-i,Ko(k-l,C)),a=i+C,h=l+C),w&&(P=Zo(E-u,Ko(N-d,P)),c=u+P,p=d+P);break;case Go:D[1]?(x&&(a=Zo(S,Ko(k,D[0][0])),h=Zo(S,Ko(k,D[1][0])),x=1),w&&(c=Zo(E,Ko(N,D[0][1])),p=Zo(E,Ko(N,D[1][1])),w=1)):(x<0?(C=Zo(S-i,Ko(k-i,C)),a=i+C,h=l):x>0&&(C=Zo(S-l,Ko(k-l,C)),a=i,h=l+C),w<0?(P=Zo(E-u,Ko(N-u,P)),c=u+P,p=d):w>0&&(P=Zo(E-d,Ko(N-d,P)),c=u,p=d+P));break;case Vo:x&&(a=Zo(S,Ko(k,i-C*x)),h=Zo(S,Ko(k,l+C*x))),w&&(c=Zo(E,Ko(N,u-P*w)),p=Zo(E,Ko(N,d+P*w)))}h<a&&(x*=-1,r=i,i=l,l=r,r=a,a=h,h=r,b in ia&&q.attr("cursor",ra[b=ia[b]])),p<c&&(w*=-1,r=u,u=d,d=r,r=c,c=p,p=r,b in oa&&q.attr("cursor",ra[b=oa[b]])),M.selection&&(T=M.selection),y&&(a=T[0][0],h=T[1][0]),v&&(c=T[0][1],p=T[1][1]),T[0][0]===a&&T[0][1]===c&&T[1][0]===h&&T[1][1]===p||(M.selection=[[a,c],[h,p]],f.call(_),R.brush(t,m.name))}function B(t){if(jo(t),t.touches){if(t.touches.length)return;n&&clearTimeout(n),n=setTimeout((function(){n=null}),500)}else ae(t.view,g),I.on("keydown.brush keyup.brush mousemove.brush mouseup.brush",null);F.attr("pointer-events","all"),q.attr("cursor",ra.overlay),M.selection&&(T=M.selection),da(T)&&(M.selection=null,f.call(_)),R.end(t,m.name)}function Y(t){switch(t.keyCode){case 16:z=x&&w;break;case 18:m===Go&&(x&&(l=h-C*x,i=a+C*x),w&&(d=p-P*w,u=c+P*w),m=Vo,U(t));break;case 32:m!==Go&&m!==Vo||(x<0?l=h-C:x>0&&(i=a-C),w<0?d=p-P:w>0&&(u=c-P),m=Xo,q.attr("cursor",ra.selection),U(t));break;default:return}$o(t)}function L(t){switch(t.keyCode){case 16:z&&(y=v=z=!1,U(t));break;case 18:m===Vo&&(x<0?l=h:x>0&&(i=a),w<0?d=p:w>0&&(u=c),m=Go,U(t));break;case 32:m===Xo&&(t.altKey?(x&&(l=h-C*x,i=a+C*x),w&&(d=p-P*w,u=c+P*w),m=Vo):(x<0?l=h:x>0&&(i=a),w<0?d=p:w>0&&(u=c),m=Go),q.attr("cursor",ra[b]),U(t));break;default:return}$o(t)}}function d(t){s(this,arguments).moved(t)}function p(t){s(this,arguments).ended(t)}function g(){var n=this.__brush||{selection:null};return n.extent=Jo(e.apply(this,arguments)),n.dim=t,n}return c.move=function(n,e,r){n.tween?n.on("start.brush",(function(t){s(this,arguments).beforestart().start(t)})).on("interrupt.brush end.brush",(function(t){s(this,arguments).end(t)})).tween("brush",(function(){var n=this,r=n.__brush,i=s(n,arguments),o=r.selection,a=t.input("function"==typeof e?e.apply(this,arguments):e,r.extent),u=Hr(o,a);function c(t){r.selection=1===t&&null===a?null:u(t),f.call(n),i.brush()}return null!==o&&null!==a?c:c(1)})):n.each((function(){var n=this,i=arguments,o=n.__brush,a=t.input("function"==typeof e?e.apply(n,i):e,o.extent),u=s(n,i).beforestart();Ii(n),o.selection=null===a?null:a,f.call(n),u.start(r).brush(r).end(r)}))},c.clear=function(t,n){c.move(t,null,n)},l.prototype={beforestart:function(){return 1==++this.active&&(this.state.emitter=this,this.starting=!0),this},start:function(t,n){return this.starting?(this.starting=!1,this.emit("start",t,n)):this.emit("brush",t),this},brush:function(t,n){return this.emit("brush",t,n),this},end:function(t,n){return 0==--this.active&&(delete this.state.emitter,this.emit("end",t,n)),this},emit:function(n,e,r){var i=Wn(this.that).datum();a.call(n,this.that,new Lo(n,{sourceEvent:e,target:c,selection:t.output(this.state.selection),mode:r,dispatch:a}),i)}},c.extent=function(t){return arguments.length?(e="function"==typeof t?t:Yo(Jo(t)),c):e},c.filter=function(t){return arguments.length?(r="function"==typeof t?t:Yo(!!t),c):r},c.touchable=function(t){return arguments.length?(i="function"==typeof t?t:Yo(!!t),c):i},c.handleSize=function(t){return arguments.length?(u=+t,c):u},c.keyModifiers=function(t){return arguments.length?(o=!!t,c):o},c.on=function(){var t=a.on.apply(a,arguments);return t===a?c:t},c}var ga=Math.abs,ya=Math.cos,va=Math.sin,_a=Math.PI,ba=_a/2,ma=2*_a,xa=Math.max,wa=1e-12;function Ma(t,n){return Array.from({length:n-t},((n,e)=>t+e))}function Aa(t){return function(n,e){return t(n.source.value+n.target.value,e.source.value+e.target.value)}}function Ta(t,n){var e=0,r=null,i=null,o=null;function a(a){var u,c=a.length,f=new Array(c),s=Ma(0,c),l=new Array(c*c),h=new Array(c),d=0;a=Float64Array.from({length:c*c},n?(t,n)=>a[n%c][n/c|0]:(t,n)=>a[n/c|0][n%c]);for(let n=0;n<c;++n){let e=0;for(let r=0;r<c;++r)e+=a[n*c+r]+t*a[r*c+n];d+=f[n]=e}u=(d=xa(0,ma-e*c)/d)?e:ma/c;{let n=0;r&&s.sort(((t,n)=>r(f[t],f[n])));for(const e of s){const r=n;if(t){const t=Ma(1+~c,c).filter((t=>t<0?a[~t*c+e]:a[e*c+t]));i&&t.sort(((t,n)=>i(t<0?-a[~t*c+e]:a[e*c+t],n<0?-a[~n*c+e]:a[e*c+n])));for(const r of t)if(r<0){(l[~r*c+e]||(l[~r*c+e]={source:null,target:null})).target={index:e,startAngle:n,endAngle:n+=a[~r*c+e]*d,value:a[~r*c+e]}}else{(l[e*c+r]||(l[e*c+r]={source:null,target:null})).source={index:e,startAngle:n,endAngle:n+=a[e*c+r]*d,value:a[e*c+r]}}h[e]={index:e,startAngle:r,endAngle:n,value:f[e]}}else{const t=Ma(0,c).filter((t=>a[e*c+t]||a[t*c+e]));i&&t.sort(((t,n)=>i(a[e*c+t],a[e*c+n])));for(const r of t){let t;if(e<r?(t=l[e*c+r]||(l[e*c+r]={source:null,target:null}),t.source={index:e,startAngle:n,endAngle:n+=a[e*c+r]*d,value:a[e*c+r]}):(t=l[r*c+e]||(l[r*c+e]={source:null,target:null}),t.target={index:e,startAngle:n,endAngle:n+=a[e*c+r]*d,value:a[e*c+r]},e===r&&(t.source=t.target)),t.source&&t.target&&t.source.value<t.target.value){const n=t.source;t.source=t.target,t.target=n}}h[e]={index:e,startAngle:r,endAngle:n,value:f[e]}}n+=u}}return(l=Object.values(l)).groups=h,o?l.sort(o):l}return a.padAngle=function(t){return arguments.length?(e=xa(0,t),a):e},a.sortGroups=function(t){return arguments.length?(r=t,a):r},a.sortSubgroups=function(t){return arguments.length?(i=t,a):i},a.sortChords=function(t){return arguments.length?(null==t?o=null:(o=Aa(t))._=t,a):o&&o._},a}const Sa=Math.PI,Ea=2*Sa,ka=1e-6,Na=Ea-ka;function Ca(){this._x0=this._y0=this._x1=this._y1=null,this._=""}function Pa(){return new Ca}Ca.prototype=Pa.prototype={constructor:Ca,moveTo:function(t,n){this._+="M"+(this._x0=this._x1=+t)+","+(this._y0=this._y1=+n)},closePath:function(){null!==this._x1&&(this._x1=this._x0,this._y1=this._y0,this._+="Z")},lineTo:function(t,n){this._+="L"+(this._x1=+t)+","+(this._y1=+n)},quadraticCurveTo:function(t,n,e,r){this._+="Q"+ +t+","+ +n+","+(this._x1=+e)+","+(this._y1=+r)},bezierCurveTo:function(t,n,e,r,i,o){this._+="C"+ +t+","+ +n+","+ +e+","+ +r+","+(this._x1=+i)+","+(this._y1=+o)},arcTo:function(t,n,e,r,i){t=+t,n=+n,e=+e,r=+r,i=+i;var o=this._x1,a=this._y1,u=e-t,c=r-n,f=o-t,s=a-n,l=f*f+s*s;if(i<0)throw new Error("negative radius: "+i);if(null===this._x1)this._+="M"+(this._x1=t)+","+(this._y1=n);else if(l>ka)if(Math.abs(s*u-c*f)>ka&&i){var h=e-o,d=r-a,p=u*u+c*c,g=h*h+d*d,y=Math.sqrt(p),v=Math.sqrt(l),_=i*Math.tan((Sa-Math.acos((p+l-g)/(2*y*v)))/2),b=_/v,m=_/y;Math.abs(b-1)>ka&&(this._+="L"+(t+b*f)+","+(n+b*s)),this._+="A"+i+","+i+",0,0,"+ +(s*h>f*d)+","+(this._x1=t+m*u)+","+(this._y1=n+m*c)}else this._+="L"+(this._x1=t)+","+(this._y1=n);else;},arc:function(t,n,e,r,i,o){t=+t,n=+n,o=!!o;var a=(e=+e)*Math.cos(r),u=e*Math.sin(r),c=t+a,f=n+u,s=1^o,l=o?r-i:i-r;if(e<0)throw new Error("negative radius: "+e);null===this._x1?this._+="M"+c+","+f:(Math.abs(this._x1-c)>ka||Math.abs(this._y1-f)>ka)&&(this._+="L"+c+","+f),e&&(l<0&&(l=l%Ea+Ea),l>Na?this._+="A"+e+","+e+",0,1,"+s+","+(t-a)+","+(n-u)+"A"+e+","+e+",0,1,"+s+","+(this._x1=c)+","+(this._y1=f):l>ka&&(this._+="A"+e+","+e+",0,"+ +(l>=Sa)+","+s+","+(this._x1=t+e*Math.cos(i))+","+(this._y1=n+e*Math.sin(i))))},rect:function(t,n,e,r){this._+="M"+(this._x0=this._x1=+t)+","+(this._y0=this._y1=+n)+"h"+ +e+"v"+ +r+"h"+-e+"Z"},toString:function(){return this._}};var za=Array.prototype.slice;function Da(t){return function(){return t}}function Ra(t){return t.source}function Fa(t){return t.target}function qa(t){return t.radius}function Ia(t){return t.startAngle}function Oa(t){return t.endAngle}function Ua(){return 0}function Ba(){return 10}function Ya(t){var n=Ra,e=Fa,r=qa,i=qa,o=Ia,a=Oa,u=Ua,c=null;function f(){var f,s=n.apply(this,arguments),l=e.apply(this,arguments),h=u.apply(this,arguments)/2,d=za.call(arguments),p=+r.apply(this,(d[0]=s,d)),g=o.apply(this,d)-ba,y=a.apply(this,d)-ba,v=+i.apply(this,(d[0]=l,d)),_=o.apply(this,d)-ba,b=a.apply(this,d)-ba;if(c||(c=f=Pa()),h>wa&&(ga(y-g)>2*h+wa?y>g?(g+=h,y-=h):(g-=h,y+=h):g=y=(g+y)/2,ga(b-_)>2*h+wa?b>_?(_+=h,b-=h):(_-=h,b+=h):_=b=(_+b)/2),c.moveTo(p*ya(g),p*va(g)),c.arc(0,0,p,g,y),g!==_||y!==b)if(t){var m=+t.apply(this,arguments),x=v-m,w=(_+b)/2;c.quadraticCurveTo(0,0,x*ya(_),x*va(_)),c.lineTo(v*ya(w),v*va(w)),c.lineTo(x*ya(b),x*va(b))}else c.quadraticCurveTo(0,0,v*ya(_),v*va(_)),c.arc(0,0,v,_,b);if(c.quadraticCurveTo(0,0,p*ya(g),p*va(g)),c.closePath(),f)return c=null,f+""||null}return t&&(f.headRadius=function(n){return arguments.length?(t="function"==typeof n?n:Da(+n),f):t}),f.radius=function(t){return arguments.length?(r=i="function"==typeof t?t:Da(+t),f):r},f.sourceRadius=function(t){return arguments.length?(r="function"==typeof t?t:Da(+t),f):r},f.targetRadius=function(t){return arguments.length?(i="function"==typeof t?t:Da(+t),f):i},f.startAngle=function(t){return arguments.length?(o="function"==typeof t?t:Da(+t),f):o},f.endAngle=function(t){return arguments.length?(a="function"==typeof t?t:Da(+t),f):a},f.padAngle=function(t){return arguments.length?(u="function"==typeof t?t:Da(+t),f):u},f.source=function(t){return arguments.length?(n=t,f):n},f.target=function(t){return arguments.length?(e=t,f):e},f.context=function(t){return arguments.length?(c=null==t?null:t,f):c},f}var La=Array.prototype.slice;function ja(t,n){return t-n}var $a=t=>()=>t;function Ha(t,n){for(var e,r=-1,i=n.length;++r<i;)if(e=Xa(t,n[r]))return e;return 0}function Xa(t,n){for(var e=n[0],r=n[1],i=-1,o=0,a=t.length,u=a-1;o<a;u=o++){var c=t[o],f=c[0],s=c[1],l=t[u],h=l[0],d=l[1];if(Ga(c,l,n))return 0;s>r!=d>r&&e<(h-f)*(r-s)/(d-s)+f&&(i=-i)}return i}function Ga(t,n,e){var r,i,o,a;return function(t,n,e){return(n[0]-t[0])*(e[1]-t[1])==(e[0]-t[0])*(n[1]-t[1])}(t,n,e)&&(i=t[r=+(t[0]===n[0])],o=e[r],a=n[r],i<=o&&o<=a||a<=o&&o<=i)}function Va(){}var Wa=[[],[[[1,1.5],[.5,1]]],[[[1.5,1],[1,1.5]]],[[[1.5,1],[.5,1]]],[[[1,.5],[1.5,1]]],[[[1,1.5],[.5,1]],[[1,.5],[1.5,1]]],[[[1,.5],[1,1.5]]],[[[1,.5],[.5,1]]],[[[.5,1],[1,.5]]],[[[1,1.5],[1,.5]]],[[[.5,1],[1,.5]],[[1.5,1],[1,1.5]]],[[[1.5,1],[1,.5]]],[[[.5,1],[1.5,1]]],[[[1,1.5],[1.5,1]]],[[[.5,1],[1,1.5]]],[]];function Za(){var t=1,n=1,e=K,r=u;function i(t){var n=e(t);if(Array.isArray(n))n=n.slice().sort(ja);else{const e=A(t),r=W(e[0],e[1],n);n=G(Math.floor(e[0]/r)*r,Math.floor(e[1]/r-1)*r,n)}return n.map((n=>o(t,n)))}function o(e,i){var o=[],u=[];return function(e,r,i){var o,u,c,f,s,l,h=new Array,d=new Array;o=u=-1,f=e[0]>=r,Wa[f<<1].forEach(p);for(;++o<t-1;)c=f,f=e[o+1]>=r,Wa[c|f<<1].forEach(p);Wa[f<<0].forEach(p);for(;++u<n-1;){for(o=-1,f=e[u*t+t]>=r,s=e[u*t]>=r,Wa[f<<1|s<<2].forEach(p);++o<t-1;)c=f,f=e[u*t+t+o+1]>=r,l=s,s=e[u*t+o+1]>=r,Wa[c|f<<1|s<<2|l<<3].forEach(p);Wa[f|s<<3].forEach(p)}o=-1,s=e[u*t]>=r,Wa[s<<2].forEach(p);for(;++o<t-1;)l=s,s=e[u*t+o+1]>=r,Wa[s<<2|l<<3].forEach(p);function p(t){var n,e,r=[t[0][0]+o,t[0][1]+u],c=[t[1][0]+o,t[1][1]+u],f=a(r),s=a(c);(n=d[f])?(e=h[s])?(delete d[n.end],delete h[e.start],n===e?(n.ring.push(c),i(n.ring)):h[n.start]=d[e.end]={start:n.start,end:e.end,ring:n.ring.concat(e.ring)}):(delete d[n.end],n.ring.push(c),d[n.end=s]=n):(n=h[s])?(e=d[f])?(delete h[n.start],delete d[e.end],n===e?(n.ring.push(c),i(n.ring)):h[e.start]=d[n.end]={start:e.start,end:n.end,ring:e.ring.concat(n.ring)}):(delete h[n.start],n.ring.unshift(r),h[n.start=f]=n):h[f]=d[s]={start:f,end:s,ring:[r,c]}}Wa[s<<3].forEach(p)}(e,i,(function(t){r(t,e,i),function(t){for(var n=0,e=t.length,r=t[e-1][1]*t[0][0]-t[e-1][0]*t[0][1];++n<e;)r+=t[n-1][1]*t[n][0]-t[n-1][0]*t[n][1];return r}(t)>0?o.push([t]):u.push(t)})),u.forEach((function(t){for(var n,e=0,r=o.length;e<r;++e)if(-1!==Ha((n=o[e])[0],t))return void n.push(t)})),{type:"MultiPolygon",value:i,coordinates:o}}function a(n){return 2*n[0]+n[1]*(t+1)*4}function u(e,r,i){e.forEach((function(e){var o,a=e[0],u=e[1],c=0|a,f=0|u,s=r[f*t+c];a>0&&a<t&&c===a&&(o=r[f*t+c-1],e[0]=a+(i-o)/(s-o)-.5),u>0&&u<n&&f===u&&(o=r[(f-1)*t+c],e[1]=u+(i-o)/(s-o)-.5)}))}return i.contour=o,i.size=function(e){if(!arguments.length)return[t,n];var r=Math.floor(e[0]),o=Math.floor(e[1]);if(!(r>=0&&o>=0))throw new Error("invalid size");return t=r,n=o,i},i.thresholds=function(t){return arguments.length?(e="function"==typeof t?t:Array.isArray(t)?$a(La.call(t)):$a(t),i):e},i.smooth=function(t){return arguments.length?(r=t?u:Va,i):r===u},i}function Ka(t){return t[0]}function Qa(t){return t[1]}function Ja(){return 1}const tu=134217729;function nu(t,n,e,r,i){let o,a,u,c,f=n[0],s=r[0],l=0,h=0;s>f==s>-f?(o=f,f=n[++l]):(o=s,s=r[++h]);let d=0;if(l<t&&h<e)for(s>f==s>-f?(a=f+o,u=o-(a-f),f=n[++l]):(a=s+o,u=o-(a-s),s=r[++h]),o=a,0!==u&&(i[d++]=u);l<t&&h<e;)s>f==s>-f?(a=o+f,c=a-o,u=o-(a-c)+(f-c),f=n[++l]):(a=o+s,c=a-o,u=o-(a-c)+(s-c),s=r[++h]),o=a,0!==u&&(i[d++]=u);for(;l<t;)a=o+f,c=a-o,u=o-(a-c)+(f-c),f=n[++l],o=a,0!==u&&(i[d++]=u);for(;h<e;)a=o+s,c=a-o,u=o-(a-c)+(s-c),s=r[++h],o=a,0!==u&&(i[d++]=u);return 0===o&&0!==d||(i[d++]=o),d}function eu(t){return new Float64Array(t)}const ru=eu(4),iu=eu(8),ou=eu(12),au=eu(16),uu=eu(4);function cu(t,n,e,r,i,o){const a=(n-o)*(e-i),u=(t-i)*(r-o),c=a-u;if(0===a||0===u||a>0!=u>0)return c;const f=Math.abs(a+u);return Math.abs(c)>=33306690738754716e-32*f?c:-function(t,n,e,r,i,o,a){let u,c,f,s,l,h,d,p,g,y,v,_,b,m,x,w,M,A;const T=t-i,S=e-i,E=n-o,k=r-o;m=T*k,h=tu*T,d=h-(h-T),p=T-d,h=tu*k,g=h-(h-k),y=k-g,x=p*y-(m-d*g-p*g-d*y),w=E*S,h=tu*E,d=h-(h-E),p=E-d,h=tu*S,g=h-(h-S),y=S-g,M=p*y-(w-d*g-p*g-d*y),v=x-M,l=x-v,ru[0]=x-(v+l)+(l-M),_=m+v,l=_-m,b=m-(_-l)+(v-l),v=b-w,l=b-v,ru[1]=b-(v+l)+(l-w),A=_+v,l=A-_,ru[2]=_-(A-l)+(v-l),ru[3]=A;let N=function(t,n){let e=n[0];for(let r=1;r<t;r++)e+=n[r];return e}(4,ru),C=22204460492503146e-32*a;if(N>=C||-N>=C)return N;if(l=t-T,u=t-(T+l)+(l-i),l=e-S,f=e-(S+l)+(l-i),l=n-E,c=n-(E+l)+(l-o),l=r-k,s=r-(k+l)+(l-o),0===u&&0===c&&0===f&&0===s)return N;if(C=11093356479670487e-47*a+33306690738754706e-32*Math.abs(N),N+=T*s+k*u-(E*f+S*c),N>=C||-N>=C)return N;m=u*k,h=tu*u,d=h-(h-u),p=u-d,h=tu*k,g=h-(h-k),y=k-g,x=p*y-(m-d*g-p*g-d*y),w=c*S,h=tu*c,d=h-(h-c),p=c-d,h=tu*S,g=h-(h-S),y=S-g,M=p*y-(w-d*g-p*g-d*y),v=x-M,l=x-v,uu[0]=x-(v+l)+(l-M),_=m+v,l=_-m,b=m-(_-l)+(v-l),v=b-w,l=b-v,uu[1]=b-(v+l)+(l-w),A=_+v,l=A-_,uu[2]=_-(A-l)+(v-l),uu[3]=A;const P=nu(4,ru,4,uu,iu);m=T*s,h=tu*T,d=h-(h-T),p=T-d,h=tu*s,g=h-(h-s),y=s-g,x=p*y-(m-d*g-p*g-d*y),w=E*f,h=tu*E,d=h-(h-E),p=E-d,h=tu*f,g=h-(h-f),y=f-g,M=p*y-(w-d*g-p*g-d*y),v=x-M,l=x-v,uu[0]=x-(v+l)+(l-M),_=m+v,l=_-m,b=m-(_-l)+(v-l),v=b-w,l=b-v,uu[1]=b-(v+l)+(l-w),A=_+v,l=A-_,uu[2]=_-(A-l)+(v-l),uu[3]=A;const z=nu(P,iu,4,uu,ou);m=u*s,h=tu*u,d=h-(h-u),p=u-d,h=tu*s,g=h-(h-s),y=s-g,x=p*y-(m-d*g-p*g-d*y),w=c*f,h=tu*c,d=h-(h-c),p=c-d,h=tu*f,g=h-(h-f),y=f-g,M=p*y-(w-d*g-p*g-d*y),v=x-M,l=x-v,uu[0]=x-(v+l)+(l-M),_=m+v,l=_-m,b=m-(_-l)+(v-l),v=b-w,l=b-v,uu[1]=b-(v+l)+(l-w),A=_+v,l=A-_,uu[2]=_-(A-l)+(v-l),uu[3]=A;const D=nu(z,ou,4,uu,au);return au[D-1]}(t,n,e,r,i,o,f)}const fu=Math.pow(2,-52),su=new Uint32Array(512);class lu{static from(t,n=vu,e=_u){const r=t.length,i=new Float64Array(2*r);for(let o=0;o<r;o++){const r=t[o];i[2*o]=n(r),i[2*o+1]=e(r)}return new lu(i)}constructor(t){const n=t.length>>1;if(n>0&&"number"!=typeof t[0])throw new Error("Expected coords to contain numbers.");this.coords=t;const e=Math.max(2*n-5,0);this._triangles=new Uint32Array(3*e),this._halfedges=new Int32Array(3*e),this._hashSize=Math.ceil(Math.sqrt(n)),this._hullPrev=new Uint32Array(n),this._hullNext=new Uint32Array(n),this._hullTri=new Uint32Array(n),this._hullHash=new Int32Array(this._hashSize).fill(-1),this._ids=new Uint32Array(n),this._dists=new Float64Array(n),this.update()}update(){const{coords:t,_hullPrev:n,_hullNext:e,_hullTri:r,_hullHash:i}=this,o=t.length>>1;let a=1/0,u=1/0,c=-1/0,f=-1/0;for(let n=0;n<o;n++){const e=t[2*n],r=t[2*n+1];e<a&&(a=e),r<u&&(u=r),e>c&&(c=e),r>f&&(f=r),this._ids[n]=n}const s=(a+c)/2,l=(u+f)/2;let h,d,p,g=1/0;for(let n=0;n<o;n++){const e=hu(s,l,t[2*n],t[2*n+1]);e<g&&(h=n,g=e)}const y=t[2*h],v=t[2*h+1];g=1/0;for(let n=0;n<o;n++){if(n===h)continue;const e=hu(y,v,t[2*n],t[2*n+1]);e<g&&e>0&&(d=n,g=e)}let _=t[2*d],b=t[2*d+1],m=1/0;for(let n=0;n<o;n++){if(n===h||n===d)continue;const e=pu(y,v,_,b,t[2*n],t[2*n+1]);e<m&&(p=n,m=e)}let x=t[2*p],w=t[2*p+1];if(m===1/0){for(let n=0;n<o;n++)this._dists[n]=t[2*n]-t[0]||t[2*n+1]-t[1];gu(this._ids,this._dists,0,o-1);const n=new Uint32Array(o);let e=0;for(let t=0,r=-1/0;t<o;t++){const i=this._ids[t];this._dists[i]>r&&(n[e++]=i,r=this._dists[i])}return this.hull=n.subarray(0,e),this.triangles=new Uint32Array(0),void(this.halfedges=new Uint32Array(0))}if(cu(y,v,_,b,x,w)<0){const t=d,n=_,e=b;d=p,_=x,b=w,p=t,x=n,w=e}const M=function(t,n,e,r,i,o){const a=e-t,u=r-n,c=i-t,f=o-n,s=a*a+u*u,l=c*c+f*f,h=.5/(a*f-u*c);return{x:t+(f*s-u*l)*h,y:n+(a*l-c*s)*h}}(y,v,_,b,x,w);this._cx=M.x,this._cy=M.y;for(let n=0;n<o;n++)this._dists[n]=hu(t[2*n],t[2*n+1],M.x,M.y);gu(this._ids,this._dists,0,o-1),this._hullStart=h;let A=3;e[h]=n[p]=d,e[d]=n[h]=p,e[p]=n[d]=h,r[h]=0,r[d]=1,r[p]=2,i.fill(-1),i[this._hashKey(y,v)]=h,i[this._hashKey(_,b)]=d,i[this._hashKey(x,w)]=p,this.trianglesLen=0,this._addTriangle(h,d,p,-1,-1,-1);for(let o,a,u=0;u<this._ids.length;u++){const c=this._ids[u],f=t[2*c],s=t[2*c+1];if(u>0&&Math.abs(f-o)<=fu&&Math.abs(s-a)<=fu)continue;if(o=f,a=s,c===h||c===d||c===p)continue;let l=0;for(let t=0,n=this._hashKey(f,s);t<this._hashSize&&(l=i[(n+t)%this._hashSize],-1===l||l===e[l]);t++);l=n[l];let g,y=l;for(;g=e[y],cu(f,s,t[2*y],t[2*y+1],t[2*g],t[2*g+1])>=0;)if(y=g,y===l){y=-1;break}if(-1===y)continue;let v=this._addTriangle(y,c,e[y],-1,-1,r[y]);r[c]=this._legalize(v+2),r[y]=v,A++;let _=e[y];for(;g=e[_],cu(f,s,t[2*_],t[2*_+1],t[2*g],t[2*g+1])<0;)v=this._addTriangle(_,c,g,r[c],-1,r[_]),r[c]=this._legalize(v+2),e[_]=_,A--,_=g;if(y===l)for(;g=n[y],cu(f,s,t[2*g],t[2*g+1],t[2*y],t[2*y+1])<0;)v=this._addTriangle(g,c,y,-1,r[y],r[g]),this._legalize(v+2),r[g]=v,e[y]=y,A--,y=g;this._hullStart=n[c]=y,e[y]=n[_]=c,e[c]=_,i[this._hashKey(f,s)]=c,i[this._hashKey(t[2*y],t[2*y+1])]=y}this.hull=new Uint32Array(A);for(let t=0,n=this._hullStart;t<A;t++)this.hull[t]=n,n=e[n];this.triangles=this._triangles.subarray(0,this.trianglesLen),this.halfedges=this._halfedges.subarray(0,this.trianglesLen)}_hashKey(t,n){return Math.floor(function(t,n){const e=t/(Math.abs(t)+Math.abs(n));return(n>0?3-e:1+e)/4}(t-this._cx,n-this._cy)*this._hashSize)%this._hashSize}_legalize(t){const{_triangles:n,_halfedges:e,coords:r}=this;let i=0,o=0;for(;;){const a=e[t],u=t-t%3;if(o=u+(t+2)%3,-1===a){if(0===i)break;t=su[--i];continue}const c=a-a%3,f=u+(t+1)%3,s=c+(a+2)%3,l=n[o],h=n[t],d=n[f],p=n[s];if(du(r[2*l],r[2*l+1],r[2*h],r[2*h+1],r[2*d],r[2*d+1],r[2*p],r[2*p+1])){n[t]=p,n[a]=l;const r=e[s];if(-1===r){let n=this._hullStart;do{if(this._hullTri[n]===s){this._hullTri[n]=t;break}n=this._hullPrev[n]}while(n!==this._hullStart)}this._link(t,r),this._link(a,e[o]),this._link(o,s);const u=c+(a+1)%3;i<su.length&&(su[i++]=u)}else{if(0===i)break;t=su[--i]}}return o}_link(t,n){this._halfedges[t]=n,-1!==n&&(this._halfedges[n]=t)}_addTriangle(t,n,e,r,i,o){const a=this.trianglesLen;return this._triangles[a]=t,this._triangles[a+1]=n,this._triangles[a+2]=e,this._link(a,r),this._link(a+1,i),this._link(a+2,o),this.trianglesLen+=3,a}}function hu(t,n,e,r){const i=t-e,o=n-r;return i*i+o*o}function du(t,n,e,r,i,o,a,u){const c=t-a,f=n-u,s=e-a,l=r-u,h=i-a,d=o-u,p=s*s+l*l,g=h*h+d*d;return c*(l*g-p*d)-f*(s*g-p*h)+(c*c+f*f)*(s*d-l*h)<0}function pu(t,n,e,r,i,o){const a=e-t,u=r-n,c=i-t,f=o-n,s=a*a+u*u,l=c*c+f*f,h=.5/(a*f-u*c),d=(f*s-u*l)*h,p=(a*l-c*s)*h;return d*d+p*p}function gu(t,n,e,r){if(r-e<=20)for(let i=e+1;i<=r;i++){const r=t[i],o=n[r];let a=i-1;for(;a>=e&&n[t[a]]>o;)t[a+1]=t[a--];t[a+1]=r}else{let i=e+1,o=r;yu(t,e+r>>1,i),n[t[e]]>n[t[r]]&&yu(t,e,r),n[t[i]]>n[t[r]]&&yu(t,i,r),n[t[e]]>n[t[i]]&&yu(t,e,i);const a=t[i],u=n[a];for(;;){do{i++}while(n[t[i]]<u);do{o--}while(n[t[o]]>u);if(o<i)break;yu(t,i,o)}t[e+1]=t[o],t[o]=a,r-i+1>=o-e?(gu(t,n,i,r),gu(t,n,e,o-1)):(gu(t,n,e,o-1),gu(t,n,i,r))}}function yu(t,n,e){const r=t[n];t[n]=t[e],t[e]=r}function vu(t){return t[0]}function _u(t){return t[1]}const bu=1e-6;class mu{constructor(){this._x0=this._y0=this._x1=this._y1=null,this._=""}moveTo(t,n){this._+=`M${this._x0=this._x1=+t},${this._y0=this._y1=+n}`}closePath(){null!==this._x1&&(this._x1=this._x0,this._y1=this._y0,this._+="Z")}lineTo(t,n){this._+=`L${this._x1=+t},${this._y1=+n}`}arc(t,n,e){const r=(t=+t)+(e=+e),i=n=+n;if(e<0)throw new Error("negative radius");null===this._x1?this._+=`M${r},${i}`:(Math.abs(this._x1-r)>bu||Math.abs(this._y1-i)>bu)&&(this._+="L"+r+","+i),e&&(this._+=`A${e},${e},0,1,1,${t-e},${n}A${e},${e},0,1,1,${this._x1=r},${this._y1=i}`)}rect(t,n,e,r){this._+=`M${this._x0=this._x1=+t},${this._y0=this._y1=+n}h${+e}v${+r}h${-e}Z`}value(){return this._||null}}class xu{constructor(){this._=[]}moveTo(t,n){this._.push([t,n])}closePath(){this._.push(this._[0].slice())}lineTo(t,n){this._.push([t,n])}value(){return this._.length?this._:null}}class wu{constructor(t,[n,e,r,i]=[0,0,960,500]){if(!((r=+r)>=(n=+n)&&(i=+i)>=(e=+e)))throw new Error("invalid bounds");this.delaunay=t,this._circumcenters=new Float64Array(2*t.points.length),this.vectors=new Float64Array(2*t.points.length),this.xmax=r,this.xmin=n,this.ymax=i,this.ymin=e,this._init()}update(){return this.delaunay.update(),this._init(),this}_init(){const{delaunay:{points:t,hull:n,triangles:e},vectors:r}=this,i=this.circumcenters=this._circumcenters.subarray(0,e.length/3*2);for(let n,r,o=0,a=0,u=e.length;o<u;o+=3,a+=2){const u=2*e[o],c=2*e[o+1],f=2*e[o+2],s=t[u],l=t[u+1],h=t[c],d=t[c+1],p=t[f],g=t[f+1],y=h-s,v=d-l,_=p-s,b=g-l,m=2*(y*b-v*_);if(Math.abs(m)<1e-9){let i=1e9;const o=2*e[0];i*=Math.sign((t[o]-s)*b-(t[o+1]-l)*_),n=(s+p)/2-i*b,r=(l+g)/2+i*_}else{const t=1/m,e=y*y+v*v,i=_*_+b*b;n=s+(b*e-v*i)*t,r=l+(y*i-_*e)*t}i[a]=n,i[a+1]=r}let o,a,u,c=n[n.length-1],f=4*c,s=t[2*c],l=t[2*c+1];r.fill(0);for(let e=0;e<n.length;++e)c=n[e],o=f,a=s,u=l,f=4*c,s=t[2*c],l=t[2*c+1],r[o+2]=r[f]=u-l,r[o+3]=r[f+1]=s-a}render(t){const n=null==t?t=new mu:void 0,{delaunay:{halfedges:e,inedges:r,hull:i},circumcenters:o,vectors:a}=this;if(i.length<=1)return null;for(let n=0,r=e.length;n<r;++n){const r=e[n];if(r<n)continue;const i=2*Math.floor(n/3),a=2*Math.floor(r/3),u=o[i],c=o[i+1],f=o[a],s=o[a+1];this._renderSegment(u,c,f,s,t)}let u,c=i[i.length-1];for(let n=0;n<i.length;++n){u=c,c=i[n];const e=2*Math.floor(r[c]/3),f=o[e],s=o[e+1],l=4*u,h=this._project(f,s,a[l+2],a[l+3]);h&&this._renderSegment(f,s,h[0],h[1],t)}return n&&n.value()}renderBounds(t){const n=null==t?t=new mu:void 0;return t.rect(this.xmin,this.ymin,this.xmax-this.xmin,this.ymax-this.ymin),n&&n.value()}renderCell(t,n){const e=null==n?n=new mu:void 0,r=this._clip(t);if(null===r||!r.length)return;n.moveTo(r[0],r[1]);let i=r.length;for(;r[0]===r[i-2]&&r[1]===r[i-1]&&i>1;)i-=2;for(let t=2;t<i;t+=2)r[t]===r[t-2]&&r[t+1]===r[t-1]||n.lineTo(r[t],r[t+1]);return n.closePath(),e&&e.value()}*cellPolygons(){const{delaunay:{points:t}}=this;for(let n=0,e=t.length/2;n<e;++n){const t=this.cellPolygon(n);t&&(t.index=n,yield t)}}cellPolygon(t){const n=new xu;return this.renderCell(t,n),n.value()}_renderSegment(t,n,e,r,i){let o;const a=this._regioncode(t,n),u=this._regioncode(e,r);0===a&&0===u?(i.moveTo(t,n),i.lineTo(e,r)):(o=this._clipSegment(t,n,e,r,a,u))&&(i.moveTo(o[0],o[1]),i.lineTo(o[2],o[3]))}contains(t,n,e){return(n=+n)==n&&(e=+e)==e&&this.delaunay._step(t,n,e)===t}*neighbors(t){const n=this._clip(t);if(n)for(const e of this.delaunay.neighbors(t)){const t=this._clip(e);if(t)t:for(let r=0,i=n.length;r<i;r+=2)for(let o=0,a=t.length;o<a;o+=2)if(n[r]==t[o]&&n[r+1]==t[o+1]&&n[(r+2)%i]==t[(o+a-2)%a]&&n[(r+3)%i]==t[(o+a-1)%a]){yield e;break t}}}_cell(t){const{circumcenters:n,delaunay:{inedges:e,halfedges:r,triangles:i}}=this,o=e[t];if(-1===o)return null;const a=[];let u=o;do{const e=Math.floor(u/3);if(a.push(n[2*e],n[2*e+1]),u=u%3==2?u-2:u+1,i[u]!==t)break;u=r[u]}while(u!==o&&-1!==u);return a}_clip(t){if(0===t&&1===this.delaunay.hull.length)return[this.xmax,this.ymin,this.xmax,this.ymax,this.xmin,this.ymax,this.xmin,this.ymin];const n=this._cell(t);if(null===n)return null;const{vectors:e}=this,r=4*t;return e[r]||e[r+1]?this._clipInfinite(t,n,e[r],e[r+1],e[r+2],e[r+3]):this._clipFinite(t,n)}_clipFinite(t,n){const e=n.length;let r,i,o,a,u=null,c=n[e-2],f=n[e-1],s=this._regioncode(c,f),l=0;for(let h=0;h<e;h+=2)if(r=c,i=f,c=n[h],f=n[h+1],o=s,s=this._regioncode(c,f),0===o&&0===s)a=l,l=0,u?u.push(c,f):u=[c,f];else{let n,e,h,d,p;if(0===o){if(null===(n=this._clipSegment(r,i,c,f,o,s)))continue;[e,h,d,p]=n}else{if(null===(n=this._clipSegment(c,f,r,i,s,o)))continue;[d,p,e,h]=n,a=l,l=this._edgecode(e,h),a&&l&&this._edge(t,a,l,u,u.length),u?u.push(e,h):u=[e,h]}a=l,l=this._edgecode(d,p),a&&l&&this._edge(t,a,l,u,u.length),u?u.push(d,p):u=[d,p]}if(u)a=l,l=this._edgecode(u[0],u[1]),a&&l&&this._edge(t,a,l,u,u.length);else if(this.contains(t,(this.xmin+this.xmax)/2,(this.ymin+this.ymax)/2))return[this.xmax,this.ymin,this.xmax,this.ymax,this.xmin,this.ymax,this.xmin,this.ymin];return u}_clipSegment(t,n,e,r,i,o){for(;;){if(0===i&&0===o)return[t,n,e,r];if(i&o)return null;let a,u,c=i||o;8&c?(a=t+(e-t)*(this.ymax-n)/(r-n),u=this.ymax):4&c?(a=t+(e-t)*(this.ymin-n)/(r-n),u=this.ymin):2&c?(u=n+(r-n)*(this.xmax-t)/(e-t),a=this.xmax):(u=n+(r-n)*(this.xmin-t)/(e-t),a=this.xmin),i?(t=a,n=u,i=this._regioncode(t,n)):(e=a,r=u,o=this._regioncode(e,r))}}_clipInfinite(t,n,e,r,i,o){let a,u=Array.from(n);if((a=this._project(u[0],u[1],e,r))&&u.unshift(a[0],a[1]),(a=this._project(u[u.length-2],u[u.length-1],i,o))&&u.push(a[0],a[1]),u=this._clipFinite(t,u))for(let n,e=0,r=u.length,i=this._edgecode(u[r-2],u[r-1]);e<r;e+=2)n=i,i=this._edgecode(u[e],u[e+1]),n&&i&&(e=this._edge(t,n,i,u,e),r=u.length);else this.contains(t,(this.xmin+this.xmax)/2,(this.ymin+this.ymax)/2)&&(u=[this.xmin,this.ymin,this.xmax,this.ymin,this.xmax,this.ymax,this.xmin,this.ymax]);return u}_edge(t,n,e,r,i){for(;n!==e;){let e,o;switch(n){case 5:n=4;continue;case 4:n=6,e=this.xmax,o=this.ymin;break;case 6:n=2;continue;case 2:n=10,e=this.xmax,o=this.ymax;break;case 10:n=8;continue;case 8:n=9,e=this.xmin,o=this.ymax;break;case 9:n=1;continue;case 1:n=5,e=this.xmin,o=this.ymin}r[i]===e&&r[i+1]===o||!this.contains(t,e,o)||(r.splice(i,0,e,o),i+=2)}if(r.length>4)for(let t=0;t<r.length;t+=2){const n=(t+2)%r.length,e=(t+4)%r.length;(r[t]===r[n]&&r[n]===r[e]||r[t+1]===r[n+1]&&r[n+1]===r[e+1])&&(r.splice(n,2),t-=2)}return i}_project(t,n,e,r){let i,o,a,u=1/0;if(r<0){if(n<=this.ymin)return null;(i=(this.ymin-n)/r)<u&&(a=this.ymin,o=t+(u=i)*e)}else if(r>0){if(n>=this.ymax)return null;(i=(this.ymax-n)/r)<u&&(a=this.ymax,o=t+(u=i)*e)}if(e>0){if(t>=this.xmax)return null;(i=(this.xmax-t)/e)<u&&(o=this.xmax,a=n+(u=i)*r)}else if(e<0){if(t<=this.xmin)return null;(i=(this.xmin-t)/e)<u&&(o=this.xmin,a=n+(u=i)*r)}return[o,a]}_edgecode(t,n){return(t===this.xmin?1:t===this.xmax?2:0)|(n===this.ymin?4:n===this.ymax?8:0)}_regioncode(t,n){return(t<this.xmin?1:t>this.xmax?2:0)|(n<this.ymin?4:n>this.ymax?8:0)}}const Mu=2*Math.PI,Au=Math.pow;function Tu(t){return t[0]}function Su(t){return t[1]}function Eu(t,n,e){return[t+Math.sin(t+n)*e,n+Math.cos(t-n)*e]}class ku{static from(t,n=Tu,e=Su,r){return new ku("length"in t?function(t,n,e,r){const i=t.length,o=new Float64Array(2*i);for(let a=0;a<i;++a){const i=t[a];o[2*a]=n.call(r,i,a,t),o[2*a+1]=e.call(r,i,a,t)}return o}(t,n,e,r):Float64Array.from(function*(t,n,e,r){let i=0;for(const o of t)yield n.call(r,o,i,t),yield e.call(r,o,i,t),++i}(t,n,e,r)))}constructor(t){this._delaunator=new lu(t),this.inedges=new Int32Array(t.length/2),this._hullIndex=new Int32Array(t.length/2),this.points=this._delaunator.coords,this._init()}update(){return this._delaunator.update(),this._init(),this}_init(){const t=this._delaunator,n=this.points;if(t.hull&&t.hull.length>2&&function(t){const{triangles:n,coords:e}=t;for(let t=0;t<n.length;t+=3){const r=2*n[t],i=2*n[t+1],o=2*n[t+2];if((e[o]-e[r])*(e[i+1]-e[r+1])-(e[i]-e[r])*(e[o+1]-e[r+1])>1e-10)return!1}return!0}(t)){this.collinear=Int32Array.from({length:n.length/2},((t,n)=>n)).sort(((t,e)=>n[2*t]-n[2*e]||n[2*t+1]-n[2*e+1]));const t=this.collinear[0],e=this.collinear[this.collinear.length-1],r=[n[2*t],n[2*t+1],n[2*e],n[2*e+1]],i=1e-8*Math.hypot(r[3]-r[1],r[2]-r[0]);for(let t=0,e=n.length/2;t<e;++t){const e=Eu(n[2*t],n[2*t+1],i);n[2*t]=e[0],n[2*t+1]=e[1]}this._delaunator=new lu(n)}else delete this.collinear;const e=this.halfedges=this._delaunator.halfedges,r=this.hull=this._delaunator.hull,i=this.triangles=this._delaunator.triangles,o=this.inedges.fill(-1),a=this._hullIndex.fill(-1);for(let t=0,n=e.length;t<n;++t){const n=i[t%3==2?t-2:t+1];-1!==e[t]&&-1!==o[n]||(o[n]=t)}for(let t=0,n=r.length;t<n;++t)a[r[t]]=t;r.length<=2&&r.length>0&&(this.triangles=new Int32Array(3).fill(-1),this.halfedges=new Int32Array(3).fill(-1),this.triangles[0]=r[0],o[r[0]]=1,2===r.length&&(o[r[1]]=0,this.triangles[1]=r[1],this.triangles[2]=r[1]))}voronoi(t){return new wu(this,t)}*neighbors(t){const{inedges:n,hull:e,_hullIndex:r,halfedges:i,triangles:o,collinear:a}=this;if(a){const n=a.indexOf(t);return n>0&&(yield a[n-1]),void(n<a.length-1&&(yield a[n+1]))}const u=n[t];if(-1===u)return;let c=u,f=-1;do{if(yield f=o[c],c=c%3==2?c-2:c+1,o[c]!==t)return;if(c=i[c],-1===c){const n=e[(r[t]+1)%e.length];return void(n!==f&&(yield n))}}while(c!==u)}find(t,n,e=0){if((t=+t)!=t||(n=+n)!=n)return-1;const r=e;let i;for(;(i=this._step(e,t,n))>=0&&i!==e&&i!==r;)e=i;return i}_step(t,n,e){const{inedges:r,hull:i,_hullIndex:o,halfedges:a,triangles:u,points:c}=this;if(-1===r[t]||!c.length)return(t+1)%(c.length>>1);let f=t,s=Au(n-c[2*t],2)+Au(e-c[2*t+1],2);const l=r[t];let h=l;do{let r=u[h];const l=Au(n-c[2*r],2)+Au(e-c[2*r+1],2);if(l<s&&(s=l,f=r),h=h%3==2?h-2:h+1,u[h]!==t)break;if(h=a[h],-1===h){if(h=i[(o[t]+1)%i.length],h!==r&&Au(n-c[2*h],2)+Au(e-c[2*h+1],2)<s)return h;break}}while(h!==l);return f}render(t){const n=null==t?t=new mu:void 0,{points:e,halfedges:r,triangles:i}=this;for(let n=0,o=r.length;n<o;++n){const o=r[n];if(o<n)continue;const a=2*i[n],u=2*i[o];t.moveTo(e[a],e[a+1]),t.lineTo(e[u],e[u+1])}return this.renderHull(t),n&&n.value()}renderPoints(t,n){void 0!==n||t&&"function"==typeof t.moveTo||(n=t,t=null),n=null==n?2:+n;const e=null==t?t=new mu:void 0,{points:r}=this;for(let e=0,i=r.length;e<i;e+=2){const i=r[e],o=r[e+1];t.moveTo(i+n,o),t.arc(i,o,n,0,Mu)}return e&&e.value()}renderHull(t){const n=null==t?t=new mu:void 0,{hull:e,points:r}=this,i=2*e[0],o=e.length;t.moveTo(r[i],r[i+1]);for(let n=1;n<o;++n){const i=2*e[n];t.lineTo(r[i],r[i+1])}return t.closePath(),n&&n.value()}hullPolygon(){const t=new xu;return this.renderHull(t),t.value()}renderTriangle(t,n){const e=null==n?n=new mu:void 0,{points:r,triangles:i}=this,o=2*i[t*=3],a=2*i[t+1],u=2*i[t+2];return n.moveTo(r[o],r[o+1]),n.lineTo(r[a],r[a+1]),n.lineTo(r[u],r[u+1]),n.closePath(),e&&e.value()}*trianglePolygons(){const{triangles:t}=this;for(let n=0,e=t.length/3;n<e;++n)yield this.trianglePolygon(n)}trianglePolygon(t){const n=new xu;return this.renderTriangle(t,n),n.value()}}var Nu={},Cu={};function Pu(t){return new Function("d","return {"+t.map((function(t,n){return JSON.stringify(t)+": d["+n+'] || ""'})).join(",")+"}")}function zu(t){var n=Object.create(null),e=[];return t.forEach((function(t){for(var r in t)r in n||e.push(n[r]=r)})),e}function Du(t,n){var e=t+"",r=e.length;return r<n?new Array(n-r+1).join(0)+e:e}function Ru(t){var n=t.getUTCHours(),e=t.getUTCMinutes(),r=t.getUTCSeconds(),i=t.getUTCMilliseconds();return isNaN(t)?"Invalid Date":function(t){return t<0?"-"+Du(-t,6):t>9999?"+"+Du(t,6):Du(t,4)}(t.getUTCFullYear())+"-"+Du(t.getUTCMonth()+1,2)+"-"+Du(t.getUTCDate(),2)+(i?"T"+Du(n,2)+":"+Du(e,2)+":"+Du(r,2)+"."+Du(i,3)+"Z":r?"T"+Du(n,2)+":"+Du(e,2)+":"+Du(r,2)+"Z":e||n?"T"+Du(n,2)+":"+Du(e,2)+"Z":"")}function Fu(t){var n=new RegExp('["'+t+"\n\r]"),e=t.charCodeAt(0);function r(t,n){var r,i=[],o=t.length,a=0,u=0,c=o<=0,f=!1;function s(){if(c)return Cu;if(f)return f=!1,Nu;var n,r,i=a;if(34===t.charCodeAt(i)){for(;a++<o&&34!==t.charCodeAt(a)||34===t.charCodeAt(++a););return(n=a)>=o?c=!0:10===(r=t.charCodeAt(a++))?f=!0:13===r&&(f=!0,10===t.charCodeAt(a)&&++a),t.slice(i+1,n-1).replace(/""/g,'"')}for(;a<o;){if(10===(r=t.charCodeAt(n=a++)))f=!0;else if(13===r)f=!0,10===t.charCodeAt(a)&&++a;else if(r!==e)continue;return t.slice(i,n)}return c=!0,t.slice(i,o)}for(10===t.charCodeAt(o-1)&&--o,13===t.charCodeAt(o-1)&&--o;(r=s())!==Cu;){for(var l=[];r!==Nu&&r!==Cu;)l.push(r),r=s();n&&null==(l=n(l,u++))||i.push(l)}return i}function i(n,e){return n.map((function(n){return e.map((function(t){return a(n[t])})).join(t)}))}function o(n){return n.map(a).join(t)}function a(t){return null==t?"":t instanceof Date?Ru(t):n.test(t+="")?'"'+t.replace(/"/g,'""')+'"':t}return{parse:function(t,n){var e,i,o=r(t,(function(t,r){if(e)return e(t,r-1);i=t,e=n?function(t,n){var e=Pu(t);return function(r,i){return n(e(r),i,t)}}(t,n):Pu(t)}));return o.columns=i||[],o},parseRows:r,format:function(n,e){return null==e&&(e=zu(n)),[e.map(a).join(t)].concat(i(n,e)).join("\n")},formatBody:function(t,n){return null==n&&(n=zu(t)),i(t,n).join("\n")},formatRows:function(t){return t.map(o).join("\n")},formatRow:o,formatValue:a}}var qu=Fu(","),Iu=qu.parse,Ou=qu.parseRows,Uu=qu.format,Bu=qu.formatBody,Yu=qu.formatRows,Lu=qu.formatRow,ju=qu.formatValue,$u=Fu("\t"),Hu=$u.parse,Xu=$u.parseRows,Gu=$u.format,Vu=$u.formatBody,Wu=$u.formatRows,Zu=$u.formatRow,Ku=$u.formatValue;const Qu=new Date("2019-01-01T00:00").getHours()||new Date("2019-07-01T00:00").getHours();function Ju(t){if(!t.ok)throw new Error(t.status+" "+t.statusText);return t.blob()}function tc(t){if(!t.ok)throw new Error(t.status+" "+t.statusText);return t.arrayBuffer()}function nc(t){if(!t.ok)throw new Error(t.status+" "+t.statusText);return t.text()}function ec(t,n){return fetch(t,n).then(nc)}function rc(t){return function(n,e,r){return 2===arguments.length&&"function"==typeof e&&(r=e,e=void 0),ec(n,e).then((function(n){return t(n,r)}))}}var ic=rc(Iu),oc=rc(Hu);function ac(t){if(!t.ok)throw new Error(t.status+" "+t.statusText);if(204!==t.status&&205!==t.status)return t.json()}function uc(t){return(n,e)=>ec(n,e).then((n=>(new DOMParser).parseFromString(n,t)))}var cc=uc("application/xml"),fc=uc("text/html"),sc=uc("image/svg+xml");function lc(t,n,e,r){if(isNaN(n)||isNaN(e))return t;var i,o,a,u,c,f,s,l,h,d=t._root,p={data:r},g=t._x0,y=t._y0,v=t._x1,_=t._y1;if(!d)return t._root=p,t;for(;d.length;)if((f=n>=(o=(g+v)/2))?g=o:v=o,(s=e>=(a=(y+_)/2))?y=a:_=a,i=d,!(d=d[l=s<<1|f]))return i[l]=p,t;if(u=+t._x.call(null,d.data),c=+t._y.call(null,d.data),n===u&&e===c)return p.next=d,i?i[l]=p:t._root=p,t;do{i=i?i[l]=new Array(4):t._root=new Array(4),(f=n>=(o=(g+v)/2))?g=o:v=o,(s=e>=(a=(y+_)/2))?y=a:_=a}while((l=s<<1|f)==(h=(c>=a)<<1|u>=o));return i[h]=d,i[l]=p,t}function hc(t,n,e,r,i){this.node=t,this.x0=n,this.y0=e,this.x1=r,this.y1=i}function dc(t){return t[0]}function pc(t){return t[1]}function gc(t,n,e){var r=new yc(null==n?dc:n,null==e?pc:e,NaN,NaN,NaN,NaN);return null==t?r:r.addAll(t)}function yc(t,n,e,r,i,o){this._x=t,this._y=n,this._x0=e,this._y0=r,this._x1=i,this._y1=o,this._root=void 0}function vc(t){for(var n={data:t.data},e=n;t=t.next;)e=e.next={data:t.data};return n}var _c=gc.prototype=yc.prototype;function bc(t){return function(){return t}}function mc(t){return 1e-6*(t()-.5)}function xc(t){return t.x+t.vx}function wc(t){return t.y+t.vy}function Mc(t){return t.index}function Ac(t,n){var e=t.get(n);if(!e)throw new Error("node not found: "+n);return e}_c.copy=function(){var t,n,e=new yc(this._x,this._y,this._x0,this._y0,this._x1,this._y1),r=this._root;if(!r)return e;if(!r.length)return e._root=vc(r),e;for(t=[{source:r,target:e._root=new Array(4)}];r=t.pop();)for(var i=0;i<4;++i)(n=r.source[i])&&(n.length?t.push({source:n,target:r.target[i]=new Array(4)}):r.target[i]=vc(n));return e},_c.add=function(t){const n=+this._x.call(null,t),e=+this._y.call(null,t);return lc(this.cover(n,e),n,e,t)},_c.addAll=function(t){var n,e,r,i,o=t.length,a=new Array(o),u=new Array(o),c=1/0,f=1/0,s=-1/0,l=-1/0;for(e=0;e<o;++e)isNaN(r=+this._x.call(null,n=t[e]))||isNaN(i=+this._y.call(null,n))||(a[e]=r,u[e]=i,r<c&&(c=r),r>s&&(s=r),i<f&&(f=i),i>l&&(l=i));if(c>s||f>l)return this;for(this.cover(c,f).cover(s,l),e=0;e<o;++e)lc(this,a[e],u[e],t[e]);return this},_c.cover=function(t,n){if(isNaN(t=+t)||isNaN(n=+n))return this;var e=this._x0,r=this._y0,i=this._x1,o=this._y1;if(isNaN(e))i=(e=Math.floor(t))+1,o=(r=Math.floor(n))+1;else{for(var a,u,c=i-e||1,f=this._root;e>t||t>=i||r>n||n>=o;)switch(u=(n<r)<<1|t<e,(a=new Array(4))[u]=f,f=a,c*=2,u){case 0:i=e+c,o=r+c;break;case 1:e=i-c,o=r+c;break;case 2:i=e+c,r=o-c;break;case 3:e=i-c,r=o-c}this._root&&this._root.length&&(this._root=f)}return this._x0=e,this._y0=r,this._x1=i,this._y1=o,this},_c.data=function(){var t=[];return this.visit((function(n){if(!n.length)do{t.push(n.data)}while(n=n.next)})),t},_c.extent=function(t){return arguments.length?this.cover(+t[0][0],+t[0][1]).cover(+t[1][0],+t[1][1]):isNaN(this._x0)?void 0:[[this._x0,this._y0],[this._x1,this._y1]]},_c.find=function(t,n,e){var r,i,o,a,u,c,f,s=this._x0,l=this._y0,h=this._x1,d=this._y1,p=[],g=this._root;for(g&&p.push(new hc(g,s,l,h,d)),null==e?e=1/0:(s=t-e,l=n-e,h=t+e,d=n+e,e*=e);c=p.pop();)if(!(!(g=c.node)||(i=c.x0)>h||(o=c.y0)>d||(a=c.x1)<s||(u=c.y1)<l))if(g.length){var y=(i+a)/2,v=(o+u)/2;p.push(new hc(g[3],y,v,a,u),new hc(g[2],i,v,y,u),new hc(g[1],y,o,a,v),new hc(g[0],i,o,y,v)),(f=(n>=v)<<1|t>=y)&&(c=p[p.length-1],p[p.length-1]=p[p.length-1-f],p[p.length-1-f]=c)}else{var _=t-+this._x.call(null,g.data),b=n-+this._y.call(null,g.data),m=_*_+b*b;if(m<e){var x=Math.sqrt(e=m);s=t-x,l=n-x,h=t+x,d=n+x,r=g.data}}return r},_c.remove=function(t){if(isNaN(o=+this._x.call(null,t))||isNaN(a=+this._y.call(null,t)))return this;var n,e,r,i,o,a,u,c,f,s,l,h,d=this._root,p=this._x0,g=this._y0,y=this._x1,v=this._y1;if(!d)return this;if(d.length)for(;;){if((f=o>=(u=(p+y)/2))?p=u:y=u,(s=a>=(c=(g+v)/2))?g=c:v=c,n=d,!(d=d[l=s<<1|f]))return this;if(!d.length)break;(n[l+1&3]||n[l+2&3]||n[l+3&3])&&(e=n,h=l)}for(;d.data!==t;)if(r=d,!(d=d.next))return this;return(i=d.next)&&delete d.next,r?(i?r.next=i:delete r.next,this):n?(i?n[l]=i:delete n[l],(d=n[0]||n[1]||n[2]||n[3])&&d===(n[3]||n[2]||n[1]||n[0])&&!d.length&&(e?e[h]=d:this._root=d),this):(this._root=i,this)},_c.removeAll=function(t){for(var n=0,e=t.length;n<e;++n)this.remove(t[n]);return this},_c.root=function(){return this._root},_c.size=function(){var t=0;return this.visit((function(n){if(!n.length)do{++t}while(n=n.next)})),t},_c.visit=function(t){var n,e,r,i,o,a,u=[],c=this._root;for(c&&u.push(new hc(c,this._x0,this._y0,this._x1,this._y1));n=u.pop();)if(!t(c=n.node,r=n.x0,i=n.y0,o=n.x1,a=n.y1)&&c.length){var f=(r+o)/2,s=(i+a)/2;(e=c[3])&&u.push(new hc(e,f,s,o,a)),(e=c[2])&&u.push(new hc(e,r,s,f,a)),(e=c[1])&&u.push(new hc(e,f,i,o,s)),(e=c[0])&&u.push(new hc(e,r,i,f,s))}return this},_c.visitAfter=function(t){var n,e=[],r=[];for(this._root&&e.push(new hc(this._root,this._x0,this._y0,this._x1,this._y1));n=e.pop();){var i=n.node;if(i.length){var o,a=n.x0,u=n.y0,c=n.x1,f=n.y1,s=(a+c)/2,l=(u+f)/2;(o=i[0])&&e.push(new hc(o,a,u,s,l)),(o=i[1])&&e.push(new hc(o,s,u,c,l)),(o=i[2])&&e.push(new hc(o,a,l,s,f)),(o=i[3])&&e.push(new hc(o,s,l,c,f))}r.push(n)}for(;n=r.pop();)t(n.node,n.x0,n.y0,n.x1,n.y1);return this},_c.x=function(t){return arguments.length?(this._x=t,this):this._x},_c.y=function(t){return arguments.length?(this._y=t,this):this._y};const Tc=4294967296;function Sc(t){return t.x}function Ec(t){return t.y}var kc=Math.PI*(3-Math.sqrt(5));function Nc(t,n){if((e=(t=n?t.toExponential(n-1):t.toExponential()).indexOf("e"))<0)return null;var e,r=t.slice(0,e);return[r.length>1?r[0]+r.slice(2):r,+t.slice(e+1)]}function Cc(t){return(t=Nc(Math.abs(t)))?t[1]:NaN}var Pc,zc=/^(?:(.)?([<>=^]))?([+\-( ])?([$#])?(0)?(\d+)?(,)?(\.\d+)?(~)?([a-z%])?$/i;function Dc(t){if(!(n=zc.exec(t)))throw new Error("invalid format: "+t);var n;return new Rc({fill:n[1],align:n[2],sign:n[3],symbol:n[4],zero:n[5],width:n[6],comma:n[7],precision:n[8]&&n[8].slice(1),trim:n[9],type:n[10]})}function Rc(t){this.fill=void 0===t.fill?" ":t.fill+"",this.align=void 0===t.align?">":t.align+"",this.sign=void 0===t.sign?"-":t.sign+"",this.symbol=void 0===t.symbol?"":t.symbol+"",this.zero=!!t.zero,this.width=void 0===t.width?void 0:+t.width,this.comma=!!t.comma,this.precision=void 0===t.precision?void 0:+t.precision,this.trim=!!t.trim,this.type=void 0===t.type?"":t.type+""}function Fc(t,n){var e=Nc(t,n);if(!e)return t+"";var r=e[0],i=e[1];return i<0?"0."+new Array(-i).join("0")+r:r.length>i+1?r.slice(0,i+1)+"."+r.slice(i+1):r+new Array(i-r.length+2).join("0")}Dc.prototype=Rc.prototype,Rc.prototype.toString=function(){return this.fill+this.align+this.sign+this.symbol+(this.zero?"0":"")+(void 0===this.width?"":Math.max(1,0|this.width))+(this.comma?",":"")+(void 0===this.precision?"":"."+Math.max(0,0|this.precision))+(this.trim?"~":"")+this.type};var qc={"%":(t,n)=>(100*t).toFixed(n),b:t=>Math.round(t).toString(2),c:t=>t+"",d:function(t){return Math.abs(t=Math.round(t))>=1e21?t.toLocaleString("en").replace(/,/g,""):t.toString(10)},e:(t,n)=>t.toExponential(n),f:(t,n)=>t.toFixed(n),g:(t,n)=>t.toPrecision(n),o:t=>Math.round(t).toString(8),p:(t,n)=>Fc(100*t,n),r:Fc,s:function(t,n){var e=Nc(t,n);if(!e)return t+"";var r=e[0],i=e[1],o=i-(Pc=3*Math.max(-8,Math.min(8,Math.floor(i/3))))+1,a=r.length;return o===a?r:o>a?r+new Array(o-a+1).join("0"):o>0?r.slice(0,o)+"."+r.slice(o):"0."+new Array(1-o).join("0")+Nc(t,Math.max(0,n+o-1))[0]},X:t=>Math.round(t).toString(16).toUpperCase(),x:t=>Math.round(t).toString(16)};function Ic(t){return t}var Oc,Uc=Array.prototype.map,Bc=["y","z","a","f","p","n","µ","m","","k","M","G","T","P","E","Z","Y"];function Yc(t){var n,e,r=void 0===t.grouping||void 0===t.thousands?Ic:(n=Uc.call(t.grouping,Number),e=t.thousands+"",function(t,r){for(var i=t.length,o=[],a=0,u=n[0],c=0;i>0&&u>0&&(c+u+1>r&&(u=Math.max(1,r-c)),o.push(t.substring(i-=u,i+u)),!((c+=u+1)>r));)u=n[a=(a+1)%n.length];return o.reverse().join(e)}),i=void 0===t.currency?"":t.currency[0]+"",o=void 0===t.currency?"":t.currency[1]+"",a=void 0===t.decimal?".":t.decimal+"",u=void 0===t.numerals?Ic:function(t){return function(n){return n.replace(/[0-9]/g,(function(n){return t[+n]}))}}(Uc.call(t.numerals,String)),c=void 0===t.percent?"%":t.percent+"",f=void 0===t.minus?"−":t.minus+"",s=void 0===t.nan?"NaN":t.nan+"";function l(t){var n=(t=Dc(t)).fill,e=t.align,l=t.sign,h=t.symbol,d=t.zero,p=t.width,g=t.comma,y=t.precision,v=t.trim,_=t.type;"n"===_?(g=!0,_="g"):qc[_]||(void 0===y&&(y=12),v=!0,_="g"),(d||"0"===n&&"="===e)&&(d=!0,n="0",e="=");var b="$"===h?i:"#"===h&&/[boxX]/.test(_)?"0"+_.toLowerCase():"",m="$"===h?o:/[%p]/.test(_)?c:"",x=qc[_],w=/[defgprs%]/.test(_);function M(t){var i,o,c,h=b,M=m;if("c"===_)M=x(t)+M,t="";else{var A=(t=+t)<0||1/t<0;if(t=isNaN(t)?s:x(Math.abs(t),y),v&&(t=function(t){t:for(var n,e=t.length,r=1,i=-1;r<e;++r)switch(t[r]){case".":i=n=r;break;case"0":0===i&&(i=r),n=r;break;default:if(!+t[r])break t;i>0&&(i=0)}return i>0?t.slice(0,i)+t.slice(n+1):t}(t)),A&&0==+t&&"+"!==l&&(A=!1),h=(A?"("===l?l:f:"-"===l||"("===l?"":l)+h,M=("s"===_?Bc[8+Pc/3]:"")+M+(A&&"("===l?")":""),w)for(i=-1,o=t.length;++i<o;)if(48>(c=t.charCodeAt(i))||c>57){M=(46===c?a+t.slice(i+1):t.slice(i))+M,t=t.slice(0,i);break}}g&&!d&&(t=r(t,1/0));var T=h.length+t.length+M.length,S=T<p?new Array(p-T+1).join(n):"";switch(g&&d&&(t=r(S+t,S.length?p-M.length:1/0),S=""),e){case"<":t=h+t+M+S;break;case"=":t=h+S+t+M;break;case"^":t=S.slice(0,T=S.length>>1)+h+t+M+S.slice(T);break;default:t=S+h+t+M}return u(t)}return y=void 0===y?6:/[gprs]/.test(_)?Math.max(1,Math.min(21,y)):Math.max(0,Math.min(20,y)),M.toString=function(){return t+""},M}return{format:l,formatPrefix:function(t,n){var e=l(((t=Dc(t)).type="f",t)),r=3*Math.max(-8,Math.min(8,Math.floor(Cc(n)/3))),i=Math.pow(10,-r),o=Bc[8+r/3];return function(t){return e(i*t)+o}}}}function Lc(n){return Oc=Yc(n),t.format=Oc.format,t.formatPrefix=Oc.formatPrefix,Oc}function jc(t){return Math.max(0,-Cc(Math.abs(t)))}function $c(t,n){return Math.max(0,3*Math.max(-8,Math.min(8,Math.floor(Cc(n)/3)))-Cc(Math.abs(t)))}function Hc(t,n){return t=Math.abs(t),n=Math.abs(n)-t,Math.max(0,Cc(n)-Cc(t))+1}t.format=void 0,t.formatPrefix=void 0,Lc({thousands:",",grouping:[3],currency:["$",""]});var Xc=1e-6,Gc=1e-12,Vc=Math.PI,Wc=Vc/2,Zc=Vc/4,Kc=2*Vc,Qc=180/Vc,Jc=Vc/180,tf=Math.abs,nf=Math.atan,ef=Math.atan2,rf=Math.cos,of=Math.ceil,af=Math.exp,uf=Math.hypot,cf=Math.log,ff=Math.pow,sf=Math.sin,lf=Math.sign||function(t){return t>0?1:t<0?-1:0},hf=Math.sqrt,df=Math.tan;function pf(t){return t>1?0:t<-1?Vc:Math.acos(t)}function gf(t){return t>1?Wc:t<-1?-Wc:Math.asin(t)}function yf(t){return(t=sf(t/2))*t}function vf(){}function _f(t,n){t&&mf.hasOwnProperty(t.type)&&mf[t.type](t,n)}var bf={Feature:function(t,n){_f(t.geometry,n)},FeatureCollection:function(t,n){for(var e=t.features,r=-1,i=e.length;++r<i;)_f(e[r].geometry,n)}},mf={Sphere:function(t,n){n.sphere()},Point:function(t,n){t=t.coordinates,n.point(t[0],t[1],t[2])},MultiPoint:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)t=e[r],n.point(t[0],t[1],t[2])},LineString:function(t,n){xf(t.coordinates,n,0)},MultiLineString:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)xf(e[r],n,0)},Polygon:function(t,n){wf(t.coordinates,n)},MultiPolygon:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)wf(e[r],n)},GeometryCollection:function(t,n){for(var e=t.geometries,r=-1,i=e.length;++r<i;)_f(e[r],n)}};function xf(t,n,e){var r,i=-1,o=t.length-e;for(n.lineStart();++i<o;)r=t[i],n.point(r[0],r[1],r[2]);n.lineEnd()}function wf(t,n){var e=-1,r=t.length;for(n.polygonStart();++e<r;)xf(t[e],n,1);n.polygonEnd()}function Mf(t,n){t&&bf.hasOwnProperty(t.type)?bf[t.type](t,n):_f(t,n)}var Af,Tf,Sf,Ef,kf,Nf,Cf,Pf,zf,Df,Rf,Ff,qf,If,Of,Uf,Bf=new T,Yf=new T,Lf={point:vf,lineStart:vf,lineEnd:vf,polygonStart:function(){Bf=new T,Lf.lineStart=jf,Lf.lineEnd=$f},polygonEnd:function(){var t=+Bf;Yf.add(t<0?Kc+t:t),this.lineStart=this.lineEnd=this.point=vf},sphere:function(){Yf.add(Kc)}};function jf(){Lf.point=Hf}function $f(){Xf(Af,Tf)}function Hf(t,n){Lf.point=Xf,Af=t,Tf=n,Sf=t*=Jc,Ef=rf(n=(n*=Jc)/2+Zc),kf=sf(n)}function Xf(t,n){var e=(t*=Jc)-Sf,r=e>=0?1:-1,i=r*e,o=rf(n=(n*=Jc)/2+Zc),a=sf(n),u=kf*a,c=Ef*o+u*rf(i),f=u*r*sf(i);Bf.add(ef(f,c)),Sf=t,Ef=o,kf=a}function Gf(t){return[ef(t[1],t[0]),gf(t[2])]}function Vf(t){var n=t[0],e=t[1],r=rf(e);return[r*rf(n),r*sf(n),sf(e)]}function Wf(t,n){return t[0]*n[0]+t[1]*n[1]+t[2]*n[2]}function Zf(t,n){return[t[1]*n[2]-t[2]*n[1],t[2]*n[0]-t[0]*n[2],t[0]*n[1]-t[1]*n[0]]}function Kf(t,n){t[0]+=n[0],t[1]+=n[1],t[2]+=n[2]}function Qf(t,n){return[t[0]*n,t[1]*n,t[2]*n]}function Jf(t){var n=hf(t[0]*t[0]+t[1]*t[1]+t[2]*t[2]);t[0]/=n,t[1]/=n,t[2]/=n}var ts,ns,es,rs,is,os,as,us,cs,fs,ss,ls,hs,ds,ps,gs,ys={point:vs,lineStart:bs,lineEnd:ms,polygonStart:function(){ys.point=xs,ys.lineStart=ws,ys.lineEnd=Ms,If=new T,Lf.polygonStart()},polygonEnd:function(){Lf.polygonEnd(),ys.point=vs,ys.lineStart=bs,ys.lineEnd=ms,Bf<0?(Nf=-(Pf=180),Cf=-(zf=90)):If>Xc?zf=90:If<-1e-6&&(Cf=-90),Uf[0]=Nf,Uf[1]=Pf},sphere:function(){Nf=-(Pf=180),Cf=-(zf=90)}};function vs(t,n){Of.push(Uf=[Nf=t,Pf=t]),n<Cf&&(Cf=n),n>zf&&(zf=n)}function _s(t,n){var e=Vf([t*Jc,n*Jc]);if(qf){var r=Zf(qf,e),i=Zf([r[1],-r[0],0],r);Jf(i),i=Gf(i);var o,a=t-Df,u=a>0?1:-1,c=i[0]*Qc*u,f=tf(a)>180;f^(u*Df<c&&c<u*t)?(o=i[1]*Qc)>zf&&(zf=o):f^(u*Df<(c=(c+360)%360-180)&&c<u*t)?(o=-i[1]*Qc)<Cf&&(Cf=o):(n<Cf&&(Cf=n),n>zf&&(zf=n)),f?t<Df?As(Nf,t)>As(Nf,Pf)&&(Pf=t):As(t,Pf)>As(Nf,Pf)&&(Nf=t):Pf>=Nf?(t<Nf&&(Nf=t),t>Pf&&(Pf=t)):t>Df?As(Nf,t)>As(Nf,Pf)&&(Pf=t):As(t,Pf)>As(Nf,Pf)&&(Nf=t)}else Of.push(Uf=[Nf=t,Pf=t]);n<Cf&&(Cf=n),n>zf&&(zf=n),qf=e,Df=t}function bs(){ys.point=_s}function ms(){Uf[0]=Nf,Uf[1]=Pf,ys.point=vs,qf=null}function xs(t,n){if(qf){var e=t-Df;If.add(tf(e)>180?e+(e>0?360:-360):e)}else Rf=t,Ff=n;Lf.point(t,n),_s(t,n)}function ws(){Lf.lineStart()}function Ms(){xs(Rf,Ff),Lf.lineEnd(),tf(If)>Xc&&(Nf=-(Pf=180)),Uf[0]=Nf,Uf[1]=Pf,qf=null}function As(t,n){return(n-=t)<0?n+360:n}function Ts(t,n){return t[0]-n[0]}function Ss(t,n){return t[0]<=t[1]?t[0]<=n&&n<=t[1]:n<t[0]||t[1]<n}var Es={sphere:vf,point:ks,lineStart:Cs,lineEnd:Ds,polygonStart:function(){Es.lineStart=Rs,Es.lineEnd=Fs},polygonEnd:function(){Es.lineStart=Cs,Es.lineEnd=Ds}};function ks(t,n){t*=Jc;var e=rf(n*=Jc);Ns(e*rf(t),e*sf(t),sf(n))}function Ns(t,n,e){++ts,es+=(t-es)/ts,rs+=(n-rs)/ts,is+=(e-is)/ts}function Cs(){Es.point=Ps}function Ps(t,n){t*=Jc;var e=rf(n*=Jc);ds=e*rf(t),ps=e*sf(t),gs=sf(n),Es.point=zs,Ns(ds,ps,gs)}function zs(t,n){t*=Jc;var e=rf(n*=Jc),r=e*rf(t),i=e*sf(t),o=sf(n),a=ef(hf((a=ps*o-gs*i)*a+(a=gs*r-ds*o)*a+(a=ds*i-ps*r)*a),ds*r+ps*i+gs*o);ns+=a,os+=a*(ds+(ds=r)),as+=a*(ps+(ps=i)),us+=a*(gs+(gs=o)),Ns(ds,ps,gs)}function Ds(){Es.point=ks}function Rs(){Es.point=qs}function Fs(){Is(ls,hs),Es.point=ks}function qs(t,n){ls=t,hs=n,t*=Jc,n*=Jc,Es.point=Is;var e=rf(n);ds=e*rf(t),ps=e*sf(t),gs=sf(n),Ns(ds,ps,gs)}function Is(t,n){t*=Jc;var e=rf(n*=Jc),r=e*rf(t),i=e*sf(t),o=sf(n),a=ps*o-gs*i,u=gs*r-ds*o,c=ds*i-ps*r,f=uf(a,u,c),s=gf(f),l=f&&-s/f;cs.add(l*a),fs.add(l*u),ss.add(l*c),ns+=s,os+=s*(ds+(ds=r)),as+=s*(ps+(ps=i)),us+=s*(gs+(gs=o)),Ns(ds,ps,gs)}function Os(t){return function(){return t}}function Us(t,n){function e(e,r){return e=t(e,r),n(e[0],e[1])}return t.invert&&n.invert&&(e.invert=function(e,r){return(e=n.invert(e,r))&&t.invert(e[0],e[1])}),e}function Bs(t,n){return[tf(t)>Vc?t+Math.round(-t/Kc)*Kc:t,n]}function Ys(t,n,e){return(t%=Kc)?n||e?Us(js(t),$s(n,e)):js(t):n||e?$s(n,e):Bs}function Ls(t){return function(n,e){return[(n+=t)>Vc?n-Kc:n<-Vc?n+Kc:n,e]}}function js(t){var n=Ls(t);return n.invert=Ls(-t),n}function $s(t,n){var e=rf(t),r=sf(t),i=rf(n),o=sf(n);function a(t,n){var a=rf(n),u=rf(t)*a,c=sf(t)*a,f=sf(n),s=f*e+u*r;return[ef(c*i-s*o,u*e-f*r),gf(s*i+c*o)]}return a.invert=function(t,n){var a=rf(n),u=rf(t)*a,c=sf(t)*a,f=sf(n),s=f*i-c*o;return[ef(c*i+f*o,u*e+s*r),gf(s*e-u*r)]},a}function Hs(t){function n(n){return(n=t(n[0]*Jc,n[1]*Jc))[0]*=Qc,n[1]*=Qc,n}return t=Ys(t[0]*Jc,t[1]*Jc,t.length>2?t[2]*Jc:0),n.invert=function(n){return(n=t.invert(n[0]*Jc,n[1]*Jc))[0]*=Qc,n[1]*=Qc,n},n}function Xs(t,n,e,r,i,o){if(e){var a=rf(n),u=sf(n),c=r*e;null==i?(i=n+r*Kc,o=n-c/2):(i=Gs(a,i),o=Gs(a,o),(r>0?i<o:i>o)&&(i+=r*Kc));for(var f,s=i;r>0?s>o:s<o;s-=c)f=Gf([a,-u*rf(s),-u*sf(s)]),t.point(f[0],f[1])}}function Gs(t,n){(n=Vf(n))[0]-=t,Jf(n);var e=pf(-n[1]);return((-n[2]<0?-e:e)+Kc-Xc)%Kc}function Vs(){var t,n=[];return{point:function(n,e,r){t.push([n,e,r])},lineStart:function(){n.push(t=[])},lineEnd:vf,rejoin:function(){n.length>1&&n.push(n.pop().concat(n.shift()))},result:function(){var e=n;return n=[],t=null,e}}}function Ws(t,n){return tf(t[0]-n[0])<Xc&&tf(t[1]-n[1])<Xc}function Zs(t,n,e,r){this.x=t,this.z=n,this.o=e,this.e=r,this.v=!1,this.n=this.p=null}function Ks(t,n,e,r,i){var o,a,u=[],c=[];if(t.forEach((function(t){if(!((n=t.length-1)<=0)){var n,e,r=t[0],a=t[n];if(Ws(r,a)){if(!r[2]&&!a[2]){for(i.lineStart(),o=0;o<n;++o)i.point((r=t[o])[0],r[1]);return void i.lineEnd()}a[0]+=2e-6}u.push(e=new Zs(r,t,null,!0)),c.push(e.o=new Zs(r,null,e,!1)),u.push(e=new Zs(a,t,null,!1)),c.push(e.o=new Zs(a,null,e,!0))}})),u.length){for(c.sort(n),Qs(u),Qs(c),o=0,a=c.length;o<a;++o)c[o].e=e=!e;for(var f,s,l=u[0];;){for(var h=l,d=!0;h.v;)if((h=h.n)===l)return;f=h.z,i.lineStart();do{if(h.v=h.o.v=!0,h.e){if(d)for(o=0,a=f.length;o<a;++o)i.point((s=f[o])[0],s[1]);else r(h.x,h.n.x,1,i);h=h.n}else{if(d)for(f=h.p.z,o=f.length-1;o>=0;--o)i.point((s=f[o])[0],s[1]);else r(h.x,h.p.x,-1,i);h=h.p}f=(h=h.o).z,d=!d}while(!h.v);i.lineEnd()}}}function Qs(t){if(n=t.length){for(var n,e,r=0,i=t[0];++r<n;)i.n=e=t[r],e.p=i,i=e;i.n=e=t[0],e.p=i}}function Js(t){return tf(t[0])<=Vc?t[0]:lf(t[0])*((tf(t[0])+Vc)%Kc-Vc)}function tl(t,n){var e=Js(n),r=n[1],i=sf(r),o=[sf(e),-rf(e),0],a=0,u=0,c=new T;1===i?r=Wc+Xc:-1===i&&(r=-Wc-Xc);for(var f=0,s=t.length;f<s;++f)if(h=(l=t[f]).length)for(var l,h,d=l[h-1],p=Js(d),g=d[1]/2+Zc,y=sf(g),v=rf(g),_=0;_<h;++_,p=m,y=w,v=M,d=b){var b=l[_],m=Js(b),x=b[1]/2+Zc,w=sf(x),M=rf(x),A=m-p,S=A>=0?1:-1,E=S*A,k=E>Vc,N=y*w;if(c.add(ef(N*S*sf(E),v*M+N*rf(E))),a+=k?A+S*Kc:A,k^p>=e^m>=e){var C=Zf(Vf(d),Vf(b));Jf(C);var P=Zf(o,C);Jf(P);var z=(k^A>=0?-1:1)*gf(P[2]);(r>z||r===z&&(C[0]||C[1]))&&(u+=k^A>=0?1:-1)}}return(a<-1e-6||a<Xc&&c<-1e-12)^1&u}function nl(t,n,e,r){return function(i){var o,a,u,c=n(i),f=Vs(),s=n(f),l=!1,h={point:d,lineStart:g,lineEnd:y,polygonStart:function(){h.point=v,h.lineStart=_,h.lineEnd=b,a=[],o=[]},polygonEnd:function(){h.point=d,h.lineStart=g,h.lineEnd=y,a=ft(a);var t=tl(o,r);a.length?(l||(i.polygonStart(),l=!0),Ks(a,rl,t,e,i)):t&&(l||(i.polygonStart(),l=!0),i.lineStart(),e(null,null,1,i),i.lineEnd()),l&&(i.polygonEnd(),l=!1),a=o=null},sphere:function(){i.polygonStart(),i.lineStart(),e(null,null,1,i),i.lineEnd(),i.polygonEnd()}};function d(n,e){t(n,e)&&i.point(n,e)}function p(t,n){c.point(t,n)}function g(){h.point=p,c.lineStart()}function y(){h.point=d,c.lineEnd()}function v(t,n){u.push([t,n]),s.point(t,n)}function _(){s.lineStart(),u=[]}function b(){v(u[0][0],u[0][1]),s.lineEnd();var t,n,e,r,c=s.clean(),h=f.result(),d=h.length;if(u.pop(),o.push(u),u=null,d)if(1&c){if((n=(e=h[0]).length-1)>0){for(l||(i.polygonStart(),l=!0),i.lineStart(),t=0;t<n;++t)i.point((r=e[t])[0],r[1]);i.lineEnd()}}else d>1&&2&c&&h.push(h.pop().concat(h.shift())),a.push(h.filter(el))}return h}}function el(t){return t.length>1}function rl(t,n){return((t=t.x)[0]<0?t[1]-Wc-Xc:Wc-t[1])-((n=n.x)[0]<0?n[1]-Wc-Xc:Wc-n[1])}Bs.invert=Bs;var il=nl((function(){return!0}),(function(t){var n,e=NaN,r=NaN,i=NaN;return{lineStart:function(){t.lineStart(),n=1},point:function(o,a){var u=o>0?Vc:-Vc,c=tf(o-e);tf(c-Vc)<Xc?(t.point(e,r=(r+a)/2>0?Wc:-Wc),t.point(i,r),t.lineEnd(),t.lineStart(),t.point(u,r),t.point(o,r),n=0):i!==u&&c>=Vc&&(tf(e-i)<Xc&&(e-=i*Xc),tf(o-u)<Xc&&(o-=u*Xc),r=function(t,n,e,r){var i,o,a=sf(t-e);return tf(a)>Xc?nf((sf(n)*(o=rf(r))*sf(e)-sf(r)*(i=rf(n))*sf(t))/(i*o*a)):(n+r)/2}(e,r,o,a),t.point(i,r),t.lineEnd(),t.lineStart(),t.point(u,r),n=0),t.point(e=o,r=a),i=u},lineEnd:function(){t.lineEnd(),e=r=NaN},clean:function(){return 2-n}}}),(function(t,n,e,r){var i;if(null==t)i=e*Wc,r.point(-Vc,i),r.point(0,i),r.point(Vc,i),r.point(Vc,0),r.point(Vc,-i),r.point(0,-i),r.point(-Vc,-i),r.point(-Vc,0),r.point(-Vc,i);else if(tf(t[0]-n[0])>Xc){var o=t[0]<n[0]?Vc:-Vc;i=e*o/2,r.point(-o,i),r.point(0,i),r.point(o,i)}else r.point(n[0],n[1])}),[-Vc,-Wc]);function ol(t){var n=rf(t),e=6*Jc,r=n>0,i=tf(n)>Xc;function o(t,e){return rf(t)*rf(e)>n}function a(t,e,r){var i=[1,0,0],o=Zf(Vf(t),Vf(e)),a=Wf(o,o),u=o[0],c=a-u*u;if(!c)return!r&&t;var f=n*a/c,s=-n*u/c,l=Zf(i,o),h=Qf(i,f);Kf(h,Qf(o,s));var d=l,p=Wf(h,d),g=Wf(d,d),y=p*p-g*(Wf(h,h)-1);if(!(y<0)){var v=hf(y),_=Qf(d,(-p-v)/g);if(Kf(_,h),_=Gf(_),!r)return _;var b,m=t[0],x=e[0],w=t[1],M=e[1];x<m&&(b=m,m=x,x=b);var A=x-m,T=tf(A-Vc)<Xc;if(!T&&M<w&&(b=w,w=M,M=b),T||A<Xc?T?w+M>0^_[1]<(tf(_[0]-m)<Xc?w:M):w<=_[1]&&_[1]<=M:A>Vc^(m<=_[0]&&_[0]<=x)){var S=Qf(d,(-p+v)/g);return Kf(S,h),[_,Gf(S)]}}}function u(n,e){var i=r?t:Vc-t,o=0;return n<-i?o|=1:n>i&&(o|=2),e<-i?o|=4:e>i&&(o|=8),o}return nl(o,(function(t){var n,e,c,f,s;return{lineStart:function(){f=c=!1,s=1},point:function(l,h){var d,p=[l,h],g=o(l,h),y=r?g?0:u(l,h):g?u(l+(l<0?Vc:-Vc),h):0;if(!n&&(f=c=g)&&t.lineStart(),g!==c&&(!(d=a(n,p))||Ws(n,d)||Ws(p,d))&&(p[2]=1),g!==c)s=0,g?(t.lineStart(),d=a(p,n),t.point(d[0],d[1])):(d=a(n,p),t.point(d[0],d[1],2),t.lineEnd()),n=d;else if(i&&n&&r^g){var v;y&e||!(v=a(p,n,!0))||(s=0,r?(t.lineStart(),t.point(v[0][0],v[0][1]),t.point(v[1][0],v[1][1]),t.lineEnd()):(t.point(v[1][0],v[1][1]),t.lineEnd(),t.lineStart(),t.point(v[0][0],v[0][1],3)))}!g||n&&Ws(n,p)||t.point(p[0],p[1]),n=p,c=g,e=y},lineEnd:function(){c&&t.lineEnd(),n=null},clean:function(){return s|(f&&c)<<1}}}),(function(n,r,i,o){Xs(o,t,e,i,n,r)}),r?[0,-t]:[-Vc,t-Vc])}var al,ul,cl,fl,sl=1e9,ll=-sl;function hl(t,n,e,r){function i(i,o){return t<=i&&i<=e&&n<=o&&o<=r}function o(i,o,u,f){var s=0,l=0;if(null==i||(s=a(i,u))!==(l=a(o,u))||c(i,o)<0^u>0)do{f.point(0===s||3===s?t:e,s>1?r:n)}while((s=(s+u+4)%4)!==l);else f.point(o[0],o[1])}function a(r,i){return tf(r[0]-t)<Xc?i>0?0:3:tf(r[0]-e)<Xc?i>0?2:1:tf(r[1]-n)<Xc?i>0?1:0:i>0?3:2}function u(t,n){return c(t.x,n.x)}function c(t,n){var e=a(t,1),r=a(n,1);return e!==r?e-r:0===e?n[1]-t[1]:1===e?t[0]-n[0]:2===e?t[1]-n[1]:n[0]-t[0]}return function(a){var c,f,s,l,h,d,p,g,y,v,_,b=a,m=Vs(),x={point:w,lineStart:function(){x.point=M,f&&f.push(s=[]);v=!0,y=!1,p=g=NaN},lineEnd:function(){c&&(M(l,h),d&&y&&m.rejoin(),c.push(m.result()));x.point=w,y&&b.lineEnd()},polygonStart:function(){b=m,c=[],f=[],_=!0},polygonEnd:function(){var n=function(){for(var n=0,e=0,i=f.length;e<i;++e)for(var o,a,u=f[e],c=1,s=u.length,l=u[0],h=l[0],d=l[1];c<s;++c)o=h,a=d,h=(l=u[c])[0],d=l[1],a<=r?d>r&&(h-o)*(r-a)>(d-a)*(t-o)&&++n:d<=r&&(h-o)*(r-a)<(d-a)*(t-o)&&--n;return n}(),e=_&&n,i=(c=ft(c)).length;(e||i)&&(a.polygonStart(),e&&(a.lineStart(),o(null,null,1,a),a.lineEnd()),i&&Ks(c,u,n,o,a),a.polygonEnd());b=a,c=f=s=null}};function w(t,n){i(t,n)&&b.point(t,n)}function M(o,a){var u=i(o,a);if(f&&s.push([o,a]),v)l=o,h=a,d=u,v=!1,u&&(b.lineStart(),b.point(o,a));else if(u&&y)b.point(o,a);else{var c=[p=Math.max(ll,Math.min(sl,p)),g=Math.max(ll,Math.min(sl,g))],m=[o=Math.max(ll,Math.min(sl,o)),a=Math.max(ll,Math.min(sl,a))];!function(t,n,e,r,i,o){var a,u=t[0],c=t[1],f=0,s=1,l=n[0]-u,h=n[1]-c;if(a=e-u,l||!(a>0)){if(a/=l,l<0){if(a<f)return;a<s&&(s=a)}else if(l>0){if(a>s)return;a>f&&(f=a)}if(a=i-u,l||!(a<0)){if(a/=l,l<0){if(a>s)return;a>f&&(f=a)}else if(l>0){if(a<f)return;a<s&&(s=a)}if(a=r-c,h||!(a>0)){if(a/=h,h<0){if(a<f)return;a<s&&(s=a)}else if(h>0){if(a>s)return;a>f&&(f=a)}if(a=o-c,h||!(a<0)){if(a/=h,h<0){if(a>s)return;a>f&&(f=a)}else if(h>0){if(a<f)return;a<s&&(s=a)}return f>0&&(t[0]=u+f*l,t[1]=c+f*h),s<1&&(n[0]=u+s*l,n[1]=c+s*h),!0}}}}}(c,m,t,n,e,r)?u&&(b.lineStart(),b.point(o,a),_=!1):(y||(b.lineStart(),b.point(c[0],c[1])),b.point(m[0],m[1]),u||b.lineEnd(),_=!1)}p=o,g=a,y=u}return x}}var dl={sphere:vf,point:vf,lineStart:function(){dl.point=gl,dl.lineEnd=pl},lineEnd:vf,polygonStart:vf,polygonEnd:vf};function pl(){dl.point=dl.lineEnd=vf}function gl(t,n){ul=t*=Jc,cl=sf(n*=Jc),fl=rf(n),dl.point=yl}function yl(t,n){t*=Jc;var e=sf(n*=Jc),r=rf(n),i=tf(t-ul),o=rf(i),a=r*sf(i),u=fl*e-cl*r*o,c=cl*e+fl*r*o;al.add(ef(hf(a*a+u*u),c)),ul=t,cl=e,fl=r}function vl(t){return al=new T,Mf(t,dl),+al}var _l=[null,null],bl={type:"LineString",coordinates:_l};function ml(t,n){return _l[0]=t,_l[1]=n,vl(bl)}var xl={Feature:function(t,n){return Ml(t.geometry,n)},FeatureCollection:function(t,n){for(var e=t.features,r=-1,i=e.length;++r<i;)if(Ml(e[r].geometry,n))return!0;return!1}},wl={Sphere:function(){return!0},Point:function(t,n){return Al(t.coordinates,n)},MultiPoint:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)if(Al(e[r],n))return!0;return!1},LineString:function(t,n){return Tl(t.coordinates,n)},MultiLineString:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)if(Tl(e[r],n))return!0;return!1},Polygon:function(t,n){return Sl(t.coordinates,n)},MultiPolygon:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)if(Sl(e[r],n))return!0;return!1},GeometryCollection:function(t,n){for(var e=t.geometries,r=-1,i=e.length;++r<i;)if(Ml(e[r],n))return!0;return!1}};function Ml(t,n){return!(!t||!wl.hasOwnProperty(t.type))&&wl[t.type](t,n)}function Al(t,n){return 0===ml(t,n)}function Tl(t,n){for(var e,r,i,o=0,a=t.length;o<a;o++){if(0===(r=ml(t[o],n)))return!0;if(o>0&&(i=ml(t[o],t[o-1]))>0&&e<=i&&r<=i&&(e+r-i)*(1-Math.pow((e-r)/i,2))<Gc*i)return!0;e=r}return!1}function Sl(t,n){return!!tl(t.map(El),kl(n))}function El(t){return(t=t.map(kl)).pop(),t}function kl(t){return[t[0]*Jc,t[1]*Jc]}function Nl(t,n,e){var r=lt(t,n-Xc,e).concat(n);return function(t){return r.map((function(n){return[t,n]}))}}function Cl(t,n,e){var r=lt(t,n-Xc,e).concat(n);return function(t){return r.map((function(n){return[n,t]}))}}function Pl(){var t,n,e,r,i,o,a,u,c,f,s,l,h=10,d=h,p=90,g=360,y=2.5;function v(){return{type:"MultiLineString",coordinates:_()}}function _(){return lt(of(r/p)*p,e,p).map(s).concat(lt(of(u/g)*g,a,g).map(l)).concat(lt(of(n/h)*h,t,h).filter((function(t){return tf(t%p)>Xc})).map(c)).concat(lt(of(o/d)*d,i,d).filter((function(t){return tf(t%g)>Xc})).map(f))}return v.lines=function(){return _().map((function(t){return{type:"LineString",coordinates:t}}))},v.outline=function(){return{type:"Polygon",coordinates:[s(r).concat(l(a).slice(1),s(e).reverse().slice(1),l(u).reverse().slice(1))]}},v.extent=function(t){return arguments.length?v.extentMajor(t).extentMinor(t):v.extentMinor()},v.extentMajor=function(t){return arguments.length?(r=+t[0][0],e=+t[1][0],u=+t[0][1],a=+t[1][1],r>e&&(t=r,r=e,e=t),u>a&&(t=u,u=a,a=t),v.precision(y)):[[r,u],[e,a]]},v.extentMinor=function(e){return arguments.length?(n=+e[0][0],t=+e[1][0],o=+e[0][1],i=+e[1][1],n>t&&(e=n,n=t,t=e),o>i&&(e=o,o=i,i=e),v.precision(y)):[[n,o],[t,i]]},v.step=function(t){return arguments.length?v.stepMajor(t).stepMinor(t):v.stepMinor()},v.stepMajor=function(t){return arguments.length?(p=+t[0],g=+t[1],v):[p,g]},v.stepMinor=function(t){return arguments.length?(h=+t[0],d=+t[1],v):[h,d]},v.precision=function(h){return arguments.length?(y=+h,c=Nl(o,i,90),f=Cl(n,t,y),s=Nl(u,a,90),l=Cl(r,e,y),v):y},v.extentMajor([[-180,-89.999999],[180,89.999999]]).extentMinor([[-180,-80.000001],[180,80.000001]])}var zl,Dl,Rl,Fl,ql=t=>t,Il=new T,Ol=new T,Ul={point:vf,lineStart:vf,lineEnd:vf,polygonStart:function(){Ul.lineStart=Bl,Ul.lineEnd=jl},polygonEnd:function(){Ul.lineStart=Ul.lineEnd=Ul.point=vf,Il.add(tf(Ol)),Ol=new T},result:function(){var t=Il/2;return Il=new T,t}};function Bl(){Ul.point=Yl}function Yl(t,n){Ul.point=Ll,zl=Rl=t,Dl=Fl=n}function Ll(t,n){Ol.add(Fl*t-Rl*n),Rl=t,Fl=n}function jl(){Ll(zl,Dl)}var $l=Ul,Hl=1/0,Xl=Hl,Gl=-Hl,Vl=Gl,Wl={point:function(t,n){t<Hl&&(Hl=t);t>Gl&&(Gl=t);n<Xl&&(Xl=n);n>Vl&&(Vl=n)},lineStart:vf,lineEnd:vf,polygonStart:vf,polygonEnd:vf,result:function(){var t=[[Hl,Xl],[Gl,Vl]];return Gl=Vl=-(Xl=Hl=1/0),t}};var Zl,Kl,Ql,Jl,th=Wl,nh=0,eh=0,rh=0,ih=0,oh=0,ah=0,uh=0,ch=0,fh=0,sh={point:lh,lineStart:hh,lineEnd:gh,polygonStart:function(){sh.lineStart=yh,sh.lineEnd=vh},polygonEnd:function(){sh.point=lh,sh.lineStart=hh,sh.lineEnd=gh},result:function(){var t=fh?[uh/fh,ch/fh]:ah?[ih/ah,oh/ah]:rh?[nh/rh,eh/rh]:[NaN,NaN];return nh=eh=rh=ih=oh=ah=uh=ch=fh=0,t}};function lh(t,n){nh+=t,eh+=n,++rh}function hh(){sh.point=dh}function dh(t,n){sh.point=ph,lh(Ql=t,Jl=n)}function ph(t,n){var e=t-Ql,r=n-Jl,i=hf(e*e+r*r);ih+=i*(Ql+t)/2,oh+=i*(Jl+n)/2,ah+=i,lh(Ql=t,Jl=n)}function gh(){sh.point=lh}function yh(){sh.point=_h}function vh(){bh(Zl,Kl)}function _h(t,n){sh.point=bh,lh(Zl=Ql=t,Kl=Jl=n)}function bh(t,n){var e=t-Ql,r=n-Jl,i=hf(e*e+r*r);ih+=i*(Ql+t)/2,oh+=i*(Jl+n)/2,ah+=i,uh+=(i=Jl*t-Ql*n)*(Ql+t),ch+=i*(Jl+n),fh+=3*i,lh(Ql=t,Jl=n)}var mh=sh;function xh(t){this._context=t}xh.prototype={_radius:4.5,pointRadius:function(t){return this._radius=t,this},polygonStart:function(){this._line=0},polygonEnd:function(){this._line=NaN},lineStart:function(){this._point=0},lineEnd:function(){0===this._line&&this._context.closePath(),this._point=NaN},point:function(t,n){switch(this._point){case 0:this._context.moveTo(t,n),this._point=1;break;case 1:this._context.lineTo(t,n);break;default:this._context.moveTo(t+this._radius,n),this._context.arc(t,n,this._radius,0,Kc)}},result:vf};var wh,Mh,Ah,Th,Sh,Eh=new T,kh={point:vf,lineStart:function(){kh.point=Nh},lineEnd:function(){wh&&Ch(Mh,Ah),kh.point=vf},polygonStart:function(){wh=!0},polygonEnd:function(){wh=null},result:function(){var t=+Eh;return Eh=new T,t}};function Nh(t,n){kh.point=Ch,Mh=Th=t,Ah=Sh=n}function Ch(t,n){Th-=t,Sh-=n,Eh.add(hf(Th*Th+Sh*Sh)),Th=t,Sh=n}var Ph=kh;function zh(){this._string=[]}function Dh(t){return"m0,"+t+"a"+t+","+t+" 0 1,1 0,"+-2*t+"a"+t+","+t+" 0 1,1 0,"+2*t+"z"}function Rh(t){return function(n){var e=new Fh;for(var r in t)e[r]=t[r];return e.stream=n,e}}function Fh(){}function qh(t,n,e){var r=t.clipExtent&&t.clipExtent();return t.scale(150).translate([0,0]),null!=r&&t.clipExtent(null),Mf(e,t.stream(th)),n(th.result()),null!=r&&t.clipExtent(r),t}function Ih(t,n,e){return qh(t,(function(e){var r=n[1][0]-n[0][0],i=n[1][1]-n[0][1],o=Math.min(r/(e[1][0]-e[0][0]),i/(e[1][1]-e[0][1])),a=+n[0][0]+(r-o*(e[1][0]+e[0][0]))/2,u=+n[0][1]+(i-o*(e[1][1]+e[0][1]))/2;t.scale(150*o).translate([a,u])}),e)}function Oh(t,n,e){return Ih(t,[[0,0],n],e)}function Uh(t,n,e){return qh(t,(function(e){var r=+n,i=r/(e[1][0]-e[0][0]),o=(r-i*(e[1][0]+e[0][0]))/2,a=-i*e[0][1];t.scale(150*i).translate([o,a])}),e)}function Bh(t,n,e){return qh(t,(function(e){var r=+n,i=r/(e[1][1]-e[0][1]),o=-i*e[0][0],a=(r-i*(e[1][1]+e[0][1]))/2;t.scale(150*i).translate([o,a])}),e)}zh.prototype={_radius:4.5,_circle:Dh(4.5),pointRadius:function(t){return(t=+t)!==this._radius&&(this._radius=t,this._circle=null),this},polygonStart:function(){this._line=0},polygonEnd:function(){this._line=NaN},lineStart:function(){this._point=0},lineEnd:function(){0===this._line&&this._string.push("Z"),this._point=NaN},point:function(t,n){switch(this._point){case 0:this._string.push("M",t,",",n),this._point=1;break;case 1:this._string.push("L",t,",",n);break;default:null==this._circle&&(this._circle=Dh(this._radius)),this._string.push("M",t,",",n,this._circle)}},result:function(){if(this._string.length){var t=this._string.join("");return this._string=[],t}return null}},Fh.prototype={constructor:Fh,point:function(t,n){this.stream.point(t,n)},sphere:function(){this.stream.sphere()},lineStart:function(){this.stream.lineStart()},lineEnd:function(){this.stream.lineEnd()},polygonStart:function(){this.stream.polygonStart()},polygonEnd:function(){this.stream.polygonEnd()}};var Yh=rf(30*Jc);function Lh(t,n){return+n?function(t,n){function e(r,i,o,a,u,c,f,s,l,h,d,p,g,y){var v=f-r,_=s-i,b=v*v+_*_;if(b>4*n&&g--){var m=a+h,x=u+d,w=c+p,M=hf(m*m+x*x+w*w),A=gf(w/=M),T=tf(tf(w)-1)<Xc||tf(o-l)<Xc?(o+l)/2:ef(x,m),S=t(T,A),E=S[0],k=S[1],N=E-r,C=k-i,P=_*N-v*C;(P*P/b>n||tf((v*N+_*C)/b-.5)>.3||a*h+u*d+c*p<Yh)&&(e(r,i,o,a,u,c,E,k,T,m/=M,x/=M,w,g,y),y.point(E,k),e(E,k,T,m,x,w,f,s,l,h,d,p,g,y))}}return function(n){var r,i,o,a,u,c,f,s,l,h,d,p,g={point:y,lineStart:v,lineEnd:b,polygonStart:function(){n.polygonStart(),g.lineStart=m},polygonEnd:function(){n.polygonEnd(),g.lineStart=v}};function y(e,r){e=t(e,r),n.point(e[0],e[1])}function v(){s=NaN,g.point=_,n.lineStart()}function _(r,i){var o=Vf([r,i]),a=t(r,i);e(s,l,f,h,d,p,s=a[0],l=a[1],f=r,h=o[0],d=o[1],p=o[2],16,n),n.point(s,l)}function b(){g.point=y,n.lineEnd()}function m(){v(),g.point=x,g.lineEnd=w}function x(t,n){_(r=t,n),i=s,o=l,a=h,u=d,c=p,g.point=_}function w(){e(s,l,f,h,d,p,i,o,r,a,u,c,16,n),g.lineEnd=b,b()}return g}}(t,n):function(t){return Rh({point:function(n,e){n=t(n,e),this.stream.point(n[0],n[1])}})}(t)}var jh=Rh({point:function(t,n){this.stream.point(t*Jc,n*Jc)}});function $h(t,n,e,r,i,o){if(!o)return function(t,n,e,r,i){function o(o,a){return[n+t*(o*=r),e-t*(a*=i)]}return o.invert=function(o,a){return[(o-n)/t*r,(e-a)/t*i]},o}(t,n,e,r,i);var a=rf(o),u=sf(o),c=a*t,f=u*t,s=a/t,l=u/t,h=(u*e-a*n)/t,d=(u*n+a*e)/t;function p(t,o){return[c*(t*=r)-f*(o*=i)+n,e-f*t-c*o]}return p.invert=function(t,n){return[r*(s*t-l*n+h),i*(d-l*t-s*n)]},p}function Hh(t){return Xh((function(){return t}))()}function Xh(t){var n,e,r,i,o,a,u,c,f,s,l=150,h=480,d=250,p=0,g=0,y=0,v=0,_=0,b=0,m=1,x=1,w=null,M=il,A=null,T=ql,S=.5;function E(t){return c(t[0]*Jc,t[1]*Jc)}function k(t){return(t=c.invert(t[0],t[1]))&&[t[0]*Qc,t[1]*Qc]}function N(){var t=$h(l,0,0,m,x,b).apply(null,n(p,g)),r=$h(l,h-t[0],d-t[1],m,x,b);return e=Ys(y,v,_),u=Us(n,r),c=Us(e,u),a=Lh(u,S),C()}function C(){return f=s=null,E}return E.stream=function(t){return f&&s===t?f:f=jh(function(t){return Rh({point:function(n,e){var r=t(n,e);return this.stream.point(r[0],r[1])}})}(e)(M(a(T(s=t)))))},E.preclip=function(t){return arguments.length?(M=t,w=void 0,C()):M},E.postclip=function(t){return arguments.length?(T=t,A=r=i=o=null,C()):T},E.clipAngle=function(t){return arguments.length?(M=+t?ol(w=t*Jc):(w=null,il),C()):w*Qc},E.clipExtent=function(t){return arguments.length?(T=null==t?(A=r=i=o=null,ql):hl(A=+t[0][0],r=+t[0][1],i=+t[1][0],o=+t[1][1]),C()):null==A?null:[[A,r],[i,o]]},E.scale=function(t){return arguments.length?(l=+t,N()):l},E.translate=function(t){return arguments.length?(h=+t[0],d=+t[1],N()):[h,d]},E.center=function(t){return arguments.length?(p=t[0]%360*Jc,g=t[1]%360*Jc,N()):[p*Qc,g*Qc]},E.rotate=function(t){return arguments.length?(y=t[0]%360*Jc,v=t[1]%360*Jc,_=t.length>2?t[2]%360*Jc:0,N()):[y*Qc,v*Qc,_*Qc]},E.angle=function(t){return arguments.length?(b=t%360*Jc,N()):b*Qc},E.reflectX=function(t){return arguments.length?(m=t?-1:1,N()):m<0},E.reflectY=function(t){return arguments.length?(x=t?-1:1,N()):x<0},E.precision=function(t){return arguments.length?(a=Lh(u,S=t*t),C()):hf(S)},E.fitExtent=function(t,n){return Ih(E,t,n)},E.fitSize=function(t,n){return Oh(E,t,n)},E.fitWidth=function(t,n){return Uh(E,t,n)},E.fitHeight=function(t,n){return Bh(E,t,n)},function(){return n=t.apply(this,arguments),E.invert=n.invert&&k,N()}}function Gh(t){var n=0,e=Vc/3,r=Xh(t),i=r(n,e);return i.parallels=function(t){return arguments.length?r(n=t[0]*Jc,e=t[1]*Jc):[n*Qc,e*Qc]},i}function Vh(t,n){var e=sf(t),r=(e+sf(n))/2;if(tf(r)<Xc)return function(t){var n=rf(t);function e(t,e){return[t*n,sf(e)/n]}return e.invert=function(t,e){return[t/n,gf(e*n)]},e}(t);var i=1+e*(2*r-e),o=hf(i)/r;function a(t,n){var e=hf(i-2*r*sf(n))/r;return[e*sf(t*=r),o-e*rf(t)]}return a.invert=function(t,n){var e=o-n,a=ef(t,tf(e))*lf(e);return e*r<0&&(a-=Vc*lf(t)*lf(e)),[a/r,gf((i-(t*t+e*e)*r*r)/(2*r))]},a}function Wh(){return Gh(Vh).scale(155.424).center([0,33.6442])}function Zh(){return Wh().parallels([29.5,45.5]).scale(1070).translate([480,250]).rotate([96,0]).center([-.6,38.7])}function Kh(t){return function(n,e){var r=rf(n),i=rf(e),o=t(r*i);return o===1/0?[2,0]:[o*i*sf(n),o*sf(e)]}}function Qh(t){return function(n,e){var r=hf(n*n+e*e),i=t(r),o=sf(i),a=rf(i);return[ef(n*o,r*a),gf(r&&e*o/r)]}}var Jh=Kh((function(t){return hf(2/(1+t))}));Jh.invert=Qh((function(t){return 2*gf(t/2)}));var td=Kh((function(t){return(t=pf(t))&&t/sf(t)}));function nd(t,n){return[t,cf(df((Wc+n)/2))]}function ed(t){var n,e,r,i=Hh(t),o=i.center,a=i.scale,u=i.translate,c=i.clipExtent,f=null;function s(){var o=Vc*a(),u=i(Hs(i.rotate()).invert([0,0]));return c(null==f?[[u[0]-o,u[1]-o],[u[0]+o,u[1]+o]]:t===nd?[[Math.max(u[0]-o,f),n],[Math.min(u[0]+o,e),r]]:[[f,Math.max(u[1]-o,n)],[e,Math.min(u[1]+o,r)]])}return i.scale=function(t){return arguments.length?(a(t),s()):a()},i.translate=function(t){return arguments.length?(u(t),s()):u()},i.center=function(t){return arguments.length?(o(t),s()):o()},i.clipExtent=function(t){return arguments.length?(null==t?f=n=e=r=null:(f=+t[0][0],n=+t[0][1],e=+t[1][0],r=+t[1][1]),s()):null==f?null:[[f,n],[e,r]]},s()}function rd(t){return df((Wc+t)/2)}function id(t,n){var e=rf(t),r=t===n?sf(t):cf(e/rf(n))/cf(rd(n)/rd(t)),i=e*ff(rd(t),r)/r;if(!r)return nd;function o(t,n){i>0?n<-Wc+Xc&&(n=-Wc+Xc):n>Wc-Xc&&(n=Wc-Xc);var e=i/ff(rd(n),r);return[e*sf(r*t),i-e*rf(r*t)]}return o.invert=function(t,n){var e=i-n,o=lf(r)*hf(t*t+e*e),a=ef(t,tf(e))*lf(e);return e*r<0&&(a-=Vc*lf(t)*lf(e)),[a/r,2*nf(ff(i/o,1/r))-Wc]},o}function od(t,n){return[t,n]}function ad(t,n){var e=rf(t),r=t===n?sf(t):(e-rf(n))/(n-t),i=e/r+t;if(tf(r)<Xc)return od;function o(t,n){var e=i-n,o=r*t;return[e*sf(o),i-e*rf(o)]}return o.invert=function(t,n){var e=i-n,o=ef(t,tf(e))*lf(e);return e*r<0&&(o-=Vc*lf(t)*lf(e)),[o/r,i-lf(r)*hf(t*t+e*e)]},o}td.invert=Qh((function(t){return t})),nd.invert=function(t,n){return[t,2*nf(af(n))-Wc]},od.invert=od;var ud=1.340264,cd=-.081106,fd=893e-6,sd=.003796,ld=hf(3)/2;function hd(t,n){var e=gf(ld*sf(n)),r=e*e,i=r*r*r;return[t*rf(e)/(ld*(ud+3*cd*r+i*(7*fd+9*sd*r))),e*(ud+cd*r+i*(fd+sd*r))]}function dd(t,n){var e=rf(n),r=rf(t)*e;return[e*sf(t)/r,sf(n)/r]}function pd(t,n){var e=n*n,r=e*e;return[t*(.8707-.131979*e+r*(r*(.003971*e-.001529*r)-.013791)),n*(1.007226+e*(.015085+r*(.028874*e-.044475-.005916*r)))]}function gd(t,n){return[rf(n)*sf(t),sf(n)]}function yd(t,n){var e=rf(n),r=1+rf(t)*e;return[e*sf(t)/r,sf(n)/r]}function vd(t,n){return[cf(df((Wc+n)/2)),-t]}function _d(t,n){return t.parent===n.parent?1:2}function bd(t,n){return t+n.x}function md(t,n){return Math.max(t,n.y)}function xd(t){var n=0,e=t.children,r=e&&e.length;if(r)for(;--r>=0;)n+=e[r].value;else n=1;t.value=n}function wd(t,n){t instanceof Map?(t=[void 0,t],void 0===n&&(n=Ad)):void 0===n&&(n=Md);for(var e,r,i,o,a,u=new Ed(t),c=[u];e=c.pop();)if((i=n(e.data))&&(a=(i=Array.from(i)).length))for(e.children=i,o=a-1;o>=0;--o)c.push(r=i[o]=new Ed(i[o])),r.parent=e,r.depth=e.depth+1;return u.eachBefore(Sd)}function Md(t){return t.children}function Ad(t){return Array.isArray(t)?t[1]:null}function Td(t){void 0!==t.data.value&&(t.value=t.data.value),t.data=t.data.data}function Sd(t){var n=0;do{t.height=n}while((t=t.parent)&&t.height<++n)}function Ed(t){this.data=t,this.depth=this.height=0,this.parent=null}function kd(t){return null==t?null:Nd(t)}function Nd(t){if("function"!=typeof t)throw new Error;return t}function Cd(){return 0}function Pd(t){return function(){return t}}hd.invert=function(t,n){for(var e,r=n,i=r*r,o=i*i*i,a=0;a<12&&(o=(i=(r-=e=(r*(ud+cd*i+o*(fd+sd*i))-n)/(ud+3*cd*i+o*(7*fd+9*sd*i)))*r)*i*i,!(tf(e)<Gc));++a);return[ld*t*(ud+3*cd*i+o*(7*fd+9*sd*i))/rf(r),gf(sf(r)/ld)]},dd.invert=Qh(nf),pd.invert=function(t,n){var e,r=n,i=25;do{var o=r*r,a=o*o;r-=e=(r*(1.007226+o*(.015085+a*(.028874*o-.044475-.005916*a)))-n)/(1.007226+o*(.045255+a*(.259866*o-.311325-.005916*11*a)))}while(tf(e)>Xc&&--i>0);return[t/(.8707+(o=r*r)*(o*(o*o*o*(.003971-.001529*o)-.013791)-.131979)),r]},gd.invert=Qh(gf),yd.invert=Qh((function(t){return 2*nf(t)})),vd.invert=function(t,n){return[-n,2*nf(af(t))-Wc]},Ed.prototype=wd.prototype={constructor:Ed,count:function(){return this.eachAfter(xd)},each:function(t,n){let e=-1;for(const r of this)t.call(n,r,++e,this);return this},eachAfter:function(t,n){for(var e,r,i,o=this,a=[o],u=[],c=-1;o=a.pop();)if(u.push(o),e=o.children)for(r=0,i=e.length;r<i;++r)a.push(e[r]);for(;o=u.pop();)t.call(n,o,++c,this);return this},eachBefore:function(t,n){for(var e,r,i=this,o=[i],a=-1;i=o.pop();)if(t.call(n,i,++a,this),e=i.children)for(r=e.length-1;r>=0;--r)o.push(e[r]);return this},find:function(t,n){let e=-1;for(const r of this)if(t.call(n,r,++e,this))return r},sum:function(t){return this.eachAfter((function(n){for(var e=+t(n.data)||0,r=n.children,i=r&&r.length;--i>=0;)e+=r[i].value;n.value=e}))},sort:function(t){return this.eachBefore((function(n){n.children&&n.children.sort(t)}))},path:function(t){for(var n=this,e=function(t,n){if(t===n)return t;var e=t.ancestors(),r=n.ancestors(),i=null;t=e.pop(),n=r.pop();for(;t===n;)i=t,t=e.pop(),n=r.pop();return i}(n,t),r=[n];n!==e;)n=n.parent,r.push(n);for(var i=r.length;t!==e;)r.splice(i,0,t),t=t.parent;return r},ancestors:function(){for(var t=this,n=[t];t=t.parent;)n.push(t);return n},descendants:function(){return Array.from(this)},leaves:function(){var t=[];return this.eachBefore((function(n){n.children||t.push(n)})),t},links:function(){var t=this,n=[];return t.each((function(e){e!==t&&n.push({source:e.parent,target:e})})),n},copy:function(){return wd(this).eachBefore(Td)},[Symbol.iterator]:function*(){var t,n,e,r,i=this,o=[i];do{for(t=o.reverse(),o=[];i=t.pop();)if(yield i,n=i.children)for(e=0,r=n.length;e<r;++e)o.push(n[e])}while(o.length)}};const zd=4294967296;function Dd(){let t=1;return()=>(t=(1664525*t+1013904223)%zd)/zd}function Rd(t,n){for(var e,r,i=0,o=(t=function(t,n){let e,r,i=t.length;for(;i;)r=n()*i--|0,e=t[i],t[i]=t[r],t[r]=e;return t}(Array.from(t),n)).length,a=[];i<o;)e=t[i],r&&Id(r,e)?++i:(r=Ud(a=Fd(a,e)),i=0);return r}function Fd(t,n){var e,r;if(Od(n,t))return[n];for(e=0;e<t.length;++e)if(qd(n,t[e])&&Od(Bd(t[e],n),t))return[t[e],n];for(e=0;e<t.length-1;++e)for(r=e+1;r<t.length;++r)if(qd(Bd(t[e],t[r]),n)&&qd(Bd(t[e],n),t[r])&&qd(Bd(t[r],n),t[e])&&Od(Yd(t[e],t[r],n),t))return[t[e],t[r],n];throw new Error}function qd(t,n){var e=t.r-n.r,r=n.x-t.x,i=n.y-t.y;return e<0||e*e<r*r+i*i}function Id(t,n){var e=t.r-n.r+1e-9*Math.max(t.r,n.r,1),r=n.x-t.x,i=n.y-t.y;return e>0&&e*e>r*r+i*i}function Od(t,n){for(var e=0;e<n.length;++e)if(!Id(t,n[e]))return!1;return!0}function Ud(t){switch(t.length){case 1:return function(t){return{x:t.x,y:t.y,r:t.r}}(t[0]);case 2:return Bd(t[0],t[1]);case 3:return Yd(t[0],t[1],t[2])}}function Bd(t,n){var e=t.x,r=t.y,i=t.r,o=n.x,a=n.y,u=n.r,c=o-e,f=a-r,s=u-i,l=Math.sqrt(c*c+f*f);return{x:(e+o+c/l*s)/2,y:(r+a+f/l*s)/2,r:(l+i+u)/2}}function Yd(t,n,e){var r=t.x,i=t.y,o=t.r,a=n.x,u=n.y,c=n.r,f=e.x,s=e.y,l=e.r,h=r-a,d=r-f,p=i-u,g=i-s,y=c-o,v=l-o,_=r*r+i*i-o*o,b=_-a*a-u*u+c*c,m=_-f*f-s*s+l*l,x=d*p-h*g,w=(p*m-g*b)/(2*x)-r,M=(g*y-p*v)/x,A=(d*b-h*m)/(2*x)-i,T=(h*v-d*y)/x,S=M*M+T*T-1,E=2*(o+w*M+A*T),k=w*w+A*A-o*o,N=-(Math.abs(S)>1e-6?(E+Math.sqrt(E*E-4*S*k))/(2*S):k/E);return{x:r+w+M*N,y:i+A+T*N,r:N}}function Ld(t,n,e){var r,i,o,a,u=t.x-n.x,c=t.y-n.y,f=u*u+c*c;f?(i=n.r+e.r,i*=i,a=t.r+e.r,i>(a*=a)?(r=(f+a-i)/(2*f),o=Math.sqrt(Math.max(0,a/f-r*r)),e.x=t.x-r*u-o*c,e.y=t.y-r*c+o*u):(r=(f+i-a)/(2*f),o=Math.sqrt(Math.max(0,i/f-r*r)),e.x=n.x+r*u-o*c,e.y=n.y+r*c+o*u)):(e.x=n.x+e.r,e.y=n.y)}function jd(t,n){var e=t.r+n.r-1e-6,r=n.x-t.x,i=n.y-t.y;return e>0&&e*e>r*r+i*i}function $d(t){var n=t._,e=t.next._,r=n.r+e.r,i=(n.x*e.r+e.x*n.r)/r,o=(n.y*e.r+e.y*n.r)/r;return i*i+o*o}function Hd(t){this._=t,this.next=null,this.previous=null}function Xd(t,n){if(!(o=(t=function(t){return"object"==typeof t&&"length"in t?t:Array.from(t)}(t)).length))return 0;var e,r,i,o,a,u,c,f,s,l,h;if((e=t[0]).x=0,e.y=0,!(o>1))return e.r;if(r=t[1],e.x=-r.r,r.x=e.r,r.y=0,!(o>2))return e.r+r.r;Ld(r,e,i=t[2]),e=new Hd(e),r=new Hd(r),i=new Hd(i),e.next=i.previous=r,r.next=e.previous=i,i.next=r.previous=e;t:for(c=3;c<o;++c){Ld(e._,r._,i=t[c]),i=new Hd(i),f=r.next,s=e.previous,l=r._.r,h=e._.r;do{if(l<=h){if(jd(f._,i._)){r=f,e.next=r,r.previous=e,--c;continue t}l+=f._.r,f=f.next}else{if(jd(s._,i._)){(e=s).next=r,r.previous=e,--c;continue t}h+=s._.r,s=s.previous}}while(f!==s.next);for(i.previous=e,i.next=r,e.next=r.previous=r=i,a=$d(e);(i=i.next)!==r;)(u=$d(i))<a&&(e=i,a=u);r=e.next}for(e=[r._],i=r;(i=i.next)!==r;)e.push(i._);for(i=Rd(e,n),c=0;c<o;++c)(e=t[c]).x-=i.x,e.y-=i.y;return i.r}function Gd(t){return Math.sqrt(t.value)}function Vd(t){return function(n){n.children||(n.r=Math.max(0,+t(n)||0))}}function Wd(t,n,e){return function(r){if(i=r.children){var i,o,a,u=i.length,c=t(r)*n||0;if(c)for(o=0;o<u;++o)i[o].r+=c;if(a=Xd(i,e),c)for(o=0;o<u;++o)i[o].r-=c;r.r=a+c}}}function Zd(t){return function(n){var e=n.parent;n.r*=t,e&&(n.x=e.x+t*n.x,n.y=e.y+t*n.y)}}function Kd(t){t.x0=Math.round(t.x0),t.y0=Math.round(t.y0),t.x1=Math.round(t.x1),t.y1=Math.round(t.y1)}function Qd(t,n,e,r,i){for(var o,a=t.children,u=-1,c=a.length,f=t.value&&(r-n)/t.value;++u<c;)(o=a[u]).y0=e,o.y1=i,o.x0=n,o.x1=n+=o.value*f}var Jd={depth:-1},tp={},np={};function ep(t){return t.id}function rp(t){return t.parentId}function ip(t){let n=t.length;if(n<2)return"";for(;--n>1&&!op(t,n););return t.slice(0,n)}function op(t,n){if("/"===t[n]){let e=0;for(;n>0&&"\\"===t[--n];)++e;if(0==(1&e))return!0}return!1}function ap(t,n){return t.parent===n.parent?1:2}function up(t){var n=t.children;return n?n[0]:t.t}function cp(t){var n=t.children;return n?n[n.length-1]:t.t}function fp(t,n,e){var r=e/(n.i-t.i);n.c-=r,n.s+=e,t.c+=r,n.z+=e,n.m+=e}function sp(t,n,e){return t.a.parent===n.parent?t.a:e}function lp(t,n){this._=t,this.parent=null,this.children=null,this.A=null,this.a=this,this.z=0,this.m=0,this.c=0,this.s=0,this.t=null,this.i=n}function hp(t,n,e,r,i){for(var o,a=t.children,u=-1,c=a.length,f=t.value&&(i-e)/t.value;++u<c;)(o=a[u]).x0=n,o.x1=r,o.y0=e,o.y1=e+=o.value*f}lp.prototype=Object.create(Ed.prototype);var dp=(1+Math.sqrt(5))/2;function pp(t,n,e,r,i,o){for(var a,u,c,f,s,l,h,d,p,g,y,v=[],_=n.children,b=0,m=0,x=_.length,w=n.value;b<x;){c=i-e,f=o-r;do{s=_[m++].value}while(!s&&m<x);for(l=h=s,y=s*s*(g=Math.max(f/c,c/f)/(w*t)),p=Math.max(h/y,y/l);m<x;++m){if(s+=u=_[m].value,u<l&&(l=u),u>h&&(h=u),y=s*s*g,(d=Math.max(h/y,y/l))>p){s-=u;break}p=d}v.push(a={value:s,dice:c<f,children:_.slice(b,m)}),a.dice?Qd(a,e,r,i,w?r+=f*s/w:o):hp(a,e,r,w?e+=c*s/w:i,o),w-=s,b=m}return v}var gp=function t(n){function e(t,e,r,i,o){pp(n,t,e,r,i,o)}return e.ratio=function(n){return t((n=+n)>1?n:1)},e}(dp);var yp=function t(n){function e(t,e,r,i,o){if((a=t._squarify)&&a.ratio===n)for(var a,u,c,f,s,l=-1,h=a.length,d=t.value;++l<h;){for(c=(u=a[l]).children,f=u.value=0,s=c.length;f<s;++f)u.value+=c[f].value;u.dice?Qd(u,e,r,i,d?r+=(o-r)*u.value/d:o):hp(u,e,r,d?e+=(i-e)*u.value/d:i,o),d-=u.value}else t._squarify=a=pp(n,t,e,r,i,o),a.ratio=n}return e.ratio=function(n){return t((n=+n)>1?n:1)},e}(dp);function vp(t,n,e){return(n[0]-t[0])*(e[1]-t[1])-(n[1]-t[1])*(e[0]-t[0])}function _p(t,n){return t[0]-n[0]||t[1]-n[1]}function bp(t){const n=t.length,e=[0,1];let r,i=2;for(r=2;r<n;++r){for(;i>1&&vp(t[e[i-2]],t[e[i-1]],t[r])<=0;)--i;e[i++]=r}return e.slice(0,i)}var mp=Math.random,xp=function t(n){function e(t,e){return t=null==t?0:+t,e=null==e?1:+e,1===arguments.length?(e=t,t=0):e-=t,function(){return n()*e+t}}return e.source=t,e}(mp),wp=function t(n){function e(t,e){return arguments.length<2&&(e=t,t=0),t=Math.floor(t),e=Math.floor(e)-t,function(){return Math.floor(n()*e+t)}}return e.source=t,e}(mp),Mp=function t(n){function e(t,e){var r,i;return t=null==t?0:+t,e=null==e?1:+e,function(){var o;if(null!=r)o=r,r=null;else do{r=2*n()-1,o=2*n()-1,i=r*r+o*o}while(!i||i>1);return t+e*o*Math.sqrt(-2*Math.log(i)/i)}}return e.source=t,e}(mp),Ap=function t(n){var e=Mp.source(n);function r(){var t=e.apply(this,arguments);return function(){return Math.exp(t())}}return r.source=t,r}(mp),Tp=function t(n){function e(t){return(t=+t)<=0?()=>0:function(){for(var e=0,r=t;r>1;--r)e+=n();return e+r*n()}}return e.source=t,e}(mp),Sp=function t(n){var e=Tp.source(n);function r(t){if(0==(t=+t))return n;var r=e(t);return function(){return r()/t}}return r.source=t,r}(mp),Ep=function t(n){function e(t){return function(){return-Math.log1p(-n())/t}}return e.source=t,e}(mp),kp=function t(n){function e(t){if((t=+t)<0)throw new RangeError("invalid alpha");return t=1/-t,function(){return Math.pow(1-n(),t)}}return e.source=t,e}(mp),Np=function t(n){function e(t){if((t=+t)<0||t>1)throw new RangeError("invalid p");return function(){return Math.floor(n()+t)}}return e.source=t,e}(mp),Cp=function t(n){function e(t){if((t=+t)<0||t>1)throw new RangeError("invalid p");return 0===t?()=>1/0:1===t?()=>1:(t=Math.log1p(-t),function(){return 1+Math.floor(Math.log1p(-n())/t)})}return e.source=t,e}(mp),Pp=function t(n){var e=Mp.source(n)();function r(t,r){if((t=+t)<0)throw new RangeError("invalid k");if(0===t)return()=>0;if(r=null==r?1:+r,1===t)return()=>-Math.log1p(-n())*r;var i=(t<1?t+1:t)-1/3,o=1/(3*Math.sqrt(i)),a=t<1?()=>Math.pow(n(),1/t):()=>1;return function(){do{do{var t=e(),u=1+o*t}while(u<=0);u*=u*u;var c=1-n()}while(c>=1-.0331*t*t*t*t&&Math.log(c)>=.5*t*t+i*(1-u+Math.log(u)));return i*u*a()*r}}return r.source=t,r}(mp),zp=function t(n){var e=Pp.source(n);function r(t,n){var r=e(t),i=e(n);return function(){var t=r();return 0===t?0:t/(t+i())}}return r.source=t,r}(mp),Dp=function t(n){var e=Cp.source(n),r=zp.source(n);function i(t,n){return t=+t,(n=+n)>=1?()=>t:n<=0?()=>0:function(){for(var i=0,o=t,a=n;o*a>16&&o*(1-a)>16;){var u=Math.floor((o+1)*a),c=r(u,o-u+1)();c<=a?(i+=u,o-=u,a=(a-c)/(1-c)):(o=u-1,a/=c)}for(var f=a<.5,s=e(f?a:1-a),l=s(),h=0;l<=o;++h)l+=s();return i+(f?h:o-h)}}return i.source=t,i}(mp),Rp=function t(n){function e(t,e,r){var i;return 0==(t=+t)?i=t=>-Math.log(t):(t=1/t,i=n=>Math.pow(n,t)),e=null==e?0:+e,r=null==r?1:+r,function(){return e+r*i(-Math.log1p(-n()))}}return e.source=t,e}(mp),Fp=function t(n){function e(t,e){return t=null==t?0:+t,e=null==e?1:+e,function(){return t+e*Math.tan(Math.PI*n())}}return e.source=t,e}(mp),qp=function t(n){function e(t,e){return t=null==t?0:+t,e=null==e?1:+e,function(){var r=n();return t+e*Math.log(r/(1-r))}}return e.source=t,e}(mp),Ip=function t(n){var e=Pp.source(n),r=Dp.source(n);function i(t){return function(){for(var i=0,o=t;o>16;){var a=Math.floor(.875*o),u=e(a)();if(u>o)return i+r(a-1,o/u)();i+=a,o-=u}for(var c=-Math.log1p(-n()),f=0;c<=o;++f)c-=Math.log1p(-n());return i+f}}return i.source=t,i}(mp);const Op=1/4294967296;function Up(t,n){switch(arguments.length){case 0:break;case 1:this.range(t);break;default:this.range(n).domain(t)}return this}function Bp(t,n){switch(arguments.length){case 0:break;case 1:"function"==typeof t?this.interpolator(t):this.range(t);break;default:this.domain(t),"function"==typeof n?this.interpolator(n):this.range(n)}return this}const Yp=Symbol("implicit");function Lp(){var t=new InternMap,n=[],e=[],r=Yp;function i(i){let o=t.get(i);if(void 0===o){if(r!==Yp)return r;t.set(i,o=n.push(i)-1)}return e[o%e.length]}return i.domain=function(e){if(!arguments.length)return n.slice();n=[],t=new InternMap;for(const r of e)t.has(r)||t.set(r,n.push(r)-1);return i},i.range=function(t){return arguments.length?(e=Array.from(t),i):e.slice()},i.unknown=function(t){return arguments.length?(r=t,i):r},i.copy=function(){return Lp(n,e).unknown(r)},Up.apply(i,arguments),i}function jp(){var t,n,e=Lp().unknown(void 0),r=e.domain,i=e.range,o=0,a=1,u=!1,c=0,f=0,s=.5;function l(){var e=r().length,l=a<o,h=l?a:o,d=l?o:a;t=(d-h)/Math.max(1,e-c+2*f),u&&(t=Math.floor(t)),h+=(d-h-t*(e-c))*s,n=t*(1-c),u&&(h=Math.round(h),n=Math.round(n));var p=lt(e).map((function(n){return h+t*n}));return i(l?p.reverse():p)}return delete e.unknown,e.domain=function(t){return arguments.length?(r(t),l()):r()},e.range=function(t){return arguments.length?([o,a]=t,o=+o,a=+a,l()):[o,a]},e.rangeRound=function(t){return[o,a]=t,o=+o,a=+a,u=!0,l()},e.bandwidth=function(){return n},e.step=function(){return t},e.round=function(t){return arguments.length?(u=!!t,l()):u},e.padding=function(t){return arguments.length?(c=Math.min(1,f=+t),l()):c},e.paddingInner=function(t){return arguments.length?(c=Math.min(1,t),l()):c},e.paddingOuter=function(t){return arguments.length?(f=+t,l()):f},e.align=function(t){return arguments.length?(s=Math.max(0,Math.min(1,t)),l()):s},e.copy=function(){return jp(r(),[o,a]).round(u).paddingInner(c).paddingOuter(f).align(s)},Up.apply(l(),arguments)}function $p(t){var n=t.copy;return t.padding=t.paddingOuter,delete t.paddingInner,delete t.paddingOuter,t.copy=function(){return $p(n())},t}function Hp(t){return+t}var Xp=[0,1];function Gp(t){return t}function Vp(t,n){return(n-=t=+t)?function(e){return(e-t)/n}:function(t){return function(){return t}}(isNaN(n)?NaN:.5)}function Wp(t,n,e){var r=t[0],i=t[1],o=n[0],a=n[1];return i<r?(r=Vp(i,r),o=e(a,o)):(r=Vp(r,i),o=e(o,a)),function(t){return o(r(t))}}function Zp(t,n,e){var r=Math.min(t.length,n.length)-1,i=new Array(r),o=new Array(r),a=-1;for(t[r]<t[0]&&(t=t.slice().reverse(),n=n.slice().reverse());++a<r;)i[a]=Vp(t[a],t[a+1]),o[a]=e(n[a],n[a+1]);return function(n){var e=l(t,n,1,r)-1;return o[e](i[e](n))}}function Kp(t,n){return n.domain(t.domain()).range(t.range()).interpolate(t.interpolate()).clamp(t.clamp()).unknown(t.unknown())}function Qp(){var t,n,e,r,i,o,a=Xp,u=Xp,c=Hr,f=Gp;function s(){var t=Math.min(a.length,u.length);return f!==Gp&&(f=function(t,n){var e;return t>n&&(e=t,t=n,n=e),function(e){return Math.max(t,Math.min(n,e))}}(a[0],a[t-1])),r=t>2?Zp:Wp,i=o=null,l}function l(n){return null==n||isNaN(n=+n)?e:(i||(i=r(a.map(t),u,c)))(t(f(n)))}return l.invert=function(e){return f(n((o||(o=r(u,a.map(t),Br)))(e)))},l.domain=function(t){return arguments.length?(a=Array.from(t,Hp),s()):a.slice()},l.range=function(t){return arguments.length?(u=Array.from(t),s()):u.slice()},l.rangeRound=function(t){return u=Array.from(t),c=Xr,s()},l.clamp=function(t){return arguments.length?(f=!!t||Gp,s()):f!==Gp},l.interpolate=function(t){return arguments.length?(c=t,s()):c},l.unknown=function(t){return arguments.length?(e=t,l):e},function(e,r){return t=e,n=r,s()}}function Jp(){return Qp()(Gp,Gp)}function tg(n,e,r,i){var o,a=W(n,e,r);switch((i=Dc(null==i?",f":i)).type){case"s":var u=Math.max(Math.abs(n),Math.abs(e));return null!=i.precision||isNaN(o=$c(a,u))||(i.precision=o),t.formatPrefix(i,u);case"":case"e":case"g":case"p":case"r":null!=i.precision||isNaN(o=Hc(a,Math.max(Math.abs(n),Math.abs(e))))||(i.precision=o-("e"===i.type));break;case"f":case"%":null!=i.precision||isNaN(o=jc(a))||(i.precision=o-2*("%"===i.type))}return t.format(i)}function ng(t){var n=t.domain;return t.ticks=function(t){var e=n();return G(e[0],e[e.length-1],null==t?10:t)},t.tickFormat=function(t,e){var r=n();return tg(r[0],r[r.length-1],null==t?10:t,e)},t.nice=function(e){null==e&&(e=10);var r,i,o=n(),a=0,u=o.length-1,c=o[a],f=o[u],s=10;for(f<c&&(i=c,c=f,f=i,i=a,a=u,u=i);s-- >0;){if((i=V(c,f,e))===r)return o[a]=c,o[u]=f,n(o);if(i>0)c=Math.floor(c/i)*i,f=Math.ceil(f/i)*i;else{if(!(i<0))break;c=Math.ceil(c*i)/i,f=Math.floor(f*i)/i}r=i}return t},t}function eg(t,n){var e,r=0,i=(t=t.slice()).length-1,o=t[r],a=t[i];return a<o&&(e=r,r=i,i=e,e=o,o=a,a=e),t[r]=n.floor(o),t[i]=n.ceil(a),t}function rg(t){return Math.log(t)}function ig(t){return Math.exp(t)}function og(t){return-Math.log(-t)}function ag(t){return-Math.exp(-t)}function ug(t){return isFinite(t)?+("1e"+t):t<0?0:t}function cg(t){return(n,e)=>-t(-n,e)}function fg(n){const e=n(rg,ig),r=e.domain;let i,o,a=10;function u(){return i=function(t){return t===Math.E?Math.log:10===t&&Math.log10||2===t&&Math.log2||(t=Math.log(t),n=>Math.log(n)/t)}(a),o=function(t){return 10===t?ug:t===Math.E?Math.exp:n=>Math.pow(t,n)}(a),r()[0]<0?(i=cg(i),o=cg(o),n(og,ag)):n(rg,ig),e}return e.base=function(t){return arguments.length?(a=+t,u()):a},e.domain=function(t){return arguments.length?(r(t),u()):r()},e.ticks=t=>{const n=r();let e=n[0],u=n[n.length-1];const c=u<e;c&&([e,u]=[u,e]);let f,s,l=i(e),h=i(u);const d=null==t?10:+t;let p=[];if(!(a%1)&&h-l<d){if(l=Math.floor(l),h=Math.ceil(h),e>0){for(;l<=h;++l)for(f=1;f<a;++f)if(s=l<0?f/o(-l):f*o(l),!(s<e)){if(s>u)break;p.push(s)}}else for(;l<=h;++l)for(f=a-1;f>=1;--f)if(s=l>0?f/o(-l):f*o(l),!(s<e)){if(s>u)break;p.push(s)}2*p.length<d&&(p=G(e,u,d))}else p=G(l,h,Math.min(h-l,d)).map(o);return c?p.reverse():p},e.tickFormat=(n,r)=>{if(null==n&&(n=10),null==r&&(r=10===a?"s":","),"function"!=typeof r&&(a%1||null!=(r=Dc(r)).precision||(r.trim=!0),r=t.format(r)),n===1/0)return r;const u=Math.max(1,a*n/e.ticks().length);return t=>{let n=t/o(Math.round(i(t)));return n*a<a-.5&&(n*=a),n<=u?r(t):""}},e.nice=()=>r(eg(r(),{floor:t=>o(Math.floor(i(t))),ceil:t=>o(Math.ceil(i(t)))})),e}function sg(t){return function(n){return Math.sign(n)*Math.log1p(Math.abs(n/t))}}function lg(t){return function(n){return Math.sign(n)*Math.expm1(Math.abs(n))*t}}function hg(t){var n=1,e=t(sg(n),lg(n));return e.constant=function(e){return arguments.length?t(sg(n=+e),lg(n)):n},ng(e)}function dg(t){return function(n){return n<0?-Math.pow(-n,t):Math.pow(n,t)}}function pg(t){return t<0?-Math.sqrt(-t):Math.sqrt(t)}function gg(t){return t<0?-t*t:t*t}function yg(t){var n=t(Gp,Gp),e=1;function r(){return 1===e?t(Gp,Gp):.5===e?t(pg,gg):t(dg(e),dg(1/e))}return n.exponent=function(t){return arguments.length?(e=+t,r()):e},ng(n)}function vg(){var t=yg(Qp());return t.copy=function(){return Kp(t,vg()).exponent(t.exponent())},Up.apply(t,arguments),t}function _g(t){return Math.sign(t)*t*t}function bg(t){return Math.sign(t)*Math.sqrt(Math.abs(t))}var mg=new Date,xg=new Date;function wg(t,n,e,r){function i(n){return t(n=0===arguments.length?new Date:new Date(+n)),n}return i.floor=function(n){return t(n=new Date(+n)),n},i.ceil=function(e){return t(e=new Date(e-1)),n(e,1),t(e),e},i.round=function(t){var n=i(t),e=i.ceil(t);return t-n<e-t?n:e},i.offset=function(t,e){return n(t=new Date(+t),null==e?1:Math.floor(e)),t},i.range=function(e,r,o){var a,u=[];if(e=i.ceil(e),o=null==o?1:Math.floor(o),!(e<r&&o>0))return u;do{u.push(a=new Date(+e)),n(e,o),t(e)}while(a<e&&e<r);return u},i.filter=function(e){return wg((function(n){if(n>=n)for(;t(n),!e(n);)n.setTime(n-1)}),(function(t,r){if(t>=t)if(r<0)for(;++r<=0;)for(;n(t,-1),!e(t););else for(;--r>=0;)for(;n(t,1),!e(t););}))},e&&(i.count=function(n,r){return mg.setTime(+n),xg.setTime(+r),t(mg),t(xg),Math.floor(e(mg,xg))},i.every=function(t){return t=Math.floor(t),isFinite(t)&&t>0?t>1?i.filter(r?function(n){return r(n)%t==0}:function(n){return i.count(0,n)%t==0}):i:null}),i}var Mg=wg((function(){}),(function(t,n){t.setTime(+t+n)}),(function(t,n){return n-t}));Mg.every=function(t){return t=Math.floor(t),isFinite(t)&&t>0?t>1?wg((function(n){n.setTime(Math.floor(n/t)*t)}),(function(n,e){n.setTime(+n+e*t)}),(function(n,e){return(e-n)/t})):Mg:null};var Ag=Mg,Tg=Mg.range;const Sg=1e3,Eg=6e4,kg=36e5,Ng=864e5,Cg=6048e5,Pg=2592e6,zg=31536e6;var Dg=wg((function(t){t.setTime(t-t.getMilliseconds())}),(function(t,n){t.setTime(+t+n*Sg)}),(function(t,n){return(n-t)/Sg}),(function(t){return t.getUTCSeconds()})),Rg=Dg,Fg=Dg.range,qg=wg((function(t){t.setTime(t-t.getMilliseconds()-t.getSeconds()*Sg)}),(function(t,n){t.setTime(+t+n*Eg)}),(function(t,n){return(n-t)/Eg}),(function(t){return t.getMinutes()})),Ig=qg,Og=qg.range,Ug=wg((function(t){t.setTime(t-t.getMilliseconds()-t.getSeconds()*Sg-t.getMinutes()*Eg)}),(function(t,n){t.setTime(+t+n*kg)}),(function(t,n){return(n-t)/kg}),(function(t){return t.getHours()})),Bg=Ug,Yg=Ug.range,Lg=wg((t=>t.setHours(0,0,0,0)),((t,n)=>t.setDate(t.getDate()+n)),((t,n)=>(n-t-(n.getTimezoneOffset()-t.getTimezoneOffset())*Eg)/Ng),(t=>t.getDate()-1)),jg=Lg,$g=Lg.range;function Hg(t){return wg((function(n){n.setDate(n.getDate()-(n.getDay()+7-t)%7),n.setHours(0,0,0,0)}),(function(t,n){t.setDate(t.getDate()+7*n)}),(function(t,n){return(n-t-(n.getTimezoneOffset()-t.getTimezoneOffset())*Eg)/Cg}))}var Xg=Hg(0),Gg=Hg(1),Vg=Hg(2),Wg=Hg(3),Zg=Hg(4),Kg=Hg(5),Qg=Hg(6),Jg=Xg.range,ty=Gg.range,ny=Vg.range,ey=Wg.range,ry=Zg.range,iy=Kg.range,oy=Qg.range,ay=wg((function(t){t.setDate(1),t.setHours(0,0,0,0)}),(function(t,n){t.setMonth(t.getMonth()+n)}),(function(t,n){return n.getMonth()-t.getMonth()+12*(n.getFullYear()-t.getFullYear())}),(function(t){return t.getMonth()})),uy=ay,cy=ay.range,fy=wg((function(t){t.setMonth(0,1),t.setHours(0,0,0,0)}),(function(t,n){t.setFullYear(t.getFullYear()+n)}),(function(t,n){return n.getFullYear()-t.getFullYear()}),(function(t){return t.getFullYear()}));fy.every=function(t){return isFinite(t=Math.floor(t))&&t>0?wg((function(n){n.setFullYear(Math.floor(n.getFullYear()/t)*t),n.setMonth(0,1),n.setHours(0,0,0,0)}),(function(n,e){n.setFullYear(n.getFullYear()+e*t)})):null};var sy=fy,ly=fy.range,hy=wg((function(t){t.setUTCSeconds(0,0)}),(function(t,n){t.setTime(+t+n*Eg)}),(function(t,n){return(n-t)/Eg}),(function(t){return t.getUTCMinutes()})),dy=hy,py=hy.range,gy=wg((function(t){t.setUTCMinutes(0,0,0)}),(function(t,n){t.setTime(+t+n*kg)}),(function(t,n){return(n-t)/kg}),(function(t){return t.getUTCHours()})),yy=gy,vy=gy.range,_y=wg((function(t){t.setUTCHours(0,0,0,0)}),(function(t,n){t.setUTCDate(t.getUTCDate()+n)}),(function(t,n){return(n-t)/Ng}),(function(t){return t.getUTCDate()-1})),by=_y,my=_y.range;function xy(t){return wg((function(n){n.setUTCDate(n.getUTCDate()-(n.getUTCDay()+7-t)%7),n.setUTCHours(0,0,0,0)}),(function(t,n){t.setUTCDate(t.getUTCDate()+7*n)}),(function(t,n){return(n-t)/Cg}))}var wy=xy(0),My=xy(1),Ay=xy(2),Ty=xy(3),Sy=xy(4),Ey=xy(5),ky=xy(6),Ny=wy.range,Cy=My.range,Py=Ay.range,zy=Ty.range,Dy=Sy.range,Ry=Ey.range,Fy=ky.range,qy=wg((function(t){t.setUTCDate(1),t.setUTCHours(0,0,0,0)}),(function(t,n){t.setUTCMonth(t.getUTCMonth()+n)}),(function(t,n){return n.getUTCMonth()-t.getUTCMonth()+12*(n.getUTCFullYear()-t.getUTCFullYear())}),(function(t){return t.getUTCMonth()})),Iy=qy,Oy=qy.range,Uy=wg((function(t){t.setUTCMonth(0,1),t.setUTCHours(0,0,0,0)}),(function(t,n){t.setUTCFullYear(t.getUTCFullYear()+n)}),(function(t,n){return n.getUTCFullYear()-t.getUTCFullYear()}),(function(t){return t.getUTCFullYear()}));Uy.every=function(t){return isFinite(t=Math.floor(t))&&t>0?wg((function(n){n.setUTCFullYear(Math.floor(n.getUTCFullYear()/t)*t),n.setUTCMonth(0,1),n.setUTCHours(0,0,0,0)}),(function(n,e){n.setUTCFullYear(n.getUTCFullYear()+e*t)})):null};var By=Uy,Yy=Uy.range;function Ly(t,n,e,i,o,a){const u=[[Rg,1,Sg],[Rg,5,5e3],[Rg,15,15e3],[Rg,30,3e4],[a,1,Eg],[a,5,3e5],[a,15,9e5],[a,30,18e5],[o,1,kg],[o,3,108e5],[o,6,216e5],[o,12,432e5],[i,1,Ng],[i,2,1728e5],[e,1,Cg],[n,1,Pg],[n,3,7776e6],[t,1,zg]];function c(n,e,i){const o=Math.abs(e-n)/i,a=r((([,,t])=>t)).right(u,o);if(a===u.length)return t.every(W(n/zg,e/zg,i));if(0===a)return Ag.every(Math.max(W(n,e,i),1));const[c,f]=u[o/u[a-1][2]<u[a][2]/o?a-1:a];return c.every(f)}return[function(t,n,e){const r=n<t;r&&([t,n]=[n,t]);const i=e&&"function"==typeof e.range?e:c(t,n,e),o=i?i.range(t,+n+1):[];return r?o.reverse():o},c]}const[jy,$y]=Ly(By,Iy,wy,by,yy,dy),[Hy,Xy]=Ly(sy,uy,Xg,jg,Bg,Ig);function Gy(t){if(0<=t.y&&t.y<100){var n=new Date(-1,t.m,t.d,t.H,t.M,t.S,t.L);return n.setFullYear(t.y),n}return new Date(t.y,t.m,t.d,t.H,t.M,t.S,t.L)}function Vy(t){if(0<=t.y&&t.y<100){var n=new Date(Date.UTC(-1,t.m,t.d,t.H,t.M,t.S,t.L));return n.setUTCFullYear(t.y),n}return new Date(Date.UTC(t.y,t.m,t.d,t.H,t.M,t.S,t.L))}function Wy(t,n,e){return{y:t,m:n,d:e,H:0,M:0,S:0,L:0}}function Zy(t){var n=t.dateTime,e=t.date,r=t.time,i=t.periods,o=t.days,a=t.shortDays,u=t.months,c=t.shortMonths,f=iv(i),s=ov(i),l=iv(o),h=ov(o),d=iv(a),p=ov(a),g=iv(u),y=ov(u),v=iv(c),_=ov(c),b={a:function(t){return a[t.getDay()]},A:function(t){return o[t.getDay()]},b:function(t){return c[t.getMonth()]},B:function(t){return u[t.getMonth()]},c:null,d:Sv,e:Sv,f:Pv,g:Lv,G:$v,H:Ev,I:kv,j:Nv,L:Cv,m:zv,M:Dv,p:function(t){return i[+(t.getHours()>=12)]},q:function(t){return 1+~~(t.getMonth()/3)},Q:d_,s:p_,S:Rv,u:Fv,U:qv,V:Ov,w:Uv,W:Bv,x:null,X:null,y:Yv,Y:jv,Z:Hv,"%":h_},m={a:function(t){return a[t.getUTCDay()]},A:function(t){return o[t.getUTCDay()]},b:function(t){return c[t.getUTCMonth()]},B:function(t){return u[t.getUTCMonth()]},c:null,d:Xv,e:Xv,f:Kv,g:c_,G:s_,H:Gv,I:Vv,j:Wv,L:Zv,m:Qv,M:Jv,p:function(t){return i[+(t.getUTCHours()>=12)]},q:function(t){return 1+~~(t.getUTCMonth()/3)},Q:d_,s:p_,S:t_,u:n_,U:e_,V:i_,w:o_,W:a_,x:null,X:null,y:u_,Y:f_,Z:l_,"%":h_},x={a:function(t,n,e){var r=d.exec(n.slice(e));return r?(t.w=p.get(r[0].toLowerCase()),e+r[0].length):-1},A:function(t,n,e){var r=l.exec(n.slice(e));return r?(t.w=h.get(r[0].toLowerCase()),e+r[0].length):-1},b:function(t,n,e){var r=v.exec(n.slice(e));return r?(t.m=_.get(r[0].toLowerCase()),e+r[0].length):-1},B:function(t,n,e){var r=g.exec(n.slice(e));return r?(t.m=y.get(r[0].toLowerCase()),e+r[0].length):-1},c:function(t,e,r){return A(t,n,e,r)},d:yv,e:yv,f:wv,g:hv,G:lv,H:_v,I:_v,j:vv,L:xv,m:gv,M:bv,p:function(t,n,e){var r=f.exec(n.slice(e));return r?(t.p=s.get(r[0].toLowerCase()),e+r[0].length):-1},q:pv,Q:Av,s:Tv,S:mv,u:uv,U:cv,V:fv,w:av,W:sv,x:function(t,n,r){return A(t,e,n,r)},X:function(t,n,e){return A(t,r,n,e)},y:hv,Y:lv,Z:dv,"%":Mv};function w(t,n){return function(e){var r,i,o,a=[],u=-1,c=0,f=t.length;for(e instanceof Date||(e=new Date(+e));++u<f;)37===t.charCodeAt(u)&&(a.push(t.slice(c,u)),null!=(i=Qy[r=t.charAt(++u)])?r=t.charAt(++u):i="e"===r?" ":"0",(o=n[r])&&(r=o(e,i)),a.push(r),c=u+1);return a.push(t.slice(c,u)),a.join("")}}function M(t,n){return function(e){var r,i,o=Wy(1900,void 0,1);if(A(o,t,e+="",0)!=e.length)return null;if("Q"in o)return new Date(o.Q);if("s"in o)return new Date(1e3*o.s+("L"in o?o.L:0));if(n&&!("Z"in o)&&(o.Z=0),"p"in o&&(o.H=o.H%12+12*o.p),void 0===o.m&&(o.m="q"in o?o.q:0),"V"in o){if(o.V<1||o.V>53)return null;"w"in o||(o.w=1),"Z"in o?(i=(r=Vy(Wy(o.y,0,1))).getUTCDay(),r=i>4||0===i?My.ceil(r):My(r),r=by.offset(r,7*(o.V-1)),o.y=r.getUTCFullYear(),o.m=r.getUTCMonth(),o.d=r.getUTCDate()+(o.w+6)%7):(i=(r=Gy(Wy(o.y,0,1))).getDay(),r=i>4||0===i?Gg.ceil(r):Gg(r),r=jg.offset(r,7*(o.V-1)),o.y=r.getFullYear(),o.m=r.getMonth(),o.d=r.getDate()+(o.w+6)%7)}else("W"in o||"U"in o)&&("w"in o||(o.w="u"in o?o.u%7:"W"in o?1:0),i="Z"in o?Vy(Wy(o.y,0,1)).getUTCDay():Gy(Wy(o.y,0,1)).getDay(),o.m=0,o.d="W"in o?(o.w+6)%7+7*o.W-(i+5)%7:o.w+7*o.U-(i+6)%7);return"Z"in o?(o.H+=o.Z/100|0,o.M+=o.Z%100,Vy(o)):Gy(o)}}function A(t,n,e,r){for(var i,o,a=0,u=n.length,c=e.length;a<u;){if(r>=c)return-1;if(37===(i=n.charCodeAt(a++))){if(i=n.charAt(a++),!(o=x[i in Qy?n.charAt(a++):i])||(r=o(t,e,r))<0)return-1}else if(i!=e.charCodeAt(r++))return-1}return r}return b.x=w(e,b),b.X=w(r,b),b.c=w(n,b),m.x=w(e,m),m.X=w(r,m),m.c=w(n,m),{format:function(t){var n=w(t+="",b);return n.toString=function(){return t},n},parse:function(t){var n=M(t+="",!1);return n.toString=function(){return t},n},utcFormat:function(t){var n=w(t+="",m);return n.toString=function(){return t},n},utcParse:function(t){var n=M(t+="",!0);return n.toString=function(){return t},n}}}var Ky,Qy={"-":"",_:" ",0:"0"},Jy=/^\s*\d+/,tv=/^%/,nv=/[\\^$*+?|[\]().{}]/g;function ev(t,n,e){var r=t<0?"-":"",i=(r?-t:t)+"",o=i.length;return r+(o<e?new Array(e-o+1).join(n)+i:i)}function rv(t){return t.replace(nv,"\\$&")}function iv(t){return new RegExp("^(?:"+t.map(rv).join("|")+")","i")}function ov(t){return new Map(t.map(((t,n)=>[t.toLowerCase(),n])))}function av(t,n,e){var r=Jy.exec(n.slice(e,e+1));return r?(t.w=+r[0],e+r[0].length):-1}function uv(t,n,e){var r=Jy.exec(n.slice(e,e+1));return r?(t.u=+r[0],e+r[0].length):-1}function cv(t,n,e){var r=Jy.exec(n.slice(e,e+2));return r?(t.U=+r[0],e+r[0].length):-1}function fv(t,n,e){var r=Jy.exec(n.slice(e,e+2));return r?(t.V=+r[0],e+r[0].length):-1}function sv(t,n,e){var r=Jy.exec(n.slice(e,e+2));return r?(t.W=+r[0],e+r[0].length):-1}function lv(t,n,e){var r=Jy.exec(n.slice(e,e+4));return r?(t.y=+r[0],e+r[0].length):-1}function hv(t,n,e){var r=Jy.exec(n.slice(e,e+2));return r?(t.y=+r[0]+(+r[0]>68?1900:2e3),e+r[0].length):-1}function dv(t,n,e){var r=/^(Z)|([+-]\d\d)(?::?(\d\d))?/.exec(n.slice(e,e+6));return r?(t.Z=r[1]?0:-(r[2]+(r[3]||"00")),e+r[0].length):-1}function pv(t,n,e){var r=Jy.exec(n.slice(e,e+1));return r?(t.q=3*r[0]-3,e+r[0].length):-1}function gv(t,n,e){var r=Jy.exec(n.slice(e,e+2));return r?(t.m=r[0]-1,e+r[0].length):-1}function yv(t,n,e){var r=Jy.exec(n.slice(e,e+2));return r?(t.d=+r[0],e+r[0].length):-1}function vv(t,n,e){var r=Jy.exec(n.slice(e,e+3));return r?(t.m=0,t.d=+r[0],e+r[0].length):-1}function _v(t,n,e){var r=Jy.exec(n.slice(e,e+2));return r?(t.H=+r[0],e+r[0].length):-1}function bv(t,n,e){var r=Jy.exec(n.slice(e,e+2));return r?(t.M=+r[0],e+r[0].length):-1}function mv(t,n,e){var r=Jy.exec(n.slice(e,e+2));return r?(t.S=+r[0],e+r[0].length):-1}function xv(t,n,e){var r=Jy.exec(n.slice(e,e+3));return r?(t.L=+r[0],e+r[0].length):-1}function wv(t,n,e){var r=Jy.exec(n.slice(e,e+6));return r?(t.L=Math.floor(r[0]/1e3),e+r[0].length):-1}function Mv(t,n,e){var r=tv.exec(n.slice(e,e+1));return r?e+r[0].length:-1}function Av(t,n,e){var r=Jy.exec(n.slice(e));return r?(t.Q=+r[0],e+r[0].length):-1}function Tv(t,n,e){var r=Jy.exec(n.slice(e));return r?(t.s=+r[0],e+r[0].length):-1}function Sv(t,n){return ev(t.getDate(),n,2)}function Ev(t,n){return ev(t.getHours(),n,2)}function kv(t,n){return ev(t.getHours()%12||12,n,2)}function Nv(t,n){return ev(1+jg.count(sy(t),t),n,3)}function Cv(t,n){return ev(t.getMilliseconds(),n,3)}function Pv(t,n){return Cv(t,n)+"000"}function zv(t,n){return ev(t.getMonth()+1,n,2)}function Dv(t,n){return ev(t.getMinutes(),n,2)}function Rv(t,n){return ev(t.getSeconds(),n,2)}function Fv(t){var n=t.getDay();return 0===n?7:n}function qv(t,n){return ev(Xg.count(sy(t)-1,t),n,2)}function Iv(t){var n=t.getDay();return n>=4||0===n?Zg(t):Zg.ceil(t)}function Ov(t,n){return t=Iv(t),ev(Zg.count(sy(t),t)+(4===sy(t).getDay()),n,2)}function Uv(t){return t.getDay()}function Bv(t,n){return ev(Gg.count(sy(t)-1,t),n,2)}function Yv(t,n){return ev(t.getFullYear()%100,n,2)}function Lv(t,n){return ev((t=Iv(t)).getFullYear()%100,n,2)}function jv(t,n){return ev(t.getFullYear()%1e4,n,4)}function $v(t,n){var e=t.getDay();return ev((t=e>=4||0===e?Zg(t):Zg.ceil(t)).getFullYear()%1e4,n,4)}function Hv(t){var n=t.getTimezoneOffset();return(n>0?"-":(n*=-1,"+"))+ev(n/60|0,"0",2)+ev(n%60,"0",2)}function Xv(t,n){return ev(t.getUTCDate(),n,2)}function Gv(t,n){return ev(t.getUTCHours(),n,2)}function Vv(t,n){return ev(t.getUTCHours()%12||12,n,2)}function Wv(t,n){return ev(1+by.count(By(t),t),n,3)}function Zv(t,n){return ev(t.getUTCMilliseconds(),n,3)}function Kv(t,n){return Zv(t,n)+"000"}function Qv(t,n){return ev(t.getUTCMonth()+1,n,2)}function Jv(t,n){return ev(t.getUTCMinutes(),n,2)}function t_(t,n){return ev(t.getUTCSeconds(),n,2)}function n_(t){var n=t.getUTCDay();return 0===n?7:n}function e_(t,n){return ev(wy.count(By(t)-1,t),n,2)}function r_(t){var n=t.getUTCDay();return n>=4||0===n?Sy(t):Sy.ceil(t)}function i_(t,n){return t=r_(t),ev(Sy.count(By(t),t)+(4===By(t).getUTCDay()),n,2)}function o_(t){return t.getUTCDay()}function a_(t,n){return ev(My.count(By(t)-1,t),n,2)}function u_(t,n){return ev(t.getUTCFullYear()%100,n,2)}function c_(t,n){return ev((t=r_(t)).getUTCFullYear()%100,n,2)}function f_(t,n){return ev(t.getUTCFullYear()%1e4,n,4)}function s_(t,n){var e=t.getUTCDay();return ev((t=e>=4||0===e?Sy(t):Sy.ceil(t)).getUTCFullYear()%1e4,n,4)}function l_(){return"+0000"}function h_(){return"%"}function d_(t){return+t}function p_(t){return Math.floor(+t/1e3)}function g_(n){return Ky=Zy(n),t.timeFormat=Ky.format,t.timeParse=Ky.parse,t.utcFormat=Ky.utcFormat,t.utcParse=Ky.utcParse,Ky}t.timeFormat=void 0,t.timeParse=void 0,t.utcFormat=void 0,t.utcParse=void 0,g_({dateTime:"%x, %X",date:"%-m/%-d/%Y",time:"%-I:%M:%S %p",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});var y_="%Y-%m-%dT%H:%M:%S.%LZ";var v_=Date.prototype.toISOString?function(t){return t.toISOString()}:t.utcFormat(y_),__=v_;var b_=+new Date("2000-01-01T00:00:00.000Z")?function(t){var n=new Date(t);return isNaN(n)?null:n}:t.utcParse(y_),m_=b_;function x_(t){return new Date(t)}function w_(t){return t instanceof Date?+t:+new Date(+t)}function M_(t,n,e,r,i,o,a,u,c,f){var s=Jp(),l=s.invert,h=s.domain,d=f(".%L"),p=f(":%S"),g=f("%I:%M"),y=f("%I %p"),v=f("%a %d"),_=f("%b %d"),b=f("%B"),m=f("%Y");function x(t){return(c(t)<t?d:u(t)<t?p:a(t)<t?g:o(t)<t?y:r(t)<t?i(t)<t?v:_:e(t)<t?b:m)(t)}return s.invert=function(t){return new Date(l(t))},s.domain=function(t){return arguments.length?h(Array.from(t,w_)):h().map(x_)},s.ticks=function(n){var e=h();return t(e[0],e[e.length-1],null==n?10:n)},s.tickFormat=function(t,n){return null==n?x:f(n)},s.nice=function(t){var e=h();return t&&"function"==typeof t.range||(t=n(e[0],e[e.length-1],null==t?10:t)),t?h(eg(e,t)):s},s.copy=function(){return Kp(s,M_(t,n,e,r,i,o,a,u,c,f))},s}function A_(){var t,n,e,r,i,o=0,a=1,u=Gp,c=!1;function f(n){return null==n||isNaN(n=+n)?i:u(0===e?.5:(n=(r(n)-t)*e,c?Math.max(0,Math.min(1,n)):n))}function s(t){return function(n){var e,r;return arguments.length?([e,r]=n,u=t(e,r),f):[u(0),u(1)]}}return f.domain=function(i){return arguments.length?([o,a]=i,t=r(o=+o),n=r(a=+a),e=t===n?0:1/(n-t),f):[o,a]},f.clamp=function(t){return arguments.length?(c=!!t,f):c},f.interpolator=function(t){return arguments.length?(u=t,f):u},f.range=s(Hr),f.rangeRound=s(Xr),f.unknown=function(t){return arguments.length?(i=t,f):i},function(i){return r=i,t=i(o),n=i(a),e=t===n?0:1/(n-t),f}}function T_(t,n){return n.domain(t.domain()).interpolator(t.interpolator()).clamp(t.clamp()).unknown(t.unknown())}function S_(){var t=yg(A_());return t.copy=function(){return T_(t,S_()).exponent(t.exponent())},Bp.apply(t,arguments)}function E_(){var t,n,e,r,i,o,a,u=0,c=.5,f=1,s=1,l=Gp,h=!1;function d(t){return isNaN(t=+t)?a:(t=.5+((t=+o(t))-n)*(s*t<s*n?r:i),l(h?Math.max(0,Math.min(1,t)):t))}function p(t){return function(n){var e,r,i;return arguments.length?([e,r,i]=n,l=li(t,[e,r,i]),d):[l(0),l(.5),l(1)]}}return d.domain=function(a){return arguments.length?([u,c,f]=a,t=o(u=+u),n=o(c=+c),e=o(f=+f),r=t===n?0:.5/(n-t),i=n===e?0:.5/(e-n),s=n<t?-1:1,d):[u,c,f]},d.clamp=function(t){return arguments.length?(h=!!t,d):h},d.interpolator=function(t){return arguments.length?(l=t,d):l},d.range=p(Hr),d.rangeRound=p(Xr),d.unknown=function(t){return arguments.length?(a=t,d):a},function(a){return o=a,t=a(u),n=a(c),e=a(f),r=t===n?0:.5/(n-t),i=n===e?0:.5/(e-n),s=n<t?-1:1,d}}function k_(){var t=yg(E_());return t.copy=function(){return T_(t,k_()).exponent(t.exponent())},Bp.apply(t,arguments)}function N_(t){for(var n=t.length/6|0,e=new Array(n),r=0;r<n;)e[r]="#"+t.slice(6*r,6*++r);return e}var C_=N_("1f77b4ff7f0e2ca02cd627289467bd8c564be377c27f7f7fbcbd2217becf"),P_=N_("7fc97fbeaed4fdc086ffff99386cb0f0027fbf5b17666666"),z_=N_("1b9e77d95f027570b3e7298a66a61ee6ab02a6761d666666"),D_=N_("a6cee31f78b4b2df8a33a02cfb9a99e31a1cfdbf6fff7f00cab2d66a3d9affff99b15928"),R_=N_("fbb4aeb3cde3ccebc5decbe4fed9a6ffffcce5d8bdfddaecf2f2f2"),F_=N_("b3e2cdfdcdaccbd5e8f4cae4e6f5c9fff2aef1e2cccccccc"),q_=N_("e41a1c377eb84daf4a984ea3ff7f00ffff33a65628f781bf999999"),I_=N_("66c2a5fc8d628da0cbe78ac3a6d854ffd92fe5c494b3b3b3"),O_=N_("8dd3c7ffffb3bebadafb807280b1d3fdb462b3de69fccde5d9d9d9bc80bdccebc5ffed6f"),U_=N_("4e79a7f28e2ce1575976b7b259a14fedc949af7aa1ff9da79c755fbab0ab"),B_=t=>Rr(t[t.length-1]),Y_=new Array(3).concat("d8b365f5f5f55ab4ac","a6611adfc27d80cdc1018571","a6611adfc27df5f5f580cdc1018571","8c510ad8b365f6e8c3c7eae55ab4ac01665e","8c510ad8b365f6e8c3f5f5f5c7eae55ab4ac01665e","8c510abf812ddfc27df6e8c3c7eae580cdc135978f01665e","8c510abf812ddfc27df6e8c3f5f5f5c7eae580cdc135978f01665e","5430058c510abf812ddfc27df6e8c3c7eae580cdc135978f01665e003c30","5430058c510abf812ddfc27df6e8c3f5f5f5c7eae580cdc135978f01665e003c30").map(N_),L_=B_(Y_),j_=new Array(3).concat("af8dc3f7f7f77fbf7b","7b3294c2a5cfa6dba0008837","7b3294c2a5cff7f7f7a6dba0008837","762a83af8dc3e7d4e8d9f0d37fbf7b1b7837","762a83af8dc3e7d4e8f7f7f7d9f0d37fbf7b1b7837","762a839970abc2a5cfe7d4e8d9f0d3a6dba05aae611b7837","762a839970abc2a5cfe7d4e8f7f7f7d9f0d3a6dba05aae611b7837","40004b762a839970abc2a5cfe7d4e8d9f0d3a6dba05aae611b783700441b","40004b762a839970abc2a5cfe7d4e8f7f7f7d9f0d3a6dba05aae611b783700441b").map(N_),$_=B_(j_),H_=new Array(3).concat("e9a3c9f7f7f7a1d76a","d01c8bf1b6dab8e1864dac26","d01c8bf1b6daf7f7f7b8e1864dac26","c51b7de9a3c9fde0efe6f5d0a1d76a4d9221","c51b7de9a3c9fde0eff7f7f7e6f5d0a1d76a4d9221","c51b7dde77aef1b6dafde0efe6f5d0b8e1867fbc414d9221","c51b7dde77aef1b6dafde0eff7f7f7e6f5d0b8e1867fbc414d9221","8e0152c51b7dde77aef1b6dafde0efe6f5d0b8e1867fbc414d9221276419","8e0152c51b7dde77aef1b6dafde0eff7f7f7e6f5d0b8e1867fbc414d9221276419").map(N_),X_=B_(H_),G_=new Array(3).concat("998ec3f7f7f7f1a340","5e3c99b2abd2fdb863e66101","5e3c99b2abd2f7f7f7fdb863e66101","542788998ec3d8daebfee0b6f1a340b35806","542788998ec3d8daebf7f7f7fee0b6f1a340b35806","5427888073acb2abd2d8daebfee0b6fdb863e08214b35806","5427888073acb2abd2d8daebf7f7f7fee0b6fdb863e08214b35806","2d004b5427888073acb2abd2d8daebfee0b6fdb863e08214b358067f3b08","2d004b5427888073acb2abd2d8daebf7f7f7fee0b6fdb863e08214b358067f3b08").map(N_),V_=B_(G_),W_=new Array(3).concat("ef8a62f7f7f767a9cf","ca0020f4a58292c5de0571b0","ca0020f4a582f7f7f792c5de0571b0","b2182bef8a62fddbc7d1e5f067a9cf2166ac","b2182bef8a62fddbc7f7f7f7d1e5f067a9cf2166ac","b2182bd6604df4a582fddbc7d1e5f092c5de4393c32166ac","b2182bd6604df4a582fddbc7f7f7f7d1e5f092c5de4393c32166ac","67001fb2182bd6604df4a582fddbc7d1e5f092c5de4393c32166ac053061","67001fb2182bd6604df4a582fddbc7f7f7f7d1e5f092c5de4393c32166ac053061").map(N_),Z_=B_(W_),K_=new Array(3).concat("ef8a62ffffff999999","ca0020f4a582bababa404040","ca0020f4a582ffffffbababa404040","b2182bef8a62fddbc7e0e0e09999994d4d4d","b2182bef8a62fddbc7ffffffe0e0e09999994d4d4d","b2182bd6604df4a582fddbc7e0e0e0bababa8787874d4d4d","b2182bd6604df4a582fddbc7ffffffe0e0e0bababa8787874d4d4d","67001fb2182bd6604df4a582fddbc7e0e0e0bababa8787874d4d4d1a1a1a","67001fb2182bd6604df4a582fddbc7ffffffe0e0e0bababa8787874d4d4d1a1a1a").map(N_),Q_=B_(K_),J_=new Array(3).concat("fc8d59ffffbf91bfdb","d7191cfdae61abd9e92c7bb6","d7191cfdae61ffffbfabd9e92c7bb6","d73027fc8d59fee090e0f3f891bfdb4575b4","d73027fc8d59fee090ffffbfe0f3f891bfdb4575b4","d73027f46d43fdae61fee090e0f3f8abd9e974add14575b4","d73027f46d43fdae61fee090ffffbfe0f3f8abd9e974add14575b4","a50026d73027f46d43fdae61fee090e0f3f8abd9e974add14575b4313695","a50026d73027f46d43fdae61fee090ffffbfe0f3f8abd9e974add14575b4313695").map(N_),tb=B_(J_),nb=new Array(3).concat("fc8d59ffffbf91cf60","d7191cfdae61a6d96a1a9641","d7191cfdae61ffffbfa6d96a1a9641","d73027fc8d59fee08bd9ef8b91cf601a9850","d73027fc8d59fee08bffffbfd9ef8b91cf601a9850","d73027f46d43fdae61fee08bd9ef8ba6d96a66bd631a9850","d73027f46d43fdae61fee08bffffbfd9ef8ba6d96a66bd631a9850","a50026d73027f46d43fdae61fee08bd9ef8ba6d96a66bd631a9850006837","a50026d73027f46d43fdae61fee08bffffbfd9ef8ba6d96a66bd631a9850006837").map(N_),eb=B_(nb),rb=new Array(3).concat("fc8d59ffffbf99d594","d7191cfdae61abdda42b83ba","d7191cfdae61ffffbfabdda42b83ba","d53e4ffc8d59fee08be6f59899d5943288bd","d53e4ffc8d59fee08bffffbfe6f59899d5943288bd","d53e4ff46d43fdae61fee08be6f598abdda466c2a53288bd","d53e4ff46d43fdae61fee08bffffbfe6f598abdda466c2a53288bd","9e0142d53e4ff46d43fdae61fee08be6f598abdda466c2a53288bd5e4fa2","9e0142d53e4ff46d43fdae61fee08bffffbfe6f598abdda466c2a53288bd5e4fa2").map(N_),ib=B_(rb),ob=new Array(3).concat("e5f5f999d8c92ca25f","edf8fbb2e2e266c2a4238b45","edf8fbb2e2e266c2a42ca25f006d2c","edf8fbccece699d8c966c2a42ca25f006d2c","edf8fbccece699d8c966c2a441ae76238b45005824","f7fcfde5f5f9ccece699d8c966c2a441ae76238b45005824","f7fcfde5f5f9ccece699d8c966c2a441ae76238b45006d2c00441b").map(N_),ab=B_(ob),ub=new Array(3).concat("e0ecf49ebcda8856a7","edf8fbb3cde38c96c688419d","edf8fbb3cde38c96c68856a7810f7c","edf8fbbfd3e69ebcda8c96c68856a7810f7c","edf8fbbfd3e69ebcda8c96c68c6bb188419d6e016b","f7fcfde0ecf4bfd3e69ebcda8c96c68c6bb188419d6e016b","f7fcfde0ecf4bfd3e69ebcda8c96c68c6bb188419d810f7c4d004b").map(N_),cb=B_(ub),fb=new Array(3).concat("e0f3dba8ddb543a2ca","f0f9e8bae4bc7bccc42b8cbe","f0f9e8bae4bc7bccc443a2ca0868ac","f0f9e8ccebc5a8ddb57bccc443a2ca0868ac","f0f9e8ccebc5a8ddb57bccc44eb3d32b8cbe08589e","f7fcf0e0f3dbccebc5a8ddb57bccc44eb3d32b8cbe08589e","f7fcf0e0f3dbccebc5a8ddb57bccc44eb3d32b8cbe0868ac084081").map(N_),sb=B_(fb),lb=new Array(3).concat("fee8c8fdbb84e34a33","fef0d9fdcc8afc8d59d7301f","fef0d9fdcc8afc8d59e34a33b30000","fef0d9fdd49efdbb84fc8d59e34a33b30000","fef0d9fdd49efdbb84fc8d59ef6548d7301f990000","fff7ecfee8c8fdd49efdbb84fc8d59ef6548d7301f990000","fff7ecfee8c8fdd49efdbb84fc8d59ef6548d7301fb300007f0000").map(N_),hb=B_(lb),db=new Array(3).concat("ece2f0a6bddb1c9099","f6eff7bdc9e167a9cf02818a","f6eff7bdc9e167a9cf1c9099016c59","f6eff7d0d1e6a6bddb67a9cf1c9099016c59","f6eff7d0d1e6a6bddb67a9cf3690c002818a016450","fff7fbece2f0d0d1e6a6bddb67a9cf3690c002818a016450","fff7fbece2f0d0d1e6a6bddb67a9cf3690c002818a016c59014636").map(N_),pb=B_(db),gb=new Array(3).concat("ece7f2a6bddb2b8cbe","f1eef6bdc9e174a9cf0570b0","f1eef6bdc9e174a9cf2b8cbe045a8d","f1eef6d0d1e6a6bddb74a9cf2b8cbe045a8d","f1eef6d0d1e6a6bddb74a9cf3690c00570b0034e7b","fff7fbece7f2d0d1e6a6bddb74a9cf3690c00570b0034e7b","fff7fbece7f2d0d1e6a6bddb74a9cf3690c00570b0045a8d023858").map(N_),yb=B_(gb),vb=new Array(3).concat("e7e1efc994c7dd1c77","f1eef6d7b5d8df65b0ce1256","f1eef6d7b5d8df65b0dd1c77980043","f1eef6d4b9dac994c7df65b0dd1c77980043","f1eef6d4b9dac994c7df65b0e7298ace125691003f","f7f4f9e7e1efd4b9dac994c7df65b0e7298ace125691003f","f7f4f9e7e1efd4b9dac994c7df65b0e7298ace125698004367001f").map(N_),_b=B_(vb),bb=new Array(3).concat("fde0ddfa9fb5c51b8a","feebe2fbb4b9f768a1ae017e","feebe2fbb4b9f768a1c51b8a7a0177","feebe2fcc5c0fa9fb5f768a1c51b8a7a0177","feebe2fcc5c0fa9fb5f768a1dd3497ae017e7a0177","fff7f3fde0ddfcc5c0fa9fb5f768a1dd3497ae017e7a0177","fff7f3fde0ddfcc5c0fa9fb5f768a1dd3497ae017e7a017749006a").map(N_),mb=B_(bb),xb=new Array(3).concat("edf8b17fcdbb2c7fb8","ffffcca1dab441b6c4225ea8","ffffcca1dab441b6c42c7fb8253494","ffffccc7e9b47fcdbb41b6c42c7fb8253494","ffffccc7e9b47fcdbb41b6c41d91c0225ea80c2c84","ffffd9edf8b1c7e9b47fcdbb41b6c41d91c0225ea80c2c84","ffffd9edf8b1c7e9b47fcdbb41b6c41d91c0225ea8253494081d58").map(N_),wb=B_(xb),Mb=new Array(3).concat("f7fcb9addd8e31a354","ffffccc2e69978c679238443","ffffccc2e69978c67931a354006837","ffffccd9f0a3addd8e78c67931a354006837","ffffccd9f0a3addd8e78c67941ab5d238443005a32","ffffe5f7fcb9d9f0a3addd8e78c67941ab5d238443005a32","ffffe5f7fcb9d9f0a3addd8e78c67941ab5d238443006837004529").map(N_),Ab=B_(Mb),Tb=new Array(3).concat("fff7bcfec44fd95f0e","ffffd4fed98efe9929cc4c02","ffffd4fed98efe9929d95f0e993404","ffffd4fee391fec44ffe9929d95f0e993404","ffffd4fee391fec44ffe9929ec7014cc4c028c2d04","ffffe5fff7bcfee391fec44ffe9929ec7014cc4c028c2d04","ffffe5fff7bcfee391fec44ffe9929ec7014cc4c02993404662506").map(N_),Sb=B_(Tb),Eb=new Array(3).concat("ffeda0feb24cf03b20","ffffb2fecc5cfd8d3ce31a1c","ffffb2fecc5cfd8d3cf03b20bd0026","ffffb2fed976feb24cfd8d3cf03b20bd0026","ffffb2fed976feb24cfd8d3cfc4e2ae31a1cb10026","ffffccffeda0fed976feb24cfd8d3cfc4e2ae31a1cb10026","ffffccffeda0fed976feb24cfd8d3cfc4e2ae31a1cbd0026800026").map(N_),kb=B_(Eb),Nb=new Array(3).concat("deebf79ecae13182bd","eff3ffbdd7e76baed62171b5","eff3ffbdd7e76baed63182bd08519c","eff3ffc6dbef9ecae16baed63182bd08519c","eff3ffc6dbef9ecae16baed64292c62171b5084594","f7fbffdeebf7c6dbef9ecae16baed64292c62171b5084594","f7fbffdeebf7c6dbef9ecae16baed64292c62171b508519c08306b").map(N_),Cb=B_(Nb),Pb=new Array(3).concat("e5f5e0a1d99b31a354","edf8e9bae4b374c476238b45","edf8e9bae4b374c47631a354006d2c","edf8e9c7e9c0a1d99b74c47631a354006d2c","edf8e9c7e9c0a1d99b74c47641ab5d238b45005a32","f7fcf5e5f5e0c7e9c0a1d99b74c47641ab5d238b45005a32","f7fcf5e5f5e0c7e9c0a1d99b74c47641ab5d238b45006d2c00441b").map(N_),zb=B_(Pb),Db=new Array(3).concat("f0f0f0bdbdbd636363","f7f7f7cccccc969696525252","f7f7f7cccccc969696636363252525","f7f7f7d9d9d9bdbdbd969696636363252525","f7f7f7d9d9d9bdbdbd969696737373525252252525","fffffff0f0f0d9d9d9bdbdbd969696737373525252252525","fffffff0f0f0d9d9d9bdbdbd969696737373525252252525000000").map(N_),Rb=B_(Db),Fb=new Array(3).concat("efedf5bcbddc756bb1","f2f0f7cbc9e29e9ac86a51a3","f2f0f7cbc9e29e9ac8756bb154278f","f2f0f7dadaebbcbddc9e9ac8756bb154278f","f2f0f7dadaebbcbddc9e9ac8807dba6a51a34a1486","fcfbfdefedf5dadaebbcbddc9e9ac8807dba6a51a34a1486","fcfbfdefedf5dadaebbcbddc9e9ac8807dba6a51a354278f3f007d").map(N_),qb=B_(Fb),Ib=new Array(3).concat("fee0d2fc9272de2d26","fee5d9fcae91fb6a4acb181d","fee5d9fcae91fb6a4ade2d26a50f15","fee5d9fcbba1fc9272fb6a4ade2d26a50f15","fee5d9fcbba1fc9272fb6a4aef3b2ccb181d99000d","fff5f0fee0d2fcbba1fc9272fb6a4aef3b2ccb181d99000d","fff5f0fee0d2fcbba1fc9272fb6a4aef3b2ccb181da50f1567000d").map(N_),Ob=B_(Ib),Ub=new Array(3).concat("fee6cefdae6be6550d","feeddefdbe85fd8d3cd94701","feeddefdbe85fd8d3ce6550da63603","feeddefdd0a2fdae6bfd8d3ce6550da63603","feeddefdd0a2fdae6bfd8d3cf16913d948018c2d04","fff5ebfee6cefdd0a2fdae6bfd8d3cf16913d948018c2d04","fff5ebfee6cefdd0a2fdae6bfd8d3cf16913d94801a636037f2704").map(N_),Bb=B_(Ub);var Yb=si(wr(300,.5,0),wr(-240,.5,1)),Lb=si(wr(-100,.75,.35),wr(80,1.5,.8)),jb=si(wr(260,.75,.35),wr(80,1.5,.8)),$b=wr();var Hb=Fe(),Xb=Math.PI/3,Gb=2*Math.PI/3;function Vb(t){var n=t.length;return function(e){return t[Math.max(0,Math.min(n-1,Math.floor(e*n)))]}}var Wb=Vb(N_("44015444025645045745055946075a46085c460a5d460b5e470d60470e6147106347116447136548146748166848176948186a481a6c481b6d481c6e481d6f481f70482071482173482374482475482576482677482878482979472a7a472c7a472d7b472e7c472f7d46307e46327e46337f463480453581453781453882443983443a83443b84433d84433e85423f854240864241864142874144874045884046883f47883f48893e49893e4a893e4c8a3d4d8a3d4e8a3c4f8a3c508b3b518b3b528b3a538b3a548c39558c39568c38588c38598c375a8c375b8d365c8d365d8d355e8d355f8d34608d34618d33628d33638d32648e32658e31668e31678e31688e30698e306a8e2f6b8e2f6c8e2e6d8e2e6e8e2e6f8e2d708e2d718e2c718e2c728e2c738e2b748e2b758e2a768e2a778e2a788e29798e297a8e297b8e287c8e287d8e277e8e277f8e27808e26818e26828e26828e25838e25848e25858e24868e24878e23888e23898e238a8d228b8d228c8d228d8d218e8d218f8d21908d21918c20928c20928c20938c1f948c1f958b1f968b1f978b1f988b1f998a1f9a8a1e9b8a1e9c891e9d891f9e891f9f881fa0881fa1881fa1871fa28720a38620a48621a58521a68522a78522a88423a98324aa8325ab8225ac8226ad8127ad8128ae8029af7f2ab07f2cb17e2db27d2eb37c2fb47c31b57b32b67a34b67935b77937b87838b9773aba763bbb753dbc743fbc7340bd7242be7144bf7046c06f48c16e4ac16d4cc26c4ec36b50c46a52c56954c56856c66758c7655ac8645cc8635ec96260ca6063cb5f65cb5e67cc5c69cd5b6ccd5a6ece5870cf5773d05675d05477d1537ad1517cd2507fd34e81d34d84d44b86d54989d5488bd6468ed64590d74393d74195d84098d83e9bd93c9dd93ba0da39a2da37a5db36a8db34aadc32addc30b0dd2fb2dd2db5de2bb8de29bade28bddf26c0df25c2df23c5e021c8e020cae11fcde11dd0e11cd2e21bd5e21ad8e219dae319dde318dfe318e2e418e5e419e7e419eae51aece51befe51cf1e51df4e61ef6e620f8e621fbe723fde725")),Zb=Vb(N_("00000401000501010601010802010902020b02020d03030f03031204041405041606051806051a07061c08071e0907200a08220b09240c09260d0a290e0b2b100b2d110c2f120d31130d34140e36150e38160f3b180f3d19103f1a10421c10441d11471e114920114b21114e22115024125325125527125829115a2a115c2c115f2d11612f116331116533106734106936106b38106c390f6e3b0f703d0f713f0f72400f74420f75440f764510774710784910784a10794c117a4e117b4f127b51127c52137c54137d56147d57157e59157e5a167e5c167f5d177f5f187f601880621980641a80651a80671b80681c816a1c816b1d816d1d816e1e81701f81721f817320817521817621817822817922827b23827c23827e24828025828125818326818426818627818827818928818b29818c29818e2a81902a81912b81932b80942c80962c80982d80992d809b2e7f9c2e7f9e2f7fa02f7fa1307ea3307ea5317ea6317da8327daa337dab337cad347cae347bb0357bb2357bb3367ab5367ab73779b83779ba3878bc3978bd3977bf3a77c03a76c23b75c43c75c53c74c73d73c83e73ca3e72cc3f71cd4071cf4070d0416fd2426fd3436ed5446dd6456cd8456cd9466bdb476adc4869de4968df4a68e04c67e24d66e34e65e44f64e55064e75263e85362e95462ea5661eb5760ec5860ed5a5fee5b5eef5d5ef05f5ef1605df2625df2645cf3655cf4675cf4695cf56b5cf66c5cf66e5cf7705cf7725cf8745cf8765cf9785df9795df97b5dfa7d5efa7f5efa815ffb835ffb8560fb8761fc8961fc8a62fc8c63fc8e64fc9065fd9266fd9467fd9668fd9869fd9a6afd9b6bfe9d6cfe9f6dfea16efea36ffea571fea772fea973feaa74feac76feae77feb078feb27afeb47bfeb67cfeb77efeb97ffebb81febd82febf84fec185fec287fec488fec68afec88cfeca8dfecc8ffecd90fecf92fed194fed395fed597fed799fed89afdda9cfddc9efddea0fde0a1fde2a3fde3a5fde5a7fde7a9fde9aafdebacfcecaefceeb0fcf0b2fcf2b4fcf4b6fcf6b8fcf7b9fcf9bbfcfbbdfcfdbf")),Kb=Vb(N_("00000401000501010601010802010a02020c02020e03021004031204031405041706041907051b08051d09061f0a07220b07240c08260d08290e092b10092d110a30120a32140b34150b37160b39180c3c190c3e1b0c411c0c431e0c451f0c48210c4a230c4c240c4f260c51280b53290b552b0b572d0b592f0a5b310a5c320a5e340a5f3609613809623909633b09643d09653e0966400a67420a68440a68450a69470b6a490b6a4a0c6b4c0c6b4d0d6c4f0d6c510e6c520e6d540f6d550f6d57106e59106e5a116e5c126e5d126e5f136e61136e62146e64156e65156e67166e69166e6a176e6c186e6d186e6f196e71196e721a6e741a6e751b6e771c6d781c6d7a1d6d7c1d6d7d1e6d7f1e6c801f6c82206c84206b85216b87216b88226a8a226a8c23698d23698f24699025689225689326679526679727669827669a28659b29649d29649f2a63a02a63a22b62a32c61a52c60a62d60a82e5fa92e5eab2f5ead305dae305cb0315bb1325ab3325ab43359b63458b73557b93556ba3655bc3754bd3853bf3952c03a51c13a50c33b4fc43c4ec63d4dc73e4cc83f4bca404acb4149cc4248ce4347cf4446d04545d24644d34743d44842d54a41d74b3fd84c3ed94d3dda4e3cdb503bdd513ade5238df5337e05536e15635e25734e35933e45a31e55c30e65d2fe75e2ee8602de9612bea632aeb6429eb6628ec6726ed6925ee6a24ef6c23ef6e21f06f20f1711ff1731df2741cf3761bf37819f47918f57b17f57d15f67e14f68013f78212f78410f8850ff8870ef8890cf98b0bf98c0af98e09fa9008fa9207fa9407fb9606fb9706fb9906fb9b06fb9d07fc9f07fca108fca309fca50afca60cfca80dfcaa0ffcac11fcae12fcb014fcb216fcb418fbb61afbb81dfbba1ffbbc21fbbe23fac026fac228fac42afac62df9c72ff9c932f9cb35f8cd37f8cf3af7d13df7d340f6d543f6d746f5d949f5db4cf4dd4ff4df53f4e156f3e35af3e55df2e661f2e865f2ea69f1ec6df1ed71f1ef75f1f179f2f27df2f482f3f586f3f68af4f88ef5f992f6fa96f8fb9af9fc9dfafda1fcffa4")),Qb=Vb(N_("0d088710078813078916078a19068c1b068d1d068e20068f2206902406912605912805922a05932c05942e05952f059631059733059735049837049938049a3a049a3c049b3e049c3f049c41049d43039e44039e46039f48039f4903a04b03a14c02a14e02a25002a25102a35302a35502a45601a45801a45901a55b01a55c01a65e01a66001a66100a76300a76400a76600a76700a86900a86a00a86c00a86e00a86f00a87100a87201a87401a87501a87701a87801a87a02a87b02a87d03a87e03a88004a88104a78305a78405a78606a68707a68808a68a09a58b0aa58d0ba58e0ca48f0da4910ea3920fa39410a29511a19613a19814a099159f9a169f9c179e9d189d9e199da01a9ca11b9ba21d9aa31e9aa51f99a62098a72197a82296aa2395ab2494ac2694ad2793ae2892b02991b12a90b22b8fb32c8eb42e8db52f8cb6308bb7318ab83289ba3388bb3488bc3587bd3786be3885bf3984c03a83c13b82c23c81c33d80c43e7fc5407ec6417dc7427cc8437bc9447aca457acb4679cc4778cc4977cd4a76ce4b75cf4c74d04d73d14e72d24f71d35171d45270d5536fd5546ed6556dd7566cd8576bd9586ada5a6ada5b69db5c68dc5d67dd5e66de5f65de6164df6263e06363e16462e26561e26660e3685fe4695ee56a5de56b5de66c5ce76e5be76f5ae87059e97158e97257ea7457eb7556eb7655ec7754ed7953ed7a52ee7b51ef7c51ef7e50f07f4ff0804ef1814df1834cf2844bf3854bf3874af48849f48948f58b47f58c46f68d45f68f44f79044f79143f79342f89441f89540f9973ff9983ef99a3efa9b3dfa9c3cfa9e3bfb9f3afba139fba238fca338fca537fca636fca835fca934fdab33fdac33fdae32fdaf31fdb130fdb22ffdb42ffdb52efeb72dfeb82cfeba2cfebb2bfebd2afebe2afec029fdc229fdc328fdc527fdc627fdc827fdca26fdcb26fccd25fcce25fcd025fcd225fbd324fbd524fbd724fad824fada24f9dc24f9dd25f8df25f8e125f7e225f7e425f6e626f6e826f5e926f5eb27f4ed27f3ee27f3f027f2f227f1f426f1f525f0f724f0f921"));function Jb(t){return function(){return t}}const tm=Math.abs,nm=Math.atan2,em=Math.cos,rm=Math.max,im=Math.min,om=Math.sin,am=Math.sqrt,um=1e-12,cm=Math.PI,fm=cm/2,sm=2*cm;function lm(t){return t>1?0:t<-1?cm:Math.acos(t)}function hm(t){return t>=1?fm:t<=-1?-fm:Math.asin(t)}function dm(t){return t.innerRadius}function pm(t){return t.outerRadius}function gm(t){return t.startAngle}function ym(t){return t.endAngle}function vm(t){return t&&t.padAngle}function _m(t,n,e,r,i,o,a,u){var c=e-t,f=r-n,s=a-i,l=u-o,h=l*c-s*f;if(!(h*h<um))return[t+(h=(s*(n-o)-l*(t-i))/h)*c,n+h*f]}function bm(t,n,e,r,i,o,a){var u=t-e,c=n-r,f=(a?o:-o)/am(u*u+c*c),s=f*c,l=-f*u,h=t+s,d=n+l,p=e+s,g=r+l,y=(h+p)/2,v=(d+g)/2,_=p-h,b=g-d,m=_*_+b*b,x=i-o,w=h*g-p*d,M=(b<0?-1:1)*am(rm(0,x*x*m-w*w)),A=(w*b-_*M)/m,T=(-w*_-b*M)/m,S=(w*b+_*M)/m,E=(-w*_+b*M)/m,k=A-y,N=T-v,C=S-y,P=E-v;return k*k+N*N>C*C+P*P&&(A=S,T=E),{cx:A,cy:T,x01:-s,y01:-l,x11:A*(i/x-1),y11:T*(i/x-1)}}var mm=Array.prototype.slice;function xm(t){return"object"==typeof t&&"length"in t?t:Array.from(t)}function wm(t){this._context=t}function Mm(t){return new wm(t)}function Am(t){return t[0]}function Tm(t){return t[1]}function Sm(t,n){var e=Jb(!0),r=null,i=Mm,o=null;function a(a){var u,c,f,s=(a=xm(a)).length,l=!1;for(null==r&&(o=i(f=Pa())),u=0;u<=s;++u)!(u<s&&e(c=a[u],u,a))===l&&((l=!l)?o.lineStart():o.lineEnd()),l&&o.point(+t(c,u,a),+n(c,u,a));if(f)return o=null,f+""||null}return t="function"==typeof t?t:void 0===t?Am:Jb(t),n="function"==typeof n?n:void 0===n?Tm:Jb(n),a.x=function(n){return arguments.length?(t="function"==typeof n?n:Jb(+n),a):t},a.y=function(t){return arguments.length?(n="function"==typeof t?t:Jb(+t),a):n},a.defined=function(t){return arguments.length?(e="function"==typeof t?t:Jb(!!t),a):e},a.curve=function(t){return arguments.length?(i=t,null!=r&&(o=i(r)),a):i},a.context=function(t){return arguments.length?(null==t?r=o=null:o=i(r=t),a):r},a}function Em(t,n,e){var r=null,i=Jb(!0),o=null,a=Mm,u=null;function c(c){var f,s,l,h,d,p=(c=xm(c)).length,g=!1,y=new Array(p),v=new Array(p);for(null==o&&(u=a(d=Pa())),f=0;f<=p;++f){if(!(f<p&&i(h=c[f],f,c))===g)if(g=!g)s=f,u.areaStart(),u.lineStart();else{for(u.lineEnd(),u.lineStart(),l=f-1;l>=s;--l)u.point(y[l],v[l]);u.lineEnd(),u.areaEnd()}g&&(y[f]=+t(h,f,c),v[f]=+n(h,f,c),u.point(r?+r(h,f,c):y[f],e?+e(h,f,c):v[f]))}if(d)return u=null,d+""||null}function f(){return Sm().defined(i).curve(a).context(o)}return t="function"==typeof t?t:void 0===t?Am:Jb(+t),n="function"==typeof n?n:Jb(void 0===n?0:+n),e="function"==typeof e?e:void 0===e?Tm:Jb(+e),c.x=function(n){return arguments.length?(t="function"==typeof n?n:Jb(+n),r=null,c):t},c.x0=function(n){return arguments.length?(t="function"==typeof n?n:Jb(+n),c):t},c.x1=function(t){return arguments.length?(r=null==t?null:"function"==typeof t?t:Jb(+t),c):r},c.y=function(t){return arguments.length?(n="function"==typeof t?t:Jb(+t),e=null,c):n},c.y0=function(t){return arguments.length?(n="function"==typeof t?t:Jb(+t),c):n},c.y1=function(t){return arguments.length?(e=null==t?null:"function"==typeof t?t:Jb(+t),c):e},c.lineX0=c.lineY0=function(){return f().x(t).y(n)},c.lineY1=function(){return f().x(t).y(e)},c.lineX1=function(){return f().x(r).y(n)},c.defined=function(t){return arguments.length?(i="function"==typeof t?t:Jb(!!t),c):i},c.curve=function(t){return arguments.length?(a=t,null!=o&&(u=a(o)),c):a},c.context=function(t){return arguments.length?(null==t?o=u=null:u=a(o=t),c):o},c}function km(t,n){return n<t?-1:n>t?1:n>=t?0:NaN}function Nm(t){return t}wm.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._point=0},lineEnd:function(){(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;default:this._context.lineTo(t,n)}}};var Cm=zm(Mm);function Pm(t){this._curve=t}function zm(t){function n(n){return new Pm(t(n))}return n._curve=t,n}function Dm(t){var n=t.curve;return t.angle=t.x,delete t.x,t.radius=t.y,delete t.y,t.curve=function(t){return arguments.length?n(zm(t)):n()._curve},t}function Rm(){return Dm(Sm().curve(Cm))}function Fm(){var t=Em().curve(Cm),n=t.curve,e=t.lineX0,r=t.lineX1,i=t.lineY0,o=t.lineY1;return t.angle=t.x,delete t.x,t.startAngle=t.x0,delete t.x0,t.endAngle=t.x1,delete t.x1,t.radius=t.y,delete t.y,t.innerRadius=t.y0,delete t.y0,t.outerRadius=t.y1,delete t.y1,t.lineStartAngle=function(){return Dm(e())},delete t.lineX0,t.lineEndAngle=function(){return Dm(r())},delete t.lineX1,t.lineInnerRadius=function(){return Dm(i())},delete t.lineY0,t.lineOuterRadius=function(){return Dm(o())},delete t.lineY1,t.curve=function(t){return arguments.length?n(zm(t)):n()._curve},t}function qm(t,n){return[(n=+n)*Math.cos(t-=Math.PI/2),n*Math.sin(t)]}Pm.prototype={areaStart:function(){this._curve.areaStart()},areaEnd:function(){this._curve.areaEnd()},lineStart:function(){this._curve.lineStart()},lineEnd:function(){this._curve.lineEnd()},point:function(t,n){this._curve.point(n*Math.sin(t),n*-Math.cos(t))}};class Im{constructor(t,n){this._context=t,this._x=n}areaStart(){this._line=0}areaEnd(){this._line=NaN}lineStart(){this._point=0}lineEnd(){(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line}point(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;default:this._x?this._context.bezierCurveTo(this._x0=(this._x0+t)/2,this._y0,this._x0,n,t,n):this._context.bezierCurveTo(this._x0,this._y0=(this._y0+n)/2,t,this._y0,t,n)}this._x0=t,this._y0=n}}class Om{constructor(t){this._context=t}lineStart(){this._point=0}lineEnd(){}point(t,n){if(t=+t,n=+n,0==this._point++)this._x0=t,this._y0=n;else{const e=qm(this._x0,this._y0),r=qm(this._x0,this._y0=(this._y0+n)/2),i=qm(t,this._y0),o=qm(t,n);this._context.moveTo(...e),this._context.bezierCurveTo(...r,...i,...o)}}}function Um(t){return new Im(t,!0)}function Bm(t){return new Im(t,!1)}function Ym(t){return new Om(t)}function Lm(t){return t.source}function jm(t){return t.target}function $m(t){let n=Lm,e=jm,r=Am,i=Tm,o=null,a=null;function u(){let u;const c=mm.call(arguments),f=n.apply(this,c),s=e.apply(this,c);if(null==o&&(a=t(u=Pa())),a.lineStart(),c[0]=f,a.point(+r.apply(this,c),+i.apply(this,c)),c[0]=s,a.point(+r.apply(this,c),+i.apply(this,c)),a.lineEnd(),u)return a=null,u+""||null}return u.source=function(t){return arguments.length?(n=t,u):n},u.target=function(t){return arguments.length?(e=t,u):e},u.x=function(t){return arguments.length?(r="function"==typeof t?t:Jb(+t),u):r},u.y=function(t){return arguments.length?(i="function"==typeof t?t:Jb(+t),u):i},u.context=function(n){return arguments.length?(null==n?o=a=null:a=t(o=n),u):o},u}const Hm=am(3);var Xm={draw(t,n){const e=.59436*am(n+im(n/28,.75)),r=e/2,i=r*Hm;t.moveTo(0,e),t.lineTo(0,-e),t.moveTo(-i,-r),t.lineTo(i,r),t.moveTo(-i,r),t.lineTo(i,-r)}},Gm={draw(t,n){const e=am(n/cm);t.moveTo(e,0),t.arc(0,0,e,0,sm)}},Vm={draw(t,n){const e=am(n/5)/2;t.moveTo(-3*e,-e),t.lineTo(-e,-e),t.lineTo(-e,-3*e),t.lineTo(e,-3*e),t.lineTo(e,-e),t.lineTo(3*e,-e),t.lineTo(3*e,e),t.lineTo(e,e),t.lineTo(e,3*e),t.lineTo(-e,3*e),t.lineTo(-e,e),t.lineTo(-3*e,e),t.closePath()}};const Wm=am(1/3),Zm=2*Wm;var Km={draw(t,n){const e=am(n/Zm),r=e*Wm;t.moveTo(0,-e),t.lineTo(r,0),t.lineTo(0,e),t.lineTo(-r,0),t.closePath()}},Qm={draw(t,n){const e=.62625*am(n);t.moveTo(0,-e),t.lineTo(e,0),t.lineTo(0,e),t.lineTo(-e,0),t.closePath()}},Jm={draw(t,n){const e=.87559*am(n-im(n/7,2));t.moveTo(-e,0),t.lineTo(e,0),t.moveTo(0,e),t.lineTo(0,-e)}},tx={draw(t,n){const e=am(n),r=-e/2;t.rect(r,r,e,e)}},nx={draw(t,n){const e=.4431*am(n);t.moveTo(e,e),t.lineTo(e,-e),t.lineTo(-e,-e),t.lineTo(-e,e),t.closePath()}};const ex=om(cm/10)/om(7*cm/10),rx=om(sm/10)*ex,ix=-em(sm/10)*ex;var ox={draw(t,n){const e=am(.8908130915292852*n),r=rx*e,i=ix*e;t.moveTo(0,-e),t.lineTo(r,i);for(let n=1;n<5;++n){const o=sm*n/5,a=em(o),u=om(o);t.lineTo(u*e,-a*e),t.lineTo(a*r-u*i,u*r+a*i)}t.closePath()}};const ax=am(3);var ux={draw(t,n){const e=-am(n/(3*ax));t.moveTo(0,2*e),t.lineTo(-ax*e,-e),t.lineTo(ax*e,-e),t.closePath()}};const cx=am(3);var fx={draw(t,n){const e=.6824*am(n),r=e/2,i=e*cx/2;t.moveTo(0,-e),t.lineTo(i,r),t.lineTo(-i,r),t.closePath()}};const sx=-.5,lx=am(3)/2,hx=1/am(12),dx=3*(hx/2+1);var px={draw(t,n){const e=am(n/dx),r=e/2,i=e*hx,o=r,a=e*hx+e,u=-o,c=a;t.moveTo(r,i),t.lineTo(o,a),t.lineTo(u,c),t.lineTo(sx*r-lx*i,lx*r+sx*i),t.lineTo(sx*o-lx*a,lx*o+sx*a),t.lineTo(sx*u-lx*c,lx*u+sx*c),t.lineTo(sx*r+lx*i,sx*i-lx*r),t.lineTo(sx*o+lx*a,sx*a-lx*o),t.lineTo(sx*u+lx*c,sx*c-lx*u),t.closePath()}},gx={draw(t,n){const e=.6189*am(n-im(n/6,1.7));t.moveTo(-e,-e),t.lineTo(e,e),t.moveTo(-e,e),t.lineTo(e,-e)}};const yx=[Gm,Vm,Km,tx,ox,ux,px],vx=[Gm,Jm,gx,fx,Xm,nx,Qm];function _x(){}function bx(t,n,e){t._context.bezierCurveTo((2*t._x0+t._x1)/3,(2*t._y0+t._y1)/3,(t._x0+2*t._x1)/3,(t._y0+2*t._y1)/3,(t._x0+4*t._x1+n)/6,(t._y0+4*t._y1+e)/6)}function mx(t){this._context=t}function xx(t){this._context=t}function wx(t){this._context=t}function Mx(t,n){this._basis=new mx(t),this._beta=n}mx.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=NaN,this._point=0},lineEnd:function(){switch(this._point){case 3:bx(this,this._x1,this._y1);case 2:this._context.lineTo(this._x1,this._y1)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;break;case 2:this._point=3,this._context.lineTo((5*this._x0+this._x1)/6,(5*this._y0+this._y1)/6);default:bx(this,t,n)}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=n}},xx.prototype={areaStart:_x,areaEnd:_x,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._y0=this._y1=this._y2=this._y3=this._y4=NaN,this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x2,this._y2),this._context.closePath();break;case 2:this._context.moveTo((this._x2+2*this._x3)/3,(this._y2+2*this._y3)/3),this._context.lineTo((this._x3+2*this._x2)/3,(this._y3+2*this._y2)/3),this._context.closePath();break;case 3:this.point(this._x2,this._y2),this.point(this._x3,this._y3),this.point(this._x4,this._y4)}},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._x2=t,this._y2=n;break;case 1:this._point=2,this._x3=t,this._y3=n;break;case 2:this._point=3,this._x4=t,this._y4=n,this._context.moveTo((this._x0+4*this._x1+t)/6,(this._y0+4*this._y1+n)/6);break;default:bx(this,t,n)}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=n}},wx.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=NaN,this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3;var e=(this._x0+4*this._x1+t)/6,r=(this._y0+4*this._y1+n)/6;this._line?this._context.lineTo(e,r):this._context.moveTo(e,r);break;case 3:this._point=4;default:bx(this,t,n)}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=n}},Mx.prototype={lineStart:function(){this._x=[],this._y=[],this._basis.lineStart()},lineEnd:function(){var t=this._x,n=this._y,e=t.length-1;if(e>0)for(var r,i=t[0],o=n[0],a=t[e]-i,u=n[e]-o,c=-1;++c<=e;)r=c/e,this._basis.point(this._beta*t[c]+(1-this._beta)*(i+r*a),this._beta*n[c]+(1-this._beta)*(o+r*u));this._x=this._y=null,this._basis.lineEnd()},point:function(t,n){this._x.push(+t),this._y.push(+n)}};var Ax=function t(n){function e(t){return 1===n?new mx(t):new Mx(t,n)}return e.beta=function(n){return t(+n)},e}(.85);function Tx(t,n,e){t._context.bezierCurveTo(t._x1+t._k*(t._x2-t._x0),t._y1+t._k*(t._y2-t._y0),t._x2+t._k*(t._x1-n),t._y2+t._k*(t._y1-e),t._x2,t._y2)}function Sx(t,n){this._context=t,this._k=(1-n)/6}Sx.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x2,this._y2);break;case 3:Tx(this,this._x1,this._y1)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2,this._x1=t,this._y1=n;break;case 2:this._point=3;default:Tx(this,t,n)}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var Ex=function t(n){function e(t){return new Sx(t,n)}return e.tension=function(n){return t(+n)},e}(0);function kx(t,n){this._context=t,this._k=(1-n)/6}kx.prototype={areaStart:_x,areaEnd:_x,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN,this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x3,this._y3),this._context.closePath();break;case 2:this._context.lineTo(this._x3,this._y3),this._context.closePath();break;case 3:this.point(this._x3,this._y3),this.point(this._x4,this._y4),this.point(this._x5,this._y5)}},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._x3=t,this._y3=n;break;case 1:this._point=2,this._context.moveTo(this._x4=t,this._y4=n);break;case 2:this._point=3,this._x5=t,this._y5=n;break;default:Tx(this,t,n)}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var Nx=function t(n){function e(t){return new kx(t,n)}return e.tension=function(n){return t(+n)},e}(0);function Cx(t,n){this._context=t,this._k=(1-n)/6}Cx.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3,this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2);break;case 3:this._point=4;default:Tx(this,t,n)}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var Px=function t(n){function e(t){return new Cx(t,n)}return e.tension=function(n){return t(+n)},e}(0);function zx(t,n,e){var r=t._x1,i=t._y1,o=t._x2,a=t._y2;if(t._l01_a>um){var u=2*t._l01_2a+3*t._l01_a*t._l12_a+t._l12_2a,c=3*t._l01_a*(t._l01_a+t._l12_a);r=(r*u-t._x0*t._l12_2a+t._x2*t._l01_2a)/c,i=(i*u-t._y0*t._l12_2a+t._y2*t._l01_2a)/c}if(t._l23_a>um){var f=2*t._l23_2a+3*t._l23_a*t._l12_a+t._l12_2a,s=3*t._l23_a*(t._l23_a+t._l12_a);o=(o*f+t._x1*t._l23_2a-n*t._l12_2a)/s,a=(a*f+t._y1*t._l23_2a-e*t._l12_2a)/s}t._context.bezierCurveTo(r,i,o,a,t._x2,t._y2)}function Dx(t,n){this._context=t,this._alpha=n}Dx.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x2,this._y2);break;case 3:this.point(this._x2,this._y2)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){if(t=+t,n=+n,this._point){var e=this._x2-t,r=this._y2-n;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(e*e+r*r,this._alpha))}switch(this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;break;case 2:this._point=3;default:zx(this,t,n)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var Rx=function t(n){function e(t){return n?new Dx(t,n):new Sx(t,0)}return e.alpha=function(n){return t(+n)},e}(.5);function Fx(t,n){this._context=t,this._alpha=n}Fx.prototype={areaStart:_x,areaEnd:_x,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x3,this._y3),this._context.closePath();break;case 2:this._context.lineTo(this._x3,this._y3),this._context.closePath();break;case 3:this.point(this._x3,this._y3),this.point(this._x4,this._y4),this.point(this._x5,this._y5)}},point:function(t,n){if(t=+t,n=+n,this._point){var e=this._x2-t,r=this._y2-n;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(e*e+r*r,this._alpha))}switch(this._point){case 0:this._point=1,this._x3=t,this._y3=n;break;case 1:this._point=2,this._context.moveTo(this._x4=t,this._y4=n);break;case 2:this._point=3,this._x5=t,this._y5=n;break;default:zx(this,t,n)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var qx=function t(n){function e(t){return n?new Fx(t,n):new kx(t,0)}return e.alpha=function(n){return t(+n)},e}(.5);function Ix(t,n){this._context=t,this._alpha=n}Ix.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){if(t=+t,n=+n,this._point){var e=this._x2-t,r=this._y2-n;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(e*e+r*r,this._alpha))}switch(this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3,this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2);break;case 3:this._point=4;default:zx(this,t,n)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var Ox=function t(n){function e(t){return n?new Ix(t,n):new Cx(t,0)}return e.alpha=function(n){return t(+n)},e}(.5);function Ux(t){this._context=t}function Bx(t){return t<0?-1:1}function Yx(t,n,e){var r=t._x1-t._x0,i=n-t._x1,o=(t._y1-t._y0)/(r||i<0&&-0),a=(e-t._y1)/(i||r<0&&-0),u=(o*i+a*r)/(r+i);return(Bx(o)+Bx(a))*Math.min(Math.abs(o),Math.abs(a),.5*Math.abs(u))||0}function Lx(t,n){var e=t._x1-t._x0;return e?(3*(t._y1-t._y0)/e-n)/2:n}function jx(t,n,e){var r=t._x0,i=t._y0,o=t._x1,a=t._y1,u=(o-r)/3;t._context.bezierCurveTo(r+u,i+u*n,o-u,a-u*e,o,a)}function $x(t){this._context=t}function Hx(t){this._context=new Xx(t)}function Xx(t){this._context=t}function Gx(t){this._context=t}function Vx(t){var n,e,r=t.length-1,i=new Array(r),o=new Array(r),a=new Array(r);for(i[0]=0,o[0]=2,a[0]=t[0]+2*t[1],n=1;n<r-1;++n)i[n]=1,o[n]=4,a[n]=4*t[n]+2*t[n+1];for(i[r-1]=2,o[r-1]=7,a[r-1]=8*t[r-1]+t[r],n=1;n<r;++n)e=i[n]/o[n-1],o[n]-=e,a[n]-=e*a[n-1];for(i[r-1]=a[r-1]/o[r-1],n=r-2;n>=0;--n)i[n]=(a[n]-i[n+1])/o[n];for(o[r-1]=(t[r]+i[r-1])/2,n=0;n<r-1;++n)o[n]=2*t[n+1]-i[n+1];return[i,o]}function Wx(t,n){this._context=t,this._t=n}function Zx(t,n){if((i=t.length)>1)for(var e,r,i,o=1,a=t[n[0]],u=a.length;o<i;++o)for(r=a,a=t[n[o]],e=0;e<u;++e)a[e][1]+=a[e][0]=isNaN(r[e][1])?r[e][0]:r[e][1]}function Kx(t){for(var n=t.length,e=new Array(n);--n>=0;)e[n]=n;return e}function Qx(t,n){return t[n]}function Jx(t){const n=[];return n.key=t,n}function tw(t){var n=t.map(nw);return Kx(t).sort((function(t,e){return n[t]-n[e]}))}function nw(t){for(var n,e=-1,r=0,i=t.length,o=-1/0;++e<i;)(n=+t[e][1])>o&&(o=n,r=e);return r}function ew(t){var n=t.map(rw);return Kx(t).sort((function(t,e){return n[t]-n[e]}))}function rw(t){for(var n,e=0,r=-1,i=t.length;++r<i;)(n=+t[r][1])&&(e+=n);return e}Ux.prototype={areaStart:_x,areaEnd:_x,lineStart:function(){this._point=0},lineEnd:function(){this._point&&this._context.closePath()},point:function(t,n){t=+t,n=+n,this._point?this._context.lineTo(t,n):(this._point=1,this._context.moveTo(t,n))}},$x.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=this._t0=NaN,this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x1,this._y1);break;case 3:jx(this,this._t0,Lx(this,this._t0))}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){var e=NaN;if(n=+n,(t=+t)!==this._x1||n!==this._y1){switch(this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;break;case 2:this._point=3,jx(this,Lx(this,e=Yx(this,t,n)),e);break;default:jx(this,this._t0,e=Yx(this,t,n))}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=n,this._t0=e}}},(Hx.prototype=Object.create($x.prototype)).point=function(t,n){$x.prototype.point.call(this,n,t)},Xx.prototype={moveTo:function(t,n){this._context.moveTo(n,t)},closePath:function(){this._context.closePath()},lineTo:function(t,n){this._context.lineTo(n,t)},bezierCurveTo:function(t,n,e,r,i,o){this._context.bezierCurveTo(n,t,r,e,o,i)}},Gx.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x=[],this._y=[]},lineEnd:function(){var t=this._x,n=this._y,e=t.length;if(e)if(this._line?this._context.lineTo(t[0],n[0]):this._context.moveTo(t[0],n[0]),2===e)this._context.lineTo(t[1],n[1]);else for(var r=Vx(t),i=Vx(n),o=0,a=1;a<e;++o,++a)this._context.bezierCurveTo(r[0][o],i[0][o],r[1][o],i[1][o],t[a],n[a]);(this._line||0!==this._line&&1===e)&&this._context.closePath(),this._line=1-this._line,this._x=this._y=null},point:function(t,n){this._x.push(+t),this._y.push(+n)}},Wx.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x=this._y=NaN,this._point=0},lineEnd:function(){0<this._t&&this._t<1&&2===this._point&&this._context.lineTo(this._x,this._y),(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line>=0&&(this._t=1-this._t,this._line=1-this._line)},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;default:if(this._t<=0)this._context.lineTo(this._x,n),this._context.lineTo(t,n);else{var e=this._x*(1-this._t)+t*this._t;this._context.lineTo(e,this._y),this._context.lineTo(e,n)}}this._x=t,this._y=n}};var iw=t=>()=>t;function ow(t,{sourceEvent:n,target:e,transform:r,dispatch:i}){Object.defineProperties(this,{type:{value:t,enumerable:!0,configurable:!0},sourceEvent:{value:n,enumerable:!0,configurable:!0},target:{value:e,enumerable:!0,configurable:!0},transform:{value:r,enumerable:!0,configurable:!0},_:{value:i}})}function aw(t,n,e){this.k=t,this.x=n,this.y=e}aw.prototype={constructor:aw,scale:function(t){return 1===t?this:new aw(this.k*t,this.x,this.y)},translate:function(t,n){return 0===t&0===n?this:new aw(this.k,this.x+this.k*t,this.y+this.k*n)},apply:function(t){return[t[0]*this.k+this.x,t[1]*this.k+this.y]},applyX:function(t){return t*this.k+this.x},applyY:function(t){return t*this.k+this.y},invert:function(t){return[(t[0]-this.x)/this.k,(t[1]-this.y)/this.k]},invertX:function(t){return(t-this.x)/this.k},invertY:function(t){return(t-this.y)/this.k},rescaleX:function(t){return t.copy().domain(t.range().map(this.invertX,this).map(t.invert,t))},rescaleY:function(t){return t.copy().domain(t.range().map(this.invertY,this).map(t.invert,t))},toString:function(){return"translate("+this.x+","+this.y+") scale("+this.k+")"}};var uw=new aw(1,0,0);function cw(t){for(;!t.__zoom;)if(!(t=t.parentNode))return uw;return t.__zoom}function fw(t){t.stopImmediatePropagation()}function sw(t){t.preventDefault(),t.stopImmediatePropagation()}function lw(t){return!(t.ctrlKey&&"wheel"!==t.type||t.button)}function hw(){var t=this;return t instanceof SVGElement?(t=t.ownerSVGElement||t).hasAttribute("viewBox")?[[(t=t.viewBox.baseVal).x,t.y],[t.x+t.width,t.y+t.height]]:[[0,0],[t.width.baseVal.value,t.height.baseVal.value]]:[[0,0],[t.clientWidth,t.clientHeight]]}function dw(){return this.__zoom||uw}function pw(t){return-t.deltaY*(1===t.deltaMode?.05:t.deltaMode?1:.002)*(t.ctrlKey?10:1)}function gw(){return navigator.maxTouchPoints||"ontouchstart"in this}function yw(t,n,e){var r=t.invertX(n[0][0])-e[0][0],i=t.invertX(n[1][0])-e[1][0],o=t.invertY(n[0][1])-e[0][1],a=t.invertY(n[1][1])-e[1][1];return t.translate(i>r?(r+i)/2:Math.min(0,r)||Math.max(0,i),a>o?(o+a)/2:Math.min(0,o)||Math.max(0,a))}cw.prototype=aw.prototype,t.Adder=T,t.Delaunay=ku,t.FormatSpecifier=Rc,t.InternMap=InternMap,t.InternSet=InternSet,t.Node=Ed,t.Voronoi=wu,t.ZoomTransform=aw,t.active=function(t,n){var e,r,i=t.__transition;if(i)for(r in n=null==n?null:n+"",i)if((e=i[r]).state>1&&e.name===n)return new lo([[t]],Bo,n,+r);return null},t.arc=function(){var t=dm,n=pm,e=Jb(0),r=null,i=gm,o=ym,a=vm,u=null;function c(){var c,f,s=+t.apply(this,arguments),l=+n.apply(this,arguments),h=i.apply(this,arguments)-fm,d=o.apply(this,arguments)-fm,p=tm(d-h),g=d>h;if(u||(u=c=Pa()),l<s&&(f=l,l=s,s=f),l>um)if(p>sm-um)u.moveTo(l*em(h),l*om(h)),u.arc(0,0,l,h,d,!g),s>um&&(u.moveTo(s*em(d),s*om(d)),u.arc(0,0,s,d,h,g));else{var y,v,_=h,b=d,m=h,x=d,w=p,M=p,A=a.apply(this,arguments)/2,T=A>um&&(r?+r.apply(this,arguments):am(s*s+l*l)),S=im(tm(l-s)/2,+e.apply(this,arguments)),E=S,k=S;if(T>um){var N=hm(T/s*om(A)),C=hm(T/l*om(A));(w-=2*N)>um?(m+=N*=g?1:-1,x-=N):(w=0,m=x=(h+d)/2),(M-=2*C)>um?(_+=C*=g?1:-1,b-=C):(M=0,_=b=(h+d)/2)}var P=l*em(_),z=l*om(_),D=s*em(x),R=s*om(x);if(S>um){var F,q=l*em(b),I=l*om(b),O=s*em(m),U=s*om(m);if(p<cm&&(F=_m(P,z,O,U,q,I,D,R))){var B=P-F[0],Y=z-F[1],L=q-F[0],j=I-F[1],$=1/om(lm((B*L+Y*j)/(am(B*B+Y*Y)*am(L*L+j*j)))/2),H=am(F[0]*F[0]+F[1]*F[1]);E=im(S,(s-H)/($-1)),k=im(S,(l-H)/($+1))}}M>um?k>um?(y=bm(O,U,P,z,l,k,g),v=bm(q,I,D,R,l,k,g),u.moveTo(y.cx+y.x01,y.cy+y.y01),k<S?u.arc(y.cx,y.cy,k,nm(y.y01,y.x01),nm(v.y01,v.x01),!g):(u.arc(y.cx,y.cy,k,nm(y.y01,y.x01),nm(y.y11,y.x11),!g),u.arc(0,0,l,nm(y.cy+y.y11,y.cx+y.x11),nm(v.cy+v.y11,v.cx+v.x11),!g),u.arc(v.cx,v.cy,k,nm(v.y11,v.x11),nm(v.y01,v.x01),!g))):(u.moveTo(P,z),u.arc(0,0,l,_,b,!g)):u.moveTo(P,z),s>um&&w>um?E>um?(y=bm(D,R,q,I,s,-E,g),v=bm(P,z,O,U,s,-E,g),u.lineTo(y.cx+y.x01,y.cy+y.y01),E<S?u.arc(y.cx,y.cy,E,nm(y.y01,y.x01),nm(v.y01,v.x01),!g):(u.arc(y.cx,y.cy,E,nm(y.y01,y.x01),nm(y.y11,y.x11),!g),u.arc(0,0,s,nm(y.cy+y.y11,y.cx+y.x11),nm(v.cy+v.y11,v.cx+v.x11),g),u.arc(v.cx,v.cy,E,nm(v.y11,v.x11),nm(v.y01,v.x01),!g))):u.arc(0,0,s,x,m,g):u.lineTo(D,R)}else u.moveTo(0,0);if(u.closePath(),c)return u=null,c+""||null}return c.centroid=function(){var e=(+t.apply(this,arguments)+ +n.apply(this,arguments))/2,r=(+i.apply(this,arguments)+ +o.apply(this,arguments))/2-cm/2;return[em(r)*e,om(r)*e]},c.innerRadius=function(n){return arguments.length?(t="function"==typeof n?n:Jb(+n),c):t},c.outerRadius=function(t){return arguments.length?(n="function"==typeof t?t:Jb(+t),c):n},c.cornerRadius=function(t){return arguments.length?(e="function"==typeof t?t:Jb(+t),c):e},c.padRadius=function(t){return arguments.length?(r=null==t?null:"function"==typeof t?t:Jb(+t),c):r},c.startAngle=function(t){return arguments.length?(i="function"==typeof t?t:Jb(+t),c):i},c.endAngle=function(t){return arguments.length?(o="function"==typeof t?t:Jb(+t),c):o},c.padAngle=function(t){return arguments.length?(a="function"==typeof t?t:Jb(+t),c):a},c.context=function(t){return arguments.length?(u=null==t?null:t,c):u},c},t.area=Em,t.areaRadial=Fm,t.ascending=n,t.autoType=function(t){for(var n in t){var e,r,i=t[n].trim();if(i)if("true"===i)i=!0;else if("false"===i)i=!1;else if("NaN"===i)i=NaN;else if(isNaN(e=+i)){if(!(r=i.match(/^([-+]\d{2})?\d{4}(-\d{2}(-\d{2})?)?(T\d{2}:\d{2}(:\d{2}(\.\d{3})?)?(Z|[-+]\d{2}:\d{2})?)?$/)))continue;Qu&&r[4]&&!r[7]&&(i=i.replace(/-/g,"/").replace(/T/," ")),i=new Date(i)}else i=e;else i=null;t[n]=i}return t},t.axisBottom=function(t){return Et(3,t)},t.axisLeft=function(t){return Et(4,t)},t.axisRight=function(t){return Et(2,t)},t.axisTop=function(t){return Et(1,t)},t.bin=Q,t.bisect=l,t.bisectCenter=s,t.bisectLeft=f,t.bisectRight=c,t.bisector=r,t.blob=function(t,n){return fetch(t,n).then(Ju)},t.blur=function(t,n){if(!((n=+n)>=0))throw new RangeError("invalid r");let e=t.length;if(!((e=Math.floor(e))>=0))throw new RangeError("invalid length");if(!e||!n)return t;const r=v(n),i=t.slice();return r(t,i,0,e,1),r(i,t,0,e,1),r(t,i,0,e,1),t},t.blur2=h,t.blurImage=d,t.brush=function(){return pa(ea)},t.brushSelection=function(t){var n=t.__brush;return n?n.dim.output(n.selection):null},t.brushX=function(){return pa(ta)},t.brushY=function(){return pa(na)},t.buffer=function(t,n){return fetch(t,n).then(tc)},t.chord=function(){return Ta(!1,!1)},t.chordDirected=function(){return Ta(!0,!1)},t.chordTranspose=function(){return Ta(!1,!0)},t.cluster=function(){var t=_d,n=1,e=1,r=!1;function i(i){var o,a=0;i.eachAfter((function(n){var e=n.children;e?(n.x=function(t){return t.reduce(bd,0)/t.length}(e),n.y=function(t){return 1+t.reduce(md,0)}(e)):(n.x=o?a+=t(n,o):0,n.y=0,o=n)}));var u=function(t){for(var n;n=t.children;)t=n[0];return t}(i),c=function(t){for(var n;n=t.children;)t=n[n.length-1];return t}(i),f=u.x-t(u,c)/2,s=c.x+t(c,u)/2;return i.eachAfter(r?function(t){t.x=(t.x-i.x)*n,t.y=(i.y-t.y)*e}:function(t){t.x=(t.x-f)/(s-f)*n,t.y=(1-(i.y?t.y/i.y:1))*e})}return i.separation=function(n){return arguments.length?(t=n,i):t},i.size=function(t){return arguments.length?(r=!1,n=+t[0],e=+t[1],i):r?null:[n,e]},i.nodeSize=function(t){return arguments.length?(r=!0,n=+t[0],e=+t[1],i):r?[n,e]:null},i},t.color=Pe,t.contourDensity=function(){var t=Ka,n=Qa,e=Ja,r=960,i=500,o=20,a=2,u=3*o,c=r+2*u>>a,f=i+2*u>>a,s=$a(20);function l(r){var i=new Float32Array(c*f),s=Math.pow(2,-a),l=-1;for(const o of r){var d=(t(o,++l,r)+u)*s,p=(n(o,l,r)+u)*s,g=+e(o,l,r);if(d>=0&&d<c&&p>=0&&p<f){var y=Math.floor(d),v=Math.floor(p),_=d-y-.5,b=p-v-.5;i[y+v*c]+=(1-_)*(1-b)*g,i[y+1+v*c]+=_*(1-b)*g,i[y+1+(v+1)*c]+=_*b*g,i[y+(v+1)*c]+=(1-_)*b*g}}return h({data:i,width:c,height:f},o*s),i}function d(t){var n=l(t),e=s(n),r=Math.pow(2,2*a);return Array.isArray(e)||(e=G(Number.MIN_VALUE,J(n)/r,e)),Za().size([c,f]).thresholds(e.map((t=>t*r)))(n).map(((t,n)=>(t.value=+e[n],p(t))))}function p(t){return t.coordinates.forEach(g),t}function g(t){t.forEach(y)}function y(t){t.forEach(v)}function v(t){t[0]=t[0]*Math.pow(2,a)-u,t[1]=t[1]*Math.pow(2,a)-u}function _(){return c=r+2*(u=3*o)>>a,f=i+2*u>>a,d}return d.contours=function(t){var n=l(t),e=Za().size([c,f]),r=Math.pow(2,2*a),i=t=>{t=+t;var i=p(e.contour(n,t*r));return i.value=t,i};return Object.defineProperty(i,"max",{get:()=>J(n)/r}),i},d.x=function(n){return arguments.length?(t="function"==typeof n?n:$a(+n),d):t},d.y=function(t){return arguments.length?(n="function"==typeof t?t:$a(+t),d):n},d.weight=function(t){return arguments.length?(e="function"==typeof t?t:$a(+t),d):e},d.size=function(t){if(!arguments.length)return[r,i];var n=+t[0],e=+t[1];if(!(n>=0&&e>=0))throw new Error("invalid size");return r=n,i=e,_()},d.cellSize=function(t){if(!arguments.length)return 1<<a;if(!((t=+t)>=1))throw new Error("invalid cell size");return a=Math.floor(Math.log(t)/Math.LN2),_()},d.thresholds=function(t){return arguments.length?(s="function"==typeof t?t:Array.isArray(t)?$a(La.call(t)):$a(t),d):s},d.bandwidth=function(t){if(!arguments.length)return Math.sqrt(o*(o+1));if(!((t=+t)>=0))throw new Error("invalid bandwidth");return o=(Math.sqrt(4*t*t+1)-1)/2,_()},d},t.contours=Za,t.count=_,t.create=function(t){return Wn(Ut(t).call(document.documentElement))},t.creator=Ut,t.cross=function(...t){const n="function"==typeof t[t.length-1]&&function(t){return n=>t(...n)}(t.pop()),e=(t=t.map(x)).map(b),r=t.length-1,i=new Array(r+1).fill(0),o=[];if(r<0||e.some(m))return o;for(;;){o.push(i.map(((n,e)=>t[e][n])));let a=r;for(;++i[a]===e[a];){if(0===a)return n?o.map(n):o;i[a--]=0}}},t.csv=ic,t.csvFormat=Uu,t.csvFormatBody=Bu,t.csvFormatRow=Lu,t.csvFormatRows=Yu,t.csvFormatValue=ju,t.csvParse=Iu,t.csvParseRows=Ou,t.cubehelix=wr,t.cumsum=function(t,n){var e=0,r=0;return Float64Array.from(t,void 0===n?t=>e+=+t||0:i=>e+=+n(i,r++,t)||0)},t.curveBasis=function(t){return new mx(t)},t.curveBasisClosed=function(t){return new xx(t)},t.curveBasisOpen=function(t){return new wx(t)},t.curveBumpX=Um,t.curveBumpY=Bm,t.curveBundle=Ax,t.curveCardinal=Ex,t.curveCardinalClosed=Nx,t.curveCardinalOpen=Px,t.curveCatmullRom=Rx,t.curveCatmullRomClosed=qx,t.curveCatmullRomOpen=Ox,t.curveLinear=Mm,t.curveLinearClosed=function(t){return new Ux(t)},t.curveMonotoneX=function(t){return new $x(t)},t.curveMonotoneY=function(t){return new Hx(t)},t.curveNatural=function(t){return new Gx(t)},t.curveStep=function(t){return new Wx(t,.5)},t.curveStepAfter=function(t){return new Wx(t,1)},t.curveStepBefore=function(t){return new Wx(t,0)},t.descending=e,t.deviation=M,t.difference=function(t,...n){t=new InternSet(t);for(const e of n)for(const n of e)t.delete(n);return t},t.disjoint=function(t,n){const e=n[Symbol.iterator](),r=new InternSet;for(const n of t){if(r.has(n))return!1;let t,i;for(;({value:t,done:i}=e.next())&&!i;){if(Object.is(n,t))return!1;r.add(t)}}return!0},t.dispatch=Nt,t.drag=function(){var t,n,e,r,i=fe,o=se,a=le,u=he,c={},f=Nt("start","drag","end"),s=0,l=0;function h(t){t.on("mousedown.drag",d).filter(u).on("touchstart.drag",y).on("touchmove.drag",v,ne).on("touchend.drag touchcancel.drag",_).style("touch-action","none").style("-webkit-tap-highlight-color","rgba(0,0,0,0)")}function d(a,u){if(!r&&i.call(this,a,u)){var c=b(this,o.call(this,a,u),a,u,"mouse");c&&(Wn(a.view).on("mousemove.drag",p,ee).on("mouseup.drag",g,ee),oe(a.view),re(a),e=!1,t=a.clientX,n=a.clientY,c("start",a))}}function p(r){if(ie(r),!e){var i=r.clientX-t,o=r.clientY-n;e=i*i+o*o>l}c.mouse("drag",r)}function g(t){Wn(t.view).on("mousemove.drag mouseup.drag",null),ae(t.view,e),ie(t),c.mouse("end",t)}function y(t,n){if(i.call(this,t,n)){var e,r,a=t.changedTouches,u=o.call(this,t,n),c=a.length;for(e=0;e<c;++e)(r=b(this,u,t,n,a[e].identifier,a[e]))&&(re(t),r("start",t,a[e]))}}function v(t){var n,e,r=t.changedTouches,i=r.length;for(n=0;n<i;++n)(e=c[r[n].identifier])&&(ie(t),e("drag",t,r[n]))}function _(t){var n,e,i=t.changedTouches,o=i.length;for(r&&clearTimeout(r),r=setTimeout((function(){r=null}),500),n=0;n<o;++n)(e=c[i[n].identifier])&&(re(t),e("end",t,i[n]))}function b(t,n,e,r,i,o){var u,l,d,p=f.copy(),g=te(o||e,n);if(null!=(d=a.call(t,new ce("beforestart",{sourceEvent:e,target:h,identifier:i,active:s,x:g[0],y:g[1],dx:0,dy:0,dispatch:p}),r)))return u=d.x-g[0]||0,l=d.y-g[1]||0,function e(o,a,f){var y,v=g;switch(o){case"start":c[i]=e,y=s++;break;case"end":delete c[i],--s;case"drag":g=te(f||a,n),y=s}p.call(o,t,new ce(o,{sourceEvent:a,subject:d,target:h,identifier:i,active:y,x:g[0]+u,y:g[1]+l,dx:g[0]-v[0],dy:g[1]-v[1],dispatch:p}),r)}}return h.filter=function(t){return arguments.length?(i="function"==typeof t?t:ue(!!t),h):i},h.container=function(t){return arguments.length?(o="function"==typeof t?t:ue(t),h):o},h.subject=function(t){return arguments.length?(a="function"==typeof t?t:ue(t),h):a},h.touchable=function(t){return arguments.length?(u="function"==typeof t?t:ue(!!t),h):u},h.on=function(){var t=f.on.apply(f,arguments);return t===f?h:t},h.clickDistance=function(t){return arguments.length?(l=(t=+t)*t,h):Math.sqrt(l)},h},t.dragDisable=oe,t.dragEnable=ae,t.dsv=function(t,n,e,r){3===arguments.length&&"function"==typeof e&&(r=e,e=void 0);var i=Fu(t);return ec(n,e).then((function(t){return i.parse(t,r)}))},t.dsvFormat=Fu,t.easeBack=Do,t.easeBackIn=Po,t.easeBackInOut=Do,t.easeBackOut=zo,t.easeBounce=No,t.easeBounceIn=function(t){return 1-No(1-t)},t.easeBounceInOut=function(t){return((t*=2)<=1?1-No(1-t):No(t-1)+1)/2},t.easeBounceOut=No,t.easeCircle=So,t.easeCircleIn=function(t){return 1-Math.sqrt(1-t*t)},t.easeCircleInOut=So,t.easeCircleOut=function(t){return Math.sqrt(1- --t*t)},t.easeCubic=vo,t.easeCubicIn=function(t){return t*t*t},t.easeCubicInOut=vo,t.easeCubicOut=function(t){return--t*t*t+1},t.easeElastic=qo,t.easeElasticIn=Fo,t.easeElasticInOut=Io,t.easeElasticOut=qo,t.easeExp=To,t.easeExpIn=function(t){return Ao(1-+t)},t.easeExpInOut=To,t.easeExpOut=function(t){return 1-Ao(t)},t.easeLinear=t=>+t,t.easePoly=mo,t.easePolyIn=_o,t.easePolyInOut=mo,t.easePolyOut=bo,t.easeQuad=yo,t.easeQuadIn=function(t){return t*t},t.easeQuadInOut=yo,t.easeQuadOut=function(t){return t*(2-t)},t.easeSin=Mo,t.easeSinIn=function(t){return 1==+t?1:1-Math.cos(t*wo)},t.easeSinInOut=Mo,t.easeSinOut=function(t){return Math.sin(t*wo)},t.every=function(t,n){if("function"!=typeof n)throw new TypeError("test is not a function");let e=-1;for(const r of t)if(!n(r,++e,t))return!1;return!0},t.extent=A,t.fcumsum=function(t,n){const e=new T;let r=-1;return Float64Array.from(t,void 0===n?t=>e.add(+t||0):i=>e.add(+n(i,++r,t)||0))},t.filter=function(t,n){if("function"!=typeof n)throw new TypeError("test is not a function");const e=[];let r=-1;for(const i of t)n(i,++r,t)&&e.push(i);return e},t.flatGroup=function(t,...n){return D(z(t,...n),n)},t.flatRollup=function(t,n,...e){return D(F(t,n,...e),e)},t.forceCenter=function(t,n){var e,r=1;function i(){var i,o,a=e.length,u=0,c=0;for(i=0;i<a;++i)u+=(o=e[i]).x,c+=o.y;for(u=(u/a-t)*r,c=(c/a-n)*r,i=0;i<a;++i)(o=e[i]).x-=u,o.y-=c}return null==t&&(t=0),null==n&&(n=0),i.initialize=function(t){e=t},i.x=function(n){return arguments.length?(t=+n,i):t},i.y=function(t){return arguments.length?(n=+t,i):n},i.strength=function(t){return arguments.length?(r=+t,i):r},i},t.forceCollide=function(t){var n,e,r,i=1,o=1;function a(){for(var t,a,c,f,s,l,h,d=n.length,p=0;p<o;++p)for(a=gc(n,xc,wc).visitAfter(u),t=0;t<d;++t)c=n[t],l=e[c.index],h=l*l,f=c.x+c.vx,s=c.y+c.vy,a.visit(g);function g(t,n,e,o,a){var u=t.data,d=t.r,p=l+d;if(!u)return n>f+p||o<f-p||e>s+p||a<s-p;if(u.index>c.index){var g=f-u.x-u.vx,y=s-u.y-u.vy,v=g*g+y*y;v<p*p&&(0===g&&(v+=(g=mc(r))*g),0===y&&(v+=(y=mc(r))*y),v=(p-(v=Math.sqrt(v)))/v*i,c.vx+=(g*=v)*(p=(d*=d)/(h+d)),c.vy+=(y*=v)*p,u.vx-=g*(p=1-p),u.vy-=y*p)}}}function u(t){if(t.data)return t.r=e[t.data.index];for(var n=t.r=0;n<4;++n)t[n]&&t[n].r>t.r&&(t.r=t[n].r)}function c(){if(n){var r,i,o=n.length;for(e=new Array(o),r=0;r<o;++r)i=n[r],e[i.index]=+t(i,r,n)}}return"function"!=typeof t&&(t=bc(null==t?1:+t)),a.initialize=function(t,e){n=t,r=e,c()},a.iterations=function(t){return arguments.length?(o=+t,a):o},a.strength=function(t){return arguments.length?(i=+t,a):i},a.radius=function(n){return arguments.length?(t="function"==typeof n?n:bc(+n),c(),a):t},a},t.forceLink=function(t){var n,e,r,i,o,a,u=Mc,c=function(t){return 1/Math.min(i[t.source.index],i[t.target.index])},f=bc(30),s=1;function l(r){for(var i=0,u=t.length;i<s;++i)for(var c,f,l,h,d,p,g,y=0;y<u;++y)f=(c=t[y]).source,h=(l=c.target).x+l.vx-f.x-f.vx||mc(a),d=l.y+l.vy-f.y-f.vy||mc(a),h*=p=((p=Math.sqrt(h*h+d*d))-e[y])/p*r*n[y],d*=p,l.vx-=h*(g=o[y]),l.vy-=d*g,f.vx+=h*(g=1-g),f.vy+=d*g}function h(){if(r){var a,c,f=r.length,s=t.length,l=new Map(r.map(((t,n)=>[u(t,n,r),t])));for(a=0,i=new Array(f);a<s;++a)(c=t[a]).index=a,"object"!=typeof c.source&&(c.source=Ac(l,c.source)),"object"!=typeof c.target&&(c.target=Ac(l,c.target)),i[c.source.index]=(i[c.source.index]||0)+1,i[c.target.index]=(i[c.target.index]||0)+1;for(a=0,o=new Array(s);a<s;++a)c=t[a],o[a]=i[c.source.index]/(i[c.source.index]+i[c.target.index]);n=new Array(s),d(),e=new Array(s),p()}}function d(){if(r)for(var e=0,i=t.length;e<i;++e)n[e]=+c(t[e],e,t)}function p(){if(r)for(var n=0,i=t.length;n<i;++n)e[n]=+f(t[n],n,t)}return null==t&&(t=[]),l.initialize=function(t,n){r=t,a=n,h()},l.links=function(n){return arguments.length?(t=n,h(),l):t},l.id=function(t){return arguments.length?(u=t,l):u},l.iterations=function(t){return arguments.length?(s=+t,l):s},l.strength=function(t){return arguments.length?(c="function"==typeof t?t:bc(+t),d(),l):c},l.distance=function(t){return arguments.length?(f="function"==typeof t?t:bc(+t),p(),l):f},l},t.forceManyBody=function(){var t,n,e,r,i,o=bc(-30),a=1,u=1/0,c=.81;function f(e){var i,o=t.length,a=gc(t,Sc,Ec).visitAfter(l);for(r=e,i=0;i<o;++i)n=t[i],a.visit(h)}function s(){if(t){var n,e,r=t.length;for(i=new Array(r),n=0;n<r;++n)e=t[n],i[e.index]=+o(e,n,t)}}function l(t){var n,e,r,o,a,u=0,c=0;if(t.length){for(r=o=a=0;a<4;++a)(n=t[a])&&(e=Math.abs(n.value))&&(u+=n.value,c+=e,r+=e*n.x,o+=e*n.y);t.x=r/c,t.y=o/c}else{(n=t).x=n.data.x,n.y=n.data.y;do{u+=i[n.data.index]}while(n=n.next)}t.value=u}function h(t,o,f,s){if(!t.value)return!0;var l=t.x-n.x,h=t.y-n.y,d=s-o,p=l*l+h*h;if(d*d/c<p)return p<u&&(0===l&&(p+=(l=mc(e))*l),0===h&&(p+=(h=mc(e))*h),p<a&&(p=Math.sqrt(a*p)),n.vx+=l*t.value*r/p,n.vy+=h*t.value*r/p),!0;if(!(t.length||p>=u)){(t.data!==n||t.next)&&(0===l&&(p+=(l=mc(e))*l),0===h&&(p+=(h=mc(e))*h),p<a&&(p=Math.sqrt(a*p)));do{t.data!==n&&(d=i[t.data.index]*r/p,n.vx+=l*d,n.vy+=h*d)}while(t=t.next)}}return f.initialize=function(n,r){t=n,e=r,s()},f.strength=function(t){return arguments.length?(o="function"==typeof t?t:bc(+t),s(),f):o},f.distanceMin=function(t){return arguments.length?(a=t*t,f):Math.sqrt(a)},f.distanceMax=function(t){return arguments.length?(u=t*t,f):Math.sqrt(u)},f.theta=function(t){return arguments.length?(c=t*t,f):Math.sqrt(c)},f},t.forceRadial=function(t,n,e){var r,i,o,a=bc(.1);function u(t){for(var a=0,u=r.length;a<u;++a){var c=r[a],f=c.x-n||1e-6,s=c.y-e||1e-6,l=Math.sqrt(f*f+s*s),h=(o[a]-l)*i[a]*t/l;c.vx+=f*h,c.vy+=s*h}}function c(){if(r){var n,e=r.length;for(i=new Array(e),o=new Array(e),n=0;n<e;++n)o[n]=+t(r[n],n,r),i[n]=isNaN(o[n])?0:+a(r[n],n,r)}}return"function"!=typeof t&&(t=bc(+t)),null==n&&(n=0),null==e&&(e=0),u.initialize=function(t){r=t,c()},u.strength=function(t){return arguments.length?(a="function"==typeof t?t:bc(+t),c(),u):a},u.radius=function(n){return arguments.length?(t="function"==typeof n?n:bc(+n),c(),u):t},u.x=function(t){return arguments.length?(n=+t,u):n},u.y=function(t){return arguments.length?(e=+t,u):e},u},t.forceSimulation=function(t){var n,e=1,r=.001,i=1-Math.pow(r,1/300),o=0,a=.6,u=new Map,c=Ti(l),f=Nt("tick","end"),s=function(){let t=1;return()=>(t=(1664525*t+1013904223)%Tc)/Tc}();function l(){h(),f.call("tick",n),e<r&&(c.stop(),f.call("end",n))}function h(r){var c,f,s=t.length;void 0===r&&(r=1);for(var l=0;l<r;++l)for(e+=(o-e)*i,u.forEach((function(t){t(e)})),c=0;c<s;++c)null==(f=t[c]).fx?f.x+=f.vx*=a:(f.x=f.fx,f.vx=0),null==f.fy?f.y+=f.vy*=a:(f.y=f.fy,f.vy=0);return n}function d(){for(var n,e=0,r=t.length;e<r;++e){if((n=t[e]).index=e,null!=n.fx&&(n.x=n.fx),null!=n.fy&&(n.y=n.fy),isNaN(n.x)||isNaN(n.y)){var i=10*Math.sqrt(.5+e),o=e*kc;n.x=i*Math.cos(o),n.y=i*Math.sin(o)}(isNaN(n.vx)||isNaN(n.vy))&&(n.vx=n.vy=0)}}function p(n){return n.initialize&&n.initialize(t,s),n}return null==t&&(t=[]),d(),n={tick:h,restart:function(){return c.restart(l),n},stop:function(){return c.stop(),n},nodes:function(e){return arguments.length?(t=e,d(),u.forEach(p),n):t},alpha:function(t){return arguments.length?(e=+t,n):e},alphaMin:function(t){return arguments.length?(r=+t,n):r},alphaDecay:function(t){return arguments.length?(i=+t,n):+i},alphaTarget:function(t){return arguments.length?(o=+t,n):o},velocityDecay:function(t){return arguments.length?(a=1-t,n):1-a},randomSource:function(t){return arguments.length?(s=t,u.forEach(p),n):s},force:function(t,e){return arguments.length>1?(null==e?u.delete(t):u.set(t,p(e)),n):u.get(t)},find:function(n,e,r){var i,o,a,u,c,f=0,s=t.length;for(null==r?r=1/0:r*=r,f=0;f<s;++f)(a=(i=n-(u=t[f]).x)*i+(o=e-u.y)*o)<r&&(c=u,r=a);return c},on:function(t,e){return arguments.length>1?(f.on(t,e),n):f.on(t)}}},t.forceX=function(t){var n,e,r,i=bc(.1);function o(t){for(var i,o=0,a=n.length;o<a;++o)(i=n[o]).vx+=(r[o]-i.x)*e[o]*t}function a(){if(n){var o,a=n.length;for(e=new Array(a),r=new Array(a),o=0;o<a;++o)e[o]=isNaN(r[o]=+t(n[o],o,n))?0:+i(n[o],o,n)}}return"function"!=typeof t&&(t=bc(null==t?0:+t)),o.initialize=function(t){n=t,a()},o.strength=function(t){return arguments.length?(i="function"==typeof t?t:bc(+t),a(),o):i},o.x=function(n){return arguments.length?(t="function"==typeof n?n:bc(+n),a(),o):t},o},t.forceY=function(t){var n,e,r,i=bc(.1);function o(t){for(var i,o=0,a=n.length;o<a;++o)(i=n[o]).vy+=(r[o]-i.y)*e[o]*t}function a(){if(n){var o,a=n.length;for(e=new Array(a),r=new Array(a),o=0;o<a;++o)e[o]=isNaN(r[o]=+t(n[o],o,n))?0:+i(n[o],o,n)}}return"function"!=typeof t&&(t=bc(null==t?0:+t)),o.initialize=function(t){n=t,a()},o.strength=function(t){return arguments.length?(i="function"==typeof t?t:bc(+t),a(),o):i},o.y=function(n){return arguments.length?(t="function"==typeof n?n:bc(+n),a(),o):t},o},t.formatDefaultLocale=Lc,t.formatLocale=Yc,t.formatSpecifier=Dc,t.fsum=function(t,n){const e=new T;if(void 0===n)for(let n of t)(n=+n)&&e.add(n);else{let r=-1;for(let i of t)(i=+n(i,++r,t))&&e.add(i)}return+e},t.geoAlbers=Zh,t.geoAlbersUsa=function(){var t,n,e,r,i,o,a=Zh(),u=Wh().rotate([154,0]).center([-2,58.5]).parallels([55,65]),c=Wh().rotate([157,0]).center([-3,19.9]).parallels([8,18]),f={point:function(t,n){o=[t,n]}};function s(t){var n=t[0],a=t[1];return o=null,e.point(n,a),o||(r.point(n,a),o)||(i.point(n,a),o)}function l(){return t=n=null,s}return s.invert=function(t){var n=a.scale(),e=a.translate(),r=(t[0]-e[0])/n,i=(t[1]-e[1])/n;return(i>=.12&&i<.234&&r>=-.425&&r<-.214?u:i>=.166&&i<.234&&r>=-.214&&r<-.115?c:a).invert(t)},s.stream=function(e){return t&&n===e?t:(r=[a.stream(n=e),u.stream(e),c.stream(e)],i=r.length,t={point:function(t,n){for(var e=-1;++e<i;)r[e].point(t,n)},sphere:function(){for(var t=-1;++t<i;)r[t].sphere()},lineStart:function(){for(var t=-1;++t<i;)r[t].lineStart()},lineEnd:function(){for(var t=-1;++t<i;)r[t].lineEnd()},polygonStart:function(){for(var t=-1;++t<i;)r[t].polygonStart()},polygonEnd:function(){for(var t=-1;++t<i;)r[t].polygonEnd()}});var r,i},s.precision=function(t){return arguments.length?(a.precision(t),u.precision(t),c.precision(t),l()):a.precision()},s.scale=function(t){return arguments.length?(a.scale(t),u.scale(.35*t),c.scale(t),s.translate(a.translate())):a.scale()},s.translate=function(t){if(!arguments.length)return a.translate();var n=a.scale(),o=+t[0],s=+t[1];return e=a.translate(t).clipExtent([[o-.455*n,s-.238*n],[o+.455*n,s+.238*n]]).stream(f),r=u.translate([o-.307*n,s+.201*n]).clipExtent([[o-.425*n+Xc,s+.12*n+Xc],[o-.214*n-Xc,s+.234*n-Xc]]).stream(f),i=c.translate([o-.205*n,s+.212*n]).clipExtent([[o-.214*n+Xc,s+.166*n+Xc],[o-.115*n-Xc,s+.234*n-Xc]]).stream(f),l()},s.fitExtent=function(t,n){return Ih(s,t,n)},s.fitSize=function(t,n){return Oh(s,t,n)},s.fitWidth=function(t,n){return Uh(s,t,n)},s.fitHeight=function(t,n){return Bh(s,t,n)},s.scale(1070)},t.geoArea=function(t){return Yf=new T,Mf(t,Lf),2*Yf},t.geoAzimuthalEqualArea=function(){return Hh(Jh).scale(124.75).clipAngle(179.999)},t.geoAzimuthalEqualAreaRaw=Jh,t.geoAzimuthalEquidistant=function(){return Hh(td).scale(79.4188).clipAngle(179.999)},t.geoAzimuthalEquidistantRaw=td,t.geoBounds=function(t){var n,e,r,i,o,a,u;if(zf=Pf=-(Nf=Cf=1/0),Of=[],Mf(t,ys),e=Of.length){for(Of.sort(Ts),n=1,o=[r=Of[0]];n<e;++n)Ss(r,(i=Of[n])[0])||Ss(r,i[1])?(As(r[0],i[1])>As(r[0],r[1])&&(r[1]=i[1]),As(i[0],r[1])>As(r[0],r[1])&&(r[0]=i[0])):o.push(r=i);for(a=-1/0,n=0,r=o[e=o.length-1];n<=e;r=i,++n)i=o[n],(u=As(r[1],i[0]))>a&&(a=u,Nf=i[0],Pf=r[1])}return Of=Uf=null,Nf===1/0||Cf===1/0?[[NaN,NaN],[NaN,NaN]]:[[Nf,Cf],[Pf,zf]]},t.geoCentroid=function(t){ts=ns=es=rs=is=os=as=us=0,cs=new T,fs=new T,ss=new T,Mf(t,Es);var n=+cs,e=+fs,r=+ss,i=uf(n,e,r);return i<Gc&&(n=os,e=as,r=us,ns<Xc&&(n=es,e=rs,r=is),(i=uf(n,e,r))<Gc)?[NaN,NaN]:[ef(e,n)*Qc,gf(r/i)*Qc]},t.geoCircle=function(){var t,n,e=Os([0,0]),r=Os(90),i=Os(6),o={point:function(e,r){t.push(e=n(e,r)),e[0]*=Qc,e[1]*=Qc}};function a(){var a=e.apply(this,arguments),u=r.apply(this,arguments)*Jc,c=i.apply(this,arguments)*Jc;return t=[],n=Ys(-a[0]*Jc,-a[1]*Jc,0).invert,Xs(o,u,c,1),a={type:"Polygon",coordinates:[t]},t=n=null,a}return a.center=function(t){return arguments.length?(e="function"==typeof t?t:Os([+t[0],+t[1]]),a):e},a.radius=function(t){return arguments.length?(r="function"==typeof t?t:Os(+t),a):r},a.precision=function(t){return arguments.length?(i="function"==typeof t?t:Os(+t),a):i},a},t.geoClipAntimeridian=il,t.geoClipCircle=ol,t.geoClipExtent=function(){var t,n,e,r=0,i=0,o=960,a=500;return e={stream:function(e){return t&&n===e?t:t=hl(r,i,o,a)(n=e)},extent:function(u){return arguments.length?(r=+u[0][0],i=+u[0][1],o=+u[1][0],a=+u[1][1],t=n=null,e):[[r,i],[o,a]]}}},t.geoClipRectangle=hl,t.geoConicConformal=function(){return Gh(id).scale(109.5).parallels([30,30])},t.geoConicConformalRaw=id,t.geoConicEqualArea=Wh,t.geoConicEqualAreaRaw=Vh,t.geoConicEquidistant=function(){return Gh(ad).scale(131.154).center([0,13.9389])},t.geoConicEquidistantRaw=ad,t.geoContains=function(t,n){return(t&&xl.hasOwnProperty(t.type)?xl[t.type]:Ml)(t,n)},t.geoDistance=ml,t.geoEqualEarth=function(){return Hh(hd).scale(177.158)},t.geoEqualEarthRaw=hd,t.geoEquirectangular=function(){return Hh(od).scale(152.63)},t.geoEquirectangularRaw=od,t.geoGnomonic=function(){return Hh(dd).scale(144.049).clipAngle(60)},t.geoGnomonicRaw=dd,t.geoGraticule=Pl,t.geoGraticule10=function(){return Pl()()},t.geoIdentity=function(){var t,n,e,r,i,o,a,u=1,c=0,f=0,s=1,l=1,h=0,d=null,p=1,g=1,y=Rh({point:function(t,n){var e=b([t,n]);this.stream.point(e[0],e[1])}}),v=ql;function _(){return p=u*s,g=u*l,o=a=null,b}function b(e){var r=e[0]*p,i=e[1]*g;if(h){var o=i*t-r*n;r=r*t+i*n,i=o}return[r+c,i+f]}return b.invert=function(e){var r=e[0]-c,i=e[1]-f;if(h){var o=i*t+r*n;r=r*t-i*n,i=o}return[r/p,i/g]},b.stream=function(t){return o&&a===t?o:o=y(v(a=t))},b.postclip=function(t){return arguments.length?(v=t,d=e=r=i=null,_()):v},b.clipExtent=function(t){return arguments.length?(v=null==t?(d=e=r=i=null,ql):hl(d=+t[0][0],e=+t[0][1],r=+t[1][0],i=+t[1][1]),_()):null==d?null:[[d,e],[r,i]]},b.scale=function(t){return arguments.length?(u=+t,_()):u},b.translate=function(t){return arguments.length?(c=+t[0],f=+t[1],_()):[c,f]},b.angle=function(e){return arguments.length?(n=sf(h=e%360*Jc),t=rf(h),_()):h*Qc},b.reflectX=function(t){return arguments.length?(s=t?-1:1,_()):s<0},b.reflectY=function(t){return arguments.length?(l=t?-1:1,_()):l<0},b.fitExtent=function(t,n){return Ih(b,t,n)},b.fitSize=function(t,n){return Oh(b,t,n)},b.fitWidth=function(t,n){return Uh(b,t,n)},b.fitHeight=function(t,n){return Bh(b,t,n)},b},t.geoInterpolate=function(t,n){var e=t[0]*Jc,r=t[1]*Jc,i=n[0]*Jc,o=n[1]*Jc,a=rf(r),u=sf(r),c=rf(o),f=sf(o),s=a*rf(e),l=a*sf(e),h=c*rf(i),d=c*sf(i),p=2*gf(hf(yf(o-r)+a*c*yf(i-e))),g=sf(p),y=p?function(t){var n=sf(t*=p)/g,e=sf(p-t)/g,r=e*s+n*h,i=e*l+n*d,o=e*u+n*f;return[ef(i,r)*Qc,ef(o,hf(r*r+i*i))*Qc]}:function(){return[e*Qc,r*Qc]};return y.distance=p,y},t.geoLength=vl,t.geoMercator=function(){return ed(nd).scale(961/Kc)},t.geoMercatorRaw=nd,t.geoNaturalEarth1=function(){return Hh(pd).scale(175.295)},t.geoNaturalEarth1Raw=pd,t.geoOrthographic=function(){return Hh(gd).scale(249.5).clipAngle(90.000001)},t.geoOrthographicRaw=gd,t.geoPath=function(t,n){var e,r,i=4.5;function o(t){return t&&("function"==typeof i&&r.pointRadius(+i.apply(this,arguments)),Mf(t,e(r))),r.result()}return o.area=function(t){return Mf(t,e($l)),$l.result()},o.measure=function(t){return Mf(t,e(Ph)),Ph.result()},o.bounds=function(t){return Mf(t,e(th)),th.result()},o.centroid=function(t){return Mf(t,e(mh)),mh.result()},o.projection=function(n){return arguments.length?(e=null==n?(t=null,ql):(t=n).stream,o):t},o.context=function(t){return arguments.length?(r=null==t?(n=null,new zh):new xh(n=t),"function"!=typeof i&&r.pointRadius(i),o):n},o.pointRadius=function(t){return arguments.length?(i="function"==typeof t?t:(r.pointRadius(+t),+t),o):i},o.projection(t).context(n)},t.geoProjection=Hh,t.geoProjectionMutator=Xh,t.geoRotation=Hs,t.geoStereographic=function(){return Hh(yd).scale(250).clipAngle(142)},t.geoStereographicRaw=yd,t.geoStream=Mf,t.geoTransform=function(t){return{stream:Rh(t)}},t.geoTransverseMercator=function(){var t=ed(vd),n=t.center,e=t.rotate;return t.center=function(t){return arguments.length?n([-t[1],t[0]]):[(t=n())[1],-t[0]]},t.rotate=function(t){return arguments.length?e([t[0],t[1],t.length>2?t[2]+90:90]):[(t=e())[0],t[1],t[2]-90]},e([0,0,90]).scale(159.155)},t.geoTransverseMercatorRaw=vd,t.gray=function(t,n){return new ir(t,0,0,null==n?1:n)},t.greatest=ot,t.greatestIndex=function(t,e=n){if(1===e.length)return tt(t,e);let r,i=-1,o=-1;for(const n of t)++o,(i<0?0===e(n,n):e(n,r)>0)&&(r=n,i=o);return i},t.group=P,t.groupSort=function(t,e,r){return(2!==e.length?U(R(t,e,r),(([t,e],[r,i])=>n(e,i)||n(t,r))):U(P(t,r),(([t,r],[i,o])=>e(r,o)||n(t,i)))).map((([t])=>t))},t.groups=z,t.hcl=sr,t.hierarchy=wd,t.histogram=Q,t.hsl=$e,t.html=fc,t.image=function(t,n){return new Promise((function(e,r){var i=new Image;for(var o in n)i[o]=n[o];i.onerror=r,i.onload=function(){e(i)},i.src=t}))},t.index=function(t,...n){return I(t,C,q,n)},t.indexes=function(t,...n){return I(t,Array.from,q,n)},t.interpolate=Hr,t.interpolateArray=function(t,n){return(Ir(n)?qr:Or)(t,n)},t.interpolateBasis=Tr,t.interpolateBasisClosed=Sr,t.interpolateBlues=Cb,t.interpolateBrBG=L_,t.interpolateBuGn=ab,t.interpolateBuPu=cb,t.interpolateCividis=function(t){return t=Math.max(0,Math.min(1,t)),"rgb("+Math.max(0,Math.min(255,Math.round(-4.54-t*(35.34-t*(2381.73-t*(6402.7-t*(7024.72-2710.57*t)))))))+", "+Math.max(0,Math.min(255,Math.round(32.49+t*(170.73+t*(52.82-t*(131.46-t*(176.58-67.37*t)))))))+", "+Math.max(0,Math.min(255,Math.round(81.24+t*(442.36-t*(2482.43-t*(6167.24-t*(6614.94-2475.67*t)))))))+")"},t.interpolateCool=jb,t.interpolateCubehelix=fi,t.interpolateCubehelixDefault=Yb,t.interpolateCubehelixLong=si,t.interpolateDate=Ur,t.interpolateDiscrete=function(t){var n=t.length;return function(e){return t[Math.max(0,Math.min(n-1,Math.floor(e*n)))]}},t.interpolateGnBu=sb,t.interpolateGreens=zb,t.interpolateGreys=Rb,t.interpolateHcl=ai,t.interpolateHclLong=ui,t.interpolateHsl=ri,t.interpolateHslLong=ii,t.interpolateHue=function(t,n){var e=Nr(+t,+n);return function(t){var n=e(t);return n-360*Math.floor(n/360)}},t.interpolateInferno=Kb,t.interpolateLab=function(t,n){var e=Pr((t=rr(t)).l,(n=rr(n)).l),r=Pr(t.a,n.a),i=Pr(t.b,n.b),o=Pr(t.opacity,n.opacity);return function(n){return t.l=e(n),t.a=r(n),t.b=i(n),t.opacity=o(n),t+""}},t.interpolateMagma=Zb,t.interpolateNumber=Br,t.interpolateNumberArray=qr,t.interpolateObject=Yr,t.interpolateOrRd=hb,t.interpolateOranges=Bb,t.interpolatePRGn=$_,t.interpolatePiYG=X_,t.interpolatePlasma=Qb,t.interpolatePuBu=yb,t.interpolatePuBuGn=pb,t.interpolatePuOr=V_,t.interpolatePuRd=_b,t.interpolatePurples=qb,t.interpolateRainbow=function(t){(t<0||t>1)&&(t-=Math.floor(t));var n=Math.abs(t-.5);return $b.h=360*t-100,$b.s=1.5-1.5*n,$b.l=.8-.9*n,$b+""},t.interpolateRdBu=Z_,t.interpolateRdGy=Q_,t.interpolateRdPu=mb,t.interpolateRdYlBu=tb,t.interpolateRdYlGn=eb,t.interpolateReds=Ob,t.interpolateRgb=zr,t.interpolateRgbBasis=Rr,t.interpolateRgbBasisClosed=Fr,t.interpolateRound=Xr,t.interpolateSinebow=function(t){var n;return t=(.5-t)*Math.PI,Hb.r=255*(n=Math.sin(t))*n,Hb.g=255*(n=Math.sin(t+Xb))*n,Hb.b=255*(n=Math.sin(t+Gb))*n,Hb+""},t.interpolateSpectral=ib,t.interpolateString=$r,t.interpolateTransformCss=Qr,t.interpolateTransformSvg=Jr,t.interpolateTurbo=function(t){return t=Math.max(0,Math.min(1,t)),"rgb("+Math.max(0,Math.min(255,Math.round(34.61+t*(1172.33-t*(10793.56-t*(33300.12-t*(38394.49-14825.05*t)))))))+", "+Math.max(0,Math.min(255,Math.round(23.31+t*(557.33+t*(1225.33-t*(3574.96-t*(1073.77+707.56*t)))))))+", "+Math.max(0,Math.min(255,Math.round(27.2+t*(3211.1-t*(15327.97-t*(27814-t*(22569.18-6838.66*t)))))))+")"},t.interpolateViridis=Wb,t.interpolateWarm=Lb,t.interpolateYlGn=Ab,t.interpolateYlGnBu=wb,t.interpolateYlOrBr=Sb,t.interpolateYlOrRd=kb,t.interpolateZoom=ni,t.interrupt=Ii,t.intersection=function(t,...n){t=new InternSet(t),n=n.map(vt);t:for(const e of t)for(const r of n)if(!r.has(e)){t.delete(e);continue t}return t},t.interval=function(t,n,e){var r=new Ai,i=n;return null==n?(r.restart(t,n,e),r):(r._restart=r.restart,r.restart=function(t,n,e){n=+n,e=null==e?wi():+e,r._restart((function o(a){a+=i,r._restart(o,i+=n,e),t(a)}),n,e)},r.restart(t,n,e),r)},t.isoFormat=__,t.isoParse=m_,t.json=function(t,n){return fetch(t,n).then(ac)},t.lab=rr,t.lch=function(t,n,e,r){return 1===arguments.length?fr(t):new lr(e,n,t,null==r?1:r)},t.least=function(t,e=n){let r,i=!1;if(1===e.length){let o;for(const a of t){const t=e(a);(i?n(t,o)<0:0===n(t,t))&&(r=a,o=t,i=!0)}}else for(const n of t)(i?e(n,r)<0:0===e(n,n))&&(r=n,i=!0);return r},t.leastIndex=ht,t.line=Sm,t.lineRadial=Rm,t.link=$m,t.linkHorizontal=function(){return $m(Um)},t.linkRadial=function(){const t=$m(Ym);return t.angle=t.x,delete t.x,t.radius=t.y,delete t.y,t},t.linkVertical=function(){return $m(Bm)},t.local=Kn,t.map=function(t,n){if("function"!=typeof t[Symbol.iterator])throw new TypeError("values is not iterable");if("function"!=typeof n)throw new TypeError("mapper is not a function");return Array.from(t,((e,r)=>n(e,r,t)))},t.matcher=Ht,t.max=J,t.maxIndex=tt,t.mean=function(t,n){let e=0,r=0;if(void 0===n)for(let n of t)null!=n&&(n=+n)>=n&&(++e,r+=n);else{let i=-1;for(let o of t)null!=(o=n(o,++i,t))&&(o=+o)>=o&&(++e,r+=o)}if(e)return r/e},t.median=function(t,n){return at(t,.5,n)},t.medianIndex=function(t,n){return ct(t,.5,n)},t.merge=ft,t.min=nt,t.minIndex=et,t.mode=function(t,n){const e=new InternMap;if(void 0===n)for(let n of t)null!=n&&n>=n&&e.set(n,(e.get(n)||0)+1);else{let r=-1;for(let i of t)null!=(i=n(i,++r,t))&&i>=i&&e.set(i,(e.get(i)||0)+1)}let r,i=0;for(const[t,n]of e)n>i&&(i=n,r=t);return r},t.namespace=qt,t.namespaces=Ft,t.nice=Z,t.now=wi,t.pack=function(){var t=null,n=1,e=1,r=Cd;function i(i){const o=Dd();return i.x=n/2,i.y=e/2,t?i.eachBefore(Vd(t)).eachAfter(Wd(r,.5,o)).eachBefore(Zd(1)):i.eachBefore(Vd(Gd)).eachAfter(Wd(Cd,1,o)).eachAfter(Wd(r,i.r/Math.min(n,e),o)).eachBefore(Zd(Math.min(n,e)/(2*i.r))),i}return i.radius=function(n){return arguments.length?(t=kd(n),i):t},i.size=function(t){return arguments.length?(n=+t[0],e=+t[1],i):[n,e]},i.padding=function(t){return arguments.length?(r="function"==typeof t?t:Pd(+t),i):r},i},t.packEnclose=function(t){return Rd(t,Dd())},t.packSiblings=function(t){return Xd(t,Dd()),t},t.pairs=function(t,n=st){const e=[];let r,i=!1;for(const o of t)i&&e.push(n(r,o)),r=o,i=!0;return e},t.partition=function(){var t=1,n=1,e=0,r=!1;function i(i){var o=i.height+1;return i.x0=i.y0=e,i.x1=t,i.y1=n/o,i.eachBefore(function(t,n){return function(r){r.children&&Qd(r,r.x0,t*(r.depth+1)/n,r.x1,t*(r.depth+2)/n);var i=r.x0,o=r.y0,a=r.x1-e,u=r.y1-e;a<i&&(i=a=(i+a)/2),u<o&&(o=u=(o+u)/2),r.x0=i,r.y0=o,r.x1=a,r.y1=u}}(n,o)),r&&i.eachBefore(Kd),i}return i.round=function(t){return arguments.length?(r=!!t,i):r},i.size=function(e){return arguments.length?(t=+e[0],n=+e[1],i):[t,n]},i.padding=function(t){return arguments.length?(e=+t,i):e},i},t.path=Pa,t.permute=O,t.pie=function(){var t=Nm,n=km,e=null,r=Jb(0),i=Jb(sm),o=Jb(0);function a(a){var u,c,f,s,l,h=(a=xm(a)).length,d=0,p=new Array(h),g=new Array(h),y=+r.apply(this,arguments),v=Math.min(sm,Math.max(-sm,i.apply(this,arguments)-y)),_=Math.min(Math.abs(v)/h,o.apply(this,arguments)),b=_*(v<0?-1:1);for(u=0;u<h;++u)(l=g[p[u]=u]=+t(a[u],u,a))>0&&(d+=l);for(null!=n?p.sort((function(t,e){return n(g[t],g[e])})):null!=e&&p.sort((function(t,n){return e(a[t],a[n])})),u=0,f=d?(v-h*b)/d:0;u<h;++u,y=s)c=p[u],s=y+((l=g[c])>0?l*f:0)+b,g[c]={data:a[c],index:u,value:l,startAngle:y,endAngle:s,padAngle:_};return g}return a.value=function(n){return arguments.length?(t="function"==typeof n?n:Jb(+n),a):t},a.sortValues=function(t){return arguments.length?(n=t,e=null,a):n},a.sort=function(t){return arguments.length?(e=t,n=null,a):e},a.startAngle=function(t){return arguments.length?(r="function"==typeof t?t:Jb(+t),a):r},a.endAngle=function(t){return arguments.length?(i="function"==typeof t?t:Jb(+t),a):i},a.padAngle=function(t){return arguments.length?(o="function"==typeof t?t:Jb(+t),a):o},a},t.piecewise=li,t.pointRadial=qm,t.pointer=te,t.pointers=function(t,n){return t.target&&(t=Jn(t),void 0===n&&(n=t.currentTarget),t=t.touches||[t]),Array.from(t,(t=>te(t,n)))},t.polygonArea=function(t){for(var n,e=-1,r=t.length,i=t[r-1],o=0;++e<r;)n=i,i=t[e],o+=n[1]*i[0]-n[0]*i[1];return o/2},t.polygonCentroid=function(t){for(var n,e,r=-1,i=t.length,o=0,a=0,u=t[i-1],c=0;++r<i;)n=u,u=t[r],c+=e=n[0]*u[1]-u[0]*n[1],o+=(n[0]+u[0])*e,a+=(n[1]+u[1])*e;return[o/(c*=3),a/c]},t.polygonContains=function(t,n){for(var e,r,i=t.length,o=t[i-1],a=n[0],u=n[1],c=o[0],f=o[1],s=!1,l=0;l<i;++l)e=(o=t[l])[0],(r=o[1])>u!=f>u&&a<(c-e)*(u-r)/(f-r)+e&&(s=!s),c=e,f=r;return s},t.polygonHull=function(t){if((e=t.length)<3)return null;var n,e,r=new Array(e),i=new Array(e);for(n=0;n<e;++n)r[n]=[+t[n][0],+t[n][1],n];for(r.sort(_p),n=0;n<e;++n)i[n]=[r[n][0],-r[n][1]];var o=bp(r),a=bp(i),u=a[0]===o[0],c=a[a.length-1]===o[o.length-1],f=[];for(n=o.length-1;n>=0;--n)f.push(t[r[o[n]][2]]);for(n=+u;n<a.length-c;++n)f.push(t[r[a[n]][2]]);return f},t.polygonLength=function(t){for(var n,e,r=-1,i=t.length,o=t[i-1],a=o[0],u=o[1],c=0;++r<i;)n=a,e=u,n-=a=(o=t[r])[0],e-=u=o[1],c+=Math.hypot(n,e);return c},t.precisionFixed=jc,t.precisionPrefix=$c,t.precisionRound=Hc,t.quadtree=gc,t.quantile=at,t.quantileIndex=ct,t.quantileSorted=ut,t.quantize=function(t,n){for(var e=new Array(n),r=0;r<n;++r)e[r]=t(r/(n-1));return e},t.quickselect=rt,t.radialArea=Fm,t.radialLine=Rm,t.randomBates=Sp,t.randomBernoulli=Np,t.randomBeta=zp,t.randomBinomial=Dp,t.randomCauchy=Fp,t.randomExponential=Ep,t.randomGamma=Pp,t.randomGeometric=Cp,t.randomInt=wp,t.randomIrwinHall=Tp,t.randomLcg=function(t=Math.random()){let n=0|(0<=t&&t<1?t/Op:Math.abs(t));return()=>(n=1664525*n+1013904223|0,Op*(n>>>0))},t.randomLogNormal=Ap,t.randomLogistic=qp,t.randomNormal=Mp,t.randomPareto=kp,t.randomPoisson=Ip,t.randomUniform=xp,t.randomWeibull=Rp,t.range=lt,t.rank=function(t,e=n){if("function"!=typeof t[Symbol.iterator])throw new TypeError("values is not iterable");let r=Array.from(t);const i=new Float64Array(r.length);2!==e.length&&(r=r.map(e),e=n);const o=(t,n)=>e(r[t],r[n]);let a,u;return Uint32Array.from(r,((t,n)=>n)).sort(e===n?(t,n)=>Y(r[t],r[n]):B(o)).forEach(((t,n)=>{const e=o(t,void 0===a?t:a);e>=0?((void 0===a||e>0)&&(a=t,u=n),i[t]=u):i[t]=NaN})),i},t.reduce=function(t,n,e){if("function"!=typeof n)throw new TypeError("reducer is not a function");const r=t[Symbol.iterator]();let i,o,a=-1;if(arguments.length<3){if(({done:i,value:e}=r.next()),i)return;++a}for(;({done:i,value:o}=r.next()),!i;)e=n(e,o,++a,t);return e},t.reverse=function(t){if("function"!=typeof t[Symbol.iterator])throw new TypeError("values is not iterable");return Array.from(t).reverse()},t.rgb=Fe,t.ribbon=function(){return Ya()},t.ribbonArrow=function(){return Ya(Ba)},t.rollup=R,t.rollups=F,t.scaleBand=jp,t.scaleDiverging=function t(){var n=ng(E_()(Gp));return n.copy=function(){return T_(n,t())},Bp.apply(n,arguments)},t.scaleDivergingLog=function t(){var n=fg(E_()).domain([.1,1,10]);return n.copy=function(){return T_(n,t()).base(n.base())},Bp.apply(n,arguments)},t.scaleDivergingPow=k_,t.scaleDivergingSqrt=function(){return k_.apply(null,arguments).exponent(.5)},t.scaleDivergingSymlog=function t(){var n=hg(E_());return n.copy=function(){return T_(n,t()).constant(n.constant())},Bp.apply(n,arguments)},t.scaleIdentity=function t(n){var e;function r(t){return null==t||isNaN(t=+t)?e:t}return r.invert=r,r.domain=r.range=function(t){return arguments.length?(n=Array.from(t,Hp),r):n.slice()},r.unknown=function(t){return arguments.length?(e=t,r):e},r.copy=function(){return t(n).unknown(e)},n=arguments.length?Array.from(n,Hp):[0,1],ng(r)},t.scaleImplicit=Yp,t.scaleLinear=function t(){var n=Jp();return n.copy=function(){return Kp(n,t())},Up.apply(n,arguments),ng(n)},t.scaleLog=function t(){const n=fg(Qp()).domain([1,10]);return n.copy=()=>Kp(n,t()).base(n.base()),Up.apply(n,arguments),n},t.scaleOrdinal=Lp,t.scalePoint=function(){return $p(jp.apply(null,arguments).paddingInner(1))},t.scalePow=vg,t.scaleQuantile=function t(){var e,r=[],i=[],o=[];function a(){var t=0,n=Math.max(1,i.length);for(o=new Array(n-1);++t<n;)o[t-1]=ut(r,t/n);return u}function u(t){return null==t||isNaN(t=+t)?e:i[l(o,t)]}return u.invertExtent=function(t){var n=i.indexOf(t);return n<0?[NaN,NaN]:[n>0?o[n-1]:r[0],n<o.length?o[n]:r[r.length-1]]},u.domain=function(t){if(!arguments.length)return r.slice();r=[];for(let n of t)null==n||isNaN(n=+n)||r.push(n);return r.sort(n),a()},u.range=function(t){return arguments.length?(i=Array.from(t),a()):i.slice()},u.unknown=function(t){return arguments.length?(e=t,u):e},u.quantiles=function(){return o.slice()},u.copy=function(){return t().domain(r).range(i).unknown(e)},Up.apply(u,arguments)},t.scaleQuantize=function t(){var n,e=0,r=1,i=1,o=[.5],a=[0,1];function u(t){return null!=t&&t<=t?a[l(o,t,0,i)]:n}function c(){var t=-1;for(o=new Array(i);++t<i;)o[t]=((t+1)*r-(t-i)*e)/(i+1);return u}return u.domain=function(t){return arguments.length?([e,r]=t,e=+e,r=+r,c()):[e,r]},u.range=function(t){return arguments.length?(i=(a=Array.from(t)).length-1,c()):a.slice()},u.invertExtent=function(t){var n=a.indexOf(t);return n<0?[NaN,NaN]:n<1?[e,o[0]]:n>=i?[o[i-1],r]:[o[n-1],o[n]]},u.unknown=function(t){return arguments.length?(n=t,u):u},u.thresholds=function(){return o.slice()},u.copy=function(){return t().domain([e,r]).range(a).unknown(n)},Up.apply(ng(u),arguments)},t.scaleRadial=function t(){var n,e=Jp(),r=[0,1],i=!1;function o(t){var r=bg(e(t));return isNaN(r)?n:i?Math.round(r):r}return o.invert=function(t){return e.invert(_g(t))},o.domain=function(t){return arguments.length?(e.domain(t),o):e.domain()},o.range=function(t){return arguments.length?(e.range((r=Array.from(t,Hp)).map(_g)),o):r.slice()},o.rangeRound=function(t){return o.range(t).round(!0)},o.round=function(t){return arguments.length?(i=!!t,o):i},o.clamp=function(t){return arguments.length?(e.clamp(t),o):e.clamp()},o.unknown=function(t){return arguments.length?(n=t,o):n},o.copy=function(){return t(e.domain(),r).round(i).clamp(e.clamp()).unknown(n)},Up.apply(o,arguments),ng(o)},t.scaleSequential=function t(){var n=ng(A_()(Gp));return n.copy=function(){return T_(n,t())},Bp.apply(n,arguments)},t.scaleSequentialLog=function t(){var n=fg(A_()).domain([1,10]);return n.copy=function(){return T_(n,t()).base(n.base())},Bp.apply(n,arguments)},t.scaleSequentialPow=S_,t.scaleSequentialQuantile=function t(){var e=[],r=Gp;function i(t){if(null!=t&&!isNaN(t=+t))return r((l(e,t,1)-1)/(e.length-1))}return i.domain=function(t){if(!arguments.length)return e.slice();e=[];for(let n of t)null==n||isNaN(n=+n)||e.push(n);return e.sort(n),i},i.interpolator=function(t){return arguments.length?(r=t,i):r},i.range=function(){return e.map(((t,n)=>r(n/(e.length-1))))},i.quantiles=function(t){return Array.from({length:t+1},((n,r)=>at(e,r/t)))},i.copy=function(){return t(r).domain(e)},Bp.apply(i,arguments)},t.scaleSequentialSqrt=function(){return S_.apply(null,arguments).exponent(.5)},t.scaleSequentialSymlog=function t(){var n=hg(A_());return n.copy=function(){return T_(n,t()).constant(n.constant())},Bp.apply(n,arguments)},t.scaleSqrt=function(){return vg.apply(null,arguments).exponent(.5)},t.scaleSymlog=function t(){var n=hg(Qp());return n.copy=function(){return Kp(n,t()).constant(n.constant())},Up.apply(n,arguments)},t.scaleThreshold=function t(){var n,e=[.5],r=[0,1],i=1;function o(t){return null!=t&&t<=t?r[l(e,t,0,i)]:n}return o.domain=function(t){return arguments.length?(e=Array.from(t),i=Math.min(e.length,r.length-1),o):e.slice()},o.range=function(t){return arguments.length?(r=Array.from(t),i=Math.min(e.length,r.length-1),o):r.slice()},o.invertExtent=function(t){var n=r.indexOf(t);return[e[n-1],e[n]]},o.unknown=function(t){return arguments.length?(n=t,o):n},o.copy=function(){return t().domain(e).range(r).unknown(n)},Up.apply(o,arguments)},t.scaleTime=function(){return Up.apply(M_(Hy,Xy,sy,uy,Xg,jg,Bg,Ig,Rg,t.timeFormat).domain([new Date(2e3,0,1),new Date(2e3,0,2)]),arguments)},t.scaleUtc=function(){return Up.apply(M_(jy,$y,By,Iy,wy,by,yy,dy,Rg,t.utcFormat).domain([Date.UTC(2e3,0,1),Date.UTC(2e3,0,2)]),arguments)},t.scan=function(t,n){const e=ht(t,n);return e<0?void 0:e},t.schemeAccent=P_,t.schemeBlues=Nb,t.schemeBrBG=Y_,t.schemeBuGn=ob,t.schemeBuPu=ub,t.schemeCategory10=C_,t.schemeDark2=z_,t.schemeGnBu=fb,t.schemeGreens=Pb,t.schemeGreys=Db,t.schemeOrRd=lb,t.schemeOranges=Ub,t.schemePRGn=j_,t.schemePaired=D_,t.schemePastel1=R_,t.schemePastel2=F_,t.schemePiYG=H_,t.schemePuBu=gb,t.schemePuBuGn=db,t.schemePuOr=G_,t.schemePuRd=vb,t.schemePurples=Fb,t.schemeRdBu=W_,t.schemeRdGy=K_,t.schemeRdPu=bb,t.schemeRdYlBu=J_,t.schemeRdYlGn=nb,t.schemeReds=Ib,t.schemeSet1=q_,t.schemeSet2=I_,t.schemeSet3=O_,t.schemeSpectral=rb,t.schemeTableau10=U_,t.schemeYlGn=Mb,t.schemeYlGnBu=xb,t.schemeYlOrBr=Tb,t.schemeYlOrRd=Eb,t.select=Wn,t.selectAll=function(t){return"string"==typeof t?new Gn([document.querySelectorAll(t)],[document.documentElement]):new Gn([Lt(t)],Xn)},t.selection=Vn,t.selector=Yt,t.selectorAll=$t,t.shuffle=dt,t.shuffler=pt,t.some=function(t,n){if("function"!=typeof n)throw new TypeError("test is not a function");let e=-1;for(const r of t)if(n(r,++e,t))return!0;return!1},t.sort=U,t.stack=function(){var t=Jb([]),n=Kx,e=Zx,r=Qx;function i(i){var o,a,u=Array.from(t.apply(this,arguments),Jx),c=u.length,f=-1;for(const t of i)for(o=0,++f;o<c;++o)(u[o][f]=[0,+r(t,u[o].key,f,i)]).data=t;for(o=0,a=xm(n(u));o<c;++o)u[a[o]].index=o;return e(u,a),u}return i.keys=function(n){return arguments.length?(t="function"==typeof n?n:Jb(Array.from(n)),i):t},i.value=function(t){return arguments.length?(r="function"==typeof t?t:Jb(+t),i):r},i.order=function(t){return arguments.length?(n=null==t?Kx:"function"==typeof t?t:Jb(Array.from(t)),i):n},i.offset=function(t){return arguments.length?(e=null==t?Zx:t,i):e},i},t.stackOffsetDiverging=function(t,n){if((u=t.length)>0)for(var e,r,i,o,a,u,c=0,f=t[n[0]].length;c<f;++c)for(o=a=0,e=0;e<u;++e)(i=(r=t[n[e]][c])[1]-r[0])>0?(r[0]=o,r[1]=o+=i):i<0?(r[1]=a,r[0]=a+=i):(r[0]=0,r[1]=i)},t.stackOffsetExpand=function(t,n){if((r=t.length)>0){for(var e,r,i,o=0,a=t[0].length;o<a;++o){for(i=e=0;e<r;++e)i+=t[e][o][1]||0;if(i)for(e=0;e<r;++e)t[e][o][1]/=i}Zx(t,n)}},t.stackOffsetNone=Zx,t.stackOffsetSilhouette=function(t,n){if((e=t.length)>0){for(var e,r=0,i=t[n[0]],o=i.length;r<o;++r){for(var a=0,u=0;a<e;++a)u+=t[a][r][1]||0;i[r][1]+=i[r][0]=-u/2}Zx(t,n)}},t.stackOffsetWiggle=function(t,n){if((i=t.length)>0&&(r=(e=t[n[0]]).length)>0){for(var e,r,i,o=0,a=1;a<r;++a){for(var u=0,c=0,f=0;u<i;++u){for(var s=t[n[u]],l=s[a][1]||0,h=(l-(s[a-1][1]||0))/2,d=0;d<u;++d){var p=t[n[d]];h+=(p[a][1]||0)-(p[a-1][1]||0)}c+=l,f+=h*l}e[a-1][1]+=e[a-1][0]=o,c&&(o-=f/c)}e[a-1][1]+=e[a-1][0]=o,Zx(t,n)}},t.stackOrderAppearance=tw,t.stackOrderAscending=ew,t.stackOrderDescending=function(t){return ew(t).reverse()},t.stackOrderInsideOut=function(t){var n,e,r=t.length,i=t.map(rw),o=tw(t),a=0,u=0,c=[],f=[];for(n=0;n<r;++n)e=o[n],a<u?(a+=i[e],c.push(e)):(u+=i[e],f.push(e));return f.reverse().concat(c)},t.stackOrderNone=Kx,t.stackOrderReverse=function(t){return Kx(t).reverse()},t.stratify=function(){var t,n=ep,e=rp;function r(r){var i,o,a,u,c,f,s,l,h=Array.from(r),d=n,p=e,g=new Map;if(null!=t){const n=h.map(((n,e)=>function(t){let n=(t=`${t}`).length;op(t,n-1)&&!op(t,n-2)&&(t=t.slice(0,-1));return"/"===t[0]?t:`/${t}`}(t(n,e,r)))),e=n.map(ip),i=new Set(n).add("");for(const t of e)i.has(t)||(i.add(t),n.push(t),e.push(ip(t)),h.push(np));d=(t,e)=>n[e],p=(t,n)=>e[n]}for(a=0,i=h.length;a<i;++a)o=h[a],f=h[a]=new Ed(o),null!=(s=d(o,a,r))&&(s+="")&&(l=f.id=s,g.set(l,g.has(l)?tp:f)),null!=(s=p(o,a,r))&&(s+="")&&(f.parent=s);for(a=0;a<i;++a)if(s=(f=h[a]).parent){if(!(c=g.get(s)))throw new Error("missing: "+s);if(c===tp)throw new Error("ambiguous: "+s);c.children?c.children.push(f):c.children=[f],f.parent=c}else{if(u)throw new Error("multiple roots");u=f}if(!u)throw new Error("no root");if(null!=t){for(;u.data===np&&1===u.children.length;)u=u.children[0],--i;for(let t=h.length-1;t>=0&&(f=h[t],f.data===np);--t)f.data=null}if(u.parent=Jd,u.eachBefore((function(t){t.depth=t.parent.depth+1,--i})).eachBefore(Sd),u.parent=null,i>0)throw new Error("cycle");return u}return r.id=function(t){return arguments.length?(n=kd(t),r):n},r.parentId=function(t){return arguments.length?(e=kd(t),r):e},r.path=function(n){return arguments.length?(t=kd(n),r):t},r},t.style=yn,t.subset=function(t,n){return _t(n,t)},t.sum=function(t,n){let e=0;if(void 0===n)for(let n of t)(n=+n)&&(e+=n);else{let r=-1;for(let i of t)(i=+n(i,++r,t))&&(e+=i)}return e},t.superset=_t,t.svg=sc,t.symbol=function(t,n){let e=null;function r(){let r;if(e||(e=r=Pa()),t.apply(this,arguments).draw(e,+n.apply(this,arguments)),r)return e=null,r+""||null}return t="function"==typeof t?t:Jb(t||Gm),n="function"==typeof n?n:Jb(void 0===n?64:+n),r.type=function(n){return arguments.length?(t="function"==typeof n?n:Jb(n),r):t},r.size=function(t){return arguments.length?(n="function"==typeof t?t:Jb(+t),r):n},r.context=function(t){return arguments.length?(e=null==t?null:t,r):e},r},t.symbolAsterisk=Xm,t.symbolCircle=Gm,t.symbolCross=Vm,t.symbolDiamond=Km,t.symbolDiamond2=Qm,t.symbolPlus=Jm,t.symbolSquare=tx,t.symbolSquare2=nx,t.symbolStar=ox,t.symbolTriangle=ux,t.symbolTriangle2=fx,t.symbolWye=px,t.symbolX=gx,t.symbols=yx,t.symbolsFill=yx,t.symbolsStroke=vx,t.text=ec,t.thresholdFreedmanDiaconis=function(t,n,e){return Math.ceil((e-n)/(2*(at(t,.75)-at(t,.25))*Math.pow(_(t),-1/3)))},t.thresholdScott=function(t,n,e){return Math.ceil((e-n)*Math.cbrt(_(t))/(3.49*M(t)))},t.thresholdSturges=K,t.tickFormat=tg,t.tickIncrement=V,t.tickStep=W,t.ticks=G,t.timeDay=jg,t.timeDays=$g,t.timeFormatDefaultLocale=g_,t.timeFormatLocale=Zy,t.timeFriday=Kg,t.timeFridays=iy,t.timeHour=Bg,t.timeHours=Yg,t.timeInterval=wg,t.timeMillisecond=Ag,t.timeMilliseconds=Tg,t.timeMinute=Ig,t.timeMinutes=Og,t.timeMonday=Gg,t.timeMondays=ty,t.timeMonth=uy,t.timeMonths=cy,t.timeSaturday=Qg,t.timeSaturdays=oy,t.timeSecond=Rg,t.timeSeconds=Fg,t.timeSunday=Xg,t.timeSundays=Jg,t.timeThursday=Zg,t.timeThursdays=ry,t.timeTickInterval=Xy,t.timeTicks=Hy,t.timeTuesday=Vg,t.timeTuesdays=ny,t.timeWednesday=Wg,t.timeWednesdays=ey,t.timeWeek=Xg,t.timeWeeks=Jg,t.timeYear=sy,t.timeYears=ly,t.timeout=Ci,t.timer=Ti,t.timerFlush=Si,t.transition=ho,t.transpose=gt,t.tree=function(){var t=ap,n=1,e=1,r=null;function i(i){var c=function(t){for(var n,e,r,i,o,a=new lp(t,0),u=[a];n=u.pop();)if(r=n._.children)for(n.children=new Array(o=r.length),i=o-1;i>=0;--i)u.push(e=n.children[i]=new lp(r[i],i)),e.parent=n;return(a.parent=new lp(null,0)).children=[a],a}(i);if(c.eachAfter(o),c.parent.m=-c.z,c.eachBefore(a),r)i.eachBefore(u);else{var f=i,s=i,l=i;i.eachBefore((function(t){t.x<f.x&&(f=t),t.x>s.x&&(s=t),t.depth>l.depth&&(l=t)}));var h=f===s?1:t(f,s)/2,d=h-f.x,p=n/(s.x+h+d),g=e/(l.depth||1);i.eachBefore((function(t){t.x=(t.x+d)*p,t.y=t.depth*g}))}return i}function o(n){var e=n.children,r=n.parent.children,i=n.i?r[n.i-1]:null;if(e){!function(t){for(var n,e=0,r=0,i=t.children,o=i.length;--o>=0;)(n=i[o]).z+=e,n.m+=e,e+=n.s+(r+=n.c)}(n);var o=(e[0].z+e[e.length-1].z)/2;i?(n.z=i.z+t(n._,i._),n.m=n.z-o):n.z=o}else i&&(n.z=i.z+t(n._,i._));n.parent.A=function(n,e,r){if(e){for(var i,o=n,a=n,u=e,c=o.parent.children[0],f=o.m,s=a.m,l=u.m,h=c.m;u=cp(u),o=up(o),u&&o;)c=up(c),(a=cp(a)).a=n,(i=u.z+l-o.z-f+t(u._,o._))>0&&(fp(sp(u,n,r),n,i),f+=i,s+=i),l+=u.m,f+=o.m,h+=c.m,s+=a.m;u&&!cp(a)&&(a.t=u,a.m+=l-s),o&&!up(c)&&(c.t=o,c.m+=f-h,r=n)}return r}(n,i,n.parent.A||r[0])}function a(t){t._.x=t.z+t.parent.m,t.m+=t.parent.m}function u(t){t.x*=n,t.y=t.depth*e}return i.separation=function(n){return arguments.length?(t=n,i):t},i.size=function(t){return arguments.length?(r=!1,n=+t[0],e=+t[1],i):r?null:[n,e]},i.nodeSize=function(t){return arguments.length?(r=!0,n=+t[0],e=+t[1],i):r?[n,e]:null},i},t.treemap=function(){var t=gp,n=!1,e=1,r=1,i=[0],o=Cd,a=Cd,u=Cd,c=Cd,f=Cd;function s(t){return t.x0=t.y0=0,t.x1=e,t.y1=r,t.eachBefore(l),i=[0],n&&t.eachBefore(Kd),t}function l(n){var e=i[n.depth],r=n.x0+e,s=n.y0+e,l=n.x1-e,h=n.y1-e;l<r&&(r=l=(r+l)/2),h<s&&(s=h=(s+h)/2),n.x0=r,n.y0=s,n.x1=l,n.y1=h,n.children&&(e=i[n.depth+1]=o(n)/2,r+=f(n)-e,s+=a(n)-e,(l-=u(n)-e)<r&&(r=l=(r+l)/2),(h-=c(n)-e)<s&&(s=h=(s+h)/2),t(n,r,s,l,h))}return s.round=function(t){return arguments.length?(n=!!t,s):n},s.size=function(t){return arguments.length?(e=+t[0],r=+t[1],s):[e,r]},s.tile=function(n){return arguments.length?(t=Nd(n),s):t},s.padding=function(t){return arguments.length?s.paddingInner(t).paddingOuter(t):s.paddingInner()},s.paddingInner=function(t){return arguments.length?(o="function"==typeof t?t:Pd(+t),s):o},s.paddingOuter=function(t){return arguments.length?s.paddingTop(t).paddingRight(t).paddingBottom(t).paddingLeft(t):s.paddingTop()},s.paddingTop=function(t){return arguments.length?(a="function"==typeof t?t:Pd(+t),s):a},s.paddingRight=function(t){return arguments.length?(u="function"==typeof t?t:Pd(+t),s):u},s.paddingBottom=function(t){return arguments.length?(c="function"==typeof t?t:Pd(+t),s):c},s.paddingLeft=function(t){return arguments.length?(f="function"==typeof t?t:Pd(+t),s):f},s},t.treemapBinary=function(t,n,e,r,i){var o,a,u=t.children,c=u.length,f=new Array(c+1);for(f[0]=a=o=0;o<c;++o)f[o+1]=a+=u[o].value;!function t(n,e,r,i,o,a,c){if(n>=e-1){var s=u[n];return s.x0=i,s.y0=o,s.x1=a,void(s.y1=c)}var l=f[n],h=r/2+l,d=n+1,p=e-1;for(;d<p;){var g=d+p>>>1;f[g]<h?d=g+1:p=g}h-f[d-1]<f[d]-h&&n+1<d&&--d;var y=f[d]-l,v=r-y;if(a-i>c-o){var _=r?(i*v+a*y)/r:a;t(n,d,y,i,o,_,c),t(d,e,v,_,o,a,c)}else{var b=r?(o*v+c*y)/r:c;t(n,d,y,i,o,a,b),t(d,e,v,i,b,a,c)}}(0,c,t.value,n,e,r,i)},t.treemapDice=Qd,t.treemapResquarify=yp,t.treemapSlice=hp,t.treemapSliceDice=function(t,n,e,r,i){(1&t.depth?hp:Qd)(t,n,e,r,i)},t.treemapSquarify=gp,t.tsv=oc,t.tsvFormat=Gu,t.tsvFormatBody=Vu,t.tsvFormatRow=Zu,t.tsvFormatRows=Wu,t.tsvFormatValue=Ku,t.tsvParse=Hu,t.tsvParseRows=Xu,t.union=function(...t){const n=new InternSet;for(const e of t)for(const t of e)n.add(t);return n},t.utcDay=by,t.utcDays=my,t.utcFriday=Ey,t.utcFridays=Ry,t.utcHour=yy,t.utcHours=vy,t.utcMillisecond=Ag,t.utcMilliseconds=Tg,t.utcMinute=dy,t.utcMinutes=py,t.utcMonday=My,t.utcMondays=Cy,t.utcMonth=Iy,t.utcMonths=Oy,t.utcSaturday=ky,t.utcSaturdays=Fy,t.utcSecond=Rg,t.utcSeconds=Fg,t.utcSunday=wy,t.utcSundays=Ny,t.utcThursday=Sy,t.utcThursdays=Dy,t.utcTickInterval=$y,t.utcTicks=jy,t.utcTuesday=Ay,t.utcTuesdays=Py,t.utcWednesday=Ty,t.utcWednesdays=zy,t.utcWeek=wy,t.utcWeeks=Ny,t.utcYear=By,t.utcYears=Yy,t.variance=w,t.version="7.6.1",t.window=hn,t.xml=cc,t.zip=function(){return gt(arguments)},t.zoom=function(){var t,n,e,r=lw,i=hw,o=yw,a=pw,u=gw,c=[0,1/0],f=[[-1/0,-1/0],[1/0,1/0]],s=250,l=ni,h=Nt("start","zoom","end"),d=500,p=0,g=10;function y(t){t.property("__zoom",dw).on("wheel.zoom",M,{passive:!1}).on("mousedown.zoom",A).on("dblclick.zoom",T).filter(u).on("touchstart.zoom",S).on("touchmove.zoom",E).on("touchend.zoom touchcancel.zoom",k).style("-webkit-tap-highlight-color","rgba(0,0,0,0)")}function v(t,n){return(n=Math.max(c[0],Math.min(c[1],n)))===t.k?t:new aw(n,t.x,t.y)}function _(t,n,e){var r=n[0]-e[0]*t.k,i=n[1]-e[1]*t.k;return r===t.x&&i===t.y?t:new aw(t.k,r,i)}function b(t){return[(+t[0][0]+ +t[1][0])/2,(+t[0][1]+ +t[1][1])/2]}function m(t,n,e,r){t.on("start.zoom",(function(){x(this,arguments).event(r).start()})).on("interrupt.zoom end.zoom",(function(){x(this,arguments).event(r).end()})).tween("zoom",(function(){var t=this,o=arguments,a=x(t,o).event(r),u=i.apply(t,o),c=null==e?b(u):"function"==typeof e?e.apply(t,o):e,f=Math.max(u[1][0]-u[0][0],u[1][1]-u[0][1]),s=t.__zoom,h="function"==typeof n?n.apply(t,o):n,d=l(s.invert(c).concat(f/s.k),h.invert(c).concat(f/h.k));return function(t){if(1===t)t=h;else{var n=d(t),e=f/n[2];t=new aw(e,c[0]-n[0]*e,c[1]-n[1]*e)}a.zoom(null,t)}}))}function x(t,n,e){return!e&&t.__zooming||new w(t,n)}function w(t,n){this.that=t,this.args=n,this.active=0,this.sourceEvent=null,this.extent=i.apply(t,n),this.taps=0}function M(t,...n){if(r.apply(this,arguments)){var e=x(this,n).event(t),i=this.__zoom,u=Math.max(c[0],Math.min(c[1],i.k*Math.pow(2,a.apply(this,arguments)))),s=te(t);if(e.wheel)e.mouse[0][0]===s[0]&&e.mouse[0][1]===s[1]||(e.mouse[1]=i.invert(e.mouse[0]=s)),clearTimeout(e.wheel);else{if(i.k===u)return;e.mouse=[s,i.invert(s)],Ii(this),e.start()}sw(t),e.wheel=setTimeout(l,150),e.zoom("mouse",o(_(v(i,u),e.mouse[0],e.mouse[1]),e.extent,f))}function l(){e.wheel=null,e.end()}}function A(t,...n){if(!e&&r.apply(this,arguments)){var i=t.currentTarget,a=x(this,n,!0).event(t),u=Wn(t.view).on("mousemove.zoom",h,!0).on("mouseup.zoom",d,!0),c=te(t,i),s=t.clientX,l=t.clientY;oe(t.view),fw(t),a.mouse=[c,this.__zoom.invert(c)],Ii(this),a.start()}function h(t){if(sw(t),!a.moved){var n=t.clientX-s,e=t.clientY-l;a.moved=n*n+e*e>p}a.event(t).zoom("mouse",o(_(a.that.__zoom,a.mouse[0]=te(t,i),a.mouse[1]),a.extent,f))}function d(t){u.on("mousemove.zoom mouseup.zoom",null),ae(t.view,a.moved),sw(t),a.event(t).end()}}function T(t,...n){if(r.apply(this,arguments)){var e=this.__zoom,a=te(t.changedTouches?t.changedTouches[0]:t,this),u=e.invert(a),c=e.k*(t.shiftKey?.5:2),l=o(_(v(e,c),a,u),i.apply(this,n),f);sw(t),s>0?Wn(this).transition().duration(s).call(m,l,a,t):Wn(this).call(y.transform,l,a,t)}}function S(e,...i){if(r.apply(this,arguments)){var o,a,u,c,f=e.touches,s=f.length,l=x(this,i,e.changedTouches.length===s).event(e);for(fw(e),a=0;a<s;++a)c=[c=te(u=f[a],this),this.__zoom.invert(c),u.identifier],l.touch0?l.touch1||l.touch0[2]===c[2]||(l.touch1=c,l.taps=0):(l.touch0=c,o=!0,l.taps=1+!!t);t&&(t=clearTimeout(t)),o&&(l.taps<2&&(n=c[0],t=setTimeout((function(){t=null}),d)),Ii(this),l.start())}}function E(t,...n){if(this.__zooming){var e,r,i,a,u=x(this,n).event(t),c=t.changedTouches,s=c.length;for(sw(t),e=0;e<s;++e)i=te(r=c[e],this),u.touch0&&u.touch0[2]===r.identifier?u.touch0[0]=i:u.touch1&&u.touch1[2]===r.identifier&&(u.touch1[0]=i);if(r=u.that.__zoom,u.touch1){var l=u.touch0[0],h=u.touch0[1],d=u.touch1[0],p=u.touch1[1],g=(g=d[0]-l[0])*g+(g=d[1]-l[1])*g,y=(y=p[0]-h[0])*y+(y=p[1]-h[1])*y;r=v(r,Math.sqrt(g/y)),i=[(l[0]+d[0])/2,(l[1]+d[1])/2],a=[(h[0]+p[0])/2,(h[1]+p[1])/2]}else{if(!u.touch0)return;i=u.touch0[0],a=u.touch0[1]}u.zoom("touch",o(_(r,i,a),u.extent,f))}}function k(t,...r){if(this.__zooming){var i,o,a=x(this,r).event(t),u=t.changedTouches,c=u.length;for(fw(t),e&&clearTimeout(e),e=setTimeout((function(){e=null}),d),i=0;i<c;++i)o=u[i],a.touch0&&a.touch0[2]===o.identifier?delete a.touch0:a.touch1&&a.touch1[2]===o.identifier&&delete a.touch1;if(a.touch1&&!a.touch0&&(a.touch0=a.touch1,delete a.touch1),a.touch0)a.touch0[1]=this.__zoom.invert(a.touch0[0]);else if(a.end(),2===a.taps&&(o=te(o,this),Math.hypot(n[0]-o[0],n[1]-o[1])<g)){var f=Wn(this).on("dblclick.zoom");f&&f.apply(this,arguments)}}}return y.transform=function(t,n,e,r){var i=t.selection?t.selection():t;i.property("__zoom",dw),t!==i?m(t,n,e,r):i.interrupt().each((function(){x(this,arguments).event(r).start().zoom(null,"function"==typeof n?n.apply(this,arguments):n).end()}))},y.scaleBy=function(t,n,e,r){y.scaleTo(t,(function(){var t=this.__zoom.k,e="function"==typeof n?n.apply(this,arguments):n;return t*e}),e,r)},y.scaleTo=function(t,n,e,r){y.transform(t,(function(){var t=i.apply(this,arguments),r=this.__zoom,a=null==e?b(t):"function"==typeof e?e.apply(this,arguments):e,u=r.invert(a),c="function"==typeof n?n.apply(this,arguments):n;return o(_(v(r,c),a,u),t,f)}),e,r)},y.translateBy=function(t,n,e,r){y.transform(t,(function(){return o(this.__zoom.translate("function"==typeof n?n.apply(this,arguments):n,"function"==typeof e?e.apply(this,arguments):e),i.apply(this,arguments),f)}),null,r)},y.translateTo=function(t,n,e,r,a){y.transform(t,(function(){var t=i.apply(this,arguments),a=this.__zoom,u=null==r?b(t):"function"==typeof r?r.apply(this,arguments):r;return o(uw.translate(u[0],u[1]).scale(a.k).translate("function"==typeof n?-n.apply(this,arguments):-n,"function"==typeof e?-e.apply(this,arguments):-e),t,f)}),r,a)},w.prototype={event:function(t){return t&&(this.sourceEvent=t),this},start:function(){return 1==++this.active&&(this.that.__zooming=this,this.emit("start")),this},zoom:function(t,n){return this.mouse&&"mouse"!==t&&(this.mouse[1]=n.invert(this.mouse[0])),this.touch0&&"touch"!==t&&(this.touch0[1]=n.invert(this.touch0[0])),this.touch1&&"touch"!==t&&(this.touch1[1]=n.invert(this.touch1[0])),this.that.__zoom=n,this.emit("zoom"),this},end:function(){return 0==--this.active&&(delete this.that.__zooming,this.emit("end")),this},emit:function(t){var n=Wn(this.that).datum();h.call(t,this.that,new ow(t,{sourceEvent:this.sourceEvent,target:y,type:t,transform:this.that.__zoom,dispatch:h}),n)}},y.wheelDelta=function(t){return arguments.length?(a="function"==typeof t?t:iw(+t),y):a},y.filter=function(t){return arguments.length?(r="function"==typeof t?t:iw(!!t),y):r},y.touchable=function(t){return arguments.length?(u="function"==typeof t?t:iw(!!t),y):u},y.extent=function(t){return arguments.length?(i="function"==typeof t?t:iw([[+t[0][0],+t[0][1]],[+t[1][0],+t[1][1]]]),y):i},y.scaleExtent=function(t){return arguments.length?(c[0]=+t[0],c[1]=+t[1],y):[c[0],c[1]]},y.translateExtent=function(t){return arguments.length?(f[0][0]=+t[0][0],f[1][0]=+t[1][0],f[0][1]=+t[0][1],f[1][1]=+t[1][1],y):[[f[0][0],f[0][1]],[f[1][0],f[1][1]]]},y.constrain=function(t){return arguments.length?(o=t,y):o},y.duration=function(t){return arguments.length?(s=+t,y):s},y.interpolate=function(t){return arguments.length?(l=t,y):l},y.on=function(){var t=h.on.apply(h,arguments);return t===h?y:t},y.clickDistance=function(t){return arguments.length?(p=(t=+t)*t,y):Math.sqrt(p)},y.tapDistance=function(t){return arguments.length?(g=+t,y):g},y},t.zoomIdentity=uw,t.zoomTransform=cw,Object.defineProperty(t,"__esModule",{value:!0})}));
diff --git a/js/001-lib/lodash-4.17.15.min.js b/js/001-lib/lodash-4.17.15.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..13ec307dac5a6f5248312146f94d3a3ab84515e5
--- /dev/null
+++ b/js/001-lib/lodash-4.17.15.min.js
@@ -0,0 +1,137 @@
+/**
+ * @license
+ * Lodash lodash.com/license | Underscore.js 1.8.3 underscorejs.org/LICENSE
+ */
+;(function(){function n(n,t,r){switch(r.length){case 0:return n.call(t);case 1:return n.call(t,r[0]);case 2:return n.call(t,r[0],r[1]);case 3:return n.call(t,r[0],r[1],r[2])}return n.apply(t,r)}function t(n,t,r,e){for(var u=-1,i=null==n?0:n.length;++u<i;){var o=n[u];t(e,o,r(o),n)}return e}function r(n,t){for(var r=-1,e=null==n?0:n.length;++r<e&&false!==t(n[r],r,n););return n}function e(n,t){for(var r=null==n?0:n.length;r--&&false!==t(n[r],r,n););return n}function u(n,t){for(var r=-1,e=null==n?0:n.length;++r<e;)if(!t(n[r],r,n))return false;
+return true}function i(n,t){for(var r=-1,e=null==n?0:n.length,u=0,i=[];++r<e;){var o=n[r];t(o,r,n)&&(i[u++]=o)}return i}function o(n,t){return!(null==n||!n.length)&&-1<v(n,t,0)}function f(n,t,r){for(var e=-1,u=null==n?0:n.length;++e<u;)if(r(t,n[e]))return true;return false}function c(n,t){for(var r=-1,e=null==n?0:n.length,u=Array(e);++r<e;)u[r]=t(n[r],r,n);return u}function a(n,t){for(var r=-1,e=t.length,u=n.length;++r<e;)n[u+r]=t[r];return n}function l(n,t,r,e){var u=-1,i=null==n?0:n.length;for(e&&i&&(r=n[++u]);++u<i;)r=t(r,n[u],u,n);
+return r}function s(n,t,r,e){var u=null==n?0:n.length;for(e&&u&&(r=n[--u]);u--;)r=t(r,n[u],u,n);return r}function h(n,t){for(var r=-1,e=null==n?0:n.length;++r<e;)if(t(n[r],r,n))return true;return false}function p(n,t,r){var e;return r(n,function(n,r,u){if(t(n,r,u))return e=r,false}),e}function _(n,t,r,e){var u=n.length;for(r+=e?1:-1;e?r--:++r<u;)if(t(n[r],r,n))return r;return-1}function v(n,t,r){if(t===t)n:{--r;for(var e=n.length;++r<e;)if(n[r]===t){n=r;break n}n=-1}else n=_(n,d,r);return n}function g(n,t,r,e){
+--r;for(var u=n.length;++r<u;)if(e(n[r],t))return r;return-1}function d(n){return n!==n}function y(n,t){var r=null==n?0:n.length;return r?m(n,t)/r:F}function b(n){return function(t){return null==t?T:t[n]}}function x(n){return function(t){return null==n?T:n[t]}}function j(n,t,r,e,u){return u(n,function(n,u,i){r=e?(e=false,n):t(r,n,u,i)}),r}function w(n,t){var r=n.length;for(n.sort(t);r--;)n[r]=n[r].c;return n}function m(n,t){for(var r,e=-1,u=n.length;++e<u;){var i=t(n[e]);i!==T&&(r=r===T?i:r+i)}return r;
+}function A(n,t){for(var r=-1,e=Array(n);++r<n;)e[r]=t(r);return e}function E(n,t){return c(t,function(t){return[t,n[t]]})}function k(n){return function(t){return n(t)}}function S(n,t){return c(t,function(t){return n[t]})}function O(n,t){return n.has(t)}function I(n,t){for(var r=-1,e=n.length;++r<e&&-1<v(t,n[r],0););return r}function R(n,t){for(var r=n.length;r--&&-1<v(t,n[r],0););return r}function z(n){return"\\"+Un[n]}function W(n){var t=-1,r=Array(n.size);return n.forEach(function(n,e){r[++t]=[e,n];
+}),r}function B(n,t){return function(r){return n(t(r))}}function L(n,t){for(var r=-1,e=n.length,u=0,i=[];++r<e;){var o=n[r];o!==t&&"__lodash_placeholder__"!==o||(n[r]="__lodash_placeholder__",i[u++]=r)}return i}function U(n){var t=-1,r=Array(n.size);return n.forEach(function(n){r[++t]=n}),r}function C(n){var t=-1,r=Array(n.size);return n.forEach(function(n){r[++t]=[n,n]}),r}function D(n){if(Rn.test(n)){for(var t=On.lastIndex=0;On.test(n);)++t;n=t}else n=Qn(n);return n}function M(n){return Rn.test(n)?n.match(On)||[]:n.split("");
+}var T,$=1/0,F=NaN,N=[["ary",128],["bind",1],["bindKey",2],["curry",8],["curryRight",16],["flip",512],["partial",32],["partialRight",64],["rearg",256]],P=/\b__p\+='';/g,Z=/\b(__p\+=)''\+/g,q=/(__e\(.*?\)|\b__t\))\+'';/g,V=/&(?:amp|lt|gt|quot|#39);/g,K=/[&<>"']/g,G=RegExp(V.source),H=RegExp(K.source),J=/<%-([\s\S]+?)%>/g,Y=/<%([\s\S]+?)%>/g,Q=/<%=([\s\S]+?)%>/g,X=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,nn=/^\w*$/,tn=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,rn=/[\\^$.*+?()[\]{}|]/g,en=RegExp(rn.source),un=/^\s+|\s+$/g,on=/^\s+/,fn=/\s+$/,cn=/\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,an=/\{\n\/\* \[wrapped with (.+)\] \*/,ln=/,? & /,sn=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g,hn=/\\(\\)?/g,pn=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,_n=/\w*$/,vn=/^[-+]0x[0-9a-f]+$/i,gn=/^0b[01]+$/i,dn=/^\[object .+?Constructor\]$/,yn=/^0o[0-7]+$/i,bn=/^(?:0|[1-9]\d*)$/,xn=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,jn=/($^)/,wn=/['\n\r\u2028\u2029\\]/g,mn="[\\ufe0e\\ufe0f]?(?:[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|\\ud83c[\\udffb-\\udfff])?(?:\\u200d(?:[^\\ud800-\\udfff]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff])[\\ufe0e\\ufe0f]?(?:[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|\\ud83c[\\udffb-\\udfff])?)*",An="(?:[\\u2700-\\u27bf]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff])"+mn,En="(?:[^\\ud800-\\udfff][\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]?|[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff]|[\\ud800-\\udfff])",kn=RegExp("['\u2019]","g"),Sn=RegExp("[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]","g"),On=RegExp("\\ud83c[\\udffb-\\udfff](?=\\ud83c[\\udffb-\\udfff])|"+En+mn,"g"),In=RegExp(["[A-Z\\xc0-\\xd6\\xd8-\\xde]?[a-z\\xdf-\\xf6\\xf8-\\xff]+(?:['\u2019](?:d|ll|m|re|s|t|ve))?(?=[\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000]|[A-Z\\xc0-\\xd6\\xd8-\\xde]|$)|(?:[A-Z\\xc0-\\xd6\\xd8-\\xde]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+(?:['\u2019](?:D|LL|M|RE|S|T|VE))?(?=[\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000]|[A-Z\\xc0-\\xd6\\xd8-\\xde](?:[a-z\\xdf-\\xf6\\xf8-\\xff]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])|$)|[A-Z\\xc0-\\xd6\\xd8-\\xde]?(?:[a-z\\xdf-\\xf6\\xf8-\\xff]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+(?:['\u2019](?:d|ll|m|re|s|t|ve))?|[A-Z\\xc0-\\xd6\\xd8-\\xde]+(?:['\u2019](?:D|LL|M|RE|S|T|VE))?|\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])|\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])|\\d+",An].join("|"),"g"),Rn=RegExp("[\\u200d\\ud800-\\udfff\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff\\ufe0e\\ufe0f]"),zn=/[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/,Wn="Array Buffer DataView Date Error Float32Array Float64Array Function Int8Array Int16Array Int32Array Map Math Object Promise RegExp Set String Symbol TypeError Uint8Array Uint8ClampedArray Uint16Array Uint32Array WeakMap _ clearTimeout isFinite parseInt setTimeout".split(" "),Bn={};
+Bn["[object Float32Array]"]=Bn["[object Float64Array]"]=Bn["[object Int8Array]"]=Bn["[object Int16Array]"]=Bn["[object Int32Array]"]=Bn["[object Uint8Array]"]=Bn["[object Uint8ClampedArray]"]=Bn["[object Uint16Array]"]=Bn["[object Uint32Array]"]=true,Bn["[object Arguments]"]=Bn["[object Array]"]=Bn["[object ArrayBuffer]"]=Bn["[object Boolean]"]=Bn["[object DataView]"]=Bn["[object Date]"]=Bn["[object Error]"]=Bn["[object Function]"]=Bn["[object Map]"]=Bn["[object Number]"]=Bn["[object Object]"]=Bn["[object RegExp]"]=Bn["[object Set]"]=Bn["[object String]"]=Bn["[object WeakMap]"]=false;
+var Ln={};Ln["[object Arguments]"]=Ln["[object Array]"]=Ln["[object ArrayBuffer]"]=Ln["[object DataView]"]=Ln["[object Boolean]"]=Ln["[object Date]"]=Ln["[object Float32Array]"]=Ln["[object Float64Array]"]=Ln["[object Int8Array]"]=Ln["[object Int16Array]"]=Ln["[object Int32Array]"]=Ln["[object Map]"]=Ln["[object Number]"]=Ln["[object Object]"]=Ln["[object RegExp]"]=Ln["[object Set]"]=Ln["[object String]"]=Ln["[object Symbol]"]=Ln["[object Uint8Array]"]=Ln["[object Uint8ClampedArray]"]=Ln["[object Uint16Array]"]=Ln["[object Uint32Array]"]=true,
+Ln["[object Error]"]=Ln["[object Function]"]=Ln["[object WeakMap]"]=false;var Un={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},Cn=parseFloat,Dn=parseInt,Mn=typeof global=="object"&&global&&global.Object===Object&&global,Tn=typeof self=="object"&&self&&self.Object===Object&&self,$n=Mn||Tn||Function("return this")(),Fn=typeof exports=="object"&&exports&&!exports.nodeType&&exports,Nn=Fn&&typeof module=="object"&&module&&!module.nodeType&&module,Pn=Nn&&Nn.exports===Fn,Zn=Pn&&Mn.process,qn=function(){
+try{var n=Nn&&Nn.f&&Nn.f("util").types;return n?n:Zn&&Zn.binding&&Zn.binding("util")}catch(n){}}(),Vn=qn&&qn.isArrayBuffer,Kn=qn&&qn.isDate,Gn=qn&&qn.isMap,Hn=qn&&qn.isRegExp,Jn=qn&&qn.isSet,Yn=qn&&qn.isTypedArray,Qn=b("length"),Xn=x({"\xc0":"A","\xc1":"A","\xc2":"A","\xc3":"A","\xc4":"A","\xc5":"A","\xe0":"a","\xe1":"a","\xe2":"a","\xe3":"a","\xe4":"a","\xe5":"a","\xc7":"C","\xe7":"c","\xd0":"D","\xf0":"d","\xc8":"E","\xc9":"E","\xca":"E","\xcb":"E","\xe8":"e","\xe9":"e","\xea":"e","\xeb":"e","\xcc":"I",
+"\xcd":"I","\xce":"I","\xcf":"I","\xec":"i","\xed":"i","\xee":"i","\xef":"i","\xd1":"N","\xf1":"n","\xd2":"O","\xd3":"O","\xd4":"O","\xd5":"O","\xd6":"O","\xd8":"O","\xf2":"o","\xf3":"o","\xf4":"o","\xf5":"o","\xf6":"o","\xf8":"o","\xd9":"U","\xda":"U","\xdb":"U","\xdc":"U","\xf9":"u","\xfa":"u","\xfb":"u","\xfc":"u","\xdd":"Y","\xfd":"y","\xff":"y","\xc6":"Ae","\xe6":"ae","\xde":"Th","\xfe":"th","\xdf":"ss","\u0100":"A","\u0102":"A","\u0104":"A","\u0101":"a","\u0103":"a","\u0105":"a","\u0106":"C",
+"\u0108":"C","\u010a":"C","\u010c":"C","\u0107":"c","\u0109":"c","\u010b":"c","\u010d":"c","\u010e":"D","\u0110":"D","\u010f":"d","\u0111":"d","\u0112":"E","\u0114":"E","\u0116":"E","\u0118":"E","\u011a":"E","\u0113":"e","\u0115":"e","\u0117":"e","\u0119":"e","\u011b":"e","\u011c":"G","\u011e":"G","\u0120":"G","\u0122":"G","\u011d":"g","\u011f":"g","\u0121":"g","\u0123":"g","\u0124":"H","\u0126":"H","\u0125":"h","\u0127":"h","\u0128":"I","\u012a":"I","\u012c":"I","\u012e":"I","\u0130":"I","\u0129":"i",
+"\u012b":"i","\u012d":"i","\u012f":"i","\u0131":"i","\u0134":"J","\u0135":"j","\u0136":"K","\u0137":"k","\u0138":"k","\u0139":"L","\u013b":"L","\u013d":"L","\u013f":"L","\u0141":"L","\u013a":"l","\u013c":"l","\u013e":"l","\u0140":"l","\u0142":"l","\u0143":"N","\u0145":"N","\u0147":"N","\u014a":"N","\u0144":"n","\u0146":"n","\u0148":"n","\u014b":"n","\u014c":"O","\u014e":"O","\u0150":"O","\u014d":"o","\u014f":"o","\u0151":"o","\u0154":"R","\u0156":"R","\u0158":"R","\u0155":"r","\u0157":"r","\u0159":"r",
+"\u015a":"S","\u015c":"S","\u015e":"S","\u0160":"S","\u015b":"s","\u015d":"s","\u015f":"s","\u0161":"s","\u0162":"T","\u0164":"T","\u0166":"T","\u0163":"t","\u0165":"t","\u0167":"t","\u0168":"U","\u016a":"U","\u016c":"U","\u016e":"U","\u0170":"U","\u0172":"U","\u0169":"u","\u016b":"u","\u016d":"u","\u016f":"u","\u0171":"u","\u0173":"u","\u0174":"W","\u0175":"w","\u0176":"Y","\u0177":"y","\u0178":"Y","\u0179":"Z","\u017b":"Z","\u017d":"Z","\u017a":"z","\u017c":"z","\u017e":"z","\u0132":"IJ","\u0133":"ij",
+"\u0152":"Oe","\u0153":"oe","\u0149":"'n","\u017f":"s"}),nt=x({"&":"&","<":"<",">":">",'"':""","'":"'"}),tt=x({"&":"&","<":"<",">":">",""":'"',"'":"'"}),rt=function x(mn){function An(n){if(yu(n)&&!ff(n)&&!(n instanceof Un)){if(n instanceof On)return n;if(oi.call(n,"__wrapped__"))return Fe(n)}return new On(n)}function En(){}function On(n,t){this.__wrapped__=n,this.__actions__=[],this.__chain__=!!t,this.__index__=0,this.__values__=T}function Un(n){this.__wrapped__=n,
+this.__actions__=[],this.__dir__=1,this.__filtered__=false,this.__iteratees__=[],this.__takeCount__=4294967295,this.__views__=[]}function Mn(n){var t=-1,r=null==n?0:n.length;for(this.clear();++t<r;){var e=n[t];this.set(e[0],e[1])}}function Tn(n){var t=-1,r=null==n?0:n.length;for(this.clear();++t<r;){var e=n[t];this.set(e[0],e[1])}}function Fn(n){var t=-1,r=null==n?0:n.length;for(this.clear();++t<r;){var e=n[t];this.set(e[0],e[1])}}function Nn(n){var t=-1,r=null==n?0:n.length;for(this.__data__=new Fn;++t<r;)this.add(n[t]);
+}function Zn(n){this.size=(this.__data__=new Tn(n)).size}function qn(n,t){var r,e=ff(n),u=!e&&of(n),i=!e&&!u&&af(n),o=!e&&!u&&!i&&_f(n),u=(e=e||u||i||o)?A(n.length,ni):[],f=u.length;for(r in n)!t&&!oi.call(n,r)||e&&("length"==r||i&&("offset"==r||"parent"==r)||o&&("buffer"==r||"byteLength"==r||"byteOffset"==r)||Se(r,f))||u.push(r);return u}function Qn(n){var t=n.length;return t?n[ir(0,t-1)]:T}function et(n,t){return De(Ur(n),pt(t,0,n.length))}function ut(n){return De(Ur(n))}function it(n,t,r){(r===T||lu(n[t],r))&&(r!==T||t in n)||st(n,t,r);
+}function ot(n,t,r){var e=n[t];oi.call(n,t)&&lu(e,r)&&(r!==T||t in n)||st(n,t,r)}function ft(n,t){for(var r=n.length;r--;)if(lu(n[r][0],t))return r;return-1}function ct(n,t,r,e){return uo(n,function(n,u,i){t(e,n,r(n),i)}),e}function at(n,t){return n&&Cr(t,Wu(t),n)}function lt(n,t){return n&&Cr(t,Bu(t),n)}function st(n,t,r){"__proto__"==t&&Ai?Ai(n,t,{configurable:true,enumerable:true,value:r,writable:true}):n[t]=r}function ht(n,t){for(var r=-1,e=t.length,u=Ku(e),i=null==n;++r<e;)u[r]=i?T:Ru(n,t[r]);return u;
+}function pt(n,t,r){return n===n&&(r!==T&&(n=n<=r?n:r),t!==T&&(n=n>=t?n:t)),n}function _t(n,t,e,u,i,o){var f,c=1&t,a=2&t,l=4&t;if(e&&(f=i?e(n,u,i,o):e(n)),f!==T)return f;if(!du(n))return n;if(u=ff(n)){if(f=me(n),!c)return Ur(n,f)}else{var s=vo(n),h="[object Function]"==s||"[object GeneratorFunction]"==s;if(af(n))return Ir(n,c);if("[object Object]"==s||"[object Arguments]"==s||h&&!i){if(f=a||h?{}:Ae(n),!c)return a?Mr(n,lt(f,n)):Dr(n,at(f,n))}else{if(!Ln[s])return i?n:{};f=Ee(n,s,c)}}if(o||(o=new Zn),
+i=o.get(n))return i;o.set(n,f),pf(n)?n.forEach(function(r){f.add(_t(r,t,e,r,n,o))}):sf(n)&&n.forEach(function(r,u){f.set(u,_t(r,t,e,u,n,o))});var a=l?a?ve:_e:a?Bu:Wu,p=u?T:a(n);return r(p||n,function(r,u){p&&(u=r,r=n[u]),ot(f,u,_t(r,t,e,u,n,o))}),f}function vt(n){var t=Wu(n);return function(r){return gt(r,n,t)}}function gt(n,t,r){var e=r.length;if(null==n)return!e;for(n=Qu(n);e--;){var u=r[e],i=t[u],o=n[u];if(o===T&&!(u in n)||!i(o))return false}return true}function dt(n,t,r){if(typeof n!="function")throw new ti("Expected a function");
+return bo(function(){n.apply(T,r)},t)}function yt(n,t,r,e){var u=-1,i=o,a=true,l=n.length,s=[],h=t.length;if(!l)return s;r&&(t=c(t,k(r))),e?(i=f,a=false):200<=t.length&&(i=O,a=false,t=new Nn(t));n:for(;++u<l;){var p=n[u],_=null==r?p:r(p),p=e||0!==p?p:0;if(a&&_===_){for(var v=h;v--;)if(t[v]===_)continue n;s.push(p)}else i(t,_,e)||s.push(p)}return s}function bt(n,t){var r=true;return uo(n,function(n,e,u){return r=!!t(n,e,u)}),r}function xt(n,t,r){for(var e=-1,u=n.length;++e<u;){var i=n[e],o=t(i);if(null!=o&&(f===T?o===o&&!wu(o):r(o,f)))var f=o,c=i;
+}return c}function jt(n,t){var r=[];return uo(n,function(n,e,u){t(n,e,u)&&r.push(n)}),r}function wt(n,t,r,e,u){var i=-1,o=n.length;for(r||(r=ke),u||(u=[]);++i<o;){var f=n[i];0<t&&r(f)?1<t?wt(f,t-1,r,e,u):a(u,f):e||(u[u.length]=f)}return u}function mt(n,t){return n&&oo(n,t,Wu)}function At(n,t){return n&&fo(n,t,Wu)}function Et(n,t){return i(t,function(t){return _u(n[t])})}function kt(n,t){t=Sr(t,n);for(var r=0,e=t.length;null!=n&&r<e;)n=n[Me(t[r++])];return r&&r==e?n:T}function St(n,t,r){return t=t(n),
+ff(n)?t:a(t,r(n))}function Ot(n){if(null==n)n=n===T?"[object Undefined]":"[object Null]";else if(mi&&mi in Qu(n)){var t=oi.call(n,mi),r=n[mi];try{n[mi]=T;var e=true}catch(n){}var u=ai.call(n);e&&(t?n[mi]=r:delete n[mi]),n=u}else n=ai.call(n);return n}function It(n,t){return n>t}function Rt(n,t){return null!=n&&oi.call(n,t)}function zt(n,t){return null!=n&&t in Qu(n)}function Wt(n,t,r){for(var e=r?f:o,u=n[0].length,i=n.length,a=i,l=Ku(i),s=1/0,h=[];a--;){var p=n[a];a&&t&&(p=c(p,k(t))),s=Ci(p.length,s),
+l[a]=!r&&(t||120<=u&&120<=p.length)?new Nn(a&&p):T}var p=n[0],_=-1,v=l[0];n:for(;++_<u&&h.length<s;){var g=p[_],d=t?t(g):g,g=r||0!==g?g:0;if(v?!O(v,d):!e(h,d,r)){for(a=i;--a;){var y=l[a];if(y?!O(y,d):!e(n[a],d,r))continue n}v&&v.push(d),h.push(g)}}return h}function Bt(n,t,r){var e={};return mt(n,function(n,u,i){t(e,r(n),u,i)}),e}function Lt(t,r,e){return r=Sr(r,t),t=2>r.length?t:kt(t,hr(r,0,-1)),r=null==t?t:t[Me(Ve(r))],null==r?T:n(r,t,e)}function Ut(n){return yu(n)&&"[object Arguments]"==Ot(n)}function Ct(n){
+return yu(n)&&"[object ArrayBuffer]"==Ot(n)}function Dt(n){return yu(n)&&"[object Date]"==Ot(n)}function Mt(n,t,r,e,u){if(n===t)t=true;else if(null==n||null==t||!yu(n)&&!yu(t))t=n!==n&&t!==t;else n:{var i=ff(n),o=ff(t),f=i?"[object Array]":vo(n),c=o?"[object Array]":vo(t),f="[object Arguments]"==f?"[object Object]":f,c="[object Arguments]"==c?"[object Object]":c,a="[object Object]"==f,o="[object Object]"==c;if((c=f==c)&&af(n)){if(!af(t)){t=false;break n}i=true,a=false}if(c&&!a)u||(u=new Zn),t=i||_f(n)?se(n,t,r,e,Mt,u):he(n,t,f,r,e,Mt,u);else{
+if(!(1&r)&&(i=a&&oi.call(n,"__wrapped__"),f=o&&oi.call(t,"__wrapped__"),i||f)){n=i?n.value():n,t=f?t.value():t,u||(u=new Zn),t=Mt(n,t,r,e,u);break n}if(c)t:if(u||(u=new Zn),i=1&r,f=_e(n),o=f.length,c=_e(t).length,o==c||i){for(a=o;a--;){var l=f[a];if(!(i?l in t:oi.call(t,l))){t=false;break t}}if((c=u.get(n))&&u.get(t))t=c==t;else{c=true,u.set(n,t),u.set(t,n);for(var s=i;++a<o;){var l=f[a],h=n[l],p=t[l];if(e)var _=i?e(p,h,l,t,n,u):e(h,p,l,n,t,u);if(_===T?h!==p&&!Mt(h,p,r,e,u):!_){c=false;break}s||(s="constructor"==l);
+}c&&!s&&(r=n.constructor,e=t.constructor,r!=e&&"constructor"in n&&"constructor"in t&&!(typeof r=="function"&&r instanceof r&&typeof e=="function"&&e instanceof e)&&(c=false)),u.delete(n),u.delete(t),t=c}}else t=false;else t=false}}return t}function Tt(n){return yu(n)&&"[object Map]"==vo(n)}function $t(n,t,r,e){var u=r.length,i=u,o=!e;if(null==n)return!i;for(n=Qu(n);u--;){var f=r[u];if(o&&f[2]?f[1]!==n[f[0]]:!(f[0]in n))return false}for(;++u<i;){var f=r[u],c=f[0],a=n[c],l=f[1];if(o&&f[2]){if(a===T&&!(c in n))return false;
+}else{if(f=new Zn,e)var s=e(a,l,c,n,t,f);if(s===T?!Mt(l,a,3,e,f):!s)return false}}return true}function Ft(n){return!(!du(n)||ci&&ci in n)&&(_u(n)?hi:dn).test(Te(n))}function Nt(n){return yu(n)&&"[object RegExp]"==Ot(n)}function Pt(n){return yu(n)&&"[object Set]"==vo(n)}function Zt(n){return yu(n)&&gu(n.length)&&!!Bn[Ot(n)]}function qt(n){return typeof n=="function"?n:null==n?$u:typeof n=="object"?ff(n)?Jt(n[0],n[1]):Ht(n):Zu(n)}function Vt(n){if(!ze(n))return Li(n);var t,r=[];for(t in Qu(n))oi.call(n,t)&&"constructor"!=t&&r.push(t);
+return r}function Kt(n,t){return n<t}function Gt(n,t){var r=-1,e=su(n)?Ku(n.length):[];return uo(n,function(n,u,i){e[++r]=t(n,u,i)}),e}function Ht(n){var t=xe(n);return 1==t.length&&t[0][2]?We(t[0][0],t[0][1]):function(r){return r===n||$t(r,n,t)}}function Jt(n,t){return Ie(n)&&t===t&&!du(t)?We(Me(n),t):function(r){var e=Ru(r,n);return e===T&&e===t?zu(r,n):Mt(t,e,3)}}function Yt(n,t,r,e,u){n!==t&&oo(t,function(i,o){if(u||(u=new Zn),du(i)){var f=u,c=Le(n,o),a=Le(t,o),l=f.get(a);if(l)it(n,o,l);else{
+var l=e?e(c,a,o+"",n,t,f):T,s=l===T;if(s){var h=ff(a),p=!h&&af(a),_=!h&&!p&&_f(a),l=a;h||p||_?ff(c)?l=c:hu(c)?l=Ur(c):p?(s=false,l=Ir(a,true)):_?(s=false,l=zr(a,true)):l=[]:xu(a)||of(a)?(l=c,of(c)?l=Ou(c):du(c)&&!_u(c)||(l=Ae(a))):s=false}s&&(f.set(a,l),Yt(l,a,r,e,f),f.delete(a)),it(n,o,l)}}else f=e?e(Le(n,o),i,o+"",n,t,u):T,f===T&&(f=i),it(n,o,f)},Bu)}function Qt(n,t){var r=n.length;if(r)return t+=0>t?r:0,Se(t,r)?n[t]:T}function Xt(n,t,r){var e=-1;return t=c(t.length?t:[$u],k(ye())),n=Gt(n,function(n){return{
+a:c(t,function(t){return t(n)}),b:++e,c:n}}),w(n,function(n,t){var e;n:{e=-1;for(var u=n.a,i=t.a,o=u.length,f=r.length;++e<o;){var c=Wr(u[e],i[e]);if(c){e=e>=f?c:c*("desc"==r[e]?-1:1);break n}}e=n.b-t.b}return e})}function nr(n,t){return tr(n,t,function(t,r){return zu(n,r)})}function tr(n,t,r){for(var e=-1,u=t.length,i={};++e<u;){var o=t[e],f=kt(n,o);r(f,o)&&lr(i,Sr(o,n),f)}return i}function rr(n){return function(t){return kt(t,n)}}function er(n,t,r,e){var u=e?g:v,i=-1,o=t.length,f=n;for(n===t&&(t=Ur(t)),
+r&&(f=c(n,k(r)));++i<o;)for(var a=0,l=t[i],l=r?r(l):l;-1<(a=u(f,l,a,e));)f!==n&&xi.call(f,a,1),xi.call(n,a,1);return n}function ur(n,t){for(var r=n?t.length:0,e=r-1;r--;){var u=t[r];if(r==e||u!==i){var i=u;Se(u)?xi.call(n,u,1):xr(n,u)}}}function ir(n,t){return n+Ii(Ti()*(t-n+1))}function or(n,t){var r="";if(!n||1>t||9007199254740991<t)return r;do t%2&&(r+=n),(t=Ii(t/2))&&(n+=n);while(t);return r}function fr(n,t){return xo(Be(n,t,$u),n+"")}function cr(n){return Qn(Uu(n))}function ar(n,t){var r=Uu(n);
+return De(r,pt(t,0,r.length))}function lr(n,t,r,e){if(!du(n))return n;t=Sr(t,n);for(var u=-1,i=t.length,o=i-1,f=n;null!=f&&++u<i;){var c=Me(t[u]),a=r;if(u!=o){var l=f[c],a=e?e(l,c,f):T;a===T&&(a=du(l)?l:Se(t[u+1])?[]:{})}ot(f,c,a),f=f[c]}return n}function sr(n){return De(Uu(n))}function hr(n,t,r){var e=-1,u=n.length;for(0>t&&(t=-t>u?0:u+t),r=r>u?u:r,0>r&&(r+=u),u=t>r?0:r-t>>>0,t>>>=0,r=Ku(u);++e<u;)r[e]=n[e+t];return r}function pr(n,t){var r;return uo(n,function(n,e,u){return r=t(n,e,u),!r}),!!r}
+function _r(n,t,r){var e=0,u=null==n?e:n.length;if(typeof t=="number"&&t===t&&2147483647>=u){for(;e<u;){var i=e+u>>>1,o=n[i];null!==o&&!wu(o)&&(r?o<=t:o<t)?e=i+1:u=i}return u}return vr(n,t,$u,r)}function vr(n,t,r,e){t=r(t);for(var u=0,i=null==n?0:n.length,o=t!==t,f=null===t,c=wu(t),a=t===T;u<i;){var l=Ii((u+i)/2),s=r(n[l]),h=s!==T,p=null===s,_=s===s,v=wu(s);(o?e||_:a?_&&(e||h):f?_&&h&&(e||!p):c?_&&h&&!p&&(e||!v):p||v?0:e?s<=t:s<t)?u=l+1:i=l}return Ci(i,4294967294)}function gr(n,t){for(var r=-1,e=n.length,u=0,i=[];++r<e;){
+var o=n[r],f=t?t(o):o;if(!r||!lu(f,c)){var c=f;i[u++]=0===o?0:o}}return i}function dr(n){return typeof n=="number"?n:wu(n)?F:+n}function yr(n){if(typeof n=="string")return n;if(ff(n))return c(n,yr)+"";if(wu(n))return ro?ro.call(n):"";var t=n+"";return"0"==t&&1/n==-$?"-0":t}function br(n,t,r){var e=-1,u=o,i=n.length,c=true,a=[],l=a;if(r)c=false,u=f;else if(200<=i){if(u=t?null:so(n))return U(u);c=false,u=O,l=new Nn}else l=t?[]:a;n:for(;++e<i;){var s=n[e],h=t?t(s):s,s=r||0!==s?s:0;if(c&&h===h){for(var p=l.length;p--;)if(l[p]===h)continue n;
+t&&l.push(h),a.push(s)}else u(l,h,r)||(l!==a&&l.push(h),a.push(s))}return a}function xr(n,t){return t=Sr(t,n),n=2>t.length?n:kt(n,hr(t,0,-1)),null==n||delete n[Me(Ve(t))]}function jr(n,t,r,e){for(var u=n.length,i=e?u:-1;(e?i--:++i<u)&&t(n[i],i,n););return r?hr(n,e?0:i,e?i+1:u):hr(n,e?i+1:0,e?u:i)}function wr(n,t){var r=n;return r instanceof Un&&(r=r.value()),l(t,function(n,t){return t.func.apply(t.thisArg,a([n],t.args))},r)}function mr(n,t,r){var e=n.length;if(2>e)return e?br(n[0]):[];for(var u=-1,i=Ku(e);++u<e;)for(var o=n[u],f=-1;++f<e;)f!=u&&(i[u]=yt(i[u]||o,n[f],t,r));
+return br(wt(i,1),t,r)}function Ar(n,t,r){for(var e=-1,u=n.length,i=t.length,o={};++e<u;)r(o,n[e],e<i?t[e]:T);return o}function Er(n){return hu(n)?n:[]}function kr(n){return typeof n=="function"?n:$u}function Sr(n,t){return ff(n)?n:Ie(n,t)?[n]:jo(Iu(n))}function Or(n,t,r){var e=n.length;return r=r===T?e:r,!t&&r>=e?n:hr(n,t,r)}function Ir(n,t){if(t)return n.slice();var r=n.length,r=gi?gi(r):new n.constructor(r);return n.copy(r),r}function Rr(n){var t=new n.constructor(n.byteLength);return new vi(t).set(new vi(n)),
+t}function zr(n,t){return new n.constructor(t?Rr(n.buffer):n.buffer,n.byteOffset,n.length)}function Wr(n,t){if(n!==t){var r=n!==T,e=null===n,u=n===n,i=wu(n),o=t!==T,f=null===t,c=t===t,a=wu(t);if(!f&&!a&&!i&&n>t||i&&o&&c&&!f&&!a||e&&o&&c||!r&&c||!u)return 1;if(!e&&!i&&!a&&n<t||a&&r&&u&&!e&&!i||f&&r&&u||!o&&u||!c)return-1}return 0}function Br(n,t,r,e){var u=-1,i=n.length,o=r.length,f=-1,c=t.length,a=Ui(i-o,0),l=Ku(c+a);for(e=!e;++f<c;)l[f]=t[f];for(;++u<o;)(e||u<i)&&(l[r[u]]=n[u]);for(;a--;)l[f++]=n[u++];
+return l}function Lr(n,t,r,e){var u=-1,i=n.length,o=-1,f=r.length,c=-1,a=t.length,l=Ui(i-f,0),s=Ku(l+a);for(e=!e;++u<l;)s[u]=n[u];for(l=u;++c<a;)s[l+c]=t[c];for(;++o<f;)(e||u<i)&&(s[l+r[o]]=n[u++]);return s}function Ur(n,t){var r=-1,e=n.length;for(t||(t=Ku(e));++r<e;)t[r]=n[r];return t}function Cr(n,t,r,e){var u=!r;r||(r={});for(var i=-1,o=t.length;++i<o;){var f=t[i],c=e?e(r[f],n[f],f,r,n):T;c===T&&(c=n[f]),u?st(r,f,c):ot(r,f,c)}return r}function Dr(n,t){return Cr(n,po(n),t)}function Mr(n,t){return Cr(n,_o(n),t);
+}function Tr(n,r){return function(e,u){var i=ff(e)?t:ct,o=r?r():{};return i(e,n,ye(u,2),o)}}function $r(n){return fr(function(t,r){var e=-1,u=r.length,i=1<u?r[u-1]:T,o=2<u?r[2]:T,i=3<n.length&&typeof i=="function"?(u--,i):T;for(o&&Oe(r[0],r[1],o)&&(i=3>u?T:i,u=1),t=Qu(t);++e<u;)(o=r[e])&&n(t,o,e,i);return t})}function Fr(n,t){return function(r,e){if(null==r)return r;if(!su(r))return n(r,e);for(var u=r.length,i=t?u:-1,o=Qu(r);(t?i--:++i<u)&&false!==e(o[i],i,o););return r}}function Nr(n){return function(t,r,e){
+var u=-1,i=Qu(t);e=e(t);for(var o=e.length;o--;){var f=e[n?o:++u];if(false===r(i[f],f,i))break}return t}}function Pr(n,t,r){function e(){return(this&&this!==$n&&this instanceof e?i:n).apply(u?r:this,arguments)}var u=1&t,i=Vr(n);return e}function Zr(n){return function(t){t=Iu(t);var r=Rn.test(t)?M(t):T,e=r?r[0]:t.charAt(0);return t=r?Or(r,1).join(""):t.slice(1),e[n]()+t}}function qr(n){return function(t){return l(Mu(Du(t).replace(kn,"")),n,"")}}function Vr(n){return function(){var t=arguments;switch(t.length){
+case 0:return new n;case 1:return new n(t[0]);case 2:return new n(t[0],t[1]);case 3:return new n(t[0],t[1],t[2]);case 4:return new n(t[0],t[1],t[2],t[3]);case 5:return new n(t[0],t[1],t[2],t[3],t[4]);case 6:return new n(t[0],t[1],t[2],t[3],t[4],t[5]);case 7:return new n(t[0],t[1],t[2],t[3],t[4],t[5],t[6])}var r=eo(n.prototype),t=n.apply(r,t);return du(t)?t:r}}function Kr(t,r,e){function u(){for(var o=arguments.length,f=Ku(o),c=o,a=de(u);c--;)f[c]=arguments[c];return c=3>o&&f[0]!==a&&f[o-1]!==a?[]:L(f,a),
+o-=c.length,o<e?ue(t,r,Jr,u.placeholder,T,f,c,T,T,e-o):n(this&&this!==$n&&this instanceof u?i:t,this,f)}var i=Vr(t);return u}function Gr(n){return function(t,r,e){var u=Qu(t);if(!su(t)){var i=ye(r,3);t=Wu(t),r=function(n){return i(u[n],n,u)}}return r=n(t,r,e),-1<r?u[i?t[r]:r]:T}}function Hr(n){return pe(function(t){var r=t.length,e=r,u=On.prototype.thru;for(n&&t.reverse();e--;){var i=t[e];if(typeof i!="function")throw new ti("Expected a function");if(u&&!o&&"wrapper"==ge(i))var o=new On([],true)}for(e=o?e:r;++e<r;)var i=t[e],u=ge(i),f="wrapper"==u?ho(i):T,o=f&&Re(f[0])&&424==f[1]&&!f[4].length&&1==f[9]?o[ge(f[0])].apply(o,f[3]):1==i.length&&Re(i)?o[u]():o.thru(i);
+return function(){var n=arguments,e=n[0];if(o&&1==n.length&&ff(e))return o.plant(e).value();for(var u=0,n=r?t[u].apply(this,n):e;++u<r;)n=t[u].call(this,n);return n}})}function Jr(n,t,r,e,u,i,o,f,c,a){function l(){for(var d=arguments.length,y=Ku(d),b=d;b--;)y[b]=arguments[b];if(_){var x,j=de(l),b=y.length;for(x=0;b--;)y[b]===j&&++x}if(e&&(y=Br(y,e,u,_)),i&&(y=Lr(y,i,o,_)),d-=x,_&&d<a)return j=L(y,j),ue(n,t,Jr,l.placeholder,r,y,j,f,c,a-d);if(j=h?r:this,b=p?j[n]:n,d=y.length,f){x=y.length;for(var w=Ci(f.length,x),m=Ur(y);w--;){
+var A=f[w];y[w]=Se(A,x)?m[A]:T}}else v&&1<d&&y.reverse();return s&&c<d&&(y.length=c),this&&this!==$n&&this instanceof l&&(b=g||Vr(b)),b.apply(j,y)}var s=128&t,h=1&t,p=2&t,_=24&t,v=512&t,g=p?T:Vr(n);return l}function Yr(n,t){return function(r,e){return Bt(r,n,t(e))}}function Qr(n,t){return function(r,e){var u;if(r===T&&e===T)return t;if(r!==T&&(u=r),e!==T){if(u===T)return e;typeof r=="string"||typeof e=="string"?(r=yr(r),e=yr(e)):(r=dr(r),e=dr(e)),u=n(r,e)}return u}}function Xr(t){return pe(function(r){
+return r=c(r,k(ye())),fr(function(e){var u=this;return t(r,function(t){return n(t,u,e)})})})}function ne(n,t){t=t===T?" ":yr(t);var r=t.length;return 2>r?r?or(t,n):t:(r=or(t,Oi(n/D(t))),Rn.test(t)?Or(M(r),0,n).join(""):r.slice(0,n))}function te(t,r,e,u){function i(){for(var r=-1,c=arguments.length,a=-1,l=u.length,s=Ku(l+c),h=this&&this!==$n&&this instanceof i?f:t;++a<l;)s[a]=u[a];for(;c--;)s[a++]=arguments[++r];return n(h,o?e:this,s)}var o=1&r,f=Vr(t);return i}function re(n){return function(t,r,e){
+e&&typeof e!="number"&&Oe(t,r,e)&&(r=e=T),t=Au(t),r===T?(r=t,t=0):r=Au(r),e=e===T?t<r?1:-1:Au(e);var u=-1;r=Ui(Oi((r-t)/(e||1)),0);for(var i=Ku(r);r--;)i[n?r:++u]=t,t+=e;return i}}function ee(n){return function(t,r){return typeof t=="string"&&typeof r=="string"||(t=Su(t),r=Su(r)),n(t,r)}}function ue(n,t,r,e,u,i,o,f,c,a){var l=8&t,s=l?o:T;o=l?T:o;var h=l?i:T;return i=l?T:i,t=(t|(l?32:64))&~(l?64:32),4&t||(t&=-4),u=[n,t,u,h,s,i,o,f,c,a],r=r.apply(T,u),Re(n)&&yo(r,u),r.placeholder=e,Ue(r,n,t)}function ie(n){
+var t=Yu[n];return function(n,r){if(n=Su(n),(r=null==r?0:Ci(Eu(r),292))&&Wi(n)){var e=(Iu(n)+"e").split("e"),e=t(e[0]+"e"+(+e[1]+r)),e=(Iu(e)+"e").split("e");return+(e[0]+"e"+(+e[1]-r))}return t(n)}}function oe(n){return function(t){var r=vo(t);return"[object Map]"==r?W(t):"[object Set]"==r?C(t):E(t,n(t))}}function fe(n,t,r,e,u,i,o,f){var c=2&t;if(!c&&typeof n!="function")throw new ti("Expected a function");var a=e?e.length:0;if(a||(t&=-97,e=u=T),o=o===T?o:Ui(Eu(o),0),f=f===T?f:Eu(f),a-=u?u.length:0,
+64&t){var l=e,s=u;e=u=T}var h=c?T:ho(n);return i=[n,t,r,e,u,l,s,i,o,f],h&&(r=i[1],n=h[1],t=r|n,e=128==n&&8==r||128==n&&256==r&&i[7].length<=h[8]||384==n&&h[7].length<=h[8]&&8==r,131>t||e)&&(1&n&&(i[2]=h[2],t|=1&r?0:4),(r=h[3])&&(e=i[3],i[3]=e?Br(e,r,h[4]):r,i[4]=e?L(i[3],"__lodash_placeholder__"):h[4]),(r=h[5])&&(e=i[5],i[5]=e?Lr(e,r,h[6]):r,i[6]=e?L(i[5],"__lodash_placeholder__"):h[6]),(r=h[7])&&(i[7]=r),128&n&&(i[8]=null==i[8]?h[8]:Ci(i[8],h[8])),null==i[9]&&(i[9]=h[9]),i[0]=h[0],i[1]=t),n=i[0],
+t=i[1],r=i[2],e=i[3],u=i[4],f=i[9]=i[9]===T?c?0:n.length:Ui(i[9]-a,0),!f&&24&t&&(t&=-25),Ue((h?co:yo)(t&&1!=t?8==t||16==t?Kr(n,t,f):32!=t&&33!=t||u.length?Jr.apply(T,i):te(n,t,r,e):Pr(n,t,r),i),n,t)}function ce(n,t,r,e){return n===T||lu(n,ei[r])&&!oi.call(e,r)?t:n}function ae(n,t,r,e,u,i){return du(n)&&du(t)&&(i.set(t,n),Yt(n,t,T,ae,i),i.delete(t)),n}function le(n){return xu(n)?T:n}function se(n,t,r,e,u,i){var o=1&r,f=n.length,c=t.length;if(f!=c&&!(o&&c>f))return false;if((c=i.get(n))&&i.get(t))return c==t;
+var c=-1,a=true,l=2&r?new Nn:T;for(i.set(n,t),i.set(t,n);++c<f;){var s=n[c],p=t[c];if(e)var _=o?e(p,s,c,t,n,i):e(s,p,c,n,t,i);if(_!==T){if(_)continue;a=false;break}if(l){if(!h(t,function(n,t){if(!O(l,t)&&(s===n||u(s,n,r,e,i)))return l.push(t)})){a=false;break}}else if(s!==p&&!u(s,p,r,e,i)){a=false;break}}return i.delete(n),i.delete(t),a}function he(n,t,r,e,u,i,o){switch(r){case"[object DataView]":if(n.byteLength!=t.byteLength||n.byteOffset!=t.byteOffset)break;n=n.buffer,t=t.buffer;case"[object ArrayBuffer]":
+if(n.byteLength!=t.byteLength||!i(new vi(n),new vi(t)))break;return true;case"[object Boolean]":case"[object Date]":case"[object Number]":return lu(+n,+t);case"[object Error]":return n.name==t.name&&n.message==t.message;case"[object RegExp]":case"[object String]":return n==t+"";case"[object Map]":var f=W;case"[object Set]":if(f||(f=U),n.size!=t.size&&!(1&e))break;return(r=o.get(n))?r==t:(e|=2,o.set(n,t),t=se(f(n),f(t),e,u,i,o),o.delete(n),t);case"[object Symbol]":if(to)return to.call(n)==to.call(t)}
+return false}function pe(n){return xo(Be(n,T,Ze),n+"")}function _e(n){return St(n,Wu,po)}function ve(n){return St(n,Bu,_o)}function ge(n){for(var t=n.name+"",r=Gi[t],e=oi.call(Gi,t)?r.length:0;e--;){var u=r[e],i=u.func;if(null==i||i==n)return u.name}return t}function de(n){return(oi.call(An,"placeholder")?An:n).placeholder}function ye(){var n=An.iteratee||Fu,n=n===Fu?qt:n;return arguments.length?n(arguments[0],arguments[1]):n}function be(n,t){var r=n.__data__,e=typeof t;return("string"==e||"number"==e||"symbol"==e||"boolean"==e?"__proto__"!==t:null===t)?r[typeof t=="string"?"string":"hash"]:r.map;
+}function xe(n){for(var t=Wu(n),r=t.length;r--;){var e=t[r],u=n[e];t[r]=[e,u,u===u&&!du(u)]}return t}function je(n,t){var r=null==n?T:n[t];return Ft(r)?r:T}function we(n,t,r){t=Sr(t,n);for(var e=-1,u=t.length,i=false;++e<u;){var o=Me(t[e]);if(!(i=null!=n&&r(n,o)))break;n=n[o]}return i||++e!=u?i:(u=null==n?0:n.length,!!u&&gu(u)&&Se(o,u)&&(ff(n)||of(n)))}function me(n){var t=n.length,r=new n.constructor(t);return t&&"string"==typeof n[0]&&oi.call(n,"index")&&(r.index=n.index,r.input=n.input),r}function Ae(n){
+return typeof n.constructor!="function"||ze(n)?{}:eo(di(n))}function Ee(n,t,r){var e=n.constructor;switch(t){case"[object ArrayBuffer]":return Rr(n);case"[object Boolean]":case"[object Date]":return new e(+n);case"[object DataView]":return t=r?Rr(n.buffer):n.buffer,new n.constructor(t,n.byteOffset,n.byteLength);case"[object Float32Array]":case"[object Float64Array]":case"[object Int8Array]":case"[object Int16Array]":case"[object Int32Array]":case"[object Uint8Array]":case"[object Uint8ClampedArray]":
+case"[object Uint16Array]":case"[object Uint32Array]":return zr(n,r);case"[object Map]":return new e;case"[object Number]":case"[object String]":return new e(n);case"[object RegExp]":return t=new n.constructor(n.source,_n.exec(n)),t.lastIndex=n.lastIndex,t;case"[object Set]":return new e;case"[object Symbol]":return to?Qu(to.call(n)):{}}}function ke(n){return ff(n)||of(n)||!!(ji&&n&&n[ji])}function Se(n,t){var r=typeof n;return t=null==t?9007199254740991:t,!!t&&("number"==r||"symbol"!=r&&bn.test(n))&&-1<n&&0==n%1&&n<t;
+}function Oe(n,t,r){if(!du(r))return false;var e=typeof t;return!!("number"==e?su(r)&&Se(t,r.length):"string"==e&&t in r)&&lu(r[t],n)}function Ie(n,t){if(ff(n))return false;var r=typeof n;return!("number"!=r&&"symbol"!=r&&"boolean"!=r&&null!=n&&!wu(n))||(nn.test(n)||!X.test(n)||null!=t&&n in Qu(t))}function Re(n){var t=ge(n),r=An[t];return typeof r=="function"&&t in Un.prototype&&(n===r||(t=ho(r),!!t&&n===t[0]))}function ze(n){var t=n&&n.constructor;return n===(typeof t=="function"&&t.prototype||ei)}function We(n,t){
+return function(r){return null!=r&&(r[n]===t&&(t!==T||n in Qu(r)))}}function Be(t,r,e){return r=Ui(r===T?t.length-1:r,0),function(){for(var u=arguments,i=-1,o=Ui(u.length-r,0),f=Ku(o);++i<o;)f[i]=u[r+i];for(i=-1,o=Ku(r+1);++i<r;)o[i]=u[i];return o[r]=e(f),n(t,this,o)}}function Le(n,t){if(("constructor"!==t||"function"!=typeof n[t])&&"__proto__"!=t)return n[t]}function Ue(n,t,r){var e=t+"";t=xo;var u,i=$e;return u=(u=e.match(an))?u[1].split(ln):[],r=i(u,r),(i=r.length)&&(u=i-1,r[u]=(1<i?"& ":"")+r[u],
+r=r.join(2<i?", ":" "),e=e.replace(cn,"{\n/* [wrapped with "+r+"] */\n")),t(n,e)}function Ce(n){var t=0,r=0;return function(){var e=Di(),u=16-(e-r);if(r=e,0<u){if(800<=++t)return arguments[0]}else t=0;return n.apply(T,arguments)}}function De(n,t){var r=-1,e=n.length,u=e-1;for(t=t===T?e:t;++r<t;){var e=ir(r,u),i=n[e];n[e]=n[r],n[r]=i}return n.length=t,n}function Me(n){if(typeof n=="string"||wu(n))return n;var t=n+"";return"0"==t&&1/n==-$?"-0":t}function Te(n){if(null!=n){try{return ii.call(n)}catch(n){}
+return n+""}return""}function $e(n,t){return r(N,function(r){var e="_."+r[0];t&r[1]&&!o(n,e)&&n.push(e)}),n.sort()}function Fe(n){if(n instanceof Un)return n.clone();var t=new On(n.__wrapped__,n.__chain__);return t.__actions__=Ur(n.__actions__),t.__index__=n.__index__,t.__values__=n.__values__,t}function Ne(n,t,r){var e=null==n?0:n.length;return e?(r=null==r?0:Eu(r),0>r&&(r=Ui(e+r,0)),_(n,ye(t,3),r)):-1}function Pe(n,t,r){var e=null==n?0:n.length;if(!e)return-1;var u=e-1;return r!==T&&(u=Eu(r),u=0>r?Ui(e+u,0):Ci(u,e-1)),
+_(n,ye(t,3),u,true)}function Ze(n){return(null==n?0:n.length)?wt(n,1):[]}function qe(n){return n&&n.length?n[0]:T}function Ve(n){var t=null==n?0:n.length;return t?n[t-1]:T}function Ke(n,t){return n&&n.length&&t&&t.length?er(n,t):n}function Ge(n){return null==n?n:$i.call(n)}function He(n){if(!n||!n.length)return[];var t=0;return n=i(n,function(n){if(hu(n))return t=Ui(n.length,t),true}),A(t,function(t){return c(n,b(t))})}function Je(t,r){if(!t||!t.length)return[];var e=He(t);return null==r?e:c(e,function(t){
+return n(r,T,t)})}function Ye(n){return n=An(n),n.__chain__=true,n}function Qe(n,t){return t(n)}function Xe(){return this}function nu(n,t){return(ff(n)?r:uo)(n,ye(t,3))}function tu(n,t){return(ff(n)?e:io)(n,ye(t,3))}function ru(n,t){return(ff(n)?c:Gt)(n,ye(t,3))}function eu(n,t,r){return t=r?T:t,t=n&&null==t?n.length:t,fe(n,128,T,T,T,T,t)}function uu(n,t){var r;if(typeof t!="function")throw new ti("Expected a function");return n=Eu(n),function(){return 0<--n&&(r=t.apply(this,arguments)),1>=n&&(t=T),
+r}}function iu(n,t,r){return t=r?T:t,n=fe(n,8,T,T,T,T,T,t),n.placeholder=iu.placeholder,n}function ou(n,t,r){return t=r?T:t,n=fe(n,16,T,T,T,T,T,t),n.placeholder=ou.placeholder,n}function fu(n,t,r){function e(t){var r=c,e=a;return c=a=T,_=t,s=n.apply(e,r)}function u(n){var r=n-p;return n-=_,p===T||r>=t||0>r||g&&n>=l}function i(){var n=Go();if(u(n))return o(n);var r,e=bo;r=n-_,n=t-(n-p),r=g?Ci(n,l-r):n,h=e(i,r)}function o(n){return h=T,d&&c?e(n):(c=a=T,s)}function f(){var n=Go(),r=u(n);if(c=arguments,
+a=this,p=n,r){if(h===T)return _=n=p,h=bo(i,t),v?e(n):s;if(g)return lo(h),h=bo(i,t),e(p)}return h===T&&(h=bo(i,t)),s}var c,a,l,s,h,p,_=0,v=false,g=false,d=true;if(typeof n!="function")throw new ti("Expected a function");return t=Su(t)||0,du(r)&&(v=!!r.leading,l=(g="maxWait"in r)?Ui(Su(r.maxWait)||0,t):l,d="trailing"in r?!!r.trailing:d),f.cancel=function(){h!==T&&lo(h),_=0,c=p=a=h=T},f.flush=function(){return h===T?s:o(Go())},f}function cu(n,t){function r(){var e=arguments,u=t?t.apply(this,e):e[0],i=r.cache;
+return i.has(u)?i.get(u):(e=n.apply(this,e),r.cache=i.set(u,e)||i,e)}if(typeof n!="function"||null!=t&&typeof t!="function")throw new ti("Expected a function");return r.cache=new(cu.Cache||Fn),r}function au(n){if(typeof n!="function")throw new ti("Expected a function");return function(){var t=arguments;switch(t.length){case 0:return!n.call(this);case 1:return!n.call(this,t[0]);case 2:return!n.call(this,t[0],t[1]);case 3:return!n.call(this,t[0],t[1],t[2])}return!n.apply(this,t)}}function lu(n,t){return n===t||n!==n&&t!==t;
+}function su(n){return null!=n&&gu(n.length)&&!_u(n)}function hu(n){return yu(n)&&su(n)}function pu(n){if(!yu(n))return false;var t=Ot(n);return"[object Error]"==t||"[object DOMException]"==t||typeof n.message=="string"&&typeof n.name=="string"&&!xu(n)}function _u(n){return!!du(n)&&(n=Ot(n),"[object Function]"==n||"[object GeneratorFunction]"==n||"[object AsyncFunction]"==n||"[object Proxy]"==n)}function vu(n){return typeof n=="number"&&n==Eu(n)}function gu(n){return typeof n=="number"&&-1<n&&0==n%1&&9007199254740991>=n;
+}function du(n){var t=typeof n;return null!=n&&("object"==t||"function"==t)}function yu(n){return null!=n&&typeof n=="object"}function bu(n){return typeof n=="number"||yu(n)&&"[object Number]"==Ot(n)}function xu(n){return!(!yu(n)||"[object Object]"!=Ot(n))&&(n=di(n),null===n||(n=oi.call(n,"constructor")&&n.constructor,typeof n=="function"&&n instanceof n&&ii.call(n)==li))}function ju(n){return typeof n=="string"||!ff(n)&&yu(n)&&"[object String]"==Ot(n)}function wu(n){return typeof n=="symbol"||yu(n)&&"[object Symbol]"==Ot(n);
+}function mu(n){if(!n)return[];if(su(n))return ju(n)?M(n):Ur(n);if(wi&&n[wi]){n=n[wi]();for(var t,r=[];!(t=n.next()).done;)r.push(t.value);return r}return t=vo(n),("[object Map]"==t?W:"[object Set]"==t?U:Uu)(n)}function Au(n){return n?(n=Su(n),n===$||n===-$?1.7976931348623157e308*(0>n?-1:1):n===n?n:0):0===n?n:0}function Eu(n){n=Au(n);var t=n%1;return n===n?t?n-t:n:0}function ku(n){return n?pt(Eu(n),0,4294967295):0}function Su(n){if(typeof n=="number")return n;if(wu(n))return F;if(du(n)&&(n=typeof n.valueOf=="function"?n.valueOf():n,
+n=du(n)?n+"":n),typeof n!="string")return 0===n?n:+n;n=n.replace(un,"");var t=gn.test(n);return t||yn.test(n)?Dn(n.slice(2),t?2:8):vn.test(n)?F:+n}function Ou(n){return Cr(n,Bu(n))}function Iu(n){return null==n?"":yr(n)}function Ru(n,t,r){return n=null==n?T:kt(n,t),n===T?r:n}function zu(n,t){return null!=n&&we(n,t,zt)}function Wu(n){return su(n)?qn(n):Vt(n)}function Bu(n){if(su(n))n=qn(n,true);else if(du(n)){var t,r=ze(n),e=[];for(t in n)("constructor"!=t||!r&&oi.call(n,t))&&e.push(t);n=e}else{if(t=[],
+null!=n)for(r in Qu(n))t.push(r);n=t}return n}function Lu(n,t){if(null==n)return{};var r=c(ve(n),function(n){return[n]});return t=ye(t),tr(n,r,function(n,r){return t(n,r[0])})}function Uu(n){return null==n?[]:S(n,Wu(n))}function Cu(n){return $f(Iu(n).toLowerCase())}function Du(n){return(n=Iu(n))&&n.replace(xn,Xn).replace(Sn,"")}function Mu(n,t,r){return n=Iu(n),t=r?T:t,t===T?zn.test(n)?n.match(In)||[]:n.match(sn)||[]:n.match(t)||[]}function Tu(n){return function(){return n}}function $u(n){return n;
+}function Fu(n){return qt(typeof n=="function"?n:_t(n,1))}function Nu(n,t,e){var u=Wu(t),i=Et(t,u);null!=e||du(t)&&(i.length||!u.length)||(e=t,t=n,n=this,i=Et(t,Wu(t)));var o=!(du(e)&&"chain"in e&&!e.chain),f=_u(n);return r(i,function(r){var e=t[r];n[r]=e,f&&(n.prototype[r]=function(){var t=this.__chain__;if(o||t){var r=n(this.__wrapped__);return(r.__actions__=Ur(this.__actions__)).push({func:e,args:arguments,thisArg:n}),r.__chain__=t,r}return e.apply(n,a([this.value()],arguments))})}),n}function Pu(){}
+function Zu(n){return Ie(n)?b(Me(n)):rr(n)}function qu(){return[]}function Vu(){return false}mn=null==mn?$n:rt.defaults($n.Object(),mn,rt.pick($n,Wn));var Ku=mn.Array,Gu=mn.Date,Hu=mn.Error,Ju=mn.Function,Yu=mn.Math,Qu=mn.Object,Xu=mn.RegExp,ni=mn.String,ti=mn.TypeError,ri=Ku.prototype,ei=Qu.prototype,ui=mn["__core-js_shared__"],ii=Ju.prototype.toString,oi=ei.hasOwnProperty,fi=0,ci=function(){var n=/[^.]+$/.exec(ui&&ui.keys&&ui.keys.IE_PROTO||"");return n?"Symbol(src)_1."+n:""}(),ai=ei.toString,li=ii.call(Qu),si=$n._,hi=Xu("^"+ii.call(oi).replace(rn,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),pi=Pn?mn.Buffer:T,_i=mn.Symbol,vi=mn.Uint8Array,gi=pi?pi.g:T,di=B(Qu.getPrototypeOf,Qu),yi=Qu.create,bi=ei.propertyIsEnumerable,xi=ri.splice,ji=_i?_i.isConcatSpreadable:T,wi=_i?_i.iterator:T,mi=_i?_i.toStringTag:T,Ai=function(){
+try{var n=je(Qu,"defineProperty");return n({},"",{}),n}catch(n){}}(),Ei=mn.clearTimeout!==$n.clearTimeout&&mn.clearTimeout,ki=Gu&&Gu.now!==$n.Date.now&&Gu.now,Si=mn.setTimeout!==$n.setTimeout&&mn.setTimeout,Oi=Yu.ceil,Ii=Yu.floor,Ri=Qu.getOwnPropertySymbols,zi=pi?pi.isBuffer:T,Wi=mn.isFinite,Bi=ri.join,Li=B(Qu.keys,Qu),Ui=Yu.max,Ci=Yu.min,Di=Gu.now,Mi=mn.parseInt,Ti=Yu.random,$i=ri.reverse,Fi=je(mn,"DataView"),Ni=je(mn,"Map"),Pi=je(mn,"Promise"),Zi=je(mn,"Set"),qi=je(mn,"WeakMap"),Vi=je(Qu,"create"),Ki=qi&&new qi,Gi={},Hi=Te(Fi),Ji=Te(Ni),Yi=Te(Pi),Qi=Te(Zi),Xi=Te(qi),no=_i?_i.prototype:T,to=no?no.valueOf:T,ro=no?no.toString:T,eo=function(){
+function n(){}return function(t){return du(t)?yi?yi(t):(n.prototype=t,t=new n,n.prototype=T,t):{}}}();An.templateSettings={escape:J,evaluate:Y,interpolate:Q,variable:"",imports:{_:An}},An.prototype=En.prototype,An.prototype.constructor=An,On.prototype=eo(En.prototype),On.prototype.constructor=On,Un.prototype=eo(En.prototype),Un.prototype.constructor=Un,Mn.prototype.clear=function(){this.__data__=Vi?Vi(null):{},this.size=0},Mn.prototype.delete=function(n){return n=this.has(n)&&delete this.__data__[n],
+this.size-=n?1:0,n},Mn.prototype.get=function(n){var t=this.__data__;return Vi?(n=t[n],"__lodash_hash_undefined__"===n?T:n):oi.call(t,n)?t[n]:T},Mn.prototype.has=function(n){var t=this.__data__;return Vi?t[n]!==T:oi.call(t,n)},Mn.prototype.set=function(n,t){var r=this.__data__;return this.size+=this.has(n)?0:1,r[n]=Vi&&t===T?"__lodash_hash_undefined__":t,this},Tn.prototype.clear=function(){this.__data__=[],this.size=0},Tn.prototype.delete=function(n){var t=this.__data__;return n=ft(t,n),!(0>n)&&(n==t.length-1?t.pop():xi.call(t,n,1),
+--this.size,true)},Tn.prototype.get=function(n){var t=this.__data__;return n=ft(t,n),0>n?T:t[n][1]},Tn.prototype.has=function(n){return-1<ft(this.__data__,n)},Tn.prototype.set=function(n,t){var r=this.__data__,e=ft(r,n);return 0>e?(++this.size,r.push([n,t])):r[e][1]=t,this},Fn.prototype.clear=function(){this.size=0,this.__data__={hash:new Mn,map:new(Ni||Tn),string:new Mn}},Fn.prototype.delete=function(n){return n=be(this,n).delete(n),this.size-=n?1:0,n},Fn.prototype.get=function(n){return be(this,n).get(n);
+},Fn.prototype.has=function(n){return be(this,n).has(n)},Fn.prototype.set=function(n,t){var r=be(this,n),e=r.size;return r.set(n,t),this.size+=r.size==e?0:1,this},Nn.prototype.add=Nn.prototype.push=function(n){return this.__data__.set(n,"__lodash_hash_undefined__"),this},Nn.prototype.has=function(n){return this.__data__.has(n)},Zn.prototype.clear=function(){this.__data__=new Tn,this.size=0},Zn.prototype.delete=function(n){var t=this.__data__;return n=t.delete(n),this.size=t.size,n},Zn.prototype.get=function(n){
+return this.__data__.get(n)},Zn.prototype.has=function(n){return this.__data__.has(n)},Zn.prototype.set=function(n,t){var r=this.__data__;if(r instanceof Tn){var e=r.__data__;if(!Ni||199>e.length)return e.push([n,t]),this.size=++r.size,this;r=this.__data__=new Fn(e)}return r.set(n,t),this.size=r.size,this};var uo=Fr(mt),io=Fr(At,true),oo=Nr(),fo=Nr(true),co=Ki?function(n,t){return Ki.set(n,t),n}:$u,ao=Ai?function(n,t){return Ai(n,"toString",{configurable:true,enumerable:false,value:Tu(t),writable:true})}:$u,lo=Ei||function(n){
+return $n.clearTimeout(n)},so=Zi&&1/U(new Zi([,-0]))[1]==$?function(n){return new Zi(n)}:Pu,ho=Ki?function(n){return Ki.get(n)}:Pu,po=Ri?function(n){return null==n?[]:(n=Qu(n),i(Ri(n),function(t){return bi.call(n,t)}))}:qu,_o=Ri?function(n){for(var t=[];n;)a(t,po(n)),n=di(n);return t}:qu,vo=Ot;(Fi&&"[object DataView]"!=vo(new Fi(new ArrayBuffer(1)))||Ni&&"[object Map]"!=vo(new Ni)||Pi&&"[object Promise]"!=vo(Pi.resolve())||Zi&&"[object Set]"!=vo(new Zi)||qi&&"[object WeakMap]"!=vo(new qi))&&(vo=function(n){
+var t=Ot(n);if(n=(n="[object Object]"==t?n.constructor:T)?Te(n):"")switch(n){case Hi:return"[object DataView]";case Ji:return"[object Map]";case Yi:return"[object Promise]";case Qi:return"[object Set]";case Xi:return"[object WeakMap]"}return t});var go=ui?_u:Vu,yo=Ce(co),bo=Si||function(n,t){return $n.setTimeout(n,t)},xo=Ce(ao),jo=function(n){n=cu(n,function(n){return 500===t.size&&t.clear(),n});var t=n.cache;return n}(function(n){var t=[];return 46===n.charCodeAt(0)&&t.push(""),n.replace(tn,function(n,r,e,u){
+t.push(e?u.replace(hn,"$1"):r||n)}),t}),wo=fr(function(n,t){return hu(n)?yt(n,wt(t,1,hu,true)):[]}),mo=fr(function(n,t){var r=Ve(t);return hu(r)&&(r=T),hu(n)?yt(n,wt(t,1,hu,true),ye(r,2)):[]}),Ao=fr(function(n,t){var r=Ve(t);return hu(r)&&(r=T),hu(n)?yt(n,wt(t,1,hu,true),T,r):[]}),Eo=fr(function(n){var t=c(n,Er);return t.length&&t[0]===n[0]?Wt(t):[]}),ko=fr(function(n){var t=Ve(n),r=c(n,Er);return t===Ve(r)?t=T:r.pop(),r.length&&r[0]===n[0]?Wt(r,ye(t,2)):[]}),So=fr(function(n){var t=Ve(n),r=c(n,Er);return(t=typeof t=="function"?t:T)&&r.pop(),
+r.length&&r[0]===n[0]?Wt(r,T,t):[]}),Oo=fr(Ke),Io=pe(function(n,t){var r=null==n?0:n.length,e=ht(n,t);return ur(n,c(t,function(n){return Se(n,r)?+n:n}).sort(Wr)),e}),Ro=fr(function(n){return br(wt(n,1,hu,true))}),zo=fr(function(n){var t=Ve(n);return hu(t)&&(t=T),br(wt(n,1,hu,true),ye(t,2))}),Wo=fr(function(n){var t=Ve(n),t=typeof t=="function"?t:T;return br(wt(n,1,hu,true),T,t)}),Bo=fr(function(n,t){return hu(n)?yt(n,t):[]}),Lo=fr(function(n){return mr(i(n,hu))}),Uo=fr(function(n){var t=Ve(n);return hu(t)&&(t=T),
+mr(i(n,hu),ye(t,2))}),Co=fr(function(n){var t=Ve(n),t=typeof t=="function"?t:T;return mr(i(n,hu),T,t)}),Do=fr(He),Mo=fr(function(n){var t=n.length,t=1<t?n[t-1]:T,t=typeof t=="function"?(n.pop(),t):T;return Je(n,t)}),To=pe(function(n){function t(t){return ht(t,n)}var r=n.length,e=r?n[0]:0,u=this.__wrapped__;return!(1<r||this.__actions__.length)&&u instanceof Un&&Se(e)?(u=u.slice(e,+e+(r?1:0)),u.__actions__.push({func:Qe,args:[t],thisArg:T}),new On(u,this.__chain__).thru(function(n){return r&&!n.length&&n.push(T),
+n})):this.thru(t)}),$o=Tr(function(n,t,r){oi.call(n,r)?++n[r]:st(n,r,1)}),Fo=Gr(Ne),No=Gr(Pe),Po=Tr(function(n,t,r){oi.call(n,r)?n[r].push(t):st(n,r,[t])}),Zo=fr(function(t,r,e){var u=-1,i=typeof r=="function",o=su(t)?Ku(t.length):[];return uo(t,function(t){o[++u]=i?n(r,t,e):Lt(t,r,e)}),o}),qo=Tr(function(n,t,r){st(n,r,t)}),Vo=Tr(function(n,t,r){n[r?0:1].push(t)},function(){return[[],[]]}),Ko=fr(function(n,t){if(null==n)return[];var r=t.length;return 1<r&&Oe(n,t[0],t[1])?t=[]:2<r&&Oe(t[0],t[1],t[2])&&(t=[t[0]]),
+Xt(n,wt(t,1),[])}),Go=ki||function(){return $n.Date.now()},Ho=fr(function(n,t,r){var e=1;if(r.length)var u=L(r,de(Ho)),e=32|e;return fe(n,e,t,r,u)}),Jo=fr(function(n,t,r){var e=3;if(r.length)var u=L(r,de(Jo)),e=32|e;return fe(t,e,n,r,u)}),Yo=fr(function(n,t){return dt(n,1,t)}),Qo=fr(function(n,t,r){return dt(n,Su(t)||0,r)});cu.Cache=Fn;var Xo=fr(function(t,r){r=1==r.length&&ff(r[0])?c(r[0],k(ye())):c(wt(r,1),k(ye()));var e=r.length;return fr(function(u){for(var i=-1,o=Ci(u.length,e);++i<o;)u[i]=r[i].call(this,u[i]);
+return n(t,this,u)})}),nf=fr(function(n,t){return fe(n,32,T,t,L(t,de(nf)))}),tf=fr(function(n,t){return fe(n,64,T,t,L(t,de(tf)))}),rf=pe(function(n,t){return fe(n,256,T,T,T,t)}),ef=ee(It),uf=ee(function(n,t){return n>=t}),of=Ut(function(){return arguments}())?Ut:function(n){return yu(n)&&oi.call(n,"callee")&&!bi.call(n,"callee")},ff=Ku.isArray,cf=Vn?k(Vn):Ct,af=zi||Vu,lf=Kn?k(Kn):Dt,sf=Gn?k(Gn):Tt,hf=Hn?k(Hn):Nt,pf=Jn?k(Jn):Pt,_f=Yn?k(Yn):Zt,vf=ee(Kt),gf=ee(function(n,t){return n<=t}),df=$r(function(n,t){
+if(ze(t)||su(t))Cr(t,Wu(t),n);else for(var r in t)oi.call(t,r)&&ot(n,r,t[r])}),yf=$r(function(n,t){Cr(t,Bu(t),n)}),bf=$r(function(n,t,r,e){Cr(t,Bu(t),n,e)}),xf=$r(function(n,t,r,e){Cr(t,Wu(t),n,e)}),jf=pe(ht),wf=fr(function(n,t){n=Qu(n);var r=-1,e=t.length,u=2<e?t[2]:T;for(u&&Oe(t[0],t[1],u)&&(e=1);++r<e;)for(var u=t[r],i=Bu(u),o=-1,f=i.length;++o<f;){var c=i[o],a=n[c];(a===T||lu(a,ei[c])&&!oi.call(n,c))&&(n[c]=u[c])}return n}),mf=fr(function(t){return t.push(T,ae),n(Of,T,t)}),Af=Yr(function(n,t,r){
+null!=t&&typeof t.toString!="function"&&(t=ai.call(t)),n[t]=r},Tu($u)),Ef=Yr(function(n,t,r){null!=t&&typeof t.toString!="function"&&(t=ai.call(t)),oi.call(n,t)?n[t].push(r):n[t]=[r]},ye),kf=fr(Lt),Sf=$r(function(n,t,r){Yt(n,t,r)}),Of=$r(function(n,t,r,e){Yt(n,t,r,e)}),If=pe(function(n,t){var r={};if(null==n)return r;var e=false;t=c(t,function(t){return t=Sr(t,n),e||(e=1<t.length),t}),Cr(n,ve(n),r),e&&(r=_t(r,7,le));for(var u=t.length;u--;)xr(r,t[u]);return r}),Rf=pe(function(n,t){return null==n?{}:nr(n,t);
+}),zf=oe(Wu),Wf=oe(Bu),Bf=qr(function(n,t,r){return t=t.toLowerCase(),n+(r?Cu(t):t)}),Lf=qr(function(n,t,r){return n+(r?"-":"")+t.toLowerCase()}),Uf=qr(function(n,t,r){return n+(r?" ":"")+t.toLowerCase()}),Cf=Zr("toLowerCase"),Df=qr(function(n,t,r){return n+(r?"_":"")+t.toLowerCase()}),Mf=qr(function(n,t,r){return n+(r?" ":"")+$f(t)}),Tf=qr(function(n,t,r){return n+(r?" ":"")+t.toUpperCase()}),$f=Zr("toUpperCase"),Ff=fr(function(t,r){try{return n(t,T,r)}catch(n){return pu(n)?n:new Hu(n)}}),Nf=pe(function(n,t){
+return r(t,function(t){t=Me(t),st(n,t,Ho(n[t],n))}),n}),Pf=Hr(),Zf=Hr(true),qf=fr(function(n,t){return function(r){return Lt(r,n,t)}}),Vf=fr(function(n,t){return function(r){return Lt(n,r,t)}}),Kf=Xr(c),Gf=Xr(u),Hf=Xr(h),Jf=re(),Yf=re(true),Qf=Qr(function(n,t){return n+t},0),Xf=ie("ceil"),nc=Qr(function(n,t){return n/t},1),tc=ie("floor"),rc=Qr(function(n,t){return n*t},1),ec=ie("round"),uc=Qr(function(n,t){return n-t},0);return An.after=function(n,t){if(typeof t!="function")throw new ti("Expected a function");
+return n=Eu(n),function(){if(1>--n)return t.apply(this,arguments)}},An.ary=eu,An.assign=df,An.assignIn=yf,An.assignInWith=bf,An.assignWith=xf,An.at=jf,An.before=uu,An.bind=Ho,An.bindAll=Nf,An.bindKey=Jo,An.castArray=function(){if(!arguments.length)return[];var n=arguments[0];return ff(n)?n:[n]},An.chain=Ye,An.chunk=function(n,t,r){if(t=(r?Oe(n,t,r):t===T)?1:Ui(Eu(t),0),r=null==n?0:n.length,!r||1>t)return[];for(var e=0,u=0,i=Ku(Oi(r/t));e<r;)i[u++]=hr(n,e,e+=t);return i},An.compact=function(n){for(var t=-1,r=null==n?0:n.length,e=0,u=[];++t<r;){
+var i=n[t];i&&(u[e++]=i)}return u},An.concat=function(){var n=arguments.length;if(!n)return[];for(var t=Ku(n-1),r=arguments[0];n--;)t[n-1]=arguments[n];return a(ff(r)?Ur(r):[r],wt(t,1))},An.cond=function(t){var r=null==t?0:t.length,e=ye();return t=r?c(t,function(n){if("function"!=typeof n[1])throw new ti("Expected a function");return[e(n[0]),n[1]]}):[],fr(function(e){for(var u=-1;++u<r;){var i=t[u];if(n(i[0],this,e))return n(i[1],this,e)}})},An.conforms=function(n){return vt(_t(n,1))},An.constant=Tu,
+An.countBy=$o,An.create=function(n,t){var r=eo(n);return null==t?r:at(r,t)},An.curry=iu,An.curryRight=ou,An.debounce=fu,An.defaults=wf,An.defaultsDeep=mf,An.defer=Yo,An.delay=Qo,An.difference=wo,An.differenceBy=mo,An.differenceWith=Ao,An.drop=function(n,t,r){var e=null==n?0:n.length;return e?(t=r||t===T?1:Eu(t),hr(n,0>t?0:t,e)):[]},An.dropRight=function(n,t,r){var e=null==n?0:n.length;return e?(t=r||t===T?1:Eu(t),t=e-t,hr(n,0,0>t?0:t)):[]},An.dropRightWhile=function(n,t){return n&&n.length?jr(n,ye(t,3),true,true):[];
+},An.dropWhile=function(n,t){return n&&n.length?jr(n,ye(t,3),true):[]},An.fill=function(n,t,r,e){var u=null==n?0:n.length;if(!u)return[];for(r&&typeof r!="number"&&Oe(n,t,r)&&(r=0,e=u),u=n.length,r=Eu(r),0>r&&(r=-r>u?0:u+r),e=e===T||e>u?u:Eu(e),0>e&&(e+=u),e=r>e?0:ku(e);r<e;)n[r++]=t;return n},An.filter=function(n,t){return(ff(n)?i:jt)(n,ye(t,3))},An.flatMap=function(n,t){return wt(ru(n,t),1)},An.flatMapDeep=function(n,t){return wt(ru(n,t),$)},An.flatMapDepth=function(n,t,r){return r=r===T?1:Eu(r),
+wt(ru(n,t),r)},An.flatten=Ze,An.flattenDeep=function(n){return(null==n?0:n.length)?wt(n,$):[]},An.flattenDepth=function(n,t){return null!=n&&n.length?(t=t===T?1:Eu(t),wt(n,t)):[]},An.flip=function(n){return fe(n,512)},An.flow=Pf,An.flowRight=Zf,An.fromPairs=function(n){for(var t=-1,r=null==n?0:n.length,e={};++t<r;){var u=n[t];e[u[0]]=u[1]}return e},An.functions=function(n){return null==n?[]:Et(n,Wu(n))},An.functionsIn=function(n){return null==n?[]:Et(n,Bu(n))},An.groupBy=Po,An.initial=function(n){
+return(null==n?0:n.length)?hr(n,0,-1):[]},An.intersection=Eo,An.intersectionBy=ko,An.intersectionWith=So,An.invert=Af,An.invertBy=Ef,An.invokeMap=Zo,An.iteratee=Fu,An.keyBy=qo,An.keys=Wu,An.keysIn=Bu,An.map=ru,An.mapKeys=function(n,t){var r={};return t=ye(t,3),mt(n,function(n,e,u){st(r,t(n,e,u),n)}),r},An.mapValues=function(n,t){var r={};return t=ye(t,3),mt(n,function(n,e,u){st(r,e,t(n,e,u))}),r},An.matches=function(n){return Ht(_t(n,1))},An.matchesProperty=function(n,t){return Jt(n,_t(t,1))},An.memoize=cu,
+An.merge=Sf,An.mergeWith=Of,An.method=qf,An.methodOf=Vf,An.mixin=Nu,An.negate=au,An.nthArg=function(n){return n=Eu(n),fr(function(t){return Qt(t,n)})},An.omit=If,An.omitBy=function(n,t){return Lu(n,au(ye(t)))},An.once=function(n){return uu(2,n)},An.orderBy=function(n,t,r,e){return null==n?[]:(ff(t)||(t=null==t?[]:[t]),r=e?T:r,ff(r)||(r=null==r?[]:[r]),Xt(n,t,r))},An.over=Kf,An.overArgs=Xo,An.overEvery=Gf,An.overSome=Hf,An.partial=nf,An.partialRight=tf,An.partition=Vo,An.pick=Rf,An.pickBy=Lu,An.property=Zu,
+An.propertyOf=function(n){return function(t){return null==n?T:kt(n,t)}},An.pull=Oo,An.pullAll=Ke,An.pullAllBy=function(n,t,r){return n&&n.length&&t&&t.length?er(n,t,ye(r,2)):n},An.pullAllWith=function(n,t,r){return n&&n.length&&t&&t.length?er(n,t,T,r):n},An.pullAt=Io,An.range=Jf,An.rangeRight=Yf,An.rearg=rf,An.reject=function(n,t){return(ff(n)?i:jt)(n,au(ye(t,3)))},An.remove=function(n,t){var r=[];if(!n||!n.length)return r;var e=-1,u=[],i=n.length;for(t=ye(t,3);++e<i;){var o=n[e];t(o,e,n)&&(r.push(o),
+u.push(e))}return ur(n,u),r},An.rest=function(n,t){if(typeof n!="function")throw new ti("Expected a function");return t=t===T?t:Eu(t),fr(n,t)},An.reverse=Ge,An.sampleSize=function(n,t,r){return t=(r?Oe(n,t,r):t===T)?1:Eu(t),(ff(n)?et:ar)(n,t)},An.set=function(n,t,r){return null==n?n:lr(n,t,r)},An.setWith=function(n,t,r,e){return e=typeof e=="function"?e:T,null==n?n:lr(n,t,r,e)},An.shuffle=function(n){return(ff(n)?ut:sr)(n)},An.slice=function(n,t,r){var e=null==n?0:n.length;return e?(r&&typeof r!="number"&&Oe(n,t,r)?(t=0,
+r=e):(t=null==t?0:Eu(t),r=r===T?e:Eu(r)),hr(n,t,r)):[]},An.sortBy=Ko,An.sortedUniq=function(n){return n&&n.length?gr(n):[]},An.sortedUniqBy=function(n,t){return n&&n.length?gr(n,ye(t,2)):[]},An.split=function(n,t,r){return r&&typeof r!="number"&&Oe(n,t,r)&&(t=r=T),r=r===T?4294967295:r>>>0,r?(n=Iu(n))&&(typeof t=="string"||null!=t&&!hf(t))&&(t=yr(t),!t&&Rn.test(n))?Or(M(n),0,r):n.split(t,r):[]},An.spread=function(t,r){if(typeof t!="function")throw new ti("Expected a function");return r=null==r?0:Ui(Eu(r),0),
+fr(function(e){var u=e[r];return e=Or(e,0,r),u&&a(e,u),n(t,this,e)})},An.tail=function(n){var t=null==n?0:n.length;return t?hr(n,1,t):[]},An.take=function(n,t,r){return n&&n.length?(t=r||t===T?1:Eu(t),hr(n,0,0>t?0:t)):[]},An.takeRight=function(n,t,r){var e=null==n?0:n.length;return e?(t=r||t===T?1:Eu(t),t=e-t,hr(n,0>t?0:t,e)):[]},An.takeRightWhile=function(n,t){return n&&n.length?jr(n,ye(t,3),false,true):[]},An.takeWhile=function(n,t){return n&&n.length?jr(n,ye(t,3)):[]},An.tap=function(n,t){return t(n),
+n},An.throttle=function(n,t,r){var e=true,u=true;if(typeof n!="function")throw new ti("Expected a function");return du(r)&&(e="leading"in r?!!r.leading:e,u="trailing"in r?!!r.trailing:u),fu(n,t,{leading:e,maxWait:t,trailing:u})},An.thru=Qe,An.toArray=mu,An.toPairs=zf,An.toPairsIn=Wf,An.toPath=function(n){return ff(n)?c(n,Me):wu(n)?[n]:Ur(jo(Iu(n)))},An.toPlainObject=Ou,An.transform=function(n,t,e){var u=ff(n),i=u||af(n)||_f(n);if(t=ye(t,4),null==e){var o=n&&n.constructor;e=i?u?new o:[]:du(n)&&_u(o)?eo(di(n)):{};
+}return(i?r:mt)(n,function(n,r,u){return t(e,n,r,u)}),e},An.unary=function(n){return eu(n,1)},An.union=Ro,An.unionBy=zo,An.unionWith=Wo,An.uniq=function(n){return n&&n.length?br(n):[]},An.uniqBy=function(n,t){return n&&n.length?br(n,ye(t,2)):[]},An.uniqWith=function(n,t){return t=typeof t=="function"?t:T,n&&n.length?br(n,T,t):[]},An.unset=function(n,t){return null==n||xr(n,t)},An.unzip=He,An.unzipWith=Je,An.update=function(n,t,r){return null==n?n:lr(n,t,kr(r)(kt(n,t)),void 0)},An.updateWith=function(n,t,r,e){
+return e=typeof e=="function"?e:T,null!=n&&(n=lr(n,t,kr(r)(kt(n,t)),e)),n},An.values=Uu,An.valuesIn=function(n){return null==n?[]:S(n,Bu(n))},An.without=Bo,An.words=Mu,An.wrap=function(n,t){return nf(kr(t),n)},An.xor=Lo,An.xorBy=Uo,An.xorWith=Co,An.zip=Do,An.zipObject=function(n,t){return Ar(n||[],t||[],ot)},An.zipObjectDeep=function(n,t){return Ar(n||[],t||[],lr)},An.zipWith=Mo,An.entries=zf,An.entriesIn=Wf,An.extend=yf,An.extendWith=bf,Nu(An,An),An.add=Qf,An.attempt=Ff,An.camelCase=Bf,An.capitalize=Cu,
+An.ceil=Xf,An.clamp=function(n,t,r){return r===T&&(r=t,t=T),r!==T&&(r=Su(r),r=r===r?r:0),t!==T&&(t=Su(t),t=t===t?t:0),pt(Su(n),t,r)},An.clone=function(n){return _t(n,4)},An.cloneDeep=function(n){return _t(n,5)},An.cloneDeepWith=function(n,t){return t=typeof t=="function"?t:T,_t(n,5,t)},An.cloneWith=function(n,t){return t=typeof t=="function"?t:T,_t(n,4,t)},An.conformsTo=function(n,t){return null==t||gt(n,t,Wu(t))},An.deburr=Du,An.defaultTo=function(n,t){return null==n||n!==n?t:n},An.divide=nc,An.endsWith=function(n,t,r){
+n=Iu(n),t=yr(t);var e=n.length,e=r=r===T?e:pt(Eu(r),0,e);return r-=t.length,0<=r&&n.slice(r,e)==t},An.eq=lu,An.escape=function(n){return(n=Iu(n))&&H.test(n)?n.replace(K,nt):n},An.escapeRegExp=function(n){return(n=Iu(n))&&en.test(n)?n.replace(rn,"\\$&"):n},An.every=function(n,t,r){var e=ff(n)?u:bt;return r&&Oe(n,t,r)&&(t=T),e(n,ye(t,3))},An.find=Fo,An.findIndex=Ne,An.findKey=function(n,t){return p(n,ye(t,3),mt)},An.findLast=No,An.findLastIndex=Pe,An.findLastKey=function(n,t){return p(n,ye(t,3),At);
+},An.floor=tc,An.forEach=nu,An.forEachRight=tu,An.forIn=function(n,t){return null==n?n:oo(n,ye(t,3),Bu)},An.forInRight=function(n,t){return null==n?n:fo(n,ye(t,3),Bu)},An.forOwn=function(n,t){return n&&mt(n,ye(t,3))},An.forOwnRight=function(n,t){return n&&At(n,ye(t,3))},An.get=Ru,An.gt=ef,An.gte=uf,An.has=function(n,t){return null!=n&&we(n,t,Rt)},An.hasIn=zu,An.head=qe,An.identity=$u,An.includes=function(n,t,r,e){return n=su(n)?n:Uu(n),r=r&&!e?Eu(r):0,e=n.length,0>r&&(r=Ui(e+r,0)),ju(n)?r<=e&&-1<n.indexOf(t,r):!!e&&-1<v(n,t,r);
+},An.indexOf=function(n,t,r){var e=null==n?0:n.length;return e?(r=null==r?0:Eu(r),0>r&&(r=Ui(e+r,0)),v(n,t,r)):-1},An.inRange=function(n,t,r){return t=Au(t),r===T?(r=t,t=0):r=Au(r),n=Su(n),n>=Ci(t,r)&&n<Ui(t,r)},An.invoke=kf,An.isArguments=of,An.isArray=ff,An.isArrayBuffer=cf,An.isArrayLike=su,An.isArrayLikeObject=hu,An.isBoolean=function(n){return true===n||false===n||yu(n)&&"[object Boolean]"==Ot(n)},An.isBuffer=af,An.isDate=lf,An.isElement=function(n){return yu(n)&&1===n.nodeType&&!xu(n)},An.isEmpty=function(n){
+if(null==n)return true;if(su(n)&&(ff(n)||typeof n=="string"||typeof n.splice=="function"||af(n)||_f(n)||of(n)))return!n.length;var t=vo(n);if("[object Map]"==t||"[object Set]"==t)return!n.size;if(ze(n))return!Vt(n).length;for(var r in n)if(oi.call(n,r))return false;return true},An.isEqual=function(n,t){return Mt(n,t)},An.isEqualWith=function(n,t,r){var e=(r=typeof r=="function"?r:T)?r(n,t):T;return e===T?Mt(n,t,T,r):!!e},An.isError=pu,An.isFinite=function(n){return typeof n=="number"&&Wi(n)},An.isFunction=_u,
+An.isInteger=vu,An.isLength=gu,An.isMap=sf,An.isMatch=function(n,t){return n===t||$t(n,t,xe(t))},An.isMatchWith=function(n,t,r){return r=typeof r=="function"?r:T,$t(n,t,xe(t),r)},An.isNaN=function(n){return bu(n)&&n!=+n},An.isNative=function(n){if(go(n))throw new Hu("Unsupported core-js use. Try https://npms.io/search?q=ponyfill.");return Ft(n)},An.isNil=function(n){return null==n},An.isNull=function(n){return null===n},An.isNumber=bu,An.isObject=du,An.isObjectLike=yu,An.isPlainObject=xu,An.isRegExp=hf,
+An.isSafeInteger=function(n){return vu(n)&&-9007199254740991<=n&&9007199254740991>=n},An.isSet=pf,An.isString=ju,An.isSymbol=wu,An.isTypedArray=_f,An.isUndefined=function(n){return n===T},An.isWeakMap=function(n){return yu(n)&&"[object WeakMap]"==vo(n)},An.isWeakSet=function(n){return yu(n)&&"[object WeakSet]"==Ot(n)},An.join=function(n,t){return null==n?"":Bi.call(n,t)},An.kebabCase=Lf,An.last=Ve,An.lastIndexOf=function(n,t,r){var e=null==n?0:n.length;if(!e)return-1;var u=e;if(r!==T&&(u=Eu(r),u=0>u?Ui(e+u,0):Ci(u,e-1)),
+t===t){for(r=u+1;r--&&n[r]!==t;);n=r}else n=_(n,d,u,true);return n},An.lowerCase=Uf,An.lowerFirst=Cf,An.lt=vf,An.lte=gf,An.max=function(n){return n&&n.length?xt(n,$u,It):T},An.maxBy=function(n,t){return n&&n.length?xt(n,ye(t,2),It):T},An.mean=function(n){return y(n,$u)},An.meanBy=function(n,t){return y(n,ye(t,2))},An.min=function(n){return n&&n.length?xt(n,$u,Kt):T},An.minBy=function(n,t){return n&&n.length?xt(n,ye(t,2),Kt):T},An.stubArray=qu,An.stubFalse=Vu,An.stubObject=function(){return{}},An.stubString=function(){
+return""},An.stubTrue=function(){return true},An.multiply=rc,An.nth=function(n,t){return n&&n.length?Qt(n,Eu(t)):T},An.noConflict=function(){return $n._===this&&($n._=si),this},An.noop=Pu,An.now=Go,An.pad=function(n,t,r){n=Iu(n);var e=(t=Eu(t))?D(n):0;return!t||e>=t?n:(t=(t-e)/2,ne(Ii(t),r)+n+ne(Oi(t),r))},An.padEnd=function(n,t,r){n=Iu(n);var e=(t=Eu(t))?D(n):0;return t&&e<t?n+ne(t-e,r):n},An.padStart=function(n,t,r){n=Iu(n);var e=(t=Eu(t))?D(n):0;return t&&e<t?ne(t-e,r)+n:n},An.parseInt=function(n,t,r){
+return r||null==t?t=0:t&&(t=+t),Mi(Iu(n).replace(on,""),t||0)},An.random=function(n,t,r){if(r&&typeof r!="boolean"&&Oe(n,t,r)&&(t=r=T),r===T&&(typeof t=="boolean"?(r=t,t=T):typeof n=="boolean"&&(r=n,n=T)),n===T&&t===T?(n=0,t=1):(n=Au(n),t===T?(t=n,n=0):t=Au(t)),n>t){var e=n;n=t,t=e}return r||n%1||t%1?(r=Ti(),Ci(n+r*(t-n+Cn("1e-"+((r+"").length-1))),t)):ir(n,t)},An.reduce=function(n,t,r){var e=ff(n)?l:j,u=3>arguments.length;return e(n,ye(t,4),r,u,uo)},An.reduceRight=function(n,t,r){var e=ff(n)?s:j,u=3>arguments.length;
+return e(n,ye(t,4),r,u,io)},An.repeat=function(n,t,r){return t=(r?Oe(n,t,r):t===T)?1:Eu(t),or(Iu(n),t)},An.replace=function(){var n=arguments,t=Iu(n[0]);return 3>n.length?t:t.replace(n[1],n[2])},An.result=function(n,t,r){t=Sr(t,n);var e=-1,u=t.length;for(u||(u=1,n=T);++e<u;){var i=null==n?T:n[Me(t[e])];i===T&&(e=u,i=r),n=_u(i)?i.call(n):i}return n},An.round=ec,An.runInContext=x,An.sample=function(n){return(ff(n)?Qn:cr)(n)},An.size=function(n){if(null==n)return 0;if(su(n))return ju(n)?D(n):n.length;
+var t=vo(n);return"[object Map]"==t||"[object Set]"==t?n.size:Vt(n).length},An.snakeCase=Df,An.some=function(n,t,r){var e=ff(n)?h:pr;return r&&Oe(n,t,r)&&(t=T),e(n,ye(t,3))},An.sortedIndex=function(n,t){return _r(n,t)},An.sortedIndexBy=function(n,t,r){return vr(n,t,ye(r,2))},An.sortedIndexOf=function(n,t){var r=null==n?0:n.length;if(r){var e=_r(n,t);if(e<r&&lu(n[e],t))return e}return-1},An.sortedLastIndex=function(n,t){return _r(n,t,true)},An.sortedLastIndexBy=function(n,t,r){return vr(n,t,ye(r,2),true);
+},An.sortedLastIndexOf=function(n,t){if(null==n?0:n.length){var r=_r(n,t,true)-1;if(lu(n[r],t))return r}return-1},An.startCase=Mf,An.startsWith=function(n,t,r){return n=Iu(n),r=null==r?0:pt(Eu(r),0,n.length),t=yr(t),n.slice(r,r+t.length)==t},An.subtract=uc,An.sum=function(n){return n&&n.length?m(n,$u):0},An.sumBy=function(n,t){return n&&n.length?m(n,ye(t,2)):0},An.template=function(n,t,r){var e=An.templateSettings;r&&Oe(n,t,r)&&(t=T),n=Iu(n),t=bf({},t,e,ce),r=bf({},t.imports,e.imports,ce);var u,i,o=Wu(r),f=S(r,o),c=0;
+r=t.interpolate||jn;var a="__p+='";r=Xu((t.escape||jn).source+"|"+r.source+"|"+(r===Q?pn:jn).source+"|"+(t.evaluate||jn).source+"|$","g");var l=oi.call(t,"sourceURL")?"//# sourceURL="+(t.sourceURL+"").replace(/[\r\n]/g," ")+"\n":"";if(n.replace(r,function(t,r,e,o,f,l){return e||(e=o),a+=n.slice(c,l).replace(wn,z),r&&(u=true,a+="'+__e("+r+")+'"),f&&(i=true,a+="';"+f+";\n__p+='"),e&&(a+="'+((__t=("+e+"))==null?'':__t)+'"),c=l+t.length,t}),a+="';",(t=oi.call(t,"variable")&&t.variable)||(a="with(obj){"+a+"}"),
+a=(i?a.replace(P,""):a).replace(Z,"$1").replace(q,"$1;"),a="function("+(t||"obj")+"){"+(t?"":"obj||(obj={});")+"var __t,__p=''"+(u?",__e=_.escape":"")+(i?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+a+"return __p}",t=Ff(function(){return Ju(o,l+"return "+a).apply(T,f)}),t.source=a,pu(t))throw t;return t},An.times=function(n,t){if(n=Eu(n),1>n||9007199254740991<n)return[];var r=4294967295,e=Ci(n,4294967295);for(t=ye(t),n-=4294967295,e=A(e,t);++r<n;)t(r);return e},An.toFinite=Au,
+An.toInteger=Eu,An.toLength=ku,An.toLower=function(n){return Iu(n).toLowerCase()},An.toNumber=Su,An.toSafeInteger=function(n){return n?pt(Eu(n),-9007199254740991,9007199254740991):0===n?n:0},An.toString=Iu,An.toUpper=function(n){return Iu(n).toUpperCase()},An.trim=function(n,t,r){return(n=Iu(n))&&(r||t===T)?n.replace(un,""):n&&(t=yr(t))?(n=M(n),r=M(t),t=I(n,r),r=R(n,r)+1,Or(n,t,r).join("")):n},An.trimEnd=function(n,t,r){return(n=Iu(n))&&(r||t===T)?n.replace(fn,""):n&&(t=yr(t))?(n=M(n),t=R(n,M(t))+1,
+Or(n,0,t).join("")):n},An.trimStart=function(n,t,r){return(n=Iu(n))&&(r||t===T)?n.replace(on,""):n&&(t=yr(t))?(n=M(n),t=I(n,M(t)),Or(n,t).join("")):n},An.truncate=function(n,t){var r=30,e="...";if(du(t))var u="separator"in t?t.separator:u,r="length"in t?Eu(t.length):r,e="omission"in t?yr(t.omission):e;n=Iu(n);var i=n.length;if(Rn.test(n))var o=M(n),i=o.length;if(r>=i)return n;if(i=r-D(e),1>i)return e;if(r=o?Or(o,0,i).join(""):n.slice(0,i),u===T)return r+e;if(o&&(i+=r.length-i),hf(u)){if(n.slice(i).search(u)){
+var f=r;for(u.global||(u=Xu(u.source,Iu(_n.exec(u))+"g")),u.lastIndex=0;o=u.exec(f);)var c=o.index;r=r.slice(0,c===T?i:c)}}else n.indexOf(yr(u),i)!=i&&(u=r.lastIndexOf(u),-1<u&&(r=r.slice(0,u)));return r+e},An.unescape=function(n){return(n=Iu(n))&&G.test(n)?n.replace(V,tt):n},An.uniqueId=function(n){var t=++fi;return Iu(n)+t},An.upperCase=Tf,An.upperFirst=$f,An.each=nu,An.eachRight=tu,An.first=qe,Nu(An,function(){var n={};return mt(An,function(t,r){oi.call(An.prototype,r)||(n[r]=t)}),n}(),{chain:false
+}),An.VERSION="4.17.15",r("bind bindKey curry curryRight partial partialRight".split(" "),function(n){An[n].placeholder=An}),r(["drop","take"],function(n,t){Un.prototype[n]=function(r){r=r===T?1:Ui(Eu(r),0);var e=this.__filtered__&&!t?new Un(this):this.clone();return e.__filtered__?e.__takeCount__=Ci(r,e.__takeCount__):e.__views__.push({size:Ci(r,4294967295),type:n+(0>e.__dir__?"Right":"")}),e},Un.prototype[n+"Right"]=function(t){return this.reverse()[n](t).reverse()}}),r(["filter","map","takeWhile"],function(n,t){
+var r=t+1,e=1==r||3==r;Un.prototype[n]=function(n){var t=this.clone();return t.__iteratees__.push({iteratee:ye(n,3),type:r}),t.__filtered__=t.__filtered__||e,t}}),r(["head","last"],function(n,t){var r="take"+(t?"Right":"");Un.prototype[n]=function(){return this[r](1).value()[0]}}),r(["initial","tail"],function(n,t){var r="drop"+(t?"":"Right");Un.prototype[n]=function(){return this.__filtered__?new Un(this):this[r](1)}}),Un.prototype.compact=function(){return this.filter($u)},Un.prototype.find=function(n){
+return this.filter(n).head()},Un.prototype.findLast=function(n){return this.reverse().find(n)},Un.prototype.invokeMap=fr(function(n,t){return typeof n=="function"?new Un(this):this.map(function(r){return Lt(r,n,t)})}),Un.prototype.reject=function(n){return this.filter(au(ye(n)))},Un.prototype.slice=function(n,t){n=Eu(n);var r=this;return r.__filtered__&&(0<n||0>t)?new Un(r):(0>n?r=r.takeRight(-n):n&&(r=r.drop(n)),t!==T&&(t=Eu(t),r=0>t?r.dropRight(-t):r.take(t-n)),r)},Un.prototype.takeRightWhile=function(n){
+return this.reverse().takeWhile(n).reverse()},Un.prototype.toArray=function(){return this.take(4294967295)},mt(Un.prototype,function(n,t){var r=/^(?:filter|find|map|reject)|While$/.test(t),e=/^(?:head|last)$/.test(t),u=An[e?"take"+("last"==t?"Right":""):t],i=e||/^find/.test(t);u&&(An.prototype[t]=function(){function t(n){return n=u.apply(An,a([n],f)),e&&h?n[0]:n}var o=this.__wrapped__,f=e?[1]:arguments,c=o instanceof Un,l=f[0],s=c||ff(o);s&&r&&typeof l=="function"&&1!=l.length&&(c=s=false);var h=this.__chain__,p=!!this.__actions__.length,l=i&&!h,c=c&&!p;
+return!i&&s?(o=c?o:new Un(this),o=n.apply(o,f),o.__actions__.push({func:Qe,args:[t],thisArg:T}),new On(o,h)):l&&c?n.apply(this,f):(o=this.thru(t),l?e?o.value()[0]:o.value():o)})}),r("pop push shift sort splice unshift".split(" "),function(n){var t=ri[n],r=/^(?:push|sort|unshift)$/.test(n)?"tap":"thru",e=/^(?:pop|shift)$/.test(n);An.prototype[n]=function(){var n=arguments;if(e&&!this.__chain__){var u=this.value();return t.apply(ff(u)?u:[],n)}return this[r](function(r){return t.apply(ff(r)?r:[],n)});
+}}),mt(Un.prototype,function(n,t){var r=An[t];if(r){var e=r.name+"";oi.call(Gi,e)||(Gi[e]=[]),Gi[e].push({name:t,func:r})}}),Gi[Jr(T,2).name]=[{name:"wrapper",func:T}],Un.prototype.clone=function(){var n=new Un(this.__wrapped__);return n.__actions__=Ur(this.__actions__),n.__dir__=this.__dir__,n.__filtered__=this.__filtered__,n.__iteratees__=Ur(this.__iteratees__),n.__takeCount__=this.__takeCount__,n.__views__=Ur(this.__views__),n},Un.prototype.reverse=function(){if(this.__filtered__){var n=new Un(this);
+n.__dir__=-1,n.__filtered__=true}else n=this.clone(),n.__dir__*=-1;return n},Un.prototype.value=function(){var n,t=this.__wrapped__.value(),r=this.__dir__,e=ff(t),u=0>r,i=e?t.length:0;n=i;for(var o=this.__views__,f=0,c=-1,a=o.length;++c<a;){var l=o[c],s=l.size;switch(l.type){case"drop":f+=s;break;case"dropRight":n-=s;break;case"take":n=Ci(n,f+s);break;case"takeRight":f=Ui(f,n-s)}}if(n={start:f,end:n},o=n.start,f=n.end,n=f-o,o=u?f:o-1,f=this.__iteratees__,c=f.length,a=0,l=Ci(n,this.__takeCount__),!e||!u&&i==n&&l==n)return wr(t,this.__actions__);
+e=[];n:for(;n--&&a<l;){for(o+=r,u=-1,i=t[o];++u<c;){var h=f[u],s=h.type,h=(0,h.iteratee)(i);if(2==s)i=h;else if(!h){if(1==s)continue n;break n}}e[a++]=i}return e},An.prototype.at=To,An.prototype.chain=function(){return Ye(this)},An.prototype.commit=function(){return new On(this.value(),this.__chain__)},An.prototype.next=function(){this.__values__===T&&(this.__values__=mu(this.value()));var n=this.__index__>=this.__values__.length;return{done:n,value:n?T:this.__values__[this.__index__++]}},An.prototype.plant=function(n){
+for(var t,r=this;r instanceof En;){var e=Fe(r);e.__index__=0,e.__values__=T,t?u.__wrapped__=e:t=e;var u=e,r=r.__wrapped__}return u.__wrapped__=n,t},An.prototype.reverse=function(){var n=this.__wrapped__;return n instanceof Un?(this.__actions__.length&&(n=new Un(this)),n=n.reverse(),n.__actions__.push({func:Qe,args:[Ge],thisArg:T}),new On(n,this.__chain__)):this.thru(Ge)},An.prototype.toJSON=An.prototype.valueOf=An.prototype.value=function(){return wr(this.__wrapped__,this.__actions__)},An.prototype.first=An.prototype.head,
+wi&&(An.prototype[wi]=Xe),An}();typeof define=="function"&&typeof define.amd=="object"&&define.amd?($n._=rt, define(function(){return rt})):Nn?((Nn.exports=rt)._=rt,Fn._=rt):$n._=rt}).call(this);
\ No newline at end of file
diff --git a/js/002-config/fc-js-init.js b/js/002-config/fc-js-init.js
index 8050993cbf9fe9e92e8bfdf055bd86bfb9709408..bd683646b919f39d86776a6b1b84f46c2012c15a 100644
--- a/js/002-config/fc-js-init.js
+++ b/js/002-config/fc-js-init.js
@@ -17,7 +17,10 @@ App.Arcology.Cell = {};
App.Art = {};
App.Budget = {};
App.Corporate = {};
+App.Corporate.Division = {};
+App.Corporate.Shared = {};
App.Data = {};
+App.Data.Arcology = {};
App.Data.FCTV = {};
App.Data.HeroSlaves = {};
App.Data.Medicine = {};
@@ -68,10 +71,12 @@ App.Medicine.Surgery = {};
App.Medicine.Surgery.Procedures = {};
App.Medicine.Surgery.Reactions = {};
App.Mods = {};
+App.Mods.DinnerParty = {};
App.Mods.SecExp = {};
App.Mods.SF = {};
App.Neighbor = {};
App.PersonalAttention = {};
+App.Porn = {};
App.RA = {};
App.RA.Activation = {};
App.Ratings = {};
@@ -87,3 +92,4 @@ App.UI.SlaveInteract = {};
App.UI.View = {};
App.Update = {};
App.Utils = {};
+App.Utils.Math = {};
diff --git a/js/003-data/arcologyData.js b/js/003-data/arcologyData.js
new file mode 100644
index 0000000000000000000000000000000000000000..6b0b17d9efa8ed3af45f453b87556e042d069445
--- /dev/null
+++ b/js/003-data/arcologyData.js
@@ -0,0 +1,2 @@
+App.Data.Arcology.Terrain = ["marine", "marine", "oceanic", "ravine", "rural", "rural", "rural", "urban", "urban"];
+App.Data.Arcology.Continents = ["Africa", "Asia", "Asia", "Australia", "Western Europe", "Southern Europe", "Central Europe", "Eastern Europe", "Scandinavia", "Japan", "North America", "North America", "South America", "the Middle East"];
diff --git a/js/003-data/clothes/001-slaveWearData.js b/js/003-data/clothes/001-slaveWearData.js
index a0aecb385e206f234cfdce68921f46ed7c3cd4bf..8de9e186cfd26738c7abe82b4a606dece7a6f740 100644
--- a/js/003-data/clothes/001-slaveWearData.js
+++ b/js/003-data/clothes/001-slaveWearData.js
@@ -1531,19 +1531,19 @@ App.Data.bellyAccessory = new Map([
["a corset",
{
name: "Tight corset",
- note: "Slowly narrows the waist into wispy one."
+ note: "Slowly narrows the waist into a wispy one."
}
],
["an extreme corset",
{
name: "Extreme corset",
- note: "Narrows the waist up to absurd level, painfully, if waist is feminine or wider(scaring and increasing obedience on resistant slaves), but risks miscarriage if a pregnant belly becomes too big"
+ note: "Narrows the waist up to an absurd level, painfully if waist is feminine or wider (increasing obedience and fear in resistant slaves), but risks miscarriage if a pregnant belly becomes too big."
}
],
["a support band",
{
name: "Supportive band",
- note: "Reduces chance of miscarriage."
+ note: "Eases the pains of pregnancy and reduces chance of miscarriage."
}
],
["a small empathy belly",
diff --git a/js/003-data/clothes/aSlaveGown.js b/js/003-data/clothes/aSlaveGown.js
index a88278880fa707a117e88624e2444c457f54f081..f481545e235df3d04d25b4199a6ce586f40c4da7 100644
--- a/js/003-data/clothes/aSlaveGown.js
+++ b/js/003-data/clothes/aSlaveGown.js
@@ -335,7 +335,7 @@ App.Data.clothes.set("a slave gown",
} else if (slave.bellyImplant > 0) {
r.push(`${slave.slaveName}'s slave gown is carefully tailored using a huge quantity of material, and gives ${him} a sensual, motherly look as it caresses ${his} unfathomable, hyper-swollen, implant-filled belly.`);
} else {
- r.push(`${slave.slaveName}'s slave gown is carefully tailored using a huge quantity of material, and gives ${him} a sensual, motherly look as it caresses and supports ${his} unfathomable, hyper-swollen pregnant belly. Despite it's size, it still has enough give to allow ${his} unborn children to bulge and squirm as desired.`);
+ r.push(`${slave.slaveName}'s slave gown is carefully tailored using a huge quantity of material, and gives ${him} a sensual, motherly look as it caresses and supports ${his} unfathomable, hyper-swollen pregnant belly. Despite its size, it still has enough give to allow ${his} unborn children to bulge and squirm as desired.`);
}
} else if (slave.belly >= 750000) {
if (isBellyFluidLargest) {
@@ -384,7 +384,7 @@ App.Data.clothes.set("a slave gown",
} else {
r.push(`${slave.slaveName}'s slave gown is carefully tailored, giving ${him} a sensual, motherly look as it carefully caresses ${his} huge pregnant belly.`);
}
- } else if (slave.belly >= 10000 || (slave.bellyAccessory === "a huge empathy belly") || (slave.bellyAccessory === "a large empathy belly")) {
+ } else if (slave.belly >= 10000 || (slave.bellyAccessory === "a large empathy belly")) {
if (slave.bellyAccessory === "a large empathy belly") {
r.push(`${slave.slaveName}'s slave gown is carefully tailored, giving ${him} a sensual, motherly look as it carefully caresses ${his} big pregnant belly.`);
} else if (isBellyFluidLargest) {
diff --git a/js/003-data/constants.js b/js/003-data/constants.js
index 4c78a1d70136bf013cb034ef476d7d8b9151f8c3..602dc75c140a7f71c4c69b6ee5d3152fca73dfc3 100644
--- a/js/003-data/constants.js
+++ b/js/003-data/constants.js
@@ -64,6 +64,7 @@ globalThis.Job = Object.freeze({
// Pseudo-jobs
LURCHER: '@Lurcher',
PIT: '@Pit',
+ ARENA: "@Arena",
IMPORTED: '@be imported',
TANK: '@lay in tank'
});
@@ -87,6 +88,7 @@ globalThis.PersonalAttention = Object.freeze({
DEVELOPMENT: 'development project',
TECH: 'technical accidents',
SEX: 'sex',
+ RELAX: 'rest and relaxation',
PROCLAMATION: 'proclamation',
TRAINING: 'slave training',
});
@@ -100,3 +102,29 @@ globalThis.DescType = Object.freeze({
EVENT: "event",
SURGERY: "surgery"
});
+
+/**
+ * @type {FC.FetishFreeze}
+ * @enum {string}
+ */
+globalThis.Fetish = Object.freeze({
+ NONE: "none",
+ MINDBROKEN: "mindbroken",
+ SUBMISSIVE: "submissive",
+ CUMSLUT: "cumslut",
+ HUMILIATION: "humiliation",
+ BUTTSLUT: "buttslut",
+ BOOBS: "boobs",
+ SADIST: "sadist",
+ MASOCHIST: "masochist",
+ DOM: "dom",
+ PREGNANCY: "pregnancy",
+ BESTIALITY: "bestiality",
+});
+
+/**
+ * @type {Readonly<{MASTERED_XP: number}>}
+ */
+globalThis.Constant = Object.freeze({
+ MASTERED_XP: 200,
+});
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 3f002273b021d564cbdfffdb4955602823c21d2b..0eb384e491d601790aaf13eb88e68f483e0d73eb 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -103,7 +103,6 @@ App.Data.defaultGameStateVariables = {
imageChoice: 1,
inbreeding: 1,
lastBDayEvent: -1,
- lineSeparations: 1,
endweekSaveWarning: 1,
/** @type {'link'|'button'} */
purchaseStyle: 'link',
@@ -165,8 +164,10 @@ App.Data.defaultGameStateVariables = {
setShadowMapping: true,
setSSAO: true,
setSSS: true,
- setTonemapping: true,
setImageSize: 1,
+ set3QView: false,
+ seeAnimation: true,
+ animFPS: 12,
showAgeDetail: 1,
showAppraisal: 1,
showAssignToScenes: 1,
@@ -232,6 +233,7 @@ App.Data.defaultGameStateVariables = {
findName: "",
findBackground: "",
findData: "",
+ underperformersCount: 7,
// eslint-disable-next-line camelcase
pedo_mode: 0,
@@ -296,6 +298,7 @@ App.Data.defaultGameStateVariables = {
// Corp data
App.Data.CorpInitData = {
+ Name: 'Your corporation',
Announced: 0,
Incorporated: 0,
Market: 0,
@@ -449,7 +452,6 @@ App.Data.resetOnNGPlus = {
thisWeeksFSWares: 0,
/** @type {FC.Zeroable<Array<string>>} */
thisWeeksIllegalWares: 0,
- Sweatshops: 0,
/** @type {Array<Array<App.Events.BaseEvent>>} */
eventQueue: [],
@@ -467,7 +469,7 @@ App.Data.resetOnNGPlus = {
reminderEntry: "",
reminderWeek: "",
- currentRule: {},
+ currentRule: null, // {},
costs: 0,
seeBuilding: 0,
purchasedSagBGone: 0,
@@ -511,6 +513,7 @@ App.Data.resetOnNGPlus = {
defaultRules: [],
/** @type {Object.<string, number[]>} */
rulesToApplyOnce: {},
+ raDefaultMode : 0,
REFeminizationCheckinIDs: [],
REMILFCheckinIDs: [],
@@ -870,7 +873,6 @@ App.Data.resetOnNGPlus = {
missingParentID: -10000,
/* animalParts: 0,*/
pregSpeedControl: 0,
- playerSurgery: 0,
bodyswapAnnounced: 0,
surnamesForbidden: 0,
menstruation: 0,
@@ -1086,6 +1088,7 @@ App.Data.resetOnNGPlus = {
cloningSystem: 0,
/** @type {FC.Bool} */
geneticFlawLibrary: 0,
+ consumerDrugs: 0,
projectN: App.Data.projectN,
bodyPuristRiot: 0,
@@ -1295,10 +1298,22 @@ App.Data.resetOnNGPlus = {
PGHack: 0,
BlackmarketPregAdaptation: 0,
- diversePronouns: 0,
+ /* Medical Pavilion */
+ doctor: {
+ state: 0, // controls introduction
+ cost: 500,
+ },
- /* Career-skill gain */
- masteredXP: 200,
+ /* Cosmetic Surgery Suite */
+ pSurgery: {
+ state: 0, // controls introduction and if the assistant is mad at you
+ cooldown: 0, // weeks until usable
+ nursePreg: 0,
+ disloyal: 0, // Getting surgery elsewhere upsets the assistant
+ cost: 0, // How much you have to spend until she forgives you
+ },
+
+ diversePronouns: 0,
/* Weather effect on economy */
antiWeatherFreeze: 0,
@@ -1337,11 +1352,6 @@ App.Data.resetOnNGPlus = {
slave: 0
},
tempEventToggle: 0,
- /**
- * Assignments texts for slaves who choose their own assignment, set at during the first pass in App.SlaveAssignment.choosesOwnJob()
- * @type {Object.<number, string>}
- */
- choosesOwnAssignmentText: {},
favorites: [],
/**
* Any loans the player has taken out.
diff --git a/js/003-data/miscDataNames.js b/js/003-data/miscDataNames.js
index 3371fe8233c87d1048b9ac440dfeafda2262346b..9d485bd3b598a1c8df888d546724c389d29a3564 100644
--- a/js/003-data/miscDataNames.js
+++ b/js/003-data/miscDataNames.js
@@ -199,7 +199,7 @@ App.Data.misc.cookIslanderSlaveSurnames = ["Abba", "Abera", "Aberahama", "Adams"
App.Data.misc.costaRicanSlaveNames = ["Ababa", "AbigaÃl", "Abril", "Adala", "Adalia", "Adela", "Adelaida", "Adelia", "Adelina", "Adelisa", "Adelita", "Adisoda", "Adoración", "Adriana", "Ãfrica", "Agata", "Agueda", "Ãgueda", "Agustina", "Aida", "AÃda", "Aide", "Aileen", "Ainara", "Ainhoa", "Aitana", "Alaina", "Alba", "Alberta", "Albina", "Aldana", "Alejandra", "Aleta", "Alexa", "Alexia", "Alfonsa", "Alheli", "Alia", "Alicia", "Alida", "Alma", "Almadelia", "Almudena", "Alodia", "Aloisia", "Alondra", "Altagracia", "Ãlvara", "Amada", "Amairany", "Amalia", "Amanda", "Amapola", "Amara", "Amaya", "Amelia", "Amparo", "Ana Maria", "Ana", "Anabel", "Anabela", "Anahi", "AnahÃ", "Anai", "Anali", "Analia", "AnalÃa", "Anay", "Andrea", "AndreÃna", "Angela", "Ãngela", "Angeles", "Ãngeles", "Angélica", "Anica", "Anita", "Antonia", "Antonieta", "Apolonia", "Aquilina", "Araceli", "Arantxa", "Aranzazu", "Arely", "Ariana", "Ariel", "Ariela", "Artemisa", "Ascensión", "Aselita", "Ashly", "Asunción", "Aurelia", "Aurora", "Avelina", "Azucena", "Azul", "Barbara", "Bárbara", "Beatriz", "Begoña", "Belén", "Belia", "Belicia", "Belkis", "Benicia", "Benita", "Berenice", "Bernarda", "Bernardina", "Berta", "Bertita", "Beryl", "Betania", "Bianka", "Bibiana", "Blanca", "Bonita", "Bouganvilla", "Bruna", "Brunilda", "Buena", "Calida", "Camelia", "Camila", "Camilla", "Candela", "Candelaria", "Candida", "Cándida", "Canela", "Caridad", "Carina", "Carito", "Carla", "Carlina", "Carlota", "Carmela", "Carmen", "Caro", "Carolina", "Casandra", "Cataleya", "Catalina", "Catrina", "Cecilia", "Celia", "Celida", "Celina", "Celsa", "Chara", "Chaxiraxi", "Chela", "Chelsea", "Chiquita", "Chita", "Cindy", "Citlali", "Clara", "Claribel", "Clarisa", "Claudia", "Clemencia", "Clotilde", "Cobura", "Colombia", "Concepción", "Concha", "Conchita", "Conseja", "Consolación", "Constanza", "Consuela", "Consuelo", "Corazón", "Corina", "Covadonga", "Crisanta", "Crisol", "Cristina", "Cruz", "Cynthia", "Dafna", "Dafne", "Daisy", "Dalia", "Dalila", "Damaris", "Damiana", "Damita", "Daniela", "Daniella", "Daniria", "Daria", "Daritza", "Darling", "Davina", "Dayana", "Dayna", "Débora", "Delfina", "Delia", "Deliasofia", "Delmira", "Delores", "Demetria", "Desamparados", "Desdemona", "Desire", "Desiree", "Diana", "Dinora", "Dionecia", "Dionicia", "Dionisia", "Dolores", "Dominga", "Dominica", "Dora", "Dorotea", "Dulce", "Dulcinea", "Edelmira", "Eglantina", "Electra", "Elena", "Eleonora", "Elia", "Eliana", "Elida", "Eligia", "Elina", "Elisa", "Elizabeth", "Elmira", "Elodea", "Eloisa", "Elvia", "Elvira", "Emelda", "Emelia", "Emilia", "Emiliana", "Encarna", "Encarnación", "Enedina", "Engracia", "Enka", "Enriqua", "Enriqueta", "Epifania", "Ericka", "Erika", "Ernestina", "Esmeralda", "Esperanza", "Estefania", "EstefanÃa", "Estela", "Estella", "Ester", "Esther", "Estil", "Estrelita", "Estrella", "Etelvina", "Eudoxia", "Eufemia", "Eufrasia", "Eugenia", "Eulalia", "Eulogia", "Eustolia", "Eva", "Evelyn", "Evita", "Fabiana", "Fabiola", "Fabricia", "Facunda", "Fatima", "Fátima", "Faustina", "Felicia", "Feliciana", "Felicidad", "Felipa", "Felisa", "Fermina", "Fernanda", "Filipa", "Filomena", "Fiorella", "Flavia", "Flor", "Flora", "Florencia", "Floria", "Florida", "Franca", "Francesca", "Francisca", "Frida", "Froilana", "Fuensanta", "Fulberta", "Fulca", "Gabriela", "Galia", "Gara", "Gema", "Genedina", "Génova", "Genoveva", "Geo", "Gilda", "Ginebra", "Gladis", "Glenda", "Glendorlee", "Gloria", "Gracia", "Graciela", "Grazia", "Gretel", "Griselda", "Guada", "Guadalupe", "Guillermina", "Guiomar", "Hada", "Hañagua", "Haydee", "Haydée", "Hazel", "Heli", "Heloisa", "Helvetia", "Hera", "Hermalinda", "Herminia", "Hilaria", "Hilda", "Hillary", "Hipolita", "Holly", "Hortensia", "Iara", "Idalia", "Idalie", "Idonia", "Ifigenia", "Ignacia", "Ilda", "Ilena", "Illena", "Ilona", "Imelda", "Immaculada", "Ines", "Inés", "Inez", "Inma", "Inmaculada", "Irene", "Irma", "Isa", "Isabel", "Isabella", "Isaura", "Isidora", "Isidra", "Ismary", "Ismelda", "Itahisa", "Ivette", "Ivonne", "Jacinta", "Jacqueline", "Janina", "Jasmine", "Javiera", "Jazmin", "Jenara", "Jesica", "Jessica", "Jesusa", "Jesusita", "Jimena", "Joaquina", "Jocelin", "Johana", "Johanna", "Jordana", "Jorgelina", "Josefa", "Josefin", "Josefina", "Joselin", "Jovita", "Juana", "Juanita", "Judith", "Julia", "Juliana", "Julieta", "Justina", "Kamila", "Karen", "Karina", "Karla", "Karol", "Karyna", "Katherine", "Kathryn", "Kayla", "Kenia", "Laila", "Lali", "Lara", "Larisa", "Larissa", "Laura", "Laureana", "Laurencia", "Lea", "Leandra", "Leila", "Leire", "Lena", "Leonarda", "Leonela", "Leonor", "Leonora", "Leopoldina", "Leticia", "LÃa", "Liana", "Libertad", "Libia", "Licha", "Lidia", "Ligia", "Lilia", "Liliana", "Liliosa", "Lina", "Linda", "Lisa", "Liselotte", "Lissette", "Lizete", "Lola", "Lolita", "Loreley", "Lorena", "Lorenza", "Lorna", "Lourdes", "Luana", "Lucelia", "Lucero", "Lucha", "Lucia", "LucÃa", "Luciana", "Lucila", "Lucina", "Lucrecia", "Luisa", "Luna", "Lupe", "Lupita", "Luz", "Luzdivina", "Macarena", "Macaria", "Madalena", "Madrid", "Mae", "Magdalena", "Magnolia", "Maitane", "Maite", "Maiya", "Malda", "Manuela", "Manuelita", "Marcela", "Marcelina", "Margarita", "Maria Concepción", "Maria de los Dolores", "Maria del Carmen", "Maria Encarnación", "Maria Ester", "Maria Guadalupe", "Maria Isabel", "MarÃa Jesús", "MarÃa José", "Maria Juana", "MarÃa Juana", "Maria Luisa", "MarÃa Magdalena", "Maria", "MarÃa", "Mariah", "Marian", "MarÃan", "Mariana", "Maribel", "Maricarmen", "Maricela", "Maricruz", "Mariela", "Mariesa", "Marina", "Marion", "Maripaz", "Marisa", "Marisol", "Marita", "Marquita", "Marta", "Martina", "Martita", "Matilde", "Maureen", "Maya", "Mayra", "Mayte", "Meagens", "Melissa", "Mercedes", "Micaela", "Miguela", "Mila", "Milagros", "Milena", "Mirca", "Mireia", "Mirella", "Mireya", "Miriam", "Mirna", "Modesta", "Moira", "Monica", "Mónica", "Monse", "Monserrat", "Montserrat", "Nadia", "Nahir", "Naike", "Naomi", "Narcisa", "Narda", "Natacha", "Natalia", "Natalie", "Natividad", "Naty", "Nayeli", "Nazarena", "Nazaret", "Nazareth", "Nelia", "Nélida", "Nerea", "Neva", "Niceto", "Nicole", "Nidia", "Nieves", "Nilda", "Nina", "Ninfa", "Noe", "Noelia", "Noemi", "NoemÃ", "Norma", "Nova", "Nuela", "Nuria", "Obdulia", "Octavia", "Odelia", "Odilia", "Ofelia", "Olga", "Olimpia", "Oliva", "Olivia", "Olivita", "Oralia", "Orestes", "Oria", "Orlanda", "Orlantha", "Otilia", "Ovidia", "Palma", "Palmira", "Paloma", "Pamela", "Pancracia", "Pandora", "Pantera", "Paola", "Paqui", "Pascua", "Pascuala", "Patricia", "Paula", "Paulette", "Paulina", "Paz", "Penelope", "Perla", "Perpetua", "Petra", "Petrona", "Pia", "Piedad", "Pilar", "Placinta", "Pricia", "Primitiva", "Priscilla", "Pura", "Purificación", "Querida", "Querina", "Quirina", "Quisela", "Rafaela", "Raimunda", "Ramira", "Ramona", "Raquel", "Rayén", "Raylina", "Rebeca", "Rebecca", "Refugio", "Reina", "Remedios", "Renata", "Renée", "Resurrección", "Reyna", "Ricarda", "Rita", "Roberta", "RocÃo", "Rodolfa", "Rolanda", "Romina", "Rosa Maria", "Rosa", "Rosalia", "RosalÃa", "Rosana", "Rosandra", "Rosaria", "Rosario", "Rosaura", "Rosenda", "Rosina", "Roxana", "Rufino", "Rut", "Ruth", "Sabana", "Sabina", "Sabrina", "Salivia", "Salomé", "Salud", "Salvadora", "Sancha", "Sandra", "Santana", "Sara", "Sarai", "Sarita", "Saturnina", "Segismunda", "Selena", "Selia", "Serafina", "Serina", "Sevilla", "Shantely", "Sharolyn", "Sharon", "Sigrid", "Silvana", "Silvia", "Sinai", "Socorro", "Sofia", "SofÃa", "Sol", "Solana", "Solange", "Soledad", "Sonia", "Soraya", "Sotera", "Stephanie", "Sucely", "Susana", "TaÃs", "Talia", "Tamara", "Tania", "Tatiana", "Telma", "Teodora", "Teofila", "Tequila", "Teresa", "Teresita", "Thiare", "Tiare", "Tomasa", "Tracy", "Triana", "Trinidad", "Uliana", "Ulrica", "Ursula", "Úrsula", "Vale", "Valencia", "Valentina", "Valeria", "Vane", "Vanesa", "Vanessa", "Vanina", "Velia", "Venecia", "Ventura", "Veronica", "Verónica", "Vica", "Vicenta", "Victoria", "Vilma", "Violeta", "Virginia", "Virtudes", "Visitación", "Viva", "Viviana", "Walkiria", "Walquiria", "Wendy", "Wuaira", "Xara", "Xaviera", "Xenia", "Xiana", "Xilosma", "Ximena", "Xiomara", "Yadira", "Yahaira", "Yajaira", "Yancy", "Yanet", "Yanina", "Yanory", "Yaretzi", "Yaritza", "Yasmina", "Yazmin", "Yazmina", "Yendry", "Yesenia", "Yessenia", "Ylenia", "Ynes", "Yolanda", "Yoselin", "Ysabel", "Yuliana", "Yurixi", "Yvette", "Zaida", "Zaira", "Zeferina", "Zoila", "Zoraida", "Zulema", "Zuleyka", "Zulma"];
App.Data.misc.costaRicanMaleNames = ["Abel", "Abelardo", "Abimael", "Absalon", "Acacio", "Adalberto", "Adan", "Adano", "Adelardo", "Adelmaro", "Ademar", "Adonis", "Adrián", "Agapito", "AgustÃn", "Aladino", "Albano", "Alberto", "Albino", "Aldair", "Aldo", "Alejandro", "Alejo", "Alex", "Alfonso", "Alfredo", "Alipio", "Allan", "Alonso", "Alterio", "Alvaro", "Ãlvaro", "Amadeo", "Amado", "Amador", "Amalio", "Amando", "Ambrosio", "Amelio", "Amilcar", "Amparo", "Ampelio", "Anacleto", "Anastasio", "Anatolio", "Andreo", "Andres", "Angel", "Anibal", "Aniceto", "Anselmo", "Antioco", "Antonio", "António", "Aparicio", "Apocalipsis", "Apolinario", "Apolo", "Aquiles", "Aquilino", "Arcángel", "Arcinio", "ArÃstides", "Armando", "Arnaldo", "Arnulfo", "Arquimedes", "Arsenio", "Artemio", "Arturo", "Ascensión", "Asclepiades", "Atanasio", "Atilio", "Augusto", "Aureliano", "Aurelio", "Auxilio", "Avelino", "Baltazar", "Bartolomé", "Bautista", "Beltran", "Benedicto", "Benigno", "Benito", "BenjamÃn", "Bernardino", "Bernardo", "Bienvenido", "Blas", "Bob", "Bonito", "Borja", "Braulio", "Bricio", "Bruno", "Calixto", "Calvino", "Camari", "Camilo", "Candido", "Carlitos", "Carlos Enrique", "Carlos Ivan", "Carlos Jose", "Carlos", "Carmelo", "Cartez", "Casandro", "Casimiro", "Casto", "Castor", "Cayetano", "Cecilio", "Ceferino", "Celedonio", "Celerino", "Celestino", "Celio", "Celso", "César", "Chico", "Christian", "Cid", "Cipriano", "Ciriaco", "Cirilo", "Ciro", "Claudio", "Clemente", "Cleto", "Clodomiro", "Colón", "Confesor", "Conrado", "Constancio", "Constantino", "Corbin", "Cornelio", "Cortez", "Cosme", "Crescencio", "Crisanto", "Crispo", "Cristobal", "Cruz", "Custodio", "Cutberto", "Dagoberto", "Dámaso", "Damián", "Daniel", "Danilo", "Dardo", "Dario", "David", "Delfin", "Delfino", "Demetrio", "Demócrito", "Deodato", "Derico", "Desiderio", "Diego", "Dimas", "Dionisio", "Domas", "Domiciano", "Dominador", "Domingo", "Donaldo", "Doroteo", "Duilio", "Eberardo", "Edelberto", "Edelio", "Edelmar", "Edelmiro", "Edgar", "Edgardo", "Edmundo", "Eduardo", "Edwin", "Efrain", "Efrén", "Egidio", "Eladio", "Elbio", "Eleuterio", "Elián", "Elias", "Eliecer", "Eligio", "Elio", "Eliseo", "Eliut", "Eloy", "Elvio", "Emerio", "Emeterio", "Emiliano", "Emilio", "Enrique", "Epicuro", "Epifanio", "Epimenio", "Epitacio", "Erardo", "Erasmo", "Eric", "Erik", "Ernesto", "Espartaco", "Estanislao", "Esteban", "Eufemio", "Eufracio", "Eugenio", "Eulalio", "Eulojio", "Eusebio", "Eustacio", "Evando", "Evaristo", "Everardo", "Expedito", "Ezequiel", "Fabián", "Fabio", "Faustino", "Fausto", "Favio", "Federico", "Feliciano", "Felipe", "Felisardo", "Felix", "Fermin", "Fernando", "Fidel", "Filadelfo", "Filademo", "Filemon", "Filiberto", "Flavio", "Floreal", "Florencio", "Florián", "Francisco", "Franco", "Fulgencio", "Fulvio", "Gabimael", "Gabino", "Gabriel", "Gadiel", "Galeaso", "Galo", "Gary", "Gaspar", "Gaudencio", "Gedeón", "Genaro", "Generoso", "George", "Georman", "Gerald", "Gerardo", "Germán", "Germinal", "Gerson", "Gervasio", "Gesualdo", "Getulio", "Gilberto", "Gildardo", "Giovanni", "Gomez", "Gonzalo", "Gracián", "Graciano", "Gregorio", "Gualberto", "Gualterio", "Guarionex", "Guillermo", "Gumecindo", "Gustavo", "Gutierre", "Hadriano", "Hector", "Helias", "Heliodoro", "Henry", "Heráclito", "Heriberto", "Hernán", "Hernando", "Heródoto", "Higinio", "Hilario", "Hipolito", "Homero", "Homobono", "Honesto", "Honoratio", "Horacio", "Hugan", "Humberto", "Ibero", "Ignacio", "Ignaz", "Inocencio", "Ionatán", "Isaias", "Isidro", "Ismael", "Ivan", "Jacinto", "Jaime Luis", "Jaime", "Jairo", "Jandino", "Jarlex", "Javier", "Jeremias", "Jesús", "Jilberto", "Joaquin", "Jonás", "Jorge", "José Alberto", "José Javier", "José Luis", "José MarÃa", "José", "Josell", "Joseph", "Juan Carlos", "Juan Diego", "Juan", "Julián", "Juliano", "Julino", "Julio", "Justiniano", "Justino", "Juvenal", "Ladislao", "Landerico", "Landolfo", "Laureano", "Laurelino", "Laurentino", "Lauro", "Lazaro", "Leal", "Leandro", "Learco", "Lelio", "Leo", "Leobardo", "Leocadio", "León", "Leonardo", "Leonel", "Leónidas", "Leonzo", "Leopoldo", "Leto", "Liberal", "Liberato", "Libio", "Licugro", "Lino", "Lisandro", "Livio", "Lope", "Lorenzo", "Loreto", "Luano", "Lucas", "Lucero", "Luciano", "Lucio", "Lucrecio", "Luis", "Luiz", "Macabeo", "Macario", "Macedonio", "Maciel", "Malaquias", "Manfredo", "Manuel", "Marcelino", "Marcelo", "Marcial", "Marcio", "Marco", "Marcos", "Mariano", "Marino", "Mario", "MartÃn", "Mateo", "Matias", "Mauricio", "Mauro", "Maximo", "Melchor", "Melecio", "Meliton", "Melquisede", "Menandro", "Mentor", "Mercurio", "Miguel Angel", "Miguel", "Misael", "Modesto", "Moises", "Monserrate", "Nacho", "Naldo", "Narciso", "Narno", "Natal", "Natalio", "Nataniel", "Nazareno", "Nazaret", "Nazario", "Neandro", "Neftali", "Nemesio", "Neptuno", "Nereo", "Nery", "Nestor", "Nicandro", "Nicanor", "Nicasio", "Niceto", "Nicolas", "Nilo", "Noe", "Nolasco", "Norberto", "Normando", "Nuncio", "Obdulio", "Octaviano", "Octavio", "Olegario", "Olimpo", "Onofre", "Orangel", "Orencio", "Orestes", "Orfeo", "Origenes", "Orión", "Orlando", "Ortiz", "Oscar", "Óscar", "Osmundo", "Osvaldo", "Oswaldo", "Otilio", "Otoniel", "Ovidio", "Pablo", "Pacifico", "Pancracio", "Panfilo", "Paris", "Parmenio", "Pascual", "Pastor", "Patricio", "Pedro", "Perfecto", "Perpetuo", "Placido", "Policarpo", "Polifemo", "Porfirio", "Poseidón", "Priamo", "Procopio", "Prometeo", "Próspero", "QuentÃn", "Quintero", "Quito", "Rafael", "Raimundo", "Ramiro", "Ramón", "Raúl", "Raymundo", "Refugio", "Reinaldo", "Remigio", "Renato", "Renzo", "Rey", "Reyes", "Reynaldo", "Ricardo", "Rico", "Rigoberto", "Roberto", "Rocio", "Rodolfo", "Rodrigo", "Rogelio", "Róger", "Rojelio", "Rolando", "Román", "Romero", "Ronald", "Ronaldo", "Roque", "Rosario", "Rosendo", "Ruben", "Rubio", "Rufo", "Ruperto", "Sabelio", "Sabino", "Salomón", "Salvador", "Salviano", "Salvo", "Sancho", "Sansón", "Santiago", "Santino", "Santos", "Saturnino", "Saúl", "Sebastián", "Sebastiano", "Segismundo", "Segundo", "Sempronio", "Serafin", "Sergio", "Servando", "Servio", "Severino", "Silverio", "Silviano", "Silvio", "Simón", "Sixto", "Socorro", "Solano", "Sotero", "Tacio", "Tacito", "Tadeo", "Tajo", "Tancredo", "Tarquino", "Tarsicio", "Telemaco", "Teodomiro", "Teodoro", "Teodosio", "Teofano", "Teofilio", "Tercio", "Terencio", "Tiberio", "Tiburcio", "Ticiano", "Timoteo", "Tino", "Tito", "Tomás", "Toribio", "Toruato", "Tranquiliano", "Tranquilino", "Transito", "Tripilo", "Tristán", "Tulio", "Ubaldo", "Ulises", "Ulrico", "Unai", "Urbano", "Uriel", "Valdemar", "ValentÃn", "Valeriano", "Valerio", "Vance", "Venturo", "Vermundo", "Vero", "Vicente", "Victor", "VÃctor", "Victoriano", "Vidal", "Virgilio", "Viviano", "Vulpiano", "Walberto", "Wilfredo", "Xavier", "Yadiel", "Yago", "Yamel", "Yareli", "Yaro", "Yerai", "Ygnacio", "Yoel", "Yojany", "Yuniel", "Zenobio", "Zumel"];
-App.Data.misc.costaRicanSlaveSurnames = ["Abadia", "Abarca", "Abellan", "Abrahams", "Aburto", "Acevedo", "Achio", "Acon", "Acosta", "Acuña", "Adams", "Adanis", "Aguero", "Aguilar", "Aguilera", "Aguirre", "Alan", "Alanis", "Alarcon", "Albonico", "Albónico", "Alcazar", "Alcocer", "Alegria", "Aleman", "Alfaro", "Alguera", "Ali", "Allen", "Almanza", "Almengor", "Alonso", "Alpizar", "Altamirano", "Alvarado", "Alvarez", "Amador", "Amaya", "Amores", "Ampie", "Anchia", "Anderson", "Andrade", "Angulo", "Antillon", "Aparicio", "Apu", "Apuy", "Aragon", "Araica", "Arana", "Araujo", "Arauz", "Araya", "Arbenz", "Arburola", "Arce", "Arcia", "Arcos", "Ardon", "Arevalo", "Arguedas", "Arguello", "Argueta", "Arguijo", "Arias", "Arley", "Arredondo", "Arrieta", "Arriola", "Arroliga", "Arrones", "Arronis", "Arroyo", "Artavia", "Artiaga", "Artola", "Asch", "Astorga", "Astua", "Atencio", "Avalos", "Avellan", "Avendaño", "Avila", "Aviles", "Ayala", "Aymerich", "Azofeifa", "Baca", "Badilla", "Baez", "Baldelomar", "Baldi", "Baldioceda", "Balladares", "Ballestero", "Balmaceda", "Baltodano", "Bañez", "Barahona", "Barberena", "Barboza", "Barillas", "Barquero", "Barrantes", "Barrera", "Barrett", "Barrientos", "Barrios", "Bartels", "Barth", "Bastos", "Batista", "Batres", "Becerra", "Beckford", "Bedoya", "Beita", "Bejarano", "Bell", "Bellido", "Bello", "Beltran", "Benavides", "Benitez", "Bennett", "Bent", "Bermudez", "Bermúdez", "Bernard", "Berrios", "Berrocal", "Betancourt", "Beteta", "Binns", "Blackwood", "Blanco", "Blandon", "Bogantes", "Bogarin", "Bojorge", "Bolandi", "Bolaños", "Bolivar", "Boniche", "Bonilla", "Borbon", "Borbón", "Borge", "Borges", "Boza", "Brais", "Bran", "Bravo", "Brenes", "Briceño", "Briones", "Brizuela", "Brooks", "Brown", "Bruno", "Bryan", "Buitrago", "Burgos", "Bustamante", "Busto", "Bustos", "Buzano", "Caamaño", "Cabalceta", "Caballero", "Cabezas", "Cabraca", "Cabrera", "Caceres", "Cajina", "Caldern", "Calderon", "Calero", "Calvo", "Camacho", "Camareno", "Cambronero", "Campbell", "Campos", "Canales", "Cañas", "Canessa", "Cano", "Cantillano", "Cantillo", "Canton", "Caravaca", "Carazo", "Carballo", "Carbonero", "Cardenas", "Cardona", "Cardoza", "Carmiol", "Carmona", "Carpio", "Carranza", "Carrera", "Carrillo", "Carrion", "Cartin", "Carvajal", "Casanova", "Casares", "Casasola", "Cascante", "Casco", "Caseres", "Castañeda", "Castellon", "Castillo", "Castrillo", "Castro", "Caton", "Cavallini", "Ceciliano", "Cedeño", "Centeno", "Cerda", "Cerdas", "Cerna", "Cernas", "Cervantes", "Cespedes", "Chacn", "Chacon", "Chacón", "Chamorro", "Chan", "Chang", "Chanto", "Charpentier", "Chavarria", "ChavarrÃa", "Chaverri", "Chaves", "Chavez", "Chen", "Cheng", "Cheves", "Chevez", "Chin", "Chinchilla", "Ching", "Chiroldes", "Cid", "Cisnero", "Cisneros", "Clark", "Clarke", "Coghi", "Cole", "Colina", "Collado", "Colomer", "Colville", "Concepcion", "Condega", "Conejo", "Contreras", "Cooper", "Cordero", "Cordoba", "Cordoncillo", "Cordonero", "Corea", "Corella", "Cornejo", "Coronado", "Corrales", "Correa", "Cortes", "Cortez", "Costa", "Coto", "Crawford", "Cruz", "Cuadra", "Cubero", "Cubillo", "Cuendis", "Cuevas", "Cunningham", "Daniels", "Darcia", "Davila", "Davis", "de La Cruz", "de La", "de Leon", "de los Angeles", "del Valle", "Delgadillo", "Delgado", "Desanti", "Diaz", "Dijeres", "Dinarte", "Dittel", "Dixon", "Dobles", "Dominguez", "Donato", "Dormond", "Douglas", "Drummond", "Duarte", "Duartes", "Duran", "Durán", "Echandi", "Echavarria", "Eche", "Echeverria", "Eduarte", "Edwards", "Elizondo", "Ellis", "Enriquez", "Eras", "Escalante", "Escamilla", "Escobar", "Escoto", "Espinales", "Espinosa", "Espinoza", "Esquivel", "Esteller", "Estrada", "Estrella", "Evans", "Faerron", "Fajardo", "Fallas", "Farrier", "Feng", "Feoli", "Fernandez", "Fernández", "Fernndez", "Ferrer", "Ferreto", "Figueroa", "Fletes", "Flores", "Fonseca", "Forbes", "Foster", "Fournier", "Francis", "Franco", "Freer", "Fuentes", "Fuertes", "Fumero", "Funes", "Fung", "Gabuardi", "Gaitan", "Galagarza", "Galarza", "Galeano", "Galiano", "Gallardo", "Gallegos", "Gallo", "Galvez", "Gamboa", "Gamez", "Garay", "Garbanzo", "Garca", "Garcia", "Garita", "Garnier", "Garrido", "Garro", "Gatgens", "Gatjens", "Gayle", "Gazel", "Gazo", "Gil", "Giron", "Godinez", "Godoy", "Golcher", "Gomez", "Gómez", "Gongora", "Goñi", "Gonzaga", "Gonzalez", "González", "Gonzalo", "Gordon", "Gorgona", "Graham", "Grajal", "Grajales", "Granados", "Granda", "Granja", "Grant", "Green", "Grijalba", "Grillo", "Guadamuz", "Guardia", "Guell", "Guerra", "Guerrero", "Guevara", "Guffey", "Guido", "Guillen", "Gurdian", "Gutierrez", "Gutiérrez", "Gutirrez", "Guzman", "Hall", "Harris", "Henriquez", "Henry", "Herckis", "Hernandez", "Hernández", "Hernndez", "Herra", "Herrera", "Herrero", "Herzz", "Hidalgo", "Hines", "Hodgson", "Howard", "Huang", "Hudson", "Huertas", "Huete", "Huezo", "Hurtado", "Ibarra", "Icaza", "Iglesias", "Ilama", "Inces", "Infante", "Inman", "Iriarte", "Irias", "Irigoyen", "Irola", "Izaguirre", "Jacamo", "Jackson", "Jaen", "Jaime", "James", "Jara", "Jaramillo", "Jarquin", "Jaubert", "Jenkins", "Jerez", "Jimenez", "Jiménez", "Jinesta", "Jiron", "Johanning", "Johnson", "Jones", "Jose", "Joseph", "Josephs", "Juarez", "Junes", "Junez", "Keith", "Kelly", "Klay", "Kopper", "Kuzdas", "Lacayo", "Lagos", "Laguna", "Lamas", "Lang", "Lanuza", "Lanza", "Lanzoni", "Lara", "Largaespada", "Larios", "Lascarez", "Latino", "Laurent", "Lawrence", "Lawson", "Lazaro", "Lazo", "Leal", "Leandro", "Ledezma", "Lee", "Leiton", "Leiva", "Lemaitre", "Leon", "Lepiz", "Lewis", "Lezama", "Lezcano", "Li", "Lin", "Linares", "Lindo", "Linton", "Lios", "Lira", "Lizano", "Loaiciga", "Loaiza", "Lobo", "Lopez", "Loria", "Lozano", "Lugo", "Lumbi", "Luna", "Lynch", "Machado", "Macotelo", "Madrigal", "Madriz", "Mainieri", "Mairena", "Maitland", "Malavassi", "Malespin", "Maltes", "Maltez", "Manzanares", "Maradiaga", "Marchena", "Marenco", "Marin", "Marn", "Maroto", "Marquez", "Marrero", "Marroquin", "Martin", "Martinez", "MartÃnez", "Masis", "Mata", "Matamoros", "Matarrita", "Mathieu", "Mattey", "Matus", "May", "Mayorga", "McCarthy", "McDonald", "McFarlane", "McKenzie", "McLean", "Medina", "Medrano", "Mejia", "Mejias", "Mejicano", "Melendez", "Membreño", "Mena", "Mendes", "Mendez", "Mendieta", "Mendoza", "Meneses", "Menocal", "Meoño", "Mercado", "Merino", "Mesen", "Meza", "Michalski", "Milanes", "Miller", "Millon", "Miranda", "Mitchell", "Mitre", "Mojica", "Molina", "Moncada", "Mondragon", "Monestel", "Monge", "Mongrillo", "Montalban", "Montano", "Montealegre", "Montenegro", "Montero", "Monterrey", "Monterrosa", "Montes de Oca", "Montes", "Montezuma", "Montiel", "Montoya", "Mora", "Moraga", "Morales", "Moran", "Morazán", "Moreira", "Moreno", "Morera", "Morgan", "Morice", "Morris", "Morua", "Morúa", "Morun", "Moscoa", "Moscoso", "Mosquera", "Moya", "Munguia", "Muñiz", "Muñoz", "Murcia", "Murillo", "Murray", "Mussio", "Myrie", "Najera", "Naranjo", "Narvaez", "Navarrete", "Navarro", "Navas", "Nelson", "Ng", "Nieto", "Noel", "Noguera", "Norman", "Nova", "Novo", "Novoa", "Nuñez", "Obaldia", "Obando", "Obregon", "Ocampo", "Ochoa", "Ocon", "Oconitrillo", "Odio", "Ojeda", "Olivar", "Olivares", "Olivas", "Olmos", "Olsen", "Ondoy", "Onil", "Oporta", "Oporto", "Oquendo", "Ordeñana", "Ordoñez", "Oreamuno", "Orellana", "Orias", "Orlich", "Orocu", "Orozco", "Ortega", "Ortiz", "Oses", "Osorio", "Osorno", "Otarola", "Otero", "Otoya", "Ovares", "Oviedo", "Pacheco", "Padilla", "Paez", "Pais", "Paisano", "Palacio", "Palacios", "Palavicini", "Palma", "Palmer", "Palomo", "Pana", "Paniagua", "Parajeles", "Pardo", "Paris", "Parks", "Parra", "Parrales", "Pasos", "Pastor", "Pastrana", "Pastrano", "Patiño", "Patterson", "Pavon", "Payan", "Paz", "Pazos", "Pena", "Peña", "Peñaranda", "Peralta", "Peraza", "Pereira", "Perera", "Perez", "Pessoa", "Phillips", "Picado", "Pichardo", "Picon", "Piedra", "Pilarte", "Pimentel", "Piña", "Pinagal", "Piñar", "Pineda", "Pinnock", "Pinto", "Pita", "Pitti", "Pizarro", "Pochet", "Polanco", "Pomares", "Ponce", "Porras", "Portilla", "Portillo", "Portuguez", "Potoy", "Poveda", "Powell", "Prada", "Prado", "Prendas", "Prieto", "Protti", "Pulido", "Quedo", "Quesada", "Quiel", "Quijano", "Quintana", "Quintanilla", "Quintero", "Quiros", "Quirós", "Quirs", "Ramirez", "RamÃrez", "Ramos", "Ramrez", "Rangel", "Recio", "Redondo", "Reid", "Reina", "Retana", "Retes", "Rey", "Reyes", "Richards", "Richmond", "Rios", "Rivas", "Rivera", "Rizo", "Roa", "Robalino", "Robert", "Robinson", "Roblero", "Robles", "Robleto", "Rocha", "Roda", "Rodriguez", "RodrÃguez", "Rojas", "Roldan", "Roman", "Romero", "Roque", "Rosabal", "Rosales", "Rosas", "Rose", "Roses", "Ross", "Rostran", "Roucka", "Rovira", "Rowe", "Royo", "Rubi", "Rubio", "Rueda", "Rugama", "Ruiz", "Saavedra", "Saballo", "Saballos", "Saborio", "Saenz", "Sáenz", "Sagot", "Salamanca", "Salas", "Salazar", "Saldaña", "Salgado", "Salguera", "Salguero", "Salinas", "Salmeron", "Salvatierra", "Samudio", "Samuels", "Sanabria", "Sanarrusia", "Sanchez", "Sánchez", "Sancho", "Sandi", "Sandino", "Sandoval", "Santamaria", "Santana", "Santos", "Saravia", "Sarmiento", "Sauma", "Saurez", "Sawyers", "Schmidt", "Scott", "Seas", "Segnini", "Segura", "Selles", "Selva", "Sequeira", "Serracin", "Serrano", "Sevilla", "Sibaja", "Sierra", "Siezar", "Siles", "Silesky", "Silva", "Simpson", "Sing", "Sirias", "Smith", "Snchez", "Soares", "Sobalbarro", "Sobrado", "Sojo", "Solano", "Solera", "Solis", "Solorzano", "Sols", "Somarribas", "Soro", "Sosa", "Sotela", "Sotelo", "Soto", "Soza", "Spencer", "Steller", "Sterling", "Stewart", "Suarez", "Suazo", "Tabash", "Tablada", "Talavera", "Taleno", "Tames", "Tapia", "Taylor", "Telles", "Tellez", "Tello", "Tencio", "Tenorio", "Teran", "Tercero", "Thomas", "Thompson", "Thorpe", "Tijerino", "Tinoco", "Tobal", "Toledo", "Torrente", "Torrentes", "Torres", "Tortos", "Toruño", "Tosso", "Traña", "Trejos", "Treminio", "Trigueros", "Troyo", "Trujillo", "Turcios", "Ubau", "Ugalde", "Ugarte", "Ujueta", "Ukermann", "Ulate", "Ulloa", "Umana", "Umaña", "Umanzor", "Unfried", "Urbina", "Ureña", "Uriarte", "Uribe", "Urtecho", "Uva", "Vado", "Vaglio", "Valdelomar", "Valderrama", "Valderramos", "Valdes", "Valdez", "Valdivia", "Valencia", "Valenciano", "Valenzuela", "Valerin", "Valerio", "Valladares", "Valle", "Vallecillo", "Vallejo", "Vallejos", "Valles", "Valverde", "Vanegas", "Varela", "Vargas", "Vasquez", "Vazquez", "Vega", "Velasquez", "Velazquez", "Velez", "Venegas", "Ventura", "Viales", "Victor", "Vidal", "Vidaurre", "Vigil", "Vilchez", "Villa", "Villachica", "Villafuerte", "Villagra", "Villalobos", "Villalta", "Villanea", "Villanueva", "Villaplana", "Villar", "Villarebia", "Villarevia", "Villarreal", "Villavicencio", "Villegas", "Vindas", "Viquez", "VÃquez", "Vivas", "Vives", "Vizcaino", "Volio", "Walker", "Wallace", "Walters", "Wang", "Watson", "Webb", "West", "White", "Williams", "Wilson", "Wint", "Wong", "Wright", "Wu", "Yglesias", "Young", "Yubank", "Zambrana", "Zambrano", "Zamora", "Zapata", "Zarate", "Zavala", "Zavaleta", "Zelaya", "Zeledon", "Zeledón", "Zepeda", "Zheng", "Ziga", "Zumbado", "Zuñiga"];
+App.Data.misc.costaRicanSlaveSurnames = ["Abadia", "Abarca", "Abellan", "Abrahams", "Aburto", "Acevedo", "Achio", "Acon", "Acosta", "Acuña", "Adams", "Adanis", "Aguero", "Aguilar", "Aguilera", "Aguirre", "Alan", "Alanis", "Alarcon", "Albonico", "Albónico", "Alcazar", "Alcocer", "Alegria", "Aleman", "Alfaro", "Alguera", "Ali", "Allen", "Almanza", "Almengor", "Alonso", "Alpizar", "Altamirano", "Alvarado", "Alvarez", "Amador", "Amaya", "Amores", "Ampie", "Anchia", "Anderson", "Andrade", "Angulo", "Antillon", "Aparicio", "Apu", "Apuy", "Aragon", "Araica", "Arana", "Araujo", "Arauz", "Araya", "Arbenz", "Arburola", "Arce", "Arcia", "Arcos", "Ardon", "Arevalo", "Arguedas", "Arguello", "Argueta", "Arguijo", "Arias", "Arley", "Arredondo", "Arrieta", "Arriola", "Arroliga", "Arrones", "Arronis", "Arroyo", "Artavia", "Artiaga", "Artola", "Asch", "Astorga", "Astua", "Atencio", "Avalos", "Avellan", "Avendaño", "Avila", "Aviles", "Ayala", "Aymerich", "Azofeifa", "Baca", "Badilla", "Baez", "Baldelomar", "Baldi", "Baldioceda", "Balladares", "Ballestero", "Balmaceda", "Baltodano", "Bañez", "Barahona", "Barberena", "Barboza", "Barillas", "Barquero", "Barrantes", "Barrera", "Barrett", "Barrientos", "Barrios", "Bartels", "Barth", "Bastos", "Batista", "Batres", "Becerra", "Beckford", "Bedoya", "Beita", "Bejarano", "Bell", "Bellido", "Bello", "Beltran", "Benavides", "Benitez", "Bennett", "Bent", "Bermudez", "Bermúdez", "Bernard", "Berrios", "Berrocal", "Betancourt", "Beteta", "Binns", "Blackwood", "Blanco", "Blandon", "Bogantes", "Bogarin", "Bojorge", "Bolandi", "Bolaños", "Bolivar", "Boniche", "Bonilla", "Borbon", "Borbón", "Borge", "Borges", "Boza", "Brais", "Bran", "Bravo", "Brenes", "Briceño", "Briones", "Brizuela", "Brooks", "Brown", "Bruno", "Bryan", "Buitrago", "Burgos", "Bustamante", "Busto", "Bustos", "Buzano", "Caamaño", "Cabalceta", "Caballero", "Cabezas", "Cabraca", "Cabrera", "Caceres", "Cajina", "Caldern", "Calderon", "Calero", "Calvo", "Camacho", "Camareno", "Cambronero", "Campbell", "Campos", "Canales", "Cañas", "Canessa", "Cano", "Cantillano", "Cantillo", "Canton", "Caravaca", "Carazo", "Carballo", "Carbonero", "Cardenas", "Cardona", "Cardoza", "Carmiol", "Carmona", "Carpio", "Carranza", "Carrera", "Carrillo", "Carrion", "Cartin", "Carvajal", "Casanova", "Casares", "Casasola", "Cascante", "Casco", "Caseres", "Castañeda", "Castellon", "Castillo", "Castrillo", "Castro", "Caton", "Cavallini", "Ceciliano", "Cedeño", "Centeno", "Cerda", "Cerdas", "Cerna", "Cernas", "Cervantes", "Cespedes", "Chacn", "Chacon", "Chacón", "Chamorro", "Chan", "Chang", "Chanto", "Charpentier", "Chavarria", "ChavarrÃa", "Chaverri", "Chaves", "Chavez", "Chen", "Cheng", "Cheves", "Chevez", "Chin", "Chinchilla", "Ching", "Chiroldes", "Cid", "Cisnero", "Cisneros", "Clark", "Clarke", "Coghi", "Cole", "Colina", "Collado", "Colomer", "Colville", "Concepcion", "Condega", "Conejo", "Contreras", "Cooper", "Cordero", "Cordoba", "Cordoncillo", "Cordonero", "Corea", "Corella", "Cornejo", "Coronado", "Corrales", "Correa", "Cortes", "Cortez", "Costa", "Coto", "Crawford", "Cruz", "Cuadra", "Cubero", "Cubillo", "Cuendis", "Cuevas", "Cunningham", "Daniels", "Darcia", "Davila", "Davis", "de La Cruz", "de La", "de Leon", "de los Angeles", "del Valle", "Delgadillo", "Delgado", "Desanti", "Diaz", "Dijeres", "Dinarte", "Dittel", "Dixon", "Dobles", "Dominguez", "Donato", "Dormond", "Douglas", "Drummond", "Duarte", "Duartes", "Duran", "Durán", "Echandi", "Echavarria", "Eche", "Echeverria", "Eduarte", "Edwards", "Elizondo", "Ellis", "Enriquez", "Eras", "Escalante", "Escamilla", "Escobar", "Escoto", "Espinales", "Espinosa", "Espinoza", "Esquivel", "Esteller", "Estrada", "Estrella", "Evans", "Faerron", "Fajardo", "Fallas", "Farrier", "Feng", "Feoli", "Fernandez", "Fernández", "Fernndez", "Ferrer", "Ferreto", "Figueroa", "Fletes", "Flores", "Fonseca", "Forbes", "Foster", "Fournier", "Francis", "Franco", "Freer", "Fuentes", "Fuertes", "Fumero", "Funes", "Fung", "Gabuardi", "Gaitan", "Galagarza", "Galarza", "Galeano", "Galiano", "Gallardo", "Gallegos", "Gallo", "Galvez", "Gamboa", "Gamez", "Garay", "Garbanzo", "Garca", "Garcia", "Garita", "Garnier", "Garrido", "Garro", "Gatgens", "Gatjens", "Gayle", "Gazel", "Gazo", "Gil", "Giron", "Godinez", "Godoy", "Golcher", "Gomez", "Gómez", "Gongora", "Goñi", "Gonzaga", "Gonzalez", "González", "Gonzalo", "Gordon", "Gorgona", "Graham", "Grajal", "Grajales", "Granados", "Granda", "Granja", "Grant", "Green", "Grijalba", "Grillo", "Guadamuz", "Guardia", "Guell", "Guerra", "Guerrero", "Guevara", "Guffey", "Guido", "Guillen", "Gurdian", "Gutierrez", "Gutiérrez", "Gutirrez", "Guzman", "Hall", "Harris", "Henriquez", "Henry", "Herckis", "Hernandez", "Hernández", "Hernndez", "Herra", "Herrera", "Herrero", "Herzz", "Hidalgo", "Hines", "Hodgson", "Howard", "Huang", "Hudson", "Huertas", "Huete", "Huezo", "Hurtado", "Ibarra", "Icaza", "Iglesias", "Ilama", "Inces", "Infante", "Inman", "Iriarte", "Irias", "Irigoyen", "Irola", "Izaguirre", "Jacamo", "Jackson", "Jaen", "Jaime", "James", "Jara", "Jaramillo", "Jarquin", "Jaubert", "Jenkins", "Jerez", "Jimenez", "Jiménez", "Jinesta", "Jiron", "Johanning", "Johnson", "Jones", "Jose", "Joseph", "Josephs", "Juarez", "Junes", "Junez", "Keith", "Kelly", "Klay", "Kopper", "Kuzdas", "Lacayo", "Lagos", "Laguna", "Lamas", "Lang", "Lanuza", "Lanza", "Lanzoni", "Lara", "Largaespada", "Larios", "Lascarez", "Latino", "Laurent", "Lawrence", "Lawson", "Lazaro", "Lazo", "Leal", "Leandro", "Ledezma", "Lee", "Leiton", "Leiva", "Lemaitre", "Leon", "Lepiz", "Lewis", "Lezama", "Lezcano", "Li", "Lin", "Linares", "Lindo", "Linton", "Lios", "Lira", "Lizano", "Loaiciga", "Loaiza", "Lobo", "Lopez", "Loria", "Lozano", "Lugo", "Lumbi", "Luna", "Lynch", "Machado", "Macotelo", "Madrigal", "Madriz", "Mainieri", "Mairena", "Maitland", "Malavassi", "Malespin", "Maltes", "Maltez", "Manzanares", "Maradiaga", "Marchena", "Marenco", "Marin", "Marn", "Maroto", "Marquez", "Marrero", "Marroquin", "Martin", "Martinez", "MartÃnez", "Masis", "Mata", "Matamoros", "Matarrita", "Mathieu", "Mattey", "Matus", "May", "Mayorga", "McCarthy", "McDonald", "McFarlane", "McKenzie", "McLean", "Medina", "Medrano", "Mejia", "Mejias", "Mejicano", "Melendez", "Membreño", "Mena", "Mendes", "Mendez", "Mendieta", "Mendoza", "Meneses", "Menocal", "Meoño", "Mercado", "Merino", "Mesen", "Meza", "Michalski", "Milanes", "Miller", "Millon", "Miranda", "Mitchell", "Mitre", "Mojica", "Molina", "Moncada", "Mondragon", "Monestel", "Monge", "Mongrillo", "Montalban", "Montano", "Montealegre", "Montenegro", "Montero", "Monterrey", "Monterrosa", "Montes de Oca", "Montes", "Montezuma", "Montiel", "Montoya", "Mora", "Moraga", "Morales", "Moran", "Morazán", "Moreira", "Moreno", "Morera", "Morgan", "Morice", "Morris", "Morua", "Morúa", "Morun", "Moscoa", "Moscoso", "Mosquera", "Moya", "Munguia", "Muñiz", "Muñoz", "Murcia", "Murillo", "Murray", "Mussio", "Myrie", "Najera", "Naranjo", "Narvaez", "Navarrete", "Navarro", "Navas", "Nelson", "Ng", "Nieto", "Noel", "Noguera", "Norman", "Nova", "Novo", "Novoa", "Nuñez", "Obaldia", "Obando", "Obregon", "Ocampo", "Ochoa", "Ocon", "Oconitrillo", "Odio", "Ojeda", "Olivar", "Olivares", "Olivas", "Olmos", "Olsen", "Ondoy", "Onil", "Oporta", "Oporto", "Oquendo", "Ordeñana", "Ordoñez", "Oreamuno", "Orellana", "Orias", "Orlich", "Orocu", "Orozco", "Ortega", "Ortiz", "Oses", "Osorio", "Osorno", "Otarola", "Otero", "Otoya", "Ovares", "Oviedo", "Pacheco", "Padilla", "Paez", "Pais", "Paisano", "Palacio", "Palacios", "Palavicini", "Palma", "Palmer", "Palomo", "Pana", "Paniagua", "Parajeles", "Pardo", "Paris", "Parks", "Parra", "Parrales", "Pasos", "Pastor", "Pastrana", "Pastrano", "Patiño", "Patterson", "Pavon", "Payan", "Paz", "Pazos", "Pena", "Peña", "Peñaranda", "Peralta", "Peraza", "Pereira", "Perera", "Perez", "Pessoa", "Phillips", "Picado", "Pichardo", "Picon", "Piedra", "Pilarte", "Pimentel", "Piña", "Pinagal", "Piñar", "Pineda", "Pinnock", "Pinto", "Pita", "Pitti", "Pizarro", "Pochet", "Polanco", "Pomares", "Ponce", "Porras", "Portilla", "Portillo", "Portuguez", "Potoy", "Poveda", "Powell", "Prada", "Prado", "Prendas", "Prieto", "Protti", "Pulido", "Quedo", "Quesada", "Quiel", "Quijano", "Quintana", "Quintanilla", "Quintero", "Quiros", "Quirós", "Quirs", "Ramirez", "RamÃrez", "Ramos", "Ramrez", "Rangel", "Recio", "Redondo", "Reid", "Reina", "Retana", "Retes", "Rey", "Reyes", "Richards", "Richmond", "Rios", "Rivas", "Rivera", "Rizo", "Roa", "Robalino", "Robert", "Robinson", "Roblero", "Robles", "Robleto", "Rocha", "Roda", "Rodriguez", "RodrÃguez", "Rojas", "Roldan", "Roman", "Romero", "Roque", "Rosabal", "Rosales", "Rosas", "Rose", "Roses", "Ross", "Rostran", "Roucka", "Rovira", "Rowe", "Royo", "Rubi", "Rubio", "Rueda", "Rugama", "Ruiz", "Saavedra", "Saballo", "Saballos", "Saborio", "Saenz", "Sáenz", "Sagot", "Salamanca", "Salas", "Salazar", "Saldaña", "Salgado", "Salguera", "Salguero", "Salinas", "Salmeron", "Salvatierra", "Samudio", "Samuels", "Sanabria", "Sanarrusia", "Sanchez", "Sánchez", "Sancho", "Sandi", "Sandino", "Sandoval", "Santamaria", "Santana", "Santos", "Saravia", "Sarmiento", "Sauma", "Saurez", "Sawyers", "Schmidt", "Scott", "Seas", "Segnini", "Segura", "Selles", "Selva", "Sequeira", "Serracin", "Serrano", "Sevilla", "Sibaja", "Sierra", "Siezar", "Siles", "Silesky", "Silva", "Simpson", "Sing", "Sirias", "Smith", "Soares", "Sobalbarro", "Sobrado", "Sojo", "Solano", "Solera", "Solis", "Solorzano", "Sols", "Somarribas", "Soro", "Sosa", "Sotela", "Sotelo", "Soto", "Soza", "Spencer", "Steller", "Sterling", "Stewart", "Suarez", "Suazo", "Tabash", "Tablada", "Talavera", "Taleno", "Tames", "Tapia", "Taylor", "Telles", "Tellez", "Tello", "Tencio", "Tenorio", "Teran", "Tercero", "Thomas", "Thompson", "Thorpe", "Tijerino", "Tinoco", "Tobal", "Toledo", "Torrente", "Torrentes", "Torres", "Tortos", "Toruño", "Tosso", "Traña", "Trejos", "Treminio", "Trigueros", "Troyo", "Trujillo", "Turcios", "Ubau", "Ugalde", "Ugarte", "Ujueta", "Ukermann", "Ulate", "Ulloa", "Umana", "Umaña", "Umanzor", "Unfried", "Urbina", "Ureña", "Uriarte", "Uribe", "Urtecho", "Uva", "Vado", "Vaglio", "Valdelomar", "Valderrama", "Valderramos", "Valdes", "Valdez", "Valdivia", "Valencia", "Valenciano", "Valenzuela", "Valerin", "Valerio", "Valladares", "Valle", "Vallecillo", "Vallejo", "Vallejos", "Valles", "Valverde", "Vanegas", "Varela", "Vargas", "Vasquez", "Vazquez", "Vega", "Velasquez", "Velazquez", "Velez", "Venegas", "Ventura", "Viales", "Victor", "Vidal", "Vidaurre", "Vigil", "Vilchez", "Villa", "Villachica", "Villafuerte", "Villagra", "Villalobos", "Villalta", "Villanea", "Villanueva", "Villaplana", "Villar", "Villarebia", "Villarevia", "Villarreal", "Villavicencio", "Villegas", "Vindas", "Viquez", "VÃquez", "Vivas", "Vives", "Vizcaino", "Volio", "Walker", "Wallace", "Walters", "Wang", "Watson", "Webb", "West", "White", "Williams", "Wilson", "Wint", "Wong", "Wright", "Wu", "Yglesias", "Young", "Yubank", "Zambrana", "Zambrano", "Zamora", "Zapata", "Zarate", "Zavala", "Zavaleta", "Zelaya", "Zeledon", "Zeledón", "Zepeda", "Zheng", "Ziga", "Zumbado", "Zuñiga"];
App.Data.misc.croatianSlaveNames = ["Adela", "Adrijana", "Agata", "Agneza", "Aida", "Ajla", "Aleksa", "Aleksandra", "Alenka", "Alojzija", "Ana", "Anamarija", "Anastazija", "Anda", "AnÄ‘a", "AnÄ‘ela", "Andelka", "Andja", "Andjelka", "Andrea", "Andreja", "Andrejka", "Andrijana", "Aneta", "Angela", "Ania", "Anica", "Anita", "Anja", "Anka", "Ankica", "Antonija", "Apolonija", "Bara", "Barbara", "Berica", "Berislava", "Biljana", "Biserka", "Blaga", "Blagica", "Blanka", "Blazenka", "Blaženka", "Bogdana", "Bogomila", "Bogumila", "Bojana", "Borica", "Borislava", "Borka", "Borna", "Bosiljka", "Bozana", "Božena", "Božica", "Božidarka", "Branimira", "Branka", "Brankica", "Bratislava", "Brigita", "Bruna", "Buga", "Cecilija", "ÄŒedna", "Cveta", "Cvijeta", "Cvita", "Dajana", "Damijana", "Damjana", "Dana", "Danica", "Daniela", "Danijela", "Daria", "Darija", "Darinka", "Darja", "Davorka", "Debora", "Desa", "Desanka", "Dijana", "Divna", "Djuka", "Dora", "Dorotea", "Draga", "Dragana", "Dragica", "Draginja", "Drazana", "Draženka", "Dubravka", "Dunja", "ÄurÄ‘a", "Dusanka", "Dusica", "Duska", "Edita", "Ela", "Eli", "Elija", "Elizabeta", "Ema", "Emilija", "Ena", "Erika", "Eva", "Finka", "Fran", "Franciska", "Franka", "Gabrijela", "Gorana", "Goranka", "Gordana", "Greta", "Grozdana", "Hana", "Helena", "Hrvatina", "Hrvoja", "Hrvojka", "Ida", "Ilinka", "Ilka", "Ina", "Ines", "Irena", "Irma", "Iskra", "Iva", "Ivana", "Ivanka", "Ivka", "Ivona", "Izabela", "Jadranka", "Jaga", "Jagoda", "Jana", "Janja", "Jasenka", "Jasmina", "Jasminka", "Jasna", "Jeka", "Jela", "Jelena", "Jelica", "Jelka", "Jerneja", "Joka", "Jordanka", "Josipa", "Jovana", "Jovanka", "Jozefa", "Jozefina", "Jozica", "Judita", "Jula", "Julija", "Kaja", "Karanfila", "Karla", "Karmen", "Karolina", "Kata", "Katarina", "Katica", "Katja", "Klara", "Klavdija", "Kolinda", "Korina", "Kornelija", "Kristina", "Krizantema", "Ksenija", "Lana", "Lara", "Laura", "Lea", "Leonarda", "Leposava", "Lidija", "Liljana", "Lisa", "Ljilja", "Ljiljana", "Ljuba", "Ljubica", "Ljubinka", "Ljudmila", "Ljupka", "Lolita", "Lucia", "Lucija", "Magdalena", "Maja", "Majda", "Malina", "Manda", "Mandica", "Manja", "Mara", "Marica", "Marija", "Marijana", "Marina", "Marinela", "Marinka", "Marjana", "Marjeta", "Marjetka", "Marta", "Martina", "Masa", "Matea", "Mateja", "Melanija", "Melita", "Meta", "Metka", "Mia", "Mihaela", "Mila", "Milena", "Mileta", "Milica", "Miljana", "Miljenka", "Milka", "Milomirka", "Minka", "Mira", "Mirela", "Mirjam", "Mirjana", "Mirka", "Mirna", "Miroslava", "Mirta", "Mislava", "Mojca", "Mojmira", "Monika", "Morana", "Nada", "Nadica", "Naida", "Natalija", "Natasa", "Neda", "Nediljka", "Nela", "Nensi", "Nevena", "Nevenka", "Neza", "Nika", "Nikolina", "Nina", "Nives", "Novka", "Ognjenka", "Olga", "Olivera", "Ozana", "Paola", "Patricija", "Paula", "Pava", "Pavica", "Pavka", "Pavla", "Petra", "Polona", "Rada", "Radmila", "Radojka", "Radoslava", "Ranka", "Rasa", "RaÅ¡eljka", "Ratka", "Renata", "Rozalija", "Rozarija", "Ruza", "Ruža", "Ružena", "Ruzica", "Ružica", "Sabina", "Sanda", "Sandra", "Sanela", "Sanja", "Sara", "Sarah", "Saska", "Senka", "Senna", "Serafina", "Severina", "Silvi", "Silvija", "Simona", "Sladana", "Sladjana", "Slava", "Slavenka", "Slavica", "Slavka", "Sloboda", "Slobodanka", "Smilja", "Smiljana", "Snezana", "SnjeÅ¡ka", "Snjezana", "Snježana", "Sofija", "Sonja", "Spela", "Spomenka", "Srebrenka", "Staka", "Stana", "Stanislava", "Stanka", "Å tefica", "Stela", "Stoja", "Stojanka", "SunÄana", "SunÄica", "Suzana", "Svetlana", "Svitlana", "Svjetlana", "Tadeja", "Tamara", "Tanja", "Tatjana", "Tea", "Teodora", "Terezija", "Tihana", "Tihomila", "Tijana", "Tina", "Tjasa", "Tjeha", "Tomaca", "Tomislava", "Tonka", "Tuga", "Ursa", "Urska", "Vaja", "Valentina", "Vanesa", "Vanja", "Vasilija", "Vasja", "Vedrana", "Velinka", "Vera", "Verica", "Veronika", "Vesna", "Vida", "Viktorija", "Vilma", "Vinka", "Violeta", "Visnja", "Vjekoslava", "Vjera", "Vlasta", "Vlatka", "Zagorka", "Žaklina", "Zara", "Zdenka", "Zeljka", "Željka", "Ziva", "Zivanka", "Zivka", "Živka", "Zlata", "Zlatica", "Zoja", "Zora", "Zorana", "Zorica", "Zorka", "Zrina", "Zrinka", "Zvjezdana", "Zvonimira", "Zvonka"];
App.Data.misc.croatianMaleNames = ["Adam", "Adis", "Adrian", "Adriano", "Adrijan", "Agram", "Alan", "Albin", "Aleksandar", "Aleksander", "Alen", "Ales", "Alija", "Aljaz", "Aljosa", "Alojz", "Alojzije", "Andelko", "Andras", "András", "Andrej", "Andreja", "Andrija", "Andro", "Ante", "Anto", "Anton", "Antonio", "Antun", "Anze", "Arian", "Avdo", "Bartol", "Bartolomej", "Bartul", "Benjamin", "Berislav", "Berivoj", "Bernard", "Bero", "Blago", "Blagoje", "Blasko", "Blaz", "Blaž", "Bogdan", "Bogoljub", "Bogomil", "Bogomir", "Bogumil", "Bojan", "Boris", "Borislav", "Borivoj", "Borivoje", "Borko", "Borna", "Boro", "Borut", "Bosko", "Bostjan", "Božetjeh", "Bozidar", "Božidar", "Božo", "Brajko", "Brane", "Branimir", "Branislav", "Branko", "Braslav", "Bratislav", "Bratoljub", "Bruno", "Budimir", "ÄŒaslav", "ÄŒastimir", "Cedomir", "ÄŒedomir", "Cvetko", "Cvitan", "Cvitko", "Cvjetko", "Dalibor", "Damijan", "Damir", "Damjan", "Daniel", "Danijel", "Danilo", "Danko", "Dario", "Darko", "David", "Davor", "Davorin", "Davorko", "Dejan", "Denis", "Desimir", "Dimitrije", "Dinko", "Dino", "Djordje", "Djuro", "Dobrivoje", "Dobroslav", "Dobrovit", "Domagoj", "Domen", "Domin", "Dominik", "Dominko", "Dorde", "ÄorÄ‘e", "Dorian", "Dorijan", "Dragan", "Dragic", "Dragisa", "Drago", "Dragoljub", "Dragomir", "Dragoslav", "Dragutin", "Drasko", "Dražan", "Drazen", "Dražen", "Drazenko", "Draženko", "Držiha", "Držislav", "Dubravko", "Duje", "Äuro", "Dusan", "Dusko", "Dzevad", "Edi", "Edin", "Eduard", "Edvard", "Elvir", "Elvis", "Emanuel", "Emil", "Enes", "Erik", "Ernest", "Fabijan", "Ferdo", "Filip", "Florijan", "Fran", "Franc", "France", "Frane", "Franjo", "Franko", "Frano", "Gabriel", "Gabrijel", "Gasper", "Godemir", "Gojislav", "Gojko", "Gojslav", "Goran", "Gorazd", "Gordan", "Grega", "Gregor", "Grgur", "GrubiÅ¡a", "Haris", "Hrvatin", "Hrvoj", "Hrvoje", "Hrvoslav", "Igor", "Ilija", "Imanuel", "Ivan", "Ivano", "Ivica", "Ivo", "Ivor", "Izidor", "Iztok", "Jadranko", "Jaka", "Jako", "Jakov", "Jan", "Janez", "Jani", "Janko", "Jasenko", "Jasmin", "Jelenko", "Jerko", "Jernej", "Joca", "Jordan", "Josif", "Josip", "JoÅ¡ko", "Joso", "Jovan", "Jovica", "Jovo", "Joze", "Jozef", "Jozo", "Juraj", "Jure", "Jurica", "Jurij", "Juro", "Karel", "Karlo", "Kazimir", "Kažimir", "Klemen", "Klonimir", "Kosta", "Kresimir", "KreÅ¡imir", "Kreso", "KreÅ¡o", "Kristian", "Kristijan", "KrÅ¡evan", "Krsta", "Kruno", "Krunoslav", "Laslo", "Lavoslav", "Lavrencij", "Leo", "Leon", "Leonardo", "Ljuba", "Ljuban", "Ljubisa", "Ljubo", "Ljubomir", "Ljudevit", "Lojze", "Lovre", "Lovro", "Luca", "Luciano", "Lucijan", "Ludvik", "Lujo", "Luka", "Lukas", "Manojle", "Marijan", "Marije", "Marijo", "Marin", "Marinko", "Marino", "Mario", "Marjan", "Marko", "Maro", "Martin", "Mate", "Matej", "Mateo", "Matevz", "Matija", "Matjaz", "Matko", "Mato", "Mauro", "Meho", "Metod", "Mico", "Mihael", "Mihajlo", "Mihovil", "Mijo", "Miladin", "Milan", "Mile", "Milenko", "Milic", "Milisav", "Milivoj", "Milivoje", "Miljenko", "Miloje", "Milojko", "Milomir", "Milorad", "Milos", "Milovan", "Milutin", "Miodrag", "Miomir", "Miran", "Mirko", "Miro", "Miroljub", "MiroÅ¡", "Miroslav", "Mirsad", "Mirza", "Misa", "Misko", "Mislav", "Miso", "Mita", "Mitar", "Mitja", "Mladen", "Mladenko", "Mojmir", "Momcilo", "Mutimir", "Narcis", "Nebojsa", "Nedeljko", "Nediljko", "Nedjeljko", "Nenad", "Nesib", "Neven", "Nikica", "Niko", "Nikola", "Nino", "Njegomir", "Njegovan", "Noa", "Noel", "Novica", "Obrad", "Ognjen", "Oliver", "Ostoja", "Ozren", "Pasko", "Patrik", "Pavao", "Pavel", "Pavle", "Pavo", "Pera", "Perica", "Perko", "Pero", "Petar", "Peter", "Pop", "Predrag", "Pribislav", "Primoz", "Prvan", "PrvoÅ¡", "Prvoslav", "Rade", "Radenko", "Radimir", "Radisa", "Radivoje", "Rado", "Radomir", "RadoÅ¡", "Radosav", "Radoslav", "Radovan", "Rafael", "Rajko", "Ranko", "Rastko", "Ratimir", "Ratko", "Rato", "Renato", "Robert", "Robi", "Rodavan", "Rodoljub", "Rok", "Roko", "Roman", "Rudolf", "Salko", "Samo", "Sanjin", "Sasa", "SaÅ¡a", "Saso", "Sava", "Savka", "Savo", "Sebastian", "Sebastijan", "Sebastjan", "Sejo", "Semi", "Semir", "Senad", "Silvije", "Sima", "Sime", "Å ime", "Simo", "Simon", "Simun", "Å imun", "Sinisa", "SiniÅ¡a", "SlaÄ‘an", "Slaven", "Slavisa", "SlaviÅ¡a", "Slavko", "Slavoljub", "Slavomir", "Slobodan", "Smiljan", "SnjeÅ¡ko", "Spasa", "Spiridon", "Spomenko", "Srbobran", "Srboljub", "Srdan", "Srdjan", "Srebrenko", "Srecko", "Srećko", "Sreten", "Stane", "Stanislav", "Stanko", "Stefan", "Stevan", "Stevo", "Stijepo", "Stipe", "Stipica", "Stipo", "Stjepan", "Stojan", "Strahimir", "Sven", "Svetislav", "Svetolik", "Svetoslav", "Tadej", "Tadija", "Teo", "Tihomil", "Tihomir", "Tin", "Tine", "TjeÅ¡imir", "Toma", "Tomaz", "Tomislav", "Tomo", "Toni", "Trpimir", "Tugomir", "Tvrtko", "Urban", "Uros", "Valentino", "Vanja", "Vasilije", "Vatroslav", "Većeslav", "Vedran", "Velibor", "Velimir", "Veljko", "Veselin", "Veselko", "Vid", "Vidoje", "Vidoslav", "Viktor", "Viljem", "Vinko", "ViÅ¡eslav", "Vito", "Vitomir", "Vjekoslav", "Vjenceslav", "Vjeran", "Vladan", "Vladimir", "Vladislav", "Vladko", "Vlado", "Vlastimir", "Vlatko", "Vojislav", "Vojko", "Vojmil", "Vojmir", "Vojnomir", "Vojo", "Vuk", "Zajko", "Zarko", "Žarko", "Zdenko", "Zdeslav", "Zdravko", "Zejnil", "Želimir", "Zeljko", "Željko", "Ziga", "Zijo", "Zikica", "Zivko", "Živko", "Zivojin", "Zivorad", "Zivota", "Zlatan", "Zlatimir", "Zlatko", "Zoran", "Zorislav", "Zrinko", "Zrinoslav", "Zvone", "Zvonimir", "Zvonko"];
@@ -207,7 +207,7 @@ App.Data.misc.croatianSlaveSurnames = ["Abramović", "Acinger", "Adam", "Adamovi
App.Data.misc.cubanSlaveNames = ["Ababa", "AbigaÃl", "Abril", "Adala", "Adalia", "Adela", "Adelaida", "Adelia", "Adelina", "Adelisa", "Adelita", "Adisoda", "Adoración", "Adriana", "Ãfrica", "Agata", "Agueda", "Ãgueda", "Agustina", "Aida", "AÃda", "Aide", "Aileen", "Ainara", "Ainhoa", "Aitana", "Alba", "Alberta", "Albina", "Aldana", "Alejandra", "Aleta", "Alexia", "Alfonsa", "Alheli", "Alicia", "Alida", "Aliuska", "Alma", "Almadelia", "Almudena", "Alodia", "Aloisia", "Alondra", "Altagracia", "Ãlvara", "Amada", "Amairany", "Amalia", "Amanda", "Amapola", "Amara", "Amaya", "Amelia", "Amparo", "Ana Maria", "Ana", "Anabel", "Anahi", "AnahÃ", "Anai", "Analena", "Anali", "Analia", "AnalÃa", "Anay", "Andrea", "AndreÃna", "Angela", "Ãngela", "Angeles", "Ãngeles", "Angélica", "Anica", "Anita", "Antonia", "Antonieta", "Apolonia", "Aquilina", "Araceli", "Arantxa", "Aranzazu", "Arely", "Ariana", "Ariel", "Ariela", "Arletis", "Armena", "Artemisa", "Ascensión", "Aselita", "Asunción", "Aurelia", "Aurora", "Avelina", "Azucena", "Azul", "Barbara", "Bárbara", "Beatriz", "Begoña", "Belén", "Belgis", "Belia", "Belicia", "Belkis", "Belsis", "Belsy", "Benicia", "Benita", "Berenice", "Bernarda", "Bernardina", "Berta", "Bertita", "Betania", "Bibiana", "Blanca", "Bonita", "Bouganvilla", "Bruna", "Brunilda", "Buena", "Calida", "Camelia", "Camila", "Candela", "Candelaria", "Candida", "Cándida", "Canela", "Caridad", "Carina", "Carito", "Carla", "Carlina", "Carlota", "Carmela", "Carmen", "Caro", "Carolina", "Casandra", "Cataleya", "Catalina", "Catrina", "Cecilia", "Celia", "Celida", "Celina", "Celsa", "Chamayra", "Chara", "Chaxiraxi", "Cheena", "Chela", "Chiquita", "Chita", "Citlali", "Clara", "Claribel", "Clarisa", "Claudia", "Clemencia", "Clotilde", "Cobura", "Colombia", "Concepción", "Concha", "Conchita", "Conseja", "Consolación", "Constanza", "Consuela", "Consuelo", "Corazón", "Corina", "Covadonga", "Crisanta", "Crisol", "Cristina", "Cruz", "Cynthia", "Dafna", "Dafne", "Daimi", "Daisy", "Dalia", "Dalila", "Damaris", "Damiana", "Damita", "Dania", "Daniela", "Daria", "Daritza", "Davina", "Dayami", "Dayana", "Dayane", "Débora", "Delfina", "Delia", "Deliasofia", "Delmira", "Delores", "Demetria", "Desamparados", "Desdemona", "Diana", "Dinora", "Dionecia", "Dionicia", "Dionisia", "Dolores", "Dominga", "Dominica", "Dorotea", "Dulce", "Dulcinea", "Edelmira", "Eglantina", "Electra", "Elena", "Eleonora", "Elia", "Eliana", "Elida", "Eligia", "Elina", "Elisa", "Elmira", "Elodea", "Eloisa", "Elvia", "Elvira", "Emelda", "Emelia", "Emilia", "Emiliana", "Emperatriz", "Encarna", "Encarnación", "Enedina", "Engracia", "Enka", "Enriqua", "Enriqueta", "Epifania", "Ernestina", "Esmeralda", "Esperanza", "Estefania", "EstefanÃa", "Estela", "Estella", "Estelle", "Ester", "Esther", "Estil", "Estrelita", "Estrella", "Etelvina", "Eudoxia", "Eufemia", "Eufrasia", "Eugenia", "Eulalia", "Eulogia", "Eustolia", "Eva", "Evelyn", "Evita", "Fabiana", "Fabiola", "Fabricia", "Facunda", "Fatima", "Fátima", "Faustina", "Felicia", "Feliciana", "Felicidad", "Felipa", "Felisa", "Fermina", "Fernanda", "Filipa", "Filomena", "Fiorella", "Flavia", "Flor", "Flora", "Florencia", "Floria", "Florida", "Franca", "Francisca", "Frida", "Froilana", "Fuensanta", "Fulberta", "Fulca", "Gabriela", "Galia", "Gara", "GarcÃa", "Gema", "Genedina", "Genoveva", "Geo", "Gilda", "Ginebra", "Gladis", "Gladys", "Gloria", "Gracia", "Graciela", "Grazia", "Gretel", "Griselda", "Guada", "Guadalupe", "Guillermina", "Guiomar", "Hada", "Hañagua", "Haydée", "Heli", "Heloisa", "Hera", "Hermalinda", "Herminia", "Hilaria", "Hilda", "Hipolita", "Hortensia", "Iara", "Idalia", "Idalmis", "Idonia", "Ifigenia", "Ignacia", "Ilda", "Illena", "Ilona", "Imelda", "Immaculada", "Indira", "Ines", "Inés", "Inez", "Inma", "Inmaculada", "Ioamnet", "Irene", "Irma", "Isa", "Isabel", "Isabella", "Isaura", "Isidora", "Isidra", "Ismary", "Ismelda", "Itahisa", "Ivette", "Ivonne", "Jacinta", "Jacqueline", "JaJuan", "Janina", "Jasmine", "Javier", "Javiera", "Jazmin", "Jenara", "Jesica", "Jesusa", "Jesusita", "Jimena", "Joaquina", "Jocelin", "Jordana", "Jorgelina", "Josefa", "Josefina", "Jovita", "Juana", "Juanita", "Judith", "Julia", "Juliana", "Julieta", "Justina", "Karina", "Laila", "Lali", "Laline", "Lara", "Larisa", "Laura", "Laureana", "Laurencia", "Lea", "Leandra", "Leire", "Lena", "Lency", "Leonarda", "Leonela", "Leonor", "Leopoldina", "Lesbia", "Leticia", "LÃa", "Liana", "Libertad", "Libia", "Licha", "Lidia", "Ligia", "Lilia", "Liliana", "Liliosa", "Lina", "Linda", "Lisa", "Liselotte", "Lissete", "Lissette", "Lisvania", "Lizete", "Lola", "Lolita", "Loreley", "Lorena", "Lorenza", "Lourdes", "Luana", "Lucelia", "Lucero", "Lucha", "Lucia", "LucÃa", "Luciana", "Lucila", "Lucina", "Lucrecia", "Luisa", "Luna", "Lupe", "Lupita", "Luz", "Luzdivina", "Macarena", "Macaria", "Madalena", "Madrid", "Mae", "Maela", "Magalys", "Magdalena", "Magnolia", "Maitane", "Maite", "Malda", "Manuela", "Manuelita", "Marcela", "Marcelina", "Marcia", "Margarita", "Maria Concepción", "Maria de los Dolores", "Maria del Carmen", "Maria Encarnación", "Maria Ester", "Maria Guadalupe", "Maria Isabel", "MarÃa Jesús", "MarÃa José", "Maria Juana", "MarÃa Juana", "Maria Luisa", "MarÃa Magdalena", "Maria", "MarÃa", "Mariah", "Marian", "Mariana", "Maribel", "Maricarmen", "Maricela", "Maricruz", "Mariela", "Mariesa", "Marina", "Maripaz", "Marisa", "Marisol", "Marita", "Marquita", "Marta", "Martina", "Martita", "Mary", "Matilde", "Maya", "Mayra", "Mayte", "Meagens", "Mercedes", "Micaela", "Miguela", "Mila", "Milagros", "Milena", "Mirca", "Mireia", "Mirella", "Mireya", "Miriam", "Mirna", "Modesta", "Moira", "Monica", "Mónica", "Monse", "Monserrat", "Montserrat", "Nadia", "Nahir", "Naike", "Nancy", "Narcisa", "Narda", "Natacha", "Natalia", "Natividad", "Nayeli", "Nazarena", "Nazaret", "Nelia", "Nélida", "Nerea", "Neva", "Niceto", "Nidia", "Nieves", "Nilda", "Nina", "Ninfa", "Noe", "Noelia", "Noemi", "NoemÃ", "Norma", "Nova", "Nuela", "Nuria", "Obdulia", "Octavia", "Odelia", "Odilia", "Ofelia", "Olga", "Olimpia", "Oliva", "Olivia", "Olivita", "Oralia", "Orestes", "Oria", "Orlanda", "Orlantha", "Osleidys", "Otilia", "Ovidia", "Palma", "Palmira", "Paloma", "Pamela", "Pancracia", "Pandora", "Pantera", "Paqui", "Pascua", "Pascuala", "Patricia", "Paula", "Paulette", "Paulina", "Paz", "Penelope", "Perla", "Perpetua", "Petra", "Petrona", "Pia", "Piedad", "Pilar", "Placinta", "Pricia", "Primitiva", "Priscilla", "Pura", "Purificación", "Querida", "Querina", "Quirina", "Quisela", "Rafaela", "Raimunda", "Ramira", "Ramona", "Raquel", "Rayén", "Raylina", "Rebeca", "Refugio", "Reina", "Remedios", "Renata", "Renée", "Resurrección", "Reyna", "Ricarda", "Rita", "Roberta", "RocÃo", "Rodolfa", "Rolanda", "Romina", "Rosa Maria", "Rosa", "Rosalia", "RosalÃa", "Rosana", "Rosandra", "Rosaria", "Rosario", "Rosaura", "Rose Mary", "Rose", "Rosenda", "Rosina", "Roxana", "Rufino", "Rut", "Ruth", "Sabana", "Sabina", "Sahily", "Salivia", "Salomé", "Salud", "Salvadora", "Sancha", "Sandra", "Santana", "Sara", "Sarai", "Sarita", "Saturnina", "Segismunda", "Selena", "Selia", "Serafina", "Serina", "Sevilla", "Silvana", "Silvia", "Sinai", "Socorro", "Sofia", "SofÃa", "Sol", "Solana", "Solange", "Soledad", "Sonia", "Soraya", "Sotera", "Stephanie", "Sucely", "Susana", "TaÃs", "Talia", "Tamara", "Tania", "Tatiana", "Telma", "Teodora", "Teofila", "Tequila", "Teresa", "Teresita", "Thiare", "Tiare", "Tomasa", "Triana", "Trinidad", "Ulrica", "Ursula", "Úrsula", "Valencia", "Valentina", "Valeria", "Vane", "Vanesa", "Vanessa", "Vanina", "Velia", "Venecia", "Ventura", "Veronica", "Verónica", "Vicenta", "Victoria", "Vilma", "Violeta", "Vionaika", "Virginia", "Virtudes", "Visitación", "Viva", "Viviana", "Walkiria", "Walquiria", "Wuaira", "Xara", "Xaviera", "Xenia", "Xiana", "Xilosma", "Ximena", "Xiomara", "Yahaira", "Yaimara", "Yaineris", "Yajaira", "Yamilé", "Yanet", "Yanina", "Yanire", "Yarcelis", "Yaretzi", "Yargelis", "Yarisley", "Yaritza", "Yazmin", "Yazmina", "Yelina", "Yesenia", "Yipsi", "Ylenia", "Ynes", "Yolanda", "Yonaidys", "Yorgelis", "Yosdalkis", "Yoslin", "Ysabel", "Yudelkis", "Yudileyvis", "Yuricema", "Yurixi", "Yvette", "Zaida", "Zaira", "Zeferina", "Zoraida", "Zulema", "Zulia", "Zulma"];
App.Data.misc.cubanMaleNames = ["Abelardo", "Abimael", "Absalon", "Acacio", "Adalberto", "Adan", "Adano", "Adelardo", "Adelmaro", "Ademar", "Adonis", "Adrián", "Agapito", "Aguelmis", "AgustÃn", "Aladino", "Albano", "Alberto", "Albino", "Aldair", "Aldo", "Alejandro", "Alejo", "Alexis", "Alfonso", "Alfredo", "Aliecer", "Alipio", "Alonso", "Alterio", "Alvaro", "Amadeo", "Amado", "Amador", "Amalio", "Amando", "Ambrosio", "Amelio", "Amilcar", "Amparo", "Ampelio", "Anacleto", "Anastasio", "Anatolio", "Andreo", "Andres", "Andrés", "Angel", "Anibal", "Aniceto", "Anier", "Anselmo", "Antioco", "Antonio", "Aparicio", "Apocalipsis", "Apolinario", "Apolo", "Aquiles", "Aquilino", "Arcángel", "Arcinio", "ArÃstides", "Armando", "Arnaldo", "Arnulfo", "Arquimedes", "Arsenio", "Artemio", "Arturo", "Asclepiades", "Atanasio", "Atilio", "Augusto", "Aureliano", "Aurelio", "Auxilio", "Avelino", "Baltazar", "Bartolomé", "Bautista", "Beltran", "Benedicto", "Benigno", "Benito", "BenjamÃn", "Bernardino", "Bernardo", "Bienvenido", "Blas", "Bonito", "Borja", "Braulio", "Bricio", "Bruno", "Calixto", "Calvino", "Camari", "Camilo", "Candido", "Carlitos", "Carlos Enrique", "Carlos Ivan", "Carlos Jose", "Carlos", "Carmelo", "Cartez", "Casandro", "Casimiro", "Casto", "Castor", "Cayetano", "Cecilio", "Ceferino", "Celedonio", "Celerino", "Celestino", "Celio", "Celso", "César", "Chico", "Christian", "Cid", "Cipriano", "Ciriaco", "Cirilo", "Ciro", "Claudio", "Clemente", "Cleto", "Clodomiro", "Colón", "Confesor", "Conrado", "Constancio", "Constantino", "Corbin", "Cornelio", "Cortez", "Cosme", "Crescencio", "Crisanto", "Crispo", "Cristobal", "Cruz", "Custodio", "Cutberto", "Dagoberto", "Dámaso", "Damián", "Daniel", "Danilo", "Dardo", "Dario", "David", "Dayron", "Delfin", "Delfino", "Demetrio", "Demócrito", "Deodato", "Derico", "Desiderio", "Diego", "Dimas", "Dionisio", "Domas", "Domiciano", "Dominador", "Domingo", "Donaldo", "Doroteo", "Duilio", "Eberardo", "Edel", "Edelberto", "Edelio", "Edelmar", "Edelmiro", "Edgar", "Edgardo", "Edmundo", "Eduardo", "Edwin", "Efrain", "Efrén", "Egidio", "Eladio", "Elbio", "Eleuterio", "Elián", "Elias", "Eliecer", "Eligio", "Elio", "Eliseo", "Eliut", "Eloy", "Elvio", "Emerio", "Emeterio", "Emiliano", "Emilio", "Enrique", "Epicuro", "Epifanio", "Epimenio", "Epitacio", "Erardo", "Erasmo", "Ernesto", "Espartaco", "Estanislao", "Esteban", "Eufemio", "Eufracio", "Eugenio", "Eulalio", "Eulojio", "Eusebio", "Eustacio", "Evando", "Evaristo", "Everardo", "Expedito", "Ezequiel", "Fabián", "Fabio", "Faustino", "Fausto", "Favio", "Federico", "Feliciano", "Felipe", "Felisardo", "Felix", "Fermin", "Fernando", "Fidel", "Filadelfo", "Filademo", "Filemon", "Filiberto", "Flavio", "Floreal", "Florencio", "Florián", "Francisco", "Franco", "Freddy", "Fulgencio", "Fulvio", "Gabimael", "Gabino", "Gabriel", "Gadiel", "Galeaso", "Galo", "Gaspar", "Gaudencio", "Gedeón", "Genaro", "Generoso", "George", "Gerardo", "Germán", "Germinal", "Gerson", "Gervasio", "Gesualdo", "Getulio", "Gilberto", "Gildardo", "Giovanni", "Gomez", "Gonzalo", "Gracián", "Graciano", "Gregorio", "Gualberto", "Gualterio", "Guarionex", "Guillermo", "Gumecindo", "Gustavo", "Gutierre", "Hadriano", "Hector", "Héctor", "Helias", "Heliodoro", "Heráclito", "Heriberto", "Hernán", "Hernando", "Heródoto", "Higinio", "Hilario", "Hipolito", "Homero", "Homobono", "Honesto", "Honoratio", "Horacio", "Hugan", "Humberto", "Ibero", "Ignacio", "Ignaz", "Inocencio", "Ionatán", "Isaias", "Isidro", "Ismael", "Ivan", "Iván", "Jacinto", "Jaime Luis", "Jaime", "Jairo", "Jandino", "Javier", "Jeremias", "Jesús", "Jilberto", "Joaquin", "Joel", "Jonás", "Jorge", "José Alberto", "José Javier", "José Luis", "José MarÃa", "José", "Juan Carlos", "Juan Diego", "Juan", "Julián", "Juliano", "Julino", "Julio", "Justiniano", "Justino", "Juvenal", "Ladislao", "Landerico", "Landolfo", "Laureano", "Laurelino", "Laurentino", "Lauro", "Lazaro", "Lázaro", "Leal", "Leandro", "Learco", "Lelio", "Leo", "Leobardo", "Leocadio", "León", "Leonardo", "Leonel", "Leónidas", "Leonzo", "Leopoldo", "Leto", "Liberal", "Liberato", "Libio", "Licugro", "Lino", "Lisandro", "Livio", "Lope", "Lorenzo", "Loreto", "Luano", "Lucas", "Lucero", "Luciano", "Lucio", "Lucrecio", "Luis", "Luiz", "Macabeo", "Macario", "Macedonio", "Maciel", "Malaquias", "Manfredo", "Manuel", "Marcelino", "Marcelo", "Marcial", "Marcio", "Marco", "Marcos", "Mariano", "Marino", "MartÃn", "Mateo", "Matias", "Mauricio", "Mauro", "Maurys", "Maximo", "Melchor", "Melecio", "Meliton", "Melquisede", "Menandro", "Mentor", "Mercurio", "Miguel Angel", "Miguel", "Misael", "Modesto", "Moises", "Monserrate", "Nacho", "Naldo", "Narciso", "Narno", "Natal", "Natalio", "Nataniel", "Nazareno", "Nazaret", "Nazario", "Neandro", "Neftali", "Nemesio", "Neptuno", "Nereo", "Nestor", "Nicandro", "Nicanor", "Nicasio", "Niceto", "Nicolas", "Nilo", "Noe", "Nolasco", "Norberto", "Normando", "Nuncio", "Obdulio", "Octaviano", "Octavio", "Olegario", "Olimpo", "Omar", "Onofre", "Orangel", "Orencio", "Orestes", "Orfeo", "Origenes", "Orión", "Orlando", "Ortiz", "Oscar", "Osmundo", "Osvaldo", "Oswaldo", "Otilio", "Otoniel", "Ovidio", "Pablo", "Pacifico", "Pancracio", "Panfilo", "Paris", "Parmenio", "Pascual", "Pastor", "Patricio", "Paul", "Pedro", "Perfecto", "Perpetuo", "Placido", "Policarpo", "Polifemo", "Porfirio", "Poseidón", "Priamo", "Procopio", "Prometeo", "Próspero", "QuentÃn", "Quintero", "Quito", "Rafael", "Raidel", "Raimundo", "Ramiro", "Ramón", "Raul", "Raúl", "Raymundo", "Refugio", "Reinaldo", "Remigio", "Renato", "Renzo", "Rey", "Reyes", "Reynaldo", "Ricardo", "Rigoberto", "Roberto", "Rocio", "Rodolfo", "Rodrigo", "Rogelio", "Rojelio", "Rolando", "Román", "Romero", "Ronaldo", "Roque", "Rosario", "Rosendo", "Ruben", "Rubio", "Rufo", "Ruperto", "Sabelio", "Sabino", "Salomón", "Salvador", "Salviano", "Salvo", "Sancho", "Sansón", "Santiago", "Santino", "Santos", "Saturnino", "Saúl", "Sebastián", "Sebastiano", "Segismundo", "Segundo", "Sempronio", "Serafin", "Sergio", "Servando", "Servio", "Severino", "Silverio", "Silviano", "Silvio", "Simón", "Sixto", "Socorro", "Solano", "Sotero", "Tacio", "Tacito", "Tadeo", "Tajo", "Tancredo", "Tarquino", "Tarsicio", "Telemaco", "Teodomiro", "Teodoro", "Teodosio", "Teofano", "Teofilio", "Tercio", "Terencio", "Tiberio", "Tiburcio", "Ticiano", "Timoteo", "Tino", "Tito", "Tomás", "Toribio", "Toruato", "Tranquiliano", "Tranquilino", "Transito", "Tripilo", "Tristán", "Tulio", "Ubaldo", "Ulises", "Ulrico", "Unai", "Urbano", "Uriel", "Valdemar", "ValentÃn", "Valeriano", "Valerio", "Venturo", "Vermundo", "Vero", "Vicente", "Victor", "Victoriano", "Vidal", "Virgilio", "Viviano", "Vulpiano", "Walberto", "Wilfredo", "Xavier", "Yadiel", "Yago", "Yamel", "Yareli", "Yaro", "Yasmani", "Yerai", "Ygnacio", "Yoel", "Yojany", "Yuniel", "Zenobio", "Zumel"];
-App.Data.misc.cubanSlaveSurnames = ["Abad", "Abrahantes", "Abreu", "Abreus", "Acanda", "Acea", "Acevedo", "Acosta", "Acuna", "Adan", "Agramonte", "Aguero", "Aguiar", "Aguila", "Aguilar", "Aguilera", "Aguirre", "Alarcon", "Alba", "Albelo", "Albert", "Alberto", "Alcantara", "Alcolea", "Aldama", "Aldana", "Aleaga", "Alejo", "Aleman", "Alfaro", "Alfonso", "Aliaga", "Allen", "Almaguer", "Almanza", "Almarales", "Almeida", "Almenares", "Almira", "Aloma", "Alonso", "Alpizar", "Alvarado", "Alvares", "Alvarez", "Amador", "Amaro", "Amaya", "Amores", "Anaya", "Andino", "Andres", "Angulo", "Antunez", "Aparicio", "Aquino", "Aragon", "Aranda", "Arango", "Araujo", "Arbolaez", "Arce", "Arcia", "Areas", "Arencibia", "Arevalo", "Argota", "Argudin", "Arguelles", "Arias", "Armas", "Armenteros", "Arocha", "Arredondo", "Arrieta", "Arteaga", "Artiles", "Arzola", "Arzuaga", "Avalos", "Avila", "Aviles", "Ayala", "Azcuy", "Bacallao", "Baez", "Ballester", "Bandera", "Banos", "Baracaldo", "Barban", "Barcelo", "Baro", "Barrabia", "Barrera", "Barreras", "Barrero", "Barreto", "Barrientos", "Barrio", "Barrios", "Barroso", "Barzaga", "Basso", "Basulto", "Batista", "Bauza", "Becerra", "Bejerano", "Bell", "Bello", "Beltran", "Benavides", "Bencomo", "Benitez", "Bermudez", "Bernal", "Betancourt", "Biscet", "Blanco", "Boitel", "Bolanos", "Bonet", "Bonne", "Borges", "Borrego", "Borrero", "Borroto", "Bosch", "Bouza", "Bouzidi", "Boza", "Bravo", "Breff", "Brito", "Brizuela", "Brocard", "Broche", "Brú", "Brunet", "Bruzon", "Bueno", "Burgos", "Buron", "Bustamante", "Caballero", "Cabello", "Cabezas", "Cabrales", "Cabreja", "Cabrera", "Caceres", "Cadrelo", "Cairo", "Cala", "Calatayud", "Calderin", "CalderÃn", "Calderon", "Calero", "Calvo", "Calzada", "Calzadilla", "Calzado", "Camacho", "Camejo", "Campo", "Campos", "Cancio", "Canel", "Canete", "Canizares", "Cañizarez", "Cano", "Cantero", "Cantillo", "Capote", "Caraballo", "Carballo", "Carballosa", "Carbonell", "Cardenas", "Cardentey", "Cardero", "Cardona", "Cardoso", "Carmenate", "Carmenates", "Carmona", "Caro", "Carpio", "Carralero", "Carrasco", "Carrazana", "Carreño", "Carrera", "Carreras", "Carrero", "Carrillo", "Carrion", "Cartaya", "Carvajal", "Casañas", "Casanova", "Casas", "Castaneda", "Castaño", "Castell", "Castellano", "Castellanos", "Castellon", "Castillo", "Castro", "Catala", "Ceballo", "Ceballos", "Cedeño", "Cejas", "Centeno", "Cepeda", "Cepero", "Cervantes", "Cespedes", "Chacon", "Chamizo", "Chang", "Charchaval", "Chavez", "Chaviano", "Chia", "Chile", "Chinea", "Chirino", "Chong", "Cid", "Cienfuegos", "Cintra", "Cisnero", "Cisneros", "Claro", "Clement", "Cobas", "Cobo", "Coca", "Coello", "Colas", "Colina", "Collado", "Collazo", "Columbie", "Comas", "Companioni", "Companionis", "Concepcion", "Conde", "Consuegra", "Contino", "Contrera", "Contreras", "Copello", "Corcho", "Cordero", "Cordova", "Cordoves", "Cordovi", "Corona", "Corral", "Corrales", "Correa", "Cortes", "Cortina", "Corzo", "Cosme", "Cossio", "Costa", "Coto", "Crespo", "Cruz", "Cruzata", "Cuadrado", "Cuba", "Cue", "Cuellar", "Cuello", "Cuenca", "Cuervo", "Cuesta", "Cueto", "Cuevas", "Curbelo", "Cutiño", "Cuza", "Damas", "Danger", "Daniel", "Darias", "Davila", "de Armas", "de La Cruz", "de La Paz", "de La Rosa", "de La Torre", "de La Vega", "de Leon", "del Castillo", "del Pino", "del Pozo", "del Rio", "del Risco", "del Sol", "del Toro", "del Valle", "Delgado", "Delis", "DelÃs", "Denis", "Despaigne", "Dfaz", "Diago", "Diaz", "DÃaz", "Dieguez", "Diez", "Dñaz", "Domfnguez", "Dominguez", "Donatien", "Dorrmann", "Dorta", "Duany", "Duardo", "Duarte", "Duenas", "Duharte", "Dumenigo", "Duporty", "Duque", "Duran", "Duvergel", "Echemendia", "Echevarrfa", "Echevarria", "Echeverria", "Elias", "Enrique", "Enriquez", "Escalante", "Escalona", "Escobar", "Espino", "Espinosa", "Esquivel", "Estenoz", "Estevez", "Estrada", "Estupiñan", "Evora", "Exposito", "Fabelo", "Fabregas", "Fajardo", "Falcon", "Farinas", "Febles", "Felipe", "Feria", "Fernandez", "Fernndez", "Ferrales", "Ferran", "Ferreiro", "Ferrer", "Ferrera", "Ferro", "Fiallo", "Fidalgo", "Figueras", "Figueredo", "Figueroa", "Fleitas", "Fleites", "Flores", "Fong", "Fonseca", "Font", "Fontaine", "Fonte", "Fornaris", "Fraga", "Francisco", "Franco", "Freire", "Frias", "Frometa", "Fuente", "Fuentes", "Fumero", "Fundora", "Gainza", "Galan", "Galano", "Galban", "Galdos", "Galindo", "Gallardo", "Gallego", "Gallo", "Galvan", "Galvez", "Gamboa", "Gamez", "Garay", "Garbey", "Garca", "Garces", "Garcfa", "Garcia", "GarcÃa", "Garcias", "Garcña", "Garrido", "Garriga", "Garzon", "Gato", "Gaxiola", "Gil", "Ginarte", "Giro", "Giron", "Godoy", "Gomez", "Gómez", "Gongora", "Gonzales", "Gonzalez", "González", "Granado", "Granados", "Granda", "Grau", "Grenot", "Grillo", "Guanche", "Guerra", "Guerrero", "Guevara", "Guilarte", "Guillen", "Guillot", "Guisado", "Gutierrez", "Gutiérrez", "Gutitrrez", "Guzman", "Hechavarria", "Hechevarria", "Heredia", "Hernadez", "Hernandez", "Hernández", "Hernnadez", "Hernndez", "Herrera", "Herrero", "Hevia", "Hidalgo", "Hierrezuelo", "Hildalgo", "Hinojosa", "Horta", "Hoyos", "Huerta", "Hung", "Hurtado", "Ibañez", "Ibarra", "Iglesia", "Iglesias", "Infante", "Isaac", "Isasi", "Izaguirre", "Iznaga", "Izquierdo", "Jaime", "Janet", "Jardines", "Jardinez", "Jauregui", "Jerez", "Jimenez", "Jimtnez", "Jordan", "Jorge", "Jova", "Junco", "Justiz", "Kindelan", "La O", "La Rosa", "Labañino", "Labrada", "Labrador", "Laffita", "Lago", "Laguardia", "Laguna", "Lahera", "Lamas", "Lamela", "Lamoru", "Landa", "Lara", "Lastre", "Laurencio", "Laza", "Lazo", "Leal", "Ledesma", "Legon", "Legra", "Legrá", "Leiva", "Lemus", "Leon", "Leonard", "Lescay", "Leyva", "Lezcano", "Licea", "Lima", "Limonta", "Linares", "Llanes", "Llano", "Lleó", "Llerena", "Llorente", "Lobaina", "Loforte", "Lopez", "López", "Lora", "Lorente", "Lorenzo", "Lores", "Loyola", "Lozada", "Lozano", "Luaces", "Lugo", "Lugones", "Luis", "Luna", "Maceo", "Machado", "Machin", "Macias", "Madera", "Madrazo", "Madrigal", "Madruga", "Malagon", "Maldonado", "Manresa", "Manso", "Mantilla", "Manzano", "Maqueira", "Marcos", "Maresma", "Marichal", "Marin", "MarÃn", "Marino", "Marquez", "Marrero", "Martell", "Martfn", "Martfnez", "Marti", "MartÃ", "Martin", "Martinez", "MartÃnez", "Martnez", "Martñnez", "Mas", "Maso", "Masso", "Matamoros", "Mateo", "Matos", "Maturell", "Maure", "Mayedo", "Mayo", "Mayola", "Mayor", "Mazorra", "McLeon", "McLeón", "Mederos", "Medina", "Mejias", "Mekin", "Melendez", "Melian", "Melo", "Mena", "Mendez", "Mendoza", "Menendez", "Menéndez", "Meneses", "Mengana", "Menocal", "Merino", "Mesa", "Mestre", "Miguel", "Mijares", "Milan", "Milanes", "Milian", "Millan", "Mirabal", "Miranda", "Mojena", "Molina", "Montalvan", "Montalvo", "Montaño", "Monteagudo", "Montejo", "Montelier", "Montenegro", "Montero", "Monterrey", "Montes de Oca", "Montes", "Montesino", "Montoya", "Monzon", "Mora", "Morales", "Moran", "More", "Moreira", "Morejon", "Morell", "Moreno", "Morera", "Morffi", "Morgado", "Morgan", "Moro", "Mosquera", "Moya", "Mujica", "Mulet", "Muñiz", "Muñoz", "Murrieta", "MursulÃ", "Mustelier", "Napoles", "Naranjo", "Navarrete", "Navarro", "Negrin", "Nerey", "Neyra", "Nicot", "Nieto", "Nieves", "Nnez", "Noa", "Noda", "Nodal", "Nodarse", "Noriega", "Novo", "Novoa", "Noy", "Nuñez", "Obregon", "Ocampo", "Ocana", "Ochoa", "Odio", "Oduardo", "Ojeda", "Olano", "Olazabal", "Oliva", "Olivares", "Olivera", "Oliveros", "Oquendo", "Oramas", "Ordaz", "Ordoñez", "Oro", "Oropesa", "Orozco", "Orta", "Ortega", "Ortiz", "Osorio", "Otaño", "Otero", "Oviedo", "Pacheco", "Padilla", "Padron", "Paez", "Palacio", "Palacios", "Palenzuela", "Palma", "Palmero", "Palomino", "Pando", "Paneque", "Pantoja", "Parada", "Pardo", "Paredes", "Parra", "Pascual", "Pastrana", "Paumier", "Pavon", "Paz", "Pedraza", "Pedroso", "Peguero", "Pelaez", "Pena", "Peña", "Penalver", "Peñate", "Penton", "Peralta", "Peraza", "Perdomo", "Pereda", "Pereira", "Perera", "Perez", "Pérez", "Pernia", "Pestana", "Pichardo", "Piedra", "Piloto", "Pimentel", "Pimienta", "Piña", "Pineda", "Piñeiro", "Pinero", "Pino", "Pita", "Pla", "Placencia", "Placeres", "Planas", "Plasencia", "Poey", "Polanco", "Polo", "Pompa", "Ponce de Leon", "Ponce", "Pons", "Porro", "Portal", "Portales", "Portela", "Portelles", "Portilla", "Portuondo", "Posada", "Pozo", "Prado", "Prieta", "Prieto", "Primelles", "Proenza", "Ptrez", "Puente", "Puentes", "Puerta", "Puerto", "Puig", "Pujol", "Pulido", "Pupo", "Quesada", "Quevedo", "Quiala", "Quiñones", "Quintana", "Quintanilla", "Quintero", "Quiroga", "Quiros", "Quirot", "Rabelo", "Rabi", "Ramfrez", "Ramirez", "Ramon", "Ramos", "Rangel", "Ravelo", "Recio", "Regalado", "Rego", "Reina", "Reinoso", "Remedios", "Revé", "Revilla", "Rey", "Reyes", "Reyna", "Reynaldo", "Reynosa", "Rguez", "Ricardo", "Rico", "Riera", "Rios", "Risco", "Rivadeneira", "Rivas", "Rivera", "Rivero", "Riveron", "Rizo", "Robaina", "Robayna", "Robert", "Robles", "Roca", "Rocha", "Roche", "Rodrfguez", "Rodrguez", "Rodriguez", "RodrÃguez", "Rodrñguez", "Roig", "Rojas", "Rojo", "Roldan", "Rolo", "Roman", "Romero", "Rondon", "Roque", "Rosa", "Rosabal", "Rosado", "Rosales", "Rosell", "Rosello", "Ruano", "Rubio", "Rufz", "Ruiz", "Ruz", "Saavedra", "Sabina", "Saez", "Sainz", "Salabarria", "Salas", "SalavarrÃa", "Salazar", "Salcedo", "Salgado", "Salomon", "San Martin", "Sanabria", "Sanchez", "Sánchez", "Sandoval", "Santa Cruz", "Santana", "Santander", "Santiago", "Santiesteban", "Santos", "Sanz", "Sardina", "Sardinas", "Sarduy", "Sariol", "Sarmiento", "Sarria", "Savigne", "Scull", "Segui", "Segura", "Semanat", "Sera", "Serra", "Serrano", "Sierra", "Silot", "Silva", "Silveira", "Silvente", "Silverio", "Simon", "Simón", "Skyers", "Smith", "Snchez", "Soca", "Socarras", "Socarrás", "Socorro", "Solano", "Soler", "Solis", "Sori", "Soria", "Soriano", "Soris", "Sosa", "Sotelo", "Soto", "Sotolongo", "Sotomayor", "Suarez", "Suárez", "Suri", "Tabares", "Tabera", "Tamayo", "Tapanes", "Tapia", "Tejeda", "Tejera", "Telles", "Tellez", "Téllez", "Terrero", "Terry", "Thaureaux", "Toirac", "Toledo", "Toranzo", "Tornes", "Torrado", "Torres", "Torrez", "Torriente", "Travieso", "Treto", "Triana", "Trujillo", "Turino", "Ulloa", "Urquiza", "Urra", "Urrutia", "Vaillant", "Valdes", "Valdez", "Valdivia", "Valdts", "Valenzuela", "Valera", "Valero", "Valido", "Valiente", "Valladares", "Valle", "Valverde", "Varela", "Vargas", "Varona", "Vasallo", "Vazquez", "Vega", "Veitia", "Velazco", "Velazquez", "Velázquez", "Velez", "Veliz", "Veloz", "Venegas", "Venet", "Vento", "Ventura", "Vera", "Veranes", "Verdecia", "Vergara", "Viamonte", "Viamontes", "Vicente", "Vidal", "Viera", "Vieta", "Vigoa", "Vila", "Vilches", "Villa", "Villafaña", "Villalobos", "Villalon", "Villalonga", "Villanueva", "Villar", "Villavicencio", "Villegas", "Viltres", "Viñas", "Vinent", "Vizcaino", "Weyler", "Wilson", "Wong", "Yanes", "Yanez", "Yera", "Yero", "Zalazar", "Zaldivar", "Zambrano", "Zamora", "Zayas", "Zerquera", "Zulueta", "Zuniga"];
+App.Data.misc.cubanSlaveSurnames = ["Abad", "Abrahantes", "Abreu", "Abreus", "Acanda", "Acea", "Acevedo", "Acosta", "Acuna", "Adan", "Agramonte", "Aguero", "Aguiar", "Aguila", "Aguilar", "Aguilera", "Aguirre", "Alarcon", "Alba", "Albelo", "Albert", "Alberto", "Alcantara", "Alcolea", "Aldama", "Aldana", "Aleaga", "Alejo", "Aleman", "Alfaro", "Alfonso", "Aliaga", "Allen", "Almaguer", "Almanza", "Almarales", "Almeida", "Almenares", "Almira", "Aloma", "Alonso", "Alpizar", "Alvarado", "Alvares", "Alvarez", "Amador", "Amaro", "Amaya", "Amores", "Anaya", "Andino", "Andres", "Angulo", "Antunez", "Aparicio", "Aquino", "Aragon", "Aranda", "Arango", "Araujo", "Arbolaez", "Arce", "Arcia", "Areas", "Arencibia", "Arevalo", "Argota", "Argudin", "Arguelles", "Arias", "Armas", "Armenteros", "Arocha", "Arredondo", "Arrieta", "Arteaga", "Artiles", "Arzola", "Arzuaga", "Avalos", "Avila", "Aviles", "Ayala", "Azcuy", "Bacallao", "Baez", "Ballester", "Bandera", "Banos", "Baracaldo", "Barban", "Barcelo", "Baro", "Barrabia", "Barrera", "Barreras", "Barrero", "Barreto", "Barrientos", "Barrio", "Barrios", "Barroso", "Barzaga", "Basso", "Basulto", "Batista", "Bauza", "Becerra", "Bejerano", "Bell", "Bello", "Beltran", "Benavides", "Bencomo", "Benitez", "Bermudez", "Bernal", "Betancourt", "Biscet", "Blanco", "Boitel", "Bolanos", "Bonet", "Bonne", "Borges", "Borrego", "Borrero", "Borroto", "Bosch", "Bouza", "Bouzidi", "Boza", "Bravo", "Breff", "Brito", "Brizuela", "Brocard", "Broche", "Brú", "Brunet", "Bruzon", "Bueno", "Burgos", "Buron", "Bustamante", "Caballero", "Cabello", "Cabezas", "Cabrales", "Cabreja", "Cabrera", "Caceres", "Cadrelo", "Cairo", "Cala", "Calatayud", "Calderin", "CalderÃn", "Calderon", "Calero", "Calvo", "Calzada", "Calzadilla", "Calzado", "Camacho", "Camejo", "Campo", "Campos", "Cancio", "Canel", "Canete", "Canizares", "Cañizarez", "Cano", "Cantero", "Cantillo", "Capote", "Caraballo", "Carballo", "Carballosa", "Carbonell", "Cardenas", "Cardentey", "Cardero", "Cardona", "Cardoso", "Carmenate", "Carmenates", "Carmona", "Caro", "Carpio", "Carralero", "Carrasco", "Carrazana", "Carreño", "Carrera", "Carreras", "Carrero", "Carrillo", "Carrion", "Cartaya", "Carvajal", "Casañas", "Casanova", "Casas", "Castaneda", "Castaño", "Castell", "Castellano", "Castellanos", "Castellon", "Castillo", "Castro", "Catala", "Ceballo", "Ceballos", "Cedeño", "Cejas", "Centeno", "Cepeda", "Cepero", "Cervantes", "Cespedes", "Chacon", "Chamizo", "Chang", "Charchaval", "Chavez", "Chaviano", "Chia", "Chile", "Chinea", "Chirino", "Chong", "Cid", "Cienfuegos", "Cintra", "Cisnero", "Cisneros", "Claro", "Clement", "Cobas", "Cobo", "Coca", "Coello", "Colas", "Colina", "Collado", "Collazo", "Columbie", "Comas", "Companioni", "Companionis", "Concepcion", "Conde", "Consuegra", "Contino", "Contrera", "Contreras", "Copello", "Corcho", "Cordero", "Cordova", "Cordoves", "Cordovi", "Corona", "Corral", "Corrales", "Correa", "Cortes", "Cortina", "Corzo", "Cosme", "Cossio", "Costa", "Coto", "Crespo", "Cruz", "Cruzata", "Cuadrado", "Cuba", "Cue", "Cuellar", "Cuello", "Cuenca", "Cuervo", "Cuesta", "Cueto", "Cuevas", "Curbelo", "Cutiño", "Cuza", "Damas", "Danger", "Daniel", "Darias", "Davila", "de Armas", "de La Cruz", "de La Paz", "de La Rosa", "de La Torre", "de La Vega", "de Leon", "del Castillo", "del Pino", "del Pozo", "del Rio", "del Risco", "del Sol", "del Toro", "del Valle", "Delgado", "Delis", "DelÃs", "Denis", "Despaigne", "Dfaz", "Diago", "Diaz", "DÃaz", "Dieguez", "Diez", "Dñaz", "Domfnguez", "Dominguez", "Donatien", "Dorrmann", "Dorta", "Duany", "Duardo", "Duarte", "Duenas", "Duharte", "Dumenigo", "Duporty", "Duque", "Duran", "Duvergel", "Echemendia", "Echevarrfa", "Echevarria", "Echeverria", "Elias", "Enrique", "Enriquez", "Escalante", "Escalona", "Escobar", "Espino", "Espinosa", "Esquivel", "Estenoz", "Estevez", "Estrada", "Estupiñan", "Evora", "Exposito", "Fabelo", "Fabregas", "Fajardo", "Falcon", "Farinas", "Febles", "Felipe", "Feria", "Fernandez", "Fernndez", "Ferrales", "Ferran", "Ferreiro", "Ferrer", "Ferrera", "Ferro", "Fiallo", "Fidalgo", "Figueras", "Figueredo", "Figueroa", "Fleitas", "Fleites", "Flores", "Fong", "Fonseca", "Font", "Fontaine", "Fonte", "Fornaris", "Fraga", "Francisco", "Franco", "Freire", "Frias", "Frometa", "Fuente", "Fuentes", "Fumero", "Fundora", "Gainza", "Galan", "Galano", "Galban", "Galdos", "Galindo", "Gallardo", "Gallego", "Gallo", "Galvan", "Galvez", "Gamboa", "Gamez", "Garay", "Garbey", "Garca", "Garces", "Garcfa", "Garcia", "GarcÃa", "Garcias", "Garcña", "Garrido", "Garriga", "Garzon", "Gato", "Gaxiola", "Gil", "Ginarte", "Giro", "Giron", "Godoy", "Gomez", "Gómez", "Gongora", "Gonzales", "Gonzalez", "González", "Granado", "Granados", "Granda", "Grau", "Grenot", "Grillo", "Guanche", "Guerra", "Guerrero", "Guevara", "Guilarte", "Guillen", "Guillot", "Guisado", "Gutierrez", "Gutiérrez", "Gutitrrez", "Guzman", "Hechavarria", "Hechevarria", "Heredia", "Hernadez", "Hernandez", "Hernández", "Hernnadez", "Hernndez", "Herrera", "Herrero", "Hevia", "Hidalgo", "Hierrezuelo", "Hildalgo", "Hinojosa", "Horta", "Hoyos", "Huerta", "Hung", "Hurtado", "Ibañez", "Ibarra", "Iglesia", "Iglesias", "Infante", "Isaac", "Isasi", "Izaguirre", "Iznaga", "Izquierdo", "Jaime", "Janet", "Jardines", "Jardinez", "Jauregui", "Jerez", "Jimenez", "Jimtnez", "Jordan", "Jorge", "Jova", "Junco", "Justiz", "Kindelan", "La O", "La Rosa", "Labañino", "Labrada", "Labrador", "Laffita", "Lago", "Laguardia", "Laguna", "Lahera", "Lamas", "Lamela", "Lamoru", "Landa", "Lara", "Lastre", "Laurencio", "Laza", "Lazo", "Leal", "Ledesma", "Legon", "Legra", "Legrá", "Leiva", "Lemus", "Leon", "Leonard", "Lescay", "Leyva", "Lezcano", "Licea", "Lima", "Limonta", "Linares", "Llanes", "Llano", "Lleó", "Llerena", "Llorente", "Lobaina", "Loforte", "Lopez", "López", "Lora", "Lorente", "Lorenzo", "Lores", "Loyola", "Lozada", "Lozano", "Luaces", "Lugo", "Lugones", "Luis", "Luna", "Maceo", "Machado", "Machin", "Macias", "Madera", "Madrazo", "Madrigal", "Madruga", "Malagon", "Maldonado", "Manresa", "Manso", "Mantilla", "Manzano", "Maqueira", "Marcos", "Maresma", "Marichal", "Marin", "MarÃn", "Marino", "Marquez", "Marrero", "Martell", "Marti", "MartÃ", "Martin", "MartÃn", "Martinez", "MartÃnez", "Martnez", "Martñnez", "Mas", "Maso", "Masso", "Matamoros", "Mateo", "Matos", "Maturell", "Maure", "Mayedo", "Mayo", "Mayola", "Mayor", "Mazorra", "McLeon", "McLeón", "Mederos", "Medina", "Mejias", "Mekin", "Melendez", "Melian", "Melo", "Mena", "Mendez", "Mendoza", "Menendez", "Menéndez", "Meneses", "Mengana", "Menocal", "Merino", "Mesa", "Mestre", "Miguel", "Mijares", "Milan", "Milanes", "Milian", "Millan", "Mirabal", "Miranda", "Mojena", "Molina", "Montalvan", "Montalvo", "Montaño", "Monteagudo", "Montejo", "Montelier", "Montenegro", "Montero", "Monterrey", "Montes de Oca", "Montes", "Montesino", "Montoya", "Monzon", "Mora", "Morales", "Moran", "More", "Moreira", "Morejon", "Morell", "Moreno", "Morera", "Morffi", "Morgado", "Morgan", "Moro", "Mosquera", "Moya", "Mujica", "Mulet", "Muñiz", "Muñoz", "Murrieta", "MursulÃ", "Mustelier", "Napoles", "Naranjo", "Navarrete", "Navarro", "Negrin", "Nerey", "Neyra", "Nicot", "Nieto", "Nieves", "Nnez", "Noa", "Noda", "Nodal", "Nodarse", "Noriega", "Novo", "Novoa", "Noy", "Nuñez", "Obregon", "Ocampo", "Ocana", "Ochoa", "Odio", "Oduardo", "Ojeda", "Olano", "Olazabal", "Oliva", "Olivares", "Olivera", "Oliveros", "Oquendo", "Oramas", "Ordaz", "Ordoñez", "Oro", "Oropesa", "Orozco", "Orta", "Ortega", "Ortiz", "Osorio", "Otaño", "Otero", "Oviedo", "Pacheco", "Padilla", "Padron", "Paez", "Palacio", "Palacios", "Palenzuela", "Palma", "Palmero", "Palomino", "Pando", "Paneque", "Pantoja", "Parada", "Pardo", "Paredes", "Parra", "Pascual", "Pastrana", "Paumier", "Pavon", "Paz", "Pedraza", "Pedroso", "Peguero", "Pelaez", "Pena", "Peña", "Penalver", "Peñate", "Penton", "Peralta", "Peraza", "Perdomo", "Pereda", "Pereira", "Perera", "Perez", "Pérez", "Pernia", "Pestana", "Pichardo", "Piedra", "Piloto", "Pimentel", "Pimienta", "Piña", "Pineda", "Piñeiro", "Pinero", "Pino", "Pita", "Pla", "Placencia", "Placeres", "Planas", "Plasencia", "Poey", "Polanco", "Polo", "Pompa", "Ponce de Leon", "Ponce", "Pons", "Porro", "Portal", "Portales", "Portela", "Portelles", "Portilla", "Portuondo", "Posada", "Pozo", "Prado", "Prieta", "Prieto", "Primelles", "Proenza", "Ptrez", "Puente", "Puentes", "Puerta", "Puerto", "Puig", "Pujol", "Pulido", "Pupo", "Quesada", "Quevedo", "Quiala", "Quiñones", "Quintana", "Quintanilla", "Quintero", "Quiroga", "Quiros", "Quirot", "Rabelo", "Rabi", "Ramfrez", "Ramirez", "Ramon", "Ramos", "Rangel", "Ravelo", "Recio", "Regalado", "Rego", "Reina", "Reinoso", "Remedios", "Revé", "Revilla", "Rey", "Reyes", "Reyna", "Reynaldo", "Reynosa", "Rguez", "Ricardo", "Rico", "Riera", "Rios", "Risco", "Rivadeneira", "Rivas", "Rivera", "Rivero", "Riveron", "Rizo", "Robaina", "Robayna", "Robert", "Robles", "Roca", "Rocha", "Roche", "Rodrfguez", "Rodrguez", "Rodriguez", "RodrÃguez", "Rodrñguez", "Roig", "Rojas", "Rojo", "Roldan", "Rolo", "Roman", "Romero", "Rondon", "Roque", "Rosa", "Rosabal", "Rosado", "Rosales", "Rosell", "Rosello", "Ruano", "Rubio", "Rufz", "Ruiz", "Ruz", "Saavedra", "Sabina", "Saez", "Sainz", "Salabarria", "Salas", "SalavarrÃa", "Salazar", "Salcedo", "Salgado", "Salomon", "San Martin", "Sanabria", "Sanchez", "Sánchez", "Sandoval", "Santa Cruz", "Santana", "Santander", "Santiago", "Santiesteban", "Santos", "Sanz", "Sardina", "Sardinas", "Sarduy", "Sariol", "Sarmiento", "Sarria", "Savigne", "Scull", "Segui", "Segura", "Semanat", "Sera", "Serra", "Serrano", "Sierra", "Silot", "Silva", "Silveira", "Silvente", "Silverio", "Simon", "Simón", "Skyers", "Smith", "Soca", "Socarras", "Socarrás", "Socorro", "Solano", "Soler", "Solis", "Sori", "Soria", "Soriano", "Soris", "Sosa", "Sotelo", "Soto", "Sotolongo", "Sotomayor", "Suarez", "Suárez", "Suri", "Tabares", "Tabera", "Tamayo", "Tapanes", "Tapia", "Tejeda", "Tejera", "Telles", "Tellez", "Téllez", "Terrero", "Terry", "Thaureaux", "Toirac", "Toledo", "Toranzo", "Tornes", "Torrado", "Torres", "Torrez", "Torriente", "Travieso", "Treto", "Triana", "Trujillo", "Turino", "Ulloa", "Urquiza", "Urra", "Urrutia", "Vaillant", "Valdes", "Valdez", "Valdivia", "Valdts", "Valenzuela", "Valera", "Valero", "Valido", "Valiente", "Valladares", "Valle", "Valverde", "Varela", "Vargas", "Varona", "Vasallo", "Vazquez", "Vega", "Veitia", "Velazco", "Velazquez", "Velázquez", "Velez", "Veliz", "Veloz", "Venegas", "Venet", "Vento", "Ventura", "Vera", "Veranes", "Verdecia", "Vergara", "Viamonte", "Viamontes", "Vicente", "Vidal", "Viera", "Vieta", "Vigoa", "Vila", "Vilches", "Villa", "Villafaña", "Villalobos", "Villalon", "Villalonga", "Villanueva", "Villar", "Villavicencio", "Villegas", "Viltres", "Viñas", "Vinent", "Vizcaino", "Weyler", "Wilson", "Wong", "Yanes", "Yanez", "Yera", "Yero", "Zalazar", "Zaldivar", "Zambrano", "Zamora", "Zayas", "Zerquera", "Zulueta", "Zuniga"];
App.Data.misc.curacaoanSlaveNames = ["Aafke", "Aaghie", "Aaltje", "Ada", "Adèle", "Adriaantje", "Adride", "Aefje", "Aeltje", "Agnietje", "Akisha", "Alerta", "Aletta", "Alexandra", "Altagracia", "Amelia", "Anamaria", "Angela", "Angeline", "Angenie", "Ann", "Anna", "Annaatje", "Anne Marie", "Anne", "Anneke", "Annemarie", "Annetje", "Anouk", "Antke", "Antoinette", "Anushka", "Ariaantje", "Ashanta", "Aubrey", "Ayanette", "Baltje", "Bartje", "Beatrix", "Beletje", "Bertha", "Betje", "Bloeme", "Camille", "Catharina", "Catherine", "Chanelle", "Christina", "Christine", "Christyntje", "Cipriana", "Claasje", "Cokkie", "Cunegonde", "Daatje", "Daleen", "Diana", "Dievertje", "Dirkje", "Divertje", "Doortje", "Dorinda", "Eefke", "Eline", "Elizabeth", "Elsa", "Elsbet", "Elsita", "Elsje", "Elvira", "Emmetje", "Emmy", "Engeltje", "Eugenia", "Eunice", "Evalina", "Fatima", "Femke", "Femmeke", "Femmetje", "Fernandine", "Fletje", "Floortje", "Florentijntje", "Fransiska", "Fransje", "Fyrena", "Fytie", "Gayle", "Geerta", "Geertje", "Geertruda", "Geertruijd", "Geesje", "Gepje", "Gertrudis", "Giertje", "Gloria", "Greet", "Gregoria", "Greta", "Hannah", "Hanneke", "Hansje", "Hassana", "Heleentje", "Heller", "Hendrika", "Herlinda", "Hilletje", "Imelda", "Ingeborg", "Ingrid", "Iris", "Irma", "Ivette", "Jaapje", "Jacoba", "Jacqueline", "Jamine", "Jan", "Jana", "Janna", "Jannetje", "Jansje", "Jantje", "Jasmin", "Jearmeane", "Jenne", "Jenyfeer", "Jetje", "Jikke", "Joanna", "Johanna", "Johanne", "Joke", "Jolanda", "Jorien", "Jouraine", "Jozaine", "Judica", "Juliana", "Jutte", "Juut", "Kaatje", "Kanisha", "Karin", "Kastanje", "Katrijn", "Katryn", "Katryne", "Klaartje", "Klaasje", "Klara", "Krisje", "Kristijntje", "Larisa", "Laurencia", "Laurien", "Leen", "Leena", "Leentje", "Leida", "Lena", "Lenoor", "Leonora", "Letje", "Lidushka", "Liene", "Lijdia", "Lisa", "Lucille", "Ludwina", "Lysje", "Maaicke", "Maartje", "Mafalda", "Magda", "Magdaleentje", "Margarietje", "Margreet", "Margretha", "Margriet", "Maria", "Marie", "Marieke", "Marijse", "Mariken", "Marisa", "Mariska", "Marit", "Maritje", "Marloes", "Martiena", "Maruschka", "Mary-Ann", "Mary", "Maxima", "Maybeline", "Mckeeyla", "Mercelina", "Miep", "Mijanou", "Mijntje", "Minerva", "Monifa", "Monika", "Mylene", "Naatje", "Naemi", "Nashaira", "Natacha", "Neeltje", "Nelleke", "Nida", "Nilva", "Ninfa", "Noortje", "Norayla", "Oeke", "Olga", "Paula", "Paulina", "Paulyntje", "Peggy", "Petra", "Petronella", "Philomena", "Pieternella", "Regina", "Regine", "Resyntje", "Rianne", "Rie", "Rika", "Romy", "Roosje", "Rosalinda", "Rosana", "Rozemond", "Ruth", "Ruthmilda", "Rychacviana", "Saartje", "Sabrina", "Sadie", "Safira", "Sally", "Sanna", "Sanne", "Sanneke", "Sannertje", "Saskia", "Seer", "Sharyaane", "Sheida", "Sien", "Sientje", "Silvana", "Siska", "Sjoukje", "Solange", "Soraida", "Soucke", "Steentje", "Stephanie", "Stien", "Sue-Ann", "Sue", "Supharmy", "Susanne", "Suzanne", "Tamara", "Teuntje", "Theresa", "Thialda", "Tientje", "Tietje", "Tjaatje", "Toontje", "Tressje", "Trijn", "Trintje", "Trui", "Truida", "Truitje", "Urseltje", "Valentyn", "Vanessa", "Vanity", "Veerle", "Vendetta", "Verna", "Victoria", "Viennaline", "Viveca", "Vrouwtje", "Wimpje", "Wyntje", "Xafira", "Xiomara", "Yandra", "Yasmin", "Ydje", "Yvonne", "Zita", "Zjarritjen"];
App.Data.misc.curacaoanMaleNames = ["Aalbert", "Aarend", "Aart", "Adolf", "Adriaan", "Adriaen", "Aelbert", "Agiomar", "Alexander", "Amerigo", "Andre", "Andreas", "Andries", "Angelo", "Anthonij", "Anthonius", "Anthony", "Anton", "Ariaantje", "Arjen", "Arnold", "Arte", "Aubrey", "Augustyn", "Baltus", "Barent", "Bart", "Barthold", "Bastiaan", "Ben", "Bernard", "Bram", "Caspar", "Chris", "Christiaan", "Christoffel", "Churandy", "Claas", "Clemens", "Conrad", "Constantijn", "Coos", "Cor", "Cornelis", "Cornelius", "D'Angelo", "Daam", "Daendels", "Daniel", "Denzil", "Diderik", "Diederik", "Dionijs", "Dirck", "Dirk", "Dolf", "Dorus", "Dries", "Dudley", "Eduard", "Eelke", "Egbert", "Endy", "Epke", "Errol", "Eugene", "Eusebio", "Faas", "Felix", "Fijtge", "Floris", "Frans", "Frederek", "Freek", "Frem", "Frits", "Geerard", "Geerd", "Geert", "Geordie", "Gerald", "Gerolt", "Gerrit", "Gerritson", "Gervaas", "Giel", "Gijsbert", "Gilmar", "Gionne", "Glenn", "Govert", "Gregor", "Gysbert", "Hannes", "Harman", "Hendrick", "Hendrik", "Hendrikus", "Hensley", "Howard", "Hubrecht", "Huib", "Huijbert", "Humphrey", "Huybert", "Huyck", "Huygen", "Ireneus", "Irvingly", "Izaak", "Jaap", "Jacobus", "Jaime", "Jairo", "Jakob", "Jan", "Jandino", "Jantje", "Japie", "Jarchinio", "Jean-Julien", "Jean", "Jeremy", "Jeroen", "Joannes", "Joao", "Jochem", "Johan", "Johannes", "John-Henk", "John", "Joop", "Joost", "Joren", "Jorgen", "Joris", "Jos", "Jubert", "Julien", "Karel", "Kenneth", "Klaas", "Kobie", "Koenrad", "Krelis", "Laurens", "Leendert", "Leo", "Lieb", "Liemarvin", "Lieuwe", "Lodewijk", "Lukas", "Lusger", "Maarten", "Maartje", "Mannus", "Marco", "Mario", "Mark", "Marshall", "Marthinus", "Martijn", "Mathys", "Matthys", "Menno", "Mertijn", "Mewis", "Neeltje", "Nicolaes", "Niek", "Niels", "Nijs", "Nikolaas", "Nygell", "Nys", "Okkert", "Ornelio", "Oswald", "Paulus", "Peter", "Philip", "Piet", "Pieter", "Pouw", "Priit", "Quenten", "Quentin", "Rachmil", "Ranier", "Raymond", "Reginald", "Reignier", "Reimond", "Rembrandt", "Riaan", "Richel", "Rigsheillo", "Rijkaard", "Rijkerd", "Rip", "Robbert", "Roberto", "Roeland", "Roelof", "Rogier", "Rombert", "Ruben", "Rutger", "Rutgert", "Rykaard", "Salomon", "Samuel", "Sander", "Sebastiaan", "Sijthoff", "Simon", "Snouck", "Staaf", "Staats", "Stanley", "Stephanus", "Stoffel", "Surae", "Theunis", "Thijs", "Thomas", "Tiebout", "Tobias", "Toff", "Toon", "Tryntje", "Tymen", "Uys", "Vaast", "Valentijn", "Virgilio", "Wendell", "Wilhelmus", "Willem-Jan", "Willem", "Wim", "Wouter"];
@@ -1529,7 +1529,7 @@ App.Data.misc.mauritianSlaveSurnames = ["Abdool", "Abdul", "Aboobakar", "Ackbara
App.Data.misc.mexicanSlaveNames = ["Ababa", "Abigail", "AbigaÃl", "Abril", "Adala", "Adalia", "Adela", "Adelaida", "Adelia", "Adelina", "Adelisa", "Adelita", "Adisoda", "Adoración", "Adriana", "Ãfrica", "Agata", "Agueda", "Ãgueda", "Agustina", "Aida", "AÃda", "Aide", "Aileen", "Ainara", "Ainhoa", "Aitana", "Alba", "Alberta", "Albina", "Aldana", "Alejandra", "Aleta", "Alexa", "Alexia", "Alfonsa", "Alheli", "Ali", "Alicia", "Alida", "Alma", "Almadelia", "Almudena", "Alodia", "Aloisia", "Alondra", "Altagracia", "Ãlvara", "Amada", "Amairany", "Amalia", "Amanda", "Amapola", "Amara", "Amaya", "Amelia", "Amparo", "Ana Maria", "Ana", "Anabel", "Anahi", "AnahÃ", "Anai", "Anali", "Analia", "AnalÃa", "Anay", "Andrea", "AndreÃna", "Angela", "Ãngela", "Angeles", "Ãngeles", "Angélica", "Anica", "Anita", "Antonia", "Antonieta", "Apolonia", "Aquilina", "Araceli", "Arantxa", "Arantza", "Aranzazu", "Areli", "Arely", "Ariana", "Ariel", "Ariela", "Artemisa", "Ascensión", "Aselita", "Asunción", "Aurelia", "Aurora", "Avelina", "Azucena", "Azul", "Barbara", "Bárbara", "Beatriz", "Begoña", "Belén", "Belia", "Belicia", "Belkis", "Benicia", "Benita", "Benvidez", "Berenice", "Bernarda", "Bernardina", "Berta", "Bertha", "Bertita", "Betania", "Bibiana", "Blanca", "Bonita", "Bouganvilla", "Brenda", "Bruna", "Brunilda", "Buena", "Calida", "Camelia", "Camila", "Candela", "Candelaria", "Candida", "Cándida", "Canela", "Caridad", "Carina", "Carito", "Carla", "Carlina", "Carlota", "Carmela", "Carmelita", "Carmen", "Caro", "Carolina", "Casandra", "Cataleya", "Catalina", "Catrina", "Cecilia", "Celia", "Celida", "Celina", "Celsa", "Chara", "Charlotte", "Chaxiraxi", "Chela", "Chipita", "Chiquita", "Chita", "Chrystal", "Citlali", "Clara", "Claribel", "Clarisa", "Claudia", "Clemencia", "Clotilde", "Cobura", "Colombia", "Concepción", "Concha", "Conchita", "Conseja", "Consolación", "Constanza", "Consuela", "Consuelo", "Corazón", "Corina", "Covadonga", "Cris", "Crisanta", "Crisol", "Cristina", "Cruz", "Cynthia", "Dafna", "Dafne", "Daisy", "Dalia", "Dalila", "Damaris", "Damiana", "Damita", "Daniela", "Daria", "Daritza", "Davina", "Dayana", "Débora", "Delfina", "Delia", "Deliasofia", "Delmira", "Delores", "Demetria", "Desamparados", "Desdemona", "Deyanira", "Diana", "Dinora", "Dionecia", "Dionicia", "Dionisia", "Dolores", "Dominga", "Dominica", "Dorotea", "Dulce Maria", "Dulce MarÃa", "Dulce", "Dulcinea", "Edelmira", "Eglantina", "Electra", "Elena", "Eleonora", "Elia", "Eliana", "Elida", "Eligia", "Elina", "Elisa", "Elizabeth", "Elmira", "Elodea", "Eloisa", "Elvia", "Elvira", "Emelda", "Emelia", "Emilia", "Emiliana", "Emma", "Encarna", "Encarnación", "Enedina", "Engracia", "Enka", "Enriqua", "Enriqueta", "Epifania", "Erika", "Ernestina", "Esmeralda", "Esperanza", "Estefania", "EstefanÃa", "Estela", "Estella", "Ester", "Esther", "Estil", "Estrelita", "Estrella", "Etelvina", "Eudoxia", "Eufemia", "Eufrasia", "Eugenia", "Eulalia", "Eulogia", "Eustolia", "Eva", "Evelyn", "Evita", "Fabiana", "Fabiola", "Fabricia", "Facunda", "Fantasma", "Fatima", "Fátima", "Faustina", "Felicia", "Feliciana", "Felicidad", "Felipa", "Felisa", "Fermina", "Fernanda", "Filipa", "Filomena", "Fiorella", "Flavia", "Flor", "Flora", "Florencia", "Floria", "Florida", "Franca", "Francisca", "Frida", "Froilana", "Fuensanta", "Fulberta", "Fulca", "Gabriela", "Galia", "Gara", "Gema", "Genedina", "Genoveva", "Geo", "Gertrudis", "Gilda", "Ginebra", "Gladis", "Gloria", "Gracia", "Graciela", "Grazia", "Gretel", "Griselda", "Guada", "Guadaloupe", "Guadalupe", "Guillermina", "Guiomar", "Hada", "Hañagua", "Haydée", "Heli", "Heloisa", "Hera", "Hermalinda", "Herminia", "Hilaria", "Hilda", "Hipolita", "Hortensia", "Iara", "Idalia", "Idonia", "Ifigenia", "Ignacia", "Ilda", "Illena", "Ilona", "Imelda", "Immaculada", "Ines", "Inés", "Inez", "Inma", "Inmaculada", "Irais", "Irene", "Irma", "Isa", "Isabel", "Isabela", "Isabella", "Isaura", "Isidora", "Isidra", "Ismary", "Ismelda", "Itahisa", "Itzel", "Ivette", "Ivonne", "Jacinta", "Jacqueline", "Janina", "Jasmine", "Javiera", "Jazmin", "Jenara", "Jesica", "Jessamyn", "Jessica", "Jesusa", "Jesusita", "Jimena", "Joaquina", "Jocelin", "Jordana", "Jorgelina", "Josefa", "Josefina", "Josephina", "Jovita", "Juana", "Juanita", "Julia", "Juliana", "Julieta", "Justina", "Karen", "Karina", "Karla", "Kathya", "Laila", "Lali", "Lara", "Larisa", "Laura", "Laureana", "Laurencia", "Lea", "Leandra", "Leire", "Lena", "Leonarda", "Leonela", "Leonor", "Leopoldina", "Leticia", "LÃa", "Liana", "Libertad", "Libia", "Licha", "Lidia", "Ligia", "Lilia", "Liliana", "Liliosa", "Lina", "Linda", "Lisa", "Liselotte", "Lissette", "Liz", "Lizete", "Lola", "Lolita", "Loreley", "Lorena", "Lorenza", "Lorna", "Lourdes", "Luana", "Lucelia", "Lucero", "Lucha", "Lucia", "LucÃa", "Luciana", "Lucila", "Lucina", "Lucrecia", "Luisa", "Luna", "Lupe", "Lupita", "Luz", "Luzdivina", "Macarena", "Macaria", "MadaÃ", "Madalena", "Madrid", "Mae", "Magdalena", "Magnolia", "Maitane", "Maite", "Malda", "Manuela", "Manuelita", "Marcela", "Marcelina", "Margarita", "Maria Concepción", "Maria de los Dolores", "Maria del Carmen", "Maria Encarnación", "Maria Ester", "Maria Fernanda", "MarÃa Fernanda", "Maria Guadalupe", "Maria Isabel", "MarÃa Jesús", "Maria Jose", "MarÃa José", "Maria Juana", "MarÃa Juana", "Maria Luisa", "MarÃa Magdalena", "Maria", "MarÃa", "Mariah", "Marian", "Mariana", "Maribel", "Maricarmen", "Maricela", "Maricruz", "Mariel", "Mariela", "Mariesa", "Marina", "Maripaz", "Marisa", "Marisol", "Marita", "Marquita", "Marta", "Martina", "Martita", "Matilde", "Maya", "Mayra", "Mayte", "Meagens", "Melissa", "Mercedes", "Mia", "Micaela", "Michelle", "Miguela", "Mila", "Milagros", "Milena", "Mirca", "Mireia", "Mirella", "Mireya", "Miriam", "Mirna", "Modesta", "Moira", "Monica", "Mónica", "Monse", "Monserrat", "Montserrat", "Nadia", "Nahir", "Naike", "Nallely", "Narcisa", "Narda", "Natacha", "Natalia", "Natividad", "Nayeli", "Nazarena", "Nazaret", "Nelia", "Nélida", "Nerea", "Neva", "Niceto", "Nidia", "Nieves", "Nilda", "Nina", "Ninfa", "Noe", "Noelia", "Noemi", "NoemÃ", "Nora", "Norma", "Nova", "Nuela", "Nuria", "Obdulia", "Octavia", "Odelia", "Odilia", "Ofelia", "Olga", "Olimpia", "Oliva", "Olivia", "Olivita", "Oralia", "Orestes", "Oria", "Orlanda", "Orlantha", "Otilia", "Ovidia", "Palma", "Palmira", "Paloma", "Pamela", "Pancracia", "Pandora", "Pantera", "Paola", "Paqui", "Pascua", "Pascuala", "Patricia", "Paula", "Paulette", "Paulina", "Paz", "Penelope", "Perla", "Perpetua", "Petra", "Petrona", "Pia", "Piedad", "Pilar", "Placinta", "Pricia", "Primitiva", "Priscilla", "Pura", "Purificación", "Querida", "Querina", "Quirina", "Quisela", "Rafaela", "Raimunda", "Ramira", "Ramona", "Raquel", "Rayén", "Raylina", "Rebeca", "Refugio", "Regina", "Reina", "Remedios", "Renata", "Renée", "Resurrección", "Reyna", "Ricarda", "Rita", "Roberta", "Rocio", "RocÃo", "Rodolfa", "Rolanda", "Romary", "Romina", "Rosa Maria", "Rosa", "Rosalia", "RosalÃa", "Rosana", "Rosandra", "Rosaria", "Rosario", "Rosaura", "Rosenda", "Rosina", "Rosita", "Roxana", "Rufino", "Rut", "Ruth", "Sabana", "Sabina", "Salivia", "Salomé", "Salud", "Salvadora", "Samantha", "Sancha", "Sanda", "Sandra", "Santana", "Sara", "Sarai", "Sarita", "Saturnina", "Segismunda", "Selena", "Selia", "Serafina", "Serina", "Sevilla", "Sharon", "Silvana", "Silvia", "Sinai", "Socorro", "Sofia", "SofÃa", "Sol", "Solana", "Solange", "Soledad", "Sonia", "Soraya", "Sotera", "Stephanie", "Sucely", "Susana", "Susy", "TaÃs", "Talia", "Tamara", "Tania", "Tatiana", "Telma", "Teodora", "Teofila", "Tequila", "Teresa", "Teresita", "Thiare", "Tiare", "Tomasa", "Triana", "Trinidad", "Ulrica", "Ursula", "Úrsula", "Valencia", "Valentina", "Valeria", "Vane", "Vanesa", "Vanessa", "Vanina", "Velia", "Venecia", "Ventura", "Veronica", "Verónica", "Vicenta", "Victoria", "Vilma", "Violeta", "Virginia", "Viridiana", "Virtudes", "Visitación", "Viva", "Viviana", "Walkiria", "Walquiria", "Wuaira", "Xara", "Xaviera", "Xenia", "Xiana", "Xilosma", "Ximena", "Xiomara", "Xóchitl", "Yahaira", "Yajaira", "Yanet", "Yanina", "Yaretzi", "Yaritza", "Yazmin", "Yazmina", "Yesenia", "Ylenia", "Ynes", "Yolanda", "Ysabel", "Yurixi", "Yvette", "Zaida", "Zaira", "Zeferina", "Zoe", "Zoraida", "Zudikey", "Zulema", "Zulma"];
App.Data.misc.mexicanMaleNames = ["Aarón", "Abelardo", "Abimael", "Absalon", "Acacio", "Adalberto", "Adan", "Adano", "Adelardo", "Adelmaro", "Ademar", "Adonis", "Adrián", "Agapito", "AgustÃn", "Aladino", "Alan", "Albano", "Alberto", "Albino", "Aldair", "Aldo", "Alejandro", "Alejo", "Alexander", "Alexis", "Alfonso", "Alfredo", "Alipio", "Alonso", "Alterio", "Alvaro", "Amadeo", "Amado", "Amador", "Amalio", "Amando", "Ambrosio", "Amelio", "Amilcar", "Amparo", "Ampelio", "Anacleto", "Anastasio", "Anatolio", "Andreo", "Andres", "Andrés", "Angel", "Ãngel", "Anibal", "Aniceto", "Anselmo", "Antioco", "Antonio", "Aparicio", "Apocalipsis", "Apolinario", "Apolo", "Aquiles", "Aquilino", "Arcángel", "Arcinio", "ArÃstides", "Armando", "Arnaldo", "Arnulfo", "Arquimedes", "Arsenio", "Artemio", "Arturo", "Asclepiades", "Atanasio", "Atilio", "Augusto", "Aureliano", "Aurelio", "Auxilio", "Avelino", "Axel", "Baltazar", "Bartolomé", "Bautista", "Beltran", "Benedicto", "Benigno", "Benito", "Benjamin", "BenjamÃn", "Bernardino", "Bernardo", "Bienvenido", "Blas", "Bonito", "Borja", "Braulio", "Bricio", "Bruno", "Bryan", "Calixto", "Calvino", "Camari", "Camilo", "Candido", "Carlitos", "Carlos Enrique", "Carlos Ivan", "Carlos Jose", "Carlos", "Carmelo", "Cartez", "Casandro", "Casimiro", "Casto", "Castor", "Cayetano", "Cecilio", "Ceferino", "Celedonio", "Celerino", "Celestino", "Celio", "Celso", "César", "Chico", "Christian", "Christopher", "Cid", "Cipriano", "Ciriaco", "Cirilo", "Ciro", "Claudio", "Clemente", "Cleto", "Clodomiro", "Colón", "Confesor", "Conrado", "Constancio", "Constantino", "Corbin", "Cornelio", "Cortez", "Cosme", "Crescencio", "Crisanto", "Crispo", "Cristian", "Cristobal", "Cruz", "Custodio", "Cutberto", "Dagoberto", "Dámaso", "Damián", "Daniel", "Danilo", "Dardo", "Dario", "David", "Delfin", "Delfino", "Demetrio", "Demócrito", "Deodato", "Derico", "Desiderio", "Destino", "Diego", "Dimas", "Dionicio", "Dionisio", "Domas", "Domiciano", "Dominador", "Domingo", "Donaldo", "Doroteo", "Duilio", "Eberardo", "Edelberto", "Edelio", "Edelmar", "Edelmiro", "Eder", "Edgar", "Edgardo", "Edmundo", "Eduardo", "Edwin", "Efrain", "Efrén", "Egidio", "Eladio", "Elbio", "Eleuterio", "Elián", "Elias", "Eliecer", "Eligio", "Elio", "Eliseo", "Eliut", "Eloy", "Elvio", "Emerio", "Emeterio", "Emiliano", "Emilio", "Emmanuel", "Enrique", "Epicuro", "Epifanio", "Epimenio", "Epitacio", "Erardo", "Erasmo", "Ernesto", "Espartaco", "Estanislao", "Esteban", "Eufemio", "Eufracio", "Eugenio", "Eulalio", "Eulojio", "Eusebio", "Eustacio", "Evando", "Evaristo", "Everardo", "Expedito", "Ezequiel", "Fabián", "Fabio", "Faustino", "Fausto", "Favio", "Federico", "Feliciano", "Felipe", "Felisardo", "Felix", "Fermin", "Fernando", "Fidel", "Filadelfo", "Filademo", "Filemon", "Filiberto", "Flavio", "Floreal", "Florencio", "Florián", "Francisco", "Franco", "Fulgencio", "Fulvio", "Gabimael", "Gabino", "Gabriel", "Gadiel", "Gael", "Galeaso", "Galo", "Gamaliel", "Gaspar", "Gaudencio", "Gedeón", "Genaro", "Generoso", "George", "Gerardo", "Germán", "Germinal", "Gerson", "Gervasio", "Gesualdo", "Getulio", "Gilberto", "Gildardo", "Giovanni", "Gomez", "Gonzalo", "Gracián", "Graciano", "Gregorio", "Gualberto", "Gualterio", "Guarionex", "Guillermo", "Gumecindo", "Gustavo", "Gutierre", "Hadriano", "Heber", "Hector", "Héctor", "Helias", "Heliodoro", "Heráclito", "Heriberto", "Hernán", "Hernando", "Heródoto", "Higinio", "Hilario", "Hipolito", "Homero", "Homobono", "Honesto", "Honoratio", "Horacio", "Hugan", "Humberto", "Ibero", "Ignacio", "Ignaz", "Iker", "Inocencio", "Ionatán", "Isaac", "Isaias", "Isidro", "Ismael", "Ivan", "Iván", "Jacinto", "Jacobo", "Jaime Luis", "Jaime", "Jairo", "James", "Jandino", "Javier", "Jeremias", "Jesús", "Jilberto", "Joaquin", "Jonás", "Jonathan", "Jorge", "José Alberto", "José Javier", "José Luis", "José MarÃa", "Jose", "José", "Juan Carlos", "Juan Diego", "Juan", "Julián", "Juliano", "Julino", "Julio", "Justiniano", "Justino", "Juvenal", "Kevin", "Ladislao", "Landerico", "Landolfo", "Laureano", "Laurelino", "Laurentino", "Lauro", "Lazaro", "Leal", "Leandro", "Learco", "Lelio", "Leo", "Leobardo", "Leocadio", "León", "Leonardo", "Leonel", "Leónidas", "Leonzo", "Leopoldo", "Leto", "Liberal", "Liberato", "Libio", "Licugro", "Lino", "Lisandro", "Livio", "Lope", "Lorenzo", "Loreto", "Luano", "Lucas", "Lucero", "Luciano", "Lucio", "Lucrecio", "Luis", "Luiz", "Macabeo", "Macario", "Macedonio", "Maciel", "Malaquias", "Manfredo", "Manuel", "Marcelino", "Marcelo", "Marcial", "Marcio", "Marco", "Marcos", "Mariano", "Marino", "Mario", "MartÃn", "Mateo", "Matias", "MatÃas", "Mauricio", "Mauro", "Maximiliano", "Maximo", "Melchor", "Melecio", "Meliton", "Melquisede", "Menandro", "Mentor", "Mercurio", "Miguel Angel", "Miguel Ãngel", "Miguel", "Misael", "Modesto", "Moises", "Monserrate", "Nacho", "Naldo", "Narciso", "Narno", "Natal", "Natalio", "Nataniel", "Nazareno", "Nazaret", "Nazario", "Neandro", "Neftali", "Nemesio", "Neptuno", "Nereo", "Nestor", "Nicandro", "Nicanor", "Nicasio", "Niceto", "Nicolas", "Nicolás", "Nilo", "Noe", "Nolasco", "Norberto", "Normando", "Nuncio", "Obdulio", "Octaviano", "Octavio", "Olegario", "Olimpo", "Onofre", "Orangel", "Orencio", "Orestes", "Orfeo", "Origenes", "Orión", "Orlando", "Ortiz", "Oscar", "Osmundo", "Osvaldo", "Oswaldo", "Otilio", "Otoniel", "Ovidio", "Pablo", "Pacifico", "Pancracio", "Panfilo", "Paris", "Parmenio", "Pascual", "Pastor", "Patricio", "Pedro", "Perfecto", "Perpetuo", "Placido", "Policarpo", "Polifemo", "Porfirio", "Poseidón", "Priamo", "Procopio", "Prometeo", "Próspero", "QuentÃn", "Quintero", "Quito", "Rafael", "Raimundo", "Ramiro", "Ramón", "Raúl", "Raymundo", "Refugio", "Reinaldo", "Remigio", "Renato", "Renzo", "Rey", "Reyes", "Reynaldo", "Ricardo", "Rigoberto", "Roberto", "Rocio", "Rodolfo", "Rodrigo", "Rogelio", "Rojelio", "Rolando", "Román", "Romero", "Ronaldo", "Roque", "Rosario", "Rosendo", "Ruben", "Rubén", "Rubio", "Rufo", "Ruperto", "Sabelio", "Sabino", "Salomón", "Salvador", "Salviano", "Salvo", "Samuel", "Sancho", "Sansón", "Santiago", "Santino", "Santos", "Saturnino", "Saúl", "Sebastian", "Sebastián", "Sebastiano", "Segismundo", "Segundo", "Sempronio", "Serafin", "Sergio", "Servando", "Servio", "Severino", "Silverio", "Silviano", "Silvio", "Simón", "Sixto", "Socorro", "Solano", "Sotero", "Stephen", "Tacio", "Tacito", "Tadeo", "Tajo", "Tancredo", "Tarquino", "Tarsicio", "Telemaco", "Teodomiro", "Teodoro", "Teodosio", "Teofano", "Teofilio", "Tercio", "Terencio", "Tiberio", "Tiburcio", "Ticiano", "Timoteo", "Tino", "Tito", "Tomás", "Toribio", "Toruato", "Tranquiliano", "Tranquilino", "Transito", "Tripilo", "Tristán", "Tulio", "Ubaldo", "Ulises", "Ulrico", "Unai", "Urbano", "Uriel", "Valdemar", "ValentÃn", "Valeriano", "Valerio", "Venturo", "Vermundo", "Vero", "Vicente", "Victor", "Victoriano", "Vidal", "Virgilio", "Viviano", "Vulpiano", "Walberto", "Wilfredo", "Xavier", "Yadiel", "Yago", "Yamel", "Yareli", "Yaro", "Yerai", "Ygnacio", "Yoel", "Yojany", "Yuniel", "Zenobio", "Zumel"];
-App.Data.misc.mexicanSlaveSurnames = ["Abad", "Abarca", "Abascal", "Abrego", "Aburto", "Acevedo", "Aceves", "Acosta", "Acuña", "Adame", "Aguayo", "Aguila", "Aguilar", "Aguilasocho", "Aguilera", "Aguillon", "Aguirre", "Agustin", "Ahumada", "Ake", "Alamilla", "Alanis", "AlanÃs", "Alarcon", "Alatorre", "Alba", "Albarran", "Alberto", "Alcala", "Alcantar", "Alcantara", "Alcaraz", "Alcazar", "Alcocer", "Aldana", "Alegria", "Alejandre", "Alejandro", "Alejo", "Aleman", "Alfaro", "Alfonso", "Allen", "Almaguer", "Almanza", "Almaraz", "Almazan", "Almeida", "Alonso", "Alonzo", "Altamirano", "Alva", "Alvarado", "Alvarez", "Alvaro", "Amador", "Amaro", "Amaya", "Ambriz", "Ambrosio", "Amezcua", "Anaya", "Andrade", "Andres", "Angel", "Angeles", "Anguiano", "Angulo", "Antonio", "Antunez", "Aparicio", "Apolinar", "Appell", "Aquilar", "Aquino", "Aragon", "Araiza", "Arana", "Aranda", "Araujo", "Arce", "Arciniega", "Arcos", "Arellano", "Arenas", "Arevalo", "Arguelles", "Arguello", "Arias", "Arizmendi", "Armas", "Armendariz", "Armenta", "Arredondo", "Arreguin", "Arreola", "Arriaga", "Arrieta", "Arroyo", "Arteaga", "Arvizu", "Arzate", "Ascencio", "Astorga", "Atilano", "Avalos", "Avendaño", "Avia", "Avila", "Aviles", "Avilez", "Ayala", "Ayon", "Baca", "Badillo", "Baez", "Baeza", "Bahena", "Bailon", "Balam", "Balbuena", "Balcazar", "Balderas", "Balderrama", "Ballesteros", "Baltazar", "Banda", "Bañuelos", "Baos", "Barajas", "Barba", "Barbosa", "Barboza", "Barcenas", "Barradas", "Barragan", "Barranco", "Barraza", "Barrera", "Barreto", "Barrientos", "Barrios", "Barron", "Barroso", "Bartolo", "Basilio", "Bastida", "Basurto", "Bautista", "Bazan", "Becerra", "Becerril", "Bedolla", "Bejarano", "Bello", "Beltran", "Benavides", "Benitez", "Benito", "Bermudez", "Bernabe", "Bernal", "Betancourt", "Blancas", "Blanco", "Blas", "Bobadilla", "Bocanegra", "Bojorquez", "Bolaños", "Bonilla", "Borja", "Botello", "Bradley", "Bravo", "Briceño", "Briones", "Briseño", "Brito", "Bucio", "Buendia", "Bueno", "Buenrostro", "Burgos", "Bustamante", "Bustillos", "Bustos", "Caamal", "Caballero", "Cabañas", "Cabello", "Cabral", "Cabrera", "Cadena", "Calderon", "Calero", "Calixto", "Callejas", "Calva", "Calvillo", "Calvo", "Calzada", "Camacho", "Camarena", "Camargo", "Camarillo", "Campos", "Campuzano", "Can", "Canales", "Canche", "Cancino", "Cano", "Canseco", "Canto", "Cantu", "Canul", "Carbajal", "Carballo", "Cardenas", "Cárdenas", "Cardona", "Cardoso", "Carillo", "Carlos", "Carmona", "Caro", "Carpio", "Carranza", "Carrasco", "Carreño", "Carreon", "Carreón", "Carrera", "Carrillo", "Carrizales", "Carvajal", "Casa", "Casanova", "Casas", "Casillas", "Castañeda", "Castañon", "Castelan", "Castellanos", "Castillo", "Castrejon", "Castro", "Catalan", "Caudillo", "Cauich", "Cavazos", "Cayetano", "Cazares", "Cazarez", "Ceballos", "Cedillo", "Cedo", "Ceja", "Celaya", "Celis", "Cen", "Centeno", "Cepeda", "Cerda", "Ceron", "Cervantes", "Chable", "Chacon", "Chairez", "Chan", "Chapa", "Chaparro", "Chavarria", "Chavez", "Chávez", "Chavira", "Chi", "Chimal", "Chuc", "Cid", "Cisneros", "Clemente", "Cobos", "Colin", "ColÃn", "Collazo", "Colli", "Colomar", "Colorado", "Colunga", "Conde", "Constantino", "Contreras", "Cordero", "Cordoba", "Cordova", "Coria", "Cornejo", "Cornelio", "Corona", "Coronado", "Coronel", "Corral", "Corrales", "Correa", "Cortes", "Cortez", "Cota", "Couoh", "Covarrubias", "Crespo", "Cristobal", "Cruz", "Cuautle", "Cuellar", "Cuevas", "Curiel", "Damian", "Daniel", "Davalos", "Davila", "de Anda", "de Dios", "de Jesus", "de la Cruz", "de La Cruz", "de La Fuente", "de la Garza", "de La Garza", "de La Luz", "de La O", "de la Rosa", "de La Rosa", "de La Torre", "de Leon", "de Lima", "de Los Santos", "de Luna", "de Santiago", "del Angel", "del Real", "del Rio", "del Rosario", "del Valle", "del Yando", "Delgadillo", "Delgado", "Diaz", "DÃaz", "Diego", "Dimas", "Dionicio", "Dolores", "Dominguez", "Dorantes", "Duarte", "Dueñas", "Duran", "Duron", "Dzib", "Dzul", "Echeverria", "Eichberger", "Ek", "Elias", "Elizalde", "Elizondo", "Encarnacion", "Encinas", "Enciso", "Enriquez", "Escalante", "Escalera", "Escalona", "Escamilla", "Escobar", "Escobedo", "Escudero", "Esparza", "Espejel", "Espindola", "Espino", "Espinosa", "Espinoza", "Esqueda", "Esquivel", "Esteban", "Estevez", "Estrada", "Estrella", "Euan", "Evangelista", "Fabian", "Fajardo", "Falcon", "Farfan", "Farias", "Favela", "Feliciano", "Felipe", "Felix", "Fernandez", "Fernández", "Ferrer", "Fierro", "Figueroa", "Fink", "Flores", "Fonseca", "Fragoso", "Fraire", "Francisco", "Franco", "Frausto", "Frias", "Fuentes", "Gabriel", "Galan", "Galarza", "Galaviz", "Galeana", "Galicia", "Galindo", "Gallardo", "Gallegos", "Galvan", "Galván", "Galvez", "Gama", "Gamboa", "Gamez", "Gaona", "Garay", "Garca", "Garces", "Garcia", "GarcÃa", "Garduño", "Garfias", "Garibay", "Garnica", "Garrido", "Garza", "Gasca", "Gaspar", "Gastelum", "Gaxiola", "Gaytan", "Gerardo", "Geronimo", "Gil", "Giron", "Godinez", "Godoy", "Gomez", "Gómez", "Gongora", "Gonzales", "Gonzalez", "González", "Gordillo", "Govea", "Gracia", "Grajales", "Granados", "Gregorio", "Grijalva", "Grimaldo", "Grinberg", "Guadalupe", "Guadarrama", "Guajardo", "Guardado", "Gudiño", "Guerra", "Guerrero", "Guevara", "Guillen", "Guillén", "Guillermo", "Gurrola", "Gutierrez", "Gutiérrez", "Guzman", "Haro", "Hau", "Heredia", "Hermosillo", "Hernandez", "Hernández", "Hernndez", "Herrera", "Hidalgo", "Higuera", "Hilario", "Hinojosa", "Hipolito", "Holguin", "Huerta", "Huitron", "Hurtado", "Ibañez", "Ibarra", "Iglesias", "Ignacio", "Infante", "Iñiguez", "Inzunza", "Isidro", "Islas", "Izquierdo", "Jacinto", "Jacobo", "Jacome", "Jaime", "Jaimes", "Jara", "Jaramillo", "Jarquin", "Jasso", "Jauregui", "Javier", "Jeronimo", "Jimenez", "Jiménez", "Jose", "Juan", "Juanz", "Juarez", "Julian", "Jurado", "Ku", "Laguna", "Lagunas", "Lagunes", "Lanaro", "Landa", "Landero", "Landeros", "Lara", "Larios", "Laureano", "Lazaro", "Lazcano", "Leal", "Lechuga", "Ledesma", "Ledezma", "Leija", "Lemus", "Leon", "Leos", "Lepe", "Lerma", "Leyva", "Lezama", "Licona", "Lima", "Limon", "Linares", "Lira", "Lizarraga", "Llamas", "Llorens", "Lobato", "Loera", "Lomeli", "Lopez", "López", "Loredo", "Lorenzo", "Loya", "Loza", "Lozada", "Lozano", "Lucas", "Lucero", "Luciano", "Lucio", "Luevano", "Lugo", "Luis", "Lujan", "Luna", "Macedo", "Machado", "Machuca", "Macias", "Maciel", "Madrid", "Madrigal", "Magallanes", "Magaña", "Magdaleno", "Maldonado", "Mancera", "Mancilla", "Mandujano", "Manjarrez", "Manrique", "Manriquez", "Manuel", "Manzano", "Manzo", "Mar", "Marcelino", "Marcial", "Marcos", "Mares", "Mariano", "Marin", "Mariscal", "Marmolejo", "Marquez", "Marroquin", "Martin", "Martinez", "MartÃnez", "Martnez", "Mata", "Mateo", "Mateos", "Matias", "Matus", "Mauricio", "May", "Maya", "Mayo", "Mayorga", "Medel", "Medellin", "Medina", "Medrano", "Mejia", "Melchor", "Melendez", "Melo", "Mena", "Mendes", "Mendez", "Méndez", "Mendieta", "Mendiola", "Mendivil", "Mendoza", "Meneses", "Meraz", "Mercado", "Merida", "Merino", "Meza", "Michel", "Miguel", "Mijangos", "Millan", "Miramontes", "Miranda", "Mireles", "Moctezuma", "Moguel", "Mojica", "Molina", "Moncada", "Mondragon", "Monreal", "Monroy", "Monsivais", "Montalvo", "Montañez", "Montaño", "Montejo", "Montelongo", "Montero", "Montes de Oca", "Montes", "Montiel", "Montoya", "Moo", "Mora", "Morales", "Moran", "Morelos", "Moreno", "Mosqueda", "Mota", "Moya", "Munguia", "Muñiz", "Muñoz", "Murguia", "Murillo", "Muro", "Murrieta", "Najera", "Naranjo", "Narvaez", "Nava", "Navarrete", "Navarro", "Neal", "Negrete", "Negro", "Neri", "Nevarez", "Nicolas", "Nieto", "Nieves", "Niño", "Noh", "Nolasco", "Noriega", "Novelo", "Noyola", "Nuñez", "Nuño", "Obregon", "Ocampo", "Ocaña", "Ochoa", "Ojeda", "Olan", "Olea", "Olguin", "Oliva", "Olivares", "Olivas", "Olivera", "Olivo", "Olmedo", "Olmos", "Olvera", "Onofre", "Ontiveros", "Ordaz", "Ordoñez", "Orduña", "Ornelas", "Oropeza", "Orozco", "Orta", "Ortega", "Ortiz", "Osorio", "Osornio", "Osuna", "Otero", "Ovalle", "Ovando", "Oviedo", "Pablo", "Pacheco", "Padilla", "Padron", "Paez", "Palacios", "Palafox", "Palma", "Palomares", "Palomino", "Palomo", "Paniagua", "Pantoja", "Parada", "Pardo", "Paredes", "Parra", "Partida", "Pascual", "Pastrana", "Pat", "Patiño", "Patricio", "Pavon", "Payan", "Paz", "Pech", "Pedraza", "Pedro", "Pedroza", "Pelaez", "Pelayo", "Pena", "Peña", "Peñaloza", "Perales", "Peralta", "Peraza", "Perea", "Perez", "Pérez", "Picazo", "Pichardo", "Pimentel", "Piña", "Pineda", "Pinto", "Pion", "Pizarro", "Plascencia", "Plata", "Polanco", "Ponce", "Pool", "Poot", "Porras", "Portillo", "Posadas", "Pozos", "Prado", "Preciado", "Prieto", "Primo", "Puc", "Puente", "Puentes", "Puga", "Pulido", "Quevedo", "Quezada", "Quijano", "Quiñones", "Quiñonez", "Quiñónez", "Quintana", "Quintanilla", "Quintero", "Quiroz", "Rafael", "Ramirez", "RamÃrez", "Ramon", "Ramos", "Rangel", "Rascon", "Raya", "Razo", "Rea", "Rebolledo", "Regalado", "Rendon", "Renteria", "Resendiz", "Reyes", "Reyna", "Reynoso", "Reza", "Rico", "Rifka", "Rincon", "Rios", "Rivas", "Rivera", "Rivero", "Rizo", "Roa", "Robledo", "Roblero", "Robles", "Rocha", "Rodarte", "Rodrguez", "Rodriguez", "RodrÃguez", "Rojas", "Rojo", "Roldan", "Roman", "Romano", "Romero", "Romo", "Ronquillo", "Roque", "Rosado", "Rosales", "Rosario", "Rosas", "Rubio", "Rueda", "Ruelas", "Ruiz", "Ruvalcaba", "Saavedra", "Saenz", "Sainz", "Salas", "Salazar", "Salcedo", "Salcido", "Saldaña", "Saldivar", "Salgado", "Salinas", "Salmeron", "Salvador", "Samaniego", "Samano", "San Juan", "Sanabria", "Sanchez", "Sánchez", "Sandoval", "Santamaria", "Santana", "Santiago", "Santillan", "Santiz", "Santos", "Santoyo", "Sarabia", "Sarmiento", "Sauceda", "Saucedo", "Sebastian", "Segovia", "Segundo", "Segura", "Sepulveda", "Serna", "Serrano", "Serrato", "Servin", "Sevilla", "Sierra", "Sifuentes", "Silva", "Silvera", "Silverio", "Silvestre", "Simon", "Snchez", "Solano", "Solares", "Solis", "Solorio", "Solorzano", "Soria", "Soriano", "Sosa", "Sotelo", "Soto", "Spencer", "Suarez", "Tadeo", "Talavera", "Tamayo", "Tamez", "Tapia", "Tavares", "Tejeda", "Tellez", "Tello", "Tenorio", "Teran", "Terrazas", "Tinajero", "Tinoco", "Tirado", "Toledo", "Tolentino", "Tomas", "Toribio", "Torres", "Torrez", "Toscano", "Tovar", "Trejo", "Trevino", "Treviño", "Trinidad", "Trujillo", "Tun", "Tuz", "Uc", "Ugalde", "Uicab", "Ulloa", "Urbano", "Urbina", "Urias", "Uribe", "Urrutia", "Uscanga", "Vaca", "Valadez", "Valderrama", "Valdes", "Valdez", "Valdivia", "Valdovinos", "Valencia", "Valentin", "Valenzuela", "Valerio", "Valero", "Valladares", "Valle", "Vallejo", "Valles", "VallÃn", "Valtierra", "Valverde", "Varela", "Vargas", "Vasquez", "Vazquez", "Vázquez", "Vega", "Vela", "Velarde", "Velasco", "Velasquez", "Velazco", "Velazquez", "Velez", "Venegas", "Ventura", "Vera", "Verdejo", "Verdugo", "Verduzco", "Vergara", "Vicencio", "Vicente", "Victoria", "Victoriano", "Vidal", "Vieyra", "Vilchis", "Villa", "Villafuerte", "Villagomez", "Villalba", "Villalobos", "Villalpando", "Villanueva", "Villarreal", "Villaseñor", "Villavicencio", "Villeda", "Villegas", "Virgen", "Vite", "Viveros", "Vizcarra", "Yam", "Yañez", "Yepez", "Zacarias", "Zamarripa", "Zambrano", "Zamora", "Zamorano", "Zamudio", "Zapata", "Zapato", "Zaragoza", "Zarate", "Zarco", "Zavala", "Zavaleta", "Zazueta", "Zenteno", "Zepeda", "Zermeño", "Zetina", "Zuñiga", "Zurita"];
+App.Data.misc.mexicanSlaveSurnames = ["Abad", "Abarca", "Abascal", "Abrego", "Aburto", "Acevedo", "Aceves", "Acosta", "Acuña", "Adame", "Aguayo", "Aguila", "Aguilar", "Aguilasocho", "Aguilera", "Aguillon", "Aguirre", "Agustin", "Ahumada", "Ake", "Alamilla", "Alanis", "AlanÃs", "Alarcon", "Alatorre", "Alba", "Albarran", "Alberto", "Alcala", "Alcantar", "Alcantara", "Alcaraz", "Alcazar", "Alcocer", "Aldana", "Alegria", "Alejandre", "Alejandro", "Alejo", "Aleman", "Alfaro", "Alfonso", "Allen", "Almaguer", "Almanza", "Almaraz", "Almazan", "Almeida", "Alonso", "Alonzo", "Altamirano", "Alva", "Alvarado", "Alvarez", "Alvaro", "Amador", "Amaro", "Amaya", "Ambriz", "Ambrosio", "Amezcua", "Anaya", "Andrade", "Andres", "Angel", "Angeles", "Anguiano", "Angulo", "Antonio", "Antunez", "Aparicio", "Apolinar", "Appell", "Aquilar", "Aquino", "Aragon", "Araiza", "Arana", "Aranda", "Araujo", "Arce", "Arciniega", "Arcos", "Arellano", "Arenas", "Arevalo", "Arguelles", "Arguello", "Arias", "Arizmendi", "Armas", "Armendariz", "Armenta", "Arredondo", "Arreguin", "Arreola", "Arriaga", "Arrieta", "Arroyo", "Arteaga", "Arvizu", "Arzate", "Ascencio", "Astorga", "Atilano", "Avalos", "Avendaño", "Avia", "Avila", "Aviles", "Avilez", "Ayala", "Ayon", "Baca", "Badillo", "Baez", "Baeza", "Bahena", "Bailon", "Balam", "Balbuena", "Balcazar", "Balderas", "Balderrama", "Ballesteros", "Baltazar", "Banda", "Bañuelos", "Baos", "Barajas", "Barba", "Barbosa", "Barboza", "Barcenas", "Barradas", "Barragan", "Barranco", "Barraza", "Barrera", "Barreto", "Barrientos", "Barrios", "Barron", "Barroso", "Bartolo", "Basilio", "Bastida", "Basurto", "Bautista", "Bazan", "Becerra", "Becerril", "Bedolla", "Bejarano", "Bello", "Beltran", "Benavides", "Benitez", "Benito", "Bermudez", "Bernabe", "Bernal", "Betancourt", "Blancas", "Blanco", "Blas", "Bobadilla", "Bocanegra", "Bojorquez", "Bolaños", "Bonilla", "Borja", "Botello", "Bradley", "Bravo", "Briceño", "Briones", "Briseño", "Brito", "Bucio", "Buendia", "Bueno", "Buenrostro", "Burgos", "Bustamante", "Bustillos", "Bustos", "Caamal", "Caballero", "Cabañas", "Cabello", "Cabral", "Cabrera", "Cadena", "Calderon", "Calero", "Calixto", "Callejas", "Calva", "Calvillo", "Calvo", "Calzada", "Camacho", "Camarena", "Camargo", "Camarillo", "Campos", "Campuzano", "Can", "Canales", "Canche", "Cancino", "Cano", "Canseco", "Canto", "Cantu", "Canul", "Carbajal", "Carballo", "Cardenas", "Cárdenas", "Cardona", "Cardoso", "Carillo", "Carlos", "Carmona", "Caro", "Carpio", "Carranza", "Carrasco", "Carreño", "Carreon", "Carreón", "Carrera", "Carrillo", "Carrizales", "Carvajal", "Casa", "Casanova", "Casas", "Casillas", "Castañeda", "Castañon", "Castelan", "Castellanos", "Castillo", "Castrejon", "Castro", "Catalan", "Caudillo", "Cauich", "Cavazos", "Cayetano", "Cazares", "Cazarez", "Ceballos", "Cedillo", "Cedo", "Ceja", "Celaya", "Celis", "Cen", "Centeno", "Cepeda", "Cerda", "Ceron", "Cervantes", "Chable", "Chacon", "Chairez", "Chan", "Chapa", "Chaparro", "Chavarria", "Chavez", "Chávez", "Chavira", "Chi", "Chimal", "Chuc", "Cid", "Cisneros", "Clemente", "Cobos", "Colin", "ColÃn", "Collazo", "Colli", "Colomar", "Colorado", "Colunga", "Conde", "Constantino", "Contreras", "Cordero", "Cordoba", "Cordova", "Coria", "Cornejo", "Cornelio", "Corona", "Coronado", "Coronel", "Corral", "Corrales", "Correa", "Cortes", "Cortez", "Cota", "Couoh", "Covarrubias", "Crespo", "Cristobal", "Cruz", "Cuautle", "Cuellar", "Cuevas", "Curiel", "Damian", "Daniel", "Davalos", "Davila", "de Anda", "de Dios", "de Jesus", "de la Cruz", "de La Cruz", "de La Fuente", "de la Garza", "de La Garza", "de La Luz", "de La O", "de la Rosa", "de La Rosa", "de La Torre", "de Leon", "de Lima", "de Los Santos", "de Luna", "de Santiago", "del Angel", "del Real", "del Rio", "del Rosario", "del Valle", "del Yando", "Delgadillo", "Delgado", "Diaz", "DÃaz", "Diego", "Dimas", "Dionicio", "Dolores", "Dominguez", "Dorantes", "Duarte", "Dueñas", "Duran", "Duron", "Dzib", "Dzul", "Echeverria", "Eichberger", "Ek", "Elias", "Elizalde", "Elizondo", "Encarnacion", "Encinas", "Enciso", "Enriquez", "Escalante", "Escalera", "Escalona", "Escamilla", "Escobar", "Escobedo", "Escudero", "Esparza", "Espejel", "Espindola", "Espino", "Espinosa", "Espinoza", "Esqueda", "Esquivel", "Esteban", "Estevez", "Estrada", "Estrella", "Euan", "Evangelista", "Fabian", "Fajardo", "Falcon", "Farfan", "Farias", "Favela", "Feliciano", "Felipe", "Felix", "Fernandez", "Fernández", "Ferrer", "Fierro", "Figueroa", "Fink", "Flores", "Fonseca", "Fragoso", "Fraire", "Francisco", "Franco", "Frausto", "Frias", "Fuentes", "Gabriel", "Galan", "Galarza", "Galaviz", "Galeana", "Galicia", "Galindo", "Gallardo", "Gallegos", "Galvan", "Galván", "Galvez", "Gama", "Gamboa", "Gamez", "Gaona", "Garay", "Garca", "Garces", "Garcia", "GarcÃa", "Garduño", "Garfias", "Garibay", "Garnica", "Garrido", "Garza", "Gasca", "Gaspar", "Gastelum", "Gaxiola", "Gaytan", "Gerardo", "Geronimo", "Gil", "Giron", "Godinez", "Godoy", "Gomez", "Gómez", "Gongora", "Gonzales", "Gonzalez", "González", "Gordillo", "Govea", "Gracia", "Grajales", "Granados", "Gregorio", "Grijalva", "Grimaldo", "Grinberg", "Guadalupe", "Guadarrama", "Guajardo", "Guardado", "Gudiño", "Guerra", "Guerrero", "Guevara", "Guillen", "Guillén", "Guillermo", "Gurrola", "Gutierrez", "Gutiérrez", "Guzman", "Haro", "Hau", "Heredia", "Hermosillo", "Hernandez", "Hernández", "Hernndez", "Herrera", "Hidalgo", "Higuera", "Hilario", "Hinojosa", "Hipolito", "Holguin", "Huerta", "Huitron", "Hurtado", "Ibañez", "Ibarra", "Iglesias", "Ignacio", "Infante", "Iñiguez", "Inzunza", "Isidro", "Islas", "Izquierdo", "Jacinto", "Jacobo", "Jacome", "Jaime", "Jaimes", "Jara", "Jaramillo", "Jarquin", "Jasso", "Jauregui", "Javier", "Jeronimo", "Jimenez", "Jiménez", "Jose", "Juan", "Juanz", "Juarez", "Julian", "Jurado", "Ku", "Laguna", "Lagunas", "Lagunes", "Lanaro", "Landa", "Landero", "Landeros", "Lara", "Larios", "Laureano", "Lazaro", "Lazcano", "Leal", "Lechuga", "Ledesma", "Ledezma", "Leija", "Lemus", "Leon", "Leos", "Lepe", "Lerma", "Leyva", "Lezama", "Licona", "Lima", "Limon", "Linares", "Lira", "Lizarraga", "Llamas", "Llorens", "Lobato", "Loera", "Lomeli", "Lopez", "López", "Loredo", "Lorenzo", "Loya", "Loza", "Lozada", "Lozano", "Lucas", "Lucero", "Luciano", "Lucio", "Luevano", "Lugo", "Luis", "Lujan", "Luna", "Macedo", "Machado", "Machuca", "Macias", "Maciel", "Madrid", "Madrigal", "Magallanes", "Magaña", "Magdaleno", "Maldonado", "Mancera", "Mancilla", "Mandujano", "Manjarrez", "Manrique", "Manriquez", "Manuel", "Manzano", "Manzo", "Mar", "Marcelino", "Marcial", "Marcos", "Mares", "Mariano", "Marin", "Mariscal", "Marmolejo", "Marquez", "Marroquin", "Martin", "Martinez", "MartÃnez", "Martnez", "Mata", "Mateo", "Mateos", "Matias", "Matus", "Mauricio", "May", "Maya", "Mayo", "Mayorga", "Medel", "Medellin", "Medina", "Medrano", "Mejia", "Melchor", "Melendez", "Melo", "Mena", "Mendes", "Mendez", "Méndez", "Mendieta", "Mendiola", "Mendivil", "Mendoza", "Meneses", "Meraz", "Mercado", "Merida", "Merino", "Meza", "Michel", "Miguel", "Mijangos", "Millan", "Miramontes", "Miranda", "Mireles", "Moctezuma", "Moguel", "Mojica", "Molina", "Moncada", "Mondragon", "Monreal", "Monroy", "Monsivais", "Montalvo", "Montañez", "Montaño", "Montejo", "Montelongo", "Montero", "Montes de Oca", "Montes", "Montiel", "Montoya", "Moo", "Mora", "Morales", "Moran", "Morelos", "Moreno", "Mosqueda", "Mota", "Moya", "Munguia", "Muñiz", "Muñoz", "Murguia", "Murillo", "Muro", "Murrieta", "Najera", "Naranjo", "Narvaez", "Nava", "Navarrete", "Navarro", "Neal", "Negrete", "Negro", "Neri", "Nevarez", "Nicolas", "Nieto", "Nieves", "Niño", "Noh", "Nolasco", "Noriega", "Novelo", "Noyola", "Nuñez", "Nuño", "Obregon", "Ocampo", "Ocaña", "Ochoa", "Ojeda", "Olan", "Olea", "Olguin", "Oliva", "Olivares", "Olivas", "Olivera", "Olivo", "Olmedo", "Olmos", "Olvera", "Onofre", "Ontiveros", "Ordaz", "Ordoñez", "Orduña", "Ornelas", "Oropeza", "Orozco", "Orta", "Ortega", "Ortiz", "Osorio", "Osornio", "Osuna", "Otero", "Ovalle", "Ovando", "Oviedo", "Pablo", "Pacheco", "Padilla", "Padron", "Paez", "Palacios", "Palafox", "Palma", "Palomares", "Palomino", "Palomo", "Paniagua", "Pantoja", "Parada", "Pardo", "Paredes", "Parra", "Partida", "Pascual", "Pastrana", "Pat", "Patiño", "Patricio", "Pavon", "Payan", "Paz", "Pech", "Pedraza", "Pedro", "Pedroza", "Pelaez", "Pelayo", "Pena", "Peña", "Peñaloza", "Perales", "Peralta", "Peraza", "Perea", "Perez", "Pérez", "Picazo", "Pichardo", "Pimentel", "Piña", "Pineda", "Pinto", "Pion", "Pizarro", "Plascencia", "Plata", "Polanco", "Ponce", "Pool", "Poot", "Porras", "Portillo", "Posadas", "Pozos", "Prado", "Preciado", "Prieto", "Primo", "Puc", "Puente", "Puentes", "Puga", "Pulido", "Quevedo", "Quezada", "Quijano", "Quiñones", "Quiñonez", "Quiñónez", "Quintana", "Quintanilla", "Quintero", "Quiroz", "Rafael", "Ramirez", "RamÃrez", "Ramon", "Ramos", "Rangel", "Rascon", "Raya", "Razo", "Rea", "Rebolledo", "Regalado", "Rendon", "Renteria", "Resendiz", "Reyes", "Reyna", "Reynoso", "Reza", "Rico", "Rifka", "Rincon", "Rios", "Rivas", "Rivera", "Rivero", "Rizo", "Roa", "Robledo", "Roblero", "Robles", "Rocha", "Rodarte", "Rodrguez", "Rodriguez", "RodrÃguez", "Rojas", "Rojo", "Roldan", "Roman", "Romano", "Romero", "Romo", "Ronquillo", "Roque", "Rosado", "Rosales", "Rosario", "Rosas", "Rubio", "Rueda", "Ruelas", "Ruiz", "Ruvalcaba", "Saavedra", "Saenz", "Sainz", "Salas", "Salazar", "Salcedo", "Salcido", "Saldaña", "Saldivar", "Salgado", "Salinas", "Salmeron", "Salvador", "Samaniego", "Samano", "San Juan", "Sanabria", "Sanchez", "Sánchez", "Sandoval", "Santamaria", "Santana", "Santiago", "Santillan", "Santiz", "Santos", "Santoyo", "Sarabia", "Sarmiento", "Sauceda", "Saucedo", "Sebastian", "Segovia", "Segundo", "Segura", "Sepulveda", "Serna", "Serrano", "Serrato", "Servin", "Sevilla", "Sierra", "Sifuentes", "Silva", "Silvera", "Silverio", "Silvestre", "Simon", "Solano", "Solares", "Solis", "Solorio", "Solorzano", "Soria", "Soriano", "Sosa", "Sotelo", "Soto", "Spencer", "Suarez", "Tadeo", "Talavera", "Tamayo", "Tamez", "Tapia", "Tavares", "Tejeda", "Tellez", "Tello", "Tenorio", "Teran", "Terrazas", "Tinajero", "Tinoco", "Tirado", "Toledo", "Tolentino", "Tomas", "Toribio", "Torres", "Torrez", "Toscano", "Tovar", "Trejo", "Trevino", "Treviño", "Trinidad", "Trujillo", "Tun", "Tuz", "Uc", "Ugalde", "Uicab", "Ulloa", "Urbano", "Urbina", "Urias", "Uribe", "Urrutia", "Uscanga", "Vaca", "Valadez", "Valderrama", "Valdes", "Valdez", "Valdivia", "Valdovinos", "Valencia", "Valentin", "Valenzuela", "Valerio", "Valero", "Valladares", "Valle", "Vallejo", "Valles", "VallÃn", "Valtierra", "Valverde", "Varela", "Vargas", "Vasquez", "Vazquez", "Vázquez", "Vega", "Vela", "Velarde", "Velasco", "Velasquez", "Velazco", "Velazquez", "Velez", "Venegas", "Ventura", "Vera", "Verdejo", "Verdugo", "Verduzco", "Vergara", "Vicencio", "Vicente", "Victoria", "Victoriano", "Vidal", "Vieyra", "Vilchis", "Villa", "Villafuerte", "Villagomez", "Villalba", "Villalobos", "Villalpando", "Villanueva", "Villarreal", "Villaseñor", "Villavicencio", "Villeda", "Villegas", "Virgen", "Vite", "Viveros", "Vizcarra", "Yam", "Yañez", "Yepez", "Zacarias", "Zamarripa", "Zambrano", "Zamora", "Zamorano", "Zamudio", "Zapata", "Zapato", "Zaragoza", "Zarate", "Zarco", "Zavala", "Zavaleta", "Zazueta", "Zenteno", "Zepeda", "Zermeño", "Zetina", "Zuñiga", "Zurita"];
App.Data.misc.micronesianSlaveNames = ["Achina", "Adiriana", "Aida", "Aisina", "Alese", "Alice", "Alison", "Amalia", "Amita", "Anabelle", "Andelina", "Angie", "Anis", "Anitra", "Anna", "Anne", "Annie", "Antilise", "Antonia", "Anuncia", "Apily", "Arikihna", "Ariminia", "Arko", "Ashley", "Atrian", "Augustin", "Aurelia", "Barbara", "Belinda", "Bessy", "Betty", "Birikida", "Bonalyn", "Buruna", "Camirilo", "Carlottha", "Carmen", "Caroline", "Chiako", "Christina", "Clara", "Concepcion", "Cynthia", "Cynthià ", "Daiana", "Debra", "Dee", "Delores", "Deresia", "Dessy", "Donna", "Edina", "Edith", "Ekar", "Elena", "Eliana", "Elieda", "Elihter", "Elipina", "Eliter", "Elizabeth", "Elprite", "Emelihter", "Emma", "Epelaine", "Ereko", "Erika", "Eriko", "Eritia", "Estella", "Estelle", "Eswina", "Evangeleen", "Flora", "Frances", "Geraldine", "Ghie", "Gladys", "Glara", "Haloise", "Hannah", "Harumi", "Hattie", "Indira", "Iris", "Isa", "Jaceleen", "Jane", "Janette", "Jeannie", "Jemima", "Jennifer", "Jenny", "Jessica", "Joanna", "Joaquina", "Judith", "Julie", "Julinida", "Karloda", "Kate", "Katerina", "Katherine", "Katin", "Kedirud", "Kenya", "Kenye", "Kieriko", "Kirsten", "Laquisha", "LaRae", "Leah", "Lechi", "Lee", "Lelean", "Lerina", "Lerissa", "Lienletipy", "Lihen", "Lihjen", "Lihma", "Lihna", "Lijapehpe", "Lilihda", "Lorleen", "Losii", "Lucy", "Lusia", "Madil", "Madilihna", "Margarita", "Margie", "Margorie", "Marguerita", "Maria", "Marian", "Marie", "Mariehda", "Marihne", "Marine", "Marita", "Marjorie", "Markpein", "Marley", "Martha", "Martina", "Mary", "Marylee", "Maurina", "Maysi", "Meise", "Melina", "Meliser", "Merion", "Metlain", "Michelle", "Mihner", "Mihter", "Mitchigo", "Miter", "Miyo", "Monica", "Nahfit", "Nahmwo", "Namiko", "Nellie", "Nepik", "Nocho", "Nohia", "Olania", "Oleen", "Oropa", "Paula", "Pesirina", "Petra", "Pihpe", "Purina", "Rachel", "Rebid", "Regina", "Reiko", "Rejel", "Reloliza", "Renee", "Rita", "Rosa", "Rosalihna", "Rosalina", "Rose", "Roselyn", "Rosenda", "Runica", "Ruth", "Salome", "Sapina", "Sarah", "Sari", "Sassy", "Scalasmara", "Seferina", "Senetonia", "Sepe", "Sera", "Serah", "Serihna", "Serlyn", "Serma", "Sheryl", "Shra", "Shrue", "Sichiko", "Sina", "Sinne", "Sirina", "Sisiko", "Sitako", "Sitato", "Sra", "Srasra", "Stayleen", "Susan", "Susin", "Suzie", "Tana", "Tapita", "Taylor", "Tipei", "Trinidad", "Tulpe", "Ujunmolun", "Vanity", "Victoria", "Violet", "Weireen", "Welryn", "Willamena", "Yoana", "Yonis", "Yoslyn"];
App.Data.misc.micronesianMaleNames = ["Aaran", "Aaron", "Abiner", "Adinno", "Akapito", "Alafanso", "Alfred", "Alik", "Aliksa", "Alokoa", "Alwis", "Andereas", "Anderson", "Andon", "Annro", "Anton", "Arthur", "Asher", "August", "Aurelio", "Ayster", "Bailey", "Ben", "Benito", "Benjamin", "Bentura", "Bernard", "Billeip", "Brandon", "Brian", "Bruno", "Byron", "Carson", "Charles", "Christian", "Clayton", "Clemente", "Cornelius", "Cristober", "Daniel", "Danny", "David", "Dennis", "Devon", "Diofil", "Dionisio", "Dominic", "Edwin", "Ehdas", "Eiken", "Elias", "Eliwet", "Elwes", "Elwyn", "Eriot", "Esau", "Esmond", "Estephan", "Falthin", "Finale", "Florencio", "Francisco", "Frank", "Fransisco", "Franson", "Fred", "Fredrick", "Freeder", "Gary", "Gene", "George", "Gerald", "Gerson", "Gorman", "Harris", "Harry", "Henderson", "Henry", "Herman", "Hermond", "Herron", "Herry", "Hiroshi", "Hirosi", "Hostino", "Howard", "Huston", "Ignacio", "Ignasio", "Ignatius", "Ioane", "Iokapus", "Ioseph", "Isaac", "Isoroku", "Jabet", "Jack", "Jacob", "James", "Javin", "Jeffrey", "Jim", "Jimion", "Jimmy", "Joab", "John", "Johnny", "Johnson", "Jonathan", "Joseph", "Justy", "Kabriel", "Kacy", "Kansou", "Kasian", "Keitani", "Keith", "Kelly", "Kerley", "Kerson", "Kicho", "Kilafwa", "Kilinkun", "Kiosy", "Kirino", "Kitson", "Klemente", "Krisdohpa", "Lazarus", "Leben", "Lehpios", "Lehplos", "Leo", "Lepalik", "Likiaksa", "Lini", "Lipiak", "Lonman", "Lorens", "Lorrin", "Luey", "Lujioj", "Lyndon", "MacArthur", "Madardus", "Magdano", "Mak", "Malakai", "Malem", "Manny", "Manuel", "Marcelo", "Marcus", "Mark", "Marthin", "Martin", "Marz", "Mathew", "Mathias", "McCaffrey", "Mehdardos", "Melner", "Michael", "Michuo", "Mike", "Mikson", "Milton", "Mongkeya", "Nakauo", "Narciso", "Nena", "Newo", "Noa", "Noel", "Norton", "Oblai", "Orlando", "Orville", "Palik", "Palikkun", "Patrick", "Paul", "Paulis", "Pedro", "Pendura", "Pentura", "Peter", "Petrus", "Philip", "Pierre", "Poia", "Polpisil", "Primos", "Pwachan", "Rams", "Raphael", "Recca", "Redley", "Rensley", "Richard", "Ringlen", "Robert", "Roger", "Romolo", "Ronald", "Ronny", "Rubin", "Sa", "Saimon", "Salik", "Salpasr", "Salvador", "Sasorio", "Scott", "Sebastian", "Seilo", "Shouichi", "Soab", "Soulik", "Sounkawad", "Stan", "Stephen", "Strik", "Swinston", "Sylvester", "Takasy", "Tara", "Taro", "Thomas", "Tilfas", "Timothy", "Tom", "Tony", "Tosiwo", "Tulen", "Tulenkun", "Tulensru", "Vicente", "Victor", "Walter", "Werner", "Wesly", "Willard", "William", "Xavier", "Yoshiwo", "Yosiwo", "Yoster", "Zarred"];
@@ -1762,7 +1762,7 @@ App.Data.misc.southSudaneseSlaveSurnames = ["Abraham", "Abugo", "Achieng", "Acho
App.Data.misc.spanishSlaveNames = ["Ababa", "AbigaÃl", "Abril", "Adala", "Adalia", "Adela", "Adelaida", "Adelia", "Adelina", "Adelisa", "Adelita", "Adisoda", "Adoración", "Adriana", "Africa", "Ãfrica", "Agata", "Agueda", "Ãgueda", "Agustina", "Aida", "AÃda", "Aide", "Aileen", "Aina", "Ainara", "Ainhoa", "Aitana", "Alba", "Alberta", "Albina", "Aldana", "Alejandra", "Aleta", "Alexandra", "Alexia", "Alfonsa", "Alheli", "Alicia", "Alida", "Alma", "Almadelia", "Almudena", "Alodia", "Aloisia", "Alondra", "Altagracia", "Ãlvara", "Amada", "Amairany", "Amalia", "Amanda", "Amapola", "Amara", "Amaya", "Amelia", "Amparo", "Ana Maria", "Ana", "Anabel", "Anahi", "AnahÃ", "Anai", "Anali", "Analia", "AnalÃa", "Anay", "Andrea", "AndreÃna", "Ane", "Angela", "Ãngela", "Angeles", "Ãngeles", "Angélica", "Anica", "Anita", "Anna", "Antonia", "Antonieta", "Apolonia", "Aquilina", "Araceli", "Arantxa", "Aranzazu", "Arely", "Ariadna", "Ariana", "Ariel", "Ariela", "Aroa", "Artemisa", "Ascensión", "Aselita", "Asunción", "Aurelia", "Aurora", "Avelina", "Aya", "Azucena", "Azul", "Barbara", "Bárbara", "Beatriz", "Begoña", "Belén", "Belia", "Belicia", "Belkis", "Benicia", "Benita", "Berenice", "Bernarda", "Bernardina", "Berta", "Bertita", "Betania", "Bibiana", "Blanca", "Bonita", "Bouganvilla", "Bruna", "Brunilda", "Buena", "Calida", "Camelia", "Camila", "Candela", "Candelaria", "Candida", "Cándida", "Canela", "Caridad", "Carina", "Carito", "Carla", "Carlina", "Carlota", "Carmela", "Carmen", "Caro", "Carolina", "Casandra", "Cataleya", "Catalina", "Catrina", "Cecilia", "Celia", "Celida", "Celina", "Celsa", "Chara", "Chaxiraxi", "Chela", "Chelo", "Chiquita", "Chita", "Citlali", "Clara", "Claribel", "Clarisa", "Claudia", "Clemencia", "Clementina", "Clotilde", "Cobura", "Colombia", "Concepción", "Concha", "Conchita", "Conseja", "Consolación", "Constanza", "Consuela", "Consuelo", "Corazón", "Corina", "Covadonga", "Crisanta", "Crisol", "Cristina", "Cruz", "Cynthia", "Dafna", "Dafne", "Daisy", "Dalia", "Dalila", "Damaris", "Damiana", "Damita", "Daniela", "Daria", "Daritza", "Davina", "Dayana", "Débora", "Delfina", "Delia", "Deliasofia", "Delmira", "Delores", "Demetria", "Desamparados", "Desdemona", "Desirée", "Diana", "Dinora", "Dionecia", "Dionicia", "Dionisia", "Dolores", "Dominga", "Dominica", "Dorotea", "Dulce", "Dulcinea", "Edelmira", "Eglantina", "Electra", "Elena", "Eleonora", "Elia", "Eliana", "Elida", "Eligia", "Elina", "Elisa", "Elmira", "Elodea", "Eloisa", "Elsa", "Elvia", "Elvira", "Emelda", "Emelia", "Emilia", "Emiliana", "Emma", "Encarna", "Encarnación", "Enedina", "Engracia", "Enka", "Enriqua", "Enriqueta", "Epifania", "Erika", "Ernestina", "Esmeralda", "Esperanza", "Estefania", "EstefanÃa", "Estela", "Estella", "Ester", "Esther", "EstÃbaliz", "Estil", "Estrelita", "Estrella", "Etelvina", "Eudoxia", "Eufemia", "Eufrasia", "Eugenia", "Eulalia", "Eulogia", "Eustolia", "Eva", "Evelyn", "Evita", "Fabiana", "Fabiola", "Fabricia", "Facunda", "Fatima", "Fátima", "Faustina", "Felicia", "Feliciana", "Felicidad", "Felipa", "Felisa", "Fermina", "Fernanda", "Filipa", "Filomena", "Fiorella", "Flavia", "Flor", "Flora", "Florencia", "Floria", "Florida", "Franca", "Francisca", "Frida", "Froilana", "Fuensanta", "Fulberta", "Fulca", "Gabriela", "Galia", "Gara", "Gema", "Genedina", "Genoveva", "Geo", "Gilda", "Ginebra", "Gladis", "Gloria", "Glory", "Gracia", "Graciela", "Grazia", "Gregoria", "Gretel", "Griselda", "Guada", "Guadalupe", "Guillermina", "Guiomar", "Hada", "Hañagua", "Haydée", "Helena", "Heli", "Heloisa", "Hera", "Hermalinda", "Herminia", "Hilaria", "Hilda", "Hipolita", "Hortensia", "Iara", "Idalia", "Idonia", "Ifigenia", "Ignacia", "Ilda", "Illena", "Ilona", "Imelda", "Immaculada", "Ines", "Inés", "Inez", "Inma", "Inmaculada", "Irati", "Irene", "Iria", "Iris", "Irma", "Isa", "Isabel", "Isabella", "Isaura", "Isidora", "Isidra", "Ismary", "Ismelda", "Itahisa", "Ivette", "Ivonne", "Izaro", "Jacinta", "Jacqueline", "Jana", "Janina", "Jasmine", "Javiera", "Jazmin", "Jenara", "Jesica", "Jesusa", "Jesusita", "Jimena", "Joaquina", "Jocelin", "Jordana", "Jorgelina", "Josefa", "Josefina", "Josephine", "Jovita", "Juana", "Juanita", "Julia", "Júlia", "Juliana", "Julieta", "June", "Justina", "Kaiane", "Karina", "Laia", "Laila", "Lali", "Lara", "Larisa", "Larraitz", "Laura", "Laureana", "Laurencia", "Lea", "Leandra", "Leire", "Lena", "Leonarda", "Leonela", "Leonor", "Leopoldina", "Leticia", "Leyre", "LÃa", "Liana", "Libertad", "Libia", "Licha", "Lidia", "Ligia", "Lilia", "Liliana", "Liliosa", "Lina", "Linda", "Lisa", "Liselotte", "Lissette", "Lizete", "Lola", "Lolita", "Loreley", "Lorena", "Lorenza", "Lourdes", "Luana", "Lucelia", "Lucero", "Lucha", "Lucia", "LucÃa", "Luciana", "Lucila", "Lucina", "Lucrecia", "Luisa", "Luna", "Lupe", "Lupita", "Luz", "Luzdivina", "Macarena", "Macaria", "Madalena", "Madrid", "Mae", "Magdalena", "Magnolia", "Maitane", "Maite", "Malak", "Malda", "Malen", "Manuela", "Manuelita", "Mar", "Mara", "Marcela", "Marcelina", "Margarita", "Maria Concepción", "Maria de los Dolores", "Maria del Carmen", "Maria Encarnación", "Maria Ester", "Maria Guadalupe", "Maria Isabel", "MarÃa Jesús", "MarÃa José", "Maria Juana", "MarÃa Juana", "Maria Luisa", "MarÃa Magdalena", "Maria", "MarÃa", "Mariah", "Marian", "Mariana", "Maribel", "Maricarmen", "Maricela", "Maricruz", "Mariela", "Mariesa", "Marina", "Maripaz", "Marisa", "Marisol", "Marita", "Marquita", "Marta", "Martina", "Martita", "Matilde", "Maya", "Mayra", "Mayte", "Meagens", "Mercedes", "Micaela", "Miguela", "Mila", "Milagros", "Milena", "Mirca", "Mireia", "Mirella", "Mireya", "Miriam", "Mirna", "Modesta", "Moira", "Monica", "Mónica", "Monse", "Monserrat", "Montserrat", "Nadia", "Nahia", "Nahir", "Naia", "Naiara", "Naike", "Narcisa", "Narda", "Naroa", "Natacha", "Natalia", "Natividad", "Nayara", "Nayeli", "Nazarena", "Nazaret", "Nelia", "Nélida", "Nerea", "Neva", "Niceto", "Nidia", "Nieves", "Nilda", "Nina", "Ninfa", "Niurka", "Noa", "Noe", "Noelia", "Noemi", "NoemÃ", "Nora", "Norma", "Nova", "Nuela", "Nuria", "Núria", "Obdulia", "Octavia", "Odelia", "Odilia", "Ofelia", "Olga", "Olimpia", "Oliva", "Olivia", "Olivita", "Oralia", "Orestes", "Oria", "Orlanda", "Orlantha", "Otilia", "Ovidia", "Palma", "Palmira", "Paloma", "Pamela", "Pancracia", "Pandora", "Pantera", "Paola", "Paqui", "Paquita", "Pascua", "Pascuala", "Patricia", "Paula", "Paulette", "Paulina", "Paz", "Penelope", "Perla", "Perpetua", "Petra", "Petrona", "Pia", "Piedad", "Pilar", "Placinta", "Pricia", "Primitiva", "Priscilla", "Pura", "Purificación", "Querida", "Querina", "Quirina", "Quisela", "Rafaela", "Raimunda", "Ramira", "Ramona", "Raquel", "Rayén", "Raylina", "Rebeca", "Refugio", "Reina", "Remedios", "Renata", "Renée", "Resurrección", "Reyna", "Ricarda", "Rita", "Roberta", "Rocio", "RocÃo", "Rodolfa", "Rolanda", "Romina", "Rosa Maria", "Rosa", "Rosalia", "RosalÃa", "Rosana", "Rosandra", "Rosaria", "Rosario", "Rosaura", "Rosenda", "Rosina", "Roxana", "Rufino", "Rut", "Ruth", "Sabana", "Sabina", "Salivia", "Salma", "Salomé", "Salud", "Salvadora", "Sancha", "Sandra", "Santana", "Sara", "Sarai", "Saray", "Sarita", "Saturnina", "Segismunda", "Selena", "Selia", "Serafina", "Serina", "Sevilla", "Silvana", "Silvia", "Sinai", "Socorro", "Sofia", "SofÃa", "Sol", "Solana", "Solange", "Soledad", "Sonia", "Soraya", "Sotera", "Stephanie", "Sucely", "Susana", "TaÃs", "Talia", "Tamara", "Tania", "Tatiana", "Telma", "Teodora", "Teofila", "Tequila", "Teresa", "Teresita", "Thiare", "Tiare", "Tomasa", "Triana", "Trihas", "Trinidad", "Ulrica", "Ursula", "Úrsula", "Uxue", "Valencia", "Valentina", "Valeria", "Vane", "Vanesa", "Vanessa", "Vanina", "Vega", "Velia", "Venecia", "Ventura", "Veronica", "Verónica", "Vicenta", "Victoria", "Vilma", "Violeta", "Virginia", "Virtudes", "Visitación", "Viva", "Viviana", "Walkiria", "Walquiria", "Wuaira", "Xara", "Xaviera", "Xela", "Xenia", "Xiana", "Xilosma", "Ximena", "Xiomara", "Yahaira", "Yaiza", "Yajaira", "Yanet", "Yanina", "Yaretzi", "Yaritza", "Yazmin", "Yazmina", "Yesenia", "Ylenia", "Ynes", "Yolanda", "Ysabel", "Yurixi", "Yvette", "Zaida", "Zaira", "Zeferina", "Zoraida", "Zulema", "Zulma"];
App.Data.misc.spanishMaleNames = ["Aaron", "Aarón", "Abel", "Abelardo", "Abimael", "Absalon", "Acacio", "Adalberto", "Adan", "Adano", "Adelardo", "Adelmaro", "Ademar", "Adonis", "Adria", "Adrian", "Adrián", "Agapito", "AgustÃn", "Aimar", "Aitor", "Aladino", "Albano", "Albert", "Alberto", "Albino", "Aldair", "Aldo", "Alejandro", "Alejo", "Alemayehu", "Alex", "Àlex", "Alfonso", "Alfredo", "Alipio", "Alonso", "Alterio", "Alvaro", "Ãlvaro", "Amadeo", "Amado", "Amador", "Amalio", "Amando", "Ambrosio", "Amelio", "Amilcar", "Amparo", "Ampelio", "Anacleto", "Anastasio", "Anatolio", "Ander", "Andreo", "Andres", "Andrés", "Angel", "Ãngel", "Angelo", "Anibal", "Aniceto", "Anselmo", "Antioco", "Antonio", "Aparicio", "Apocalipsis", "Apolinario", "Apolo", "Aquiles", "Aquilino", "Arcángel", "Arcinio", "ArÃstides", "Armando", "Arnaldo", "Arnau", "Arnulfo", "Arquimedes", "Arsenio", "Artemio", "Arturo", "Asclepiades", "Asier", "Atanasio", "Atilio", "Augusto", "Aureliano", "Aurelio", "Auxilio", "Avelino", "Baltazar", "Bartolomé", "Bautista", "Beltran", "Benedicto", "Benigno", "Benito", "BenjamÃn", "Bernardino", "Bernardo", "Bernat", "Biel", "Bienvenido", "Blas", "Bonito", "Borja", "Braulio", "Bricio", "Bruno", "Calixto", "Calvino", "Camari", "Camilo", "Candido", "Carlitos", "Carlos Enrique", "Carlos Ivan", "Carlos Jose", "Carlos", "Carmelo", "Cartez", "Casandro", "Casimiro", "Casto", "Castor", "Cayetano", "Cecilio", "Ceferino", "Celedonio", "Celerino", "Celestino", "Celio", "Celso", "Cesar", "César", "Chema", "Chico", "Christian", "Cid", "Cipriano", "Ciriaco", "Cirilo", "Ciro", "Claudio", "Clemente", "Cleto", "Clodomiro", "Colón", "Confesor", "Conrado", "Constancio", "Constantino", "Corbin", "Cornelio", "Cortez", "Cosme", "Crescencio", "Crisanto", "Crispo", "Cristian", "Cristobal", "Cruz", "Custodio", "Cutberto", "Dagoberto", "Dámaso", "Damián", "Daniel", "Danilo", "Dardo", "Dario", "Darwin", "David", "Delfin", "Delfino", "Demetrio", "Demócrito", "Deodato", "Derico", "Desiderio", "Diego", "Dimas", "Dionisio", "Domas", "Domiciano", "Dominador", "Domingo", "Donaldo", "Doroteo", "Duilio", "Eberardo", "Edelberto", "Edelio", "Edelmar", "Edelmiro", "Edgar", "Edgardo", "Edmundo", "Eduard", "Eduardo", "Edwin", "Efrain", "Efrén", "Egidio", "Eladio", "Elbio", "Eleuterio", "Elián", "Elias", "Eliecer", "Eligio", "Elio", "Eliseo", "Eliut", "Eloy", "Elvio", "Emerio", "Emeterio", "Emiliano", "Emilio", "Enrique", "Epicuro", "Epifanio", "Epimenio", "Epitacio", "Erardo", "Erasmo", "Eric", "Èric", "Ernesto", "Espartaco", "Estanislao", "Esteban", "Eufemio", "Eufracio", "Eugenio", "Eulalio", "Eulojio", "Eusebio", "Eustacio", "Evando", "Evaristo", "Everardo", "Expedito", "Ezequiel", "Fabián", "Fabio", "Faustino", "Fausto", "Favio", "Federico", "Feliciano", "Felipe", "Felisardo", "Felix", "Fermin", "FermÃn", "Fernando", "Fidel", "Filadelfo", "Filademo", "Filemon", "Filiberto", "Flavio", "Floreal", "Florencio", "Florián", "Francisco Javier", "Francisco Jose", "Francisco", "Franco", "Fulgencio", "Fulvio", "Gabimael", "Gabino", "Gabriel", "Gadiel", "Galeaso", "Galo", "Gaspar", "Gaudencio", "Gedeón", "Genaro", "Generoso", "George", "Gerard", "Gerardo", "Germán", "Germinal", "Gerson", "Gervasio", "Gesualdo", "Getulio", "Gilberto", "Gildardo", "Giovanni", "Gomez", "Gonzalo", "Gracián", "Graciano", "Gregorio", "Gualberto", "Gualterio", "Guarionex", "Guillem", "Guillermo", "Gumecindo", "Gustavo", "Gutierre", "Hadriano", "Hector", "Helias", "Heliodoro", "Heráclito", "Heriberto", "Hernán", "Hernando", "Heródoto", "Higinio", "Hilario", "Hipolito", "Homero", "Homobono", "Honesto", "Honoratio", "Horacio", "Hugan", "Hugo", "Humberto", "Ibai", "Ibero", "Ignacio", "Ignaz", "Iker", "Inocencio", "Ionatán", "Isaac", "Isaias", "Isidro", "Ismael", "Ivan", "Jacinto", "Jaime Luis", "Jaime", "Jairo", "Jan", "Jandino", "Javier", "Jeremias", "Jesus", "Jesús", "Jilberto", "Joan", "Joaquin", "Joel", "Jon", "Jonás", "Jonathan", "Jordi", "Jorge", "José Alberto", "Jose Antonio", "José Javier", "Jose Luis", "José Luis", "Jose Manuel", "Jose Maria", "José MarÃa", "Jose Miguel", "Jose", "José", "Juan Antonio", "Juan Carlos", "Juan Diego", "Juan Jose", "Juan Manuel", "Juan", "Julen", "Julián", "Juliano", "Julino", "Julio", "Justiniano", "Justino", "Juvenal", "Kevin", "Ladislao", "Landerico", "Landolfo", "Laureano", "Laurelino", "Laurentino", "Lauro", "Lazaro", "Leal", "Leandro", "Learco", "Lelio", "Leo", "Leobardo", "Leocadio", "León", "Leonardo", "Leonel", "Leónidas", "Leonzo", "Leopoldo", "Leto", "Liberal", "Liberato", "Libio", "Licugro", "Lino", "Lisandro", "Livio", "Lope", "Lorenzo", "Loreto", "Luano", "Lucas", "Lucero", "Luciano", "Lucio", "Lucrecio", "Luis", "Luiz", "Macabeo", "Macario", "Macedonio", "Maciel", "Malaquias", "Manfredo", "Manolo", "Manuel", "Marc", "Marcelino", "Marcelo", "Marcial", "Marcio", "Marco", "Marcos", "Mariano", "Marino", "Mario", "Mark", "Markel", "Marti", "Martin", "MartÃn", "Mateo", "Matias", "Mauricio", "Mauro", "Maximo", "Melchor", "Melecio", "Meliton", "Melquisede", "Menandro", "Mentor", "Mercurio", "Miguel Angel", "Miguel", "Mikel", "Miquel", "Misael", "Modesto", "Mohamed", "Moises", "Monserrate", "Montxu", "Nacho", "Naldo", "Narciso", "Narno", "Natal", "Natalio", "Nataniel", "Nazareno", "Nazaret", "Nazario", "Neandro", "Neftali", "Nemesio", "Neptuno", "Nereo", "Nestor", "Nicandro", "Nicanor", "Nicasio", "Niceto", "Nico", "Nicolas", "Nil", "Nilo", "Noe", "Nolasco", "Norberto", "Normando", "Nuncio", "Obdulio", "Octaviano", "Octavio", "Odei", "Oier", "Olegario", "Olimpo", "Onofre", "Orangel", "Orencio", "Orestes", "Orfeo", "Origenes", "Oriol", "Orión", "Orlando", "Ortiz", "Oscar", "Óscar", "Osmundo", "Osvaldo", "Oswaldo", "Otilio", "Otoniel", "Ovidio", "Pablo", "Pacifico", "Paco", "Pancracio", "Panfilo", "Paquillo", "Paris", "Parmenio", "Pascual", "Pastor", "Patricio", "Pau", "Pedro", "Pepe", "Perfecto", "Perpetuo", "Placido", "Pol", "Policarpo", "Polifemo", "Porfirio", "Poseidón", "Priamo", "Procopio", "Prometeo", "Próspero", "QuentÃn", "Quintero", "Quito", "Rafael", "Raimundo", "Ramiro", "Ramon", "Ramón", "Raul", "Raúl", "Raymundo", "Refugio", "Reinaldo", "Remigio", "Renato", "Renzo", "Rey", "Reyes", "Reynaldo", "Ricardo", "Rico", "Rigoberto", "Roberto", "Rocio", "Rodolfo", "Rodrigo", "Rogelio", "Rojelio", "Rolando", "Román", "Romero", "Ronaldo", "Roque", "Rosario", "Rosendo", "Ruben", "Rubio", "Rufo", "Ruperto", "Sabelio", "Sabino", "Salomón", "Salvador", "Salviano", "Salvo", "Samuel", "Sancho", "Sansón", "Santiago", "Santino", "Santos", "Saturnino", "Saúl", "Sebastián", "Sebastiano", "Segismundo", "Segundo", "Sempronio", "Serafin", "Sergi", "Sergio", "Servando", "Servio", "Severino", "Silverio", "Silviano", "Silvio", "Simón", "Sixto", "Socorro", "Solano", "Sotero", "Tacio", "Tacito", "Tadeo", "Tajo", "Tancredo", "Tarquino", "Tarsicio", "Telemaco", "Teo", "Teodomiro", "Teodoro", "Teodosio", "Teofano", "Teofilio", "Tercio", "Terencio", "Tiberio", "Tiburcio", "Ticiano", "Timoteo", "Tino", "Tito", "Tomás", "Toribio", "Toruato", "Tranquiliano", "Tranquilino", "Transito", "Tripilo", "Tristán", "Tulio", "Ubaldo", "Ulises", "Ulrico", "Unai", "Unax", "Urbano", "Uriel", "Valdemar", "ValentÃ", "ValentÃn", "Valeriano", "Valerio", "Venancio", "Venturo", "Vermundo", "Vero", "Vicente", "Victor", "Victoriano", "Vidal", "Viorel", "Virgilio", "Viviano", "Vulpiano", "Walberto", "Wilfredo", "Xavier", "Yadiel", "Yago", "Yamel", "Yareli", "Yaro", "Yerai", "Ygnacio", "Yoel", "Yojany", "Yuniel", "Yunier", "Zenobio", "Zumel"];
-App.Data.misc.spanishSlaveSurnames = ["Abad", "Abadia", "Abana", "Abano", "Abarca", "Abaroa", "Abascal", "Abasolo", "Abel", "Abellan", "Abelló", "Aberquero", "Abreu", "Abril", "Acedo", "Acevedo", "Acosta", "Acuña", "Adan", "Afonso", "Agirre", "Agramunt", "Aguado", "Agudo", "Aguilar", "Aguilera", "Aguirre", "Agullo", "Ahmed", "Aiza", "Alamilla", "Alamo", "Alarcon", "Alba", "Albert", "Albuquerque", "Alcaide", "Alcala", "Alcalde", "Alcantara", "Alcaraz", "Alcazar", "Aldana", "Aldorino", "Alegre", "Alemany", "Alfaro", "Alfonso", "Ali", "Aliaga", "Almagro", "Almeida", "Alonso", "Alozie", "Alvarado", "Alvarez", "Ãlvarez", "Alvaro", "Alves", "Amado", "Amador", "Amat", "Amaya", "Amor", "Amores", "Amoros", "Andrade", "Andres", "Andreu", "Andujar", "Anglés", "Angulo", "Antolin", "Anton", "Antón", "Antunez", "Antúnez", "Aparicio", "Aqua", "Aquino", "Aragon", "Arana", "Aranda", "Araujo", "Araújo", "Araullo", "Araya", "Arce", "Arcos", "Arechavaleta", "Arellano", "Arena", "Arenas", "Ares", "Arevalo", "Arias", "Aritza", "Ariza", "Arjona", "Armando", "Armas", "Arnaiz", "Arnau", "Aroca", "Arranz", "Arreola", "Arribas", "Arriola", "Arroyo", "Arteaga", "Asenjo", "Asensio", "Asis", "Asturias", "Atienza", "Avana", "Avila", "Aviles", "Ayala", "Ayuso", "Azarola", "Aznar", "Bachero", "Badia", "Baena", "Baez", "Baeza", "Balaguer", "Ballester", "Ballesteros", "Banderas", "Baños", "Barba", "Barbera", "Barbero", "Barcelo", "Barea", "Barragan", "Barranco", "Barreiro", "Barrera", "Barrero", "Barrientos", "Barrio", "Barrios", "Barros", "Barroso", "Bartolome", "Bastida", "Basurto", "Batista", "Bautista", "Becerra", "Beitia", "Bejarano", "Belda", "Bellido", "Bello", "Belmonte", "Beltran", "Benavente", "Benavides", "Benet", "Bengochea", "Benitez", "Benito", "Berenguer", "Bermejo", "Bermudez", "Bermúdez", "Bernabe", "Bernabeu", "Bernal", "Berrocal", "Bes", "Betancor", "Bezabeh", "Bilbao", "Blanco", "Blanxart", "Blasco", "Blazquez", "Boix", "Bolaños", "BolÃvar", "Bonaventura", "Bonet", "Bonilla", "Borja", "Borras", "Borrego", "Bosch", "Bosque", "Botella", "Bourbon", "Bravo", "Brito", "Búa", "Buendia", "Bueno", "Burgos", "Bustamante", "Bustillo", "Busto", "Bustos", "Caamaño", "Caballero", "Cabanillas", "Cabello", "Cabeza", "Cabezas", "Cabrera", "Caceres", "Cacho", "Calatayud", "Calderon", "Calderón", "Calero", "Calle", "Calleja", "Calvo", "Camacho", "Camara", "Camino", "Campillo", "Campo", "Campos", "Campoy", "Camps", "Cañadas", "Canales", "Cañas", "Candela", "Cañete", "Cañizares", "Cano", "Canovas", "Cantero", "Canto", "Cantos", "Caparros", "Capdevila", "Capellán", "Capello", "Carballo", "Carbonell", "Cardama", "Cardenas", "Cardona", "Carmona", "Caro", "Carpio", "Carranza", "Carrasco", "Carrascosa", "Carreño", "Carrera", "Carreras", "Carrero", "Carretero", "Carrillo", "Carrion", "Carro", "Carvajal", "Casado", "Casal", "Casales", "Casals", "Casanova", "Casas", "Castañeda", "Castaño", "Castell", "Castellano", "Castellanos", "Castello", "Castells", "Castilla", "Castillion", "Castillo", "Castrejana", "Castro", "Catala", "Catalan", "Cazorla", "Ceballos", "Cebrian", "Centeno", "Cerda", "Cerdan", "Cerezo", "Cervantes", "Cervera", "Cespedes", "Chacon", "Chamorro", "Chaparro", "ChavarrÃa", "Chaves", "Chavez", "Checa", "Chen", "Chico", "Chilla", "Cid", "Cienfuegos", "Cifuentes", "Clemente", "Climent", "Cobo", "Cobos", "Coca", "Codina", "Coll", "Collado", "Colomer", "Colón", "Comas", "Conde", "Conesa", "Contreras", "Cordero", "Cordoba", "Cordon", "Cornejo", "Coronado", "Corral", "Corrales", "Correa", "Cortes", "Costa", "Costas", "Crespo", "Criado", "Cristobal", "Cruz", "Cuadrado", "Cubero", "Cuellar", "Cuéllar", "Cuenca", "Cuesta", "Cuevas", "D'Cruz", "D'Cruze", "da Silva", "Da-Silva", "Davila", "de Castro", "de Diego", "de Dios", "de Haro", "de la Cruz", "de La Cruz", "de la Fuente", "de La Fuente", "de la Puente", "de La Rosa", "de La Torre", "de las Heras", "de Leon", "de Los Santos", "de Miguel", "de Santigo", "De-Diego", "De-Dios", "de-La-Cruz", "De-La-Fuente", "de-La-Rosa", "De-La-Torre", "De-Las-Heras", "de-Los-Santos", "del Bosque", "del Campo", "del Castillo", "del Moral", "del Olmo", "del Pino", "del Pozo", "del Rio", "del RÃo", "del Valle", "Del-Rio", "Delgado", "Desoisa", "Diallo", "Diaz", "DÃaz", "Diego", "Dieguez", "Diez", "Domenech", "Domingo", "Dominguez", "DomÃnguez", "Dorado", "dos Santos", "Dos-Santos", "Duarte", "Dueñas", "Duque", "Duran", "Durante", "Echevarria", "EchevarrÃa", "Echeverria", "EcheverrÃa", "Echeverry", "Egea", "Elizondo", "Elorza", "Elvira", "Encinas", "Enriquez", "Erta", "Escamilla", "Escárcega", "Escarrà ", "Esclápez", "Escobar", "Escribano", "Escudero", "Espada", "España", "Esparza", "Espejo", "Espin", "Espina", "Espino", "Espinosa", "Espinoza", "Esteban", "Esteve", "Estevez", "Estévez", "Estrada", "Etxebarria", "Etxeberria", "Exposito", "Fajardo", "Falcon", "Fariña", "Farre", "Feijoo", "Felipe", "Félix", "Fernandez", "Fernández", "Fernndez", "Ferrando", "Ferre", "Ferreira", "Ferreiro", "Ferrer", "Ferrero", "Fidalgo", "Fierro", "Figueras", "Figueroa", "Flores", "Florez", "Folch", "Fonseca", "Font", "Fraga", "Fraile", "Frances", "Francisco", "Franco", "Freire", "Frias", "Frutos", "Fuente", "Fuentes", "Fuertes", "Fuster", "Gabarri", "Gago", "Galan", "Galán", "Galera", "Galiano", "Galindo", "Gallardo", "Gallego", "Gallo", "Galvan", "Galvez", "Gamero", "Gamez", "Garca", "Garces", "Garcia", "GarcÃa", "Garrastazu", "Garrido", "Garriga", "Garza", "Garzon", "Gascon", "Gaspar", "Gay", "Gebara", "Gebre", "Gil", "Gilabert", "Gimenez", "Gimeno", "Giner", "Giraldo", "Giron", "Gisbert", "Godoy", "Gomez", "Gómez", "Gomis", "Goñi", "Gonzales", "Gonzalez", "González", "Gonzalo", "Gordillo", "Gordo", "Gracia", "Granado", "Granados", "Grande", "Grau", "Grec", "Griñó", "Guadarrama", "Guardiola", "Guerra", "Guerrero", "Guevara", "Guijarro", "Guillen", "Guirado", "Guirao", "Guisado", "Gutierrez", "Gutiérrez", "Guzman", "Haro", "Heras", "Heredia", "Hermida", "Hermoso", "Hernandez", "Hernández", "Hernando", "Herraiz", "Herranz", "Herrera", "Herrero", "Herreros", "Hervas", "Hidalgo", "Hierro", "Hinojosa", "Holgado", "HolguÃn", "Hortelano", "Hoyos", "Huerta", "Huertas", "Huisgen", "Hurtado", "Husillos", "Ibañez", "Ibáñez", "Ibarra", "Iborra", "Iglesias", "Infante", "Iniesta", "IñÃguez", "Iturburua", "Izquierdo", "Jaen", "Jaime", "Jainaga", "Jara", "Jaramillo", "Jaso", "Jasso", "Jerez", "Jimenez", "Jiménez", "Jimeno", "Jordà ", "Jordan", "Jorge", "José", "Jover", "Juan", "Juarez", "Juárez", "Julian", "Jurado", "Kaur", "Labrador", "Lacambra", "Lafuente", "Lago", "Laguna", "Lahoz", "Lamas", "Lamela", "Lara", "Latorre", "Lazano", "Lazaro", "Leal", "Ledesma", "Leiva", "Lema", "Leon", "León", "Li", "Lillo", "Lima", "Lin", "Linares", "Liu", "Llamas", "Llanos", "Llopis", "Llorens", "Llorente", "Lloret", "Lobato", "Lobo", "Lopez", "López", "Lora", "Lorente", "Lorenzo", "Losa", "Losada", "Loyola", "Lozano", "Lucas", "Lucena", "Luengo", "Luis", "Lujan", "Luna", "Luque", "Machado", "Macia", "Macias", "MacÃas", "Madrid", "Maestre", "Maldonado", "Mañas", "Manrique", "Mansilla", "Manso", "Manzanares", "Manzano", "Maradona", "Marco", "Marcos", "Mari", "MarÃa", "Marin", "MarÃn", "Marino", "Mariño", "Mariscal", "Maroto", "Marques", "Marquez", "Márquez", "Marrero", "Martell", "Marti", "MartÃ", "Martin", "MartÃn", "Martinez", "MartÃnez", "Martnez", "Martorell", "Martos", "Mas", "Massana", "Mata", "Matas", "Mateo", "Mateos", "Mateu", "Matos", "Maya", "Mayo", "Mayor", "Mayoral", "Maza", "Medina", "Medrano", "Megias", "Mejia", "Mejias", "Melendez", "Melero", "Melgar", "Melian", "Mellado", "Mena", "Mendez", "Méndez", "Mendoza", "Menendez", "Mera", "Mercado", "Merchan", "Merino", "Merlo", "Mesa", "Meseguer", "Mestre", "Michel", "Miguel", "Miguez", "Millan", "Mingo", "Minguez", "Mir", "Mira", "Miralles", "Miranda", "Miro", "Mohamed", "Molero", "Moles", "Molina", "Molinero", "Monge", "Montalvo", "Montaño", "Monteagudo", "Montenegro", "Montero", "Montes", "Montesinos", "Montiel", "Montilla", "Montoro", "Montoya", "Monzon", "Mora", "Moracho", "Moral", "Morales", "Moralez", "Moran", "Morcillo", "Moreira", "Moreno", "Morera", "Morilla", "Morillas", "Morillo", "Moro", "Moron", "Mosquera", "Mota", "Moya", "Moyano", "Muñiz", "Muñoz", "Murcia", "Muriel", "Murillo", "Myers", "Nadal", "Naranjo", "Narvaez", "Narváez", "Navarrete", "Navarro", "Navas", "Neira", "Nevado", "Nicolas", "Nieto", "Nieves", "ÑÃguez", "Nogales", "Noguera", "Noguerra", "Nolet", "Novo", "Novoa", "Nuñez", "Núñez", "Obando", "Ocaña", "Ochoa", "Ojeda", "Ola", "Oleastro", "Olguin", "Oliva", "Olivares", "Oliveira", "Oliver", "Olivera", "Olmedo", "Olmo", "Olmos", "Onyia", "Oquendo", "Ordoñez", "Ordóñez", "Orellana", "Oriol", "Orozco", "Ortega", "Ortiz", "OrtÃz", "Ortuño", "Osorio", "Osuna", "Otero", "Oviedo", "Pacheco", "Padilla", "Padron", "Paez", "Palacio", "Palacios", "Palau", "Palazon", "Palencia", "Pallares", "Palma", "Palomares", "Palomino", "Palomo", "Pancorbo", "Paniagua", "Parada", "Pardo", "Paredes", "Pareja", "Parejo", "Parra", "Parrilla", "Pascual", "Pastor", "Patiño", "Pavia", "Pavon", "Paz", "Pazos", "Pedraza", "Pedrosa", "Peinado", "Peiro", "Pelaez", "Peláez", "Peleteiro", "Pellicer", "Pena", "Peña", "Peñalver", "Peñarrocha", "Peral", "Perales", "Peralta", "Perdomo", "Perea", "Pereira", "Perello", "Perera", "Perez", "Pérez", "Peris", "Pestano", "Petit", "Picasso", "Picazo", "Pico", "Pina", "Pineda", "Piñeiro", "Piñero", "Pinilla", "Pino", "Pinto", "Piqueras", "Pizarro", "Pla", "Planas", "Plasencia", "Plaza", "Polo", "Ponce", "Pons", "Ponsati", "Porcel", "Porra", "Porras", "Portela", "Portillo", "Postigo", "Poveda", "Pozo", "Prada", "Prado", "Prados", "Prat", "Prats", "Prieto", "Puente", "Puerta", "Puertas", "Puerto", "Puga", "Puig", "Pujol", "Pulido", "Quero", "Quesada", "Quevedo", "Quiles", "Quinones", "Quiñones", "Quintana", "Quintero", "Quiroga", "Quiros", "Quirós", "Ramirez", "RamÃrez", "Ramiro", "Ramon", "Ramos", "Rana", "Ravar", "Raya", "Real", "Rebollo", "Recio", "Redondo", "Reig", "Reina", "Rendón", "Requena", "Revilla", "Revuelta", "Rey", "Reyes", "Rial", "Ribas", "Ribera", "Ribes", "Ricart", "Rico", "Riera", "Rincon", "Rio", "Rios", "Ripoll", "Riquelme", "Rivas", "Rivera", "Rivero", "Robledo", "Robles", "Roca", "Rocha", "Rodenas", "Rodrguez", "Rodrigo", "Rodrigues", "Rodriguez", "RodrÃguez", "Rodriquez", "Roig", "Rojas", "Rojo", "Roldan", "Roldán", "Romà ", "Roman", "Romera", "Romero", "Romo", "Roncero", "Ros", "Rosa", "Rosado", "Rosales", "Rosell", "Rosello", "Rovira", "Royo", "Ruano", "Rubio", "Rueda", "Ruiz", "Rus", "Ruz", "Saavedra", "Sabater", "Sacristan", "Saenz", "Saez", "Sainz", "Saiz", "Sala", "Salamanca", "Salas", "Salazar", "Salcedo", "Saldaña", "Sales", "Salgado", "Salguero", "Salinas", "Salmeron", "Salvador", "Sampedro", "Samper", "San Jose", "San Juan", "San Martin", "San Miguel", "San nicolas", "San-Jose", "San-Juan", "San-Martin", "Sanchez", "Sánchez", "Sanchis", "Sancho", "Sandoval", "Sanjuan", "Sanmartin", "Sans", "Santamaria", "Santana", "Santiago", "Santillian", "Santos", "Sanz", "Sarmiento", "Sastre", "Saura", "Sebastian", "Seco", "Segarra", "Segovia", "Segui", "Segura", "Sempere", "Seoane", "Sepulveda", "Sepúlveda", "Serna", "Serra", "Serrano", "Sevilla", "Sevillano", "Sierra", "Silva", "Silvestre", "Simon", "Singh", "Snchez", "Sobrino", "Sola", "Solana", "Solano", "Sole", "Soler", "Solis", "Solo", "Solos", "Soria", "Soriano", "Sosa", "Soto", "Sousa", "Souto", "Suarez", "Suárez", "Suero", "Taboada", "Takács", "Talavera", "Tamayo", "Tapia", "Tejada", "Tejedor", "Tejera", "Tejero", "Tellez", "Tello", "Tena", "Terrazas", "Teruel", "Tirado", "Toledano", "Toledo", "Tomas", "Tomà s", "Tome", "Toribio", "Toro", "Torralba", "Torre", "Torregrosa", "Torrejon", "Torres", "Torrijos", "Tortosa", "Tos", "Tosell", "Toset", "Tovar", "Travieso", "Trigo", "Trillo", "Trujillo", "Tudela", "Ubeda", "Ubina", "Ujakpor", "Urbano", "Urbina", "Ureña", "Uriarte", "Urpi", "Vaca", "Valcarcel", "Valdes", "Valdez", "Valdivia", "Valencia", "Valenzuela", "Valera", "Valero", "Valiente", "Valle", "Vallejo", "Valles", "Valls", "Valverde", "Vaquero", "Varela", "Vargas", "Vasco", "Vasquez", "Vásquez", "Vazquez", "Vázquez", "Vega", "Vegas", "Veiga", "Vela", "Velasco", "Velazquez", "Velez", "Ventura", "Vera", "Verdu", "Verdugo", "Vergara", "Vicario", "Vicente", "Viciosa", "Vico", "Vidal", "Viera", "Vila", "Vilar", "Vilaró", "Vilches", "Vilchez", "Viles", "Villa", "Villalba", "Villalobos", "Villanueva", "Villar", "Villaverde", "Villegas", "Villena", "Viñas", "Viola", "Viteri", "Vivas", "Vives", "Vizcaino", "Wang", "Wu", "Xu", "Yague", "Yañez", "Ybarra", "Ye", "Yuste", "Zabala", "Zafra", "Zambrano", "Zamora", "Zamorano", "Zapata", "Zapatero", "Zaragoza", "Zavala", "Zhang", "Zheng", "Zhou", "Zhu", "Zubizarreta", "Zuñiga", "Zúñiga", "Zurita"];
+App.Data.misc.spanishSlaveSurnames = ["Abad", "Abadia", "Abana", "Abano", "Abarca", "Abaroa", "Abascal", "Abasolo", "Abel", "Abellan", "Abelló", "Aberquero", "Abreu", "Abril", "Acedo", "Acevedo", "Acosta", "Acuña", "Adan", "Afonso", "Agirre", "Agramunt", "Aguado", "Agudo", "Aguilar", "Aguilera", "Aguirre", "Agullo", "Ahmed", "Aiza", "Alamilla", "Alamo", "Alarcon", "Alba", "Albert", "Albuquerque", "Alcaide", "Alcala", "Alcalde", "Alcantara", "Alcaraz", "Alcazar", "Aldana", "Aldorino", "Alegre", "Alemany", "Alfaro", "Alfonso", "Ali", "Aliaga", "Almagro", "Almeida", "Alonso", "Alozie", "Alvarado", "Alvarez", "Ãlvarez", "Alvaro", "Alves", "Amado", "Amador", "Amat", "Amaya", "Amor", "Amores", "Amoros", "Andrade", "Andres", "Andreu", "Andujar", "Anglés", "Angulo", "Antolin", "Anton", "Antón", "Antunez", "Antúnez", "Aparicio", "Aqua", "Aquino", "Aragon", "Arana", "Aranda", "Araujo", "Araújo", "Araullo", "Araya", "Arce", "Arcos", "Arechavaleta", "Arellano", "Arena", "Arenas", "Ares", "Arevalo", "Arias", "Aritza", "Ariza", "Arjona", "Armando", "Armas", "Arnaiz", "Arnau", "Aroca", "Arranz", "Arreola", "Arribas", "Arriola", "Arroyo", "Arteaga", "Asenjo", "Asensio", "Asis", "Asturias", "Atienza", "Avana", "Avila", "Aviles", "Ayala", "Ayuso", "Azarola", "Aznar", "Bachero", "Badia", "Baena", "Baez", "Baeza", "Balaguer", "Ballester", "Ballesteros", "Banderas", "Baños", "Barba", "Barbera", "Barbero", "Barcelo", "Barea", "Barragan", "Barranco", "Barreiro", "Barrera", "Barrero", "Barrientos", "Barrio", "Barrios", "Barros", "Barroso", "Bartolome", "Bastida", "Basurto", "Batista", "Bautista", "Becerra", "Beitia", "Bejarano", "Belda", "Bellido", "Bello", "Belmonte", "Beltran", "Benavente", "Benavides", "Benet", "Bengochea", "Benitez", "Benito", "Berenguer", "Bermejo", "Bermudez", "Bermúdez", "Bernabe", "Bernabeu", "Bernal", "Berrocal", "Bes", "Betancor", "Bezabeh", "Bilbao", "Blanco", "Blanxart", "Blasco", "Blazquez", "Boix", "Bolaños", "BolÃvar", "Bonaventura", "Bonet", "Bonilla", "Borja", "Borras", "Borrego", "Bosch", "Bosque", "Botella", "Bourbon", "Bravo", "Brito", "Búa", "Buendia", "Bueno", "Burgos", "Bustamante", "Bustillo", "Busto", "Bustos", "Caamaño", "Caballero", "Cabanillas", "Cabello", "Cabeza", "Cabezas", "Cabrera", "Caceres", "Cacho", "Calatayud", "Calderon", "Calderón", "Calero", "Calle", "Calleja", "Calvo", "Camacho", "Camara", "Camino", "Campillo", "Campo", "Campos", "Campoy", "Camps", "Cañadas", "Canales", "Cañas", "Candela", "Cañete", "Cañizares", "Cano", "Canovas", "Cantero", "Canto", "Cantos", "Caparros", "Capdevila", "Capellán", "Capello", "Carballo", "Carbonell", "Cardama", "Cardenas", "Cardona", "Carmona", "Caro", "Carpio", "Carranza", "Carrasco", "Carrascosa", "Carreño", "Carrera", "Carreras", "Carrero", "Carretero", "Carrillo", "Carrion", "Carro", "Carvajal", "Casado", "Casal", "Casales", "Casals", "Casanova", "Casas", "Castañeda", "Castaño", "Castell", "Castellano", "Castellanos", "Castello", "Castells", "Castilla", "Castillion", "Castillo", "Castrejana", "Castro", "Catala", "Catalan", "Cazorla", "Ceballos", "Cebrian", "Centeno", "Cerda", "Cerdan", "Cerezo", "Cervantes", "Cervera", "Cespedes", "Chacon", "Chamorro", "Chaparro", "ChavarrÃa", "Chaves", "Chavez", "Checa", "Chen", "Chico", "Chilla", "Cid", "Cienfuegos", "Cifuentes", "Clemente", "Climent", "Cobo", "Cobos", "Coca", "Codina", "Coll", "Collado", "Colomer", "Colón", "Comas", "Conde", "Conesa", "Contreras", "Cordero", "Cordoba", "Cordon", "Cornejo", "Coronado", "Corral", "Corrales", "Correa", "Cortes", "Costa", "Costas", "Crespo", "Criado", "Cristobal", "Cruz", "Cuadrado", "Cubero", "Cuellar", "Cuéllar", "Cuenca", "Cuesta", "Cuevas", "D'Cruz", "D'Cruze", "da Silva", "Da-Silva", "Davila", "de Castro", "de Diego", "de Dios", "de Haro", "de la Cruz", "de La Cruz", "de la Fuente", "de La Fuente", "de la Puente", "de La Rosa", "de La Torre", "de las Heras", "de Leon", "de Los Santos", "de Miguel", "de Santigo", "De-Diego", "De-Dios", "de-La-Cruz", "De-La-Fuente", "de-La-Rosa", "De-La-Torre", "De-Las-Heras", "de-Los-Santos", "del Bosque", "del Campo", "del Castillo", "del Moral", "del Olmo", "del Pino", "del Pozo", "del Rio", "del RÃo", "del Valle", "Del-Rio", "Delgado", "Desoisa", "Diallo", "Diaz", "DÃaz", "Diego", "Dieguez", "Diez", "Domenech", "Domingo", "Dominguez", "DomÃnguez", "Dorado", "dos Santos", "Dos-Santos", "Duarte", "Dueñas", "Duque", "Duran", "Durante", "Echevarria", "EchevarrÃa", "Echeverria", "EcheverrÃa", "Echeverry", "Egea", "Elizondo", "Elorza", "Elvira", "Encinas", "Enriquez", "Erta", "Escamilla", "Escárcega", "Escarrà ", "Esclápez", "Escobar", "Escribano", "Escudero", "Espada", "España", "Esparza", "Espejo", "Espin", "Espina", "Espino", "Espinosa", "Espinoza", "Esteban", "Esteve", "Estevez", "Estévez", "Estrada", "Etxebarria", "Etxeberria", "Exposito", "Fajardo", "Falcon", "Fariña", "Farre", "Feijoo", "Felipe", "Félix", "Fernandez", "Fernández", "Fernndez", "Ferrando", "Ferre", "Ferreira", "Ferreiro", "Ferrer", "Ferrero", "Fidalgo", "Fierro", "Figueras", "Figueroa", "Flores", "Florez", "Folch", "Fonseca", "Font", "Fraga", "Fraile", "Frances", "Francisco", "Franco", "Freire", "Frias", "Frutos", "Fuente", "Fuentes", "Fuertes", "Fuster", "Gabarri", "Gago", "Galan", "Galán", "Galera", "Galiano", "Galindo", "Gallardo", "Gallego", "Gallo", "Galvan", "Galvez", "Gamero", "Gamez", "Garca", "Garces", "Garcia", "GarcÃa", "Garrastazu", "Garrido", "Garriga", "Garza", "Garzon", "Gascon", "Gaspar", "Gay", "Gebara", "Gebre", "Gil", "Gilabert", "Gimenez", "Gimeno", "Giner", "Giraldo", "Giron", "Gisbert", "Godoy", "Gomez", "Gómez", "Gomis", "Goñi", "Gonzales", "Gonzalez", "González", "Gonzalo", "Gordillo", "Gordo", "Gracia", "Granado", "Granados", "Grande", "Grau", "Grec", "Griñó", "Guadarrama", "Guardiola", "Guerra", "Guerrero", "Guevara", "Guijarro", "Guillen", "Guirado", "Guirao", "Guisado", "Gutierrez", "Gutiérrez", "Guzman", "Haro", "Heras", "Heredia", "Hermida", "Hermoso", "Hernandez", "Hernández", "Hernando", "Herraiz", "Herranz", "Herrera", "Herrero", "Herreros", "Hervas", "Hidalgo", "Hierro", "Hinojosa", "Holgado", "HolguÃn", "Hortelano", "Hoyos", "Huerta", "Huertas", "Huisgen", "Hurtado", "Husillos", "Ibañez", "Ibáñez", "Ibarra", "Iborra", "Iglesias", "Infante", "Iniesta", "IñÃguez", "Iturburua", "Izquierdo", "Jaen", "Jaime", "Jainaga", "Jara", "Jaramillo", "Jaso", "Jasso", "Jerez", "Jimenez", "Jiménez", "Jimeno", "Jordà ", "Jordan", "Jorge", "José", "Jover", "Juan", "Juarez", "Juárez", "Julian", "Jurado", "Kaur", "Labrador", "Lacambra", "Lafuente", "Lago", "Laguna", "Lahoz", "Lamas", "Lamela", "Lara", "Latorre", "Lazano", "Lazaro", "Leal", "Ledesma", "Leiva", "Lema", "Leon", "León", "Li", "Lillo", "Lima", "Lin", "Linares", "Liu", "Llamas", "Llanos", "Llopis", "Llorens", "Llorente", "Lloret", "Lobato", "Lobo", "Lopez", "López", "Lora", "Lorente", "Lorenzo", "Losa", "Losada", "Loyola", "Lozano", "Lucas", "Lucena", "Luengo", "Luis", "Lujan", "Luna", "Luque", "Machado", "Macia", "Macias", "MacÃas", "Madrid", "Maestre", "Maldonado", "Mañas", "Manrique", "Mansilla", "Manso", "Manzanares", "Manzano", "Maradona", "Marco", "Marcos", "Mari", "MarÃa", "Marin", "MarÃn", "Marino", "Mariño", "Mariscal", "Maroto", "Marques", "Marquez", "Márquez", "Marrero", "Martell", "Marti", "MartÃ", "Martin", "MartÃn", "Martinez", "MartÃnez", "Martnez", "Martorell", "Martos", "Mas", "Massana", "Mata", "Matas", "Mateo", "Mateos", "Mateu", "Matos", "Maya", "Mayo", "Mayor", "Mayoral", "Maza", "Medina", "Medrano", "Megias", "Mejia", "Mejias", "Melendez", "Melero", "Melgar", "Melian", "Mellado", "Mena", "Mendez", "Méndez", "Mendoza", "Menendez", "Mera", "Mercado", "Merchan", "Merino", "Merlo", "Mesa", "Meseguer", "Mestre", "Michel", "Miguel", "Miguez", "Millan", "Mingo", "Minguez", "Mir", "Mira", "Miralles", "Miranda", "Miro", "Mohamed", "Molero", "Moles", "Molina", "Molinero", "Monge", "Montalvo", "Montaño", "Monteagudo", "Montenegro", "Montero", "Montes", "Montesinos", "Montiel", "Montilla", "Montoro", "Montoya", "Monzon", "Mora", "Moracho", "Moral", "Morales", "Moralez", "Moran", "Morcillo", "Moreira", "Moreno", "Morera", "Morilla", "Morillas", "Morillo", "Moro", "Moron", "Mosquera", "Mota", "Moya", "Moyano", "Muñiz", "Muñoz", "Murcia", "Muriel", "Murillo", "Myers", "Nadal", "Naranjo", "Narvaez", "Narváez", "Navarrete", "Navarro", "Navas", "Neira", "Nevado", "Nicolas", "Nieto", "Nieves", "ÑÃguez", "Nogales", "Noguera", "Noguerra", "Nolet", "Novo", "Novoa", "Nuñez", "Núñez", "Obando", "Ocaña", "Ochoa", "Ojeda", "Ola", "Oleastro", "Olguin", "Oliva", "Olivares", "Oliveira", "Oliver", "Olivera", "Olmedo", "Olmo", "Olmos", "Onyia", "Oquendo", "Ordoñez", "Ordóñez", "Orellana", "Oriol", "Orozco", "Ortega", "Ortiz", "OrtÃz", "Ortuño", "Osorio", "Osuna", "Otero", "Oviedo", "Pacheco", "Padilla", "Padron", "Paez", "Palacio", "Palacios", "Palau", "Palazon", "Palencia", "Pallares", "Palma", "Palomares", "Palomino", "Palomo", "Pancorbo", "Paniagua", "Parada", "Pardo", "Paredes", "Pareja", "Parejo", "Parra", "Parrilla", "Pascual", "Pastor", "Patiño", "Pavia", "Pavon", "Paz", "Pazos", "Pedraza", "Pedrosa", "Peinado", "Peiro", "Pelaez", "Peláez", "Peleteiro", "Pellicer", "Pena", "Peña", "Peñalver", "Peñarrocha", "Peral", "Perales", "Peralta", "Perdomo", "Perea", "Pereira", "Perello", "Perera", "Perez", "Pérez", "Peris", "Pestano", "Petit", "Picasso", "Picazo", "Pico", "Pina", "Pineda", "Piñeiro", "Piñero", "Pinilla", "Pino", "Pinto", "Piqueras", "Pizarro", "Pla", "Planas", "Plasencia", "Plaza", "Polo", "Ponce", "Pons", "Ponsati", "Porcel", "Porra", "Porras", "Portela", "Portillo", "Postigo", "Poveda", "Pozo", "Prada", "Prado", "Prados", "Prat", "Prats", "Prieto", "Puente", "Puerta", "Puertas", "Puerto", "Puga", "Puig", "Pujol", "Pulido", "Quero", "Quesada", "Quevedo", "Quiles", "Quinones", "Quiñones", "Quintana", "Quintero", "Quiroga", "Quiros", "Quirós", "Ramirez", "RamÃrez", "Ramiro", "Ramon", "Ramos", "Rana", "Ravar", "Raya", "Real", "Rebollo", "Recio", "Redondo", "Reig", "Reina", "Rendón", "Requena", "Revilla", "Revuelta", "Rey", "Reyes", "Rial", "Ribas", "Ribera", "Ribes", "Ricart", "Rico", "Riera", "Rincon", "Rio", "Rios", "Ripoll", "Riquelme", "Rivas", "Rivera", "Rivero", "Robledo", "Robles", "Roca", "Rocha", "Rodenas", "Rodrguez", "Rodrigo", "Rodrigues", "Rodriguez", "RodrÃguez", "Rodriquez", "Roig", "Rojas", "Rojo", "Roldan", "Roldán", "Romà ", "Roman", "Romera", "Romero", "Romo", "Roncero", "Ros", "Rosa", "Rosado", "Rosales", "Rosell", "Rosello", "Rovira", "Royo", "Ruano", "Rubio", "Rueda", "Ruiz", "Rus", "Ruz", "Saavedra", "Sabater", "Sacristan", "Saenz", "Saez", "Sainz", "Saiz", "Sala", "Salamanca", "Salas", "Salazar", "Salcedo", "Saldaña", "Sales", "Salgado", "Salguero", "Salinas", "Salmeron", "Salvador", "Sampedro", "Samper", "San Jose", "San Juan", "San Martin", "San Miguel", "San nicolas", "San-Jose", "San-Juan", "San-Martin", "Sanchez", "Sánchez", "Sanchis", "Sancho", "Sandoval", "Sanjuan", "Sanmartin", "Sans", "Santamaria", "Santana", "Santiago", "Santillian", "Santos", "Sanz", "Sarmiento", "Sastre", "Saura", "Sebastian", "Seco", "Segarra", "Segovia", "Segui", "Segura", "Sempere", "Seoane", "Sepulveda", "Sepúlveda", "Serna", "Serra", "Serrano", "Sevilla", "Sevillano", "Sierra", "Silva", "Silvestre", "Simon", "Singh", "Sobrino", "Sola", "Solana", "Solano", "Sole", "Soler", "Solis", "Solo", "Solos", "Soria", "Soriano", "Sosa", "Soto", "Sousa", "Souto", "Suarez", "Suárez", "Suero", "Taboada", "Takács", "Talavera", "Tamayo", "Tapia", "Tejada", "Tejedor", "Tejera", "Tejero", "Tellez", "Tello", "Tena", "Terrazas", "Teruel", "Tirado", "Toledano", "Toledo", "Tomas", "Tomà s", "Tome", "Toribio", "Toro", "Torralba", "Torre", "Torregrosa", "Torrejon", "Torres", "Torrijos", "Tortosa", "Tos", "Tosell", "Toset", "Tovar", "Travieso", "Trigo", "Trillo", "Trujillo", "Tudela", "Ubeda", "Ubina", "Ujakpor", "Urbano", "Urbina", "Ureña", "Uriarte", "Urpi", "Vaca", "Valcarcel", "Valdes", "Valdez", "Valdivia", "Valencia", "Valenzuela", "Valera", "Valero", "Valiente", "Valle", "Vallejo", "Valles", "Valls", "Valverde", "Vaquero", "Varela", "Vargas", "Vasco", "Vasquez", "Vásquez", "Vazquez", "Vázquez", "Vega", "Vegas", "Veiga", "Vela", "Velasco", "Velazquez", "Velez", "Ventura", "Vera", "Verdu", "Verdugo", "Vergara", "Vicario", "Vicente", "Viciosa", "Vico", "Vidal", "Viera", "Vila", "Vilar", "Vilaró", "Vilches", "Vilchez", "Viles", "Villa", "Villalba", "Villalobos", "Villanueva", "Villar", "Villaverde", "Villegas", "Villena", "Viñas", "Viola", "Viteri", "Vivas", "Vives", "Vizcaino", "Wang", "Wu", "Xu", "Yague", "Yañez", "Ybarra", "Ye", "Yuste", "Zabala", "Zafra", "Zambrano", "Zamora", "Zamorano", "Zapata", "Zapatero", "Zaragoza", "Zavala", "Zhang", "Zheng", "Zhou", "Zhu", "Zubizarreta", "Zuñiga", "Zúñiga", "Zurita"];
App.Data.misc.sriLankanSlaveNames = ["Adeline", "Amanthi", "Amara", "Amitha", "Anarkali", "Anitha", "Anjaney", "Anoja", "Anoma", "Anula", "Anusha", "Aruni", "Asuntha", "Athula", "Babi", "Bebi", "Chamali", "Champa", "Champika", "Chandima", "Chandra", "Chandrani", "Chandrika", "Chaturi", "Chitra", "Chitranganie", "Chrishanthi", "Christine", "Clarice", "Clodagh", "Damanyante", "Damayanthi", "Dammayanthi", "Daya", "Deepa", "Deepthi", "Devika", "Dilipa", "Dinakshie", "Doreen", "Elina", "Emma", "Eranga", "Eromi", "Evelyn", "Ferial", "Florence", "Gallage", "Gamya", "Gayanthika", "Gayesha", "Geetha", "Hasarangani", "Hema", "Himali", "Hinni", "Hiruni", "Indra", "Indrani", "Jacqueline", "Janaka", "Jayanadani", "Jayanthi", "Kalyani", "Kamala", "Kamani", "Kanthi", "Keerthilatha", "Kiribaba", "Kiribabi", "Kissan", "Kumari", "Kusala", "Kusum", "Kusuma", "Kusumalatha", "Kuveni", "Lakmini", "Lakshika", "Lakshmi", "Lalitha", "Larine", "Leticia", "Logini", "Lohini", "Lorna", "Lorraine", "Maithili", "Malini", "Malkanthi", "Mallihai", "Mallika", "Manaranjani", "Manel", "Mangalika", "Manisha", "Manjula", "Mano", "Mary", "Mathangi", "Mathy", "Menik", "Mihika", "Mohotti", "Nadeeka", "Nalini", "Nalinika", "Nanda", "Nayana", "Naysum", "Nelun", "Nilanthi", "Nilmini", "Niluka", "Nimala", "Nimali", "Nimalka", "Nireka", "Nirmala", "Nirmalee", "Nirmali", "Nirosha", "Nirupama", "Padma", "Padmini", "Parami", "Pathmini", "Pattini", "Pavithra", "Pedi", "Piyaseeli", "Prasangee", "Prema", "Prita", "Priyadharshani", "Priyangika", "Priyani", "Priyanka", "Priyanthika", "Punya", "Raju", "Ramani", "Ramya", "Ranee", "Ranganayaki", "Rani", "Ranjani", "Rasamanohari", "Renuka", "Rita", "Rizana", "Rohini", "Rosy", "Rozanne", "Rupa", "Rushani", "Sabrina", "Samadara", "Samantha", "Sanghamitta", "Sarasi", "Sarojini", "Seelawathie", "Selvakumai", "Sepalika", "Shalani", "Shantha", "Shanthi", "Sharmila", "Sharmini", "Shirani", "Shiranthi", "Shoba", "Shyama", "Silidi", "Siliidi", "Sinthuja", "Sirima", "Sirimavo", "Sisira", "Sita", "Sithy", "Sivagamie", "Sivagini", "Sobani", "Soida", "Soma", "Somakumari", "Srima", "Sriya", "Sriyani", "Stephanie", "Sudarini", "Sudarshani", "Sugala", "Sujatha", "Sujeewa", "Sumana", "Sumedha", "Sumitha", "Sunethra", "Surangani", "Susanthika", "Susila", "Susilavati", "Swarna", "Thalatha", "Thangeshwari", "Thangeswary", "Thanuja", "Tharika", "Thilaka", "Tilothamaw", "Tounnalina", "Ukkumenike", "Upeksha", "Vairamuthu", "Vajira", "Vanmathi", "Veronica", "Vidu", "Vidula", "Vidusha", "Vijayakala", "Vijitha", "Vimala", "Vino", "Vinoba", "Vithiya", "Vivienne", "Waliwarsha", "Wimala", "Wimalawathi", "Yaso", "Yureni", "Yuvani", "Yvonne"];
App.Data.misc.sriLankanMaleNames = ["Abdul", "Ahmed", "Ajith", "Aloy", "Ananda", "Anil", "Annesley", "Anton", "Anura", "Anuradha", "Anusan", "Arawinda", "Ariyadasa", "Ariyapala", "Ariyaraj", "Ariyaratna", "Ariyasiri", "Arjuna", "Aru", "Arulpragasam", "Arumagam", "Aruna", "Asanka", "Ashane", "Ashok", "Asoka", "Athma", "Athula", "Baba", "Babiya", "Balamugunthan", "Bandara", "Bandula", "Bayya", "Benildus", "Biyanwilage", "Chamika", "Chaminda", "Champika", "Chanaka", "Chandra", "Chandradasa", "Chandrakirti", "Chandraratna", "Chandrasiri", "Charith", "Charmila", "Chathura", "Chatura", "Chinthana", "Chrishantha", "Chrishanthat", "Cyril", "Danuja", "Dasun", "Davith", "Dharma", "Dharmadasa", "Dharmapala", "Dharmaratna", "Dharmasiri", "Dilip", "Dilvan", "Dinesh", "Dingiri", "Disanayaka", "Dishan", "Don", "Dudley", "Eugene", "Gamini", "Gayan", "Gayesh", "Gemunu", "George", "Gihan", "Greshan", "Hammalawa", "Harijan", "Harshan", "Hasitha", "Hemal", "Hetuhamy", "Hetuwa", "Himasha", "Illankeaswaran", "Indika", "Indunil", "Iranga", "Jagath", "Janaka", "Jayantha", "Jebaseelan", "Jegan", "Jehan", "Jeyam", "Jim", "John", "Juniu", "Junius", "Kamal", "Kannan", "Karunadasa", "Kathan", "Kiribaba", "Kithsiri", "Kosala", "Kumar", "Kumara", "Kusumsiri", "Lahiru", "Lakshman", "Lalith", "Lasantha", "Lionel", "Lokukankanamge", "Lucas", "Lucien", "Magedara", "Mahesh", "Mahinda", "Maithripala", "Manjula", "Mantheesh", "Manura", "Mariampillai", "Marvan", "Mavai", "Menika", "Mohamed", "Mohideen", "Muttiah", "Nadeeka", "Nalin", "Narada", "Naradha", "Nayana", "Neelakandan", "Neelan", "Nihal", "Nimal", "Niranjan", "Nissanka", "Noel", "Nuwan", "Oswald", "Owen", "Padman", "Padmasiri", "Palitha", "Pediya", "Philip", "Pina", "Piyadasa", "Pradeep", "Prasad", "Prasanna", "Preethi", "Prem", "Prince", "Priya", "Priyantha", "Pubudu", "Raja", "Ranasinghe", "Ranga", "Ranil", "Ranjit", "Ranjith", "Rasika", "Ratnasiri", "Ravith", "Ray", "Rayan", "Richard", "Rohan", "Roshan", "Rukshan", "Ruwan", "Sadun", "Saleem", "Saman", "Saminda", "Sanath", "Sanjeev", "Sarath", "Sena", "Senaka", "Sepala", "Shamila", "Shanta", "Shanthi", "Shehan", "Shelton", "Shesha", "Shibly", "Shihan", "Shivantha", "Silida", "Siri", "Sirinatha", "Sirisena", "Sirisoma", "Solomon", "Somasiri", "Somasundaram", "Stephen", "Sugath", "Sujeewa", "Sumeda", "Summa", "Sunil", "Supun", "Susantha", "Sydney", "Thanuja", "Thilak", "Thomas", "Tilak", "Tissa", "Uddaka", "Udeni", "Uditha", "Ukkuwa", "Upali", "Upasena", "Upul", "Vasantha", "Vellasamy", "Victor", "Vijitha", "Vinod", "Vinoj", "Walter", "Wasantha", "Wenceslaus", "William", "Wimal", "Yathukulan", "Yupun"];
diff --git a/js/003-data/policiesData.js b/js/003-data/policiesData.js
index 53ff399abb680f386922432192462322f3ad8c3a..0a1b83c17a76b481ac4f84ad1f5dc05288cb91c9 100644
--- a/js/003-data/policiesData.js
+++ b/js/003-data/policiesData.js
@@ -316,12 +316,11 @@ App.Data.Policies.Selection = {
{
title: "Age Of Sexual Appeal",
get text() {
- const el = new DocumentFragment;
- if(V.idealAge === 18) {
- el.append(`many consider the most sexually appealing age to be the old world default of 18. You will use your influence to change the sexual ideal to `);
- }
- else {
- el.append(`many consider the most sexually appealing age to be ${V.idealAge}. You will use your influence to change the sexual ideal to `);
+ const el = new DocumentFragment();
+ if (V.idealAge === 18) {
+ el.append(`many consider the most sexually appealing age to be the old world default of ${num(18)}. You will use your influence to change the sexual ideal to `);
+ } else {
+ el.append(`many consider the most sexually appealing age to be ${num(V.idealAge)}. You will use your influence to change the sexual ideal to `);
}
el.append(
App.UI.DOM.makeElement(
@@ -331,10 +330,10 @@ App.Data.Policies.Selection = {
v => {
let minAge = V.minimumSlaveAge;
let maxAge = V.retirementAge - 1 > 60 ? 60 : V.retirementAge - 1;/* problems do occur if idealAge can be set to over 60 */
- if(V.arcologies[0].FSMaturityPreferentialist !== "unset") {
+ if (V.arcologies[0].FSMaturityPreferentialist !== "unset") {
minAge = 30;
}
- if(V.arcologies[0].FSYouthPreferentialist !== "unset") {
+ if (V.arcologies[0].FSYouthPreferentialist !== "unset") {
maxAge = 29;
}
V.targetIdealAge = Math.clamp(v, minAge, maxAge);
@@ -348,23 +347,22 @@ App.Data.Policies.Selection = {
return el;
},
get activatedText() {
- return `you are using your personal influence to make ${V.targetIdealAge} the most sexually appealing age. The current perceived ideal age is ${V.idealAge}.`;
+ return `you are using your personal influence to make ${num(V.targetIdealAge)} the most sexually appealing age. The current perceived ideal age is ${V.idealAge}.`;
},
- onRepeal: function() {
- if(V.arcologies[0].FSMaturityPreferentialist !== "unset") {
- if(V.idealAge < 30) {
+ onRepeal: function() {
+ if (V.arcologies[0].FSMaturityPreferentialist !== "unset") {
+ if (V.idealAge < 30) {
V.idealAge = 30;
}
V.targetIdealAge = 30;
- }
- else {
- if(V.idealAge >= 30) {
+ } else {
+ if (V.idealAge >= 30) {
V.idealAge = 29;
}
V.targetIdealAge = 18;
}
},
- get note() { return `Will cost ${cashFormat(1500)} weekly until the target age is reached; high reputation will accelerate adoption.`}
+ get note() { return `Will cost ${cashFormat(1500)} weekly until the target age is reached; high reputation will accelerate adoption.`; }
}
],
"arcologies[0].FSEgyptianRevivalistIncestPolicy": [
@@ -790,7 +788,7 @@ App.Data.Policies.Selection = {
{
title: "Redefined Mandatory Retirement Age",
get text() {
- const el = new DocumentFragment;
+ const el = new DocumentFragment();
el.append(`you will set your arcology's standard retirement age for sex slaves at age `);
el.append(
App.UI.DOM.makeElement(
@@ -823,7 +821,7 @@ App.Data.Policies.Selection = {
{
title: "Physical Retirement Age",
get text() {
- const el = new DocumentFragment;
+ const el = new DocumentFragment();
el.append(`you will replace your arcology's standard age-based retirement policy for one retiring sex slaves once their bodies reach age `);
el.append(
App.UI.DOM.makeElement(
@@ -834,7 +832,7 @@ App.Data.Policies.Selection = {
const age = Math.clamp(v, 20, 120);
V.customRetirementAge = age;
V.retirementAge = age;
- if(V.idealAge >= V.retirementAge) {
+ if (V.idealAge >= V.retirementAge) {
V.idealAge = V.retirementAge - 1;
}
App.UI.reload();
@@ -895,7 +893,7 @@ App.Data.Policies.Selection = {
title: "Sexual Milestone Retirement",
get text() { return `slaves will be rewarded with their freedom once they have been fucked ${V.policies.retirement.sex === 0 ? "a set number of" : num(V.policies.retirement.sex)} times.`; },
get activatedText() {
- const el = new DocumentFragment;
+ const el = new DocumentFragment();
let div = document.createElement("div");
el.append(`slaves are rewarded with their freedom once they have been fucked ${num(V.policies.retirement.sex)} times.`);
div.append(`Set a new retirement requirement:`);
@@ -925,7 +923,7 @@ App.Data.Policies.Selection = {
title: "Productive Cow Retirement",
get text() { return `slaves will be rewarded with their freedom once they have given ${V.policies.retirement.milk === 0 ? "a set number of" : num(V.policies.retirement.milk)} liters of milk.`; },
get activatedText() {
- const el = new DocumentFragment;
+ const el = new DocumentFragment();
let div = document.createElement("div");
el.append(`slaves are rewarded with their freedom once they have given ${num(V.policies.retirement.milk)} liters of milk.`);
div.append(`Set a new retirement requirement:`);
@@ -955,7 +953,7 @@ App.Data.Policies.Selection = {
title: "Productive Bull Retirement",
get text() { return `slaves will be rewarded with their freedom once they have given ${V.policies.retirement.cum === 0 ? "a set number of" : num(V.policies.retirement.cum)} deciliters of cum.`; },
get activatedText() {
- const el = new DocumentFragment;
+ const el = new DocumentFragment();
let div = document.createElement("div");
el.append(`slaves are rewarded with their freedom once they have given ${num(V.policies.retirement.cum)} deciliters of cum.`);
div.append(`Set a new retirement requirement:`);
@@ -985,7 +983,7 @@ App.Data.Policies.Selection = {
title: "Fertile Breeder Retirement",
get text() { return `slaves will be rewarded with their freedom once they add ${V.policies.retirement.births === 0 ? "a set number of" : num(V.policies.retirement.births)} new slaves to the population of ${V.arcologies[0].name}.`; },
get activatedText() {
- const el = new DocumentFragment;
+ const el = new DocumentFragment();
let div = document.createElement("div");
el.append(`slaves are rewarded with their freedom once they add ${num(V.policies.retirement.births)} new slaves to the population of ${V.arcologies[0].name}. `);
div.append(`Set a new retirement requirement:`);
@@ -1015,7 +1013,7 @@ App.Data.Policies.Selection = {
title: "Champion Gladiatrix Retirement",
get text() { return `slaves will be rewarded with their freedom once they have killed ${V.policies.retirement.kills === 0 ? "a set number of" : num(V.policies.retirement.kills)} of their fellow slaves in the pit.`; },
get activatedText() {
- const el = new DocumentFragment;
+ const el = new DocumentFragment();
let div = document.createElement("div");
el.append(`slaves are rewarded with their freedom once they have killed ${num(V.policies.retirement.kills)} of their fellow slaves in the pit.`);
div.append(`Set a new retirement requirement:`);
@@ -1045,7 +1043,7 @@ App.Data.Policies.Selection = {
"policies.retirement.menial2Citizen": [
{
get title() {
- const el = new DocumentFragment;
+ const el = new DocumentFragment();
if (V.policies.retirement.menial2Citizen !== 1) {
let div = document.createElement("div");
let span = document.createElement("span");
@@ -1063,7 +1061,7 @@ App.Data.Policies.Selection = {
return el;
},
get text() {
- const el = new DocumentFragment;
+ const el = new DocumentFragment();
el.append(`you will set your arcology's retirement age for menial slaves at age`);
el.append(
App.UI.DOM.makeElement(
@@ -1239,6 +1237,7 @@ App.Data.Policies.Selection = {
V.seeDicks !== 0 &&
V.arcologies[0].FSGenderRadicalist > 60 &&
V.arcologies[0].FSSlimnessEnthusiastLaw === 0 &&
+ V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 0 &&
V.arcologies[0].FSGenderRadicalistLawFuta === 0
);
},
@@ -1584,6 +1583,25 @@ App.Data.Policies.Selection = {
note: `Flat slaves will enjoy increased attractiveness to citizens`
}
],
+ "arcologies[0].FSSlimnessEnthusiastFoodLaw": [
+ {
+ title: "Asset Slimming Food",
+ titleClass: "lime",
+ text: "slave food production will be required to follow a recipe that keeps chattel nice and trim, reducing the growth of disgusting flesh on their T&A.",
+ activatedText: "you have standardized a slave food recipe to keep your chattel nice and trim, reducing the amount of oversized T&A in the arcology.",
+ get requirements() {
+ return (
+ V.arcologies[0].FSGenderRadicalistLawBeauty === 0 &&
+ V.arcologies[0].FSGenderFundamentalistLawBeauty === 0 &&
+ V.arcologies[0].FSGenderRadicalistLawFuta !== 3 &&
+ V.arcologies[0].FSHedonisticDecadenceLaw2 === 0 &&
+ V.arcologies[0].FSPhysicalIdealistLaw === 0 &&
+ V.arcologies[0].FSSlimnessEnthusiast > 20
+ );
+ },
+ note: `Slaves will struggle to grow beyond the ideal amount of T&A. `
+ }
+ ],
},
FSAssetExpansionist: {
"arcologies[0].FSAssetExpansionistSMR": [
@@ -1695,6 +1713,7 @@ App.Data.Policies.Selection = {
get requirements() {
return (
V.arcologies[0].FSSlimnessEnthusiastLaw === 0 &&
+ V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 0 &&
V.arcologies[0].FSGenderRadicalistLawBeauty === 0 &&
V.arcologies[0].FSGenderFundamentalistLawBeauty === 0 &&
V.arcologies[0].FSPhysicalIdealistLaw === 0 &&
@@ -1747,6 +1766,16 @@ App.Data.Policies.Selection = {
note: `Will increase your renown`
}
],
+ "arcologies[0].FSChattelReligionistLaw2": [
+ {
+ title: "Holy Nudism",
+ titleClass: "lime",
+ text: "religious clothing standards will shift from modesty to exposure.",
+ activatedText: "religious clothing standards emphasize exposure rather than modesty.",
+ get requirements() { return (V.arcologies[0].FSChattelReligionist >= 60); },
+ note: `Along with nudity, certain revealing clothing, including the chattel habit, will remain acceptable attire.`
+ }
+ ],
"arcologies[0].FSChattelReligionistCreed": [
{
title: "Chattel Religionist Creed",
diff --git a/js/003-data/slaveBody.js b/js/003-data/slaveBody.js
index 951fdced4045256fef715924a736c935cee6398d..7739c26772281023fe09101af8746e3810d0baf0 100644
--- a/js/003-data/slaveBody.js
+++ b/js/003-data/slaveBody.js
@@ -128,3 +128,5 @@ App.Data.Slave.Ears = {
normal: {title: ""},
...App.Data.Slave.FancyEars
};
+
+App.Data.Slave.Races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"];
diff --git a/js/003-data/slaveGeneData.js b/js/003-data/slaveGeneData.js
index e642acf3c0b6119d8806521846e769c9d21bbc92..5107f065446b0ee68cd33d441c9f1bec2dbad085 100644
--- a/js/003-data/slaveGeneData.js
+++ b/js/003-data/slaveGeneData.js
@@ -7,7 +7,7 @@
* @property {boolean} [requirements]
* @property {boolean} [pubertyActivated]
*/
-/** @type {Map.<FC.GeneticQuirks|string, geneData>} */
+/** @type {Map.<keyof FC.GeneticQuirks, geneData>} */
App.Data.geneticQuirks = new Map([
["albinism",
{
diff --git a/js/003-data/slaveMods.js b/js/003-data/slaveMods.js
index a07bac2d4e89f34d6d5fe634d7891e17275c8016..327fab5f61edac8350c6416c55d1f8a8a7dbf772 100644
--- a/js/003-data/slaveMods.js
+++ b/js/003-data/slaveMods.js
@@ -200,6 +200,7 @@ App.Medicine.Modification.Brands = {
App.Medicine.Modification.Color = {
Primary: [
+ {value: "amber"},
{value: "auburn"},
{value: "black"},
{value: "blazing red"},
@@ -505,7 +506,7 @@ App.Medicine.Modification.faceShape = new Map([
desc: `faces are moderately bad for attractiveness`
}],
["masculine", {
- desc: ``,
+ // TODO desc: ``,
get requirements() { return V.seeDicks !== 0; }
}]
]);
@@ -514,7 +515,7 @@ App.Medicine.Modification.teeth = new Map([
get desc() {
return App.UI.DOM.combineNodes(
`teeth have a minor positive impact on, `,
- App.Encyclopedia.Dialog.linkDOM("attractiveness", "Slave Score (Attractiveness)"),
+ App.Encyclopedia.link("attractiveness", "Slave Score (Attractiveness)"),
`.`
);
}
@@ -529,7 +530,7 @@ App.Medicine.Modification.teeth = new Map([
desc: `have a negative impact on attractiveness, but less than crooked teeth, and will eventually straighten the slave's teeth. They can be applied to straight teeth or left on after they are no longer useful, if desired.`
}],
["cosmetic braces", {
- desc: ``
+ // TODO desc: ``
}],
["removable", {
desc: `teeth can pass as normal teeth and thus have no attractiveness impact, but do alter some sex scenes.`,
@@ -539,7 +540,7 @@ App.Medicine.Modification.teeth = new Map([
get desc() {
return App.UI.DOM.combineNodes(
`teeth have a minor negative impact on attractiveness, but are intimidating, offering slight improvements to combat effectiveness and performance as a `,
- App.Encyclopedia.Dialog.linkDOM("Bodyguard", "Bodyguard"),
+ App.Encyclopedia.link("Bodyguard"),
`.`
);
},
@@ -547,18 +548,18 @@ App.Medicine.Modification.teeth = new Map([
sharp: true
}],
["fangs", {
- desc: ``,
+ // TODO desc: ``,
sharp: true
}],
["fang", {
- desc: ``,
+ // TODO desc: ``,
sharp: true
}],
["baby", {
- desc: ``,
+ // TODO desc: ``,
}],
["mixed", {
- desc: ``,
+ // TODO desc: ``,
}],
]);
/**
diff --git a/js/003-data/slaveSummaryData.js b/js/003-data/slaveSummaryData.js
index 465f67c7e32e73fd66cb580fb3be8a91025f811f..3af5ee6c550f3574b350fdbe35c864a2f716781a 100644
--- a/js/003-data/slaveSummaryData.js
+++ b/js/003-data/slaveSummaryData.js
@@ -301,6 +301,11 @@ App.Data.SlaveSummary = {
95: "Pregnancy kink",
100: "Pregnancy fetish"
},
+ "bestiality": {
+ 60: "Interest in bestiality",
+ 95: "Bestiality kink",
+ 100: "Bestiality fetish"
+ },
"none": "Sexually vanilla"
},
clothes: {
@@ -620,7 +625,13 @@ App.Data.SlaveSummary = {
999: {desc: "Masterful whore", style: "skill"}
},
mss: {desc: "Masterful sex slave.", style: "skill"},
- fighter: {desc: "Trained fighter.", style: "skill"},
+ combat: {
+ 10: null,
+ 30: {desc: "Basic fighter", style: "skill"},
+ 60: {desc: "Skilled fighter", style: "skill"},
+ 99: {desc: "Expert fighter", style: "skill"},
+ 999: {desc: "Masterful fighter", style: "skill"}
+ },
},
sexDrive: {
XX: {
@@ -1398,7 +1409,13 @@ App.Data.SlaveSummary = {
999: {desc: "W+++", style: "skill"}
},
mss: {desc: "MSS", style: "skill"},
- fighter: {desc: "C", style: "skill"},
+ combat: {
+ 10: null,
+ 30: {desc: "C", style: "skill"},
+ 60: {desc: "C+", style: "skill"},
+ 99: {desc: "C++", style: "skill"},
+ 999: {desc: "C+++", style: "skill"}
+ },
},
sexDrive: {
XX: {
diff --git a/js/003-data/startingGirlsData.js b/js/003-data/startingGirlsData.js
index 191c4b51c66eb42f2af79b44bb78ac2d8e8e1aa4..52dfe784c1d6a0d953d6e449a73e432bc93b059c 100644
--- a/js/003-data/startingGirlsData.js
+++ b/js/003-data/startingGirlsData.js
@@ -98,7 +98,7 @@ App.Data.StartingGirls = {
{name: "Basic", value: 15, max: 30},
{name: "Skilled", value: 35, max: 60},
{name: "Expert", value: 65, max: 998},
- {name: "Masterful", value: 999, max: 999},
+ {name: "Masterful", value: 100, max: 999},
],
devotion: [
{name: "Utterly hateful", value: -100, max: -95},
diff --git a/js/004-base/SurgeryEffect.js b/js/004-base/SurgeryEffect.js
index 09f00ffed574342f67adbec075d061c8d566c135..9514c65ca566d66b0a98477a3c38fa782efa0476 100644
--- a/js/004-base/SurgeryEffect.js
+++ b/js/004-base/SurgeryEffect.js
@@ -13,7 +13,7 @@ App.Medicine.Surgery.SimpleReaction = class {
* @param {App.Entity.SlaveState} slave
* @returns {boolean}
*/
- _hasEmotion(slave) { return slave.fetish !== "mindbroken" && slave.fuckdoll === 0; }
+ _hasEmotion(slave) { return slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0; }
/**
* @param {App.Entity.SlaveState} slave
diff --git a/js/medicine/surgery/addGenitals/addBalls.js b/js/medicine/surgery/addGenitals/addBalls.js
index 38de3f74001ff654551e16b428831a0592707f89..bac137551fd273432a77547b7df4ccd3b1a14051 100644
--- a/js/medicine/surgery/addGenitals/addBalls.js
+++ b/js/medicine/surgery/addGenitals/addBalls.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.AddBalls = class extends App.Medicine.Surgery.Sim
const {He, he, His, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} lies back in the surgical chair${(canSee(slave)) ? `, gazing at ${himself} in the ceiling mirror` : ``} as the fog of anesthetics lifts and feeling returns to ${his} lower half. ${His} new testicles are small, and ${his} scrotum is scarcely visible under ${his} dick, but its impact becomes immediately clear. ${He} slowly achieves an excruciatingly painful erection, panting with the pain as ${his} very sore member becomes hard. The terrible overstimulation brings a spurt of cum jetting out of ${his} cockhead. As the agony melts away, ${he} struggles to understand what just happened. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} lies back in the surgical chair${(canSee(slave)) ? `, gazing at ${himself} in the ceiling mirror` : ``} as the fog of anesthetics lifts and feeling returns to ${his} lower half. As a devoted slave, ${he} knew the essentials of the surgery before it was performed, so ${he}'s excited to`);
@@ -51,7 +51,7 @@ App.Medicine.Surgery.Reactions.AddAnimalBalls = class extends App.Medicine.Surge
// TODO: This will require a rewrite
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} lies back in the surgical chair${(canSee(slave)) ? `, gazing at ${himself} in the ceiling mirror` : ``} as the fog of anesthetics lifts and feeling returns to ${his} lower half. ${His} new testicles are small, and ${his} scrotum is scarcely visible under ${his} dick, but its impact becomes immediately clear. ${He} slowly achieves an excruciatingly painful erection, panting with the pain as ${his} very sore member becomes hard. The terrible overstimulation brings a spurt of cum jetting out of ${his} cockhead. As the agony melts away, ${he} struggles to understand what just happened. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} lies back in the surgical chair${(canSee(slave)) ? `, gazing at ${himself} in the ceiling mirror` : ``} as the fog of anesthetics lifts and feeling returns to ${his} lower half. As a devoted slave, ${he} knew the essentials of the surgery before it was performed, so ${he}'s excited to`);
diff --git a/js/medicine/surgery/addGenitals/addDick.js b/js/medicine/surgery/addGenitals/addDick.js
index 99c650bfa49862b75e41579ca444faa5f8e7ff92..90766f3f02fbfbb54f4e86992a19d2fef7e21ff2 100644
--- a/js/medicine/surgery/addGenitals/addDick.js
+++ b/js/medicine/surgery/addGenitals/addDick.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.AddDick = class extends App.Medicine.Surgery.Simp
const {He, he, His, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`The surgery is invasive, and ${he} spends some time in the autosurgery, slowly recovering. As feeling slowly returns to the lower half of ${his} body and ${his} thoughts coalesce against the dissipating fog of surgical pharmacology, ${he} strains to focus on ${his} groin${(canSee(slave)) ? `, visible in a ceiling mirror above ${him}` : ``}. ${His} eyes open wide as ${he} takes in the new member between ${his} legs. Suddenly, it twitches for the first time. The mixed pain of the terribly sore area and pleasure of new sensations floods ${him}, and ${he} jerks against the surgical restraints, gasping for breath. <span class="health dec">${his} health has been severely affected</span> by the intrusive surgery.`);
} else if (slave.devotion > 50) {
r.push(`The surgery is invasive, and ${he} spends some time in the autosurgery, slowly recovering. As feeling slowly returns to the lower half of ${his} body and ${his} thoughts coalesce against the dissipating fog of surgical pharmacology, ${he} strains to focus on ${his} groin${(canSee(slave)) ? `, visible in a ceiling mirror above ${him}` : ``}. As a devoted slave, ${he} knew the essentials of the surgery before it was performed, so ${he}'s excited to`);
diff --git a/js/medicine/surgery/addGenitals/addForeskin.js b/js/medicine/surgery/addGenitals/addForeskin.js
index 3e1ce57ed1ecdfb90072a7bda6e17c90d915b680..c0c4efa342ac35dde3c0d2146769c7fe19a5c2dc 100644
--- a/js/medicine/surgery/addGenitals/addForeskin.js
+++ b/js/medicine/surgery/addGenitals/addForeskin.js
@@ -6,7 +6,7 @@ App.Medicine.Surgery.Reactions.AddForeskin = class extends App.Medicine.Surgery.
if (slave.dick > 0) {
r.push(`${He} leaves the surgery gingerly, knowing ${he}'s had surgery on ${his} dick. Taking the first opportunity to check out ${his} member${(canSee(slave)) ? ` in a mirror` : ``}, ${he}'s`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`confused to find nothing has really changed.`);
} else if (slave.devotion > 50) {
r.push(`titillated to find that ${he} has a foreskin. ${He} examines it`);
@@ -29,7 +29,7 @@ App.Medicine.Surgery.Reactions.AddForeskin = class extends App.Medicine.Surgery.
}
} else {
r.push(`${He} leaves the surgery gingerly, knowing ${he}'s had surgery on ${his} genitals. Taking the first opportunity to check out ${his} crotch${(canSee(slave)) ? ` in a mirror` : ``}, ${he}'s`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`confused to find that ${his} clitoris is missing.`);
} else if (slave.devotion > 50) {
r.push(`titillated to find that ${his} clitoris has a hood. ${He} examines it`);
diff --git a/js/medicine/surgery/addGenitals/addOvaries.js b/js/medicine/surgery/addGenitals/addOvaries.js
index 422ec48d81713c0a4a862006546d854726bd188a..21bd232e743d4f716cda270e80f190ba592392c8 100644
--- a/js/medicine/surgery/addGenitals/addOvaries.js
+++ b/js/medicine/surgery/addGenitals/addOvaries.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.AddOvaries = class extends App.Medicine.Surgery.S
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen, but lacks the mental faculties to realize that ${he} now has a chance to get pregnant. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (this._strongKnownFetish(slave, "pregnancy") || slave.origin === "$He sold $himself to you in the hope of someday bearing children.") {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen, but ${he} has managed to catch enough slave rumors about what the organ farm can do to know that it means ${he} now has a chance to get pregnant. ${He} is filled with joy whenever ${he} thinks about the fact that feeling a life growing within ${him} is now, at last, a possibility. ${He} now places <span class="trust inc">total faith</span> in your plans for ${his} body and <span class="devotion inc">adores you</span> for giving ${him} a gift ${he} once thought impossible. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
@@ -34,7 +34,7 @@ App.Medicine.Surgery.Reactions.AddAnimalOvaries = class extends App.Medicine.Sur
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen, but lacks the mental faculties to realize that ${he} now has a chance of carrying an animal baby to term. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (this._strongKnownFetish(slave, "pregnancy") || slave.origin === "$He sold $himself to you in the hope of someday bearing children.") {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen, but ${he} has managed to catch enough slave rumors about what the organ farm can do to know that it means ${he} now has a chance to get pregnant. ${He} is filled with joy whenever ${he} thinks about the fact that feeling a life growing within ${him} is now, at last, a possibility. ${He} now places <span class="trust inc">total faith</span> in your plans for ${his} body and <span class="devotion inc">adores you</span> for giving ${him} a gift ${he} once thought impossible. ${He} doesn't realize exactly what the surgery entailed, however — the happiness ${he} felt at first will most likely be replaced with horror once ${he} realizes the babies in ${his} womb are not human. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
diff --git a/js/medicine/surgery/addGenitals/addScrotum.js b/js/medicine/surgery/addGenitals/addScrotum.js
index 2e94ef1ead3c0675da96191a22f2e8a5a7be5567..4c8a35791c44d1bd39cf4b098400b62d13b7f91d 100644
--- a/js/medicine/surgery/addGenitals/addScrotum.js
+++ b/js/medicine/surgery/addGenitals/addScrotum.js
@@ -11,7 +11,7 @@ App.Medicine.Surgery.Reactions.AddScrotum = class extends App.Medicine.Surgery.S
r.push(`feel ${his} crotch,`);
}
r.push(`${he}'s`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`confused to find something new dangling there.`);
} else if (slave.devotion > 50) {
r.push(`overjoyed to find that ${he} has a ballsack. ${He} very obviously starts to think about how it will affect ${his} various functions as a sex slave. First, ${he} flexes ${his} Kegel muscles,`);
diff --git a/js/medicine/surgery/addGenitals/addTesticles.js b/js/medicine/surgery/addGenitals/addTesticles.js
index 19c5e482bb01385a5087c0c48092934d24012141..106b49d65f6fcd42da77fb710710f7929087a674 100644
--- a/js/medicine/surgery/addGenitals/addTesticles.js
+++ b/js/medicine/surgery/addGenitals/addTesticles.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.AddTesticles = class extends App.Medicine.Surgery
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`It's not immediately apparent to ${him} what kind of surgery ${he} received, since all ${he}'s left with is a nonspecific ache in ${his} abdomen. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} lies back in the surgical chair${(canSee(slave)) ? `, gazing at ${himself} in the ceiling mirror` : ``} as the fog of anesthetics lifts and feeling returns to ${his} lower half. As a devoted slave, ${he} knew the essentials of the surgery before it was performed, so ${he}'s excited to`);
diff --git a/js/medicine/surgery/addGenitals/asexualReproOvaries.js b/js/medicine/surgery/addGenitals/asexualReproOvaries.js
index b8b567b20fe63b55e0e0b951734b361825e0cf4c..8822dd22f24cc51bb30f2a0f9b1cbc26fec4b054 100644
--- a/js/medicine/surgery/addGenitals/asexualReproOvaries.js
+++ b/js/medicine/surgery/addGenitals/asexualReproOvaries.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.AsexualReproOvaries = class extends App.Medicine.
const {He, he, his, him, girl} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen, but lacks the mental faculties to realize that ${he} is now self-impregnating. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen, but ${he} has managed to catch enough slave rumors about what the organ farm can do to suspect that something has critically changed about ${his} reproductive system. ${He} is <span class="trust inc">pleased</span> that you would go out of your way to alter ${his} body, and is more willing than ever to <span class="devotion inc">submit to your plans</span> for ${his} future. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
diff --git a/js/medicine/surgery/addGenitals/mpreg.js b/js/medicine/surgery/addGenitals/mpreg.js
index acd212db7563da704be9afbe10163a41da5ea0aa..e21ed5e80ad0f5ca453d6df15f77aee4718e4296 100644
--- a/js/medicine/surgery/addGenitals/mpreg.js
+++ b/js/medicine/surgery/addGenitals/mpreg.js
@@ -5,7 +5,7 @@ App.Medicine.Surgery.Reactions.AddMPreg = class extends App.Medicine.Surgery.Sim
const r = [];
r.push(`${He} leaves the surgery with a certain fullness in ${his} lower abdomen, ${he} knows that, despite lacking female reproductive organs, ${he} can now become pregnant.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (this._strongKnownFetish(slave, "pregnancy")) {
r.push(`${He} is <span class="devotion inc"> filled with joy</span> about the possibility of becoming pregnant and gleefully rubs ${his} softer belly. ${He}'s so pleased that ${he} now <span class="trust inc">trusts</span> your plans for ${his} body. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
diff --git a/js/medicine/surgery/assets/boobs.js b/js/medicine/surgery/assets/boobs.js
index 99334fa8546ad43459c71beb6c5d40bfd2d12cca..6dfa0e16b0add087329e4a1c53bcce6626fc642b 100644
--- a/js/medicine/surgery/assets/boobs.js
+++ b/js/medicine/surgery/assets/boobs.js
@@ -23,7 +23,7 @@ App.Medicine.Surgery.Reactions.BoobsGain = class extends App.Medicine.Surgery.Si
}
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows little reaction to the new weight on ${his} chest. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 20 && this._strongKnownFetish(slave, "boobs")) {
if (hasAnyArms(slave)) {
@@ -98,7 +98,7 @@ App.Medicine.Surgery.Reactions.BoobsLoss = class extends App.Medicine.Surgery.Si
r.push(`With the removal of ${his} load bearing implants, <span class="orange">${his} breasts are left deflated and sagging.</span>`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows little awareness that ${his} breasts are smaller. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
if (hasAnyArms(slave)) {
diff --git a/js/medicine/surgery/assets/breastLift.js b/js/medicine/surgery/assets/breastLift.js
index 0a70e7a41d00f708d48cb227600c55d1d6b03aa1..e4bf8e4ab7fdfb06f815276a1798284c1dadc4bf 100644
--- a/js/medicine/surgery/assets/breastLift.js
+++ b/js/medicine/surgery/assets/breastLift.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.BreastLift = class extends App.Medicine.Surgery.S
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`The changes to ${his} breasts are lost on ${him}. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 20 && this._strongKnownFetish(slave, "boobs")) {
if (hasAnyArms(slave)) {
diff --git a/js/medicine/surgery/assets/breastReconstruction.js b/js/medicine/surgery/assets/breastReconstruction.js
index 5a3ff7a337da0974d2b29beaebaa94edacab2c40..fb4462a50ec304f4376a3858a46d14f27adc8de2 100644
--- a/js/medicine/surgery/assets/breastReconstruction.js
+++ b/js/medicine/surgery/assets/breastReconstruction.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.BreastReconstruction = class extends App.Medicine
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`The changes to ${his} breasts are lost on ${him}. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 20 && this._strongKnownFetish(slave, "boobs")) {
if (hasAnyArms(slave)) {
diff --git a/js/medicine/surgery/assets/breastShapePreservation.js b/js/medicine/surgery/assets/breastShapePreservation.js
index 88a08430c494dfce7f4885733553a1e8dff8ed59..8b3f7e0eaab63efc85f363e227ad5b6126007cea 100644
--- a/js/medicine/surgery/assets/breastShapePreservation.js
+++ b/js/medicine/surgery/assets/breastShapePreservation.js
@@ -60,7 +60,7 @@ App.Medicine.Surgery.Reactions.BreastShapePreservationFailure = class extends Ap
r.push(`${slave.slaveName}'s mesh implantation <span class="health dec">has gone wrong, resulting in a mastectomy!</span>`);
if (slave.boobs >= 7000) {
areolaeAndNipples();
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`As with all invasive surgery <span class="health dec">${his} health has been affected.</span>`);
} else if (slave.sexualFlaw === "breast growth") {
if (canSee(slave)) {
@@ -125,7 +125,7 @@ App.Medicine.Surgery.Reactions.BreastShapePreservationFailure = class extends Ap
}
} else {
areolaeAndNipples();
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`As with all invasive surgery <span class="health dec">${his} health has been affected.</span>`);
} else if (slave.sexualFlaw === "breast growth") {
if (canSee(slave)) {
diff --git a/js/medicine/surgery/assets/butt.js b/js/medicine/surgery/assets/butt.js
index bb850556814b2b9c3d10430975c7dc734582f6b4..4fe495f21a486329c6f3a092a5ad8fee1b79bdbc 100644
--- a/js/medicine/surgery/assets/butt.js
+++ b/js/medicine/surgery/assets/butt.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.ButtGain = class extends App.Medicine.Surgery.Sim
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} doesn't notice that ${his} butt has gotten larger. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 20 && this._strongKnownFetish(slave, "buttslut")) {
r.push(`${He} gently flexes ${his} sore buttocks with a sigh of pleasure. ${He}'s <span class="devotion inc">deliriously happy</span> to have a bigger butt, since ${he} confidently expects that this will mean more cocks being shoved up ${his} asshole. ${He}'s so pleased that ${he} now <span class="trust inc">trusts</span> your plans for ${his} body. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
@@ -42,7 +42,7 @@ App.Medicine.Surgery.Reactions.ButtLoss = class extends App.Medicine.Surgery.Sim
const {He, he, his, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} doesn't notice that ${his} butt has gotten smaller. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He}`);
diff --git a/js/medicine/surgery/assets/fatGraft.js b/js/medicine/surgery/assets/fatGraft.js
index c43e27e5a2c199402954fe815c0bf070102a3e0b..0686c587788e5cc00b42265dbcd01d7f462e7bb7 100644
--- a/js/medicine/surgery/assets/fatGraft.js
+++ b/js/medicine/surgery/assets/fatGraft.js
@@ -14,7 +14,7 @@ App.Medicine.Surgery.Reactions.FatGraft = class extends App.Medicine.Surgery.Sim
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} notices that ${his} weight is slightly off, almost as if it were someplace else. As with all surgeries, <span class="health dec">${his} health has been affected.</span>`);
} else if (slave.behavioralFlaw === "anorexic") {
if (canSee(slave)) {
diff --git a/js/medicine/surgery/assets/mastectomy.js b/js/medicine/surgery/assets/mastectomy.js
index c0e53321d4a1ad8842fa371ad7c7f2cf92ce2bbd..f8e9d6adb556355c7a7324fe0f2d80eb92dc47cb 100644
--- a/js/medicine/surgery/assets/mastectomy.js
+++ b/js/medicine/surgery/assets/mastectomy.js
@@ -36,7 +36,7 @@ App.Medicine.Surgery.Reactions.Mastectomy = class extends App.Medicine.Surgery.S
_normalMastectomy(slave, r, reaction) {
const {He, he, His, his, him, himself} = getPronouns(slave);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows little awareness that ${his} breasts are gone. As with all invasive surgery <span class="health dec">${his} health has been affected.</span>`);
} else if (slave.sexualFlaw === "breast growth") {
if (canSee(slave)) {
@@ -128,7 +128,7 @@ App.Medicine.Surgery.Reactions.Mastectomy = class extends App.Medicine.Surgery.S
_largeMastectomy(slave, r, reaction) {
const {He, he, His, his, him, himself} = getPronouns(slave);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows little awareness that ${his} breasts are gone, despite such a massive change. As with all invasive surgery <span class="health dec">${his} health has been affected.</span>`);
} else if (slave.sexualFlaw === "breast growth") {
if (canSee(slave)) {
diff --git a/js/medicine/surgery/belly/bellyDown.js b/js/medicine/surgery/belly/bellyDown.js
index 9dfc11b5f1c478a5c2bc2fcec01707f15b461d90..b3e33d9c431fff25848910425053f3392d999052 100644
--- a/js/medicine/surgery/belly/bellyDown.js
+++ b/js/medicine/surgery/belly/bellyDown.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.BellyDown = class extends App.Medicine.Surgery.Si
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (canSee(slave)) {
r.push(`${He} eyes ${his} lighter belly with appreciation.`);
} else {
diff --git a/js/medicine/surgery/belly/bellyIn.js b/js/medicine/surgery/belly/bellyIn.js
index 8f9dcc6f85020e43972baf478e9187433c74238a..f6f03123d30850b55bb5fa0d0fddb0dcdee26749 100644
--- a/js/medicine/surgery/belly/bellyIn.js
+++ b/js/medicine/surgery/belly/bellyIn.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.BellyIn = class extends App.Medicine.Surgery.Simp
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen that ${he} cannot figure out the source of. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen, and as such, knows you put something into ${his} womb. ${He} is <span class="devotion inc">curious</span> about the details of the implant, and eagerly awaits to see the end result. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
diff --git a/js/medicine/surgery/belly/bellyInMale.js b/js/medicine/surgery/belly/bellyInMale.js
index 7c19701036bf025b771450215c101f8e06739e11..d34217a3f8a75a2e27c4075cbcc27115a78f89ce 100644
--- a/js/medicine/surgery/belly/bellyInMale.js
+++ b/js/medicine/surgery/belly/bellyInMale.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.BellyInMale = class extends App.Medicine.Surgery.
const {He, he, his} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen that ${he} cannot figure out the source of. As ${his} surgery was very invasive <span class="health dec">${his} health has been greatly impacted.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen, and as such, knows you put something into ${his} body. ${He} is <span class="devotion inc">curious</span> about the details of the implant, and eagerly awaits to see the end result. As ${his} surgery was very invasive <span class="health dec">${his} health has been greatly impacted.</span>`);
diff --git a/js/medicine/surgery/belly/bellyUp.js b/js/medicine/surgery/belly/bellyUp.js
index 5ce01529a504787f392ecd7af128ef40b384b96c..00045b41e3e8bbea76f356eb28b4795700ff913b 100644
--- a/js/medicine/surgery/belly/bellyUp.js
+++ b/js/medicine/surgery/belly/bellyUp.js
@@ -9,7 +9,7 @@ App.Medicine.Surgery.Reactions.BellyUp = class extends App.Medicine.Surgery.Simp
r.push(`${His} bellybutton has become an outie from the size of the implant within ${him}.`);
}
if (slave.bellyPain === 1) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (canSee(slave)) {
r.push(`${He} eyes ${his} expanded belly`);
} else {
@@ -61,7 +61,7 @@ App.Medicine.Surgery.Reactions.BellyUp = class extends App.Medicine.Surgery.Simp
reaction.devotion -= 5;
}
} else if (slave.bellyPain === 2) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (canSee(slave)) {
r.push(`${He} eyes ${his} painfully expanded belly`);
} else {
diff --git a/js/medicine/surgery/belly/cervixPump.js b/js/medicine/surgery/belly/cervixPump.js
index a037f016823e26000bc308f2cb72db555ea6013e..558beec924124f617b3d0dc01a29a8e356c8ebfe 100644
--- a/js/medicine/surgery/belly/cervixPump.js
+++ b/js/medicine/surgery/belly/cervixPump.js
@@ -7,7 +7,7 @@ App.Medicine.Surgery.Reactions.CervixPump = class extends App.Medicine.Surgery.S
const cervixPumpAcheLocation = "vagina";
const cervixPumpLocation = "cervix";
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen and ${cervixPumpAcheLocation} that ${he} cannot figure out the source of. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen and ${cervixPumpAcheLocation}, and as such, knows you put something into ${his} ${cervixPumpLocation}. ${He} is <span class="devotion inc">curious</span> about the details of the implant, and eagerly awaits to see the end result. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
diff --git a/js/medicine/surgery/belly/cervixPumpAnus.js b/js/medicine/surgery/belly/cervixPumpAnus.js
index 9638d823ac2af2ba895e14c7639f86f0748170af..59a81b76af854fd04b8cbb0b69c77de49ccbce2e 100644
--- a/js/medicine/surgery/belly/cervixPumpAnus.js
+++ b/js/medicine/surgery/belly/cervixPumpAnus.js
@@ -9,7 +9,7 @@ App.Medicine.Surgery.Reactions.CervixPumpAnus = class extends App.Medicine.Surge
const cervixPumpAcheLocation = "anus";
const cervixPumpLocation = "rectum";
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen and ${cervixPumpAcheLocation} that ${he} cannot figure out the source of. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen and ${cervixPumpAcheLocation}, and as such, knows you put something into ${his} ${cervixPumpLocation}. ${He} is <span class="devotion inc">curious</span> about the details of the implant, and eagerly awaits to see the end result. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
diff --git a/js/medicine/surgery/belly/tummyTuck.js b/js/medicine/surgery/belly/tummyTuck.js
index 3369d4606a66b6f009cf156e1733b55f62a90930..73d9461495934f68430fed95225c0b4c44bf1666 100644
--- a/js/medicine/surgery/belly/tummyTuck.js
+++ b/js/medicine/surgery/belly/tummyTuck.js
@@ -5,7 +5,7 @@ App.Medicine.Surgery.Reactions.TummyTuck = class extends App.Medicine.Surgery.Si
const r = [];
r.push(`${He} leaves the surgery with a soreness on ${his} lower abdomen,`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`and finds ${his} belly isn't so saggy anymore. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else {
r.push(`and is <span class="devotion inc">pleased</span> to find it's no longer saggy. ${He}'s happy that ${he}'ll be able to show off ${his}`);
diff --git a/js/medicine/surgery/ears/earGone.js b/js/medicine/surgery/ears/earGone.js
index ed58e1b2c7bcbacd69d427e2e1b6d091808f7624..9b2dec69bb1d165df58b198caf5825e82f966b83 100644
--- a/js/medicine/surgery/ears/earGone.js
+++ b/js/medicine/surgery/ears/earGone.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.EarGone = class extends App.Medicine.Surgery.Simp
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows little reaction to ${his} altered ears. Since the surgery was fairly invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} is horrified that you would disfigure ${him} but ultimately accepts it since ${he} is devoted to you. Since the surgery was fairly invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
diff --git a/js/medicine/surgery/ears/earMajor.js b/js/medicine/surgery/ears/earMajor.js
index 77f1ef0b838ef4db180f51819cea1c9cc7e4d655..6b0cfa154900209a428fa6321b6ef1a63cfb5059 100644
--- a/js/medicine/surgery/ears/earMajor.js
+++ b/js/medicine/surgery/ears/earMajor.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.EarMajor = class extends App.Medicine.Surgery.Sim
const {He, he, His, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows little reaction to ${his} altered ears. Since the surgery was fairly invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.devotion > 50) {
if (canSee(slave)) {
diff --git a/js/medicine/surgery/ears/earMinor.js b/js/medicine/surgery/ears/earMinor.js
index 82fd884d5cdce7fc2279160e1847287df6d1d313..529507774d213367ebd63c291e412c5eb06e2385 100644
--- a/js/medicine/surgery/ears/earMinor.js
+++ b/js/medicine/surgery/ears/earMinor.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.EarMinor = class extends App.Medicine.Surgery.Sim
const {He, he, his} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows little reaction to ${his} altered ears. The modification surgery is brief, with <span class="health dec">nothing more than minor health effects.</span>`);
} else if (slave.devotion > 20) {
if (canSee(slave)) {
diff --git a/js/medicine/surgery/ears/earRestore.js b/js/medicine/surgery/ears/earRestore.js
index 71ec4f300704afffa7c72e9054864485a4ef8082..e3d3c7a26a0cb05ceefd6a70c50e3f76610c655a 100644
--- a/js/medicine/surgery/ears/earRestore.js
+++ b/js/medicine/surgery/ears/earRestore.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.EarRestore = class extends App.Medicine.Surgery.S
const {He, his} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows little reaction to ${his} altered ears. Since the surgery was fairly invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else { // TODO: Will expand in future
r.push(`${He} is delighted to have ${his} ears back. Since the surgery was fairly invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
diff --git a/js/medicine/surgery/ears/newEars.js b/js/medicine/surgery/ears/newEars.js
index 88cfa17c1e4a95c4a94b4f333eedd030ae215681..753d1f2cb9b5511a11ead3427a1cd27078ce1eab 100644
--- a/js/medicine/surgery/ears/newEars.js
+++ b/js/medicine/surgery/ears/newEars.js
@@ -5,7 +5,7 @@ App.Medicine.Surgery.Reactions.NewEars = class extends App.Medicine.Surgery.Simp
const r = [];
r.push(`The implant surgery is <span class="health dec">invasive</span> and ${he} spends some time in the autosurgery recovering. As soon as the bandages around ${his} ears are removed, ${he}`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`returns to ${his} normal activities, none the wiser.`);
} else {
r.push(`initially believes nothing has changed, but soon discovers ${his} hearing is no longer technologically enhanced.`);
diff --git a/js/medicine/surgery/exotic/race.js b/js/medicine/surgery/exotic/race.js
index 90da55121b9f4390a1100e388fd142cb0844eba3..282e39be85573527a1c48ef7b493bcdb1d67bc6a 100644
--- a/js/medicine/surgery/exotic/race.js
+++ b/js/medicine/surgery/exotic/race.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Race = class extends App.Medicine.Surgery.SimpleR
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (canSee(slave)) {
r.push(`${He} pauses when ${he} sees the changes to ${his} body, unable to comprehend them.`);
} else {
@@ -21,7 +21,7 @@ App.Medicine.Surgery.Reactions.Race = class extends App.Medicine.Surgery.SimpleR
r.push(`gets a feel for the changes to ${his} body`);
}
r.push(`with approval.`);
- if (slave.race === slave.origRace) {
+ if (diff.race === slave.origRace) {
r.push(`${He} recognizes ${himself} as ${he} was, and`);
} else {
r.push(`${He} doesn't recognize ${himself} quite yet, but`);
@@ -38,7 +38,7 @@ App.Medicine.Surgery.Reactions.Race = class extends App.Medicine.Surgery.SimpleR
r.push(`gets a feel for the changes to ${his} body`);
}
r.push(`with hesitation.`);
- if (slave.race === slave.origRace) {
+ if (diff.race === slave.origRace) {
r.push(`${He} recognizes ${himself} as ${he} was, and`);
} else {
r.push(`${He} doesn't recognize ${himself} quite yet, but`);
@@ -55,13 +55,13 @@ App.Medicine.Surgery.Reactions.Race = class extends App.Medicine.Surgery.SimpleR
r.push(`gets a feel for the changes to ${his} body`);
}
r.push(`with revulsion.`);
- if (slave.race === slave.origRace) {
+ if (diff.race === slave.origRace) {
r.push(`${He} recognizes ${himself} as ${he} was, which ${he} loves, and`);
} else {
r.push(`${He} doesn't recognize ${himself} quite yet, which ${he} hates, though`);
}
r.push(`${he} hopes you'll like ${his} new appearance better and punish ${him} less cruelly as a result. For now, <span class="devotion dec">${he} seems to view this`);
- if (slave.race !== slave.origRace) {
+ if (diff.race !== slave.origRace) {
r.push(`fake`);
}
r.push(`racial appearance as a cruel imposition.</span> As with all invasive surgery <span class="health dec">${his} health has been affected.</span> ${He} is <span class="trust dec">terribly afraid</span> of your total power over ${his} body.`);
diff --git a/js/medicine/surgery/exotic/retrogradeVirusInjectionNCS.js b/js/medicine/surgery/exotic/retrogradeVirusInjectionNCS.js
index 97d35eca6ad4fa0f46ce4e0b6ee678396d966b9c..7655991923d9a56df386117a79749b8aa03a8106 100644
--- a/js/medicine/surgery/exotic/retrogradeVirusInjectionNCS.js
+++ b/js/medicine/surgery/exotic/retrogradeVirusInjectionNCS.js
@@ -199,7 +199,7 @@ App.Medicine.Surgery.Reactions.RetrogradeVirusInjectionNCS = class extends App.M
r.push(`You explain that ${he}'s never going to grow older and ${he}'ll stay younger. You sit back and let ${him} absorb that data for a moment.`);
reaction.longReaction.push(r);
r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} doesn't seem to comprehend what this means for ${him}.`);
} else if (slave.devotion > 20) {
r.push(`${He} is <span class="devotion inc">happy</span> with how young ${his} body has become${(slave.visualAge > 26) ? ` and is excited about the process continuing` : ``}. ${He} is already <span class="trust inc">wondering</span> what new kinky things you have planned for ${him}.`);
diff --git a/js/medicine/surgery/exotic/treatment.js b/js/medicine/surgery/exotic/treatment.js
index 31fd7b00ce1fd831d1acbb3c15ea61fedcd6de18..c0ed5c9ae41c02d3e27f2b403a1462be7477af70 100644
--- a/js/medicine/surgery/exotic/treatment.js
+++ b/js/medicine/surgery/exotic/treatment.js
@@ -148,7 +148,7 @@ App.Medicine.Surgery.Procedures.RemoveGene = class extends App.Medicine.Surgery.
App.Medicine.Surgery.Procedures.AddGene = class extends App.Medicine.Surgery.Procedure {
/**
* @param {App.Entity.SlaveState} slave
- * @param {string} gene
+ * @param {keyof FC.GeneticQuirks} gene
* @param {boolean} [activation=false] Activation or inducement
*/
constructor(slave, gene, activation = false) {
diff --git a/js/medicine/surgery/extreme/fuckdollExtraction.js b/js/medicine/surgery/extreme/fuckdollExtraction.js
index a7a6bf621498688217b37e18a377d10e8d075812..479149d2ef1fbbbb279beed15a5ee84d81d6a7e3 100644
--- a/js/medicine/surgery/extreme/fuckdollExtraction.js
+++ b/js/medicine/surgery/extreme/fuckdollExtraction.js
@@ -21,7 +21,7 @@ App.Medicine.Surgery.Reactions.FuckdollExtraction = class extends App.Medicine.S
if (getBestVision(slave) > 0) {
r.push(`You're denied any reaction from ${him} to the sight of ${himself} in the mirror outside the recovery area, as ${he}'s wearing a pair of very dark glasses ${he}'ll have to keep on for a few hours yet. ${He}'s been denied almost all vision for a long time, and though ${his} recovery included light therapy, ${he}'s still very sensitive to it.`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${His} mind remains just as broken outside the suit as it was inside it. In many ways, ${he}'s as much of a living sex toy now as ${he} was when ${he} was a Fuckdoll; ${he}'s unresponsive to almost everything, though ${he} will probably still understand how to get fucked. ${His} personality is probably somewhere back there in the Fuckdoll maintenance areas, like the scraps of the suit that was just cut off ${him}. Just another piece of refuse.`);
} else if (slave.fuckdoll > 20) {
r.push(`Though ${he} retains possession of some of ${his} faculties, ${he}'s been severely affected by the weeks ${he}'s spent as a living sex toy. Any joy or relief at being liberated from the Fuckdoll suit is probably being suppressed by the similarity of the extraction procedure to the routine suit maintenance ${he} received weekly. If ${he} even understands that ${he}'s been freed, ${he}'s been trained so thoroughly that ${he} will struggle to adapt to life more complex than tonal commands and sexual use.`);
diff --git a/js/medicine/surgery/eye/ocularImplant.js b/js/medicine/surgery/eye/ocularImplant.js
index 17b942494fe6eafa4c9993e298525cd9b41a0121..0f26faaacc2ac154df42230cdedde4705b49d411 100644
--- a/js/medicine/surgery/eye/ocularImplant.js
+++ b/js/medicine/surgery/eye/ocularImplant.js
@@ -16,7 +16,7 @@ App.Medicine.Surgery.Reactions.OcularImplant = class extends App.Medicine.Surger
reaction.trust += 10;
} else {
r.push(`${He} is <span class="trust dec">disturbed</span> that you replaced ${his} eyes with artificial ones and afraid of increased control over ${him} that such device grants.`);
- reaction.devotion -= 5; // TODO: text says trust, but devotion changed?
+ reaction.trust -= 5;
}
}
diff --git a/js/medicine/surgery/face/age.js b/js/medicine/surgery/face/age.js
index 44f9af6ccdcd118ac5cac9c80fa768941862fd4b..155decbb1d1d0f7660f0ce9611acff15b9967903 100644
--- a/js/medicine/surgery/face/age.js
+++ b/js/medicine/surgery/face/age.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Age = class extends App.Medicine.Surgery.SimpleRe
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} doesn't notice the improvements to ${his} face, but ${he}'s not the one looking at it. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He}`);
diff --git a/js/medicine/surgery/face/face.js b/js/medicine/surgery/face/face.js
index b255e1bb88839119e7b5ec15b31b9e41fbc3d858..b55a4a465e45db3396ec7c8215a45e929ab43941 100644
--- a/js/medicine/surgery/face/face.js
+++ b/js/medicine/surgery/face/face.js
@@ -5,7 +5,7 @@ App.Medicine.Surgery.Reactions.Face = class extends App.Medicine.Surgery.SimpleR
const r = [];
r.push(faceIncreaseDesc(slave, diff.face));
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} doesn't notice the improvements to ${his} face, but ${he}'s not the one looking at it. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He}`);
diff --git a/js/medicine/surgery/face/lips.js b/js/medicine/surgery/face/lips.js
index 3efebb3a8e59af39919e0424994046015e9d9004..2cb29c85885a1c623572e542bd283017754079d5 100644
--- a/js/medicine/surgery/face/lips.js
+++ b/js/medicine/surgery/face/lips.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Lips = class extends App.Medicine.Surgery.SimpleR
const {He, he, his, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} vaguely realizes ${his} mouth doesn't move as well as it used to. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 20 && this._strongKnownFetish(slave, "cumslut")) {
r.push(`${He} licks ${his} new lips experimentally but doesn't lose much time before turning to you with ${his} mouth open and ready. ${He}'s still sore, so ${he}'s careful, but ${he} runs ${his} wet tongue over ${his} lips, already panting at the thought of sucking dick. If ${he} had much in the way of oral skills, <span class="stat drop">they've likely suffered.</span> <span class="devotion inc">${He}'s happy with your changes to ${his} lips,</span> so much so that ${he} now <span class="trust inc">trusts</span> your plans for ${his} body. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
@@ -59,10 +59,6 @@ App.Medicine.Surgery.Procedures.lipImplantProcedure = function() {
get name() {
return "Replace with the next size up";
}
-
- get description() {
- return '';
- }
}
/**
diff --git a/js/medicine/surgery/genitials/anus.js b/js/medicine/surgery/genitials/anus.js
index 5be7cb53e8d76d7e096dcaccd28e186b9beed66b..ab7745dfe088ae63d8927f8f76eacfc0b33b247b 100644
--- a/js/medicine/surgery/genitials/anus.js
+++ b/js/medicine/surgery/genitials/anus.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Anus = class extends App.Medicine.Surgery.SimpleR
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with a terribly sore rear end and little desire to mess with it. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else {
if (this._strongKnownFetish(slave, "buttslut")) {
diff --git a/js/medicine/surgery/genitials/chop.js b/js/medicine/surgery/genitials/chop.js
index 113e1154fa885f72d618903be78620f9409984d4..bed9a07093a4f0b0b46aaed51b19ef82bcf85097 100644
--- a/js/medicine/surgery/genitials/chop.js
+++ b/js/medicine/surgery/genitials/chop.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Chop = class extends App.Medicine.Surgery.SimpleR
const {He, he, His, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Surprisingly, ${he} already realized while exiting that ${his} genitalia was completely reshaped. The reasons why are lost to ${him}, though.`);
} else if (slave.vagina === -1) {
r.push(`Of course, ${he} already realized while exiting that something very dear to ${him} has been taken away.`);
@@ -19,7 +19,7 @@ App.Medicine.Surgery.Reactions.Chop = class extends App.Medicine.Surgery.SimpleR
r.push(`${He}'s such an oral slut, though, that ${he} finds ${he} doesn't really care. ${He} never really paid much attention to ${his} dick; for ${him}, sex is about what ${he} gets to suck. As far as ${he}'s concerned, you've simply confirmed that ${his} most important hole is the one in ${his} face. If anything, ${he}'s <span class="trust inc">reassured</span> by the implicit promise that ${he}'ll never be anything more than a nice inviting facepussy, and of course, ${he}'s forced even further into <span class="devotion inc">submission to your will.</span>`);
reaction.devotion += 8;
reaction.trust += 8;
- } else if (slave.devotion > 20 && slave.fetishKnown === 1 && slave.fetishStrength > 95 && slave.fetish === "submissive") {
+ } else if (slave.devotion > 20 && slave.fetishKnown === 1 && slave.fetishStrength > 95 && slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He}'s such a total submissive, though, that ${he} accepts even this. Having ${his} cock removed, reducing ${him} to a sexually helpless place where ${he} can only receive pleasure by being penetrated, is perhaps the final step in sexual slavery, and ${he}'s a little awed by it. If anything, ${he}'s <span class="trust inc">reassured</span> by the implicit promise that ${his} body exists for the sexual gratification of others, and of course, ${he}'s forced even further into <span class="devotion inc">submission to your will.</span>`);
reaction.devotion += 8;
reaction.trust += 8;
diff --git a/js/medicine/surgery/genitials/circumcision.js b/js/medicine/surgery/genitials/circumcision.js
index b0df42a88714a87df1635dd586b17f35734facab..4bbab1b0e549acaff3f9ac823f8aec82c632649e 100644
--- a/js/medicine/surgery/genitials/circumcision.js
+++ b/js/medicine/surgery/genitials/circumcision.js
@@ -5,7 +5,7 @@ App.Medicine.Surgery.Reactions.Circumcision = class extends App.Medicine.Surgery
const r = [];
if (slave.dick > 0) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} exits the surgery gingerly, since ${he} can feel that something was done to ${his} dick. Since it is still there, ${he} doesn't understand what changed. Circumcision of an adult is not a trivial procedure, so <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} exits the surgery gingerly, since ${he} can feel that something was done to ${his} dick. ${He} examines it carefully`);
@@ -35,7 +35,7 @@ App.Medicine.Surgery.Reactions.Circumcision = class extends App.Medicine.Surgery
reaction.devotion -= 5;
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} exits the surgery gingerly, since ${he} can feel that something was done to ${his} crotch. Since everything is still there, ${he} doesn't understand what changed. <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} exits the surgery gingerly, since ${he} can feel that ${his} crotch was operated on. ${He} examines it carefully`);
diff --git a/js/medicine/surgery/genitials/clitoralEnlargement.js b/js/medicine/surgery/genitials/clitoralEnlargement.js
index cacff02d850afb90a3603524179a36f09eab6ecc..34b243dc72f326336bc52fb7bbdb20dbffe3641b 100644
--- a/js/medicine/surgery/genitials/clitoralEnlargement.js
+++ b/js/medicine/surgery/genitials/clitoralEnlargement.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.ClitoralEnlargement = class extends App.Medicine.
const {He, he, His, his} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with a terribly sore pussy and little desire to mess with it. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.energy > 95) {
r.push(`${He} leaves the surgery with a terribly sore pussy. ${He} is <span class="devotion inc">filled with joy</span> at the thought that ${his} pussy will now be more appealing to ${his} ${getWrittenTitle(slave)}; ${his} sensitivity has been increased, <span class="libido inc">raising ${his} sex drive slightly.</span> As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
diff --git a/js/medicine/surgery/genitials/clitoralReduction.js b/js/medicine/surgery/genitials/clitoralReduction.js
index 0a4327fce0c509f1671c74995cb00faacd715b07..4ea9136b810f5cebe5f5fcb0628e4d66ee5a3266 100644
--- a/js/medicine/surgery/genitials/clitoralReduction.js
+++ b/js/medicine/surgery/genitials/clitoralReduction.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.ClitoralReduction = class extends App.Medicine.Su
const {He, he, his} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with a terribly sore pussy and little desire to mess with it. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.energy > 95) {
r.push(`${He} leaves the surgery with a terribly sore pussy. ${He} is <span class="devotion inc">filled with joy</span> at the thought that ${his} pussy will now be more appealing to ${his} ${getWrittenTitle(slave)}; ${his} sensitivity has been reduced, <span class="libido dec">reducing ${his} sex drive slightly.</span> As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
diff --git a/js/medicine/surgery/genitials/fertility.js b/js/medicine/surgery/genitials/fertility.js
index 43cc1417e932943d990c0ae7d30a2ac9c8bc081d..6be9bebc6aa49ce1da1225048c8a61fbafc941be 100644
--- a/js/medicine/surgery/genitials/fertility.js
+++ b/js/medicine/surgery/genitials/fertility.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Fertility = class extends App.Medicine.Surgery.Si
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen, but lacks the mental faculties to realize that ${he} now has a chance to get pregnant. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (this._strongKnownFetish(slave, "pregnancy") || slave.origin === "$He sold $himself to you in the hope of someday bearing children.") {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen, but ${he} knows enough about surgery and sex slaves to know that it means ${he} now has a chance to get pregnant. ${He} is <span class="devotion inc">filled with joy</span> whenever ${he} thinks about the fact that feeling a life growing within ${him} is now, at last, a possibility. ${He}'s so pleased that ${he} now <span class="trust inc">trusts</span> your plans for ${his} body. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
diff --git a/js/medicine/surgery/genitials/foreskinTuck.js b/js/medicine/surgery/genitials/foreskinTuck.js
index 0e002d57af93307abad906fb6eb12a428a636f8b..509079c505d6e77d23b471e963c7a3b9b3323151 100644
--- a/js/medicine/surgery/genitials/foreskinTuck.js
+++ b/js/medicine/surgery/genitials/foreskinTuck.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.ForeskinTuck = class extends App.Medicine.Surgery
const {He, he, his, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} exits the surgery gingerly, since ${he} can feel that something was done to ${his} dick. Since it is still there, ${he} doesn't understand what changed. <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} exits the surgery gingerly, since ${he} can feel that something was done to ${his} dick. ${He} examines it carefully`);
diff --git a/js/medicine/surgery/genitials/geld.js b/js/medicine/surgery/genitials/geld.js
index b811a4990572bd923ade109cf56f4cc9303efda6..8b63437ce536398055b3cfd4a21c0a2722ecf1b8 100644
--- a/js/medicine/surgery/genitials/geld.js
+++ b/js/medicine/surgery/genitials/geld.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Geld = class extends App.Medicine.Surgery.SimpleR
const {He, he, His, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Surprisingly, ${he} already realized while exiting that ${his} scrotum was gone. The reasons why are lost to ${him}, though. Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`Of course, ${he} already realized while exiting that ${his} scrotum was gone. ${He} was already accepting of ${his} role as an effectively female slave, a receptacle for cock, and ${he} now understands that you no longer think it will ever again be necessary for ${him} to cum. <span class="devotion inc">${He} has become more submissive due to your radical reshaping of ${his} body.</span> Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
diff --git a/js/medicine/surgery/genitials/herm.js b/js/medicine/surgery/genitials/herm.js
index 54566864c7c378a673a6a11e5f912493ad9e4a45..5adb128d36f752db6e2033629cc03b08ccd45c12 100644
--- a/js/medicine/surgery/genitials/herm.js
+++ b/js/medicine/surgery/genitials/herm.js
@@ -5,7 +5,7 @@ App.Medicine.Surgery.Reactions.Herm = class extends App.Medicine.Surgery.SimpleR
const {he: heP} = getPronouns(V.PC);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Surprisingly, ${he} already realized while exiting that ${his} genitalia has been heavily augmented. The reasons why are lost to ${him}, though. Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} already realized while exiting that ${his} genitalia has been heavily augmented. ${He}'s almost beside ${himself} with joy: ${he} now has three holes for ${his} beloved ${getWrittenTitle(slave)} to fuck, and ${heP} even allowed ${him} to retain ${his} dick! <span class="devotion inc">${He} has become more submissive due to your radical reshaping of ${his} body.</span> Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
diff --git a/js/medicine/surgery/genitials/insemination.js b/js/medicine/surgery/genitials/insemination.js
index d76415d99f5969b856cc81cd156465a588abd80c..311eeb6691b63017ce3fd0fdfd3bc021749a60a3 100644
--- a/js/medicine/surgery/genitials/insemination.js
+++ b/js/medicine/surgery/genitials/insemination.js
@@ -1,6 +1,6 @@
App.Medicine.Surgery.Reactions.Insemination = class extends App.Medicine.Surgery.SimpleReaction {
/**
- * @param {App.Entity.SlaveState} seedSource
+ * @param {FC.HumanState} seedSource
*/
constructor(seedSource) {
super();
@@ -20,7 +20,7 @@ App.Medicine.Surgery.Reactions.Insemination = class extends App.Medicine.Surgery
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with a certain warmth in ${his} lower abdomen, ${he} knows that ${he} has been impregnated.`);
} else if (this._strongKnownFetish(slave, "pregnancy")) {
if (canSee(slave)) {
@@ -38,7 +38,7 @@ App.Medicine.Surgery.Reactions.Insemination = class extends App.Medicine.Surgery
r.push(`${He} leaves the surgery with a certain warmth in ${his} lower abdomen, ${he} knows that ${he} has been impregnated.`);
}
r.push(`${He}'s <span class="devotion inc">grateful</span> that you think ${him} worthy of carrying`);
- if (slave.pregSource === -1) {
+ if (this.seedSource === V.PC) {
r.push(`your`);
} else {
r.push(`${this.seedSource.slaveName}'s`);
@@ -73,7 +73,7 @@ App.Medicine.Surgery.Procedures.Insemination = class extends App.Medicine.Surger
/**
* @param {App.Entity.SlaveState} slave
* @param {string} name
- * @param {App.Entity.SlaveState} seedSource
+ * @param {FC.HumanState} seedSource
*/
constructor(slave, name, seedSource) {
super(slave);
diff --git a/js/medicine/surgery/genitials/labiaplasty.js b/js/medicine/surgery/genitials/labiaplasty.js
index 1bce714fe5f83edffef4d86a6cc5a2c40911fe8a..74908f66473d259c8f41e97f4f3d9743a520e8ee 100644
--- a/js/medicine/surgery/genitials/labiaplasty.js
+++ b/js/medicine/surgery/genitials/labiaplasty.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Labiaplasty = class extends App.Medicine.Surgery.
const {He, he, his} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with a terribly sore pussy and little desire to mess with it. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.energy > 95) {
r.push(`${He} leaves the surgery with a terribly sore pussy. ${He} is <span class="devotion inc">filled with joy</span> at the thought that ${his} pussy will now be more appealing to ${his} ${getWrittenTitle(slave)}; ${he}'s already anticipating recovering enough to feel your cockhead pressing past ${his} new lips, so much so that ${he} now <span class="trust inc">trusts</span> your plans for ${his} body. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
diff --git a/js/medicine/surgery/genitials/maleToFemale.js b/js/medicine/surgery/genitials/maleToFemale.js
index c185a8e9a072f692b406c8cfecf748bba9d1276f..3bf4129aabba6d328b43c4fc550b4014155111c6 100644
--- a/js/medicine/surgery/genitials/maleToFemale.js
+++ b/js/medicine/surgery/genitials/maleToFemale.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.MaletoFemale = class extends App.Medicine.Surgery
const {He, he, His, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Surprisingly, ${he} already realized while exiting that ${his} genitalia was completely reshaped. The reasons why are lost to ${him}, though. Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`Of course, ${he} already realized while exiting that ${his} genitalia was completely reshaped. As a shemale slave ${he} knew this day might come, and ${his} face is a strange mix of hope, happiness, satisfaction, and the tiniest tinge of soul-crushing sadness as ${he}`);
diff --git a/js/medicine/surgery/genitials/noneToFemale.js b/js/medicine/surgery/genitials/noneToFemale.js
index 82e603f7befde7004e1670b52a1dd8b2afe75db8..1ab3bd9e144d95abcc8660bdbc65b0d91cfecaa2 100644
--- a/js/medicine/surgery/genitials/noneToFemale.js
+++ b/js/medicine/surgery/genitials/noneToFemale.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.NoneToFemale = class extends App.Medicine.Surgery
const {He, he, his, him, himself, hers} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Surprisingly, ${he} already realized while exiting that ${his} genitalia was completely reshaped. The reasons why are lost to ${him}, though. Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`Of course, ${he} already realized while exiting that ${his} genitalia was completely reshaped. ${He} can only be happy that ${he}`);
diff --git a/js/medicine/surgery/genitials/preg.js b/js/medicine/surgery/genitials/preg.js
index 1ecaa3f702df95328deb05eec05a4d0e21de05f9..efbb4f4eac0dce200235df06cc80f044dd5e78ba 100644
--- a/js/medicine/surgery/genitials/preg.js
+++ b/js/medicine/surgery/genitials/preg.js
@@ -5,7 +5,7 @@ App.Medicine.Surgery.Reactions.Preg = class extends App.Medicine.Surgery.SimpleR
let r = [];
r.push(`${He} leaves the surgery with a certain warmth in ${his} lower abdomen, ${he} knows that ${he} has been impregnated.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (this._strongKnownFetish(slave, "pregnancy")) {
r.push(`${He} is <span class="devotion inc"> filled with joy</span> about being swollen with life and gleefully rubs ${his} soon to be huge belly. ${He}'s so pleased that ${he} now <span class="trust inc">trusts</span> your plans for ${his} body. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
diff --git a/js/medicine/surgery/genitials/preg1hack.js b/js/medicine/surgery/genitials/preg1hack.js
index 59314d0c82b0b98236eb1ae91d4107405d095bbb..aa51225f92cbbae5b9f054b543e15c172c404b52 100644
--- a/js/medicine/surgery/genitials/preg1hack.js
+++ b/js/medicine/surgery/genitials/preg1hack.js
@@ -9,7 +9,7 @@ App.Medicine.Surgery.Reactions.Preg1Hack = class extends App.Medicine.Surgery.Si
// My testing shows that 2 or 3 is relatively safe for generic adult slave with effective curatives or clinic, 4 - high risk of bursting. So there is a catch with it.
slave.broodmotherFetuses = [2, 2, 2, 2, 3, 3, 4].random();
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
/* nothing*/
} else if (this._strongKnownFetish(slave, "pregnancy")) {
r.push(`${He} is <span class="devotion inc">filled with joy</span> about being even more swollen with life and gleefully rubs ${his} soon-to-be-larger belly. ${He}'s so pleased that ${he} now <span class="trust inc">trusts</span> your plans for ${his} body. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
diff --git a/js/medicine/surgery/genitials/pregRemove.js b/js/medicine/surgery/genitials/pregRemove.js
index 7c5d78c56fce5b6b3f01dcfff51522f9e8a82d2c..54ed79a884cc99137b9f94fd3858fc0551e770cf 100644
--- a/js/medicine/surgery/genitials/pregRemove.js
+++ b/js/medicine/surgery/genitials/pregRemove.js
@@ -5,7 +5,7 @@ App.Medicine.Surgery.Reactions.PregRemove = class extends App.Medicine.Surgery.S
const r = [];
r.push(`${He} leaves the surgery with a certain soreness and minor pain in ${his} lower abdomen, ${he} knows that ${his} days as broodmother are finished.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (this._strongKnownFetish(slave, "pregnancy")) {
r.push(`${He} is <span class="trust dec">filled with despair</span> about missing being swollen with life and rubs ${his} flat belly with <span class="devotion dec">sorrow.</span> Only one fact slightly soothes ${him} and allows ${him} to remain sane — at least ${he} will not become infertile and still can get pregnant naturally. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
diff --git a/js/medicine/surgery/genitials/relocate.js b/js/medicine/surgery/genitials/relocate.js
index fb75bdc180d8e3ff1ed666d7b800db34aa2b54ab..b3eef71a37a41b8dcba466e55c5ed22d1a8ac8a4 100644
--- a/js/medicine/surgery/genitials/relocate.js
+++ b/js/medicine/surgery/genitials/relocate.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Relocate = class extends App.Medicine.Surgery.Sim
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`When ${he} begins surgical recovery, ${his} groin hurts quite a lot, and ${he} can't quite tell what's going on down there. Since the surgery was invasive, <span class="health dec">${his} health has been seriously affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`When ${he} begins surgical recovery, ${his} groin hurts quite a lot, and ${he} can't quite tell what's going on down there. However, ${he} was able to follow enough of the surgery to understand that ${he} still has ${his} balls, even if they're no longer visible. ${He}'s eager to`);
diff --git a/js/medicine/surgery/genitials/scrotalTuck.js b/js/medicine/surgery/genitials/scrotalTuck.js
index 350ce0a9505cec4992ee12762684a44bf11fb846..652845ba7b4205b56876d4508dbb1c1578b8aeb0 100644
--- a/js/medicine/surgery/genitials/scrotalTuck.js
+++ b/js/medicine/surgery/genitials/scrotalTuck.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.ScrotalTuck = class extends App.Medicine.Surgery.
const {He, he, his} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`When ${he} begins surgical recovery, ${his} groin hurts quite a lot, and ${he} can't quite tell what's going on down there. Since the surgery was invasive, <span class="health dec">${his} health has been seriously affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} exits the surgery gingerly, since ${he} can feel that something was done to ${his} testicles. ${He} examines them carefully`);
diff --git a/js/medicine/surgery/genitials/sterilize.js b/js/medicine/surgery/genitials/sterilize.js
index 549f5a8e89359b993db3838983122f1498c380e1..1c7f4984b2ecb401f249d7bdbac4624c1a2c4c23 100644
--- a/js/medicine/surgery/genitials/sterilize.js
+++ b/js/medicine/surgery/genitials/sterilize.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Sterilize = class extends App.Medicine.Surgery.Si
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen, but lacks the mental faculties to know that ${he}'ll never have a child now. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (this._strongKnownFetish(slave, "pregnancy")) {
r.push(`${He} leaves the surgery with nothing but a nonspecific ache in ${his} lower abdomen, but ${he} knows enough about surgery and sex slaves to know that it means ${he}'ll never have a child. ${He} is <span class="devotion dec">filled with grief</span> whenever ${he} thinks about the fact that feeling a life growing within ${him} is now, finally and forever, beyond ${him}. As with all surgery <span class="health dec">${his} health has been slightly affected.</span> ${He} is <span class="trust dec">terribly afraid</span> of your total power over ${his} body.`);
diff --git a/js/medicine/surgery/genitials/vagina.js b/js/medicine/surgery/genitials/vagina.js
index 1876b54b74e153dfb91eb805493e6a7bc9f0eaa2..facb07fdf72b18f5b18554f83a717d7de8f54eb2 100644
--- a/js/medicine/surgery/genitials/vagina.js
+++ b/js/medicine/surgery/genitials/vagina.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Vagina = class extends App.Medicine.Surgery.Simpl
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} leaves the surgery with a terribly sore pussy and little desire to mess with it. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else {
if (slave.energy > 95) {
diff --git a/js/medicine/surgery/genitials/vaginalRemoval.js b/js/medicine/surgery/genitials/vaginalRemoval.js
index 0733e948ae1eb566778fbb8cea0c0a3d5bd4e229..81305924440556a97aefd3f15b3d90f0baf37b11 100644
--- a/js/medicine/surgery/genitials/vaginalRemoval.js
+++ b/js/medicine/surgery/genitials/vaginalRemoval.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.VaginaRemoval = class extends App.Medicine.Surger
const {He, he, His, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Surprisingly, ${he} already realized while exiting that ${his} genitalia was completely reshaped. The reasons why are lost to ${him}, though.`);
} else if (slave.dick === 0) {
r.push(`Of course, ${he} already realized while exiting that something very dear to ${him} has been taken away.`);
@@ -19,7 +19,7 @@ App.Medicine.Surgery.Reactions.VaginaRemoval = class extends App.Medicine.Surger
r.push(`${He}'s such an oral slut, though, that ${he} finds ${he} doesn't really care. ${He} viewed ${his} pussy as a nice place for stimulation while ${he} licked, blew, and sucked; if ${he} has to learn to get off from throat stimulation ${he} will. As far as ${he}'s concerned, you've simply confirmed that ${his} most important hole is the one in ${his} face. If anything, ${he}'s <span class="trust inc">reassured</span> by the implication that ${his} real pussy has always been the one in the middle of ${his} face, and of course, ${he}'s forced even further into <span class="devotion inc">submission to your will.</span>`);
reaction.devotion += 8;
reaction.trust += 8;
- } else if (slave.devotion > 20 && slave.fetishKnown === 1 && slave.fetishStrength > 95 && slave.fetish === "submissive") {
+ } else if (slave.devotion > 20 && slave.fetishKnown === 1 && slave.fetishStrength > 95 && slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He}'s such a total submissive, though, that ${he} accepts even this. Having ${his} womanhood torn out, greatly curtailing ${his} physical ability to enjoy sex, is perhaps the final step in sexual slavery, and ${he}'s a little awed by it. If anything, ${he}'s <span class="trust inc">reassured</span> by the implicit promise that ${his} body exists for the degrading sexual gratification of others, and of course, ${he}'s forced even further into <span class="devotion inc">submission to your will.</span>`);
reaction.devotion += 8;
reaction.trust += 8;
diff --git a/js/medicine/surgery/hair/restoreHairBrow.js b/js/medicine/surgery/hair/restoreHairBrow.js
index f86df5755555edea2c83cdf3bff83b4bdb632de1..83ad6be0425a866c7b6b6b10e9a16416b851095a 100644
--- a/js/medicine/surgery/hair/restoreHairBrow.js
+++ b/js/medicine/surgery/hair/restoreHairBrow.js
@@ -16,7 +16,7 @@ App.Medicine.Surgery.Reactions.RestoreHairBrow = class extends App.Medicine.Surg
} else {
r.push(`As ${he} struggles to rub it against something,`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${he} fails to realize ${he} now has eyebrows.`);
} else {
r.push(`${he} is <span class="devotion inc">delighted</span> to find ${he} now has eyebrows.`);
diff --git a/js/medicine/surgery/hair/restoreHairHead.js b/js/medicine/surgery/hair/restoreHairHead.js
index caf9857fa1ebbc650eb50398f85d0554634c6e9c..6e724855a9220b63cb17a5579ac6c305cfc02905 100644
--- a/js/medicine/surgery/hair/restoreHairHead.js
+++ b/js/medicine/surgery/hair/restoreHairHead.js
@@ -16,7 +16,7 @@ App.Medicine.Surgery.Reactions.RestoreHairHead = class extends App.Medicine.Surg
} else {
r.push(`As ${he} struggles to rub it against something,`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${he} fails to realize ${he} now has a head of short hair.`);
} else {
r.push(`${he} is <span class="devotion inc">delighted</span> to find ${he} now has hair.`);
diff --git a/js/medicine/surgery/hair/restoreHairPits.js b/js/medicine/surgery/hair/restoreHairPits.js
index a70fedc1a01b3bfbe9f5a06652ad945382a0f399..e3109cb9f121c89c493e3b5036545a7d1e76ac0f 100644
--- a/js/medicine/surgery/hair/restoreHairPits.js
+++ b/js/medicine/surgery/hair/restoreHairPits.js
@@ -22,7 +22,7 @@ App.Medicine.Surgery.Reactions.RestoreHairPits = class extends App.Medicine.Surg
} else {
r.push(`As ${he} struggles to rub it against something,`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${he} fails to realize ${he} now has underarm hair.`);
} else {
if (slave.physicalAge < pubertyAge - 2) {
diff --git a/js/medicine/surgery/hair/restoreHairPubes.js b/js/medicine/surgery/hair/restoreHairPubes.js
index d02544ee40daa61449fc93536a3f1b48c2b8cd09..dc16e158ebbc927f8c2defd3f73dfcf6f677fdb3 100644
--- a/js/medicine/surgery/hair/restoreHairPubes.js
+++ b/js/medicine/surgery/hair/restoreHairPubes.js
@@ -17,7 +17,7 @@ App.Medicine.Surgery.Reactions.RestoreHairPubes = class extends App.Medicine.Sur
} else {
r.push(`As ${he} struggles to rub it against something,`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${he} fails to realize ${he} now has pubic hair.`);
} else {
if (slave.physicalAge < pubertyAge - 2) {
diff --git a/js/medicine/surgery/horns/horn.js b/js/medicine/surgery/horns/horn.js
index 39bc8de3ef044169b38e98075d86cf4f38e0dc32..c1c61fd8e5b5f1fdff95a7d93bb58cc4f7949993 100644
--- a/js/medicine/surgery/horns/horn.js
+++ b/js/medicine/surgery/horns/horn.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Horn = class extends App.Medicine.Surgery.SimpleR
const {He, he, his} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows little reaction to ${his} new head ornamentation. As with all invasive surgery <span class="health dec">${his} health has been affected.</span>`);
} else if (slave.devotion > 20) {
if (canSee(slave)) {
diff --git a/js/medicine/surgery/horns/hornGone.js b/js/medicine/surgery/horns/hornGone.js
index 68a66ce9619548eed26c07a5ecb32ed2a8ff733f..747bfd2b0ed852013e4b6a4371c3a77f8174c2a3 100644
--- a/js/medicine/surgery/horns/hornGone.js
+++ b/js/medicine/surgery/horns/hornGone.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.HornGone = class extends App.Medicine.Surgery.Sim
const {He, he, his} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows little reaction to the removal of ${his} head ornamentation. As with all invasive surgery <span class="health dec">${his} health has been affected.</span>`);
} else if (slave.devotion > 20) {
r.push(`${He} is a little sad ${his} head ornaments are gone but since ${he} is attentive to your will it doesn't have a great impact on ${his} mental state. As with all invasive surgery <span class="health dec">${his} health has been affected.</span>`);
diff --git a/js/medicine/surgery/liposuction/liposuction.js b/js/medicine/surgery/liposuction/liposuction.js
index 12af6bcb3ba90bf8b889e7f3547b59a1a8ac0fb3..dfc70daa6e90ea916e65e130968226917f4f8941 100644
--- a/js/medicine/surgery/liposuction/liposuction.js
+++ b/js/medicine/surgery/liposuction/liposuction.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Liposuction = class extends App.Medicine.Surgery.
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} notices that ${he} is quite lighter than ${he} used to be. As with all surgeries, <span class="health dec">${his} health has been affected.</span>`);
} else if (slave.behavioralFlaw === "anorexic") {
if (canSee(slave)) {
diff --git a/js/medicine/surgery/liposuction/ribs.js b/js/medicine/surgery/liposuction/ribs.js
index 1d80fb40074c831d262e4eb14e3574f6f03f7270..15b69717fd221b50854fb3e0bd2eb8b0e36661e6 100644
--- a/js/medicine/surgery/liposuction/ribs.js
+++ b/js/medicine/surgery/liposuction/ribs.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Ribs = class extends App.Medicine.Surgery.SimpleR
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He}'s desperately stiff and sore. It takes a good while for ${him} to figure out what has happened, but eventually ${his} careful investigations discern that the cause is ${his} new extremely narrow waist. Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.behavioralFlaw === "anorexic") {
r.push(`${He}'s desperately stiff and sore. It takes a good while for ${him} to figure out what has happened, but eventually ${his} careful investigations discern that the cause of ${his} extremely narrow waist is that ${his} ribcage has been shortened. ${He} gasps with shock, and when ${he}`);
diff --git a/js/medicine/surgery/liposuction/waist.js b/js/medicine/surgery/liposuction/waist.js
index 139eaf08ac2d1a075bc266db0779251e1abbc301..84c4202e6c7ace2b0995910750602f5bd5f52fd4 100644
--- a/js/medicine/surgery/liposuction/waist.js
+++ b/js/medicine/surgery/liposuction/waist.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Waist = class extends App.Medicine.Surgery.Simple
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While ${he} notices how sore ${his} waist is, ${he} fails to find the reason why. Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.behavioralFlaw === "anorexic") {
if (canSee(slave)) {
diff --git a/js/medicine/surgery/nipples/areolae.js b/js/medicine/surgery/nipples/areolae.js
index 5984cbe714b12fde8f593510f64561e2b3aa924f..966fd7303a0c70507b4f35c900481b04c3add60f 100644
--- a/js/medicine/surgery/nipples/areolae.js
+++ b/js/medicine/surgery/nipples/areolae.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Areolae = class extends App.Medicine.Surgery.Simp
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows little reaction to ${his} altered nipples. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 20 && this._strongKnownFetish(slave, "boobs")) {
if (hasAnyArms(slave)) {
diff --git a/js/medicine/surgery/nipples/lactation.js b/js/medicine/surgery/nipples/lactation.js
index 748fefe04486606a27c071c014d724fd73200303..a26f5397dc6f41563dddcc8e1feb14fcbc228329 100644
--- a/js/medicine/surgery/nipples/lactation.js
+++ b/js/medicine/surgery/nipples/lactation.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Lactation = class extends App.Medicine.Surgery.Si
const {He, he, His, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} notices almost immediately that ${his} breasts feel fuller, gasping as milk begins to leak from ${his} nipples. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
if (hasAnyArms(slave)) {
diff --git a/js/medicine/surgery/nipples/nippleCunts.js b/js/medicine/surgery/nipples/nippleCunts.js
index d7b974d0cb346eae788b7e4395ef45e39f84a3f6..53251d3ca906151e56542a47fb4c9ea0030e338a 100644
--- a/js/medicine/surgery/nipples/nippleCunts.js
+++ b/js/medicine/surgery/nipples/nippleCunts.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.NippleCunts = class extends App.Medicine.Surgery.
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows no reaction to ${his} altered nipples. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 20 && this._strongKnownFetish(slave, "boobs")) {
if (hasAnyArms(slave)) {
diff --git a/js/medicine/surgery/prosthetics/pLimbInterface.js b/js/medicine/surgery/prosthetics/pLimbInterface.js
index c740e151839c95796f4a97c0e5890bd66db84d5d..16264f429066d9aeacdd6283e8dd11589aa6ccd2 100644
--- a/js/medicine/surgery/prosthetics/pLimbInterface.js
+++ b/js/medicine/surgery/prosthetics/pLimbInterface.js
@@ -77,7 +77,7 @@ App.Medicine.Surgery.Reactions.PLimbInterface3 = class extends App.Medicine.Surg
r.push(`wiggles ${his} stumps trying to feel the ports`);
}
r.push(`installed in ${his} stumps. ${His} stumps twitch slightly as the software begins configuring. Since ${he} already had anchors installed in previous surgery this procedure was less invasive and thus <span class="health dec">${his} health has been only slightly affected.</span>`);
- if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0) {
if (slave.devotion > 20) {
r.push(`${He} is <span class="devotion inc">overjoyed</span> when ${he} finds out this upgrade will allow ${him} to <i>feel</i> with ${his} limbs again and thanks you profusely the first chance ${he} gets. ${He} <span class="trust inc">places more trust in you,</span> too, since you obviously have ${his} best interests at heart.`);
} else if (slave.devotion >= -20) {
@@ -107,7 +107,7 @@ App.Medicine.Surgery.Reactions.PLimbInterface4 = class extends App.Medicine.Surg
r.push(`wiggles ${his} stumps trying to feel the ports`);
}
r.push(`installed in ${his} stumps. ${His} stumps twitch slightly as the software begins configuring. Since ${he} already had anchors installed in previous surgery this procedure was less invasive and thus <span class="health dec">${his} health has been only slightly affected.</span>`);
- if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0) {
if (slave.devotion > 20) {
r.push(`${He} <span class="devotion inc">trusts</span> you enough to be not be put off by your explanation of what kind of prosthetic limbs will fit ${his} new interface. Thinking that maybe being a pet won't be so bad.`);
} else if (slave.devotion >= -20) {
diff --git a/js/medicine/surgery/structural/amputation.js b/js/medicine/surgery/structural/amputation.js
index b3e347a6b60a2b4b1eb6e52c4ab5a728569a0440..efc3f2b4a56183fe70725f0b4cd522fb46b20f6a 100644
--- a/js/medicine/surgery/structural/amputation.js
+++ b/js/medicine/surgery/structural/amputation.js
@@ -15,7 +15,7 @@ App.Medicine.Surgery.Reactions.Amputate = class extends App.Medicine.Surgery.Sim
// TODO: add missing cases, improve descriptions
if (isAmputee(this.newLimbs)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Of course, ${he} could not walk out of the surgery; you carried ${him}. ${He} squirms the entire time, trying to move the arms and legs ${he} now lacks. Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`Of course, ${he} could not walk out of the surgery; you carried ${him}. ${He} knows what a slave's life is, but ${he} did not really expect that it would ever come to this for ${him}. After a long, silent`);
@@ -121,7 +121,7 @@ App.Medicine.Surgery.Reactions.Amputate = class extends App.Medicine.Surgery.Sim
}
} else {
if (hasAnyLegs(this.newLimbs)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Of course, ${he} could not walk out of the surgery by ${himself}; you had to walk alongside ${him}. ${He} leans into you the entire time, already seeming to forget ${he} ever had another leg. Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`Of course, ${he} could not walk out of the surgery by ${himself}; you had to walk alongside ${him}. ${He} knows what a slave's life is, but ${he} did not really expect that it would involve this. After a brief, silent`);
@@ -157,7 +157,7 @@ App.Medicine.Surgery.Reactions.Amputate = class extends App.Medicine.Surgery.Sim
reaction.devotion -= 15;
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Of course, ${he} could not walk out of the surgery; you carried ${him}. ${He} holds onto you the entire time, already seeming to forget the sensation of walking. Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`Of course, ${he} could not walk out of the surgery; you carried ${him}. ${He} knows what a slave's life is, but ${he} did not really expect that it would involve this. After a brief, silent`);
@@ -217,8 +217,13 @@ App.Medicine.Surgery.Reactions.Amputate = class extends App.Medicine.Surgery.Sim
const {He, him} = getPronouns(slave);
if (slave.behavioralFlaw === "arrogant") {
- reaction.longReaction.last()
- .push(`<span class="flaw break">${He} can hardly be arrogant relying on others to feed, bathe and carry ${him}.</span>`);
+ const r = `<span class="flaw break">${He} can hardly be arrogant relying on others to feed, bathe and carry ${him}.</span>`;
+ if (reaction.longReaction.length > 0) {
+ reaction.longReaction.last()
+ .push(r);
+ } else {
+ reaction.longReaction.push([r]);
+ }
slave.behavioralFlaw = "none";
}
diff --git a/js/medicine/surgery/structural/heels.js b/js/medicine/surgery/structural/heels.js
index 32dc4cc9e5a70debe9384cc11aeb4de992e93022..4fdfd1c683d54d71163b3c5104c60e07342f6946 100644
--- a/js/medicine/surgery/structural/heels.js
+++ b/js/medicine/surgery/structural/heels.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.ShortenTendons = class extends App.Medicine.Surge
const {He, he, His, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} exits the surgery on all fours, unable to stand due to the changes to ${his} legs. A whorish pair of heels are slipped onto ${him} and ${he} is forced to ${his} feet to show that ${he} can indeed walk comfortably while wearing them. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} exits the surgery on all fours, unable to stand due to the changes to ${his} legs. ${He} finds a whorish pair of heels waiting for ${him} and eagerly puts them on, gingerly standing to find that ${he} can indeed walk comfortably while wearing them. ${He} struts back and forth experimentally and then offers`);
@@ -46,7 +46,7 @@ App.Medicine.Surgery.Reactions.ReplaceTendons = class extends App.Medicine.Surge
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} exits the surgery on ${his} own two feet. ${He}'s still sore, but the modern surgery is fast and effective, and ${he} can use ${his} restored legs immediately. ${He} gingerly stands on one foot, then the other; and even takes a few little hops. ${He} obviously confused, but will get used to it soon enough. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion >= -20) {
r.push(`${He} exits the surgery on ${his} own two feet. ${He}'s still sore, but the modern surgery is fast and effective, and ${he} can use ${his} restored legs immediately. ${He} gingerly stands on one foot, then the other; and even takes a few little hops. ${He}'s grinning like a fool the whole time. <span class="devotion inc">${He} has become more obedient due to gratitude.</span> As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
diff --git a/js/medicine/surgery/structural/height.js b/js/medicine/surgery/structural/height.js
index ec9af2f59533488545342c527d709ddbc04b440d..0b158b23b28a1c30852f1268b6656f347d2aac5c 100644
--- a/js/medicine/surgery/structural/height.js
+++ b/js/medicine/surgery/structural/height.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Height = class extends App.Medicine.Surgery.Simpl
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} exits the surgery very slowly, since ${he}'s terribly sore and isn't yet used to the novel lengths of the legs ${he} walks on. ${He}'ll be clumsy for some time. Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} exits the surgery very cautiously, since ${he}'s terribly sore and isn't yet used to the novel lengths of the legs ${he} walks on. ${He}'ll be clumsy and hesitant for some time, but ${he}'s happy with ${his} new body. <span class="devotion inc">${He} has become more submissive due to your radical reshaping of ${his} body.</span> Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
diff --git a/js/medicine/surgery/structural/hips.js b/js/medicine/surgery/structural/hips.js
index be184d8e1d433c46531cfb77ff6aef73b81415a3..28adada3e34ce839f8f2ab11bbcb9d9404d12dce 100644
--- a/js/medicine/surgery/structural/hips.js
+++ b/js/medicine/surgery/structural/hips.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Hips = class extends App.Medicine.Surgery.SimpleR
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} exits the surgery very slowly, since ${he}'s still in considerable pain and isn't yet used to the way ${his} pelvis now fits together with the rest of ${his} body. Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} exits the surgery very cautiously, since ${he}'s still in considerable pain and isn't yet used to the way ${his} pelvis now fits together with the rest of ${his} body. ${He}'ll be clumsy and hesitant for some time, but ${he}'s happy with ${his} new hips. <span class="devotion inc">${He} has become more submissive due to your radical reshaping of ${his} body.</span> Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
diff --git a/js/medicine/surgery/structural/shoulders.js b/js/medicine/surgery/structural/shoulders.js
index 4ebd4d154cfbd101f34af7d542f85141f92a0020..9aaa66ba24f3e5e49998f6ce7e33becc9d4ec587 100644
--- a/js/medicine/surgery/structural/shoulders.js
+++ b/js/medicine/surgery/structural/shoulders.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Shoulders = class extends App.Medicine.Surgery.Si
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} exits the surgery gingerly, since the changes of proportion in ${his} upper body have seriously affected ${his} sense of balance. Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} exits the surgery gingerly, since the changes of proportion in ${his} upper body have seriously affected ${his} sense of balance, albeit temporarily. ${He}'ll be clumsy and hesitant for some time, but ${he}'s happy with ${his} new shoulders. <span class="devotion inc">${He} has become more submissive due to your radical reshaping of ${his} body.</span> Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
diff --git a/js/medicine/surgery/teeth/braces.js b/js/medicine/surgery/teeth/braces.js
index e9f63159b23880ad4a40e6520cd3b1dbc5ec3c25..58759f589841befe2ca9328148552b213b0f15dc 100644
--- a/js/medicine/surgery/teeth/braces.js
+++ b/js/medicine/surgery/teeth/braces.js
@@ -12,9 +12,9 @@ App.Medicine.Surgery.Reactions.Braces = class extends App.Medicine.Surgery.Simpl
const {He, he, His, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is quite quick to realize ${his} teeth now have something on them. What its purpose is is beyond ${him}, though.`);
- } else if (slave.teeth === "straightening braces") {
+ } else if (diff.teeth === "straightening braces") {
r.push(`Quite aware that ${his} crooked, aching teeth are now in braces,`);
if (slave.devotion > 50) {
r.push(`${He} smiles tentatively at`);
@@ -43,7 +43,7 @@ App.Medicine.Surgery.Reactions.Braces = class extends App.Medicine.Surgery.Simpl
}
r.push(`${He}'s experiencing considerable discomfort, and ${his} feelings are mixed. ${He} knows that straightening teeth is expensive, and in different circumstances ${he} would probably be glad to be given free braces. However, ${he}'s very aware that ${he}'s being beautified because ${he}'s a sex slave.`);
}
- } else if (slave.teeth === "cosmetic braces") {
+ } else if (diff.teeth === "cosmetic braces") {
r.push(`Quite aware that ${his} aching teeth are now in braces,`);
if (slave.devotion > 50) {
r.push(`${he} smiles tentatively at`);
@@ -93,7 +93,7 @@ App.Medicine.Surgery.Reactions.RemoveBraces = class extends App.Medicine.Surgery
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is quite quick to realize ${his} teeth are missing something.`);
} else {
r.push(`Quite aware that ${his} teeth are now free of ${his} braces,`);
@@ -149,7 +149,7 @@ App.Medicine.Surgery.Reactions.RemoveCosmeticBraces = class extends App.Medicine
const {He, he, his} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is quite quick to realize ${his} teeth are missing something.`);
} else {
r.push(`Quite aware that ${his} teeth are now free of ${his} braces,`);
@@ -201,7 +201,7 @@ App.Medicine.Surgery.Procedures.AddCosmeticBraces = class extends App.Medicine.S
apply(cheat) {
this._slave.teeth = "cosmetic braces";
- return this._assemble(new App.Medicine.Surgery.Reactions.RemoveCosmeticBraces());
+ return this._assemble(new App.Medicine.Surgery.Reactions.Braces());
}
};
diff --git a/js/medicine/surgery/teeth/fang.js b/js/medicine/surgery/teeth/fang.js
index cd101f053b429f47527c844a96b3bfee94919168..563c43895277c6d4529631b0e70035b245132efd 100644
--- a/js/medicine/surgery/teeth/fang.js
+++ b/js/medicine/surgery/teeth/fang.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.FangImplant = class extends App.Medicine.Surgery.
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} clearly feels quite normal except for a vague ache around ${his} jaw, yet fails to understand that ${his} teeth have changed shape. Since the surgery was moderately invasive, <span class="health dec">${his} health has been somewhat affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} clearly feels quite normal except for a vague ache around ${his} jaw. It takes a good while for ${him} to figure out what has happened, but eventually ${he} gets enough sensation in ${his} mouth to realize that ${he} now has a fang. ${He} seems doubtful,`);
diff --git a/js/medicine/surgery/teeth/fangs.js b/js/medicine/surgery/teeth/fangs.js
index 72bf338d90e86db7f27a6c3507580e4259b689e3..a101c5c48c9b4d1e6e52892affb5482da9e2c106 100644
--- a/js/medicine/surgery/teeth/fangs.js
+++ b/js/medicine/surgery/teeth/fangs.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.FangsImplant = class extends App.Medicine.Surgery
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} clearly feels quite normal except for a vague ache around ${his} jaw, yet fails to understand that ${his} teeth have changed shape. Since the surgery was moderately invasive, <span class="health dec">${his} health has been somewhat affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} clearly feels quite normal except for a vague ache around ${his} jaw. It takes a good while for ${him} to figure out what has happened, but eventually ${he} gets enough sensation in ${his} mouth to realize that ${he} now has a pair of fangs. ${He} seems doubtful, but then works up ${his} courage and bares them`);
diff --git a/js/medicine/surgery/teeth/sharp.js b/js/medicine/surgery/teeth/sharp.js
index c3f039291aadf64a18c1f9dda0d1e8f196bc389b..66b64c608a1d43036619909f732d1205612603e8 100644
--- a/js/medicine/surgery/teeth/sharp.js
+++ b/js/medicine/surgery/teeth/sharp.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.SharpTeeth = class extends App.Medicine.Surgery.S
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} clearly feels quite normal except for a vague ache around ${his} jaw, yet fails to understand that ${his} teeth have changed shape. Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} clearly feels quite normal except for a vague ache around ${his} jaw. It takes a good while for ${him} to figure out what has happened, but eventually ${he} gets enough sensation in ${his} mouth to realize that ${he} now has teeth fit for a carnivore. ${He} seems doubtful, but then works up ${his} courage and bares them`);
diff --git a/js/medicine/surgery/teeth/teeth.js b/js/medicine/surgery/teeth/teeth.js
index 8e4fb2c5df2afe93f1365cfe17ef642ba729cf57..3a246a2e582f2857cc9483cd1fe07270fcabe873 100644
--- a/js/medicine/surgery/teeth/teeth.js
+++ b/js/medicine/surgery/teeth/teeth.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Teeth = class extends App.Medicine.Surgery.Simple
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} clearly feels quite normal except for a vague ache around ${his} jaw, yet fails to understand ${his} teeth are now fake. Since the surgery was invasive, <span class="health dec">${his} health has been greatly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} clearly feels quite normal except for a vague ache around ${his} jaw. It takes a good while for ${him} to figure out what has happened, but eventually ${he} gets enough sensation in ${his} mouth to realize that ${he} is wearing prosthetic teeth that ${he} can remove. ${He} gasps with shock, but figures out the idea quickly enough by experimentally`);
diff --git a/js/medicine/surgery/voice/electrolarynx.js b/js/medicine/surgery/voice/electrolarynx.js
index 6c4fb18f74c7ef9dda74e33a3e111e6be3864c4b..ddbaf24bbbd45a253d831e3882898d65e1fde941 100644
--- a/js/medicine/surgery/voice/electrolarynx.js
+++ b/js/medicine/surgery/voice/electrolarynx.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Electrolarynx = class extends App.Medicine.Surger
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Before surgery, ${he} was warned repeatedly not to try talking for a while, but ${he} fails to recall that. ${He} doesn't notice any difference.`);
} else if (slave.voice === 0) {
if (slave.devotion > 50) {
diff --git a/js/medicine/surgery/voice/mute.js b/js/medicine/surgery/voice/mute.js
index 5730de3b38c37cc006d0778ad12394bc61ed798a..ba9062fcb60448e6ece070de6e36f46001eee4dc 100644
--- a/js/medicine/surgery/voice/mute.js
+++ b/js/medicine/surgery/voice/mute.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.Mute = class extends App.Medicine.Surgery.SimpleR
const {He, he, his, him, himself} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} clearly feels quite normal except for a vague ache around ${his} larynx. It takes a good while for ${him} to figure out what has happened, but eventually ${he} tries to speak and makes no sound. ${He} simply keeps trying for some time before accepting this is how things are. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`${He} clearly feels quite normal except for a vague ache around ${his} larynx. It takes a good while for ${him} to figure out what has happened, but eventually ${he} tries to speak and makes no sound. ${He} panics, but manages to control ${himself} at length and begins to think.`);
@@ -40,8 +40,13 @@ App.Medicine.Surgery.Reactions.Mute = class extends App.Medicine.Surgery.SimpleR
const {He} = getPronouns(slave);
if (slave.behavioralFlaw === "bitchy") {
- reaction.longReaction.last()
- .push(`<span class="green">${He} can hardly make sharp remarks without a voice.</span>`);
+ const r = `<span class="green">${He} can hardly make sharp remarks without a voice.</span>`;
+ if (reaction.longReaction.length > 0) {
+ reaction.longReaction.last()
+ .push(r);
+ } else {
+ reaction.longReaction.push([r]);
+ }
slave.behavioralFlaw = "none";
}
diff --git a/js/medicine/surgery/voice/newVoice.js b/js/medicine/surgery/voice/newVoice.js
index 9d4ba3bf4e687f7105fad317c17c5ce5c477aeb2..8cd1fa4d85646cd9001bafa3a3adda71fc8b4ecb 100644
--- a/js/medicine/surgery/voice/newVoice.js
+++ b/js/medicine/surgery/voice/newVoice.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.NewVoice = class extends App.Medicine.Surgery.Sim
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`The autosurgery instructed ${him} in no uncertain terms not to speak during recovery, but ${he} fails to recall that. ${He} doesn't notice anything different, though.`);
} else {
r.push(`Before surgery, ${he} was warned repeatedly not to try talking for a while, and ${he} obeys. When ${he} finally does, ${his} voice is raspy and weak, but as it gradually gains strength ${he} notices that it sounds more natural and human than ${his} old electrolarynx.`);
diff --git a/js/medicine/surgery/voice/restoreVoice.js b/js/medicine/surgery/voice/restoreVoice.js
index cc58cbfd1d2ae3ff023cc7dae1764f9d1350b4ff..75b968c385ec1dafc39352a5fbd4cdefff2b5636 100644
--- a/js/medicine/surgery/voice/restoreVoice.js
+++ b/js/medicine/surgery/voice/restoreVoice.js
@@ -4,7 +4,7 @@ App.Medicine.Surgery.Reactions.RestoreVoice = class extends App.Medicine.Surgery
const {He, he, his, him} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`The autosurgery instructed ${him} in no uncertain terms not to speak during recovery, but ${he} fails to recall that. ${He} doesn't any effort to speak either, though.`);
} else if (slave.devotion > 50) {
r.push(`The autosurgery instructed ${him} in no uncertain terms not to speak during recovery, so ${he} knows that ${his} voice has been restored. When you come in to check on ${him} late in the process, though, ${he} does ${his} best to communicate adoration with ${his}`);
diff --git a/js/medicine/surgery/voice/voiceLower.js b/js/medicine/surgery/voice/voiceLower.js
index 4ad2e678d232caa66d886f3eea94c6a2d3686f96..ee6c97e9a45f96f77693459971aeacf312734ecd 100644
--- a/js/medicine/surgery/voice/voiceLower.js
+++ b/js/medicine/surgery/voice/voiceLower.js
@@ -4,36 +4,36 @@ App.Medicine.Surgery.Reactions.VoiceLower = class extends App.Medicine.Surgery.S
const {He, he, his, him, himself, hers} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`The autosurgery instructed ${him} in no uncertain terms not to speak during recovery, but ${he} fails to recall that. ${He} doesn't notice anything different. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`Before surgery, ${he} was warned repeatedly not to try talking for a while, and ${he} obeys. When ${he} finally does, ${his} voice is raspy and weak, but it gains strength gradually. It comes out`);
- if (slave.voice === 1) {
+ if (diff.voice === 1) {
r.push(`far`);
}
r.push(`lower and more manly than it was before, and ${he} laughs at ${himself} as ${he} gets used to it. <span class="devotion inc">${He} has become more dominant,</span> since this allows ${him} to think of ${himself} as`);
- if (slave.voice === 1) {
+ if (diff.voice === 1) {
r.push(`an action movie hero.`);
- } else if (slave.voice === 2) {
+ } else if (diff.voice === 2) {
r.push(`a mature career woman.`);
}
r.push(`As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
reaction.devotion += 4;
} else if (slave.devotion > 20) {
r.push(`Before surgery, ${he} was warned repeatedly not to try talking for a while, and ${he} obeys. When ${he} finally does, ${his} voice is raspy and weak, but it gains strength gradually. It comes out`);
- if (slave.voice === 1) {
+ if (diff.voice === 1) {
r.push(`far`);
}
r.push(`lower and more manly than it was before, and ${he} laughs grimly at ${himself} as ${he} gets used to it. ${He} carries on regardless, accepting it as one more thing to learn to accept. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else {
r.push(`Before surgery, ${he} was warned repeatedly not to try talking for a while, and ${he} obeys. When ${he} finally does, ${his} voice is raspy and weak, but it gains strength gradually. It comes out`);
- if (slave.voice === 1) {
+ if (diff.voice === 1) {
r.push(`far`);
}
r.push(`lower and more manly than it was before. For now, <span class="devotion dec">${he} feels this`);
- if (slave.voice === 1) {
+ if (diff.voice === 1) {
r.push(`gravelly`);
- } else if (slave.voice === 2) {
+ } else if (diff.voice === 2) {
r.push(`subdued`);
}
r.push(`voice is not ${hers}, a cruel mockery.</span> As with all surgery <span class="health dec">${his} health has been slightly affected.</span> ${He} is now <span class="trust dec">terribly afraid</span> of your total power over ${his} body.`);
diff --git a/js/medicine/surgery/voice/voiceRaise.js b/js/medicine/surgery/voice/voiceRaise.js
index b79cd071195868c8e306b81e827da86f56dac59b..550d7359eacad89a78017abfde8ecb08095b14ac 100644
--- a/js/medicine/surgery/voice/voiceRaise.js
+++ b/js/medicine/surgery/voice/voiceRaise.js
@@ -4,15 +4,15 @@ App.Medicine.Surgery.Reactions.VoiceRaise = class extends App.Medicine.Surgery.S
const {He, he, his, him, himself, hers} = getPronouns(slave);
const r = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`The autosurgery instructed ${him} in no uncertain terms not to speak during recovery, but ${he} fails to recall that. ${He} doesn't notice anything different. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else if (slave.devotion > 50) {
r.push(`Before surgery, ${he} was warned repeatedly not to try talking for a while, and ${he} obeys. When ${he} finally does, ${his} voice is raspy and weak, but it gains strength gradually. It comes out`);
- if (slave.voice === 3) {
+ if (diff.voice === 3) {
r.push(`far`);
}
r.push(`higher and more girly than it was before, and ${he} laughs at ${himself} as ${he} gets used to it. <span class="devotion inc">${He} has become more submissive,</span> since this helps ${him} to think of ${himself} as a`);
- if (slave.voice === 3) {
+ if (diff.voice === 3) {
r.push(`bimbo slut.`);
} else {
r.push(`real woman.`);
@@ -21,17 +21,17 @@ App.Medicine.Surgery.Reactions.VoiceRaise = class extends App.Medicine.Surgery.S
reaction.devotion += 4;
} else if (slave.devotion > 20) {
r.push(`Before surgery, ${he} was warned repeatedly not to try talking for a while, and ${he} obeys. When ${he} finally does, ${his} voice is raspy and weak, but it gains strength gradually. It comes out`);
- if (slave.voice === 3) {
+ if (diff.voice === 3) {
r.push(`far`);
}
r.push(`higher and more girly than it was before, and ${he} laughs grimly at ${himself} as ${he} gets used to it. ${He} carries on regardless, accepting it as one more thing to learn to accept. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`);
} else {
r.push(`Before surgery, ${he} was warned repeatedly not to try talking for a while, and ${he} obeys. When ${he} finally does, ${his} voice is raspy and weak, but it gains strength gradually. It comes out`);
- if (slave.voice === 3) {
+ if (diff.voice === 3) {
r.push(`far`);
}
r.push(`higher and more girly than it was before. For now, <span class="devotion dec">${he} feels this`);
- if (slave.voice === 3) {
+ if (diff.voice === 3) {
r.push(`bimbo`);
} else {
r.push(`feminine`);
diff --git a/js/medicine/utility.js b/js/medicine/utility.js
index a7e2ba4d7cd20a6b08d4fb70db9883b0643661bb..07682ad63cc4a404a6ece4947b35515719de8d52 100644
--- a/js/medicine/utility.js
+++ b/js/medicine/utility.js
@@ -29,7 +29,7 @@ App.Medicine.pocketVolume = function() {
// now the current skin area:
const A = Math.PI * (a * a + h * h);
- const skinStretchFactor = linearInterpolation(Math.max(slave.physicalAge, 13), 13, 1.5, 45, 1.15);
+ const skinStretchFactor = linearInterpolation(Math.clamp(slave.physicalAge, 13, 45), 13, 1.5, 45, 1.15);
const hMax = Math.sqrt(A * skinStretchFactor / Math.PI - a * a);
const VMax = Math.PI / 6 * hMax * (3 * a * a + hMax * hMax);
diff --git a/js/medicine/z001-organFarm/2-reproductiveOrgans.js b/js/medicine/z001-organFarm/2-reproductiveOrgans.js
index 016ba16eb157c5173c17c0b59bd484bacbb5b529..b7ef9391a478e0ca61fe40a7fb54249ebdd94288 100644
--- a/js/medicine/z001-organFarm/2-reproductiveOrgans.js
+++ b/js/medicine/z001-organFarm/2-reproductiveOrgans.js
@@ -163,7 +163,7 @@ App.Medicine.OrganFarm.AnalWombImplantAction = class extends App.Medicine.OrganF
super({
name: "Implant",
surgeryProcedure: App.Medicine.Surgery.Procedures.OFAddMPreg,
- surgeryProcedureParams: [],
+ surgeryProcedureParams: [eggType, pregData],
canImplant: s => ((this.eggType === "human" || V.animalTesticles > 0) && s.ovaries === 0 && s.vagina <= -1 && s.mpreg === 0 && s.bellyImplant < 0),
implantError: s => {
if (this.eggType !== "human" && V.animalTesticles === 0) {
diff --git a/js/random.js b/js/random.js
index 8b42d1b96c0cc7178746fa1383ac902e8a19d82d..8ab8e1d61ea85182398316e6f9927fec8840c5e2 100644
--- a/js/random.js
+++ b/js/random.js
@@ -11,6 +11,38 @@ function gaussianPair(mean = 0, deviation = 1) {
return [r * Math.cos(sigma), r * Math.sin(sigma)].map(val => val * deviation + mean);
}
+/**
+ * Generate a skewed normal random variable
+ * Reference: http://azzalini.stat.unipd.it/SN/faq-r.html
+ * @param {number} skew
+ * @returns {number}
+ */
+App.Utils.Math.skewedGaussian = function(skew) {
+ let randoms = gaussianPair();
+ if (skew === 0) {
+ // Don't bother, return an unskewed normal distribution
+ return randoms[0];
+ }
+ let delta = skew / Math.sqrt(1 + skew * skew);
+ let result = delta * randoms[0] + Math.sqrt(1 - delta * delta) * randoms[1];
+ return randoms[0] >= 0 ? result : -result;
+};
+
+/**
+ * Generate a skewed normal random variable between max and min
+ * @param {number} max
+ * @param {number} min
+ * @param {number} skew
+ * @returns {number}
+ */
+App.Utils.Math.limitedSkewedGaussian = function(max, min, skew) {
+ let result = App.Utils.Math.skewedGaussian(skew);
+ while (result < min || result > max) {
+ result = App.Utils.Math.skewedGaussian(skew);
+ }
+ return result;
+};
+
/**
* Generate a random integer with a normal distribution between min and max (both inclusive).
* Default parameters result in truncating the standard normal distribution between -3 and +3.
@@ -21,7 +53,6 @@ function gaussianPair(mean = 0, deviation = 1) {
* @param {number} [max]
* @returns {number}
*/
-/* exported normalRandInt */
function normalRandInt(mean = 0, deviation = 1, min = mean - 3 * deviation, max = mean + 3 * deviation) {
let val = gaussianPair(mean, deviation)[0];
while (val < min || val > max) {
@@ -38,7 +69,6 @@ function normalRandInt(mean = 0, deviation = 1, min = mean - 3 * deviation, max
* @param {number} [count]
* @returns {number}
*/
-/* exported jsRandom */
function jsRandom(min, max, count = 1) {
function rand() {
return Math.random() * (max - min + 1) + min;
@@ -62,7 +92,6 @@ function jsRandom(min, max, count = 1) {
* @param {number} count
* @returns {Array<T>}
*/
-/* exported jsRandomMany */
function jsRandomMany(arr, count) {
let result = [];
let tmp = arr.slice();
@@ -80,7 +109,6 @@ function jsRandomMany(arr, count) {
* @param {...T} [otherChoices]
* @returns {T}
*/
-/* exported jsEither */
function jsEither(choices, ...otherChoices) {
if (otherChoices.length === 0 && Array.isArray(choices)) {
return choices[Math.floor(Math.random() * choices.length)];
diff --git a/js/rulesAssistant/conditionEditorSimple.js b/js/rulesAssistant/conditionEditorSimple.js
new file mode 100644
index 0000000000000000000000000000000000000000..64a557a95a6c1a5711122843a60841f5700dc6b5
--- /dev/null
+++ b/js/rulesAssistant/conditionEditorSimple.js
@@ -0,0 +1,424 @@
+/**
+ * All functions should only be called from z1-conditionEditorController.js
+ */
+App.RA.Activation.SimpleEditor = (function() {
+ /**
+ * @typedef {object} RuleState
+ * @property {"always"|"never"|"boolean"|"number"|"string"|"custom"} activeRuleType
+ * @property {string} boolGetter
+ * @property {boolean} negateBool
+ * @property {string} stringGetter
+ * @property {string} stringComparator
+ * @property {string} stringValue
+ * @property {string} numberGetter
+ * @property {number} numberUpperValue
+ * @property {"lt"|"lte"|""} numberUpperComparator
+ * @property {number} numberLowerValue
+ * @property {"gt"|"gte"|""} numberLowerComparator
+ * @property {string[]} assignments
+ * @property {"include"|"exclude"|"ignore"} assignmentMode
+ * @property {string} customGetter
+ * @property {"b"|"s"|"n"} customMode
+ */
+
+ /**
+ * @type {HTMLDivElement}
+ */
+ let editorNode = null;
+ /**
+ * @type {RuleState}
+ */
+ let currentRule = null;
+
+ /**
+ * @param {FC.RA.PostFixRule} rule
+ * @param {HTMLDivElement}parent
+ */
+ function editor(rule, parent) {
+ currentRule = deserializeRule(rule);
+ editorNode = parent;
+ editorNode.append(buildEditor());
+ }
+
+ function refreshEditor() {
+ if (editorNode !== null) {
+ $(editorNode).empty().append(buildEditor());
+ }
+ }
+
+ /**
+ * If the rule is valid, returns the serialized rule, otherwise null.
+ *
+ * @returns {FC.RA.PostFixRule}
+ */
+ function saveEditor() {
+ if (currentRule == null) {
+ return null;
+ }
+ return serializeRule(currentRule);
+ }
+
+ function resetEditor() {
+ currentRule = null;
+ editorNode = null;
+ }
+
+ /**
+ * @returns {HTMLElement}
+ */
+ function buildEditor() {
+ const outerDiv = document.createElement("div");
+ // selector
+ const selectorDiv = document.createElement("div");
+ selectorDiv.classList.add("button-group");
+ outerDiv.append(selectorDiv);
+ App.UI.DOM.appendNewElement("button", selectorDiv, "Always", currentRule.activeRuleType === "always" ? ["selected", "disabled"] : []).onclick = () => {
+ currentRule.activeRuleType = "always";
+ refreshEditor();
+ };
+ App.UI.DOM.appendNewElement("button", selectorDiv, "Never", currentRule.activeRuleType === "never" ? ["selected", "disabled"] : []).onclick = () => {
+ currentRule.activeRuleType = "never";
+ refreshEditor();
+ };
+ App.UI.DOM.appendNewElement("button", selectorDiv, "Boolean", currentRule.activeRuleType === "boolean" ? ["selected", "disabled"] : []).onclick = () => {
+ currentRule.activeRuleType = "boolean";
+ refreshEditor();
+ };
+ App.UI.DOM.appendNewElement("button", selectorDiv, "Number", currentRule.activeRuleType === "number" ? ["selected", "disabled"] : []).onclick = () => {
+ currentRule.activeRuleType = "number";
+ refreshEditor();
+ };
+ App.UI.DOM.appendNewElement("button", selectorDiv, "String", currentRule.activeRuleType === "string" ? ["selected", "disabled"] : []).onclick = () => {
+ currentRule.activeRuleType = "string";
+ refreshEditor();
+ };
+ App.UI.DOM.appendNewElement("button", selectorDiv, "Custom", currentRule.activeRuleType === "custom" ? ["selected", "disabled"] : []).onclick = () => {
+ currentRule.activeRuleType = "custom";
+ refreshEditor();
+ };
+
+ // add bool
+ if (currentRule.activeRuleType === "boolean") {
+ const boolDiv = document.createElement("div");
+ boolDiv.classList.add("button-group");
+ outerDiv.append(boolDiv);
+ /**
+ * @type {selectOption[]}
+ */
+ const options = [];
+ App.RA.Activation.getterManager.booleanGetters.forEach((getter, key) => {
+ if (!getter.visible || getter.visible()) {
+ options.push({
+ key: key, name: getter.name, enabled: !getter.enabled || getter.enabled()
+ });
+ }
+ });
+ boolDiv.append(App.UI.DOM.makeSelect(options, currentRule.boolGetter, key => {
+ currentRule.boolGetter = key;
+ refreshEditor();
+ }));
+ boolDiv.append(" should be ");
+ App.UI.DOM.appendNewElement("button", boolDiv, "True", currentRule.negateBool ? [] : ["selected", "disabled"]).onclick = () => {
+ currentRule.negateBool = false;
+ refreshEditor();
+ };
+ App.UI.DOM.appendNewElement("button", boolDiv, "False", currentRule.negateBool ? ["selected", "disabled"] : []).onclick = () => {
+ currentRule.negateBool = true;
+ refreshEditor();
+ };
+ } else if (currentRule.activeRuleType === "number") {
+ const numberDiv = document.createElement("div");
+ outerDiv.append(numberDiv);
+ /**
+ * @type {selectOption[]}
+ */
+ const options = [];
+ App.RA.Activation.getterManager.numberGetters.forEach((getter, key) => {
+ if (!getter.visible || getter.visible()) {
+ options.push({
+ key: key, name: getter.name, enabled: !getter.enabled || getter.enabled()
+ });
+ }
+ });
+ numberDiv.append(App.UI.DOM.makeSelect(options, currentRule.numberGetter, key => {
+ currentRule.numberGetter = key;
+ refreshEditor();
+ }));
+ numberDiv.append(" should be ");
+ numberDiv.append(App.UI.DOM.makeSelect(
+ [{key: "gt", name: "greater than"}, {key: "gte", name: "greater than or equal to"},
+ {key: "", name: "ignored"}],
+ currentRule.numberLowerComparator, key => {
+ currentRule.numberLowerComparator = key;
+ refreshEditor();
+ }));
+ if (currentRule.numberLowerComparator !== "") {
+ numberDiv.append(" ", App.UI.DOM.makeTextBox(currentRule.numberLowerValue, val => {
+ currentRule.numberLowerValue = val;
+ }, true));
+ }
+ numberDiv.append(" and ");
+ numberDiv.append(App.UI.DOM.makeSelect(
+ [{key: "lt", name: "less than"}, {key: "lte", name: "less than or equal to"},
+ {key: "", name: "ignored"}],
+ currentRule.numberUpperComparator, key => {
+ currentRule.numberUpperComparator = key;
+ refreshEditor();
+ }));
+ if (currentRule.numberUpperComparator !== "") {
+ numberDiv.append(" ", App.UI.DOM.makeTextBox(currentRule.numberUpperValue, val => {
+ currentRule.numberUpperValue = val;
+ }, true));
+ }
+ } else if (currentRule.activeRuleType === "string") {
+ const stringDiv = document.createElement("div");
+ outerDiv.append(stringDiv);
+ /**
+ * @type {selectOption[]}
+ */
+ const options = [];
+ App.RA.Activation.getterManager.stringGetters.forEach((getter, key) => {
+ if (!getter.visible || getter.visible()) {
+ options.push({
+ key: key, name: getter.name, enabled: !getter.enabled || getter.enabled()
+ });
+ }
+ });
+ stringDiv.append(App.UI.DOM.makeSelect(options, currentRule.stringGetter, key => {
+ currentRule.stringGetter = key;
+ refreshEditor();
+ }));
+ stringDiv.append(" should ");
+ stringDiv.append(App.UI.DOM.makeSelect(
+ [{key: "eqstr", name: "equal"}, {key: "substr", name: "contain"}, {key: "match", name: "match"}],
+ currentRule.stringComparator, key => {
+ currentRule.stringComparator = key;
+ refreshEditor();
+ }));
+ stringDiv.append(" ", App.UI.DOM.makeTextBox(currentRule.stringValue, val => {
+ currentRule.stringValue = val;
+ }));
+ } else if (currentRule.activeRuleType === "custom") {
+ const options = new App.UI.OptionsGroup();
+ options.addOption("Mode", "customMode", currentRule)
+ .addValueList([["Boolean", "b"], ["Number", "n"], ["String", "s"]]).addCallbackToEach(refreshEditor);
+ outerDiv.append(options.render());
+ const textArea = document.createElement("textarea");
+ textArea.classList.add("condition-custom");
+ textArea.append(currentRule.customGetter);
+ textArea.onchange = ev => {
+ // @ts-ignore
+ currentRule.customGetter = ev.target.value;
+ refreshEditor();
+ };
+ App.UI.DOM.appendNewElement("div", outerDiv, textArea);
+ }
+
+ // Assignments
+ outerDiv.append("Assignments: ");
+ outerDiv.append(App.UI.DOM.makeSelect(
+ [{key: "ignore", name: "Ignored"}, {key: "include", name: "Include"}, {key: "exclude", name: "Exclude"}],
+ currentRule.assignmentMode, key => {
+ currentRule.assignmentMode = key;
+ refreshEditor();
+ }
+ ));
+ if (currentRule.assignmentMode !== "ignore") {
+ for (const [key, getter] of App.RA.Activation.getterManager.assignmentGetters) {
+ if (getter.enabled && !getter.enabled()) {
+ continue;
+ }
+ const checkbox = document.createElement("input");
+ checkbox.setAttribute("type", "checkbox");
+ checkbox.checked = currentRule.assignments.includes(key);
+ checkbox.onchange = () => {
+ if (!currentRule.assignments.includes(key)) {
+ currentRule.assignments.push(key);
+ } else {
+ const index = currentRule.assignments.indexOf(key);
+ currentRule.assignments.splice(index, 1);
+ }
+ };
+ outerDiv.append(` ${getter.name}: `, checkbox);
+ }
+ }
+
+ return outerDiv;
+ }
+
+ /**
+ * @param {FC.RA.PostFixRule} rule
+ * @returns {RuleState}
+ */
+ function deserializeRule(rule) {
+ // About the TS errors in this function: we can assume a lot about the rule composition because we know it's in
+ // the simple format. The rule itself is still a normal FC.RA.PostFixRule which would allow a lot more.
+ // Therefore, TS is not happy even though we now everything's fine.
+ /**
+ * @type {RuleState}
+ */
+ const ruleState = {
+ activeRuleType: "always",
+ boolGetter: "isfertile",
+ negateBool: false,
+ stringGetter: "label",
+ stringValue: "",
+ stringComparator: "eqstr",
+ numberGetter: "devotion",
+ numberUpperValue: 100,
+ numberUpperComparator: "",
+ numberLowerValue: -100,
+ numberLowerComparator: "",
+ assignments: [],
+ assignmentMode: "ignore",
+ customGetter: "context => false",
+ customMode: "b",
+ };
+ // we know there is only main one rule.
+ let i = 0;
+ const rulePart = rule[i];
+ if (rulePart === true) {
+ ruleState.activeRuleType = "always";
+ } else if (rulePart === false) {
+ ruleState.activeRuleType = "never";
+ } else if (App.RA.Activation.getterManager.isBoolean(rulePart)) {
+ ruleState.activeRuleType = "boolean";
+ ruleState.boolGetter = rulePart;
+ if (rule[i + 1] === "not") {
+ ruleState.negateBool = true;
+ i++;
+ }
+ } else if (App.RA.Activation.getterManager.isNumber(rulePart)) {
+ ruleState.activeRuleType = "number";
+ ruleState.numberGetter = rulePart;
+ // check if there is a lower rule:
+ if (rule[i + 2].startsWith("g")) {
+ ruleState.numberLowerValue = rule[i + 1];
+ ruleState.numberLowerComparator = rule[i + 2];
+ // check if there is also an upper value:
+ if (rule[i + 3] === ruleState.numberGetter) {
+ ruleState.numberUpperValue = rule[i + 4];
+ ruleState.numberUpperComparator = rule[i + 5];
+ i += 3;
+ }
+ } else {
+ ruleState.numberUpperValue = rule[i + 1];
+ ruleState.numberUpperComparator = rule[i + 2];
+ }
+ i += 2;
+ } else if (App.RA.Activation.getterManager.isString(rulePart)) {
+ ruleState.activeRuleType = "string";
+ ruleState.stringGetter = rulePart;
+ ruleState.stringValue = rule[i + 1].slice(1);
+ ruleState.stringComparator = rule[i + 2];
+ i += 2;
+ } else if (typeof rulePart === "string" && rulePart.startsWith("?")) {
+ ruleState.activeRuleType = "custom";
+ ruleState.customMode = rulePart.charAt(1);
+ ruleState.customGetter = rulePart.slice(2);
+ } else {
+ throw new Error("Rule is not in simple mode format!");
+ }
+ i++;
+
+ // check for assignment rules
+ let any = false;
+ while (App.RA.Activation.getterManager.isAssignment(rule[i])) {
+ any = true;
+ ruleState.assignments.push(rule[i]);
+ i++;
+ }
+ if (any) {
+ i += 2;
+ if (rule[i] === "not") {
+ ruleState.assignmentMode = "exclude";
+ i++;
+ } else {
+ ruleState.assignmentMode = "include";
+ }
+ }
+
+ return ruleState;
+ }
+
+ /**
+ * Expects a valid RulePart structure
+ *
+ * @param {RuleState} ruleState
+ * @returns {FC.RA.PostFixRule}
+ */
+ function serializeRule(ruleState) {
+ /**
+ * @type {FC.RA.PostFixRule}
+ */
+ const rule = [];
+ let counter = 0;
+
+ switch (ruleState.activeRuleType) {
+ case "always":
+ rule.push(true);
+ counter++;
+ break;
+ case "never":
+ rule.push(false);
+ counter++;
+ break;
+ case "boolean":
+ rule.push(ruleState.boolGetter);
+ if (ruleState.negateBool) {
+ rule.push("not");
+ }
+ counter++;
+ break;
+ case "number": {
+ let any = false;
+ if (ruleState.numberLowerComparator !== "") {
+ any = true;
+ rule.push(ruleState.numberGetter);
+ rule.push(ruleState.numberLowerValue);
+ rule.push(ruleState.numberLowerComparator);
+ counter++;
+ }
+ if (ruleState.numberUpperComparator !== "") {
+ any = true;
+ rule.push(ruleState.numberGetter);
+ rule.push(ruleState.numberUpperValue);
+ rule.push(ruleState.numberUpperComparator);
+ counter++;
+ }
+ if (!any) {
+ rule.push(true);
+ counter++;
+ }
+ }
+ break;
+ case "string":
+ rule.push(ruleState.stringGetter);
+ rule.push("!" + ruleState.stringValue);
+ rule.push(ruleState.stringComparator);
+ counter++;
+ break;
+ case "custom":
+ rule.push("?" + ruleState.customMode + ruleState.customGetter);
+ counter++;
+ }
+
+ if (ruleState.assignmentMode !== "ignore" && ruleState.assignments.length > 0) {
+ rule.push(...ruleState.assignments);
+ rule.push(ruleState.assignments.length, "or");
+ if (ruleState.assignmentMode === "exclude") {
+ rule.push("not");
+ }
+ counter++;
+ }
+
+ rule.push(counter, "and");
+ return rule;
+ }
+
+ return {
+ build: editor,
+ save: saveEditor,
+ reset: resetEditor,
+ };
+})();
diff --git a/js/rulesAssistant/conditionEditor.js b/js/rulesAssistant/conditionEditorTree.js
similarity index 98%
rename from js/rulesAssistant/conditionEditor.js
rename to js/rulesAssistant/conditionEditorTree.js
index e6f4ec6be0004e6857e6223bd5ec849d95752fb4..84862bc625ff722dcc2e007f94226540f7ac4558 100644
--- a/js/rulesAssistant/conditionEditor.js
+++ b/js/rulesAssistant/conditionEditorTree.js
@@ -1,4 +1,7 @@
-App.RA.Activation.Editor = (function() {
+/**
+ * All functions should only be called from z1-conditionEditorController.js
+ */
+App.RA.Activation.TreeEditor = (function() {
/**
* @type {HTMLDivElement}
*/
@@ -14,14 +17,13 @@ App.RA.Activation.Editor = (function() {
/**
* @param {FC.RA.PostFixRule} rule
- * @returns {HTMLDivElement}
+ * @param {HTMLDivElement}parent
*/
- function editor(rule) {
+ function editor(rule, parent) {
rulePartMap = new Map();
currentRule = deserializeRule(rule);
- editorNode = document.createElement("div");
+ editorNode = parent;
editorNode.append(buildEditor());
- return editorNode;
}
function refreshEditor() {
@@ -31,18 +33,19 @@ App.RA.Activation.Editor = (function() {
}
/**
- * Save the rule, if it is valid.
+ * If the rule is valid, returns the serialized rule, otherwise null.
*
- * @param {(rule:FC.RA.PostFixRule)=>void} callback
+ * @returns {FC.RA.PostFixRule}
*/
- function saveEditor(callback) {
+ function saveEditor() {
if (currentRule == null) {
- return;
+ return null;
}
const error = currentRule.validate([]) === "error";
if (!error) {
- callback(serializeRule(currentRule));
+ return serializeRule(currentRule);
}
+ return null;
}
function resetEditor() {
@@ -70,7 +73,7 @@ App.RA.Activation.Editor = (function() {
} else {
ruleDiv.append("Condition saved.");
}
- ruleDiv.append(" ", App.Encyclopedia.Dialog.linkDOM("Help", "RA Condition Editor"));
+ ruleDiv.append(" ", App.Encyclopedia.link("Help", "RA Condition Editor"));
ruleDiv.append(currentRule.render());
outerDiv.append(ruleDiv);
@@ -87,6 +90,7 @@ App.RA.Activation.Editor = (function() {
App.UI.DOM.appendNewElement("h3", container, "Part Browser");
const div = document.createElement("div");
div.classList.add("rule-part-browser");
+ div.append(new RulePartTrash().render());
div.append(new RulePartProvider(() => new RuleGroup("and")).render());
div.append(new RulePartProvider(() => new RuleGroup("add")).render());
div.append(new RulePartProvider(() => new RuleNegate()).render());
diff --git a/js/rulesAssistant/conditionEvaluation.js b/js/rulesAssistant/conditionEvaluation.js
index e3c50573c7529e77a4f7cab7d70c471bd788ca74..ab3cc47e65f66653426b140d748851c45e77ed5d 100644
--- a/js/rulesAssistant/conditionEvaluation.js
+++ b/js/rulesAssistant/conditionEvaluation.js
@@ -539,6 +539,10 @@ App.RA.Activation.populateGetters = function() {
name: "Pregnancy Multiples", description: "Fetus count, known only after the 10th week of pregnancy",
val: c => c.slave.pregType
});
+ gm.addNumber("pregWeeks", {
+ name: "Pregnancy Progress", description: "Fetal development status, in weeks equivalent to unaccelerated pregnancy. Negative is postpartum.",
+ val: c => c.slave.pregWeek
+ });
gm.addNumber("bellyImplant", {
name: "Belly Implant", description: "Volume in CCs. None: -1",
val: c => c.slave.bellyImplant
@@ -622,6 +626,26 @@ App.RA.Activation.populateGetters = function() {
description: "Very narrow: -2, Narrow: -1, Normal: 0, Wide hips: 1, Very wide hips: 2, Inhumanly wide hips: 3",
val: c => c.slave.hips
});
+ gm.addNumber("shoulders", {
+ name: "Shoulders",
+ description: "Very narrow: -2, Narrow: -1, Feminine: 0, Broad: 1, Very broad: 2",
+ val: c => c.slave.shoulders
+ });
+ gm.addNumber("vagina", {
+ name: "Vagina Size",
+ description: "No Vagina: -1, Virgin: 0, Tight: 1, higher numbers are looser.",
+ val: c => c.slave.vagina
+ });
+ gm.addNumber("anus", {
+ name: "Anus Size",
+ description: "Virgin: 0, Tight: 1, higher numbers are looser.",
+ val: c => c.slave.anus
+ });
+ gm.addNumber("wetness", {
+ name: "Vaginal Wetness",
+ description: "How easily the slave gets wet: dry: 0, wet: 1, soaking wet: 2",
+ val: c => c.slave.vaginaLube
+ });
gm.addNumber("oralskill", {
name: "Oral Skill",
description: "Unskilled: (-∞, 10), Basic: [10, 30), Skilled: [30, 60), Expert: [60, 99), Master: [99, ∞)",
@@ -671,6 +695,16 @@ App.RA.Activation.populateGetters = function() {
"'pregnancy', 'none' (AKA vanilla)",
val: c => c.slave.fetish
});
+ gm.addString("teeth", {
+ name: "Teeth",
+ description: "One of 'normal', 'crooked', 'gapped', 'straightening braces', 'cosmetic braces', 'removable', 'pointy', 'fangs', 'fang', 'baby', 'mixed'",
+ val: c => c.slave.teeth
+ });
+ gm.addString("faceshape", {
+ name: "Face Shape",
+ description: "One of 'normal', 'masculine', 'androgynous', 'cute', 'sensual', 'exotic', 'feline' (catmod only)",
+ val: c => c.slave.faceShape
+ });
gm.addString("title", {
name: "Title",
description: "Slave title (class) without adjectives (slavegirl, MILF, bimbo, shemale, herm, etc.). ",
diff --git a/js/rulesAssistant/z1-conditionEditorController.js b/js/rulesAssistant/z1-conditionEditorController.js
new file mode 100644
index 0000000000000000000000000000000000000000..a45aa13f4624221969686df21c0af27483cf14bb
--- /dev/null
+++ b/js/rulesAssistant/z1-conditionEditorController.js
@@ -0,0 +1,98 @@
+App.RA.Activation.Editor = (function() {
+ /**
+ * Should the advanced mode (tree editor) be used?
+ * @type {boolean}
+ */
+ let advanced = false;
+ /**
+ * Keep a reference to the outermost node, so we can refresh it when needed.
+ * @type {HTMLDivElement}
+ */
+ let outerNode = null;
+
+ /**
+ * @param {FC.RA.RuleConditionEditorArguments} args
+ * @returns {HTMLDivElement}
+ */
+ function editor(args) {
+ outerNode = document.createElement("div");
+ fillOuterNode(args);
+ return outerNode;
+ }
+
+ /**
+ * @param {FC.RA.RuleConditionEditorArguments} args
+ */
+ function fillOuterNode(args) {
+ advanced = args.advancedMode;
+ let editorNode = document.createElement("div");
+ if (advanced) {
+ outerNode.append(App.UI.DOM.link("Reset to simple mode", () => {
+ if (SugarCube.Dialog.isOpen()) {
+ SugarCube.Dialog.close();
+ }
+ SugarCube.Dialog.setup("Reset RA to simple mode");
+ $(SugarCube.Dialog.body()).empty().append(
+ "<p>Resetting will delete your current conditions. Do you want to continue?</p>",
+ App.UI.DOM.link("Yes, delete conditions.", () => {
+ args.advancedMode = false;
+ args.activation = App.RA.newRule.conditions().activation;
+ SugarCube.Dialog.close();
+ $(outerNode).empty();
+ fillOuterNode(args);
+ }), " ",
+ App.UI.DOM.makeElement("p", App.UI.DOM.link("Abort.", () => {
+ SugarCube.Dialog.close();
+ })));
+ SugarCube.Dialog.open();
+ }));
+ App.RA.Activation.TreeEditor.build(args.activation, editorNode);
+ } else {
+ outerNode.append(App.UI.DOM.link("Switch to advanced mode", () => {
+ args.advancedMode = true;
+ $(outerNode).empty();
+ fillOuterNode(args);
+ }));
+ App.RA.Activation.SimpleEditor.build(args.activation, editorNode);
+ }
+ outerNode.append(editorNode);
+ }
+
+ /**
+ * Save the rule, if it is valid.
+ *
+ * @param {FC.RA.RuleConditionEditorArguments} args
+ */
+ function saveEditor(args) {
+ if (advanced) {
+ let rule = App.RA.Activation.TreeEditor.save();
+ if (rule == null) {
+ return;
+ }
+ args.advancedMode = advanced;
+ args.activation = rule;
+ } else {
+ let rule = App.RA.Activation.SimpleEditor.save();
+ if (rule == null) {
+ return;
+ }
+ args.advancedMode = advanced;
+ args.activation = rule;
+ }
+ }
+
+ function resetEditor() {
+ App.RA.Activation.TreeEditor.reset();
+ App.RA.Activation.SimpleEditor.reset();
+ outerNode = null;
+ advanced = false;
+ }
+
+ return {
+ build: editor,
+ save: saveEditor,
+ reset: resetEditor,
+ // Because of this reference we need to load after conditionEditorTree.js
+ validateRule: App.RA.Activation.TreeEditor.validateRule,
+ };
+})();
diff --git a/js/utils.js b/js/utils.js
index 4ee72ebf6bced819a356a55e31f26f4e3e07c9f9..c1579fbda1731c3970af55f0e9d43ff0ecc28370 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -309,16 +309,17 @@ App.Utils.topologicalSort = function(keys, edges) {
nodes[from].afters.push(to);
});
- // 2. topological sort
- Object.keys(nodes).forEach(function visit(idstr, ancestors) {
+ /** 2. topological sort with visitor
+ * @param {string} idstr
+ * @param {number[]} [ancestors]
+ */
+ function visit(idstr, ancestors = []) {
let node = nodes[idstr];
let id = node.id;
// if already exists, do nothing
if (visited[idstr]) { return; }
- if (!Array.isArray(ancestors)) { ancestors = []; }
-
ancestors.push(id);
visited[idstr] = true;
@@ -332,7 +333,8 @@ App.Utils.topologicalSort = function(keys, edges) {
});
sorted.unshift(id);
- });
+ }
+ Object.keys(nodes).forEach(node => visit(node));
return sorted;
};
@@ -363,25 +365,7 @@ function sortArrayByArray(sorted, unsorted, key) {
* @param {object} source
*/
function deepAssign(target, source) {
- function isObject(o) {
- return (o !== undefined && o !== null && typeof o === 'object' && !Array.isArray(o));
- }
-
- if (isObject(target) && isObject(source)) {
- for (const key in source) {
- if (!source.hasOwnProperty(key)) { continue; }
- if (isObject(source[key])) {
- if (!target.hasOwnProperty(key) || !isObject(target[key])) {
- target[key] = {};
- }
- deepAssign(target[key], source[key]);
- } else {
- Object.assign(target, {
- [key]: source[key]
- });
- }
- }
- }
+ _.merge(target, _.cloneDeep(source));
}
/**
diff --git a/package.json b/package.json
index 8597ed95c2aef8be7a4022b1bcf317a0e1b8ce43..7a0c99af1660088612e905c08ef2de5dcbc7fb8e 100644
--- a/package.json
+++ b/package.json
@@ -12,9 +12,9 @@
},
"license": "GPL-3.0-only",
"devDependencies": {
- "@types/d3": "^5.7.2",
+ "@types/d3": "^7.4.0",
"@types/jquery": "^3.5.1",
- "@types/lodash": "^4.14.159",
+ "@types/lodash": "^4.14.185",
"@types/mousetrap": "^1.6.3",
"@types/twine-sugarcube": "^2.36.1",
"eslint": "^8.0.0",
@@ -35,6 +35,7 @@
"gulp-sort": "^2.0.0",
"gulp-sourcemaps": "^3.0.0",
"gulp-strip-comments": "^2.5.2",
+ "postcss": "^8.1.0",
"which": "^2.0.2",
"yargs": "^16.0.0"
}
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index 39cb83be86f21ba4839ff7b4c999fbd7d7988c6c..d66255ea8f41e0bdbed16d2b6176241b2f725f3a 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -1,6 +1,6 @@
App.Version = {
base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
- pmod: "4.0.0-alpha.17",
+ pmod: "4.0.0-alpha.21",
commitHash: null,
- release: 1170, // When getting close to 2000, please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js.
+ release: 1183, // When getting close to 2000, please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js.
};
diff --git a/src/004-base/encyclopediaMap.js b/src/004-base/encyclopediaMap.js
index e026f5b183c7d7f974b788faee2c714c44e30294..20544538f817b5e6ed3540f91ee7a47b1fd81381 100644
--- a/src/004-base/encyclopediaMap.js
+++ b/src/004-base/encyclopediaMap.js
@@ -11,7 +11,6 @@ App.Encyclopedia.articles = new Map();
/**
* Adds an article if it does not exist yet.
- *
* @param {string} key
* @param {function():(HTMLElement|DocumentFragment)} article
* @param {string} [category]
@@ -26,7 +25,6 @@ App.Encyclopedia.addArticle = function(key, article, category) {
/**
* Renders the specified article.
- *
* @param {string} article
* @returns {string|HTMLElement|DocumentFragment}
*/
@@ -34,10 +32,7 @@ App.Encyclopedia.renderArticle = function(article) {
if (App.Encyclopedia.articles.has(article)) {
return App.Encyclopedia.articles.get(article).render();
}
-
- // TODO: turn this back on when completed.
- // return `Encyclopedia article "${article}" not found.`;
- return null;
+ return `Encyclopedia article "${article}" not found.`;
};
// Categories map
@@ -48,7 +43,6 @@ App.Encyclopedia.categories = new Map();
/**
* Adds an article if it does not exist yet.
- *
* @param {string} key
* @param {function():(HTMLElement|DocumentFragment)} category
*/
@@ -62,28 +56,21 @@ App.Encyclopedia.addCategory = function(key, category) {
/**
* Renders the specified article.
- *
* @param {string} article
* @returns {string|HTMLElement|DocumentFragment}
*/
App.Encyclopedia.renderCategory = function(article) {
if (!App.Encyclopedia.articles.has(article)) {
- // TODO: turn this back on when completed.
- // return `Encyclopedia article "${article}" not found.`;
- return null;
+ return `Encyclopedia article "${article}" not found.`;
}
const category = App.Encyclopedia.articles.get(article).category;
if (!category) {
- // TODO: turn this back on when completed.
- // return `Encyclopedia article "${article}" has no category.`;
- return null;
+ return `Encyclopedia article "${article}" has no category.`;
}
-
if (!App.Encyclopedia.categories.has(category)) {
return `Encyclopedia category "${category}" not found.`;
}
-
return App.Encyclopedia.categories.get(category)();
};
@@ -99,12 +86,9 @@ App.Encyclopedia.topic = function(topic) {
*/
App.Encyclopedia.addArticleSource = function(parent, source, author) {
const r = [];
-
if (author) {
r.push(`<span class='author'>${author},</span>`);
}
-
r.push(`<span class='article'>${source}</span>`);
-
App.Events.addNode(parent, r, "p", "encyclopedia-source");
};
diff --git a/src/004-base/facility.js b/src/004-base/facility.js
index e5c54f0f8969a62f58c43e3185d1d34ab8abdeea..2d520d272fceba5ae490510b279042f2175a15d2 100644
--- a/src/004-base/facility.js
+++ b/src/004-base/facility.js
@@ -40,7 +40,7 @@ App.Entity.Facilities.Job = class {
if (!this.desc.fuckdollAccepted && slave.fuckdoll > 0) {
r.push(`Fuckdolls can't ${this.desc.assignment} at ${this.facility.name}.`);
}
- if (!this.desc.broodmotherAccepted && slave.preg > 37 && slave.broodmother === 2) {
+ if (!this.desc.broodmotherAccepted && slave.preg >= 36 && slave.broodmother === 2) {
r.push(`Birthing broodmothers can't ${this.desc.assignment}.`);
}
return r;
@@ -195,7 +195,7 @@ App.Entity.Facilities.ManagingJob = class extends App.Entity.Facilities.Job {
if (this.desc.shouldTalk && !canTalk(slave)) {
r.push(`${slave.slaveName} must be able to talk.`);
}
- if (this.desc.shouldThink && slave.fetish === "mindbroken") {
+ if (this.desc.shouldThink && slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} must possess cognition.`);
}
return r;
@@ -207,7 +207,7 @@ App.Entity.Facilities.ManagingJob = class extends App.Entity.Facilities.Job {
* @returns {boolean}
*/
slaveHasExperience(slave) {
- return (this.desc.skill && slave.skill[this.desc.skill] >= V.masteredXP) || (this.desc.careers.includes(slave.career));
+ return (this.desc.skill && slave.skill[this.desc.skill] >= Constant.MASTERED_XP) || (this.desc.careers.includes(slave.career));
}
/** @returns {App.Entity.SlaveState} */
@@ -253,7 +253,10 @@ App.Entity.Facilities.Facility = class {
// default manager job implementation
manager = (this.desc.manager !== null) ? new App.Entity.Facilities.ManagingJob() : null;
}
- /** @private */
+ /**
+ * @private
+ * @type {App.Entity.Facilities.ManagingJob}
+ */
this._manager = manager;
if (this._manager !== null) {
this._manager.facility = this;
@@ -329,8 +332,12 @@ App.Entity.Facilities.Facility = class {
}
/** Number of already hosted slaves
+ * @param {string} [jobName]
* @returns {number} */
- get hostedSlaves() {
+ hostedSlaves(jobName) {
+ if (jobName) {
+ return this._jobs[jobName].employeesIDs().size;
+ }
return this.jobs.reduce((acc, job) => { return acc + job.employeesIDs().size; }, 0);
}
@@ -339,7 +346,7 @@ App.Entity.Facilities.Facility = class {
* @returns {number}
*/
get totalEmployeesCount() {
- return this.hostedSlaves + ((this.manager && this.manager.currentEmployee) ? 1 : 0);
+ return this.hostedSlaves() + ((this.manager && this.manager.currentEmployee) ? 1 : 0);
}
/**
@@ -353,7 +360,7 @@ App.Entity.Facilities.Facility = class {
* @returns {number} total count of facility places taken by employees and other beings (e.g. bioreactors in the dairy)
*/
get totalOccupants() {
- return this.hostedSlaves + this.nonEmployeeOccupantsCount;
+ return this.hostedSlaves() + this.nonEmployeeOccupantsCount;
}
get hasEmployees() {
@@ -420,11 +427,10 @@ App.Entity.Facilities.Facility = class {
/**
* Can this facility host the given slave
* @param {App.Entity.SlaveState} slave
- * @param {string} [job]
+ * @param {string} [job] default job if omitted
* @returns {string[]} array with rejection reasons. Slave can be hosted if this is empty.
*/
canHostSlave(slave, job) {
- job = job || this.desc.defaultJob;
const j = this.job(job);
if (j === undefined) {
if (this.jobs.length === 0) {
@@ -435,10 +441,6 @@ App.Entity.Facilities.Facility = class {
console.warn(`Can't find job ${job} at ${this.name}.`); // eslint-disable-line no-console
}
}
- // if there are more than one job at this facility, test them too
- if (Object.keys(this.desc.jobs).length > 1 && this.isHosted(slave)) {
- return [`${slave.slaveName} is already assigned to ${slave.assignment} at ${this.name}.`];
- }
return j.canEmploy(slave);
}
@@ -533,7 +535,7 @@ App.Entity.Facilities.Facility = class {
const managerStr = this.manager && this.manager.currentEmployee ? (
long ? `, ${this.manager.desc.position}` : `, ${this.manager.positionAbbreviation}`) : "";
const slavesStr = long ? ` ${this.job().desc.position}${this.capacity !== 1 ? 's' : ''}` : "";
- return `${this.hostedSlaves}${nonEmployees ? `+${nonEmployees}` : ""}/${this.capacity}${slavesStr}${managerStr}`;
+ return `${this.hostedSlaves()}${nonEmployees ? `+${nonEmployees}` : ""}/${this.capacity}${slavesStr}${managerStr}`;
}
/**
diff --git a/src/004-base/facilityFramework.js b/src/004-base/facilityFramework.js
index 81aeeee1596ddae8ef624e92bf14c137692fb79e..e618f793e5a52f0057fb4a78f892ff36eeb34a3f 100644
--- a/src/004-base/facilityFramework.js
+++ b/src/004-base/facilityFramework.js
@@ -138,11 +138,11 @@ App.Facilities.Facility = class Facility {
const capacity = typeof V[this.facility.desc.baseName] === 'object'
? V[this.facility.desc.baseName].capacity
: V[this.facility.desc.baseName];
- const occupancy = this.facility.hostedSlaves;
+ const occupancy = this.facility.hostedSlaves();
const maximum = this.expand.maximum || Number.MAX_SAFE_INTEGER;
const amount = this.expand.amount;
const desc = this.expand.desc ||
- `${this.facility.nameCaps} can support ${this.facility.capacity} slaves. There ${this.facility.hostedSlaves === 1 ? `is` : `are`} currently ${numberWithPluralOne(this.facility.hostedSlaves, "slave")} here.`;
+ `${this.facility.nameCaps} can support ${this.facility.capacity} slaves. There ${this.facility.hostedSlaves() === 1 ? `is` : `are`} currently ${numberWithPluralOne(this.facility.hostedSlaves(), "slave")} here.`;
let cost = this.expand.cost || capacity * 1000 * V.upgradeMultiplierArcology;
div.append(desc);
@@ -161,20 +161,22 @@ App.Facilities.Facility = class Facility {
} else {
const link = document.createElement("span");
const baseCost = cost;
- const array = [];
- for (const expand of [10, 25, 50, 100].filter(s => capacity - occupancy >= s)) {
+ const upgrades = [10, 25, 50, 100];
+ const available = maximum ? upgrades.filter(s => maximum - occupancy >= s) : upgrades;
+ const options = [];
+ for (const expand of available) {
cost = baseCost * (expand / 5);
- array.push(
- App.UI.DOM.link(`x${expand}`, () => { expandFacility(expand, cost); }, [], '', `+${expand} slots will cost ${cashFormat(Math.trunc(cost))}`)
+ options.push(
+ App.UI.DOM.link(`x${expand}`, () => { expandFacility(expand, cost); }, [], '', `An additional ${num(expand)} slots will cost ${cashFormat(Math.trunc(cost))}.`)
);
}
- link.append(App.UI.DOM.generateLinksStrip(array));
+ link.append(App.UI.DOM.generateLinksStrip(options));
const linkArray = [];
App.UI.DOM.appendNewElement("div", div);
div.append(`Expanding ${this.facility.name} by ${num(5)} slots will cost ${cashFormat(Math.trunc(baseCost))}: `);
linkArray.push(App.UI.DOM.link(`x5`, () => { expandFacility(5, baseCost); }));
- if (capacity - occupancy >= 10) {
+ if (!maximum || maximum - occupancy >= 10) {
linkArray.push(App.UI.DOM.linkReplace(`Additional options`, link));
}
div.append(App.UI.DOM.generateLinksStrip(linkArray));
@@ -231,16 +233,16 @@ App.Facilities.Facility = class Facility {
_makeRules() {
const div = document.createElement("div");
- if (this.rules.length > 0 && this.rules.some(rule => rule.prereqs.every(prereq => prereq()))) {
+ if (this.rules.length > 0 && this.rules.some(rule => rule.prereqs.every(prereq => prereq === true))) {
App.UI.DOM.appendNewElement("h2", div, `Rules`);
this._rules.forEach(rule => {
- if (rule.prereqs.every(prereq => prereq())) {
+ if (rule.prereqs.every(prereq => prereq === true)) {
const options = new App.UI.OptionsGroup();
const option = options.addOption(null, rule.property, rule.object || V);
rule.options.forEach(o => {
- if (!o.prereqs || o.prereqs.every(prereq => prereq())) {
+ if (!o.prereqs || o.prereqs.every(prereq => prereq === true)) {
option.addValue(o.link, o.value);
if (o.handler) {
option.addCallback(o.handler);
diff --git a/src/005-passages/SpecialUIPassages.js b/src/005-passages/SpecialUIPassages.js
index ef4ea12110da8074a9a3466a5ef557346919a569..f2edeacc433676aeaf75c72e97f3b25e89c86051 100644
--- a/src/005-passages/SpecialUIPassages.js
+++ b/src/005-passages/SpecialUIPassages.js
@@ -1 +1,2 @@
new App.DomPassage("StoryCaption", () => { return App.UI.storyCaption(); });
+new App.DomPassage("Encyclopedia", () => { return App.Encyclopedia.ui(); });
diff --git a/src/005-passages/bcPassages.js b/src/005-passages/bcPassages.js
index 47e6bbb32868dbe8217505c6be194d01400fa3e5..f8c9f93fd2c68bbc7da8afefa617004ba494242d 100644
--- a/src/005-passages/bcPassages.js
+++ b/src/005-passages/bcPassages.js
@@ -2,10 +2,8 @@ new App.DomPassage("Backwards Compatibility",
() => {
V.nextButton = "Continue";
V.nextLink = "Main";
- V.returnTo = "Main";
App.Update.setNonexistentProperties(V, App.Data.defaultGameStateVariables);
-
// resetOnNGPlus contains half of the variables we need, but we use it politely here instead of forcing it so it
// fills in holes instead of overwriting data.
App.Update.setNonexistentProperties(V, App.Data.resetOnNGPlus);
diff --git a/src/005-passages/endWeekPassages.js b/src/005-passages/endWeekPassages.js
index c7cdc293a1dffa690a29c4488b126efb01052b43..33e93c72fd560dbca0439cc4605bb0ba91690c5c 100644
--- a/src/005-passages/endWeekPassages.js
+++ b/src/005-passages/endWeekPassages.js
@@ -37,10 +37,3 @@ new App.DomPassage("Economics",
return App.EndWeek.economics();
}
);
-
-new App.DomPassage("Security Force Naming-Colonel",
- () => {
- V.nextButton = " ";
- return App.UI.securityForceNamingColonel();
- }
-);
diff --git a/src/005-passages/facilitiesPassages.js b/src/005-passages/facilitiesPassages.js
index e8c1e26252d0fb8fd81b83b8da364aa5aeacc22c..45127852fe761e41f486c55fabfd21e68aeaf046 100644
--- a/src/005-passages/facilitiesPassages.js
+++ b/src/005-passages/facilitiesPassages.js
@@ -21,7 +21,7 @@ new App.DomPassage("Master Suite", () => { return new App.Facilities.MasterSuite
new App.DomPassage("Nursery", () => { return new App.Facilities.Nursery.nursery().render(); }, ["jump-to-safe", "jump-from-safe"]);
-new App.DomPassage("Pit", () => { return new App.Facilities.Pit.pit().render(); }, ["jump-to-safe", "jump-from-safe"]);
+new App.DomPassage("Pit", () => { return App.Facilities.Pit.pit(); }, ["jump-to-safe", "jump-from-safe"]);
new App.DomPassage("Schoolroom", () => { return new App.Facilities.Schoolroom.schoolroom().render(); }, ["jump-to-safe", "jump-from-safe"]);
@@ -241,7 +241,7 @@ new App.DomPassage("Toy Shop",
new App.DomPassage("Dispensary",
() => {
- V.nextButton = "Back"; V.nextLink = "Manage Penthouse"; V.encyclopedia = "The Pharmaceutical Fab.";
+ V.nextButton = "Back"; V.nextLink = "Manage Penthouse"; V.encyclopedia = "The Pharmaceutical Fab";
return App.UI.dispensary();
}, ["jump-to-safe", "jump-from-safe"]
diff --git a/src/005-passages/interactPassages.js b/src/005-passages/interactPassages.js
index a25a8d7c9ae78b73bdbfd512d0a4d4df740e8617..3861c266e58c02a64ffc9a6671ba57d6677f94b3 100644
--- a/src/005-passages/interactPassages.js
+++ b/src/005-passages/interactPassages.js
@@ -379,3 +379,20 @@ new App.DomPassage("Subordinate Targeting",
return App.UI.subordinateTargeting();
}
);
+
+new App.DomPassage("Dinner Party Preparations",
+ () => {
+ V.nextButton = "Cancel The Event";
+ V.nextLink = "Main";
+ return App.Mods.DinnerParty.Prep();
+ }
+);
+
+new App.DomPassage("Dinner Party Execution",
+ () => {
+ V.nextButton = "Back to Main";
+ V.nextLink = "Main";
+ V.encyclopedia = "Personal Assistant";
+ return App.Mods.DinnerParty.Execution();
+ }
+);
diff --git a/src/005-passages/managePassages.js b/src/005-passages/managePassages.js
index ce546fc095f99b5fd2c9247e1d3f4c72cfadb689..c62ebe6a7a9ab5695d34245640041780f3a5dfb2 100644
--- a/src/005-passages/managePassages.js
+++ b/src/005-passages/managePassages.js
@@ -32,7 +32,7 @@ new App.DomPassage("retire",
() => {
V.nextButton = "Back";
V.nextLink = "Main";
- return retireScene(getSlave(V.AS));
+ return App.Events.retire(getSlave(V.AS));
}
);
@@ -91,12 +91,26 @@ new App.DomPassage("Farmyard Animals",
}
);
+new App.DomPassage("Doctor Consultation",
+ () => {
+ return App.UI.doctorConsultation();
+ }
+);
+
new App.DomPassage("Elective Surgery",
() => {
return App.UI.electiveSurgery();
}
);
+new App.DomPassage("Personal Appearance",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Manage Personal Affairs";
+ return App.UI.playerSalon(V.PC);
+ }, ["jump-to-safe", "jump-from-safe"]
+);
+
new App.DomPassage("Brothel Advertisement",
() => {
return App.Facilities.Brothel.ads();
@@ -163,7 +177,7 @@ new App.DomPassage("Gene Lab",
() => {
V.nextButton = "Back";
V.nextLink = "Manage Penthouse";
- V.encyclopedia = "The Pharmaceutical Fab.";
+ V.encyclopedia = "The Pharmaceutical Fab";
return App.UI.geneLab();
}, ["jump-to-safe", "jump-from-safe"]
);
@@ -180,7 +194,7 @@ new App.DomPassage("Implant Manufactory",
() => {
V.nextButton = "Back";
V.nextLink = "Manage Penthouse";
- V.encyclopedia = "The Pharmaceutical Fab.";
+ V.encyclopedia = "The Pharmaceutical Fab";
return App.UI.implantManufactory();
}, ["jump-to-safe", "jump-from-safe"]
);
@@ -189,7 +203,7 @@ new App.DomPassage("Organ Farm",
() => {
V.nextButton = "Back";
V.nextLink = "Manage Penthouse";
- V.encyclopedia = "The Pharmaceutical Fab.";
+ V.encyclopedia = "The Pharmaceutical Fab";
return App.UI.organFarm();
}, ["jump-to-safe", "jump-from-safe"]
);
@@ -214,6 +228,7 @@ new App.DomPassage("Firebase",
() => {
V.nextButton = "Back";
V.nextLink = "Main";
+ V.encyclopedia = "Special Force";
return App.UI.FireBase();
}, ["jump-to-safe", "jump-from-safe"]
);
@@ -225,3 +240,12 @@ new App.DomPassage("edicts",
return App.Mods.SecExp.edicts();
}, ["jump-to-safe", "jump-from-safe"]
);
+
+new App.DomPassage("Media Studio",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Manage Penthouse";
+ V.encyclopedia = "Media Hub";
+ return App.UI.mediaStudio();
+ }, ["jump-to-safe", "jump-from-safe"]
+);
diff --git a/src/Corporation/005-divisionBase.js b/src/Corporation/005-divisionBase.js
new file mode 100644
index 0000000000000000000000000000000000000000..b0f5297fd1fed40222082608f6669cd525ed16ef
--- /dev/null
+++ b/src/Corporation/005-divisionBase.js
@@ -0,0 +1,499 @@
+App.Corporate.Shared.averageRange = class {
+ constructor({center, range}) {
+ this._const = {
+ center,
+ range
+ };
+ }
+
+ get center() { return this._const.center; }
+
+ get range() { return this._const.range; }
+
+ roll() {
+ let roll = Math.clamp(gaussianPair(0, 0.2)[0], -0.5, 0.5);
+ return {roll, value: (roll * this.range) + this.center};
+ }
+
+ rollInt() {
+ let retval = this.roll();
+ retval.value = Math.trunc(retval.value);
+ return retval;
+ }
+};
+
+App.Corporate.Shared.RelatedDivisionType = class {
+ constructor() {
+ this._var = {
+ to: [],
+ from: [],
+ all: []
+ };
+ }
+
+ get to() { return this._var.to; }
+
+ get from() { return this._var.from; }
+
+ get all() { return this._var.all; }
+
+ addTo(value) {
+ this._var.to.push(value);
+ this._var.all.push(value);
+ }
+
+ addFrom(value) {
+ this._var.from.push(value);
+ this._var.all.push(value);
+ }
+
+ get anyFounded() { return this.all.some(div => div.founded); }
+};
+App.Corporate.Shared.FoundingType = class {
+ constructor(division, {corporateCash, startingSize = 10}) {
+ this._const = {
+ division,
+ cash: corporateCash,
+ size: startingSize
+ };
+ }
+
+ get cash() { return this._const.cash; }
+
+ get size() { return this._const.size; }
+
+ get startingPrice() {
+ let div = this._const.division;
+ return this._const.cash + div.foundingCost;
+ }
+};
+App.Corporate.Shared.SellOverflowSlaves = function(division) {
+ const slavesToSell = division.activeSlaves - division.developmentCount;
+ if (slavesToSell > 0) {
+ const slaveProcCost = Math.trunc(App.Corporate.slaveMarketPurchaseValue(division, -slavesToSell));
+ App.Corporate.chargeAsset(slaveProcCost, "slaves");
+ division.activeSlaves -= slavesToSell;
+ V.menialDemandFactor -= slavesToSell;
+ }
+};
+App.Corporate.Shared.SellUnhousedSlaves = function(division, divLedger, rate) {
+ if (divLedger.market.sell != 0) {
+ return;
+ }
+
+ let housing = Math.trunc(2 * rate * division.developmentCount);
+ let unhoused = division.heldSlaves - housing - divLedger.transfer.total;
+ if (unhoused <= 0) {
+ return;
+ }
+
+ divLedger.market.sell = unhoused;
+};
+App.Corporate.Shared.MessageProcessedSlaves = function(division, verbPhrase, color) {
+ let procCount = Math.trunc(division.developmentCount * division.processRate);
+ let slaveCountedNoun = numberWithPluralNonZero(procCount, "slave");
+
+ return `It ${verbPhrase} approximately <span class="${color}">${slaveCountedNoun}</span> each week when operating at capacity (${division.developmentCount})`;
+};
+App.Corporate.Shared.MessageSlaveToMarket = function(division) {
+ return `The slaves from this division can be sold for <span class='yellowgreen'>${cashFormat(Math.trunc(division.soldSlaveValue * menialSlaveCost()))}</span> each.`;
+};
+App.Corporate.Shared.EndWeekProcessing_Slaves = function(processingCount, rate) {
+ const perDevPair = rate.roll();
+ let slaveIncrease = perDevPair.value * processingCount;
+ if (slaveIncrease < 1) {
+ slaveIncrease = (slaveIncrease > Math.random() ? 1 : 0);
+ }
+ return {efficiency: perDevPair.roll, value: Math.trunc(slaveIncrease)};
+};
+App.Corporate.Shared.FoundingSetupAutoBuy = function(division) {
+ let foundedFrom = division.relatedDivisions.from.filter(div => div.founded);
+ if (foundedFrom.length === 0) {
+ division.setAutoBuyFromMarket(true);
+ } else {
+ for (let otherDiv of foundedFrom) {
+ if (otherDiv.getAutoSendToMarket()) {
+ otherDiv.setAutoSendToDivision(division, true);
+ }
+ }
+ }
+};
+App.Corporate.Shared.FoundingSetupAutoSell = function(division) {
+ let foundedTo = division.relatedDivisions.to.filter(div => div.founded);
+ if (foundedTo.length === 0) {
+ division.setAutoSendToMarket(true);
+ } else {
+ for (let otherDiv of foundedTo) {
+ if (otherDiv.getAutoBuyFromMarket()) {
+ division.setAutoSendToDivision(otherDiv, true);
+ }
+ }
+ }
+};
+
+App.Corporate.Division.Base = class {
+ constructor({id, name, focusDescription, sizeCost, maintenance, founding, merger}) {
+ this._const = {};
+ this._const.id = id;
+ this._const.corpId = `Div${capFirstChar(id)}`;
+ this._const.cost = sizeCost;
+ this._const.name = name;
+ this._const.focusDescription = focusDescription;
+ this._const.maintenance = {
+ quadratic: maintenance.quadratic,
+ linear: maintenance.linear,
+ category: maintenance.category
+ };
+ if (founding != null) {
+ this._const.founding = new App.Corporate.Shared.FoundingType(this, founding);
+ }
+ if (merger != null && _.isObject(merger) || (Array.isArray(merger) && merger.length > 0)) {
+ if (!Array.isArray(merger)) {
+ merger = [merger];
+ }
+ this._const.merger = merger;
+ }
+ this.relatedDivisions = new App.Corporate.Shared.RelatedDivisionType();
+ }
+
+ // initialized data
+ get id() { return this._const.id; }
+
+ get sizeCost() { return this._const.cost; }
+
+ get name() { return this._const.name; }
+
+ get focusDescription() { return this._const.focusDescription; }
+
+ get founding() { return this._const.founding; }
+
+ get nextDivisions() { return null; }
+
+ get hasMergers() { return this._const.merger != null; }
+
+ get mergerChoices() { return this._const.merger; }
+
+ get maintenanceCategory() { return this._const.maintenance.category; }
+
+ // stored variables
+ get founded() { return this.getStored('') == 1; }
+
+ get foundedDate() { return this.getStored('Founded'); }
+
+ get developmentCount() { return this.getStored("Dev"); }
+
+ set developmentCount(value) {
+ if (value < 0) {
+ throw Error("Cannot set development count to less than 0");
+ }
+ // dissolve is the only function that sets founded to false.
+ if (value === 0 && this.founded) {
+ throw Error("Cannot set development count to 0; use dissolve instead.");
+ }
+ this.setStored("Dev", value);
+ }
+
+ // calculated
+ get availableRoom() { return Math.max(0, this.developmentCount - this.activeSlaves); }
+
+ get maintenanceCost() {
+ return Math.trunc(this._const.maintenance.linear * 1000 * this.developmentCount + this._const.maintenance.quadratic * Math.pow(this.activeSlaves, 2));
+ }
+
+ get foundingCostDivision() { return this._const.founding.size * this.sizeCost; }
+
+ get foundingCost() { return this.foundingCostDivision; }
+
+ get canFoundCorporation() { return this._const.founding != null; }
+
+ get foundingCash() {
+ if (!this.canFoundCorporation) {
+ throw Error(`${this.name} is not set up found a corporation`);
+ }
+ return 1000 * this._const.founding.startingPrice;
+ }
+
+ get value() {
+ const developmentValue = this.developmentCount * this.sizeCost * 800;
+ let slaveProcValue = 0;
+ let slaveHeldValue = 0;
+
+ if (this.activeSlaves > 0) {
+ slaveProcValue = this.activeSlaves * this.purchasedSlaveValue * 1000;
+ }
+ if (this.heldSlaves > 0) {
+ slaveHeldValue = this.heldSlaves * this.soldSlaveValue * 1000;
+ }
+
+ return developmentValue + slaveProcValue + slaveHeldValue;
+ }
+
+ /**
+ * @abstract
+ * @returns {boolean}
+ */
+ get fromMarket() { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @returns {boolean}
+ */
+ get toMarket() { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @returns {number}
+ */
+ get heldSlaves() { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @param {number} value
+ */
+ set heldSlaves(value) { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @returns {number}
+ */
+ get activeSlaves() { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @param {number} value
+ */
+ set activeSlaves(value) { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @returns {number}
+ */
+ get processRate() { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @returns {number}
+ */
+ get initialSlaveValue() { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @returns {number}
+ */
+ get soldSlaveValue() { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @returns {string}
+ */
+ get slaveAction() { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @returns {string}
+ */
+ get nounFinishedSlave() { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @returns {string}
+ */
+ get nounSlaveFromMarket() { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @returns {string}
+ */
+ messageSlaveCount() { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @returns {string}
+ */
+ messageSlaveOutput() { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @param {object} divLedger
+ * @returns {string}
+ */
+ message_endWeek_Slaves(divLedger) { throw Error("Must be defined"); }
+
+ /**
+ * @abstract
+ * @param {object} ledger
+ * @param {object} divLedger
+ * @returns {string}
+ */
+ endWeek_Slaves(ledger, divLedger) { throw Error("Must be defined"); }
+
+ /**
+ * The value of a slave ignoring enhancements from founded divisions
+ * The actual value of a slave after all improvements
+ * @returns {number}
+ */
+ get purchasedSlaveValue() {
+ let cheapest = {'value': Number.MAX_VALUE, 'div': null};
+ let expensive = {'value': 0, 'div': null};
+ for (let fromDiv of this.relatedDivisions.from) {
+ let initialValue = fromDiv.initialSlaveValue;
+ if (initialValue < cheapest.value) {
+ cheapest.value = initialValue;
+ cheapest.div = fromDiv;
+ }
+ if (fromDiv.founded) {
+ let soldValue = fromDiv.soldSlaveValue;
+ if (soldValue > expensive.value) {
+ expensive.value = soldValue;
+ expensive.div = fromDiv;
+ }
+ }
+ }
+ if (expensive.div != null && expensive.value != cheapest.value) {
+ // The added value of an owned intermediary takes time to work its way through this division to the next
+ let expensiveDiv = expensive.div;
+ let valueDiff = expensive.value - cheapest.value;
+ let weeksSinceFounding = V.week - (expensiveDiv.foundedDate || 0);
+ let weeksToProcess = 10 * expensiveDiv.processRate;
+ let multiplier = Math.min(weeksSinceFounding / weeksToProcess, 1);
+ let finalAddedValue = valueDiff * multiplier;
+ return cheapest.value + finalAddedValue;
+ } else if (cheapest.div != null) {
+ return cheapest.value;
+ }
+ throw Error("No route to acquisition found.");
+ }
+
+ /**
+ * @returns {number}
+ */
+ get maintenanceSlaves() { return this.activeSlaves * this.processRate; }
+
+ /**
+ * @returns {{cost: number, perUnit: number}}
+ */
+ getDisplayMaintenanceCost() {
+ const cost = this.maintenanceCost;
+ const processedCount = this.maintenanceSlaves;
+
+ return {cost, perUnit: cost / processedCount};
+ }
+
+ /**
+ * @param {App.Corporate.Division.Base} division
+ * @returns {boolean}
+ */
+ getAutoSendToDivision(division) {
+ return (!App.Corporate.ownsIntermediaryDivision(this, division) && this.getStored(`To${division.id}`) === 1);
+ }
+
+ /**
+ * @param {App.Corporate.Division.Base} division
+ * @param {boolean} value
+ */
+ setAutoSendToDivision(division, value) {
+ this.setStored(`To${division.id}`, value ? 1 : 0);
+ }
+
+ /**
+ * @returns {boolean}
+ */
+ getAutoSendToMarket() {
+ return !!this.getStored("ToMarket");
+ }
+
+ /**
+ * @param {boolean} value
+ */
+ setAutoSendToMarket(value) {
+ this.setStored("ToMarket", value ? 1 : 0);
+ }
+
+ /**
+ * @returns {boolean}
+ */
+ getAutoBuyFromMarket() {
+ return !!this.getStored("FromMarket");
+ }
+
+ /**
+ * @param {boolean} value
+ */
+ setAutoBuyFromMarket(value) {
+ this.setStored("FromMarket", value ? 1 : 0);
+ }
+
+ /**
+ * @param {object} divLedger
+ */
+ endweek_Revenue(divLedger) {
+ // Unless otherwise specified, divisions don't produce revenue directly.
+ }
+
+ /**
+ * @param {object} divLedger
+ */
+ endWeek_Transfer(divLedger) {
+ let divisions = [];
+ for (let otherDiv of this.relatedDivisions.to.filter(div => div.founded && this.getAutoSendToDivision(div))) {
+ const otherLedger = divLedger.weekLedger.getDivision(otherDiv);
+
+ const room = otherDiv.availableRoom - otherLedger.transfer.in;
+ if (room === 0) {
+ continue;
+ }
+ divisions.push({division: otherDiv, room});
+ }
+ const fillDivisions = evenFillArray(divisions, this.heldSlaves, pair => pair.room);
+ for (const filled of fillDivisions) {
+ const division = filled.item.division;
+ const value = filled.value;
+ divLedger.transfer.addDivision(division, value);
+ }
+ }
+
+ /**
+ * @param {object} divLedger
+ */
+ endWeek_Market(divLedger) {
+ if (this.getAutoSendToMarket()) {
+ divLedger.market.sell = this.heldSlaves - divLedger.transfer.total;
+ }
+ if (this.getAutoBuyFromMarket()) {
+ divLedger.market.buy = this.availableRoom - divLedger.transfer.in;
+ }
+ App.Corporate.Shared.SellUnhousedSlaves(this, divLedger, this.processRate);
+ }
+
+ create() {
+ if (this.founded) {
+ throw Error(`${this.name} has already been founded.`);
+ }
+
+ App.Corporate.expandedDivision();
+ App.Corporate.chargeAsset(this.foundingCostDivision * 1000, "development");
+ this.setStored('', 1);
+ this.developmentCount = this._const.founding.size;
+ this.setStored('Founded', V.week);
+ }
+
+ dissolve() {
+ this.setStored('', 0);
+ App.Corporate.sellDevelopment(this);
+ App.Corporate.dissolvedDivision();
+ this.relatedDivisions.to.forEach(nextDep => delete V.corp[`${this._const.corpId}To${nextDep.id}`]);
+ }
+
+ // private helpers
+ /**
+ * @param {string} key
+ * @returns {*}
+ */
+ getStored(key) { return V.corp[this._const.corpId + key]; }
+
+ /**
+ * @param {string} key
+ * @param {*} value
+ */
+ setStored(key, value) { V.corp[this._const.corpId + key] = value; }
+};
diff --git a/src/Corporation/010-divisionAcquiring.js b/src/Corporation/010-divisionAcquiring.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f1de65dc65e04e8683e1057eec0d673df1b8584
--- /dev/null
+++ b/src/Corporation/010-divisionAcquiring.js
@@ -0,0 +1,104 @@
+App.Corporate.Division.Acquiring = class extends App.Corporate.Division.Base {
+ constructor({slaveValue, acquiring, mercenaryHelp, nextDivision}) {
+ super(arguments[0]);
+ this._const.slaveValue = slaveValue;
+ this._const.acquiring = new App.Corporate.Shared.averageRange(acquiring);
+ this._const.nextDivisions = nextDivision;
+ if (mercenaryHelp != null) {
+ this._const.mercenaryHelp = {
+ level: mercenaryHelp.level,
+ cost: mercenaryHelp.cost
+ };
+ }
+ }
+
+ // abstract virtual definitions
+ get fromMarket() { return false; }
+
+ get toMarket() { return true; }
+
+ get heldSlaves() { return this.getStored("Slaves"); }
+
+ set heldSlaves(value) { this.setStored("Slaves", Math.trunc(value)); }
+
+ get activeSlaves() { return 0; }
+
+ set activeSlaves(value) { throw Error("Cannot set active slaves for acquiring divisions"); }
+
+ get processRate() { return this._const.acquiring.center; }
+
+ get purchasedSlaveValue() { return null; }
+
+ get initialSlaveValue() { return this.soldSlaveValue; }
+
+ get soldSlaveValue() { return this._const.slaveValue; }
+
+ get nounFinishedSlave() { return "slave"; }
+
+ get nounSlaveFromMarket() { return "slave"; }
+
+ messageSlaveCount() {
+ return `It averages <span class="positive">${numberWithPluralNonZero(this.developmentCount, "new slave")}</span> each week.`;
+ }
+
+ messageSlaveOutput() {
+ return App.Corporate.Shared.MessageSlaveToMarket(this);
+ }
+
+ message_endWeek_Slaves(divLedger) {
+ let newSlaves = divLedger.slaves.value;
+ if (newSlaves > 0) {
+ return `<span class="positive">acquired ${numberWithPlural(newSlaves, "slave")}` +
+ (this.hadMercenaryHelp ? "</span> with the help of your mercenaries." : ".</span>");
+ } else {
+ return `<span class="red">failed to acquire any slaves` +
+ (this.hadMercenaryHelp ? "</span> even with the help of your mercenaries." : ".</span>");
+ }
+ }
+
+ endWeek_Slaves(divLedger) {
+ let slaves = App.Corporate.Shared.EndWeekProcessing_Slaves(this.developmentCount, this._const.acquiring);
+ this.heldSlaves += slaves.value;
+ return divLedger.slaves.apply(slaves);
+ }
+
+ // virtual overrides
+ get nextDivisions() { return this._const.nextDivisions; }
+
+ dissolve() {
+ App.Corporate.sellSlaves(this, this.heldSlaves);
+ super.dissolve();
+ delete V.corp[`${this._const.corpId}Slaves`];
+ }
+
+ getAutoBuyFromMarket() {
+ return false;
+ }
+
+ setAutoBuyFromMarket(value) {
+ throw Error("Acquiring divisions cannot acquire from the market");
+ }
+
+ get availableRoom() { return 0; }
+
+ get maintenanceSlaves() { return this.developmentCount; }
+
+ get maintenanceCost() {
+ // If it makes sense to have mercenaries help with other types of divisions, this code and the mercenaryHelp property will need to be moved into the super class.
+ let baseCost = super.maintenanceCost;
+
+ if (this.hadMercenaryHelp) {
+ const mercHelpCost = Math.trunc((V.mercenaries - this._const.mercenaryHelp.level) * this._const.mercenaryHelp.cost * 1000);
+ baseCost += mercHelpCost;
+ }
+ return baseCost;
+ }
+
+ create() {
+ super.create();
+ this.heldSlaves = 0;
+ App.Corporate.Shared.FoundingSetupAutoSell(this);
+ }
+
+ get hadMercenaryHelp() { return this._const.mercenaryHelp != null && V.mercenariesHelpCorp === 1 && V.mercenaries > this._const.mercenaryHelp.level; }
+};
diff --git a/src/Corporation/010-divisionProcessing.js b/src/Corporation/010-divisionProcessing.js
new file mode 100644
index 0000000000000000000000000000000000000000..839a2b39e200b47164e2feec60923cf1fbf511f6
--- /dev/null
+++ b/src/Corporation/010-divisionProcessing.js
@@ -0,0 +1,109 @@
+App.Corporate.Division.Processing = class extends App.Corporate.Division.Base {
+ constructor({founding, addedValue, processing, nextDivision, slaveProcessType, slaveProcessDescription}) {
+ super(arguments[0]);
+ this._const.addedValue = addedValue;
+ this._const.processing = new App.Corporate.Shared.averageRange(processing);
+ this._const.nextDivisions = nextDivision;
+ this._const.slaveProcessType = slaveProcessType;
+ this._const.slaveProcessDescription = slaveProcessDescription;
+ }
+
+ // abstract virtual definitions
+ get fromMarket() { return true; }
+
+ get toMarket() { return true; }
+
+ get heldSlaves() { return this.getStored("Slaves2"); }
+
+ set heldSlaves(value) { this.setStored("Slaves2", Math.trunc(value)); }
+
+ get activeSlaves() { return this.getStored("Slaves"); }
+
+ set activeSlaves(value) { this.setStored("Slaves", Math.trunc(value)); }
+
+ get processRate() { return this._const.processing.center; }
+
+ get soldSlaveValue() {
+ // TODO: find a way to cache this.
+ return this.purchasedSlaveValue + this._const.addedValue;
+ }
+
+ get slaveAction() {
+ return this._const.slaveProcessDescription;
+ }
+
+ get nounFinishedSlave() { return `${this._const.slaveProcessDescription.past} slave`; }
+
+ get nounSlaveFromMarket() { return this._const.slaveProcessDescription.market; }
+
+ messageSlaveCount() {
+ return App.Corporate.Shared.MessageProcessedSlaves(this, `can ${this._const.slaveProcessType.present}`, 'green');
+ }
+
+ messageSlaveOutput() {
+ return App.Corporate.Shared.MessageSlaveToMarket(this);
+ }
+
+ message_endWeek_Slaves(divLedger) {
+ let newSlaves = divLedger.slaves.value;
+ // The division
+ let retval = this._const.slaveProcessType.past; // exploited
+ if (newSlaves <= 0) {
+ retval += " <span class='red'>none of its slaves.</span>";
+ } else {
+ retval += ` <span class="positive">${numberWithPlural(newSlaves, 'slave')}.</span>`;
+ }
+ retval += " The division ";
+ if (this.activeSlaves) {
+ retval += `is still ${this._const.slaveProcessDescription.present} ${numberWithPlural(this.activeSlaves, "slave")}.`;
+ } else {
+ retval += `doesn't have any slaves to ${this._const.slaveProcessDescription.future}.`;
+ }
+ return retval;
+ }
+
+ endWeek_Slaves(divLedger) {
+ let slaves = App.Corporate.Shared.EndWeekProcessing_Slaves(this.activeSlaves, this._const.processing);
+ this.activeSlaves -= slaves.value;
+ this.heldSlaves += slaves.value;
+ return divLedger.slaves.apply(slaves);
+ }
+
+ get initialSlaveValue() {
+ const values = this.relatedDivisions.from.map(fromDiv => fromDiv.initialSlaveValue);
+ if (values.length === 0) {
+ throw Error("No route to acquisition found.");
+ }
+ return Math.min(...values) + this._const.addedValue;
+ }
+
+ // virtual override
+ get nextDivisions() { return this._const.nextDivisions; }
+
+ get developmentCount() { return super.developmentCount; }
+
+ set developmentCount(value) {
+ super.developmentCount = value;
+ App.Corporate.Shared.SellOverflowSlaves(this);
+ }
+
+ dissolve() {
+ App.Corporate.sellSlaves(this, this.heldSlaves);
+ super.dissolve();
+ delete V.corp[this._const.corpId + "Slaves"];
+ delete V.corp[this._const.corpId + "Slaves2"];
+ }
+
+ get foundingCostSlaves() { return this._const.founding.size * this.purchasedSlaveValue; }
+
+ get foundingCost() { return this.foundingCostDivision + this.foundingCostSlaves; }
+
+ create() {
+ super.create();
+ App.Corporate.chargeAsset(this.foundingCostSlaves * 1000, "slaves");
+ this.activeSlaves = this._const.founding.size;
+ this.heldSlaves = 0;
+ App.Corporate.Shared.FoundingSetupAutoBuy(this);
+ App.Corporate.Shared.FoundingSetupAutoSell(this);
+ }
+};
diff --git a/src/Corporation/010-divisionWorking.js b/src/Corporation/010-divisionWorking.js
new file mode 100644
index 0000000000000000000000000000000000000000..1e30f1235edca7c027d5e1fb33c2b6666c44e1e7
--- /dev/null
+++ b/src/Corporation/010-divisionWorking.js
@@ -0,0 +1,116 @@
+App.Corporate.Division.Working = class extends App.Corporate.Division.Base {
+ constructor({founding, attrition, revenue, slaveWorkDescription}) {
+ super(arguments[0]);
+ this._const.attrition = new App.Corporate.Shared.averageRange(attrition);
+ this._const.revenue = new App.Corporate.Shared.averageRange(revenue);
+ this._const.slaveWorkDescription = slaveWorkDescription;
+ }
+
+ // abstract virtual definitions
+ get fromMarket() { return true; }
+
+ get toMarket() { return false; }
+
+ get heldSlaves() { return 0; }
+
+ set heldSlaves(value) { throw Error("Cannot set held slaves of working division"); }
+
+ get activeSlaves() { return this.getStored("Slaves"); }
+
+ set activeSlaves(value) { this.setStored("Slaves", Math.trunc(value)); }
+
+ get processRate() { return this._const.attrition.center; }
+
+ get initialSlaveValue() { return null; }
+
+ get soldSlaveValue() { return null; }
+
+ get slaveAction() {
+ return this._const.slaveWorkDescription;
+ }
+
+ // @ts-ignore
+ get nounFinishedSlave() { throw Error("Cannot get finished slave in working division, since they don't produce finished slaves."); }
+
+ get nounSlaveFromMarket() { return this._const.slaveWorkDescription.market; }
+
+ messageSlaveCount() {
+ return App.Corporate.Shared.MessageProcessedSlaves(this, `has to replace`, 'red');
+ }
+
+ messageSlaveOutput() {
+ /* TODO: originally some divisions had a slight description for what the work was; ie, "the escorts generate" */
+ return `The division generates <span class="yellowgreen">${cashFormat(this.slaveRevenue)}</span> per slave on average.`;
+ }
+
+ endWeek_Slaves(divLedger) {
+ let slaves = App.Corporate.Shared.EndWeekProcessing_Slaves(this.activeSlaves, this._const.attrition);
+ this.activeSlaves -= slaves.value;
+ return divLedger.slaves.apply(slaves);
+ }
+
+ message_endWeek_Slaves(divLedger) {
+ let lostSlaves = divLedger.slaves.value;
+ let retval = '';// The division
+ if (this.activeSlaves <= 0) {
+ retval += `has <span class="red">no slaves</span> to ${this._const.slaveWorkDescription.future}.`;
+ } else {
+ retval += `is ${this._const.slaveWorkDescription.present} <span class="positive">${numberWithPlural(this.activeSlaves, 'slave')}.</span> `;
+ }
+ if (lostSlaves > 0) {
+ retval += `During operations <span class="red">${numberWithPlural(lostSlaves, 'slave')}</span> ${this._const.slaveWorkDescription.past}.`;
+ }
+ return retval;
+ }
+
+ // virtual override
+ get developmentCount() { return super.developmentCount; }
+
+ set developmentCount(value) {
+ super.developmentCount = value;
+ App.Corporate.Shared.SellOverflowSlaves(this);
+ }
+
+ dissolve() {
+ super.dissolve();
+ delete V.corp[this._const.corpId + "Slaves"];
+ }
+
+ getAutoSendToMarket() {
+ return false;
+ }
+
+ setAutoSendToMarket(value) {
+ throw Error("Working divisions cannot sell to market");
+ }
+
+ endweek_Revenue(divLedger) {
+ let {roll, value} = this._const.revenue.roll();
+ let revenue = Math.trunc(this.activeSlaves * value);
+ divLedger.revenue.apply({value: revenue, efficiency: roll});
+ }
+
+ endWeek_Transfer(divLedger) {
+ // Working divisions don't do transfers
+ }
+
+ get slaveRevenue() {
+ return this._const.revenue.center;
+ }
+
+ get maintenanceSlaves() {
+ // maintenance is paid on working slaves, not worked slaves.
+ return this.activeSlaves;
+ }
+
+ get foundingCostSlaves() { return this._const.founding.size * this.purchasedSlaveValue; }
+
+ get foundingCost() { return this.foundingCostDivision + this.foundingCostSlaves; }
+
+ create() {
+ super.create();
+ App.Corporate.chargeAsset(this.foundingCostSlaves * 1000, "slaves");
+ this.activeSlaves = this._const.founding.size;
+ App.Corporate.Shared.FoundingSetupAutoBuy(this);
+ }
+};
diff --git a/src/Corporation/corporate-constants.js b/src/Corporation/corporate-constants.js
index 61e5f46e13ff932f05c86ade64c9b90f6bea5358..b3287e2cd829a1aa0f1f5ba1650dcec8861dacf1 100644
--- a/src/Corporation/corporate-constants.js
+++ b/src/Corporation/corporate-constants.js
@@ -216,7 +216,7 @@ App.Corporate.InitConstants = function() {
'name': 'slave breaking facility',
'cost': 50,
'text': {
- 'trouble': 'a small slave breaking firm. Despite a great need for obedient slaves the owner of this little establishment was unable to turn a profit. The facility has everything a respecting slave breaking could ever need, it seems the owner simply lacked the right character to apply effective breaking techniques. Your corporation knows perfectly well what it takes to achieve obedience and the assets can be put to great use.',
+ 'trouble': 'a small slave breaking firm. Despite a great need for obedient slaves the owner of this little establishment was unable to turn a profit. The facility has everything a self-respecting slave-breaker could ever need; it seems the owner simply lacked the right character to apply effective breaking techniques. Your corporation knows perfectly well what it takes to achieve obedience and the assets can be put to great use.',
'acquire': ' and staff it with qualified personnel to make use of the new assets.'
},
'result': {
@@ -358,7 +358,7 @@ App.Corporate.InitConstants = function() {
'name': 'café',
'cost': 50,
'text': {
- 'trouble': "a quaint maid café. The prime location together with a popular concept should make for a bustling business and yet the owner is looking to get out of the business hoping to salvage some of his savings. Sadly there was a lack of capital to employ attractive servant slave maids. While someone might very well be more than willing to come in and invest in some better slaves, the place is so cheap you could easily replace the furniture and use the current assets to create a new arcade location for your corporation instead.",
+ 'trouble': "a quaint maid café. The prime location together with a popular concept should make for a bustling enterprise, and yet the owner is looking to get out of the business, hoping to salvage some of his savings. Sadly, there was a lack of capital to employ attractive servant slave maids. While someone might very well be more than willing to come in and invest in some better slaves, the place is so cheap you could easily replace the furniture and use the current assets to create a new arcade location for your corporation instead.",
'acquire': ". The old owner wishes his slaves luck under the new management, not knowing your plans for the place. A new sex arcade under your corporate umbrella will open shortly."
},
'result': {
@@ -443,7 +443,7 @@ App.Corporate.InitConstants = function() {
'name': 'farm',
'cost': 50,
'text': {
- 'trouble': "a dairy farm. Why a conventional dairy farm popped up as target confused you for a moment, but it quickly became clear the entire family was so deep in debt it would be a no brainer to buy the farm and start milking the farmer's large-uddered daughters as a great addition to your corporate dairy.",
+ 'trouble': "a dairy farm. Why a conventional dairy farm popped up as target confused you for a moment, but it quickly became clear the entire family was so deep in debt it would be a no-brainer to buy the farm and start milking the farmer's large-uddered daughters as a great addition to your corporate dairy.",
'acquire': " and your new slaves for the corporation. The family is not happy with your plans, but their approval is not required, you care only for their fluids."
},
'result': {
@@ -485,7 +485,7 @@ App.Corporate.InitConstants = function() {
'name': 'brothel',
'cost': 50,
'text': {
- 'trouble': "a little brothel. With slave whores becoming the dominant force in sexual services the current madam lost her passion for the business. She's getting up there in age and has run a tight ship for many years so she deemed it the right time to bow out. All you need to do to add a new brothel location for your corporation is sign at the dotted line before anyone else has a chance to bite.",
+ 'trouble': "a little brothel. With slave whores becoming the dominant force in sexual services, the current madam lost her passion for the business. She's getting up there in age and has run a tight ship for many years, so she deemed it the right time to bow out. All you need to do to add a new brothel location for your corporation is sign at the dotted line before anyone else has a chance to bite.",
'acquire': " before anyone else can make an offer. The madam is surprised by your speed, but happily signs over the brothel."
},
'result': {
diff --git a/src/Corporation/corporate-divisionAcquiring.js b/src/Corporation/corporate-divisionAcquiring.js
deleted file mode 100644
index aa446a71034f1153d7508354f8da706c4217c763..0000000000000000000000000000000000000000
--- a/src/Corporation/corporate-divisionAcquiring.js
+++ /dev/null
@@ -1,84 +0,0 @@
-App.Corporate.Init_DivisionAcquiring = function(shared) {
- App.Corporate.Division.Acquiring = class extends App.Corporate.Division.Base {
- constructor({slaveValue, acquiring, mercenaryHelp, nextDivision}) {
- super(arguments[0]);
- this._const.slaveValue = slaveValue;
- this._const.acquiring = new averageRange(acquiring);
- this._const.nextDivisions = nextDivision;
- if (mercenaryHelp != null) {
- this._const.mercenaryHelp = {
- level: mercenaryHelp.level,
- cost: mercenaryHelp.cost
- };
- }
- }
- // abstract virtual definitions
- get fromMarket() { return false; }
- get toMarket() { return true; }
- get heldSlaves() { return this.getStored("Slaves"); }
- set heldSlaves(value) { this.setStored("Slaves", Math.trunc(value)); }
- get activeSlaves() { return 0; }
- set activeSlaves(value) { throw Error("Cannot set active slaves for acquiring divisions"); }
- get processRate() { return this._const.acquiring.center; }
- get purchasedSlaveValue() { return null; }
- get initialSlaveValue() { return this.soldSlaveValue; }
- get soldSlaveValue() { return this._const.slaveValue; }
- get nounFinishedSlave() { return "slave"; }
- get nounSlaveFromMarket() { return "slave"; }
- messageSlaveCount() {
- return `It averages <span class="positive">${numberWithPluralNonZero(this.developmentCount, "new slave")}</span> each week.`;
- }
- messageSlaveOutput() {
- return shared.MessageSlaveToMarket(this);
- }
- message_endWeek_Slaves(divLedger) {
- let newSlaves = divLedger.slaves.value;
- if (newSlaves > 0) {
- return `<span class="positive">acquired ${numberWithPlural(newSlaves, "slave")}` +
-(this.hadMercenaryHelp ? "</span> with the help of your mercenaries." : ".</span>");
- } else {
- return `<span class="red">failed to acquire any slaves` +
-(this.hadMercenaryHelp ? "</span> even with the help of your mercenaries." : ".</span>");
- }
- }
- endWeek_Slaves(divLedger) {
- let slaves = shared.EndWeekProcessing_Slaves(this.developmentCount, this._const.acquiring);
- this.heldSlaves += slaves.value;
- return divLedger.slaves.apply(slaves);
- }
- // virtual overrides
- get nextDivisions() { return this._const.nextDivisions; }
- dissolve() {
- App.Corporate.sellSlaves(this, this.heldSlaves);
- super.dissolve();
- delete V.corp[`${this._const.corpId}Slaves`];
- }
- getAutoBuyFromMarket() {
- return false;
- }
- setAutoBuyFromMarket(value) {
- throw Error("Acquiring divisions cannot acquire from the market");
- }
-
- get availableRoom() { return 0; }
- get maintenanceSlaves() { return this.developmentCount; }
- get maintenanceCost() {
- // If it makes sense to have mercenaries help with other types of divisions, this code and the mercenaryHelp property will need to be moved into the super class.
- let baseCost = super.maintenanceCost;
-
- if (this.hadMercenaryHelp) {
- const mercHelpCost = Math.trunc((V.mercenaries - this._const.mercenaryHelp.level) * this._const.mercenaryHelp.cost * 1000);
- baseCost += mercHelpCost;
- }
- return baseCost;
- }
-
- create() {
- super.create();
- this.heldSlaves = 0;
- shared.FoundingSetupAutoSell(this);
- }
-
- get hadMercenaryHelp() { return this._const.mercenaryHelp != null && V.mercenariesHelpCorp === 1 && V.mercenaries > this._const.mercenaryHelp.level; }
- };
-};
diff --git a/src/Corporation/corporate-divisionBase.js b/src/Corporation/corporate-divisionBase.js
deleted file mode 100644
index 4e45b144b9525f33ee2d770c82e5519e7bccbcfb..0000000000000000000000000000000000000000
--- a/src/Corporation/corporate-divisionBase.js
+++ /dev/null
@@ -1,200 +0,0 @@
-App.Corporate.Init_DivisionBase = function(shared) {
- App.Corporate.Division.Base = class {
- constructor({id, name, focusDescription, sizeCost, maintenance, founding, merger}) {
- this._const = {};
- this._const.id = id;
- this._const.corpId = `Div${capFirstChar(id)}`;
- this._const.cost = sizeCost;
- this._const.name = name;
- this._const.focusDescription = focusDescription;
- this._const.maintenance = {
- quadratic: maintenance.quadratic,
- linear: maintenance.linear,
- category: maintenance.category
- };
- if (founding != null) {
- this._const.founding = new shared.FoundingType(this, founding);
- }
- if (merger != null && _.isObject(merger) || (Array.isArray(merger) && merger.length > 0)) {
- if (!Array.isArray(merger)) {
- merger = [merger];
- }
- this._const.merger = merger;
- }
- this.relatedDivisions = new shared.RelatedDivisionType();
- }
- // initialized data
- get id() { return this._const.id; }
- get sizeCost() { return this._const.cost; }
- get name() { return this._const.name; }
- get focusDescription() { return this._const.focusDescription; }
- get founding() { return this._const.founding; }
- get nextDivisions() { return null; }
- get hasMergers() { return this._const.merger != null; }
- get mergerChoices() { return this._const.merger; }
- get maintenanceCategory() { return this._const.maintenance.category; }
-
- // stored variables
- get founded() { return this.getStored('') == 1; }
- get foundedDate() { return this.getStored('Founded'); }
- get developmentCount() { return this.getStored("Dev"); }
- set developmentCount(value) {
- if (value < 0) { throw Error("Cannot set development count to less than 0"); }
- // dissolve is the only function that sets founded to false.
- if (value === 0 && this.founded) { throw Error("Cannot set development count to 0; use dissolve instead."); }
- this.setStored("Dev", value);
- }
-
- // calculated
- get availableRoom() { return Math.max(0, this.developmentCount - this.activeSlaves); }
- get maintenanceCost() {
- return Math.trunc( this._const.maintenance.linear * 1000 * this.developmentCount + this._const.maintenance.quadratic * Math.pow(this.activeSlaves, 2));
- }
- get foundingCostDivision() { return this._const.founding.size * this.sizeCost; }
- get foundingCost() { return this.foundingCostDivision; }
- get canFoundCorporation() { return this._const.founding != null; }
- get foundingCash() {
- if (!this.canFoundCorporation) { throw Error(`${this.name} is not set up found a corporation`); }
- return 1000 * this._const.founding.startingPrice;
- }
- get value() {
- const developmentValue = this.developmentCount * this.sizeCost * 800;
- let slaveProcValue = 0;
- let slaveHeldValue = 0;
-
- if (this.activeSlaves > 0) { slaveProcValue = this.activeSlaves * this.purchasedSlaveValue * 1000; }
- if (this.heldSlaves > 0) { slaveHeldValue = this.heldSlaves * this.soldSlaveValue * 1000; }
-
- return developmentValue + slaveProcValue + slaveHeldValue;
- }
-
- // abstract virtual
- get fromMarket() { throw Error("Must be defined"); }
- get toMarket() { throw Error("Must be defined"); }
- /** @returns {number} */ // eslint-disable-line
- get heldSlaves() { throw Error("Must be defined"); }
- set heldSlaves(value) { throw Error("Must be defined"); }
- /** @returns {number} */ // eslint-disable-line
- get activeSlaves() { throw Error("Must be defined"); }
- set activeSlaves(value) { throw Error("Must be defined"); }
- /** @returns {number} */ // eslint-disable-line
- get processRate() { throw Error("Must be defined"); }
- get initialSlaveValue() { throw Error("Must be defined"); }
- /** @returns {number} */ // eslint-disable-line
- get soldSlaveValue() { throw Error("Must be defined"); }
- get slaveAction() { throw Error("Must be defined"); }
- get nounFinishedSlave() { throw Error("Must be defined"); }
- get nounSlaveFromMarket() { throw Error("Must be defined"); }
- messageSlaveCount() { throw Error("Must be defined"); }
- messageSlaveOutput() { throw Error("Must be defined"); }
- message_endWeek_Slaves(divLedger) { throw Error("Must be defined"); }
- endWeek_Slaves(ledger, divLedger) { throw Error("Must be defined"); }
-
- // The value of a slave ignoring enhancements from founded divisions
- // The actual value of a slave after all improvements
- get purchasedSlaveValue() {
- let cheapest = {'value': Number.MAX_VALUE, 'div': null};
- let expensive = {'value': 0, 'div': null};
- for (let fromDiv of this.relatedDivisions.from) {
- let initialValue = fromDiv.initialSlaveValue;
- if (initialValue < cheapest.value) {
- cheapest.value = initialValue;
- cheapest.div = fromDiv;
- }
- if (fromDiv.founded) {
- let soldValue = fromDiv.soldSlaveValue;
- if (soldValue > expensive.value) {
- expensive.value = soldValue;
- expensive.div = fromDiv;
- }
- }
- }
- if (expensive.div != null && expensive.value != cheapest.value) {
- // The added value of an owned intermediary takes time to work its way through this division to the next
- let expensiveDiv = expensive.div;
- let valueDiff = expensive.value - cheapest.value;
- let weeksSinceFounding = V.week - (expensiveDiv.foundedDate || 0);
- let weeksToProcess = 10 * expensiveDiv.processRate;
- let multiplier = Math.min(weeksSinceFounding / weeksToProcess, 1);
- let finalAddedValue = valueDiff * multiplier;
- return cheapest.value + finalAddedValue;
- } else if (cheapest.div != null) {
- return cheapest.value;
- }
- throw Error("No route to acquisition found.");
- }
- get maintenanceSlaves() { return this.activeSlaves * this.processRate; }
- getDisplayMaintenanceCost() {
- const cost = this.maintenanceCost;
- const processedCount = this.maintenanceSlaves;
-
- return {cost, perUnit: cost / processedCount};
- }
- getAutoSendToDivision(division) {
- return (!App.Corporate.ownsIntermediaryDivision(this, division) && this.getStored(`To${division.id}`) == 1);
- }
- setAutoSendToDivision(division, value) {
- this.setStored(`To${division.id}`, value ? 1 : 0);
- }
- getAutoSendToMarket() {
- return this.getStored("ToMarket") || 0;
- }
- setAutoSendToMarket(value) {
- this.setStored("ToMarket", value ? 1 : 0);
- }
- getAutoBuyFromMarket() {
- return this.getStored("FromMarket")||0;
- }
- setAutoBuyFromMarket(value) {
- this.setStored("FromMarket", value ? 1 : 0);
- }
- endweek_Revenue(divLedger) {
- // Unless otherwise specified, divisions don't produce revenue directly.
- }
- endWeek_Transfer(divLedger) {
- let divisions = [];
- for (let otherDiv of this.relatedDivisions.to.filter(div=> div.founded && this.getAutoSendToDivision(div))) {
- const otherLedger = divLedger.weekLedger.getDivision(otherDiv);
-
- const room = otherDiv.availableRoom - otherLedger.transfer.in;
- if (room === 0) { continue; }
- divisions.push({division: otherDiv, room});
- }
- const fillDivisions = evenFillArray(divisions, this.heldSlaves, pair=>pair.room);
- for (const filled of fillDivisions) {
- const division = filled.item.division;
- const value = filled.value;
- divLedger.transfer.addDivision(division, value);
- }
- }
- endWeek_Market(divLedger) {
- if (this.getAutoSendToMarket()) {
- divLedger.market.sell = this.heldSlaves - divLedger.transfer.total;
- }
- if (this.getAutoBuyFromMarket()) {
- divLedger.market.buy = this.availableRoom - divLedger.transfer.in;
- }
- shared.SellUnhousedSlaves(this, divLedger, this.processRate);
- }
-
- create() {
- if (this.founded) { throw Error(`${this.name} has already been founded.`); }
-
- App.Corporate.expandedDivision();
- App.Corporate.chargeAsset(this.foundingCostDivision * 1000, "development");
- this.setStored('', 1);
- this.developmentCount = this._const.founding.size;
- this.setStored('Founded', V.week);
- }
- dissolve() {
- this.setStored('', 0);
- App.Corporate.sellDevelopment(this);
- App.Corporate.dissolvedDivision();
- this.relatedDivisions.to.forEach(nextDep => delete V.corp[`${this._const.corpId}To${nextDep.id}`]);
- }
-
- // private helpers
- getStored(key ) { return V.corp[this._const.corpId + key]; }
- setStored(key, value) { V.corp[this._const.corpId + key] = value; }
- };
-};
diff --git a/src/Corporation/corporate-divisionProcessing.js b/src/Corporation/corporate-divisionProcessing.js
deleted file mode 100644
index c062900d3ef113dfcb9d0c11ecea0702a765931a..0000000000000000000000000000000000000000
--- a/src/Corporation/corporate-divisionProcessing.js
+++ /dev/null
@@ -1,88 +0,0 @@
-App.Corporate.Init_DivisionProcessing = function(shared) {
- App.Corporate.Division.Processing = class extends App.Corporate.Division.Base {
- constructor({founding, addedValue, processing, nextDivision, slaveProcessType, slaveProcessDescription}) {
- super(arguments[0]);
- this._const.addedValue = addedValue;
- this._const.processing = new averageRange(processing);
- this._const.nextDivisions = nextDivision;
- this._const.slaveProcessType = slaveProcessType;
- this._const.slaveProcessDescription = slaveProcessDescription;
- }
-
- // abstract virtual definitions
- get fromMarket() { return true; }
- get toMarket() { return true; }
- get heldSlaves() { return this.getStored("Slaves2" ); }
- set heldSlaves(value) { this.setStored("Slaves2", Math.trunc(value)); }
- get activeSlaves() { return this.getStored("Slaves" ); }
- set activeSlaves(value) { this.setStored("Slaves", Math.trunc(value)); }
- get processRate() { return this._const.processing.center; }
- get soldSlaveValue() {
- // TODO: find a way to cache this.
- return this.purchasedSlaveValue + this._const.addedValue;
- }
- get slaveAction() {
- return this._const.slaveProcessDescription;
- }
- get nounFinishedSlave() { return `${this._const.slaveProcessDescription.past} slave`; }
- get nounSlaveFromMarket() { return this._const.slaveProcessDescription.market; }
- messageSlaveCount() {
- return shared.MessageProcessedSlaves(this, `can ${this._const.slaveProcessType.present}`, 'green');
- }
- messageSlaveOutput() {
- return shared.MessageSlaveToMarket(this);
- }
- message_endWeek_Slaves(divLedger) {
- let newSlaves = divLedger.slaves.value;
- // The division
- let retval = this._const.slaveProcessType.past; // exploited
- if (newSlaves <= 0) {
- retval += " <span class='red'>none of its slaves.</span>";
- } else {
- retval += ` <span class="positive">${numberWithPlural(newSlaves, 'slave')}.</span>`;
- }
- retval += " The division ";
- if (this.activeSlaves) {
- retval += `is still ${this._const.slaveProcessDescription.present} ${numberWithPlural(this.activeSlaves, "slave")}.`;
- } else {
- retval += `doesn't have any slaves to ${this._const.slaveProcessDescription.future}.`;
- }
- return retval;
- }
- endWeek_Slaves(divLedger) {
- let slaves = shared.EndWeekProcessing_Slaves(this.activeSlaves, this._const.processing);
- this.activeSlaves -= slaves.value;
- this.heldSlaves += slaves.value;
- return divLedger.slaves.apply(slaves);
- }
- get initialSlaveValue() {
- const values = this.relatedDivisions.from.map(fromDiv => fromDiv.initialSlaveValue);
- if (values.length === 0) { throw Error("No route to acquisition found."); }
- return Math.min(...values) + this._const.addedValue;
- }
- // virtual override
- get nextDivisions() { return this._const.nextDivisions; }
- get developmentCount() { return super.developmentCount; }
- set developmentCount(value) {
- super.developmentCount = value;
- shared.SellOverflowSlaves(this);
- }
- dissolve() {
- App.Corporate.sellSlaves(this, this.heldSlaves);
- super.dissolve();
- delete V.corp[this._const.corpId + "Slaves"];
- delete V.corp[this._const.corpId + "Slaves2"];
- }
-
- get foundingCostSlaves() { return this._const.founding.size * this.purchasedSlaveValue; }
- get foundingCost() { return this.foundingCostDivision + this.foundingCostSlaves; }
- create() {
- super.create();
- App.Corporate.chargeAsset(this.foundingCostSlaves * 1000, "slaves");
- this.activeSlaves = this._const.founding.size;
- this.heldSlaves = 0;
- shared.FoundingSetupAutoBuy(this);
- shared.FoundingSetupAutoSell(this);
- }
- };
-};
diff --git a/src/Corporation/corporate-divisionWorking.js b/src/Corporation/corporate-divisionWorking.js
deleted file mode 100644
index eac06d70b41d315ae230b7565a03225bdc40ea78..0000000000000000000000000000000000000000
--- a/src/Corporation/corporate-divisionWorking.js
+++ /dev/null
@@ -1,93 +0,0 @@
-App.Corporate.Init_DivisionWorking = function(shared) {
- App.Corporate.Division.Working = class extends App.Corporate.Division.Base {
- constructor({founding, attrition, revenue, slaveWorkDescription}) {
- super(arguments[0]);
- this._const.attrition = new averageRange(attrition);
- this._const.revenue = new averageRange(revenue);
- this._const.slaveWorkDescription = slaveWorkDescription;
- }
-
- // abstract virtual definitions
- get fromMarket() { return true; }
- get toMarket() { return false; }
- get heldSlaves() { return 0; }
- set heldSlaves(value) { throw Error("Cannot set held slaves of working division"); }
- get activeSlaves() { return this.getStored("Slaves"); }
- set activeSlaves(value) { this.setStored("Slaves", Math.trunc(value)); }
- get processRate() { return this._const.attrition.center; }
- get initialSlaveValue() { return null; }
- get soldSlaveValue() { return null; }
- get slaveAction() {
- return this._const.slaveWorkDescription;
- }
- get nounFinishedSlave() { throw Error("Cannot get finished slave in working division, since they don't produce finished slaves."); }
- get nounSlaveFromMarket() { return this._const.slaveWorkDescription.market; }
- messageSlaveCount() {
- return shared.MessageProcessedSlaves(this, `has to replace`, 'red');
- }
- messageSlaveOutput() {
- /* TODO: originally some divisions had a slight description for what the work was; ie, "the escorts generate" */
- return `The division generates <span class="yellowgreen">${cashFormat(this.slaveRevenue)}</span> per slave on average.`;
- }
- endWeek_Slaves(divLedger) {
- let slaves = shared.EndWeekProcessing_Slaves(this.activeSlaves, this._const.attrition);
- this.activeSlaves -= slaves.value;
- return divLedger.slaves.apply(slaves);
- }
- message_endWeek_Slaves(divLedger) {
- let lostSlaves = divLedger.slaves.value;
- let retval = '';// The division
- if (this.activeSlaves <= 0) {
- retval += `has <span class="red">no slaves</span> to ${this._const.slaveWorkDescription.future}.`;
- } else {
- retval += `is ${this._const.slaveWorkDescription.present} <span class="positive">${numberWithPlural(this.activeSlaves, 'slave')}.</span> `;
- }
- if (lostSlaves > 0) {
- retval += `During operations <span class="red">${numberWithPlural(lostSlaves, 'slave')}</span> ${this._const.slaveWorkDescription.past}.`;
- }
- return retval;
- }
-
- // virtual override
- get developmentCount() { return super.developmentCount; }
- set developmentCount(value) {
- super.developmentCount = value;
- shared.SellOverflowSlaves(this);
- }
- dissolve() {
- super.dissolve();
- delete V.corp[this._const.corpId + "Slaves"];
- }
- getAutoSendToMarket() {
- return false;
- }
- setAutoSendToMarket(value) {
- throw Error("Working divisions cannot sell to market");
- }
- endweek_Revenue(divLedger) {
- let {roll, value} = this._const.revenue.roll();
- let revenue = Math.trunc(this.activeSlaves * value);
- divLedger.revenue.apply({value: revenue, efficiency: roll});
- }
- endWeek_Transfer(divLedger) {
- // Working divisions don't do transfers
- }
-
- get slaveRevenue() {
- return this._const.revenue.center;
- }
- get maintenanceSlaves() {
- // maintenance is paid on working slaves, not worked slaves.
- return this.activeSlaves;
- }
-
- get foundingCostSlaves() { return this._const.founding.size * this.purchasedSlaveValue; }
- get foundingCost() { return this.foundingCostDivision + this.foundingCostSlaves; }
- create() {
- super.create();
- App.Corporate.chargeAsset(this.foundingCostSlaves * 1000, "slaves");
- this.activeSlaves = this._const.founding.size;
- shared.FoundingSetupAutoBuy(this);
- }
- };
-};
diff --git a/src/Corporation/corporate.js b/src/Corporation/corporate.js
index 7e4e51fd9842af9551a143a712dd49dfd92c37ac..3664624d75c4e18e29647821adfa5027819db617 100644
--- a/src/Corporation/corporate.js
+++ b/src/Corporation/corporate.js
@@ -1,61 +1,3 @@
-globalThis.averageRange = class {
- constructor({center, range}) {
- this._const = {
- center,
- range
- };
- }
- get center() { return this._const.center; }
- get range() { return this._const.range; }
- roll() {
- let roll = Math.clamp(gaussianPair(0, 0.2)[0], -0.5, 0.5);
- return {roll, value: (roll * this.range) + this.center};
- }
- rollInt() {
- let retval = this.roll();
- retval.value = Math.trunc(retval.value);
- return retval;
- }
-};
-globalThis.evenFillArray = function(array, amount, lookupAmount) {
- let perItem;
- let changed;
- let retval = [];
- do {
- let newArray = [];
- changed = false;
- perItem = Math.trunc(amount / array.length);
- for (let item of array) {
- let itemValue = lookupAmount(item);
- if (itemValue >= perItem) {
- newArray.push(item);
- continue;
- }
-
- amount -= itemValue;
- retval.push({item, value: itemValue});
- changed = true;
- }
- array = newArray;
- } while (changed);
- let remainder = amount % array.length;
- for (let item of array) {
- let extra = 0;
- if (remainder > 0) {
- remainder--;
- extra = 1;
- }
- retval.push({item, value: perItem + extra});
- }
- return retval;
-};
-globalThis.typeHiddenMembers = class {
- constructor() {
- this._const = {};
- this._var = {};
- this._cache = {};
- }
-};
App.Corporate.Init = function() {
const Ledger = class {
constructor(corp, suffix = "") {
@@ -141,6 +83,13 @@ this.development - this.slaves - this.overhead - this.operations;
this.corp.deleteStored(key + this.suffix);
}
};
+ const typeHiddenMembers = class {
+ constructor() {
+ this._const = {};
+ this._var = {};
+ this._cache = {};
+ }
+ };
const WeekProcessingEfficiencyLine = class {
constructor() {
this.value = 0;
@@ -324,7 +273,7 @@ this.development - this.slaves - this.overhead - this.operations;
this._var.operatingCost = Math.trunc(value);
}
get overhead() {
- const divCount = App.Corporate.numDivisions;
+ const divCount = App.Corporate.getStored("Div");
if (divCount <= 1) { return 0; }
const divisionOverhead = Object.values(this.maintenanceCategories).reduce((r, categoryLedger) => r + categoryLedger.cost, 0);
@@ -347,108 +296,6 @@ this.development - this.slaves - this.overhead - this.operations;
get canSpecializeNow() { return this._var.canSpecializeNow; }
set canSpecializeNow(value) { this._var.canSpecializeNow = value; }
};
- App.Corporate.Division = {};
- const shared = {
- RelatedDivisionType: class {
- constructor() {
- this._var = {
- to: [],
- from: [],
- all: []
- };
- }
- get to() { return this._var.to; }
- get from() { return this._var.from; }
- get all() { return this._var.all; }
- addTo(value) {
- this._var.to.push(value);
- this._var.all.push(value);
- }
- addFrom(value) {
- this._var.from.push(value);
- this._var.all.push(value);
- }
- get anyFounded() { return this.all.some(div=>div.founded); }
- },
- FoundingType: class {
- constructor(division, {corporateCash, startingSize = 10}) {
- this._const = {
- division,
- cash: corporateCash,
- size: startingSize
- };
- }
- get cash() { return this._const.cash; }
- get size() { return this._const.size; }
- get startingPrice() {
- let div = this._const.division;
- return this._const.cash + div.foundingCost;
- }
- },
- SellOverflowSlaves: function(division) {
- const slavesToSell = division.activeSlaves - division.developmentCount;
- if (slavesToSell > 0) {
- const slaveProcCost = Math.trunc(App.Corporate.slaveMarketPurchaseValue(division, -slavesToSell));
- App.Corporate.chargeAsset(slaveProcCost, "slaves");
- division.activeSlaves -= slavesToSell;
- V.menialDemandFactor -= slavesToSell;
- }
- },
- SellUnhousedSlaves: function(division, divLedger, rate) {
- if (divLedger.market.sell != 0) { return; }
-
- let housing = Math.trunc(2 * rate * division.developmentCount);
- let unhoused = division.heldSlaves - housing - divLedger.transfer.total;
- if (unhoused <= 0) { return; }
-
- divLedger.market.sell = unhoused;
- },
- MessageProcessedSlaves: function(division, verbPhrase, color) {
- let procCount = Math.trunc(division.developmentCount * division.processRate);
- let slaveCountedNoun = numberWithPluralNonZero(procCount, "slave");
-
- return `It ${verbPhrase} approximately <span class="${color}">${slaveCountedNoun}</span> each week when operating at capacity (${division.developmentCount})`;
- },
- MessageSlaveToMarket: function(division) {
- return `The slaves from this division can be sold for <span class='yellowgreen'>${cashFormat(Math.trunc(division.soldSlaveValue * menialSlaveCost()))}</span> each.`;
- },
- EndWeekProcessing_Slaves: function(processingCount, rate) {
- const perDevPair = rate.roll();
- let slaveIncrease = perDevPair.value * processingCount;
- if (slaveIncrease < 1) {
- slaveIncrease = (slaveIncrease > Math.random() ? 1 : 0);
- }
- return {efficiency: perDevPair.roll, value: Math.trunc(slaveIncrease)};
- },
- FoundingSetupAutoBuy: function(division) {
- let foundedFrom = division.relatedDivisions.from.filter(div=>div.founded);
- if (foundedFrom.length === 0) {
- division.setAutoBuyFromMarket(true);
- } else {
- for (let otherDiv of foundedFrom) {
- if (otherDiv.getAutoSendToMarket()) {
- otherDiv.setAutoSendToDivision(division, true);
- }
- }
- }
- },
- FoundingSetupAutoSell: function(division) {
- let foundedTo = division.relatedDivisions.to.filter(div=>div.founded);
- if (foundedTo.length === 0) {
- division.setAutoSendToMarket(true);
- } else {
- for (let otherDiv of foundedTo) {
- if (otherDiv.getAutoBuyFromMarket()) {
- division.setAutoSendToDivision(otherDiv, true);
- }
- }
- }
- }
- };
- App.Corporate.Init_DivisionBase(shared);
- App.Corporate.Init_DivisionAcquiring(shared);
- App.Corporate.Init_DivisionProcessing(shared);
- App.Corporate.Init_DivisionWorking(shared);
App.Corporate.InitConstants();
let divisions = App.Corporate.divisions = mapIdList(App.Corporate.divisionList);
@@ -462,73 +309,6 @@ this.development - this.slaves - this.overhead - this.operations;
nextDiv.relatedDivisions.addFrom(div);
}
}
- let asDivision = function(division) {
- if (_.isObject(division)) { return division; }
- return App.Corporate.divisions[division];
- };
- App.Corporate.getStored = function(key ) { return V.corp[key]; };
- App.Corporate.setStored = function(key, value) { V.corp[key] = value; };
- App.Corporate.deleteStored = function(key ) { delete V.corp[key]; };
-
- // Integer properties starting with corp
- const propertyToStoryInt = {
- cash: "Cash",
- numDivisions: 'Div',
- foundedDate: 'Founded',
- dividend: "Dividend",
- specializations: "Spec",
- specializationTokens: "SpecToken",
- specializationTimer: "SpecTimer",
- };
- for (const property in propertyToStoryInt) {
- const key = propertyToStoryInt[property];
- Object.defineProperty(App.Corporate, property, {
- get: function() { return this.getStored(key); },
- set: function(value) {
- if (!Number.isFinite(value)) { throw Error("Unreal number " + key); }
- this.setStored(key, Math.trunc(value));
- }
- });
- }
-
- // Boolean properties starting with corp (true == 1, false == 0)
- const propertyToStoryBool = {
- founded: "Incorporated",
- hasMarket: "Market",
- payoutCash: "CashDividend",
- canExpand: 'ExpandToken',
- };
- for (const property in propertyToStoryBool) {
- const key = propertyToStoryBool[property];
- Object.defineProperty(App.Corporate, property, {
- get: function() { return this.getStored(key) === 1; },
- set: function(value) { this.setStored(key, value ? 1 : 0); }
- });
- }
-
- // Abnormal properties
- Object.defineProperty(App.Corporate, "value", {
- get: function() {
- if (!this.founded) { return 0; }
- let corpAssets = App.Corporate.divisionList
- .filter(div=>div.founded)
- .reduce((v, div)=>v + div.value, 0);
- return corpAssets + this.dividend + this.cash;
- }
- });
- Object.defineProperty(App.Corporate, "dividendRatio", {
- get: function() { return V.dividendRatio; },
- set: function(value) { V.dividendRatio = value; }
- });
- Object.defineProperty(App.Corporate, "dividendTimer", {
- get: function() { return V.dividendTimer; },
- set: function(value) { V.dividendTimer = value; }
- });
- Object.defineProperty(App.Corporate, "payoutAfterCash", {
- get: function() {
- return Math.max(Math.trunc(this.payoutCorpValueMultiplier * this.value), this.payoutMinimumCash);
- }
- });
const SharesType = class {
get personal() { return V.personalShares; }
@@ -554,244 +334,11 @@ this.development - this.slaves - this.overhead - this.operations;
this.current.release();
}
};
- App.Corporate.foundingCostToPlayer = function(division, personalShares, publicShares) {
- division = asDivision(division);
- let costToPlayer = Math.trunc((division.foundingCash / (personalShares + publicShares)) * personalShares);
- return costToPlayer;
- };
- App.Corporate.create = function(division, personalShares, publicShares) {
- this.shares.personal = personalShares;
- this.shares.public = publicShares;
- V.dividendTimer = 13;
- this.founded = true;
- this.foundedDate = V.week;
- this.dividend = 0;
- this.dividendRatio = 0;
- this.specializationTimer = 4;
-
- this.ledger.clear();
-
- // this will be updated by division.create
- this.numDivisions = 0;
- this.expansionTokens = 1;
-
- division = asDivision(division);
- cashX(forceNeg(App.Corporate.foundingCostToPlayer(division, personalShares, publicShares)), 'stocksTraded');
- this.cash = division.foundingCash;
-
- division.create(this);
- App.Corporate.ledger.swap();
- };
- App.Corporate.dissolve = function() {
- for (let division of this.divisionList.filter(x=>x.founded)) {
- division.dissolve();
- }
- this.founded = false;
- this.numDivisions = 0;
- this.expansionTokens = 0;
- this.setStored("Expand", 0);
- this.specializations = 0;
- this.specializationTokens = 0;
- this.setStored("SpecRaces", []);
- this.ledger.release();
-
- // Some of these will need to be refactored into App.Corporate.Specialization
- const toDeleteGlobal = [
- "personalShares",
- "publicShares",
- "dividendTimer",
- ];
- toDeleteGlobal.forEach(id => delete V[id]);
- const toDeleteCorp = [
- "Cash",
- "Dividend",
- "SpecAccent",
- "SpecAge",
- "SpecNationality",
- "SpecAmputee",
- "SpecBalls",
- "SpecDevotion",
- "SpecDick",
- "SpecEducation",
- "SpecGender",
- "SpecGenitalia",
- "SpecWeight",
- "SpecHeight",
- "SpecHormones",
- "SpecImplants",
- "SpecInjection",
- "SpecIntelligence",
- "SpecMilk",
- "SpecMuscle",
- "SpecPussy",
- "SpecSexEd",
- "SpecTrust",
- "SpecVirgin"
- ];
- toDeleteCorp.forEach(id => delete V.corp[id]);
-
- if (this.hasMarket) {
- App.Arcology.cellUpgrade(V.building, App.Arcology.Cell.Market, "Corporate Market", "Markets");
- this.hasMarket = false;
- }
- };
- App.Corporate.expandedDivision = function() {
- this.numDivisions += 1;
- this.canExpand = false;
- };
- App.Corporate.dissolvedDivision = function() {
- this.numDivisions -= 1;
- };
- App.Corporate.chargeAsset = function(cost, type) {
- if (!Number.isFinite(cost)) { throw Error("The cost provided was not a real number"); }
- cost = Math.trunc(cost);
- if (!(type in this.ledger.current)) { throw Error(`Ledger doesn't record '${type}' category.`); }
- if (cost === 0) { return; }
-
- this.ledger.current[type] += cost;
- this.cash -= cost;
- };
- App.Corporate.earnRevenue = function(cost, locality) {
- if (!Number.isFinite(cost)) { throw Error("The cost provided was not real"); }
- cost = Math.trunc(cost);
- let current = this.ledger.current;
- let key = `${locality}Revenue`;
- if (!(key in current)) { throw Error(`Unknown locality '${locality}'`); }
- current[key] += cost;
- this.cash += cost;
- };
- App.Corporate.chargeDividend = function(cost, weekLedger) {
- if (!Number.isFinite(cost)) { throw Error("The cost provided was not real"); }
- cost = Math.trunc(cost);
- if (weekLedger == null) {
- throw Error("No weekLedger provided");
- }
- this.dividend += cost;
- this.cash -= cost;
- weekLedger.dividend += cost;
- };
- App.Corporate.creditEconomy = function() {
- this.ledger.current.setEconomy(V.localEcon);
- this.cash += this.ledger.current.economicBoost;
- };
- /* Need to prevent skipping intermediaries if they exist, ie break->surgery->train, you can skip surgery only if you don't have it.*/
- App.Corporate.ownsIntermediaryDivision = function(fromDivision, toDivision) {
- for (let intermediateDiv of toDivision.relatedDivisions
- .from
- .filter(iDep => iDep.id !== fromDivision.id &&
- fromDivision.relatedDivisions.to.includes(iDep))) {
- if (intermediateDiv.founded) { return true; }
- }
- return false;
- };
- App.Corporate.slaveMarketPurchaseValue = function(division, count) {
- division = asDivision(division);
- let slaveValue = division.purchasedSlaveValue;
- let totalValue = slaveValue * count * menialSlaveCost(count);
- return Math.trunc(totalValue);
- };
- App.Corporate.slaveMarketSellValue = function(division, count) {
- division = asDivision(division);
- let slaveValue = division.soldSlaveValue;
- let totalValue = slaveValue * count * menialSlaveCost(count);
- return Math.trunc(totalValue);
- };
- App.Corporate.buySlaves = function(division, count) {
- if (count <= 0) { return 0; }
-
- division = asDivision(division);
- let purchasePrice = this.slaveMarketPurchaseValue(division, count);
- if (this.cash < purchasePrice) {
- throw Error("Attempted purchase without enough money");
- }
-
- this.chargeAsset(purchasePrice, "slaves");
- division.activeSlaves += count;
- V.menialSupplyFactor -= count;
- return purchasePrice;
- };
- App.Corporate.sellSlaves = function(division, count) {
- if (count <= 0) { return 0; }
-
- division = asDivision(division);
- if (division.heldSlaves < count) { throw Error("Attempted to sell more slaves than held."); }
-
- let sellPrice = this.slaveMarketSellValue(division, count);
- this.earnRevenue(sellPrice, "local");
- division.heldSlaves -= count;
- V.menialDemandFactor -= count;
- return sellPrice;
- };
- App.Corporate.transferSlaves = function(fromDivision, toDivision, count) {
- fromDivision = asDivision(fromDivision);
- toDivision = asDivision(toDivision);
- // TODO: validate the from and to departments are directly connected.
-
- if (fromDivision.heldSlaves < count) { throw Error(`Tried to move ${count} slaves out of ${fromDivision.name}, but it only had ${fromDivision.heldSlaves}`); }
-
- fromDivision.heldSlaves -= count;
- toDivision.activeSlaves += count;
- };
-
- App.Corporate.buyDevelopment = function(division, count) {
- division = asDivision(division);
-
- let cost = Math.trunc(division.sizeCost * count * 1000);
-
- this.chargeAsset(cost, "development");
- division.developmentCount += count;
- };
- App.Corporate.sellDevelopment = function(division, count) {
- division = asDivision(division);
-
- const devCount = division.developmentCount;
- count = count || devCount;
- if (count > devCount) { throw Error(`Attempted to sell more of a division ${division.id} than exists (${count} of ${devCount})`); }
- const developmentCost = Math.trunc(count * division.sizeCost * 800);
- this.chargeAsset(-developmentCost, "development");
- division.developmentCount -= count;
- };
- App.Corporate.setAutoSendToDivision = function(fromDivision, toDivision, value) {
- fromDivision = asDivision(fromDivision);
- toDivision = asDivision(toDivision);
-
- fromDivision.setAutoSendToDivision(toDivision, value);
- };
- App.Corporate.setAutoSendToMarket = function(division, value) {
- division = asDivision(division);
- division.setAutoSendToMarket(value);
- };
- App.Corporate.setAutoBuyFromMarket = function(division, value) {
- division = asDivision(division);
- division.setAutoBuyFromMarket(value);
- };
- App.Corporate.calculateDividend = function(weekLedger) {
- let profit = this.ledger.current.profit;
- if (this.dividendRatio > 0 && profit > 0) {
- this.chargeDividend(profit * this.dividendRatio, weekLedger);
- }
- // Payout leftover cash should be the last thing the corporation does
- // in a week so that its cash will be at the payout amount.
- if (this.payoutCash) {
- let payoutAfter = this.payoutAfterCash;
- if (this.cash > payoutAfter) {
- this.chargeDividend(this.cash - payoutAfter, weekLedger);
- }
- }
-
- if (this.dividendTimer <= 1) {
- weekLedger.payout = Math.trunc(this.dividend * this.shares.personal / this.shares.total);
- cashX(weekLedger.payout, "stocks");
- this.dividendTimer = 14;// 13 for each quarter, but +1 because we're subtracting one below.
- this.dividend = 0;
- }
- this.dividendTimer--;
- };
App.Corporate.endWeek = function() {
let ledger = new WeekProcessingLedger();
// Prepare requests
- for (let div of this.divisionList.filter(div=>div.founded)) {
+ for (let div of App.Corporate.divisionList.filter(div=>div.founded)) {
let divLedger = ledger.getDivision(div);
ledger.operatingCost += div.maintenanceCost;
@@ -805,14 +352,14 @@ this.development - this.slaves - this.overhead - this.operations;
div.endWeek_Transfer(divLedger);
div.endWeek_Market(divLedger);
}
- this.chargeAsset(ledger.operatingCost, "operations");
- this.chargeAsset(ledger.overhead, "overhead");
+ App.Corporate.chargeAsset(ledger.operatingCost, "operations");
+ App.Corporate.chargeAsset(ledger.overhead, "overhead");
// Execute sales requests, transfers, and earned revenue
for (let divLedger of Object.values(ledger.divisionLedgers)) {
let div = divLedger.division;
- this.earnRevenue(divLedger.revenue.value, "local");
+ App.Corporate.earnRevenue(divLedger.revenue.value, "local");
if (div.activeSlaves > 0) {
- shared.SellOverflowSlaves(div);
+ App.Corporate.Shared.SellOverflowSlaves(div);
}
for (let otherDivPair of divLedger.transfer.divisions) {
@@ -820,10 +367,10 @@ this.development - this.slaves - this.overhead - this.operations;
let count = otherDivPair.fill;
if (count == 0) { continue; }
- this.transferSlaves(div, otherDiv, count);
+ App.Corporate.transferSlaves(div, otherDiv, count);
}
if (divLedger.market.sell > 0) {
- divLedger.market.finalSale = this.sellSlaves(div, divLedger.market.sell);
+ divLedger.market.finalSale = App.Corporate.sellSlaves(div, divLedger.market.sell);
}
}
@@ -834,7 +381,7 @@ this.development - this.slaves - this.overhead - this.operations;
// Even purchase requests:
let purchaseValues = evenFillArray(Object.values(ledger.divisionLedgers)
.filter(divLedger=>divLedger.market.buy > 0)
- , this.cash
+ , App.Corporate.getStored("Cash")
, divLedger=>divLedger.market.buyValue);
for (let divLedgerPair of purchaseValues) {
let divLedger = divLedgerPair.item;
@@ -858,73 +405,28 @@ this.development - this.slaves - this.overhead - this.operations;
divLedger.market.buy = numSlavesEstimate;
}
}
- divLedger.market.finalPurchase = this.buySlaves(div, divLedger.market.buy);
+ divLedger.market.finalPurchase = App.Corporate.buySlaves(div, divLedger.market.buy);
}
- this.creditEconomy();
+ App.Corporate.creditEconomy();
- if (this.numDivisions < this.divisionList.length && !this.canExpand) {
- let expansionValue = Math.trunc(Math.pow(this.numDivisions, 1.5) + (5 * this.numDivisions + 2) / 4);
- if (this.value > expansionValue * 1000000) {
+ if (App.Corporate.getStored("Div") < App.Corporate.divisionList.length && App.Corporate.getStored("ExpandToken") === 0) {
+ let expansionValue = Math.trunc(Math.pow(App.Corporate.getStored("Div"), 1.5) + (5 * App.Corporate.getStored("Div") + 2) / 4);
+ if (App.Corporate.calculateValue() > expansionValue * 1000000) {
ledger.canExpandNow = true;
- this.canExpand = true;
+ App.Corporate.setStored("ExpandToken", 1);
}
}
- let specializationExpansion = 1.6 * Math.pow(1.25, this.specializations) - 1.2;
- if (this.value > specializationExpansion * 1000000) {
- this.specializationTokens++;
- this.specializations++;
+ let specializationExpansion = 1.6 * Math.pow(1.25, App.Corporate.getStored("Spec")) - 1.2;
+ if (App.Corporate.calculateValue() > specializationExpansion * 1000000) {
+ App.Corporate.setStored("SpecToken", App.Corporate.getStored("SpecToken") + 1);
+ App.Corporate.setStored("Spec", App.Corporate.getStored("Spec") + 1);
ledger.canSpecializeNow = true;
}
- if (this.specializationTimer > 0) {
- this.specializationTimer--;
+ if (App.Corporate.getStored("SpecTimer") > 0) {
+ App.Corporate.setStored("SpecTimer", App.Corporate.getStored("SpecTimer") - 1);
}
- this.calculateDividend(ledger);
+ App.Corporate.calculateDividend(ledger);
return ledger;
};
- App.Corporate.cheatCash = function(userCash) {
- userCash = Math.trunc(Number(userCash));
- if (Number.isFinite(userCash)) {
- this.cash = userCash;
- V.cheater = 1;
- }
- };
-
- App.Corporate.Backcompat = function() {
- // current foreignRevenue used to be used for old foreignRevenue
- let c = this.ledger.current;
- App.Corporate.ledger.old.foreignRevenue = c.foreignRevenue;
- if (c.operations === undefined) {
- c.operations = 0;
- c.overhead = 0;
- c.economicBoost = 0;
- }
- };
-};
-
-
-// Corporation Share Price
-// A positive q means adding shares to the market, negative means removing them
-
-globalThis.corpSharePrice = function(q = 0, personalShares = null, publicShares = null) {
- if (V.corp.Incorporated === 0) {
- return 0;
- }
- personalShares = personalShares || V.personalShares;
- publicShares = publicShares || V.publicShares;
- return Math.trunc(1000 * (App.Corporate.value / (personalShares + publicShares + q)));
-};
-
-// Corporation race blacklisting/whitelisting
-// race is the lowercase string representing the race, 'blacklist' is either 1 or 0. 1 means we are blacklisting and 0 means we are whitelisting said race
-globalThis.corpBlacklistRace = function(race, blacklist) {
- let raceArray = V.corp.SpecRaces;
- if (raceArray.length > 0 && blacklist === 1) {
- raceArray.delete(race);
- } else if (blacklist === 1) {
- raceArray = Array.from(App.Data.misc.filterRacesPublic.keys()).filter(x => x !== race);
- } else {
- raceArray.push(race);
- }
- return raceArray;
};
diff --git a/src/Corporation/corporateLedger.js b/src/Corporation/corporateLedger.js
index c0038e471939a9b791283c1153f5944c2e366017..a3d64b9b58ac7394bc8f629c7d9359f450f1578a 100644
--- a/src/Corporation/corporateLedger.js
+++ b/src/Corporation/corporateLedger.js
@@ -87,10 +87,10 @@ App.Corporate.writeLedger = function(ledger, week) {
createRow(tbody, "td", "Profit", ledger.profit, econNote);
createRow(tbody, "th", "Totals");
- createRow(tbody, "td", "Liquidity", App.Corporate.cash, V.cheatMode ? makeCheatTextbox(App.Corporate.cash) : undefined);
- createRow(tbody, "td", "Corporate Value", App.Corporate.value);
- createRow(tbody, "td", "Dividend for Payout", App.Corporate.dividend, `Pays out on ${asDateString(V.week + App.Corporate.dividendTimer, -1)},
- ${App.Corporate.dividendTimer === 1 ? `the end of this week` : `in ${App.Corporate.dividendTimer} weeks`}
+ createRow(tbody, "td", "Liquidity", App.Corporate.getStored("Cash"), V.cheatMode ? makeCheatTextbox(App.Corporate.getStored("Cash")) : undefined);
+ createRow(tbody, "td", "Corporate Value", App.Corporate.calculateValue());
+ createRow(tbody, "td", "Dividend for Payout", App.Corporate.getStored("Dividend"), `Pays out on ${asDateString(V.week + V.dividendTimer, -1)},
+ ${V.dividendTimer === 1 ? `the end of this week` : `in ${V.dividendTimer} weeks`}
`);
return table;
diff --git a/src/Corporation/corporation-utils.js b/src/Corporation/corporation-utils.js
new file mode 100644
index 0000000000000000000000000000000000000000..de80d53821c5438dffa771a32816a0ae0984db44
--- /dev/null
+++ b/src/Corporation/corporation-utils.js
@@ -0,0 +1,464 @@
+globalThis.evenFillArray = function(array, amount, lookupAmount) {
+ let perItem;
+ let changed;
+ let retval = [];
+ do {
+ let newArray = [];
+ changed = false;
+ perItem = Math.trunc(amount / array.length);
+ for (let item of array) {
+ let itemValue = lookupAmount(item);
+ if (itemValue >= perItem) {
+ newArray.push(item);
+ continue;
+ }
+
+ amount -= itemValue;
+ retval.push({item, value: itemValue});
+ changed = true;
+ }
+ array = newArray;
+ } while (changed);
+ let remainder = amount % array.length;
+ for (let item of array) {
+ let extra = 0;
+ if (remainder > 0) {
+ remainder--;
+ extra = 1;
+ }
+ retval.push({item, value: perItem + extra});
+ }
+ return retval;
+};
+
+App.Corporate.getStored = function(key) { return V.corp[key]; };
+App.Corporate.setStored = function(key, value) { V.corp[key] = value; };
+App.Corporate.deleteStored = function(key) { delete V.corp[key]; };
+
+/**
+ * @param {string|App.Corporate.Division.Base} division
+ * @returns {App.Corporate.Division.Base}
+ */
+globalThis.asDivision = function(division) {
+ if (_.isObject(division)) {
+ return division;
+ }
+ return App.Corporate.divisions[division];
+};
+
+/**
+ * @param {string|App.Corporate.Division.Base} division
+ * @param {number} personalShares
+ * @param {number} publicShares
+ * @returns {number}
+ */
+App.Corporate.foundingCostToPlayer = function(division, personalShares, publicShares) {
+ division = asDivision(division);
+ return Math.trunc((division.foundingCash / (personalShares + publicShares)) * personalShares);
+};
+
+/**
+ * @param {string|App.Corporate.Division.Base} division
+ * @param {number} personalShares
+ * @param {number} publicShares
+ */
+App.Corporate.create = function(division, personalShares, publicShares) {
+ App.Corporate.shares.personal = personalShares;
+ App.Corporate.shares.public = publicShares;
+ V.dividendTimer = 13;
+ App.Corporate.setStored("Incorporated", 1);
+ App.Corporate.setStored("Founded", V.week);
+ App.Corporate.setStored("Dividend", 0);
+ V.dividendRatio = 0;
+ App.Corporate.setStored("SpecTimer", 4);
+
+ App.Corporate.ledger.clear();
+
+ // this will be updated by division.create
+ App.Corporate.setStored("Div", 0);
+ App.Corporate.expansionTokens = 1;
+
+ division = asDivision(division);
+ cashX(forceNeg(App.Corporate.foundingCostToPlayer(division, personalShares, publicShares)), 'stocksTraded');
+ App.Corporate.setStored("Cash", Math.trunc(division.foundingCash));
+
+ division.create();
+ App.Corporate.ledger.swap();
+};
+
+App.Corporate.dissolve = function() {
+ for (let division of App.Corporate.divisionList.filter(x => x.founded)) {
+ division.dissolve();
+ }
+ App.Corporate.setStored("Incorporated", 0);
+ App.Corporate.setStored("Div", 0);
+ App.Corporate.expansionTokens = 0;
+ App.Corporate.setStored("Expand", 0);
+ App.Corporate.setStored("Spec", 0);
+ App.Corporate.setStored("SpecToken", 0);
+ App.Corporate.setStored("SpecRaces", []);
+ App.Corporate.ledger.release();
+
+ // TODO Some of these will need to be refactored into App.Corporate.Specialization
+ const toDeleteGlobal = [
+ "personalShares",
+ "publicShares",
+ "dividendTimer",
+ ];
+ toDeleteGlobal.forEach(id => delete V[id]);
+ const toDeleteCorp = [
+ "Cash",
+ "Dividend",
+ "SpecAccent",
+ "SpecAge",
+ "SpecNationality",
+ "SpecAmputee",
+ "SpecBalls",
+ "SpecDevotion",
+ "SpecDick",
+ "SpecEducation",
+ "SpecGender",
+ "SpecGenitalia",
+ "SpecWeight",
+ "SpecHeight",
+ "SpecHormones",
+ "SpecImplants",
+ "SpecInjection",
+ "SpecIntelligence",
+ "SpecMilk",
+ "SpecMuscle",
+ "SpecPussy",
+ "SpecSexEd",
+ "SpecTrust",
+ "SpecVirgin"
+ ];
+ toDeleteCorp.forEach(id => delete V.corp[id]);
+
+ if (App.Corporate.getStored("Market") === 1) {
+ App.Arcology.cellUpgrade(V.building, App.Arcology.Cell.Market, "Corporate Market", "Markets");
+ App.Corporate.setStored("Market", 0);
+ }
+};
+
+App.Corporate.expandedDivision = function() {
+ App.Corporate.setStored("Div", App.Corporate.getStored("Div") + 1);
+ App.Corporate.setStored("ExpandToken", 0);
+};
+
+App.Corporate.dissolvedDivision = function() {
+ App.Corporate.setStored("Div", App.Corporate.getStored("Div") - 1);
+};
+/**
+ * @param {number} cost
+ * @param {string} type
+ */
+App.Corporate.chargeAsset = function(cost, type) {
+ if (!Number.isFinite(cost)) {
+ throw Error("The cost provided was not a real number");
+ }
+ cost = Math.trunc(cost);
+ if (!(type in App.Corporate.ledger.current)) {
+ throw Error(`Ledger doesn't record '${type}' category.`);
+ }
+ if (cost === 0) {
+ return;
+ }
+
+ App.Corporate.ledger.current[type] += cost;
+ App.Corporate.setStored("Cash", App.Corporate.getStored("Cash") - cost);
+};
+
+/**
+ * @param {number} cost
+ * @param {string} locality
+ */
+App.Corporate.earnRevenue = function(cost, locality) {
+ if (!Number.isFinite(cost)) {
+ throw Error("The cost provided was not real");
+ }
+ cost = Math.trunc(cost);
+ let current = App.Corporate.ledger.current;
+ let key = `${locality}Revenue`;
+ if (!(key in current)) {
+ throw Error(`Unknown locality '${locality}'`);
+ }
+ current[key] += cost;
+ App.Corporate.setStored("Cash", App.Corporate.getStored("Cash") + cost);
+};
+
+/**
+ * @param {number} cost
+ * @param {object} weekLedger
+ */
+App.Corporate.chargeDividend = function(cost, weekLedger) {
+ if (!Number.isFinite(cost)) {
+ throw Error("The cost provided was not real");
+ }
+ cost = Math.trunc(cost);
+ if (weekLedger == null) {
+ throw Error("No weekLedger provided");
+ }
+ App.Corporate.setStored("Dividend", App.Corporate.getStored("Dividend") + cost);
+ App.Corporate.setStored("Cash", App.Corporate.getStored("Cash") - cost);
+ weekLedger.dividend += cost;
+};
+
+App.Corporate.creditEconomy = function() {
+ App.Corporate.ledger.current.setEconomy(V.localEcon);
+ App.Corporate.setStored("Cash", App.Corporate.getStored("Cash") + App.Corporate.ledger.current.economicBoost);
+};
+
+/**
+ * Need to prevent skipping intermediaries if they exist, ie break->surgery->train, you can skip surgery only if you don't have it.
+ * @param {App.Corporate.Division.Base} fromDivision
+ * @param {App.Corporate.Division.Base} toDivision
+ * @returns {boolean}
+ */
+App.Corporate.ownsIntermediaryDivision = function(fromDivision, toDivision) {
+ for (let intermediateDiv of toDivision.relatedDivisions
+ .from
+ .filter(iDep => iDep.id !== fromDivision.id &&
+ fromDivision.relatedDivisions.to.includes(iDep))) {
+ if (intermediateDiv.founded) {
+ return true;
+ }
+ }
+ return false;
+};
+
+/**
+ * @param {string|App.Corporate.Division.Base} division
+ * @param {number} count
+ * @returns {number}
+ */
+App.Corporate.slaveMarketPurchaseValue = function(division, count) {
+ division = asDivision(division);
+ let slaveValue = division.purchasedSlaveValue;
+ let totalValue = slaveValue * count * menialSlaveCost(count);
+ return Math.trunc(totalValue);
+};
+
+/**
+ * @param {string|App.Corporate.Division.Base} division
+ * @param {number} count
+ * @returns {number}
+ */
+App.Corporate.slaveMarketSellValue = function(division, count) {
+ division = asDivision(division);
+ let slaveValue = division.soldSlaveValue;
+ let totalValue = slaveValue * count * menialSlaveCost(count);
+ return Math.trunc(totalValue);
+};
+
+/**
+ * @param {string|App.Corporate.Division.Base} division
+ * @param {number} count
+ * @returns {number}
+ */
+App.Corporate.buySlaves = function(division, count) {
+ if (count <= 0) {
+ return 0;
+ }
+
+ division = asDivision(division);
+ let purchasePrice = App.Corporate.slaveMarketPurchaseValue(division, count);
+ if (App.Corporate.getStored("Cash") < purchasePrice) {
+ throw Error("Attempted purchase without enough money");
+ }
+
+ App.Corporate.chargeAsset(purchasePrice, "slaves");
+ division.activeSlaves += count;
+ V.menialSupplyFactor -= count;
+ return purchasePrice;
+};
+
+/**
+ * @param {string|App.Corporate.Division.Base} division
+ * @param {number} count
+ * @returns {number}
+ */
+App.Corporate.sellSlaves = function(division, count) {
+ if (count <= 0) {
+ return 0;
+ }
+
+ division = asDivision(division);
+ if (division.heldSlaves < count) {
+ throw Error("Attempted to sell more slaves than held.");
+ }
+
+ let sellPrice = App.Corporate.slaveMarketSellValue(division, count);
+ App.Corporate.earnRevenue(sellPrice, "local");
+ division.heldSlaves -= count;
+ V.menialDemandFactor -= count;
+ return sellPrice;
+};
+
+/**
+@param {string|App.Corporate.Division.Base} fromDivision
+ * @param {string|App.Corporate.Division.Base} toDivision
+ * @param {number} count
+ */
+App.Corporate.transferSlaves = function(fromDivision, toDivision, count) {
+ fromDivision = asDivision(fromDivision);
+ toDivision = asDivision(toDivision);
+ // TODO: validate the from and to departments are directly connected.
+
+ if (fromDivision.heldSlaves < count) {
+ throw Error(`Tried to move ${count} slaves out of ${fromDivision.name}, but it only had ${fromDivision.heldSlaves}`);
+ }
+
+ fromDivision.heldSlaves -= count;
+ toDivision.activeSlaves += count;
+};
+
+/**
+ * @param {string|App.Corporate.Division.Base} division
+ * @param {number} count
+ */
+App.Corporate.buyDevelopment = function(division, count) {
+ division = asDivision(division);
+
+ let cost = Math.trunc(division.sizeCost * count * 1000);
+
+ App.Corporate.chargeAsset(cost, "development");
+ division.developmentCount += count;
+};
+
+/**
+ * @param {string|App.Corporate.Division.Base} division
+ * @param {number} [count=0]
+ */
+App.Corporate.sellDevelopment = function(division, count = 0) {
+ division = asDivision(division);
+
+ const devCount = division.developmentCount;
+ count = count || devCount;
+ if (count > devCount) {
+ throw Error(`Attempted to sell more of a division ${division.id} than exists (${count} of ${devCount})`);
+ }
+ const developmentCost = Math.trunc(count * division.sizeCost * 800);
+ App.Corporate.chargeAsset(-developmentCost, "development");
+ division.developmentCount -= count;
+};
+
+/**
+ * @param {string|App.Corporate.Division.Base} fromDivision
+ * @param {string|App.Corporate.Division.Base} toDivision
+ * @param {*} value
+ */
+App.Corporate.setAutoSendToDivision = function(fromDivision, toDivision, value) {
+ fromDivision = asDivision(fromDivision);
+ toDivision = asDivision(toDivision);
+
+ fromDivision.setAutoSendToDivision(toDivision, value);
+};
+
+/**
+ * @param {string|App.Corporate.Division.Base} division
+ * @param {*} value
+ */
+App.Corporate.setAutoSendToMarket = function(division, value) {
+ division = asDivision(division);
+ division.setAutoSendToMarket(value);
+};
+
+/**
+ * @param {string|App.Corporate.Division.Base} division
+ * @param {*} value
+ */
+App.Corporate.setAutoBuyFromMarket = function(division, value) {
+ division = asDivision(division);
+ division.setAutoBuyFromMarket(value);
+};
+/**
+ * @param {object} weekLedger
+ */
+App.Corporate.calculateDividend = function(weekLedger) {
+ let profit = App.Corporate.ledger.current.profit;
+ if (V.dividendRatio > 0 && profit > 0) {
+ App.Corporate.chargeDividend(profit * V.dividendRatio, weekLedger);
+ }
+ // Payout leftover cash should be the last thing the corporation does
+ // in a week so that its cash will be at the payout amount.
+ if (App.Corporate.getStored("CashDividend") === 1) {
+ let payoutAfter = App.Corporate.payoutAfterCash();
+ if (App.Corporate.getStored("Cash") > payoutAfter) {
+ App.Corporate.chargeDividend(App.Corporate.getStored("Cash") - payoutAfter, weekLedger);
+ }
+ }
+
+ if (V.dividendTimer <= 1) {
+ weekLedger.payout = Math.trunc(App.Corporate.getStored("Dividend") * App.Corporate.shares.personal / App.Corporate.shares.total);
+ cashX(weekLedger.payout, "stocks");
+ V.dividendTimer = 14;// 13 for each quarter, but +1 because we're subtracting one below.
+ App.Corporate.setStored("Dividend", 0);
+ }
+
+ V.dividendTimer--;
+};
+
+/**
+ * @param {number} userCash
+ */
+App.Corporate.cheatCash = function(userCash) {
+ userCash = Math.trunc(Number(userCash));
+ if (Number.isFinite(userCash)) {
+ App.Corporate.setStored("Cash", Math.trunc(userCash));
+ V.cheater = 1;
+ }
+};
+
+/**
+ * @returns {number}
+ */
+App.Corporate.calculateValue = function() {
+ if (App.Corporate.getStored("Incorporated") === 0) {
+ return 0;
+ }
+ let corpAssets = App.Corporate.divisionList
+ .filter(div => div.founded)
+ .reduce((v, div) => v + div.value, 0);
+ return corpAssets + App.Corporate.getStored("Dividend") + App.Corporate.getStored("Cash");
+};
+
+/**
+ * @returns {number}
+ */
+App.Corporate.payoutAfterCash = function() {
+ return Math.max(Math.trunc(App.Corporate.payoutCorpValueMultiplier * App.Corporate.calculateValue()), App.Corporate.payoutMinimumCash);
+};
+
+/**
+ * Corporation Share Price
+ * @param {number} q positive means adding shares to the market, negative means removing them
+ * @param {number} [personalShares=null]
+ * @param {number} [publicShares=null]
+ * @returns {number}
+ */
+globalThis.corpSharePrice = function(q = 0, personalShares = null, publicShares = null) {
+ if (V.corp.Incorporated === 0) {
+ return 0;
+ }
+ personalShares = personalShares || V.personalShares;
+ publicShares = publicShares || V.publicShares;
+ return Math.trunc(1000 * (App.Corporate.calculateValue() / (personalShares + publicShares + q)));
+};
+
+/**
+ * Corporation race blacklisting/whitelisting
+ * @param {string} race lowercase string representing the race
+ * @param {0|1} blacklist 1 means we are blacklisting and 0 means we are whitelisting given race
+ * @returns {Array<string>}
+ */
+globalThis.corpBlacklistRace = function(race, blacklist) {
+ let raceArray = V.corp.SpecRaces;
+ if (raceArray.length > 0 && blacklist === 1) {
+ raceArray.delete(race);
+ } else if (blacklist === 1) {
+ raceArray = Array.from(App.Data.misc.filterRacesPublic.keys()).filter(x => x !== race);
+ } else {
+ raceArray.push(race);
+ }
+ return raceArray;
+};
diff --git a/src/Corporation/manageCorporation.js b/src/Corporation/manageCorporation.js
index 49831789f72dc08b36a85cfd1550423bd63587d8..5a1e1364c775dd2211f86f4bfd4740877a44f6fe 100644
--- a/src/Corporation/manageCorporation.js
+++ b/src/Corporation/manageCorporation.js
@@ -9,18 +9,37 @@ App.Corporate.manage = function() {
function structure() {
const f = new DocumentFragment();
- if (!App.Corporate.founded) {
+ if (App.Corporate.getStored("Incorporated") === 0) {
f.append(foundingPage());
} else {
- App.UI.DOM.appendNewElement("h1", f, "Corporation Overview");
- if (App.Corporate.foundedDate) {
- App.UI.DOM.appendNewElement("div", f, `Founded on ${asDateString(App.Corporate.foundedDate)}.`, "founding");
+ App.UI.DOM.appendNewElement("h1", f, `Corporation Overview`);
+ App.UI.DOM.appendNewElement("h2", f,
+ App.UI.DOM.link(V.corp.Name, () => {
+ if (Dialog.isOpen()) {
+ Dialog.close();
+ }
+
+ Dialog.setup("Rename");
+
+ const frag = new DocumentFragment();
+
+ frag.append(App.UI.DOM.makeTextBox(V.corp.Name, str => { V.corp.Name = str; App.UI.reload(); }));
+
+ $(Dialog.body()).empty().append(frag);
+
+ Dialog.open();
+ }), ["white", "margin-bottom"]
+ );
+
+ if (App.Corporate.getStored("Founded")) {
+ App.UI.DOM.appendNewElement("div", f, `Founded on ${asDateString(App.Corporate.getStored("Founded"))}.`, ["founding"]);
}
f.append(App.Corporate.writeLedger(App.Corporate.ledger.old, V.week - 1));
f.append(divisionManagement());
- if (App.Corporate.canExpand) { // Is the corporation large enough to expand into another division?
+ if (App.Corporate.getStored("ExpandToken") === 1) {
+ // Is the corporation large enough to expand into another division?
f.append(newDivision());
}
f.append(financials());
@@ -248,7 +267,7 @@ App.Corporate.manage = function() {
{'name': 'Expand x10', 'count': 10}
];
- for (const buySet of buyDevArray.filter(buySet => App.Corporate.cash >= buySet.count * depExpandCost)) {
+ for (const buySet of buyDevArray.filter(buySet => App.Corporate.getStored("Cash") >= buySet.count * depExpandCost)) {
links.push(App.UI.DOM.link(buySet.name, () => {
App.Corporate.buyDevelopment(division.id, buySet.count);
refresh();
@@ -291,11 +310,11 @@ App.Corporate.manage = function() {
if (division.toMarket) {
const o = {send: division.getAutoSendToMarket()};
options.addOption("Auto send to market", "send", o)
- .addValue("Enabled", 1, () => {
+ .addValue("Enabled", true, () => {
App.Corporate.setAutoSendToMarket(division.id, 1);
refresh();
}).on()
- .addValue("Disabled", 0, () => {
+ .addValue("Disabled", false, () => {
App.Corporate.setAutoSendToMarket(division.id, 0);
refresh();
}).off();
@@ -304,18 +323,18 @@ App.Corporate.manage = function() {
if (division.fromMarket) {
const o = {buy: division.getAutoBuyFromMarket()};
options.addOption("Auto buy slaves from the market", "buy", o)
- .addValue("Enabled", 1, () => {
+ .addValue("Enabled", true, () => {
App.Corporate.setAutoBuyFromMarket(division.id, 1);
refresh();
}).on()
- .addValue("Disabled", 0, () => {
+ .addValue("Disabled", false, () => {
App.Corporate.setAutoBuyFromMarket(division.id, 0);
refresh();
}).off();
}
frag.append(options.render());
- if (App.Corporate.numDivisions > 1) {
+ if (App.Corporate.getStored("Div") > 1) {
// Cannot dissolve the last division
addDiv(frag,
App.UI.DOM.link("Dissolve Division", () => {
@@ -355,7 +374,7 @@ App.Corporate.manage = function() {
for (const division of App.Corporate.divisionList.filter(x => !x.founded && x.relatedDivisions.anyFounded)) {
const depCost = division.foundingCost * 1000;
- if (App.Corporate.cash >= depCost) {
+ if (App.Corporate.getStored("Cash") >= depCost) {
addDiv(el,
App.UI.DOM.link("Add " + division.name + " Division", () => {
App.Corporate.divisions[division.id].create(App.Corporate);
@@ -384,48 +403,48 @@ App.Corporate.manage = function() {
const div = document.createElement("div");
let dividends = App.Corporate.dividendOptions;
- let index = dividends.findIndex(element => App.Corporate.dividendRatio >= element);
+ let index = dividends.findIndex(element => V.dividendRatio >= element);
let dividend = dividends[index];
if (index >= 0) {
let nextIndex = index + 1;
- App.Corporate.dividendRatio = dividend;/* Normalize */
- div.append(`The corporation is currently reserving ${Math.trunc(dividend * 100)}% of its profit to be paid out as dividends. `);
+ V.dividendRatio = dividend;/* Normalize */
+ div.append(`${V.corp.Name} is currently reserving ${Math.trunc(dividend * 100)}% of its profit to be paid out as dividends. `);
const links = [];
if (index > 0) {
links.push(App.UI.DOM.link("Increase Ratio", () => {
- App.Corporate.dividendRatio = dividends[index - 1];
+ V.dividendRatio = dividends[index - 1];
refresh();
}));
}
if (nextIndex !== dividends.length) {
links.push(App.UI.DOM.link("Reduce Ratio", () => {
- App.Corporate.dividendRatio = dividends[nextIndex];
+ V.dividendRatio = dividends[nextIndex];
refresh();
}));
} else {
links.push(App.UI.DOM.link("None", () => {
- App.Corporate.dividendRatio = 0;
+ V.dividendRatio = 0;
refresh();
}));
}
div.append(App.UI.DOM.generateLinksStrip(links));
} else {
- div.append(`The corporation is currently not reserving a portion of its profit to be paid out as dividends. `);
+ div.append(`${V.corp.Name} is currently not reserving a portion of its profit to be paid out as dividends. `);
div.append(App.UI.DOM.link("Increase Ratio", () => {
- App.Corporate.dividendRatio = dividends[dividends.length - 1];
+ V.dividendRatio = dividends[dividends.length - 1];
refresh();
}));
}
el.append(div);
- if (App.Corporate.payoutCash) {
- addDiv(el, "The corporation will payout unused cash reserves over ", App.UI.DOM.makeElement("span", cashFormat(App.Corporate.payoutAfterCash), "yellowgreen"), " as dividends. ", App.UI.DOM.link("Stop", () => {
- App.Corporate.payoutCash = false;
+ if (App.Corporate.getStored("CashDividend") === 1) {
+ addDiv(el, "The corporation will payout unused cash reserves over ", App.UI.DOM.makeElement("span", cashFormat(App.Corporate.payoutAfterCash()), "yellowgreen"), " as dividends. ", App.UI.DOM.link("Stop", () => {
+ App.Corporate.setStored("CashDividend", 0);
refresh();
}));
} else {
- addDiv(el, "You can direct the corporation to reserve cash over ", App.UI.DOM.makeElement("span", cashFormat(App.Corporate.payoutAfterCash), "yellowgreen"), " to be paid out as dividends as well. ", App.UI.DOM.link("Payout Cash Reserves", () => {
- App.Corporate.payoutCash = true;
+ addDiv(el, "You can direct the corporation to reserve cash over ", App.UI.DOM.makeElement("span", cashFormat(App.Corporate.payoutAfterCash()), "yellowgreen"), " to be paid out as dividends as well. ", App.UI.DOM.link("Payout Cash Reserves", () => {
+ App.Corporate.setStored("CashDividend", 1);
refresh();
}));
}
@@ -519,7 +538,7 @@ App.Corporate.manage = function() {
let splitStockConstants = App.Corporate.stockSplits;
r = [];
- r.push(`The corporation can perform a stock split to increase the number of stocks while maintaining the same owned value. This requires paying a market fee of`);
+ r.push(`${V.corp.Name} can perform a stock split to increase the number of stocks while maintaining the same owned value. This requires paying a market fee of`);
r.push(App.UI.DOM.makeElement("span", cashFormat(splitFeeValue), ["cash", "dec"]));
r.push(`plus a per-share fee depending on the type of split being done.`);
@@ -587,9 +606,9 @@ App.Corporate.manage = function() {
// Spending tokens on new specializations
const r = [];
if (V.corp.SpecToken > 1) {
- r.push(`Your corporation has ${V.corp.SpecToken} specializations left.`);
+ r.push(`${V.corp.Name} has ${V.corp.SpecToken} specializations left.`);
} else {
- r.push(`Your corporation has one specialization left.`);
+ r.push(`${V.corp.Name} has one specialization left.`);
}
if (V.corp.SpecTimer > 0) {
r.push(`You have recently changed specializations and the corporation needs`);
diff --git a/src/Mods/Catmod/events/CMRESS/annoyingcat.js b/src/Mods/Catmod/events/CMRESS/annoyingcat.js
index f63374870b0965c4157abb618e1930e9c80677ba..8a17c63074a6ee4be0443d519b18ffac498b51ed 100644
--- a/src/Mods/Catmod/events/CMRESS/annoyingcat.js
+++ b/src/Mods/Catmod/events/CMRESS/annoyingcat.js
@@ -6,7 +6,7 @@ App.Events.CMRESSAnnoyingCat = class CMRESSAnnoyingCat extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canMove,
s => s.race === "catgirl",
diff --git a/src/Mods/Catmod/events/CMRESS/catLove.js b/src/Mods/Catmod/events/CMRESS/catLove.js
index ca586f069982511903ccf5919776632385eb50e7..6eca89321e9652021da9fa2ce72306032706e934 100644
--- a/src/Mods/Catmod/events/CMRESS/catLove.js
+++ b/src/Mods/Catmod/events/CMRESS/catLove.js
@@ -6,7 +6,7 @@ App.Events.CMRESSCatLove = class CMRESSCatLove extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canMove,
s => s.race === "catgirl",
diff --git a/src/Mods/Catmod/events/CMRESS/catPresent.js b/src/Mods/Catmod/events/CMRESS/catPresent.js
index e1bf83b8e3ff3065dbc56ccd2c13193722fa869e..ed1574199055ac9482cfb22a1ba50ba795c9b157 100644
--- a/src/Mods/Catmod/events/CMRESS/catPresent.js
+++ b/src/Mods/Catmod/events/CMRESS/catPresent.js
@@ -6,7 +6,7 @@ App.Events.CMRESSCatPresent = class CMRESSCatPresent extends App.Events.BaseEven
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canMove,
s => s.race === "catgirl",
diff --git a/src/Mods/Catmod/events/CMRESS/lazyCat.js b/src/Mods/Catmod/events/CMRESS/lazyCat.js
index f888ffab7d9c686942686c11c52445d70be7aadf..b8748d5912a4a478bc3922aed9516d1957313bb2 100644
--- a/src/Mods/Catmod/events/CMRESS/lazyCat.js
+++ b/src/Mods/Catmod/events/CMRESS/lazyCat.js
@@ -6,7 +6,7 @@ App.Events.CMRESSLazyCat = class CMRESSLazyCat extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canStand,
canMove,
s => s.race === "catgirl",
diff --git a/src/Mods/Catmod/events/CMRESS/spoiledCat.js b/src/Mods/Catmod/events/CMRESS/spoiledCat.js
index bdab4dc3da54e69e1fda77a4da69b9951858e61f..402b7e9e7f1ba5d6312de202e03ea89194b84a46 100644
--- a/src/Mods/Catmod/events/CMRESS/spoiledCat.js
+++ b/src/Mods/Catmod/events/CMRESS/spoiledCat.js
@@ -9,7 +9,7 @@ App.Events.CMRESSSpoiledCat = class CMRESSSpoiledCat extends App.Events.BaseEven
return [
[ // single event slave
s => s.assignment === Job.PUBLIC || s.assignment === Job.WHORE,
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canStand,
canMove,
s => s.race === "catgirl",
diff --git a/src/Mods/Catmod/events/SoSSniper.js b/src/Mods/Catmod/events/SoSSniper.js
index e70a305d4f126331b8fc22c5e6b595888da9a880..6c520fc3bc28bc66653c184016179414ff504ebc 100644
--- a/src/Mods/Catmod/events/SoSSniper.js
+++ b/src/Mods/Catmod/events/SoSSniper.js
@@ -26,7 +26,7 @@ App.Events.RESosSniper = class RESosSniper extends App.Events.BaseEvent {
slave.origin = "$He was an elite sniper of the Sons of Sekhmet, nearly successful in assassinating you with a long-range shot from across the arcology before being captured by your Imperial Knights in a tense shootout.";
slave.intelligenceImplant = 30;
slave.career = "a sniper";
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.devotion = -100;
slave.trust = random(-20, 10);
slave.weight = random(-20, 30);
diff --git a/src/Mods/Catmod/events/SoSassassin.js b/src/Mods/Catmod/events/SoSassassin.js
index f653a3058b94011c82531144674b7c13998a6fcc..a3729fa0a90185143e753954f33ba692f977244d 100644
--- a/src/Mods/Catmod/events/SoSassassin.js
+++ b/src/Mods/Catmod/events/SoSassassin.js
@@ -49,7 +49,7 @@ App.Events.RESosAssassin = class RESosAssassin extends App.Events.BaseEvent {
r.push(`As the two would-be assassins collapse, the pretty woman draws a vicious-looking curved knife from her sleeve, swears in a foreign language, and lunges towards you.`);
if (S.Bodyguard) {
r.push(`She's intercepted by ${S.Bodyguard.slaveName}, who drops ${his} empty firearm on the ground to pull ${his} own sword free.`);
- if (S.Bodyguard.skill.combat > 0 && V.personalArms > 0) {
+ if (S.Bodyguard.skill.combat > 60 && V.personalArms > 0) {
r.push(`The two trained killers clash ferociously, ${S.Bodyguard.slaveName} using the longer reach of ${his} sword to keep the mysterious assassin's lightning-fast long knife at bay. As the two narrowly avoid each other's attacks, you pull up your handgun, one bullet left in the chamber, carefully lower your aim, and fire into the melee, blasting a hole through the assassin's left thigh. As she cries out in pain and stumbles, your trained bodyguard tackles her to the ground and slams a fist into her face before she can activate whatever suicide method she has. As the security drones arrive, the marketplace watching the <span class="red">minorly damaged</span> scene with a mixture of <span class="green">shock and admiration,</span> you call for a medic and some sedatives. You're about to claim yourself a <span class="green">brand new slave.</span>`);
cashX(-1000, "event", S.Bodyguard);
repX(2500, "event", S.Bodyguard);
@@ -59,7 +59,7 @@ App.Events.RESosAssassin = class RESosAssassin extends App.Events.BaseEvent {
slave.origin = "$He was an elite assassin of the Sons of Sekhmet, narrowly captured in a well-planned assassination attempt where $he distracted you with $his pretty face..";
slave.intelligenceImplant = 30;
slave.career = "an assassin";
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.devotion = -100;
slave.trust = random(-20, 10);
slave.weight = random(-20, 30);
@@ -68,13 +68,13 @@ App.Events.RESosAssassin = class RESosAssassin extends App.Events.BaseEvent {
slave.shouldersTat = either("flowers", "tribal patterns", "asian art");
slave.custom.tattoo = "$He has the orange sun of the Sons of Sekhmet tattooed on $his neck, marking $him as a high-ranking operative.";
newSlave(slave);
- } else if (S.Bodyguard.skill.combat > 0 && V.personalArms < 1) {
+ } else if (S.Bodyguard.skill.combat > 60 && V.personalArms < 1) {
r.push(`The two trained killers clash ferociously, ${S.Bodyguard.slaveName} using the longer reach of ${his} sword to keep the mysterious assassin's lightning-fast long knife at bay. For what feels like a full minute they dodge each other's lethal blows, both unable to land a hit on the other, until you see the security drones you called for finally start to arrive. Sensing that her time window is closing, the assassin tries to step back, only for her retreat to be cut off as ${S.Bodyguard.slaveName} ferociously leaps forward and plunges ${his} sword directly through the assassin's neck. ${He} nearly decapitates the pretty head as ${he} pulls ${his} sword back, the marketplace watching the <span class="red">minorly damaged</span> scene with a mixture of <span class="green">shock and admiration.</span>`);
cashX(-1000, "event", S.Bodyguard);
repX(2500, "event", S.Bodyguard);
} else {
r.push(`The two killers clash, but it's immediately apparent who's better trained. The assassin blocks every strike coming from ${S.Bodyguard.slaveName} and hits back twice as hard, forcing ${him} on the defensive. When ${S.Bodyguard.slaveName} stumbles, the assassin furiously kicks the blade out from ${his} hand and leaps atop ${him},`);
- if (S.Bodyguard.skill.combat < 1 && V.personalArms > 0) {
+ if (S.Bodyguard.skill.combat <= 60 && V.personalArms > 0) {
r.push(`readying her own knife to slash the bodyguard's throat. You raise your handgun at the same time, one bullet left in the trigger, and fire a single round through the assassin's skull just before she can. Her head explodes backwards in a burst of gore, and she slumps off ${S.Bodyguard.slaveName}, her knife clattering to the ground. The citizens in the marketplace watch the <span class="red">minorly damaged</span> scene with a mixture of <span class="green">shock and admiration,</span> both you and ${S.Bodyguard.slaveName} panting in the wake of the attack and surrounded by bodies.`);
cashX(-1000, "event", S.Bodyguard);
repX(2500, "event", S.Bodyguard);
@@ -116,7 +116,7 @@ App.Events.RESosAssassin = class RESosAssassin extends App.Events.BaseEvent {
}
r.toParagraph();
r.push(`As the two would-be assassins collapse, the pretty woman draws a vicious-looking curved knife from her sleeve, swears in a foreign language, and lunges towards you. She's intercepted by ${S.Bodyguard.slaveName}, who drops ${his} empty firearm on the ground to pull ${his} own sword free.`);
- if (S.Bodyguard.skill.combat > 0 && V.personalArms > 0 && V.PC.skill.warfare >= 60) {
+ if (S.Bodyguard.skill.combat > 60 && V.personalArms > 0 && V.PC.skill.warfare >= 60) {
r.push(`The two trained killers clash ferociously, ${S.Bodyguard.slaveName} using the longer reach of ${his} sword to keep the mysterious assassin's lightning-fast long knife at bay. As the two narrowly avoid each other's attacks, you pull up your handgun, one bullet left in the chamber, carefully lower your aim, and fire into the melee, blasting a hole through the assassin's left thigh. As she cries out in pain and stumbles, your trained bodyguard tackles her to the ground and slams a fist into her face before she can activate whatever suicide method she has. As the security drones arrive, the marketplace watching the <span class="red">minorly damaged</span> scene with a mixture of <span class="green">shock and admiration,</span> you call for a medic and some sedatives. You're about to claim yourself a <span class="green">brand new slave.</span>`);
cashX(-1000, "event", S.Bodyguard);
repX(2500, "event", S.Bodyguard);
@@ -126,7 +126,7 @@ App.Events.RESosAssassin = class RESosAssassin extends App.Events.BaseEvent {
slave.origin = "$He was an elite assassin of the Sons of Sekhmet, narrowly captured in a well-planned assassination attempt where $he distracted you with $his pretty face.";
slave.intelligenceImplant = 30;
slave.career = "an assassin";
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.devotion = -100;
slave.trust = random(-20, 10);
slave.weight = random(-20, 30);
@@ -135,7 +135,7 @@ App.Events.RESosAssassin = class RESosAssassin extends App.Events.BaseEvent {
slave.shouldersTat = either("flowers", "tribal patterns", "asian art");
slave.custom.tattoo = "$He has the orange sun of the Sons of Sekhmet tattooed on $his neck, marking $him as a high-ranking operative.";
newSlave(slave);
- } else if (S.Bodyguard.skill.combat > 0) {
+ } else if (S.Bodyguard.skill.combat > 60) {
r.push(`The two trained killers clash ferociously, ${S.Bodyguard.slaveName} using the longer reach of ${his} sword to keep the mysterious assassin's lightning-fast long knife at bay. For what feels like a full minute they dodge each other's lethal blows, both unable to land a hit on the other, until you see the security drones you called for finally start to arrive. Sensing that her time window is closing, the assassin tries to step back, only for her retreat to be cut off as ${S.Bodyguard.slaveName} ferociously leaps forward and plunges ${his} sword directly through the assassin's neck. ${He} nearly decapitates the pretty head as ${he} pulls ${his} sword back, the marketplace watching the <span class="red">minorly damaged</span> scene with a mixture of <span class="green">shock and admiration.</span>`);
cashX(-1000, "event", S.Bodyguard);
repX(2500, "event", S.Bodyguard);
@@ -169,7 +169,7 @@ App.Events.RESosAssassin = class RESosAssassin extends App.Events.BaseEvent {
r.toParagraph();
if (S.Bodyguard) {
r.push(`She's intercepted by ${S.Bodyguard.slaveName}, who drops ${his} empty firearm on the ground to pull ${his} own sword free.`);
- if (S.Bodyguard.skill.combat > 0) {
+ if (S.Bodyguard.skill.combat > 60) {
r.push(`The two trained killers clash ferociously, ${S.Bodyguard.slaveName} using the longer reach of ${his} sword to keep the mysterious assassin's lightning-fast long knife at bay. For what feels like a full minute they dodge each other's lethal blows, both unable to land a hit on the other, until you see the security drones you called for finally start to arrive. Sensing that her time window is closing, the assassin tries to step back, only for her retreat to be cut off as ${S.Bodyguard.slaveName} ferociously leaps forward and plunges ${his} sword directly through the assassin's neck. ${He} nearly decapitates the pretty head as ${he} pulls ${his} sword back, the marketplace watching the <span class="red">minorly damaged</span> scene with a mixture of <span class="green">shock and admiration.</span>`);
cashX(-1000, "event", S.Bodyguard);
repX(2500, "event", S.Bodyguard);
diff --git a/src/Mods/Catmod/events/nonRandom/projectNComplete.js b/src/Mods/Catmod/events/nonRandom/projectNComplete.js
index c695bdc02fbdeb1cc8483fc40cec141e40b119df..2c0f0ace406cb01adafe2bf8f3ae22b12d8e021b 100644
--- a/src/Mods/Catmod/events/nonRandom/projectNComplete.js
+++ b/src/Mods/Catmod/events/nonRandom/projectNComplete.js
@@ -9,48 +9,21 @@ App.Events.SEProjectNComplete = class SEProjectNComplete extends App.Events.Base
execute(node) {
V.bodyPuristRiot = 1;
V.projectN.public = 1;
- const slave = GenerateNewSlave("XX", {
- maxAge: 16, minAge: 16, disableDisability: 1, race: "catgirl", nationality: "Stateless"
- });
+
+ const slave = growCatgirl("XX", {minAge: 16, maxAge: 16});
slave.origin = "$He is a vat-grown catgirl, the world's first. You painstakingly grew $him yourself over months in the expensive Project N, a cutting-edge biotechnology experiment led by Doctor Nieskowitz.";
slave.face = random(75, 100);
- slave.faceShape = "feline";
slave.slaveName = V.subjectDeltaName;
slave.birthName = V.subjectDeltaName;
- slave.slaveSurname = "";
- slave.birthSurname = "";
- slave.career = "an orphan";
- slave.intelligenceImplant = 0;
slave.hColor = "white";
slave.override_H_Color = 1; // TODO: Identifier 'override_H_Color' is not in camel case
slave.origHColor = "white";
slave.skin = "pure white";
slave.origSkin = "pure white";
slave.override_Skin = 1; // TODO: Identifier 'override_Skin' is not in camel case
- slave.teeth = "fangs";
- slave.devotion = 20;
- slave.trust = 30;
slave.boobs = 300;
- slave.earShape = "none";
- slave.earT = "cat";
slave.earTColor = slave.hColor;
- slave.earImplant = 1;
- slave.tailShape = "cat";
slave.tailColor = slave.hColor;
- slave.eye.left.pupil = "catlike";
- slave.eye.right.pupil = "catlike";
- slave.weight = 10;
- slave.muscles = 0;
- slave.waist = 10;
- slave.skill.vaginal = 0;
- slave.vagina = 0;
- slave.skill.oral = 0;
- slave.skill.anal = 0;
- slave.anus = 0;
- slave.skill.whoring = 0;
- slave.skill.entertainment = 0;
- slave.canRecruit = 0;
- slave.accent = 4;
App.Events.addParagraph(node, [`It's finally time. Nieskowitz greets you with a rare smile as you enter the genetics lab, showing you to the tube where ${V.subjectDeltaName} floats unconscious. Far from the blob of pinkish flesh she once was, ${V.subjectDeltaName} is now a fully-formed humanoid, covered in a layer of beautiful, snow-white fur and topped with twitching, pointed cat ears. You can hear the bustle of the media, journalists who somehow found out about ${V.subjectDeltaName}'s near completion and are all but breaking down the lab's door trying to get a good look in.`]);
App.Events.addParagraph(node, [`"Be aware that she won't have any instinctive knowledge of our language. Frankly, I don't know if she'll be capable of real human speech at all, honestly. This is a first for me, too. Try and keep her away from any cameras in her face, they're likely to frighten her. Anyway, I guess she's ready. Are you?"`]);
diff --git a/src/Mods/Catmod/events/nonRandom/projectNInitialized.js b/src/Mods/Catmod/events/nonRandom/projectNInitialized.js
index bd8bdf57e047ebf7e1506f12151eb79fc06e71b8..d790bf750ad0683ec26cd997f4caf5eb1c843e93 100644
--- a/src/Mods/Catmod/events/nonRandom/projectNInitialized.js
+++ b/src/Mods/Catmod/events/nonRandom/projectNInitialized.js
@@ -10,7 +10,7 @@ App.Events.SEProjectNInitialized = class SEProjectNInitialized extends App.Event
V.projectN.phase1 = App.Events.effectiveWeek();
App.Events.addParagraph(node, [`After giving the order to your personal assistant to begin preparations for your transhumanist genetic engineering project, you spend much of the next week getting in contact with the most renowned geneticists and biologists of the old world. Many of these gray-bearded intellectuals scoff as you initially explain your goal of making a 'catgirl', but change their tune almost immediately when you mention the paycheck attached. By the end of the week, you've acquired an impressive team of high-profile minds en route to the arcology, many of them already setting up workstations and tables full of imported chemicals within your laboratory.`]);
- App.Events.addParagraph(node, [`The first few days within the lab are spent organizing the new staff's structure; under your supervision, they create a formal research team headed by the ancient Doctor Nieskowitz, dubbed "Project N" both for the research head and as a dry joke by the ever-sardonic science team for their cat focused intentions. As things begin to formalize into the process of initial research, you realize you've got a decision to make before you've even started the project itself - are you going to keep Project N a secret from the rest of your arcology, or immediately bring it out into the public eye?`]);
+ App.Events.addParagraph(node, [`The first few days within the lab are spent organizing the new staff's structure; under your supervision, they create a formal research team headed by the ancient Doctor Nieskowitz, dubbed "Project N" both for the research head and as a dry joke by the ever-sardonic science team for their cat-focused intentions. As things begin to formalize into the process of initial research, you realize you've got a decision to make before you've even started the project itself - are you going to keep Project N a secret from the rest of your arcology, or immediately bring it out into the public eye?`]);
const choices = [];
choices.push(new App.Events.Result(`Announce Project N to the public`, announce));
diff --git a/src/Mods/Catmod/events/reRecruit/runawayCat.js b/src/Mods/Catmod/events/reRecruit/runawayCat.js
index 5eb22633ad35d6dfde31d9e4c8d11fca8ecdeab1..7b4a1015f5b0175d39b28f4054cce597c0a25451 100644
--- a/src/Mods/Catmod/events/reRecruit/runawayCat.js
+++ b/src/Mods/Catmod/events/reRecruit/runawayCat.js
@@ -20,7 +20,7 @@ App.Events.recRunawayCat = class recRunawayCat extends App.Events.BaseEvent {
const {He, he, his, him, girl} = getPronouns(slave);
let r = [];
- r.push(`Coming to your desk in the morning, you see that your assistant has noted that you have a 'pressing' piece of business to attend to. With a wave of your hand, you bring up the notification to see that a runaway slave has apparently been waiting outside your penthouse for the entire night. What's more, ${he}'s owned by a prominent rival arcology owner within the cluster - and a cat${girl}, to boot. Apparently, according to the short, hand-scrawled letter that ${V.assistant.name} has digitized into the notification, ${his} former master regularly beat ${him} both out of frustration and for pleasure, and ${he}'s approached you hoping for a better life in the slavery that's defined ${his} existence.`);
+ r.push(`Coming to your desk in the morning, you see that your assistant has noted that you have a 'pressing' piece of business to attend to. With a wave of your hand, you bring up the notification to see that a runaway slave has apparently been waiting outside your penthouse for the entire night. What's more, ${he}'s owned by a prominent rival arcology owner within the cluster - and ${he}'s a cat${girl}, to boot. Apparently, according to the short, hand-scrawled letter that ${V.assistant.name} has digitized into the notification, ${his} former master regularly beat ${him} both out of frustration and for pleasure, and ${he}'s approached you hoping for a better life in the slavery that's defined ${his} existence.`);
App.Events.addParagraph(node, r);
r = [];
r.push(`The exclusive and novel nature of cat${girl}s makes ${him} an exceptionally valuable slave, and the genetic modification that created ${him} has ensured that the feline face you look over in the automated overview is particularly attractive, but taking ${him} under your wing away from another wealthy plutocrat would cause a whole score of problems. Deciding it'd be best not to make more enemies than you have to, you call up the rival on your personal phone, who answers after only a few seconds. After you explain the situation, the abusive oligarch chuckles, admits that he hadn't even noticed the cat${girl} leaving, and says he'll formally sell ${him} over to you for "just" twenty thousand credits. Otherwise, he'll give you a little cash to show his appreciation for sending the runaway back home.`);
diff --git a/src/Mods/Catmod/events/scheduled/vatcatboy.js b/src/Mods/Catmod/events/scheduled/vatcatboy.js
index a6c76a599b13f6022a88fcdaedbf7e5eb33bfbd4..8cc88296dd9105288275337e80d5723a4003dc06 100644
--- a/src/Mods/Catmod/events/scheduled/vatcatboy.js
+++ b/src/Mods/Catmod/events/scheduled/vatcatboy.js
@@ -7,39 +7,8 @@ App.Events.SEVatCatBoy = class SEVatCatBoy extends App.Events.BaseEvent {
}
execute(node) {
- const slave = GenerateNewSlave("XY", {
- minAge: 16, maxAge: 16, nationality: "Stateless", disableDisability: 1, race: "catgirl"
- });
+ const slave = growCatgirl("XY", {minAge: 16, maxAge: 16});
slave.origin = "$He is a vat-grown catboy created by Dr. Nieskowitz and the science team in your genelab.";
- slave.face = random(55, 95);
- slave.faceShape = "feline";
- slave.slaveName = App.Data.misc.catSlaveNames.random();
- slave.birthName = slave.slaveName;
- slave.slaveSurname = "";
- slave.birthSurname = "";
- slave.career = "an orphan";
- slave.intelligenceImplant = 0;
- slave.teeth = "fangs";
- slave.devotion = 20;
- slave.trust = 30;
- slave.earShape = "none";
- slave.earT = "cat";
- slave.earTColor = slave.hColor;
- slave.earImplant = 1;
- slave.tailShape = "cat";
- slave.tailColor = slave.hColor;
- slave.eye.left.pupil = "catlike";
- slave.eye.right.pupil = "catlike";
- slave.weight = 10;
- slave.muscles = 0;
- slave.waist = 10;
- slave.skill.oral = 0;
- slave.skill.anal = 0;
- slave.anus = 0;
- slave.skill.whoring = 0;
- slave.skill.entertainment = 0;
- slave.accent = 4;
- slave.canRecruit = 0;
App.Events.addParagraph(node, [
`With their latest genemodding project complete, Dr. Nieskowitz proudly presents to you a healthy, unconscious catboy, floating suspended in the tube of thick green liquid you use to grow them. "Looks like he came out just fine." The aging doctor says with an authoritative gesture. "Another successful project. ${slave.slaveName} is going to make a lovely addition to your little collection."`
diff --git a/src/Mods/Catmod/events/scheduled/vatcatgirl.js b/src/Mods/Catmod/events/scheduled/vatcatgirl.js
index 92ccdaadc771ca52ede9205b7cb81870722de349..10074a6af968177ca1c89170c163123181c4c195 100644
--- a/src/Mods/Catmod/events/scheduled/vatcatgirl.js
+++ b/src/Mods/Catmod/events/scheduled/vatcatgirl.js
@@ -7,41 +7,9 @@ App.Events.SEVatCatGirl = class SEVatCatGirl extends App.Events.BaseEvent {
}
execute(node) {
- const slave = GenerateNewSlave("XX", {
- minAge: 16, maxAge: 16, nationality: "Stateless", disableDisability: 1, race: "catgirl"
- });
+ const slave = growCatgirl("XX", {minAge: 16, maxAge: 16});
slave.origin = "$He is a vat-grown catgirl created by Dr. Nieskowitz and the science team in your genelab.";
- slave.face = random(55, 95);
- slave.faceShape = "feline";
- slave.slaveName = App.Data.misc.catSlaveNames.random();
- slave.birthName = slave.slaveName;
- slave.slaveSurname = "";
- slave.birthSurname = "";
- slave.career = "an orphan";
- slave.intelligenceImplant = 0;
- slave.devotion = 20;
- slave.trust = 30;
- slave.earShape = "none";
- slave.teeth = "fangs";
- slave.earT = "cat";
- slave.earTColor = slave.hColor;
- slave.earImplant = 1;
- slave.tailShape = "cat";
- slave.tailColor = slave.hColor;
- slave.eye.left.pupil = "catlike";
- slave.eye.right.pupil = "catlike";
- slave.weight = 10;
- slave.muscles = 0;
- slave.waist = 10;
- slave.skill.vaginal = 0;
- slave.vagina = 0;
- slave.skill.oral = 0;
- slave.skill.anal = 0;
- slave.anus = 0;
- slave.skill.whoring = 0;
- slave.skill.entertainment = 0;
- slave.accent = 4;
- slave.canRecruit = 0;
+
App.Events.addParagraph(node, [`With their latest genemodding project complete, Dr. Nieskowitz proudly presents to you a healthy, unconscious catgirl, floating suspended in the tube of thick green liquid you use to grow them. "Looks like she came out just fine." The aging doctor says with an authoritative gesture. "Another successful project. ${slave.slaveName} is going to make a lovely addition to your little collection."`]);
App.Events.addResponses(node, [new App.Events.Result(`Bring your new slave back home`, home)]);
diff --git a/src/Mods/Catmod/generateCatgirl.js b/src/Mods/Catmod/generateCatgirl.js
new file mode 100644
index 0000000000000000000000000000000000000000..2bd8936d82b0b793efde344dbc5fec3d48a5d917
--- /dev/null
+++ b/src/Mods/Catmod/generateCatgirl.js
@@ -0,0 +1,55 @@
+/**
+ * Generates a new vat-grown catgirl that was grown in this arcology.
+ * @returns {App.Entity.SlaveState}
+ * @param {"XY"|"XX"|""} [sex] null or omit to use default rules
+ * @param {Object} [Obj]
+ */
+globalThis.growCatgirl = function(sex, {
+ minAge,
+ maxAge,
+} = {}) {
+ const slave = GenerateNewSlave(sex, {
+ minAge, maxAge, nationality: "Stateless", disableDisability: 1, race: "catgirl"
+ });
+ slave.face = random(55, 95);
+ slave.faceShape = "feline";
+ slave.slaveName = App.Data.misc.catSlaveNames.random();
+ slave.birthName = slave.slaveName;
+ slave.career = "an orphan";
+ slave.intelligenceImplant = 0;
+ slave.devotion = 20;
+ slave.trust = 30;
+ slave.earShape = "none";
+ slave.teeth = "fangs";
+ slave.earT = "cat";
+ slave.earTColor = slave.hColor;
+ slave.earImplant = 1;
+ slave.tailShape = "cat";
+ slave.tailColor = slave.hColor;
+ slave.eye.left.pupil = "catlike";
+ slave.eye.right.pupil = "catlike";
+ slave.weight = 10;
+ slave.muscles = 0;
+ slave.waist = 10;
+ slave.vagina = Math.min(slave.vagina, 0);
+ slave.anus = 0;
+ slave.accent = 4;
+ slave.canRecruit = 0;
+ slave.skill = new App.Entity.SlaveSkillsState();
+ slave.piercing = new App.Entity.completePiercingState();
+
+ // they're genetically engineered and very expensive, so go ahead and make their genes conform a bit better to local expectations...
+ const arc = V.arcologies[0];
+ if (arc.FSStatuesqueGlorification !== "unset") {
+ slave.height = Math.min(slave.height + 10, 274);
+ } else if (arc.FSPetiteAdmiration !== "unset") {
+ slave.height = Math.max(slave.height - 10, 85);
+ }
+ if (arc.FSIntellectualDependency !== "unset") {
+ slave.intelligence = Math.max(slave.intelligence - 15, -100);
+ } else if (arc.FSSlaveProfessionalism !== "unset") {
+ slave.intelligence = Math.min(slave.intelligence + 15, 100);
+ }
+
+ return slave;
+};
diff --git a/src/Mods/Catmod/interaction/fPet.js b/src/Mods/Catmod/interaction/fPet.js
index 2ac27c85ba78273f0f39527e876b940cb8af08d4..f5ef1d5fe88c5642e39d41eb272f5645446670d0 100644
--- a/src/Mods/Catmod/interaction/fPet.js
+++ b/src/Mods/Catmod/interaction/fPet.js
@@ -35,7 +35,7 @@ App.Interact.fPet = function(slave) {
r.push(`Once ${he}'s at an acceptable petting range, you bring the overgrown cat into your embrace and gingerly run a hand from the top of ${his} head down ${his} spine, coursing through the soft fur in a massage-like petting motion.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} accepts the petting robotically, barely even comprehending what you're doing. The pleasant scritch of your fingers against ${his} back produces some sort of guttural purring sound, but that conveys the extent of the mindbroken cat's response.`);
} else if (slave.devotion > 75) {
r.push(`The cat${girl} loudly purrs and eagerly rubs up against you, arching ${his} back to give you a full range over the silky fur. ${His} tail flicks back and forth happily as you pet ${him}, flicking up to tease against your chin as you pet the purring kitten. When you finally retract your hand, ${slave.slaveName} bats ${his} eyelashes at you, still purring a little.`);
diff --git a/src/Mods/DinnerParty.js b/src/Mods/DinnerParty.js
new file mode 100644
index 0000000000000000000000000000000000000000..aae43738851f3f958b3909c728b4809042ae67ac
--- /dev/null
+++ b/src/Mods/DinnerParty.js
@@ -0,0 +1,517 @@
+App.Mods.DinnerParty.Prep = function() {
+ const t = new DocumentFragment();
+ let r = [];
+
+ r.push("Hosting of high society dinner parties will increase your prestige significantly and it is expected for someone of your station.");
+ r.push("Since there is a lack of animal meat, human meat is served at these events to illustrate the wealth and power of the host.");
+ r.push("The success of the evening is judged by how well the human offering is prepared.");
+ r.push("Guests to these events are encouraged to rate the dishes and special dishes are expected.");
+ r.push(`If the host receives 5 stars on all the dishes, they will receive the coveted title "${V.PC.title ? 'Master' : 'Mistress'} of The Culinary Arts".`);
+ r.push(`You ask ${V.assistant.name} to show you a list of cooking instructions for those dishes.`);
+ App.Events.addNode(t, r, "div");
+
+ App.Events.addNode(t, ["Cooking Instructions and Recipes:"], "h1");
+
+ r = [];
+ r.push(App.UI.DOM.makeElement("span", "Roast Long Pig", ["bold"]));
+ r.push("– Made with the meat of a human roasted on a spit. Young meat is better than old meat.");
+ r.push("There should be some amount of fat to make the meat juicy, but not too much fat that makes the meat greasy.");
+ r.push("Muscles affect the texture of the meat. Meat without muscles lacks texture while an excess will be tough and hard to chew. Remember that you can't eat silicone, and virgin meat is highly sought after.");
+ if (V.seePreg !== 0) {
+ r.push("If the human is pregnant, a veal dish can also be made from the fetus.");
+ }
+ App.Events.addNode(t, r, "div");
+
+ r = [];
+ r.push(App.UI.DOM.makeElement("span", "Dicky Roll", ["bold"]));
+ r.push("– An erect penis made into a spring roll. For best results, harvest the penis at the moment of ejaculation.");
+ r.push("The size of the penis and the amount of accumulated ejaculate all affect the quality of the dish. Too big of a dick and too thin of semen can both ruin a dish.");
+ App.Events.addNode(t, r, "p");
+
+ App.Events.addNode(t, [App.UI.DOM.makeElement("span", "Testy Meat Balls", ["bold"]), "– Testicles made into meat balls served with a sauce. Size matters."], "p");
+
+ r = [];
+ r.push(App.UI.DOM.makeElement("span", "Titty Tartare", ["bold"]));
+ r.push("– Made from finely chopped breasts, mixed with onions, capers, and seasonings, and served raw.");
+ r.push("Big breasts make the best quality meat for this dish. To add a hint of creamy taste, make sure the breasts are lactating. Remember that you can't eat silicone.");
+ App.Events.addNode(t, r, "p");
+
+ App.Events.addNode(t, [App.UI.DOM.makeElement("span", "Camel Toe à l'Orange", ["bold"]), "– Pussy grilled like a steak. A big clit and big labia will improve the quality of the dish."], "p");
+
+ App.Events.addNode(t, ["Your assistant will take care of the invitations and all the arrangements; all you need to do is pick the meat."], "p");
+
+ App.Events.addNode(t, ["Select Your Meat:"], "div", ["underline"]);
+
+ t.append(App.UI.SlaveList.slaveSelectionList(
+ s => assignmentVisible(s) && s.fuckdoll === 0,
+ App.UI.SlaveList.SlaveInteract.stdInteract,
+ null,
+ (s) => {
+ const p = getPronouns(s);
+ return App.UI.DOM.passageLink(`Make ${p.him} the main course`, "Dinner Party Execution",
+ () => { V.AS = s.ID; });
+ }
+ ));
+ return t;
+};
+
+App.Mods.DinnerParty.Execution = function() {
+ // To MOD: insert the following code into the passage PC Name and Title
+ // <<if $MOD_DinnerPartyTitleAchievement == 1>><<if $PC.title > 0>><<set $titles.push("Master of the Culinary Arts")>><<else>><<set $titles.push("Mistress of the Culinary Arts")>><</if>><</if>>
+ const t = new DocumentFragment();
+ const slave = getSlave(V.AS);
+ const {His, He, his, he, him} = getPronouns(slave);
+ App.Events.drawEventArt(t, slave);
+ const appetizers = new Map([
+ ["Dicky Roll", slave.dick > 0],
+ ["Testy Meat Balls", slave.balls > 0],
+ ["Camel Toe steak", slave.vagina !== -1],
+ ["Baby Veal Ragout", slave.preg >= slave.pregData.normalBirth/4],
+ ["Titty Tartare", true],
+ ["Roast Long Pig", true],
+ ]);
+
+ let r;
+ let dinnerRating = 0;
+ cashX(-1000, "event");
+
+ r = [];
+ r.push(`${slave.slaveName} is carried out by four slaves on a huge platter and placed on the dining table.`);
+ if (slave.fetish === Fetish.MINDBROKEN) {
+ r.push(`${His} mind is broken. ${He} does not understand what's about happen, so there is little need to restrain ${him}.`);
+ } else if (slave.devotion > 90) {
+ r.push(`${He} worships you and considers it an honor to be chosen for sacrifice. There is no need to restrain ${him}.`);
+ } else {
+ r.push(`${He} understands ${he} is about to be slaughtered liked an animal. Tears stream down ${his} face as ${he} struggles against ${his} bindings.`);
+ }
+
+ // This needs to be rewritten. Take into account FS tastes and the fact that the player might not have a dick
+ r.push(`${He} is lying on ${his} back with an apple in ${his} mouth. You lift ${his} ${hasBothLegs(slave) ? 'legs' : 'waist'} up in the air, exposing ${his} nethers.`);
+ r.push(`You penetrate ${him} with your ${V.PC.dick !== 0 ? 'throbbing dick' : 'strap-on'} , fucking ${him} roughly and cumming quickly.`);
+ r.push(`Your guests form a line behind you, and do the same to ${his} ass. Some of your guests take particular pleasure being rough with ${slave.slaveName}.`);
+ r.push(`They enjoy making ${him} squeal like a pig, knowing they are about to enjoy ${his} flesh in a short while.`);
+ r.push(`After all of your guests had a turn with the little piggy, ${his} ass is dripping with cum and a hint of blood.`);
+ r.push(`It seems your guests greatly`, App.UI.DOM.makeElement("span", "enjoy", ["green"]), `themselves. You stand over ${him} with a ceremonial dagger,`);
+ repX(5000, "event");
+
+ r.push(`looking into ${his}`);
+ if (slave.fetish === Fetish.MINDBROKEN) {
+ r.push(`dull eyes.`);
+ } else if (slave.devotion > 90) {
+ r.push(`proud eyes.`);
+ } else {
+ r.push(`terrified eyes begging for mercy.`);
+ }
+
+ r.push(`You give the signal for your slaves to begin the ceremony. The four slaves hold ${slave.slaveName} down on the platter. A fifth slave starts to give ${him} oral sex.`);
+ r.push(`${slave.slaveName} moans with the apple in ${his} mouth. When ${he} is on the edge of climax you plunge the ceremonial dagger into ${his} chest.`);
+ r.push(`The pain causes ${him} to bite down on the apple deeply. Tears mixed with the juices of the apple flow down ${his} face. With a twist of your hand, you carve out ${his} beating heart.`);
+ if (slave.fetish === Fetish.MINDBROKEN || slave.devotion > 90) {
+ r.push(`Your guests`, App.UI.DOM.makeElement("span", "applaud", ["green"]), `your slave's willingness to die for ${his} ${getWrittenTitle(slave)}, a credit to your training.`);
+ } else {
+ r.push(`Your guests`, App.UI.DOM.makeElement("span", "snicker", ["red"]), `at your inability to provide a willing sacrifice.`);
+ }
+ repX((slave.fetish === Fetish.MINDBROKEN || slave.devotion > 90 ? 2500 : -100), "event");
+ r.push(`Your slaves carry the carcass to the kitchen for cooking preparations. With all the ingredients for the special dishes harvested, the carcass is placed on a spit slowly rotating over an open fire.`);
+ r.push(`You mingle with your guests while ${slave.slaveName} is slowly being cooked.`);
+ App.Events.addNode(t, r, "p");
+
+ App.Events.addNode(t, [`Your slaves begin to serve the appetizer...`], "p");
+ for (const [name] of Array.from(appetizers).filter(s => s[1] === true)) {
+ t.append(getDish(name));
+ }
+
+ // End of Dinner. Total of main dishes each can earn 5 stars total 25, getting 12 stars means a successful evening
+ r = [];
+ if (dinnerRating >= 12) { // successful evening
+ r.push(`The party is in full swing. Your guests enjoy eating ${slave.slaveName} and make good use of the slaves you provided for their pleasure.`);
+ r.push(`Sounds of an orgy of food drink and sex echoes through your dining hall. Your guests ate, drank and fucked their fill.`);
+ r.push(`As the evening draw to a close, there isn't a single morsel of ${slave.slaveName} left to be found. Some of your slaves show signs of teeth marks on their skin. Perhaps some guests got confused about what's for eating and what's for fucking?`);
+ r.push(`The evening was a`, App.UI.DOM.makeElement("span", "success.", ["green"]));
+ App.Events.addNode(t, r, "div");
+ repX((dinnerRating * 500), "event");
+
+ if (dinnerRating >= 20) {
+ App.Events.addNode(t, [`You have earned the 20 stars required for the title of`, App.UI.DOM.makeElement("span", `${V.PC.title > 0 ? 'Master' : 'Mistress'} of The Culinary Arts.`, ["yellow"])], "p");
+ // V.MOD_DinnerPartyTitleAchievement = 1;
+ }
+ } else { // failed evening
+ r.push(`With most of your dishes earning a poor rating, your guests are`, App.UI.DOM.makeElement("span", "dissatisfied.", ["red"]));
+ r.push(`They take out their frustrations on your slaves. Your slaves are being fucked roughly and abused. Cries of pain and pleads of mercy echoes through your dining hall. You decide to allow the abuse to continue as you do not want to antagonize your guests further. You watch with a forced smile as your favorite slaves are being slapped, whipped, choked and burned with cigarettes.`);
+ r.push(`Some of your unlucky slaves had their health`, App.UI.DOM.makeElement("span", "reduced.", ["red"]));
+ r.push(`All of your slaves`, App.UI.DOM.makeElement("span", "respect you less", ["mediumorchid"]), "and", App.UI.DOM.makeElement("span", "fear", ["gold"]), "you more as you place your reputation above their wellbeing.");
+ App.Events.addNode(t, r, "p");
+
+ repX(forceNeg(dinnerRating * 100), "event");
+ for (const aliveSlave of V.slaves) {
+ if (random(0, 1) > 0) {
+ healthDamage(aliveSlave, 10);
+ }
+ aliveSlave.devotion -= 5;
+ aliveSlave.trust -= 5;
+ }
+
+ if (V.HeadGirlID !== 0 && slave.assignment !== "be your Head Girl") {
+ const {His2, He2, his2, he2, him2, girl2, himself2} = getPronouns(S.HeadGirl).appendSuffix("2");
+ r = [];
+ r.push(`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.`);
+ r.push(`${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.`);
+ r.push(`${S.HeadGirl.slaveName} knows better than to resist, ${he2} is still a slave despite ${his2} position as your Head Girl. A slave does not raise their hand against a Master, even one that's not ${his2} own.`);
+ r.push(`The leader rips off ${his2} dress, exposing ${his2} bare chest. Your Head Girl is frozen in terror when ${he2} is lifted onto the hastily cleared dining hall table by several of the men. ${His2} eyes desperately search for you.`);
+ r.push(`You are the only one who can stop this. All that's required is a single word from you.`);
+ r.push(`${S.HeadGirl.slaveName}'s eyes meets yours; the look of relief on ${his2} face is soon replaced by the sad realization that you will not intervene.`);
+ r.push(`${His2} mouth just barely forms the word "${getWrittenTitle(S.HeadGirl)}" as you shake your head, so ${He2} closes ${his2} mouth and resigns ${himself2} to ${his2} fate.`);
+ App.Events.addNode(t, r, "div");
+
+ r = [];
+ r.push(`Your Head Girl is placed across the corner of the dining hall table face-down, ${his2} arm${hasBothArms(S.HeadGirl) ? 's' : ''} and leg${hasBothLegs(S.HeadGirl) ? 's' : ''} held down by four men. ${He2} finds a hand on ${his2} ass, groping roughly, then another hand on the other cheek, roughly parting ${his2} globes to get better access.`);
+ if (S.HeadGirl.vagina >= 0 && canDoVaginal(S.HeadGirl)) {
+ r.push(`A finger traces along ${his2} slit, finding the source of that moisture and pressing its way in. Another finger was added and the hand began to finger fuck ${him2} roughly. After a few seconds a third finger was added and then a fourth, stretching ${his2} pussy.`);
+ r.push(`${S.HeadGirl.slaveName} screams loudly as the entire hand was shoved up ${his2} cunt without warning.`);
+ r.push(`${his2} pussy has`, App.UI.DOM.makeElement("span", "loosened", ["lime"]));
+ S.HeadGirl.vagina++;
+ }
+ r.push(`One man moves to the head of ${S.HeadGirl.slaveName} and shoved his cock into ${his2} mouth, fucking ${his2} throat roughly. He buries his cock deep down ${his2} throat all the way to his balls.`);
+ r.push(`He places both hands around ${his2} neck and squeezes with every stroke. Your Head Girl's face turns red and ${He2} gags uncontrollably. ${his2} eyes roll back as another man shoves his hard cock in ${his2} asshole, sodomizing ${him2} with no mercy.`);
+ r.push(`As your Head Girl makes squeaking noises in pain, several guests pick up forks and jab it at ${his2} butt and ${his2} back, chanting "More meat... More meat..." and "Squeal, piggy, squeal." You slump over your chair at the head of the table. Gulping down your drink, you suppress the urge to order your security drones to open fire on those men.`);
+ r.push(`You know they would never dare to harm your Head Girl, not permanently, at least not anything your remote surgery couldn't fix. It's not as if you haven't done worse to your slaves, but the message is clear; the attack on your Head Girl was meant as disrespect and an insult towards you. Raping your Head Girl is like raping you.`);
+ r.push(`You stare at the group of men gang raping your Head Girl at the end of your own dining table, burning their`, App.UI.DOM.makeElement("span", "names and their faces", ["yellow"]), `into your memory as they take turns fucking ${him2}. They make use of ${his2} every hole. When they are done, ${He2} is left on the floor, battered and bruised, covered in cum and blood from superficial wounds.`);
+ r.push(`The leader of the pack pulls out his half erect cock and`);
+ if (V.seePee === 1) {
+ r.push(`pees on your Head Girl as a final insult towards you. The poor ${girl2} is so spent that ${He2} doesn't even flinch at the urine hitting ${his2} face. He finishes showering your Head Girl, then`);
+ } else {
+ r.push(`ejaculates all over your Head Girl's face, clearly and intentionally aiming for ${his2} eyes. The poor ${girl2} is so spent that ${He2} doesn't even flinch from this final insult towards you. When he's done, he`);
+ }
+ r.push(`turns towards you and says smilingly:`);
+ App.Events.addNode(t, r, "div");
+
+ r = [];
+ r.push(App.UI.DOM.makeElement("span", `"I must congratulate you ${V.PC.title > 0 ? 'sir' : 'madam'},`, ["note"]));
+ r.push(App.UI.DOM.makeElement("span", `you trained a fine obedient slave. ${He2} certainly understands ${his2} position well."`, ['note']));
+ r.push(`You grit your teeth faking a smile, mentally repeating the old adage:`, App.UI.DOM.makeElement("span", "revenge is dish best served cold.", ["yellow"]), `You have made some enemies tonight; you begin to plan a military conquest of them all. You will enjoy storming their arcologies and making them pay for this insult.`);
+ App.Events.addNode(t, r, "p");
+
+ App.Events.addNode(t, [`The abuse your Head Girl suffers had`, App.UI.DOM.makeElement("span", `decreased ${his2} health`, ["health", "dec"]), `${his2} and ${He2} is`, App.UI.DOM.makeElement("span", "less devoted", ["mediumorchid"]), `to you, as you allowed ${him2} to be abused.`], "div");
+ healthDamage(S.HeadGirl, 20);
+ S.HeadGirl.devotion -= 20;
+ }
+
+ App.Events.addNode(t, [], "p");
+ // Clean up and slaves reactions
+ App.Events.addNode(t, ["When the last of your guests has stumbled drunkenly out your door, your slaves begin the daunting task of cleanup."], "div");
+ for (const aliveSlave of V.slaves) {
+ let relation;
+ let feeling;
+ const {his3, sister3, daughter3, He3} = getPronouns(aliveSlave).appendSuffix("3");
+ if (slave.mother === aliveSlave.ID || slave.father === aliveSlave.ID) {
+ relation = `${daughter3}`;
+ feeling = "distraught";
+ aliveSlave.devotion -= (slave.mother === aliveSlave.ID ? 20 : 10);
+ aliveSlave.trust -= (slave.mother === aliveSlave.ID ? 20 : 10);
+ }
+ if (slave.ID === aliveSlave.father || slave.ID === aliveSlave.mother) {
+ relation = (slave.ID === aliveSlave.father ? "father" : "mother");
+ feeling = "grieved";
+ aliveSlave.devotion -= (slave.ID === aliveSlave.father ? 10 : 20);
+ aliveSlave.trust -= (slave.ID === aliveSlave.father ? 10 : 20);
+ }
+ switch (areSisters(slave, aliveSlave)) {
+ case 1:
+ relation = "twin";
+ feeling = "devastated";
+ aliveSlave.devotion -= 30;
+ aliveSlave.trust -= 30;
+ break;
+ case 2:
+ relation = `${sister3}`;
+ feeling = "grieved";
+ aliveSlave.devotion -= 20;
+ aliveSlave.trust -= 20;
+ break;
+ case 3:
+ relation = `half-${sister3}`;
+ feeling = "disheartened";
+ aliveSlave.devotion -= 10;
+ aliveSlave.trust -= 10;
+ break;
+ }
+ if (relation) {
+ App.Events.addNode(t, [`${aliveSlave.slaveName} is`, App.UI.DOM.makeElement("span", feeling, ["mediumorchid"]), `that you ate ${his3} ${relation} and also`, App.UI.DOM.makeElement("span", "fears", ["gold"]), `that ${He3} will be next.`], "div");
+ }
+ }
+
+ let aliveSlave = V.slaves.find(s => s.ID === slave.relationshipTarget && s.fetish !== Fetish.MINDBROKEN);
+ if (slave.relationship !== 0 && aliveSlave) {
+ const {his3} = getPronouns(aliveSlave).appendSuffix("3");
+ App.Events.addNode(t, [`${aliveSlave.slaveName} is`, App.UI.DOM.makeElement("span", "distraught", ["mediumorchid"]), `that you ate ${his3} best source of comfort and companionship in a life of bondage.`], "div");
+ aliveSlave.devotion -= aliveSlave.relationship * 5;
+ aliveSlave.devotion -= 20;
+ }
+
+ aliveSlave = V.slaves.find(s => s.ID === slave.rivalryTarget && s.fetish !== Fetish.MINDBROKEN);
+ if (slave.rivalry !== 0 && aliveSlave) {
+ const {his3, He3} = getPronouns(aliveSlave).appendSuffix("3");
+ App.Events.addNode(t, [`${aliveSlave.slaveName} is`, App.UI.DOM.makeElement("span", "pleased", ["hotpink"]), `that ${He3} won't have to see ${his3} rival any more.`], "div");
+ aliveSlave.devotion += aliveSlave.rivalry * 5;
+ }
+
+ r = [];
+ r.push(`The slaves who do not already worship you`, App.UI.DOM.makeElement("span", "resent", ["mediumorchid"]), "your monstrous appetite and", App.UI.DOM.makeElement("span", "fear", ["mediumaquamarine"]), "a similar fate awaits them.");
+ r.push(`The fat slaves are`, App.UI.DOM.makeElement("span", "worried", ["mediumaquamarine"]), "they are being fattened for consumption.");
+ App.Events.addNode(t, r, "p");
+ for (const aliveSlave of V.slaves.filter(s => s.fetish !== Fetish.MINDBROKEN && s.devotion > 20)) {
+ aliveSlave.devotion -= 5;
+ aliveSlave.trust -= (aliveSlave.diet === "fattening" || aliveSlave.weight > 10 ? 10 : 5);
+ }
+
+ if (isShelterSlave(slave)) {
+ V.shelterAbuse++;
+ }
+ removeSlave(slave);
+ /*
+ if (generateEnemies === 1) {
+ V.MOD_enemyList = V.MOD_enemyList || [];
+ for (let i = 0; i < 6; i++) {
+ const pram = {minAge: 38, maxAge: 44, ageOverridesPedoMode: 1, disableDisability: 1};
+ slave = GenerateNewSlave(V.seeDicks === 0 ? "XX" : "XY", pram);
+ slave.devotion = -20;
+ slave.trust = -2;
+ slave.oldDevotion = -20;
+ slave.origin = "$He was once an arcology owner like yourself, who made the mistake of insulting you.";
+ slave.career = "a slave";
+ slave.prestige = 3;
+ slave.prestigeDesc = "You stormed $his arcology, killed $his guards, and enslaved $him in revenge for insulting you at a dinner party.";
+ setHealth(_slave, 20, random(5, 15), 0, 0, 0);
+ slave.dick = 5;
+ slave.balls = 5;
+ slave.intelligenceImplant = 1;
+ V.MOD_enemy = {leader: 0, numSlave: 0, slaveTotalHP: 0, numDrone: 0, droneTotalHP: 0, numMerc: 0, mercTotalHP: 0, weekCreated: 0, enemyIndex: -1, hostility: 0};
+ V.MOD_enemy.leader = _slave;
+ V.MOD_enemy.weekCreated = V.week;
+ V.MOD_enemy.numSlave = random(Math.trunc(V.slaves.length * 0.7), Math.trunc(V.slaves.length * 1.3));
+ V.MOD_enemy.numDrone = random(25, 75);
+ V.MOD_enemy.numMerc = random(10, 60);
+ V.MOD_enemyList.push(V.MOD_enemy);
+ }
+ }
+ */
+ }
+
+ return t;
+ /**
+ * @param {string} name title of dish
+ */
+ function getDish(name) {
+ const t = new DocumentFragment();
+ let r = [];
+ let dishRating = 5;
+ let override;
+
+ if (name !== "Roast Long Pig") {
+ r.push(`The next course is ${name === "Baby Veal Ragout" ? `a bonus dish` : ``}`);
+ } else {
+ r.push('Your slaves begin to serve the main course,');
+ }
+ r.push(App.UI.DOM.makeElement("span", `${name}:`, ["bold", "note"]));
+
+ switch (name) {
+ case "Dicky Roll":
+ dishRating = slave.dick; // the dick is numbered from 0 to 5 - this isn't a problem at all
+ r.push(`${slave.slaveName}'s penis is wrapped in a spring roll wrapper, deep fried and placed on a plate. Green lettuce decorates the plate along with a side of dipping sauce.`);
+ if (slave.dick >= 5) {
+ r.push(`The massive length and girth of the penis impressed your guests greatly and have them all salivating at the sight of the dish.`);
+ } else if (slave.dick >= 4) {
+ r.push(`The large size of the penis impressed your guests and have them salivating at the sight of the dish.`);
+ } else if (slave.dick >= 3) {
+ r.push(`The regular size of the penis did not impress your guests much. Nevertheless they are looking forward to tasting the delicacy.`);
+ } else if (slave.dick >= 2) {
+ r.push(`The small size of the penis had your guests disappointed at the size of the dish.`);
+ } else {
+ r.push(`The tiny size of the penis had your guests laughing at the disappointing dish.`);
+ }
+ if (slave.balls >= 5) {
+ r.push(`As you bite into the dick your palate is treated with a rich salty taste at the center of your dicky roll. You smile as you know this is the taste of cum trapped in the shaft of the penis at the moment of death. Your guests also greatly enjoy this exotic taste.`);
+ } else if (slave.balls >= 4) {
+ r.push(`As you bite into the dick your palate is treated with a distinct salty taste at the center of your dicky roll. You smile as you know this is the taste of cum trapped in the shaft of the penis at the moment of death. Your guests also enjoy this exotic taste.`);
+ dishRating -= 0.5;
+ } else if (slave.balls >= 3) {
+ r.push(`As you bite into the dick your palate is treated with a faint salty taste at the center of your dicky roll. You smile as you know this is the taste of cum trapped in the shaft of the penis at the moment of death. Your guests also enjoy this exotic taste.`);
+ dishRating--;
+ } else if (slave.balls >= 2) {
+ r.push(`As you bite into the dick your palate is treated with a hint of salty taste at the center of your dicky roll. You smile as you know this is the taste of cum trapped in the shaft of the penis at the moment of death. Your guests also enjoy this exotic taste.`);
+ dishRating -= 1.5;
+ } else if (slave.balls >= 1) {
+ r.push(`As you bite into the dick your palate is treated with barely a hint of salty taste at the center of your dicky roll. You smile as you know this is the taste of cum trapped in the shaft of the penis at the moment of death. Your guests also enjoy this exotic taste.`);
+ dishRating -= 2;
+ } else {
+ r.push(`As you bite into the dick you feel as if this dish is missing something. A certain 'je ne sais quoi'.`);
+ dishRating -= 2.5;
+ }
+ break;
+ case "Testy Meat Balls":
+ dishRating = slave.balls; // I give up. Each and every dish will need a rework and score redesign. Definitely some crazy potential with FSs to do some interesting things.
+ App.Events.addNode(t, [`${slave.slaveName}'s balls are coated in olive oil and sautéed.`]);
+ break;
+ case "Camel Toe steak":
+ r.push(`${slave.slaveName}'s pussy is grilled like a steak.`);
+ if (slave.clit >= 2) { // These would all need to take into account clitoral hoods
+ r.push(`${His} huge clit sticking out of the camel toe is the cherry on top for this dish.`);
+ } else if (slave.clit >= 1) {
+ r.push(`${His} large clit sticking out of the camel toe makes this dish aesthetically pleasing.`);
+ dishRating -= 0.5;
+ } else {
+ r.push(`${His} small clit is hiding inside of the camel toe. It does not add to the scheme of this dish.`);
+ dishRating -= 2;
+ }
+ if (slave.labia >= 2) {
+ r.push(`${His} huge labia taste delicious.`);
+ } else if (slave.labia >= 1) {
+ r.push(`${His} large labia is tasty.`);
+ dishRating -= 0.5;
+ } else {
+ r.push(`${His} small labia leave you and your guests wanting more.`);
+ dishRating -= 2;
+ }
+ break;
+ case "Baby Veal Ragout":
+ override = true;
+ r.push(`${slave.slaveName} was pregnant so ${he} has a special bonus dish to offer your guests. ${His} fetus is boiled in a vinegar stock and stewed in butter.`);
+ if (slave.preg >= slave.pregData.normalBirth/1.6) {
+ r.push(`Your guests are pleased with the huge size of the dish.`);
+ } else if (slave.preg >= slave.pregData.normalBirth/2) {
+ r.push(`Your guests are pleased with the large size of the dish.`);
+ dishRating--;
+ } else if (slave.preg >= slave.pregData.normalBirth/2.66) {
+ r.push(`Your guests are satisfied with the decent size of the dish.`);
+ dishRating -= 2;
+ } else {
+ r.push(`Your guests are a little disappointed with the small size of the dish.`);
+ dishRating -= 3;
+ }
+ break;
+ case "Titty Tartare":
+ r.push(`${slave.slaveName}'s tits are chopped into tiny cube size pieces mixed with onions, capers and seasoning. It is served raw with an egg yolk on top and a side of French fries.`);
+ if (slave.boobsImplant > 0) {
+ r.push(`As you and your guests take your first bite of the tartare you immediately spit out the meat. Who would have thought silicone is not edible.`);
+ r.push(`You have neglected to remove ${his} breast implants before serving the titty tartare. The dish is now ruined. Your guests are`, App.UI.DOM.makeElement("span", "displeased", ["red"]), `by your lack of attention to detail.`);
+ dishRating = 0;
+ repX(-500, "event");
+ } else {
+ if (slave.boobs >= 4800) {
+ r.push(`${His} monstrous boobs are very tender and juicy. There are also enough servings to keep all of your guests satisfied.`);
+ } else if (slave.boobs >= 2400) {
+ r.push(`${His} massive boobs are tender and juicy. Your guests are satisfied with the generous portions.`);
+ dishRating--;
+ } else if (slave.boobs >= 1600) {
+ r.push(`${His} huge boobs are tender. Your guests are satisfied with the portions.`);
+ dishRating -= 2;
+ } else if (slave.boobs >= 800) {
+ r.push(`${His} big boobs are tender and tasty. Your guests are satisfied with the portions, but wished for more.`);
+ dishRating -= 3;
+ } else if (slave.boobs >= 500) {
+ r.push(`${His} small boobs are tender. Your guests are disappointed with their portions.`);
+ dishRating -= 4;
+ } else {
+ r.push(`${His} non-existent boobs leaves your guests disappointed.`);
+ dishRating -= 5;
+ }
+ if (slave.lactation >= 2) {
+ r.push(`As you and your guests enjoy your tartare, suddenly you hear a loud crunch coming from the guest sitting right next to you.`);
+ r.push(`You see blood spewing from his mouth as he spits out his chipped tooth along with a lactation implant.`);
+ r.push(`You apologize profusely and pay the man ${num(10000)} as compensation.`);
+ r.push(`The rest of your guests are`, App.UI.DOM.makeElement("span", "not happy", ["red"]), `that you serve them drugged meat.`);
+ dishRating = 0;
+ repX(-1000, "event");
+ cashX(-10000, "event");
+ } else if (slave.lactation > 0) {
+ r.push(`You detect a hint of creamy taste to your tartare. The clearly lactating breast earns the dish an extra star.`);
+ dishRating++;
+ }
+ }
+ break;
+ case "Roast Long Pig":
+ r.push(`${slave.slaveName} is carried out with ${his} carcass roasted to a perfect golden brown color. ${He} is coated with BBQ sauce and dripping in ${his} own juices. The apple is still in ${his} mouth.`);
+ if (slave.vagina === 0) {
+ r.push(`${slave.slaveName} was a virgin. Eating of maiden meat is thought to be highly prestigious. It earns you an extra star for this dish.`);
+ dishRating++;
+ }
+ if (slave.physicalAge >= 60) {
+ r.push(`${slave.slaveName} was old. ${His} meat is tough and leathery.`);
+ dishRating -= 2;
+ } else if (slave.physicalAge >= 40) {
+ r.push(`${slave.slaveName} was middle aged. ${His} meat is stringy.`);
+ dishRating--;
+ } else if (slave.physicalAge >= 20) {
+ r.push(`${slave.slaveName} was young. ${His} meat is tender.`);
+ } else {
+ r.push(`${slave.slaveName} was very young. ${His} meat is very tender.`);
+ dishRating++;
+ }
+ if (slave.weight > 95) {
+ r.push(`${slave.slaveName} was too fat. It made the dish taste very greasy.`);
+ dishRating -= 2;
+ } else if (slave.weight > 30) {
+ r.push(`${slave.slaveName} was fat. It made the dish taste greasy.`);
+ dishRating--;
+ } else if (slave.weight > 10) {
+ r.push(`${slave.slaveName} was juicy and yet not greasy. ${He} is a prime piece of meat.`);
+ dishRating += 0.5;
+ } else if (slave.weight >= -10) {
+ r.push(`${slave.slaveName} was lean. ${He} is a good piece of meat.`);
+ } else if (slave.weight >= -30) {
+ r.push(`${slave.slaveName} was thin. ${He} does not provide enough meat for you and your guests.`);
+ dishRating -= 0.5;
+ } else if (slave.weight >= -95) {
+ r.push(`${slave.slaveName} was too skinny. ${He} has very little meat on the bones.`);
+ dishRating--;
+ } else {
+ r.push(`${slave.slaveName} was emaciated. ${He} has only bones and skin.`);
+ dishRating -= 2;
+ }
+ if (slave.muscles > 95) {
+ r.push(`${slave.slaveName} has too much muscle and sinew. ${His} meat is too chewy.`);
+ dishRating -= 0.5;
+ } else if (slave.muscles > 50) {
+ r.push(`${slave.slaveName} has strong muscles. It gives ${his} meat a very tasty texture.`);
+ dishRating += 0.5;
+ } else if (slave.muscles > 5) {
+ r.push(`${slave.slaveName} has toned muscles. It gives ${his} meat a tasty texture.`);
+ } else {
+ r.push(`${slave.slaveName} has no muscles. It gives ${his} meat a plain texture.`);
+ dishRating--;
+ }
+ if (slave.lipsImplant > 0) {
+ r.push(`All of sudden one of your guests' face turns red, then purple. It is clear he is choking on something.`);
+ r.push(`You leap out of your seat, rush over to him and start the Heimlich maneuver.`);
+ r.push(`On your third thrust into his abdominal, a piece of lip implants flies out of his mouth and hits another guest square in the face.`);
+ r.push(`You apologize profusely for your carelessness in selecting the meat. The rest of your guests had a great laugh at your`, App.UI.DOM.makeElement("span", "expense.", ["red"]));
+ dishRating -= 5;
+ repX(-500, "event");
+ } else if (slave.buttImplant > 0) {
+ r.push(`All of sudden one of your guests clutches his chest. His face turns pale as a ghost, foaming at the mouth falls over onto the table.`);
+ r.push(`You rush over to him, it is clear he is not breathing. You don't know what's wrong with him.`);
+ r.push(`It could not have been poison, since any toxins in the food would have been detected by your personal assistant. You order your slave to rush the man to the nearest emergency clinic.`);
+ r.push(`You were informed later that he had died from ingesting a silicone butt implant. Your reputation`, App.UI.DOM.makeElement("span", "suffers", ["red"]), `greatly due to this incident.`);
+ dishRating -= 10;
+ repX(-5000, "event");
+ }
+ break;
+ }
+ App.Events.addNode(t, r, "div");
+
+ dishRating = Math.clamp(dishRating, 0, 5);
+ dinnerRating += dishRating;
+
+ r = [];
+ r.push(`This dish earned a score of ${dishRating} out of 5 stars. Your reputation has`);
+ r.push(App.UI.DOM.makeElement("span", (dishRating >= 2 || override ? "increased." : "decreased."), [dishRating >= 2 || override ? "green" : "red"]));
+ if (dishRating >= 2 || override) {
+ repX(dishRating * 100, "event");
+ } else {
+ repX(forceNeg(dishRating >= 0 ? (dishRating * 20) : 100), "event");
+ }
+ App.Events.addNode(t, r, "div");
+
+ return App.UI.DOM.makeElement("p", t);
+ }
+};
diff --git a/src/Mods/DinnerParty/dinnerPartyExecution.tw b/src/Mods/DinnerParty/dinnerPartyExecution.tw
deleted file mode 100644
index 4916d9cb4f7d376dda2a6b88241e9c9e41ab2c56..0000000000000000000000000000000000000000
--- a/src/Mods/DinnerParty/dinnerPartyExecution.tw
+++ /dev/null
@@ -1,574 +0,0 @@
-:: Dinner Party Execution [nobr]
-
-/% To MOD: insert the following code into the passage PC Name and Title %/
-/% <<if $MOD_DinnerPartyTitleAchievement == 1>><<if $PC.title > 0>><<set $titles.push("Master of the Culinary Arts")>><<else>><<set $titles.push("Mistress of the Culinary Arts")>><</if>><</if>> %/
-
- <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Main", $encyclopedia = "Personal Assistant">>
-
- <<set _generateEnemies to 0>>
- <<run cashX(-1000, "event")>>
- <<set _dinnerRating = 0>>
-
- /* 000-250-006 */
- <<if $seeImages == 1>>
- <div class="imageColumn">
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
- </div>
- </div>
- <</if>>
- /* 000-250-006 */
-
- <<run App.Utils.setLocalPronouns($activeSlave)>>
-
- /%Event description%/
- $activeSlave.slaveName is carried out by four slaves on a huge platter and placed on the dining table.
- <<if $activeSlave.fetish == "mindbroken">>
- $His mind is broken. $He does not understand what's about happen, so there is little need to restrain $him.
- <<elseif $activeSlave.devotion > 90>>
- $He worships you and considers it an honor to be chosen for sacrifice. There is no need to restrain $him.
- <<else>>
- $He understands $he is about to be slaughtered liked an animal. Tears stream down $his face as $he struggles against $his bindings.
- <</if>>
- /* This needs to be rewritten. Take into account FS tastes and the fact that the player might not have a dick */
- $He is lying on $his back with an apple in $his mouth. You lift $his <<if hasBothLegs($activeSlave)>>legs<<else>>waist<</if>> up in the air, exposing $his nethers. You penetrate $him with your <<if $PC.dick !== 0>>throbbing dick<<else>>strap-on<</if>>, fucking $him roughly and cumming quickly. Your guests form a line behind you, and do the same to $his ass. Some of your guests take particular pleasure being rough with $activeSlave.slaveName. They enjoy making $him squeal like a pig, knowing they are about to enjoy $his flesh in a short while. After all of your guests had a turn with the little piggy, $his ass is dripping with cum and a hint of blood. It seems your guests greatly @@.green;enjoy@@ themselves. You stand over $him with a ceremonial dagger,
- <<run repX(5000, "event")>>
- <<if $activeSlave.fetish == "mindbroken">>
- looking into $his dull eyes.
- <<elseif $activeSlave.devotion > 90>>
- looking into $his proud eyes.
- <<else>>
- looking into $his terrified eyes begging for mercy.
- <</if>>
- You give the signal for your slaves to begin the ceremony. The four slaves hold $activeSlave.slaveName down on the platter. A fifth slave starts to give $him oral sex.
- $activeSlave.slaveName moans with the apple in $his mouth. When $he is on the edge of climax you plunge the ceremonial dagger into $his chest. The pain causes $him to bite down on the apple deeply. Tears mixed with the juices of the apple flow down $his face. With a twist of your hand, you carve out $his beating heart.
- <<if ($activeSlave.fetish == "mindbroken") || ($activeSlave.devotion > 90)>>
- Your guests @@.green;applaud@@ your slave's willingness to die for $his <<= getWrittenTitle($activeSlave)>>, a credit to your training.
- <<run repX(2500, "event")>>
- <<else>>
- Your guests @@.red;snicker@@ at your inability to provide a willing sacrifice.
- <<run repX(-100, "event")>>
- <</if>>
- Your slaves carry the carcass to the kitchen for cooking preparations. With all the ingredients for the special dishes harvested, the carcass is placed on a spit slowly rotating over an open fire. You mingle with your guests while $activeSlave.slaveName is slowly being cooked.
- <br><br>
-
- Your slaves begin to serve the appetizer...
- <br>
- /% Dicky Roll %/
- <<if $activeSlave.dick > 0>>
- /% the dick is numbered from 0 to 5 %/ /*this isn't a problem at all*/
- <<set _dishRating = $activeSlave.dick>>
- /*<img src='resources/spring roll.jpg' style="float:left" />*/
- ''//Dicky Roll//'':
- <br>
- $activeSlave.slaveName's penis is wrapped in a spring roll wrapper, deep fried and placed on a plate. Green lettuce decorates the plate along with a side of dipping sauce.
- <<if $activeSlave.dick >= 5>>
- The massive length and girth of the penis impressed your guests greatly and have them all salivating at the sight of the dish.
- <<elseif $activeSlave.dick >= 4>>
- The large size of the penis impressed your guests and have them salivating at the sight of the dish.
- <<elseif $activeSlave.dick >= 3>>
- The regular size of the penis did not impress your guests much. Nevertheless they are looking forward to tasting the delicacy.
- <<elseif $activeSlave.dick >= 2>>
- The small size of the penis had your guests disappointed at the size of the dish.
- <<else>>
- The tiny size of the penis had your guests laughing at the disappointing dish.
- <</if>>
- <<if $activeSlave.balls >= 5>>
- As you bite into the dick your palate is treated with a rich salty taste at the center of your dicky roll. You smile as you know this is the taste of cum trapped in the shaft of the penis at the moment of death. Your guests also greatly enjoy this exotic taste.
- <<elseif $activeSlave.balls >= 4>>
- As you bite into the dick your palate is treated with a distinct salty taste at the center of your dicky roll. You smile as you know this is the taste of cum trapped in the shaft of the penis at the moment of death. Your guests also enjoy this exotic taste.
- <<set _dishRating -= 0.5>>
- <<elseif $activeSlave.balls >= 3>>
- As you bite into the dick your palate is treated with a faint salty taste at the center of your dicky roll. You smile as you know this is the taste of cum trapped in the shaft of the penis at the moment of death. Your guests also enjoy this exotic taste.
- <<set _dishRating -= 1>>
- <<elseif $activeSlave.balls >= 2>>
- As you bite into the dick your palate is treated with a hint of salty taste at the center of your dicky roll. You smile as you know this is the taste of cum trapped in the shaft of the penis at the moment of death. Your guests also enjoy this exotic taste.
- <<set _dishRating -= 1.5>>
- <<elseif $activeSlave.balls >= 1>>
- As you bite into the dick your palate is treated with barely a hint of salty taste at the center of your dicky roll. You smile as you know this is the taste of cum trapped in the shaft of the penis at the moment of death. Your guests also enjoy this exotic taste.
- <<set _dishRating -= 2>>
- <<else>>
- As you bite into the dick you feel as if this dish is missing something. A certain 'je ne sais quoi'.
- <<set _dishRating -= 2.5>>
- <</if>>
- /% Dish rating, could be made into a separate function/passage. The following will be called for every dish %/
- <<set _dinnerRating += _dishRating>>
- <<if _dishRating > 5>>
- <<set _dishRating = 5>>
- <<elseif _dishRating < 0>>
- <<set _dishRating = 0>>
- <</if>>
- <br><br>
- This dish earned a score of _dishRating out of 5 stars.
- <<if _dishRating >= 2>>
- Your reputation has @@.green;increased.@@
- <<run repX((_dishRating * 100), "event")>>
- <<elseif _dishRating >= 0>>
- Your reputation has @@.red;decreased.@@
- <<run repX(forceNeg(_dishRating * 20), "event")>>
- <<else>>
- Your reputation has @@.red;decreased.@@
- <<run repX(-100, "event")>>
- <</if>>
- <br><br>
- /% End of Dish rating %/
- <</if>>
- /*<br style="clear:both" />*/
- <br>
- /% Testy Meat Balls %/
- <<if $activeSlave.balls > 0>>
- /*<img src='resources/meat balls.jpg' style="float:left" />*/
- The next course is ''//Testy Meat Balls//'':
- <<set _dishRating = $activeSlave.balls>> /* I give up. Each and every dish will need a rework and score redesign. Definitely some crazy potential with FSs to do some interesting things.*/
- <br>
- $activeSlave.slaveName's balls are coated in olive oil and sautéed.
- /% Dish rating, could be made into a separate function/passage. The following will be called for every dish %/
- <<set _dinnerRating += _dishRating>>
- <<if _dishRating > 5>>
- <<set _dishRating = 5>>
- <<elseif _dishRating < 0>>
- <<set _dishRating = 0>>
- <</if>>
- <br><br>
- This dish earned a score of _dishRating out of 5 stars.
- <<if _dishRating >= 2>>
- Your reputation has @@.green;increased.@@
- <<run repX((_dishRating * 100), "event")>>
- <<elseif _dishRating >= 0>>
- Your reputation has @@.red;decreased.@@
- <<run repX(forceNeg(_dishRating * 20), "event")>>
- <<else>>
- Your reputation has @@.red;decreased.@@
- <<run repX(-100, "event")>>
- <</if>>
- <br><br>
- /% End of Dish rating %/
- <</if>>
- /*<br style="clear:both" />*/
- <br>
- /% Camel Toe à l'Orange %/
- <<if $activeSlave.vagina != -1>>
- <<set _dishRating = 5>>
- /*<img src='resources/steak.jpg' style="float:left" />*/
- The next course is ''//Camel Toe steak//'':
- <br>
- $activeSlave.slaveName's pussy is grilled like a steak.
- <<if $activeSlave.clit >= 2>> /*These would all need to take into account clitoral hoods */
- $His huge clit sticking out of the camel toe is the cherry on top for this dish.
- <<elseif $activeSlave.clit >= 1>>
- $His large clit sticking out of the camel toe makes this dish aesthetically pleasing.
- <<set _dishRating -= 1.5>>
- <<else>>
- $His small clit is hiding inside of the camel toe. It does not add to the scheme of this dish.
- <<set _dishRating -= 2>>
- <</if>>
- <<if $activeSlave.labia >= 2>>
- $His huge labia taste delicious.
- <<elseif $activeSlave.labia >= 1>>
- $His large labia is tasty.
- <<set _dishRating -= 1.5>>
- <<else>>
- $His small labia leave you and your guests wanting more.
- <<set _dishRating -= 2>>
- <</if>>
-
- /% Dish rating, could be made into a separate function/passage. The following will be called for every dish %/
- <<set _dinnerRating += _dishRating>>
- <<if _dishRating > 5>>
- <<set _dishRating = 5>>
- <<elseif _dishRating < 0>>
- <<set _dishRating = 0>>
- <</if>>
- <br><br>
- This dish earned a score of _dishRating out of 5 stars.
- <<if _dishRating >= 2>>
- Your reputation has @@.green;increased.@@
- <<run repX((_dishRating * 100), "event")>>
- <<elseif _dishRating >= 0>>
- Your reputation has @@.red;decreased.@@
- <<run repX(forceNeg(_dishRating * 20), "event")>>
- <<else>>
- Your reputation has @@.red;decreased.@@
- <<run repX(-100, "event")>>
- <</if>>
- <br><br>
- /% End of Dish rating %/
- <</if>>
- /*<br style="clear:both" />*/
- <br>
- /% Bonus dish Baby Veal Ragout %/
- <<if $activeSlave.preg >= $activeSlave.pregData.normalBirth/4>>
- <<set _dishRating = 5>>
- /*<img src='resources/veal ragout.jpg' style="float:left" />*/
- The next course is a bonus dish ''//Baby Veal Ragout//'':
- <br>
- $activeSlave.slaveName was pregnant so $he has a special bonus dish to offer your guests. $His fetus is boiled in a vinegar stock and stewed in butter.
- <<if $activeSlave.preg >= $activeSlave.pregData.normalBirth/1.6>>
- Your guests are pleased with the huge size of the dish.
- <<elseif $activeSlave.preg >= $activeSlave.pregData.normalBirth/2>>
- Your guests are pleased with the large size of the dish.
- <<set _dishRating -= 1>>
- <<elseif $activeSlave.preg >= $activeSlave.pregData.normalBirth/2.66>>
- Your guests are satisfied with the decent size of the dish.
- <<set _dishRating -= 2>>
- <<else>>
- Your guests are a little disappointed with the small size of the dish.
- <<set _dishRating -= 3>>
- <</if>>
-
- /% Dish Rating %/
- <<set _dinnerRating += _dishRating>>
- <br><br>
- This dish earned a score of _dishRating out of 5 stars.
- Your reputation has @@.green;increased.@@
- <<run repX((_dishRating * 100), "event")>>
- <br><br>
- <</if>>
- /*<br style="clear:both" />*/
- <br>
- /% Titty Tartare %/
- <<set _dishRating = 5>>
- /*<img src='resources/tartare.jpg' style="float:left" />*/
- The next course is ''//Titty Tartare//'':
- <br>
- $activeSlave.slaveName's tits are chopped into tiny cube size pieces mixed with onions, capers and seasoning. It is served raw with an egg yolk on top and a side of French fries.
- <<if $activeSlave.boobsImplant > 0>>
- As you and your guests take your first bite of the tartare you immediately spit out the meat. Who would have thought silicone is not edible. You have neglected to remove $his breast implants before serving the titty tartare. The dish is now ruined. Your guests are @@.red;displeased@@ by your lack of attention to detail.
- <<set _dishRating = 0>>
- <<run repX(-500, "event")>>
- <<else>>
- <<if $activeSlave.boobs >= 4800>>
- $His monstrous boobs are very tender and juicy. There are also enough servings to keep all of your guests satisfied.
- <<elseif $activeSlave.boobs >= 2400>>
- $His massive boobs are tender and juicy. Your guests are satisfied with the generous portions.
- <<set _dishRating -= 1>>
- <<elseif $activeSlave.boobs >= 1600>>
- $His huge boobs are tender. Your guests are satisfied with the portions.
- <<set _dishRating -= 2>>
- <<elseif $activeSlave.boobs >= 800>>
- $His big boobs are tender and tasty. Your guests are satisfied with the portions, but wished for more.
- <<set _dishRating -= 3>>
- <<elseif $activeSlave.boobs >= 500>>
- $His small boobs are tender. Your guests are disappointed with their portions.
- <<set _dishRating -= 4>>
- <<else>>
- $His non-existent boobs leaves your guests disappointed.
- <<set _dishRating -= 5>>
- <</if>>
- <<if $activeSlave.lactation >= 2>>
- As you and your guests enjoy your tartare, suddenly you hear a loud crunch coming from the guest sitting right next to you. You see blood spewing from his mouth as he spits out his chipped tooth along with a lactation implant. You apologize profusely and pay the man ¤10000 as compensation. The rest of your guests are @@.red;not happy@@ that you serve them drugged meat.
- <<set _dishRating = 0>>
- <<run repX(-1000, "event")>>
- <<run cashX(-10000, "event")>>
- <<elseif $activeSlave.lactation > 0 >>
- You detect a hint of creamy taste to your tartare. The clearly lactating breast earns the dish an extra star.
- <<set _dishRating += 1>>
- <</if>>
- <</if>>
-
- /% Dish rating, could be made into a separate function/passage. The following will be called for every dish %/
- <<set _dinnerRating += _dishRating>>
- <<if _dishRating > 5>>
- <<set _dishRating = 5>>
- <<elseif _dishRating < 0>>
- <<set _dishRating = 0>>
- <</if>>
- <br><br>
- This dish earned a score of _dishRating out of 5 stars.
- <<if _dishRating >= 2>>
- Your reputation has @@.green;increased.@@
- <<run repX((_dishRating * 100), "event")>>
- <<elseif _dishRating >= 0>>
- Your reputation has @@.red;decreased.@@
- <<run repX(forceNeg(_dishRating * 20), "event")>>
- <<else>>
- Your reputation has @@.red;decreased.@@
- <<run repX(-100, "event")>>
- <</if>>
- <br><br>
- /% End of Dish rating %/
- /*<br style="clear:both" />*/
- <br>
- /% Roast Long Pig %/
- /*<img src='resources/roast pig.jpg' style="float:left" />*/
- Your slaves begin to serve the main course ''//Roast Long Pig//'':
- <br>
- $activeSlave.slaveName is carried out with $his carcass roasted to a perfect golden brown color. $He is coated with BBQ sauce and dripping in $his own juices. The apple is still in $his mouth.
- <<set _dishRating = 5>>
- <<if $activeSlave.vagina == 0>>
- $activeSlave.slaveName was a virgin. Eating of maiden meat is thought to be highly prestigious. It earns you an extra star for this dish.
- <<set _dishRating += 1>>
- <</if>>
- <<if $activeSlave.physicalAge >= 60>>
- $activeSlave.slaveName was old. $His meat is tough and leathery.
- <<set _dishRating -= 2>>
- <<elseif $activeSlave.physicalAge >= 40>>
- $activeSlave.slaveName was middle aged. $His meat is stringy.
- <<set _dishRating -= 1>>
- <<elseif $activeSlave.physicalAge >= 20>>
- $activeSlave.slaveName was young. $His meat is tender.
- <<else>>
- $activeSlave.slaveName was very young. $His meat is very tender.
- <<set _dishRating += 1>>
- <</if>>
- <<if $activeSlave.weight > 95>>
- $activeSlave.slaveName was too fat. It made the dish taste very greasy.
- <<set _dishRating -= 2>>
- <<elseif $activeSlave.weight > 30>>
- $activeSlave.slaveName was fat. It made the dish taste greasy.
- <<set _dishRating -= 1>>
- <<elseif $activeSlave.weight > 10>>
- $activeSlave.slaveName was juicy and yet not greasy. $He is a prime piece of meat.
- <<set _dishRating += 0.5>>
- <<elseif $activeSlave.weight >= -10>>
- $activeSlave.slaveName was lean. $He is a good piece of meat.
- <<elseif $activeSlave.weight >= -30>>
- $activeSlave.slaveName was thin. $He does not provide enough meat for you and your guests.
- <<set _dishRating -= 0.5>>
- <<elseif $activeSlave.weight >= -95>>
- $activeSlave.slaveName was too skinny. $He has very little meat on the bones.
- <<set _dishRating -= 1>>
- <<else>>
- $activeSlave.slaveName was emaciated. $He has only bones and skin.
- <<set _dishRating -= 2>>
- <</if>>
- <<if $activeSlave.muscles > 95>>
- $activeSlave.slaveName has too much muscle and sinew. $His meat is too chewy.
- <<set _dishRating -= 0.5>>
- <<elseif $activeSlave.muscles > 50>>
- $activeSlave.slaveName has strong muscles. It gives $his meat a very tasty texture.
- <<set _dishRating += 0.5>>
- <<elseif $activeSlave.muscles > 5>>
- $activeSlave.slaveName has toned muscles. It gives $his meat a tasty texture.
- <<else>>
- $activeSlave.slaveName has no muscles. It gives $his meat a plain texture.
- <<set _dishRating -= 1>>
- <</if>>
- <<if $activeSlave.lipsImplant > 0>>
- All of sudden one of your guests' face turns red, then purple. It is clear he is choking on something. You leap out of your seat, rush over to him and start the Heimlich maneuver. On your third thrust into his abdominal, a piece of lip implants flies out of his mouth and hits another guest square in the face. You apologize profusely for your carelessness in selecting the meat. The rest of your guests had a great laugh at your @@.red;expense.@@
- <<set _dishRating -= 5>>
- <<run repX(-500, "event")>>
- <</if>>
- <<if $activeSlave.buttImplant > 0>>
- All of sudden one of your guests clutches his chest. His face turns pale as a ghost, foaming at the mouth falls over onto the table. You rush over to him, it is clear he is not breathing. You don't know what's wrong with him. It could not have been poison, since any toxins in the food would have been detected by your personal assistant. You order your slave to rush the man to the nearest emergency clinic. You were informed later that he had died from ingesting a silicone butt implant. Your reputation @@.red;suffers@@ greatly due to this incident.
- <<set _dishRating -= 10>>
- <<run repX(-5000, "event")>>
- <</if>>
-
- /% Dish rating, could be made into a separate function/passage. The following will be called for every dish %/
- <<set _dinnerRating += _dishRating>>
- <<if _dishRating > 5>>
- <<set _dishRating = 5>>
- <<elseif _dishRating < 0>>
- <<set _dishRating = 0>>
- <</if>>
- <br><br>
- This dish earned a score of _dishRating out of 5 stars.
- <<if _dishRating >= 2>>
- Your reputation has @@.green;increased.@@
- <<run repX((_dishRating * 100), "event")>>
- <<elseif _dishRating >= 0>>
- Your reputation has @@.red;decreased.@@
- <<run repX(forceNeg(_dishRating * 20), "event")>>
- <<else>>
- Your reputation has @@.red;decreased.@@
- <<run repX(-100, "event")>>
- <</if>>
- <br><br>
- /% End of Dish rating %/
- /*<br style="clear:both" />*/
- <br>
- /% End of Dinner %/
- /% Total of main dishes each can earn 5 stars total 25, getting 12 stars means a successful evening %/
- <<if _dinnerRating >= 12>>
- /% successful evening %/
- The party is in full swing. Your guests enjoy eating $activeSlave.slaveName and make good use of the slaves you provided for their pleasure.
- Sounds of an orgy of food drink and sex echoes through your dining hall. Your guests ate, drank and fucked their fill.
- As the evening draw to a close, there isn't a single morsel of $activeSlave.slaveName left to be found. Some of your slaves show signs of teeth marks on their skin. Perhaps some guests got confused about what's for eating and what's for fucking?
- The evening was a @@.green;success.@@
- <<run repX((_dinnerRating * 500), "event")>>
-
- <<if _dinnerRating >= 20>>
- <br><br>
- You have earned the 20 stars required for the title of
- <<set $MOD_DinnerPartyTitleAchievement = 1>>
- <<if $PC.title > 0>>
- @@.yellow;Master of The Culinary Arts.@@
- <<else>>
- @@.yellow;Mistress of The Culinary Arts.@@
- <</if>>
-
- <br><br>
- <</if>>
- <<else>>
- /% failed evening %/
- With most of your dishes earning a poor rating, your guests are @@.red;dissatisfied.@@
- <<run repX(forceNeg(_dinnerRating * 100), "event")>>
- They take out their frustrations on your slaves. Your slaves are being fucked roughly and abused. Cries of pain and pleads of mercy echoes through your dining hall. You decide to allow the abuse to continue as you do not want to antagonize your guests further. You watch with a forced smile as your favorite slaves are being slapped, whipped, choked and burned with cigarettes.
- Some of your unlucky slaves had their health @@.red;reduced.@@
- All of your slaves @@.mediumorchid;respect you less@@ and @@.gold;fear@@ you more as you place your reputation above their wellbeing.
- <<for _dpe = 0; _dpe < $slaves.length; _dpe++>>
- <<if random(0,1) > 0>>
- <<run healthDamage($slaves[_dpe], 10)>>
- <</if>>
- <<set $slaves[_dpe].devotion -= 5>>
- <<set $slaves[_dpe].trust -= 5>>
- <</for>>
-
- /% Head Girl abuse %/
- <<if ($HeadGirlID != 0) && ($activeSlave.assignment != "be your Head Girl")>>
- <<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.
- _S.HeadGirl.slaveName knows better than to resist, _he2 is still a slave despite _his2 position as your Head Girl. A slave does not raise their hand against a Master, even one that's not _his2 own. The leader rips off _his2 dress, exposing _his2 bare chest. Your Head Girl is frozen in terror when _he2 is lifted onto the hastily cleared dining hall table by several of the men. _His2 eyes desperately search for you. You are the only one who can stop this. All that's required is a single word from you.
- _S.HeadGirl.slaveName's eyes meets yours; the look of relief on _his2 face is soon replaced by the sad realization that you will not intervene.
- _His2 mouth just barely forms the word "<<= getWrittenTitle(_S.HeadGirl)>>" as you shake your head, so _he2 closes _his2 mouth and resigns $himself to _his2 fate.
- <br>
- Your Head Girl is placed across the corner of the dining hall table face-down, _his2 arm<<if hasBothArms(_S.HeadGirl)>>s<</if>> and leg<<if hasBothLegs(_S.HeadGirl)>>s<</if>> held down by four men. _He2 finds a hand on _his2 ass, groping roughly, then another hand on the other cheek, roughly parting _his2 globes to get better access.
- /% Pussy Check %/
- <<if (_S.HeadGirl.vagina >= 0) && canDoVaginal(_S.HeadGirl)>>
- A finger traces along _his2 slit, finding the source of that moisture and pressing its way in. Another finger was added and the hand began to finger fuck _him2 roughly. After a few seconds a third finger was added and then a fourth, stretching _his2 pussy.
- _S.HeadGirl.slaveName screams loudly as the entire hand was shoved up _his2 cunt without warning.
- _His2 pussy has @@.lime;loosened.@@
- <<set _S.HeadGirl.vagina += 1>>
- <</if>>
- One man moves to the head of _S.HeadGirl.slaveName and shoved his cock into _his2 mouth, fucking _his2 throat roughly. He buries his cock deep down _his2 throat all the way to his balls.
- He places both hands around _his2 neck and squeezes with every stroke. Your Head Girl's face turns red and _he2 gags uncontrollably. _His2 eyes roll back as another man shoves his hard cock in _his2 asshole, sodomizing _him2 with no mercy. As your Head Girl makes squeaking noises in pain, several guests pick up forks and jab it at _his2 butt and _his2 back, chanting "More meat... More meat..." and "Squeal, piggy, squeal." You slump over your chair at the head of the table. Gulping down your drink, you suppress the urge to order your security drones to open fire on those men. You know they would never dare to harm your Head Girl, not permanently, at least not anything your remote surgery couldn't fix. It's not as if you haven't done worse to your slaves, but the message is clear; the attack on your Head Girl was meant as disrespect and an insult towards you. Raping your Head Girl is like raping you. You stare at the group of men gang raping your Head Girl at the end of your own dining table, burning their @@.yellow;names and their faces@@ into your memory as they take turns fucking _him2. They make use of _his2 every hole. When they are done, _he2 is left on the floor, battered and bruised, covered in cum and blood from superficial wounds.
- The leader of the pack pulls out his half erect cock and
- <<if $seePee == 1>>
- pees on your Head Girl as a final insult towards you. The poor $girl is so spent that _he2 doesn't even flinch at the urine hitting _his2 face. He finishes showering your Head Girl, then
- <<else>>
- ejaculates all over your Head Girl's face, clearly and intentionally aiming for _his2 eyes. The poor $girl is so spent that _he2 doesn't even flinch from this final insult towards you. When he's done, he
- <</if>>
- turns towards you and says smilingly:
- <br><br>
- //"I must congratulate you//
- <<if $PC.title > 0>>
- //sir//,
- <<else>>
- //madam//,
- <</if>>
- //you trained a fine obedient slave. _He2 certainly understands _his2 position well."// You grit your teeth faking a smile, mentally repeating the old adage: @@.yellow;revenge is dish best served cold.@@ You have made some enemies tonight; you begin to plan a military conquest of them all. You will enjoy storming their arcologies and making them pay for this insult.
- <br><br>
- The abuse your Head Girl suffers had @@.health.dec;decreased _his2 health@@ and _he2 is @@.mediumorchid;less devoted@@ to you, as you allowed _him2 to be abused.
- <br>
- <<run healthDamage(_S.HeadGirl, 20)>>
- <<set _S.HeadGirl.devotion -= 20>>
- <<set _generateEnemies = 1>>
- <</if>>
- <</if>>
-
- <br><br>
- /% 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++>>
- <<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>
- <<set $slaves[_dpe].devotion -= 20, $slaves[_dpe].trust -= 20>>
- <</if>>
- <<if $activeSlave.father == $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>
- <<set $slaves[_dpe].devotion -= 10, $slaves[_dpe].trust -= 10>>
- <</if>>
- <<if $activeSlave.ID == $slaves[_dpe].father>>
- $slaves[_dpe].slaveName is @@.mediumorchid;grieved@@ that you ate _his2 father. _He2 also @@.gold;fears@@ that _he2 will be next.
- <br><br>
- <<set $slaves[_dpe].devotion -= 10, $slaves[_dpe].trust -= 10>>
- <</if>>
- <<if $activeSlave.ID == $slaves[_dpe].mother>>
- $slaves[_dpe].slaveName is @@.mediumorchid;grieved@@ that you ate _his2 mother. _He2 also @@.gold;fears@@ that _he2 will be next.
- <br><br>
- <<set $slaves[_dpe].devotion -= 20, $slaves[_dpe].trust -= 20>>
- <</if>>
- <<switch areSisters($activeSlave, $slaves[_dpe])>>
- <<case 1>>
- $slaves[_dpe].slaveName is @@.mediumorchid;devastated@@ that you ate _his2 twin. _He2 also @@.gold;fears@@ that _he2 will be next.
- <br><br>
- <<set $slaves[_dpe].devotion -= 30, $slaves[_dpe].trust -= 30>>
- <<case 2>>
- $slaves[_dpe].slaveName is @@.mediumorchid;grieved@@ that you ate _his2 $sister. _He2 also @@.gold;fears@@ that _he2 will be next.
- <br><br>
- <<set $slaves[_dpe].devotion -= 20, $slaves[_dpe].trust -= 20>>
- <<case 3>>
- $slaves[_dpe].slaveName is @@.mediumorchid;disheartened@@ that you ate _his2 half-<<= $sister>>. _He2 also @@.gold;fears@@ that _he2 will be next.
- <br><br>
- <<set $slaves[_dpe].devotion -= 10, $slaves[_dpe].trust -= 10>>
- <</switch>>
- <</for>>
- <<if $activeSlave.relationship != 0>>
- <<for _dpe = 0; _dpe < $slaves.length; _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>>
- <<set $slaves[_dpe].devotion -= 20>>
- <<break>>
- <</if>>
- <</for>>
- <</if>>
- <<if $activeSlave.rivalry != 0>>
- <<for _dpe = 0; _dpe < $slaves.length; _dpe++>>
- <<if ($slaves[_dpe].ID == $activeSlave.rivalryTarget) && ($slaves[_dpe].fetish != "mindbroken")>>
- $slaves[_dpe].slaveName is @@.hotpink;pleased@@ that _he2 won't have to see _his2 rival any more.
- <<set $slaves[_dpe].devotion += $slaves[_dpe].rivalry*5>>
- <<break>>
- <</if>>
- <</for>>
- <</if>>
-
- The slaves who do not already worship you @@.mediumorchid;resent@@ your monstrous appetite and @@.mediumaquamarine;fear@@ a similar fate awaits them.
- The fat slaves are @@.mediumaquamarine;worried@@ they are being fattened for consumption.
- <<for _dpe = 0; _dpe < $slaves.length; _dpe++>>
- <<if ($slaves[_dpe].fetish != "mindbroken") && ($slaves[_dpe].devotion > 20)>>
- <<set $slaves[_dpe].devotion -= 5>>
- <<set $slaves[_dpe].trust -= 5>>
- <<if $slaves[_dpe].diet == "fattening" || $slaves[_dpe].weight > 10>>
- <<set $slaves[_dpe].trust -= 5>>
- <</if>>
- <</if>>
- <</for>>
- /*<br style="clear:both" />*/
- <br>
-
- <<if isShelterSlave($activeSlave)>>
- <<set $shelterAbuse += 1>>
- <</if>>
-
- <<run removeSlave($activeSlave)>>
-
-/* generate enemies
-<<if _generateEnemies == 1>>
- <<if ndef $MOD_enemyList>>
- <<set $MOD_enemyList = []>>
- <</if>>
- <<for _i = 0; _i < 6; _i++>>
- <<set _pram = {minAge: 38, maxAge: 44, ageOverridesPedoMode: 1, disableDisability: 1}>>
- <<set _slave = GenerateNewSlave(($seeDicks == 0 ? "XX" : "XY"), _pram)>>
- <<set _slave.devotion = -20>>
- <<set _slave.trust = -2>>
- <<set _slave.oldDevotion = -20>>
- <<set _slave.origin = "$He was once an arcology owner like yourself, who made the mistake of insulting you.">>
- <<set _slave.career = "a slave">>
- <<set _slave.prestige = 3>>
- <<set _slave.prestigeDesc = "You stormed $his arcology, killed $his guards, and enslaved $him in revenge for insulting you at a dinner party.">>
- <<run setHealth(_slave, 20, random(5, 15), 0, 0, 0)>>
- <<set _slave.dick = 5>>
- <<set _slave.balls = 5>>
- <<set _slave.intelligenceImplant = 1>>
- <<set $MOD_enemy = {leader: 0, numSlave: 0, slaveTotalHP: 0, numDrone: 0, droneTotalHP: 0, numMerc: 0, mercTotalHP: 0, weekCreated: 0, enemyIndex: -1, hostility: 0}>>
- <<set $MOD_enemy.leader = _slave>>
- <<set $MOD_enemy.weekCreated = $week>>
- <<set $MOD_enemy.numSlave = random(Math.trunc($slaves.length * 0.7), Math.trunc($slaves.length * 1.3))>>
- <<set $MOD_enemy.numDrone = random(25, 75)>>
- <<set $MOD_enemy.numMerc = random(10, 60)>>
- <<set $MOD_enemyList.push($MOD_enemy)>>
- <</for>>
-<</if>>
-*/
\ No newline at end of file
diff --git a/src/Mods/DinnerParty/dinnerPartyPreparations.tw b/src/Mods/DinnerParty/dinnerPartyPreparations.tw
deleted file mode 100644
index 33faa2cdb6eaf260ddce23e59e7be448951ff2a4..0000000000000000000000000000000000000000
--- a/src/Mods/DinnerParty/dinnerPartyPreparations.tw
+++ /dev/null
@@ -1,41 +0,0 @@
-:: Dinner Party Preparations [nobr]
-
-<<set $nextButton = "Cancel The Event", $nextLink = "Main">>
-
-Hosting of high society dinner parties will increase your prestige significantly and it is expected for someone of your station. Since there is a lack of animal meat, human meat is served at these events to illustrate the wealth and power of the host. The success of the evening is judged by how well the human offering is prepared. Guests to these events are encouraged to rate the dishes and special dishes are expected. If the host receives 5 stars on all the dishes, they will receive the coveted title "<<if $PC.title == 1>>Master<<else>>Mistress<</if>> of The Culinary Arts". You ask $assistant.name to show you a list of cooking instructions for those dishes.
-
-
-<h1>Cooking Instructions and Recipes:</h1>
-
-''Roast Long Pig'' – Made with the meat of a human roasted on a spit. Young meat is better than old meat. There should be some amount of fat to make the meat juicy, but not too much fat that makes the meat greasy. Muscles affect the texture of the meat. Meat without muscles lacks texture while an excess will be tough and hard to chew. Remember that you can't eat silicone, and virgin meat is highly sought after.<<if $seePreg != 0>> If the human is pregnant, a veal dish can also be made from the fetus.<</if>>
-
-<br><br>
-''Dicky Roll'' – An erect penis made into a spring roll. For best results, harvest the penis at the moment of ejaculation. The size of the penis and the amount of accumulated ejaculate all affect the quality of the dish. Too big of a dick and too thin of semen can both ruin a dish.
-
-<br><br>
-''Testy Meat Balls'' – Testicles made into meat balls served with a sauce. Size matters.
-
-<br><br>
-''Titty Tartare'' – Made from finely chopped breasts, mixed with onions, capers, and seasonings, and served raw. Big breasts make the best quality meat for this dish. To add a hint of creamy taste, make sure the breasts are lactating. Remember that you can't eat silicone.
-
-<br><br>
-''Camel Toe à l'Orange'' – Pussy grilled like a steak. A big clit and big labia will improve the quality of the dish.
-
-<br><br>
-
-Your assistant will take care of the invitations and all the arrangements; all you need to do is pick the meat.
-
-<br><br>
-
-__Select Your Meat:__
-<br><br>
-<<includeDOM App.UI.SlaveList.slaveSelectionList(
- s => assignmentVisible(s) && s.fuckdoll === 0,
- App.UI.SlaveList.SlaveInteract.stdInteract,
- null,
- (s) => {
- const p = getPronouns(s);
- return App.UI.DOM.passageLink(`Make ${p.him} the main course`, "Dinner Party Execution",
- () => { $activeSlave = s; })
- }
- )>>
diff --git a/src/Mods/SecExp/buildings/riotControlCenter.js b/src/Mods/SecExp/buildings/riotControlCenter.js
index b7b9dc39025d0c794e21f93e6ee41feb65854fe0..7c649a455e8bfb3a2c1c6b8b8712351e8dbaf320 100644
--- a/src/Mods/SecExp/buildings/riotControlCenter.js
+++ b/src/Mods/SecExp/buildings/riotControlCenter.js
@@ -200,18 +200,11 @@ App.Mods.SecExp.riotCenter = (function() {
if (V.SF.Toggle && V.SF.Active >= 1) {
if (V.SecExp.edicts.SFSupportLevel >= 4 && V.SF.Squad.Armoury >= 8 && !V.SecExp.rebellions.sfArmor) {
- App.UI.DOM.appendNewElement("div", node);
const cost = Math.ceil(500000 * App.Mods.SF.env() * (1.15 + (V.SF.Squad.Armoury/10) ));
- App.UI.DOM.appendNewElement("span", node,
- App.UI.DOM.link(
- `Give the riot unit access to the combat armor suits of ${V.SF.Lower}.`,
- () => {
- V.SecExp.rebellions.sfArmor = 1;
- cashX(-cost, "capEx");
- }
- )
- );
- App.UI.DOM.appendNewElement("span", node, `Costs ${cashFormat(cost)}.`, "note");
+ App.UI.DOM.appendNewElement("div", node, makePurchase(
+ `Give the riot unit access to the combat armor suits of ${V.SF.Lower}.`, cost, "capEx",
+ {handler: () => { V.SecExp.rebellions.sfArmor = 1; }}
+ ));
} else {
App.UI.DOM.appendNewElement("div", node, `You have given the riot unit access to the combat armor suits of ${V.SF.Lower}.`);
}
@@ -233,7 +226,7 @@ App.Mods.SecExp.riotCenter = (function() {
deploy.append("Spend: ", App.UI.DOM.generateLinksStrip(r));
return deploy;
/**
- * @param {string} cost
+ * @param {string} cost
* @returns {HTMLSpanElement}
*/
function menu(cost) {
diff --git a/src/Mods/SecExp/buildings/secBarracks.js b/src/Mods/SecExp/buildings/secBarracks.js
index 4c233ce683438efc3b7fad7189b619efad5f8bcd..9966f83f3e83b7c43890297b05bc3a6b7114a487 100644
--- a/src/Mods/SecExp/buildings/secBarracks.js
+++ b/src/Mods/SecExp/buildings/secBarracks.js
@@ -93,7 +93,7 @@ App.Mods.SecExp.barracks = (function() {
}
if (reasons.length > 0 || sectionSF) {
- const capSF = capFirstChar(V.SF.Lower || "the special force");
+ const capSF = capFirstChar(V.SF.Lower || "the Special Force");
if (reasons.length > 0) {
App.UI.DOM.appendNewElement("div", node, `The Colonel says that ${capSF} may be able to provide assistance if ${toSentence(reasons)}.`);
}
diff --git a/src/Mods/SecExp/buildings/weaponsManufacturing.js b/src/Mods/SecExp/buildings/weaponsManufacturing.js
index 6eba10ff2a83dcbfc24e178efb2aab5f41010f33..50fcaa785f58975ad3df14aa956d07d3e809aef8 100644
--- a/src/Mods/SecExp/buildings/weaponsManufacturing.js
+++ b/src/Mods/SecExp/buildings/weaponsManufacturing.js
@@ -91,19 +91,19 @@ App.Mods.SecExp.weapManu = (function() {
};
case 6:
return {
- dec: "combined training regimens with the special force", type: "attack and defense",
+ dec: `combined training regimens with ${capFirstChar(V.SF.Lower)}`, type: "attack and defense",
purpose: "offensive and defensive effectiveness", cost: 0,
unit: "our human troops"
};
case 7:
return {
- dec: `a variant of the stimulant cocktail that the ${V.SF.Lower} created`, type: "hp and morale",
+ dec: `a variant of the stimulant cocktail that ${capFirstChar(V.SF.Lower)} created`, type: "hp and morale",
purpose: "morale and survivability", cost: 300000,
unit: "our human troops"
};
case 8:
return {
- dec: "a mesh network based off the custom network of the special force", type: "all",
+ dec: `a mesh network based off the custom network of ${capFirstChar(V.SF.Lower)}`, type: "all",
purpose: "offensive,defensive effectiveness in addition to morale and survivability", cost: 1000000*V.HackingSkillMultiplier,
unit: "our human troops"
};
diff --git a/src/Mods/SecExp/events/conflictOptions.js b/src/Mods/SecExp/events/conflictOptions.js
index 8296d64c40c343305b76566c6f9012716f627e07..e5423b9b32304530c12da0a661af0c13137db08b 100644
--- a/src/Mods/SecExp/events/conflictOptions.js
+++ b/src/Mods/SecExp/events/conflictOptions.js
@@ -2,8 +2,7 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
eventPrerequisites() {
return [
() => V.secExpEnabled > 0,
- () => V.SecExp.war.foughtThisWeek === 0,
- () => V.SecExp.war.type !== ""
+ () => V.SecExp.war.type
];
}
@@ -31,7 +30,7 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
r.push(`Some of your citizens saw the disorganized horde of raiders coming towards the city and quickly reported it. To such jackals your arcology surely looks like an appetizing morsel.`);
}
const div = document.createElement("div");
- App.UI.DOM.makeElement("span", `Raiders`, "strong");
+ App.UI.DOM.makeElement("span", `Raiders`, ["strong"]);
App.UI.DOM.makeElement("span", `are roaming gangs of bandits, preying on the vulnerable supply lines of Free Cities and old world nations. They are rarely equipped with decent armaments and even more rarely have any formal military training, but they make up for that with high mobility and numbers.`);
r.push(div);
} else if (V.SecExp.war.attacker.type === "free city") {
@@ -42,7 +41,7 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
r.push(`Some of your citizens saw the menacing column of slavers and hired mercenaries and rushed to your office to bring the grim news. Another free city is ready to use their best tools to bring down a dangerous competitor.`);
}
const div = document.createElement("div");
- App.UI.DOM.makeElement("span", `Free City expeditions`, "strong");
+ App.UI.DOM.makeElement("span", `Free City expeditions`, ["strong"]);
App.UI.DOM.makeElement("span", `are usually composed of mercenaries hired to take down sensible supplies or infrastructure in order to damage the enemies of their contractor. They have on average good equipment and training, together with decent mobility, making them a formidable force. Their biggest weakness however is their relatively low numbers.`);
r.push(div);
} else if (V.SecExp.war.attacker.type === "freedom fighters") {
@@ -53,7 +52,7 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
r.push(`Some of your citizens saw the dangerous looking army of guerrillas is gathering just outside the arcology. Fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire.`);
}
const div = document.createElement("div");
- App.UI.DOM.makeElement("span", `Freedom Fighters`, "strong");
+ App.UI.DOM.makeElement("span", `Freedom Fighters`, ["strong"]);
App.UI.DOM.makeElement("span", `are groups of individuals fighting to rid the planet of "evils" such as the Free Cities and their way of life. Lacking the strength to assault one directly they fight guerrilla style slowly starving to death their enemies. They are rarely well equipped, but with good training and mobility they are not a threat that can be taken lightly.`);
r.push(div);
} else if (V.SecExp.war.attacker.type === "old world") {
@@ -64,7 +63,7 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
r.push(`Some of your citizens saw the disciplined yet dusty, scruffy old world army is approaching the confines of your arcology. There's nothing better than a good war to unite the electorate and your arcology is just the perfect target.`);
}
const div = document.createElement("div");
- App.UI.DOM.makeElement("span", `Old world expeditions`, "strong");
+ App.UI.DOM.makeElement("span", `Old world expeditions`, ["strong"]);
App.UI.DOM.makeElement("span", `are usually sent to secure resources and trade routes for their nation or, more often, to provide their citizens with a bogeyman to be scared of. They are usually decently equipped and trained, which together with their generous numbers make them a tough nut to crack. However, they often lack in mobility.`);
r.push(div);
}
@@ -121,27 +120,27 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
const isOceanic = V.terrain === "oceanic";
r.push(`It seems your troops and your adversary will fight`);
if (V.SecExp.war.terrain === "rural") {
- r.push(`in`, App.UI.DOM.makeElement("span", `the rural land`, "strong"), `surrounding the free city.`);
+ r.push(`in`, App.UI.DOM.makeElement("span", `the rural land`, ["strong"]), `surrounding the free city.`);
} else if (V.SecExp.war.terrain === "urban") {
- r.push(`in the old`, App.UI.DOM.makeElement("span", `abandoned city`, "strong"), `surrounding the free city.`);
+ r.push(`in the old`, App.UI.DOM.makeElement("span", `abandoned city`, ["strong"]), `surrounding the free city.`);
} else if (V.SecExp.war.terrain === "hills") {
- r.push(`on`, App.UI.DOM.makeElement("span", `the hills`, "strong"), `around the free city.`);
+ r.push(`on`, App.UI.DOM.makeElement("span", `the hills`, ["strong"]), `around the free city.`);
} else if (V.SecExp.war.terrain === "coast") {
- r.push(`along`, App.UI.DOM.makeElement("span", `the coast`, "strong"), `just outside the free city.`);
+ r.push(`along`, App.UI.DOM.makeElement("span", `the coast`, ["strong"]), `just outside the free city.`);
} else if (V.SecExp.war.terrain === "outskirts") {
- r.push(`right against`, App.UI.DOM.makeElement("span", `the walls of the arcology.`, "strong"));
+ r.push(`right against`, App.UI.DOM.makeElement("span", `the walls of the arcology.`, ["strong"]));
} else if (V.SecExp.war.terrain === "mountains") {
- r.push(`in`, App.UI.DOM.makeElement("span", `the mountains`, "strong"), `overlooking the arcology.`);
+ r.push(`in`, App.UI.DOM.makeElement("span", `the mountains`, ["strong"]), `overlooking the arcology.`);
} else if (V.SecExp.war.terrain === "wasteland") {
- r.push(`in`, App.UI.DOM.makeElement("span", `the wastelands`, "strong"), `outside the free city territory.`);
+ r.push(`in`, App.UI.DOM.makeElement("span", `the wastelands`, ["strong"]), `outside the free city territory.`);
} else if (V.SecExp.war.terrain === "international waters") {
- r.push(`in`, App.UI.DOM.makeElement("span", `the water surrounding`, "strong"), `the free city.`);
+ r.push(`in`, App.UI.DOM.makeElement("span", `the water surrounding`, ["strong"]), `the free city.`);
} else if (["a sunken ship", "an underwater cave"].includes(V.SecExp.war.terrain)) {
- r.push(`in`, App.UI.DOM.makeElement("span", `${V.SecExp.war.terrain}`, "strong"), `near the free city.`);
+ r.push(`in`, App.UI.DOM.makeElement("span", `${V.SecExp.war.terrain}`, ["strong"]), `near the free city.`);
} else if (V.SecExp.war.terrain === "error") {
- r.push(App.UI.DOM.makeElement("span", `Error: failed to assign terrain.`, "red"), `${V.SecExp.war.terrain} reads: ${V.SecExp.war.terrain}.`);
+ r.push(App.UI.DOM.makeElement("span", `Error: failed to assign terrain.`, ["red"]), `${V.SecExp.war.terrain} reads: ${V.SecExp.war.terrain}.`);
} else {
- r.push(App.UI.DOM.makeElement("span", `Error: failed to read terrain.`, "red"), `${V.SecExp.war.terrain} reads: ${V.SecExp.war.terrain}.`);
+ r.push(App.UI.DOM.makeElement("span", `Error: failed to read terrain.`, ["red"]), `${V.SecExp.war.terrain} reads: ${V.SecExp.war.terrain}.`);
}
if (App.Mods.SecExp.battle.recon() === 3) {
r.push(`Your recon capabilities are top notch. The information collected will be most likely correct or very close to be so:`);
@@ -153,22 +152,22 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
r.push(`Your recon capabilities are almost non-existent. The information collected will be wild guesses at best:`);
}
r.push(`approximately`);
- r.push(App.UI.DOM.makeElement("span", `${estimatedMen} men`, "strong"));
+ r.push(App.UI.DOM.makeElement("span", `${estimatedMen} men`, ["strong"]));
r.push(`are coming, they seem to be`);
if (expectedEquip <= 0) {
- r.push(App.UI.DOM.makeElement("span", `poorly armed.`, "strong"));
+ r.push(App.UI.DOM.makeElement("span", `poorly armed.`, ["strong"]));
r.push(`Old rusty small arms are the norm with just a few barely working civilian ${isOceanic ? 'boats' : 'vehicles'}.`);
} else if (expectedEquip === 1) {
- r.push(App.UI.DOM.makeElement("span", `lightly armed,`, "strong"));
+ r.push(App.UI.DOM.makeElement("span", `lightly armed,`, ["strong"]));
r.push(`mostly with small arms and some repurposed civilian ${isOceanic ? 'boats' : 'vehicles'} with scattered machine gun support. There's no sign of heavy ${isOceanic ? 'boats' : 'vehicles'}, ${isOceanic ? 'submarines' : 'artillery'} or aircraft.`);
} else if (expectedEquip === 2) {
- r.push(App.UI.DOM.makeElement("span", `decently armed`, "strong"));
+ r.push(App.UI.DOM.makeElement("span", `decently armed`, ["strong"]));
r.push(`with good quality small arms, machine guns and a few mortars. There appear to be some heavy military ${isOceanic ? 'boats' : 'vehicles'} coming as well.`);
} else if (expectedEquip === 3) {
- r.push(App.UI.DOM.makeElement("span", `well armed`, "strong"));
+ r.push(App.UI.DOM.makeElement("span", `well armed`, ["strong"]));
r.push(`with high quality small arms, ${isOceanic ? 'spear men' : 'snipers'}, demolitions teams, heavy duty machine guns and mortars. Heavy military ${isOceanic ? 'boats' : 'vehicles'} are numerous and a few ${isOceanic ? 'submarines' : 'artillery pieces'} are accompanying the detachment.`);
} else if (expectedEquip >= 4) {
- r.push(App.UI.DOM.makeElement("span", `extremely well armed`, "strong"));
+ r.push(App.UI.DOM.makeElement("span", `extremely well armed`, ["strong"]));
r.push(`with excellent small arms and specialized teams with heavy duty infantry support weapons. Heavy presence of armored military ${isOceanic ? 'boats' : 'vehicles'}, ${isOceanic ? 'submarines' : 'artillery pieces'} and even some attack helicopters.`);
}
App.Events.addParagraph(node, r);
@@ -176,7 +175,7 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
App.UI.DOM.appendNewElement("h2", node, `Battle plan`);
if (V.SecExp.war.commander === "bodyguard" && V.BodyguardID === 0 || V.SecExp.war.commander === "headGirl" && V.HeadGirlID === 0) {
- App.UI.DOM.makeElement("span", `Chosen leader ${V.SecExp.war.commander} cannot be found, please select another.`, "warning");
+ App.UI.DOM.makeElement("span", `Chosen leader ${V.SecExp.war.commander} cannot be found, please select another.`, ["warning"]);
V.SecExp.war.commander = "PC";
}
options = new App.UI.OptionsGroup(); // leader assignment
@@ -218,14 +217,14 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
option = options.addOption(tactic, "chosenTactic", V.SecExp.war).addValue("Select", tactic);
const comment = document.createElement("span");
if (tactics[tactic].atkMod > 0.1) {
- App.UI.DOM.appendNewElement("span", comment, "Atk+, ", "green");
+ App.UI.DOM.appendNewElement("span", comment, "Atk+, ", ["green"]);
} else if (tactics[tactic].atkMod < 0.1) {
- App.UI.DOM.appendNewElement("span", comment, "Atk-, ", "red");
+ App.UI.DOM.appendNewElement("span", comment, "Atk-, ", ["red"]);
}
if (tactics[tactic].defMod > 0.1) {
- App.UI.DOM.appendNewElement("span", comment, "Def+, ", "green");
+ App.UI.DOM.appendNewElement("span", comment, "Def+, ", ["green"]);
} else if (tactics[tactic].defMod < 0.1) {
- App.UI.DOM.appendNewElement("span", comment, "Def-, ", "red");
+ App.UI.DOM.appendNewElement("span", comment, "Def-, ", ["red"]);
}
comment.append(tacticsDesc.get(tactic));
option.addComment(comment);
@@ -234,10 +233,11 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
App.UI.DOM.appendNewElement("h3", node, `Troops`);
if (V.SF.Toggle && V.SF.Active >= 1 && V.SecExp.war.type.includes("Major")) {
+ const capSF = capFirstChar(V.SF.Lower || "the Special Force");
options = new App.UI.OptionsGroup();
- options.addOption("The incoming attack's scale warrants deploying the special force.", "deploySF", V.SecExp.war)
+ options.addOption(`The incoming attack's scale warrants deploying ${capSF}.`, "deploySF", V.SecExp.war)
.addValue("Green light", 1).on().addValue("Red light", 0).off()
- .addComment("Some upgrades will be able to support your troops even if the special force is not deployed in the fight.");
+ .addComment(`Some upgrades will be able to support your troops even if ${capSF} is not deployed.`);
node.append(options.render());
}
@@ -307,18 +307,14 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
// troop deployment
if (App.Mods.SecExp.battle.deployableUnits() > 0) {
r.push(`With your current readiness level you can send an additional`);
- r.push(App.UI.DOM.makeElement("span", String(App.Mods.SecExp.battle.deployableUnits()), "strong"));
+ r.push(App.UI.DOM.makeElement("span", String(App.Mods.SecExp.battle.deployableUnits()), ["strong"]));
r.push(`units.`);
}
} else {
const isSlaveRebellion = V.SecExp.war.type.includes("Slave");
r.push(`In the end it happened, the ${isSlaveRebellion ? "slaves" : "citizens"}`);
r.push(`of your arcology dared took up arms and rose up against their betters. Your penthouse is flooded with reports from all over the arcology of small skirmishes between the rioting slaves and the security forces. It appears <strong>${num(Math.trunc(V.SecExp.war.attacker.troops))}</strong> rebels are in the streets right now, building barricades and`);
- if (isSlaveRebellion) {
- r.push(`freeing their peers.`);
- } else {
- r.push(`destroying your property.`);
- }
+ r.push(`${isSlaveRebellion ? 'freeing their peers' : 'destroying your property'}.`);
if (V.SecExp.war.attacker.equip <= 0) {
r.push(`They are <strong>poorly armed</strong>.`);
} else if (V.SecExp.war.attacker.equip === 1) {
@@ -333,30 +329,29 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
if (V.SecExp.war.irregulars > 0) {
r.push(`${num(Math.trunc(V.SecExp.war.irregulars))} of your citizens took up arms to defend their arcology owner.`);
}
- if (V.SecExp.war.rebellingID.length > 0) {
- App.Events.addParagraph(node, r);
- r = [];
- let rebelling = [];
- for (const squad of App.Mods.SecExp.unit.squads("human")) {
- if (squad.active === 1 && (V.SecExp.war.rebellingID.includes(squad.ID))) {
- rebelling.push(squad.platoonName);
- }
- }
- r.push(`${toSentence(rebelling)} betrayed you and joined the insurrection.`);
- }
- let defending = [];
+
+ const rebelling = [];
+ const defending = [];
if (V.arcologyUpgrade.drones === 1) {
defending.push(`Your security drones`);
}
- for (const squad of App.Mods.SecExp.unit.squads("human")) {
- if (squad.active === 1 && (!V.SecExp.war.rebellingID.includes(squad.ID))) {
- defending.push(squad.platoonName);
- }
- }
if (V.SF.Toggle && V.SF.Active >= 1) {
let SFname = defending.length > 0 ? V.SF.Lower : capFirstChar(V.SF.Lower);
defending.push(`${SFname}, ${num(V.SF.ArmySize)} strong`);
}
+ for (const squad of App.Mods.SecExp.unit.squads("human").filter(u => u.active)) {
+ if (V.SecExp.war.rebellingID.includes(squad.ID)) {
+ rebelling.push(squad.platoonName);
+ } else {
+ defending.push(squad.platoonName);
+ }
+ }
+
+ if (V.SecExp.war.rebellingID.length > 0) {
+ App.Events.addParagraph(node, r);
+ r = [];
+ r.push(`${toSentence(rebelling)} betrayed you and joined the insurrection.`);
+ }
if (defending.length > 0) {
App.Events.addParagraph(node, r);
r = [];
@@ -378,7 +373,7 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
text = `Your troops will make use of the special weaponry, equipment and infrastructure developed by the riot control center to surgically eliminate rebels and dissidents with little to no collateral damage.`;
}
if (text) {
- App.UI.DOM.appendNewElement("div", node, text, "note");
+ App.UI.DOM.appendNewElement("div", node, text, ["note"]);
}
const engageRules = new Map([
@@ -409,7 +404,7 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
]);
const activeDefenses = Array.from(locations.keys()).filter(loc => V.SecExp.war[loc] === 1);
if (activeDefenses.length > 0) {
- App.UI.DOM.appendNewElement("div", node, `Your troops will garrison the ${toSentence(activeDefenses.map(loc => locations.get(loc)))}.`, "note");
+ App.UI.DOM.appendNewElement("div", node, `Your troops will garrison the ${toSentence(activeDefenses.map(loc => locations.get(loc)))}.`, ["note"]);
}
for (const [loc, text] of locations) {
const choices = [];
@@ -434,7 +429,7 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
node.append(App.Mods.SecExp.unit.replenishAll());
if (isBattle) {
if (App.Mods.SecExp.battle.deployableUnits() === 0) {
- App.UI.DOM.appendNewElement("div", node, `Unit roster full.`, "strong");
+ App.UI.DOM.appendNewElement("div", node, `Unit roster full.`, ["strong"]);
}
if (App.Mods.SecExp.unit.squads().length > 0) {
options = new App.UI.OptionsGroup();
@@ -457,20 +452,17 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
if (isBattle && App.Mods.SecExp.battle.deployedUnits() > 0 || !isBattle) {
option.addButton(isBattle ? `Deploy troops` : `Proceed`, () => {
V.SecExp.war.result = 4; // Sets to a value outside accepted range (-3, 3) to avoid evaluation problems
- V.SecExp.war.foughtThisWeek = 1;
}, `conflictHandler`);
} else if (isBattle && App.Mods.SecExp.battle.deployedUnits() === 0) {
- App.UI.DOM.appendNewElement("div", node, `You need at least a unit in your roster to proceed to battle.`, "red");
+ App.UI.DOM.appendNewElement("div", node, `You need at least a unit in your roster to proceed to battle.`, ["red"]);
}
if (isBattle) {
option.addButton(`Attempt to bribe (approximately ${cashFormat(Math.round(App.Mods.SecExp.battle.bribeCost() * (1 + either(-1, 1) * random(2) * 0.1)))})`, () => {
V.SecExp.war.result = 1;
- V.SecExp.war.foughtThisWeek = 1;
}, `conflictHandler`);
}
option.addButton(`Surrender`, () => {
V.SecExp.war.result = -1;
- V.SecExp.war.foughtThisWeek = 1;
}, "conflictReport");
node.append(options.render());
return node;
diff --git a/src/Mods/SecExp/events/conflictReport.js b/src/Mods/SecExp/events/conflictReport.js
index 2983e3b35df72ddb51501f8823505132c581cdd7..e08874b3b6fa1818cc1a96cd6f4c4bb73358381b 100644
--- a/src/Mods/SecExp/events/conflictReport.js
+++ b/src/Mods/SecExp/events/conflictReport.js
@@ -1053,7 +1053,7 @@ App.Events.conflictReport = function() {
slave.weight = (generateFemale ? random(-20, 30) : random(0, 30));
slave.muscles = (generateFemale ? random(15, 80) : random(25, 80));
slave.waist = (generateFemale ? random(10, 80) : random(-20, 20));
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.origin = `$He is an enslaved ${V.SecExp.war.attacker.type} soldier captured during a battle.`;
names.push(SlaveFullName(slave));
newSlave(slave); // skip New Slave Intro
@@ -1217,14 +1217,12 @@ App.Events.conflictReport = function() {
App.Events.addParagraph(node, r);
if (inRebellion) {
+ const inverse = slaveRebellion ? 'citizen' : 'slave';
V.SecExp.rebellions[V.SecExp.war.type.toLowerCase().replace(' rebellion', '') + 'Progress'] = 0;
V.SecExp.rebellions.tension = Math.clamp(V.SecExp.rebellions.tension - random(50, 100), 0, 100);
- if (slaveRebellion) {
- V.SecExp.rebellions.citizenProgress = Math.clamp(V.SecExp.rebellions.citizenProgress - random(50, 100), 0, 100);
- } else {
- V.SecExp.rebellions.slaveProgress = Math.clamp(V.SecExp.rebellions.slaveProgress - random(50, 100), 0, 100);
- }
+ V.SecExp.rebellions[inverse + 'Progress'] = Math.clamp(V.SecExp.rebellions[inverse + 'Progress'] - random(50, 100), 0, 100);
}
+ delete V.SecExp.war.type;
return node;
};
/**
@@ -1309,7 +1307,7 @@ const checkWoundStatus = function(target) {
return ``;
}
- if (slave.skill.combat > 0) {
+ if (slave.skill.combat > 30) {
woundChance -= 2;
}
woundChance -= 0.25 * (getLimbCount(slave, 105));
diff --git a/src/Mods/SecExp/events/secExpSmilingMan0.js b/src/Mods/SecExp/events/secExpSmilingMan0.js
index cda9d50687c37470760be95fdb352dc026eaa702..6a1253f641268dbfa8cb43fbe1c54d7b97d43fbd 100644
--- a/src/Mods/SecExp/events/secExpSmilingMan0.js
+++ b/src/Mods/SecExp/events/secExpSmilingMan0.js
@@ -9,24 +9,23 @@ App.Events.secExpSmilingMan0 = class secExpSmilingMan0 extends App.Events.BaseEv
}
execute(node) {
- let r = [];
+ V.fcnn.push("...encryption techniques: how to protect you and your loved ones from hackers ...");
V.SecExp.smilingMan.progress++;
-
+ V.SecExp.smilingMan.relationship = 0;
+ let r = [];
const {heA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
+ const cost = 10000;
+ const choices = [];
- V.SecExp.smilingMan.relationship = 0;
- V.fcnn.push("...encryption techniques: how to protect you and your loved ones from hackers ...");
r.push(
`During your morning routine, a peculiar report appears: it's been several weeks since your arcology was the victim of a series of cyber-crimes conducted by a mysterious figure. The egocentric criminal apparently took great pride in their acts, to the point of signing them with a symbol: a stylized smiling face. Your arcology was not the only one under assault by the machinations of the one the media quickly nicknamed`,
- App.UI.DOM.makeElement("span", "the Smiling Man.", "note")
+ App.UI.DOM.makeElement("span", "the Smiling Man.", ["note"])
);
App.Events.addParagraph(node, r);
App.Events.addParagraph(node, [`Despite the sheer damage this criminal did, you cannot help but admire the skill with which every misdeed was performed — the worst white collar crimes of the century, carried out with such elegance that they almost seemed the product of natural laws, rather than masterful manipulation of the digital market. While sifting through the report, ${V.assistant.name} remains strangely quiet. "I'm worried, ${properTitle()} — this individual seems to be able to penetrate whichever system garners his attention. I... feel vulnerable," ${heA} says. "It's not something I'm used to."`]);
App.Events.addParagraph(node, [`Fortunately you have not been hit directly by this criminal — yet. Still, the repercussions of numerous bankruptcies take their toll on your arcology, whose <span class="red">prosperity suffers.</span>`]);
V.arcologies[0].prosperity *= random(80, 90) * 0.01;
- const choices = [];
- const cost = 10000;
if (V.cash >= cost) {
choices.push(new App.Events.Result(`Devote funds to the search for this dangerous criminal`, search, `This will cost ${cashFormat(cost)}`));
choices.push(new App.Events.Result(`Attempt to contact the mysterious figure`, contact, `This will cost ${cashFormat(cost)}`));
@@ -39,27 +38,26 @@ App.Events.secExpSmilingMan0 = class secExpSmilingMan0 extends App.Events.BaseEv
function search() {
cashX(-10000, "event");
- V.SecExp.smilingMan.investedFunds = 1;
+ App.Events.queueEvent(3, new App.Events.secExpSmilingMan1(), {investedFunds: V.SecExp.smilingMan.investedFunds || 1});
V.SecExp.smilingMan.relationship++;
return `You devote funds to capture and neutralize the threat. You cannot help but wonder what the end game of this "smiling man" is. Money? Fame? Or is he on an ideological crusade?`;
}
-
function contact() {
cashX(-10000, "event");
- V.SecExp.smilingMan.investedFunds = 1;
+ App.Events.queueEvent(3, new App.Events.secExpSmilingMan1(), {investedFunds: V.SecExp.smilingMan.investedFunds || 1});
V.SecExp.smilingMan.relationship += 2;
return `You devote funds to an attempt at communicating with the smiling man. You cannot help but wonder what the end game of this "smiling man" is. Money? Fame? Or is he on an ideological crusade?`;
}
-
function invest() {
cashX(-10000, "event");
- V.SecExp.smilingMan.investedFunds = 1;
+ App.Events.queueEvent(3, new App.Events.secExpSmilingMan1(), {investedFunds: V.SecExp.smilingMan.investedFunds || 1});
V.SecExp.smilingMan.relationship += random(5, 10);
return `You devote funds to the improvement of the cyber-security of your arcology. You cannot help but wonder what the end game of this "smiling man" is. Money? Fame? Or is he on an ideological crusade?`;
}
-
function bliss() {
+ App.Events.queueEvent(3, new App.Events.secExpSmilingMan1());
return `You do not consider this individual a threat.`;
}
+
}
};
diff --git a/src/Mods/SecExp/events/secExpSmilingMan1.js b/src/Mods/SecExp/events/secExpSmilingMan1.js
index c51c512a248dba98c82ca715fc4d11ffe525ad0e..fe4e5c768467aac3a4967ebd511114e3030b03bd 100644
--- a/src/Mods/SecExp/events/secExpSmilingMan1.js
+++ b/src/Mods/SecExp/events/secExpSmilingMan1.js
@@ -1,19 +1,17 @@
App.Events.secExpSmilingMan1 = class secExpSmilingMan1 extends App.Events.BaseEvent {
eventPrerequisites() {
return [
- () => V.rival.state <= 1 || V.rival.state > 2,
() => V.secExpEnabled > 0,
- () => V.SecExp.smilingMan.progress === 1,
- () => App.Events.effectiveWeek() >= 77,
];
}
execute(node) {
- let r = [];
+ App.Events.queueEvent(5, new App.Events.secExpSmilingMan2());
+ V.fcnn.push("...cybersecurity market is booming thanks to a series of recent high-profile attacks...");
V.SecExp.smilingMan.progress++;
-
+ let r = [];
const {hisA, heA, himA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
- V.fcnn.push("...cybersecurity market is booming thanks to a series of recent high-profile attacks...");
+
r.push(
`You have just reached your penthouse when your faithful assistant appears in front of you, evidently excited.`,
`"${properTitle()}, I have just received news of a new attack by the Smiling Man. It appears a few hours ago he infiltrated another arcology and caused a catastrophic failure of its power plant.`,
@@ -53,13 +51,9 @@ App.Events.secExpSmilingMan1 = class secExpSmilingMan1 extends App.Events.BaseEv
}
if (V.SecExp.buildings.secHub && V.SecExp.buildings.secHub.upgrades.security.cyberBots === 1) {
lostCash -= Math.min(30000, lostCash);
- r.push(`The additional cyber defenses acquired and running in the security HQ`);
- if (lostCash < 200000) {
- r.push(`further`);
- }
- r.push(`limit the damage.`);
+ r.push(`The additional cyber defenses acquired and running in the security HQ ${lostCash < 200000 ? 'further' : ''} limit the damage.`);
}
- if (V.SecExp.smilingMan.investedFunds) {
+ if (V.SecExp.smilingMan.investedFunds || this.params.investedFunds) {
lostCash -= Math.min(20000, lostCash);
r.push(`The funding you dedicated to the Smiling Man case saved some of the assets that would have been otherwise lost.`);
delete V.SecExp.smilingMan.investedFunds;
@@ -67,7 +61,6 @@ App.Events.secExpSmilingMan1 = class secExpSmilingMan1 extends App.Events.BaseEv
cashX(forceNeg(lostCash), "event");
App.Events.addParagraph(node, r);
-
App.Events.addResponses(node, [
new App.Events.Result(`"I want them dead. Now."`, kill),
new App.Events.Result(`"I want them, dead or alive!"`, find),
@@ -79,17 +72,14 @@ App.Events.secExpSmilingMan1 = class secExpSmilingMan1 extends App.Events.BaseEv
V.SecExp.smilingMan.relationship--;
return `You command your loyal operatives to double down on the search and elimination of the threat.`;
}
-
function find() {
V.SecExp.smilingMan.relationship++;
return `You command your loyal operatives to double down on the search and capture of the threat.`;
}
-
function findFast() {
V.SecExp.smilingMan.relationship += 2;
return `You command your loyal operatives to double down on the search and neutralization of the threat.`;
}
-
function peace() {
return `You take no further action. Hopefully this ordeal is over.`;
}
diff --git a/src/Mods/SecExp/events/secExpSmilingMan2.js b/src/Mods/SecExp/events/secExpSmilingMan2.js
index 021d1cac5f5a64553ad54a15c939e0fc5e0e9bb8..c1bc510d96ac2785f60eb5fe443ef73365f6f152 100644
--- a/src/Mods/SecExp/events/secExpSmilingMan2.js
+++ b/src/Mods/SecExp/events/secExpSmilingMan2.js
@@ -1,19 +1,16 @@
App.Events.secExpSmilingMan2 = class secExpSmilingMan2 extends App.Events.BaseEvent {
eventPrerequisites() {
return [
- () => V.rival.state <= 1 || V.rival.state > 2,
() => V.secExpEnabled > 0,
- () => V.SecExp.smilingMan.progress === 2,
- () => App.Events.effectiveWeek() >= 82,
];
}
execute(node) {
- let r = [];
+ App.Events.queueEvent(0, new App.Events.secExpSmilingMan3());
+ V.fcnn.push("...my money safe the old-fashioned way: I store it all underneath my mattress...");
V.SecExp.smilingMan.progress++;
-
+ let r = [];
const {hisA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
- V.fcnn.push("...my money safe the old-fashioned way: I store it all underneath my mattress...");
r.push(`When ${V.assistant.name} violently wakes you up, ${hisA} worried expression can mean only one thing: the Smiling Man had been back. "We were anonymously sent a link to a new website: it's a very simple site, no visuals, no text; only a countdown ticking away. It will reach zero this evening." your assistant says.`);
r.push(`This is troubling, yet somewhat exciting. The Smiling Man never failed to cause damage, but his ego had gotten the best of him this time — having time to prepare before their attack will give you a chance to find them. For the rest of the day you do your best to plan, prepare and focus.`);
@@ -79,17 +76,14 @@ App.Events.secExpSmilingMan2 = class secExpSmilingMan2 extends App.Events.BaseEv
V.SecExp.smilingMan.relationship--;
return `You command your loyal operatives to prepare for a manhunt.`;
}
-
function find() {
V.SecExp.smilingMan.relationship++;
return `You command your loyal operatives to prepare for a manhunt.`;
}
-
function findFast() {
V.SecExp.smilingMan.relationship += 2;
return `You command your loyal operatives to prepare for a manhunt.`;
}
-
function peace() {
return `You take no further action. Hopefully this ordeal is finally over.`;
}
diff --git a/src/Mods/SecExp/events/secExpSmilingMan3.js b/src/Mods/SecExp/events/secExpSmilingMan3.js
index c11f7de1eb9c274bc3ced369e4b5482fcdb42b24..17a8269c5471685c25a6e8107f2967cda1911a86 100644
--- a/src/Mods/SecExp/events/secExpSmilingMan3.js
+++ b/src/Mods/SecExp/events/secExpSmilingMan3.js
@@ -1,30 +1,23 @@
App.Events.secExpSmilingMan3 = class secExpSmilingMan3 extends App.Events.BaseEvent {
eventPrerequisites() {
return [
- () => V.rival.state <= 1 || V.rival.state > 2,
() => V.secExpEnabled > 0,
- () => V.SecExp.smilingMan.progress === 3,
];
}
execute(node) {
+ V.fcnn.push("...sometimes high-tech problems have low-tech solutions. Back to you in the...");
+ V.nextButton = " ";
let r = [];
+ const smileSlave = GenerateNewSlave(V.seeDicks !== 100 ? "XX" : "XY", {
+ minAge: 16, maxAge: 18, ageOverridesPedoMode: 1, disableDisability: 1, race: "asian", nationality: "Japanese"
+ });
- let smileSlave;
+ smileSlave.faceShape = V.seeDicks !== 100 ? "cute" : "androgynous";
+ smileSlave.boobs = V.seeDicks !== 100 ? 450 : 250;
if (V.seeDicks !== 100) {
- smileSlave = GenerateNewSlave("XX", {
- minAge: 16, maxAge: 18, ageOverridesPedoMode: 1, disableDisability: 1, race: "asian", nationality: "Japanese"
- });
- smileSlave.faceShape = "cute";
- smileSlave.boobs = 450;
smileSlave.vagina = 0;
smileSlave.ovaries = 1;
- } else {
- smileSlave = GenerateNewSlave("XY", {
- minAge: 16, maxAge: 18, ageOverridesPedoMode: 1, disableDisability: 1, race: "asian", nationality: "Japanese"
- });
- smileSlave.boobs = 250;
- smileSlave.faceShape = "androgynous";
}
smileSlave.boobShape = "perky";
smileSlave.nipples = "cute";
@@ -69,8 +62,6 @@ App.Events.secExpSmilingMan3 = class secExpSmilingMan3 extends App.Events.BaseEv
His, He,
his, he, him, girl
} = getPronouns(smileSlave);
- V.nextButton = " ";
- V.fcnn.push("...sometimes high-tech problems have low-tech solutions. Back to you in the...");
r.push(`The day has come to finally put an end to this story. Your men are ready to go, waiting only on your signal. You quickly don your protective gear and proceed down the busy streets of your arcology.`);
r.push(`You carefully planned the day so that nothing could exit the arcology without being scanned at least three times and poked twice. The Smiling Man has no escape.`);
@@ -87,10 +78,8 @@ App.Events.secExpSmilingMan3 = class secExpSmilingMan3 extends App.Events.BaseEv
function inside() {
const frag = new DocumentFragment();
let r = [];
+ App.Events.drawEventArt(frag, smileSlave);
- if (V.seeImages === 1) {
- App.Events.drawEventArt(frag, smileSlave);
- }
r.push(`"So it was you to find me first.`);
if (V.SecExp.smilingMan.relationship > 2) {
r.push(`I was hoping you would be the one!`);
@@ -117,14 +106,11 @@ App.Events.secExpSmilingMan3 = class secExpSmilingMan3 extends App.Events.BaseEv
r.push(`You decide it would be criminally wasteful to throw away such talent. You offer ${him} a new life at your side. ${His} expertise will surely guarantee safety, if not supremacy, to your arcology in cyberspace, while ${he} will have safety and luxury in the physical world.`);
r.push(App.UI.DOM.link(
"Continue",
- () => {
- $(node).empty().append(result());
- }
+ () => { $(node).empty().append(result()); }
));
App.Events.addParagraph(frag, r);
return frag;
}
-
function punish() {
const frag = new DocumentFragment();
let r = [];
@@ -132,14 +118,11 @@ App.Events.secExpSmilingMan3 = class secExpSmilingMan3 extends App.Events.BaseEv
r.push(`You decide to end ${his} pitiful life. ${He} has crossed the wrong master of the new world ${he} worked so hard to create. No mercy was asked for and no mercy will be given.`);
r.push(App.UI.DOM.link(
"Continue",
- () => {
- $(node).empty().append(result());
- }
+ () => { $(node).empty().append(result()); }
));
App.Events.addParagraph(frag, r);
return frag;
}
-
function enslave() {
const frag = new DocumentFragment();
let r = [];
@@ -147,14 +130,11 @@ App.Events.secExpSmilingMan3 = class secExpSmilingMan3 extends App.Events.BaseEv
r.push(`You decide to enslave the ${girl}. ${His} skill may be great, but ${his} crimes are equally so, which will make it all the sweeter to turn ${him} into an obedient little toy to play with.`);
r.push(App.UI.DOM.link(
"Continue",
- () => {
- $(node).empty().append(result());
- }
+ () => { $(node).empty().append(result()); }
));
App.Events.addParagraph(frag, r);
return frag;
}
-
function result() {
const frag = new DocumentFragment();
let r = [];
@@ -162,9 +142,8 @@ App.Events.secExpSmilingMan3 = class secExpSmilingMan3 extends App.Events.BaseEv
App.Utils.scheduleSidebarRefresh();
window.scrollTo(0, window.pageYOffset);
if (V.SecExp.smilingMan.progress < 30) {
- if (V.seeImages === 1) {
- App.Events.drawEventArt(frag, smileSlave);
- }
+ App.Events.drawEventArt(frag, smileSlave);
+
if (V.SecExp.smilingMan.progress === 10) {
r.push(`The ${girl} asks for a few minutes to think about your offer,`);
if (V.SecExp.smilingMan.relationship >= 4) {
diff --git a/src/Mods/SecExp/js/Unit.js b/src/Mods/SecExp/js/Unit.js
index 76b01e3197cfe0f0e1e0467353bf3b8db72d53ad..c01268796433498e23b4812ddf93bdc676bcb5de 100644
--- a/src/Mods/SecExp/js/Unit.js
+++ b/src/Mods/SecExp/js/Unit.js
@@ -220,7 +220,7 @@ App.Mods.SecExp.unit = (function() {
if (V.peacekeepers.state === 3 && type !== "bots") {
const unitAdjust = Math.ceil((unit.troops / 10) + (unit.maxTroops / 10) + (unit.training / 10) + unit.equip + unit.commissars + unit.cyber + unit.medics + unit.SF);
const cost = forceNeg(25000 * (1.5 + unitAdjust));
- linkArray.push(App.UI.DOM.link(`Send this unit to improve your relationship with General ${V.peacekeepers.generalName}. Costs ${cashFormat(cost)}.`, () => {
+ linkArray.push(App.UI.DOM.link(`Send this unit to improve your relationship with General ${V.peacekeepers.generalName}. Costs ${cashFormat(cost)}.`, () => {
V.peacekeepers.attitude += Math.ceil(unitAdjust / 5);
cashX(cost, "securityExpansion");
unitFree(type).add(unit.troops);
@@ -685,7 +685,7 @@ App.Mods.SecExp.unit = (function() {
el.append(`Medical squad attached. `);
}
if (V.SF.Toggle && V.SF.Active >= 1 && jsDef(input.SF) && input.SF > 0) {
- el.append(`${capFirstChar(V.SF.Lower || "the special force")} "advisors" attached. `);
+ el.append(`${capFirstChar(V.SF.Lower || "the Special Force")} "advisors" attached. `);
}
}
}
diff --git a/src/Mods/SecExp/js/authorityReport.js b/src/Mods/SecExp/js/authorityReport.js
index 33db7ebaa4c97c75a1de3a947f605c8df48c09f4..4701aceef75180b01c0e29477ba98ecca896b5b2 100644
--- a/src/Mods/SecExp/js/authorityReport.js
+++ b/src/Mods/SecExp/js/authorityReport.js
@@ -39,10 +39,10 @@ App.Mods.SecExp.authorityReport = function() {
r.push(`Your legend is so well known that your mere presence commands respect and obedience, increasing your authority.`);
authGrowth += (10 * random(10, 20));
} else if (V.rep >= 15000) {
- r.push(`Your authority is so high that your mere presence commands respect, increasing your authority.`);
+ r.push(`Your reputation is so high that your mere presence commands respect, increasing your authority.`);
authGrowth += (10 * random(5, 15));
} else if (V.rep >= 10000) {
- r.push(`Your authority is high enough that your presence commands some respect, increasing your authority.`);
+ r.push(`Your reputation is high enough that your presence commands some respect, increasing your authority.`);
authGrowth += (10 * random(2, 8));
}
diff --git a/src/Mods/SecExp/js/edicts.js b/src/Mods/SecExp/js/edicts.js
index 6562cb93aec7fcc561c49e34dfd6c857b8bc88e8..010c3963d9198bf72dc5987ad64c27b27a002b98 100644
--- a/src/Mods/SecExp/js/edicts.js
+++ b/src/Mods/SecExp/js/edicts.js
@@ -534,7 +534,7 @@ App.Mods.SecExp.edicts = function() {
}
return toSentence(x);
};
- const capSF = capFirstChar(V.SF.Lower || "the special force");
+ const capSF = capFirstChar(V.SF.Lower || "the Special Force");
const data = new Map([
[`Wages for soldiers are ${soliderWages()}`, {
implement: [
@@ -663,7 +663,7 @@ App.Mods.SecExp.edicts = function() {
note: `Will quickly replenish militia manpower and will cap at ${num(App.Mods.SecExp.militiaCap(4)*100)}% of the total citizens population, but has a very high authority cost.`
},
{
- text: `ensure that very adult citizen is required to train and participate in the defense of the arcology.`,
+ text: `ensure that every adult citizen is required to train and participate in the defense of the arcology.`,
conditional: V.SecExp.edicts.defense.militia === 4,
set: function() {
V.SecExp.edicts.defense.militia = 5;
@@ -946,7 +946,7 @@ App.Mods.SecExp.edicts = function() {
const r = [];
for (const [name, detail] of data) {
if (V.SF.Toggle && V.SF.Active >= 1 && name === "SF Assistance" && !r.includes(name)) {
- App.UI.DOM.appendNewElement("h1", c, "Special Force:", "underline");
+ App.UI.DOM.appendNewElement("h1", c, "Special Force:", ["underline"]);
r.push(name);
}
App.UI.DOM.appendNewElement("p", c, genMenu(name, detail));
@@ -957,7 +957,7 @@ App.Mods.SecExp.edicts = function() {
const count = (x) => V.SecExp[x].victories + V.SecExp[x].losses;
const node = new DocumentFragment();
App.UI.DOM.appendNewElement("h1", node, `Edicts`);
- App.UI.DOM.appendNewElement("div", node, `Passing any edict will cost ${cashFormat(5000)} and some authority. More will become available as the arcology develops.`, "note");
+ App.UI.DOM.appendNewElement("div", node, `Passing any edict will cost ${cashFormat(5000)} and some authority. More will become available as the arcology develops.`, ["note"]);
const tabBar = new App.UI.Tabs.TabBar("SecExpEdicts");
tabBar.addTab("Society", "Society", Society());
if (count("battles") > 0 || count("rebellions") > 0 || V.mercenaries > 0) {
diff --git a/src/Mods/SecExp/js/reportingRelatedFunctions.js b/src/Mods/SecExp/js/reportingRelatedFunctions.js
index 60eb56328f6c808f77a9ac3b4490e65719da3eda..bcec882e8355470ead2fa72d06757e1bd9248e9d 100644
--- a/src/Mods/SecExp/js/reportingRelatedFunctions.js
+++ b/src/Mods/SecExp/js/reportingRelatedFunctions.js
@@ -9,10 +9,10 @@ App.Mods.SecExp.assistanceSF = function(report, section = '') {
let r = ``; let bonus = 0;
if (size > 10) {
if (report === 'authority' || report === 'trade') {
- r += `Having a powerful special force increases ${report === 'authority' ? 'your authority' : 'trade security'}.`;
+ r += `Having a powerful Special Force increases ${report === 'authority' ? 'your authority' : 'trade security'}.`;
bonus += size / 10;
} else if (report === 'security') {
- r += `Having a powerful special force attracts a lot of ${section === 'militia' ? 'citizens' : 'mercenaries'}, hopeful that they may be able to fight along side it.`;
+ r += `Having a powerful Special Force attracts a lot of ${section === 'militia' ? 'citizens' : 'mercenaries'}, hopeful that they may be able to fight along side it.`;
if (section === 'militia') {
bonus *= 1 + (random(1, (Math.round(size / 10))) / 20); // not sure how high size goes, so I hope this makes sense
} else if (section === 'mercs') {
@@ -512,7 +512,7 @@ App.Mods.SecExp.commanderEffectiveness = function(passage) {
tacChance -= 0.35;
}
// does she get wounded?
- if (slave.skill.combat === 1) {
+ if (slave.skill.combat > 30) {
woundChance -= 3;
}
woundChance -= 0.25 * (getLimbCount(slave, 105));
@@ -558,9 +558,9 @@ App.Mods.SecExp.commanderEffectiveness = function(passage) {
enemyMod += 0.2;
}
// 60% chance of getting combat skill if not already have it
- if (slave.skill.combat === 0 && random(1, 100) <= 60) {
+ if (slave.skill.combat < 70 && random(1, 100) <= 60) {
V.SecExp.war.gainedCombat = 1;
- slave.skill.combat = 1;
+ slave.skill.combat += 5 + Math.floor((slave.intelligence + slave.intelligenceImplant) / 64);
}
} else {
const {
diff --git a/src/Mods/SecExp/js/secExp.js b/src/Mods/SecExp/js/secExp.js
index 293c029b6f93f4a5fa27b27e77037aa8e821d999..1db9a45cca83a184ad7b8e6b17ce0a9d3818328f 100644
--- a/src/Mods/SecExp/js/secExp.js
+++ b/src/Mods/SecExp/js/secExp.js
@@ -20,7 +20,7 @@ App.Mods.SecExp.generator = (function() {
function attack() {
let attackChance = 0; // attackChance value is the chance out of 100 of an attack happening this week
// attacks are deactivated if security drones are not around yet, there is not a rebellion this week or the last attack/rebellion happened within 3 weeks
- if (V.arcologyUpgrade.drones === 1 && V.SecExp.war.type === "" && V.SecExp.battles.lastEncounterWeeks > 3 && V.SecExp.rebellions.lastEncounterWeeks > 3) {
+ if (V.arcologyUpgrade.drones === 1 && !V.SecExp.war.type && V.SecExp.battles.lastEncounterWeeks > 3 && V.SecExp.rebellions.lastEncounterWeeks > 3) {
if (V.week < 30) {
attackChance = 5;
} else if (V.week < 60) {
@@ -205,11 +205,11 @@ App.Mods.SecExp.generator = (function() {
}
}
- if (V.SecExp.settings.rebellion.force === 1 && V.SecExp.war.foughtThisWeek === 0) {
+ if (V.SecExp.settings.rebellion.force === 1) {
V.SecExp.war.type = `${random(1, 100) <= 50 ? 'Slave' : 'Citizen'} Rebellion`;
}
- if (V.SecExp.war.type === "") {
+ if (!V.SecExp.war.type) {
V.SecExp.rebellions.lastEncounterWeeks++;
} else {
const isSlaveRebellion = V.SecExp.war.type.includes("Slave");
@@ -262,135 +262,6 @@ App.Mods.SecExp.militiaCap = function(x = 0) {
}
};
-App.Mods.SecExp.initTrade = function() {
- if (V.SecExp.core.trade === 0 || !jsDef(V.SecExp.core.trade)) {
- let init = jsRandom(20, 30);
- if (V.terrain === "urban") {
- init += jsRandom(10, 10);
- } else if (V.terrain === "ravine") {
- init -= jsRandom(5, 5);
- }
- if (isPCCareerInCategory("wealth") || isPCCareerInCategory("capitalist") || isPCCareerInCategory("celebrity") || isPCCareerInCategory("BlackHat")) {
- init += jsRandom(5, 5);
- } else if (isPCCareerInCategory("escort") || isPCCareerInCategory("gang") || isPCCareerInCategory("servant")) {
- init -= jsRandom(5, 5);
- }
- V.SecExp.core.trade = init;
- }
-};
-
-App.Mods.SecExp.generalInit = function() {
- if (V.secExpEnabled === 0) {
- return;
- }
-
- Object.assign(V.SecExp, {
- battles: {
- major: 0,
- slaveVictories: [],
- lastSelection: [],
- victories: 0,
- victoryStreak: 0,
- losses: 0,
- lossStreak: 0,
- lastEncounterWeeks: 0,
- saved: {}
- },
- rebellions: {
- tension: 0,
- slaveProgress: 0,
- citizenProgress: 0,
- victories: 0,
- losses: 0,
- lastEncounterWeeks: 0,
- repairTime: {},
- },
- core: {
- trade: 0,
- authority: 0,
- security: 100,
- crimeLow: 30,
- totalKills: 0,
- },
- settings: {
- difficulty: 1,
- unitDescriptions: 0,
- showStats: 0,
- battle: {
- enabled: 1,
- allowSlavePrestige: 1,
- force: 0,
- frequency: 1,
- major: {
- enabled: 0,
- gameOver: 1,
- mult: 1,
- force: 0
- }
- },
- rebellion: {
- enabled: 1,
- force: 0,
- gameOver: 1,
- speed: 1
- }
- },
- buildings: {},
- proclamation: {
- cooldown: 0,
- currency: "",
- type: "crime"
- },
- units: {},
- edicts: {
- alternativeRents: 0,
- enslavementRights: 0,
- sellData: 0,
- propCampaignBoost: 0,
- tradeLegalAid: 0,
- taxTrade: 0,
- slaveWatch: 0,
- subsidyChurch: 0,
- SFSupportLevel: 0,
- limitImmigration: 0,
- openBorders: 0,
- weaponsLaw: 3,
- defense: {
- soldierWages: 1,
- slavesOfficers: 0,
- discountMercenaries: 0,
- militia: 0,
- militaryExemption: 0,
- noSubhumansInArmy: 0,
- pregExemption: 0,
- liveTargets: 0,
- privilege: {
- militiaSoldier: 0,
- slaveSoldier: 0,
- mercSoldier: 0,
- },
- // Soldiers
- martialSchool: 0,
- eliteOfficers: 0,
- lowerRequirements: 0,
- // FS soldiers
- legionTradition: 0,
- eagleWarriors: 0,
- ronin: 0,
- sunTzu: 0,
- mamluks: 0,
- pharaonTradition: 0,
- }
- },
- smilingMan: {progress: 0}
- });
-
- for (const [unit] of App.Mods.SecExp.unit.list()) {
- App.Mods.SecExp.unit.gen(unit);
- }
- App.Mods.SecExp.initTrade();
-};
-
App.Mods.SecExp.battle = (function() {
"use strict";
const unitFunctions = App.Mods.SecExp.unit;
diff --git a/src/Mods/SecExp/js/secExpBC.js b/src/Mods/SecExp/js/secExpBC.js
deleted file mode 100644
index d645ae5fb31b41fc5096aae17709f9ca2bcf4cf8..0000000000000000000000000000000000000000
--- a/src/Mods/SecExp/js/secExpBC.js
+++ /dev/null
@@ -1,325 +0,0 @@
-// @ts-nocheck
-App.Mods.SecExp.generalBC = function() {
- if (jsDef(V.secExp)) {
- if (V.secExpEnabled !== 1) {
- V.secExpEnabled = V.secExp;
- }
- }
- if (typeof V.secExpEnabled !== "number") {
- V.secExpEnabled = 0;
- }
-
- delete V.SecExp.army;
-
- if (V.secExpEnabled === 0) {
- return;
- }
- V.SecExp.settings = V.SecExp.settings || {};
- V.SecExp.edicts = V.SecExp.edicts || {};
- V.SecExp.edicts.defense = V.SecExp.edicts.defense || {};
- V.SecExp.units = V.SecExp.units || {};
- V.SecExp.units.bots = V.SecExp.units.bots || {};
- V.SecExp.smilingMan = V.SecExp.smilingMan || {};
- V.SecExp.core = V.SecExp.core || {};
- V.SecExp.battles = V.SecExp.battles || {};
- V.SecExp.rebellions = V.SecExp.rebellions || {};
- V.SecExp.settings.battle = V.SecExp.settings.battle || {};
- V.SecExp.settings.battle.major = V.SecExp.settings.battle.major || {};
- V.SecExp.settings.rebellion = V.SecExp.settings.rebellion || {};
- V.SecExp.buildings = V.SecExp.buildings || {};
- V.SecExp.proclamation = V.SecExp.proclamation || {};
-
- V.SecExp.edicts.alternativeRents = V.SecExp.edicts.alternativeRents || V.alternativeRents || 0;
- V.SecExp.edicts.enslavementRights = V.SecExp.edicts.enslavementRights || V.enslavementRights || 0;
- V.SecExp.edicts.sellData = V.SecExp.edicts.sellData || V.sellData || 0;
- V.SecExp.edicts.propCampaignBoost = V.SecExp.edicts.propCampaignBoost || V.propCampaignBoost || 0;
- V.SecExp.edicts.tradeLegalAid = V.SecExp.edicts.tradeLegalAid || V.tradeLegalAid || 0;
- V.SecExp.edicts.taxTrade = V.SecExp.edicts.taxTrade || V.taxTrade || 0;
- V.SecExp.edicts.slaveWatch = V.SecExp.edicts.slaveWatch || V.slaveWatch || 0;
- V.SecExp.edicts.subsidyChurch = V.SecExp.edicts.subsidyChurch || V.subsidyChurch || 0;
- V.SecExp.edicts.SFSupportLevel = V.SecExp.edicts.SFSupportLevel || V.SFSupportLevel || 0;
- V.SecExp.edicts.limitImmigration = V.SecExp.edicts.limitImmigration || V.limitImmigration || 0;
- V.SecExp.edicts.openBorders = V.SecExp.edicts.openBorders || V.openBorders || 0;
- if (typeof V.SecExp.edicts.weaponsLaw !== "number") {
- V.SecExp.edicts.weaponsLaw = V.weaponsLaw || 3;
- }
-
- V.SecExp.edicts.defense.soldierWages = V.SecExp.edicts.defense.soldierWages || V.soldierWages || 1;
- V.SecExp.edicts.defense.slavesOfficers = V.SecExp.edicts.defense.slavesOfficers || V.slavesOfficers || 0;
- V.SecExp.edicts.defense.discountMercenaries = V.SecExp.edicts.defense.discountMercenaries || V.discountMercenaries || 0;
-
- V.SecExp.edicts.defense.militia = V.SecExp.edicts.defense.militia || 0;
- if (V.militiaFounded) {
- V.SecExp.edicts.defense.militia = 1;
- }
- if (V.recruitVolunteers) {
- V.SecExp.edicts.defense.militia = 2;
- }
- if (V.conscription) {
- V.SecExp.edicts.defense.militia = 3;
- }
- if (V.militaryService) {
- V.SecExp.edicts.defense.militia = 4;
- }
- if (V.militarizedSociety) {
- V.SecExp.edicts.defense.militia = 5;
- }
-
- V.SecExp.edicts.defense.militaryExemption = V.SecExp.edicts.defense.militaryExemption || V.militaryExemption || 0;
- V.SecExp.edicts.defense.noSubhumansInArmy = V.SecExp.edicts.defense.noSubhumansInArmy || V.noSubhumansInArmy || 0;
- V.SecExp.edicts.defense.pregExemption = V.SecExp.edicts.defense.pregExemption || V.pregExemption || 0;
- V.SecExp.edicts.defense.liveTargets = V.SecExp.edicts.defense.liveTargets || V.liveTargets || 0;
- V.SecExp.edicts.defense.pregExemption = V.SecExp.edicts.defense.pregExemption || V.pregExemption || 0;
-
- // Units
- V.SecExp.edicts.defense.martialSchool = V.SecExp.edicts.defense.martialSchool || V.martialSchool || 0;
- V.SecExp.edicts.defense.eliteOfficers = V.SecExp.edicts.defense.eliteOfficers || V.eliteOfficers || 0;
- V.SecExp.edicts.defense.lowerRequirements = V.SecExp.edicts.defense.lowerRequirements || V.lowerRequirements|| V.lowerRquirements || 0;
- V.SecExp.edicts.defense.legionTradition = V.SecExp.edicts.defense.legionTradition || V.legionTradition || 0;
- V.SecExp.edicts.defense.eagleWarriors = V.SecExp.edicts.defense.eagleWarriors || V.eagleWarriors || 0;
- V.SecExp.edicts.defense.ronin = V.SecExp.edicts.defense.ronin || V.ronin || 0;
- V.SecExp.edicts.defense.sunTzu = V.SecExp.edicts.defense.sunTzu || V.sunTzu || 0;
- V.SecExp.edicts.defense.mamluks = V.SecExp.edicts.defense.mamluks || V.mamluks || 0;
- V.SecExp.edicts.defense.pharaonTradition = V.SecExp.edicts.defense.pharaonTradition || V.pharaonTradition || 0;
-
- // Priv
- V.SecExp.edicts.defense.privilege = V.SecExp.edicts.defense.privilege || {};
- V.SecExp.edicts.defense.privilege.militiaSoldier = V.SecExp.edicts.defense.privilege.militiaSoldier || V.militiaSoldier || 0;
- V.SecExp.edicts.defense.privilege.slaveSoldier = V.SecExp.edicts.defense.privilege.slaveSoldier || V.slaveSoldier || 0;
- V.SecExp.edicts.defense.privilege.mercSoldier = V.SecExp.edicts.defense.privilege.mercSoldier || V.mercSoldier || 0;
-
- for (const [unit, data] of App.Mods.SecExp.unit.list()) {
- App.Mods.SecExp.unit.gen(unit);
- V.SecExp.units[unit].squads.forEach(u => {
- if (unit === 'bots') {
- u.active = Math.max(0, u.active) || V.arcologyUpgrade.drones > 0 ? 1 : 0;
- u.troops = Math.max(u.troops || 0, V.arcologyUpgrade.drones > 0 ? 30 : 0);
- u.maxTroops = Math.max(u.maxTroops || 0, V.arcologyUpgrade.drones > 0 ? 30 : 0);
- if (V.secBots) {
- V.SecExp.units.bots.squads[0] = Object.assign(V.secBots, {platoonName: "1st " + data.defaultName});
- }
- if (V.SecExp.units[unit].squads.length === 1 && !u.platoonName) {
- u.platoonName = "1st " + data.defaultName;
- }
- } else {
- u.SF = u.SF || 0;
- if (!jsDef(u.ID)) {
- u.ID = genID();
- }
- u.cyber = u.cyber || 0;
- u.commissars = u.commissars || 0;
- u.troops = Math.clamp(u.troops, 0, u.maxTroops || 30);
- u.training = Math.clamp(u.training, 0, 100);
- if (V.SF.Active < 1) {
- u.SF = 0;
- }
- }
-
- if (unit !== 'bots' && u.platoonName.contains('undefined')) {
- u.platoonName = u.platoonName.replace('undefined', data.defaultName);
- }
-
- App.Mods.SecExp.unit.genID(u, unit);
- u.equip = u.equip || 0;
- delete u.isDeployed;
- });
- }
-
- if (V.SecExp.units.mercs.free === 0) {
- if (V.mercenaries === 1) {
- V.SecExp.units.mercs.free = 15;
- } else if (V.mercenaries > 1) {
- V.SecExp.units.mercs.free = 30;
- }
- }
-
- if (V.SecExp.defaultNames) {
- V.SecExp.units.slaves.defaultName = V.SecExp.defaultNames.slaves;
- V.SecExp.units.militia.defaultName = V.SecExp.defaultNames.milita || V.SecExp.defaultNames.militia;
- V.SecExp.units.mercs.defaultName = V.SecExp.defaultNames.mercs;
- delete V.SecExp.defaultNames;
- }
-
- V.SecExp.smilingMan.progress = V.SecExp.smilingMan.progress || V.smilingManProgress || 0;
- if (jsDef(V.smilingManFate)) {
- if (V.smilingManFate === 0) { // Offer $him a new life
- V.SecExp.smilingMan.progress = 10;
- } else if (V.smilingManFate === 1) { // Make $him pay
- V.SecExp.smilingMan.progress = 20;
- } else if (V.smilingManFate === 2) { // Enslave $him
- V.SecExp.smilingMan.progress = 30;
- }
- }
-
- if (V.SecExp.smilingMan.progress === 4) {
- V.SecExp.smilingMan.progress = 10;
- } else if (V.SecExp.smilingMan.progress < 4) {
- if (V.SecExp.smilingMan.progress === 0 && V.investedFunds) {
- V.SecExp.smilingMan.investedFunds = V.investedFunds;
- }
- if (V.relationshipLM) {
- V.SecExp.smilingMan.relationship = V.relationshipLM;
- }
- if (V.globalCrisisWeeks) {
- V.SecExp.smilingMan.globalCrisisWeeks = V.globalCrisisWeeks;
- }
- }
-
- delete V.SecExp.core.crimeCap;
- V.SecExp.core.trade = V.SecExp.core.trade || V.trade || 0;
- App.Mods.SecExp.initTrade();
-
- V.SecExp.core.authority = V.SecExp.core.authority || V.authority || 0;
- V.SecExp.core.security = V.SecExp.core.security || V.security || 100;
- if (jsDef(V.SecExp.security)) {
- V.SecExp.core.security = V.SecExp.security.cap;
- delete V.SecExp.security;
- }
- V.SecExp.core.totalKills = +V.SecExp.core.totalKills || V.totalKills || 0;
-
- if (V.week === 1 || !jsDef(V.SecExp.core.crimeLow)) {
- V.SecExp.core.crimeLow = 30;
- }
- V.SecExp.core.crimeLow = Math.clamp(V.SecExp.core.crimeLow, 0, 100) || V.crime || 0;
-
- V.SecExp.battles.slaveVictories = V.SecExp.battles.slaveVictories || V.slaveVictories || [];
- V.SecExp.battles.major = V.SecExp.battles.major || 0;
- if (jsDef(V.majorBattlesCount)) {
- if (V.majorBattlesCount === 0 && V.hasFoughtMajorBattleOnce === 1) {
- V.SecExp.battles.major = 1;
- } else {
- V.SecExp.battles.major = V.majorBattlesCount;
- }
- }
- V.SecExp.battles.victories = V.SecExp.battles.victories || V.PCvictories || 0;
- V.SecExp.battles.victoryStreak = V.SecExp.battles.victoryStreak || V.PCvictoryStreak || 0;
- V.SecExp.battles.losses = V.SecExp.battles.losses || V.PClosses || 0;
- V.SecExp.battles.lossStreak = V.SecExp.battles.lossStreak || V.PClossStreak || 0;
- V.SecExp.battles.lastEncounterWeeks = V.SecExp.battles.lastEncounterWeeks || V.lastAttackWeeks || 0;
- V.SecExp.battles.lastSelection = V.SecExp.battles.lastSelection || V.lastSelection || [];
- V.SecExp.battles.saved = V.SecExp.battles.saved || {};
- V.SecExp.battles.saved.commander = V.SecExp.battles.saved.commander || V.SavedLeader || "";
- V.SecExp.battles.saved.sfSupport = V.SecExp.battles.saved.sfSupport || V.SavedSFI || 0;
-
- V.SecExp.rebellions.tension = V.SecExp.rebellions.tension || V.tension || 0;
- V.SecExp.rebellions.slaveProgress = V.SecExp.rebellions.slaveProgress || V.slaveProgress || 0;
- V.SecExp.rebellions.citizenProgress = V.SecExp.rebellions.citizenProgress || V.citizenProgress || 0;
- V.SecExp.rebellions.victories = V.SecExp.rebellions.victories || V.PCrebWon || 0;
- V.SecExp.rebellions.losses = V.SecExp.rebellions.losses || V.PCrebLoss || 0;
- V.SecExp.rebellions.lastEncounterWeeks = V.SecExp.rebellions.lastEncounterWeeks || V.lastRebellionWeeks || 0;
- if (V.SFGear) {
- V.SecExp.rebellions.sfArmor = V.SFGear;
- }
-
- V.SecExp.settings.difficulty = V.SecExp.settings.difficulty || 1;
- if (jsDef(V.difficulty)) {
- V.SecExp.settings.difficulty = V.difficulty;
- }
-
- if (!jsDef(V.SecExp.settings.battle.enabled)) {
- V.SecExp.settings.battle.enabled = 1;
- }
- if (jsDef(V.battlesEnabled)) {
- V.SecExp.settings.battle.enabled = V.battlesEnabled;
- }
- delete V.SecExp.battle;
-
- V.SecExp.settings.battle.frequency = V.SecExp.settings.battle.frequency || 1;
- if (jsDef(V.battleFrequency)) {
- V.SecExp.settings.battle.frequency = V.battleFrequency;
- }
- V.SecExp.settings.battle.force = V.SecExp.settings.battle.force || 0;
- if (jsDef(V.forceBattle)) {
- V.SecExp.settings.battle.force = V.forceBattle;
- }
-
- if (V.readiness && V.readiness === 10 || V.sectionInFirebase) {
- V.SecExp.sectionInFirebase = 1;
- }
-
- V.SecExp.settings.unitDescriptions = V.SecExp.settings.unitDescriptions || 0;
-
- if (!jsDef(V.SecExp.settings.battle.allowSlavePrestige)) {
- V.SecExp.settings.battle.allowSlavePrestige = 1;
- }
- if (jsDef(V.allowPrestigeFromBattles)) {
- V.SecExp.settings.battle.allowSlavePrestige = V.allowPrestigeFromBattles;
- }
-
- V.SecExp.settings.battle.major.enabled = V.SecExp.settings.battle.major.enabled || 0;
- if (jsDef(V.majorBattlesEnabled)) {
- V.SecExp.settings.battle.major.enabled = V.majorBattlesEnabled;
- }
-
- if (!jsDef(V.SecExp.settings.battle.major.gameOver)) {
- V.SecExp.settings.battle.major.gameOver = 1;
- }
- if (jsDef(V.majorBattleGameOver)) {
- V.SecExp.settings.battle.major.gameOver = V.majorBattleGameOver;
- }
- V.SecExp.settings.battle.major.force = V.SecExp.settings.battle.major.force || 0;
- if (jsDef(V.forceMajorBattle)) {
- V.SecExp.settings.battle.major.force = V.forceMajorBattle;
- }
- V.SecExp.settings.battle.major.mult = V.SecExp.settings.battle.major.mult || 1;
-
- if (!jsDef(V.SecExp.settings.rebellion.enabled)) {
- V.SecExp.settings.rebellion.enabled = 1;
- }
- if (jsDef(V.rebellionsEnabled)) {
- V.SecExp.settings.rebellion.enabled = V.rebellionsEnabled;
- }
-
- V.SecExp.settings.rebellion.force = V.SecExp.settings.rebellion.force || 0;
- if (jsDef(V.forceRebellion)) {
- V.SecExp.settings.rebellion.force = V.forceRebellion;
- }
- if (!jsDef(V.SecExp.settings.rebellion.gameOver)) {
- V.SecExp.settings.rebellion.gameOver = 1;
- }
- if (jsDef(V.rebellionGameOver)) {
- V.SecExp.settings.rebellion.gameOver = V.rebellionGameOver;
- }
-
- V.SecExp.settings.rebellion.speed = V.SecExp.settings.rebellion.speed || 1;
- if (jsDef(V.rebellionSpeed)) {
- V.SecExp.settings.rebellion.speed = V.rebellionSpeed;
- }
-
- V.SecExp.settings.showStats = V.SecExp.settings.showStats || 0;
- if (jsDef(V.showBattleStatistics)) {
- V.SecExp.settings.showStats = V.showBattleStatistics;
- }
-
- App.Mods.SecExp.BC.propHub();
- App.Mods.SecExp.BC.barracks();
- App.Mods.SecExp.BC.secHub();
- App.Mods.SecExp.BC.transportHub();
- App.Mods.SecExp.BC.riotCenter();
- App.Mods.SecExp.BC.weaponsManufacturing();
-
- V.SecExp.proclamation.cooldown = V.SecExp.proclamation.cooldown || V.proclamationsCooldown || 0;
- V.SecExp.proclamation.currency = V.SecExp.proclamation.currency || V.proclamationCurrency || "";
- V.SecExp.proclamation.type = V.SecExp.proclamation.type || "crime";
- if (jsDef(V.proclamationType) && V.proclamationType !== "none") {
- V.SecExp.proclamation.type = V.proclamationType;
- }
-
- V.SecExp.rebellions.repairTime = V.SecExp.rebellions.repairTime || {};
- if (jsDef(V.garrison)) {
- if (V.garrison.waterwayTime > 0) {
- V.SecExp.rebellions.repairTime.waterway = V.garrison.waterwayTime;
- }
- if (V.garrison.assistantTime > 0) {
- V.SecExp.rebellions.repairTime.assistant = V.garrison.assistantTime;
- }
- if (V.garrison.reactorTime > 0) {
- V.SecExp.rebellions.repairTime.reactor = V.garrison.reactorTime;
- }
- }
- if (V.arcRepairTime && V.arcRepairTime > 0) {
- V.SecExp.rebellions.repairTime.arc = V.arcRepairTime;
- }
-
- delete V.SecExp.settings.show;
-};
diff --git a/src/Mods/SecExp/js/secExpObject.js b/src/Mods/SecExp/js/secExpObject.js
new file mode 100644
index 0000000000000000000000000000000000000000..451730fa1bec95ef232f747de2564354d4471a79
--- /dev/null
+++ b/src/Mods/SecExp/js/secExpObject.js
@@ -0,0 +1,428 @@
+App.Mods.SecExp.Obj = (function() {
+ return {
+ BC,
+ Init,
+ };
+
+ function BC() {
+ if (jsDef(V.secExp) && V.secExpEnabled !== 1) {
+ V.secExpEnabled = V.secExp;
+ }
+ if (typeof V.secExpEnabled !== "number") {
+ V.secExpEnabled = 0;
+ }
+ delete V.SecExp.army;
+ if (V.secExpEnabled === 0) {
+ return;
+ }
+
+ V.SecExp.war = V.SecExp.war || {};
+ V.SecExp.settings = V.SecExp.settings || {};
+ V.SecExp.edicts = V.SecExp.edicts || {};
+ V.SecExp.edicts.defense = V.SecExp.edicts.defense || {};
+ V.SecExp.units = V.SecExp.units || {};
+ V.SecExp.units.bots = V.SecExp.units.bots || {};
+ V.SecExp.smilingMan = V.SecExp.smilingMan || {};
+ V.SecExp.core = V.SecExp.core || {};
+ V.SecExp.battles = V.SecExp.battles || {};
+ V.SecExp.rebellions = V.SecExp.rebellions || {};
+ V.SecExp.settings.battle = V.SecExp.settings.battle || {};
+ V.SecExp.settings.battle.major = V.SecExp.settings.battle.major || {};
+ V.SecExp.settings.rebellion = V.SecExp.settings.rebellion || {};
+ V.SecExp.buildings = V.SecExp.buildings || {};
+ V.SecExp.proclamation = V.SecExp.proclamation || {};
+
+ V.SecExp.edicts.alternativeRents = V.SecExp.edicts.alternativeRents || V.alternativeRents || 0;
+ V.SecExp.edicts.enslavementRights = V.SecExp.edicts.enslavementRights || V.enslavementRights || 0;
+ V.SecExp.edicts.sellData = V.SecExp.edicts.sellData || V.sellData || 0;
+ V.SecExp.edicts.propCampaignBoost = V.SecExp.edicts.propCampaignBoost || V.propCampaignBoost || 0;
+ V.SecExp.edicts.tradeLegalAid = V.SecExp.edicts.tradeLegalAid || V.tradeLegalAid || 0;
+ V.SecExp.edicts.taxTrade = V.SecExp.edicts.taxTrade || V.taxTrade || 0;
+ V.SecExp.edicts.slaveWatch = V.SecExp.edicts.slaveWatch || V.slaveWatch || 0;
+ V.SecExp.edicts.subsidyChurch = V.SecExp.edicts.subsidyChurch || V.subsidyChurch || 0;
+ V.SecExp.edicts.SFSupportLevel = V.SecExp.edicts.SFSupportLevel || V.SFSupportLevel || 0;
+ V.SecExp.edicts.limitImmigration = V.SecExp.edicts.limitImmigration || V.limitImmigration || 0;
+ V.SecExp.edicts.openBorders = V.SecExp.edicts.openBorders || V.openBorders || 0;
+ if (typeof V.SecExp.edicts.weaponsLaw !== "number") {
+ V.SecExp.edicts.weaponsLaw = V.weaponsLaw || 3;
+ }
+
+ V.SecExp.edicts.defense.soldierWages = V.SecExp.edicts.defense.soldierWages || V.soldierWages || 1;
+ V.SecExp.edicts.defense.slavesOfficers = V.SecExp.edicts.defense.slavesOfficers || V.slavesOfficers || 0;
+ V.SecExp.edicts.defense.discountMercenaries = V.SecExp.edicts.defense.discountMercenaries || V.discountMercenaries || 0;
+
+ V.SecExp.edicts.defense.militia = V.SecExp.edicts.defense.militia || 0;
+ if (V.militiaFounded) {
+ V.SecExp.edicts.defense.militia = 1;
+ }
+ if (V.recruitVolunteers) {
+ V.SecExp.edicts.defense.militia = 2;
+ }
+ if (V.conscription) {
+ V.SecExp.edicts.defense.militia = 3;
+ }
+ if (V.militaryService) {
+ V.SecExp.edicts.defense.militia = 4;
+ }
+ if (V.militarizedSociety) {
+ V.SecExp.edicts.defense.militia = 5;
+ }
+
+ V.SecExp.edicts.defense.militaryExemption = V.SecExp.edicts.defense.militaryExemption || V.militaryExemption || 0;
+ V.SecExp.edicts.defense.noSubhumansInArmy = V.SecExp.edicts.defense.noSubhumansInArmy || V.noSubhumansInArmy || 0;
+ V.SecExp.edicts.defense.pregExemption = V.SecExp.edicts.defense.pregExemption || V.pregExemption || 0;
+ V.SecExp.edicts.defense.liveTargets = V.SecExp.edicts.defense.liveTargets || V.liveTargets || 0;
+ V.SecExp.edicts.defense.pregExemption = V.SecExp.edicts.defense.pregExemption || V.pregExemption || 0;
+
+ // Units
+ V.SecExp.edicts.defense.martialSchool = V.SecExp.edicts.defense.martialSchool || V.martialSchool || 0;
+ V.SecExp.edicts.defense.eliteOfficers = V.SecExp.edicts.defense.eliteOfficers || V.eliteOfficers || 0;
+ V.SecExp.edicts.defense.lowerRequirements = V.SecExp.edicts.defense.lowerRequirements || V.lowerRequirements|| V.lowerRquirements || 0;
+ V.SecExp.edicts.defense.legionTradition = V.SecExp.edicts.defense.legionTradition || V.legionTradition || 0;
+ V.SecExp.edicts.defense.eagleWarriors = V.SecExp.edicts.defense.eagleWarriors || V.eagleWarriors || 0;
+ V.SecExp.edicts.defense.ronin = V.SecExp.edicts.defense.ronin || V.ronin || 0;
+ V.SecExp.edicts.defense.sunTzu = V.SecExp.edicts.defense.sunTzu || V.sunTzu || 0;
+ V.SecExp.edicts.defense.mamluks = V.SecExp.edicts.defense.mamluks || V.mamluks || 0;
+ V.SecExp.edicts.defense.pharaonTradition = V.SecExp.edicts.defense.pharaonTradition || V.pharaonTradition || 0;
+
+ // Priv
+ V.SecExp.edicts.defense.privilege = V.SecExp.edicts.defense.privilege || {};
+ V.SecExp.edicts.defense.privilege.militiaSoldier = V.SecExp.edicts.defense.privilege.militiaSoldier || V.militiaSoldier || 0;
+ V.SecExp.edicts.defense.privilege.slaveSoldier = V.SecExp.edicts.defense.privilege.slaveSoldier || V.slaveSoldier || 0;
+ V.SecExp.edicts.defense.privilege.mercSoldier = V.SecExp.edicts.defense.privilege.mercSoldier || V.mercSoldier || 0;
+
+ for (const [unit, data] of App.Mods.SecExp.unit.list()) {
+ App.Mods.SecExp.unit.gen(unit);
+ V.SecExp.units[unit].squads.forEach(u => {
+ if (unit === 'bots') {
+ u.active = Math.max(0, u.active) || V.arcologyUpgrade.drones > 0 ? 1 : 0;
+ u.troops = Math.max(u.troops || 0, V.arcologyUpgrade.drones > 0 ? 30 : 0);
+ u.maxTroops = Math.max(u.maxTroops || 0, V.arcologyUpgrade.drones > 0 ? 30 : 0);
+ if (V.secBots) {
+ V.SecExp.units.bots.squads[0] = Object.assign(V.secBots, {platoonName: "1st " + data.defaultName});
+ }
+ if (V.SecExp.units[unit].squads.length === 1 && !u.platoonName) {
+ u.platoonName = "1st " + data.defaultName;
+ }
+ } else {
+ u.SF = u.SF || 0;
+ u.cyber = u.cyber || 0;
+ u.commissars = u.commissars || 0;
+ u.troops = Math.clamp(u.troops, 0, u.maxTroops || 30);
+ u.training = Math.clamp(u.training, 0, 100);
+ if (V.SF.Active < 1) {
+ u.SF = 0;
+ }
+ }
+
+ if (unit !== 'bots' && u.platoonName.contains('undefined')) {
+ u.platoonName = u.platoonName.replace('undefined', data.defaultName);
+ }
+
+ App.Mods.SecExp.unit.genID(u, unit);
+ u.equip = u.equip || 0;
+ delete u.isDeployed;
+ });
+ }
+
+ if (V.SecExp.units.mercs.free === 0) {
+ if (V.mercenaries === 1) {
+ V.SecExp.units.mercs.free = 15;
+ } else if (V.mercenaries > 1) {
+ V.SecExp.units.mercs.free = 30;
+ }
+ }
+
+ if (V.SecExp.defaultNames) {
+ V.SecExp.units.slaves.defaultName = V.SecExp.defaultNames.slaves;
+ V.SecExp.units.militia.defaultName = V.SecExp.defaultNames.milita || V.SecExp.defaultNames.militia;
+ V.SecExp.units.mercs.defaultName = V.SecExp.defaultNames.mercs;
+ delete V.SecExp.defaultNames;
+ }
+
+ V.SecExp.smilingMan.progress = V.SecExp.smilingMan.progress || V.smilingManProgress || 0;
+ if (jsDef(V.smilingManFate)) {
+ if (V.smilingManFate === 0) { // Offer $him a new life
+ V.SecExp.smilingMan.progress = 10;
+ } else if (V.smilingManFate === 1) { // Make $him pay
+ V.SecExp.smilingMan.progress = 20;
+ } else if (V.smilingManFate === 2) { // Enslave $him
+ V.SecExp.smilingMan.progress = 30;
+ }
+ }
+
+ if (V.SecExp.smilingMan.progress === 4) {
+ V.SecExp.smilingMan.progress = 10;
+ } else if (V.SecExp.smilingMan.progress < 4) {
+ if (V.SecExp.smilingMan.progress === 0 && V.investedFunds) {
+ V.SecExp.smilingMan.investedFunds = V.investedFunds;
+ }
+ if (V.relationshipLM) {
+ V.SecExp.smilingMan.relationship = V.relationshipLM;
+ }
+ if (V.globalCrisisWeeks) {
+ V.SecExp.smilingMan.globalCrisisWeeks = V.globalCrisisWeeks;
+ }
+ }
+
+ delete V.SecExp.core.crimeCap;
+ V.SecExp.core.trade = V.SecExp.core.trade || V.trade || 0;
+ initTrade();
+
+ V.SecExp.core.authority = V.SecExp.core.authority || V.authority || 0;
+ V.SecExp.core.security = V.SecExp.core.security || V.security || 100;
+ if (jsDef(V.SecExp.security)) {
+ V.SecExp.core.security = V.SecExp.security.cap;
+ delete V.SecExp.security;
+ }
+ V.SecExp.core.totalKills = +V.SecExp.core.totalKills || V.totalKills || 0;
+
+ if (V.week === 1 || !jsDef(V.SecExp.core.crimeLow)) {
+ V.SecExp.core.crimeLow = 30;
+ }
+ V.SecExp.core.crimeLow = Math.clamp(V.SecExp.core.crimeLow, 0, 100) || V.crime || 0;
+
+ V.SecExp.battles.slaveVictories = V.SecExp.battles.slaveVictories || V.slaveVictories || [];
+ V.SecExp.battles.major = V.SecExp.battles.major || 0;
+ if (jsDef(V.majorBattlesCount)) {
+ if (V.majorBattlesCount === 0 && V.hasFoughtMajorBattleOnce === 1) {
+ V.SecExp.battles.major = 1;
+ } else {
+ V.SecExp.battles.major = V.majorBattlesCount;
+ }
+ }
+ V.SecExp.battles.victories = V.SecExp.battles.victories || V.PCvictories || 0;
+ V.SecExp.battles.victoryStreak = V.SecExp.battles.victoryStreak || V.PCvictoryStreak || 0;
+ V.SecExp.battles.losses = V.SecExp.battles.losses || V.PClosses || 0;
+ V.SecExp.battles.lossStreak = V.SecExp.battles.lossStreak || V.PClossStreak || 0;
+ V.SecExp.battles.lastEncounterWeeks = V.SecExp.battles.lastEncounterWeeks || V.lastAttackWeeks || 0;
+ V.SecExp.battles.lastSelection = V.SecExp.battles.lastSelection || V.lastSelection || [];
+ V.SecExp.battles.saved = V.SecExp.battles.saved || {};
+ V.SecExp.battles.saved.commander = V.SecExp.battles.saved.commander || V.SavedLeader || "";
+ V.SecExp.battles.saved.sfSupport = V.SecExp.battles.saved.sfSupport || V.SavedSFI || 0;
+
+ V.SecExp.rebellions.tension = V.SecExp.rebellions.tension || V.tension || 0;
+ V.SecExp.rebellions.slaveProgress = V.SecExp.rebellions.slaveProgress || V.slaveProgress || 0;
+ V.SecExp.rebellions.citizenProgress = V.SecExp.rebellions.citizenProgress || V.citizenProgress || 0;
+ V.SecExp.rebellions.victories = V.SecExp.rebellions.victories || V.PCrebWon || 0;
+ V.SecExp.rebellions.losses = V.SecExp.rebellions.losses || V.PCrebLoss || 0;
+ V.SecExp.rebellions.lastEncounterWeeks = V.SecExp.rebellions.lastEncounterWeeks || V.lastRebellionWeeks || 0;
+ if (V.SFGear) {
+ V.SecExp.rebellions.sfArmor = V.SFGear;
+ }
+ V.SecExp.settings.difficulty = V.difficulty || V.SecExp.settings.difficulty || 1;
+
+ if (!jsDef(V.SecExp.settings.battle.enabled)) {
+ V.SecExp.settings.battle.enabled = 1;
+ }
+ if (jsDef(V.battlesEnabled)) {
+ V.SecExp.settings.battle.enabled = V.battlesEnabled;
+ }
+ delete V.SecExp.battle;
+
+ V.SecExp.settings.battle.frequency = V.battleFrequency || V.SecExp.settings.battle.frequency || 1;
+ V.SecExp.settings.battle.force = V.forceBattle || V.SecExp.settings.battle.force || 0;
+
+ if (V.readiness && V.readiness === 10 || V.sectionInFirebase) {
+ V.SecExp.sectionInFirebase = 1;
+ }
+
+ V.SecExp.settings.unitDescriptions = V.SecExp.settings.unitDescriptions || 0;
+
+ if (!jsDef(V.SecExp.settings.battle.allowSlavePrestige)) {
+ V.SecExp.settings.battle.allowSlavePrestige = 1;
+ }
+ if (jsDef(V.allowPrestigeFromBattles)) {
+ V.SecExp.settings.battle.allowSlavePrestige = V.allowPrestigeFromBattles;
+ }
+
+ V.SecExp.settings.battle.major.enabled = V.majorBattlesEnabled || V.SecExp.settings.battle.major.enabled || 0;
+
+ if (!jsDef(V.SecExp.settings.battle.major.gameOver)) {
+ V.SecExp.settings.battle.major.gameOver = 1;
+ }
+ if (jsDef(V.majorBattleGameOver)) {
+ V.SecExp.settings.battle.major.gameOver = V.majorBattleGameOver;
+ }
+ V.SecExp.settings.battle.major.force = V.forceMajorBattle || V.SecExp.settings.battle.major.force || 0;
+ V.SecExp.settings.battle.major.mult = V.SecExp.settings.battle.major.mult || 1;
+
+ if (!jsDef(V.SecExp.settings.rebellion.enabled)) {
+ V.SecExp.settings.rebellion.enabled = 1;
+ }
+ if (jsDef(V.rebellionsEnabled)) {
+ V.SecExp.settings.rebellion.enabled = V.rebellionsEnabled;
+ }
+
+ V.SecExp.settings.rebellion.force = V.forceRebellion || V.SecExp.settings.rebellion.force || 0;
+ if (!jsDef(V.SecExp.settings.rebellion.gameOver)) {
+ V.SecExp.settings.rebellion.gameOver = 1;
+ }
+ if (jsDef(V.rebellionGameOver)) {
+ V.SecExp.settings.rebellion.gameOver = V.rebellionGameOver;
+ }
+
+ V.SecExp.settings.rebellion.speed = V.rebellionSpeed || V.SecExp.settings.rebellion.speed || 1;
+ V.SecExp.settings.showStats = V.showBattleStatistics || V.SecExp.settings.showStats || 0;
+
+ App.Mods.SecExp.BC.propHub();
+ App.Mods.SecExp.BC.barracks();
+ App.Mods.SecExp.BC.secHub();
+ App.Mods.SecExp.BC.transportHub();
+ App.Mods.SecExp.BC.riotCenter();
+ App.Mods.SecExp.BC.weaponsManufacturing();
+
+ V.SecExp.proclamation.cooldown = V.SecExp.proclamation.cooldown || V.proclamationsCooldown || 0;
+ V.SecExp.proclamation.currency = V.SecExp.proclamation.currency || V.proclamationCurrency || "";
+ V.SecExp.proclamation.type = V.SecExp.proclamation.type || "crime";
+ if (jsDef(V.proclamationType) && V.proclamationType !== "none") {
+ V.SecExp.proclamation.type = V.proclamationType;
+ }
+
+ V.SecExp.rebellions.repairTime = V.SecExp.rebellions.repairTime || {};
+ if (jsDef(V.garrison)) {
+ if (V.garrison.waterwayTime > 0) {
+ V.SecExp.rebellions.repairTime.waterway = V.garrison.waterwayTime;
+ }
+ if (V.garrison.assistantTime > 0) {
+ V.SecExp.rebellions.repairTime.assistant = V.garrison.assistantTime;
+ }
+ if (V.garrison.reactorTime > 0) {
+ V.SecExp.rebellions.repairTime.reactor = V.garrison.reactorTime;
+ }
+ }
+ if (V.arcRepairTime && V.arcRepairTime > 0) {
+ V.SecExp.rebellions.repairTime.arc = V.arcRepairTime;
+ }
+
+ delete V.SecExp.settings.show;
+ };
+
+ function Init() {
+ if (V.secExpEnabled === 0) {
+ return;
+ }
+ V.SecExp = {
+ war: {},
+ battles: {
+ major: 0,
+ slaveVictories: [],
+ lastSelection: [],
+ victories: 0,
+ victoryStreak: 0,
+ losses: 0,
+ lossStreak: 0,
+ lastEncounterWeeks: 0,
+ saved: {}
+ },
+ rebellions: {
+ tension: 0,
+ slaveProgress: 0,
+ citizenProgress: 0,
+ victories: 0,
+ losses: 0,
+ lastEncounterWeeks: 0,
+ repairTime: {},
+ },
+ core: {
+ trade: 0,
+ authority: 0,
+ security: 100,
+ crimeLow: 30,
+ totalKills: 0,
+ },
+ settings: {
+ difficulty: 1,
+ unitDescriptions: 0,
+ showStats: 0,
+ battle: {
+ enabled: 1,
+ allowSlavePrestige: 1,
+ force: 0,
+ frequency: 1,
+ major: {
+ enabled: 0,
+ gameOver: 1,
+ mult: 1,
+ force: 0
+ }
+ },
+ rebellion: {
+ enabled: 1,
+ force: 0,
+ gameOver: 1,
+ speed: 1
+ }
+ },
+ buildings: {},
+ proclamation: {
+ cooldown: 0,
+ currency: "",
+ type: "crime"
+ },
+ units: {},
+ edicts: {
+ alternativeRents: 0,
+ enslavementRights: 0,
+ sellData: 0,
+ propCampaignBoost: 0,
+ tradeLegalAid: 0,
+ taxTrade: 0,
+ slaveWatch: 0,
+ subsidyChurch: 0,
+ SFSupportLevel: 0,
+ limitImmigration: 0,
+ openBorders: 0,
+ weaponsLaw: 3,
+ defense: {
+ soldierWages: 1,
+ slavesOfficers: 0,
+ discountMercenaries: 0,
+ militia: 0,
+ militaryExemption: 0,
+ noSubhumansInArmy: 0,
+ pregExemption: 0,
+ liveTargets: 0,
+ privilege: {
+ militiaSoldier: 0,
+ slaveSoldier: 0,
+ mercSoldier: 0,
+ },
+ // Soldiers
+ martialSchool: 0,
+ eliteOfficers: 0,
+ lowerRequirements: 0,
+ // FS soldiers
+ legionTradition: 0,
+ eagleWarriors: 0,
+ ronin: 0,
+ sunTzu: 0,
+ mamluks: 0,
+ pharaonTradition: 0,
+ }
+ },
+ smilingMan: {progress: 0}
+ };
+ initTrade();
+ for (const [unit, data] of App.Mods.SecExp.unit.list()) {
+ App.Mods.SecExp.unit.gen(unit);
+ }
+ };
+
+ function initTrade() {
+ if (V.SecExp.core.trade === 0 || !jsDef(V.SecExp.core.trade)) {
+ let init = jsRandom(20, 30);
+ if (V.terrain === "urban") {
+ init += jsRandom(10, 10);
+ } else if (V.terrain === "ravine") {
+ init -= jsRandom(5, 5);
+ }
+ if (isPCCareerInCategory("wealth") || isPCCareerInCategory("capitalist") || isPCCareerInCategory("celebrity") || isPCCareerInCategory("BlackHat")) {
+ init += jsRandom(5, 5);
+ } else if (isPCCareerInCategory("escort") || isPCCareerInCategory("gang") || isPCCareerInCategory("servant")) {
+ init -= jsRandom(5, 5);
+ }
+ V.SecExp.core.trade = init;
+ }
+ };
+})();
diff --git a/src/Mods/SecExp/js/securityReport.js b/src/Mods/SecExp/js/securityReport.js
index cdfd2a4253dbe1e6a48b9b9c6e977e0fe60161b3..4e4965936c5151e18916bebc87bc04d6129e1514 100644
--- a/src/Mods/SecExp/js/securityReport.js
+++ b/src/Mods/SecExp/js/securityReport.js
@@ -1,13 +1,16 @@
-/** @returns {DocumentFragment} */
-App.Mods.SecExp.securityReport = function() {
+/**
+ * @param {number} oldACitizens
+ * @returns {DocumentFragment}
+ */
+App.Mods.SecExp.securityReport = function(oldACitizens) {
let immigration = 0;
let emigration = 0;
let secGrowth = 0;
let crimeGrowth = 0;
- if (V.ACitizens > V.oldACitizens) {
- immigration = V.ACitizens - V.oldACitizens;
+ if (V.ACitizens > oldACitizens) {
+ immigration = V.ACitizens - oldACitizens;
} else {
- emigration = V.oldACitizens - V.ACitizens; // takes into account citizens leaving and those getting enslaved
+ emigration = oldACitizens - V.ACitizens; // takes into account citizens leaving and those getting enslaved
}
const activeUnits = App.Mods.SecExp.battle.activeUnits();
/** @type {(string|HTMLElement|DocumentFragment)[]} */
@@ -501,19 +504,7 @@ App.Mods.SecExp.securityReport = function() {
Object.assign(currentItem, App.Mods.SecExp.weapManu.current(currentItem.ID));
if (item === 0) {
currentItem.time--;
- r.push(`<br>In the research lab, ${currentItem.dec}`);
- switch (currentItem.dec) {
- case "adaptive armored frames":
- case "advanced synthetic alloys":
- case "ceramo-metallic alloys":
- case "rapid action stimulants":
- case "universal cyber enhancements":
- case "remote neural links":
- case "combined training regimens with the special force":
- r.push(`are`); break;
- default: r.push(`is`);
- }
- r.push(`being developed with the aim of enhancing ${currentItem.unit}' ${currentItem.purpose}.`);
+ r.push(`<br>In the research lab, ${currentItem.dec} ${[-3, -2, 1, 2, 4, 5, 6].includes(currentItem.ID) ? 'are' : 'is'} being developed with the aim of enhancing ${currentItem.unit}' ${currentItem.purpose}.`);
if (currentItem.time <= 0) {
r.push(`Reports indicate it is ready for deployment and will be issued in the following days.`);
V.SecExp.buildings.weapManu.upgrades.completed.push(currentItem.ID);
diff --git a/src/Mods/SpecialForce/AfterActionReport.js b/src/Mods/SpecialForce/AfterActionReport.js
index d92788c12edb85abb3ccabd0309721fdf6d4fa2d..dd65b78f79f10d36c4bb366300c0c38bd3896318 100644
--- a/src/Mods/SpecialForce/AfterActionReport.js
+++ b/src/Mods/SpecialForce/AfterActionReport.js
@@ -1,5 +1,5 @@
/**
- * @returns {[DocumentFragment, number]}
+ * @returns {[text: DocumentFragment, upkeep: number, profit: number]}
*/
App.Mods.SF.AAR = function() {
const endWeekCall = V.endweekFlag ? 1 : 0;
@@ -11,357 +11,347 @@ App.Mods.SF.AAR = function() {
let income = 0;
let incomeAdd = 0;
const node = new DocumentFragment();
- if (V.SF.FS.Tension > 100 && endWeekCall > 0) {
- if (V.SF.FS.BadOutcome === undefined) {
- App.Mods.SF.fsIntegration.badOutcome();
+ let Multiplier = {
+ action: 1,
+ troop: 1,
+ unit: 1,
+ depravity: 1
+ };
+ let FNG = 10 + (V.SF.ArmySize / 10);
+ let unitCap = 2500;
+ let Trade = 0.025;
+ let cost = {a: 10, b: 10};
+ let N0 = 1 + (0.01 * (size / 6));
+ let N1 = 1 + (0.01 * (size / 3));
+
+ let SFD = V.SF.Depravity;
+ V.SF.ArmySize = Math.clamp(V.SF.ArmySize, 0, unitCap);
+ if (endWeekCall > 0) {
+ if (V.SF.ArmySize < 100) {
+ V.SF.ArmySize += Math.ceil(jsRandom(2, 5));
} else {
- App.UI.DOM.appendNewElement("div", node, `This week your arcology lost a bit of prosperity and large amount of reputation, due to the looming threat that The Colonel and her forces may resurface.`);
- V.arcologies[0].prosperity -= 25;
- V.rep = Math.clamp(V.rep, 0, 17500);
- }
- } else if (V.SF.FS.Tension < 100) {
- let Multiplier = {
- action: 1,
- troop: 1,
- unit: 1,
- depravity: 1
- };
- let FNG = 10 + (V.SF.ArmySize / 10);
- let unitCap = 2500;
- let Trade = 0.025;
- let cost = {a: 10, b: 10};
- let N0 = 1 + (0.01 * (size / 6));
- let N1 = 1 + (0.01 * (size / 3));
-
- let SFD = V.SF.Depravity;
- V.SF.ArmySize = Math.clamp(V.SF.ArmySize, 0, unitCap);
- if (endWeekCall > 0) {
- if (V.SF.ArmySize < 100) {
- V.SF.ArmySize += Math.ceil(jsRandom(2, 5));
+ if (V.SF.Target === "recruit") {
+ V.SF.ArmySize -= Math.ceil(jsRandom(1 * V.SF.ArmySize / 1000, 0));
+ } else if (V.SF.Target === "raiding") {
+ V.SF.ArmySize -= Math.ceil(jsRandom(1.15 * V.SF.ArmySize / 1000, -1.20 * V.SF.ArmySize / 1000));
} else {
- if (V.SF.Target === "recruit") {
- V.SF.ArmySize -= Math.ceil(jsRandom(1 * V.SF.ArmySize / 1000, 0));
- } else if (V.SF.Target === "raiding") {
- V.SF.ArmySize -= Math.ceil(jsRandom(1.15 * V.SF.ArmySize / 1000, -1.20 * V.SF.ArmySize / 1000));
- } else {
- V.SF.ArmySize -= Math.ceil(jsRandom(1.10 * V.SF.ArmySize / 1000, -1.15 * V.SF.ArmySize / 1000));
- }
+ V.SF.ArmySize -= Math.ceil(jsRandom(1.10 * V.SF.ArmySize / 1000, -1.15 * V.SF.ArmySize / 1000));
}
}
+ }
- if (V.SF.ArmySize > 200) {
- Trade += 0.05 * (V.SF.ArmySize / 200);
- Multiplier.troop += V.SF.ArmySize / 200;
- upkeep += V.SF.ArmySize * 33 * 1/N0;
- if (V.secExpEnabled > 0 && endWeekCall > 0) {
- App.Mods.SecExp.authorityX((25 * (Math.ceil(V.SF.ArmySize / 200))) + size * 10);
- }
+ if (V.SF.ArmySize > 200) {
+ Trade += 0.05 * (V.SF.ArmySize / 200);
+ Multiplier.troop += V.SF.ArmySize / 200;
+ upkeep += V.SF.ArmySize * 33 * 1/N0;
+ if (V.secExpEnabled > 0 && endWeekCall > 0) {
+ App.Mods.SecExp.authorityX((25 * (Math.ceil(V.SF.ArmySize / 200))) + size * 10);
}
+ }
- if (S.Firebase > 0) {
- FNG += S.Firebase;
- Trade += 0.5 * S.Firebase;
- Multiplier.unit += 7.5 * S.Firebase + 2 * Math.pow(S.Firebase, 2) * cost.a;
- incomeAdd += (5000 * S.Firebase)/ Math.max(S.Firebase - 1, 1);
- upkeep += (95 * 10 + S.Firebase) * cost.b;
- }
- if (S.Armoury > 0) {
- FNG += 2 * S.Armoury;
- Trade += 0.25 * S.Armoury;
- Multiplier.unit += 7.5 * S.Armoury + 2 * Math.pow(S.Armoury, 2) * cost.a;
- incomeAdd += (3000 * S.Armoury)/Math.max(S.Armoury - 1, 1);
- upkeep += (55 * S.Armoury) * cost.b;
+ if (S.Firebase > 0) {
+ FNG += S.Firebase;
+ Trade += 0.5 * S.Firebase;
+ Multiplier.unit += 7.5 * S.Firebase + 2 * Math.pow(S.Firebase, 2) * cost.a;
+ incomeAdd += (5000 * S.Firebase)/ Math.max(S.Firebase - 1, 1);
+ upkeep += (95 * 10 + S.Firebase) * cost.b;
+ }
+ if (S.Armoury > 0) {
+ FNG += 2 * S.Armoury;
+ Trade += 0.25 * S.Armoury;
+ Multiplier.unit += 7.5 * S.Armoury + 2 * Math.pow(S.Armoury, 2) * cost.a;
+ incomeAdd += (3000 * S.Armoury)/Math.max(S.Armoury - 1, 1);
+ upkeep += (55 * S.Armoury) * cost.b;
+ }
+ if (S.Drugs > 0) {
+ FNG += S.Drugs;
+ Trade += 0.25 * S.Drugs;
+ Multiplier.unit += 7.5 * S.Drugs + 2 * Math.pow(S.Drugs, 2) * cost.a;
+ incomeAdd += (3000 * S.Drugs)/Math.max(S.Drugs - 1, 1);
+ upkeep += (35 * S.Drugs) * cost.b;
+ }
+ if (S.Firebase >= 1) {
+ if (S.AV > 0) {
+ FNG += S.AV;
+ Trade += 0.25 * S.AV;
+ Multiplier.unit += 7.5 * S.AV + 2 * Math.pow(S.AV, 2) * cost.a;
+ upkeep += (89 * S.AV) * cost.b;
}
- if (S.Drugs > 0) {
- FNG += S.Drugs;
- Trade += 0.25 * S.Drugs;
- Multiplier.unit += 7.5 * S.Drugs + 2 * Math.pow(S.Drugs, 2) * cost.a;
- incomeAdd += (3000 * S.Drugs)/Math.max(S.Drugs - 1, 1);
- upkeep += (35 * S.Drugs) * cost.b;
+ if (S.TV > 0) {
+ FNG += S.TV;
+ Trade += 0.25 * S.TV;
+ Multiplier.unit += 7.5 * S.TV + 2 * Math.pow(S.TV, 2) * cost.a;
+ upkeep += (89 * S.TV) * cost.b;
}
- if (S.Firebase >= 1) {
- if (S.AV > 0) {
- FNG += S.AV;
- Trade += 0.25 * S.AV;
- Multiplier.unit += 7.5 * S.AV + 2 * Math.pow(S.AV, 2) * cost.a;
- upkeep += (89 * S.AV) * cost.b;
- }
- if (S.TV > 0) {
- FNG += S.TV;
- Trade += 0.25 * S.TV;
- Multiplier.unit += 7.5 * S.TV + 2 * Math.pow(S.TV, 2) * cost.a;
- upkeep += (89 * S.TV) * cost.b;
- }
- if (S.PGT > 0) {
- FNG += S.PGT;
- Trade += 0.25 * S.PGT;
- Multiplier.unit += 15 * S.PGT + 3 * Math.pow(S.PGT, 2) * cost.a;
- upkeep += (100 * S.PGT) * cost.b;
- }
+ if (S.PGT > 0) {
+ FNG += S.PGT;
+ Trade += 0.25 * S.PGT;
+ Multiplier.unit += 15 * S.PGT + 3 * Math.pow(S.PGT, 2) * cost.a;
+ upkeep += (100 * S.PGT) * cost.b;
}
+ }
- if (S.Firebase >= 2 && S.Drones > 0) {
- FNG += S.Drones;
- Trade += 0.5 * S.Drones;
- Multiplier.unit += 7.5 * S.Drones + 2 * Math.pow(S.Drones, 2) * cost.a;
- upkeep += (50 * S.Drones) * cost.b;
- }
+ if (S.Firebase >= 2 && S.Drones > 0) {
+ FNG += S.Drones;
+ Trade += 0.5 * S.Drones;
+ Multiplier.unit += 7.5 * S.Drones + 2 * Math.pow(S.Drones, 2) * cost.a;
+ upkeep += (50 * S.Drones) * cost.b;
+ }
- if (S.Firebase >= 4) {
- if (S.AA > 0) {
- FNG += S.AA;
- Trade += 0.25 * S.AA;
- Multiplier.unit += 7.5 * S.AA + 2 * Math.pow(S.AA, 2) * cost.a;
- upkeep += (100 * S.AA) * cost.b;
- }
- if (S.TA > 0) {
- FNG += S.TA;
- Trade += 0.25 * S.TA;
- Multiplier.unit += 7.5 * S.TA + 2 * Math.pow(S.TA, 2) * cost.a;
- upkeep += (100 * S.TA) * cost.b;
- }
- if (S.SpacePlane > 0) {
- FNG += S.SpacePlane;
- Trade += 0.25 * S.SpacePlane;
- Multiplier.unit += 7.5 * S.SpacePlane + 2 * Math.pow(S.SpacePlane, 2) * cost.a;
- upkeep += (100 * S.SpacePlane) * cost.b;
- }
- if (S.GunS > 0) {
- FNG += S.GunS;
- Trade += 0.25 * S.GunS;
- Multiplier.unit += 12 * S.GunS + 3 * Math.pow(S.GunS, 2) * cost.a;
- upkeep += (70 * S.GunS) * cost.b;
- }
- if (S.Satellite > 0 && S.SatLaunched > 0) {
- FNG += S.Satellite;
- Trade += 0.25 * S.Satellite;
- Multiplier.unit += 15 * S.Satellite + 5 * Math.pow(S.Satellite, 2) * cost.a;
- upkeep += (85 * S.Satellite) * cost.b;
- }
- if (S.GiantRobot > 0) {
- FNG += S.GiantRobot;
- Trade += 0.25 * S.GiantRobot;
- Multiplier.unit += 15 * S.GiantRobot + 5 * Math.pow(S.GiantRobot, 2) * cost.a;
- upkeep += (95 * S.GiantRobot) * cost.b;
- }
- if (S.MissileSilo > 0) {
- FNG += S.MissileSilo;
- Trade += 0.25 * S.MissileSilo;
- Multiplier.unit += 15 * S.MissileSilo + 5 * Math.pow(S.MissileSilo, 2) * cost.a;
- upkeep += (100 * S.MissileSilo) * cost.b;
- }
+ if (S.Firebase >= 4) {
+ if (S.AA > 0) {
+ FNG += S.AA;
+ Trade += 0.25 * S.AA;
+ Multiplier.unit += 7.5 * S.AA + 2 * Math.pow(S.AA, 2) * cost.a;
+ upkeep += (100 * S.AA) * cost.b;
}
-
- if (S.AircraftCarrier > 0) {
- FNG += S.AircraftCarrier;
- Trade += 0.25 * S.AircraftCarrier;
- Multiplier.unit += 9 * S.AircraftCarrier + 3 * Math.pow(S.AircraftCarrier, 2) * cost.a;
- upkeep += (80 * S.AircraftCarrier) * cost.b;
+ if (S.TA > 0) {
+ FNG += S.TA;
+ Trade += 0.25 * S.TA;
+ Multiplier.unit += 7.5 * S.TA + 2 * Math.pow(S.TA, 2) * cost.a;
+ upkeep += (100 * S.TA) * cost.b;
}
- if (S.Sub > 0) {
- FNG += S.Sub;
- Trade += 0.25 * S.Sub;
- Multiplier.unit += 7.5 * S.Sub + 2 * Math.pow(S.Sub, 2) * cost.a;
- upkeep += (90 * S.Sub) * cost.b;
+ if (S.SpacePlane > 0) {
+ FNG += S.SpacePlane;
+ Trade += 0.25 * S.SpacePlane;
+ Multiplier.unit += 7.5 * S.SpacePlane + 2 * Math.pow(S.SpacePlane, 2) * cost.a;
+ upkeep += (100 * S.SpacePlane) * cost.b;
}
- if (S.HAT > 0) {
- FNG += S.HAT;
- Trade += 0.25 * S.HAT;
- Multiplier.unit += 7.5 * S.HAT + 2 * Math.pow(S.HAT, 2) * cost.a;
- upkeep += (70 * S.HAT) * cost.b;
+ if (S.GunS > 0) {
+ FNG += S.GunS;
+ Trade += 0.25 * S.GunS;
+ Multiplier.unit += 12 * S.GunS + 3 * Math.pow(S.GunS, 2) * cost.a;
+ upkeep += (70 * S.GunS) * cost.b;
}
-
- switch (V.SF.Colonel.Core) {
- case "kind":
- FNG += 10;
- Trade += 0.15;
- SFD -= 0.15;
- break;
- case "cruel":
- Trade -= 0.15;
- SFD += 0.15;
- break;
- case "brazen":
- FNG += 15;
- Multiplier.unit += 0.5;
- break;
- case "jaded":
- Trade -= 0.05;
- SFD += 0.05;
- break;
- case "shell shocked":
- Trade += 0.05;
- SFD -= 0.05;
- Multiplier.unit -= 0.5;
- break;
+ if (S.Satellite > 0 && S.SatLaunched > 0) {
+ FNG += S.Satellite;
+ Trade += 0.25 * S.Satellite;
+ Multiplier.unit += 15 * S.Satellite + 5 * Math.pow(S.Satellite, 2) * cost.a;
+ upkeep += (85 * S.Satellite) * cost.b;
}
-
- if (V.SF.Target === "raiding") {
- SFD += 0.05;
- Multiplier.action += 0.5;
- } else if (V.SF.Target === "secure") {
- SFD -= 0.05;
- Multiplier.action += 0.2;
- } else {
- SFD -= 0.1;
- Multiplier.action -= 0.5;
+ if (S.GiantRobot > 0) {
+ FNG += S.GiantRobot;
+ Trade += 0.25 * S.GiantRobot;
+ Multiplier.unit += 15 * S.GiantRobot + 5 * Math.pow(S.GiantRobot, 2) * cost.a;
+ upkeep += (95 * S.GiantRobot) * cost.b;
}
- if (V.SF.ROE === "free") {
- Multiplier.action *= 0.8;
- SFD += 0.05;
- Trade += Trade * 0.95;
- } else if (V.SF.ROE === "hold") {
- Multiplier.action *= 1.1;
- SFD -= 0.05;
- Trade += Trade * 1.05;
+ if (S.MissileSilo > 0) {
+ FNG += S.MissileSilo;
+ Trade += 0.25 * S.MissileSilo;
+ Multiplier.unit += 15 * S.MissileSilo + 5 * Math.pow(S.MissileSilo, 2) * cost.a;
+ upkeep += (100 * S.MissileSilo) * cost.b;
}
- if (V.SF.Regs === "none") {
- Multiplier.action *= 0.8;
+ }
+
+ if (S.AircraftCarrier > 0) {
+ FNG += S.AircraftCarrier;
+ Trade += 0.25 * S.AircraftCarrier;
+ Multiplier.unit += 9 * S.AircraftCarrier + 3 * Math.pow(S.AircraftCarrier, 2) * cost.a;
+ upkeep += (80 * S.AircraftCarrier) * cost.b;
+ }
+ if (S.Sub > 0) {
+ FNG += S.Sub;
+ Trade += 0.25 * S.Sub;
+ Multiplier.unit += 7.5 * S.Sub + 2 * Math.pow(S.Sub, 2) * cost.a;
+ upkeep += (90 * S.Sub) * cost.b;
+ }
+ if (S.HAT > 0) {
+ FNG += S.HAT;
+ Trade += 0.25 * S.HAT;
+ Multiplier.unit += 7.5 * S.HAT + 2 * Math.pow(S.HAT, 2) * cost.a;
+ upkeep += (70 * S.HAT) * cost.b;
+ }
+
+ switch (V.SF.Colonel.Core) {
+ case "kind":
+ FNG += 10;
+ Trade += 0.15;
+ SFD -= 0.15;
+ break;
+ case "cruel":
+ Trade -= 0.15;
+ SFD += 0.15;
+ break;
+ case "brazen":
+ FNG += 15;
+ Multiplier.unit += 0.5;
+ break;
+ case "jaded":
+ Trade -= 0.05;
SFD += 0.05;
- Trade += Trade * 0.95;
- } else if (V.SF.Regs === "strict") {
- Multiplier.action *= 1.1;
+ break;
+ case "shell shocked":
+ Trade += 0.05;
SFD -= 0.05;
- Trade += Trade * 1.05;
- Multiplier.depravity = 1 + SFD;
- }
- if (SFD > -2) {
- Trade *= 1 + SFD / 2;
- }
+ Multiplier.unit -= 0.5;
+ break;
+ }
- if (V.SF.Target === "recruit") {
- FNG += FNG * 0.95;
- } else {
- FNG += FNG * 0.25;
- }
- FNG = Math.ceil(FNG / 2);
+ if (V.SF.Target === "raiding") {
+ SFD += 0.05;
+ Multiplier.action += 0.5;
+ } else if (V.SF.Target === "secure") {
+ SFD -= 0.05;
+ Multiplier.action += 0.2;
+ } else {
+ SFD -= 0.1;
+ Multiplier.action -= 0.5;
+ }
+ if (V.SF.ROE === "free") {
+ Multiplier.action *= 0.8;
+ SFD += 0.05;
+ Trade += Trade * 0.95;
+ } else if (V.SF.ROE === "hold") {
+ Multiplier.action *= 1.1;
+ SFD -= 0.05;
+ Trade += Trade * 1.05;
+ }
+ if (V.SF.Regs === "none") {
+ Multiplier.action *= 0.8;
+ SFD += 0.05;
+ Trade += Trade * 0.95;
+ } else if (V.SF.Regs === "strict") {
+ Multiplier.action *= 1.1;
+ SFD -= 0.05;
+ Trade += Trade * 1.05;
+ Multiplier.depravity = 1 + SFD;
+ }
+ if (SFD > -2) {
+ Trade *= 1 + SFD / 2;
+ }
- if (endWeekCall > 0) {
- if (V.SF.Target === "secure") {
- repX((Math.ceil(V.rep * ((Trade / 100) * 0.95))), "specialForces");
- V.arcologies[0].prosperity = Math.ceil((V.arcologies[0].prosperity + (Trade / 10) * 0.95));
- } else {
- repX((Math.ceil(V.rep * (Trade / 100) * 0.25)), "specialForces");
- V.arcologies[0].prosperity = Math.ceil(V.arcologies[0].prosperity + (Trade / 10) * 0.25);
- }
- }
+ if (V.SF.Target === "recruit") {
+ FNG += FNG * 0.95;
+ } else {
+ FNG += FNG * 0.25;
+ }
+ FNG = Math.ceil(FNG / 2);
- income += (1 + Multiplier.troop / N0) * (1 + Multiplier.unit / N0) * (1 + Multiplier.action / N0) * (1 + Multiplier.depravity / N0);
- upkeep += 30000 + (25000 * 1 / N1);
- if (V.SF.Target === "raiding") {
- income *= 1.25;
- } else if (V.SF.Target === "secure") {
- income *= 1.05;
- } else { // When recruiting, upkeep is lowered, effect dependent on amount of soldiers. At max capacity, multiplier back to 1.
- upkeep *= 0.75 + (V.SF.ArmySize/10000);
+ if (endWeekCall > 0) {
+ if (V.SF.Target === "secure") {
+ repX((Math.ceil(V.rep * ((Trade / 100) * 0.95))), "specialForces");
+ V.arcologies[0].prosperity = Math.ceil((V.arcologies[0].prosperity + (Trade / 10) * 0.95));
+ } else {
+ repX((Math.ceil(V.rep * (Trade / 100) * 0.25)), "specialForces");
+ V.arcologies[0].prosperity = Math.ceil(V.arcologies[0].prosperity + (Trade / 10) * 0.25);
}
+ }
+
+ income += (1 + Multiplier.troop / N0) * (1 + Multiplier.unit / N0) * (1 + Multiplier.action / N0) * (1 + Multiplier.depravity / N0);
+ upkeep += 30000 + (25000 * 1 / N1);
+ if (V.SF.Target === "raiding") {
+ income *= 1.25;
+ } else if (V.SF.Target === "secure") {
+ income *= 1.05;
+ } else { // When recruiting, upkeep is lowered, effect dependent on amount of soldiers. At max capacity, multiplier back to 1.
+ upkeep *= 0.75 + (V.SF.ArmySize/10000);
+ }
- if (V.economy.isBetween(33, 100)) {
- let multiplier = (1.75 * Math.sqrt(Math.trunc(100000/V.economy-1000)/10)) + (0.2 * (Math.trunc(100000/V.economy-1000)/10));
- income *= (1 + multiplier/100);
- } else if (V.economy <= 33) { // There comes a point where a worse global economy no longer benefits your Special Forces.
- let multiplier = (1.75 * Math.sqrt(Math.trunc(100000/33-1000)/10)) + (0.2 * (Math.trunc(100000/33-1000)/10));
- income *= (1 + multiplier/100);
+ if (V.economy.isBetween(33, 100)) {
+ let multiplier = (1.75 * Math.sqrt(Math.trunc(100000/V.economy-1000)/10)) + (0.2 * (Math.trunc(100000/V.economy-1000)/10));
+ income *= (1 + multiplier/100);
+ } else if (V.economy <= 33) { // There comes a point where a worse global economy no longer benefits your Special Forces.
+ let multiplier = (1.75 * Math.sqrt(Math.trunc(100000/33-1000)/10)) + (0.2 * (Math.trunc(100000/33-1000)/10));
+ income *= (1 + multiplier/100);
+ }
+ income = Math.ceil(income + incomeAdd);
+ upkeep = Math.ceil(upkeep);
+ profit = income - upkeep;
+
+ if (endWeekCall > 0) {
+ V.SF.ArmySize += FNG;
+ if (V.debugMode > 0) {
+ App.UI.DOM.appendNewElement("div", node, `income:${cashFormat(income)}, upkeep:${cashFormat(upkeep)}, profit:${cashFormat(profit)}, troop:${num((0.09+Multiplier.troop/N0).toFixed(2))}, unit:${num((0.09+Multiplier.unit/N0).toFixed(2))}, action:${num((0.09+Multiplier.action/N0).toFixed(2))}, depravity:${num((0.09+Multiplier.depravity/N0).toFixed(2))}, N0: ${N0} N1: ${N1}`);
}
- income = Math.ceil(income + incomeAdd);
- upkeep = Math.ceil(upkeep);
- profit = income - upkeep;
-
- if (endWeekCall > 0) {
- V.SF.ArmySize += FNG;
- if (V.debugMode > 0) {
- App.UI.DOM.appendNewElement("div", node, `income:${cashFormat(income)}, upkeep:${cashFormat(upkeep)}, profit:${cashFormat(profit)}, troop:${num((0.09+Multiplier.troop/N0).toFixed(2))}, unit:${num((0.09+Multiplier.unit/N0).toFixed(2))}, action:${num((0.09+Multiplier.action/N0).toFixed(2))}, depravity:${num((0.09+Multiplier.depravity/N0).toFixed(2))}, N0: ${N0} N1: ${N1}`);
- }
- cashX(income, "specialForces");
- // We run this in economyJS.js now.
- // cashX(forceNeg(upkeep), "specialForces");
- V.SF.ArmySize = Math.clamp(V.SF.ArmySize, 0, unitCap);
- V.arcologies[0].prosperity = Math.clamp(V.arcologies[0].prosperity, 0, V.AProsperityCap);
+ cashX(income, "specialForces");
+ // We run this in economyJS.js now.
+ // cashX(forceNeg(upkeep), "specialForces");
+ V.SF.ArmySize = Math.clamp(V.SF.ArmySize, 0, unitCap);
+ V.arcologies[0].prosperity = Math.clamp(V.arcologies[0].prosperity, 0, V.AProsperityCap);
- if (V.SF.UC.Assign === 1 && V.SF.UC.Lock < 1) {
- V.SF.UC.Assign = 0;
- }
- V.SF.Upgrade = 0;
+ if (V.SF.UC.Assign === 1 && V.SF.UC.Lock < 1) {
+ V.SF.UC.Assign = 0;
+ }
+ V.SF.Upgrade = 0;
- const capSF = capFirstChar(V.SF.Lower || "the special force");
- App.UI.DOM.appendNewElement("h3", node, `${capSF} (AO: ${V.terrain}) operational report:`);
- App.UI.DOM.appendNewElement("span", node, ` ${capSF} focused their ${num(V.SF.ArmySize)} troops on`);
+ const capSF = capFirstChar(V.SF.Lower || "the Special Force");
+ App.UI.DOM.appendNewElement("h3", node, `${capSF} (AO: ${V.terrain}) operational report:`);
+ App.UI.DOM.appendNewElement("span", node, ` ${capSF} focused their ${num(V.SF.ArmySize)} troops on`);
- if (V.SF.Target === "recruit") {
- App.UI.DOM.appendNewElement("span", node, ` recruiting and training more personnel. Smaller parties ventured out to protect the arcology's trade routes and strike targets of opportunity.`);
- } else if (V.SF.Target === "secure") {
- App.UI.DOM.appendNewElement("span", node, ` securing the trade routes between the arcology and the surrounding area. Smaller parties ventured out to strike targets of opportunity and process new recruits.`);
- } else {
- App.UI.DOM.appendNewElement("span", node, ` locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits.`);
- }
+ if (V.SF.Target === "recruit") {
+ App.UI.DOM.appendNewElement("span", node, ` recruiting and training more personnel. Smaller parties ventured out to protect the arcology's trade routes and strike targets of opportunity.`);
+ } else if (V.SF.Target === "secure") {
+ App.UI.DOM.appendNewElement("span", node, ` securing the trade routes between the arcology and the surrounding area. Smaller parties ventured out to strike targets of opportunity and process new recruits.`);
+ } else {
+ App.UI.DOM.appendNewElement("span", node, ` locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits.`);
+ }
- if (V.SF.UC.Assign > 0) {
- App.UI.DOM.appendNewElement("div", node, `A ${V.SF.UC.Assign < 2 ? 'small':'large'} portion of the force was assigned as ${V.SF.UC.Assign < 2 ? 'part':'full'} time undercover officers.`);
- }
+ if (V.SF.UC.Assign > 0) {
+ App.UI.DOM.appendNewElement("div", node, `A ${V.SF.UC.Assign < 2 ? 'small':'large'} portion of the force was assigned as ${V.SF.UC.Assign < 2 ? 'part':'full'} time undercover officers.`);
+ }
- App.UI.DOM.appendNewElement("span", node, " These activities have, overall");
- App.UI.DOM.appendNewElement("span", node, " improved your arcology's prosperity.", "green");
- App.UI.DOM.appendNewElement("span", node, ` The goods procured by ${V.SF.Lower} after accounting for the spoils retained by individual soldiers were`);
-
- if (profit > 0) {
- App.UI.DOM.appendNewElement("span", node, " more than sufficient to cover expenses.", "green");
- App.UI.DOM.appendNewElement("span", node, " Excess material and human assets totaling");
- App.UI.DOM.appendNewElement("span", node, ` ${cashFormat(profit)}`, "yellowgreen");
- App.UI.DOM.appendNewElement("span", node, " (after liquidation) and paying expenses were transferred to your accounts.");
- if (V.economy < 100) {
- App.UI.DOM.appendNewElement("span", node, " The rapidly degrading global economy has one upside,");
- App.UI.DOM.appendNewElement("span", node, ` more 'persuasive' techniques were able to be implemented thus leading to an increase in profit.`, "green");
- }
- } else {
- App.UI.DOM.appendNewElement("span", node, " barely enough to cover expenses.", "red");
- App.UI.DOM.appendNewElement("span", node, " More growth will be needed to ensure profitability;");
- App.UI.DOM.appendNewElement("span", node, " purchasing more upgrades may help.", "yellow");
- App.UI.DOM.appendNewElement("span", node, " Per estimates provided, an additional");
- App.UI.DOM.appendNewElement("span", node, ` ${cashFormat(Math.abs(profit))}`, "yellowgreen");
- App.UI.DOM.appendNewElement("span", node, " is required for sufficient cover.");
+ App.UI.DOM.appendNewElement("span", node, " These activities have, overall");
+ App.UI.DOM.appendNewElement("span", node, " improved your arcology's prosperity.", ["green"]);
+ App.UI.DOM.appendNewElement("span", node, ` The goods procured by ${V.SF.Lower} after accounting for the spoils retained by individual soldiers were`);
+
+ if (profit > 0) {
+ App.UI.DOM.appendNewElement("span", node, " more than sufficient to cover expenses.", ["green"]);
+ App.UI.DOM.appendNewElement("span", node, " Excess material and human assets totaling");
+ App.UI.DOM.appendNewElement("span", node, ` ${cashFormat(profit)}`, ["yellowgreen"]);
+ App.UI.DOM.appendNewElement("span", node, " (after liquidation) and paying expenses were transferred to your accounts.");
+ if (V.economy < 100) {
+ App.UI.DOM.appendNewElement("span", node, " The rapidly degrading global economy has one upside,");
+ App.UI.DOM.appendNewElement("span", node, ` more 'persuasive' techniques were able to be implemented thus leading to an increase in profit.`, ["green"]);
}
- App.UI.DOM.appendNewElement("span", node, ` This represents a difference of ${num(Math.abs(((profit/V.SF.lastWeeksProfit)*100).toFixed(2)))}% since last week's profit of ${cashFormat(V.SF.lastWeeksProfit)}.`);
- V.SF.lastWeeksProfit = profit;
-
- App.UI.DOM.appendNewElement("span", node, ` ${FNG} new soldiers were recruited this week, and your reputation has`);
- App.UI.DOM.appendNewElement("span", node, " increased through the improvement of trade security.", "green");
-
- App.Events.addParagraph(node, ["As the leader of a military force, The Colonel has very limited free time during the week and is only able to issue orders or provide basic reports."]);
- App.UI.DOM.appendNewElement("p", node, weeklyActions());
- App.UI.DOM.appendNewElement("div", node, weeklyOptions());
-
- if (V.SF.MercCon.CanAttend === 1) {
- V.SF.MercCon.Income = 0;
- V.SF.MercCon.Menials = 0;
- const tradeShowAttendes = 200;
- const menialGiftsPerAttendee = 5;
- const menialGifts = Math.ceil(jsRandom(1, ((tradeShowAttendes * menialGiftsPerAttendee) / 10)));
- const TSProfit = Math.ceil(500000 * (1 + (size / 1000)) * (1 + (V.arcologies[0].prosperity / 1000)) * App.Mods.SF.env());
- const NewMercs = jsRandom(1, (tradeShowAttendes / 10));
-
- V.SF.MercCon.Menials += menialGifts;
- V.SF.MercCon.TotalMenials += menialGifts;
- V.menials += menialGifts;
- V.SF.MercCon.History++;
- V.SF.MercCon.Income += TSProfit;
- V.SF.MercCon.Revenue += TSProfit;
- cashX(TSProfit, "specialForces");
-
- if (V.secExpEnabled > 0 && V.mercenaries > 0) {
- V.SF.MercCon.Mercs = 0;
- V.SecExp.units.mercs.free += NewMercs;
- V.SF.MercCon.TotalMercs += NewMercs;
- V.SF.MercCon.Mercs += NewMercs;
- }
- App.UI.DOM.appendNewElement("span", node, "TradeShow: ", "bold");
- App.UI.DOM.appendNewElement("span", node, `During a break, The Colonel managed to sell some generic schematics to the ${tradeShowAttendes} attendees, some of whom decided to also give a few menial slaves as a bonus.`);
+ } else {
+ App.UI.DOM.appendNewElement("span", node, " barely enough to cover expenses.", ["red"]);
+ App.UI.DOM.appendNewElement("span", node, " More growth will be needed to ensure profitability;");
+ App.UI.DOM.appendNewElement("span", node, " purchasing more upgrades may help.", ["yellow"]);
+ App.UI.DOM.appendNewElement("span", node, " Per estimates provided, an additional");
+ App.UI.DOM.appendNewElement("span", node, ` ${cashFormat(Math.abs(profit))}`, ["yellowgreen"]);
+ App.UI.DOM.appendNewElement("span", node, " is required for sufficient cover.");
+ }
+ App.UI.DOM.appendNewElement("span", node, ` This represents a difference of ${num(Math.abs(((profit / V.SF.lastWeeksProfit) * 100).toFixed(2)))}% since last week's profit of ${cashFormat(V.SF.lastWeeksProfit)}.`);
+ V.SF.lastWeeksProfit = profit;
+
+ App.UI.DOM.appendNewElement("span", node, ` ${FNG} new soldiers were recruited this week, and your reputation has`);
+ App.UI.DOM.appendNewElement("span", node, " increased through the improvement of trade security.", ["green"]);
+
+ App.Events.addParagraph(node, ["As the leader of a military force, The Colonel has very limited free time during the week and is only able to issue orders or provide basic reports."]);
+ App.UI.DOM.appendNewElement("p", node, weeklyActions());
+ App.UI.DOM.appendNewElement("div", node, weeklyOptions());
+
+ if (V.SF.MercCon.CanAttend === 1) {
+ V.SF.MercCon.Income = 0;
+ V.SF.MercCon.Menials = 0;
+ const tradeShowAttendes = 200;
+ const menialGiftsPerAttendee = 5;
+ const menialGifts = Math.ceil(jsRandom(1, ((tradeShowAttendes * menialGiftsPerAttendee) / 10)));
+ const TSProfit = Math.ceil(500000 * (1 + (size / 1000)) * (1 + (V.arcologies[0].prosperity / 1000)) * App.Mods.SF.env());
+ const NewMercs = jsRandom(1, (tradeShowAttendes / 10));
+
+ V.SF.MercCon.Menials += menialGifts;
+ V.SF.MercCon.TotalMenials += menialGifts;
+ V.menials += menialGifts;
+ V.SF.MercCon.History++;
+ V.SF.MercCon.Income += TSProfit;
+ V.SF.MercCon.Revenue += TSProfit;
+ cashX(TSProfit, "specialForces");
+
+ if (V.secExpEnabled > 0 && V.mercenaries > 0) {
+ V.SF.MercCon.Mercs = 0;
+ V.SecExp.units.mercs.free += NewMercs;
+ V.SF.MercCon.TotalMercs += NewMercs;
+ V.SF.MercCon.Mercs += NewMercs;
}
-
- V.SF.MercCon.CanAttend = -1;
+ App.UI.DOM.appendNewElement("span", node, "TradeShow: ", ["bold"]);
+ App.UI.DOM.appendNewElement("span", node, `During a break, The Colonel managed to sell some generic schematics to the ${tradeShowAttendes} attendees, some of whom decided to also give a few menial slaves as a bonus.`);
}
- return [node, upkeep];
+
+ V.SF.MercCon.CanAttend = -1;
}
+ return [node, upkeep, profit];
function weeklyOptions() {
const choices = document.createElement("span");
diff --git a/src/Mods/SpecialForce/FireBase.js b/src/Mods/SpecialForce/FireBase.js
index 57917cf6ae781944786dd0a8db321dc6e1b8aaf4..05e600775b1e03ec055441dec2df7ad3ac2ced0e 100644
--- a/src/Mods/SpecialForce/FireBase.js
+++ b/src/Mods/SpecialForce/FireBase.js
@@ -6,7 +6,7 @@ App.UI.FireBase = function() {
let r = [];
if (V.SF.FS.Tension > 100) {
- node.append(App.Mods.SF.fsIntegration.badOutcome());
+ return App.UI.DOM.appendNewElement("div", node, App.Mods.SF.fsIntegration.crisis()[0]);
} else {
if (V.cheatMode > 0 || V.debugMode > 0) {
App.UI.DOM.appendNewElement("div", node, App.UI.DOM.passageLink("Edit", "editSF"));
@@ -100,7 +100,7 @@ App.UI.FireBase = function() {
App.UI.DOM.appendNewElement("p", node, ROE());
App.UI.DOM.appendNewElement("p", node, Accountability());
App.Events.addParagraph(node, ["Force depravity is a measure of how cruel and indifferent solders of the force are. This affects trade, how the force is viewed and or acts during some situations. Lower values lead to more ideal outcomes."]);
-
+
if (V.SF.MercCon.CanAttend === 0 || V.SF.MercCon.History >= 1 && repeatTrigger) {
r.push(`Her expression changes as something jogs her memory. "Before we begin, ${isBrazen ? `${properTitle()}` : 'boss'},`);
if (V.SF.MercCon.CanAttend === 0) {
@@ -162,8 +162,8 @@ App.UI.FireBase = function() {
} else {
App.UI.DOM.appendNewElement("span", node,
App.UI.DOM.combineNodes(
- App.UI.DOM.makeElement("span", `${ratio()}`, "bold"),
- " the special force is assigned to undercover work, which will primarily advance your cultural goals while also slightly boosting your reputation."
+ App.UI.DOM.makeElement("span", `${ratio()}`, ["bold"]),
+ " the Special Force is assigned to undercover work, which will primarily advance your cultural goals while also slightly boosting your reputation."
)
);
App.UI.DOM.appendNewElement("span", node, assignTroopsLink(" Re-allocate the units", "Lock", 0));
@@ -176,10 +176,10 @@ App.UI.FireBase = function() {
const text = new DocumentFragment();
let focus = document.createElement("span");
App.UI.DOM.appendNewElement("span", focus, mapping());
-
+
App.UI.DOM.appendNewElement("span", text, "Deployment focus: ");
App.UI.DOM.appendNewElement("span", text, focus, "bold");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("Recruiting and Training",
() => {
V.SF.Target = "recruit";
@@ -187,7 +187,7 @@ App.UI.FireBase = function() {
}, [], "",
"Increases the amount of FNGs at the cost of revenue."
), "indent");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("Securing Trade Routes",
() => {
V.SF.Target = "secure";
@@ -195,7 +195,7 @@ App.UI.FireBase = function() {
}, [], "",
"Increases trade and reputation at the cost of revenue."
), "indent");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("Raiding and Slaving",
() => {
V.SF.Target = "raiding";
@@ -203,9 +203,9 @@ App.UI.FireBase = function() {
}, [], "",
"Increases revenue at the cost of less FNGs and increased force depravity."
), "indent");
-
+
return text;
-
+
function mapping() {
switch (V.SF.Target) {
case "recruit":
@@ -217,15 +217,15 @@ App.UI.FireBase = function() {
}
}
}
-
+
function ROE() {
const text = new DocumentFragment();
let focus = document.createElement("span");
App.UI.DOM.appendNewElement("span", focus, mapping());
-
+
App.UI.DOM.appendNewElement("span", text, "Rules of Engagements: ");
App.UI.DOM.appendNewElement("span", text, focus, "bold");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("Hold Fire",
() => {
V.SF.ROE = "hold";
@@ -233,7 +233,7 @@ App.UI.FireBase = function() {
}, [], "",
"Reduces force depravity."
), "indent");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("limited Fire",
() => {
V.SF.ROE = "limited";
@@ -241,7 +241,7 @@ App.UI.FireBase = function() {
}, [], "",
"Does not adjust force depravity."
), "indent");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("Free Fire",
() => {
V.SF.ROE = "free";
@@ -249,9 +249,9 @@ App.UI.FireBase = function() {
}, [], "",
"Increases force depravity."
), "indent");
-
+
return text;
-
+
function mapping() {
switch (V.SF.ROE) {
case "hold":
@@ -263,15 +263,15 @@ App.UI.FireBase = function() {
}
}
}
-
+
function Accountability() {
const text = new DocumentFragment();
let focus = document.createElement("span");
App.UI.DOM.appendNewElement("span", focus, mapping());
-
+
App.UI.DOM.appendNewElement("span", text, "Rules of Engagements: ");
App.UI.DOM.appendNewElement("span", text, focus, "bold");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("Strict Accountability",
() => {
V.SF.Regs = "strict";
@@ -279,7 +279,7 @@ App.UI.FireBase = function() {
}, [], "",
"Reduces force depravity."
), "indent");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("Some Accountability",
() => {
V.SF.Regs = "some";
@@ -287,7 +287,7 @@ App.UI.FireBase = function() {
}, [], "",
"Does not adjust force depravity."
), "indent");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("No Accountability",
() => {
V.SF.Regs = "none";
@@ -295,9 +295,9 @@ App.UI.FireBase = function() {
}, [], "",
"Increases force depravity."
), "indent");
-
+
return text;
-
+
function mapping() {
switch (V.SF.Regs) {
case "strict":
diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index 2ab9c9a042b4b9cf9c459f687b1a843b3cdabf6b..20486d8497e590ae1e36e731377b0288a7e5773c 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -17,7 +17,7 @@ App.Mods.SF.Init = function() {
ROE: "hold",
Target: "recruit",
Regs: "strict",
- Lower: "the special force",
+ Lower: "the Special Force",
ArmySize: 40,
SatLaunched: 0,
Squad: {},
@@ -80,6 +80,7 @@ App.Mods.SF.totalNetWorth = function() {
value += V.SF.CreditsInvested;
value += V.SF.MercCon.Revenue;
value -= App.Mods.SF.AAR()[1];
+ value += App.Mods.SF.AAR()[2];
}
return value;
};
diff --git a/src/Mods/SpecialForce/SpecialForceBC.js b/src/Mods/SpecialForce/SpecialForceBC.js
index 3fbbdeedd399154e81c127537d8fa352459bc998..6aaf1a57088ce70f6297bc1b49a7917219225be3 100644
--- a/src/Mods/SpecialForce/SpecialForceBC.js
+++ b/src/Mods/SpecialForce/SpecialForceBC.js
@@ -77,7 +77,7 @@ App.Mods.SF.BC = function() {
V.SF = {Toggle: V.SFMODToggle, Active: V.securityForceActive};
InitClean();
if (V.securityForceName === undefined) {
- V.securityForceName = "the special force";
+ V.securityForceName = "the Special Force";
}
if (V.SF.Active >= 1) {
Object.assign(V.SF, {
@@ -216,7 +216,7 @@ App.Mods.SF.BC = function() {
V.SF.ROE = V.SF.ROE || "hold";
V.SF.Target = V.SF.Target || "recruit";
V.SF.Regs = V.SF.Regs || "strict";
- V.SF.Lower = V.SF.Lower || "the special force";
+ V.SF.Lower = V.SF.Lower || "the Special Force";
V.SF.ArmySize = V.SF.ArmySize || 40;
@@ -327,6 +327,27 @@ App.Mods.SF.BC = function() {
delete V.SF.Units; delete V.SpecOpsLock; delete V.SF.U; delete V.SF.WG;
delete V.SF.Subsidy; delete V.SF.SpecOps; delete V.SF.SpecOpsLock; delete V.SFUC;
+ if (V.SF.FS.BadOutcome && !V.SF.Colonel.Core) {
+ switch(V.SF.FS.BadOutcome) {
+ case 'MIGRATION':
+ V.SF.Colonel.Core = "kind";
+ break;
+ case 'Revolt':
+ case 'ANNIHILATION':
+ V.SF.Colonel.Core = "cruel";
+ break;
+ case 'OCCUPATION':
+ V.SF.Colonel.Core = "brazen";
+ break;
+ case 'ASSIMILATION':
+ V.SF.Colonel.Core = "jaded";
+ break;
+ case 'ISOLATION':
+ V.SF.Colonel.Core = "shell shocked";
+ break;
+ }
+ }
+ delete V.SF.FS.BadOutcome;
if (V.SF.BadOutcome !== undefined) {
delete V.SF.BadOutcome;
}
diff --git a/src/Mods/SpecialForce/SpecialForceFS.js b/src/Mods/SpecialForce/SpecialForceFS.js
index 5835b1237d253f5045b4c86b3bb113b7ecc1543b..37937314e597a0dba2981fd821369555376e8562 100644
--- a/src/Mods/SpecialForce/SpecialForceFS.js
+++ b/src/Mods/SpecialForce/SpecialForceFS.js
@@ -3,8 +3,7 @@ App.Mods.SF.fsIntegration = (function() {
list,
menu,
flavourText,
- badOutcome,
- badOutcomeFirebase
+ crisis,
};
function list() {
@@ -152,7 +151,7 @@ App.Mods.SF.fsIntegration = (function() {
barracks = `The barracks are certainly not the first of their kind in the Free Cities, but they are among the first to provide an actual side room for Barracks-slaves to relax in when their shifts are done. The Slave Lounge is very well furnished, with soft furniture and a large wallscreen television to maximize comfort. Sometimes the occasional soldier will even drop by when they want to spend time with some 'civvies' for a change.`;
armoury = `On the largest wall in the armoury, there is a massive wallscreen. This wallscreen serves as an interactive digital plaque of commemoration. Upon it lie the listed names of every retired and deceased former member of the Firebase, and one only has to touch it to see a listee's profile, search for a specific name, or scroll up or down the immense list. If one were only to touch a name, they will see a profile pop-up containing the full life story of that soldier -- or at least as much of it as they wanted to share -- along with their full service records, with special emphasis placed on any heroic deeds in battle or valorous conduct in general. On tiny wallspeakers, triumphant music gently plays while onlookers scroll. On both flanks of the wallscreen, an honor guard stands vigil.`;
commandCenter = `The command center has been made extremely comfortable. The tables and chairs are adjustable, each battle station has its own heating and air conditioning unit for highly localized climate control, and there is are monthly rewards for commanders who manage to keep soldier, slave, and civilian casualties especially low. There is a long sofa near the entrance for obedient slaves assigned here to relax and chat on when not being called to serve. Next to the sofa there is also a big plush rug piled with soft pillows if a deserving commander or two wants to have a relaxing fuck with unoccupied slaves. The atmosphere is relaxed and cordial by military standards, even between the slaves and staff.`;
- drugLab = `In the 'special projects chamber' of the drug laboratory, the balcony's sealed control room overlooks a hopeful sight: rows upon rows of rejuvenation tanks installed here house dozens of critically injured soldiers and slaves from all around the Firebase, and even a few dying citizens from the main arcology; here the drug laboratory tests, applies, and perfects its newest curative formulae and solutes on emergency patients that need them most.In the 'special projects chamber' of the drug laboratory, the balcony's sealed control room overlooks a hopeful sight: rows upon rows of rejuvenation tanks installed here house dozens of critically injured soldiers and slaves from all around the Firebase, and even a few dying citizens from the main arcology; here the drug laboratory tests, applies, and perfects its newest curative formulae and solutes on emergency patients that need them most.`;
+ drugLab = `In the 'special projects chamber' of the drug laboratory, the balcony's sealed control room overlooks a hopeful sight: rows upon rows of rejuvenation tanks installed here house dozens of critically injured soldiers and slaves from all around the Firebase, and even a few dying citizens from the main arcology; here the drug laboratory tests, applies, and perfects its newest curative formulae and solutes on emergency patients that need them most.`;
personalItems = `The proud slave owners in the Firebase can be seen donating portions of their free time to studying and applying the slave improvement materials in their possession; best-selling slave-training books, novelty slave clothing, and slave nutrition meal plans are all commonplace tools to slavemaster hobbyists in your martial employ. Especially notable are the slave-oriented gifts such as slave-written gift books or randomized gift boxes for deserving slaves who like surprises.`;
droneBay = `The many slave-capture drones have all been equipped with helpful light cyber-warfare suites meant to take over nearby enemy and civilian devices to display or broadcast simple messages; unprotected PDA's, computers, smartphones, radios, comm-beads, and so on are hijacked to communicate placative statements like "PLEASE SURRENDER", "DON'T SHOOT", or "WE'RE HERE TO HELP".`;
garage = `Safety, Survivability, and Dependability are very high priorities for the dedicated maintenance and refitting crews of the garage. There are safety notices pasted onto the walls of many duty stations within the garage, clearly encouraging mechanics and crewmen to exercise great caution and best practices in dealing with the vehicles in their care. Additional safety instructions and even some well-wishes painted on by the staff can be found inside the vehicles as well.`;
@@ -230,7 +229,7 @@ App.Mods.SF.fsIntegration = (function() {
aircraft = `The aircraft deployed from the garage are distinguished for their massive energy outputs. They are maintained and flown with a very high carbon footprint and heat signature thanks to the domestically-made custom nuclear-powered engine systems employed to ensure that the Firebase's air power is extremely capable. Your air force is proud to do all that it can to channel the FIRE in FIREBASE.`;
luxuries = `Whereas some peoples make changes to the technology they use, your people have their technology make changes to them. The brightly backlit transformation tower stands arrogantly before the entrance of the common area, and it is a sight of behold. Inside the tower, Robotic arms featuring finely-calibrated surgical instruments and independent AI operational systems whirr overhead in a dizzying variety. Those who enter always leave exactly one hour later, physically transformed in some manner, be it minor or major. The Firebase's precise and dedicated machinists and hacker hobbyists regularly volunteer to mod, update, and debug the devices here and keep it supplied with all the synthetic parts needed to continue making modifications to those who enter. This fan-sourced mathematical masterpiece a fine testament to the wonders of artificial design.`;
perimeter = `In the entrance grounds to the arcology's Firebase, there is a rustic miniature township to be found, complete with paved roads, brick houses, and even its own town hall. However, for an invading opponent, this place will be anything but welcoming. The few 'houses', 'shops', 'diners', and other structures feature anything from explosives-rigged cars parked outside, to hidden snipers, to hidden anti tank teams. Departing or returning troops can safely pass using the explosives-rigged, sniper-guarded roadway the circumvents all of this, but your enemies have no such luck.`;
- roleplaying = `Endurance and Adaptability have taken on special importance in the Firebase subculture. Everyone here has taken on some level of personal enhancement; Faces and other body parts surgically lifted, breasts and buts shaped up with implants for the ladies, and plenty of personalized tattoos abound. 3D printed designer foods, lab-concocted superdrinks, and experimental nanotech drugs are not only a fashion, but a focus, as the punks of the Firebase race towards the future. Even more impressive are the sub-contracted bionic installation modules employed within the Firebase's intensive care facilities; great pains are taken to replace battle-damaged body parts with domestically-manufactured replacements as needed. Evolution and Progress seem to be strong personal priorities for most individuals here, and this can be seen in the way they push themselves to become... More.`;
+ roleplaying = `Endurance and Adaptability have taken on special importance in the Firebase subculture. Everyone here has taken on some level of personal enhancement: faces and other body parts surgically lifted, breasts and butts shaped up with implants for the ladies, and personalized tattoos aplenty. 3D printed designer foods, lab-concocted superdrinks, and experimental nanotech drugs are not only a fashion, but a focus, as the punks of the Firebase race towards the future. Even more impressive are the sub-contracted bionic installation modules employed within the Firebase's intensive care facilities; great pains are taken to replace battle-damaged body parts with domestically-manufactured replacements as needed. Evolution and Progress seem to be strong personal priorities for most individuals here, and this can be seen in the way they push themselves to become... More.`;
colonel = `Transformation Fetishism: The Colonel is sporting some very small breast and butt implants, just enough to undo some of the recent sagging she's been secretly bothered by. When she's not properly dressed, your trained eye can detect that her tits and ass are just a little too round and perfect nowadays to be fully natural. Nevertheless, she's happier with the way she looks now, and so are you.`;
break;
case 'Youth_Preferentialism':
@@ -283,7 +282,7 @@ App.Mods.SF.fsIntegration = (function() {
dec = `Slimness Enthusiasm: a fashion for slaves with girlish figures.`;
gift = `In celebration of Slimness Enthusiasm, you've gifted The Colonel with her very own fleet of small single-seater reconnaissance buggies, all made from extremely lightweight-yet-durable alloys, and precisely engineered miniature nuclear reactors meant to allow each vehicle in the fleet to achieve obscene speeds in the field in all terrains. They even come with roof hardpoint mounts for mounting light remote-operated weapons. Thanks to their stellar support systems they also ensure driver safety and orientation during use, reliably absorbing and redistributing the energy received from the multitude of shocks, bounces, g-forces, jolts, jumps, and other maneuverability hiccups that would make these vehicles impossible to handle without them. All that being said, they are very fun to drive and eventually master. Also, their extreme mobility, tiny target profiles, quiet engines, and ease of camouflage all make them excellent recon vehicles for The Colonel and her friends to use for races, scouting missions, and raids whenever things in the Firebase get too boring.`;
foods = `The meals are prepared and presented as low-calorie or even calorie-free, stripping fatty content wherever possible. Smaller portions and slices than market standard are not uncommon either.`;
- media = `Much of the movies and porn videos the troops receive prominently feature glamorous model-thin actors and actresses alike, with tiny tits and asses, and usually very little bodyfat. With bodies so light and thin, every endeavor onscreen, from fight scenes to sex scenes, is usually very intense and fast paced.`;
+ media = `Much of the movies and porn videos the troops receive prominently feature glamorous model-thin actors and actresses alike, with tiny tits and asses, and usually very little body fat. With bodies so light and thin, every endeavor onscreen, from fight scenes to sex scenes, is usually very intense and fast paced.`;
slaves = `A good portion of the slaves in the Firebase are quite skinny. They have slim assets on their bodies and are generally lightweight. A few discerning troops are seen checking them out from afar, from time to time.`;
cages = `The new slaves kept in the processing cages are aggressively slimmed down. They are given only one medium-sized meal at midday, and yet they are required to work and train for their new lives just as hard as any other slave.`;
commonArea = `Along the greatest length of the common area, there is a full proper running track, complete with laid tarmac and white paint. It is comparable to the tracks used by any modern sports team, and even has a tiny booth staffed by in-house bookies, where troopers go to place their bets or collect their prizes for the weekly slave Races and monthly Coursing games. This track also has a feature you wouldn't find on most tracks, which are the compact wheeled cages on either end, for owners to store their prized runner slaves, or collect a runner slave they just won through their bets. Aside from concession stands, raised seats are lined up on the sides of the racetrack, for spectators and judges to observe and film the footraces themselves.`;
@@ -373,13 +372,13 @@ App.Mods.SF.fsIntegration = (function() {
break;
case 'Hedonistic_Decadence':
dec = `Hedonistic Decadence: societal acceptance of overindulgence and immediate gratification. Be it food, drink, sex, drugs or whatever one's desire may be.`;
- gift = `With the help of her own personal Amphibious Resupply Landship, The Colonel can support ongoing operations within friendly lines while doing very little work herself, independent of whatever the rest of the Firebase is up to. This massive, high-capacity, quad tracked vehicle can seamlessly transition from land to sea and vice-versa, while supporting dozens of heavy ammo crates, several refueling hoses & fuel pumps, and a whole week's worth of rations and recreational refreshments for an entire infantry company. This vehicles long range and ease of use makes it a perfect vehicle for The Colonel to stay productive during her more lackadaisical moods.`;
+ gift = `With the help of her own personal Amphibious Resupply Landship, The Colonel can support ongoing operations within friendly lines while doing very little work herself, independent of whatever the rest of the Firebase is up to. This massive, high-capacity, quad-tracked vehicle can seamlessly transition from land to sea and vice-versa, while supporting dozens of heavy ammo crates, several refueling hoses & fuel pumps, and a whole week's worth of rations and recreational refreshments for an entire infantry company. This vehicle's long range and ease of use makes it a perfect vehicle for The Colonel to stay productive during her more lackadaisical moods.`;
foods = `Delightful platters of bewildering varieties of foods and baked treats are available on demand, as the cooks and slave-cooks toil day and night on rotation to keep it all coming. Each soldier gets a tray at every meal to fill and stack as he or she pleases, with a small free packet of recreational drugs given with every meal.`;
- media = `Quotes, Stories, and Essays from across the ages written on the topics of desire, indulgence, pleasure, or the importance of these things to the human experience are all available in lots of little booklets available by the stack throughout the Firebase. Meanwhile, pornography featuring curvy, plush, or even obese women is easily accessible on the laminated tablets that have been distributed throughout the Firebase.`;
+ media = `Quotes, stories, and essays from across the ages written on the topics of desire, indulgence, pleasure, or the importance of these things to the human experience are all available in lots of little booklets available by the stack throughout the Firebase. Meanwhile, pornography featuring curvy, plush, or even obese women is easily accessible on the laminated tablets that have been distributed throughout the Firebase.`;
slaves = `Many of the slaves here are quite hardworking; they need to supply a constant amount of food, drink, drugs, games, media, clean holes, and other entertainments to the impatient soldiers around, who are in constant need of fast gratification. The slaves deal with all the stress and anxiety by indulging in some extra drinks and drugs themselves, and they have some extra soft padding on their bodies and assets to prove it.`;
cages = `Sex toys, and a generous supply of snack bars, porn magazines, and electric cigarettes are issued to every cage inmate upon internment. The captives are free to relieve their anxieties at any time, and are encouraged to do so.`;
commonArea = `The east end of the common area has the tables and chairs there packed much more tightly together than before, and for good reason; the entire wing is dominated by an Olympic-sized hot tub, flanked on both sides by beach chairs, food vendors, LAN party lounges, and even unisex changing rooms. This open air resort is a widely frequented attraction; with support staff, soldiers, and even some highly-favored slaves partaking of its attractions whenever they have the time. The air is heavy with drug fumes and the smell of food. You see a few empty alcohol bottles floating idly in the steamy water.`;
- barracks = `Every bed unit has a tiny refrigerator unit attached at the head. At any given time, a cold drink, some cool leftovers, or a chilled shot of injections is just within arms reach for any soldier resting. Above soldiers' heads is a small touchscreen monitor attached to an adjustable arm, so that troops are never without options for entertainment either.`;
+ barracks = `Every bed unit has a tiny refrigerator unit attached at the head. At any given time, a cold drink, some cool leftovers, or a chilled shot of injections is just within arm's reach for any soldier resting. Above soldiers' heads is a small touchscreen monitor attached to an adjustable arm, so that troops are never without options for entertainment either.`;
armoury = `Cushioned couches, lounge chairs, and futons lie all around the armoury, and on every last one of them lies a debriefed soldier sleeping off their last deployment with the help of some opium. Most of them haven't even bothered to change out of their fatigues, and many have their weapons and body armor strewn carelessly on the floor beside them. Further still, a few have their pants pulled down to their ankles, whilst an intoxicated slave-whore lazily rides them. Heavy smoke fills the air, and adjacent to the central quartermaster's booth is a tidy fast food bar where shots of soft drinks, small plates of fried foods, and tiny condiments are always in quick supply for those that the time to spare.`;
commandCenter = `There are drug platters, snack bowls, and punch bowls for every battle station of the command center. During combat maneuvers the staff here are especially ravenous, chugging down large amounts of substance while they send messages that carry power over life and death. The pressure to succeed and secure victory is high, and in order to cope, the staff consume.`;
drugLab = `The distribution point of the drug laboratory is an eerie place, with a very thick white mist for soldiers to stroll through on their way to the drug selection buffet. The mist is so dense and rich that many soldiers report feeling either high or buzzed after just a few minutes inside of it.`;
@@ -387,11 +386,11 @@ App.Mods.SF.fsIntegration = (function() {
droneBay = `Your drone technicians are proud of how little upkeep the drones they work on require, how little time they need to spend on tune-ups whenever maintenance time does finally come around, and how easy said maintenance is. Your drones haven't been upgraded too often, as their sheer power output is high enough to be sufficient for operational requirements for a long time to come.`;
garage = `There are treats of all kinds all over the garage, to set the hardworking staff here at ease. Unclad sex slaves bounce up and down on the laps of debriefed crewmen while waitress slaves rush about carrying platters of hors d'oeuvres to mechanics that summon them, feeding the mechanics hand-to-mouth while they make their adjustments. There are drugs all over the garage too, half-snorted, half-injected, and half smoked. Substances pepper the garage as the workmen get their fixes in between the fixes they perform on the vehicles. It is not uncommon to find tweakers passed out underneath or next to the vehicles they were just tweaking because of this.`;
vehicle = `The staff of the garage work hard within a very comfortable environment, and according to them they need their many comforts, but your combat-active crewmen deserve some comforts as well. On the interior of every vehicle are very plush massage-chair seats, powerful air conditioning suites, and of course, delightful compact pill dispensers that help ensure that no deployment is ever a dull one.`;
- hangar = `The personnel within the hangar work with great levity, with every person's working shift beginning with a tall glass of beer (barring a direct attack on the arcology). Your staff and pilots are aware that their combat role is not as physically strenuous as that of their mechanized and infantry comrades, and they fully intend on taking advantage of that fact to get more partying done. All around the hangar, right next to well-serviced aircraft, you can see idle personnel doing lines on the nearest available surface, dancing together in empty spaces, enjoying succulent desert foods and expensive drinks large trays, and so on. Your pilots are very relaxed too, with their drug-induced states being a useful asset in their high-risk flight missions that sometimes require them to make very brave maneuvers in order to more effectively engage enemy forces. As such, your ace pilots are some of the most high-tolerance users you've ever seen.`;
+ hangar = `The personnel within the hangar work with great levity, with every person's working shift beginning with a tall glass of beer (barring a direct attack on the arcology). Your staff and pilots are aware that their combat role is not as physically strenuous as that of their mechanized and infantry comrades, and they fully intend on taking advantage of that fact to get more partying done. All around the hangar, right next to well-serviced aircraft, you can see idle personnel doing lines on the nearest available surface, dancing together in empty spaces, enjoying succulent desert foods and expensive drinks on large trays, and so on. Your pilots are very relaxed too, with their drug-induced states being a useful asset in their high-risk flight missions that sometimes require them to make very brave maneuvers in order to more effectively engage enemy forces. As such, your ace pilots are some of the most high-tolerance users you've ever seen.`;
aircraft = `The personnel of the hangar are impressively pampered on their own, but they seem to have applied their dedication to delight to the vehicles in their care as well. Every airframe has been carefully enlarged to fit ever more luxuries and comforts into every aircraft. Internal heating and cooling systems are enhanced, every passenger compartment comes with its own wallscreen HDTV, and soft padded reclining seats line each passenger compartment, among other accommodations. No effort is spared in ensuring deployed troops and pilots are put at ease as soon as they mount up. After all, isn't continuous gratification a key aspect of Hedonism?`;
- luxuries = `A stark narrow building occupies the space near the drug laboratory, where it can receive easy shipments anesthetics, filtrates, and detoxifying substances from the lab for the sake of any visitor in need of them. Within this spacious zone lie a long row of surgical chairs, where occupants can simply sit down and be placed into a deep rest by the numerous attendants, before being operated upon by the autosurgery suites above to receive advanced liposuction, carcinogenic filtration, and curative injection procedures that quickly and somewhat painlessly prolongs their lives and repairs the damage to their bodies incurred by their wild are carefree lifestyles within the Firebase. For those willing to pay the fees, this place provides the pleasure-obsessed population with powerful longevity solutions that they cannot replicate elsewhere within the Firebase, and eliminating the need to settle for intermittent diet & exercise or to waste their free time traveling to the crowded clinics in the arcology above. Your warriors and their support staff are all grateful for the opportunity to sustain their truly decadent lifestyles without guilt or consequence.`;
- perimeter = `Luxury cruises have long been a popular interest in your Firebase subculture, and now, your personnel have a worthy environment to explore that interest. A small artificial lake has been built outside the Firebase entrance to host a small but well furnished premium yacht. The yacht lazily makes its daily revolutions around this lake, filled with rare and ever-changing entertainments that once cannot find inside the Firebase itself.`;
- roleplaying = `Your soldiers are rather lackadaisical about themselves and their bodies; the Firebase is a carefree place. Fun and Relaxation are pursuits of choice, as the weekly orgies, eating competitions, and drug exhibitions require little effort to enjoy. The peer pressure to indulge and make the most of each day is inescapable, and every individual has been seen participating in most of the delights available at least once. Obviously, every person down here, bar some of the newer recruits, has a very jolly disposition. Some are drunk, high, or both. Others are passed out. Some are just laughing at the others. However, everyone is thoroughly entertained.`;
+ luxuries = `A stark narrow building occupies the space near the drug laboratory, where it can receive easy shipments of anesthetics, filtrates, and detoxifying substances from the lab for the sake of any visitor in need of them. Within this spacious zone lies a long row of surgical chairs, where occupants can simply sit down and be placed into a deep rest by the numerous attendants, before being operated upon by the autosurgery suites above to receive advanced liposuction, carcinogenic filtration, and curative injection procedures that quickly and somewhat painlessly prolong their lives and repair the damage to their bodies incurred by their wild and carefree lifestyles within the Firebase. For those willing to pay the fees, this place provides the pleasure-obsessed population with powerful longevity solutions that they cannot replicate elsewhere within the Firebase, and eliminating the need to settle for intermittent diet & exercise or to waste their free time traveling to the crowded clinics in the arcology above. Your warriors and their support staff are all grateful for the opportunity to sustain their truly decadent lifestyles without guilt or consequence.`;
+ perimeter = `Luxury cruises have long been a popular interest in your Firebase subculture, and now, your personnel have a worthy environment to explore that interest. A small artificial lake has been built outside the Firebase entrance to host a small but well furnished premium yacht. The yacht lazily makes its daily revolutions around this lake, filled with rare and ever-changing entertainments that one cannot find inside the Firebase itself.`;
+ roleplaying = `Your soldiers are rather lackadaisical about themselves and their bodies; the Firebase is a carefree place. Fun and relaxation are pursuits of choice, as the weekly orgies, eating competitions, and drug exhibitions require little effort to enjoy. The peer pressure to indulge and make the most of each day is inescapable, and every individual has been seen participating in most of the delights available at least once. Obviously, every person down here, bar some of the newer recruits, has a very jolly disposition. Some are drunk, high, or both. Others are passed out. Some are just laughing at the others. However, everyone is thoroughly entertained.`;
colonel = `Decadent Hedonism: The Colonel has a thin layer of fat covering her muscles and overall body, making her appealingly 'thicc' without making her slow or weak; she even jiggles in the precisely correct places when she walks. Every weekend she has entire trays of food and substances brought to her pavilion on rotation, and you have no idea where she manages to put it all. She's certainly indulging her desires a lot more. She visits her doctors more often and regularly joins the training platoons in their daily runs to keep her body healthy.`;
break;
case 'Chattel_Religionism':
@@ -419,7 +418,7 @@ App.Mods.SF.fsIntegration = (function() {
break;
case 'Roman_Revivalism':
dec = `Roman Revivalism: a vision of a new Rome.`;
- gift = `The Colonel has been bestowed with an unmistakable and peerless. badge of office - a mastercrafted SPATHI sword, forged from nigh-unbreakable metals, made extremely sharp with the help of a machine that she also now owns, and equipped with an inbuilt communications array, holographic display projector, recharging port, and fingerprint scanner that delivers electric shocks to anyone other than The Colonel when wielded. It comes with an immaculate sheath, and a complementary gold-wrought laurel wreath and fine linen toga, further enabling her to command the legions of the Firebase with absolute authority and authenticity within the Roman tradition.`;
+ gift = `The Colonel has been bestowed with an unmistakable and peerless badge of office - a mastercrafted SPATHI sword, forged from nigh-unbreakable metals, made extremely sharp with the help of a machine that she also now owns, and equipped with an inbuilt communications array, holographic display projector, recharging port, and fingerprint scanner that delivers electric shocks to anyone other than The Colonel when wielded. It comes with an immaculate sheath, and a complementary gold-wrought laurel wreath and fine linen toga, further enabling her to command the legions of the Firebase with absolute authority and authenticity within the Roman tradition.`;
foods = `You spare no expense to supply your troops with increasingly rare boar and deer meat, distinctive of Roman cuisine.`;
media = `Soldiers also enjoy fresh fruits while watching gladiator games, public speakings of famous orators or the history of Ancient Rome on wall-screen TV.`;
slaves = `All of the slaves serving here are from outside of your arcology, captured during the many military expeditions staged from the Firebase.`;
@@ -572,7 +571,7 @@ App.Mods.SF.fsIntegration = (function() {
garage = `The garage, also known as the Chekù, is filled with noise of jìshis performing check-ups, upgrades, and repairs on your vehicles, thus ensuring that Chinese works still leave the world in awe.`;
vehicle = `Particular vehicles within the garage have been painted with your Imperial coat of arms and decorated with intimidating dragon's heads on their fronts.`;
hangar = `The hangar, also known as the Jikù, is filled with noise of jìshis performing check-ups, upgrades, and repairs on your aircraft, while the stalwart feixÃngyuán prepare to extend your reach to the Heavens themselves.`;
- aircraft = `When the mission allows, the military aircraft deployed beyond your arcology's airspace are decorated with brightly-glowing neon yellow chrysanthemum-symbol decals that herald the incoming domination of the emperor's special forces.`;
+ aircraft = `When the mission allows, the military aircraft deployed beyond your arcology's airspace are decorated with brightly-glowing neon yellow chrysanthemum-symbol decals that herald the incoming domination of the emperor's Special Forces.`;
luxuries = `You also notice that the several nearby vendors here are proper and respectable establishments offering a variety of goods and services: from classes teaching ancient Chinese arts, to beautiful clothes and jewelry, these shops cater grandly towards the culture. At the nearby officers' workshop, an veteran commander conducts a detailed review of 'The Art of War' to the inexperienced new NCO's in attendance.`;
perimeter = `Outside the Firebase gates, a majestic walled perimeter has been carefully erected so as to make the outside grounds of the Firebase more closely resemble the Forbidden City; a broad garden of bright yellow chrysanthemums, a heavily reinforced stone roadway with accompanying stone footpaths, finely sanded wooden benches and fences, and brightly colored walls and gates greet any who would presume to enter or exit the Firebase domain... Besides you, of course.`;
roleplaying = `Your soldiers put in effort carry themselves in a manner befitting such a communal setting; they are cooperative, diligent, and disciplined at all times. They identify first and foremost as warriors of 'the emperor', and are proud to have a powerful empire such as your arcology to call home and fight for. In their personal dealings, they do their best to handle most affairs using the esteemed Mandarin dialect, and they avoid unseemly things like disloyalty, foolishness, and dishonor like the plagues that they are. These are true Imperial men and women, and they will relentlessly carry your society into the future as they fight to impress your name upon both Heaven and Earth themselves.`;
@@ -761,101 +760,124 @@ App.Mods.SF.fsIntegration = (function() {
return node;
}
- function badOutcome() {
- V.arcologies[0].prosperity -= 50;
- cashX(-V.cash * 0.25, "specialForces");
- let r = ``;
- let BadOutcome = '';
+ /**
+ * @returns {[text: DocumentFragment, type: String]}
+ */
+ function crisis() {
+ const t = new DocumentFragment();
+ const firstExecution = V.SF.Active !== -2;
+ if (["Firebase", "Economics"].includes(passage())) {
+ V.arcologies[0].prosperity -= (firstExecution ? 10 : 5);
+ }
+ if (firstExecution) {
+ cashX(forceNeg(V.cash * 0.25), "specialForces");
+ }
V.rep = Math.clamp(V.rep, 0, 17500);
+
+ if (passage() === "Economics" && !firstExecution) {
+ App.UI.DOM.appendNewElement("div", t, `This week your arcology lost a bit of prosperity and large amount of reputation, due to the looming threat that The Colonel and her forces may resurface.`, ["red"]);
+ }
+
+ let type;
switch (V.SF.Colonel.Core) {
case "kind":
- BadOutcome += 'MIGRATION';
- addTrinket("The Colonel's handkerchief");
- r += `Your Colonel has had enough of your meddling. In her eyes, you've broken faith with her. She asked one thing of you in return for her full support, and you could not even give her that.`;
- r += `<br>At midnight, a great mechanized convoy, the biggest you've seen in a long while, streams out of your Arcology. Troop Carriers, Aircraft, Heavy Trucks, and other war machines of varying sizes pour out of the Firebase in tight formation. The Colonel is refusing your calls, and you know it would be ill advised to go out there yourself or to try to stop them with force. The many bandits and mercenary groups that the convoy will inevitably pass by will probably feel this way as well. You have no idea where they are going or how they will end up, but with their wealth and weaponry, you are not worried.`;
- r += `<br>Upon your inspection of the abandoned firebase itself, most of the heavier installations have been dismantled and carried away, but about ${cashFormat(55000)} in miscellaneous supplies and 73 menials have been left behind, presumably because the convoy had no space for them. On The Colonel's old pavilion, you see a white gift card standing upright.`;
- r += `<br>When you climb the crates to take it and read it, you see The Colonel's handwritten sentiments about the way things turned out; her gratitude for taking her in when you did, her disappointment in your actions, a detailed account of your failings, her regrets that things had to end this way, and finally, her well wishes for your future endeavors.`;
- r += `<br>Disgusted, you pocket the gift card and leave your employees and menials to gather up the valuables here before stalking back to your Penthouse. The former Firebase is returned to being a warehouse facility.`;
+ type = 'MIGRATION';
+ if (firstExecution) {
+ addTrinket("The Colonel's handkerchief");
+ App.UI.DOM.appendNewElement("div", t, `Your Colonel has had enough of your meddling. In her eyes, you've broken faith with her. She asked one thing of you in return for her full support, and you could not even give her that.`);
+ App.UI.DOM.appendNewElement("div", t, `At midnight, a great mechanized convoy, the biggest you've seen in a long while, streams out of your Arcology. Troop Carriers, Aircraft, Heavy Trucks, and other war machines of varying sizes pour out of the Firebase in tight formation. The Colonel is refusing your calls, and you know it would be ill advised to go out there yourself or to try to stop them with force. The many bandits and mercenary groups that the convoy will inevitably pass by will probably feel this way as well. You have no idea where they are going or how they will end up, but with their wealth and weaponry, you are not worried.`);
+ App.UI.DOM.appendNewElement("div", t, `Upon your inspection of the abandoned firebase itself, most of the heavier installations have been dismantled and carried away, but about ${cashFormat(55000)} in miscellaneous supplies and 73 menials have been left behind, presumably because the convoy had no space for them. On The Colonel's old pavilion, you see a white gift card standing upright.`);
+ App.UI.DOM.appendNewElement("div", t, `When you climb the crates to take it and read it, you see The Colonel's handwritten sentiments about the way things turned out; her gratitude for taking her in when you did, her disappointment in your actions, a detailed account of your failings, her regrets that things had to end this way, and finally, her well wishes for your future endeavors.`);
+ App.UI.DOM.appendNewElement("div", t, `Disgusted, you pocket the gift card and leave your employees and menials to gather up the valuables here before stalking back to your Penthouse. The former Firebase is returned to being a warehouse facility.`);
+ } else if (passage() === "Manage Penthouse") {
+ App.UI.DOM.appendNewElement("div", t, "Visiting the Firebase just takes you to an empty, eerie storeroom now.");
+ }
break;
case "cruel":
if (jsRandom(1, 100) > 50) {
- BadOutcome += 'Revolt';
- addTrinket("The Colonel's dog tags");
- r += `<br>Finally fed up with your constant intrusions into her territory and crew, The Colonel riles up her people for an utterly ferocious rebellion. The promises of rape and plunder and dominion over some of the wealthiest tenants in the entire Free City (and their world-class slaves) are all that's needed to give the selfish lot of them a nearly unshakable resolve in the task of delivering their overlord Her most coveted prize: You.`;
- r += `<br>It is now midnight. The lights are the first thing they disable, as they still have the excellent night vision equipment you purchased for them. Some of your citizens start panicking almost immediately at the sudden blackout; this is very reminiscent of the Daughters of Liberty attack that still haunts many of their memories. Things like this were never supposed to happen again. You had promised them that you'd create an army that would protect them...`;
- r += `<br>Her army vanguard strikes fast and hard throughout the main Plaza, cutting through your security personnel, defensive platoons, and drones with an ease that stinks of months of careful planning and study. Your defensive platoons, veterans of many Battles, are outmaneuvered at every turn; their hidden ammunition caches are found empty, their communications networks are mysteriously scrambled, and key chokepoints are found to be booby-trapped before your men can even get to them; their well-rehearsed arcology defense routines have gone to ash. Assuming you ever get a chance to speak to The Colonel again, you would ask if her betrayal was actually inevitable rather than something you triggered.`;
- r += `<br>You watch with immense disappointment as the very APC's and IFV's that you paid for now charge into resisting storefronts to storm the armed civilians inside with heavy infantry at point blank range. Battle Tanks trample wounded civilians in the streets as they maneuver to blast your citizens' hastily-made holdouts to pieces, burying dozens of civilian loyalists under mountains of rubble while hundreds more are gunned down in the streets for want of adequate cover. The Plaza is lost; the enemy vanguard has gained access to the Residential Sectors upstairs. Enticed, entire platoons of her vanguard decide to become bandits, ignoring their Colonel's orders and scattering off from the main force to kick down many apartment doors and help themselves to whatever desirable goods or inhabitants they find within.`;
- r += `<br>Outside, her many aircraft swarm the local airspace to patrol the Arcology outskirts, conduct recon scans of the upper levels, or monitor your sealed penthouse outside the range of your SAM turrets, while shooting down any other fleeing VTOL's. You will not be escaping by air today. No one will. No escaping by land either: Swarms of her drones are tasing fleeing noncombatants by the hundreds for later enslavement, as the remainder of her army begins to pour into the bloody Plaza. This is your Arcology's darkest hour.`;
- r += `<br>And yet your Mercenaries stand ready. On security feeds throughout the Residential Sectors and Garrison you see your elite sellswords charging out of their lodgings in full kit. They are few, but this is their home, and you are their Patron and Commander. They hold firm, fighting like legends of old in some places, and fighting like animals in others. The Mercenaries trapped downstairs near The Garrison take to the Markets, pinning down most of The Colonel's reinforcements from various shopping outlets using towed quad anti-aircraft guns, and ultimately cutting off many of the assets needed for The Colonel's ongoing assault upstairs. Enemy troop carriers laden with heavy infantry breach the shopping centers in order to dislodge them, only to have their inhabitants cooked alive before they can disembark in time or shot to pieces even when they do. Keeping these Mercenaries alive are the roving exosuit-clad tank hunter duos that frag entire armor platoons en route to these shopping outlets, resorting to carving open enemy AFV's up close with their powered CQB weapons once they've run out of missiles. Back in the Residencies upstairs, in the still-evacuating streets and atriums, your actively-camouflaged snipers take up choice positions on various balconies and overpasses, sowing panic among the advancing traitors with their impressive anti-material rifles with one explosive headshot after another, sometimes even hitting them through walls and buildings. In large indoor parks leading up to the main Residential courtyard, Mercenary fireteams force enemy flankers to flee every single footpath they walk through, harassing constantly and preventing any hostile reconnaissance or infiltration from being done.`;
- r += `<br>The main Residential courtyard features the Residential Sectors' massive elevator complex, which will give The Colonel's forces rapid access to the Promenade, and ultimately, You. In front of it, your Mercenary Captain stands atop one of the many meters-thick sandbag walls his men just assembled there, leading the raging defensive blockade in bringing the vanguard's assault to a gory halt. ${V.SF.Lower}'s bodies and bits and debris pile up in small walls on the outskirts under the burning heat of hundreds of flying autocannon rounds and dozens of screeching missiles. Before the vanguard's morale can break however, The Colonel shows up in person behind her own lines, kitted in a customized power armor and dragging, of all things, a hydraulic trebuchet loaded with a crudely-welded large metal box. She launches the box from beyond your Mercenaries' line of sight, sending it reeling towards them and predicting that they will try to shoot it out of the sky. They do, not wanting the slow but strange projectile to hit them directly, only learning of their folly when the metal 'box' detonates midair and releases a dense cloud of cluster bombs over their position. The munitions themselves disable some of the exosuits, but they don't kill too many on their own. However, the bomblets do succeed in detonating the various ammo dumps that were feeding your Mercenaries' blazing guns. The chain explosions, resulting fires, destroyed cover, and widespread casualties and confusion all create the perfect opportunity for The Colonel to storm the previously implacable barricade at the head of her troops, with her followers rushing the merc lines and blasting off the heavy armor plating of your disoriented Mercenaries themselves before stabbing them to death, or in some cases, hauling off the dis-armored and defeated female Mercenaries they discover for immediate use. As the few intact Mercenaries remaining desperately struggle to hold off the advancing horde with their remaining ammo, The Colonel takes on your dazed Mercenary Captain in single combat. When their ammunition runs dry, and their blasted battlesuits break down, they both eject, and then the knives come out. Minutes later, she stabs him in the side of his skull after she dodges yet another attempt to land a killing blow on her. With the source of Mercenary command and control gone, The Colonel staunches her own bleeding, yanks a trooper out of a near-pristine battlesuit that she now claims for herself, and directly organizes the isolation and extermination of the smaller teams of Mercenaries that are bleeding her troops everywhere else. She routs your Mercenaries for good with the razing of their Garrison structure. The ${V.SF.Lower} now enjoys absolute air and ground superiority. Soon the surviving rear of her army is brought upstairs from the killing floors down in the Markets, and the many elevators and cargo lifts of the elevator complex are boarded, with your executive override codes to remotely shut down the elevators somehow being manually bypassed by her combat engineers. It won't be long now.`;
- r += `<br>Dawn has broken over the Free City. Only five hours into the slaughter (of which your Mercenaries no doubt bought you at least three), it becomes very clear to you that the only way to save your arcology is to destroy it. Everything and Everyone will burn before you let this crazy bitch and her rabid dogs get their dirty hands on you or your slaves. On your order, your most loyal subordinates, the ones who were with you since the early days to patrol your arcology before you even had drones to protect it, fight their way to through the carnage of your panicking civilians on The Promenade to get to the exact hidden elevators that your Personal Assistant specifies for them. Their destination is the arcology's reactor complex, of course. Following the PA's instructions precisely, they arm their many high-yield explosive charges on your now-exposed and de-stabilized reactor, and in one final service to you, detonate them, creating a colossal explosion. The rapidly ascending heretics quite literally have the rug pulled from under them, as the blast takes out nearly all of the arcology's lesser foundational support beams, thus collapsing many thousands of metric tons of concrete, steel, plastic, and plaster out from underneath the upward bound Colonel and her men... And everyone else, unfortunately. With no foundation any longer, all of your arcology's interior Sectors are utterly gutted from the bottom-up by gravity itself, and everything beneath your ration-stocked, backup-powered Penthouse crumbles to the earth. The massive cloud of dust created by the widespread fires and interior collapse ends up covering the entire Free City for hours. Her aircraft, now bereft of their logistical support and command structure, immediately fly off to neighboring arcologies to offer their services to the various employers there, seeing as the coup has failed and they have nowhere else to go. The skies are free for You to travel as you please, but You aren't going anywhere.`;
- r += `<br>It is late evening when the tremors finally stop. Everything below your Penthouse is ruin, and your arcology, its population, and your reputation are now essentially dust. However, the arcology did not fall. It. Is. Still. Yours. You shall rise again, not flee this tragedy in shame. Of course, no one will ever know that you sacrificed the arcology deliberately in order to save yourself; it is all too easy to claim that The Colonel carelessly damaged the reactor complex during her assault, ironically causing her own defeat. Frankly, sacrificing most of your tenants doesn't bother you as much as it probably should; maybe its because you know that if The Colonel and her men had won, all those people were as good as dead anyway.`;
- r += `<br>You know that if you want to survive, you'll need to surround yourself with workers and allies to rebuild fast, else your rivals gobble you up. It costs you a horrific sum to clear and process the wreckage and rebuild the basic Sector superstructures and infrastructure for your arcology on such short notice, even after liquidating everything your workers salvage. Your powerful friends still residing in the old world or other Free Cities have lent you a surprising amount of aid too, with quite a few lent super-heavy construction assets getting huge amounts of work done quickly. Even then, what you've been able to rebuild is very little. After a nearly sleepless, sexless week of immense toil, you've successfully organized tens of thousands of people in restoring the arcology to a barely functional condition (along with rudimentary imitations of all your upgrades), and you've even got some new Garrison Mercenaries in by week's end too... But its just not the same. If it weren't for your bruised weather-plating your arcology would look like a giant skeleton. Inside, it feels like a concrete boneyard; everything has been built cheap and utilitarian, and the walls aren't even painted. With only a few operational services staffed by commuters from neighboring arcologies, there is just an eerie silence just about everywhere. With few amenities for relief, there are going to be many long days ahead for your few tenants, most of them being wealthy but distraught returning travelers who left before the attack. Maybe your slaves can help entertain them. A lot of these people are VIP's it seems.`;
- r += `<br>It is now midnight. In a rare moment of reflection, you contemplate that what The Colonel just did to your arcology was exactly what you were all too happy to have her do to dozens, if not hundreds of innocent villages and townships under your shadow during her 'Raiding and Slaving' operations. Nevertheless, You have hard work ahead of you, especially now that your enemies see that you are now much weaker than you have ever been.`;
- r += `<br>The Colonel's body was never found.`;
+ type = 'Revolt';
+ if (firstExecution) {
+ addTrinket("The Colonel's dog tags");
+ App.UI.DOM.appendNewElement("div", t, `Finally fed up with your constant intrusions into her territory and crew, The Colonel riles up her people for an utterly ferocious rebellion. The promises of rape and plunder and dominion over some of the wealthiest tenants in the entire Free City (and their world-class slaves) are all that's needed to give the selfish lot of them a nearly unshakable resolve in the task of delivering their overlord Her most coveted prize: You.`);
+ App.UI.DOM.appendNewElement("div", t, `It is now midnight. The lights are the first thing they disable, as they still have the excellent night vision equipment you purchased for them. Some of your citizens start panicking almost immediately at the sudden blackout; this is very reminiscent of the Daughters of Liberty attack that still haunts many of their memories. Things like this were never supposed to happen again. You had promised them that you'd create an army that would protect them...`);
+ App.UI.DOM.appendNewElement("div", t, `Her army vanguard strikes fast and hard throughout the main Plaza, cutting through your security personnel, defensive platoons, and drones with an ease that stinks of months of careful planning and study. Your defensive platoons, veterans of many Battles, are outmaneuvered at every turn; their hidden ammunition caches are found empty, their communications networks are mysteriously scrambled, and key chokepoints are found to be booby-trapped before your men can even get to them; their well-rehearsed arcology defense routines have gone to ash. Assuming you ever get a chance to speak to The Colonel again, you would ask if her betrayal was actually inevitable rather than something you triggered.`);
+ App.UI.DOM.appendNewElement("div", t, `You watch with immense disappointment as the very APC's and IFV's that you paid for now charge into resisting storefronts to storm the armed civilians inside with heavy infantry at point blank range. Battle Tanks trample wounded civilians in the streets as they maneuver to blast your citizens' hastily-made holdouts to pieces, burying dozens of civilian loyalists under mountains of rubble while hundreds more are gunned down in the streets for want of adequate cover. The Plaza is lost; the enemy vanguard has gained access to the Residential Sectors upstairs. Enticed, entire platoons of her vanguard decide to become bandits, ignoring their Colonel's orders and scattering off from the main force to kick down many apartment doors and help themselves to whatever desirable goods or inhabitants they find within.`);
+ App.UI.DOM.appendNewElement("div", t, `Outside, her many aircraft swarm the local airspace to patrol the Arcology outskirts, conduct recon scans of the upper levels, or monitor your sealed penthouse outside the range of your SAM turrets, while shooting down any other fleeing VTOL's. You will not be escaping by air today. No one will. No escaping by land either: Swarms of her drones are tasing fleeing noncombatants by the hundreds for later enslavement, as the remainder of her army begins to pour into the bloody Plaza. This is your Arcology's darkest hour.`);
+ App.UI.DOM.appendNewElement("div", t, `And yet your Mercenaries stand ready. On security feeds throughout the Residential Sectors and Garrison you see your elite sellswords charging out of their lodgings in full kit. They are few, but this is their home, and you are their Patron and Commander. They hold firm, fighting like legends of old in some places, and fighting like animals in others. The Mercenaries trapped downstairs near The Garrison take to the Markets, pinning down most of The Colonel's reinforcements from various shopping outlets using towed quad anti-aircraft guns, and ultimately cutting off many of the assets needed for The Colonel's ongoing assault upstairs. Enemy troop carriers laden with heavy infantry breach the shopping centers in order to dislodge them, only to have their inhabitants cooked alive before they can disembark in time or shot to pieces even when they do. Keeping these Mercenaries alive are the roving exosuit-clad tank hunter duos that frag entire armor platoons en route to these shopping outlets, resorting to carving open enemy AFV's up close with their powered CQB weapons once they've run out of missiles. Back in the Residencies upstairs, in the still-evacuating streets and atriums, your actively-camouflaged snipers take up choice positions on various balconies and overpasses, sowing panic among the advancing traitors with their impressive anti-material rifles with one explosive headshot after another, sometimes even hitting them through walls and buildings. In large indoor parks leading up to the main Residential courtyard, Mercenary fireteams force enemy flankers to flee every single footpath they walk through, harassing constantly and prtypeing any hostile reconnaissance or infiltration from being done.`);
+ App.UI.DOM.appendNewElement("div", t, `The main Residential courtyard features the Residential Sectors' massive elevator complex, which will give The Colonel's forces rapid access to the Promenade, and ultimately, You.`);
+ App.UI.DOM.appendNewElement("div", t, `In front of it, your Mercenary Captain stands atop one of the many meters-thick sandbag walls his men just assembled there, leading the raging defensive blockade in bringing the vanguard's assault to a gory halt. ${V.SF.Lower}'s bodies and bits and debris pile up in small walls on the outskirts under the burning heat of hundreds of flying autocannon rounds and dozens of screeching missiles. Before the vanguard's morale can break however, The Colonel shows up in person behind her own lines, kitted in a customized power armor and dragging, of all things, a hydraulic trebuchet loaded with a crudely-welded large metal box. She launches the box from beyond your Mercenaries' line of sight, sending it reeling towards them and predicting that they will try to shoot it out of the sky. They do, not wanting the slow but strange projectile to hit them directly, only learning of their folly when the metal 'box' detonates midair and releases a dense cloud of cluster bombs over their position. The munitions themselves disable some of the exosuits, but they don't kill too many on their own. However, the bomblets do succeed in detonating the various ammo dumps that were feeding your Mercenaries' blazing guns. The chain explosions, resulting fires, destroyed cover, and widespread casualties and confusion all create the perfect opportunity for The Colonel to storm the previously implacable barricade at the head of her troops, with her followers rushing the merc lines and blasting off the heavy armor plating of your disoriented Mercenaries themselves before stabbing them to death, or in some cases, hauling off the dis-armored and defeated female Mercenaries they discover for immediate use.`);
+ App.UI.DOM.appendNewElement("div", t, `As the few intact Mercenaries remaining desperately struggle to hold off the advancing horde with their remaining ammo, The Colonel takes on your dazed Mercenary Captain in single combat. When their ammunition runs dry, and their blasted battlesuits break down, they both eject, and then the knives come out. Minutes later, she stabs him in the side of his skull after she dodges yet another attempt to land a killing blow on her. With the source of Mercenary command and control gone, The Colonel staunches her own bleeding, yanks a trooper out of a near-pristine battlesuit that she now claims for herself, and directly organizes the isolation and extermination of the smaller teams of Mercenaries that are bleeding her troops everywhere else. She routs your Mercenaries for good with the razing of their Garrison structure. The ${V.SF.Lower} now enjoys absolute air and ground superiority. Soon the surviving rear of her army is brought upstairs from the killing floors down in the Markets, and the many elevators and cargo lifts of the elevator complex are boarded, with your executive override codes to remotely shut down the elevators somehow being manually bypassed by her combat engineers. It won't be long now.`);
+ App.UI.DOM.appendNewElement("div", t, `Dawn has broken over the Free City. Only five hours into the slaughter (of which your Mercenaries no doubt bought you at least three), it becomes very clear to you that the only way to save your arcology is to destroy it. Everything and Everyone will burn before you let this crazy bitch and her rabid dogs get their dirty hands on you or your slaves. On your order, your most loyal subordinates, the ones who were with you since the early days to patrol your arcology before you even had drones to protect it, fight their way to through the carnage of your panicking civilians on The Promenade to get to the exact hidden elevators that your Personal Assistant specifies for them. Their destination is the arcology's reactor complex, of course. Following the PA's instructions precisely, they arm their many high-yield explosive charges on your now-exposed and de-stabilized reactor, and in one final service to you, detonate them, creating a colossal explosion. The rapidly ascending heretics quite literally have the rug pulled from under them, as the blast takes out nearly all of the arcology's lesser foundational support beams, thus collapsing many thousands of metric tons of concrete, steel, plastic, and plaster out from underneath the upward bound Colonel and her men... And everyone else, unfortunately. With no foundation any longer, all of your arcology's interior Sectors are utterly gutted from the bottom-up by gravity itself, and everything beneath your ration-stocked, backup-powered Penthouse crumbles to the earth. The massive cloud of dust created by the widespread fires and interior collapse ends up covering the entire Free City for hours. Her aircraft, now bereft of their logistical support and command structure, immediately fly off to neighboring arcologies to offer their services to the various employers there, seeing as the coup has failed and they have nowhere else to go. The skies are free for You to travel as you please, but You aren't going anywhere.`);
+ App.UI.DOM.appendNewElement("div", t, `It is late evening when the tremors finally stop. Everything below your Penthouse is ruin, and your arcology, its population, and your reputation are now essentially dust. However, the arcology did not fall. It. Is. Still. Yours. You shall rise again, not flee this tragedy in shame. Of course, no one will ever know that you sacrificed the arcology deliberately in order to save yourself; it is all too easy to claim that The Colonel carelessly damaged the reactor complex during her assault, ironically causing her own defeat. Frankly, sacrificing most of your tenants doesn't bother you as much as it probably should; maybe its because you know that if The Colonel and her men had won, all those people were as good as dead anyway.`);
+ App.UI.DOM.appendNewElement("div", t, `You know that if you want to survive, you'll need to surround yourself with workers and allies to rebuild fast, else your rivals gobble you up. It costs you a horrific sum to clear and process the wreckage and rebuild the basic Sector superstructures and infrastructure for your arcology on such short notice, even after liquidating everything your workers salvage. Your powerful friends still residing in the old world or other Free Cities have lent you a surprising amount of aid too, with quite a few lent super-heavy construction assets getting huge amounts of work done quickly. Even then, what you've been able to rebuild is very little. After a nearly sleepless, sexless week of immense toil, you've successfully organized tens of thousands of people in restoring the arcology to a barely functional condition (along with rudimentary imitations of all your upgrades), and you've even got some new Garrison Mercenaries in by week's end too... But its just not the same. If it weren't for your bruised weather-plating your arcology would look like a giant skeleton. Inside, it feels like a concrete boneyard; everything has been built cheap and utilitarian, and the walls aren't even painted. With only a few operational services staffed by commuters from neighboring arcologies, there is just an eerie silence just about everywhere. With few amenities for relief, there are going to be many long days ahead for your few tenants, most of them being wealthy but distraught returning travelers who left before the attack. Maybe your slaves can help entertain them. A lot of these people are VIP's it seems.`);
+ App.UI.DOM.appendNewElement("div", t, `It is now midnight. In a rare moment of reflection, you contemplate that what The Colonel just did to your arcology was exactly what you were all too happy to have her do to dozens, if not hundreds of innocent villages and townships under your shadow during her 'Raiding and Slaving' operations. Nevertheless, You have hard work ahead of you, especially now that your enemies see that you are now much weaker than you have ever been.`);
+ App.UI.DOM.appendNewElement("div", t, `The Colonel's body was never found.`);
+ } else if (passage() === "Manage Penthouse") {
+ App.UI.DOM.appendNewElement("div", t, "Visiting the Firebase just takes you to an empty, eerie storeroom now.");
+ }
} else {
- BadOutcome += 'ANNIHILATION';
- addTrinket("The Colonel's combat knife");
- r += `Finally fed up with your constant intrusions into her territory and crew, The Colonel riles up her people for a full takeover against your arcology. The promises of plunder and dominion over some of the wealthiest tenants in the entire Free City (and their world-class slaves), including you, are all that's needed to get things started. However, not every soldier is eager to betray you.`;
- r += `<br>It is now Midnight. The lights are the first thing The Colonel's forces disable, as they still have the excellent night vision equipment you purchased for them. Some of your citizens start panicking almost immediately at the sudden blackout; this is very reminiscent of the Daughters of Liberty attack that still haunts many of their memories. Her horde of marauders purges the plaza and lower floors of the arcology mercilessly, thoughtlessly cutting through your tenants with an ease that stinks of true jealously and hatred. Most disturbingly, your penthouse's communications networks are all but destroyed, and your PA has been unreachable, seemingly hacked by some obscure technology you figure only The Colonel's contacts and few others could provide. As bad as all of this is, it is merely meant to distract and disrupt your mercenaries. The real threat is aerial.`;
- r += `<br>Outside the arcology, her many aircraft swarm the local airspace to patrol the arcology outskirts, conduct recon scans of the upper levels, or monitor your now-secured penthouse, while shooting down any other fleeing VTOL's. You will not be escaping by air. No one will. No escaping by land either: Swarms of her drones are tasing fleeing noncombatants by the hundreds for resale, as the remainder of her army seizes control of vital arcology infrastructure. As you take note of this while donning your bathrobe, several missiles from attack VTOL's come crashing through your penthouse before detonating. Miraculously, no one is harmed by this, and it has even created a gap in a nearby wall for you to escape the penthouse through, but this is but a small comfort in the wake of the squads of disembarking troops, lead by The Colonel herself, rappelling into your penthouse to capture you directly.`;
- r += `<br>You run. You run faster than you ever have in your life, past burning shops, burning vehicles, burning crowds, and burning bodies. An entire team of The Colonel's men are chasing you, lead by The Colonel herself, with their heavy kit probably the only reason they haven't caught you yet. They obviously want you alive, and you have been sharp enough to realize that this is very bad news for you. During your sprint, you also happen to run past several security cameras that impassively capture high-definition full-color footage of your retreat. When you eventually bump into one of your mercenaries and are escorted to a shelter, the personnel responsible for overseeing the camera feeds upload the footage of your great chase to the internet, where the entire world can see you being hounded by the men and women you personally hired to protect you and your arcology.`;
- r += `<br>Eventually, The Colonel's coup collapses. The selfish and malevolent troops following her, easily distracted by the myriad opportunities for rich plunder all around them, end up scattering throughout the arcology and losing cohesion, allowing for your much better organized security forces, mercenary hunter-killer teams, and even local enraged citizens to regroup and eventually overwhelm each enemy looter gang individually until a grinding total victory is achieved by the end of the week. The Colonel never finds, captures, or kills you. Nor is she ever found, captured, or killed herself. But she did set you on the run, and humiliatingly enough, the entire Free City now knows about it. Everyone has seen the clip. When you think about it she did manage to kill you after all, in a manner of speaking.`;
- r += `<br>Your arcology is once more yours, but your people will never forget the horrifying week they spent being slaughtered and hunted by The Colonel's marauders, butchered by the army that you convinced them to allow, or the fact that you couldn't save them because you were very busy being hunted yourself.`;
+ type = 'ANNIHILATION';
+ if (firstExecution) {
+ addTrinket("The Colonel's combat knife");
+ App.UI.DOM.appendNewElement("div", t, `Finally fed up with your constant intrusions into her territory and crew, The Colonel riles up her people for a full takeover against your arcology. The promises of plunder and dominion over some of the wealthiest tenants in the entire Free City (and their world-class slaves), including you, are all that's needed to get things started. However, not every soldier is eager to betray you.`);
+ App.UI.DOM.appendNewElement("div", t, `It is now Midnight. The lights are the first thing The Colonel's forces disable, as they still have the excellent night vision equipment you purchased for them. Some of your citizens start panicking almost immediately at the sudden blackout; this is very reminiscent of the Daughters of Liberty attack that still haunts many of their memories. Her horde of marauders purges the plaza and lower floors of the arcology mercilessly, thoughtlessly cutting through your tenants with an ease that stinks of true jealously and hatred. Most disturbingly, your penthouse's communications networks are all but destroyed, and your PA has been unreachable, seemingly hacked by some obscure technology you figure only The Colonel's contacts and few others could provide. As bad as all of this is, it is merely meant to distract and disrupt your mercenaries. The real threat is aerial.`);
+ App.UI.DOM.appendNewElement("div", t, `Outside the arcology, her many aircraft swarm the local airspace to patrol the arcology outskirts, conduct recon scans of the upper levels, or monitor your now-secured penthouse, while shooting down any other fleeing VTOL's. You will not be escaping by air. No one will. No escaping by land either: Swarms of her drones are tasing fleeing noncombatants by the hundreds for resale, as the remainder of her army seizes control of vital arcology infrastructure. As you take note of this while donning your bathrobe, several missiles from attack VTOL's come crashing through your penthouse before detonating. Miraculously, no one is harmed by this, and it has even created a gap in a nearby wall for you to escape the penthouse through, but this is but a small comfort in the wake of the squads of disembarking troops, lead by The Colonel herself, rappelling into your penthouse to capture you directly.`);
+ App.UI.DOM.appendNewElement("div", t, `You run. You run faster than you ever have in your life, past burning shops, burning vehicles, burning crowds, and burning bodies. An entire team of The Colonel's men are chasing you, lead by The Colonel herself, with their heavy kit probably the only reason they haven't caught you yet. They obviously want you alive, and you have been sharp enough to realize that this is very bad news for you. During your sprint, you also happen to run past several security cameras that impassively capture high-definition full-color footage of your retreat. When you typeually bump into one of your mercenaries and are escorted to a shelter, the personnel responsible for overseeing the camera feeds upload the footage of your great chase to the internet, where the entire world can see you being hounded by the men and women you personally hired to protect you and your arcology.`);
+ App.UI.DOM.appendNewElement("div", t, `typeually, The Colonel's coup collapses. The selfish and malevolent troops following her, easily distracted by the myriad opportunities for rich plunder all around them, end up scattering throughout the arcology and losing cohesion, allowing for your much better organized security forces, mercenary hunter-killer teams, and even local enraged citizens to regroup and typeually overwhelm each enemy looter gang individually until a grinding total victory is achieved by the end of the week. The Colonel never finds, captures, or kills you. Nor is she ever found, captured, or killed herself. But she did set you on the run, and humiliatingly enough, the entire Free City now knows about it. Everyone has seen the clip. When you think about it she did manage to kill you after all, in a manner of speaking.`);
+ App.UI.DOM.appendNewElement("div", t, `Your arcology is once more yours, but your people will never forget the horrifying week they spent being slaughtered and hunted by The Colonel's marauders, butchered by the army that you convinced them to allow, or the fact that you couldn't save them because you were very busy being hunted yourself.`);
+ } else if (passage() === "Manage Penthouse") {
+ App.UI.DOM.appendNewElement("div", t, "Visiting the Firebase just takes you to a charnel house of dead bodies, spent ammo casings, collapsed sub-structure, unstable rubble, and live munitions & duds that can detonate at the slightest disturbance. This chamber has proven so troublesome, tedious, and dangerous to clear out that you've decided to halt all salvage operations for the foreseeable future.");
+ }
}
break;
case "brazen":
- BadOutcome += 'OCCUPATION';
- addTrinket("The Colonel's sidearm");
- r += `Finally fed up with your constant intrusions into her territory and crew, The Colonel riles up her people for a full takeover against your arcology. The promises of plunder and dominion over some of the wealthiest tenants in the entire Free City (and their world-class slaves), including you, are all that's needed to get things started.`;
- r += `<br>At midnight, the lights are the first thing The Colonel's forces disable, as they still have the excellent night vision equipment you purchased for them. Some of your citizens panic almost immediately at the sudden blackout; this is very reminiscent of the Daughters of Liberty attack that still haunts many of their memories. Her army vanguard strikes fast and hard throughout, cutting through your security units and drones with an ease that stinks of months of careful planning and study. Most disturbingly, your penthouse's communications networks are all but destroyed, and your PA has been unreachable, seemingly hacked by some obscure technology you figure only The Colonel's contacts and few others could provide.`;
- r += `<br>Outside, her many aircraft swarm the local airspace to patrol the arcology outskirts, conduct recon scans of the upper levels, or monitor your now-secured penthouse, while shooting down any other fleeing VTOL's. You will not be escaping by air. No one will. No escaping by land either: Swarms of her drones are tasing fleeing noncombatants by the hundreds for detainment, as the remainder of her army seizes control of vital arcology infrastructure. After just a few days, the entire arcology falls under her direct control, all dissidents, criminals, and rebels hopelessly outgunned by her lavishly equipped and experienced warriors.`;
- r += `<br>You are trapped inside your Penthouse by the detachment of infantry guarding its exits in order to keep you in, probably with the goal of starving you out until you surrender yourself. With your communications down as well. your penthouse might as well be an island. You only salvation comes in the form of your neighboring arcologies and their respective mercenary contingents. They are intervening on your behalf out of paranoia; Free Cities are extremely wary of military power buildups near their borders, and they absolutely will not tolerate a full scale military coup within its borders. Fighting men and women from all over the City are seen battling in the streets of your arcology in a brutal blitzkrieg that your own tenants and mercenaries quickly join in on, pushing The Colonel's forces back gradually with sheer numbers. Eventually they are forced back into the Firebase proper, where they are sealed inside by using explosives to collapse part of the arcology atop them, rendering the Firebase itself totally defunct. Only a few small groups manage to scatter and flee this holding action, and your intelligence networks suspects that The Colonel herself was among one of them.`;
- r += `With the help of some unlikely intervention, you've won this little war. Your arcology is once more yours, but your people will never forget the traumatic week they spent under the heel of the army that you convinced them to allow, or the fact that it took an entire coalition of outsiders to save them.`;
+ type = 'OCCUPATION';
+ if (firstExecution) {
+ addTrinket("The Colonel's sidearm");
+ App.UI.DOM.appendNewElement("div", t, `Finally fed up with your constant intrusions into her territory and crew, The Colonel riles up her people for a full takeover against your arcology. The promises of plunder and dominion over some of the wealthiest tenants in the entire Free City (and their world-class slaves), including you, are all that's needed to get things started.`);
+ App.UI.DOM.appendNewElement("div", t, `At midnight, the lights are the first thing The Colonel's forces disable, as they still have the excellent night vision equipment you purchased for them. Some of your citizens panic almost immediately at the sudden blackout; this is very reminiscent of the Daughters of Liberty attack that still haunts many of their memories. Her army vanguard strikes fast and hard throughout, cutting through your security units and drones with an ease that stinks of months of careful planning and study. Most disturbingly, your penthouse's communications networks are all but destroyed, and your PA has been unreachable, seemingly hacked by some obscure technology you figure only The Colonel's contacts and few others could provide.`);
+ App.UI.DOM.appendNewElement("div", t, `Outside, her many aircraft swarm the local airspace to patrol the arcology outskirts, conduct recon scans of the upper levels, or monitor your now-secured penthouse, while shooting down any other fleeing VTOL's. You will not be escaping by air. No one will. No escaping by land either: Swarms of her drones are tasing fleeing noncombatants by the hundreds for detainment, as the remainder of her army seizes control of vital arcology infrastructure. After just a few days, the entire arcology falls under her direct control, all dissidents, criminals, and rebels hopelessly outgunned by her lavishly equipped and experienced warriors.`);
+ App.UI.DOM.appendNewElement("div", t, `You are trapped inside your Penthouse by the detachment of infantry guarding its exits in order to keep you in, probably with the goal of starving you out until you surrender yourself. With your communications down as well, your penthouse might as well be an island. You only salvation comes in the form of your neighboring arcologies and their respective mercenary contingents. They are intervening on your behalf out of paranoia; Free Cities are extremely wary of military power buildups near their borders, and they absolutely will not tolerate a full scale military coup within its borders. Fighting men and women from all over the City are seen battling in the streets of your arcology in a brutal blitzkrieg that your own tenants and mercenaries quickly join in on, pushing The Colonel's forces back gradually with sheer numbers. typeually they are forced back into the Firebase proper, where they are sealed inside by using explosives to collapse part of the arcology atop them, rendering the Firebase itself totally defunct. Only a few small groups manage to scatter and flee this holding action, and your intelligence networks suspects that The Colonel herself was among one of them.`);
+ App.UI.DOM.appendNewElement("div", t, `With the help of some unlikely intervention, you've won this little war. Your arcology is once more yours, but your people will never forget the traumatic week they spent under the heel of the army that you convinced them to allow, or the fact that it took an entire coalition of outsiders to save them.`);
+ } else if (passage() === "Manage Penthouse") {
+ App.UI.DOM.appendNewElement("div", t, "Visiting the Firebase just takes you to its entrance. The two guards that usually let you in will now shoo you away at gunpoint.");
+ }
break;
case "jaded":
- BadOutcome += 'ASSIMILATION';
- addTrinket("The Colonel's canteen");
- r += `Finally weary of your constant intrusions into her territory and crew, The Colonel gathers up her people for a full scale liquidation and dispersal of personnel and assets throughout the Free City itself; they are going to discreetly sell off the majority of their military hardware, assume new identities and melt into the fabric of the Free City's wider population. Gone are the days of plunder and dominion, as this retirement plan will make many of them some of the wealthiest tenants in the entire Free City, and they will no longer need to break their backs living the lives of soldiers. With the liquidation complete and the money distributed, the army moves on to the net stage of the plan.`;
- r += `<br>At midnight, the lights are the first thing The Colonel's forces disable, as they still have the excellent night vision equipment you purchased for them. Some of your citizens panic almost immediately at the sudden blackout; this is very reminiscent of the Daughters of Liberty attack that still haunts many of their memories. Her army moves fast and quietly throughout the arcology and the streets outside of it, slipping through your security units and drones with an ease that stinks of months of careful planning and study. Most disturbingly, your penthouse's communications networks are all but destroyed, and your PA has been unreachable, seemingly hacked by some obscure technology you figure only The Colonel's contacts and few others could provide.`;
- r += `<br>Outside, her many aircraft escape the local airspace to patrol the arcology outskirts, evading recon scans, the monitoring systems of your secured penthouse, and the feeble attempts of your sentries to shoot them down. A great many of them will be escaping by air, it seems. Many are escaping by land too: Swarms of personnel carriers and utility trucks are driving off to neighboring arcologies or even neighboring Free Cities by the dozens for retirement, as the remainder of her army purchase new apartments and properties in various arcologies nearby while being dressed in civilian clothing. After just a few days, the entire army has essentially disappeared, hopelessly obscured by mountains of digital noise, detailed fake backstories, lavish fake identities, and lots of bribes and carefully destroyed digital and physical records. Your special force has gone completely AWOL and there is nothing you or anyone can do about it. It seems your experienced former warriors have an eye for deception too.`;
- r += `<br>You are trapped inside your Penthouse by the electricity-cutting digital virus that has kept you inside and communicatively isolated for the past week. Probably with the goal of keeping you in the dark, figuratively and literally, so that you could not intervene in The Colonel's total assimilation into the Free Cities. The lazy bitch did not want to cooperate with your Future Societies plans, so she and her men decided to stop being soldiers altogether, and live off of their savings. Your only relief comes at the midnight of the seventh day, when the virus self-terminates and the arcology's electricity, PA, and communications lines return to full functioning.`;
- r += `<br>Your arcology is once more yours, but your people will never forget the troubling week they spent in total darkness and lockdown, or the sudden mass desertion and disappearance of the army that you convinced them to allow, or the fact that there was nothing you could do to prevent or mitigate any of it.`;
+ type = 'ASSIMILATION';
+ if (firstExecution) {
+ addTrinket("The Colonel's canteen");
+ App.UI.DOM.appendNewElement("div", t, `Finally weary of your constant intrusions into her territory and crew, The Colonel gathers up her people for a full scale liquidation and dispersal of personnel and assets throughout the Free City itself; they are going to discreetly sell off the majority of their military hardware, assume new identities and melt into the fabric of the Free City's wider population. Gone are the days of plunder and dominion, as this retirement plan will make many of them some of the wealthiest tenants in the entire Free City, and they will no longer need to break their backs living the lives of soldiers. With the liquidation complete and the money distributed, the army moves on to the net stage of the plan.`);
+ App.UI.DOM.appendNewElement("div", t, `At midnight, the lights are the first thing The Colonel's forces disable, as they still have the excellent night vision equipment you purchased for them. Some of your citizens panic almost immediately at the sudden blackout; this is very reminiscent of the Daughters of Liberty attack that still haunts many of their memories. Her army moves fast and quietly throughout the arcology and the streets outside of it, slipping through your security units and drones with an ease that stinks of months of careful planning and study. Most disturbingly, your penthouse's communications networks are all but destroyed, and your PA has been unreachable, seemingly hacked by some obscure technology you figure only The Colonel's contacts and few others could provide.`);
+ App.UI.DOM.appendNewElement("div", t, `Outside, her many aircraft escape the local airspace to patrol the arcology outskirts, evading recon scans, the monitoring systems of your secured penthouse, and the feeble attempts of your sentries to shoot them down. A great many of them will be escaping by air, it seems. Many are escaping by land too: Swarms of personnel carriers and utility trucks are driving off to neighboring arcologies or even neighboring Free Cities by the dozens for retirement, as the remainder of her army purchase new apartments and properties in various arcologies nearby while being dressed in civilian clothing. After just a few days, the entire army has essentially disappeared, hopelessly obscured by mountains of digital noise, detailed fake backstories, lavish fake identities, and lots of bribes and carefully destroyed digital and physical records. Your Special Force has gone completely AWOL and there is nothing you or anyone can do about it. It seems your experienced former warriors have an eye for deception too.`);
+ App.UI.DOM.appendNewElement("div", t, `You are trapped inside your Penthouse by the electricity-cutting digital virus that has kept you inside and communicatively isolated for the past week. Probably with the goal of keeping you in the dark, figuratively and literally, so that you could not intervene in The Colonel's total assimilation into the Free Cities. The lazy bitch did not want to cooperate with your Future Societies plans, so she and her men decided to stop being soldiers altogether, and live off of their savings. Your only relief comes at the midnight of the stypeh day, when the virus self-terminates and the arcology's electricity, PA, and communications lines return to full functioning.`);
+ App.UI.DOM.appendNewElement("div", t, `Your arcology is once more yours, but your people will never forget the troubling week they spent in total darkness and lockdown, or the sudden mass desertion and disappearance of the army that you convinced them to allow, or the fact that there was nothing you could do to prtype or mitigate any of it.`);
+ } else if (passage() === "Manage Penthouse") {
+ App.UI.DOM.appendNewElement("div", t, "Visiting the Firebase just takes you to a very trashy floorspace full of discarded food, apparel, and furniture, as well as piles of empty boxes and crates. The filthy bastards didn't even bother to clean up after themselves.");
+ }
break;
case "shell shocked":
- BadOutcome += 'ISOLATION';
- addTrinket("The Colonel's explosives detonator");
- r += `Unnerved by your ever-increasing influence over your men and undercutting of her authority, The Colonel uses heavy explosives at Midnight to seal off The Firebase from your access. When you step off of your express elevator, you are met not with two guards, but several armed proximity mines next to an incredibly thick wall of smoking rubble. No doubt there are machine gun nests, anti-tank nests, and lots more proximity mines just waiting for you on the other side, should you somehow get through the wall of debris.`;
- r += `<br>The ${V.SF.Lower} still deploys into the old world to plunder as it pleases, but no longer for you. You receive no money from their exploits, and their total defiance and independence of you is a permanent stain on your reputation. Of course, you'll never have the needed military power to dislodge them, especially with all the redundant fortifications, crossfire envelopes, and myriad traps that paranoid bitch had built around each entrance ever since she went rogue. Trying to sabotage certain support beams from above to make the Firebase facility collapse in on itself could easily cause enough damage to topple other parts of the arcology too, and such a thing would be very difficult to cover up. In other words, you're stuck with them. The Firebase has become a permanent tumor on your arcology and good name.`;
+ type = 'ISOLATION';
+ if (firstExecution) {
+ addTrinket("The Colonel's explosives detonator");
+ App.UI.DOM.appendNewElement("div", t, `Unnerved by your ever-increasing influence over your men and undercutting of her authority, The Colonel uses heavy explosives at Midnight to seal off The Firebase from your access. When you step off of your express elevator, you are met not with two guards, but several armed proximity mines next to an incredibly thick wall of smoking rubble. No doubt there are machine gun nests, anti-tank nests, and lots more proximity mines just waiting for you on the other side, should you somehow get through the wall of debris.`);
+ App.UI.DOM.appendNewElement("div", t, `The ${V.SF.Lower} still deploys into the old world to plunder as it pleases, but no longer for you. You receive no money from their exploits, and their total defiance and independence of you is a permanent stain on your reputation. Of course, you'll never have the needed military power to dislodge them, especially with all the redundant fortifications, crossfire envelopes, and myriad traps that paranoid bitch had built around each entrance ever since she went rogue. Trying to sabotage certain support beams from above to make the Firebase facility collapse in on itself could easily cause enough damage to topple other parts of the arcology too, and such a thing would be very difficult to cover up. In other words, you're stuck with them. The Firebase has become a permanent tumor on your arcology and good name.`);
+ } else if (passage() === "Manage Penthouse") {
+ App.UI.DOM.appendNewElement("div", t, "Visiting the Firebase just takes you to a thick wall of rubble. You no longer have any way of reaching out to the Special Force.");
+ }
break;
}
- const Obj = {
- Active: -2,
- Toggle: V.SF.Toggle,
- ArmySize: V.SF.ArmySize,
- FS: {
- Tension: V.SF.FS.Tension,
- BadOutcome: BadOutcome
- }
- };
- V.SF = Obj;
- return r;
- }
-
- function badOutcomeFirebase(){
- const x = `Visiting the Firebase just takes you to`;
- switch (V.SF.FS.BadOutcome) {
- case 'MIGRATION':
- return `${x} an empty, eerie storeroom now.`;
- case 'ANNIHILATION':
- return `${x} a charnel house of dead bodies, spent ammo casings, collapsed sub-structure, unstable rubble, and live munitions & duds that can detonate at the slightest disturbance. This chamber has proven so troublesome, tedious, and dangerous to clear out that you've decided to halt all salvage operations for the foreseeable future.<br>`;
- case 'OCCUPATION':
- return `${x} its entrance. The two guards that usually let you in will now shoo you away at gunpoint.<br>`;
- case 'ASSIMILATION':
- return `${x} a very trashy floorspace full of discarded food, apparel, and furniture, as well as piles of empty boxes and crates. The filthy bastards didn't even bother to clean up after themselves.<br>`;
- case 'ISOLATION':
- return `${x} a thick wall of rubble. You no longer have any way of reaching out to the Special Force.<br>`;
+ if (firstExecution) {
+ const Obj = {
+ Active: -2,
+ Toggle: V.SF.Toggle,
+ ArmySize: V.SF.ArmySize,
+ Colonel: {Core: V.SF.Colonel.Core},
+ FS: {Tension: V.SF.FS.Tension}
+ };
+ V.SF = Obj;
}
+ return [t, type];
}
function validityTester() {
diff --git a/src/Mods/SpecialForce/events/SpecialForceIntro.js b/src/Mods/SpecialForce/events/SpecialForceIntro.js
index d55aa2c0fcee297e76fc97eb21df5c89ae73c335..26dbc7a0cbd04c20b409873f5bcb48e22bcd1efb 100644
--- a/src/Mods/SpecialForce/events/SpecialForceIntro.js
+++ b/src/Mods/SpecialForce/events/SpecialForceIntro.js
@@ -20,7 +20,7 @@ App.Events.SecurityForceProposal = class SecurityForceProposal extends App.Event
App.Events.addParagraph(node, [`Such a force would solve many problems. More soldiers would mean more control, which is very good for you. More soldiers would mean more security for the arcology and the approaches to it, which is very good for business. More soldiers would mean more obedience from rebellious slaves who can see how powerless they truly are, which is very good for everybody. The force would be tiny compared to the old world militaries that still exist, but money and technology can, of course, overcome massive numerical inferiority. This being the Free Cities, they would have other uses besides security. Perhaps, in time, you could exert some manner of influence on the old world itself.`]);
App.Events.addParagraph(node, [
- App.UI.DOM.makeElement("span", "This is a unique and very important opportunity,", "bold"),
+ App.UI.DOM.makeElement("span", "This is a unique and very important opportunity,", ["bold"]),
`and is possible only because of your recent victory over the Daughters. If you do not seize it, the memories and fears of your citizens will fade, and you will not be able to raise the matter again.`
]);
@@ -105,7 +105,7 @@ App.Events.SecurityForceProposal = class SecurityForceProposal extends App.Event
} = getNonlocalPronouns(V.seeDicks).appendSuffix("U");
App.Events.addParagraph(text2, [
`She is likely to be`,
- App.UI.DOM.makeElement("span", `${V.SF.Colonel.Core}.`, "bold")
+ App.UI.DOM.makeElement("span", `${V.SF.Colonel.Core}.`, ["bold"])
]);
r.push(`She strides in, stopping in front of your desk,`);
switch (V.SF.Colonel.Core) {
diff --git a/src/Mods/SpecialForce/events/TrickShotNight.js b/src/Mods/SpecialForce/events/TrickShotNight.js
index bfdeba4feaf4b07a8a10bace808c11781ae8d1bd..0c6b40e1539af61c5e662ecea13fc1c859ec7285 100644
--- a/src/Mods/SpecialForce/events/TrickShotNight.js
+++ b/src/Mods/SpecialForce/events/TrickShotNight.js
@@ -15,7 +15,7 @@ App.Events.TrickShotNight = class TrickShotNight extends App.Events.BaseEvent {
} = getPronouns(assistant.pronouns().main).appendSuffix("A");
const shootChance = Math.max(25 + V.PC.skill.warfare * 0.2, 25 + V.PC.skill.warfare * 0.65); // Odds increase slowly up to 0 skill, then greatly after. Always some odds to succeed or fail.
- App.Events.addParagraph(node, [`Despite your direct elevator, interaction with the majority of your security force is relatively scarce. Aside from mutually exchanged nods in the firebase and the occasional briefing, your ${V.SF.Lower} enjoy a degree of autonomy.`]);
+ App.Events.addParagraph(node, [`Despite your direct elevator, interaction with the majority of your Special Force is relatively scarce. Aside from mutually exchanged nods in the firebase and the occasional briefing, your ${V.SF.Lower} enjoy a degree of autonomy.`]);
r.push(`On a particularly lackadaisical evening, you find yourself alerted to a message alert by ${V.assistant.name}.`);
if (V.assistant.personality > 0) {
@@ -40,7 +40,7 @@ App.Events.TrickShotNight = class TrickShotNight extends App.Events.BaseEvent {
function attend() {
const frag = new DocumentFragment();
- App.Events.addParagraph(frag, [`You instruct ${V.assistant.name} to inform ${V.SF.Lower} that you will be attending their trick shot night, and after settling your affairs in the penthouse you head down to the firebase. The atmosphere in the firebase is casual, especially in comparison to the usual situations you meet them, though your security force still maintain some measure of decorum towards you as their employer. Eventually, you settle in at the table with a handful of ${V.SF.Lower} officers and turn your <span class="cash">${cashFormat(buyIn)}</span> into bullets. All that remains is to decide your strategy for the night.`]);
+ App.Events.addParagraph(frag, [`You instruct ${V.assistant.name} to inform ${V.SF.Lower} that you will be attending their trick shot night, and after settling your affairs in the penthouse you head down to the firebase. The atmosphere in the firebase is casual, especially in comparison to the usual situations you meet them, though your Special Force still maintains some measure of decorum towards you as their employer. Eventually, you settle in at the table with a handful of ${V.SF.Lower} officers and turn your <span class="cash">${cashFormat(buyIn)}</span> into bullets. All that remains is to decide your strategy for the night.`]);
const choices = [];
choices.push(new App.Events.Result(`Play it safe`, safe));
@@ -54,12 +54,12 @@ App.Events.TrickShotNight = class TrickShotNight extends App.Events.BaseEvent {
if (random(1, 100) > shootChance) {
repX(5000, "event");
cashX(-25000, "event");
- return `Despite your attempts to mitigate risk and play the safest shots possible, it seems lady luck has conspired against you this evening. However, even when your last bullet is shot, your security force pitch you a few bullets to keep you in the game for the rest of the night. You may have lost most of your ¤, but it seems you've <span class="reputation inc">made some friends.</span>`;
+ return `Despite your attempts to mitigate risk and play the safest shots possible, it seems lady luck has conspired against you this evening. However, when your last bullet is shot, some members of your Special Force pitch you a few bullets to keep you in the game for the rest of the night. You may have lost most of your ¤, but it seems you've <span class="reputation inc">made some friends.</span>`;
} else {
const winnings = buyIn * 2;
repX(5000, "event");
cashX(winnings, "event");
- return `While a careful eye for accuracy has buoyed you through the evening, ultimately lady luck is the decider in handing you the win in a number of close shots. Unfortunately your meticulous play limited your chance at a larger payout, and you only come away from the evening with <span class="cash inc">${cashFormat(winnings)}</span> more than you arrived with and <span class="reputation inc">the respect of your security force.</span>`;
+ return `While a careful eye for accuracy has buoyed you through the evening, ultimately lady luck is the decider in handing you the win in a number of close shots. Unfortunately your meticulous play limited your chance at a larger payout, and you only come away from the evening with <span class="cash inc">${cashFormat(winnings)}</span> more than you arrived with and <span class="reputation inc">the respect of your Special Force.</span>`;
}
}
@@ -85,7 +85,7 @@ App.Events.TrickShotNight = class TrickShotNight extends App.Events.BaseEvent {
soldier.anus = 0;
soldier.skill.anal = 0;
soldier.skill.whoring = 0;
- soldier.skill.combat = 1;
+ soldier.skill.combat = 70;
soldier.accent = random(0, 1);
soldier.behavioralFlaw = "arrogant";
soldier.hLength = 1;
@@ -111,7 +111,7 @@ App.Events.TrickShotNight = class TrickShotNight extends App.Events.BaseEvent {
const frag = new DocumentFragment();
let r = [];
if (random(1, 100) > shootChance) {
- r.push(`For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up ${his} spoils, the other security force clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've <span class="green">made some friends.</span>`);
+ r.push(`For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up ${his} spoils, the other Special Force clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've <span class="green">made some friends.</span>`);
repX(5000, "event");
cashX(-buyIn, "event");
} else {
@@ -130,11 +130,11 @@ App.Events.TrickShotNight = class TrickShotNight extends App.Events.BaseEvent {
if (random(1, 100) > shootChance) {
repX(5000, "event");
cashX(-buyIn, "event");
- return `For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up ${his} spoils, the other security force members clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've <span class="reputation inc">made some friends.</span>`;
+ return `For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up ${his} spoils, the other Special Force members clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've <span class="reputation inc">made some friends.</span>`;
} else {
repX(10000, "event");
cashX(buyIn, "event");
- return `For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. Your opponent accepts ${his} defeat with grace and jokes to ${his} comrades that ${he}'ll be fighting in ${his} underwear for the next few months, and their uproar of laughter fills the room. Though you take the lion's share of the ¤, your security force also <span class="reputation inc">had a good time fraternizing with you.</span>`;
+ return `For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. Your opponent accepts ${his} defeat with grace and jokes to ${his} comrades that ${he}'ll be fighting in ${his} underwear for the next few months, and their uproar of laughter fills the room. Though you take the lion's share of the ¤, your Special Force also <span class="reputation inc">had a good time fraternizing with you.</span>`;
}
}
}
diff --git a/src/arcologyBuilding/ManageArcology.js b/src/arcologyBuilding/ManageArcology.js
index dbd355b89f976ef4665dbd9e45cca16932893c13..03de386557aa3cca2788f0bd7c0d1183df9500ef 100644
--- a/src/arcologyBuilding/ManageArcology.js
+++ b/src/arcologyBuilding/ManageArcology.js
@@ -154,7 +154,7 @@ App.UI.manageArcology = function() {
const text = [];
if (V.weatherCladding === 0) {
- text.push(`Extreme weather is becoming common worldwide. The arcology's exterior can be hardened to reduce damage in case of heavy weather, but this will reduce its beauty somewhat and will cost ${cashFormat(50000 * V.upgradeMultiplierArcology)}. Your citizens are`);
+ text.push(`Extreme weather is becoming common worldwide. The arcology's exterior can be hardened to reduce damage in case of heavy weather, but this will reduce its beauty somewhat. Your citizens are`);
if (V.weatherAwareness === 0) {
text.push(`likely to disapprove of this measure as alarmism.`);
@@ -176,11 +176,9 @@ App.UI.manageArcology = function() {
App.Events.addNode(div, text, "div");
if (V.weatherCladding === 1 && V.building.sections.length > 0) {
- const cost = 3_500_000 * V.upgradeMultiplierArcology;
-
div.append(
- `Your arcology is so prosperous that remodeling the cladding into something beautiful is within the realm of possibility. This massive project will cost ${cashFormat(cost)} and without a doubt render your arcology one of the wonders of the world.`,
- makePurchase(`Remodel weather cladding`, cost, "capEx", {
+ `Your arcology is so prosperous that remodeling the cladding into something beautiful is within the realm of possibility. This massive project without a doubt render your arcology one of the wonders of the world.`,
+ makePurchase(`Remodel weather cladding`, 3_500_000 * V.upgradeMultiplierArcology, "capEx", {
handler: () => {
V.weatherCladding++;
V.PC.skill.engineering++;
@@ -201,7 +199,6 @@ App.UI.manageArcology = function() {
V.FCTV.weekEnabled = V.week;
FCTV.initChannels();
-
repX(500, "capEx");
},
}),
@@ -615,7 +612,7 @@ App.UI.manageArcology = function() {
if (V.mods.food.enabled && V.mods.food.market) {
App.UI.DOM.appendNewElement("h2", div, "Food Management");
div.append(App.UI.foodMarket());
- } else if (V.eventResults.foodCrisis) {
+ } else if (V.eventResults.foodCrisis && !V.mods.food.rations) {
const price = V.PC.skill.trading >= 50 && ["capitalist", "entrepreneur", "business kid"].includes(V.PC.career) || V.PC.skill.trading >= 100 ? 112_500 : 150_000;
div.append(
@@ -712,7 +709,7 @@ App.UI.manageArcology = function() {
const text = [];
- text.push(`Your army counts ${num(App.Mods.SecExp.unit.squads("human").reduce((acc, s) => acc + s.troops, 0) + SF)} total soldiers${(V.SF.Toggle && V.SF.Active >= 1) ? ` of which ${num(V.SF.ArmySize)} under the special force command and the rest under your direct control` : ``}.`);
+ text.push(`Your army counts ${num(App.Mods.SecExp.unit.squads("human").reduce((acc, s) => acc + s.troops, 0) + SF)} total soldiers${(V.SF.Toggle && V.SF.Active >= 1) ? ` of which ${num(V.SF.ArmySize)} under the Special Force chain of command and the rest under your direct control` : ``}.`);
if (V.SecExp.settings.battle.enabled === 1 && count('battles') > 0) {
text.push(`Your troops were involved in ${num(count('battles'))} battles, of which ${num(V.SecExp.battles.major)} were major engagements. You won`);
diff --git a/src/arcologyBuilding/manufacturing.js b/src/arcologyBuilding/manufacturing.js
index bbff45144b68e4d0babd28d92b6cf1111cd6a121..7ad4b55dbe0babffa0d1bd8edd921489d3362fa8 100644
--- a/src/arcologyBuilding/manufacturing.js
+++ b/src/arcologyBuilding/manufacturing.js
@@ -168,7 +168,7 @@ App.Arcology.Cell.Manufacturing = class extends App.Arcology.Cell.BaseCell {
r += "housed in this sector.";
- if (V.menials > 0 && V.Sweatshops > 0) {
+ if (V.menials > 0 && sweatshopCount() > 0) {
r += ` The simple labor slaves toil in ${V.arcologies[0].name}'s sweatshops, and only return here to sleep.`;
}
if (V.fuckdolls > 0 && V.arcade > 0) {
diff --git a/src/arcologyBuilding/markets.js b/src/arcologyBuilding/markets.js
index 8ee82ef53fc1bb49d5ed1ea01db1730275aae0f9..36e6a65a8f60e1cb8a3a589588d83154a4fd22a6 100644
--- a/src/arcologyBuilding/markets.js
+++ b/src/arcologyBuilding/markets.js
@@ -37,6 +37,9 @@ App.Arcology.Cell.Market = class extends App.Arcology.Cell.BaseCell {
* @returns {string}
*/
get name() {
+ if (this.type === "Pit") {
+ return "Arena";
+ }
return this.type;
}
@@ -53,7 +56,7 @@ App.Arcology.Cell.Market = class extends App.Arcology.Cell.BaseCell {
case "Arcade":
return App.Arcology.facilityCellContent(App.Entity.facilities.arcade);
case "Pit":
- return App.Arcology.facilityCellContent(App.Entity.facilities.pit);
+ return App.Arcology.facilityCellContent(App.Entity.facilities.pit, "Pit");
case "Markets":
return App.Arcology.getCellLinkFromPath(path, "Markets");
case "Transport Hub":
@@ -103,7 +106,7 @@ App.Arcology.Cell.Market = class extends App.Arcology.Cell.BaseCell {
if (!V.pit) {
fragment.append(this._makeExternalUpgrade(
- `Build a pit to host proper slave fights`,
+ `Build an arena to host proper slave fights`,
() => {
this.type = "Pit";
App.Facilities.Pit.init();
diff --git a/src/arcologyBuilding/presets.js b/src/arcologyBuilding/presets.js
index 058d31aa4cf56e9004a2d4707c0f18208133ddb9..c364817abba774cb752645ff17f1b239592d6f03 100644
--- a/src/arcologyBuilding/presets.js
+++ b/src/arcologyBuilding/presets.js
@@ -291,17 +291,20 @@ App.Arcology.upgrades = function(building) {
const div = document.createElement("div");
div.classList.add("choices");
const cost = upgrade.cost * V.upgradeMultiplierArcology;
- div.append(`...${upgrade.desc}. `, App.UI.DOM.makeElement("span", `This huge project will cost ${cashFormat(cost)} `, "note"),
- App.UI.DOM.passageLink(`Build ${upgrade.name}`, passage(), () => {
- if (building.usedUpgrades.length === 0) {
- // the first major upgrade gives skill, successive ones not, mainly because there might be a
- // different number depending on layout.
- V.PC.skill.engineering++;
- }
- building.usedUpgrades.push(upgrade.id);
- upgrade.apply();
- cashX(-cost, "capEx");
- }));
+ div.append(
+ makePurchase(`...${upgrade.desc}`, cost, "capEx", {
+ handler: () => {
+ if (building.usedUpgrades.length === 0) {
+ // the first major upgrade gives skill, successive ones not, mainly because there might be a
+ // different number depending on layout.
+ V.PC.skill.engineering++;
+ }
+ building.usedUpgrades.push(upgrade.id);
+ upgrade.apply();
+ App.UI.reload();
+ },
+ }),
+ );
outerDiv.append(div);
count++;
}
diff --git a/src/arcologyBuilding/purchaseArcology.js b/src/arcologyBuilding/purchaseArcology.js
new file mode 100644
index 0000000000000000000000000000000000000000..c5bfdf13a743f7073816ccffb074b436d7b9e3d5
--- /dev/null
+++ b/src/arcologyBuilding/purchaseArcology.js
@@ -0,0 +1,24 @@
+App.Arcology.purchase = function() {
+ const div = document.createElement("div");
+ const linkDiv = document.createElement("div");
+
+ div.append(linkDiv);
+ linkDiv.append(
+ `You can also purchase a new arcology to move to in a new location. You will once again become an unknown figure with no reputation of any kind.`,
+ App.UI.DOM.makeElement("div", App.UI.DOM.link(`See arcologies`, () => {
+ App.UI.DOM.replace(linkDiv, purchase());
+ }), ['indent']),
+ );
+
+ function purchase() {
+ const frag = new DocumentFragment();
+
+ const h3 = App.UI.DOM.makeElement("h3", `Purchase an arcology`);
+
+ frag.append(h3, App.Intro.generateEstablishedArcologies());
+
+ return frag;
+ }
+
+ return div;
+};
diff --git a/src/arcologyBuilding/shops.js b/src/arcologyBuilding/shops.js
index 0208405d2463db39d38f040e06817f13fad9abce..952b0aad9ed65937d3db7ba8edce0ddd46b09555 100644
--- a/src/arcologyBuilding/shops.js
+++ b/src/arcologyBuilding/shops.js
@@ -191,7 +191,7 @@ App.Arcology.Cell.Shop = class extends App.Arcology.Cell.BaseCell {
fragment.append("dedicated to Chattel Religionism. The stores offer all the items useful to a slaveowner who holds the new faith: proper slave restraints and penitent slave garments, of course, but also fine oils and incense, candles, tapers, and other devotional necessities. There are also correctional convents for the assistance of citizens with wayward slaves. ",
App.UI.DOM.linkReplace("Visit the convents",
`As a leader of the new faith, your visitation rights on these convents are unquestioned, and their owners are indeed eager to have you look around and offer your revered advice. The average citizen with only a slave or two often needs help keeping ${girl}s within the faith. The convents are severe houses of correction, and the sounds of prayer and penitence are omnipresent. In one nave, a slave prostrates ${himself} before a religious icon, praying in a loud, desperate tone while ${
- V.seeDicks === 0
+ V.seeDicks === 0 || V.arcologies[0].FSGenderFundamentalist > 0
? "a woman in nun's attire holding a ribbed vibrating dildo"
: V.seeDicks < 100
? "futanari in nun's attire"
diff --git a/src/art/artJS.js b/src/art/artJS.js
index c650d08cfd545cbda64abd9518da2225df7e012b..ad97268d707004e1b2c25fe8880c338376792359 100644
--- a/src/art/artJS.js
+++ b/src/art/artJS.js
@@ -213,7 +213,7 @@ App.Art.webglInitialize = function() {
// start Webgl engine, textures are streamed asynchronously
App.Art.engine = new App.Art.Engine();
- App.Art.engine.bind(sceneData, scene, "");
+ App.Art.engine.bind(sceneData, scene, "resources/webgl/");
App.Art.engineReady = true;
// when ready, fire event to art elements to start rendering
@@ -249,7 +249,7 @@ App.Art.webglInitialize = function() {
let load = document.createElement("script");
load.onload = function() {
// but only if version is correct
- if (App.Art.version === "1.11") {
+ if (App.Art.version === "1.12") {
document.head.appendChild(settings);
} else {
App.Art.errorHandler("engineFailed", 3);
@@ -265,11 +265,11 @@ App.Art.webglInitialize = function() {
}();
/**
- * @param {App.Entity.SlaveState} slave
+ * @param {App.Entity.SlaveState} inSlave
* @param {number} artSize
* @returns {HTMLElement}
*/
-App.Art.webglArtElement = function(slave, artSize) {
+App.Art.webglArtElement = function(inSlave, artSize) {
let container = document.createElement("div");
container.setAttribute("class", "artContainer");
container.style.fontSize = "large";
@@ -279,6 +279,9 @@ App.Art.webglArtElement = function(slave, artSize) {
container.style.height = sz[1] + "px";
// container.innerText = "Loading...";
+ // we're being asked to render this slave at this snapshot in time, but we're doing so asynchronously, so clone her first
+ // it's common for e.g. events to make alterations to a slave just before rendering and revert them afterwards
+ const slave = clone(inSlave);
container.addEventListener("engineLoaded", function() {
new IntersectionObserver(function(entries) {
if (entries.some(e => e.isIntersecting)) {
@@ -292,7 +295,7 @@ App.Art.webglArtElement = function(slave, artSize) {
App.Art.applyFigures(slave, scene, p);
App.Art.applySurfaces(slave, scene, p);
App.Art.applyMaterials(slave, scene, p);
- App.Art.applyMorphs(slave, scene, p);
+ App.Art.applyMorphs(slave, scene, p, false);
// console.log(scene);
@@ -369,12 +372,12 @@ App.Art.renderedArtElement = function(slave, artSize) {
} else {
fileName = `${fileName} rebellious`;
}
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
fileName = `${fileName} reluctant`;
} else if (slave.devotion <= 50 || slave.fetishKnown !== 1 || (V.seeMainFetishes === 0 && artSize < 2)) {
fileName = `${fileName} obedient`;
} else {
- if (slave.fetish === "none") {
+ if (slave.fetish === Fetish.NONE) {
fileName = `${fileName} obedient`;
} else {
fileName = `${fileName} ${slave.fetish}`;
@@ -2492,5 +2495,5 @@ App.Art.generateDisplayClass = function() {
} else {
T.artDisplayID = 1;
}
- return `ad${T.artDisplayID}`;
+ return `art${T.artDisplayID}`;
};
diff --git a/src/art/webgl/art.js b/src/art/webgl/art.js
index ba23fdb80a5d670bffcc7299cd16c0d640b58a89..be76df5f30366f869f1af1d01243461839dc67e6 100644
--- a/src/art/webgl/art.js
+++ b/src/art/webgl/art.js
@@ -60,7 +60,6 @@ App.Art.resetMorphs = function(scene) {
}
};
-
App.Art.getArtParams = function(slave) {
let p = {};
@@ -72,6 +71,7 @@ App.Art.getArtParams = function(slave) {
p.applyExtremeHeels = false;
p.applyExtremeHeels2 = false;
p.applyPanty = true;
+ p.animVars = [[0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0], ["", "", "", "", "", ""], [0, 0, 0, 0, 0, 0], jsEither([true, false])];
p.underage = slave.age < 18 || slave.visualAge < 18;
p.height = Math.max(slave.height, 140); // clamp underage
@@ -844,56 +844,27 @@ App.Art.applySurfaces = function(slave, scene, p) {
surfaces.push(["new_gens_V8_1840_Anus", "visible", true]);
}
- let cockSkin;
- let skin;
-
- let O = App.Art.hexToRgb(skinColorCatcher(slave).skinColor);
-
- let A = [207/255, 198/255, 195/255];
- let B = [201/255, 157/255, 134/255];
- let C = [174/255, 128/255, 100/255];
- let D = [112/255, 78/255, 62/255];
-
- let sqAO = (A[0] - O[0])**2 + (A[1] - O[1])**2 + (A[2] - O[2])**2;
- let sqBO = (B[0] - O[0])**2 + (B[1] - O[1])**2 + (B[2] - O[2])**2;
- let sqCO = (C[0] - O[0])**2 + (C[1] - O[1])**2 + (C[2] - O[2])**2;
- let sqDO = (D[0] - O[0])**2 + (D[1] - O[1])**2 + (D[2] - O[2])**2;
-
- if (sqAO < sqBO && sqAO < sqCO && sqAO < sqDO) {
- skin = "WhiteTone";
- cockSkin = "White";
- } else if (sqBO < sqAO && sqBO < sqCO && sqBO < sqDO) {
- skin = "LightTone";
- cockSkin = "Light";
- } else if (sqCO < sqBO && sqCO < sqAO && sqCO < sqDO) {
- skin = "MidTone";
- cockSkin = "Mid";
- } else if (sqDO < sqBO && sqDO < sqCO && sqDO < sqAO) {
- skin = "DarkTone";
- cockSkin = "Dark";
- }
-
- glansFutaliciousShellLayers.push("ao_surface", cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell");
- shaftFutaliciousShellLayers.push("ao_surface", cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell");
- testiclesFutaliciousShellLayers.push("ao_surface", cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell");
- torsoFrontFutaliciousShellLayers.push("ao_surface", cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell");
- torsoMiddleFutaliciousShellLayers.push("ao_surface", cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell");
- torsoBackFutaliciousShellLayers.push("ao_surface", cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell");
- rectumFutaliciousShellLayers.push("ao_surface", cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell");
- torsoFrontLayers.push("ao_surface", skin + "Torso", "skindetail_blotches_torso", "skindetail_pores_torso", "skindetail_fine_torso", "skindetail_veins_torso");
- torsoMiddleLayers.push("ao_surface", skin + "Torso", "skindetail_blotches_torso", "skindetail_pores_torso", "skindetail_fine_torso", "skindetail_veins_torso");
- torsoBackLayers.push("ao_surface", skin + "Torso", "skindetail_blotches_torso", "skindetail_pores_torso", "skindetail_fine_torso", "skindetail_veins_torso");
- genitaliaLayers.push("ao_surface", skin + "Genitalia", "skindetail_blotches_torso", "skindetail_pores_torso", "skindetail_fine_torso", "skindetail_veins_torso");
- anusLayers.push("ao_surface", skin + "Anus", "skindetail_blotches_torso", "skindetail_pores_torso", "skindetail_fine_torso", "skindetail_veins_torso");
- torsoLayers.push(skin + "Torso", "skindetail_blotches_torso", "skindetail_pores_torso", "skindetail_fine_torso", "skindetail_veins_torso");
- faceLayers.push(skin + "Face", "skindetail_blotches_face", "skindetail_pores_face", "skindetail_fine_face", "skindetail_veins_face");
- lipsLayers.push(skin + "Lips");
- earsLayers.push(skin + "Ears", "skindetail_blotches_face", "skindetail_pores_face", "skindetail_fine_face", "skindetail_veins_face");
- legsLayers.push(skin + "Legs", "skindetail_blotches_legs", "skindetail_pores_legs", "skindetail_fine_legs", "skindetail_veins_legs");
- armsLayers.push(skin + "Arms", "skindetail_blotches_arms", "skindetail_pores_arms", "skindetail_fine_arms", "skindetail_veins_arms");
- eyesocketLayers.push(skin + "Face");
- toenailsLayers.push(skin + "Toenails");
- fingernailsLayers.push(skin + "Fingernails");
+ glansFutaliciousShellLayers.push("ao_surface", "TemplateFutalicious_Genitalia_G8F_Glans_Futalicious_Shell");
+ shaftFutaliciousShellLayers.push("ao_surface", "TemplateFutalicious_Genitalia_G8F_Glans_Futalicious_Shell");
+ testiclesFutaliciousShellLayers.push("ao_surface", "TemplateFutalicious_Genitalia_G8F_Glans_Futalicious_Shell");
+ torsoFrontFutaliciousShellLayers.push("ao_surface", "TemplateFutalicious_Genitalia_G8F_Glans_Futalicious_Shell");
+ torsoMiddleFutaliciousShellLayers.push("ao_surface", "TemplateFutalicious_Genitalia_G8F_Glans_Futalicious_Shell");
+ torsoBackFutaliciousShellLayers.push("ao_surface", "TemplateFutalicious_Genitalia_G8F_Glans_Futalicious_Shell");
+ rectumFutaliciousShellLayers.push("ao_surface", "TemplateFutalicious_Genitalia_G8F_Glans_Futalicious_Shell");
+ torsoFrontLayers.push("ao_surface", "TemplateTorso", "skindetail_blotches_torso", "skindetail_pores_torso", "skindetail_fine_torso", "skindetail_veins_torso");
+ torsoMiddleLayers.push("ao_surface", "TemplateTorso", "skindetail_blotches_torso", "skindetail_pores_torso", "skindetail_fine_torso", "skindetail_veins_torso");
+ torsoBackLayers.push("ao_surface", "TemplateTorso", "skindetail_blotches_torso", "skindetail_pores_torso", "skindetail_fine_torso", "skindetail_veins_torso");
+ genitaliaLayers.push("ao_surface", "TemplateGenitalia", "skindetail_blotches_torso", "skindetail_pores_torso", "skindetail_fine_torso", "skindetail_veins_torso");
+ anusLayers.push("ao_surface", "TemplateAnus", "skindetail_blotches_torso", "skindetail_pores_torso", "skindetail_fine_torso", "skindetail_veins_torso");
+ torsoLayers.push("TemplateTorso", "skindetail_blotches_torso", "skindetail_pores_torso", "skindetail_fine_torso", "skindetail_veins_torso");
+ faceLayers.push("TemplateFace", "skindetail_blotches_face", "skindetail_pores_face", "skindetail_fine_face", "skindetail_veins_face");
+ lipsLayers.push("TemplateLips", "lips_mask");
+ earsLayers.push("TemplateEars", "skindetail_blotches_face", "skindetail_pores_face", "skindetail_fine_face", "skindetail_veins_face");
+ legsLayers.push("TemplateLegs", "skindetail_blotches_legs", "skindetail_pores_legs", "skindetail_fine_legs", "skindetail_veins_legs");
+ armsLayers.push("TemplateArms", "skindetail_blotches_arms", "skindetail_pores_arms", "skindetail_fine_arms", "skindetail_veins_arms");
+ eyesocketLayers.push("TemplateFace");
+ toenailsLayers.push("TemplateToenails");
+ fingernailsLayers.push("TemplateFingernails");
switch (slave.hStyle) {
case "pixie cut":
@@ -1172,7 +1143,7 @@ App.Art.applySurfaces = function(slave, scene, p) {
torsoLayers.push("tattoo_breeding");
}
- if (slave.birthsTat > 0) {
+ if (slave.birthsTat > 0 && slave.birthsTat >= 100) {
let location = "left abdomen";
let [, center, layer] = getDecalArea(location);
if (layer !== null) {
@@ -1180,6 +1151,33 @@ App.Art.applySurfaces = function(slave, scene, p) {
}
}
+ if (slave.birthsTat > 0 && slave.birthsTat < 100) { // let's make sure we don't generate too many materials
+ let location = "left thigh";
+ let [, center, layer] = getDecalArea(location);
+ if (layer !== null) {
+ for (let i = 0; i < slave.birthsTat; i++) {
+ let matId = "birthcount" + location + i;
+
+ if (App.Art.getMaterialById(scene, matId) == null) {
+ let scale = 0.015;
+ let width = scale * 5;
+ let height = scale;
+ let row = Math.trunc(i / 5);
+ let col = i % 5;
+
+ let mat = App.Art.getMaterialById(scene, "tattoo_birthcount");
+ if (mat !== null) {
+ mat = JSON.parse(JSON.stringify(mat));
+ mat.matId = matId;
+ mat.transform = [center[0] + 0.06 - (width/2) + (scale/2) + scale * col, center[1] - scale * 2.5 + height * row + scale * 0.1 * row, 0, scale];
+ scene.materials.push(mat);
+ }
+ }
+ layer.push(matId);
+ }
+ }
+ }
+
if (slave.abortionTat > 0) {
let location = "right abdomen";
let [, center, layer] = getDecalArea("right abdomen");
@@ -1566,138 +1564,144 @@ App.Art.applyMaterials = function(slave, scene, p) {
// expected skin color
let O = App.Art.hexToRgb(skinColorCatcher(slave).skinColor);
- // average color of skintone texture
- let A = [207/255, 198/255, 195/255];
- let B = [201/255, 157/255, 134/255];
- let C = [174/255, 128/255, 100/255];
- let D = [112/255, 78/255, 62/255];
-
- // find nearest skintone texture
- let sqAO = (A[0] - O[0])**2 + (A[1] - O[1])**2 + (A[2] - O[2])**2;
- let sqBO = (B[0] - O[0])**2 + (B[1] - O[1])**2 + (B[2] - O[2])**2;
- let sqCO = (C[0] - O[0])**2 + (C[1] - O[1])**2 + (C[2] - O[2])**2;
- let sqDO = (D[0] - O[0])**2 + (D[1] - O[1])**2 + (D[2] - O[2])**2;
-
- // factor to multiply skintone texture to get expected skin color
- let mA = [O[0]/A[0]*0.87, O[1]/A[1]*0.8, O[2]/A[2]*0.8];
- let mB = [O[0]/B[0], O[1]/B[1], O[2]/B[2]];
- let mC = [O[0]/C[0], O[1]/C[1], O[2]/C[2]];
- let mD = [O[0]/D[0], O[1]/D[1], O[2]/D[2]];
-
- let lA = [lipsColor[0]/A[0]*0.87, lipsColor[1]/A[1]*0.8, lipsColor[2]/A[2]*0.8];
- let lB = [lipsColor[0]/B[0], lipsColor[1]/B[1], lipsColor[2]/B[2]];
- let lC = [lipsColor[0]/C[0], lipsColor[1]/C[1], lipsColor[2]/C[2]];
- let lD = [lipsColor[0]/D[0], lipsColor[1]/D[1], lipsColor[2]/D[2]];
-
+ // calculate lips and areola color based on skin color and brightness
+ let lbrf = Math.min((O[0] + O[1] + O[2])/3+0.4, 1);
+ lipsColor = [O[0]*0.76*lbrf, O[1]*0.55*lbrf, O[2]*0.6*lbrf];
+ areolaColor = lipsColor;
+
+ // average skin texture color
+ let oSkinColors = {
+ "Tara": [194/255, 148/255, 124/255],
+ "Saffron": [246/255, 209/255, 193/255],
+ "Reagan": [224/255, 180/255, 151/255],
+ "Mylou": [212/255, 166/255, 140/255],
+ "Minami": [191/255, 164/255, 143/255],
+ "Kimmy": [216/255, 185/255, 167/255],
+ "Kathy": [219/255, 154/255, 132/255],
+ // "DarkSkin": [92/255, 68/255, 58/255],
+ "Daphne": [199/255, 157/255, 133/255],
+ "Ceridwen": [238/255, 216/255, 203/255],
+ "Celinette": [223/255, 210/255, 204/255],
+ "Base": [215/255, 181/255, 156/255],
+ // "Angelica": [117/255, 70/255, 54/255],
+ "Adaline": [208/255, 154/255, 126/255],
+ // "Topmodel": [198/255, 153/255, 122/255]
+ "Kelly": [207/255, 149/255, 103/255],
+ "Zalena": [136/255, 103/255, 86/255],
+ "Mowad": [207/255, 169/255, 148/255],
+ };
+
+ let oCockColors = {
+ "White": [180/255, 170/255, 164/255],
+ "Light": [185/255, 160/255, 143/255],
+ "Mid": [200/255, 155/255, 124/255],
+ "Dark": [85/255, 56/255, 42/255],
+ };
+
+ // find nearest skin texture
+ let distance = [];
+ for (const [, value] of Object.entries(oSkinColors)) {
+ let noise = App.Art.random()*(60/255); // add random error term to sample similar skins
+ distance.push((value[0] - O[0])**2 + (value[1] - O[1])**2 + (value[2] - O[2])**2 + noise**2);
+ }
+ let skin = Object.keys(oSkinColors)[distance.indexOf(Math.min(...distance))];
+
+ // find multiplication factor skin texture color -> skin color
+ let Oc = oSkinColors[skin];
+ let mO = [O[0]/Oc[0], O[1]/Oc[1], O[2]/Oc[2]];
+
+ // find nearest cock texture
+ distance = [];
+ for (const [, value] of Object.entries(oCockColors)) {
+ distance.push((value[0] - O[0])**2 + (value[1] - O[1])**2 + (value[2] - O[2])**2);
+ }
+ let cockSkin = Object.keys(oCockColors)[distance.indexOf(Math.min(...distance))];
+
+ // find multiplication factor cock texture color -> skin color
+ let Occ = oCockColors[cockSkin];
+ let cbrf = Math.min((O[0] + O[1] + O[2])/3+0.5, 1);
+ let mOc = [O[0]/Occ[0]*0.85*cbrf, O[1]/Occ[1]*0.85*cbrf, O[2]/Occ[2]*0.85*cbrf];
+
+ // skin specularity related values
let Ks;
- let Ka;
- let lKa;
let r;
let rN;
let Ni;
- let skin;
- let cockSkin;
if (slave.clothes === "body oil") {
r = 0.4;
rN = 0.4;
Ni = 1.5;
} else {
- r = 0.7;
+ r = 0.65;
rN = 0.55;
Ni = 1.35;
}
- if (sqAO < sqBO && sqAO < sqCO && sqAO < sqDO) {
- Ks = [2.5, 2.5, 2.5];
- Ka = mA;
- lKa = lA;
- skin = "WhiteTone";
- cockSkin = "White";
-
- materials.push([cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ka", [Ka[0]*0.9, Ka[1]*0.9, Ka[2]*0.9]]);
- materials.push([cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ks", [3, 3, 3]]);
- materials.push([cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ni", Ni]);
- materials.push(["nipple_mask", "Ka", [areolaColor[0]/A[0], areolaColor[1]/A[1], areolaColor[2]/A[2]]]);
- materials.push(["nipple_mask", "map_Ka", "base/skin/torso white.jpg"]);
- materials.push(["nipple_mask", "Ks", [3, 3, 3]]);
- } else if (sqBO < sqAO && sqBO < sqCO && sqBO < sqDO) {
- Ks = [2.5, 2.5, 2.5];
- Ka = mB;
- lKa = lB;
- skin = "LightTone";
- cockSkin = "Light";
-
- materials.push([cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ka", [mB[0]*0.8, mB[1]*0.8, mB[2]*0.8]]);
- materials.push([cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ks", [2.5, 2.5, 2.5]]);
- materials.push([cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ni", Ni]);
- materials.push(["nipple_mask", "Ka", [areolaColor[0]/B[0], areolaColor[1]/B[1], areolaColor[2]/B[2]]]);
- materials.push(["nipple_mask", "map_Ka", "base/skin/torso light.jpg"]);
- materials.push(["nipple_mask", "Ks", [2.5, 2.5, 2.5]]);
- } else if (sqCO < sqBO && sqCO < sqAO && sqCO < sqDO) {
- Ks = [2, 2, 2];
- Ka = mC;
- lKa = lC;
- skin = "MidTone";
- cockSkin = "Mid";
-
- materials.push([cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ka", [mC[0]*0.65, mC[1]*0.65, mC[2]*0.65]]);
- materials.push([cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ks", [2, 2, 2]]);
- materials.push([cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ni", Ni]);
- materials.push(["nipple_mask", "Ka", [areolaColor[0]/C[0], areolaColor[1]/C[1], areolaColor[2]/C[2]]]);
- materials.push(["nipple_mask", "map_Ka", "base/skin/torso mid.jpg"]);
- materials.push(["nipple_mask", "Ks", [2, 2, 2]]);
- } else if (sqDO < sqBO && sqDO < sqCO && sqDO < sqAO) {
- Ks = [1, 1, 1];
- Ka = mD;
- lKa = lD;
- skin = "DarkTone";
- cockSkin = "Dark";
-
- materials.push([cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ka", [mD[0]*0.85, mD[1]*0.85, mD[2]*0.85]]);
- materials.push([cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ks", [1, 1, 1]]);
- materials.push([cockSkin + "Futalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ni", Ni]);
- materials.push(["nipple_mask", "Ka", [areolaColor[0]/D[0], areolaColor[1]/D[1], areolaColor[2]/D[2]]]);
- materials.push(["nipple_mask", "map_Ka", "base/skin/torso dark.jpg"]);
- materials.push(["nipple_mask", "Ks", [1, 1, 1]]);
- }
-
- materials.push([skin + "Torso", "Ka", Ka]);
- materials.push([skin + "Torso", "Ks", Ks]);
- materials.push([skin + "Torso", "r", r]);
- materials.push([skin + "Torso", "Ni", Ni]);
- materials.push([skin + "Arms", "Ka", Ka]);
- materials.push([skin + "Arms", "Ks", Ks]);
- materials.push([skin + "Arms", "r", r]);
- materials.push([skin + "Arms", "Ni", Ni]);
- materials.push([skin + "Legs", "Ka", Ka]);
- materials.push([skin + "Legs", "Ks", Ks]);
- materials.push([skin + "Legs", "r", r]);
- materials.push([skin + "Legs", "Ni", Ni]);
- materials.push([skin + "Face", "Ka", Ka]);
- materials.push([skin + "Face", "Ks", Ks]);
- materials.push([skin + "Face", "r", r]);
- materials.push([skin + "Face", "Ni", Ni]);
- materials.push([skin + "Ears", "Ka", Ka]);
- materials.push([skin + "Ears", "Ks", Ks]);
- materials.push([skin + "Ears", "r", r]);
- materials.push([skin + "Ears", "Ni", Ni]);
- materials.push([skin + "Lips", "Ka", lKa]);
- materials.push([skin + "Lips", "Ni", lipsGloss]);
- materials.push([skin + "Lips", "m", lipsMetal]);
- materials.push([skin + "Lips", "r", lipsRough]);
- materials.push([skin + "Fingernails", "Ka", nailColor]);
- materials.push([skin + "Toenails", "Ka", nailColor]);
- materials.push([skin + "Anus", "Ka", Ka]);
- materials.push([skin + "Anus", "Ks", Ks]);
- materials.push([skin + "Anus", "r", r]);
- materials.push([skin + "Anus", "Ni", Ni]);
- materials.push([skin + "Genitalia", "Ka", Ka]);
- materials.push([skin + "Genitalia", "Ks", Ks]);
- materials.push([skin + "Genitalia", "r", r]);
- materials.push([skin + "Genitalia", "Ni", Ni]);
+ let Obr = (O[0] + O[1] + O[2])/3;
+ Ks = [Obr*2+0.5, Obr*2+0.5, Obr*2+0.5];
+
+ // apply
+ materials.push(["TemplateFutalicious_Genitalia_G8F_Glans_Futalicious_Shell", "map_Ka", "dick/" + cockSkin + "Cock.jpg"]);
+ materials.push(["TemplateFutalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ka", mOc]);
+ materials.push(["TemplateFutalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ks", Ks]);
+ materials.push(["TemplateFutalicious_Genitalia_G8F_Glans_Futalicious_Shell", "Ni", Ni]);
+
+ materials.push(["nipple_mask", "Ka", areolaColor]);
+ materials.push(["nipple_mask", "Ks", Ks]);
materials.push(["nipple_mask", "r", rN]);
materials.push(["nipple_mask", "Ni", Ni]);
+ materials.push(["nipple_mask", "d", 0.6]);
+
+ materials.push(["lips_mask", "Ka", lipsColor]);
+ materials.push(["lips_mask", "Ni", lipsGloss]);
+ materials.push(["lips_mask", "m", lipsMetal]);
+ materials.push(["lips_mask", "r", lipsRough]);
+ materials.push(["lips_mask", "d", 1.0]);
+
+ materials.push(["TemplateTorso", "Ka", mO]);
+ materials.push(["TemplateTorso", "Ks", Ks]);
+ materials.push(["TemplateTorso", "r", r]);
+ materials.push(["TemplateTorso", "Ni", Ni]);
+ materials.push(["TemplateTorso", "map_Ka", "base/skin/" + skin + "Torso.jpg"]);
+ materials.push(["TemplateArms", "Ka", mO]);
+ materials.push(["TemplateArms", "Ks", Ks]);
+ materials.push(["TemplateArms", "r", r]);
+ materials.push(["TemplateArms", "Ni", Ni]);
+ materials.push(["TemplateArms", "map_Ka", "base/skin/" + skin + "Arms.jpg"]);
+ materials.push(["TemplateLegs", "Ka", mO]);
+ materials.push(["TemplateLegs", "Ks", Ks]);
+ materials.push(["TemplateLegs", "r", r]);
+ materials.push(["TemplateLegs", "Ni", Ni]);
+ materials.push(["TemplateLegs", "map_Ka", "base/skin/" + skin + "Legs.jpg"]);
+ materials.push(["TemplateFace", "Ka", mO]);
+ materials.push(["TemplateFace", "Ks", Ks]);
+ materials.push(["TemplateFace", "r", r]);
+ materials.push(["TemplateFace", "Ni", Ni]);
+ materials.push(["TemplateFace", "map_Ka", "base/skin/" + skin + "Face.jpg"]);
+ materials.push(["TemplateEars", "Ka", mO]);
+ materials.push(["TemplateEars", "Ks", Ks]);
+ materials.push(["TemplateEars", "r", r]);
+ materials.push(["TemplateEars", "Ni", Ni]);
+ materials.push(["TemplateEars", "map_Ka", "base/skin/" + skin + "Face.jpg"]);
+ materials.push(["TemplateLips", "Ni", lipsGloss]);
+ materials.push(["TemplateLips", "m", lipsMetal]);
+ materials.push(["TemplateLips", "r", lipsRough]);
+ materials.push(["TemplateLips", "map_Ka", "base/skin/" + skin + "Face.jpg"]);
+ materials.push(["TemplateFingernails", "Ka", nailColor]);
+ materials.push(["TemplateFingernails", "map_Ka", "base/skin/" + skin + "Arms.jpg"]);
+ materials.push(["TemplateToenails", "Ka", nailColor]);
+ materials.push(["TemplateToenails", "map_Ka", "base/skin/" + skin + "Legs.jpg"]);
+ materials.push(["TemplateAnus", "Ka", mO]);
+ materials.push(["TemplateAnus", "Ks", Ks]);
+ materials.push(["TemplateAnus", "r", r]);
+ materials.push(["TemplateAnus", "Ni", Ni]);
+ materials.push(["TemplateAnus", "map_Ka", "base/skin/" + skin + "Torso.jpg"]);
+ materials.push(["TemplateGenitalia", "Ka", mO]);
+ materials.push(["TemplateGenitalia", "Ks", Ks]);
+ materials.push(["TemplateGenitalia", "r", r]);
+ materials.push(["TemplateGenitalia", "Ni", Ni]);
+ materials.push(["TemplateGenitalia", "map_Ka", "base/skin/" + skin + "Torso.jpg"]);
let pubicColor = App.Art.hexToRgb(extractColor(slave.pubicHColor));
switch (slave.pubicHStyle) {
@@ -1818,7 +1822,308 @@ App.Art.applyMaterials = function(slave, scene, p) {
}
};
-App.Art.applyMorphs = function(slave, scene, p) {
+App.Art.artSize = 0; // capture the artSize variable from ui.js
+
+App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) {
+ // variable shortcuts (array variables) - pose || face || breathing || blink || look X || look Y
+ let animLength = p.animVars[0]; // how many seconds the anim will play over
+ let animPower = p.animVars[1]; // morph strength
+ let animDelay = p.animVars[2]; // how long to wait until playing the next anim
+ let currentAnim = p.animVars[3];
+ let animFrame = p.animVars[4]; // tracking how many frames into the anim
+ let eyeMoveReciprocal = p.animVars[5]; // randomly decides whether eye movements follow head movements
+
+ const poseAnimList = ["idle1", "idle2", "idle3", "idle4"];
+ const faceAnimList = [];
+ if (Math.random() < (slave.trust + 100) / 200) {
+ // trusting slave - happy animations
+ faceAnimList.push("expressionsHappy", "expressionsHappyCheerful", "expressionsHappyDelighted", "expressionsHappyFriendly", "expressionsHappySweet");
+ }
+ else {
+ // fearful slave - fear/sad animations
+ faceAnimList.push("expressionsFear", "expressionsFearAlarm", "expressionsFearAnticipation", "expressionsFearFrightened", "expressionsSadConfused", "expressionsSadOffended", "expressionsSadDejected", "expressionsSadIll");
+ }
+ if (Math.random() < (slave.devotion + 100) / 200) {
+ // devoted slave - seductive animations
+ faceAnimList.push("expressionsSeductiveDesire", "expressionsSeductiveLoving");
+ }
+ else {
+ // hateful slave - angry animations
+ faceAnimList.push("expressionsAngerFierce", "expressionsAngerGrumpy", "expressionsAngerSnarl");
+ }
+ const animList = [poseAnimList, faceAnimList];
+
+ const animState = [0, 0, 0, 0, 0, 0];
+
+ // run animations from here
+ for (let i = 0; i < animFrame.length; i++) {
+ if (App.Art.artSize < 3 && !(i === 0 || i === 4 || i === 5)) {
+ currentAnim[i] = "";
+ continue; // skip face | blink | breath anims if small frames
+ }
+
+ // reset anim
+ if (currentAnim[i] === "") {
+ switch (i) {
+ case 0: // pose
+ currentAnim[i] = animList[i][Math.floor(Math.random() * animList[i].length)];
+ if (App.Art.artSize === 1) {
+ animLength[i] = (Math.random() * 0.5) + 0.5;
+ animDelay[i] = (Math.floor(Math.random() * 4) + 1) * V.animFPS;
+ }
+ else {
+ animLength[i] = (Math.random() * 4) + 2;
+ animDelay[i] = (Math.floor(Math.random() * 25) + 5) * V.animFPS;
+ }
+ break;
+ case 1: // facial exp
+ currentAnim[i] = animList[i][Math.floor(Math.random() * animList[i].length)];
+ animLength[i] = (Math.random() * 4) + 1;
+ animDelay[i] = (Math.floor(Math.random() * 20) + 10) * V.animFPS;
+ animPower[i] = (Math.random() * 0.75) + 0.25;
+ break;
+ case 2: // breathing
+ currentAnim[i] = "breathAnim";
+ animLength[i] = (Math.random() * 2) + 2;
+ animDelay[i] = (Math.floor(Math.random() * 2) + 1) * V.animFPS;
+ animPower[i] = (Math.random() * 0.025) + 0.025;
+ break;
+ case 3: // blink
+ currentAnim[i] = "blinkAnim";
+ animLength[i] = (Math.random() * 0.25) + 0.25;
+ animDelay[i] = (Math.floor(Math.random() * 8) + 2) * V.animFPS;
+ break;
+ case 4: // look X
+ case 5: // look Y
+ if (currentAnim[4] === "" && currentAnim[5] === "") {
+ currentAnim[4] = jsEither(["headBendLeft", "headTwistLeft", "headBendRight", "headTwistRight"]);
+ animLength[4] = (Math.random() * 2) + 0.5;
+ animDelay[4] = (Math.floor(Math.random() * 10) + 5) * V.animFPS;
+ animPower[4] = Math.random();
+
+ currentAnim[5] = ((Math.random() < (slave.trust + 100) / 200) ? "down" : "up");
+ eyeMoveReciprocal = (Math.random() > (slave.trust + 100) / 200);
+ animLength[5] = (Math.random() * 2) + 0.5;
+ animDelay[5] = (Math.floor(Math.random() * 10) + 5) * V.animFPS;
+ animPower[5] = Math.random();
+ }
+ break;
+ }
+ animFrame[i] = 0;
+ }
+
+ animState[i] = Math.sin((Math.PI / (Math.floor(animLength[i] * V.animFPS))) * animFrame[i] - (Math.PI / 2));
+
+ function getAnimState(morphPower) {
+ return (animState[i] / (2 / Math.abs(morphPower))) + (1 / (2 / morphPower));
+ }
+
+ // animation picker
+ switch (i) {
+ case 0: // pose
+ // lots of things change arms down and legs closed states, so these need to be summated and pushed as one morph below
+ let slaveArmsDown = 0;
+ let slaveLegsClosed = 0;
+
+ if (!scene.inspect) {
+ if (slave.scrotum > 20) {
+ if (slave.devotion <= 50) {
+ slaveArmsDown += Math.max(Math.min(-slave.weight/300/3.5, -slave.scrotum/200), -0.5);
+ }
+
+ if (p.applyExtremeHeels || p.applyExtremeHeels2) {
+ slaveLegsClosed += Math.max(Math.min(-slave.weight/300/3.5 - 0.5, -slave.scrotum/20), -1.5);
+ } else {
+ slaveLegsClosed += Math.max(Math.min(-slave.weight/300/3.5, -slave.scrotum/20), -1.5);
+ }
+ } else {
+ if (slave.devotion <= 50) {
+ slaveArmsDown += Math.max(-slave.weight/300/3.5, -0.5);
+ }
+
+ if (p.applyExtremeHeels || p.applyExtremeHeels2 && !scene.inspect) {
+ slaveLegsClosed += Math.max(-slave.weight/300/3.5 - 0.5, -1.5);
+ } else {
+ slaveLegsClosed += Math.max(-slave.weight/300/3.5, -1.5);
+ }
+ }
+ }
+
+ switch (currentAnim[i]) {
+ case "idle1":
+ if (slave.devotion > 50) {
+ morphs.push(["posesHigh", 1 - getAnimState(0.5)]);
+ slaveArmsDown += getAnimState(0.4);
+ if (p.applyExtremeHeels || p.applyExtremeHeels2) {
+ slaveLegsClosed -= getAnimState(0.5);
+ }
+ } else if (slave.devotion > -20) {
+ morphs.push(["posesMid", 1 - getAnimState(0.5)]);
+ } else {
+ morphs.push(["posesLow", 1 - getAnimState(0.5)]);
+ slaveArmsDown += getAnimState(0.2);
+ }
+ morphs.push(["posesInspect2", getAnimState(0.5)]);
+ break;
+ case "idle2":
+ if (slave.devotion > 50) {
+ morphs.push(["posesHigh", 1 - getAnimState(0.4)]);
+ morphs.push(["posesLow", getAnimState(0.6)]);
+ slaveArmsDown += getAnimState(0.1);
+ if (p.applyExtremeHeels || p.applyExtremeHeels2) {
+ slaveLegsClosed -= getAnimState(0.5);
+ }
+ } else if (slave.devotion > -20) {
+ morphs.push(["posesMid", 1 - getAnimState(0.5)]);
+ morphs.push(["posesHigh", getAnimState(0.3)]);
+ slaveArmsDown += getAnimState(0.1);
+ } else {
+ morphs.push(["posesLow", 1 - getAnimState(0.6)]);
+ morphs.push(["posesHigh", getAnimState(0.4)]);
+ slaveArmsDown += getAnimState(0.1);
+ }
+ break;
+ case "idle3":
+ if (slave.devotion > 50) {
+ morphs.push(["posesHigh", 1]);
+ morphs.push(["posesInspect2", getAnimState(-0.25)]);
+ slaveArmsDown += getAnimState(0.2);
+ if (p.applyExtremeHeels || p.applyExtremeHeels2) {
+ slaveLegsClosed -= getAnimState(0.5);
+ }
+ } else if (slave.devotion > -20) {
+ morphs.push(["posesMid", 1]);
+ morphs.push(["posesInspect2", getAnimState(-0.2)]);
+ } else {
+ morphs.push(["posesLow", getAnimState(1.2)]);
+ morphs.push(["posesInspect2", getAnimState(-0.2)]);
+ }
+ break;
+ case "idle4":
+ if (slave.devotion > 50) {
+ morphs.push(["posesHigh", 1 - getAnimState(0.8)]);
+ morphs.push(["posesLow", getAnimState(0.2)]);
+ morphs.push(["posesMid", getAnimState(0.6)]);
+ if (p.applyExtremeHeels || p.applyExtremeHeels2) {
+ slaveLegsClosed -= getAnimState(0.5);
+ }
+ } else if (slave.devotion > -20) {
+ morphs.push(["posesMid", 1 - getAnimState(0.4)]);
+ morphs.push(["posesLow", getAnimState(0.2)]);
+ morphs.push(["posesHigh", getAnimState(0.2)]);
+ } else {
+ morphs.push(["posesLow", 1 - getAnimState(0.8)]);
+ morphs.push(["posesMid", getAnimState(0.6)]);
+ morphs.push(["posesHigh", getAnimState(0.2)]);
+ }
+ break;
+ }
+
+ if (slaveArmsDown > 0) {
+ morphs.push(["poseArmsDown", Math.min(Math.max(slaveArmsDown, 0), 1)]);
+ }
+ if (slaveLegsClosed !== 0) {
+ morphs.push(["posesLegsClosed", Math.min(Math.max(slaveLegsClosed, -1), 1)]);
+ }
+ break;
+ case 1: // facial exp
+ morphs.push([currentAnim[i], getAnimState(animPower[i])]);
+ break;
+ case 2: // breathing
+ morphs.push(["posesInspect", getAnimState(animPower[i]) - (animPower[i] / 2)]);
+ morphs.push(["bodyShape2", getAnimState(animPower[i]) - (animPower[i] / 2)]); // note, may need to change this morph if Elohiem decides to use it for something later; see commented code ln 2321
+ break;
+ case 3: // blink
+ morphs.push(["eyesClosed", Math.min(Math.max(getAnimState(1.0), 0), 1)]);
+ break;
+ case 4: // look X
+ if (currentAnim[i] === "") {
+ break; // little catch code if it's waiting for look Y to reset
+ }
+ morphs.push([currentAnim[i], getAnimState(animPower[i] * 0.5)]);
+ if (currentAnim[i] === "headBendLeft" || currentAnim[i] === "headTwistLeft") {
+ if (eyeMoveReciprocal) {
+ morphs.push(["eyesLookRight", getAnimState(animPower[i] * 0.75)]);
+ }
+ else {
+ morphs.push(["eyesLookLeft", getAnimState(animPower[i] * 0.75)]);
+ }
+ }
+ else {
+ if (eyeMoveReciprocal) {
+ morphs.push(["eyesLookLeft", getAnimState(animPower[i] * 0.75)]);
+ }
+ else {
+ morphs.push(["eyesLookRight", getAnimState(animPower[i] * 0.75)]);
+ }
+ }
+ break;
+ case 5: // look Y
+ switch (currentAnim[i]) {
+ case "up":
+ morphs.push(["headBendBackwards", getAnimState(animPower[i] * 0.15)]);
+ if (eyeMoveReciprocal) {
+ morphs.push(["eyesLookDown", getAnimState(animPower[i] * 0.5)]);
+ }
+ else {
+ morphs.push(["eyesLookUp", getAnimState(animPower[i] * 0.5)]);
+ }
+ break;
+ case "down":
+ morphs.push(["headBendForward", getAnimState(animPower[i] * 0.25)]);
+ if (eyeMoveReciprocal) {
+ morphs.push(["eyesLookUp", getAnimState(animPower[i] * 0.5)]);
+ }
+ else {
+ morphs.push(["eyesLookDown", getAnimState(animPower[i] * 0.5)]);
+ }
+ break;
+ }
+ break;
+ }
+
+ // do animation tick
+ if (isAnimTick) { // this is needed so that mouse movement frame updates don't break animation state
+ if (animState[i] === 1.0 || animFrame[i] === 0) { // pause during start and apogee of anim track
+ animDelay[i]--;
+ if (animDelay[i] <= 0) {
+ switch (i) {
+ case 0: // pose
+ if (App.Art.artSize === 1) {
+ animDelay[i] = (Math.floor(Math.random() * 4) + 1) * V.animFPS;
+ }
+ else {
+ animDelay[i] = (Math.floor(Math.random() * 10) + 10) * V.animFPS;
+ }
+ break;
+ case 1: // facial exp
+ animDelay[i] = (Math.floor(Math.random() * 20) + 10) * V.animFPS;
+ break;
+ case 2: // breathing
+ animDelay[i] = (Math.floor(Math.random() * 2) + 1) * V.animFPS;
+ break;
+ case 3: // blink
+ animDelay[i] = 0;
+ break;
+ case 4: // look X
+ case 5: // look Y
+ animDelay[i] = (Math.floor(Math.random() * 10) + 5) * V.animFPS;
+ break;
+ }
+ animFrame[i]++;
+ }
+ }
+ else if (animState[i] === -1.0 && animFrame[i] > 0) { // end of anim track
+ currentAnim[i] = "";
+ }
+ else {
+ animFrame[i]++;
+ }
+ }
+ }
+};
+
+App.Art.applyMorphs = function(slave, scene, p, isAnimating) {
App.Art.seed = slave.ID + 3000;
let morphs = [];
@@ -1846,28 +2151,49 @@ App.Art.applyMorphs = function(slave, scene, p) {
morphs.push(["posesExtremeHeels2", 1]);
}
- if (slave.arm.right && slave.arm.left && slave.leg.right && slave.leg.left) {
- if (scene.inspect) {
- morphs.push(["posesInspect2", 1]);
- morphs.push(["posesInspectGen2", 1]);
- } else if (slave.devotion > 50) {
- morphs.push(["posesHigh", 1]);
- } else if (slave.devotion > -20) {
- morphs.push(["posesMid", 1]);
- } else {
- morphs.push(["posesLow", 1]);
- }
+ if (!isAnimating) { // animation code now handles these morphs directly
+ if (slave.arm.right && slave.arm.left && slave.leg.right && slave.leg.left) {
+ if (scene.inspect) {
+ morphs.push(["posesInspect2", 1]);
+ morphs.push(["posesInspectGen2", 1]);
+ } else {
+ if (slave.devotion > 50) {
+ morphs.push(["posesHigh", 1]);
+ } else if (slave.devotion > -20) {
+ morphs.push(["posesMid", 1]);
+ } else {
+ morphs.push(["posesLow", 1]);
+ }
+
+ if (slave.scrotum > 20) {
+ if (slave.devotion <= 50) {
+ morphs.push(["posesArmsDown", Math.max(Math.min(-slave.weight/300/3.5, -slave.scrotum/200), -0.5)]);
+ }
+
+ if (p.applyExtremeHeels || p.applyExtremeHeels2) {
+ morphs.push(["posesLegsClosed", Math.max(Math.min(-slave.weight/300/3.5 - 0.5, -slave.scrotum/20), -1.5)]);
+ } else {
+ morphs.push(["posesLegsClosed", Math.max(Math.min(-slave.weight/300/3.5, -slave.scrotum/20), -1.5)]);
+ }
+ } else {
+ if (slave.devotion <= 50) {
+ morphs.push(["posesArmsDown", Math.max(-slave.weight/300/3.5, -0.5)]);
+ }
- if (slave.devotion <= 50) {
- morphs.push(["posesArmsDown", -slave.weight/300/3.5]);
- morphs.push(["posesLegsClosed", -slave.weight/300/3.5]);
+ if (p.applyExtremeHeels || p.applyExtremeHeels2) {
+ morphs.push(["posesLegsClosed", Math.max(-slave.weight/300/3.5 - 0.5, -1.5)]);
+ } else {
+ morphs.push(["posesLegsClosed", Math.max(-slave.weight/300/3.5, -1.5)]);
+ }
+ }
+ }
}
- }
- if (slave.trust < 0) {
- morphs.push(["expressionsFear", Math.abs(slave.trust)/100]);
- } else {
- morphs.push(["expressionsHappy", slave.trust/100]);
+ if (slave.trust < 0) {
+ morphs.push(["expressionsFear", Math.abs(slave.trust)/100]);
+ } else {
+ morphs.push(["expressionsHappy", slave.trust/100]);
+ }
}
// used for interpolating mixed race based on slave ID
@@ -2102,7 +2428,7 @@ App.Art.applyMorphs = function(slave, scene, p) {
morphs.push([ribShape[rib], 1]);
}
- /*
+ /* Elohiem, if you decide to reactivate this bit, note that I'm using "bodyShape2" for breathing animations --BI
let bodyShape = ["bodyShape0", "bodyShape1", "bodyShape2", "bodyShape3", "bodyShape4", "bodyShape5"];
let body = Math.floor(App.Art.random() * bodyShape.length);
if (body > 0) {
@@ -2360,13 +2686,13 @@ App.Art.applyMorphs = function(slave, scene, p) {
*/
if (slave.boobs < 600) {
- morphs.push(["boobShapeSmall", -(slave.boobs-600)/600]);
+ morphs.push(["boobShapeSmall", Math.min(-(slave.boobs-700)/600, 1)]);
} else {
switch (slave.boobShape) {
case "normal":
morphs.push(["boobShapeNormal", ((slave.boobs-600)**(1/3)/17) * (175/p.height)]); break;
case "perky":
- morphs.push(["boobShapePerky", ((slave.boobs-600)**(1/3)/30) * (175/p.height)]); break;
+ morphs.push(["boobShapePerky", ((slave.boobs-600)**(1/3)/15) * (175/p.height)]); break;
case "saggy":
morphs.push(["boobShapeSaggy", ((slave.boobs-600)**(1/3)/28) * (175/p.height)]); break;
case "torpedo-shaped":
@@ -2427,12 +2753,10 @@ App.Art.applyMorphs = function(slave, scene, p) {
if (slave.scrotum <= 0 || slave.balls <= 1) {
morphs.push(["ballsRemove", 1]);
} else {
- if (slave.balls > 1) {
- morphs.push(["balls", convertRange(2, 10, 0, 0.75, slave.balls * 0.6 *(175/p.height))]);
- }
-
if (slave.scrotum > 0) {
- morphs.push(["scrotum", convertRange(1, 10, 0, 2.0, slave.scrotum * (175/p.height))]);
+ let scr = Math.min(slave.scrotum, 40);
+ morphs.push(["balls", convertRange(2, 10, 0, 0.75, scr * 2.5 * 0.6 *(175/p.height))]);
+ morphs.push(["scrotum", convertRange(1, 10, 0, 2.0, scr * (175/p.height))]);
}
}
@@ -2492,6 +2816,10 @@ App.Art.applyMorphs = function(slave, scene, p) {
morphs.push(["offset", 2]); // only applies to clothes
+ if (V.seeAnimation) {
+ App.Art.getAnimState(slave, scene, p, morphs, isAnimating);
+ }
+
App.Art.resetMorphs(scene);
for (let i =0; i < scene.models[0].morphs.length; i++) {
diff --git a/src/art/webgl/contents.txt b/src/art/webgl/contents.txt
index 0aa0767332dc4c4e86335373c8d1b11c01ed808a..0653f90fda9706580bfdfe2ea843ee97e8d23110 100644
--- a/src/art/webgl/contents.txt
+++ b/src/art/webgl/contents.txt
@@ -1,7 +1,7 @@
OUTDATED!!!
///////////////// MORPHS /////////////////
-General
+General
physicalAgeYoung
physicalAgeOld
weight
@@ -22,14 +22,14 @@ General
dickRemove
vaginaRemove - just closes the vagina
-amputee
+amputee
leftArm
rightArm
leftLeg
rightLeg
boobShape
- small
+ small
normal
perky
saggy
@@ -42,7 +42,7 @@ nipples
huge
puffy
-faceShape
+faceShape
normal
masculine
androgynous
@@ -50,15 +50,15 @@ faceShape
sensual
exotic
-lips
+lips
thin
normal
pretty
plush
huge
facepussy
-
-eyes
+
+eyes
normal
wide
round
@@ -66,16 +66,16 @@ eyes
slit
small
open
-
-nose
+
+nose
normal
wide
forward
flat
triangular
small
-
-forehead
+
+forehead
normal
round
small
@@ -84,7 +84,7 @@ expressions
happy
fear
-race
+race
white
asian
latina
@@ -97,7 +97,7 @@ race
indo-aryan (aryan)
malay
-poses
+poses
high
mid
low
@@ -110,7 +110,7 @@ general
makeup
fingernails
-skin color
+skin color
pure white (Ceridwen)
ivory (Ceridwen)
white (Ceridwen)
diff --git a/src/art/webgl/engine.js b/src/art/webgl/engine.js
index 0e93a67728bd7858a36929fb4aba35154c3b830b..075f31981811d1bea76c65ff6ebb3d500f84e522 100644
--- a/src/art/webgl/engine.js
+++ b/src/art/webgl/engine.js
@@ -46,7 +46,7 @@ App.Art.Engine = class {
if (map_d < 0.85)
discard;
-
+
gPosition = pos;
gNormal = normalize(normal);
}`;
@@ -81,7 +81,7 @@ App.Art.Engine = class {
if (map_d < 0.85)
discard;
-
+
gShadowDepth = gl_FragCoord.z;
}`;
}
@@ -139,19 +139,19 @@ App.Art.Engine = class {
{
// get sample position
vec3 samplePos = TBN * samples[i]; // from tangent to view-space
- samplePos = pos + samplePos * radius;
-
+ samplePos = pos + samplePos * radius;
+
// project sample position
vec4 offset = vec4(samplePos, 1.0);
offset = projection * offset; // from view to clip-space
offset.xy /= offset.w; // perspective divide
offset.xy = offset.xy * 0.5 + 0.5; // transform to range 0.0 - 1.0
-
+
float sampleDepth = texture(gPosition, offset.xy).z;
-
+
// range check & accumulate
float rangeCheck = smoothstep(0.0, 1.0, radius / abs(pos.z - sampleDepth));
- occlusion += (sampleDepth <= samplePos.z + bias ? 1.0 : 0.0) * rangeCheck;
+ occlusion += (sampleDepth <= samplePos.z + bias ? 1.0 : 0.0) * rangeCheck;
}
ao = 1.0 - (occlusion / scale);
}`;
@@ -166,14 +166,14 @@ App.Art.Engine = class {
uniform sampler2D ssaoInput;
uniform float blur;
-
- void main()
+
+ void main()
{
vec2 texelSize = 1.0 / vec2(textureSize(ssaoInput, 0));
float result = 0.0;
- for (float x = -blur; x <= blur; x++)
+ for (float x = -blur; x <= blur; x++)
{
- for (float y = -blur; y <= blur; y++)
+ for (float y = -blur; y <= blur; y++)
{
vec2 offset = vec2(x, y) * texelSize;
result += texture(ssaoInput, textureCoord + offset).r;
@@ -222,19 +222,19 @@ App.Art.Engine = class {
{
// get sample position
vec3 samplePos = TBN * samples[i]; // from tangent to view-space
- samplePos = pos + samplePos * radius;
-
+ samplePos = pos + samplePos * radius;
+
// project sample position
vec4 offset = vec4(samplePos, 1.0);
offset = projection * offset; // from view to clip-space
offset.xy /= offset.w; // perspective divide
offset.xy = offset.xy * 0.5 + 0.5; // transform to range 0.0 - 1.0
-
+
float sampleDepth = texture(gPosition, offset.xy).z;
-
+
// range check & accumulate
float rangeCheck = smoothstep(0.0, 1.0, radius / abs(pos.z - sampleDepth));
- occlusion += (sampleDepth <= samplePos.z + bias ? 1.0 : 0.0) * rangeCheck;
+ occlusion += (sampleDepth <= samplePos.z + bias ? 1.0 : 0.0) * rangeCheck;
}
iao = 1.0 - (occlusion / scale);
}`;
@@ -249,14 +249,14 @@ App.Art.Engine = class {
uniform sampler2D sssInput;
uniform float blur;
-
- void main()
+
+ void main()
{
vec2 texelSize = 1.0 / vec2(textureSize(sssInput, 0));
float result = 0.0;
- for (float x = -blur; x <= blur; x++)
+ for (float x = -blur; x <= blur; x++)
{
- for (float y = -blur; y <= blur; y++)
+ for (float y = -blur; y <= blur; y++)
{
vec2 offset = vec2(x, y) * texelSize;
result += texture(sssInput, textureCoord + offset).r;
@@ -269,7 +269,7 @@ App.Art.Engine = class {
getFsSourceForwardPass(dl, pl) {
return `#version 300 es
precision highp float;
-
+
uniform float lightInt[${dl}];
uniform vec3 lightAmb[${dl}];
uniform vec3 lightColor[${dl}];
@@ -327,7 +327,7 @@ App.Art.Engine = class {
uniform float sSSS;
uniform float overlay;
-
+
uniform vec3 cameraPos;
uniform sampler2D textSampler[10];
@@ -341,28 +341,47 @@ App.Art.Engine = class {
const float PI = 3.14159265359;
+ vec2 poissonDisk[16] = vec2[](
+ vec2( -0.94201624, -0.39906216 ),
+ vec2( 0.94558609, -0.76890725 ),
+ vec2( -0.094184101, -0.92938870 ),
+ vec2( 0.34495938, 0.29387760 ),
+ vec2( -0.91588581, 0.45771432 ),
+ vec2( -0.81544232, -0.87912464 ),
+ vec2( -0.38277543, 0.27676845 ),
+ vec2( 0.97484398, 0.75648379 ),
+ vec2( 0.44323325, -0.97511554 ),
+ vec2( 0.53742981, -0.47373420 ),
+ vec2( -0.26496911, -0.41893023 ),
+ vec2( 0.79197514, 0.19090188 ),
+ vec2( -0.24188840, 0.99706507 ),
+ vec2( -0.81409955, 0.91437590 ),
+ vec2( 0.19984126, 0.78641367 ),
+ vec2( 0.14383161, -0.14100790 )
+ );
+
float distributionGGX(vec3 N, vec3 H, float roughness)
{
float a = roughness*roughness;
float a2 = a*a;
float NdotH = max(dot(N, H), 0.0);
float NdotH2 = NdotH*NdotH;
-
+
float num = a2;
float denom = (NdotH2 * (a2 - 1.0) + 1.0);
denom = PI * denom * denom;
-
+
return num / denom;
}
-
+
float geometrySchlickGGX(float NdotV, float roughness)
{
float r = (roughness + 1.0);
float k = (r*r) / 8.0;
-
+
float num = NdotV;
float denom = NdotV * (1.0 - k) + k;
-
+
return num / denom;
}
@@ -372,7 +391,7 @@ App.Art.Engine = class {
float NdotL = max(dot(N, L), 0.0);
float ggx2 = geometrySchlickGGX(NdotV, roughness);
float ggx1 = geometrySchlickGGX(NdotL, roughness);
-
+
return ggx1 * ggx2;
}
@@ -410,18 +429,24 @@ App.Art.Engine = class {
float S1 = m + a * l0;
float C2 = (a * P) / (P - S1);
float CP = -C2 / P;
-
+
vec3 w0 = 1.0 - smoothstep(0.0, m, x);
vec3 w2 = step(m + l0, x);
vec3 w1 = 1.0 - w0 - w2;
-
+
vec3 T = m * pow(x / m, vec3(c)) + b;
vec3 S = P - (P - S1) * exp(CP * (x - S0));
vec3 L = m + a * (x - m);
-
+
return T * w0 + L * w1 + S * w2;
}
+ float random(vec3 seed, int i){
+ vec4 seed4 = vec4(seed,i);
+ float dot_product = dot(seed4, vec4(12.9898,78.233,45.164,94.673));
+ return fract(sin(dot_product) * 43758.5453);
+ }
+
void main() {
vec2 resolution = vec2(textureSize(textSampler[0], 0));
mat3 TBN = createTBNMatrix(pos, textureCoord, normal);
@@ -441,7 +466,7 @@ App.Art.Engine = class {
coord = vec2(coord.x * cos(angle) - coord.y * sin(angle), coord.x * sin(angle) + coord.y * cos(angle));
coord = coord / scale;
coord = coord + vec2(0.5, 0.5);
-
+
if (sAlpha == 1.0)
map_d = d * texture(textSampler[1], coord).r;
@@ -475,18 +500,15 @@ App.Art.Engine = class {
if (sShadows == 1.0) {
vec3 projCoords = shadowMap.xyz/shadowMap.w * 0.5 + 0.5;
float currentDepth = projCoords.z;
- float bias = max(shadowBiasMax * (1.0 - dot(new_normal, shadowDir)), shadowBiasMin);
+ float bias = max(shadowBiasMax * (1.0 - dot(new_normal, shadowDir)), shadowBiasMin);
vec2 texelSize = 1.0 / vec2(textureSize(textSampler[8], 0));
- for(int x = -2; x <= 2; ++x)
- {
- for(int y = -2; y <= 2; ++y)
- {
- float pcfDepth = texture(textSampler[8], projCoords.xy + vec2(x, y) * texelSize).r;
- shadow += currentDepth - bias < pcfDepth ? 1.0 : 0.0;
- }
+ for (int i=0;i<16;i++){
+ int index = int(16.0*random(floor(pos.xyz*1000.0), i))%16;
+ float pcfDepth = texture(textSampler[8], projCoords.xy + poissonDisk[index]*texelSize).r;
+ shadow += currentDepth - bias < pcfDepth ? 1.0 : 0.0;
}
- shadow /= 25.0;
+ shadow /= 16.0;
shadow = min(shadow + (1.0-shadowIntensity), 1.0);
}
@@ -508,21 +530,21 @@ App.Art.Engine = class {
// calculate per-light radiance
vec3 L = -lightVect[i];
vec3 H = normalize(V + L);
- vec3 radiance = lightColor[i] * lightInt[i];
-
+ vec3 radiance = lightColor[i] * lightInt[i];
+
// cook-torrance brdf
- float NDF = distributionGGX(N, H, roughness);
- float G = geometrySmith(N, V, L, roughness);
- vec3 F = fresnelSchlickRoughness(max(dot(H, V), 0.0), F0, roughness);
-
+ float NDF = distributionGGX(N, H, roughness);
+ float G = geometrySmith(N, V, L, roughness);
+ vec3 F = fresnelSchlickRoughness(max(dot(H, V), 0.0), F0, roughness);
+
vec3 numerator = NDF * G * F;
float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.00001;
- vec3 specular = numerator / denominator;
+ vec3 specular = numerator / denominator;
// kS is equal to Fresnel
vec3 kD = vec3(1.0) - F;
- kD *= 1.0 - metallic;
-
+ kD *= 1.0 - metallic;
+
// add to outgoing radiance Lo
float NdotL = max(dot(N, L), 0.0);
if (map_d >= 0.85 || overlay == 1.0) {
@@ -557,21 +579,21 @@ App.Art.Engine = class {
// calculate per-light radiance
vec3 L = normalize(pointLightPos[i] - pos);
vec3 H = normalize(V + L);
- vec3 radiance = pointLightColor[i] * pointLightInt[i];
-
+ vec3 radiance = pointLightColor[i] * pointLightInt[i];
+
// cook-torrance brdf
- float NDF = distributionGGX(N, H, roughness);
- float G = geometrySmith(N, V, L, roughness);
- vec3 F = fresnelSchlickRoughness(max(dot(H, V), 0.0), F0, roughness);
-
+ float NDF = distributionGGX(N, H, roughness);
+ float G = geometrySmith(N, V, L, roughness);
+ vec3 F = fresnelSchlickRoughness(max(dot(H, V), 0.0), F0, roughness);
+
vec3 numerator = NDF * G * F;
float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.00001;
- vec3 specular = numerator / denominator;
+ vec3 specular = numerator / denominator;
// kS is equal to Fresnel
vec3 kD = vec3(1.0) - F;
- kD *= 1.0 - metallic;
-
+ kD *= 1.0 - metallic;
+
// add to outgoing radiance Lo
float NdotL = max(dot(N, L), 0.0);
if (map_d >= 0.85 || overlay == 1.0) {
@@ -615,7 +637,7 @@ App.Art.Engine = class {
if (sGamma == 1.0)
c = pow(c, vec3(1.0/gammaY));
-
+
if (sNormals == 1.0)
c = new_normal*0.5+0.5;
@@ -694,15 +716,16 @@ App.Art.Engine = class {
let seemMap = new Int32Array(seems.length*2);
let indices = modelBuffers.figureIndices[i];
for (let j=0, h=0; j <= seems.length-3; j+=3, h+=6) {
- let idx = seems[j+1];
- let value = seems[j+2];
- indices[seems[j]] = value/3;
- seemMap[h] = idx;
- seemMap[h+1] = value;
- seemMap[h+2] = idx+1;
- seemMap[h+3] = value+1;
- seemMap[h+4] = idx+2;
- seemMap[h+5] = value+2;
+ let pos = seems[j+0];
+ let oldInd = seems[j+1];
+ let newInd = seems[j+2];
+ indices[pos] = newInd/3;
+ seemMap[h] = oldInd;
+ seemMap[h+1] = newInd;
+ seemMap[h+2] = oldInd+1;
+ seemMap[h+3] = newInd+1;
+ seemMap[h+4] = oldInd+2;
+ seemMap[h+5] = newInd+2;
}
modelBuffers.figureSeemMaps[i] = seemMap;
}
@@ -1161,6 +1184,7 @@ App.Art.Engine = class {
if (V.setShadowMapping) {
this.gl.disable(this.gl.BLEND);
+ this.gl.cullFace(this.gl.FRONT);
this.gl.viewport(0, 0, sceneParams.settings.rwidth*4, sceneParams.settings.rheight*4);
this.gl.bindFramebuffer(this.gl.FRAMEBUFFER, this.buffers.shadowBuffer);
this.gl.clear(this.gl.COLOR_BUFFER_BIT | this.gl.DEPTH_BUFFER_BIT);
@@ -1168,6 +1192,7 @@ App.Art.Engine = class {
this.drawShadow(sceneParams);
this.gl.bindFramebuffer(this.gl.FRAMEBUFFER, null);
this.gl.viewport(0, 0, this.gl.drawingBufferWidth, this.gl.drawingBufferHeight);
+ this.gl.cullFace(this.gl.BACK);
this.gl.enable(this.gl.BLEND);
}
@@ -1232,8 +1257,8 @@ App.Art.Engine = class {
// shadows
let shadow = [sceneParams.shadows.x, sceneParams.shadows.y, sceneParams.shadows.z];
- let shadowRotX = this.degreeToRad(sceneParams.shadows.xr);
- let shadowRotY = this.degreeToRad(sceneParams.shadows.yr);
+ let shadowRotX = this.degreeToRad(-sceneParams.shadows.xr);
+ let shadowRotY = this.degreeToRad(-sceneParams.shadows.yr);
let matShadowRot = this.matrixMulMatrix(this.matrixMakeRotationX(shadowRotX), this.matrixMakeRotationY(shadowRotY));
let shadowDir = this.matrixMulVector(matShadowRot, [0, 0, 1]);
let shadowTarget = this.vectorAdd(shadowDir, shadow);
@@ -1503,7 +1528,7 @@ App.Art.Engine = class {
this.gl.uniform1f(this.gl.getUniformLocation(this.shaderProgramForwardPass, "sGamma"), sceneParams.settings.gamma);
this.gl.uniform1f(this.gl.getUniformLocation(this.shaderProgramForwardPass, "whiteM"), sceneParams.settings.whiteM);
this.gl.uniform1f(this.gl.getUniformLocation(this.shaderProgramForwardPass, "gammaY"), sceneParams.settings.gammaY);
- this.gl.uniform1f(this.gl.getUniformLocation(this.shaderProgramForwardPass, "sUchimura"), V.setTonemapping);
+ this.gl.uniform1f(this.gl.getUniformLocation(this.shaderProgramForwardPass, "sUchimura"), sceneParams.settings.uchimura);
this.gl.uniform1f(this.gl.getUniformLocation(this.shaderProgramForwardPass, "uchimuraP"), sceneParams.settings.uchimuraP);
this.gl.uniform1f(this.gl.getUniformLocation(this.shaderProgramForwardPass, "uchimuraA"), sceneParams.settings.uchimuraA);
this.gl.uniform1f(this.gl.getUniformLocation(this.shaderProgramForwardPass, "roughness"), sceneParams.pbr.roughness);
@@ -1802,7 +1827,7 @@ App.Art.Engine = class {
return [[2/width, 0, 0, 0],
[0, 2/height, 0, 0],
[0, 0, 1/(far-near), 0],
- [0, 0, -near/(far-near), 0]];
+ [0, 0, -near/(far-near), 1]];
}
matrixPointAt(pos, target, up) {
diff --git a/src/art/webgl/ui.js b/src/art/webgl/ui.js
index 7ee029ae9ecb27ecd960cf984497aec14f7a5f79..dc05e3d74ce13541843a2d20b7185a47323927b9 100644
--- a/src/art/webgl/ui.js
+++ b/src/art/webgl/ui.js
@@ -2,6 +2,8 @@ App.Art.views = {};
App.Art.isDraggingCanvas = false;
+App.Art.runningAnim = [];
+
App.Art.createWebglUI = function(container, slave, artSize, scene, p) {
// persistent view
if (!(slave.ID in App.Art.views)) {
@@ -25,7 +27,7 @@ App.Art.createWebglUI = function(container, slave, artSize, scene, p) {
function render() {
applyView(scene, view); // copy persistent view to scene before render
- App.Art.applyMorphs(slave, scene, p); // used for posing
+ App.Art.applyMorphs(slave, scene, p, false); // used for posing
App.Art.engine.render(scene, cvs);
}
@@ -94,10 +96,16 @@ App.Art.createWebglUI = function(container, slave, artSize, scene, p) {
function inspectView(e) {
updateLinkedButtons("inspect");
- view.yr = 0;
- view.inspect = true;
- App.Art.Frame(slave, scene, view, p);
- render();
+ if (!V.seeAnimation) {
+ if (V.set3QView) {
+ view.yr = 30;
+ } else {
+ view.yr = 0;
+ }
+ view.inspect = true;
+ App.Art.Frame(slave, scene, view, p);
+ render();
+ }
}
function lockView(e) {
@@ -120,7 +128,11 @@ App.Art.createWebglUI = function(container, slave, artSize, scene, p) {
function resetView(e) {
updateLinkedButtons("reset");
- view.yr = App.Art.defaultScene.models[0].transform.yr;
+ if (V.set3QView) {
+ view.yr = 30;
+ } else {
+ view.yr = App.Art.defaultScene.models[0].transform.yr;
+ }
view.inspect = false;
App.Art.Frame(slave, scene, view, p);
render();
@@ -164,7 +176,9 @@ App.Art.createWebglUI = function(container, slave, artSize, scene, p) {
if (view.lockView){
// update if shared view
updateLinkedButtons();
- render();
+ if (artSize < 3) {
+ render();
+ }
return;
}
oz = view.camera.z;
@@ -214,6 +228,19 @@ App.Art.createWebglUI = function(container, slave, artSize, scene, p) {
return false;
};
+ // animation call
+ if (artSize !== App.Art.artSize && App.Art.runningAnim.length > 0) {
+ for (let i = 0; i < App.Art.runningAnim.length; i++) {
+ clearInterval(App.Art.runningAnim[i]); // always clear, prevent animation running in background
+ }
+ App.Art.runningAnim.length = 0;
+ }
+
+ if (V.seeAnimation) {
+ App.Art.startAnim(slave, scene, view, p, cvs);
+ App.Art.artSize = artSize;
+ }
+
container.appendChild(cvs);
uicontainer.appendChild(btnLockView);
uicontainer.appendChild(btnFaceView);
@@ -237,12 +264,11 @@ App.Art.createWebglUI = function(container, slave, artSize, scene, p) {
scene.settings.rwidth = cvs.width * V.setSuperSampling;
scene.settings.rheight = cvs.height * V.setSuperSampling;
- scene.shadows.x = -600;
- scene.shadows.y = 1000;
- scene.shadows.z = -1000;
- scene.shadows.fov = 40;
- scene.shadows.fnear = 5;
- scene.shadows.ffar = 10000;
+ if (slave.height > 450) {
+ scene.shadows.fov = 60;
+ } else {
+ scene.shadows.fov = 25;
+ }
// render state
if (view.faceView) {
@@ -254,8 +280,21 @@ App.Art.createWebglUI = function(container, slave, artSize, scene, p) {
} else {
// default
updateLinkedButtons();
- render();
+ if (!V.seeAnimation || artSize < 3) {
+ render();
+ }
+ }
+};
+
+App.Art.startAnim = function(slave, scene, view, p, cvs) {
+ function updateFrame() {
+ scene.inspect = view.inspect;
+ scene.models[0].transform.yr = view.yr;
+ scene.camera = view.camera;
+ App.Art.applyMorphs(slave, scene, p, true);
+ App.Art.engine.render(scene, cvs);
}
+ App.Art.runningAnim.push(setInterval(updateFrame, 1000 / V.animFPS));
};
App.Art.GetCanvasResolution = function(artSize) {
diff --git a/src/budget/budget.js b/src/budget/budget.js
index e23350f7c820e0aedcb0e2478812d26f48f787a6..f37dcd826e22d931498b21408709497bde182a87 100644
--- a/src/budget/budget.js
+++ b/src/budget/budget.js
@@ -249,7 +249,9 @@ App.Budget.table = function(budgetType) {
generateRowCategory("Your skills", "PCSkills"),
generateRowCategory("Your training expenses", "PCtraining"),
generateRowCategory("Your food expenses", "PCdiet"),
+ generateRowCategory("Your drug expenses", "PCdrugs"),
generateRowCategory("Your medical expenses", "PCmedical"),
+ generateRowCategory("Your cosmetic expenses", "PCcosmetics"),
generateRowCategory("Citizen Orphanage", "citizenOrphanage"),
generateRowCategory("Private Orphanage", "privateOrphanage"),
generateRowCategory("Stock dividends", "stocks"),
diff --git a/src/budget/costsBudget.js b/src/budget/costsBudget.js
index 03bb29fb5c79d997c79a694dc99c317ee74fc144..e17815aba0ca5c86efcbbd4a36acbe8464a105a4 100644
--- a/src/budget/costsBudget.js
+++ b/src/budget/costsBudget.js
@@ -75,7 +75,7 @@ App.Budget.costs = function() {
const p = document.createElement("p");
- App.UI.DOM.appendNewElement("div", p, `The Local Economy score effects some prices in your ecology. The lower the score, the higher the prices. The base score is 100.`, ["scene-intro"]);
+ App.UI.DOM.appendNewElement("div", p, `The Local Economy score effects some prices in your ecology. The lower the score, the higher the prices. The base score is 100.`, ["detail"]);
const grid = document.createElement("div");
grid.className = "grid-2columns-auto";
@@ -129,7 +129,7 @@ App.Budget.costs = function() {
*/
function settings() {
const p = document.createElement("p");
- App.UI.DOM.appendNewElement("div", p, "Your weekly costs are as follows:", ["detail"]);
+ App.UI.DOM.appendNewElement("h2", p, `Weekly costs`);
let options = new App.UI.OptionsGroup();
options.addOption("", "costsBudget", V.showAllEntries)
diff --git a/src/budget/loans.js b/src/budget/loans.js
index 5234f2eac176ad7b628c4a5e82b8cc14aed5e7b4..855278661f8a2fb0ae63c7d6d694ead5b0f1d60d 100644
--- a/src/budget/loans.js
+++ b/src/budget/loans.js
@@ -23,7 +23,18 @@ App.Budget.loans = function() {
const links = [];
const text = [];
- text.push(`You can pay off a loan here.`);
+ text.push(`You`);
+ if (loan('bank')) {
+ text.push(`still owe the bank ${cashFormat(Math.trunc(loan('bank').full))}`);
+ if (loan('shark')) {
+ text.push(`and`);
+ }
+ }
+ if (loan('shark')) {
+ text.push(`have ${years(loan('shark').deadline - V.week)} to pay the shark back ${cashFormat(Math.trunc(loan('shark').full))}`);
+ }
+ text.push(text.pop() + `.`);
+ text.push(`You can pay off your loans here.`);
if (loan('bank')) {
const bank = loan('bank');
@@ -33,7 +44,7 @@ App.Budget.loans = function() {
V.loans.delete(bank);
App.UI.reload();
- }, [], '', `You have a remaining balance of ${cashFormat(Math.trunc(bank.full))}.`));
+ }));
} else {
links.push(App.UI.DOM.disabledLink(`Pay off your bank loan`, [
`You lack the necessary funds to pay off this loan`,
@@ -48,7 +59,7 @@ App.Budget.loans = function() {
V.loans.delete(shark);
App.UI.reload();
- }, [], '', `You have ${years(loan('shark').deadline - V.week || 1)} until the shark comes to collect.`));
+ }));
} else {
links.push(App.UI.DOM.disabledLink(`Pay off the loanshark`, [
`You lack the necessary funds to pay off this loan`,
diff --git a/src/budget/repBudget.js b/src/budget/repBudget.js
index d7df45658b2ebf65a2b5461b374754704e1cceea..f3a1be735b4c0eee337340735e5f31cb08134efb 100644
--- a/src/budget/repBudget.js
+++ b/src/budget/repBudget.js
@@ -31,7 +31,7 @@ App.Budget.rep = function() {
*/
function settings() {
const p = document.createElement("p");
- App.UI.DOM.appendNewElement("div", p, "Your weekly reputation changes are as follows:", "detail");
+ App.UI.DOM.appendNewElement("div", p, "Your weekly reputation changes are as follows:", ["detail"]);
let options = new App.UI.OptionsGroup();
options.addOption("", "repBudget", V.showAllEntries)
diff --git a/src/cheats/cheatEditArcology.js b/src/cheats/cheatEditArcology.js
index 315d736c73f755969d0a61156cfec82733941ac6..e902ea26605b6fade7eb9b7acfc0ba8b06204442 100644
--- a/src/cheats/cheatEditArcology.js
+++ b/src/cheats/cheatEditArcology.js
@@ -100,20 +100,6 @@ App.UI.Cheat.arcology = function(num) {
.addValue("Yes", 1).on()
.addValue("No", 0).off();
}
- if (arc.hasOwnProperty("hackingEconomic")) { // Sadly, hacking seems to be sometimes undefined, and .addOption will break atm if it is.
- options.addOption("Hacking economic", "hackingEconomic", arc).showTextBox();
- }
- if (arc.hasOwnProperty("hackingEconomicTarget")) {
- option = options.addOption("Hacking economic target", "hackingEconomicTarget", arc)
- .addValue("none", -1).off()
- .addValueList(compass).pulldown();
- if (num !== 0) {
- option.addValue("player", 0);
- }
- }
- if (arc.hasOwnProperty("hackingReputation")) {
- options.addOption("Hacking reputation", "hackingReputation", arc).showTextBox();
- }
if (arc.hasOwnProperty("childhoodFertilityInducedNCSResearch")) {
options.addOption("Childhood fertility induced NCS research", "childhoodFertilityInducedNCSResearch", arc).showTextBox();
}
diff --git a/src/cheats/neighborArcologyCheatDatatypeCleanup.js b/src/cheats/neighborArcologyCheatDatatypeCleanup.js
index d03b0a7b7a2fcc9c3cb983f2136e72cf10571520..1c21116668e0ccb7dfc350cdfe4b44cb014ba93d 100644
--- a/src/cheats/neighborArcologyCheatDatatypeCleanup.js
+++ b/src/cheats/neighborArcologyCheatDatatypeCleanup.js
@@ -1,10 +1,7 @@
App.UI.Cheat.neighborArcologyCheatDatatypeCleanup = function() {
const node = new DocumentFragment();
- const clean = App.Update.arcologiesDatatypeCleanup();
- if (clean) {
- App.UI.DOM.appendNewElement("p", node, clean);
- }
+ App.Update.arcologiesDatatypeCleanup();
App.UI.DOM.appendNewElement("p", node, "You have CHEATED your way to influencing the neighboring arcologies. They have been unscrupulously directed according to your CHEAT whims.");
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 8daf86d9e8cf24d7956123b175692927de7cb00d..a372db01a7dcb56f9ced7192a1aaca192e6533e5 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -86,7 +86,7 @@ App.Update.backwardsCompatibility = function() {
const f = document.createDocumentFragment();
let div;
try {
- div = App.UI.DOM.appendNewElement("div", f, `Check for old version... `);
+ div = App.UI.DOM.appendNewElement("div", f, `Checking for old versions... `);
App.Update.oldVersions(div);
div = App.UI.DOM.appendNewElement("div", f, `Updating gene pool records... `);
@@ -107,8 +107,8 @@ App.Update.backwardsCompatibility = function() {
div = App.UI.DOM.appendNewElement("div", f, `Updating mods... `);
App.Update.mods(div);
- div = App.UI.DOM.appendNewElement("div", f, `Checking for old arcology locations... `);
- App.Update.arcologyLocation(div);
+ div = App.UI.DOM.appendNewElement("div", f, `Updating arcology information... `);
+ App.Update.arcology(div);
div = App.UI.DOM.appendNewElement("div", f, `Cleaning up old FCNN headlines... `);
App.Update.FCNN(div);
@@ -171,6 +171,14 @@ App.Update.globalVariables = function(node) {
if (V.rivalOwnerEnslaved) {
V.rival.state = 5;
}
+ if (V.releaseID < 1180) {
+ const rivalEnslaved = V.slaves.filter(s => s.newGamePlus === 0 && s.origin.includes("$He was once an arcology owner like yourself.")).length > 0;
+ if (V.rival.state === 1 && rivalEnslaved) {
+ V.rival.state = 5;
+ } else if (V.rival.state === 1 && !rivalEnslaved && V.arcologies.find(a => a.direction !== 0 && a.rival !== 1)) {
+ V.rival.state = 4;
+ }
+ }
if (V.rivalGender) {
V.rival.gender = V.rivalGender;
}
@@ -436,7 +444,11 @@ App.Update.globalVariables = function(node) {
// Pit
App.Facilities.Pit.BC();
- App.Mods.SecExp.generalBC();
+ if (Object.values(V.SecExp).length <= 1) {
+ App.Mods.SecExp.Obj.Init();
+ } else {
+ App.Mods.SecExp.Obj.BC();
+ }
App.Mods.SF.BC();
// FS
@@ -707,6 +719,9 @@ App.Update.globalVariables = function(node) {
} else if (typeof V.arcologies[0].FSSlimnessEnthusiastSMR === "undefined") {
V.arcologies[0].FSSlimnessEnthusiastSMR = 0;
}
+ if (typeof V.arcologies[0].FSSlimnessEnthusiastFoodLaw === "undefined") {
+ V.arcologies[0].FSSlimnessEnthusiastFoodLaw = 0;
+ }
if ((typeof V.FSMaturityPreferentialist !== "undefined") && V.FSMaturityPreferentialist !== "unset") {
V.arcologies[0].FSMaturityPreferentialist = V.FSMaturityPreferentialist;
} else if (typeof V.arcologies[0].FSMaturityPreferentialist === "undefined") {
@@ -747,6 +762,9 @@ App.Update.globalVariables = function(node) {
} else if (typeof V.arcologies[0].FSChattelReligionistLaw === "undefined") {
V.arcologies[0].FSChattelReligionistLaw = 0;
}
+ if (typeof V.arcologies[0].FSChattelReligionistLaw2 === "undefined") {
+ V.arcologies[0].FSChattelReligionistLaw2 = 0;
+ }
if ((typeof V.FSRomanRevivalist !== "undefined") && V.FSRomanRevivalist !== "unset") {
V.arcologies[0].FSRomanRevivalist = V.FSRomanRevivalist;
} else if (typeof V.arcologies[0].FSRomanRevivalist === "undefined") {
@@ -1153,7 +1171,14 @@ App.Update.globalVariables = function(node) {
}
}
}
- App.Corporate.Backcompat();
+ // current foreignRevenue used to be used for old foreignRevenue
+ let c = App.Corporate.ledger.current;
+ App.Corporate.ledger.old.foreignRevenue = c.foreignRevenue;
+ if (c.operations === undefined) {
+ c.operations = 0;
+ c.overhead = 0;
+ c.economicBoost = 0;
+ }
/* Corporation variables added*/
if (V.corp.ExpandToken > 1) {
V.corp.ExpandToken = 1;
@@ -1181,6 +1206,9 @@ App.Update.globalVariables = function(node) {
if (typeof V.corp.Incorporated === "undefined") {
V.corp = clone(App.Data.CorpInitData);
}
+ if (!("Name" in V.corp)) {
+ V.corp.Name = 'Your corporation';
+ }
}
// Organs
@@ -1361,6 +1389,14 @@ App.Update.globalVariables = function(node) {
delete V.JFC.role;
}
+ // Cosmetic Surgery Suite
+ V.pSurgery = V.pSurgery || {};
+ V.pSurgery.state = V.pSurgery.state || 0;
+ V.pSurgery.cooldown = V.playerSurgery || V.pSurgery.cooldown || 0;
+ V.pSurgery.nursePreg = V.pSurgery.nursePreg || 0;
+ V.pSurgery.disloyal = V.pSurgery.disloyal || 0;
+ V.pSurgery.cost = V.pSurgery.cost || 0;
+
// eventResults
V.eventResults.snatch = V.eventResults.snatch || V.PSnatch || 0;
V.eventResults.aid = V.eventResults.aid || V.PAid || 0;
@@ -1441,6 +1477,13 @@ App.Update.globalVariables = function(node) {
}
}
+ if (V.facility.farmyard) {
+ V.facility.farmyard.whoreIncome = V.facility.farmyard.farmhandIncome;
+ V.facility.farmyard.whoreCosts = V.facility.farmyard.farmhandCosts;
+ delete V.facility.farmyard.farmhandIncome;
+ delete V.facility.farmyard.farmhandCosts;
+ }
+
node.append(`Done!`);
};
@@ -1543,97 +1586,127 @@ App.Update.genePoolRecords = function(node) {
V.genePool.forEach(g => { g.inbreedingCoeff = ibCoeff[g.ID]; });
V.slaveIndices = slaves2indices(); // we're going to need to compare to active slaves, if they exist
+ let playerExists = V.genePool.findIndex(p => p.ID === -1);
+ if (playerExists === -1) {
+ V.genePool.push(clone(V.PC));
+ }
for (let bci = 0; bci < V.genePool.length; bci++) {
- App.Update.Slave(V.genePool[bci], true);
- let slave = V.genePool[bci];
-
- if (V.genePool.map(function(s) { return s.ID; }).count(slave.ID) > 1) {
- /* first check for duplicate IDs, keep the first entry and delete the others */
- for (let bci2 = bci + 1; bci2 < V.genePool.length; bci2++) {
- if (V.genePool[bci2].ID === slave.ID) {
- V.genePool.deleteAt(bci2);
- bci2--;
+ if (V.genePool[bci].ID !== -1) {
+ App.Update.Slave(V.genePool[bci], true);
+ let slave = V.genePool[bci];
+
+ deduplication(slave);
+ let dontDeleteMe = 0;
+ if (typeof V.slaveIndices[slave.ID] !== "undefined") {
+ /* are we still in the V.slaves array? */
+ dontDeleteMe = 1;
+ }
+ if (V.traitor !== 0) {
+ if (isImpregnatedBy(V.traitor, slave, true) || V.traitor.ID === slave.ID) {
+ /* did we impregnate the traitor, or are we the traitor? */
+ dontDeleteMe = 1;
}
}
- }
- let dontDeleteMe = 0;
- if (typeof V.slaveIndices[slave.ID] !== "undefined") {
- /* are we still in the V.slaves array? */
- dontDeleteMe = 1;
- }
- if (V.traitor !== 0) {
- if (isImpregnatedBy(V.traitor, slave, true) || V.traitor.ID === slave.ID) {
- /* did we impregnate the traitor, or are we the traitor? */
- dontDeleteMe = 1;
+ if (V.boomerangSlave !== 0) {
+ if (isImpregnatedBy(V.boomerangSlave, slave, true) || V.boomerangSlave.ID === slave.ID) {
+ /* did we impregnate the boomerang, or are we the boomerang? */
+ dontDeleteMe = 1;
+ }
}
- }
- if (V.boomerangSlave !== 0) {
- if (isImpregnatedBy(V.boomerangSlave, slave, true) || V.boomerangSlave.ID === slave.ID) {
- /* did we impregnate the boomerang, or are we the boomerang? */
+ if (isImpregnatedBy(V.PC, slave, true)) {
+ /* did we impregnate the PC */
dontDeleteMe = 1;
}
- }
- if (isImpregnatedBy(V.PC, slave, true)) {
- /* did we impregnate the PC */
- dontDeleteMe = 1;
- }
- if (dontDeleteMe === 0) {
- /* avoid going through this loop if possible */
- for (let bci2 = 0; bci2 < V.slaves.length; bci2++) {
- if (isImpregnatedBy(V.slaves[bci2], slave, true)) {
- /* have we impregnated a slave on the slaves array? */
- dontDeleteMe = 1;
- break;
+ if (dontDeleteMe === 0) {
+ /* avoid going through this loop if possible */
+ for (let bci2 = 0; bci2 < V.slaves.length; bci2++) {
+ if (isImpregnatedBy(V.slaves[bci2], slave, true)) {
+ /* have we impregnated a slave on the slaves array? */
+ dontDeleteMe = 1;
+ break;
+ }
}
}
- }
- if (dontDeleteMe === 0) {
- V.genePool.deleteAt(bci);
- bci--;
- continue;
- }
- if (typeof slave.origSkin === "undefined") {
- slave.origSkin = slave.skin;
- }
- if (typeof slave.origRace === "undefined") {
- slave.origRace = slave.race;
- }
- if (V.releaseID < 1059) {
- if (typeof slave.eyesImplant === "undefined") {
- slave.eyesImplant = 0;
+ if (dontDeleteMe === 0) {
+ V.genePool.deleteAt(bci);
+ bci--;
+ continue;
}
- let oldEyes;
- if (slave.origEye === "implant") {
- slave.eyesImplant = 1;
- oldEyes = V.genePool.find(function(s) { return s.ID === slave.ID; });
- slave.origEye = oldEyes.origEye;
+ if (typeof slave.origSkin === "undefined") {
+ slave.origSkin = slave.skin;
}
- if (slave.origEye === "none") {
- slave.eyes = -3;
- oldEyes = V.genePool.find(function(s) { return s.ID === slave.ID; });
- slave.origEye = oldEyes.origEye;
+ if (typeof slave.origRace === "undefined") {
+ slave.origRace = slave.race;
}
- if (slave.eyeColor === "empty") {
- slave.eyeColor = slave.origEye;
- slave.eyes = -4;
+ if (V.releaseID < 1059) {
+ if (typeof slave.eyesImplant === "undefined") {
+ slave.eyesImplant = 0;
+ }
+ let oldEyes;
+ if (slave.origEye === "implant") {
+ slave.eyesImplant = 1;
+ oldEyes = V.genePool.find(function(s) { return s.ID === slave.ID; });
+ slave.origEye = oldEyes.origEye;
+ }
+ if (slave.origEye === "none") {
+ slave.eyes = -3;
+ oldEyes = V.genePool.find(function(s) { return s.ID === slave.ID; });
+ slave.origEye = oldEyes.origEye;
+ }
+ if (slave.eyeColor === "empty") {
+ slave.eyeColor = slave.origEye;
+ slave.eyes = -4;
+ }
}
+
+ App.Entity.Utils.GenePoolRecordCleanup(slave, bci);
+ V.genePool[bci] = slave;
+
+ missingParentCheck(V.genePool[bci].ID, bci);
+ } else {
+ // App.Update.Player(V.genePool[bci], true);
+ let player = V.genePool[bci];
+
+ deduplication(player);
+ if (typeof player.origSkin === "undefined") {
+ player.origSkin = player.skin;
+ }
+ if (typeof player.origRace === "undefined") {
+ player.origRace = player.race;
+ }
+
+ App.Entity.Utils.GenePoolRecordCleanup(player, bci);
+ V.genePool[bci] = player;
+
+ missingParentCheck(V.PC, bci);
}
+ }
+ node.append(`Done!`);
- App.Entity.Utils.GenePoolRecordCleanup(slave);
- V.genePool[bci] = slave;
+ function deduplication(slave, index) {
+ /* Check for duplicate IDs, keep the first entry and delete the others */
+ if (V.genePool.map(function(s) { return s.ID; }).count(slave.ID) > 1) {
+ for (let bci2 = index + 1; bci2 < V.genePool.length; bci2++) {
+ if (V.genePool[bci2].ID === slave.ID) {
+ V.genePool.deleteAt(bci2);
+ bci2--;
+ }
+ }
+ }
+ }
+ function missingParentCheck(slave, index) {
// if a genepool entry doesn't have specific parent information, but the "live" copy of the same slave does, copy it into the genepool
- const liveSlave = getSlave(V.genePool[bci].ID);
+ const liveSlave = slave;
if (liveSlave) {
- if (liveSlave.mother && V.genePool[bci].mother === 0) {
- V.genePool[bci].mother = liveSlave.mother;
+ if (liveSlave.mother && V.genePool[index].mother === 0) {
+ V.genePool[index].mother = liveSlave.mother;
}
- if (liveSlave.father && V.genePool[bci].father === 0) {
- V.genePool[bci].father = liveSlave.father;
+ if (liveSlave.father && V.genePool[index].father === 0) {
+ V.genePool[index].father = liveSlave.father;
}
}
}
- node.append(`Done!`);
};
App.Update.RAassistantData = function(node) {
@@ -1656,7 +1729,7 @@ App.Update.RAassistantData = function(node) {
node.append(`Done!`);
};
-App.Update.arcologyLocation = function(node) {
+App.Update.arcology = function(node) {
if (V.continent === "Europe") {
const prompt = App.UI.DOM.appendNewElement('div', node);
prompt.id = "location-prompt"; // so we can replace the whole prompt later after the user clicks a link
@@ -1668,7 +1741,7 @@ App.Update.arcologyLocation = function(node) {
"Scandinavia",
"Central Europe"
];
- prompt.append(`General Arcology location detected: Europe. Please specify exact location of arcology. Currently selected: ${V.continent}. Other Possibilities: `,
+ prompt.append(`General Arcology location detected: Europe. Please specify exact location of arcology. Currently selected: ${V.continent}. Other possibilities: `,
App.UI.DOM.generateLinksStrip(altLocations.map(l => makeLinkForLocation(l))));
} else {
node.append(`Done!`);
@@ -1680,6 +1753,10 @@ App.Update.arcologyLocation = function(node) {
App.UI.DOM.replace("#location-prompt", `Arcology location specified at ${l}.`);
});
}
+
+ if (!("weeks" in V.arcologies[0])) {
+ V.arcologies[0].weeks = V.week;
+ }
};
App.Update.oldVersions = function(node) {
@@ -1913,9 +1990,6 @@ App.Update.oldVersions = function(node) {
if (typeof V.PC.markings === "undefined") {
V.PC.markings = "none";
}
- if (typeof V.PC.pronoun === "undefined") {
- generatePlayerPronouns(V.PC);
- }
if (typeof V.PC.pregKnown === "undefined") {
if (V.PC.preg > 0) {
V.PC.pregKnown = 1;
@@ -2176,14 +2250,12 @@ App.Update.oldVersions = function(node) {
newPC.counter.slavesKnockedUp = V.PC.slavesKnockedUp;
newPC.counter.storedCum = V.PC.storedCum;
newPC.sexualEnergy = V.PC.sexualEnergy;
- newPC.staminaPills = V.PC.staminaPills;
newPC.preg = V.PC.preg;
newPC.pregType = V.PC.pregType;
newPC.pregWeek = V.PC.pregWeek;
newPC.pregKnown = V.PC.pregKnown;
newPC.fertKnown = V.PC.fertKnown;
newPC.fertPeak = V.PC.fertPeak;
- newPC.fertDrugs = V.PC.fertDrugs;
newPC.forcedFertDrugs = V.PC.forcedFertDrugs;
newPC.belly = V.PC.belly;
newPC.bellyPreg = V.PC.bellyPreg;
@@ -2345,6 +2417,21 @@ App.Update.oldVersions = function(node) {
if (typeof V.PC.spermY === "undefined") {
V.PC.spermY = 50; // exactly
}
+ if (V.releaseID < 1175) {
+ V.PC.earTEffectColor = "none";
+ V.PC.earTEffect = "none";
+ V.PC.tailEffectColor = "none";
+ V.PC.tailEffect = "none";
+ V.PC.PBack = 0;
+ V.PC.wingsShape = "none";
+ V.PC.appendagesColor = "none";
+ V.PC.appendagesEffectColor = "none";
+ V.PC.appendagesEffect = "none";
+ V.PC.patternColor = "black";
+ V.PC.hEffectColor = "none";
+ V.PC.hEffect = "none";
+ V.PC.haircuts = 0;
+ }
if ((typeof V.familyTesting === "undefined") && V.releaseID < 1065) {
// possibly vanilla FC; compel V.familyTesting to 0 so that the family upgrade will run on slaves
@@ -2361,6 +2448,9 @@ App.Update.oldVersions = function(node) {
if (V.releaseID <= 1123) {
V.plotEventWeek = App.Events.effectiveWeek();
}
+ if (V.releaseID < 1183 && V.pit) {
+ V.pit.trainingIDs = [];
+ }
node.append(`Done!`);
};
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index af14361979dfaa92ceca64a05095bf32b9010935..95fda7a3c3ba6efbe0ac980c0f2f4bdfc255ae0e 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -937,7 +937,7 @@ globalThis.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
slave.skill.anal = Math.clamp(+slave.skill.anal, 0, 100) || 0;
slave.skill.whoring = Math.clamp(+slave.skill.whoring, 0, 100) || 0;
slave.skill.entertainment = Math.clamp(+slave.skill.entertainment, 0, 100) || 0;
- slave.skill.combat = Math.clamp(+slave.skill.combat, 0, 1) || 0;
+ slave.skill.combat = Math.clamp(+slave.skill.combat, 0, 100) || 0;
slave.skill.headGirl = Math.clamp(+slave.skill.headGirl, 0, 200) || 0;
slave.skill.recruiter = Math.clamp(+slave.skill.recruiter, 0, 200) || 0;
slave.skill.bodyguard = Math.clamp(+slave.skill.bodyguard, 0, 200) || 0;
@@ -1168,8 +1168,10 @@ globalThis.PCDatatypeCleanup = (function PCDatatypeCleanup() {
PCRulesDatatypeCleanup(PC);
PCCustomStatsDatatypeCleanup(PC);
PCMiscellaneousDatatypeCleanup(PC);
- App.Entity.Utils.migratePronouns(PC);
- generatePlayerPronouns(PC);
+ if (typeof PC.pronoun !== "number") {
+ App.Entity.Utils.migratePronouns(PC);
+ generatePlayerPronouns(PC);
+ }
}
/**
@@ -1200,6 +1202,7 @@ globalThis.PCDatatypeCleanup = (function PCDatatypeCleanup() {
if (PC.actualAge > PC.pubertyAgeXY) {
PC.pubertyXY = 1;
}
+ PC.NCSyouthening = Math.max(+PC.NCSyouthening, 0) || 0;
}
/**
@@ -1233,17 +1236,9 @@ globalThis.PCDatatypeCleanup = (function PCDatatypeCleanup() {
PC.health = {};
PC.health.condition = condition;
}
+ PC.majorInjury = Math.max(+PC.majorInjury, 0) || 0;
PC.health.condition = Math.clamp(PC.health.condition, -100, 100) || 0;
- if (PC.majorInjury !== undefined) {
- if (PC.majorInjury > 0) {
- PC.health.shortDamage = Math.max(PC.majorInjury * 20, 30);
- } else {
- PC.health.shortDamage = 0;
- }
- delete PC.majorInjury;
- } else {
- PC.health.shortDamage = Math.max(+PC.health.shortDamage, 0) || 0;
- }
+ PC.health.shortDamage = Math.max(+PC.health.shortDamage, 0) || 0;
PC.health.longDamage = Math.max(+PC.health.longDamage, 0) || 0;
PC.health.illness = Math.max(+PC.health.illness, 0) || 0;
PC.health.tired = Math.clamp(+PC.health.tired, 0, 100) || 0;
@@ -1363,7 +1358,9 @@ globalThis.PCDatatypeCleanup = (function PCDatatypeCleanup() {
PC.fertPeak = Math.clamp(+PC.fertPeak, 0, 4) || 0;
PC.pregSource = +PC.pregSource || 0;
PC.pregMood = Math.clamp(+PC.pregMood, 0, 2) || 0;
- PC.fertDrugs = Math.clamp(+PC.fertDrugs, 0, 1) || 0;
+ if (typeof PC.pregControl !== "string") {
+ PC.pregControl = "none";
+ }
PC.forcedFertDrugs = Math.max(+PC.forcedFertDrugs, 0) || 0;
WombNormalizePreg(PC);
}
@@ -1491,7 +1488,6 @@ globalThis.PCDatatypeCleanup = (function PCDatatypeCleanup() {
PC.drugs = "no drugs";
}
PC.aphrodisiacs = Math.clamp(+PC.aphrodisiacs, -1, 2) || 0;
- PC.staminaPills = Math.clamp(+PC.staminaPills, 0, 1) || 0;
}
/**
@@ -1880,7 +1876,7 @@ globalThis.FacilityDatatypeCleanup = (function() {
function FarmyardDatatypeCleanup() {
V.farmyard = Math.max(+V.farmyard, 0) || 0;
V.farmyardBreeding = Math.clamp(+V.farmyardBreeding, 0, 1) || 0;
- V.farmyardShows = Math.clamp(+V.farmyardShows, 0, 1) || 0;
+ V.farmyardShows = Math.clamp(+V.farmyardShows, 0, 2) || 0;
/* farmer */
V.FarmerID = findSlaveId(s => s.assignment === Job.FARMER);
}
@@ -2015,7 +2011,9 @@ App.Entity.Utils.GenePoolRecordCleanup = (function() {
* @param {App.Entity.SlaveState} slave
*/
function GenePoolRecordCleanup(slave) {
- App.Entity.Utils.SlaveDataSchemeCleanup(slave);
+ if (slave.ID !== -1) {
+ App.Entity.Utils.SlaveDataSchemeCleanup(slave);
+ }
// the following attributes are unneeded for gene pool records
App.Update.deleteProperties(slave, [
@@ -2063,7 +2061,12 @@ App.Entity.Utils.GenePoolRecordCleanup = (function() {
"slaveCost",
"NCSyouthening",
"lastWeeksCashIncome", "lastWeeksRepIncome", "lastWeeksRepExpenses",
- "lifetimeCashIncome", "lifetimeCashExpenses", "lifetimeRepIncome", "lifetimeRepExpenses"
+ "lifetimeCashIncome", "lifetimeCashExpenses", "lifetimeRepIncome", "lifetimeRepExpenses",
+ // player stuff
+ "degeneracy", "refreshment", "refreshmentType",
+ "relationships",
+ "criticalDamage",
+ "fertKnown", "forcedFertDrugs"
]);
}
})();
@@ -2073,10 +2076,13 @@ App.Entity.Utils.RARuleDatatypeCleanup = function() {
return ruleCleanup;
- /** @param {FC.RA.Rule} rule */
+ /**
+ * @param {FC.RA.Rule} rule
+ * @returns {FC.RA.Rule}
+ */
function ruleCleanup(rule) {
// ensure rule has all required properties
- let newRule = App.RA.ruleDeepAssign(emptyDefaultRule(), rule);
+ let newRule = App.RA.ruleDeepAssign(emptyDefaultRule(), rule, {}, "");
cleanupConditions(newRule.condition);
cleanupSetters(newRule.set);
return newRule;
@@ -2305,6 +2311,10 @@ App.Entity.Utils.RARuleDatatypeCleanup = function() {
};
return jobs[assignment];
}
+
+ if (V.releaseID < 1173) {
+ cond.advancedMode = true;
+ }
}
/** @param {object} o */
diff --git a/src/data/backwardsCompatibility/farmyardBC.js b/src/data/backwardsCompatibility/farmyardBC.js
index 0774ab9ee51c51b108accff12f0851ab787761d2..6f47035f5eb34831a695b9b71118b40414f98241 100644
--- a/src/data/backwardsCompatibility/farmyardBC.js
+++ b/src/data/backwardsCompatibility/farmyardBC.js
@@ -32,28 +32,21 @@ App.Facilities.Farmyard.BC = function() {
delete V.feline;
}
- if (V.animals.canine.some(animal => typeof animal !== "string")) {
- V.animals.canine = V.animals.canine.filter(animal => typeof animal === "string");
- V.active.canine = V.animals.canine || null;
- }
- if (V.animals.hooved.some(animal => typeof animal !== "string")) {
- V.animals.hooved = V.animals.hooved.filter(animal => typeof animal === "string");
- V.active.hooved = V.animals.hooved || null;
- }
- if (V.animals.feline.some(animal => typeof animal !== "string")) {
- V.animals.feline = V.animals.feline.filter(animal => typeof animal === "string");
- V.active.feline = V.animals.feline || null;
+ if (!V.animals || typeof V.animals !== "object") {
+ V.animals = {
+ canine: [],
+ hooved: [],
+ feline: [],
+ };
+ } else {
+ V.animals.canine = V.animals.canine.filter(canine => !!getAnimal(canine));
+ V.animals.hooved = V.animals.hooved.filter(hooved => !!getAnimal(hooved));
+ V.animals.feline = V.animals.feline.filter(feline => !!getAnimal(feline));
}
- if (V.active.canine && typeof V.active.canine !== "string") {
- V.active.canine = V.active.canine.name;
- }
- if (V.active.hooved && typeof V.active.hooved !== "string") {
- V.active.hooved = V.active.hooved.name;
- }
- if (V.active.feline && typeof V.active.feline !== "string") {
- V.active.feline = V.active.feline.name;
- }
+ if (V.active.canine && typeof getAnimal(V.active.canine) === "undefined") { V.active.canine = null; }
+ if (V.active.hooved && typeof getAnimal(V.active.hooved) === "undefined") { V.active.hooved = null; }
+ if (V.active.feline && typeof getAnimal(V.active.feline) === "undefined") { V.active.feline = null; }
if (V.farmyardShowgirls) {
delete V.farmyardShowgirls;
diff --git a/src/data/backwardsCompatibility/pitBC.js b/src/data/backwardsCompatibility/pitBC.js
index eeb2d3437cc48a0e0133c64c63fa5225751ef549..ceb8677d4bf534f399b1c9773cdea8e997401a24 100644
--- a/src/data/backwardsCompatibility/pitBC.js
+++ b/src/data/backwardsCompatibility/pitBC.js
@@ -36,6 +36,10 @@ App.Facilities.Pit.BC = function() {
}
if (V.slaveFightingBG && V.pit) {
- V.pit.slaveFightingBodyguard = V.slaveFightingBG;
+ V.pit.slaveFightingBodyguard = V.slaveFightingBG;
+ }
+
+ if (V.pit && V.pit.trainingIDs) {
+ V.pit.trainingIDs = V.pit.trainingIDs.filter(id => !!getSlave(id));
}
};
diff --git a/src/data/backwardsCompatibility/policiesBC.js b/src/data/backwardsCompatibility/policiesBC.js
index 3143dead083184a99bfb780f95dc95c043f9c31d..b967d1a122b2587ddfd5216c1c2f29b8a0131a85 100644
--- a/src/data/backwardsCompatibility/policiesBC.js
+++ b/src/data/backwardsCompatibility/policiesBC.js
@@ -17,7 +17,7 @@ App.Update.policies = function() {
gumjobFetishism: 0,
gumjobFetishismSMR: 0,
idealAge: 0
- });
+ });
// Spelling fixes:
V.policies.sexualOpenness = V.policies.sexualOpenness || V.policies.sexualOpeness || 0;
diff --git a/src/data/backwardsCompatibility/updateSlaveObject.js b/src/data/backwardsCompatibility/updateSlaveObject.js
index a88e58b40abfceda1f25b300e454fd9fe0c58759..cca5878d17ecde1b7148aea2c9c430c8b4eae87b 100644
--- a/src/data/backwardsCompatibility/updateSlaveObject.js
+++ b/src/data/backwardsCompatibility/updateSlaveObject.js
@@ -116,6 +116,473 @@ App.Update.Slave = function(slave, genepool = false) {
}
}
+ /**
+ * Takes a string with a baked in pronoun ("Her mother offered her") and returns it with SC variable pronouns("$His mother offered $him")
+ * @param {string} slavetext
+ * @returns {string}
+ */
+ function pronounReplacer(slavetext) {
+ switch (slavetext) {
+ case "After her short but very promising slave racing career, during which she made it through several competitions as a virgin, many people fondly remember fantasizing about taking her.":
+ slavetext = "After $his short but very promising slave racing career, during which $he made it through several competitions as a virgin, many people fondly remember fantasizing about taking $him.";
+ break;
+ case "Her entire body is tattooed with a detailed map of her arteries which, combined with her albinism, gives her a quasi-translucent quality.":
+ slavetext = "$His entire body is tattooed with a detailed map of $his arteries which, combined with $his albinism, gives $him a quasi-translucent quality.";
+ break;
+ case "Her husband sold her into slavery to escape his debts.":
+ slavetext = "$His husband sold $him into slavery to escape his debts.";
+ break;
+ case "Her mother offered her to you as an incentive to take her in.":
+ slavetext = "$His mother offered $him to you as an incentive to take them in.";
+ break;
+ case "Her recognizable face marks her as a descendant of an overthrown royal family.":
+ slavetext = "$His recognizable face marks $him as a descendant of an overthrown royal family.";
+ break;
+ case "Many people remember her from the slavegirl races where she slammed her cock into countless runners' pussies after catching them.":
+ slavetext = "Many people remember $him from the slavegirl races where $he slammed $his cock into countless runners' pussies after catching them.";
+ break;
+ case "She came to you to escape being sold to a cruel master after her producer informed her of her debt.":
+ slavetext = "$He came to you to escape being sold to a cruel master after $his producer informed $him of $his debt.";
+ break;
+ case "She comes from old money and sold herself into slavery to satisfy her obsession with the practice, believing her family would buy her back out of slavery later.":
+ slavetext = "$He comes from old money and sold $himself into slavery to satisfy $his obsession with the practice, believing $his family would buy $him back out of slavery later.";
+ break;
+ case "She has a following in slave pornography. Thousands have enjoyed the sight of her ignoring her own pleasure.":
+ slavetext = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him ignoring $his own pleasure.";
+ break;
+ case "She has a following in slave pornography. Thousands have enjoyed watching her devote herself to her partners' pleasure.":
+ slavetext = "$He has a following in slave pornography. Thousands have enjoyed watching $him devote $himself to $his partners' pleasure.";
+ break;
+ case "She has a following in slave pornography. Thousands have enjoyed watching her do anything for a dick in her ass.":
+ slavetext = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for a dick in $his ass.";
+ break;
+ case "She has a small scar on the back of her right hand. She was injured while participating in the finals of the national kendo tournament, and decided to keep the scar to remind her of her achievements.":
+ slavetext = "$He has a small scar on the back of $his right hand. $He was injured while participating in the finals of a national kendo tournament, and decided to keep the scar to remind $him of $his achievements.";
+ break;
+ case "She has an implanted GPS tracker to find her in case her habit of stalking pretty girls gets the better of her.":
+ slavetext = "$He has an implanted GPS tracker to find $him in case $his habit of stalking pretty girls gets the better of $him.";
+ break;
+ case "She has massive C-clamp piercings in her back that allow her to act as furniture, and a truly enormous vagina.":
+ slavetext = "$He has massive C-clamp piercings in $his back that allow $him to act as furniture, and a truly enormous vagina.";
+ break;
+ case "She has the number of times her father came in you while you were pregnant with her tattooed down her back.":
+ slavetext = "$He has the number of times $his father came in you while you were pregnant with $him tattooed down $his back.";
+ break;
+ case "She is a famed Free Cities slut, and can please anyone.":
+ slavetext = "$He is a famed Free Cities slut, and can please anyone.";
+ break;
+ case "She is a famed Free Cities whore, and commands top prices.":
+ slavetext = "$He is a famed Free Cities whore, and commands top prices.";
+ break;
+ case "She is a prized dairy cow given to you by a failed local pasture of The Cattle Ranch.":
+ slavetext = "$He is a prized dairy cow given to you by a failed local pasture of The Cattle Ranch.";
+ break;
+ case "She is an enslaved Daughter of Liberty.":
+ slavetext = "$He is an enslaved Daughter of Liberty.";
+ break;
+ case "She is an enslaved member of an anti-slavery extremist group.":
+ slavetext = "$He is an enslaved member of an anti-slavery extremist group.";
+ break;
+ case "She is remembered for winning best in show as a breeder.":
+ slavetext = "$He is remembered for winning best in show as a breeder.";
+ break;
+ case "She is remembered for winning best in show as a cockmilker.":
+ slavetext = "$He is remembered for winning best in show as a cockmilker.";
+ break;
+ case "She is remembered for winning best in show as a dairy cow.":
+ slavetext = "$He is remembered for winning best in show as a dairy cow.";
+ break;
+ case "She is the spoiled daughter of a wealthy old world businessman. Many will pay well to use her to discredit her father and family.":
+ slavetext = "$He is the spoiled $daughter of a wealthy old world businessman. Many will pay well to use $him to discredit $his father and family.";
+ break;
+ case "She is well known from her career in slave pornography. Her many fans relish the sight of her abusing others.":
+ slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him abusing others.";
+ break;
+ case "She is well known from her career in slave pornography. Her many fans relish the sight of her being raped.":
+ slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being raped.";
+ break;
+ case "She is well known from her career in slave pornography. Her many fans relish the sight of her being used.":
+ slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being used.";
+ break;
+ case "She is well known from her career in slave pornography. Her many fans relish the sight of her denying herself pleasure.":
+ slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him denying $himself pleasure.";
+ break;
+ case "She is well known from her career in slave pornography. Her many fans relish the sight of her doing anything for a dick up her ass.":
+ slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for a dick up $his ass.";
+ break;
+ case "She is well known from her career in slave pornography. Her many fans relish the sight of her doing anything for attention.":
+ slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for attention.";
+ break;
+ case "She is well known from her career in slave pornography. Her many fans relish the sight of her doing anything for cum.":
+ slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for cum.";
+ break;
+ case "She is well known from her career in slave pornography. Her many fans relish the sight of her getting off from the suffering she caused.":
+ slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him getting off from the suffering $he caused.";
+ break;
+ case "She is well known from her career in slave pornography. Her many fans relish the sight of her swollen with child.":
+ slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him swollen with child.";
+ break;
+ case "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her being raped.":
+ slavetext = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him being raped.";
+ break;
+ case "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her denying herself pleasure.":
+ slavetext = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him denying $himself pleasure.";
+ break;
+ case "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her doing anything for attention.":
+ slavetext = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him doing anything for attention.";
+ break;
+ case "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her doing anything for cum.":
+ slavetext = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him doing anything for cum.";
+ break;
+ case "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her mid-coitus.":
+ slavetext = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him mid-coitus.";
+ break;
+ case "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her suffering.":
+ slavetext = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him suffering.";
+ break;
+ case "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her swollen with child.":
+ slavetext = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him swollen with child.";
+ break;
+ case "She offered herself for voluntary enslavement, choosing you as her new owner because you treat lactating girls well.":
+ slavetext = "$He offered $himself for voluntary enslavement, choosing you as $his new owner because you treat lactating girls well.";
+ break;
+ case "She offered herself to you for enslavement hoping you would preserve $his incestuous relationship with her sibling.":
+ slavetext = "$He offered $himself to you for enslavement hoping you would preserve $his incestuous relationship with $his sibling.";
+ break;
+ case "She offered to become your slave to protect her incestuous relationship.":
+ slavetext = "$He offered to become your slave to protect $his incestuous relationship.";
+ break;
+ case "She sold herself into slavery out of fear that life on the streets was endangering her pregnancy.":
+ slavetext = "$He sold $himself into slavery out of fear that life on the streets was endangering $his pregnancy.";
+ break;
+ case "She sold herself to you in the hope of someday bearing children.":
+ slavetext = "$He sold $himself to you in the hope of someday bearing children.";
+ break;
+ case "She submitted to enslavement for a better chance at survival than she had as a migrant.":
+ slavetext = "$He submitted to enslavement for a better chance at survival than $he had as a migrant.";
+ break;
+ case "She submitted to enslavement out of a misguided desire to join a sexually libertine society.":
+ slavetext = "$He submitted to enslavement out of a misguided desire to join a sexually libertine society.";
+ break;
+ case "She submitted to enslavement to escape the hard life of an old world whore.":
+ slavetext = "$He submitted to enslavement to escape the hard life of an old world whore.";
+ break;
+ case "She submitted to enslavement to get access to modern prenatal care.":
+ slavetext = "$He submitted to enslavement to get access to modern prenatal care.";
+ break;
+ case "She was a Futanari Sister until you engineered her early enslavement.":
+ slavetext = "$He was a Futanari Sister until you engineered $his early enslavement.";
+ break;
+ case "She was brought up in a radical slave school to match her twin.":
+ slavetext = "$He was brought up in a radical slave school to match $his twin.";
+ break;
+ case "She was given to you by a failed branch campus of St. Claver Preparatory after she served as a plastic surgeon's passing final exam.":
+ slavetext = "$He was given to you by a failed branch campus of St. Claver Preparatory after $he served as a plastic surgeon's passing final exam.";
+ break;
+ case "She was given to you by a failed branch campus of the Hippolyta Academy right after her majority.":
+ slavetext = "$He was given to you by a failed branch campus of the Hippolyta Academy right after $his majority.";
+ break;
+ case "She was given to you by a failed branch campus of the innovative École des Enculées right after her graduation.":
+ slavetext = "$He was given to you by a failed branch campus of the innovative École des Enculées right after $his graduation.";
+ break;
+ case "She was given to you by a failed branch campus of the intense Gymnasium-Academy right after her majority.":
+ slavetext = "$He was given to you by a failed branch campus of the intense Gymnasium-Academy right after $his majority.";
+ break;
+ case "She was given to you by a failed branch campus of The Slavegirl School after she was retrained as a slave girl.":
+ slavetext = "$He was given to you by a failed branch campus of the Slavegirl School after $he was retrained as a slave $girl.";
+ break;
+ case "She was given to you by a failed branch campus of The Slavegirl School right after her majority.":
+ slavetext = "$He was given to you by a failed branch campus of the Slavegirl School right after $his majority.";
+ break;
+ case "She was given to you by a failed subsidiary lab of the Growth Research Institute right after her use as a test subject ended.":
+ slavetext = "$He was given to you by a failed subsidiary lab of the Growth Research Institute right after $his use as a test subject ended.";
+ break;
+ case "She was once the crown prince of an old world kingdom up until you aided her brother in making her 'disappear'.":
+ slavetext = "$He was once the crown prince of an old world kingdom up until you aided $his brother in making $him 'disappear'.";
+ break;
+ case "She was once the princess of an old world kingdom up until her loose habits caught up with her and she was exiled.":
+ slavetext = "$He was once the princess of an old world kingdom up until $his loose habits caught up with $him and $he was exiled.";
+ break;
+ case "She was once the young trophy wife of a powerful man in the old world, but he sold her into slavery in revenge for her infidelity.":
+ slavetext = "$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.";
+ break;
+ case "She was raised in a radical slave school that treated her from a very young age, up to the point that she never experienced male puberty.":
+ slavetext = "$He was raised in a radical slave school that treated $him from a very young age, up to the point that $he never experienced male puberty.";
+ break;
+ case "She was raised in a radical slave school that treated her with drugs and surgery from a very young age.":
+ slavetext = "$He was raised in a radical slave school that treated $him with drugs and surgery from a very young age.";
+ break;
+ case "She was sold into slavery by her older sister.":
+ slavetext = "$He was sold into slavery by $his older sister.";
+ break;
+ case "She was the leader of your arcology's Futanari Sisters until you engineered her community's failure and enslavement.":
+ slavetext = "$He was the leader of your arcology's Futanari Sisters until you engineered $his community's failure and enslavement.";
+ break;
+ case "She was the result of unprotected sex with a client. Her mother tracked you down years after her birth to force her upon you.":
+ slavetext = "$He was the result of unprotected sex with a client. $His mother tracked you down years after $his birth to force $him upon you.";
+ break;
+ case "She was voluntarily enslaved after she decided that your arcology was the best place for her to get the steroids that she'd allowed to define her life.":
+ slavetext = "$He was voluntarily enslaved after $he decided that your arcology was the best place for $him to get the steroids that $he'd allowed to define $his life.";
+ break;
+ case "She was your slave, but you freed her, which she repaid by participating in a coup attempt against you. It failed, and she is again your chattel.":
+ slavetext = "$He was your slave, but you freed $him, which $he repaid by participating in a coup attempt against you. It failed, and $he is again your chattel.";
+ break;
+ case "Shortly after birth, she was sealed in an aging tank until she was of age. She knows nothing of the world outside of what the tank imprinted her with.":
+ slavetext = "Shortly after birth, $he was sealed in an aging tank until $he was of age. $He knows nothing of the world outside of what the tank imprinted $him with.";
+ break;
+ case "Shortly after birth, she was sealed in an aging tank until she was of age. She knows only of the terror that awaits her should she not obey her master.":
+ slavetext = "Shortly after birth, $he was sealed in an aging tank until $he was of age. $He knows only of the terror that awaits $him should $he not obey $his master.";
+ break;
+ case "Though her vocal cords have been altered to keep her from speaking, she is still capable of the occasional moo.":
+ slavetext = "Though $his vocal cords have been altered to keep $him from speaking, $he is still capable of the occasional moo.";
+ break;
+ case "To seal a business deal, a client asked you to knock her up. She is the end result of that fling.":
+ slavetext = "To seal a business deal, a client asked you to knock her up. $He is the end result of that fling.";
+ break;
+ case "When you took her from her previous owner, she was locked into a beautiful rosewood box lined with red velvet, crying.":
+ slavetext = "When you took $him from $his previous owner, $he was locked into a beautiful rosewood box lined with red velvet, crying.";
+ break;
+ case "You acquired her along with her mother when the family business failed.":
+ slavetext = "You acquired $him along with $his mother when the family business failed.";
+ break;
+ case "You acquired her along with her sissy sister due to her inexperience as a madam.":
+ slavetext = "You acquired $him along with $his sissy sister due to $his inexperience as a madam.";
+ break;
+ case "You bankrupted and enslaved her in revenge for her part in the attack on your arcology by the Daughters of Liberty.":
+ slavetext = "You bankrupted and enslaved $him in revenge for $his part in the attack on your arcology by the Daughters of Liberty.";
+ break;
+ case "You bought her fresh from the intense Gymnasium-Academy right after her majority.":
+ slavetext = "You bought $him fresh from the intense Gymnasium-Academy right after $his majority.";
+ break;
+ case "You bought her fresh from the new Slavegirl School after she was retrained as a slave girl.":
+ slavetext = "You bought $him fresh from the new Slavegirl School after $he was retrained as a slave $girl.";
+ break;
+ case "You bought her fresh from the Slavegirl School right after her majority.":
+ slavetext = "You bought $him fresh from the Slavegirl School right after $his majority.";
+ break;
+ case "You bought her from a body dump, completely broken.":
+ slavetext = "You bought $him from a body dump, completely broken.";
+ break;
+ case "You bought her from a wetware CPU farm, her body ruined but her mind subjected to a simulated career.":
+ slavetext = "You bought $him from a wetware CPU farm, $his body ruined but $his mind subjected to a simulated career.";
+ break;
+ case "You bought her from the girl raiders' slave market the week she reached her majority.":
+ slavetext = "You bought $him from the $girl raiders' slave market the week $he reached $his majority.";
+ break;
+ case "You bought her from the Growth Research Institute right after her use as a test subject ended.":
+ slavetext = "You bought $him from the Growth Research Institute right after $his use as a test subject ended.";
+ break;
+ case "You bought her from the innovative École des Enculées right after her graduation.":
+ slavetext = "You bought $him from the innovative École des Enculées right after $his graduation.";
+ break;
+ case "You bought her from the runaway hunters' slave market after they recaptured her and her original owner did not pay their fee.":
+ slavetext = "You bought $him from the runaway hunters' slave market after they recaptured $him and $his original owner did not pay their fee.";
+ break;
+ case "You bought out a deal for her sale after the seller took her virginity and the buyer no longer wanted her.":
+ slavetext = "You bought out a deal for $his sale after the seller took $his virginity and the buyer no longer wanted $him.";
+ break;
+ case "You got her at the Slave Shelter. Her background is obscure, but seems to have involved terrible abuse of her huge cock and balls.":
+ slavetext = "You got $him at the Slave Shelter. $His background is obscure, but seems to have involved terrible abuse of $his huge cock and balls.";
+ break;
+ case "You got her at the Slave Shelter. Her holes were cruelly stretched by constant plug use.":
+ slavetext = "You got $him at the Slave Shelter. $His holes were cruelly stretched by constant plug use.";
+ break;
+ case "You got her at the Slave Shelter. Her owner purposely blinded her by dumping boiling water into her eyes.":
+ slavetext = "You got $him at the Slave Shelter. $His owner purposely blinded $him by dumping boiling water into $his eyes.";
+ break;
+ case "You got her at the Slave Shelter. Her previous owner discarded her after many pregnancies.":
+ slavetext = "You got $him at the Slave Shelter. $His previous owner discarded $him after many pregnancies.";
+ break;
+ case "You got her at the Slave Shelter. Her previous owner forced her to cut off her breasts and cook them.":
+ slavetext = "You got $him at the Slave Shelter. $His previous owner forced $him to cut off $his breasts and cook them.";
+ break;
+ case "You got her at the Slave Shelter. Her previous owner forced her to cut off her dick and balls and cook them.":
+ slavetext = "You got $him at the Slave Shelter. $His previous owner forced $him to cut off $his dick and balls and cook them.";
+ break;
+ case "You got her at the Slave Shelter. Her previous owner gelded her and used her for anal abuse.":
+ slavetext = "You got $him at the Slave Shelter. $His previous owner gelded $him and used $him for anal abuse.";
+ break;
+ case "You got her at the Slave Shelter. It's not clear why her previous owner cut her arms and legs off.":
+ slavetext = "You got $him at the Slave Shelter. It's not clear why $his previous owner cut $his arms and legs off.";
+ break;
+ case "You got her at the Slave Shelter. She has never communicated anything about her background, since she arrived at the shelter with a broken mind.":
+ slavetext = "You got $him at the Slave Shelter. $He has never communicated anything about $his background, since $he arrived at the shelter with a broken mind.";
+ break;
+ case "You got her at the Slave Shelter. She is an enslaved Daughter of Liberty, caught some weeks after the failed coup. Her previous owner used her as a punching bag and dart board, then when he was bored of her tattooed obscenities all over her body and threw her away.":
+ slavetext = "You got $him at the Slave Shelter. $He is an enslaved Daughter of Liberty, caught some weeks after the failed coup. $His previous owner used $him as a punching bag and dart board, then when he was bored of $him tattooed obscenities all over $his body and threw $him away.";
+ break;
+ case "You got her at the Slave Shelter. She was discarded after suffering a terrible reaction to growth hormone treatment.":
+ slavetext = "You got $him at the Slave Shelter. $He was discarded after suffering a terrible reaction to growth hormone treatment.";
+ break;
+ case "You got her at the Slave Shelter. She was found unresponsive in the lower arcology with a gaping pussy and deflated belly. It is unclear what happened to her.":
+ slavetext = "You got $him at the Slave Shelter. $He was found unresponsive in the lower arcology with a gaping pussy and deflated belly. It is unclear what happened to $him.";
+ break;
+ case "You got her at the Slave Shelter. She was worn out by twenty years of brothel service.":
+ slavetext = "You got $him at the Slave Shelter. $He was worn out by twenty years of brothel service.";
+ break;
+ case "You helped free her from a POW camp after being abandoned by her country, leaving her deeply indebted to you.":
+ slavetext = "You helped free $him from a POW camp after being abandoned by $his country, leaving $him deeply indebted to you.";
+ break;
+ case "You kept her after her owner failed to pay your bill for performing surgery on her.":
+ slavetext = "You kept $him after $his owner failed to pay your bill for performing surgery on $him.";
+ break;
+ case "You purchased her as a favor to her father.":
+ slavetext = "You purchased $him as a favor to $his father.";
+ break;
+ case "You purchased her from a King after his son put an illegitimate heir in her womb.":
+ slavetext = "You purchased $him from a King after his son put an illegitimate heir in $his womb.";
+ break;
+ case "You purchased her in order to pave the way for her brother to take the throne.":
+ slavetext = "You purchased $him in order to pave the way for $his brother to take the throne.";
+ break;
+ case "You purchased her indenture contract, making her yours for as long as it lasts.":
+ slavetext = "You purchased $his indenture contract, making $him yours for as long as it lasts.";
+ break;
+ case "You sentenced her to enslavement as a punishment for attempted theft of a slave.":
+ slavetext = "You sentenced $him to enslavement as a punishment for attempted theft of a slave.";
+ break;
+ case "You sentenced her to enslavement as a punishment for dereliction of her duty to you as a mercenary and for theft.":
+ slavetext = "You sentenced $him to enslavement as a punishment for dereliction of $his duty to you as a mercenary and for theft.";
+ break;
+ case "You sentenced her to enslavement as a punishment for smuggling slaves within her body.":
+ slavetext = "You sentenced $him to enslavement as a punishment for smuggling slaves within $his body.";
+ break;
+ case "You stormed her arcology, killed her guards and enslaved her in revenge for insulting you at a dinner party.":
+ slavetext = "You stormed $his arcology, killed $his guards, and enslaved $him in revenge for insulting you at a dinner party.";
+ break;
+ case "You tricked her into enslavement, manipulating her based on her surgical addiction.":
+ slavetext = "You tricked $him into enslavement, manipulating $him based on $his surgical addiction.";
+ break;
+ case "You tricked her mother into selling her into slavery to clear addiction debts.":
+ slavetext = "You tricked $his mother into selling $him into slavery to clear addiction debts.";
+ break;
+ case "You were acquainted with her before you were an arcology owner; your rival tried to use her to manipulate you, but you rescued her.":
+ slavetext = "You were acquainted with $him before you were an arcology owner; your rival tried to use $him to manipulate you, but you rescued $him.";
+ break;
+ case "Your slaving troop kept several girls as fucktoys; you sired her in your favorite.":
+ slavetext = "Your slaving troop kept several girls as fucktoys; you sired $him in your favorite.";
+ break;
+ case "She was enslaved by you when you purchased her debt.":
+ slavetext = "$He was enslaved by you when you purchased $his debt.";
+ break;
+ case "A fresh capture once overpowered you and had his way with you. You kept her as a painful reminder to never lower your guard again.":
+ case "Drugs and alcohol can be a potent mix; the night that followed it can sometimes be hard to remember. Needless to say, once your belly began swelling with her, you had to temporarily switch to a desk job for your mercenary group.":
+ case "Her musky milky aura drives men and women around her giggly and dumb with lust.":
+ case "She chose to be a slave because the romanticized view of it she had turns her on.":
+ case "She grew up sheltered and submissive, making her an easy target for enslavement.":
+ case "She has a faint air of fatigue about her, and strength too: that of a survivor.":
+ case "She has a following in slave pornography. Thousands have enjoyed her getting off from the suffering she caused.":
+ case "She has a following in slave pornography. Thousands have enjoyed her humiliating herself.":
+ case "She has a following in slave pornography. Thousands have enjoyed the sight of her being raped.":
+ case "She has a following in slave pornography. Thousands have enjoyed the sight of her being used.":
+ case "She has a following in slave pornography. Thousands have enjoyed the sight of her eating and gaining weight.":
+ case "She has a following in slave pornography. Thousands have enjoyed watching her abuse others.":
+ case "She has a following in slave pornography. Thousands have enjoyed watching her do anything and everything for cum.":
+ case "She has a following in slave pornography. Thousands have enjoyed watching her do anything for attention.":
+ case "She has a following in slave pornography. Thousands have enjoyed watching her happily suffer.":
+ case "She has a following in slave pornography. Thousands have enjoyed watching her obsess over pumping out babies.":
+ case "She has a following in slave pornography. Thousands have enjoyed watching her swell with child.":
+ case "She has a verbal tic that causes her to say 'ho, ho, ho' frequently.":
+ case "She has many surgical scars and something seems off about her.":
+ case "She is a complete mental blank; to her, there is only the Master.":
+ case "She is one of the longest legally-enslaved persons in the world, having been a slave for 15 years. She has spent almost all that time working as a slave prostitute, and has been heavily modified to keep her productive.":
+ case "She is the winner of a martial arts slave tournament. You won her in a bet.":
+ case "She offered herself to you for enslavement to escape having plastic surgery foisted on her.":
+ case "She was a runaway slave captured by a gang outside your arcology. You bought her cheap after she was harshly used by them.":
+ case "She was a student you enslaved when you evacuated her from a threatened old world grade school.":
+ case "She was a volleyball player you enslaved when you evacuated her from a broken down bus.":
+ case "She was an expectant mother you enslaved when you evacuated her from a threatened old world hospital.":
+ case "She was an orphan forced to live and steal on the streets until you adopted her.":
+ case "She was enslaved by you when you overcharged her for surgery.":
+ case "She was fresh from the slave markets when you acquired her.":
+ case "She was homeless and willing to do anything for food, which in the end resulted in her becoming a slave.":
+ case "She was previously owned by a creative sadist, who has left a variety of mental scars on her.":
+ case "She was sold to you by an anonymous person who wanted her to suffer.":
+ case "She was taken as a slave by a Sultan, who presented her as a gift to a surveyor.":
+ case "She was taken into your custody from an owner who treated her as an equal.":
+ case "She was the private slave of a con artist cult leader before he had to abandon her and flee.":
+ case "She was the result of an intruder brute forcing your firewall, overloading your pleasure sensors, and allowing a corrupted packet to slip by. With a quick wipe of your RAM and cache with some powerful liquor, you have no idea who planted her in your womb.":
+ case "You acquired her in the last stages of your career as a noted private military contractor.":
+ case "You acquired her in the last stages of your career as a successful venture capitalist.":
+ case "You bought her at auction.":
+ case "You bought her from The Cattle Ranch.":
+ case "You bought her from the enigmatic Futanari Sisters after they sold her into slavery.":
+ case "You bought her from the household liquidator.":
+ case "You bought her from the kidnappers' slave market, so she was probably forced into slavery.":
+ case "You bought her from the prestigious Hippolyta Academy.":
+ case "You bought her from the trainers' slave market after they put her through basic training.":
+ case "You bought her from the underage raiders' slave market.":
+ case "You bought out a deal involving her training to be an expert gelded sex slave.":
+ case "You brought her into the arcology mindbroken, little more than a human onahole.":
+ case "You brought her into the arcology mindbroken, little more than a walking collection of fuckable holes.":
+ case "You captured her during your transition to the arcology":
+ case "You conceived her after a male arcology owner, impressed by your work, rewarded you with a night you'll never forget.":
+ case "You enslaved her personally during the last stages of your slaving career.":
+ case "You helped her give birth, leaving her deeply indebted to you.":
+ case "You never thought you would be capable of impregnating yourself, but years of pleasuring yourself with yourself after missions managed to create her.":
+ case "You purchased her by special order.":
+ case "You purchased her from a King after she expressed knowledge of the prince's affair with another servant.":
+ case "You purchased her from FCTV's Home Slave Shopping stream channel.":
+ case "You received her as a gift from an arcology owner impressed by your work.":
+ case "You received her from a surgeon who botched an implant operation on her and needed to get her out of sight.":
+ case "You reserved a mindless slave like her from the Flesh Heap.":
+ case "You sentenced her to enslavement as a punishment for attempted burglary.":
+ case "You sentenced her to enslavement as a punishment for defying local racial segregation laws.":
+ case "You sentenced her to enslavement as a punishment for fraud and theft.":
+ case "You sentenced her to enslavement as a punishment for suspected escapism.":
+ case "You sentenced her to enslavement as a punishment for theft and battery.":
+ case "You sentenced her to enslavement for smuggling drugs into the arcology.":
+ case "You sired her after a female arcology owner, impressed by your work, rewarded you with a night you'll never forget.":
+ case "You sired her in yourself after an arcology owner, impressed by your work, rewarded you with a night you'll never forget.":
+ case "You turned her into a slave girl after she fell into debt to you.":
+ case "You won her at a shotgun match against other arcology owners.":
+ case "You won her at cards, a memento from your life as one of the idle rich before you became an arcology owner.":
+ slavetext = slavetext.replace(/\bherself\b/g, "$himself");
+ slavetext = slavetext.replace(/\bHerself\b/g, "$Himself");
+ slavetext = slavetext.replace(/\bshe\b/g, "$he");
+ slavetext = slavetext.replace(/\bShe\b/g, "$He");
+ slavetext = slavetext.replace(/\bher\b/g, "$him");
+ slavetext = slavetext.replace(/\bHer\b/g, "$His");
+ slavetext = slavetext.replace(/\b girl\b/g, " $girl");
+ slavetext = slavetext.replace(/\b woman\b/g, " $woman");
+ slavetext = slavetext.replace(/\${2,}/g, '');
+ break;
+ default:
+ if ((slavetext.includes("was serving the public")) || (slavetext.includes("You bought her from"))) {
+ slavetext = slavetext.replace(/\bher\b/g, "$him");
+ } else if (((slavetext.includes("Your lurcher")) && (slavetext.includes("coursing"))) || ((slavetext.includes("Your")) && (slavetext.includes("while raiding")))) {
+ slavetext = slavetext.replace(/\bher\b/g, "$him");
+ slavetext = slavetext.replace(/\bshe\b/g, "$he");
+ } else if (slavetext.includes("was once the young trophy husband of a powerful woman in the old world, but she sold")) {
+ slavetext = "$He was once the young trophy husband of a powerful woman in the old world, but she sold $him into slavery in revenge for $his infidelities.";
+ } else if (slavetext.includes("gargantuan dick to be a truly unique slave")) {
+ slavetext = "$He was raised as a girl despite $his gargantuan dick to be a truly unique slave.";
+ } else if (slavetext.includes("to enslavement for the attempted rape of a free woman")) {
+ slavetext = "You sentenced $him to enslavement for the attempted rape of a free woman.";
+ } else if (slavetext.includes("to enslavement as a punishment for the rape of a free woman")) {
+ slavetext = "You sentenced $him to enslavement as a punishment for the rape of a free woman.";
+ } else if (slavetext.includes("only way to obtain surgery to transform $him into a woman")) {
+ slavetext = "$He submitted to enslavement as $his only way to obtain surgery to transform $him into a woman.";
+ } else if (slavetext.includes("was sold as a slave to satisfy her spousal maintenance after divorce")) {
+ slavetext = "Once $he was an arcology security officer, lured to aphrodisiacs addiction and feminized by $his boss (and former wife), to whom $he was sold as a slave to satisfy her spousal maintenance after divorce.";
+ } else if (slavetext.includes("asked to be enslaved in the hope you'd treat a fellow woman well")) {
+ slavetext = "$He asked to be enslaved in the hope you'd treat a fellow woman well.";
+ } else {
+ slavetext = slavetext.replace(/\bherself\b/g, "$himself");
+ slavetext = slavetext.replace(/\bHerself\b/g, "$Himself");
+ slavetext = slavetext.replace(/\bshe\b/g, "$he");
+ slavetext = slavetext.replace(/\bShe\b/g, "$He");
+ slavetext = slavetext.replace(/\bher\b/g, "$his");
+ slavetext = slavetext.replace(/\bHer\b/g, "$His");
+ slavetext = slavetext.replace(/\b girl\b/g, " $girl");
+ slavetext = slavetext.replace(/\b woman\b/g, " $woman");
+ slavetext = slavetext.replace(/\${2,}/g, '');
+ }
+ break;
+ }
+ return slavetext;
+ }
+
if (slave.reservedChildren !== undefined) { delete slave.reservedChildren; }
if (slave.origin !== undefined && slave.origin !== "") { slave.origin = pronounReplacer(slave.origin); }
if (slave.custom !== undefined) {
@@ -299,17 +766,16 @@ App.Update.Slave = function(slave, genepool = false) {
}
}
- let backwardsCompatibility;
if (slave.rivalry !== 0) {
- backwardsCompatibility = V.slaveIndices[slave.rivalryTarget];
- if (backwardsCompatibility === undefined) {
+ const test = getSlave(slave.rivalryTarget);
+ if (!test) {
slave.rivalry = 0;
slave.rivalryTarget = 0;
}
}
if (slave.relationship > 0) {
- backwardsCompatibility = V.slaveIndices[slave.relationshipTarget];
- if (backwardsCompatibility === undefined) {
+ const test = getSlave(slave.relationshipTarget);
+ if (!test) {
slave.relationship = 0;
slave.relationshipTarget = 0;
}
@@ -931,27 +1397,27 @@ App.Update.Slave = function(slave, genepool = false) {
f.genetics.geneticQuirks = Object.assign(clone(quirks), f.genetics.geneticQuirks);
});
- if (V.releaseID < 1161 && !genepool) {
+ if (!genepool) {
// transfer scars from body to limbs if needed.
const scars = slave.scar;
const brands = slave.brand;
slave.scar = {};
slave.brand = {};
if (slave.leg.left) {
- slave.leg.left.scar = {};
- slave.leg.left.brand = {};
+ slave.leg.left.scar = slave.leg.left.scar || {};
+ slave.leg.left.brand = slave.leg.left.brand || {};
}
if (slave.leg.right) {
- slave.leg.right.scar = {};
- slave.leg.right.brand = {};
+ slave.leg.right.scar = slave.leg.right.scar || {};
+ slave.leg.right.brand = slave.leg.right.brand || {};
}
if (slave.arm.left) {
- slave.arm.left.scar = {};
- slave.arm.left.brand = {};
+ slave.arm.left.scar = slave.arm.left.scar || {};
+ slave.arm.left.brand = slave.arm.left.brand || {};
}
if (slave.arm.right) {
- slave.arm.right.scar = {};
- slave.arm.right.brand = {};
+ slave.arm.right.scar = slave.arm.right.scar || {};
+ slave.arm.right.brand = slave.arm.right.brand || {};
}
for (const location in scars) {
for (const design in scars[location]) {
@@ -959,7 +1425,13 @@ App.Update.Slave = function(slave, genepool = false) {
}
}
for (const location in brands) {
- App.Medicine.Modification.addBrand(slave, location, scars[location]);
+ App.Medicine.Modification.addBrand(slave, location, brands[location]);
+ }
+ }
+
+ if (V.releaseID < 1182) {
+ if (slave.skill.combat === 1) {
+ slave.skill.combat = 70;
}
}
};
diff --git a/src/data/newGamePlus.js b/src/data/newGamePlus.js
index b19c8af9b917abde48af554e7471d5f44782fd1a..4b539ee70a3d7f34478b024016d18a7d36c52d16 100644
--- a/src/data/newGamePlus.js
+++ b/src/data/newGamePlus.js
@@ -58,7 +58,8 @@ App.Data.NewGamePlus = (function() {
const transferredSlaveIds = (V.slaves || [])
.filter(s => s.ID >= NGPOffset)
.map(s => s.ID - NGPOffset);
- return genePool
+ const pcGenes = V.genePool.find(s => s.ID === -1);
+ const gp = genePool
.filter(s => (transferredSlaveIds.includes(s.ID)))
.map(s => {
const result = jQuery.extend(true, {}, s);
@@ -68,6 +69,10 @@ App.Data.NewGamePlus = (function() {
result.cloneID = ngpSlaveID(result.cloneID);
return result;
});
+ if (V.freshPC === 0) {
+ gp.push(pcGenes);
+ }
+ return gp;
};
const ngUpdateMissingTable = function(missingTable) {
diff --git a/src/descriptions/arcologyDescription.js b/src/descriptions/arcologyDescription.js
index 332409c6f9f6ca46ca0e51e1aed01093272c4b95..9e4c06113865a181581b525382a5e4bb8e850c8a 100644
--- a/src/descriptions/arcologyDescription.js
+++ b/src/descriptions/arcologyDescription.js
@@ -772,7 +772,12 @@ App.Desc.playerArcology = function(lastElement) {
buffer.push(`On several raised stands around the plaza, female slaves are stripping for the pleasure of passersby.`);
}
if (A.FSChattelReligionistDecoration >= 80) {
- buffer.push(`A handful of slaves are in religious attire, praying. They help if asked, and will even lead brief religious services if requested.`);
+ if (A.FSChattelReligionistLaw2 === 1) {
+ buffer.push(`A handful of nude slaves are praying.`);
+ } else {
+ buffer.push(`A handful of slaves are in religious attire, praying.`);
+ }
+ buffer.push(`They help if asked, and will even lead brief religious services if requested.`);
}
if (A.FSDegradationistDecoration >= 80) {
buffer.push(`Numerous downtrodden slaves are working on the plaza at menial tasks. Some are even carrying citizens in sedan chairs.`);
@@ -984,8 +989,11 @@ App.Desc.playerArcology = function(lastElement) {
if (A.FSHedonisticDecadenceSMR === 1) {
buffer.push(`${A.name} must import a very large quantity of fattening food to plump up its slaves.`);
}
- if (V.animals.canine.length > 0) {
- buffer.push(`Slaves can be seen walking one of your canines every so often.`);
+ if (V.animals.canine.length > 0 || V.animals.hooved.length > 0 || V.animals.feline.length > 0) {
+ buffer.push(`Slaves can be seen walking your animals every so often.`);
+ }
+ if (V.policies.SMR.beauty.qualitySMR) {
+ buffer.push(`${A.name} is known for its beautiful slaves.`);
}
return buffer.join(" ");
diff --git a/src/descriptions/familySummaries.js b/src/descriptions/familySummaries.js
index cc11db585a1b8429e5afd93bdf6032d9c20de198..3f3082a8cea168cc284eea94dc82ec663e5baa8e 100644
--- a/src/descriptions/familySummaries.js
+++ b/src/descriptions/familySummaries.js
@@ -1,27 +1,36 @@
App.Desc.family = (function() {
/** From a list of slaves, return their names, comma-separated and appended with "and" if necessary
* @param {Array<App.Entity.SlaveState>} slaveList
- * @returns {string}
+ * @param {boolean} links Should slave names be links
+ * @returns {DocumentFragment|HTMLElement|string}
*/
- function slaveListToText(slaveList) {
- return slaveList.map(s => s.slaveName).reduce((res, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch);
+ function slaveListToText(slaveList, links) {
+ if (!links) {
+ return toSentence(slaveList.map(s => s.slaveName));
+ }
+ return App.UI.DOM.toSentence(slaveList.map(s => App.UI.DOM.referenceSlaveWithPreview(s, s.slaveName)));
}
- /** See if an ID refers to a valid, active slave. This will return false for slaves that no longer exist or have not yet been created.
- * @param {number} slaveID
- * @returns {boolean}
+ /**
+ * @param {Array<HTMLElement|DocumentFragment|string>} parts
+ * @returns {HTMLSpanElement}
*/
- function validSlaveID(slaveID) {
- return slaveID > 0 && _.isObject(getSlave(slaveID));
+ function familySpan(...parts) {
+ const span = document.createElement("span");
+ span.classList.add("si-family");
+ span.append(...parts);
+ return span;
}
/** From a slave ID, return text describing that slave (even if they aren't currently your slave) to use in place of their name
* @param {number} slaveID
- * @returns {string}
+ * @param {boolean} allowLinks
+ * @returns {string|HTMLSpanElement}
*/
- function knownSlave(slaveID) {
- if (validSlaveID(slaveID)) {
- return getSlave(slaveID).slaveName;
+ function knownSlave(slaveID, allowLinks) {
+ const rel = findFather(slaveID);
+ if (slaveID > 0 && rel) {
+ return conditionalSlaveLink(rel, allowLinks);
} else if (slaveID in V.missingTable) {
return "your former slave " + V.missingTable[slaveID].slaveName;
} else {
@@ -29,6 +38,22 @@ App.Desc.family = (function() {
}
}
+ /**
+ * @param {Relative} slave
+ * @param {boolean} allowLinks
+ * @returns {HTMLSpanElement|string}
+ */
+ function conditionalSlaveLink(slave, allowLinks) {
+ const ownedSlave = getSlave(slave.ID);
+ if (allowLinks && ownedSlave) {
+ return App.UI.DOM.referenceSlaveWithPreview(ownedSlave, slave.slaveName);
+ } else if (slave.ID in V.missingTable) {
+ return "your former slave " + slave.slaveName;
+ } else {
+ return slave.slaveName;
+ }
+ }
+
/** Splits an array of slaves by sex (nieces/nephews, aunts/uncles, brothers/sisters, etc)
* @param {Array<App.Entity.SlaveState>} slaves
* @returns {{m: Array<App.Entity.SlaveState>, f: Array<App.Entity.SlaveState>}}
@@ -47,24 +72,30 @@ App.Desc.family = (function() {
/** Describe the members of a character's family.
* @param {FC.HumanState} character (pass V.PC to get the PC's special family summary)
- * @returns {string}
+ * @param {boolean} [allowLinks=false] Allow names of family members to be links to them. Should be disabled if the
+ * passage is not safe to navigate from.
+ * @returns {DocumentFragment}
*/
- function familySummary(character) {
+ function familySummary(character, allowLinks = false) {
+ let text;
if (character === V.PC) {
- return PCFamilySummary();
+ text = PCFamilySummary(allowLinks);
} else {
- return slaveFamilySummary(asSlave(character));
+ text = slaveFamilySummary(asSlave(character), allowLinks);
}
+ const f = new DocumentFragment();
+ $(f).append(...App.Events.spaceSentences(text));
+ return f;
}
/** Describe the members of a slave's family.
* @param {App.Entity.SlaveState} slave
- * @returns {string}
+ * @param {boolean} allowLinks
+ * @returns {Array<string|HTMLElement|DocumentFragment>}
*/
- function slaveFamilySummary(slave) {
- let r = [];
-
+ function slaveFamilySummary(slave, allowLinks) {
const {He, His, he, him, himself, his, sister} = getPronouns(slave);
+ const r = [];
/* PC parentage */
if (slave.ID === V.PC.mother && slave.ID === V.PC.father) {
@@ -78,136 +109,194 @@ App.Desc.family = (function() {
if (slave.father === -1 && slave.mother === -1) {
r.push(`${He}'s <span class="lightgreen">your child;</span> you knocked yourself up and gave birth to ${him}.`);
} else if (slave.father === slave.mother && (slave.father > 0 || (slave.father in V.missingTable && V.showMissingSlaves))) {
- r.push(`${He} was <span class="lightgreen">both fathered and mothered by ${knownSlave(slave.father)}.</span>`);
+ r.push(`${He} was `, familySpan(`both fathered and mothered by `, knownSlave(slave.father, allowLinks), `.`));
}
if (slave.father === -1 && slave.mother !== -1) {
r.push(`${He}'s <span class="lightgreen">your child;</span> you knocked ${his} mother up.`);
} else if ((slave.father > 0 || (slave.father in V.missingTable && V.showMissingSlaves)) && slave.father !== slave.mother) {
- r.push(`${He} was <span class="lightgreen">fathered by ${knownSlave(slave.father)}'s</span> virile dick.`);
+ r.push(`${He} was `, familySpan(`fathered by `, knownSlave(slave.father, allowLinks), `'s`), ` virile dick.`);
}
if (slave.father !== -1 && slave.mother === -1) {
r.push(`${He}'s <span class="lightgreen">your child;</span> you gave birth to ${him}.`);
} else if ((slave.mother > 0 || (slave.mother in V.missingTable && V.showMissingSlaves)) && slave.father !== slave.mother) {
- r.push(`${He} was <span class="lightgreen">born from ${knownSlave(slave.mother)}'s</span> fertile womb.`);
+ r.push(`${He} was `, familySpan(`born from `, knownSlave(slave.mother, allowLinks), `'s`), ` fertile womb.`);
}
let children = V.slaves.filter((s) => slave.ID === s.father && slave.ID === s.mother);
const isSoleParent = children.length > 0;
if (children.length > 2) {
- r.push(`${He} <span class="lightgreen">is the sole parent of ${slaveListToText(children)}.</span>`);
+ r.push(He, familySpan(`is the sole parent of `, slaveListToText(children, allowLinks), `.`));
} else if (children.length > 1) {
- r.push(`${He} <span class="lightgreen">is the sole parent of a pair of your slaves: ${slaveListToText(children)}.</span>`);
+ r.push(He, familySpan(`is the sole parent of a pair of your slaves: `, slaveListToText(children, allowLinks), `.`));
} else if (children.length > 0) {
- r.push(`${He} <span class="lightgreen">is the sole parent of a single slave of yours: ${slaveListToText(children)}.</span>`);
+ r.push(He, familySpan(`is the sole parent of a single slave of yours: `, slaveListToText(children, allowLinks), `.`));
}
children = V.slaves.filter((s) => slave.ID === s.father && slave.ID !== s.mother);
if (children.length > 2) {
- r.push(`${He} <span class="lightgreen">fathered ${slaveListToText(children)}${isSoleParent ? " with other mothers" : ""}.</span>`);
+ r.push(He, familySpan(`fathered `, slaveListToText(children, allowLinks), `${isSoleParent ? " with other mothers" : ""}.`));
} else if (children.length > 1) {
- r.push(`${He} <span class="lightgreen">fathered a pair of your slaves${isSoleParent ? " with other mothers" : ""}: ${slaveListToText(children)}.</span>`);
+ r.push(He, familySpan(`fathered a pair of your slaves${isSoleParent ? " with other mothers" : ""}: `, slaveListToText(children, allowLinks), `.`));
} else if (children.length > 0) {
- r.push(`${He} <span class="lightgreen">fathered a single slave of yours${isSoleParent ? " with another mother" : ""}: ${slaveListToText(children)}.</span>`);
+ r.push(He, familySpan(`fathered a single slave of yours${isSoleParent ? " with another mother" : ""}: `, slaveListToText(children, allowLinks), `.`));
}
children = V.slaves.filter((s) => slave.ID === s.mother && slave.ID !== s.father);
if (children.length > 2) {
- r.push(`${He} <span class="lightgreen">gave birth to ${slaveListToText(children)}${isSoleParent ? " with other fathers" : ""}.</span>`);
+ r.push(He, familySpan(`gave birth to `, slaveListToText(children, allowLinks), `${isSoleParent ? " with other fathers" : ""}.`));
} else if (children.length > 1) {
- r.push(`${He} <span class="lightgreen">gave birth to a pair of your slaves${isSoleParent ? " with other fathers" : ""}: ${slaveListToText(children)}.</span>`);
+ r.push(He, familySpan(`gave birth to a pair of your slaves${isSoleParent ? " with other fathers" : ""}: `, slaveListToText(children, allowLinks), `.`));
} else if (children.length > 0) {
- r.push(`${He} <span class="lightgreen">gave birth to a single slave of yours${isSoleParent ? " with another father" : ""}: ${slaveListToText(children)}.</span>`);
- }
-
- function getParentIndices(slaveID) {
- if (slaveID === V.PC.ID) {
- return {mi: V.slaveIndices[V.PC.mother], fi: V.slaveIndices[V.PC.father]};
- } else {
- const target = getSlave(slaveID);
- if (target) {
- return {mi: V.slaveIndices[target.mother], fi: V.slaveIndices[target.father]};
- }
- }
- return {mi: undefined, fi: undefined};
+ r.push(He, familySpan(`gave birth to a single slave of yours${isSoleParent ? " with another father" : ""}: `, slaveListToText(children, allowLinks), `.`));
}
if (V.showDistantRelatives) {
/* grandparents */
- const mi = V.slaveIndices[slave.mother];
- const fi = V.slaveIndices[slave.father];
- const {mi: mmi, fi: fmi} = getParentIndices(slave.mother);
- const {mi: mfi, fi: ffi} = getParentIndices(slave.father);
- if ((jsDef(mi) || jsDef(fi)) && !jsDef(mmi) && !jsDef(fmi) && !jsDef(mfi) && !jsDef(ffi)) {
- if (jsDef(mi)) {
- if ((jsDef(fi)) && mi === fi) {
- if (V.PC.ID === V.slaves[mi].mother && V.PC.ID === V.slaves[fi].father) {
- r.push(`${He} is <span class="lightgreen">your grandchild. You impregnated yourself with ${his} sole biological parent.</span>`);
- } else if (V.PC.ID === V.slaves[mi].mother) {
- r.push(`${He} is <span class="lightgreen">your grandchild. You gave birth to ${his} sole biological parent.</span>`);
- } else if (V.PC.ID === V.slaves[fi].father) {
- r.push(`${He} is <span class="lightgreen">your grandchild. You fathered ${his} sole biological parent.</span>`);
- }
- } else if ((jsDef(fi)) && V.PC.ID === V.slaves[mi].mother && V.PC.ID === V.slaves[fi].mother) {
- r.push(`${He} is <span class="lightgreen">your grandchild. You gave birth to both of ${his} parents.</span>`);
- } else if ((jsDef(fi)) && V.PC.ID === V.slaves[mi].father && V.PC.ID === V.slaves[fi].father) {
- r.push(`${He} is <span class="lightgreen">your grandchild. You fathered both of ${his} parents.</span>`);
- } else if (V.PC.ID === V.slaves[mi].mother) {
- r.push(`${He} is <span class="lightgreen">your grandchild. You gave birth to ${his} mother.</span>`);
- } else if (V.PC.ID === V.slaves[mi].father) {
- r.push(`${He} is <span class="lightgreen">your grandchild. You fathered ${his} mother.</span>`);
+ const mom = getRelative(slave.mother);
+ const dad = getRelative(slave.father);
+ const mgmom = mom ? getRelative(mom.mother) : null;
+ const mgdad = mom ? getRelative(mom.father) : null;
+ const pgmom = dad ? getRelative(dad.mother) : null;
+ const pgdad = dad ? getRelative(dad.father) : null;
+ if (mom && dad && mom.ID === dad.ID) { // sole parent
+ if (mgmom && mgdad && mgmom.ID === mgdad.ID) { // sole grandparent
+ if (mgmom.ID === V.PC.ID) {
+ r.push(`${He} is <span class="lightgreen">your grandchild. You impregnated yourself with ${his} sole biological parent.</span>`);
+ } else {
+ r.push(`${His} sole`, familySpan(`grandparent is `, conditionalSlaveLink(mgmom, allowLinks), `,`), `who gave birth to ${his} sole biological parent.`);
}
- } else if (jsDef(fi)) {
- if (V.PC.ID === V.slaves[fi].mother) {
- r.push(`${He} is <span class="lightgreen">your grandchild. You gave birth to ${his} father.</span>`);
- } else if (V.PC.ID === V.slaves[fi].father) {
- r.push(`${He} is <span class="lightgreen">your grandchild. You fathered ${his} father.</span>`);
+ } else { // two grandparents
+ if (mgmom && mgmom.ID === V.PC.ID) {
+ r.push(`${He} is <span class="lightgreen">your grandchild. You gave birth to ${his} sole biological parent.</span>`);
+ } else if (mgmom) {
+ r.push(`${His} sole`, familySpan(`grandmother is `, conditionalSlaveLink(mgmom, allowLinks), `,`), `who gave birth to ${his} sole biological parent.`);
+ }
+ if (mgdad && mgdad.ID === V.PC.ID) {
+ r.push(`${He} is <span class="lightgreen">your grandchild. You fathered ${his} sole biological parent.</span>`);
+ } else if (mgdad) {
+ r.push(`${His} sole`, familySpan(`grandfather is `, conditionalSlaveLink(mgdad, allowLinks), `,`), `who fathered ${his} sole biological parent.`);
}
}
- } else {
- if ((jsDef(mmi)) && (jsDef(ffi)) && mmi === ffi) {
- r.push(`${His} sole <span class="lightgreen">grandparent is ${V.slaves[mmi].slaveName}.</span>`);
- } else {
- if ((jsDef(mmi)) && (jsDef(mfi)) && mmi === mfi) {
- r.push(`${His} sole <span class="lightgreen">grandmother is ${V.slaves[mmi].slaveName}.</span>`);
+ } else { // two parents means between one and four grandparents
+ if (mgmom && mgdad && pgmom && pgdad && mgmom.ID === mgdad.ID && mgmom.ID === pgmom.ID && pgmom.ID === pgdad.ID) { // one grandparent
+ if (mgmom.ID === V.PC.ID) {
+ r.push(`${He} is <span class="lightgreen">your grandchild. You impregnated yourself with both of ${his} parents.</span>`);
} else {
- if (jsDef(mmi)) {
- r.push(`${His} maternal <span class="lightgreen">grandmother is ${V.slaves[mmi].slaveName}.</span>`);
+ r.push(`${His} sole `, familySpan(`grandparent is `, conditionalSlaveLink(mgmom, allowLinks), `.`));
+ }
+ } else {
+ // two grandparents can mean:
+ // two sole parents, one for each parent
+ // shared grandfather AND shared grandmother
+ // paternal grandmother is maternal grandfather and vice versa (no special handling)
+ // any 3+1 combination (no special handling)
+
+ // three grandparents can mean:
+ // sole grandparent on one side or the other
+ // same grandfather on both sides
+ // same grandmother on both sides
+ // paternal grandmother is maternal grandfather OR vice versa (no special handling)
+
+ // four distinct grandparents is easy
+
+ let didMGMom = false;
+ let didMGDad = false;
+ let didPGMom = false;
+ let didPGDad = false;
+ let pcout = [];
+ let npcout = [];
+
+ // so we handle: sole parents, on either or both sides
+ if (mgmom && mgdad && mgmom.ID === mgdad.ID) {
+ if (mgmom.ID === V.PC.ID) {
+ pcout.push(`${He} is <span class="lightgreen">your grandchild. You impregnated yourself with ${his} mother.</span>`);
+ } else {
+ npcout.push(`${His} sole `, familySpan(`maternal grandparent is `, conditionalSlaveLink(mgmom, allowLinks), `.`));
}
- if (jsDef(mfi)) {
- r.push(`${His} paternal <span class="lightgreen">grandmother is ${V.slaves[mfi].slaveName}.</span>`);
+ didMGMom = didMGDad = true;
+ }
+ if (pgmom && pgdad && pgmom.ID === pgdad.ID) {
+ if (pgmom.ID === V.PC.ID) {
+ pcout.push(`${He} is <span class="lightgreen">your grandchild. You impregnated yourself with ${his} father.</span>`);
+ } else {
+ npcout.push(`${His} sole `, familySpan(`paternal grandparent is `, conditionalSlaveLink(mgmom, allowLinks), `.`));
}
+ didPGMom = didPGDad = true;
}
- if ((jsDef(fmi)) && (jsDef(ffi)) && fmi === ffi) {
- r.push(`${His} sole <span class="lightgreen">grandfather is ${V.slaves[ffi].slaveName}.</span>`);
- } else {
- if (jsDef(fmi)) {
- r.push(`${His} maternal <span class="lightgreen">grandfather is ${V.slaves[fmi].slaveName}.</span>`);
+
+ // shared grandfather
+ if (mgdad && pgdad && mgdad.ID === pgdad.ID) {
+ if (mgdad.ID === V.PC.ID) {
+ pcout.push(`${He} is <span class="lightgreen">your grandchild. You fathered both of ${his} parents.</span>`);
+ } else {
+ npcout.push(`${His} sole `, familySpan(`grandfather is `, conditionalSlaveLink(mgdad, allowLinks), `.`));
+ }
+ didMGDad = didPGDad = true;
+ }
+
+ // shared grandmother
+ if (mgmom && pgmom && mgmom.ID === pgmom.ID) {
+ if (mgmom.ID === V.PC.ID) {
+ pcout.push(`${He} is <span class="lightgreen">your grandchild. You gave birth to both of ${his} parents.</span>`);
+ } else {
+ npcout.push(`${His} sole `, familySpan(`grandmother is `, conditionalSlaveLink(mgmom, allowLinks), `.`));
+ }
+ didMGMom = didPGMom = true;
+ }
+
+ // pick up any remaining grandparents (and the unhandled crosses)
+ if (mgdad && !didMGDad) {
+ if (mgdad.ID === V.PC.ID) {
+ pcout.push(`${He} is <span class="lightgreen">your grandchild. You fathered ${his} mother.</span>`);
+ } else {
+ npcout.push(`${His} maternal `, familySpan(`grandfather is `, conditionalSlaveLink(mgdad, allowLinks), `.`));
}
- if (ffi) {
- r.push(`${His} paternal <span class="lightgreen">grandfather is ${V.slaves[ffi].slaveName}.</span>`);
+ }
+ if (mgmom && !didMGMom) {
+ if (mgmom.ID === V.PC.ID) {
+ pcout.push(`${He} is <span class="lightgreen">your grandchild. You gave birth to ${his} mother.</span>`);
+ } else {
+ npcout.push(`${His} maternal `, familySpan(`grandmother is `, conditionalSlaveLink(mgmom, allowLinks), `.`));
}
}
+ if (pgdad && !didPGDad) {
+ if (pgdad.ID === V.PC.ID) {
+ pcout.push(`${He} is <span class="lightgreen">your grandchild. You fathered ${his} father.</span>`);
+ } else {
+ npcout.push(`${His} paternal `, familySpan(`grandfather is `, conditionalSlaveLink(pgdad, allowLinks), `.`));
+ }
+ }
+ if (pgmom && !didPGMom) {
+ if (pgmom.ID === V.PC.ID) {
+ pcout.push(`${He} is <span class="lightgreen">your grandchild. You gave birth to ${his} father.</span>`);
+ } else {
+ npcout.push(`${His} paternal `, familySpan(`grandmother is `, conditionalSlaveLink(pgmom, allowLinks), `.`));
+ }
+ }
+
+ // reorder: pc as grandparent first, followed by NPC grandparents.
+ r.push(...pcout, ...npcout);
}
}
/* PC grandparents - determines if the current slave is your grandparent */
- const pcMother = getSlave(V.PC.mother);
- const pcFather = getSlave(V.PC.father);
+ const pcMother = getRelative(V.PC.mother);
+ const pcFather = getRelative(V.PC.father);
if (jsDef(pcMother)) {
if ((jsDef(pcFather)) && pcMother === pcFather) {
if (slave.ID === pcMother.mother && slave.ID === pcFather.father) {
- r.push(`${He} is <span class="lightgreen">your sole grandparent. ${He} impregnated ${himself} with your sole parent ${pcMother.slaveName} who in turn impregnated themselves with you.</span>`);
+ r.push(`${He} is `, familySpan(`your sole grandparent. ${He} impregnated ${himself} with your sole parent `, conditionalSlaveLink(pcMother, allowLinks), ` who in turn impregnated themselves with you.`));
} else if (slave.ID === pcMother.mother) {
- r.push(`${He} is <span class="lightgreen">your sole grandmother. ${He} gave birth to ${pcMother.slaveName} who in turn impregnated themselves with you.</span>`);
+ r.push(`${He} is `, familySpan(`your sole grandmother. ${He} gave birth to `, conditionalSlaveLink(pcMother, allowLinks), ` who in turn impregnated themselves with you.`));
} else if (slave.ID === pcFather.father) {
- r.push(`${He} is <span class="lightgreen">your sole grandfather. ${He} fathered ${pcFather.slaveName} who in turn impregnated themselves with you.</span>`);
+ r.push(`${He} is `, familySpan(`your sole grandfather. ${He} fathered `, conditionalSlaveLink(pcFather, allowLinks), ` who in turn impregnated themselves with you.`));
}
} else if ((jsDef(pcFather)) && slave.ID === pcMother.mother && slave.ID === pcFather.mother) {
- r.push(`${He} is <span class="lightgreen">your sole grandmother.</span> ${He} gave birth to both of your parents, ${pcMother.slaveName} and ${pcFather.slaveName}.`);
+ r.push(`${He} is <span class="lightgreen">your sole grandmother.</span> ${He} gave birth to both of your parents, `, conditionalSlaveLink(pcMother, allowLinks), ` and `, conditionalSlaveLink(pcFather, allowLinks), `.`);
} else if ((jsDef(pcFather)) && slave.ID === pcMother.father && slave.ID === pcFather.father) {
- r.push(`${He} is <span class="lightgreen">your sole grandfather.</span> ${He} fathered both of your parents, ${pcFather.slaveName} and ${pcMother.slaveName}.`);
+ r.push(`${He} is <span class="lightgreen">your sole grandfather.</span> ${He} fathered both of your parents, `, conditionalSlaveLink(pcFather, allowLinks), ` and `, conditionalSlaveLink(pcMother, allowLinks), `.`);
} else if (slave.ID === pcMother.mother) {
r.push(`${He} is <span class="lightgreen">your maternal grandmother.</span>`);
} else if (slave.ID === pcMother.father) {
@@ -226,11 +315,11 @@ App.Desc.family = (function() {
if (children.length > 0) {
r.push(`${He} has`);
if (children.length > 2) {
- r.push(`<span class="lightgreen">many grandchildren, ${slaveListToText(children)}, amongst your slaves.</span>`);
+ r.push(familySpan(`many grandchildren, `, slaveListToText(children, allowLinks), `, amongst your slaves.`));
} else if (children.length > 1) {
- r.push(`<span class="lightgreen">two grandchildren, ${slaveListToText(children)}, amongst your slaves.</span>`);
+ r.push(familySpan(`two grandchildren, `, slaveListToText(children, allowLinks), `, amongst your slaves.`));
} else {
- r.push(`a <span class="lightgreen">grandchild, ${slaveListToText(children)}, as your slave.</span>`);
+ r.push(`a`, familySpan(`grandchild, `, slaveListToText(children, allowLinks), `, as your slave.`));
}
}
@@ -241,13 +330,13 @@ App.Desc.family = (function() {
r.push(`${He} is`);
if (slave.genes === "XX") {
if (aunts.length > 0) {
- r.push(`<span class="lightgreen">your aunt along with ${slaveListToText(aunts)}.</span>`);
+ r.push(familySpan(`your aunt along with `, slaveListToText(aunts, allowLinks), `.`));
} else {
r.push(`<span class="lightgreen">your aunt.</span>`);
}
} else {
if (uncles.length > 0) {
- r.push(`<span class="lightgreen">your uncle along with ${slaveListToText(uncles)}.</span>`);
+ r.push(familySpan(`your uncle along with `, slaveListToText(uncles, allowLinks), `.`));
} else {
r.push(`<span class="lightgreen">your uncle.</span>`);
}
@@ -260,21 +349,21 @@ App.Desc.family = (function() {
if (aunts.length > 0) {
r.push(`${He} has`);
if (aunts.length > 2) {
- r.push(`<span class="lightgreen">many aunts, ${slaveListToText(aunts)}.</span>`);
+ r.push(familySpan(`many aunts, `, slaveListToText(aunts, allowLinks), `.`));
} else if (aunts.length > 1) {
- r.push(`<span class="lightgreen">two aunts, ${slaveListToText(aunts)}.</span>`);
+ r.push(familySpan(`two aunts, `, slaveListToText(aunts, allowLinks), `.`));
} else {
- r.push(`<span class="lightgreen">an aunt, ${slaveListToText(aunts)}.</span>`);
+ r.push(familySpan(`an aunt, `, slaveListToText(aunts, allowLinks), `.`));
}
}
if (uncles.length > 0) {
r.push(`${He} has`);
if (uncles.length > 2) {
- r.push(`<span class="lightgreen">many uncles, ${slaveListToText(uncles)}.</span>`);
+ r.push(familySpan(`many uncles, `, slaveListToText(uncles, allowLinks), `.`));
} else if (uncles.length > 1) {
- r.push(`<span class="lightgreen">two uncles, ${slaveListToText(uncles)}.</span>`);
+ r.push(familySpan(`two uncles, `, slaveListToText(uncles, allowLinks), `.`));
} else {
- r.push(`<span class="lightgreen">an uncle, ${slaveListToText(uncles)}.</span>`);
+ r.push(familySpan(`an uncle, `, slaveListToText(uncles, allowLinks), `.`));
}
}
@@ -286,13 +375,13 @@ App.Desc.family = (function() {
r.push(`${He} is`);
if (slave.genes === "XX") {
if (nieces.length > 0) {
- r.push(`<span class="lightgreen">your niece along with ${slaveListToText(nieces)}.</span>`);
+ r.push(familySpan(`your niece along with `, slaveListToText(nieces, allowLinks), `.`));
} else {
r.push(`<span class="lightgreen">your niece.</span>`);
}
} else {
if (nephews.length > 0) {
- r.push(`<span class="lightgreen">your nephew along with ${slaveListToText(nephews)}.</span>`);
+ r.push(familySpan(`your nephew along with `, slaveListToText(nephews, allowLinks), `.`));
} else {
r.push(`<span class="lightgreen">your nephew.</span>`);
}
@@ -305,21 +394,21 @@ App.Desc.family = (function() {
if (nieces.length > 0) {
r.push(`${He} has`);
if (nieces.length > 2) {
- r.push(`<span class="lightgreen">many nieces, ${slaveListToText(nieces)}, who are your slaves.</span>`);
+ r.push(familySpan(`many nieces, `, slaveListToText(nieces, allowLinks), `, who are your slaves.`));
} else if (nieces.length > 1) {
- r.push(`<span class="lightgreen">two nieces, ${slaveListToText(nieces)}, who are your slaves.</span>`);
+ r.push(familySpan(`two nieces, `, slaveListToText(nieces, allowLinks), `, who are your slaves.`));
} else {
- r.push(`<span class="lightgreen">a niece, ${slaveListToText(nieces)}, who is your slave.</span>`);
+ r.push(familySpan(`a niece, `, slaveListToText(nieces, allowLinks), `, who is your slave.`));
}
}
if (nephews.length > 0) {
r.push(`${He} has`);
if (nephews.length > 2) {
- r.push(`<span class="lightgreen">many nephews, ${slaveListToText(nephews)}, who are your slaves.</span>`);
+ r.push(familySpan(`many nephews, `, slaveListToText(nephews, allowLinks), `, who are your slaves.`));
} else if (nephews.length > 1) {
- r.push(`<span class="lightgreen">two nephews, ${slaveListToText(nephews)}, who are your slaves.</span>`);
+ r.push(familySpan(`two nephews, `, slaveListToText(nephews, allowLinks), `, who are your slaves.`));
} else {
- r.push(`<span class="lightgreen">a nephew, ${slaveListToText(nephews)}, who is your slave.</span>`);
+ r.push(familySpan(`a nephew, `, slaveListToText(nephews, allowLinks), `, who is your slave.`));
}
}
} /* end distant relatives toggle check */
@@ -353,9 +442,9 @@ App.Desc.family = (function() {
if (areSisters(slave, V.PC) === 1) {
r.push(He);
if (twins.length > 1) {
- r.push(`<span class="lightgreen">shared a cramped womb with you, ${slaveListToText(twins)}.</span>`);
+ r.push(familySpan(`shared a cramped womb with you, `, slaveListToText(twins, allowLinks), `.`));
} else if (twins.length > 0) {
- r.push(`is <span class="lightgreen">your twin along with ${slaveListToText(twins)}.</span>`);
+ r.push(`is `, familySpan(`your twin along with `, slaveListToText(twins, allowLinks), `.`));
} else {
r.push(`is <span class="lightgreen">your twin.</span>`);
}
@@ -366,7 +455,7 @@ App.Desc.family = (function() {
if (areSisters(slave, V.PC) === 2 && slave.genes === "XX") {
r.push(`${He} is`);
if (sisters.length > 0) {
- r.push(`<span class="lightgreen">your ${sister} along with ${slaveListToText(sisters)}.</span>`);
+ r.push(familySpan(`your ${sister} along with `, slaveListToText(sisters, allowLinks), `.`));
} else {
r.push(`<span class="lightgreen">your ${sister}.</span>`);
}
@@ -377,7 +466,7 @@ App.Desc.family = (function() {
if (areSisters(slave, V.PC) === 2 && slave.genes === "XY") {
r.push(`${He} is`);
if (brothers.length > 0) {
- r.push(`<span class="lightgreen">your ${sister} along with ${slaveListToText(brothers)}.</span>`);
+ r.push(familySpan(`your ${sister} along with `, slaveListToText(brothers, allowLinks), `.`));
} else {
r.push(`<span class="lightgreen">your ${sister}.</span>`);
}
@@ -388,7 +477,7 @@ App.Desc.family = (function() {
if (areSisters(slave, V.PC) === 3 && slave.genes === "XX") {
r.push(`${He} is`);
if (halfSisters.length > 0) {
- r.push(`<span class="lightgreen">your half-${sister} along with ${slaveListToText(halfSisters)}.</span>`);
+ r.push(familySpan(`your half-${sister} along with `, slaveListToText(halfSisters, allowLinks), `.`));
} else {
r.push(`<span class="lightgreen">your half-${sister}.</span>`);
}
@@ -399,7 +488,7 @@ App.Desc.family = (function() {
if (areSisters(slave, V.PC) === 3 && slave.genes === "XY") {
r.push(`${He} is`);
if (halfBrothers.length > 0) {
- r.push(`<span class="lightgreen">your half-${sister} along with ${slaveListToText(halfBrothers)}.</span>`);
+ r.push(familySpan(`your half-${sister} along with `, slaveListToText(halfBrothers, allowLinks), `.`));
} else {
r.push(`<span class="lightgreen">your half-${sister}.</span>`);
}
@@ -410,11 +499,11 @@ App.Desc.family = (function() {
if (twins.length > 0) {
r.push(`${He}`);
if (twins.length > 2) {
- r.push(`<span class="lightgreen">shared a cramped womb with ${slaveListToText(twins)}.</span>`);
+ r.push(familySpan(`shared a cramped womb with `, slaveListToText(twins, allowLinks), `.`));
} else if (twins.length > 1) {
- r.push(`is <span class="lightgreen">one of a set of triplets; ${slaveListToText(twins)}</span> complete the trio.`);
+ r.push(`is `, familySpan(`one of a set of triplets; `, slaveListToText(twins, allowLinks)), ` complete the trio.`);
} else {
- r.push(`is <span class="lightgreen">twins with ${twins[0].slaveName}.</span>`);
+ r.push(`is `, familySpan(`twins with `, conditionalSlaveLink(twins[0], allowLinks), `.`));
}
}
@@ -422,9 +511,9 @@ App.Desc.family = (function() {
if (sisters.length > 0) {
const sister2 = getPronouns(sisters[0]).sister;
if (sisters.length > 1) {
- r.push(`<span class="lightgreen">${slaveListToText(sisters)} are ${his} ${sister2}s.</span>`);
+ r.push(familySpan(slaveListToText(sisters, allowLinks), ` are ${his} ${sister2}s.`));
} else {
- r.push(`<span class="lightgreen">${sisters[0].slaveName} is ${his} ${sister2}.</span>`);
+ r.push(familySpan(conditionalSlaveLink(sisters[0], allowLinks), ` is ${his} ${sister2}.`));
}
}
@@ -432,9 +521,9 @@ App.Desc.family = (function() {
if (brothers.length > 0) {
const sister2 = getPronouns(brothers[0]).sister;
if (brothers.length > 1) {
- r.push(`<span class="lightgreen">${slaveListToText(brothers)} are ${his} ${sister2}s.</span>`);
+ r.push(familySpan(slaveListToText(brothers, allowLinks), ` are ${his} ${sister2}s.`));
} else {
- r.push(`<span class="lightgreen">${brothers[0].slaveName} is ${his} ${sister2}.</span>`);
+ r.push(familySpan(conditionalSlaveLink(brothers[0], allowLinks), ` is ${his} ${sister2}.`));
}
}
@@ -442,9 +531,9 @@ App.Desc.family = (function() {
if (halfSisters.length > 0) {
const sister2 = getPronouns(halfSisters[0]).sister;
if (halfSisters.length > 1) {
- r.push(`<span class="lightgreen">${slaveListToText(halfSisters)} are half-${sister2}s to ${him}.</span>`);
+ r.push(familySpan(slaveListToText(halfSisters, allowLinks), ` are half-${sister2}s to ${him}.`));
} else {
- r.push(`<span class="lightgreen">${halfSisters[0].slaveName} is a half-${sister2} to ${him}.</span>`);
+ r.push(familySpan(conditionalSlaveLink(halfSisters[0], allowLinks), ` is a half-${sister2} to ${him}.`));
}
}
@@ -452,9 +541,9 @@ App.Desc.family = (function() {
if (halfBrothers.length > 0) {
const sister2 = getPronouns(halfBrothers[0]).sister;
if (halfBrothers.length > 1) {
- r.push(`<span class="lightgreen">${slaveListToText(halfBrothers)} are half-${sister2}s to ${him}.</span>`);
+ r.push(familySpan(slaveListToText(halfBrothers, allowLinks), ` are half-${sister2}s to ${him}.`));
} else if (halfBrothers.length > 0) {
- r.push(`<span class="lightgreen">${halfBrothers[0].slaveName} is a half-${sister2} to ${him}.</span>`);
+ r.push(familySpan(conditionalSlaveLink(halfBrothers[0], allowLinks), ` is a half-${sister2} to ${him}.`));
}
}
@@ -464,7 +553,7 @@ App.Desc.family = (function() {
const PCcousins = V.slaves.filter((s) => s.ID !== slave.ID && areCousins(V.PC, s));
r.push(`${He} is`);
if (PCcousins.length > 0) {
- r.push(`<span class="lightgreen">your cousin along with ${slaveListToText(PCcousins)}.</span>`);
+ r.push(familySpan(`your cousin along with `, slaveListToText(PCcousins, allowLinks), `.`));
} else {
r.push(`<span class="lightgreen">your cousin.</span>`);
}
@@ -472,9 +561,9 @@ App.Desc.family = (function() {
/* cousin - determines how many cousins a slave has*/
if (cousins.length > 1) {
- r.push(`<span class="lightgreen">${slaveListToText(cousins)} are cousins to ${him}.</span>`);
+ r.push(familySpan(slaveListToText(cousins, allowLinks), ` are cousins to ${him}.`));
} else if (cousins.length > 0) {
- r.push(`<span class="lightgreen">${cousins[0].slaveName} is a cousin to ${him}.</span>`);
+ r.push(familySpan(conditionalSlaveLink(cousins[0], allowLinks), ` is a cousin to ${him}.`));
}
}
@@ -487,7 +576,7 @@ App.Desc.family = (function() {
}
}
- if (V.cheatMode) {
+ if (V.debugMode) {
r.push(`${He} has ${numberWithPlural(slave.sisters, "sister")} and ${numberWithPlural(slave.daughters, "daughter")}.`);
}
@@ -507,14 +596,15 @@ App.Desc.family = (function() {
r.push(`inbred, with a CoI of ${slave.inbreedingCoeff}.`);
}
- return r.join(" ");
+ return r;
}
/** Describe the members of the PC's family.
- * @returns {string}
+ * @param {boolean} allowLinks
+ * @returns {Array<string|HTMLElement|DocumentFragment>}
*/
- function PCFamilySummary() {
- let r = [];
+ function PCFamilySummary(allowLinks) {
+ const r = [];
r.push(`<br>Your family records show that:`);
@@ -531,14 +621,14 @@ App.Desc.family = (function() {
parents = parents.concat(V.slaves.filter((s) => isParentP(V.PC, s)));
if (parents.length > 1) {
- r.push(`<br>Your parents are <span class="lightgreen">${knownSlave(parents[0].ID)} and ${knownSlave(parents[1].ID)}.</span>`);
+ r.push(`<br>Your parents are `, familySpan(knownSlave(parents[0].ID, allowLinks), ` and `, knownSlave(parents[1].ID, allowLinks), `.`));
} else if (parents.length > 0) {
if (V.PC.father === V.PC.mother) {
/* apparently we don't keep pronoun records in the missing parents table??? */
const himself = jsDef(parents[0].pronoun) ? getPronouns(parents[0]).himself : "herself";
- r.push(`<br>Your parent is <span class="lightgreen">${knownSlave(parents[0].ID)},</span> who impregnated ${himself} with you.`);
+ r.push(`<br>Your parent is `, familySpan(knownSlave(parents[0].ID, allowLinks), `,`), ` who impregnated ${himself} with you.`);
} else {
- r.push(`<br>You know one of your parents, <span class="lightgreen">${knownSlave(parents[0].ID)}.</span>`);
+ r.push(`<br>You know one of your parents, `, familySpan(knownSlave(parents[0].ID, allowLinks), `.`));
}
}
@@ -549,21 +639,21 @@ App.Desc.family = (function() {
if (aunts.length > 0) {
r.push(`<br>You have`);
if (aunts.length > 2) {
- r.push(`<span class="lightgreen">many aunts, ${slaveListToText(aunts)}.</span>`);
+ r.push(familySpan(`many aunts, `, slaveListToText(aunts, allowLinks), `.`));
} else if (aunts.length > 1) {
- r.push(`<span class="lightgreen">two aunts, ${slaveListToText(aunts)}.</span>`);
+ r.push(familySpan(`two aunts, `, slaveListToText(aunts, allowLinks), `.`));
} else {
- r.push(`<span class="lightgreen">an aunt, ${slaveListToText(aunts)}.</span>`);
+ r.push(familySpan(`an aunt, `, slaveListToText(aunts, allowLinks), `.`));
}
}
if (uncles.length > 0) {
r.push(`<br>You have`);
if (uncles.length > 2) {
- r.push(`<span class="lightgreen">many uncles, ${slaveListToText(uncles)}.</span>`);
+ r.push(familySpan(`many uncles, `, slaveListToText(uncles, allowLinks), `.`));
} else if (uncles.length > 1) {
- r.push(`<span class="lightgreen">two uncles, ${slaveListToText(uncles)}.</span>`);
+ r.push(familySpan(`two uncles, `, slaveListToText(uncles, allowLinks), `.`));
} else {
- r.push(`<span class="lightgreen">an uncle, ${slaveListToText(uncles)}.</span>`);
+ r.push(familySpan(`an uncle, `, slaveListToText(uncles, allowLinks), `.`));
}
}
}
@@ -594,44 +684,44 @@ App.Desc.family = (function() {
}
if (twins.length > 1) {
- r.push(`<br>You are <span class="lightgreen">twins with ${slaveListToText(twins)}.</span>`);
+ r.push(`<br>You are `, familySpan(`twins with `, slaveListToText(twins, allowLinks), `.`));
} else if (twins.length > 0) {
- r.push(`<br>Your twin is <span class="lightgreen">${twins[0].slaveName}.</span>`);
+ r.push(`<br>Your twin is `, familySpan(conditionalSlaveLink(twins[0], allowLinks), `.`));
}
if (sisters.length > 1) {
- r.push(`<br><span class="lightgreen">${slaveListToText(sisters)}</span> are your sisters.`);
+ r.push(`<br>`, slaveListToText(sisters, allowLinks), ` are your sisters.`);
} else if (sisters.length > 0) {
const {sister} = getPronouns(sisters[0]);
- r.push(`<br>Your ${sister} is <span class="lightgreen">${sisters[0].slaveName}.</span>`);
+ r.push(`<br>Your ${sister} is `, familySpan(conditionalSlaveLink(sisters[0], allowLinks), `.`));
}
if (brothers.length > 1) {
- r.push(`<br><span class="lightgreen">${slaveListToText(brothers)}</span> are your brothers.`);
+ r.push(`<br>`, slaveListToText(brothers, allowLinks), ` are your brothers.`);
} else if (brothers.length > 0) {
const {sister} = getPronouns(brothers[0]);
- r.push(`<br>Your ${sister} is <span class="lightgreen">${brothers[0].slaveName}.</span>`);
+ r.push(`<br>Your ${sister} is `, familySpan(conditionalSlaveLink(brothers[0], allowLinks), `.`));
}
if (halfSisters.length > 1) {
- r.push(`<br><span class="lightgreen">${slaveListToText(halfSisters)}</span> are your half-sisters.`);
+ r.push(`<br>`, slaveListToText(halfSisters, allowLinks), ` are your half-sisters.`);
} else if (halfSisters.length > 0) {
const {sister} = getPronouns(halfSisters[0]);
- r.push(`<br>You have one half-${sister}, <span class="lightgreen">${halfSisters[0].slaveName}.</span>`);
+ r.push(`<br>You have one half-${sister}, `, familySpan(conditionalSlaveLink(halfSisters[0], allowLinks), `.`));
}
if (halfBrothers.length > 1) {
- r.push(`<br><span class="lightgreen">${slaveListToText(halfBrothers)}</span> are your half-brothers.`);
+ r.push(`<br>`, slaveListToText(halfBrothers, allowLinks), ` are your half-brothers.`);
} else if (halfBrothers.length > 0) {
const {sister} = getPronouns(halfBrothers[0]);
- r.push(`<br>You have one half-${sister}, <span class="lightgreen">${halfBrothers[0].slaveName}.</span>`);
+ r.push(`<br>You have one half-${sister}, `, familySpan(conditionalSlaveLink(halfBrothers[0], allowLinks), `.`));
}
if (V.showDistantRelatives) {
if (cousins.length > 1) {
- r.push(`<br><span class="lightgreen">${slaveListToText(cousins)}</span> are your cousins.`);
+ r.push(`<br>`, slaveListToText(cousins, allowLinks), ` are your cousins.`);
} else if (cousins.length > 0) {
- r.push(`<br>You have one cousin, <span class="lightgreen">${cousins[0].slaveName}.</span>`);
+ r.push(`<br>You have one cousin, `, familySpan(conditionalSlaveLink(cousins[0], allowLinks), `.`));
}
}
@@ -642,21 +732,21 @@ App.Desc.family = (function() {
if (nieces.length > 0) {
r.push(`<br>You have`);
if (nieces.length > 2) {
- r.push(`<span class="lightgreen">many nieces, ${slaveListToText(nieces)}, who are your slaves.</span>`);
+ r.push(familySpan(`many nieces, `, slaveListToText(nieces, allowLinks), `, who are your slaves.`));
} else if (nieces.length > 1) {
- r.push(`<span class="lightgreen">two nieces, ${slaveListToText(nieces)}, who are your slaves.</span>`);
+ r.push(familySpan(`two nieces, `, slaveListToText(nieces, allowLinks), `, who are your slaves.`));
} else {
- r.push(`<span class="lightgreen">a niece, ${slaveListToText(nieces)}, who is your slave.</span>`);
+ r.push(familySpan(`a niece, `, slaveListToText(nieces, allowLinks), `, who is your slave.`));
}
}
if (nephews.length > 0) {
r.push(`<br>You have`);
if (nephews.length > 2) {
- r.push(`<span class="lightgreen">many nephews, ${slaveListToText(nephews)}, who are your slaves.</span>`);
+ r.push(familySpan(`many nephews, `, slaveListToText(nephews, allowLinks), `, who are your slaves.`));
} else if (nephews.length > 1) {
- r.push(`<span class="lightgreen">two nephews, ${slaveListToText(nephews)}, who are your slaves.</span>`);
+ r.push(familySpan(`two nephews, `, slaveListToText(nephews, allowLinks), `, who are your slaves.`));
} else {
- r.push(`<span class="lightgreen">a nephew, ${slaveListToText(nephews)}, who is your slave.</span>`);
+ r.push(familySpan(`a nephew, `, slaveListToText(nephews, allowLinks), `, who is your slave.`));
}
}
}
@@ -664,31 +754,31 @@ App.Desc.family = (function() {
/* Player is sole parent */
let children = V.slaves.filter((s) => s.father === V.PC.ID && s.mother === V.PC.ID);
if (children.length > 0) {
- r.push(`<br>You are the sole parent of ${num(children.length)} of your slaves, <span class="lightgreen">${slaveListToText(children)}.</span>`);
+ r.push(`<br>You are the sole parent of ${num(children.length)} of your slaves, `, familySpan(slaveListToText(children, allowLinks), `.`));
}
const isSoleParent = children.length > 0;
/* Player is Father, lists children you fathered */
children = V.slaves.filter((s) => s.father === V.PC.ID && s.mother !== V.PC.ID);
if (children.length > 0) {
- r.push(`<br>You fathered ${num(children.length)} of your slaves${isSoleParent ? " with other mothers" : ''}, <span class="lightgreen">${slaveListToText(children)}.</span>`);
+ r.push(`<br>You fathered ${num(children.length)} of your slaves${isSoleParent ? " with other mothers" : ''}, `, familySpan(slaveListToText(children, allowLinks), `.`));
}
/* Player is Mother, lists birthed children */
children = V.slaves.filter((s) => s.mother === V.PC.ID && s.father !== V.PC.ID);
if (children.length > 0) {
- r.push(`<br>You gave birth to ${num(children.length)} of your slaves${isSoleParent ? " who had other fathers" : ''}, <span class="lightgreen">${slaveListToText(children)}.</span>`);
+ r.push(`<br>You gave birth to ${num(children.length)} of your slaves${isSoleParent ? " who had other fathers" : ''}, `, familySpan(slaveListToText(children, allowLinks), `.`));
}
/* Player is grandparent */
if (V.showDistantRelatives) {
children = V.slaves.filter((s) => isGrandparentP(s, V.PC));
if (children.length > 0) {
- r.push(`<br>You have ${num(children.length)} grandchildren as your slaves, <span class="lightgreen">${slaveListToText(children)}.</span>`);
+ r.push(`<br>You have ${num(children.length)} grandchildren as your slaves, `, familySpan(slaveListToText(children, allowLinks), `.`));
}
}
- if (V.cheatMode) {
+ if (V.debugMode) {
r.push(`<br>You have ${numberWithPlural(V.PC.sisters, "sister")} and ${numberWithPlural(V.PC.daughters, "daughter")}.`);
}
@@ -708,7 +798,7 @@ App.Desc.family = (function() {
r.push(`inbred, with a CoI of ${V.PC.inbreedingCoeff}.`);
}
- return r.join(" ");
+ return r;
}
return familySummary;
diff --git a/src/descriptions/officeDescription.js b/src/descriptions/officeDescription.js
index 29f72b3a6974c8d9bf0359c7ba3cd50bbde98257..8e5555860bb5ada1a69fe814146bc5f4498272e3 100644
--- a/src/descriptions/officeDescription.js
+++ b/src/descriptions/officeDescription.js
@@ -260,11 +260,9 @@ App.Desc.officeDescription = function(lastElement) {
break;
case "shemale":
r.push(`a pinup of ${himselfA} to its plating: ${heA}'s depicted straddling a battle rifle so closely that it looks like ${heA}'s intimately entangled in the action.`);
-
break;
case "amazon":
r.push(`a pinup of ${himselfA} to its plating: ${heA}'s depicted in a classic nude bodybuilder's pose, but with a cutely coquettish expression.`);
-
break;
case "businesswoman":
r.push(`a pinup of ${himselfA} to its plating: ${heA}'s depicted wearing underwear, for once, and looking very severe as ${heA} straddles a cruise missile in a classic bombshell pose.`);
@@ -372,7 +370,7 @@ App.Desc.officeDescription = function(lastElement) {
r.push(`${heA}'s depicted striking a pose with one arm supporting ${hisA} enormous implants.`);
break;
case "pastoralist":
- r.push(`${heA}'s depicted striking a sexy pose, hands trying to relieve the pressure of ${hisA} quartet of milk filled breasts.`);
+ r.push(`${heA}'s depicted striking a sexy pose, hands trying to relieve the pressure of ${hisA} quartet of milk-filled breasts.`);
break;
case "maturity preferentialist":
r.push(`${heA}'s depicted in a pose not unlike something you'd see on a 60's pinup calendar`);
@@ -466,165 +464,178 @@ App.Desc.officeDescription = function(lastElement) {
function printTrinkets() {
const frag = new DocumentFragment();
- /** @type {Array<HTMLElement>} */
- let trinketElements = [];
- let plurals = false;
+ frag.append(
+ `There's a display case behind your desk, with `,
+ App.UI.DOM.linkReplace(`${num(V.trinkets.size)} items`, trinkets()),
+ ` in it.`,
+ );
- for (const [trinketDesc, value] of V.trinkets) {
- if ((typeof value === "number" && value === 1) || (Array.isArray(value) && value.length === 0)) {
- trinketElements.push(App.UI.DOM.makeElement("li", capFirstChar(trinketDesc)));
- } else {
- trinketElements.push(trinketPluralReplacer(trinketDesc, value));
- plurals = true;
+ return frag;
+
+ function trinkets() {
+ const frag = new DocumentFragment();
+
+ /** @type {Array<string|HTMLElement>} */
+ let trinketElements = [];
+ let plurals = false;
+
+ for (const [trinketDesc, value] of V.trinkets) {
+ if ((typeof value === "number" && value === 1) || (Array.isArray(value) && value.length === 0)) {
+ trinketElements.push(capFirstChar(trinketDesc));
+ } else {
+ trinketElements.push(trinketPluralReplacer(trinketDesc, value));
+ plurals = true;
+ }
}
- }
- trinketElements.sort((a, b) => a > b ? 1 : -1);
+ trinketElements.sort((a, b) => a > b ? 1 : -1);
- // depending on length of trinketString, add necessary conjunctions
- frag.append(`There's a display case behind your desk, with `);
- if (trinketElements.length === 1) {
- if (V.trinkets.size === 1) {
- frag.append(`a single item:`);
- } else {
- frag.append(`:`);
+ if (trinketElements.length === 1) {
+ if (V.trinkets.size === 1) {
+ frag.append(`a single item:`);
+ } else {
+ frag.append(`:`);
+ }
+ } else if (trinketElements.length === 2 && plurals === false) {
+ frag.append(`a couple of items:`);
}
- } else if (trinketElements.length === 2 && plurals === false) {
- frag.append(`a couple of items:`);
+ const list = App.UI.DOM.appendNewElement("ul", frag);
+
+ list.style.textIndent = "0";
+ trinketElements.forEach(ts => App.UI.DOM.appendNewElement("li", list, ts));
+
+ return frag;
}
- const list = App.UI.DOM.appendNewElement("ul", frag);
- list.style.textIndent = "0";
- trinketElements.forEach(ts => App.UI.DOM.appendNewElement("li", list, ts));
- return frag;
}
/**
*
* @param {string} desc
- * @param {Array} array
+ * @param {number|FC.TrinketData[]} value
* @returns {HTMLElement}
*/
- function trinketPluralReplacer(desc, array) {
- const his = (array && array[0] && array[0].id && getSlave(array[0].id) ? getPronouns(getSlave(array[0].id)).possessive : "their");
- const he = (array && array[0] && array[0].id && getSlave(array[0].id) ? getPronouns(getSlave(array[0].id)).pronoun : "they");
+ function trinketPluralReplacer(desc, value) {
+ const isArray = Array.isArray(value) && value.length > 0;
+ const his = (isArray && value[0].id && getSlave(value[0].id) ? getPronouns(getSlave(value[0].id)).possessive : "their");
+ const he = (isArray && value[0].id && getSlave(value[0].id) ? getPronouns(getSlave(value[0].id)).pronoun : "they");
switch (desc) {
case "best in show balls":
- if (array.length > 0) {
+ if (isArray) {
const el = document.createElement("span");
- if (array.length === 1) {
- App.Events.addNode(el, [`A best in show ribbon awarded to`, slaveSentence(array), `for ${his} balls`]);
+ if (value.length === 1) {
+ App.Events.addNode(el, [`A best in show ribbon awarded to`, slaveSentence(value), `for ${his} balls`]);
} else {
- App.Events.addNode(el, [`Best in show ribbons awarded to`, slaveSentence(array), `for their balls`]);
+ App.Events.addNode(el, [`Best in show ribbons awarded to`, slaveSentence(value), `for their balls`]);
}
return el;
} else {
return null;
}
case "best in show milk cow":
- if (array.length > 0) {
+ if (isArray) {
const el = document.createElement("span");
- if (array.length === 1) {
- App.Events.addNode(el, [`A best in show ribbon awarded to`, slaveSentence(array), `as a milk cow`]);
+ if (value.length === 1) {
+ App.Events.addNode(el, [`A best in show ribbon awarded to`, slaveSentence(value), `as a milk cow`]);
} else {
- App.Events.addNode(el, [`Best in show ribbons awarded to`, slaveSentence(array), `as milk cows`]);
+ App.Events.addNode(el, [`Best in show ribbons awarded to`, slaveSentence(value), `as milk cows`]);
}
return el;
} else {
return null;
}
case "best in show breeder":
- if (array.length > 0) {
+ if (isArray) {
const el = document.createElement("span");
- if (array.length === 1) {
- App.Events.addNode(el, [`A best in show ribbon awarded to`, slaveSentence(array), `as a breeder`]);
+ if (value.length === 1) {
+ App.Events.addNode(el, [`A best in show ribbon awarded to`, slaveSentence(value), `as a breeder`]);
} else {
- App.Events.addNode(el, [`Best in show ribbons awarded to`, slaveSentence(array), `as breeders`]);
+ App.Events.addNode(el, [`Best in show ribbons awarded to`, slaveSentence(value), `as breeders`]);
}
return el;
} else {
return null;
}
case "famous courtesan":
- if (array.length > 0) {
+ if (isArray) {
const el = document.createElement("span");
- if (array.length === 1) {
- App.Events.addNode(el, [`A framed article written about`, slaveSentence(array), `when ${he} debuted as a famous courtesan`]);
+ if (value.length === 1) {
+ App.Events.addNode(el, [`A framed article written about`, slaveSentence(value), `when ${he} debuted as a famous courtesan`]);
} else {
- App.Events.addNode(el, [`Framed articles written about`, slaveSentence(array), `when they debuted as famous courtesans`]);
+ App.Events.addNode(el, [`Framed articles written about`, slaveSentence(value), `when they debuted as famous courtesans`]);
}
return el;
} else {
return null;
}
case "famous whore":
- if (array.length > 0) {
+ if (isArray) {
const el = document.createElement("span");
- if (array.length === 1) {
- App.Events.addNode(el, [`A framed pornographic advertisement for`, slaveSentence(array), `from the week ${he} became a famous whore`]);
+ if (value.length === 1) {
+ App.Events.addNode(el, [`A framed pornographic advertisement for`, slaveSentence(value), `from the week ${he} became a famous whore`]);
} else {
- App.Events.addNode(el, [`Framed pornographic advertisements from`, slaveSentence(array), `from the weeks they became famous whores`]);
+ App.Events.addNode(el, [`Framed pornographic advertisements from`, slaveSentence(value), `from the weeks they became famous whores`]);
}
return el;
} else {
return null;
}
case "catgirl icon":
- if (array.length > 0) {
+ if (isArray) {
const el = document.createElement("span");
- if (array.length === 1) {
- App.Events.addNode(el, [`A gorgeous quasi-religious icon made by`, slaveSentence(array), `showing you creating the catgirl race`]);
+ if (value.length === 1) {
+ App.Events.addNode(el, [`A gorgeous quasi-religious icon made by`, slaveSentence(value), `showing you creating the catgirl race`]);
} else {
- App.Events.addNode(el, [`Gorgeous quasi-religious icons made by`, slaveSentence(array), `showing you creating the catgirl race`]);
+ App.Events.addNode(el, [`Gorgeous quasi-religious icons made by`, slaveSentence(value), `showing you creating the catgirl race`]);
}
return el;
} else {
return null;
}
case "cat clay sculpture":
- if (array.length > 0) {
+ if (isArray) {
const el = document.createElement("span");
- if (array.length === 1) {
- App.Events.addNode(el, [`A small, elegant clay sculpture made by`, slaveSentence(array), `showing you surrounded by happy catgirl slaves`]);
+ if (value.length === 1) {
+ App.Events.addNode(el, [`A small, elegant clay sculpture made by`, slaveSentence(value), `showing you surrounded by happy catgirl slaves`]);
} else {
- App.Events.addNode(el, [`Small, elegant clay sculptures made by`, slaveSentence(array), `showing you surrounded by happy catgirl slaves`]);
+ App.Events.addNode(el, [`Small, elegant clay sculptures made by`, slaveSentence(value), `showing you surrounded by happy catgirl slaves`]);
}
return el;
} else {
return null;
}
case "cat drawing":
- if (array.length > 0) {
+ if (isArray) {
const el = document.createElement("span");
- if (array.length === 1) {
- App.Events.addNode(el, [`A pretty drawing of you and`, slaveSentence(array), `cuddling together peacefully`]);
+ if (value.length === 1) {
+ App.Events.addNode(el, [`A pretty drawing of you and`, slaveSentence(value), `cuddling together peacefully`]);
} else {
- App.Events.addNode(el, [`Pretty drawings of you and`, slaveSentence(array), `cuddling together peacefully`]);
+ App.Events.addNode(el, [`Pretty drawings of you and`, slaveSentence(value), `cuddling together peacefully`]);
}
return el;
} else {
return null;
}
case "cat crayon":
- if (array.length > 0) {
+ if (isArray) {
const el = document.createElement("span");
- if (array.length === 1) {
- App.Events.addNode(el, [`A red construction paper heart with crude crayon figures of you and`, slaveSentence(array), `holding hands above text reading "I LUV U ${V.PC.title !== 0 ? `MASTER` : `MISTRESS`}"`]);
+ if (value.length === 1) {
+ App.Events.addNode(el, [`A red construction paper heart with crude crayon figures of you and`, slaveSentence(value), `holding hands above text reading "I LUV U ${V.PC.title !== 0 ? `MASTER` : `MISTRESS`}"`]);
} else {
- App.Events.addNode(el, [`Red construction paper hearts with crude crayon figures of you and`, slaveSentence(array), `holding hands above text reading "I LUV U ${V.PC.title !== 0 ? `MASTER` : `MISTRESS`}"`]);
+ App.Events.addNode(el, [`Red construction paper hearts with crude crayon figures of you and`, slaveSentence(value), `holding hands above text reading "I LUV U ${V.PC.title !== 0 ? `MASTER` : `MISTRESS`}"`]);
}
return el;
} else {
return null;
}
case "a cloth napkin":
- if (array.length > 0) {
+ if (isArray) {
const el = document.createElement("span");
- if (array.length === 1) {
- App.Events.addNode(el, [`A cloth napkin skillfully folded into the shape of`, array[0].napkinShape, `given to you by`, slaveSentence(array)]);
+ if (value.length === 1) {
+ App.Events.addNode(el, [`A cloth napkin skillfully folded into the shape of`, value[0].napkinShape, `given to you by`, slaveSentence(value)]);
} else {
const r = [];
- // Napkins are weird; we need to sort by two properties: napkinShape and the slave. First, set up a map of the types of napkins, and attach the appropriate slaves to them by array:
+ // Napkins are weird; we need to sort by two properties: napkinShape and the slave. First, set up a map of the types of napkins, and attach the appropriate slaves to them by value:
const napkinMap = new Map([]);
- for (const slave of array) {
+ for (const slave of value) {
if (!napkinMap.get(slave.napkinShape)) {
napkinMap.set(slave.napkinShape, []);
}
@@ -642,9 +653,13 @@ App.Desc.officeDescription = function(lastElement) {
return null;
}
case "a poster for the movie that was made about the love between one of your mercenaries and": {
- const el = document.createElement("span");
- el.append("A poster for the movie that was made about the love between one of your mercenaries and ", slaveSentence(array), ".");
- return el;
+ if (isArray) {
+ const el = document.createElement("span");
+ el.append("A poster for the movie that was made about the love between one of your mercenaries and ", slaveSentence(value), ".");
+ return el;
+ } else {
+ return null;
+ }
}
// should never have plurals
case "a collection of diplomas from expensive schools":
diff --git a/src/endWeek/economics/arcmgmt.js b/src/endWeek/economics/arcmgmt.js
index 2c97e12c5860fe9e821496ab20c8f5c4c73d0d93..a437b4ef058049ec2a33094b0d2ea2e629a6442b 100644
--- a/src/endWeek/economics/arcmgmt.js
+++ b/src/endWeek/economics/arcmgmt.js
@@ -3,9 +3,13 @@ App.EndWeek.arcManagement = function() {
const secExpImmigrationBonus = App.Mods.SecExp.propagandaEffects("immigration");
let r;
let enslaved;
- let rentMultiplier;
- let AWeekGrowth;
- let econMult;
+ let rentMultiplier = 1;
+ let AWeekGrowth = V.AGrowth;
+ // formula to calculate localEcon effect
+ let econMult = (1/(1 + 5 * Math.sqrt(Math.trunc(100000/50-1000)/8.5)/100));
+ if (V.localEcon >= 100) {
+ econMult = (1 + 1.15 * (Math.trunc(1000-100000/200)/8.5)/100);
+ }
if (V.useTabs === 0) {
App.UI.DOM.appendNewElement("h2", el, "Arcology Management");
@@ -29,16 +33,13 @@ App.EndWeek.arcManagement = function() {
}
}
- $(el).append(supplyPoliciesReport("lower"));
- $(el).append(supplyPoliciesReport("middle"));
- $(el).append(supplyPoliciesReport("upper"));
- $(el).append(supplyPoliciesReport("top"));
-
+ for (const societyClass of ["lower", "middle", "upper", "top"]) {
+ $(el).append(supplyPoliciesReport(societyClass));
+ }
/* New Population
Populations depend on the 'demand' for them. People flock to the Free City when there are jobs. Jobs for lower class people depend on prosperity and the need for labor from other classes. They compete with slaves for work.
More elite citizens require their own slaves and will cause the population of slaves to increase as they move in. FS and policies will impact how many slaves they desire and how productive they are. The PC's menials also compete for labor within the arcology. Slaves can now 'expire', speed depends on FS and policies. Default lifespan for menials is an average of ~4 years. */
- V.oldACitizens = V.ACitizens;
let FSScore = 0; /* FS progress for tourism */
let slaveDemandU = 1; /* Changes to upperClass slave demand */
let slaveDemandT = 1; /* Changes to topClass slave demand */
@@ -73,14 +74,6 @@ App.EndWeek.arcManagement = function() {
citizenToSlave();
V.GDP = Math.trunc(((V.NPCSlaves + V.menials) * 0.35 * slaveProductivity) + (V.lowerClass * 0.35) + (V.middleClass * 0.75) + (V.upperClass * 2) + (V.topClass * 10)) / 10;
-
- /* formula to calculate localEcon effect */
- if (V.localEcon >= 100) {
- econMult = (1 + 1.15 * (Math.trunc(1000-100000/200)/8.5)/100);
- } else {
- econMult = (1/(1 + 5 * Math.sqrt(Math.trunc(100000/50-1000)/8.5)/100));
- }
-
const frozen = isFrozen();
if (!frozen) {
@@ -242,7 +235,6 @@ App.EndWeek.arcManagement = function() {
App.Events.addParagraph(el, r);
r = [];
- rentMultiplier = 1;
if (V.arcologies[0].FSPaternalistLaw === 1) {
rentMultiplier *= 0.95;
r.push(`Tenants who can prove that they abstain from certain practices are given a reduction to their rent.`);
@@ -325,23 +317,17 @@ App.EndWeek.arcManagement = function() {
let fuckdollsEarnings = 0;
r.push(`You own`);
if (V.menials > 0) {
- if (V.menials > menialWorkAvailable) {
- menialEarnings += Math.max(menialWorkAvailable * 10, 0);
- r.push(`<span class="red">more menial slaves than there was work,</span> consider selling some.`);
- if (menialEarnings === 0) {
- r.push(`Actually, consider selling them all...demand for labor is so low that <span class="red">none of them made any money</span> this week.`);
+ const sweatshops = sweatshopCount();
+ const menialsInSweatshops = Math.min(sweatshops * 500, V.menials);
+ const menialsWorking = V.menials - menialsInSweatshops;
+ const menialWorkDone = Math.min(menialsWorking, menialWorkAvailable);
+ menialEarnings = menialsInSweatshops * 14 + menialWorkDone * 10;
+ if (menialsWorking > menialWorkAvailable) {
+ r.push(`<span class="red">more menial slaves than there was work;</span> consider selling some.`);
+ if (menialWorkAvailable === 0) {
+ r.push(`Actually, consider selling them all${sweatshops > 0 ? `, except for those working in the Sweatshops` : ``}...demand for labor is so low that <span class="red">none of them made any money</span> this week.`);
}
r.push(`<br>You own`);
- } else {
- menialEarnings = V.menials * 10;
- if (V.Sweatshops > 0) {
- if (V.Sweatshops * 500 <= V.menials) {
- menialEarnings += V.Sweatshops * 7000;
- menialEarnings += (V.menials - V.Sweatshops * 500) * 10;
- } else {
- menialEarnings += V.menials * 14;
- }
- }
}
if (V.illegalDeals.menialDrug === 1) {
menialEarnings = Math.trunc(menialEarnings * 1.5);
@@ -374,12 +360,10 @@ App.EndWeek.arcManagement = function() {
if (V.fuckdolls > 0) {
const arcadeFreeSpace = V.arcade - App.Entity.facilities.arcade.employeesIDs().size;
const fuckdollsArcade = arcadeFreeSpace > 0 ? Math.min(arcadeFreeSpace, V.fuckdolls) : 0;
- let arcadeUpgradeInjectors;
- if (V.arcadeUpgradeInjectors === 0) {
- arcadeUpgradeInjectors = 0;
- } else if (V.arcadeUpgradeInjectors === 1) {
+ let arcadeUpgradeInjectors = 0;
+ if (V.arcadeUpgradeInjectors === 1) {
arcadeUpgradeInjectors = 1;
- } else {
+ } else if (V.arcadeUpgradeInjectors > 1) {
arcadeUpgradeInjectors = 1.5;
}
fuckdollsEarnings = Math.trunc(((V.fuckdolls - fuckdollsArcade) * 140 + fuckdollsArcade * (175 + 35 * arcadeUpgradeInjectors)) * (V.arcadePrice - 0.5) / 10);
@@ -417,7 +401,6 @@ App.EndWeek.arcManagement = function() {
}
}
- AWeekGrowth = V.AGrowth;
if (AWeekGrowth + V.arcologies[0].prosperity > V.AProsperityCap) {
r.push(`<span class="yellow">${V.arcologies[0].name} is at its maximum prosperity, so rents will not increase until it is improved.</span>`);
} else if ((2 * AWeekGrowth) + V.arcologies[0].prosperity >= V.AProsperityCap) {
@@ -444,7 +427,7 @@ App.EndWeek.arcManagement = function() {
}
if (V.secExpEnabled > 0) {
if (V.SecExp.core.trade <= 20) {
- AWeekGrowth += 1;
+ AWeekGrowth++;
} else if (V.SecExp.core.trade <= 40) {
AWeekGrowth += 2;
} else if (V.SecExp.core.trade <= 60) {
@@ -1460,8 +1443,8 @@ App.EndWeek.arcManagement = function() {
}
}
if (weatherFreeze) {
- const warning = App.UI.DOM.combineNodes(`The terrible weather is `, App.UI.DOM.makeElement("span", `preventing people from entering or leaving`, "red"), ` your arcology. Improving your transport infrastructure will prevent this from happening.`);
- App.UI.DOM.appendNewElement("div", el, warning, "note");
+ const warning = App.UI.DOM.combineNodes(`The terrible weather is `, App.UI.DOM.makeElement("span", `preventing people from entering or leaving`, ["red"]), ` your arcology. Improving your transport infrastructure will prevent this from happening.`);
+ App.UI.DOM.appendNewElement("div", el, warning, ["note"]);
V.weatherAwareness = 1;
}
return weatherFreeze;
@@ -1769,7 +1752,7 @@ App.EndWeek.arcManagement = function() {
if (V.eliteFailTimer > 0) {
/* when you fail the eugenics Elite and they leave this triggers*/
TCD -= Math.trunc(V.eliteFail / 15 * V.eliteFailTimer);
- V.eliteFailTimer -= 1;
+ V.eliteFailTimer--;
}
if (V.classSatisfied.topClass !== 0) {
TCD *= 1 + V.classSatisfied.topClass * 0.06;
@@ -1869,7 +1852,7 @@ App.EndWeek.arcManagement = function() {
V.lowerClass -= deathsLC;
V.middleClass -= deathsMC;
V.upperClass -= deathsUC;
- V.lowerClass -= deathsTC;
+ V.topClass -= deathsTC;
if (deathsLC > 0) {
z.push(numberWithPluralOne(deathsLC, "lower class citizen"));
}
@@ -1883,7 +1866,7 @@ App.EndWeek.arcManagement = function() {
z.push(numberWithPluralOne(deathsTC, "millionaire"));
}
if (deathsLC > 0 || deathsMC > 0 || deathsUC > 0 || deathsTC > 0) {
- r.push(App.UI.DOM.makeElement("span", `${capFirstChar(toSentence(z))} passed away due to natural causes.`, "red"));
+ r.push(App.UI.DOM.makeElement("span", `${capFirstChar(toSentence(z))} passed away due to natural causes.`, ["red"]));
}
/* Slave expiration*/
@@ -1921,22 +1904,22 @@ App.EndWeek.arcManagement = function() {
.forEach(cell => {
if (cell instanceof App.Arcology.Cell.Apartment) {
if (cell.type === 3) {
- count += 1;
+ count++;
lowerClass += 40;
}
}
});
if (count > 9) {
- r.push(App.UI.DOM.makeElement("span", `A great amount of lower class citizens`, "green"));
+ r.push(App.UI.DOM.makeElement("span", `A great amount of lower class citizens`, ["green"]));
r.push(`were attracted by the sectors filled with dense apartments.`);
} else if (count > 5) {
- r.push(App.UI.DOM.makeElement("span", `A large amount of lower class citizens`, "green"));
+ r.push(App.UI.DOM.makeElement("span", `A large amount of lower class citizens`, ["green"]));
r.push(`were attracted by your sprawling blocks of dense apartments.`);
} else if (count > 2) {
- r.push(App.UI.DOM.makeElement("span", `A moderate amount of lower class citizens`, "green"));
+ r.push(App.UI.DOM.makeElement("span", `A moderate amount of lower class citizens`, ["green"]));
r.push(`were attracted by your dense apartment complexes`);
} else if (count > 0) {
- r.push(App.UI.DOM.makeElement("span", `A small amount of lower class citizens`, "green"));
+ r.push(App.UI.DOM.makeElement("span", `A small amount of lower class citizens`, ["green"]));
r.push(`were attracted by your dense apartments.`);
}
return r;
diff --git a/src/endWeek/economics/corporationDevelopments.js b/src/endWeek/economics/corporationDevelopments.js
index 6838a3b77c91b83dde123b062eb9b3a422d52bf2..353d160da707a9aa73333220c0fc84f011f039ee 100644
--- a/src/endWeek/economics/corporationDevelopments.js
+++ b/src/endWeek/economics/corporationDevelopments.js
@@ -3,8 +3,8 @@ App.EndWeek.corporationDevelopments = function() {
let r;
/* Main Corporation Pass*/
- if (App.Corporate.cash < 0) {
- App.Corporate.cash = Math.trunc(App.Corporate.cash * 1.02); /* 2% weekly interest rate on negative cash*/
+ if (App.Corporate.getStored("Cash") < 0) {
+ App.Corporate.setStored("Cash", Math.trunc(Math.trunc(App.Corporate.getStored("Cash") * 1.02))) /* 2% weekly interest rate on negative cash*/
}
App.UI.DOM.appendNewElement("h1", el, "Corporation Management");
App.UI.DOM.appendNewElement("h2", el, "Operational Results");
@@ -75,22 +75,22 @@ App.EndWeek.corporationDevelopments = function() {
/* Calculating cash set aside for dividend*/
App.UI.DOM.appendNewElement("h2", el, "Dividend");
r = [];
- if (App.Corporate.dividendRatio > 0) {
- r.push(`The corporation is currently reserving ${Math.floor(App.Corporate.dividendRatio * 100)}% of its profit to be paid out as dividends.`);
+ if (V.dividendRatio > 0) {
+ r.push(`The corporation is currently reserving ${Math.floor(V.dividendRatio * 100)}% of its profit to be paid out as dividends.`);
} else {
r.push(`The corporation is currently not reserving a portion of its profit to be paid out as dividends.`);
}
- if (App.Corporate.payoutCash) {
+ if (App.Corporate.getStored("CashDividend") === 1) {
r.push(`It is putting aside unused cash reserves to be paid out as dividends.`);
}
App.Events.addNode(el, r, "div");
- if (App.Corporate.dividend > 0) {
+ if (App.Corporate.getStored("Dividend") > 0) {
r = [];
if (weekLedger.hasDividend) {
r.push(`It reserved ${cashFormatColor(weekLedger.dividend)} this week.`);
}
- r.push(`A total of ${cashFormatColor(App.Corporate.dividend)} has been put aside for its shareholders.`);
+ r.push(`A total of ${cashFormatColor(App.Corporate.getStored("Dividend"))} has been put aside for its shareholders.`);
App.Events.addNode(el, r, "div");
}
@@ -99,7 +99,7 @@ App.EndWeek.corporationDevelopments = function() {
}
/* Bankrupted the Corporation*/
- if (App.Corporate.value < 0) {
+ if (App.Corporate.calculateValue() < 0) {
App.Corporate.dissolve();
App.UI.DOM.appendNewElement("div", el, "Your corporation went bankrupt.", "red");
}
diff --git a/src/endWeek/economics/economics.js b/src/endWeek/economics/economics.js
index 4ca4911742d07b70f4badc17c4dcf892d238fa85..081ea69ecc1e1509c7fff289323b557b9fc69bce 100644
--- a/src/endWeek/economics/economics.js
+++ b/src/endWeek/economics/economics.js
@@ -11,6 +11,7 @@ App.EndWeek.economics = function() {
V.mods.food.warned = false;
}
+ const oldACitizens = V.ACitizens;
SectorCounts();
App.Arcology.updateOwnership();
@@ -53,7 +54,7 @@ App.EndWeek.economics = function() {
["securityReport", {
name: "Security",
get requirements() { return V.secExpEnabled > 0; },
- get report() { return App.Mods.SecExp.securityReport(); }
+ get report() { return App.Mods.SecExp.securityReport(oldACitizens); }
}],
["reputation", {
name: "Reputation",
diff --git a/src/endWeek/economics/neighborsDevelopment.js b/src/endWeek/economics/neighborsDevelopment.js
index 2c319e1c4385c5690463d9fbf8b3e13fd9c81671..3e97621a7646f96a23bfe81c5ea222d098c84c15 100644
--- a/src/endWeek/economics/neighborsDevelopment.js
+++ b/src/endWeek/economics/neighborsDevelopment.js
@@ -5,7 +5,7 @@ App.EndWeek.neighborsDevelopment = function() {
const el = document.createElement("p");
const averageProsperity = _.mean(V.arcologies.map(a => a.prosperity));
- const corpBonus = V.corp.Incorporated ? Math.trunc(1000 * Math.pow(App.Corporate.value, 0.1)) : 0;
+ const corpBonus = V.corp.Incorporated ? Math.trunc(1000 * Math.pow(App.Corporate.calculateValue(), 0.1)) : 0;
let agentBonusValue = 0;
if (V.useTabs === 0) {
@@ -320,7 +320,7 @@ App.EndWeek.neighborsDevelopment = function() {
const weekModifier = Math.max(1, (100 - (V.week * 2)));
arc.prosperity -= V.arcologies[0].CyberEconomic * 2;
const warSpoils = Math.ceil(10 + Math.max(((100 / weekModifier) * arc.prosperity * V.arcologies[0].CyberEconomic), 0));
- arc.prosperity = Math.clamp(arc.prosperity, 1, V.AProsperityCap);
+ arc.prosperity = Math.clamp(arc.prosperity, 1, 300);
let redHanded = 0;
if (random(0, 100) >= catchChance - (10 * V.arcologies[0].CyberEconomic)) {
V.arcologies[0].prosperity -= V.arcologies[0].CyberEconomic * 3;
@@ -377,7 +377,7 @@ App.EndWeek.neighborsDevelopment = function() {
App.Mods.SecExp.authorityX(random(-100, -500) * V.arcologies[0].CyberReputation);
V.SecExp.core.crimeLow = Math.clamp(V.SecExp.core.crimeLow + random(10, 25), 0, 100);
}
- V.arcologies[0].prosperity = Math.clamp(V.arcologies[0].prosperity, 1, 300);
+ V.arcologies[0].prosperity = Math.clamp(V.arcologies[0].prosperity, 1, V.AProsperityCap);
}
r.push(`You target ${arc.name}'s leadership for <span class="yellow">character assassination</span> in an attempt to destabilize the arcology.`);
if (redHanded === 1) {
@@ -1435,10 +1435,8 @@ App.EndWeek.neighborsDevelopment = function() {
let attacking = [];
const dipFSes = FutureSocieties.diplomaticFSes(arc, arc2);
for (const sharedFS of dipFSes.shared) {
- if (arc2[sharedFS] > 60) {
- if (sharedFS === "FSNull") {
- continue; // Multiculturalism is not affected by influence.
- }
+ // Multiculturalism is not affected by influence.
+ if (sharedFS !== "FSNull" && arc2[sharedFS] > 60) {
arc[sharedFS] += Math.trunc((arc2[sharedFS] - 60) / 4) + appliedInfluenceBonus;
if (arc[sharedFS] > V.FSLockinLevel) {
alignment += 1;
@@ -1453,10 +1451,8 @@ App.EndWeek.neighborsDevelopment = function() {
}
}
for (const [arcFS, arc2FS] of dipFSes.conflicting) {
- if (arc2[arc2FS] > 60) {
- if (arcFS === "FSNull") {
- continue; // Multiculturalism is not affected by influence.
- }
+ // Multiculturalism is not affected by influence.
+ if (arcFS !== "FSNull" && arc2[arc2FS] > 60) {
arc[arcFS] -= Math.trunc((arc2[arc2FS] - 60) / 4) + appliedInfluenceBonus;
if (arcFS === "FSSubjugationist" && arc2FS === "FSSupremacist") {
attacking.push("opposing Subjugationism");
@@ -1969,626 +1965,628 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.government === "your agent") {
const leader = App.currentAgent(i);
const {he, his, himself, woman, him, hers} = getPronouns(leader);
+ /** @type {Array<{fs: FC.FutureSociety, msg: string}>} */
+ const candidates = [];
- if (validFSes.includes("FSRepopulationFocus") && leader.fetish === "pregnancy" && V.seePreg === 1) {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Repopulationism,</span> since as a pregnancy fetishist, ${he} can't wait to see the female population's bellies swell with life.`);
- arc.FSRepopulationFocus = 5;
- return;
- } else if (validFSes.includes("FSRestart") && (leader.preg < -1 || (leader.ovaries === 0 && leader.mpreg !== 1)) && leader.genes === "XX") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Eugenics,</span> since if no-one can get pregnant, ${he} won't be alone.`);
- arc.FSRestart = 5;
- return;
- }
- if (validFSes.includes("FSGenderRadicalist") && leader.dick > 0) {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Gender Radicalism,</span> since ${he}'s a walking, swinging argument for dickgirls.`);
- arc.FSGenderRadicalist = 5;
- return;
- } else if (validFSes.includes("FSGenderFundamentalist") && (leader.pregKnown === 1 || leader.bellyPreg > 1500)) {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Gender Fundamentalism,</span> since its citizens find leadership by a pregnant ${woman} fascinating.`);
- arc.FSGenderFundamentalist = 5;
- return;
- }
- if (validFSes.includes("FSPaternalist") && leader.behavioralQuirk === "advocate") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Paternalism,</span> since as an advocate for slavery, ${he} believes in its benefits.`);
- arc.FSPaternalist = 5;
- return;
- } else if (validFSes.includes("FSDegradationist") && leader.fetish === "sadist") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Degradationism,</span> since as a sexual sadist, ${he}'s excited by the idea of leading a society that applauds ${his} cruelest impulses.`);
- arc.FSDegradationist = 5;
- return;
+ if (leader.fetish === "pregnancy" && V.seePreg === 1) {
+ candidates.push({fs: "FSRepopulationFocus", msg: `since as a pregnancy fetishist, ${he} can't wait to see the female population's bellies swell with life.`});
}
- if (validFSes.includes("FSSlaveProfessionalism") && (leader.intelligence + leader.intelligenceImplant >= 120) && (leader.skill.vaginal + leader.skill.oral + leader.skill.anal + leader.skill.whoring + leader.skill.entertainment >= 400)) {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Slave Professionalism,</span> since ${he} wishes to produce slaves you can be proud of.`);
- arc.FSSlaveProfessionalism = 5;
- return;
- } else if (validFSes.includes("FSIntellectualDependency") && (leader.intelligence + leader.intelligenceImplant >= 120) && (leader.behavioralFlaw === "arrogant" || leader.behavioralQuirk === "insecure")) {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Intellectual Dependency,</span>`);
- if (leader.behavioralQuirk === "insecure") {
- r.push(`since, due to ${his} own insecurities, needs to be frequently reassured that ${he} is smarter than the masses.`);
- } else {
- r.push(`since ${he} absolutely needs to feel intellectually superior to ${his} chattel.`);
- }
- arc.FSIntellectualDependency = 5;
- return;
- }
- if (validFSes.includes("FSBodyPurist") && leader.chem > 50) {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Body Purism,</span> since ${he} knows what long term drug damage feels like, and doesn't want any slave to ever experience it again.`);
- arc.FSBodyPurist = 5;
- return;
- } else if (validFSes.includes("FSTransformationFetishist") && leader.boobsImplant > 1000) {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Transformation Fetishism,</span> out of a perverse desire to subject all slaves to massive implants like ${hers}.`);
- arc.FSTransformationFetishist = 5;
- return;
- }
- if (validFSes.includes("FSYouthPreferentialist") && leader.actualAge <= 25) {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Youth Preferentialism,</span> to buttress acceptance of ${his} own young age.`);
- arc.FSYouthPreferentialist = 5;
- return;
- } else if (validFSes.includes("FSMaturityPreferentialist") && leader.actualAge > 35) {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Maturity Preferentialism,</span> since ${he} has a certain personal interest in promoting the idea that MILFs are sexy.`);
- arc.FSMaturityPreferentialist = 5;
- return;
+ if ((leader.preg < -1 || (leader.ovaries === 0 && leader.mpreg !== 1)) && leader.genes === "XX") {
+ candidates.push({fs: "FSRestart", msg: `since if no-one can get pregnant, ${he} won't be alone.`});
}
- if (validFSes.includes("FSSlimnessEnthusiast") && leader.behavioralQuirk === "insecure") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Slimness Enthusiasm,</span> since ${his} history of anorexia has deeply impacted ${his} idea of beauty.`);
- arc.FSSlimnessEnthusiast = 5;
- return;
- } else if (validFSes.includes("FSAssetExpansionist") && leader.fetish === "boobs") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Asset Expansionism,</span> since ${he}'s a breast expansion fetishist in addition to being a mere breast fetishist.`);
- arc.FSAssetExpansionist = 5;
- return;
- } else if (validFSes.includes("FSAssetExpansionist") && leader.sexualQuirk === "size queen" && leader.vagina > 3) {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Asset Expansionism,</span> since ${he}'s a stickler for big dicks and seeks to find one large enough to push ${him} to ${his} very limit.`);
- arc.FSAssetExpansionist = 5;
- return;
+ if (leader.dick > 0) {
+ candidates.push({fs: "FSGenderRadicalist", msg: `since ${he}'s a walking, swinging argument for dickgirls.`});
}
- if (validFSes.includes("FSCummunism") && leader.fetish === "cumslut") { // this will become the cum focused condition, being replaced with breast focus for milk
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Cummunism,</span> since ${he} already loves sucking down huge loads of cum.`);
- arc.FSCummunism = 5;
- return;
- } else if (validFSes.includes("FSPastoralist") && leader.fetish === "boobs") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Pastoralism,</span> since ${he} loves boobs and adores suckling them.`);
- arc.FSPastoralist = 5;
- return;
+ if (leader.pregKnown === 1 || leader.bellyPreg > 1500) {
+ candidates.push({fs: "FSGenderFundamentalist", msg: `since its citizens find leadership by a pregnant ${woman} fascinating.`});
}
- if (validFSes.includes("FSHedonisticDecadence") && leader.behavioralFlaw === "gluttonous") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Decadent Hedonism,</span> since ${he} already loves over-eating.`);
- arc.FSHedonisticDecadence = 5;
- return;
- } else if (validFSes.includes("FSPhysicalIdealist") && leader.behavioralQuirk === "fitness") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Physical Idealism,</span> since ${he}'s a fitness fanatic ${himself}.`);
- arc.FSPhysicalIdealist = 5;
- return;
- } else if (validFSes.includes("FSHedonisticDecadence") && leader.fetish !== "none" && leader.fetishStrength >= 100) {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Decadent Hedonism,</span> since ${he} seeks to satisfy ${his} powerful fetish.`);
- arc.FSHedonisticDecadence = 5;
- return;
+ if (leader.behavioralQuirk === "advocate") {
+ candidates.push({fs: "FSPaternalist", msg: `since as an advocate for slavery, ${he} believes in its benefits.`});
}
- if (validFSes.includes("FSStatuesqueGlorification") && leader.height >= 200) {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Statuesque Glorification,</span> since ${he} is tired of being one of the tallest in arcology.`);
- arc.FSStatuesqueGlorification = 5;
- return;
- } else if (validFSes.includes("FSPetiteAdmiration") && leader.height >= 170 && leader.fetish === "dom") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Petite Admiration,</span> since it is far easier to dominate someone much smaller than oneself.`);
- arc.FSPetiteAdmiration = 5;
- return;
+ if (leader.fetish === "sadist") {
+ candidates.push({fs: "FSDegradationist", msg: `since as a sexual sadist, ${he}'s excited by the idea of leading a society that applauds ${his} cruelest impulses.`});
}
- if (validFSes.includes("FSIncestFetishist")) {
- const lover = V.slaves.find(s => (s.ID === leader.relationshipTarget && areRelated(s, leader) && s.assignment === Job.AGENTPARTNER));
- if ((leader.behavioralQuirk === "sinful" || leader.sexualQuirk === "perverted") && lover && V.seeIncest === 1) {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Incest Festishism,</span> to share the love and joy ${he} holds with ${his} ${relativeTerm(leader, lover)}.`);
- arc.FSIncestFetishist = 5;
- return;
+ if (leader.intelligence + leader.intelligenceImplant >= 120) {
+ if (leader.skill.vaginal + leader.skill.oral + leader.skill.anal + leader.skill.whoring + leader.skill.entertainment >= 400) {
+ candidates.push({fs: "FSSlaveProfessionalism", msg: `since ${he} wishes to produce slaves you can be proud of.`});
}
- }
- if (validFSes.includes("FSChattelReligionist") && leader.behavioralFlaw === "devout") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Chattel Religionism,</span> to share and spread ${his} deeply held beliefs about the holiness of sexual service.`);
- arc.FSChattelReligionist = 5;
- return;
- } else if (validFSes.includes("FSChattelReligionist") && leader.behavioralQuirk === "sinful") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Chattel Religionism,</span> since ${he}'s excited by the prospect of getting away with horrible sins against old religions in public.`);
- arc.FSChattelReligionist = 5;
- return;
- }
- if (validFSes.includes("FSEgyptianRevivalist") && leader.relationshipTarget !== 0) {
- const lover = getSlave(leader.relationshipTarget);
- if (lover && areRelated(leader, lover)) {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Egyptian Revivalism,</span> since ${he}'s already part of a gloriously incestuous relationship.`);
- arc.FSEgyptianRevivalist = 5;
- return;
+ if (leader.behavioralFlaw === "arrogant") {
+ candidates.push({fs: "FSIntellectualDependency", msg: `since, due to ${his} own insecurities, needs to be frequently reassured that ${he} is smarter than the masses.`});
}
- } else if (validFSes.includes("FSChineseRevivalist") && leader.nationality === "Chinese") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Chinese Revivalism,</span> since ${he}'s Chinese ${himself} and can claim high honor in such a society.`);
- arc.FSChineseRevivalist = 5;
- return;
- } else if (validFSes.includes("FSEdoRevivalist") && leader.nationality === "Japanese") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Edo Revivalism,</span> since ${he}'s Japanese ${himself} and can claim high honor in such a society.`);
- arc.FSEdoRevivalist = 5;
- return;
- } else if (validFSes.includes("FSAztecRevivalist") && leader.nationality === "Mexican") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Aztec Revivalism,</span> since ${he}'s Mexican ${himself} and can claim high honor in such a society.`);
- arc.FSAztecRevivalist = 5;
- return;
- } else if (validFSes.includes("FSNeoImperialist") && leader.nationality === "German") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Neo-Imperialism,</span> since ${he}'s German ${himself} and can easily cement ${his} rule with Imperial directives in your name.`);
- arc.FSNeoImperialist = 5;
- return;
- } else if (validFSes.includes("FSNeoImperialist") && leader.nationality === "French") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Neo-Imperialism,</span> since ${he}'s French ${himself} and can easily cement ${his} rule with Imperial directives in your name.`);
- arc.FSNeoImperialist = 5;
- return;
- } else if (validFSes.includes("FSNeoImperialist") && leader.nationality === "Spanish") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Neo-Imperialism,</span> since ${he}'s Spanish ${himself} and can easily cement ${his} rule with Imperial directives in your name.`);
- arc.FSNeoImperialist = 5;
- return;
- } else if (validFSes.includes("FSNeoImperialist") && leader.nationality === "English") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Neo-Imperialism,</span> since ${he}'s English ${himself} and can easily cement ${his} rule with Imperial directives in your name.`);
- arc.FSNeoImperialist = 5;
- return;
- } else if (validFSes.includes("FSRomanRevivalist") && leader.behavioralQuirk === "confident") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Roman Revivalism,</span> since it appeals to ${his} confident, patrician nature.`);
- arc.FSRomanRevivalist = 5;
- return;
- } else if (validFSes.includes("FSArabianRevivalist") && leader.fetish === "dom") {
- r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt Arabian Revivalism,</span> since ${he}'s sexually dominant and quite likes the idea of overseeing slave bazaars.`);
- arc.FSArabianRevivalist = 5;
- return;
- }
- }
-
- /* CROSS-FS ADOPTION*/
- if (arc.FSSubjugationist > random(50, 200)) {
- if (validFSes.includes("FSDegradationist")) {
- r.push(`The arcology's racial Subjugationist culture <span class="yellow">pushes it towards Degradationism.</span>`);
- arc.FSDegradationist = 5;
- return;
- } else if ((validFSes.includes("FSAztecRevivalist") && validFSes.includes("FSEgyptianRevivalist"))) {
- if (random(0, 1) === 0) {
- r.push(`The arcology's racial Subjugationist culture <span class="yellow">pushes it towards Egyptian Revivalism,</span> since the Ancient Egyptians are famous for keeping a race of slaves.`);
- arc.FSEgyptianRevivalist = 5;
- return;
- } else {
- r.push(`The arcology's racial Supremacist culture <span class="yellow">pushes it towards Aztec Revivalism,</span> since the enslavement and sacrifice of slaves was fundamental to the culture.`);
- arc.FSAztecRevivalist = 5;
- return;
+ if (leader.behavioralQuirk === "insecure") {
+ candidates.push({fs: "FSIntellectualDependency", msg: `since ${he} absolutely needs to feel intellectually superior to ${his} chattel.`});
}
}
- }
- if (arc.FSRestart > random(50, 200)) {
- if (validFSes.includes("FSNeoImperialist")) {
- r.push(`The arcology's elitist, eugenicist culture <span class="yellow">pushes it towards Neo-Imperialism,</span> since the societal elite view themselves as the only appropriate rulers of their society.`);
- arc.FSNeoImperialist = 5;
- return;
+ if (leader.chem > 50) {
+ candidates.push({fs: "FSBodyPurist", msg: `since ${he} knows what long term drug damage feels like, and doesn't want any slave to ever experience it again.`});
}
- }
- if (arc.FSSupremacist > random(50, 200)) {
- if (validFSes.includes("FSPaternalist")) {
- r.push(`The arcology's racial Supremacist culture <span class="yellow">pushes it towards Paternalism.</span>`);
- arc.FSPaternalist = 5;
- return;
- } else if ((validFSes.includes("FSEdoRevivalist") && validFSes.includes("FSChineseRevivalist") && (arc.FSSupremacistRace === "asian"))) {
- if (random(0, 1) === 0) {
- r.push(`The arcology's racial Supremacist culture <span class="yellow">pushes it towards Edo Revivalism,</span> since the beauty and grace of the Japanese people are watchwords there.`);
- arc.FSEdoRevivalist = 5;
- return;
- } else {
- r.push(`The arcology's racial Supremacist culture <span class="yellow">pushes it towards Chinese Revivalism,</span> since the wisdom of the Middle Kingdom is admired there.`);
- arc.FSChineseRevivalist = 5;
- return;
- }
+ if (leader.boobsImplant > 1000) {
+ candidates.push({fs: "FSTransformationFetishist", msg: `out of a perverse desire to subject all slaves to massive implants like ${hers}.`});
}
- }
- if (arc.FSRepopulationFocus > random(50, 200)) {
- if (validFSes.includes("FSAssetExpansionist")) {
- r.push(`The arcology's Repopulationist culture <span class="yellow">pushes it towards Asset Expansionism,</span> since big pregnant bellies go great with huge tits and asses.`);
- arc.FSAssetExpansionist = 5;
- return;
- } else if (validFSes.includes("FSGenderFundamentalist")) {
- r.push(`The arcology's Repopulationist culture <span class="yellow">pushes it towards Gender Fundamentalism,</span> since traditional women make better mothers.`);
- arc.FSGenderFundamentalist = 5;
- return;
- } else if (validFSes.includes("FSPetiteAdmiration")) {
- r.push(`The arcology's Repopulationist culture <span class="yellow">pushes it towards Petite Admiration,</span> since shorter women tend to have an easier time with childbirth.`);
- arc.FSPetiteAdmiration = 5;
- return;
+ if (leader.actualAge <= 25) {
+ candidates.push({fs: "FSYouthPreferentialist", msg: `to buttress acceptance of ${his} own young age.`});
}
- } else if (arc.FSRestart > random(50, 200)) {
- if (validFSes.includes("FSDegradationist")) {
- r.push(`The arcology's elite focused culture <span class="yellow">pushes it towards Degradationism,</span> since its lowest class deserves nothing but misery.`);
- arc.FSDegradationist = 5;
- return;
- } else if (validFSes.includes("FSSlaveProfessionalism")) {
- r.push(`The arcology's elite focused culture <span class="yellow">pushes it towards Slave Professionalism,</span> since the highest class deserve nothing less than the best slaves.`);
- arc.FSSlaveProfessionalism = 5;
- return;
- } else if (validFSes.includes("FSHedonisticDecadence")) {
- r.push(`The arcology's wide range of imports <span class="yellow">pushes it towards Decadent Hedonism,</span> since it has access to so many undiscovered pleasures.`);
- arc.FSHedonisticDecadence = 5;
- return;
+ if (leader.actualAge > 35) {
+ candidates.push({fs: "FSMaturityPreferentialist", msg: `since ${he} has a certain personal interest in promoting the idea that MILFs are sexy.`});
}
- }
- if (arc.FSGenderRadicalist > random(50, 200)) {
- if (validFSes.includes("FSTransformationFetishist")) {
- r.push(`The arcology's Gender Radicalist culture <span class="yellow">pushes it towards Transformation Fetishism,</span> since surgery can turn a slave into anything.`);
- arc.FSTransformationFetishist = 5;
- return;
- } else if (validFSes.includes("FSSlimnessEnthusiast")) {
- r.push(`The arcology's Gender Radicalist culture <span class="yellow">pushes it towards Slimness Enthusiasm,</span> since that's the kind of body many of its slaves have.`);
- arc.FSSlimnessEnthusiast = 5;
- return;
- } else if (validFSes.includes("FSCummunism")) {
- r.push(`The arcology's Gender Radicalist culture <span class="yellow">pushes it towards Cummunism,</span> since many of its slaves are capable of giving cum.`);
- arc.FSCummunism = 5;
- return;
+ if (leader.behavioralQuirk === "insecure" || leader.behavioralFlaw === "anorexic") {
+ candidates.push({fs: "FSSlimnessEnthusiast", msg: `since ${his} history of anorexia has deeply impacted ${his} idea of beauty.`});
}
- } else if (arc.FSGenderFundamentalist > random(50, 200)) {
- if (validFSes.includes("FSPastoralist")) {
- r.push(`The arcology's Gender Fundamentalist culture <span class="yellow">pushes it towards Pastoralism,</span> since its pregnant slaves are already giving milk.`);
- arc.FSPastoralist = 5;
- return;
- } else if (validFSes.includes("FSIntellectualDependency")) {
- r.push(`The arcology's Gender Fundamentalist culture <span class="yellow">pushes it towards Intellectual Dependency,</span> since women don't need to think to serve men.`);
- arc.FSYouthPreferentialist = 5;
- return;
- } else if (validFSes.includes("FSYouthPreferentialist")) {
- r.push(`The arcology's Gender Fundamentalist culture <span class="yellow">pushes it towards Youth Preferentialism,</span> since younger slaves are beautiful and fertile.`);
- arc.FSYouthPreferentialist = 5;
- return;
+ if (leader.fetish === "boobs") {
+ candidates.push({fs: "FSAssetExpansionist", msg: `since ${he}'s a breast expansion fetishist in addition to being a mere breast fetishist.`});
}
- }
- if (arc.FSPaternalist > random(50, 200)) {
- if (validFSes.includes("FSChattelReligionist")) {
- r.push(`The arcology's Paternalist culture <span class="yellow">pushes it towards Chattel Religionism,</span> since many of its slaves are already worshipful.`);
- arc.FSChattelReligionist = 5;
- return;
- } else if (validFSes.includes("FSBodyPurist")) {
- r.push(`The arcology's Paternalist culture <span class="yellow">pushes it towards Body Purism,</span> since giving slaves dangerous drugs is hardly good for them.`);
- arc.FSBodyPurist = 5;
- return;
- } else if (validFSes.includes("FSRomanRevivalist")) {
- r.push(`The arcology's Paternalist culture <span class="yellow">pushes it towards Roman Revivalism,</span> since loyal service to the res publica bears similarity to their existing mores.`);
- arc.FSRomanRevivalist = 5;
- return;
+ if (leader.sexualQuirk === "size queen" && leader.vagina > 3) {
+ candidates.push({fs: "FSAssetExpansionist", msg: `since ${he}'s a stickler for big dicks and seeks to find one large enough to push ${him} to ${his} very limit.`});
}
- } else if (arc.FSDegradationist > random(50, 200)) {
- if (validFSes.includes("FSTransformationFetishist")) {
- r.push(`The arcology's Degradationist culture <span class="yellow">pushes it towards Transformation Fetishism,</span> the ultimate expression of power over slave bodies.`);
- arc.FSTransformationFetishist = 5;
- return;
- } else if (validFSes.includes("FSGenderRadicalist")) {
- r.push(`The arcology's Degradationist culture <span class="yellow">pushes it towards Gender Radicalism,</span> since the joy of forcing a gender role on a slave is already popular.`);
- arc.FSGenderRadicalist = 5;
- return;
+ if (leader.fetish === "cumslut") {
+ candidates.push({fs: "FSCummunism", msg: `since ${he} already loves sucking down huge loads of cum.`});
}
- }
- if (arc.FSIntellectualDependency > random(50, 200)) {
- if (validFSes.includes("FSTransformationFetishist")) {
- r.push(`The arcology's Intellectual Dependency culture <span class="yellow">pushes it towards Transformation Fetishism,</span> to give its bimbos a body most fitting.`);
- arc.FSTransformationFetishist = 5;
- return;
- } else if (validFSes.includes("FSYouthPreferentialist")) {
- r.push(`The arcology's Intellectual Dependency culture <span class="yellow">pushes it towards Youth Preferentialism,</span> since the young have more energy to party.`);
- arc.FSYouthPreferentialist = 5;
- return;
- } else if (validFSes.includes("FSHedonisticDecadence")) {
- r.push(`The arcology's Intellectual Dependency culture <span class="yellow">pushes it towards Decadent Hedonism,</span> since base instinct already rules slaves' lives.`);
- arc.FSHedonisticDecadence = 5;
- return;
- } else if (validFSes.includes("FSRepopulationFocus")) {
- r.push(`The arcology's Intellectual Dependency culture <span class="yellow">pushes it towards Repopulationism,</span> since there has been an epidemic of unplanned pregnancies among the slave population.`);
- arc.FSRepopulationFocus = 5;
- return;
+ if (leader.fetish === "boobs") {
+ candidates.push({fs: "FSPastoralist", msg: `since ${he} loves boobs and adores suckling them.`});
}
- } else if (arc.FSSlaveProfessionalism > random(50, 200)) {
- if (validFSes.includes("FSMaturityPreferentialist")) {
- r.push(`The arcology's Slave Professionalism culture <span class="yellow">pushes it towards Maturity Preferentialist,</span> since with age comes experience.`);
- arc.FSMaturityPreferentialist = 5;
- return;
- } else if (validFSes.includes("FSPaternalist")) {
- r.push(`The arcology's Slave Professionalism culture <span class="yellow">pushes it towards Paternalism,</span> since happy slaves are much more willing to be molded in to shape.`);
- arc.FSPaternalist = 5;
- return;
- } else if (validFSes.includes("FSPhysicalIdealist")) {
- r.push(`The arcology's Slave Professionalism culture <span class="yellow">pushes it towards Physical Idealism,</span> since a fitting body is required to house the perfect mind.`);
- arc.FSPhysicalIdealist = 5;
- return;
- } else if (validFSes.includes("FSChattelReligionist")) {
- r.push(`The arcology's Slave Professionalism culture <span class="yellow">pushes it towards Chattel Religionism,</span> since skilled service is already a part of a slave's daily life.`);
- arc.FSChattelReligionist = 5;
- return;
- }
- }
- if (arc.FSBodyPurist > random(50, 200)) {
- if (validFSes.includes("FSPhysicalIdealist")) {
- r.push(`The arcology's Body Purist culture <span class="yellow">pushes it towards Physical Idealism,</span> since it already takes an intense interest in bodily perfection.`);
- arc.FSPhysicalIdealist = 5;
- return;
- } else if (validFSes.includes("FSPaternalist")) {
- r.push(`The arcology's Body Purist culture <span class="yellow">pushes it towards Paternalism,</span> since it's become obvious that happiness is a necessary part of wellness.`);
- arc.FSPaternalist = 5;
- return;
+ if (leader.behavioralQuirk === "fitness") {
+ candidates.push({fs: "FSPhysicalIdealist", msg: `since ${he}'s a fitness fanatic ${himself}.`});
}
- } else if (arc.FSTransformationFetishist > random(50, 200)) {
- if (validFSes.includes("FSAssetExpansionist")) {
- r.push(`The arcology's Transformation Fetishist culture <span class="yellow">pushes it towards Asset Expansionism,</span> since it's already overrun with massive tits and asses.`);
- arc.FSAssetExpansionist = 5;
- return;
- } else if (validFSes.includes("FSDegradationist")) {
- r.push(`The arcology's Transformation Fetishist culture <span class="yellow">pushes it towards Degradationism,</span> since it's already used to slaves whining about their latest surgeries.`);
- arc.FSDegradationist = 5;
- return;
+ if (leader.behavioralFlaw === "gluttonous") {
+ candidates.push({fs: "FSHedonisticDecadence", msg: `since ${he} already loves over-eating.`});
}
- }
- if (arc.FSYouthPreferentialist > random(50, 200)) {
- if (validFSes.includes("FSSlimnessEnthusiast")) {
- r.push(`The arcology's Youth Preferentialist culture <span class="yellow">pushes it towards Slimness Enthusiasm,</span> since that's the kind of body many of its slaves have.`);
- arc.FSSlimnessEnthusiast = 5;
- return;
- } else if (validFSes.includes("FSRepopulationFocus")) {
- r.push(`The arcology's Youth Preferentialist culture <span class="yellow">pushes it towards Repopulationism,</span> since many of its slaves are deliciously ripe for breeding.`);
- arc.FSRepopulationFocus = 5;
- return;
+ if (leader.fetish !== Fetish.NONE && leader.fetishStrength >= 100) {
+ candidates.push({fs: "FSHedonisticDecadence", msg: `since ${he} seeks to satisfy ${his} powerful fetish.`});
}
- } else if (arc.FSMaturityPreferentialist > random(50, 200)) {
- if (validFSes.includes("FSAssetExpansionist")) {
- r.push(`The arcology's Maturity Preferentialist culture <span class="yellow">pushes it towards Asset Expansionism,</span> since that's the kind of body many of its slaves have.`);
- arc.FSAssetExpansionist = 5;
- return;
- } else if (validFSes.includes("FSPaternalist")) {
- r.push(`The arcology's Maturity Preferentialist culture <span class="yellow">pushes it towards Paternalism,</span> since its many older slaves have skills best applied by a happy woman.`);
- arc.FSPaternalist = 5;
- return;
+ if (leader.height >= 200) {
+ candidates.push({fs: "FSStatuesqueGlorification", msg: `since ${he} is tired of being one of the tallest in arcology.`});
}
- }
- if (arc.FSPetiteAdmiration > random(50, 200)) {
- if (validFSes.includes("FSAssetExpansionist")) {
- r.push(`The arcology's Petite Admiration culture <span class="yellow">pushes it towards Asset Expansionist,</span> since a ${girlU} with tits wider than ${heU} is tall attracts quite some attention.`);
- arc.FSAssetExpansionist = 5;
- return;
- } else if (validFSes.includes("FSPaternalist")) {
- r.push(`The arcology's Petite Admiration culture <span class="yellow">pushes it towards Paternalism,</span> since such tiny ${girlU}s need extra special attention.`);
- arc.FSPaternalist = 5;
- return;
- } else if (validFSes.includes("FSIncestFetishist")) {
- r.push(`The arcology's Petite Admiration culture <span class="yellow">pushes it towards Incest Fetishism,</span> since age play often goes hand-in-hand with size play.`);
- arc.FSIncestFetishist = 5;
- return;
+ if (leader.height >= 170 && leader.fetish === "dom") {
+ candidates.push({fs: "FSPetiteAdmiration", msg: `since it is far easier to dominate someone much smaller than oneself.`});
}
- } else if (arc.FSStatuesqueGlorification > random(50, 200)) {
- if (validFSes.includes("FSPhysicalIdealist")) {
- r.push(`The arcology's Statuesque Glorification culture <span class="yellow">pushes it towards Physical Idealism,</span> since being ripped complements being tall.`);
- arc.FSPhysicalIdealist = 5;
- return;
- } else if (validFSes.includes("FSDegradationist")) {
- r.push(`The arcology's Statuesque Glorification culture <span class="yellow">pushes it towards Degradationism,</span> since those that don't measure up deserve only suffering.`);
- arc.FSDegradationist = 5;
- return;
+ if (leader.height < 160 && leader.fetish !== Fetish.SUBMISSIVE) {
+ candidates.push({fs: "FSPetiteAdmiration", msg: `since ${he} doesn't like ${his} subordinates towering over ${him}.`});
}
- }
- if (arc.FSSlimnessEnthusiast > random(50, 200)) {
- if (validFSes.includes("FSYouthPreferentialist")) {
- r.push(`The arcology's Slimness Enthusiast culture <span class="yellow">pushes it towards Youth Preferentialism,</span> since younger slaves are often attractively slim.`);
- arc.FSYouthPreferentialist = 5;
- return;
- } else if (validFSes.includes("FSBodyPurist")) {
- r.push(`The arcology's Slimness Enthusiast culture <span class="yellow">pushes it towards Body Purism,</span> since the last thing they want is prettily slender girls with health trouble.`);
- arc.FSBodyPurist = 5;
- return;
- }
- } else if (arc.FSAssetExpansionist > random(50, 200)) {
- if (validFSes.includes("FSMaturityPreferentialist")) {
- r.push(`The arcology's Asset Expansionist culture <span class="yellow">pushes it towards Maturity Preferentialism,</span> since MILF slaves tend to come with nice big tits.`);
- arc.FSMaturityPreferentialist = 5;
- return;
- } else if (validFSes.includes("FSBodyPurist")) {
- r.push(`The arcology's Asset Expansionist culture <span class="yellow">pushes it towards Body Purism,</span> since slaves on curatives are slaves not on growth hormones.`);
- arc.FSBodyPurist = 5;
- return;
- } else if (validFSes.includes("FSPetiteAdmiration") && validFSes.includes("FSStatuesqueGlorification")) {
- if (random(0, 1) === 1) {
- r.push(`The arcology's Asset Expansionist culture <span class="yellow">pushes it towards Petite Admiration,</span> since the smaller a slave's body is, the bigger their breasts will look.`);
- arc.FSPetiteAdmiration = 5;
- return;
- } else {
- r.push(`The arcology's Asset Expansionist culture <span class="yellow">pushes it towards Statuesque Glorification,</span> as the love of all things huge is rather indiscriminate.`);
- arc.FSStatuesqueGlorification = 5;
- return;
+ const lover = getSlave(leader.relationshipTarget);
+ if (lover && areRelated(leader, lover) && V.seeIncest === 1) {
+ if ((leader.behavioralQuirk === "sinful" || leader.sexualQuirk === "perverted")) {
+ candidates.push({fs: "FSIncestFetishist", msg: `to share the love and joy ${he} holds with ${his} ${relativeTerm(leader, lover)}.`});
+ }
+ if (lover.assignment === Job.AGENTPARTNER && leader.relationship > 3) {
+ candidates.push({fs: "FSEgyptianRevivalist", msg: `since ${he}'s already part of a gloriously incestuous relationship.`});
}
}
- }
- if (arc.FSPastoralist > random(50, 200)) {
- if (validFSes.includes("FSBodyPurist")) {
- r.push(`The arcology's Pastoralist culture <span class="yellow">pushes it towards Body Purism,</span> since there have been concerns about milk purity.`);
- arc.FSBodyPurist = 5;
- return;
- } else if (validFSes.includes("FSAssetExpansionist")) {
- r.push(`The arcology's Pastoralist culture <span class="yellow">pushes it towards Asset Expansionism,</span> since they're convinced that there's no such thing as udders that are too big.`);
- arc.FSAssetExpansionist = 5;
- return;
- } else if (validFSes.includes("FSRepopulationFocus")) {
- r.push(`The arcology's Pastoralist culture <span class="yellow">pushes it towards Repopulationism,</span> since pregnancy stimulates milk flow.`);
- arc.FSRepopulationFocus = 5;
- return;
- }
- } else if (arc.FSCummunism > random(50, 200)) {
- if (validFSes.includes("FSPhysicalIdealist")) {
- r.push(`The arcology's Cummunist culture <span class="yellow">pushes it towards Physical Idealism,</span> since big balls and huge loads go hand in hand with masculine muscles.`);
- arc.FSPhysicalIdealist = 5;
- return;
- } else if (validFSes.includes("FSAssetExpansionist")) {
- r.push(`The arcology's Cummunist culture <span class="yellow">pushes it towards Asset Expansionism,</span> since they're convinced that there's no such thing as balls that are too big.`);
- arc.FSAssetExpansionist = 5;
- return;
- } else if (validFSes.includes("FSBodyPurist")) {
- r.push(`The arcology's Cummunist culture <span class="yellow">pushes it towards Body Purism,</span> since there have been concerns about cum purity.`);
- arc.FSBodyPurist = 5;
- return;
- }
- }
- if (arc.FSHedonisticDecadence > random(50, 200)) {
- if (validFSes.includes("FSPastoralist")) {
- r.push(`The arcology's Hedonistic culture <span class="yellow">pushes it towards Pastoralism,</span> since nothing beats a nice glass of fresh squeezed milk with your cake.`);
- arc.FSPastoralist = 5;
- return;
- } else if (validFSes.includes("FSIntellectualDependency")) {
- r.push(`The arcology's Hedonistic culture <span class="yellow">pushes it towards Intellectual Dependency,</span> since higher thought is unneeded when you have everything you want.`);
- arc.FSIntellectualDependency = 5;
- return;
- } else if (validFSes.includes("FSPaternalist")) {
- r.push(`The arcology's Hedonistic culture <span class="yellow">pushes it towards Paternalism,</span> since happiness is infectious.`);
- arc.FSPaternalist = 5;
- return;
- }
- } else if (arc.FSPhysicalIdealist > random(50, 200)) {
- if (validFSes.includes("FSBodyPurist")) {
- r.push(`The arcology's Physical Idealist culture <span class="yellow">pushes it towards Body Purism,</span> since it's already used to treating slaves' bodies as temples.`);
- arc.FSBodyPurist = 5;
- return;
- } else if (validFSes.includes("FSYouthPreferentialist")) {
- r.push(`The arcology's Physical Idealist culture <span class="yellow">pushes it towards Youth Preferentialism,</span> since beauty and athletic prowess do tend to peak early.`);
- arc.FSYouthPreferentialist = 5;
- return;
- } else if (validFSes.includes("FSStatuesqueGlorification")) {
- r.push(`The arcology's Physical Idealist culture <span class="yellow">pushes it towards Statuesque Glorification,</span> to better emulate the titans of legend.`);
- arc.FSStatuesqueGlorification = 5;
- return;
- } else if (validFSes.includes("FSCummunism")) {
- r.push(`The arcology's Physical Idealist culture <span class="yellow">pushes it towards Cummunism,</span> since muscular, testosterone filled slaves make admirable cumshots.`);
- arc.FSCummunism = 5;
- return;
- }
- }
- if (arc.FSIncestFetishist > random(50, 200)) {
- if (validFSes.includes("FSRepopulationFocus")) {
- r.push(`The arcology's Incest Fetishizing culture <span class="yellow">pushes it towards Repopulationism,</span> in order to create many new future loving couples.`);
- arc.FSRepopulationFocus = 5;
- return;
- } else if (validFSes.includes("FSBodyPurist")) {
- r.push(`The arcology's Incest Fetishizing culture <span class="yellow">pushes it towards Body Purism,</span> in order to keep its bloodlines pure.`);
- arc.FSBodyPurist = 5;
- return;
- } else if (validFSes.includes("FSPaternalist")) {
- r.push(`The arcology's Incest Fetishizing culture <span class="yellow">pushes it towards Paternalism,</span> as healthy slaves live longer allowing relationships to span generations.`);
- arc.FSPaternalist = 5;
- return;
- } else if (validFSes.includes("FSEgyptianRevivalist")) {
- r.push(`The arcology's Incest Fetishizing culture <span class="yellow">pushes it towards Egyptian Revivalism,</span> as they naturally seek even more incestuous fun.`);
- arc.FSEgyptianRevivalist = 5;
- return;
- }
- }
- if (arc.FSChattelReligionist > random(50, 200)) {
- if (validFSes.includes("FSPaternalist")) {
- r.push(`The arcology's Chattel Religionist culture <span class="yellow">pushes it towards Paternalism,</span> since charitable care for slaves' welfare has become widespread.`);
- arc.FSPaternalist = 5;
- return;
- } else if (validFSes.includes("FSArabianRevivalist")) {
- r.push(`The arcology's Chattel Religionist culture <span class="yellow">pushes it towards Arabian Revivalism,</span> since such an intermingling of slavery and faith fascinates them.`);
- arc.FSArabianRevivalist = 5;
- return;
+ if (leader.behavioralFlaw === "devout") {
+ candidates.push({fs: "FSChattelReligionist", msg: `to share and spread ${his} deeply held beliefs about the holiness of sexual service.`});
}
- }
- if (arc.FSRomanRevivalist > random(50, 200)) {
- if (validFSes.includes("FSPaternalist")) {
- r.push(`The arcology's Roman Revivalist culture <span class="yellow">pushes it towards Paternalism,</span> since some Roman slaves were traditionally permitted limited rights.`);
- arc.FSPaternalist = 5;
- return;
+ if (leader.behavioralQuirk === "sinful") {
+ candidates.push({fs: "FSChattelReligionist", msg: `since ${he}'s excited by the prospect of getting away with horrible sins against old religions in public.`});
}
- }
- if (arc.FSNeoImperialist > random(50, 200)) {
- if (validFSes.includes("FSRestart")) {
- r.push(`The arcology's Neo-Imperialist culture <span class="yellow">pushes it towards Eugenics,</span> since their hegemonic, noble culture naturally views itself as genetically superior to the unwashed masses.`);
- arc.FSRestart = 5;
- return;
+ if (leader.nationality === "Chinese") {
+ candidates.push({fs: "FSChineseRevivalist", msg: `since ${he}'s Chinese ${himself} and can claim high honor in such a society.`});
+ } else if (leader.nationality === "Japanese") {
+ candidates.push({fs: "FSEdoRevivalist", msg: `since ${he}'s Japanese ${himself} and can claim high honor in such a society.`});
+ } else if (leader.nationality === "Mexican") {
+ candidates.push({fs: "FSAztecRevivalist", msg: `since ${he}'s Mexican ${himself} and can claim high honor in such a society.`});
+ } else if (leader.nationality === "Egyptian") {
+ candidates.push({fs: "FSEgyptianRevivalist", msg: `since ${he}'s Egyptian ${himself} and wants to relive the glory of the Pharaohs.`});
+ } else if (["German", "French", "Spanish", "English"].includes(leader.nationality)) {
+ candidates.push({fs: "FSNeoImperialist", msg: `since ${he}'s ${leader.nationality} ${himself} and can easily cement ${his} rule with Imperial directives in your name.`});
}
- }
- if (arc.FSAztecRevivalist > random(50, 200)) {
- if (validFSes.includes("FSDegradationist")) {
- r.push(`The arcology's Aztec Revivalist culture <span class="yellow">pushes it towards Degradation,</span> since most Aztec war slaves were tortured and sacrificed.`);
- arc.FSDegradationist = 5;
- return;
+ if (leader.behavioralQuirk === "confident") {
+ candidates.push({fs: "FSRomanRevivalist", msg: `since it appeals to ${his} confident, patrician nature.`});
}
- }
- if (arc.FSEgyptianRevivalist > random(50, 200)) {
- if (validFSes.includes("FSChattelReligionist")) {
- r.push(`The arcology's Egyptian Revivalist culture <span class="yellow">pushes it towards Chattel Religionism,</span> since worship is already becoming an established part of its life.`);
- arc.FSChattelReligionist = 5;
- return;
- } else if (validFSes.includes("FSIncestFetishist")) {
- r.push(`The arcology's Egyptian Revivalist culture <span class="yellow">pushes it towards Incest Fetishism,</span> since more incest is only a good thing in its eyes.`);
- arc.FSIncestFetishist = 5;
- return;
+ if (leader.fetish === "dom") {
+ candidates.push({fs: "FSArabianRevivalist", msg: `since ${he}'s sexually dominant and quite likes the idea of overseeing slave bazaars.`});
}
- }
- if (arc.FSEdoRevivalist > random(50, 200)) {
- if (validFSes.includes("FSSlimnessEnthusiast")) {
- r.push(`The arcology's Edo Revivalist culture <span class="yellow">pushes it towards Slimness Enthusiasm,</span> since slim and elegant slaves are already fashionable there.`);
- arc.FSSlimnessEnthusiast = 5;
+ const chosen = candidates.filter(c => validFSes.includes(c.fs)).random();
+ if (chosen) {
+ r.push(`Your agent <span class="pink">${leader.slaveName}</span> successfully pushes it to <span class="yellow">adopt ${FutureSocieties.displayName(chosen.fs)},</span>`, chosen.msg);
+ arc[chosen.fs] = 5;
return;
}
}
- if (arc.FSArabianRevivalist > random(50, 200)) {
- if (validFSes.includes("FSChattelReligionist")) {
- r.push(`The arcology's Arabian Revivalist culture <span class="yellow">pushes it towards Chattel Religionism,</span> since the word of God is already a matter of daily significance there.`);
- arc.FSChattelReligionist = 5;
- return;
+
+ /* CROSS-FS ADOPTION */
+ /** Map from source to an array of destination FSes. On the destination side, order matters; adoption is attempted in sequence through the array.
+ * If several destination FSes should be equally likely at a particular stage, put them in a nested array.
+ * @typedef {{fs: FC.FutureSociety, prereqs?: () => boolean, msg: string}} crossFSDest
+ * @type {Map<FC.FutureSociety, (crossFSDest|crossFSDest[])[]>} */
+ const crossFS = new Map([
+ ["FSSubjugationist", [
+ {
+ fs: "FSDegradationist",
+ msg: `The arcology's racial Subjugationist culture <span class="yellow">pushes it towards Degradationism.</span>`,
+ },
+ [ // pick one at random
+ {
+ fs: "FSAztecRevivalist",
+ msg: `The arcology's racial Supremacist culture <span class="yellow">pushes it towards Aztec Revivalism,</span> since the enslavement and sacrifice of slaves was fundamental to the culture.`
+ },
+ {
+ fs: "FSEgyptianRevivalist",
+ msg: `The arcology's racial Subjugationist culture <span class="yellow">pushes it towards Egyptian Revivalism,</span> since the Ancient Egyptians are famous for keeping a race of slaves.`
+ }
+ ]
+ ]],
+ ["FSSupremacist", [
+ {
+ fs: "FSPaternalist",
+ msg: `The arcology's racial Supremacist culture <span class="yellow">pushes it towards Paternalism.</span>`,
+ },
+ [ // pick one at random
+ {
+ fs: "FSEdoRevivalist",
+ prereqs: () => arc.FSSupremacistRace === "asian",
+ msg: `The arcology's racial Supremacist culture <span class="yellow">pushes it towards Edo Revivalism,</span> since the beauty and grace of the Japanese people are watchwords there.`
+ },
+ {
+ fs: "FSChineseRevivalist",
+ prereqs: () => arc.FSSupremacistRace === "asian",
+ msg: `The arcology's racial Supremacist culture <span class="yellow">pushes it towards Chinese Revivalism,</span> since the wisdom of the Middle Kingdom is admired there.`
+ }
+ ]
+ ]],
+ ["FSRepopulationFocus", [
+ {
+ fs: "FSGenderFundamentalist",
+ msg: `The arcology's Repopulationist culture <span class="yellow">pushes it towards Gender Fundamentalism,</span> since traditional women make better mothers.`
+ },
+ {
+ fs: "FSAssetExpansionist",
+ msg: `The arcology's Repopulationist culture <span class="yellow">pushes it towards Asset Expansionism,</span> since big pregnant bellies go great with huge tits and asses.`
+ },
+ {
+ fs: "FSPetiteAdmiration",
+ msg: `The arcology's Repopulationist culture <span class="yellow">pushes it towards Petite Admiration,</span> since shorter women tend to have an easier time with childbirth.`
+ },
+ ]],
+ ["FSRestart", [
+ {
+ fs: "FSNeoImperialist",
+ msg: `The arcology's elitist, eugenicist culture <span class="yellow">pushes it towards Neo-Imperialism,</span> since the societal elite view themselves as the only appropriate rulers of their society.`
+ },
+ {
+ fs: "FSDegradationist",
+ msg: `The arcology's elite-focused culture <span class="yellow">pushes it towards Degradationism,</span> since its lowest class deserves nothing but misery.`
+ },
+ {
+ fs: "FSSlaveProfessionalism",
+ msg: `The arcology's elite-focused culture <span class="yellow">pushes it towards Slave Professionalism,</span> since the highest class deserve nothing less than the best slaves.`
+ },
+ {
+ fs: "FSHedonisticDecadence",
+ msg: `The arcology's wide range of imports <span class="yellow">pushes it towards Decadent Hedonism,</span> since it has access to so many undiscovered pleasures.`
+ },
+ ]],
+ ["FSGenderRadicalist", [
+ {
+ fs: "FSTransformationFetishist",
+ msg: `The arcology's Gender Radicalist culture <span class="yellow">pushes it towards Transformation Fetishism,</span> since surgery can turn a slave into anything.`
+ },
+ {
+ fs: "FSSlimnessEnthusiast",
+ msg: `The arcology's Gender Radicalist culture <span class="yellow">pushes it towards Slimness Enthusiasm,</span> since that's the kind of body many of its slaves have.`
+ },
+ {
+ fs: "FSCummunism",
+ msg: `The arcology's Gender Radicalist culture <span class="yellow">pushes it towards Cummunism,</span> since many of its slaves are capable of giving cum.`
+ },
+ ]],
+ ["FSGenderFundamentalist", [
+ {
+ fs: "FSPastoralist",
+ msg: `The arcology's Gender Fundamentalist culture <span class="yellow">pushes it towards Pastoralism,</span> since its pregnant slaves are already giving milk.`
+ },
+ {
+ fs: "FSIntellectualDependency",
+ msg: `The arcology's Gender Fundamentalist culture <span class="yellow">pushes it towards Intellectual Dependency,</span> since women don't need to think to serve men.`
+ },
+ {
+ fs: "FSYouthPreferentialist",
+ msg: `The arcology's Gender Fundamentalist culture <span class="yellow">pushes it towards Youth Preferentialism,</span> since younger slaves are beautiful and fertile.`
+ },
+ ]],
+ ["FSPaternalist", [
+ {
+ fs: "FSChattelReligionist",
+ msg: `The arcology's Paternalist culture <span class="yellow">pushes it towards Chattel Religionism,</span> since many of its slaves are already worshipful.`
+ },
+ {
+ fs: "FSBodyPurist",
+ msg: `The arcology's Paternalist culture <span class="yellow">pushes it towards Body Purism,</span> since giving slaves dangerous drugs is hardly good for them.`
+ },
+ {
+ fs: "FSRomanRevivalist",
+ msg: `The arcology's Paternalist culture <span class="yellow">pushes it towards Roman Revivalism,</span> since loyal service to the res publica bears similarity to their existing mores.`
+ },
+ ]],
+ ["FSDegradationist", [
+ {
+ fs: "FSTransformationFetishist",
+ msg: `The arcology's Degradationist culture <span class="yellow">pushes it towards Transformation Fetishism,</span> the ultimate expression of power over slave bodies.`
+ },
+ {
+ fs: "FSGenderRadicalist",
+ msg: `The arcology's Degradationist culture <span class="yellow">pushes it towards Gender Radicalism,</span> since the joy of forcing a gender role on a slave is already popular.`
+ },
+ {
+ fs: "FSIntellectualDependency",
+ msg: `The arcology's Degradationist culture <span class="yellow">pushes it towards Intellectual Dependency,</span> since there's no need for a sex toy to be thinking.`
+ },
+ ]],
+ ["FSIntellectualDependency", [
+ {
+ fs: "FSTransformationFetishist",
+ msg: `The arcology's Intellectual Dependency culture <span class="yellow">pushes it towards Transformation Fetishism,</span> to give its bimbos a body most fitting.`
+ },
+ {
+ fs: "FSYouthPreferentialist",
+ msg: `The arcology's Intellectual Dependency culture <span class="yellow">pushes it towards Youth Preferentialism,</span> since the young have more energy to party.`
+ },
+ {
+ fs: "FSHedonisticDecadence",
+ msg: `The arcology's Intellectual Dependency culture <span class="yellow">pushes it towards Decadent Hedonism,</span> since base instinct already rules slaves' lives.`
+ },
+ {
+ fs: "FSRepopulationFocus",
+ msg: `The arcology's Intellectual Dependency culture <span class="yellow">pushes it towards Repopulationism,</span> since there has been an epidemic of unplanned pregnancies among the slave population.`
+ },
+ ]],
+ ["FSSlaveProfessionalism", [
+ {
+ fs: "FSMaturityPreferentialist",
+ msg: `The arcology's Slave Professionalism culture <span class="yellow">pushes it towards Maturity Preferentialist,</span> since with age comes experience.`
+ },
+ {
+ fs: "FSPaternalist",
+ msg: `The arcology's Slave Professionalism culture <span class="yellow">pushes it towards Paternalism,</span> since happy slaves are much more willing to be molded into shape.`
+ },
+ {
+ fs: "FSPhysicalIdealist",
+ msg: `The arcology's Slave Professionalism culture <span class="yellow">pushes it towards Physical Idealism,</span> since a fitting body is required to house the perfect mind.`
+ },
+ {
+ fs: "FSChattelReligionist",
+ msg: `The arcology's Slave Professionalism culture <span class="yellow">pushes it towards Chattel Religionism,</span> since skilled service is already a part of a slave's daily life.`
+ },
+ ]],
+ ["FSBodyPurist", [
+ {
+ fs: "FSPhysicalIdealist",
+ msg: `The arcology's Body Purist culture <span class="yellow">pushes it towards Physical Idealism,</span> since it already takes an intense interest in bodily perfection.`
+ },
+ {
+ fs: "FSPaternalist",
+ msg: `The arcology's Body Purist culture <span class="yellow">pushes it towards Paternalism,</span> since it's become obvious that happiness is a necessary part of wellness.`
+ },
+ ]],
+ ["FSTransformationFetishist", [
+ {
+ fs: "FSAssetExpansionist",
+ msg: `The arcology's Transformation Fetishist culture <span class="yellow">pushes it towards Asset Expansionism,</span> since it's already overrun with massive tits and asses.`
+ },
+ {
+ fs: "FSDegradationist",
+ msg: `The arcology's Transformation Fetishist culture <span class="yellow">pushes it towards Degradationism,</span> since it's already used to slaves whining about their latest surgeries.`
+ },
+ ]],
+ ["FSYouthPreferentialist", [
+ {
+ fs: "FSSlimnessEnthusiast",
+ msg: `The arcology's Youth Preferentialist culture <span class="yellow">pushes it towards Slimness Enthusiasm,</span> since that's the kind of body many of its slaves have.`
+ },
+ {
+ fs: "FSRepopulationFocus",
+ msg: `The arcology's Youth Preferentialist culture <span class="yellow">pushes it towards Repopulationism,</span> since many of its slaves are deliciously ripe for breeding.`
+ },
+ ]],
+ ["FSMaturityPreferentialist", [
+ {
+ fs: "FSAssetExpansionist",
+ msg: `The arcology's Maturity Preferentialist culture <span class="yellow">pushes it towards Asset Expansionism,</span> since that's the kind of body many of its slaves have.`
+ },
+ {
+ fs: "FSPaternalist",
+ msg: `The arcology's Maturity Preferentialist culture <span class="yellow">pushes it towards Paternalism,</span> since its many older slaves have skills best applied by a happy woman.`
+ },
+ ]],
+ ["FSPetiteAdmiration", [
+ {
+ fs: "FSAssetExpansionist",
+ msg: `The arcology's Petite Admiration culture <span class="yellow">pushes it towards Asset Expansionist,</span> since a ${girlU} with tits wider than ${heU} is tall attracts quite some attention.`
+ },
+ {
+ fs: "FSPaternalist",
+ msg: `The arcology's Petite Admiration culture <span class="yellow">pushes it towards Paternalism,</span> since such tiny ${girlU}s need extra special attention.`
+ },
+ {
+ fs: "FSIncestFetishist",
+ msg: `The arcology's Petite Admiration culture <span class="yellow">pushes it towards Incest Fetishism,</span> since age play often goes hand-in-hand with size play.`
+ },
+ ]],
+ ["FSStatuesqueGlorification", [
+ {
+ fs: "FSPhysicalIdealist",
+ msg: `The arcology's Statuesque Glorification culture <span class="yellow">pushes it towards Physical Idealism,</span> since being ripped complements being tall.`
+ },
+ {
+ fs: "FSDegradationist",
+ msg: `The arcology's Statuesque Glorification culture <span class="yellow">pushes it towards Degradationism,</span> since those that don't measure up deserve only suffering.`
+ },
+ ]],
+ ["FSSlimnessEnthusiast", [
+ {
+ fs: "FSYouthPreferentialist",
+ msg: `The arcology's Slimness Enthusiast culture <span class="yellow">pushes it towards Youth Preferentialism,</span> since younger slaves are often attractively slim.`
+ },
+ {
+ fs: "FSBodyPurist",
+ msg: `The arcology's Slimness Enthusiast culture <span class="yellow">pushes it towards Body Purism,</span> since the last thing they want is prettily slender girls with health trouble.`
+ },
+ ]],
+ ["FSAssetExpansionist", [
+ {
+ fs: "FSMaturityPreferentialist",
+ msg: `The arcology's Asset Expansionist culture <span class="yellow">pushes it towards Maturity Preferentialism,</span> since MILF slaves tend to come with nice big tits.`
+ },
+ {
+ fs: "FSBodyPurist",
+ msg: `The arcology's Asset Expansionist culture <span class="yellow">pushes it towards Body Purism,</span> since slaves on curatives are slaves not on growth hormones.`
+ },
+ [ // pick one at random
+ {
+ fs: "FSPetiteAdmiration",
+ msg: `The arcology's Asset Expansionist culture <span class="yellow">pushes it towards Petite Admiration,</span> since the smaller a slave's body is, the bigger their breasts will look.`
+ },
+ {
+ fs: "FSStatuesqueGlorification",
+ msg: `The arcology's Asset Expansionist culture <span class="yellow">pushes it towards Statuesque Glorification,</span> as the love of all things huge is rather indiscriminate.`
+ },
+ ]
+ ]],
+ ["FSPastoralist", [
+ {
+ fs: "FSBodyPurist",
+ msg: `The arcology's Pastoralist culture <span class="yellow">pushes it towards Body Purism,</span> since there have been concerns about milk purity.`
+ },
+ {
+ fs: "FSAssetExpansionist",
+ msg: `The arcology's Pastoralist culture <span class="yellow">pushes it towards Asset Expansionism,</span> since they're convinced that there's no such thing as udders that are too big.`
+ },
+ {
+ fs: "FSRepopulationFocus",
+ msg: `The arcology's Pastoralist culture <span class="yellow">pushes it towards Repopulationism,</span> since pregnancy stimulates milk flow.`
+ },
+ ]],
+ ["FSCummunism", [
+ {
+ fs: "FSPhysicalIdealist",
+ msg: `The arcology's Cummunist culture <span class="yellow">pushes it towards Physical Idealism,</span> since big balls and huge loads go hand in hand with masculine muscles.`
+ },
+ {
+ fs: "FSAssetExpansionist",
+ msg: `The arcology's Cummunist culture <span class="yellow">pushes it towards Asset Expansionism,</span> since they're convinced that there's no such thing as balls that are too big.`
+ },
+ {
+ fs: "FSBodyPurist",
+ msg: `The arcology's Cummunist culture <span class="yellow">pushes it towards Body Purism,</span> since there have been concerns about cum purity.`
+ },
+ ]],
+ ["FSHedonisticDecadence", [
+ {
+ fs: "FSPastoralist",
+ msg: `The arcology's Hedonistic culture <span class="yellow">pushes it towards Pastoralism,</span> since nothing beats a nice glass of fresh squeezed milk with your cake.`
+ },
+ {
+ fs: "FSIntellectualDependency",
+ msg: `The arcology's Hedonistic culture <span class="yellow">pushes it towards Intellectual Dependency,</span> since higher thought is unneeded when you have everything you want.`
+ },
+ {
+ fs: "FSPaternalist",
+ msg: `The arcology's Hedonistic culture <span class="yellow">pushes it towards Paternalism,</span> since happiness is infectious.`
+ },
+ ]],
+ ["FSPhysicalIdealist", [
+ {
+ fs: "FSBodyPurist",
+ msg: `The arcology's Physical Idealist culture <span class="yellow">pushes it towards Body Purism,</span> since it's already used to treating slaves' bodies as temples.`
+ },
+ {
+ fs: "FSYouthPreferentialist",
+ msg: `The arcology's Physical Idealist culture <span class="yellow">pushes it towards Youth Preferentialism,</span> since beauty and athletic prowess do tend to peak early.`
+ },
+ {
+ fs: "FSStatuesqueGlorification",
+ msg: `The arcology's Physical Idealist culture <span class="yellow">pushes it towards Statuesque Glorification,</span> to better emulate the titans of legend.`
+ },
+ {
+ fs: "FSCummunism",
+ msg: `The arcology's Physical Idealist culture <span class="yellow">pushes it towards Cummunism,</span> since muscular, testosterone-filled slaves make admirable cumshots.`
+ },
+ ]],
+ ["FSIncestFetishist", [
+ {
+ fs: "FSRepopulationFocus",
+ msg: `The arcology's Incest Fetishizing culture <span class="yellow">pushes it towards Repopulationism,</span> in order to create many new future loving couples.`
+ },
+ {
+ fs: "FSBodyPurist",
+ msg: `The arcology's Incest Fetishizing culture <span class="yellow">pushes it towards Body Purism,</span> in order to keep its bloodlines pure.`
+ },
+ {
+ fs: "FSPaternalist",
+ msg: `The arcology's Incest Fetishizing culture <span class="yellow">pushes it towards Paternalism,</span> as healthy slaves live longer allowing relationships to span generations.`
+ },
+ {
+ fs: "FSEgyptianRevivalist",
+ msg: `The arcology's Incest Fetishizing culture <span class="yellow">pushes it towards Egyptian Revivalism,</span> as they naturally seek even more incestuous fun.`
+ },
+ ]],
+ ["FSChattelReligionist", [
+ {
+ fs: "FSPaternalist",
+ msg: `The arcology's Chattel Religionist culture <span class="yellow">pushes it towards Paternalism,</span> since charitable care for slaves' welfare has become widespread.`
+ },
+ {
+ fs: "FSArabianRevivalist",
+ msg: `The arcology's Chattel Religionist culture <span class="yellow">pushes it towards Arabian Revivalism,</span> since such an intermingling of slavery and faith fascinates them.`
+ },
+ ]],
+ ["FSRomanRevivalist", [
+ {
+ fs: "FSPaternalist",
+ msg: `The arcology's Roman Revivalist culture <span class="yellow">pushes it towards Paternalism,</span> since some Roman slaves were traditionally permitted limited rights.`
+ },
+ ]],
+ ["FSNeoImperialist", [
+ {
+ fs: "FSRestart",
+ msg: `The arcology's Neo-Imperialist culture <span class="yellow">pushes it towards Eugenics,</span> since their hegemonic, noble culture naturally views itself as genetically superior to the unwashed masses.`
+ },
+ ]],
+ ["FSAztecRevivalist", [
+ {
+ fs: "FSDegradationist",
+ msg: `The arcology's Aztec Revivalist culture <span class="yellow">pushes it towards Degradation,</span> since most Aztec war slaves were tortured and sacrificed.`
+ },
+ ]],
+ ["FSEgyptianRevivalist", [
+ {
+ fs: "FSChattelReligionist",
+ msg: `The arcology's Egyptian Revivalist culture <span class="yellow">pushes it towards Chattel Religionism,</span> since worship is already becoming an established part of its life.`
+ },
+ {
+ fs: "FSIncestFetishist",
+ msg: `The arcology's Egyptian Revivalist culture <span class="yellow">pushes it towards Incest Fetishism,</span> since more incest is only a good thing in its eyes.`
+ },
+ ]],
+ ["FSEdoRevivalist", [
+ {
+ fs: "FSSlimnessEnthusiast",
+ msg: `The arcology's Edo Revivalist culture <span class="yellow">pushes it towards Slimness Enthusiasm,</span> since slim and elegant slaves are already fashionable there.`
+ },
+ ]],
+ ["FSArabianRevivalist", [
+ {
+ fs: "FSChattelReligionist",
+ msg: `The arcology's Arabian Revivalist culture <span class="yellow">pushes it towards Chattel Religionism,</span> since the word of God is already a matter of daily significance there.`
+ },
+ ]],
+ ["FSChineseRevivalist", [
+ {
+ fs: "FSSlaveProfessionalism",
+ msg: `The arcology's Chinese Revivalist culture <span class="yellow">pushes it towards Slave Professionalism,</span> since well-educated, dispassionate slave leaders are more effective.`
+ },
+ {
+ fs: "FSPaternalist",
+ msg: `The arcology's Chinese Revivalist culture <span class="yellow">pushes it towards Paternalism,</span> since traditional beliefs about duty and order have become accepted.`
+ },
+ ]],
+ ]);
+ const validChoice = /** @param {crossFSDest} dest */ (dest) => validFSes.includes(dest.fs) && (!dest.prereqs || dest.prereqs());
+ const candidates = [];
+ for (const [source, destArray] of crossFS) {
+ if (arc[source] > random(50, 200)) {
+ for (const dest of destArray) {
+ if (Array.isArray(dest)) {
+ // pick one at random
+ const choice = dest.filter(x => validChoice(x)).random();
+ if (choice) {
+ candidates.push(choice);
+ break; // only select one dest per source
+ }
+ } else if (validChoice(dest)) {
+ candidates.push(dest);
+ break; // only select one dest per source
+ }
+ }
}
}
- if (arc.FSChineseRevivalist > random(50, 200)) {
- if (validFSes.includes("FSPaternalist")) {
- r.push(`The arcology's Chinese Revivalist culture <span class="yellow">pushes it towards Paternalism,</span> since traditional beliefs about duty and order have become accepted.`);
- arc.FSPaternalist = 5;
- return;
- }
+ if (candidates.length > 0) {
+ const candidate = candidates.random();
+ r.push(candidate.msg);
+ arc[candidate.fs] = 5;
+ return;
}
/* NEIGHBOR ADOPTION*/
+ const influencedBy = [];
+ const aligned = [];
+ const opposed = [];
+ const usableCandidates = [];
for (const arc2 of V.arcologies) {
if (arc.direction !== arc2.direction) {
let influenceBonus = 0;
if (arc.direction === arc2.influenceTarget) {
- r.push(`${arc2.name}'s directed cultural influence gives it some input over ${arc.name}'s choice of direction.`);
+ influencedBy.push(arc2.name);
influenceBonus = 20;
}
const opinion = App.Neighbor.opinion(arc, arc2);
if (opinion >= 50) {
- r.push(`${arc.name} is aligned with ${arc2.name} socially, encouraging it to consider adopting all its cultural values.`);
+ aligned.push(arc2.name);
influenceBonus += opinion - 50;
} else if (opinion <= -50) {
- r.push(`${arc.name} is culturally opposed to ${arc2.name}, encouraging it to resist adopting its cultural values.`);
+ opposed.push(arc2.name);
influenceBonus += opinion + 50;
}
+ if (arc2.direction === 0 && V.baseDifficulty < 3) {
+ // 10 points of bonus influence for player per level below normal
+ influenceBonus += (3 - V.baseDifficulty) * 10;
+ } else if (arc2.rival === 1 && V.baseDifficulty > 3) {
+ // 10 points of bonus influence for rival per level above normal
+ influenceBonus += (V.baseDifficulty - 3) * 10;
+ }
+
for (const candidate of validFSes) {
- if (candidate === "FSSubjugationist") {
- if ((arc.FSSupremacist === "unset") || (arc.FSSupremacistRace !== arc2.FSSubjugationistRace)) {
- if (arc2.FSSubjugationist > random(0, 200) - influenceBonus) {
- r.push(`It <span class="yellow">adopts ${arc2.FSSubjugationistRace} Subjugation</span> due to influence from its trading partner ${arc2.name}.`);
- arc.FSSubjugationist = 5;
- arc.FSSubjugationistRace = arc2.FSSubjugationistRace;
- return;
+ if (arc2[candidate] > random(0, 200) - influenceBonus) {
+ // equal weight by default (at normal difficulty, or the arc is neither player nor rival)
+ usableCandidates.push({arc2, candidate});
+ if (arc2.direction === 0) {
+ // easier than normal: player FS gets bonus chance
+ if (V.baseDifficulty < 3) {
+ usableCandidates.push({arc2, candidate});
}
- }
- } else if (candidate === "FSSupremacist") {
- if ((arc.FSSubjugationist === "unset") || (arc.FSSubjugationistRace !== arc2.FSSupremacistRace)) {
- if (arc2.FSSupremacist > random(0, 200) - influenceBonus) {
- r.push(`It <span class="yellow">adopts ${arc2.FSSupremacistRace} Supremacy</span> due to influence from its trading partner ${arc2.name}.`);
- arc.FSSupremacist = 5;
- arc.FSSupremacistRace = arc2.FSSupremacistRace;
- return;
+ // very easy: player FS gets another bonus chance
+ if (V.baseDifficulty < 2) {
+ usableCandidates.push({arc2, candidate});
+ }
+ } else if (arc2.rival > 0) {
+ // harder than normal: rival FS gets bonus chance
+ if (V.baseDifficulty > 3) {
+ usableCandidates.push({arc2, candidate});
+ }
+ // nightmare: rival FS gets another bonus chance
+ if (V.baseDifficulty > 4) {
+ usableCandidates.push({arc2, candidate});
}
- }
- } else {
- if (arc2[candidate] > random(0, 200) - influenceBonus) {
- r.push(`It <span class="yellow">adopts ${FutureSocieties.displayName(candidate)}</span> due to influence from its trading partner ${arc2.name}.`);
- arc[candidate] = 5;
- return;
}
}
}
}
}
+ if (influencedBy.length > 0) {
+ r.push(`Directed cultural influence from ${toSentence(influencedBy)} gives ${influencedBy.length > 1 ? 'them' : 'it'} some input over ${arc.name}'s choice of direction.`);
+ }
+ if (aligned.length > 0) {
+ r.push(`${arc.name} is aligned with ${toSentence(aligned)} socially, encouraging it to consider adopting more of ${aligned.length > 1 ? 'their' : 'its'} cultural values.`);
+ }
+ if (opposed.length > 0) {
+ r.push(`${arc.name} is culturally opposed with ${toSentence(opposed)} socially, encouraging it to resist adopting ${opposed.length > 1 ? 'their' : 'its'} cultural values.`);
+ }
+ if (usableCandidates.length > 0) {
+ const chosen = usableCandidates.random();
+ if (chosen.candidate === "FSSubjugationist") {
+ r.push(`It <span class="yellow">adopts ${chosen.arc2.FSSubjugationistRace} Subjugation</span> due to influence from its trading partner ${chosen.arc2.name}.`);
+ arc.FSSubjugationist = 5;
+ arc.FSSubjugationistRace = chosen.arc2.FSSubjugationistRace;
+ } else if (chosen.candidate === "FSSupremacist") {
+ r.push(`It <span class="yellow">adopts ${chosen.arc2.FSSupremacistRace} Supremacy</span> due to influence from its trading partner ${chosen.arc2.name}.`);
+ arc.FSSupremacist = 5;
+ arc.FSSupremacistRace = chosen.arc2.FSSupremacistRace;
+ } else {
+ r.push(`It <span class="yellow">adopts ${FutureSocieties.displayName(chosen.candidate)}</span> due to influence from its trading partner ${chosen.arc2.name}.`);
+ arc[chosen.candidate] = 5;
+ }
+ return;
+ }
/* RANDOM ADOPTION*/
if (random(0, 4) === 1) {
diff --git a/src/endWeek/economics/persBusiness.js b/src/endWeek/economics/persBusiness.js
index 50dbd9cff67f3d7118ea1eb07e157f62540f94e6..ad5172e4019b29373974f4cb7acf603d688a62cd 100644
--- a/src/endWeek/economics/persBusiness.js
+++ b/src/endWeek/economics/persBusiness.js
@@ -61,16 +61,8 @@ App.EndWeek.personalBusiness = function() {
}
}
}
- if (V.PC.health.shortDamage >= 30) {
- endWeekHealthDamage(V.PC);
- r.push(`The injuries received in the recent battle prevents you from engaging in tiring endeavors.`);
- if (V.PC.health.shortDamage >= 51) {
- r.push(`Your trusted physician believes it will still take a few weeks to fully recover.`);
- } else if (V.PC.health.shortDamage >= 39) {
- r.push(`You are starting to feel better. It's very likely you will be back to full working order within the next week.`);
- } else {
- r.push(`You have finally recovered from your injuries.`);
- }
+ if (onBedRest(V.PC, true) && V.PC.dick < -4000) { // Impossible condition to prevent scope creep. Need to finish this later, not right now.
+ r.push(`You can't tend to your personal affairs right now. Why? You'll find out when this stops being a placeholder.`);
} else if (V.personalAttention.task === PersonalAttention.WHORING) {
income = random(2000, 4500);
if (V.PC.belly >= 1500) {
@@ -556,7 +548,7 @@ App.EndWeek.personalBusiness = function() {
}
*/
- if (V.PC.health.shortDamage < 30) {
+ if (V.PC.actualAge > 3) { // Always true for now. Need to finish this later, using the following as the condition. (!onBedRest(V.PC, true))
let oldSkill;
switch (V.personalAttention.task) {
case PersonalAttention.TRADE:
@@ -1259,8 +1251,12 @@ App.EndWeek.personalBusiness = function() {
}
App.Events.addParagraph(el, r);
- if (V.SF.Toggle && V.SF.Active >= 1) {
- el.append(App.Mods.SF.AAR()[0]);
+ if (V.SF.Toggle) {
+ if (V.SF.Active >= 1) {
+ el.append(App.Mods.SF.AAR()[0]);
+ } else if (V.SF.FS.Tension > 100) {
+ el.append(App.Mods.SF.fsIntegration.crisis()[0]);
+ }
}
return el;
};
diff --git a/src/endWeek/economics/personalNotes.js b/src/endWeek/economics/personalNotes.js
index dc9f14c73c4e5bdb0a4b1032edda83445f186b80..cfa10672ce78e75ca72b1ace1686e036d02d0685 100644
--- a/src/endWeek/economics/personalNotes.js
+++ b/src/endWeek/economics/personalNotes.js
@@ -36,7 +36,7 @@ App.EndWeek.personalNotes = function() {
App.Events.addParagraph(el, r);
r = [];
-
+
if (V.useTabs === 1) {
App.UI.DOM.appendNewElement("h2", el, `Diet`);
}
@@ -50,6 +50,7 @@ App.EndWeek.personalNotes = function() {
}
r.push(App.EndWeek.Player.longTermEffects());
+ r.push(App.EndWeek.Player.mobility());
App.Events.addParagraph(el, r);
r = [];
@@ -57,9 +58,12 @@ App.EndWeek.personalNotes = function() {
if (V.useTabs === 1) {
App.UI.DOM.appendNewElement("h2", el, `Drugs`);
}
- // r.push(App.EndWeek.Player.drugs());
-
+ r.push(App.EndWeek.Player.drugs());
+ if (V.useTabs === 1) {
+ App.UI.DOM.appendNewElement("h2", el, `Health`);
+ }
+ r.push(App.EndWeek.Player.health());
App.Events.addParagraph(el, r);
return el;
diff --git a/src/endWeek/economics/reputation.js b/src/endWeek/economics/reputation.js
index de6e1493a4ca0e41a0a756c893cd8154ba4436f8..c0d5ab2cedab09ebb578f7f1d5de3e1911cda954 100644
--- a/src/endWeek/economics/reputation.js
+++ b/src/endWeek/economics/reputation.js
@@ -344,7 +344,7 @@ App.EndWeek.reputation = function() {
sfArray.push(`portion of ${V.SF.Lower} to <span class="green">undercover work, slightly boosts your reputation.</span>`);
App.Events.addNode(el, sfArray, "div");
repX(V.SF.ArmySize * (V.SF.UC.Assign === 1 ? 0.05 : 0.25), "specialForces");
- } else if (V.SF.FS.BadOutcome === "ISOLATION") {
+ } else if (V.SF.Toggle && V.SF.FS.Tension > 100 && App.Mods.SF.fsIntegration.crisis()[1] === "ISOLATION") {
r.push(App.UI.DOM.makeElement("div", `Your citizens are <span class="red">very displeased</span> that you are hosting a legion of heavily armed squatters in your basement.`));
repX(forceNeg(V.SF.ArmySize + App.Mods.SF.upgrades.total()), "specialForces");
}
@@ -446,7 +446,7 @@ App.EndWeek.reputation = function() {
repX(forceNeg(10 * V.PC.buttImplant), "PCappearance");
}
if (V.PC.ballsImplant > 0) {
- r.push(`Society finds everything unnatural disgusting and the grotesque bulge in your crotch is no exception; your gel filled balls <span class="red">harm</span> your public image.`);
+ r.push(`Society finds everything unnatural disgusting and the grotesque bulge in your crotch is no exception; your gel-filled balls <span class="red">harm</span> your public image.`);
repX(forceNeg(10 * V.PC.ballsImplant), "PCappearance");
}
if (V.arcologies[0].FSRepopulationFocus !== "unset" && V.PC.boobs >= 1000 && V.PC.boobsImplant === 0) {
@@ -825,7 +825,7 @@ App.EndWeek.reputation = function() {
let care;
if (V.citizenOrphanageTotal > 0) {
if (V.arcologies[0].FSPaternalist !== "unset") {
- r.push(`The public <span class="green">approves</span> of the way you're providing for ${V.citizenOrphanageTotal} of your slaves' children to be raised as citizens.`);
+ r.push(`The public <span class="green">approves</span> of the way you're providing for ${num(V.citizenOrphanageTotal)} of your slaves' children to be raised as citizens.`);
FutureSocieties.Change("Paternalist", V.citizenOrphanageTotal);
if (V.privateOrphanageTotal > 0) {
r.push(`Raising ${num(V.privateOrphanageTotal)} of your slaves' children privately is considered even more <span class="green">impressive.</span>`);
@@ -833,7 +833,7 @@ App.EndWeek.reputation = function() {
FutureSocieties.Change("Paternalist", care);
}
} else if (V.arcologies[0].FSDegradationist !== "unset") {
- r.push(`The public <span class="red">disapproves</span> of the way you're providing for ${V.citizenOrphanageTotal} of your slaves' children to be raised as citizens.`);
+ r.push(`The public <span class="red">disapproves</span> of the way you're providing for ${num(V.citizenOrphanageTotal)} of your slaves' children to be raised as citizens.`);
care = -V.citizenOrphanageTotal;
FutureSocieties.Change("Degradationist", care);
if (V.privateOrphanageTotal > 0) {
diff --git a/src/endWeek/endWeek.js b/src/endWeek/endWeek.js
index c89e7c90f63cc67feac142aab4152544489d876a..f8de7f61d1d73df7d5a515cfa52c49b8db27224d 100644
--- a/src/endWeek/endWeek.js
+++ b/src/endWeek/endWeek.js
@@ -17,9 +17,6 @@ globalThis.endWeek = (function() {
}
setUseWeights();
saveWeekTotals();
- if (V.secExpEnabled > 0) {
- V.SecExp.war = {foughtThisWeek: 0, type: ""};
- }
// pass time for objects that need it
weather();
@@ -237,14 +234,14 @@ globalThis.endWeek = (function() {
} else if (V.PC.preg > 0) {
V.PC.sexualEnergy -= 1;
} else {
- if (V.PC.fertDrugs === 1) {
+ if (V.PC.drugs === "fertility supplements") {
V.PC.sexualEnergy++;
}
if (V.PC.forcedFertDrugs > 0) {
V.PC.sexualEnergy += 2;
}
}
- if (V.PC.staminaPills > 0) {
+ if (V.PC.drugs === "stamina enhancers") {
V.PC.sexualEnergy += 2;
}
if (V.PC.preg > 0) {
@@ -257,7 +254,6 @@ globalThis.endWeek = (function() {
} else if (V.PC.belly > 500) {
V.PC.belly *= 0.75;
}
- V.PC.fertDrugs = 0;
} else if (V.PC.belly > 0) {
if (V.PC.belly < 100) {
V.PC.belly = 0;
diff --git a/src/endWeek/events/expire.js b/src/endWeek/events/expire.js
index ae4c1c1eabd32e598a5b11a53528cd0de57d273e..d6ada8f9e70beba1f5a906ef9a41df9c27874758 100644
--- a/src/endWeek/events/expire.js
+++ b/src/endWeek/events/expire.js
@@ -57,14 +57,12 @@ App.Events.SEExpiration = class SEExpiration extends App.Events.BaseEvent {
}
r.push(App.UI.DOM.combineNodes(App.UI.DOM.slaveDescriptionDialog(slave, slave.slaveName), `'s indentured servitude is ending this week, meaning that your arcology is gaining a citizen.`));
- V.lowerClass += 1;
+ V.lowerClass++;
let seed = 0;
- for (let seeXp = 0; seeXp < V.slaves.length; seeXp++) {
- if (V.slaves[seeXp].devotion <= 20) {
- seed = 1;
- V.slaves[seeXp].devotion -= 1;
- }
+ for (const seeXp of V.slaves.filter(s => s.devotion <= 20)) {
+ seed = 1;
+ seeXp.devotion--;
}
if (seed === 1) {
r.push(`Those of your slaves who are unhappy with their lives under you are <span class="mediumorchid">envious or angry</span> to see ${him} become free, according to their individual natures.`);
@@ -76,14 +74,9 @@ App.Events.SEExpiration = class SEExpiration extends App.Events.BaseEvent {
slave.indenture = 52;
let cost = slaveCost(slave);
- if (slave.fetish === "mindbroken") {
- r.push(`Since ${he} is mindbroken, there is precisely no chance that ${he} will be able to look after ${himself}. ${He}`);
- if (hasAnyLegs(slave)) {
- r.push(`stands`);
- } else {
- r.push(`sits`);
- }
- r.push(`before you dumbly, betraying no reaction to the prospect of becoming free from sexual slavery. In situations like this, it is perfectly acceptable to subject ${him} to another indenture for ${his} own good.`);
+ if (slave.fetish === Fetish.MINDBROKEN) {
+ r.push(`Since ${he} is mindbroken, there is precisely no chance that ${he} will be able to look after ${himself}.`);
+ r.push(`${He} ${hasAnyLegs(slave) ? 'stands' : 'sits'} before you dumbly, betraying no reaction to the prospect of becoming free from sexual slavery. In situations like this, it is perfectly acceptable to subject ${him} to another indenture for ${his} own good.`);
if (V.cash > 1000) {
App.UI.DOM.appendNewElement("div", result, App.UI.DOM.link(
@@ -97,7 +90,7 @@ App.Events.SEExpiration = class SEExpiration extends App.Events.BaseEvent {
`This costs ${cashFormat(1000)}`
));
} else {
- App.UI.DOM.appendNewElement("div", result, `You cannot afford to do this`, "note");
+ App.UI.DOM.appendNewElement("div", result, `You cannot afford to do this`, ["note"]);
}
} else if ((slave.relationship < -1) && (slave.devotion > 95) && (slave.trust > 95)) {
r.push(`${He} has been trying desperately hard not to think about this trying situation, but when ${he} comes before you on the day of ${his} indenture's expiration, ${he} can ignore it no longer. ${He}`);
@@ -124,20 +117,11 @@ App.Events.SEExpiration = class SEExpiration extends App.Events.BaseEvent {
r.push(`${He}'s beside ${himself} with joy when you accept ${his} plea and enslave ${him}. ${He}'s given you the finest proof of loyalty a slave possibly can, having tasted a moment of freedom under the law, and thrown it away with utter contempt.`);
if (hasAnyEyes(slave)) {
r.push(`${His} ${App.Desc.eyesColor(slave)}`);
- if (hasBothEyes(slave)) {
- if (canSee(slave)) {
- r.push(`watch you`);
- } else {
- r.push(`are wide`);
- }
+ if (canSee(slave)) {
+ r.push(`${hasBothEyes(slave) ? 'watch' : 'watches'} you with`);
} else {
- if (canSee(slave)) {
- r.push(`watches you`);
- } else {
- r.push(`is wide`);
- }
+ r.push(`${hasBothEyes(slave) ? 'are' :'is'} wide with`);
}
- r.push(`with`);
} else {
r.push(`${His} face shows`);
}
@@ -153,19 +137,14 @@ App.Events.SEExpiration = class SEExpiration extends App.Events.BaseEvent {
`This costs ${cashFormat(1000)}`
));
} else {
- App.UI.DOM.appendNewElement("div", result, `You cannot afford to do this`, "note");
+ App.UI.DOM.appendNewElement("div", result, `You cannot afford to do this`, ["note"]);
}
} else if ((slave.devotion > 50) && (slave.trust > 50)) {
cost = Math.trunc((cost * 0.5) / 500) * 500;
cost = Math.clamp(cost, minimumSlaveCost(), 100000);
r.push(`${His} feelings on this are quite mixed, since ${he} has come to feel that ${he} has a place under you.`);
- if (!hasAnyLegs(slave)) {
- r.push(`Propped up`);
- } else {
- r.push(`Standing before you`);
- }
- r.push(`at the moment of ${his} scheduled emancipation, ${he} seems to be struggling to express ${himself}.`);
+ r.push(`${!hasAnyLegs(slave) ? 'Propped up' : 'Standing before you'} at the moment of ${his} scheduled emancipation, ${he} seems to be struggling to express ${himself}.`);
if (!canTalk(slave)) {
r.push(`${He} does ${his} best to communicate a willingness to remain your slave, indicating that ${he} wouldn't press too hard about the price if you offered ${him} another indenture.`);
} else {
@@ -186,16 +165,11 @@ App.Events.SEExpiration = class SEExpiration extends App.Events.BaseEvent {
`This costs ${cashFormat(cost)}`
));
} else {
- App.UI.DOM.appendNewElement("div", result, `You cannot afford to do this`, "note");
+ App.UI.DOM.appendNewElement("div", result, `You cannot afford to do this`, ["note"]);
}
} else if ((slave.devotion >= -20) && (slave.trust > 20)) {
r.push(`${He} approaches the moment with calculation, since ${he} has found more of a place in slavery than ${he} probably expected when ${he} became an indentured servant.`);
- if (!hasAnyLegs(slave)) {
- r.push(`Propped up`);
- } else {
- r.push(`Standing before you`);
- }
- r.push(`at the moment of ${his} scheduled emancipation, ${he} seems willing to consider a short term continuation of service.`);
+ r.push(`${!hasAnyLegs(slave) ? 'Propped up' : 'Standing before you'} at the moment of ${his} scheduled emancipation, ${he} seems willing to consider a short term continuation of service.`);
if (V.cash > cost) {
App.UI.DOM.appendNewElement("div", result, App.UI.DOM.link(
@@ -209,7 +183,7 @@ App.Events.SEExpiration = class SEExpiration extends App.Events.BaseEvent {
`This costs ${cashFormat(cost)}`
));
} else {
- App.UI.DOM.appendNewElement("div", result, `You cannot afford to do this`, "note");
+ App.UI.DOM.appendNewElement("div", result, `You cannot afford to do this`, ["note"]);
}
} else {
r.push(`${He} makes no effort at all to conceal ${his} joy at being a free ${woman} again.`);
@@ -224,8 +198,8 @@ App.Events.SEExpiration = class SEExpiration extends App.Events.BaseEvent {
}
App.Events.addNode(desc, r);
App.UI.DOM.appendNewElement("h3", el, `Final notes?`);
- const note = App.UI.DOM.appendNewElement("div", el, null, "note");
- App.UI.DOM.appendNewElement("div", note, `${His} most recent task was to ${(V.assignmentRecords[slave]) ? `${slave.assignment}, and before that to ${V.assignmentRecords[slave]}` : slave.assignment}.`, "indent");
+ const note = App.UI.DOM.appendNewElement("div", el, null, ["note"]);
+ App.UI.DOM.appendNewElement("div", note, `${His} most recent task was to ${(V.assignmentRecords[slave]) ? `${slave.assignment}, and before that to ${V.assignmentRecords[slave]}` : slave.assignment}.`, ["indent"]);
note.append(slaveImpactLongTerm(slave));
return el;
@@ -233,7 +207,7 @@ App.Events.SEExpiration = class SEExpiration extends App.Events.BaseEvent {
function keepSlave(cost) {
cashX(forceNeg(cost), "slaveTransfer", slave);
that.actors.delete(slave.ID);
- V.lowerClass -= 1;
+ V.lowerClass--;
}
}
}
diff --git a/src/endWeek/events/retire.js b/src/endWeek/events/retire.js
index f021a76667985ece14617bd67d42dfb53c917c2c..718ae9120b4ae78d49291520ab964a0a5bf77463 100644
--- a/src/endWeek/events/retire.js
+++ b/src/endWeek/events/retire.js
@@ -18,7 +18,7 @@ App.Events.SERetire = class SERetire extends App.Events.BaseEvent {
for (const id of this.actors) {
const slave = getSlave(id);
if (slave) {
- App.UI.DOM.appendNewElement("div", node, retireScene(slave));
+ App.UI.DOM.appendNewElement("div", node, App.Events.retire(slave));
node.append(sectionBreak());
}
}
@@ -35,7 +35,7 @@ App.Events.SERetire = class SERetire extends App.Events.BaseEvent {
* @param {App.Entity.SlaveState} originalSlave
* @param {App.Art.SlaveArtBatch} [artRenderer]
*/
-globalThis.retireScene = function(originalSlave, artRenderer) {
+App.Events.retire = function(originalSlave, artRenderer) {
const el = new DocumentFragment();
const slave = clone(originalSlave);
removeSlave(originalSlave);
@@ -80,7 +80,7 @@ globalThis.retireScene = function(originalSlave, artRenderer) {
r.push(`${He} is retiring into citizenship, with a substantial annuity that will provide ${him} with a secure if not luxurious life.`);
if (slave.relationship === -3) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Sadly, ${he} is not mentally equipped to look after ${himself}, but the arcology hosts several fine institutions capable of caring for ${him}. They'll have someone check in on ${him} daily. ${Him} being your ${wife} is ultimately irrelevant; ${he} never realized it in the first place.`);
} else if (slave.devotion + slave.trust >= 175) {
r.push(`${He} wishes ${he} could continue to be your slave ${wife}, but ${he} understands that marriages between slaves and slaveowners are predicated on the slave relationship. ${He} knows that ${his} retirement has come, meaning that ${his} slave relationship to you is ending. ${He}'s had a long time to get used to the idea, and gets through the process with dignity, doing ${his} best to avoid embarrassing you.`);
@@ -91,7 +91,7 @@ globalThis.retireScene = function(originalSlave, artRenderer) {
} else {
r.push(`${He} is glad ${he} no longer has to be your slave ${wife}, as ${he} never wanted to be in the first place. ${He} understands that marriages between slaves and slaveowners are predicated on the slave relationship. ${He} knows that ${his} retirement has come, meaning that ${his} slave relationship to you is ending. ${He}'s had a long time to get used to the idea, and gets through the process dutifully, doing ${his} best to avoid embarrassing you.`);
}
- } else if (slave.fetish === "mindbroken" || slave.actualAge < 3) {
+ } else if (slave.fetish === Fetish.MINDBROKEN || slave.actualAge < 3) {
r.push(`Sadly, ${he} is not mentally equipped to look after ${himself}, but the arcology hosts several fine institutions capable of caring for ${him}. They'll have someone check in on ${him} daily.`);
} else if (slave.devotion > 95) {
r.push(`${He} desperately wishes ${he} could continue to be your sex slave, but ${he} understands that ${his} retirement has come. More importantly, ${he}'s had a long time to get used to the idea, and gets through the process with resolution, doing ${his} best to avoid embarrassing ${himself} or you.`);
@@ -126,7 +126,7 @@ globalThis.retireScene = function(originalSlave, artRenderer) {
pornFame = pornFame.replace("$He is world famous for $his career in slave pornography. Millions are intimately familiar with", "enjoy");
pornFame = pornFame.replace(".", ",");
r.push(`In addition to ${his} annuity, you've laid the groundwork for ${him} to become wealthy by the way you publicized pornography of ${him}. Many thousands of people across the world are willing to pay to ${pornFame} and they enjoy it in part because ${he} doesn't mind it, either. ${He}'s in a position to make great money for doing on camera what ${he} would probably do anyway.`);
- } else if ((slave.intelligence + slave.intelligenceImplant >= -50) && (slave.muscles > 5) && (slave.skill.combat >= 1) && hasAllLimbs(slave) && (slave.face > 10)) {
+ } else if ((slave.intelligence + slave.intelligenceImplant >= -50) && (slave.muscles > 5) && (slave.skill.combat > 60) && hasAllLimbs(slave) && (slave.face > 10)) {
r.push(`${He}'s pretty and deadly. If ${he} feels ${he} prefers wealth and danger to living on ${his} annuity, ${he}'ll have no trouble finding work. In fact, ${he}'ll likely have trouble sifting through all the mercenary organizations, businesses in need of attractive and competent guards for public spaces, and citizens looking for effective bodyguards willing to hire ${him}.`);
} else if ((slave.intelligence + slave.intelligenceImplant > 50) && (slave.intelligenceImplant >= 15)) {
r.push(`${He} has no skills extraordinary enough to bring prospective employers in search of ${him}, in this new, slaveowning economy, but ${he} is highly intelligent, educated, and has a small income. As you know from your own abundant personal experience, ${his} intelligence is a lever, ${his} annuity is a fulcrum, and with the two, ${he} may move the world someday. You have no doubt that, at the very least, ${he} will be far from the poorest of your citizens.`);
@@ -134,7 +134,7 @@ globalThis.retireScene = function(originalSlave, artRenderer) {
App.Events.addParagraph(desc, r);
r = [];
r.push(`As ${he} takes ${his} leave, heading the short distance down to ${his} modest little apartment, ${he} presents a strange appearance. ${He}'s wearing cheap but not unattractive clothing, and you are struck by a crystal-clear mental image of what ${he} looks like nude.`);
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.devotion > 20) {
if (slave.devotion > 95) {
r.push(`${He}'s doing ${his} absolute best not to sob, but ${his} lips are quivering.`);
@@ -157,7 +157,7 @@ globalThis.retireScene = function(originalSlave, artRenderer) {
r = [];
if (slave.relationship === -3) {
r.push(`When you return to your desk you realize something.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`The ring ${he} wore when ${he} was your slave ${wife} is nowhere to be seen; ${he}'s likely forgotten ${he} was wearing it, but no matter: you can always get more.`);
} else if (slave.devotion + slave.trust >= 175) {
r.push(`The ring ${he} wore when ${he} was your slave ${wife} is nowhere to be seen; ${he}'s likely taken it with ${him} to remember you by.`);
@@ -208,7 +208,7 @@ globalThis.retireScene = function(originalSlave, artRenderer) {
r.push(`When ${he} knows ${he} has your attention, ${he} produces the steel ring that ${he} wore when ${he} was your slave ${wife}. ${He} doesn't put it on, but ${he} kisses it suggestively before putting it back in ${his} purse.`);
}
}
- if (slave.fetish === "submissive" && slave.fetishKnown === 1) {
+ if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishKnown === 1) {
r.push(`Taking the lead as you know ${he} prefers, you lead ${him} to a private booth and make love to ${him}, holding ${him} down with the gentle but firm grip that never fails to bring ${him} through a long and gasping climax.`);
} else if (slave.fetish === "cumslut" && slave.fetishKnown === 1) {
r.push(`${He}`);
@@ -346,7 +346,7 @@ globalThis.retireScene = function(originalSlave, artRenderer) {
r.push(`the relentless sodomy forcing semen out of ${his} distended balls,`);
}
r.push(`and the milk flowing into the milkers tugging at ${his} painfully engorged nipples.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He}'s already broken in spirit, and ${he} complies with ${his} installation into a milking machine with the dumb obedience of the animal ${he} has become.`);
} else if (slave.devotion > 20) {
r.push(`${He} complies with ${his} installation into a milking machine with the dumb obedience of someone whose mind will not allow them to understand their true situation out of simple immediate self-preservation.`);
@@ -391,7 +391,7 @@ globalThis.retireScene = function(originalSlave, artRenderer) {
r.push(`vagina,`);
}
r.push(`anus, and throat, and the drug-induced haze that will leave ${him} no choice but to orgasm when ${he} is penetrated.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He}'s already broken in spirit, and ${he} complies with the conversion process with the dumb obedience of the animal ${he} has become.`);
} else if (slave.devotion > 20) {
r.push(`${He} complies with the conversion process with the dumb obedience of someone whose mind will not allow them to understand their true situation out of simple immediate self-preservation.`);
diff --git a/src/endWeek/facilityLeaderSex.js b/src/endWeek/facilityLeaderSex.js
index bc82fd9e9d2e8a3fa0a51d907594bc587745b69c..87042d77f852e1d623aa6d4b71558b657aedf42d 100644
--- a/src/endWeek/facilityLeaderSex.js
+++ b/src/endWeek/facilityLeaderSex.js
@@ -37,7 +37,7 @@ App.EndWeek.getFLSex = function(facility) {
/** @type {Set<number>} */
const employeeSex = new Set();
const fl = facility.manager ? facility.manager.currentEmployee : null;
- if (fl && App.Data.misc.sexFromDevelopmentLeaders.includes[fl.assignment]) {
+ if (fl && App.Data.misc.sexFromDevelopmentLeaders.includes(fl.assignment)) {
facility.employees().filter(s => flWillFuck(s)).forEach(s => employeeSex.add(s.ID));
}
return employeeSex;
@@ -45,7 +45,7 @@ App.EndWeek.getFLSex = function(facility) {
/** @param {App.Entity.SlaveState} emp */
function flWillFuck(emp) {
const horny = (s) => s.devotion >= -50 /* not unhappy */ && s.energy > 20/* not frigid */;
- if (fl.assignment === Job.WARDEN && fl.fetish === "mindbroken") {
+ if (fl.assignment === Job.WARDEN && fl.fetish === Fetish.MINDBROKEN) {
return true; // mindbroken warden ignores rules, rapes everyone
}
if (fl.assignment === Job.NURSE && App.EndWeek.getClinicPartner(emp).type !== "nurse") {
diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index 786c67886632c4422c9f56752ec0fe400ea85c9b..6099b17b53fd284c8eae5d4f96499caaae9c3f43 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -167,6 +167,13 @@ globalThis.illness = function(slave) {
r += ` ${He} has <span class="health dec">caught ${addA(sicknessDegree[H.illness])}</span> from ${his} ${relationshipTerm(rel)} ${rel.slaveName}.`;
}
}
+ } else if (H.illness === 0 && slave.relationship === -3) {
+ if (V.PC.health.illness > 1) {
+ if (catchesIllness(10)) {
+ H.illness = V.PC.health.illness - 1; // reduced severity
+ r += ` ${He} has <span class="health dec">caught ${addA(sicknessDegree[H.illness])}</span> from you.`;
+ }
+ }
}
// or she might catch something from a sick coworker
const job = App.Utils.jobForAssignment(slave.assignment);
@@ -180,6 +187,14 @@ globalThis.illness = function(slave) {
}
}
}
+ if (H.illness === 0 && [Job.FUCKTOY, Job.MASTERSUITE, Job.CONCUBINE].includes(slave.assignment)) {
+ if (V.PC.health.illness > 1) {
+ if (catchesIllness(20)) {
+ H.illness = V.PC.health.illness - 1; // reduced severity
+ r += ` ${He} has <span class="health dec">caught ${addA(sicknessDegree[H.illness])}</span> from you.`;
+ }
+ }
+ }
}
} else if (H.illness > 0) {
if (jsRandom(1, 100) > 75 && H.illness === 1 && curativesBonus < 2 && slave.assignment !== Job.CLINIC && V.week > 8) {
@@ -196,7 +211,7 @@ globalThis.illness = function(slave) {
};
/** Determine whether a given slave can catch an illness at all, so we don't have to check chances.
- * @param {App.Entity.SlaveState} slave
+ * @param {FC.HumanState} slave
* @returns {boolean}
*/
globalThis.canCatchIllness = function(slave) {
@@ -206,11 +221,13 @@ globalThis.canCatchIllness = function(slave) {
if (slave.health.illness > 0) { // already sick
return false;
}
- if (slave.curatives === 1 || slave.inflationType === "curative") { // on preventatives, or inflated with curatives
- return false;
- }
- if (slave.assignment === Job.CLINIC) { // slaves in the clinic are monitored
- return false;
+ if (slave.ID !== -1) {
+ if (slave.curatives === 1 || slave.inflationType === "curative") { // on preventatives, or inflated with curatives
+ return false;
+ }
+ if (slave.assignment === Job.CLINIC) { // slaves in the clinic are monitored
+ return false;
+ }
}
return true;
};
@@ -229,7 +246,7 @@ globalThis.hasOutsideContact = function(slave) {
};
/** Once a new illness is rolled this determines how bad it is initially, chem levels seriously increase the chances of a higher initial value. Health also factors in with weakened slaves being more likely to catch ill.
- * @param {App.Entity.SlaveState} slave
+ * @param {FC.HumanState} slave
*/
globalThis.getIll = function(slave) {
const H = slave.health;
@@ -303,12 +320,15 @@ globalThis.nurseEffectiveness = function(slave) {
*/
globalThis.endWeekHealthDamage = function(slave) {
const H = slave.health;
+ let illnessToCondition = 0;
let chemToShort = 0;
+ let chemToLong = 0;
+ let shortRecovery = 0;
let shortToCondition = 0;
let shortToLong = 0;
// Checking if we are dealing with the player
- // Player does not make use of most things slaves deal with, only short to long term damage
+ // Player is the testbed for a new long/short damage system
if (slave.ID !== -1) {
// dealing with carcinogens
// They decay naturally at a rate of 10%, but at as they decay cause short term damage
@@ -331,45 +351,119 @@ globalThis.endWeekHealthDamage = function(slave) {
if (slave.birthWeek === 0 && slave.physicalAge > 29) {
H.longDamage += Math.trunc((slave.physicalAge - 25 + jsRandom(1, 15)) / 20);
}
- } else if (H.condition < 100) { // The player gets an automatic 5 condition recovery each weak up to 100
- H.condition = Math.min(H.condition + 5, 100);
- }
- // recovering and transferring short term damage to condition and long term
- if (H.shortDamage > 0) {
- shortToCondition += Math.max(Math.trunc(H.shortDamage * 0.5), 1); // 50% of short term damage gets transferred
- H.shortDamage -= shortToCondition;
- const assignment = slave.ID !== -1 ? asSlave(slave).assignment : null;
- if (assignment === Job.CLINIC) {
- H.shortDamage = Math.trunc(H.shortDamage * 0.5); // An additional 50% of short term damage reduction (75% total) for getting treatment in the clinic
- } else if (assignment === Job.REST || assignment === Job.SPA) {
- H.shortDamage = Math.trunc(H.shortDamage * 0.75); // An additional 25% of short term damage reduction (62.5% total) for resting
- }
- if (slave.curatives > 0 || slave.ID === -1) { // transferred damage is half if on preventatives/curatives or target is the player
- shortToCondition = Math.trunc(shortToCondition * 0.5);
+ // recovering and transferring short term damage to condition and long term
+ if (H.shortDamage > 0) {
+ shortToCondition += Math.max(Math.trunc(H.shortDamage * 0.5), 1); // 50% of short term damage gets transferred
+ H.shortDamage -= shortToCondition;
+ const assignment = slave.ID !== -1 ? asSlave(slave).assignment : null;
+ if (assignment === Job.CLINIC) {
+ H.shortDamage = Math.trunc(H.shortDamage * 0.5); // An additional 50% of short term damage reduction (75% total) for getting treatment in the clinic
+ } else if (assignment === Job.REST || assignment === Job.SPA) {
+ H.shortDamage = Math.trunc(H.shortDamage * 0.75); // An additional 25% of short term damage reduction (62.5% total) for resting
+ }
+ if (slave.curatives > 0 || slave.ID === -1) { // transferred damage is half if on preventatives/curatives or target is the player
+ shortToCondition = Math.trunc(shortToCondition * 0.5);
+ }
+ if (assignment === Job.CLINIC) {
+ shortToCondition = Math.trunc(shortToCondition * 0.75);
+ }
+ shortToLong += Math.trunc(shortToCondition * 0.1); // 10% of transferred damage gets added to long term damage, minimum of 20 short term damage before any long term damage is accumulated
+ H.longDamage += shortToLong;
}
- if (assignment === Job.CLINIC) {
- shortToCondition = Math.trunc(shortToCondition * 0.75);
+ if (V.baseDifficulty === 1) { // Reducing longDamage up to a certain point depending on the difficulty
+ if (H.longDamage > 0) {
+ H.longDamage -= Math.min(Math.trunc(H.longDamage * 0.1), 1);
+ }
+ } else if (V.baseDifficulty === 2) {
+ if (H.longDamage > 20) {
+ H.longDamage -= Math.min(Math.trunc((H.longDamage - 20) * 0.1), 1);
+ }
+ } else if (V.baseDifficulty === 3) {
+ if (H.longDamage > 40) {
+ H.longDamage -= Math.min(Math.trunc((H.longDamage - 40) * 0.1), 1);
+ }
+ } else if (V.baseDifficulty === 4) {
+ if (H.longDamage > 60) {
+ H.longDamage -= Math.min(Math.trunc((H.longDamage - 60) * 0.1), 1);
+ }
}
- shortToLong += Math.trunc(shortToCondition * 0.1); // 10% of transferred damage gets added to long term damage, minimum of 20 short term damage before any long term damage is accumulated
- H.longDamage += shortToLong;
- }
- if (V.baseDifficulty === 1) { // Reducing longDamage up to a certain point depending on the difficulty
- if (H.longDamage > 0) {
- H.longDamage -= Math.min(Math.trunc(H.longDamage * 0.1), 1);
+ } else { // player
+ // This is under heavy testing, especially long term damage. Chem contributes to death directly, so it must not overdo it through long term damage, while at the same time being something to keep in the back of ones mind when using unhealthy drugs.
+
+ // dealing with illness
+ // moved ahead of everything else to allow its major short term damage impact to make a bigger splash
+ if (H.illness > 0) {
+ illnessToCondition = Math.trunc(Math.pow(H.illness, 1.5) * (1 + H.shortDamage * 0.1) * (Math.max(H.longDamage * 0.01, 1)) + 2); // this needs extensive testing, but a healthy player should fight off the damage better than a weakened one. Every week will hit harder and harder due to damage impacts.
+ H.condition -= illnessToCondition; // direct change, since we don't want to double dip on damage.
+ H.shortDamage += Math.trunc(Math.pow(H.illness, 1.52) * 3 + 2); // 5, 10, 17, 26, 36 points of damage per respective level of illness
+ if (H.illness > 4) {
+ H.longDamage++;
+ }
}
- } else if (V.baseDifficulty === 2) {
- if (H.longDamage > 20) {
- H.longDamage -= Math.min(Math.trunc((H.longDamage - 20) * 0.1), 1);
+
+ // dealing with carcinogens
+ // slave food aids in neutralization.
+ // They decay naturally at a rate of 10%, but at as they decay cause short term damage,
+ // and 1%, rounded down, to long term damage
+ // Without it, it linearly slowly decays, adds 5% to short term damage, and 1%, rounded down, to long term damage
+ if (slave.chem > 0) {
+ if (!canEatFood(slave)) {
+ if (slave.chem > 10) {
+ chemToShort += Math.max(Math.trunc(slave.chem * 0.1), 1);
+ } else if (slave.chem > jsRandom(0, 9)) {
+ chemToShort += 1;
+ }
+ slave.chem -= chemToShort;
+ H.shortDamage += Math.max(Math.trunc(chemToShort * 0.1), 2);
+ chemToLong += Math.floor(slave.chem * 0.01);
+ H.longDamage += chemToLong;
+ } else {
+ slave.chem = Math.clamp(slave.chem - 0.2, 0, 1000); // note that it lingers, causing issues
+ chemToShort += Math.min(Math.max(Math.trunc(slave.chem * 0.05), 1), 5); // capped at 5 for now
+ H.shortDamage += chemToShort;
+ chemToLong += Math.trunc(slave.chem * 0.01);
+ H.longDamage += chemToLong;
+ }
}
- } else if (V.baseDifficulty === 3) {
- if (H.longDamage > 40) {
- H.longDamage -= Math.min(Math.trunc((H.longDamage - 40) * 0.1), 1);
+
+ // recovering and converting short term damage to long term
+ if (H.shortDamage > 0) {
+ // short term damage begins converting to long term damage at 20+
+ shortToLong += Math.trunc(H.shortDamage * 0.05);
+ H.longDamage += shortToLong;
+ // short term damage reduces by half each week normally
+ // 100+ long term damage begins to harm short term recovery
+ // at 400+, you're ability to heal properly is completely crippled
+ // but, keep in mind, that short and long damage do not directly influence health, sans illness
+ shortRecovery = Math.max(Math.trunc(H.shortDamage * (0.5 + Math.min(0.4, H.longDamage * 0.001))), 1);
+ if (V.personalAttention.task === PersonalAttention.RELAX) {
+ shortRecovery += 5;
+ }
+ if (V.PC.diet === "medicinal") {
+ shortRecovery += 5;
+ }
+ H.shortDamage = Math.max(H.shortDamage - shortRecovery, 0);
}
- } else if (V.baseDifficulty === 4) {
- if (H.longDamage > 60) {
- H.longDamage -= Math.min(Math.trunc((H.longDamage - 60) * 0.1), 1);
+
+ // Reducing longDamage for easier difficulties
+ if (H.longDamage > 0) {
+ if (V.baseDifficulty === 1) {
+ H.longDamage -= 0.3;
+ } else if (V.baseDifficulty === 2) {
+ H.longDamage -= 0.1;
+ }
+ H.longDamage = Math.max(H.longDamage, 0);
}
+
+ // Temporarily disabled for balancing. healthDamage() is causing too much shortDamage right now, need to think on things.
+ H.longDamage = 0;
+ H.shortDamage = 0;
+ slave.chem = 0;
+
+ // The player gets an automatic 5 condition recovery each week up to 100
+ // relaxation and diet is handled in its respective locations
+ H.condition = Math.min(H.condition + 5, 100);
}
if (V.disableLongDamage) {
H.longDamage = 0;
@@ -396,7 +490,7 @@ globalThis.willWorkToDeath = function(slave) {
return true;
} else if (slave.sexualFlaw === "self hating") {
return true;
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
return true;
} else if (V.MadamID !== 0 && (slave.assignment === Job.BROTHEL || (slave.assignment === Job.WHORE && V.brothel > 0 && V.universalRulesFacilityWork === 1 && V.brothelSpots > 0))) {
return true;
@@ -567,8 +661,8 @@ globalThis.tired = function(slave) {
assignment += 1;
}
} else if ([Job.CELLBLOCK, Job.CONFINEMENT].includes(slave.assignment)) { // Generally not tiring unless a Wardeness is present, in which case she uses sleep deprivation to break slaves.
- if (slave.assignment === Job.CELLBLOCK && V.WardenessID !== 0 && slave.fetish !== "mindbroken") {
- if (S.Wardeness.fetish === "mindbroken") {
+ if (slave.assignment === Job.CELLBLOCK && V.WardenessID !== 0 && slave.fetish !== Fetish.MINDBROKEN) {
+ if (S.Wardeness.fetish === Fetish.MINDBROKEN) {
if (H.tired > 80) {
assignment -= 8;
} else {
@@ -795,7 +889,7 @@ globalThis.tiredFucks = function(slave) {
let acceptance = 0;
acceptance += Math.trunc(slave.energy / 10);
acceptance -= Math.trunc((slave.intelligence + slave.intelligenceImplant) / 10);
- if (slave.fetish === "masochist" || slave.fetish === "humiliation") {
+ if (slave.fetish === Fetish.MASOCHIST || slave.fetish === Fetish.HUMILIATION) {
acceptance += Math.trunc(slave.fetishStrength / 10);
}
if (slave.assignment === Job.GLORYHOLE) {
diff --git a/src/endWeek/minorInjuryResponse.js b/src/endWeek/minorInjuryResponse.js
index 79774938bd528d94e7efa5cda7c092d49fd65aa1..e487a520d150f3ef829747ff1b2966a72ed8363e 100644
--- a/src/endWeek/minorInjuryResponse.js
+++ b/src/endWeek/minorInjuryResponse.js
@@ -49,7 +49,7 @@ globalThis.minorInjuryResponse = function(slave) {
} else if (slave.skill.whoring > jsRandom(1, 100)) {
o += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
cashX(50, category, slave);
- } else if (slave.skill.combat > 0) {
+ } else if (slave.skill.combat > 30) {
o += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
cashX(50, category, slave);
}
@@ -63,7 +63,7 @@ globalThis.minorInjuryResponse = function(slave) {
} else if (slave.skill.whoring > jsRandom(1, 100)) {
o += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay minor <span class="yellowgreen">compensation.</span>`;
cashX(10, category, slave);
- } else if (slave.skill.combat > 0) {
+ } else if (slave.skill.combat > 30) {
o += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay minor <span class="yellowgreen">compensation.</span>`;
cashX(10, category, slave);
}
diff --git a/src/endWeek/nextWeek/nextWeek.js b/src/endWeek/nextWeek/nextWeek.js
index e3a899688e268367af6ac92e248acac519b101e0..9d68d1148397592a22d74d8e750e7ebd0337ce1a 100644
--- a/src/endWeek/nextWeek/nextWeek.js
+++ b/src/endWeek/nextWeek/nextWeek.js
@@ -4,11 +4,21 @@ App.EndWeek.nextWeek = function() {
V.upgradeMultiplierMedicine = upgradeMultiplier('medicine');
V.upgradeMultiplierTrade = upgradeMultiplier('trading');
- const rival = V.arcologies.find(function(s) { return s.direction !== 0 && s.rival === 1; });
+ const rival = V.arcologies.find(s => s.direction !== 0 && s.rival === 1);
if (rival && V.rival.prosperity !== 0) {
V.rival.prosperity = rival.prosperity;
} else if (!rival) {
- V.rival.state = 1;
+ if (V.slaves.filter(s => s.newGamePlus === 0 && s.origin.includes("$He was once an arcology owner like yourself.")).length > 0) {
+ V.rival.state = 5;
+ } else if (V.plot > 0 && V.rival.prosperity > 0) {
+ if (V.arcologies.length > 1) {
+ V.rival.state = 2;
+ } else if (V.arcologies.length === 1) {
+ V.rival.state = 1;
+ }
+ } else {
+ V.rival.state = 4;
+ }
}
if (V.playerAging !== 0) {
@@ -36,6 +46,9 @@ App.EndWeek.nextWeek = function() {
}
}
}
+ if (V.PC.majorInjury > 0) {
+ V.PC.majorInjury--;
+ }
if (V.PC.induceLactation > 0) {
V.PC.induceLactation--;
}
@@ -55,9 +68,6 @@ App.EndWeek.nextWeek = function() {
} else if (V.PC.fertPeak !== 0) {
V.PC.fertPeak = 0;
}
- if (V.PC.health.shortDamage > 0) {
- V.PC.health.shortDamage--;
- }
// Adding random changes to the economy
if (V.difficultySwitch === 1) {
@@ -238,6 +248,7 @@ App.EndWeek.nextWeek = function() {
slave.skill.anal = Math.clamp(slave.skill.anal.toFixed(1), 0, 100);
slave.skill.whoring = Math.clamp(slave.skill.whoring.toFixed(1), 0, 100);
slave.skill.entertainment = Math.clamp(slave.skill.entertainment.toFixed(1), 0, 100);
+ slave.skill.combat = Math.clamp(slave.skill.combat.toFixed(1), 0, 100);
slave.lactationAdaptation = Math.clamp(slave.lactationAdaptation.toFixed(1), 0, 100);
slave.intelligenceImplant = Math.clamp(slave.intelligenceImplant.toFixed(1), -15, 30);
slave.prematureBirth = 0;
@@ -306,9 +317,23 @@ App.EndWeek.nextWeek = function() {
}
V.week++;
+ V.arcologies[0].weeks++;
- if (V.playerSurgery > 0) {
- V.playerSurgery--;
+ // Plastic surgeon stuff
+ if (V.pSurgery.cooldown > 0) {
+ V.pSurgery.cooldown--;
+ }
+ if (V.arcologies[0].FSRepopulationFocus !== "unset" || V.pSurgery.nursePreg !== 0) {
+ V.pSurgery.nursePreg++;
+ if (V.pSurgery.cooldown > 0 && V.pSurgery.nursePreg > 36) {
+ V.pSurgery.nursePreg = 0;
+ } else if (V.pSurgery.nursePreg > 40) {
+ V.pSurgery.nursePreg = -3;
+ }
+ }
+
+ if (V.doctor.state > 1) {
+ V.doctor.state = 1;
}
// advance the event queue
@@ -322,7 +347,7 @@ App.EndWeek.nextWeek = function() {
V.SecExp.buildings.riotCenter.sentUnitCooldown = Math.max(V.SecExp.buildings.riotCenter.sentUnitCooldown - 1, 0);
}
V.SecExp.proclamation.cooldown = Math.max(V.SecExp.proclamation.cooldown - 1, 0);
- V.SecExp.war = {foughtThisWeek: 0, type: ""};
+ V.SecExp.war = {};
}
App.EndWeek.weather();
@@ -375,9 +400,7 @@ App.EndWeek.nextWeek = function() {
}
if (V.SF.Toggle && V.SF.FS.Tension > 100) {
- if (V.rep > 17500) {
- V.rep = 17500;
- }
+ App.Mods.SF.fsIntegration.crisis();
}
V.NaNArray = findNaN();
diff --git a/src/endWeek/player/playerReportUtils.js b/src/endWeek/player/playerReportUtils.js
index 91f17062db26afb587286b3cecd6fb1d79e7eab7..075c9f45e00765a734d67d081efc478db64ebe75 100644
--- a/src/endWeek/player/playerReportUtils.js
+++ b/src/endWeek/player/playerReportUtils.js
@@ -1,3 +1,6 @@
+// I'm thinking of tearing this out of the pregnancy breast growth and instead taking a start point and an end point and then reporting a summation of any noteworthy changes after the physical block of the week.
+// Weight would also be relevant for this.
+// Maybe even height on growth drugs?
App.EndWeek.Player.bustUp = function(PC, oldCupSize) {
let outcome = "";
diff --git a/src/endWeek/player/prDiet.js b/src/endWeek/player/prDiet.js
index 6e5df1df5a95dc9babade6840400ba5943ac8c21..f470ac257defd11256285a3ffe69ed61a841d100 100644
--- a/src/endWeek/player/prDiet.js
+++ b/src/endWeek/player/prDiet.js
@@ -32,7 +32,7 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
weightLoss = 4;
if (PC.weightDirection === -1) {
PC.weight -= (weightLoss + 3);
- r.push(`You stick to a strict diet,<span class="change positive">losing a lot of weight.</span>`);
+ r.push(`You stick to a strict diet, <span class="change positive">losing a lot of weight.</span>`);
} else if (PC.weightDirection === 1) {
PC.weight -= (weightLoss - 3);
r.push(`Despite sticking to a strict diet, <span class="change positive">you barely lose any weight.</span>`);
@@ -67,22 +67,45 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
PC.weight = Math.min(PC.weight, 200);
break;
case "muscle building": // Muscle Gain
- r.push(gainMuscle());
+ gainMuscle();
break;
case "slimming": // Muscle Loss
- r.push(loseMuscle());
+ loseMuscle();
break;
case "exotic":
r.push(`You stick to an unusual diet full of exotic foods and drinks, both rumored and proven, to boost your sexual energy.`);
// This should increase .need
if (PC.dick.isBetween(0, 3) && random(1, 100) > 95) {
- r.push(`You feel like you're a bit biggger down there. A quick measuring confirms <span class="change positive">your dick has gotten fatter.</span>`);
+ r.push(`You feel like you're a bit bigger down there. A quick measuring confirms <span class="change positive">your dick has gotten fatter.</span>`);
PC.dick += 1;
}
if ((PC.geneMods.NCS === 0 && PC.balls.isBetween(0, 6) && random(1, 100) > 95) || (PC.geneMods.NCS === 1 && PC.balls.isBetween(0, 3) && random(1, 100) > 99)) {
r.push(`The <span class="change positive">added heft to your balls</span> is a pleasant side-effect.`);
PC.balls += 1;
}
+ if (PC.vagina >= 0 && PC.vaginaLube < 2) {
+ if (PC.vagina >= 0 && PC.vaginaLube === 0 && PC.energy > 20 && random(1, 100) > (100 - (PC.energy / 4))) {
+ r.push(`It also gets the juices flowing; <span class="change positive">your pussy is no longer so dry.</span>`);
+ PC.vaginaLube = 1;
+ } else if (PC.energy > 95 && random(1, 100) > 40 + ((100 - PC.energy) * 10)) {
+ r.push(`It also gets the juices really flowing; <span class="change positive">your pussy has become so wet</span> that you're soaked with arousal by the end of your meal.`);
+ PC.vaginaLube = 2;
+ }
+ }
+ break;
+ case "medicinal":
+ r.push(`You stick to an unusual diet full of exotic foods and drinks known for <span class="health inc">fortifying health, healing ailments, and cleansing the body.</span>`);
+ if (canTaste(PC)) {
+ r.push(`It is surprisingly pleasant, if a bit on the expensive side.`);
+ } else {
+ r.push(`It is rather expensive, so you wish you could actually taste it.`);
+ }
+ if (PC.health.condition <= 90) {
+ improveCondition(PC, 2);
+ }
+ if (PC.chem > 1) {
+ PC.chem--;
+ }
break;
}
}
@@ -102,7 +125,7 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
weightLoss = 5 + (V.feeder * 2);
if (PC.weightDirection === -1) {
PC.weight -= (weightLoss + 3);
- r.push(`You stick to a strict diet,<span class="change positive">losing a lot of weight.</span>`);
+ r.push(`You stick to a strict diet, <span class="change positive">losing a lot of weight.</span>`);
} else if (PC.weightDirection === 1) {
PC.weight -= (weightLoss - 3) - (V.feeder);
r.push(`Despite sticking to a strict diet, <span class="change positive">you barely lose any weight.</span>`);
@@ -161,7 +184,7 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
roll = 200;
target = Math.trunc(Math.clamp(weightShift * 2 + (boobSize - growthGoal) / 20, 0, 68));
}
- if (random(1, roll) <= target && gigantomastiaMod !== 3 && boobSize >= 100) {
+ if (random(1, roll) <= target && gigantomastiaMod !== 3 && boobSize > 100) {
r.push(`<span class="change negative">Your chest has gotten a little smaller.</span>`);
if (random(1, 2) === 1) {
PC.boobs -= 20;
@@ -221,15 +244,15 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
}
}
if (PC.weight >= -10 && PC.weight <= 10) {
- r.push(`Since you have now accomplished your goal, you're going<span class="noteworthy">back to a normal diet.</span>`);
+ r.push(`Since you have now accomplished your goal, you're going <span class="noteworthy">back to a normal diet.</span>`);
PC.diet = "healthy";
}
break;
case "muscle building": // Muscle Gain
- r.push(gainMuscle());
+ gainMuscle();
break;
case "slimming": // Muscle Loss
- r.push(loseMuscle());
+ loseMuscle();
break;
case "cum production":
// This should increase .need
@@ -355,7 +378,7 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
r.push(`Your balls feel heavy and full; further inspection reveals they've <span class="change positive">grown</span> under your diet.`);
PC.balls += 1;
}
- if ((PC.geneMods.NCS === 0 && boobSize > 400- (V.feeder * 100)) || (PC.geneMods.NCS === 1 && boobSize > 200) && gigantomastiaMod !== 3) {
+ if ((PC.geneMods.NCS === 0 && boobSize > 400 - (V.feeder * 100)) || (PC.geneMods.NCS === 1 && boobSize > 200) && gigantomastiaMod !== 3) {
r.push(`Your chest <span class="change negative">slims down slightly.</span>`);
PC.boobs -= 10;
if (PC.geneMods.NCS === 1) {
@@ -472,7 +495,7 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
break;
case "cleansing": // chem reduce and health plus
if (!canSmell(PC) && !canTaste(PC)) {
- r.push(`<span class="health inc">You feel spectacular</span> on this health focused diet, even if you find other people try to avoid you, and that your slaves hold their breath when in your presence.`);
+ r.push(`<span class="health inc">You feel spectacular</span> on this health-focused diet, even if you find other people try to avoid you, and that your slaves hold their breath when in your presence.`);
} else if (!canSmell(PC) || !canTaste(PC)) {
r.push(`Your specialized diet ${canTaste(PC) ? "tastes" : "smells"} awful, but leaves you <span class="health inc">feeling well</span> once you get over it.`);
} else {
@@ -529,12 +552,12 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
sharedAssetLoss(20 + (wombLength * 5));
PC.muscles -= 10 + (wombLength * 2);
PC.energy -= 10;
- r.push(`On top of all your other problems, the undigested food has no where to go as your body relearns how to properly move it all the way through your gastrointestinal tract. <span class="change negative">It is steadily building up inside you,</span> adding to your discomfort as it distends your belly a little more with each passing day.`);
+ r.push(`On top of all your other problems, the undigested food has nowhere to go as your body relearns how to properly move it all the way through your gastrointestinal tract. <span class="change negative">It is steadily building up inside you,</span> adding to your discomfort as it distends your belly a little more with each passing day.`);
PC.inflation = 1;
PC.inflationType = "undigested food";
PC.inflationMethod = 1;
PC.belly += 300;
- PC.bellyInflation += 300;
+ PC.bellyFluid += 300;
SetBellySize(PC);
} else if (PC.weaningDuration < 14) {
r.push(`Your body is improving at absorbing nutrients from it, but still <span class="change negative">breaks down some fat and muscle tissue</span> to make up for what it can't.`);
@@ -563,7 +586,10 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
}
function gainMuscle() {
- if (isAmputee(PC)) {
+ if (onBedRest(PC)) {
+ r.push(`You aren't capable of actively working out, so you're <span class="noteworthy">back on a normal diet.</span>`);
+ PC.diet = "healthy";
+ } else if (isAmputee(PC)) {
r.push(`You can't work out with no limbs, so you're <span class="noteworthy">back on a normal diet.</span>`);
PC.diet = "healthy";
} else {
@@ -591,7 +617,7 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
r.push(`but with the natural testosterone and artificial female hormones clashing in your system, <span class="change positive">gain muscle slowly.</span>`);
PC.muscles += 3 + PC.geneticQuirks.mGain;
} else if (PC.balls > 0 && PC.ballType !== "sterile" && PC.hormoneBalance <= -100) {
- r.push(`and with the natural testosterone and artificial male hormones in your system,<span class="change positive">rapidly bulk up.</span>`);
+ r.push(`and with the natural testosterone and artificial male hormones in your system, <span class="change positive">rapidly bulk up.</span>`);
PC.muscles += 8;
} else if (PC.balls > 0 && PC.ballType !== "sterile") {
r.push(`and with the natural testosterone in your system, <span class="change positive">efficiently bulk up.</span>`);
@@ -641,7 +667,7 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
}
PC.muscles = Math.clamp(PC.muscles, -100, 100);
if (PC.muscles >= 100) {
- r.push(`There is just no more room for muscle on your frame, so you will be<span class="noteworthy">resuming a normal diet</span> next week.`);
+ r.push(`There is just no more room for muscle on your frame, so you will be <span class="noteworthy">resuming a normal diet</span> next week.`);
PC.diet = "healthy";
}
}
@@ -726,7 +752,7 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
}
PC.muscles = Math.clamp(PC.muscles, 0, 100);
if (PC.muscles <= 0) {
- r.push(`You've finally shed the last of your visible muscles, so you will be<span class="noteworthy">resuming a normal diet</span> next week.`);
+ r.push(`You've finally shed the last of your visible muscles, so you will be <span class="noteworthy">resuming a normal diet</span> next week.`);
PC.diet = "healthy";
}
} else {
@@ -774,7 +800,7 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
roll = 75;
target = Math.trunc(Math.clamp(weightMod * 2 + (boobSize - growthGoal) / 20, 0, 68));
}
- if (random(1, roll) <= target && (gigantomastiaMod !== 3 && boobSize >= 100)) {
+ if (random(1, roll) <= target && (gigantomastiaMod !== 3 && boobSize > 100)) {
if (random(1, 2) === 1) {
r.push(`<span class="change negative">Your chest has gotten smaller.</span>`);
PC.boobs -= 100;
@@ -813,7 +839,7 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
roll = 75;
target = Math.trunc(Math.clamp(weightMod * 2 - (boobSize - growthGoal) / 20, 0, 68));
}
- if (PC.geneMods.NCS === 1) {
+ if (PC.geneMods.NCS === 1 || (V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 1 && !canEatFood(PC))) {
roll *= 2;
}
// PC food is not laced with hormones normally, so galactorrhea is not triggered here.
@@ -830,7 +856,7 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
roll = 80000;
target = Math.trunc(Math.clamp(weightMod * 1000 - (buttSize * 1000 - growthGoal) * 4, 0, 72000));
}
- if (PC.geneMods.NCS === 1) {
+ if (PC.geneMods.NCS === 1 || (V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 1 && !canEatFood(PC))) {
roll *= 2;
}
if (random(1, roll) <= target) {
diff --git a/src/endWeek/player/prDrugs.js b/src/endWeek/player/prDrugs.js
new file mode 100644
index 0000000000000000000000000000000000000000..2d8e40b9f22054602d7367074f240704f79bcd70
--- /dev/null
+++ b/src/endWeek/player/prDrugs.js
@@ -0,0 +1,1833 @@
+App.EndWeek.Player.drugs = function(PC = V.PC) {
+ const r = [];
+
+ const intensive = (PC.drugs === "intensive breast injections" || PC.drugs === "intensive butt injections" ||
+ PC.drugs === "intensive penis enhancement" || PC.drugs === "intensive testicle enhancement") ? 1 : 0;
+ const gigantomastiaMod = PC.geneticQuirks.gigantomastia === 2 ? (PC.geneticQuirks.macromastia === 2 ? 3 : 2) : 1;
+ const rearLipedemaMod = PC.geneticQuirks.rearLipedema === 2 ? 1 : 0;
+ const boobSize = PC.boobs - PC.boobsImplant - PC.boobsMilk;
+ const buttSize = PC.butt - PC.buttImplant;
+ const lipSize = PC.lips - PC.lipsImplant;
+
+ if (PC.drugs !== "no drugs") {
+ drugEffects();
+ }
+ if (PC.pregControl !== "none") {
+ pregnancyDrugEffects();
+ }
+ if (PC.aphrodisiacs > 0) {
+ aphrodisiacEffects();
+ }
+ if (PC.drugs !== "no drugs") {
+ drugExpiry();
+ }
+
+ return r.join(" ");
+
+ function galactorrheaTriggerCheck() {
+ if (PC.geneticQuirks.galactorrhea === 2 && PC.lactation === 0 && random(1, 100) <= PC.hormoneBalance) {
+ PC.lactation = 1;
+ PC.lactationDuration = 2;
+ if (V.geneticMappingUpgrade >= 1) {
+ r.push(`The sudden surge of female hormones has unsurprisingly <span class="change positive">triggered your galactorrhea.</span>`);
+ } else {
+ r.push(`You experience <span class="change positive">sudden lactation</span> as a side effect from the drugs.`);
+ }
+ }
+ }
+
+ function ncsFightsButtGrowth(PC, growth) {
+ if (PC.geneMods.NCS === 1) {
+ growth = Math.trunc(growth / 2.2);
+ r.push(`Your <span class="ncs">NCS</span> resists the butt growth,`);
+ if (growth > 1) {
+ r.push(`converting the excess fat into sexual energy.`);
+ } else {
+ r.push(`but has no lasting effect.`);
+ }
+ PC.energy += growth;
+ }
+ return growth;
+ }
+
+ function drugEffects() {
+ let dietInfluence;
+ let growth;
+ let shrinkage;
+ let noGrowth;
+ const oldLips = PC.lips;
+
+ switch (PC.drugs) {
+ case "hormone enhancers":
+ r.push(`Your drug regime prepares your body to accept hormonal effects.`);
+ break;
+ case "hip wideners":
+ r.push(`The tablets aid your body with preparing for childbirth, at the cost of <span class="health dec">leaving you ill</span> from the excess hormones.`);
+ healthDamage(PC, random(3, 5))
+ break;
+ case "priapism agents":
+ if (PC.dick === 0) {
+ r.push(`You have no dick, so priapism agents are useless to you. <span class="noteworthy">You stop taking them.</span>`);
+ PC.drugs = "no drugs";
+ } else if (PC.dick > 10) {
+ r.push(`Taking priapism agents started to get your enormous dick erect, but you never find out if they succeeded as the amount of blood it took to get that hard caused you to black out. <span class="noteworthy">You hastily stop taking them.</span>`);
+ PC.drugs = "no drugs";
+ } else {
+ r.push(`Taking priapism agents keeps you hard at all times. Taking them too often leaves your dick <span class="health dec">painfully sensitive,</span> though.`);
+ healthDamage(PC, 5);
+ if (PC.dick >= 7) {
+ r.push(`Your oversized cock also requires a proportionally large amount of blood to achieve erection <span class="health dec">leaving you lightheaded and suffering from low blood pressure.</span>`);
+ healthDamage(PC, PC.dick * 5);
+ }
+ }
+ break;
+ case "psychostimulants":
+ r.push(`You enjoy a cup of <span class="intelligent">mind stimulating</span> tea with each meal; it's quite relaxing, really.`);
+ PC.intelligence += 1;
+ if (PC.energy > 60) {
+ r.push(`A little too much, perhaps, as you find yourself <span class="libido dec">thinking less about sex</span> as well.`);
+ if (PC.energy > 95) {
+ PC.energy -= 3;
+ } else if (PC.energy > 80) {
+ PC.energy -= 2;
+ } else {
+ PC.energy -= 1;
+ }
+ }
+ break;
+ case "hyper breast injections":
+ growth = (1 + V.injectionUpgrade) * 3 * gigantomastiaMod;
+ r.push(`You <span class="change positive">directly inject`);
+ if (V.injectionUpgrade !== 0) {
+ r.push(`advanced`);
+ }
+ r.push(`hyper growth hormones into your breasts before bed each night;</span>`);
+ dietInfluence = false;
+ if (PC.diet === "fattening") {
+ r.push(`all the binging you do fuels growth,`);
+ dietInfluence = true;
+ growth += 6;
+ } else if (PC.diet === "fertility") {
+ r.push(`the fertility hormones in your food favor breast growth`);
+ dietInfluence = true;
+ growth += 1;
+ } else if (PC.diet === "restricted") {
+ r.push(`how little you eat leaves your body few resources to grow on`);
+ dietInfluence = true;
+ growth -= 1;
+ } else if (PC.weight > 130) {
+ r.push(`the extra large portions you eat helps support growth`);
+ dietInfluence = true;
+ growth += 4;
+ } else if (PC.weight > 30) {
+ r.push(`how much you eat helps support growth`);
+ dietInfluence = true;
+ growth += 2;
+ } else if (PC.weight <= -30) {
+ r.push(`how little you eat impedes growth`);
+ dietInfluence = true;
+ growth--;
+ }
+ if (dietInfluence) {
+ if (PC.health.condition > -20) {
+ r.push(`and`);
+ } else {
+ r.push(`but`);
+ }
+ }
+ if (PC.health.condition > 80) {
+ r.push(`your perfect health supports growth extremely well,`);
+ if (PC.boobs < 5000 || PC.boobs >= 10000) {
+ r.push(`and`);
+ } else {
+ r.push(`but`);
+ }
+ growth += 6;
+ } else if (PC.health.condition > -20) {
+ r.push(`your health supports growth,`);
+ if (PC.boobs < 2000 || PC.boobs >= 10000) {
+ r.push(`and`);
+ } else {
+ r.push(`but`);
+ }
+ } else {
+ r.push(`your poor health does not support steady growth, but`);
+ growth--;
+ }
+ if (PC.boobs < 800) {
+ r.push(`you wake up each morning with a lot of extra weight on your chest.`);
+ growth += 10;
+ if (PC.boobShape !== "saggy" && PC.boobsImplant / PC.boobs < 0.5 && PC.breastMesh !== 1) {
+ if (random(1, 10) < 5) {
+ r.push(`Their rapid growth and lack of existing support causes them to <span class="coral">sag under their new-found weight.</span>`);
+ PC.boobShape = "saggy";
+ }
+ }
+ } else if (PC.boobs < 2000) {
+ r.push(`you wake up each morning to find them larger than the night before.`);
+ growth += 8;
+ if (PC.boobShape !== "saggy" && PC.boobsImplant / PC.boobs < 0.5 && PC.breastMesh !== 1) {
+ if (random(1, 10) < 5) {
+ r.push(`Their rapid growth and lack of existing support causes them to <span class="coral">sag under their new-found weight.</span>`);
+ PC.boobShape = "saggy";
+ }
+ }
+ } else if (PC.boobs < 5000) {
+ r.push(`your hefty boobs steadily grow.`);
+ growth += 6;
+ if (PC.boobShape !== "saggy" && PC.boobsImplant / PC.boobs < 0.5 && PC.breastMesh !== 1) {
+ if (random(1, 10) === 1) {
+ r.push(`As they do, they <span class="coral">begin to sag</span> under their own monstrous weight, with the surging breastflesh directing your nipples downward.`);
+ PC.boobShape = "saggy";
+ }
+ }
+ } else if (PC.boobs < 10000) {
+ r.push(`your huge boobs slowly grow.`);
+ growth += 4;
+ if (PC.boobShape !== "saggy" && PC.boobsImplant / PC.boobs < 0.5 && PC.breastMesh !== 1) {
+ if (random(1, 10) === 1) {
+ r.push(`As they do, they <span class="coral">begin to sag</span> under their own monstrous weight, with the surging breastflesh directing your nipples downward.`);
+ PC.boobShape = "saggy";
+ }
+ }
+ } else {
+ r.push(`you wake up each morning to find your monstrous udders a little larger than the night before.`);
+ growth += 10;
+ if (PC.boobShape !== "normal" && (PC.boobsImplant / PC.boobs < 0.9) && PC.breastMesh !== 1) {
+ if (random(1, 10) === 1) {
+ r.push(`Your <span class="coral">breasts lose their unique shape</span> as they adapt to their monstrous, unnatural size. There's simply nowhere else for the mass of boob to go as its continuous expansion fills your breasts out more and more.`);
+ PC.boobShape = "normal";
+ }
+ }
+ }
+ if (PC.geneMods.NCS === 1) {
+ growth = Math.trunc(growth / 2.2);
+ r.push(`Your <span class="ncs">NCS</span> resists the breast growth, diverting some of resources into additional sexual energy.`);
+ PC.energy += growth;
+ }
+ growth = 25 * Math.trunc(growth * 0.8);
+ PC.boobs += Math.clamp(growth, 25, 5000);
+ if (random(1, 100) > 30 + (PC.areolae * 10) && PC.areolae < 4) {
+ r.push(`Your <span class="change positive">areolae grow</span> to keep in proportion with your breasts.`);
+ PC.areolae += 1;
+ }
+ if (random(1, 100) > 70 && PC.nipples !== "inverted" && PC.nipples !== "fuckable" && PC.nipples !== "flat") {
+ if (["cute", "huge", "puffy", "tiny"].includes(PC.nipples)) {
+ r.push(`Your <span class="change positive">nipples have completely disappeared</span> into your breastflesh.`);
+ PC.nipples = "inverted";
+ }
+ }
+ if (PC.geneticQuirks.gigantomastia === 3 && random(1, 200) < PC.hormoneBalance) {
+ PC.geneticQuirks.gigantomastia = 2;
+ }
+ if (PC.geneticQuirks.macromastia === 3 && random(1, 200) < PC.hormoneBalance) {
+ PC.geneticQuirks.macromastia = 2;
+ }
+ if (PC.geneticQuirks.galactorrhea === 2 && PC.lactation === 0 && random(1, 50) <= PC.hormoneBalance) {
+ PC.lactation = 1;
+ PC.lactationDuration = 2;
+ if (V.geneticMappingUpgrade >= 1) {
+ r.push(`The sudden surge of hormones has unsurprisingly <span class="change positive">triggered your galactorrhea.</span>`);
+ } else {
+ r.push(`You experience <span class="change positive">sudden lactation</span> as a side effect from the drugs.`);
+ }
+ }
+ break;
+ case "breast enhancers":
+ growth = 1 * gigantomastiaMod;
+ r.push(`You slap a <span class="change positive">dermal growth hormone patch on each breast every morning;</span>`);
+ if (PC.boobs < 800) {
+ r.push(`with their limited mass, your small boobs greedily absorb the drugs.`);
+ growth += 3;
+ if (PC.boobShape !== "torpedo-shaped" && PC.boobShape !== "wide-set" && PC.breastMesh !== 1) {
+ if (random(1, 10) === 1) {
+ if (PC.shoulders < 0) {
+ r.push(`As they expand, <span class="change positive">they take on a torpedo shape within the your narrow frame,</span> projecting considerably from your chest and swinging delightfully when unrestrained.`);
+ PC.boobShape = "torpedo-shaped";
+ } else {
+ r.push(`As they expand, <span class="change positive">they become widely set across your broad frame,</span> spreading to your sides even when you're not lying back.`);
+ PC.boobShape = "wide-set";
+ }
+ }
+ }
+ } else if (PC.boobs < 2000) {
+ r.push(`at their size, your boobs readily absorb the drugs.`);
+ growth += 2;
+ if (PC.boobShape === "saggy" || (PC.boobShape === "downward-facing" && PC.breastMesh !== 1)) {
+ if (random(1, 10) === 1) {
+ r.push(`As they expand, <span class="change positive">they fill out, losing their sag</span> as the expanding tissue lifts your nipples up to point forward.`);
+ PC.boobShape = "normal";
+ }
+ }
+ } else if (PC.boobs < 5000) {
+ r.push(`at their size, your hefty boobs slowly absorb the drugs.`);
+ growth++;
+ if (PC.boobShape !== "saggy" && (PC.boobsImplant / PC.boobs < 0.5) && PC.breastMesh !== 1) {
+ if (random(1, 10) === 1) {
+ r.push(`As they expand, they <span class="coral">begin to sag</span> under their own monstrous weight, with the expanding breastflesh directing your nipples downward.`);
+ PC.boobShape = "saggy";
+ }
+ }
+ } else if (PC.boobs < 10000) {
+ r.push(`with their mass, and how tiny the patches are in comparison, it comes as little surprise that your huge boobs barely grow.`);
+ if (PC.boobShape !== "saggy" && PC.boobsImplant / PC.boobs < 0.5 && PC.breastMesh !== 1) {
+ if (random(1, 10) === 1) {
+ r.push(`As they slowly do, they <span class="coral">begin to sag</span> under their own monstrous weight, with the expanding breastflesh directing your nipples downward.`);
+ PC.boobShape = "saggy";
+ }
+ }
+ } else {
+ r.push(`with their mass, and how miniscule the patches are in comparison, you're left to wonder if your monstrous boobs are actually growing or not.`);
+ growth--;
+ if (PC.boobShape !== "normal" && (PC.boobsImplant / PC.boobs < 0.9) && PC.breastMesh !== 1) {
+ if (random(1, 10) === 1) {
+ r.push(`Your <span class="coral">breasts lose their unique shape</span> as they adapt to their enormous, unnatural size; there's simply nowhere else for the flesh to go as it keeps piling on.`);
+ PC.boobShape = "normal";
+ }
+ }
+ }
+ if (PC.geneMods.NCS === 1 && growth > 0) {
+ growth = Math.trunc(growth / 2.2);
+ r.push(`Your <span class="ncs">NCS</span> resists the breast growth, diverting some of resources into additional sexual energy.`);
+ PC.energy += growth;
+ }
+ growth = 25 * Math.trunc(growth * 0.8);
+ PC.boobs += Math.clamp(growth, 5, 200);
+ if (PC.areolae < 4) {
+ if (growth > PC.areolae * 25) {
+ r.push(`As the drugs diffuse throughout your breast tissue, <span class="change positive">they reach your areolae, forcing them to grow too.</span>`);
+ PC.areolae += 1;
+ }
+ }
+ if (PC.nipples === "tiny" || PC.nipples === "cute" || PC.nipples === "puffy") {
+ if (random(1, 200) < growth) {
+ if (PC.nipples === "tiny") {
+ r.push(`The hormones also <span class="change positive">cause a little nipple growth.</span>`);
+ PC.nipples = "cute";
+ } else if (PC.nipples === "cute") {
+ r.push(`The hormones also <span class="change positive">cause your cute nipples to puff up.</span>`);
+ PC.nipples = "puffy";
+ } else if (PC.nipples === "puffy") {
+ r.push(`The hormones also <span class="change positive">cause your puffy nipples to become really enormous.</span>`);
+ PC.nipples = "huge";
+ }
+ }
+ }
+ if (PC.geneticQuirks.gigantomastia === 3 && random(1, 400) < PC.hormoneBalance) {
+ PC.geneticQuirks.gigantomastia = 2;
+ }
+ if (PC.geneticQuirks.macromastia === 3 && random(1, 400) < PC.hormoneBalance) {
+ PC.geneticQuirks.macromastia = 2;
+ }
+ if (PC.geneticQuirks.galactorrhea === 2 && PC.lactation === 0 && random(1, 150) <= PC.hormoneBalance) {
+ PC.lactation = 1;
+ PC.lactationDuration = 2;
+ if (V.geneticMappingUpgrade >= 1) {
+ r.push(`The sudden surge of hormones has unsurprisingly <span class="change positive">triggered your galactorrhea.</span>`);
+ } else {
+ r.push(`You experience <span class="change positive">sudden lactation</span> as a side effect from the drugs.`);
+ }
+ }
+ break;
+ case "breast injections":
+ case "intensive breast injections":
+ growth = 1 + V.injectionUpgrade * gigantomastiaMod;
+ r.push(`You <span class="change positive">directly inject`);
+ if (intensive) {
+ r.push(`massive amounts of`);
+ growth *= 2;
+ }
+ if (V.injectionUpgrade !== 0) {
+ r.push(`advanced`);
+ }
+ r.push(`growth hormones into your breasts before bed each night;</span>`);
+ dietInfluence = false;
+ if (PC.diet === "fattening") {
+ r.push(`all the binging you do fuels growth,`);
+ dietInfluence = true;
+ growth += 2;
+ } else if (PC.diet === "fertility") {
+ r.push(`the fertility hormones in your food favor breast growth`);
+ dietInfluence = true;
+ growth += 1;
+ } else if (PC.diet === "restricted") {
+ r.push(`how little you eat leaves your body few resources to grow on`);
+ dietInfluence = true;
+ growth -= 2;
+ } else if (PC.weight > 130) {
+ r.push(`the extra large portions you eat helps support growth`);
+ dietInfluence = true;
+ growth++;
+ } else if (PC.weight > 30) {
+ r.push(`how much you eat helps support growth`);
+ dietInfluence = true;
+ growth++;
+ } else if (PC.weight <= -30) {
+ r.push(`how little you eat impedes growth`);
+ dietInfluence = true;
+ growth--;
+ }
+ if (dietInfluence) {
+ if (PC.health.condition > -20) {
+ r.push(`and`);
+ } else {
+ r.push(`but`);
+ }
+ }
+ if (PC.health.condition > 80) {
+ r.push(`your perfect health supports growth extremely well,`);
+ growth++;
+ } else if (PC.health.condition > -20) {
+ r.push(`your health supports growth,`);
+ } else {
+ r.push(`your poor health does not support steady growth,`);
+ growth--;
+ }
+ if (PC.boobs < 2000) {
+ r.push(`and`);
+ } else {
+ r.push(`but`);
+ }
+ if (PC.boobs < 800) {
+ r.push(`you wake up each morning to find them a little larger than the night before.`);
+ growth += 3;
+ if (PC.boobShape !== "torpedo-shaped" && PC.boobShape !== "wide-set" && PC.breastMesh !== 1) {
+ if (random(1, 10) === 1) {
+ if (PC.shoulders < 0) {
+ r.push(`As they grow, <span class="change positive">they take on a torpedo shape within the your narrow frame,</span> projecting considerably from your chest and swinging delightfully when unrestrained.`);
+ PC.boobShape = "torpedo-shaped";
+ } else {
+ r.push(`As they grow, <span class="change positive">they become widely set across your broad frame,</span> spreading to your sides even when you're not lying back.`);
+ PC.boobShape = "wide-set";
+ }
+ }
+ }
+ } else if (PC.boobs < 2000) {
+ r.push(`your big boobs steadily grow.`);
+ growth += 2;
+ if (PC.boobShape === "saggy" || (PC.boobShape === "downward-facing" && PC.breastMesh !== 1)) {
+ if (random(1, 10) === 1) {
+ r.push(`As they do, <span class="change positive">they fill out, losing their sag</span> as the expanding tissue lifts your nipples up to point forward.`);
+ PC.boobShape = "normal";
+ }
+ }
+ } else if (PC.boobs < 5000) {
+ r.push(`your hefty boobs slowly grow.`);
+ growth++;
+ if (PC.boobShape !== "saggy" && (PC.boobsImplant / PC.boobs < 0.5) && PC.breastMesh !== 1) {
+ if (random(1, 10) === 1) {
+ r.push(`As they do, they <span class="coral">begin to sag</span> under their own monstrous weight, with the surging breastflesh directing your nipples downward.`);
+ PC.boobShape = "saggy";
+ }
+ }
+ } else {
+ r.push(`you find it difficult to notice the slight growth in your monstrous tits.`);
+ if (PC.boobShape !== "normal" && (PC.boobsImplant / PC.boobs < 0.9) && PC.breastMesh !== 1) {
+ if (random(1, 10) === 1) {
+ r.push(`Your <span class="coral">breasts lose their unique shape</span> as they adapt to their enormous, unnatural size. There's simply nowhere else for the mass of boob to go as its continuous expansion fills your breasts out more and more.`);
+ PC.boobShape = "normal";
+ }
+ }
+ }
+ if (PC.geneMods.NCS === 1) {
+ growth = Math.trunc(growth / 2.2);
+ r.push(`Your <span class="ncs">NCS</span> resists the breast growth, diverting some of resources into additional sexual energy.`);
+ PC.energy += growth;
+ }
+ growth = 25 * Math.trunc(growth * 0.8);
+ PC.boobs += Math.clamp(growth, 25, 200);
+ if (PC.areolae < 4) {
+ if (growth > PC.areolae * 25) {
+ r.push(`Your <span class="change positive">areolae grow</span> to keep in proportion with your breasts.`);
+ PC.areolae += 1;
+ }
+ }
+ if (PC.nipples !== "huge" && PC.nipples !== "fuckable" && PC.nipples !== "flat") {
+ if (random(1, 200) < growth) {
+ if (PC.nipples === "tiny") {
+ r.push(`The hormones also <span class="change positive">cause a little nipple growth.</span>`);
+ PC.nipples = "cute";
+ } else if (PC.nipples === "cute") {
+ if (random(1, 2) === 1) {
+ r.push(`The hormones also <span class="change positive">cause your cute nipples to puff up.</span>`);
+ PC.nipples = "puffy";
+ } else {
+ r.push(`The explosive growth also <span class="change positive">causes your cute nipples to be partially swallowed up</span> by the burgeoning breastflesh.`);
+ PC.nipples = "partially inverted";
+ }
+ } else if (PC.nipples === "puffy") {
+ if (random(1, 2) === 1) {
+ r.push(`The hormones also <span class="change positive">cause your puffy nipples to become really enormous.</span>`);
+ PC.nipples = "huge";
+ } else {
+ r.push(`The explosive growth also <span class="change positive">causes your cute nipples to be completely swallowed up</span> by the burgeoning breastflesh.`);
+ PC.nipples = "inverted";
+ }
+ } else if (PC.nipples === "partially inverted") {
+ r.push(`The explosive growth also <span class="change positive">causes your nipples to fully invert</span> into the burgeoning breastflesh.`);
+ PC.nipples = "inverted";
+ }
+ }
+ }
+ if (PC.geneticQuirks.gigantomastia === 3 && random(1, 300) < PC.hormoneBalance) {
+ PC.geneticQuirks.gigantomastia = 2;
+ }
+ if (PC.geneticQuirks.macromastia === 3 && random(1, 300) < PC.hormoneBalance) {
+ PC.geneticQuirks.macromastia = 2;
+ }
+ if (PC.geneticQuirks.galactorrhea === 2 && PC.lactation === 0 && random(1, 100) <= PC.hormoneBalance) {
+ PC.lactation = 1;
+ PC.lactationDuration = 2;
+ if (V.geneticMappingUpgrade >= 1) {
+ r.push(`The sudden surge of hormones has unsurprisingly <span class="change positive">triggered your galactorrhea.</span>`);
+ } else {
+ r.push(`You experience <span class="change positive">sudden lactation</span> as a side effect from the drugs.`);
+ }
+ }
+ break;
+ case "nipple enhancers": {
+ let nippleThreshold = ((60 - (V.injectionUpgrade * 15)) / (1 + PC.geneMods.NCS));
+ r.push(`You <span class="change positive">directly inject enhancers into your nipples several times a day,</span> keeping them bloated and engorged${PC.geneMods.NCS === 1 ? `; your <span class="ncs">NCS</span> hinders the effect, however` : ""}.`);
+ switch (PC.nipples) {
+ case "inverted":
+ if (random(1, 100) > nippleThreshold) {
+ r.push(`<span class="change positive">Your inverted nipples swell painfully,</span> bulging out of your tits and eventually never fully retracting.`);
+ PC.nipples = "partially inverted";
+ }
+ break;
+ case "partially inverted":
+ if (random(1, 100) > nippleThreshold) {
+ r.push(`<span class="change positive">Your inverted nipples swell painfully,</span> completely bulging out of your tits and staying that way.`);
+ PC.nipples = jsEither(["cute", "puffy", "huge"]);
+ }
+ break;
+ case "tiny":
+ if (random(1, 100) > nippleThreshold) {
+ r.push(`<span class="change positive">Your nipples swell painfully,</span> becoming larger and cute.`);
+ PC.nipples = "cute";
+ }
+ break;
+ case "cute":
+ if (random(1, 100) > nippleThreshold) {
+ r.push(`<span class="change positive">Your nipples swell painfully,</span> becoming larger and puffy.`);
+ PC.nipples = "puffy";
+ }
+ break;
+ case "puffy":
+ if (random(1, 100) > nippleThreshold) {
+ r.push(`<span class="change positive">Your nipples swell painfully,</span> becoming spectacularly immense.`);
+ PC.nipples = "huge";
+ }
+ break;
+ case "flat":
+ if (random(1, 100) > nippleThreshold) {
+ r.push(`<span class="change positive">Your flat nipples swell painfully,</span> becoming spectacularly immense.`);
+ PC.nipples = "huge";
+ }
+ break;
+ case "huge":
+ r.push(`Your nipples are now so massive that the drugs aren't having much of an effect; <span class="yellow">you see no reason to keep taking them.</span>`);
+ PC.drugs = "no drugs";
+ break;
+ default:
+ r.push(`They fail to have any lasting effect on your ${PC.nipples} nipples; <span class="noteworthy">you see no reason to keep taking them.</span>`);
+ PC.drugs = "no drugs";
+ break;
+ }
+ break;
+ }
+ case "hyper butt injections":
+ growth = 0.5;
+ r.push(`You <span class="change positive">directly inject`);
+ if (V.injectionUpgrade !== 0) {
+ r.push(`advanced`);
+ }
+ r.push(`hyper growth hormones into your buttocks before bed each night;</span>`);
+ dietInfluence = false;
+ if (PC.diet === "fattening") {
+ r.push(`all the binging you do fuels growth,`);
+ dietInfluence = true;
+ growth += 0.2;
+ } else if (PC.diet === "restricted") {
+ r.push(`how little you eat leaves your body few resources to grow on`);
+ dietInfluence = true;
+ growth -= 0.2;
+ } else if (PC.weight > 130) {
+ r.push(`the extra large portions you eat helps support growth`);
+ dietInfluence = true;
+ growth += 0.2;
+ } else if (PC.weight > 30) {
+ r.push(`how much you eat helps support growth`);
+ dietInfluence = true;
+ growth += 0.1;
+ } else if (PC.weight <= -30) {
+ r.push(`how little you eat impedes growth`);
+ dietInfluence = true;
+ growth -= 0.1;
+ }
+ if (dietInfluence) {
+ if (PC.health.condition > -20) {
+ r.push(`and`);
+ } else {
+ r.push(`but`);
+ }
+ }
+ if (PC.health.condition > 80) {
+ r.push(`your perfect health supports growth extremely well,`);
+ growth += 0.5;
+ } else if (PC.health.condition > -20) {
+ r.push(`your health supports growth,`);
+ } else {
+ r.push(`your poor health does not support steady growth,`);
+ growth -= 0.1;
+ }
+ if (PC.butt < 10) {
+ r.push(`and`);
+ } else {
+ r.push(`but`);
+ }
+ if (PC.butt < 6) {
+ r.push(`you wake up each morning with a lot of extra weight on your rear.`);
+ growth += 1;
+ } else if (PC.butt < 8) {
+ r.push(`you wake up each morning to find it a little larger than the night before.`);
+ growth += 0.8;
+ } else if (PC.butt < 10) {
+ r.push(`your titanic rear steadily grows.`);
+ growth += 0.6;
+ } else {
+ r.push(`it's hard to track the slow growth of your inhuman rear.`);
+ growth += 0.4;
+ }
+ if (rearLipedemaMod !== 0) {
+ growth += 1;
+ if (V.geneticMappingUpgrade >= 1) {
+ r.push(`Your rear lipedema amplifies the drug's effects.`);
+ } else {
+ r.push(`You're larger than you expected to be after this amount of use.`);
+ }
+ }
+ growth = ncsFightsButtGrowth(PC, growth);
+ if (growth > 1 || PC.geneMods.NCS === 1) {
+ PC.butt += growth;
+ } else {
+ PC.butt += 1;
+ }
+ if (PC.butt >= 20) {
+ PC.butt = 20;
+ }
+ break;
+ case "butt enhancers":
+ growth = 1 + rearLipedemaMod;
+ r.push(`You slap a <span class="change positive">dermal growth hormone patch on each buttock every morning;</span>`);
+ if (PC.butt < 2) {
+ r.push(`with its limited mass, your small butt greedily absorbs the drugs.`);
+ growth += 3;
+ } else if (PC.butt < 4) {
+ r.push(`at its size, your butt readily absorbs the drugs.`);
+ growth += 2;
+ } else if (PC.butt < 6) {
+ r.push(`at its size, your huge butt slowly absorbs the drugs.`);
+ growth++;
+ } else if (PC.butt < 8) {
+ r.push(`with its mass, and how tiny the patches are becoming by comparison, the drugs have a reduced effect on your enormous butt.`);
+ growth += 0.5;
+ } else if (PC.butt < 10) {
+ r.push(`with its mass, and how tiny the patches are by comparison, it comes as little surprise that your monstrous butt barely grows.`);
+ } else {
+ r.push(`with its mass, and how miniscule the patches are in comparison, you're left to wonder if your inhuman ass is actually growing or not.`);
+ growth--;
+ }
+ if (rearLipedemaMod !== 0) {
+ if (V.geneticMappingUpgrade >= 1) {
+ r.push(`Your rear lipedema amplifies the drug's effects.`);
+ } else {
+ r.push(`Your rate of expansion is a little alarming given the drugs are administered by diffusion rather than infusion.`);
+ }
+ }
+ growth *= 0.2;
+ growth = ncsFightsButtGrowth(PC, growth);
+ PC.butt += Math.clamp(growth, 0.1, 1 + rearLipedemaMod);
+ break;
+ case "butt injections":
+ case "intensive butt injections":
+ growth = 1 + V.injectionUpgrade;
+ r.push(`You <span class="change positive">directly inject`);
+ if (intensive) {
+ r.push(`massive amounts of`);
+ growth *= 2;
+ }
+ if (V.injectionUpgrade !== 0) {
+ r.push(`advanced`);
+ }
+ r.push(`growth hormones into your buttocks before bed each night;</span>`);
+ dietInfluence = false;
+ if (PC.diet === "fattening") {
+ r.push(`all the binging you do fuels growth,`);
+ dietInfluence = true;
+ growth += 2;
+ } else if (PC.diet === "restricted") {
+ r.push(`how little you eat leaves your body few resources to grow on`);
+ dietInfluence = true;
+ growth -= 2;
+ } else if (PC.weight > 130) {
+ r.push(`the extra large portions you eat helps support growth`);
+ dietInfluence = true;
+ growth += 3;
+ } else if (PC.weight > 30) {
+ r.push(`how much you eat helps support growth`);
+ dietInfluence = true;
+ growth++;
+ } else if (PC.weight <= -30) {
+ r.push(`how little you eat impedes growth`);
+ dietInfluence = true;
+ growth--;
+ }
+ if (dietInfluence) {
+ if (PC.health.condition > -20) {
+ r.push(`and`);
+ } else {
+ r.push(`but`);
+ }
+ }
+ if (PC.health.condition > 80) {
+ r.push(`your perfect health supports growth extremely well,`);
+ growth++;
+ } else if (PC.health.condition > -20) {
+ r.push(`your health supports growth,`);
+ } else {
+ r.push(`your poor health does not support steady growth,`);
+ growth--;
+ }
+ if (PC.butt < 6) {
+ r.push(`and`);
+ } else {
+ r.push(`but`);
+ }
+ if (PC.butt < 2) {
+ r.push(`you wake up each morning to find it a little larger than the night before.`);
+ growth += 3;
+ } else if (PC.butt < 4) {
+ r.push(`your big behind steadily expands.`);
+ growth += 2;
+ } else if (PC.butt < 6) {
+ r.push(`your massive ass slowly and steadily grows.`);
+ growth++;
+ } else {
+ r.push(`it's hard to track the slow growth to your monstrous rear.`);
+ }
+ if (rearLipedemaMod !== 0) {
+ growth += 3;
+ if (V.geneticMappingUpgrade >= 1) {
+ r.push(`Your rear lipedema amplifies the drug's effects.`);
+ } else {
+ r.push(`You're larger than you expected to be after this amount of use.`);
+ }
+ }
+ growth *= 0.2;
+ growth = ncsFightsButtGrowth(PC, growth);
+ PC.butt += Math.clamp(growth, 0, 2 + rearLipedemaMod);
+ if (PC.geneMods.rapidCellGrowth !== 1) {
+ if (intensive) {
+ if (PC.anus > 1) {
+ r.push(`The reckless drug therapy has the pleasant side effect of rejuvenating your sphincter muscles, <span class="change positive">tightening up your`);
+ if (PC.anus > 4) {
+ r.push(`gaping`);
+ } else if (PC.anus > 3) {
+ r.push(`loose`);
+ } else {
+ r.push(`relaxed`);
+ }
+ r.push(`anus.</span>`);
+ PC.anus--;
+ }
+ } else {
+ if (PC.anus > 2) {
+ r.push(`The drug therapy has the pleasant side effect of rejuvenating your sphincter muscles, <span class="change positive">tightening up your`);
+ if (PC.anus > 4) {
+ r.push(`gaping`);
+ } else {
+ r.push(`loose`);
+ }
+ r.push(`anus.</span>`);
+ PC.anus--;
+ }
+ }
+ }
+ break;
+ case "lip enhancers":
+ r.push(`You apply a series of <span class="change positive">dermal growth hormone patches along your lips before bed,</span> resulting in slow, but steady, growth.`);
+ if (PC.geneMods.NCS === 1) {
+ PC.lips += 1;
+ } else {
+ PC.lips += 2;
+ }
+ if (PC.lips > 90 && oldLips <= 90) {
+ r.push(`They've become so engorged that they resemble a puffy pussy. While they may be good for oral sex, <span class="change negative">they are bad for anything not involving fellatio.</span>`);
+ } else if (PC.lips > 70 && oldLips <= 70) {
+ r.push(`They've swollen so large now that <span class="change negative">it has become difficult to properly enunciate words</span> through them.`);
+ }
+ break;
+ case "lip injections":
+ if (PC.lips <= 95) {
+ r.push(`You <span class="change positive">directly inject`);
+ if (V.injectionUpgrade !== 0) {
+ r.push(`advanced`);
+ }
+ r.push(`growth agents into your lips before bed each night;</span> they swell rapidly,`);
+ if (PC.lips > 90) {
+ r.push(`becoming a facepussy useless for anything other than oral sex. <span class="change negative"> That includes talking and being taken serious in business.</span>`);
+ } else if (PC.lips > 70 && PC.lips <= 75) {
+ r.push(`and are now so large that it has <span class="change negative">become difficult to properly enunciate words.</span>`);
+ } else {
+ r.push(`with their progress easily trackable with each passing day.`);
+ }
+ if (PC.geneMods.NCS === 1) {
+ PC.lips += 2;
+ } else {
+ PC.lips += 5;
+ }
+ }
+ break;
+ case "growth stimulants":
+ growth = 1;
+ r.push(`You <span class="change positive">directly inject yourself with growth stimulants</span> several times a day in an effort to increase your height.`);
+ // Hormones
+ if (PC.hormones === 1 || PC.hormones === -1) {
+ r.push(`The hormones you are on disrupt the drug's effectiveness.`);
+ growth -= 0.2;
+ }
+ // hormone balance
+ if (PC.hormoneBalance <= -50) {
+ growth += 0.5;
+ } else if (PC.hormoneBalance <= -25) {
+ growth += 0.2;
+ } else if (PC.hormoneBalance < 50) {
+ growth -= 0.2;
+ } else {
+ growth -= 0.5;
+ }
+ // diet
+ if (PC.diet === "fattening") {
+ r.push(`All the binging you do fuels growth.`);
+ growth += 0.2;
+ } else if (PC.diet === "restricted") {
+ r.push(`How little you eat leaves your body few resources to grow on.`);
+ growth--;
+ } else if (PC.diet === "fertility") {
+ r.push(`The fertility enhancing hormones in your food slightly disrupts your growth.`);
+ growth -= 0.1;
+ } else if (PC.diet === "XY" || PC.diet === "XX" || PC.diet === "XXY") {
+ r.push(`The fertility hormones in your food inhibits growth.`);
+ growth -= 0.5;
+ } else if (PC.diet === "cleansing") {
+ r.push(`Your growth is severely inhibited by your diet.`);
+ growth--;
+ } else if (PC.diet === "muscle building" || PC.diet === "slimming" || PC.muscles >= 96) {
+ r.push(`Your rigorous exercise regime helps support growth.`);
+ growth += 0.5;
+ }
+ // health
+ if (PC.health.condition > 80) {
+ r.push(`Your perfect health greatly supports growth.`);
+ growth += 0.2;
+ } else if (PC.health.condition > -20) {
+ r.push(`Your health supports your growth.`);
+ } else {
+ r.push(`Your health hinders growth.`);
+ growth--;
+ }
+ // if growth was accomplished
+ if (growth > 0) {
+ // age modifier
+ let ageMod = 1;
+ const pubertyLength = 5;
+ const maxGrowthAge = 24;
+
+ if (PC.geneMods.NCS === 1) {
+ r.push(`Your <span class="ncs">NCS</span> harshly inhibits your body's response to the treatment.`);
+ ageMod = 0.25;
+ } else if (PC.genes === "XY") {
+ if (PC.pubertyXY === 0 && PC.physicalAge <= 13) {
+ r.push(`Your young body eagerly responds to the stimulants.`);
+ ageMod = 1.5;
+ } else if (PC.physicalAge <= (PC.pubertyAgeXY + pubertyLength)) {
+ r.push(`Since you're going through the aftermath of puberty, your body welcomes the treatment with open arms.`);
+ ageMod = 2;
+ } else if (PC.physicalAge <= maxGrowthAge) {
+ r.push(`With puberty over, your body resists the stimulants.`);
+ ageMod = 1;
+ } else {
+ r.push(`Your mature body struggles to respond to the treatment, making progress difficult.`);
+ ageMod = 0.5;
+ }
+ } else if (PC.genes === "XX") {
+ if (PC.pubertyXX === 0 && PC.physicalAge <= 13) {
+ r.push(`Your young body eagerly responds to the stimulants.`);
+ ageMod = 1.5;
+ } else if (PC.physicalAge <= (PC.pubertyAgeXX + pubertyLength)) {
+ r.push(`Since you're going through the aftermath of puberty, your body welcomes the treatment with open arms.`);
+ ageMod = 2;
+ } else if (PC.physicalAge <= maxGrowthAge) {
+ r.push(`With puberty over, your body resists the stimulants.`);
+ ageMod = 1;
+ } else {
+ r.push(`Your mature body struggles to respond to the treatment, making progress difficult.`);
+ ageMod = 0.5;
+ }
+ }
+ // evaluate against expected height, with neoteny comparing against expected height for 12 year olds...
+ let heightDiff;
+ if (PC.geneticQuirks.neoteny === 2 && PC.physicalAge > 12) {
+ heightDiff = (PC.height - PC.heightImplant * 10) / Height.mean(PC.nationality, PC.race, PC.genes, 12);
+ } else {
+ heightDiff = (PC.height - PC.heightImplant * 10) / Height.mean(PC);
+ }
+ // if you are taller than the expected height the growth is reduced, if shorter accelerated proportionally to the distance from the expected height
+ heightDiff = 1 - heightDiff;
+ // ...and calculates final value
+ growth = (growth + growth * heightDiff) * ageMod;
+ if (PC.geneMods.NCS === 0) {
+ growth = Math.round(Math.clamp(growth, 0, 5));
+ } else {
+ growth = Math.round(Math.clamp(growth, 0, 2));
+ }
+ // communicates the amount of growth
+ if (growth < 1) { // in case heightDiff manages to bring growth down enough
+ r.push(`Despite the treatment, you didn't grow at all.`);
+ } else if (growth === 1) {
+ r.push(`<span class="change positive">Overall, you got a little taller over the week.</span>`);
+ } else if (growth === 2) {
+ r.push(`<span class="change positive">Overall, you got taller over the week.</span>`);
+ } else if (growth === 3) {
+ r.push(`<span class="change positive">Overall, you grew a lot over the week.</span>`);
+ } else if (growth === 4) {
+ r.push(`<span class="change positive">Shockingly, you grew dramatically over the week.</span>`);
+ } else if (growth === 5) {
+ r.push(`<span class="change positive">You experience explosive growth over the week,</span> growth so extreme that your cardiovascular system struggled to keep up, <span class="health dec">severely damaging your health.</span>`);
+ healthDamage(PC, 20);
+ }
+ // health issues
+ if (random(1, 10) === 1 && growth.isBetween(1, 4)) {
+ r.push(`You grew faster than your body could keep up with, even; <span class="health dec">a rather painful endeavor.</span>`);
+ healthDamage(PC, 10);
+ }
+ if (PC.physicalAge > maxGrowthAge) {
+ if (random(1, 6) === 1) {
+ r.push(`Since you've already concluded your natural growth phase, the treatment <span class="health dec">weakens you considerably.</span>`);
+ healthDamage(PC, 15);
+ }
+ }
+ // update height
+ PC.height += growth;
+ } else {
+ // if growth is zero or negative
+ r.push(`Despite the treatment, you don't get any taller.`);
+ }
+ break;
+ case "male hormone injections":
+ if (PC.pubertyXY === 1) {
+ r.push(`Your orgasms are now very different from last week, in scent and volume, so it would appear the hormone injections have rendered you potent. <span class="noteworthy">You stop using them.</span>`);
+ PC.drugs = "no drugs";
+ } else {
+ r.push(`You <span class="change positive">frequently inject yourself with concentrated male hormones</span> several times a day in an effort to spur puberty. The intense surge of hormones leaves you <span class="health dec">ill and weak</span> as your body struggles to adapt to the overwhelming chemicals flooding its system.`);
+ PC.chem += 20;
+ healthDamage(PC, 10);
+ if (PC.energy > 5) {
+ PC.energy -= 5;
+ }
+ }
+ break;
+ case "female hormone injections":
+ if (PC.pubertyXX === 1) {
+ r.push(`Since you've had your first period, you no longer have need for the hormone injections. <span class="noteworthy">You stop using them.</span>`);
+ PC.drugs = "no drugs";
+ } else {
+ r.push(`You <span class="change positive">frequently inject yourself with concentrated female hormones</span> several times a day in an effort to spur puberty. The intense surge of hormones leaves you <span class="health dec">ill and weak</span> as your body struggles to adapt to the overwhelming chemicals flooding its system.`);
+ PC.chem += 20;
+ healthDamage(PC, 10);
+ if (PC.energy > 5) {
+ PC.energy -= 5;
+ }
+ galactorrheaTriggerCheck();
+ }
+ break;
+ case "hyper penis enhancement":
+ r.push(`You directly inject`);
+ if (V.injectionUpgrade !== 0) {
+ r.push(`advanced`);
+ }
+ r.push(`hyper growth hormones into your ${PC.dick > 0 ? "dick" : "clit"} before bed each night; a really unpleasant experience.`);
+ if (PC.dick > 0) {
+ if (PC.geneMods.NCS === 0) {
+ r.push(`<span class="change positive">Your cock grows painfully,</span> becoming both longer and girthier.`);
+ PC.dick += 1;
+ if (PC.balls === 1 && PC.scrotum > 0) {
+ r.push(`As a side effect of the dick enhancement drugs, <span class="change positive">your balls drop.</span>`);
+ PC.balls += 1;
+ }
+ } else if (random(1, (20 - PC.dick + V.injectionUpgrade)) > 12) {
+ r.push(`<span class="change positive">Your cock grows painfully,</span> becoming both longer and girthier, despite your <span class="ncs">NCS.</span>`);
+ PC.dick += 1;
+ } else {
+ r.push(`Your <span class="ncs">NCS</span> manages to prevent any substantial growth this session.`);
+ }
+ } else {
+ if (PC.geneMods.NCS === 0) {
+ r.push(`<span class="change positive">Your clit grows painfully,</span> becoming both longer and girthier.`);
+ PC.clit += 1;
+ } else if (random(1, (16 - PC.clit + V.injectionUpgrade)) > 10) {
+ r.push(`<span class="change positive">Your clit grows painfully,</span> becoming both longer and girthier, despite your <span class="ncs">NCS.</span>`);
+ PC.clit += 1;
+ } else {
+ r.push(`Your <span class="ncs">NCS</span> manages to prevent any substantial growth this session.`);
+ }
+ }
+ break;
+ case "penis enlargers":
+ noGrowth = true;
+ growth = 60;
+ if (PC.geneMods.NCS === 1) {
+ growth += 30;
+ }
+ r.push(`You slap a dermal growth hormone patch on your ${PC.dick > 0 ? "penis" : "pubic mound"} each morning;`);
+ if (PC.dick > 0) {
+ if (PC.dick < 2) {
+ r.push(`with how small you are, your tiny dick greedily absorbs the drugs.`);
+ if (random(1, 120) > growth) {
+ noGrowth = false;
+ }
+ } else if (PC.dick < 4) {
+ r.push(`at its size, your dick readily absorbs the drugs.`);
+ if (random(1, 110) > growth) {
+ noGrowth = false;
+ }
+ } else if (PC.dick < 6) {
+ r.push(`at its size, your big dick slowly absorbs the drugs.`);
+ if (random(1, 100) > growth) {
+ noGrowth = false;
+ }
+ } else if (PC.dick < 8) {
+ r.push(`with its size compared to the patch, it comes as little surprise that the drugs are beginning to have a reduced effect on your huge dick.`);
+ if (random(1, 80) > growth) {
+ noGrowth = false;
+ }
+ } else if (PC.dick <= 10) {
+ r.push(`with its mass, and how tiny the patches are by comparison, it comes as little surprise that the drugs are beginning to have a severely reduced effect on your massive dick.`);
+ if (random(1, 70) > growth) {
+ noGrowth = false;
+ }
+ } else {
+ r.push(`with its mass, and how miniscule the patches are in comparison, you're left to wonder if a dick of your size is even capable of absorbing enough of the drugs to continue expanding.`);
+ if (random(1, 61) > growth) {
+ noGrowth = false;
+ }
+ }
+ if (noGrowth) {
+ r.push(`You didn't grow much at all this week.`);
+ } else {
+ r.push(`<span class="change positive">You grew considerably over the week,</span> and are now sporting an obviously larger cock.`);
+ PC.dick++;
+ }
+ if (PC.dick === 6) {
+ if (PC.balls > 0 && canAchieveErection(PC)) {
+ r.push(`<span class="noteworthy">You're starting to have trouble getting and staying fully erect.</span> Your cardiovascular system is at the limit of what it can handle and any more growth may result in erectile dysfunction.`);
+ }
+ }
+ } else {
+ if (random(1, 100) > growth - (PC.clit * 10)) {
+ r.push(`<span class="change positive">Your clit steadily swells,</span> becoming both longer and girthier.`);
+ PC.clit++;
+ } else {
+ r.push(`Despite the treatment, your clit growth was negligible.`);
+ }
+ if (PC.vagina >= 0 && PC.labia < 3 && random(1, 100) > growth + (PC.labia * 12)) {
+ r.push(`Some of the drugs find their way to your labia, giving you a bit of a surprise when you discover <span class="change positive">your pussylips are larger.</span>`);
+ }
+ }
+ break;
+ case "penis enhancement":
+ case "intensive penis enhancement":
+ growth = 60 - (V.injectionUpgrade * 10);
+ if (PC.geneMods.NCS === 1) {
+ growth += 30;
+ }
+ r.push(`You directly inject`);
+ if (intensive) {
+ r.push(`massive amounts of`);
+ growth -= 20;
+ }
+ if (V.injectionUpgrade !== 0) {
+ r.push(`advanced`);
+ }
+ r.push(`growth hormones into your ${PC.dick > 0 ? "dick" : "clit"} before bed each night; a really unpleasant experience.`);
+ if (PC.dick > 0) {
+ if (random(1, 100) > growth + (PC.dick * 5)) {
+ r.push(`<span class="change positive">Your cock grows painfully,</span> becoming both longer and girthier.`);
+ PC.dick++;
+ } else {
+ r.push(`Despite the treatment, your dick growth was negligible.`);
+ }
+ if (PC.balls === 1 && PC.scrotum > 0) {
+ r.push(`As a side effect of the dick enhancement drugs, <span class="change positive">your balls drop.</span>`);
+ PC.balls += 1;
+ }
+ if (PC.dick === 6) {
+ if (PC.balls > 0 && canAchieveErection(PC)) {
+ r.push(`<span class="noteworthy">Your dick is having trouble getting and staying fully hard.</span> Your cardiovascular system is at the limit of what it can bring erect, any more and you might lose the ability to naturally get hard altogether.`);
+ }
+ }
+ } else {
+ if (random(1, 100) > growth - (PC.clit * 10)) {
+ r.push(`<span class="change positive">Your clit grows painfully,</span> becoming both longer and girthier.`);
+ PC.clit++;
+ } else {
+ r.push(`Despite the treatment, your clit growth was negligible.`);
+ }
+ }
+ break;
+ case "hyper testicle enhancement":
+ r.push(`You directly inject`);
+ if (V.injectionUpgrade !== 0) {
+ r.push(`advanced`);
+ }
+ r.push(`hyper growth hormones into your testicles before bed each night; a rather unpleasant experience.`);
+ if (PC.geneMods.NCS === 0) {
+ r.push(`<span class="change positive">Your balls bloat painfully</span> as your body enters a state of cum overproduction.`);
+ PC.balls += 2;
+ } else if (random(1, 400 - PC.balls + (V.injectionUpgrade * 10)) > 200) {
+ r.push(`<span class="change positive">Your balls swell painfully</span> as your body enters a state of cum overproduction despite your <span class="ncs">NCS.</span>`);
+ PC.balls += 1;
+ } else {
+ r.push(`Your <span class="ncs">NCS</span> manages to prevent any substantial growth this session, though your cum production is in overdrive.`);
+ }
+ break;
+ case "testicle enlargers":
+ noGrowth = true;
+ growth = 60;
+ if (PC.geneMods.NCS === 1) {
+ growth += 30;
+ }
+ r.push(`You slap a <span class="change positive">dermal growth hormone patch on each testicle every morning;</span>`);
+ if (PC.balls < 2) {
+ r.push(`with how small your sack is, your tiny balls greedily absorb the drugs.`);
+ if (random(1, 120) > growth) {
+ noGrowth = false;
+ }
+ } else if (PC.balls < 4) {
+ r.push(`at your sack's size, your balls readily absorb the drugs.`);
+ if (random(1, 110) > growth) {
+ noGrowth = false;
+ }
+ } else if (PC.balls < 6) {
+ r.push(`at your sack's size, your big balls slowly absorb the drugs.`);
+ if (random(1, 100) > growth) {
+ noGrowth = false;
+ }
+ } else if (PC.balls < 10) {
+ r.push(`with your sack's size compared to the patches, it comes as little surprise that the drugs are beginning to have a reduced effect on your massive balls.`);
+ if (random(1, 80) > growth) {
+ noGrowth = false;
+ }
+ } else if (PC.balls < 30) {
+ r.push(`with your sack's size, and how tiny the patches are by comparison, it comes as little surprise that the drugs are beginning to have a severely reduced effect on your enormous balls.`);
+ if (random(1, 70) > growth) {
+ noGrowth = false;
+ }
+ } else {
+ r.push(`with your sack's size, and how miniscule the patches are in comparison, you're left to wonder if balls of your size are even capable of absorbing enough of the drugs each to continue expanding.`);
+ if (random(1, 61) > growth) {
+ noGrowth = false;
+ }
+ }
+ if (noGrowth) {
+ r.push(`You didn't see much expansion this week.`);
+ } else {
+ r.push(`<span class="change positive">Your balls engorged considerably over the week,</span> and you are now sporting an obviously swollen scrotum.`);
+ PC.balls++;
+ }
+ break;
+ case "testicle enhancement":
+ case "intensive testicle enhancement":
+ growth = 60 - (V.injectionUpgrade * 10);
+ if (PC.geneMods.NCS === 1) {
+ growth += 30;
+ }
+ r.push(`You directly inject`);
+ if (intensive) {
+ r.push(`massive amounts of`);
+ growth -= 20;
+ }
+ if (V.injectionUpgrade !== 0) {
+ r.push(`advanced`);
+ }
+ r.push(`growth hormones into your testicles before bed each night; a rather unpleasant experience.`);
+ if (PC.balls < 10) {
+ if (random(1, 100) > growth + (PC.balls * 5)) {
+ r.push(`<span class="change positive">Your balls swell painfully</span> as they overproduce cum.`);
+ PC.balls++;
+ } else {
+ r.push(`Despite being filled with testicle enhancers and painfully swollen with resultant cum overproduction, your balls do not grow.`);
+ }
+ }
+ break;
+ case "steroids":
+ r.push(`You routinely inject yourself with steroids to better your gains.`);
+ if (PC.geneMods.NCS === 0 || random(1, 100) > 50) {
+ if (PC.dick === 0 && random(1, 100) > 40 + (PC.clit * 10)) {
+ r.push(`All the testosterone in your gear <span class="change positive">causes your clit to grow.</span>`);
+ PC.clit++;
+ } else if (PC.dick !== 0 && PC.dick < 3 && random(1, 100) > 95) {
+ r.push(`All the testosterone in your gear <span class="change positive">causes your dick to become a little more manly.</span>`);
+ PC.dick++;
+ } else if (PC.faceShape !== "masculine" && PC.faceShape !== "androgynous" && random(1, 100) > 95) {
+ r.push(`All the testosterone in your gear <span class="orange">hardens your face into androgyny.</span>`);
+ PC.faceShape = "androgynous";
+ } else if (PC.balls === 1 && PC.scrotum !== 0 && random(1, 100) > 95) {
+ r.push(`All the testosterone in your gear <span class="change positive">causes your balls to drop.</span>`);
+ PC.balls++;
+ } else if (PC.faceShape !== "masculine" && random(1, 100) > 95) {
+ r.push(`All the testosterone in your gear <span class="orange">masculinizes your face.</span>`);
+ PC.faceShape = "masculine";
+ } else if ( PC.balls > 2 && PC.scrotum !== 0 && random(1, 100) > 95) {
+ r.push(`All the testosterone in your gear <span class="change negative">causes your balls to atrophy,</span> as they no longer need to produce it themselves.`);
+ PC.balls++;
+ } else if (random(1, 100) > 110 - (PC.anus * 10) && PC.geneMods.rapidCellGrowth !== 1) {
+ r.push(`The steroids you're on have an effect on your stretched anal muscles, <span class="change positive">tightening your butthole up.</span>`);
+ PC.anus--;
+ } else if (random(1, 100) > 110 - (PC.vagina * 10) && PC.geneMods.rapidCellGrowth !== 1) {
+ r.push(`The steroids you're on have an effect on your vaginal muscles, <span class="change positive">leaving your pussy slightly tighter.</span>`);
+ PC.vagina--;
+ }
+ }
+ break;
+ case "anti-aging cream":
+ r.push(`The skin creams <span class="change positive">soothe your aging skin</span> leaving you with a more youthful glow.`);
+ PC.visualAge -= 1;
+ break;
+ case "super fertility drugs":
+ r.push(`You take a dose of super fertility pills with each of your meals.`);
+ if (PC.pregKnown === 1) {
+ if (PC.geneticQuirks.superfetation === 2 && (V.geneticMappingUpgrade !== 0 || PC.preg > 10 || PC.counter.birthsTotal > 0)) {
+ r.push(`You're already pregnant, but with superfetation in play, you're on track for an exceedingly full womb.`);
+ } else {
+ r.push(`<span class="noteworthy">You're already pregnant, so the fertility drugs don't really have any effect.</span>`);
+ }
+ } else if (PC.pregWeek < 0) {
+ r.push(`Your body is still recovering from your last pregnancy, so they aren't accomplishing much.`);
+ } else if (PC.preg > 1) {
+ r.push(`You really don't feel any different, which is odd given the strength of the drugs. Turns out <span class="pregnancy">you're already knocked up.</span>`);
+ PC.pregKnown = 1;
+ } else if (PC.ovaries === 0 && PC.mpreg === 0) {
+ r.push(`You lack the parts that would actually allow you to get pregnant, so they aren't accomplishing much.`);
+ } else if (PC.preg < -1) {
+ r.push(`You're sterile, so they aren't accomplishing much.`);
+ } else if (PC.ovaries === 0 && PC.mpreg !== 1) {
+ r.push(`You're barren, so they aren't accomplishing much.`);
+ } else if (PC.pubertyXX === 0 && (PC.ovaries === 1 || PC.mpreg === 1)) {
+ r.push(`However, you haven't actually gone through puberty yet, so they aren't accomplishing much.`);
+ } else if (PC.preg === -1) {
+ r.push(`You're also taking contraceptives, so they aren't accomplishing much.`);
+ } else {
+ r.push(`It feels as if your ovaries are bursting with fertile eggs; if you were to have sex in this state, which your body craves incessantly, there is no doubt in your mind that you would end up very, very pregnant.`);
+ }
+ if (PC.geneMods.NCS === 0) {
+ if (PC.lactation === 0 && random(0, 50) < PC.health.condition) {
+ r.push(`One of the side effects is clearly <span class="change positive">spontaneous lactation,</span> given your now swollen, milk-laden tits.`);
+ PC.lactation = 1;
+ PC.lactationDuration = 1;
+ }
+ }
+ galactorrheaTriggerCheck();
+ if (PC.energy < 85 && random(0, 10) < PC.health.condition) {
+ r.push(`You are frequently beset by intrusive thoughts<span class="libido inc">centered around being fucked raw.</span>`);
+ PC.energy += 2;
+ }
+ break;
+ case "fertility drugs":
+ r.push(`You take a dose of fertility pills with each of your meals.`);
+ if (PC.pregKnown === 1) {
+ if (PC.geneticQuirks.superfetation === 2 && (V.geneticMappingUpgrade !== 0 || PC.preg > 10 || PC.counter.birthsTotal > 0)) {
+ r.push(`You're already pregnant, but with superfetation in play, the drugs will aid in getting even more so.`);
+ } else {
+ r.push(`<span class="noteworthy">You're already pregnant, so the fertility drugs don't really have any effect.</span>`);
+ }
+ } else if (PC.pregWeek < 0) {
+ r.push(`Your body is still recovering from your last pregnancy, so they aren't accomplishing much.`);
+ } else if (PC.preg > 1) {
+ r.push(`You don't really feel any different, and after a few cursory tests, discover that <span class="pregnancy">you're already knocked up.</span>`);
+ PC.pregKnown = 1;
+ } else if (PC.ovaries === 0 && PC.mpreg === 0) {
+ r.push(`You lack the parts that would actually allow you to get pregnant, so they aren't accomplishing much.`);
+ } else if (PC.preg < -1) {
+ r.push(`You're sterile, so they aren't accomplishing much.`);
+ } else if (PC.ovaries === 0 && PC.mpreg !== 1) {
+ r.push(`You're barren, so they aren't accomplishing much.`);
+ } else if (PC.pubertyXX === 0 && (PC.ovaries === 1 || PC.mpreg === 1)) {
+ r.push(`However, you haven't actually gone through puberty yet, so they aren't accomplishing much.`);
+ } else if (PC.preg === -1) {
+ r.push(`You're also taking contraceptives, so they aren't accomplishing much.`);
+ } else {
+ r.push(`You feel sexier and more confident; a winning combination when it comes to getting yourself knocked up, and very likely to happen if you play things risky.`);
+ }
+ if (PC.geneMods.NCS === 0) {
+ if (PC.lactation === 0 && random(0, 100) < PC.health.condition) {
+ r.push(`One of the side effects is clearly <span class="change positive">spontaneous lactation,</span> given your now swollen, milk-laden tits.`);
+ PC.lactation = 1;
+ PC.lactationDuration = 1;
+ }
+ }
+ galactorrheaTriggerCheck();
+ break;
+ case "fertility supplements":
+ r.push(`You take a fertility supplement with each of your meals.`);
+ if (PC.pregKnown === 1) {
+ if (PC.geneticQuirks.superfetation === 2 && (V.geneticMappingUpgrade !== 0 || PC.preg > 10 || PC.counter.birthsTotal > 0)) {
+ r.push(`You're already pregnant, but with superfetation in play, the drugs will help a little in getting even more so.`);
+ } else {
+ r.push(`<span class="noteworthy">You're already pregnant, so the drugs don't really have any effect.</span>`);
+ }
+ } else if (PC.pregWeek < 0) {
+ r.push(`Your body is still recovering from your last pregnancy, so they aren't accomplishing much.`);
+ } else if (PC.preg > 1) {
+ r.push(`You feel a little ill after taking the pills, and a bit of testing leads to the discovery that <span class="pregnancy">you're already knocked up.</span>`);
+ PC.pregKnown = 1;
+ } else if (PC.ovaries === 0 && PC.mpreg === 0) {
+ r.push(`You lack the parts that would actually allow you to get pregnant, so they aren't accomplishing much.`);
+ } else if (PC.preg < -1) {
+ r.push(`You're sterile, so they aren't accomplishing much.`);
+ } else if (PC.ovaries === 0 && PC.mpreg !== 1) {
+ r.push(`You're barren, so they aren't accomplishing much.`);
+ } else if (PC.pubertyXX === 0 && (PC.ovaries === 1 || PC.mpreg === 1)) {
+ r.push(`However, you haven't actually gone through puberty yet, so they aren't accomplishing much.`);
+ } else if (PC.preg === -1) {
+ r.push(`You're also taking contraceptives, so they aren't accomplishing much.`);
+ } else {
+ r.push(`The carton advises that it won't actually boost conception rates, but rather give more chances to get pregnant. Twinning is fairly common though, according to other consumers.`);
+ }
+ galactorrheaTriggerCheck();
+ break;
+ case "appetite suppressors":
+ r.push(`You take an appetite suppressant before each meal in an effort to eat less and lose weight.`);
+ switch (PC.diet) {
+ case "restricted":
+ r.push(`In conjunction with your restrictive diet, you do so spectacularly, <span class="change positive">losing far more</span> than you ever could normally.`);
+ PC.weight -= 5;
+ break;
+ case "fattening":
+ r.push(`Which makes little sense since you're trying to gain weight, so <span class="noteworthy">you stop taking them.</span>`);
+ PC.drugs = "no drugs";
+ break;
+ default:
+ r.push(`It works exactly as you would expect, gradually <span class="change positive">slimming</span> you down from your reduced portion sizes.`);
+ PC.weight -= 2;
+ break;
+ }
+ break;
+ case "penis atrophiers":
+ r.push(`You directly inject`);
+ if (V.injectionUpgrade !== 0) {
+ r.push(`enhanced`);
+ }
+ r.push(`atrophiers into your dick before bed each night; a really unpleasant experience. Your body sets to work pulling resources from`);
+ if (PC.geneMods.NCS === 1) {
+ r.push(`it, amplified by your <span class="ncs">NCS.</span>`);
+ } else {
+ r.push(`it.`);
+ }
+ shrinkage = 0;
+ if (PC.dick >= 20) {
+ r.push(`Your enormous <span class="change positive">cock shrinks dully,</span> rapidly losing mass.`);
+ shrinkage = 3;
+ } else if (PC.dick >= 10) {
+ r.push(`Your massive <span class="change positive">cock shrinks dully,</span> becoming noticeably shorter and thinner.`);
+ shrinkage = 2;
+ } else if ((PC.geneMods.NCS === 1) || (random(1, 100) > 40 - (V.injectionUpgrade * 10) - (PC.dick * 5) && PC.dick > 1)) {
+ r.push(`Your <span class="change positive">cock shrinks dully,</span> becoming shorter and thinner.`);
+ shrinkage = 1;
+ }
+ if (PC.geneMods.NCS === 1 && PC.dick > 2) {
+ shrinkage *= 2;
+ }
+ PC.dick -= shrinkage;
+ break;
+ case "testicle atrophiers":
+ r.push(`You directly inject`);
+ if (V.injectionUpgrade !== 0) {
+ r.push(`enhanced`);
+ }
+ r.push(`atrophiers into your testicles before bed each night; a rather unpleasant experience. Your body sets to work pulling resources from`);
+ if (PC.geneMods.NCS === 1) {
+ r.push(`them, amplified by your <span class="ncs">NCS.</span>`);
+ } else {
+ r.push(`them.`);
+ }
+ shrinkage = 0;
+ if (PC.balls >= 100) {
+ r.push(`Your enormous <span class="change positive">balls shrink dully,</span> rapidly losing mass inside your scrotum.`);
+ shrinkage = 5;
+ } else if (PC.balls >= 80) {
+ r.push(`Your enormous <span class="change positive">balls shrink dully,</span> rapidly losing mass inside your scrotum.`);
+ shrinkage = 4;
+ } else if (PC.balls >= 60) {
+ r.push(`Your enormous <span class="change positive">balls shrink dully,</span> rapidly losing mass inside your scrotum.`);
+ shrinkage = 3;
+ } else if (PC.balls >= 40) {
+ r.push(`Your enormous <span class="change positive">balls shrink dully,</span> losing mass inside your scrotum.`);
+ shrinkage = 2;
+ } else if (PC.balls >= 20) {
+ r.push(`Your enormous <span class="change positive">balls shrink dully,</span> losing mass inside your scrotum.`);
+ shrinkage = 1;
+ } else if ((PC.geneMods.NCS === 1) || (random(1, 100) > 40 - (V.injectionUpgrade * 10) - (PC.balls * 2) && PC.balls > 1)) {
+ r.push(`Your <span class="change positive">balls shrink dully,</span> becoming smaller and filling out your scrotum less.`);
+ shrinkage = 1;
+ }
+ if (PC.geneMods.NCS === 1 && PC.balls > 2) {
+ shrinkage *= 2;
+ }
+ PC.balls -= shrinkage;
+ break;
+ case "clitoris atrophiers":
+ r.push(`You directly inject`);
+ if (V.injectionUpgrade !== 0) {
+ r.push(`enhanced`);
+ }
+ r.push(`atrophiers into your clitoris before bed each night; a really unpleasant experience. Your body sets to work pulling resources from`);
+ if (PC.geneMods.NCS === 1) {
+ r.push(`it, amplified by your <span class="ncs">NCS.</span>`);
+ } else {
+ r.push(`it.`);
+ }
+ if ((PC.geneMods.NCS === 1) || (random(1, 100) > 60 - (V.injectionUpgrade * 10) - (PC.clit * 5) && PC.clit > 0)) {
+ r.push(`Your <span class="change positive">clit shrinks dully,</span> becoming smaller`);
+ PC.clit -= 1;
+ }
+ if (PC.geneMods.NCS === 1 && PC.clit > 2) {
+ PC.clit -= 1;
+ }
+ break;
+ case "labia atrophiers":
+ r.push(`You directly inject`);
+ if (V.injectionUpgrade !== 0) {
+ r.push(`enhanced`);
+ }
+ r.push(`atrophiers into your labia majora before bed each night. Your body sets to work pulling resources from`);
+ if (PC.geneMods.NCS === 1) {
+ r.push(`them, amplified by your <span class="ncs">NCS.</span>`);
+ } else {
+ r.push(`them.`);
+ }
+ if ((PC.geneMods.NCS === 1) || (random(1, 100) > 60 - (V.injectionUpgrade * 10) - (PC.labia * 5) && PC.labia > 0)) {
+ r.push(`Your <span class="change positive">labia shrink dully,</span> becoming smaller`);
+ PC.labia -= 1;
+ }
+ if (PC.geneMods.NCS === 1 && PC.labia > 2) {
+ PC.labia -= 1;
+ }
+ break;
+ case "nipple atrophiers":
+ r.push(`You directly inject`);
+ if (V.injectionUpgrade !== 0) {
+ r.push(`enhanced`);
+ }
+ r.push(`atrophiers into your nipples before bed each night. Your body sets to work pulling resources from`);
+ if (PC.geneMods.NCS === 1) {
+ r.push(`them, amplified by your <span class="ncs">NCS.</span>`);
+ } else {
+ r.push(`them.`);
+ }
+ switch (PC.nipples) {
+ case "huge":
+ if ((PC.geneMods.NCS === 1) || (random(1, 100) > 60 - (V.injectionUpgrade * 15))) {
+ r.push(`<span class="change positive">Your nipples shrink dully,</span> becoming smaller, yet still remaining puffy swells.`);
+ PC.nipples = "puffy";
+ }
+ break;
+ case "puffy":
+ if ((PC.geneMods.NCS === 1) || (random(1, 100) > 60 - (V.injectionUpgrade * 15))) {
+ r.push(`<span class="change positive">Your nipples shrink dully,</span> becoming small and cute.`);
+ PC.nipples = "cute";
+ }
+ break;
+ case "cute":
+ if ((PC.geneMods.NCS === 1) || (random(1, 100) > 60 - (V.injectionUpgrade * 15))) {
+ r.push(`<span class="change positive">Your nipples shrink dully,</span> becoming positively tiny.`);
+ PC.nipples = "tiny";
+ }
+ break;
+ default:
+ r.push(`Your nipples are now so small that further sessions will fail to shrink them further; <span class="noteworthy">you stop taking them.</span>`);
+ PC.drugs = "no drugs";
+ break;
+ }
+ break;
+ case "lip atrophiers":
+ r.push(`You directly inject`);
+ if (V.injectionUpgrade !== 0) {
+ r.push(`enhanced`);
+ }
+ r.push(`atrophiers into your nipples before bed each night. Your body sets to work pulling resources from`);
+ if (PC.geneMods.NCS === 1) {
+ r.push(`them, amplified by your <span class="ncs">NCS.</span>`);
+ } else {
+ r.push(`them.`);
+ }
+ shrinkage = 0;
+ if (lipSize >= 70) {
+ r.push(`<span class="change positive">Your ${PC.lipsImplant > 0 ? "natural " : ""}lips shrink dully,</span> becoming massively smaller and thinner.`);
+ shrinkage = 5;
+ } else if (lipSize >= 50) {
+ r.push(`<span class="change positive">Your ${PC.lipsImplant > 0 ? "natural " : ""}lips shrink dully,</span> becoming much smaller and thinner.`);
+ shrinkage = 3;
+ } else if (lipSize >= 20) {
+ r.push(`<span class="change positive">Your ${PC.lipsImplant > 0 ? "natural " : ""}lips shrink dully,</span> becoming smaller and thinner.`);
+ shrinkage = 1;
+ } else if ((PC.geneMods.NCS === 1) || (random(1, 100) > (40 - (V.injectionUpgrade * 10) - lipSize) && lipSize > 0)) {
+ r.push(`<span class="change positive">Your ${PC.lipsImplant > 0 ? "natural " : ""}lips shrink dully,</span> becoming smaller and thinner.`);
+ shrinkage = 1;
+ }
+ if (PC.geneMods.NCS === 1 && PC.lipsImplant > 1) {
+ shrinkage *= 2;
+ }
+ PC.lips -= shrinkage;
+ break;
+ case "breast redistributors":
+ r.push(`You directly inject fat redistributors into your breasts before bed each night,`);
+ if (gigantomastiaMod !== 3) {
+ r.push(`encouraging your body to move fatty tissue from them to your`);
+ if (PC.geneMods.NCS === 1) {
+ r.push(`core, with your <span class="ncs">NCS</span> enhancing its effects.`);
+ } else {
+ r.push(`core.`);
+ }
+ let factor = 0;
+ if (boobSize >= 20000) {
+ r.push(`<span class="change positive">Your boobs shrink</span> over the week, becoming massively smaller while your <span class="orange">waistline swells tremendously.</span>`);
+ factor = 20;
+ } else if (boobSize >= 10000) {
+ r.push(`<span class="change positive">Your boobs shrink</span> over the week, becoming noticeably smaller while your <span class="orange">waistline does the opposite.</span>`);
+ factor = 10;
+ } else if (boobSize >= 5000) {
+ r.push(`<span class="change positive">Your boobs shrink</span> over the week, becoming smaller while your <span class="orange">waistline steadily grows.</span>`);
+ factor = 5;
+ } else if (boobSize >= 1000) {
+ r.push(`<span class="change positive">Your boobs shrink</span> over the week, becoming smaller while your <span class="orange">waistline steadily grows.</span>`);
+ factor = 3;
+ } else if (boobSize > 100) {
+ r.push(`<span class="change positive">Your boobs shrink</span> over the week, becoming a little smaller while your <span class="orange">waistline grows slightly.</span>`);
+ factor = 1;
+ }
+ PC.weight += factor;
+ if (PC.geneMods.NCS === 1 && boobSize > 200) {
+ factor *= 2;
+ }
+ if (gigantomastiaMod === 2) {
+ factor = 1;
+ r.push(`However, <span class="orange">your tits do not shrink proportionately to your stomach's expansion;</span> your passive breast growth has disrupted the whole process.`);
+ }
+ PC.boobs -= 100 * factor;
+ } else {
+ r.push(`but your constantly growing breasts resist them utterly; <span class="noteworthy">there's no point in continuing to take them.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "butt redistributors":
+ r.push(`You directly inject fat redistributors into your buttocks before bed each night, encouraging your body to move fatty tissue from them to your`);
+ if (PC.geneMods.NCS === 1 && rearLipedemaMod === 0) {
+ r.push(`core, with your <span class="ncs">NCS</span> enhancing its effects.`);
+ } else {
+ r.push(`core.`);
+ }
+ if (rearLipedemaMod === 1) {
+ r.push(`Annoyingly, while your <span class="orange">waistline slowly swelled,</span> most of <span class="change positive">your butt shrinkage</span> was offset by your passive ass growth.`);
+ PC.butt -= 0.2;
+ PC.weight += 5;
+ } else if (buttSize >= 15) {
+ r.push(`<span class="change positive">Your butt shrinks</span> over the week, becoming massively smaller while your <span class="orange">waistline swells tremendously.</span>`);
+ PC.butt -= 2;
+ PC.weight += 25;
+ } else if (buttSize >= 10) {
+ r.push(`<span class="change positive">Your butt shrinks</span> over the week, becoming smaller while your <span class="orange">waistline swells tremendously.</span>`);
+ PC.butt -= 1;
+ PC.weight += 20;
+ } else if ((PC.geneMods.NCS === 1) || (random(1, 100) > (50 - (V.injectionUpgrade * 10) - buttSize))) {
+ r.push(`<span class="change positive">Your butt shrinks</span> over the week, becoming smaller while your <span class="orange">waistline swells greatly.</span>`);
+ PC.butt -= 1;
+ PC.weight += 10;
+ }
+ PC.butt = Math.clamp(PC.butt, 0, 20);
+ break;
+ case "stamina enhancers":
+ r.push(`You take a couple stamina enhancing pills each morning to have some extra energy for more sex during the day.`);
+ // Consider tiredness here.
+ break;
+ case "detox pills":
+ r.push(`You take an aphrodisiac detoxification pill with each meal in an effort to kick your addiction. They're weaker than real aphrodisiacs, have none of the sexual benefits, and <span class="health dec">are still bad for you,</span> but sure beat dealing with the withdrawal.`);
+ // handled in prHealth
+ break;
+ case "sag-B-gone":
+ if (S.Concubine && S.Concubine.fetish !== Fetish.MINDBROKEN && hasAnyArms(S.Concubine)) {
+ r.push(`Each morning and evening, you make it a habit of allowing ${S.Concubine.slaveName} to sensually <span class="coral">massage sag-B-gone into your breasts.</span> While it may be strengthening the bond between you and your Concubine, it doesn't appear to be doing much else.`);
+ } else if (fuckSlavesLength() > 0) {
+ r.push(`Each morning and evening, you make it a habit of ordering the nearest fucktoy to <span class="coral">massage sag-B-gone into your breasts.</span> While the sensation may be enjoyable, and a little arousing, it doesn't seem to be doing much.`);
+ } else {
+ r.push(`Each morning and evening, you make a habit of <span class="coral">massaging sag-B-gone into your breasts,</span> which, while self-gratifying, doesn't appear to be doing much else.`);
+ }
+ r.push(induceLactation(PC, 2));
+ break;
+ }
+ if (["hyper breast injections", "hyper butt injections", "growth stimulants", "hyper penis enhancement", "hyper testicle enhancement", "super fertility drugs"].includes(PC.drugs)) {
+ if (!canEatFood(PC)) {
+ PC.chem += 2;
+ } else {
+ PC.chem += 10;
+ }
+ } else if (PC.drugs === "detox pills" || PC.drugs === "hip wideners") {
+ PC.chem += 2;
+ }
+ if (V.arcologies[0].FSBodyPuristLaw === 0 && V.healthyDrugsUpgrade === 0) {
+ if (["hormone enhancers", "priapism agents", "steroids", "fertility drugs"].includes(PC.drugs)) {
+ PC.chem += 1.5;
+ } else if (!["no drugs", "sag-B-gone", "anti-aging cream", "psychostimulants", "breast enhancers", "butt enhancers", "lip enhancers", "penis enlargers", "testicle enlargers", "fertility supplements", "stamina enhancers", "appetite suppressors", "detox pills"].includes(PC.drugs)) {
+ if (!canEatFood(PC)) {
+ PC.chem += 1.5;
+ if (intensive) {
+ PC.chem += 1;
+ }
+ } else {
+ PC.chem += 4;
+ if (intensive) {
+ PC.chem += 8;
+ }
+ }
+ }
+ }
+ if (intensive) {
+ r.push(`Being so reckless with the dosages is dangerous and <span class="health dec">unhealthy.</span>`);
+ healthDamage(PC, random(3, 5));
+ }
+ }
+
+ function pregnancyDrugEffects() {
+ if (PC.pregControl === "labor suppressors") {
+ r.push(`You're currently taking labor suppressors in order to prevent yourself from giving birth.`);
+ PC.chem += 5;
+ if (WombBirthReady(PC, PC.pregData.normalBirth * 1.25) > 0) {
+ healthDamage(PC, 20);
+ r.push(`Your body has been ready to give birth for some time now; it was not designed to stave off birth so long, and its <span class="health dec">serious impacts on your health</span> prove this. There's also the lingering thought of you <span class="health dec">tearing yourself asunder</span> in a fruitless bid to give birth to the oversized ${(PC.pregType === 1) ? `child` : `children`} growing heavy in your womb.`);
+ if (WombBirthReady(PC, PC.pregData.normalBirth * 1.5) > 0) {
+ induce(PC);
+ r.push(`<span class="noteworthy">A notion made all the more real by a sudden gush of fluids...</span>`);
+ }
+ } else if (WombBirthReady(PC, PC.pregData.normalBirth) > 0) {
+ healthDamage(PC, 10);
+ r.push(`Since you've passed your due date, something your body is well aware of, the drugs begin having a <span class="health dec">negative affect on your health.</span>`);
+ } else if (WombBirthReady(PC, PC.pregData.normalBirth * .90) > 0) {
+ r.push(`You're getting close to your intended due date, so it may be time to stop taking the drugs and "pop the cork," so to speak.`);
+ }
+ }
+ }
+
+ function aphrodisiacEffects() {
+ r.push(`You take a hit of slave-grade aphrodisiacs each morning to enhance the overall pleasure you feel during the day's escapades.`);
+ if (PC.energy <= 95) {
+ r.push(`You find yourself <span class="libido inc">fucking harder than you ever have before</span> and the payout more intense than you can imagine.`);
+ PC.energy += 3;
+ } else {
+ r.push(`While you're always ready to go on a moment's notice, you already are even before you take the pills. The increased intensity of your climaxes, however, makes it worthwhile still.`);
+ }
+ PC.chem += 0.5;
+ }
+
+ function drugExpiry() {
+ switch (PC.drugs) {
+ case "growth stimulants":
+ if (!canImproveHeight(PC)) {
+ r.push(`Your body has grown far past its natural limits, and with their recent reduced effects, it makes sense that the stimulants have also reached their limit. <span class="noteworthy">You stop using them.</span>`);
+ PC.height = Math.clamp(PC.height, 0, maxHeight(PC));
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "hyper breast injections":
+ if (PC.boobs >= 50000) {
+ r.push(`Your udders are now so massive that further HA-HGH treatment will be largely negligible. <span class="noteworthy">You stop using them.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "breast enhancers":
+ if (PC.boobs >= 50000) {
+ r.push(`Your udders are now so massive that the dermal patches can no longer diffuse the drugs into them effectively. <span class="noteworthy">You stop using them.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "breast injections":
+ case "intensive breast injections":
+ if (PC.boobs >= 50000) {
+ r.push(`Your udders are now so massive that further A-HGH treatment will be largely negligible. <span class="noteworthy">You stop using them.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "hyper butt injections":
+ if (PC.butt >= 20) {
+ r.push(`You've expanded your ass to such a freakishly monstrous size that HA-HGH treatment can do nothing more to further its growth. <span class="noteworthy">You stop using them.</span>`);
+ PC.butt = Math.clamp(PC.butt, 0, 20);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "butt enhancers":
+ if (PC.butt >= 20) {
+ r.push(`You've expanded your ass to such a freakishly monstrous size that the patches can no longer diffuse the drugs into them effectively. <span class="noteworthy">You stop using them.</span>`);
+ PC.butt = Math.clamp(PC.butt, 0, 20);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "butt injections":
+ case "intensive butt injections":
+ if (PC.butt >= 10) {
+ r.push(`Your ass is now so huge that further A-HGH treatment will be largely negligible. <span class="noteworthy">You stop using them.</span>`);
+ PC.butt = Math.clamp(PC.butt, 0, 20);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "lip enhancers":
+ if ((PC.lips >= 100) || (PC.lips > 85 && V.seeExtreme !== 1)) {
+ r.push(`Your lips are now so enormous that the patches can no longer diffuse the drugs into them effectively. <span class="noteworthy">You stop using them.</span>`);
+ PC.drugs = "no drugs";
+ PC.dick = Math.clamp(PC.lips, 0, 100);
+ }
+ break;
+ case "lip injections":
+ if ((PC.lips > 95) || (PC.lips > 85 && V.seeExtreme !== 1)) {
+ r.push(`Your lips are now so huge that further A-HGH treatment will be largely negligible. <span class="noteworthy">You stop using them.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "hyper penis enhancement":
+ if (PC.dick >= 30) {
+ r.push(`Your cock is so massive that any further growth will be negligible. <span class="noteworthy">You stop using them.</span>`);
+ PC.drugs = "no drugs";
+ } else if (PC.clit >= 5) {
+ r.push(`Your clit is so huge that the drug enhancement isn't having much of an effect any longer. <span class="noteworthy">You stop using them.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "penis enlargers":
+ if (PC.dick >= 30) {
+ r.push(`Your cock is so massive that the patches can no longer diffuse the drugs into it to a degree needed for further growth. <span class="noteworthy">You stop using them.</span>`);
+ PC.drugs = "no drugs";
+ } else if (PC.clit >= 5) {
+ r.push(`Your clit is so huge that the patches aren't having much of an effect any longer. <span class="noteworthy">You stop using them.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "penis enhancement":
+ case "intensive penis enhancement":
+ if (PC.dick >= 10) {
+ r.push(`Your cock is so huge that any further growth will be negligible. <span class="noteworthy">You stop using them.</span>`);
+ PC.dick = Math.clamp(PC.dick, 0, 10);
+ PC.drugs = "no drugs";
+ } else if (PC.clit >= 5) {
+ r.push(`Your clit is so huge that any further growth will be negligible. <span class="noteworthy">You stop using them.</span>`);
+ PC.clit = (Math.clamp(PC.clit, 0, 5));
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "hyper testicle enhancement":
+ if (PC.balls >= 125) {
+ r.push(`Your balls are now so immense that any further growth will be negligible. However, staying on the drugs will still stimulate cum overproduction.`);
+ }
+ break;
+ case "testicle enlargers":
+ if (PC.balls >= 125) {
+ r.push(`Your balls have ballooned to such an obscene size that the patches can no longer diffuse the drugs into them to a degree needed for further growth. <span class="noteworthy">You stop using them.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "testicle enhancement":
+ case "intensive testicle enhancement":
+ if (PC.balls >= 10) {
+ r.push(`Your balls are now so huge that any further growth will be negligible. However, staying on the drugs will still stimulate cum production.`);
+ }
+ break;
+ case "psychostimulants":
+ if (!canImproveIntelligence(PC)) {
+ r.push(`Your mind has been sharpened as much as any simple solution is capable of. <span class="noteworthy">You stop drinking it.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "anti-aging cream":
+ if (PC.visualAge <= 18) {
+ r.push(`The creams have done their job fully, having little to no further effect on you. Perhaps in a few years you'll resume treatment, but for now, <span class="noteworthy">you stop using them.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "appetite suppressors":
+ if (PC.weight <= -95) {
+ r.push(`You've lost so much weight that losing any more would put your life at risk; <span class="noteworthy">you stop taking them.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "penis atrophiers":
+ if (PC.dick === 1) {
+ r.push(`Your penis is now so minuscule that there is nothing left that the drugs can further reduce; <span class="noteworthy">you stop taking them.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "testicle atrophiers":
+ if (PC.balls === 1) {
+ r.push(`Your balls are now so insignificant that the drugs will have no further effect; <span class="noteworthy">you stop taking them.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "clitoris atrophiers":
+ if (PC.clit === 0) {
+ r.push(`Your clit is now a normal size and unable to really get any smaller; <span class="noteworthy">you stop taking them.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "labia atrophiers":
+ if (PC.labia === 0) {
+ r.push(`Your labia are now a more normal size and unable to really get any smaller; <span class="noteworthy">you stop taking the atrophiers.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "lip atrophiers":
+ if (lipSize === 0) {
+ r.push(`Your ${PC.lipsImplant > 0 ? "natural " : ""}lips are now so thin that further drug use will fail to shrink them further; <span class="noteworthy">you stop taking them.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "breast redistributors":
+ if (boobSize <= 100) {
+ r.push(`You are now so flat that you lack any breast tissue for the drugs to move; <span class="noteworthy">you stop taking them.</span>`);
+ PC.drugs = "no drugs";
+ } else if (PC.weight >= 200) {
+ r.push(`You have become so immensely obese that getting any fatter will put your health at risk; <span class="noteworthy">you hastily stop taking the drugs.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "butt redistributors":
+ if (buttSize <= 0) {
+ r.push(`Your ass is now so flat that the drugs will have no further effect on you; <span class="noteworthy">you stop taking them.</span>`);
+ PC.drugs = "no drugs";
+ } else if (PC.weight >= 200) {
+ r.push(`You have become so immensely obese that getting any fatter will put your health at risk; <span class="noteworthy">you hastily stop taking the drugs.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ case "hip wideners":
+ if (PC.hips > -2) {
+ r.push(`Your body has become better suited for childbirth; <span class="noteworthy">you stop taking the hormones.</span>`);
+ PC.drugs = "no drugs";
+ } else if (PC.preg <= 0) {
+ r.push(`You are no longer pregnant and have no need for wider hips; <span class="noteworthy">you stop taking the hormones.</span>`);
+ PC.drugs = "no drugs";
+ }
+ break;
+ }
+ if (PC.pregControl !== "none" && PC.pregKnown === 0) {
+ r.push(`You aren't pregnant anymore; <span class="noteworthy">you stop bothering with the labor suppressors.</span>`);
+ PC.pregControl = "none";
+ }
+ }
+};
diff --git a/src/endWeek/player/prHealth.js b/src/endWeek/player/prHealth.js
new file mode 100644
index 0000000000000000000000000000000000000000..4d7f6a4475b38a11337ffe08e7602e695ecaaddd
--- /dev/null
+++ b/src/endWeek/player/prHealth.js
@@ -0,0 +1,330 @@
+// This file calls functions from /src/endWeek/healthFunctions.js
+App.EndWeek.Player.health = function(PC = V.PC) {
+ const r = [];
+ const PCH = PC.health;
+
+ PC.chem = Math.clamp(PC.chem - 0.01, 0, 1000);
+
+ if (PC.diet !== "medicinal") {
+ healthBlips();
+ }
+ illness();
+ addiction();
+ endWeekHealthDamage(PC);
+ health();
+
+ return r.join(" ");
+
+ function healthBlips() {
+ if (PC.chem > 5) {
+ if (random(1, 220) < (PC.chem * 2) + PC.physicalAge - PC.health.condition) {
+ healthDamage(PC, 5);
+ switch (random(1, 10)) {
+ case 1:
+ r.push(`A bout of foreplay was interrupted when your partner discovered a small lump in your ${PC.boobs >= 300 ? "breast" : "chest"}. Your doctor removed it easily enough, <span class="cash">for a small fee,</span> with testing revealing it as benign.`);
+ cashX(forceNeg(500), "PCmedical");
+ break;
+ case 2:
+ r.push(`A bout of intense vertigo kept you stuck in bed, unwilling to move. Eventually the feeling passes on its own, just as suddenly as it arrived.`);
+ break;
+ case 3:
+ r.push(`You spent the morning experiencing an unshakable sense of dread. Eventually the feeling passes on its own, just as suddenly as it arrived.`);
+ break;
+ case 4:
+ r.push(`You're plagued by a series of severe headaches that are calmed easily enough by a dose of aspirin each.`);
+ break;
+ case 5:
+ r.push(`You experience recurrent nausea each morning this week.`);
+ if (PC.preg.isBetween(0, 4)) {
+ if (PC.pregKnown === 0) {
+ r.push(`It turns out <span class="pregnant">you're pregnant,</span> but it still didn't feel like ${PC.counter.birthsTotal > 0 ? "your morning sickness did last pregnancy" : "morning sickness to you"}.`);
+ PC.pregKnown = 1;
+ } else {
+ r.push(`You have been experiencing morning sickness already, and this is not helping matters.`);
+ }
+ } else {
+ r.push(`Your stomach is soothed with a little medication, but it was still unpleasant.`);
+ }
+ break;
+ case 6:
+ r.push(`You had trouble sleeping without taking anything before bed, several nights in a row.`);
+ break;
+ case 7:
+ r.push(`After a vigorous lovemaking session, you discover your heart rate is not coming down. A minor dose of medication resolves it, but it was still alarming.`);
+ break;
+ case 8:
+ r.push(`Much to your dismay, you discover that your blood isn't clotting properly. Eventually the cut stops bleeding on its own, but it does not bode well should anything worse happen to you.`);
+ break;
+ case 9:
+ r.push(`You've developed several ugly little ${PC.skin} skin tags. The autosurgery has everything you need to trivially remove them, but they are still annoying.`);
+ break;
+ default:
+ r.push(`Often you just feel wrong for a short spell before recovering.`);
+ }
+ r.push(`This likely was <span class="health dec">a side effect</span> of some treatment you've undergone.`);
+ }
+ }
+
+ if (PC.weight > 190) {
+ r.push(`Your extreme obesity <span class="health dec">directly impacts</span> your health, but since you let yourself get this large, it's not really that bothersome.`);
+ healthDamage(PC, 2);
+ if (random(1, 100 + PC.health.condition) < 5) {
+ r.push(`Unfortunately, this week ushered in <span class="health dec">severe health complications</span> related to it. After extensive, <span class="cash">and very costly,</span> heart surgery, your life was saved, though you'd better set aside some ¤ for when it happens again.`);
+ cashX(forceNeg(15000), "PCmedical");
+ healthDamage(PC, 80);
+ }
+ } else if (PC.weight > 160) {
+ if (random(1, 150 + PC.health.condition) < 5) {
+ r.push(`Your obesity has brought <span class="health dec">severe health complications</span> upon you this week. They required extensive, <span class="cash">and costly,</span> surgery to correct, so it may be time to pay more mind to your wellbeing.`);
+ cashX(forceNeg(5000), "PCmedical");
+ healthDamage(PC, 40);
+ }
+ } else if (PC.weight > 130) {
+ if (random(1, 175 + PC.health.condition) < 5) {
+ r.push(`Your weight caused you some <span class="health dec">severe health complications</span> this week. They passed after some time, but are rather concerning.`);
+ healthDamage(PC, 20);
+ }
+ } else if (PC.weight > 95) {
+ if (random(1, 200 + PC.health.condition) < 5) {
+ r.push(`Your weight caused you some <span class="health dec">minor health complications</span> this week. It passed quickly enough, and shouldn't be a real problem.`);
+ healthDamage(PC, 5);
+ }
+ }
+ }
+
+ function illness() {
+ const sicknessDegree = ["fine", "minor illness", "illness", "bad illness", "severe illness", "life-threatening illness"];
+
+ if (PCH.illness > 0) {
+ r.push(`You are`);
+ if (PCH.illness > 4) {
+ r.push(`deathly`);
+ } else if (PCH.illness > 3) {
+ r.push(`seriously`);
+ } else if (PCH.illness < 2) {
+ r.push(`slightly`);
+ } else {
+ r.push(`visibly`);
+ }
+ r.push(`ill,`);
+ if (PCH.illness > 1) {
+ r.push(`limiting your social interactions.`);
+ } else {
+ r.push(`but not badly enough to impede your socializing.`);
+ }
+ }
+
+ const roll = random(1, 100); // high rolls are good
+ let bonuses = 20; // bonus for living conditions and skills
+ if (PC.skill.medicine >= 40) {
+ bonuses += 10;
+ }
+ if (PC.diet === "medicinal") {
+ bonuses += 10;
+ }
+ if (V.personalAttention.task === PersonalAttention.RELAX) {
+ bonuses += 10;
+ }
+
+ if (roll < 2 && canCatchIllness(PC)) { // Always a 2% per week base chance of you, even in otherwise-safe conditions, spontaneously catching an illness
+ getIll(PC);
+ r.push(`You wake up to a sore throat and a runny nose; <span class="health dec">you've fallen ill.</span>`);
+ if (PCH.illness > 4) {
+ r.push(`You can barely move, and as you feel the vomit coming, there is nothing you can do to stop it. When you come back to your senses, you're horrified to discover you've coated yourself in your own disgorged blood.`);
+ } else if (PCH.illness > 3) {
+ r.push(`All you manage to do is roll to the side of the bed and vomit all over the floor before having to stop to regain some strength. Moving to clean yourself up is agonizing, and all you want is to go back to bed.`);
+ } else if (PCH.illness > 2) {
+ r.push(`It's a struggle to get out of bed, and you barely manage to make it to the bathroom before the vomit escapes you.`);
+ } else if (PCH.illness > 1) {
+ r.push(`It's a struggle to get out of bed, but you manage.`);
+ } else {
+ r.push(`It doesn't feel that bad, though.`);
+ }
+ } else if (roll < 6 && PCH.illness > 0) { // Always a 5% chance of feeling worse
+ PCH.illness += 1 + Math.trunc((PC.chem / 10 + random(1, 50) + 15) / 100); // Illness progresses with 1, unless chem > 350, then there's a chance for 2
+ r.push(`You feel worse by week's end <span class="health dec">as your illness progresses.</span>`);
+ if (PCH.illness > 5) {
+ healthDamage(PC, 20 * (PCH.illness - 5)); // Condition penalty for going over maximum illness, very dangerous
+ PCH.illness = 5;
+ r.push(`You feel your consciousness start to fade, and the last thing you remember is projectile vomiting a large amount of blood across the room. You awake surrounded by terrified slaves, <span class="health dec">unsure if you are alive or not and unwilling to approach you to find out,</span> lest they risk catching whatever it is that got you.`);
+ }
+ } else if (roll > 95 && PCH.illness > 0) { // Always a 5% chance of getting better
+ PCH.illness -= 1;
+ if (PCH.illness === 0) {
+ improveCondition(PC, 5);
+ r.push(`You feel better; <span class="health inc">it seems you've gotten over what ailed you.</span>`);
+ } else {
+ r.push(`You're not feeling yourself yet, but <span class="health inc">your illness has waned</span> slightly.`);
+ }
+ } else {
+ const ageModifier = Math.min(PC.physicalAge - 15, 0); // always negative (-15 to 0); younger kids are slightly more likely to get sick
+ const healthAdjusted = PCH.condition - (PCH.longDamage * 0.5) - (PCH.shortDamage * 1.5) * 1.25 + ageModifier; // -125~ to +125~, before weakness kicks in
+ const healthFactor = Math.clamp(1 + bonuses / healthAdjusted, 0.5, 1.5); // 0.5 to 1.5
+
+ if (V.debugMode) {
+ r.push(`(Illness factors: health ${healthFactor}${PCH.illness > 0 ? `; cure roll ${roll}` : ``})`);
+ }
+
+ // When ill, being in average health with a level 1 illness has a 60% chance of getting better the next week at complete default
+ if (PCH.illness > 0 && roll > (30 + (PCH.illness * 10)) / (healthFactor)) {
+ PCH.illness -= 1;
+ r.push(`Your immune system <span class="health inc">pushes back</span> against your illness.`);
+ if (PCH.illness === 0) {
+ r.push(`It seems to have <span class="health inc">thoroughly beaten</span> whatever was ailing you.`);
+ }
+ } else if (canCatchIllness(PC)) {
+ /** an adult in average condition in an otherwise unprotected environment (no drugs or modifiers) will have `baseChance` chance of catching an illness when exposed
+ * note the independent roll for each exposure; we're ignoring the original random roll here
+ * @param {number} baseChance
+ * @returns {boolean}
+ */
+ const catchesIllness = (baseChance) => {
+ const catchIll = random(1, 100);
+ if (V.debugMode) {
+ r.push(`(Transmission roll: ${catchIll} vs ${baseChance}*mods)`);
+ }
+ return catchIll < baseChance / (bonuses * healthFactor);
+ };
+
+ // PC is always in and out of the penthouse
+ if (isMovable(PC)) {
+ if (catchesIllness(5)) {
+ getIll(PC);
+ r.push(`You have picked up <span class="health dec">${addA(sicknessDegree[PCH.illness])}</span> while touring ${V.arcologies[0].name}; with all the people coming and going, it's not surprising that something easily transmissible can gain a foothold.`);
+ if (PCH.illness > 2) {
+ r.push(`Wandering around when you're this sick, however, is a serious public health risk given the population density, as well as just plain rude.`);
+ }
+ }
+ }
+
+ /* if you didn't/couldn't catch an illness outside, maybe you'll get one from your slaves
+ * You're most likely to catch something from your lover,
+ * followed by consorts,
+ * then personal attention targets,
+ * and lastly, anything in the penthouse.
+ */
+ const sexPartners = V.slaves.filter(s => App.Utils.sexAllowed(PC, s) && isSlaveAvailable(s));
+ const fucktoys = V.slaves.filter(s => [Job.FUCKTOY, Job.MASTERSUITE, Job.CONCUBINE].includes(s.assignment));
+ const wives = V.slaves.filter(s => s.relationship === -3);
+ if (PCH.illness === 0 && wives.length > 0) {
+ for (const other of wives.filter(s => s.health.illness > 1)) {
+ if (catchesIllness(20)) {
+ PCH.illness = other.health.illness - 1; // reduced severity
+ r.push(`${other.slaveName} is sick, and has <span class="health dec">passed ${addA(sicknessDegree[PCH.illness])} on</span> to you.`);
+ break;
+ }
+ }
+ }
+ if (PCH.illness === 0 && fucktoys.length > 0) {
+ for (const other of fucktoys.filter(s => s.health.illness > 1)) {
+ if (catchesIllness(15)) {
+ PCH.illness = other.health.illness - 1; // reduced severity
+ r.push(`You have <span class="health dec">caught ${addA(sicknessDegree[PCH.illness])}</span> from your bedslave, ${other.slaveName}.`);
+ break;
+ }
+ }
+ }
+ if (PCH.illness === 0 && V.personalAttention.task === PersonalAttention.TRAINING && V.personalAttention.slaves.length > 0 && !onBedRest(V.PC, true)) {
+ for (const other of V.personalAttention.slaves.map(s => getSlave(s.ID)).filter(s => !!s && s.health.illness > 1)) {
+ if (catchesIllness(20)) {
+ PCH.illness = other.health.illness - 1; // reduced severity
+ r.push(`You tried your best, but you ended up <span class="health dec">catching ${addA(sicknessDegree[PCH.illness])}</span> while training ${other.slaveName}.`);
+ break;
+ }
+ }
+ }
+ if (PCH.illness === 0 && sexPartners.length > 0) {
+ const contacts = 30; // limits max spread rate in large populations - you do try to avoid catching ill, after all
+ for (const other of sexPartners.randomMany(contacts).filter(s => s.health.illness > 1)) {
+ if (catchesIllness(5)) {
+ PCH.illness = other.health.illness - 1; // reduced severity
+ r.push(`You tried to avoid catching whatever is ailing ${other.slaveName}, but you still ended up <span class="health dec">with ${addA(sicknessDegree[PCH.illness])}.</span>`);
+ break;
+ }
+ }
+ }
+ } else if (PCH.illness > 0) {
+ if (random(1, 100) > 75 && PCH.illness === 1 && V.personalAttention.task !== PersonalAttention.RELAX && V.week > 8) {
+ // independent 25% chance of getting worse if you have a level 1 illness, aren't treating it, AND already failed your recovery roll (i.e. you've spent more than one week sick)
+ r.push(`You've ignored your minor illness, allowing it time to <span class="health dec">develop into something more threatening.</span>`);
+ PCH.illness += 1;
+ } else {
+ r.push(`Your <span class="health dec">${sicknessDegree[PCH.illness]} takes its toll on your health.</span>`);
+ }
+ // note: health damage from continuing illness is deducted in endWeekHealthDamage
+ }
+ }
+ }
+
+ function health() {
+ r.push(`Living such a lavish lifestyle has a <span class="health inc">positive effect on one's well-being${V.personalAttention.task === PersonalAttention.RELAX ? ", especially when focusing on rest and relaxation" : ""}.</span> Overall,`);
+ if (PCH.condition < -90) {
+ r.push(`<span class="red">you are on the brink of death`);
+ } else if (PCH.condition < -50) {
+ r.push(`you are in <span class="red">bad health`);
+ } else if (PCH.condition < -20) {
+ r.push(`you are in <span class="red">poor health`);
+ } else if (PCH.condition <= 20) {
+ r.push(`you are in <span class="yellow">average health`);
+ } else if (PCH.condition <= 50) {
+ r.push(`you are in <span class="green">good health`);
+ } else if (PCH.condition <= 90) {
+ r.push(`you are in <span class="green">great health`);
+ } else {
+ r.push(`you are the definition of <span class="green">perfect health`);
+ }
+ if (PCH.shortDamage >= 20) {
+ r.push(r.pop() + `,</span>`);
+ if (PCH.condition < -20) {
+ r.push(`and`);
+ if (PCH.shortDamage >= 50) {
+ r.push(`have been <span class="red">incapacitated by your worsening condition.</span>`);
+ } else if (PCH.shortDamage >= 20) {
+ r.push(`are tormented by a <span class="red">general sense of malaise.</span>`); // tormented by malaise? General sense may be redundant here.
+ }
+ } else {
+ r.push(`but`);
+ if (PCH.shortDamage >= 50) {
+ r.push(`your <span class="red">worsening condition</span> has caught up with you.`);
+ } else if (PCH.shortDamage >= 20) {
+ r.push(`a <span class="red">general sense of malaise</span> lingers over you.`); // a malaise? General sense may be redundant here.
+ }
+ }
+ } else {
+ r.push(r.pop() + `.</span>`);
+ }
+ if (V.debugMode) {
+ r.push(`Your current health is ${PCH.condition}, with ${PCH.shortDamage} short term damage and ${PCH.longDamage} long term damage.`);
+ }
+ }
+
+ function addiction() {
+ if (PC.addict > 0) {
+ if (PC.aphrodisiacs > 0) {
+ PC.addict++;
+ } else if (PC.addict < 2) {
+ r.push(`You've finally <span class="cyan">kicked your aphrodisiac addiction.</span>`);
+ PC.addict = 0;
+ } else if (PC.drugs === "detox pills") {
+ r.push(`The aphrodisiac substitute helps keep the cravings in check while slowly weaning you off the real drug.`);
+ PC.addict -= 1;
+ } else if (V.aphrodisiacUpgrade === 1 && !canEatFood(PC)) {
+ r.push(`Substitutes produced by your advanced pharmaceutical fabricator allow you to skip the negative effects of aphrodisiac withdrawal while efficiently flushing them from your system.`);
+ PC.addict -= 2;
+ } else if (PC.inflationType !== "aphrodisiac") {
+ r.push(`The effects of aphrodisiac withdrawal eat away at you, encouraging <span class="health dec">self-destructive behavior.</span>`);
+ PC.addict -= 2;
+ healthDamage(PC, 1 * Math.min(random(1, PC.addict), 10));
+ } else {
+ r.push(`You don't mind cutting back on the aphrodisiac pills when your gut is laden with the stuff.`);
+ }
+ } else {
+ if (PC.aphrodisiacs > 0) {
+ if (random(1, 100) < 40 + (20 * PC.aphrodisiacs)) {
+ r.push(`<span class="cyan">You've become addicted to aphrodisiacs.</span>`);
+ PC.addict = 1;
+ }
+ }
+ }
+ }
+};
diff --git a/src/endWeek/player/prHormones.js b/src/endWeek/player/prHormones.js
index ae9dc400d0abb688a95399fcf4e6e6a149d455bb..f33394534f119213f69ddcd5bb00667b82d4b98f 100644
--- a/src/endWeek/player/prHormones.js
+++ b/src/endWeek/player/prHormones.js
@@ -9,6 +9,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) {
let normButt;
const faceValue = PC.face - PC.faceImplant;
const effects = [];
+ /** @type {FC.Zeroable<string>} */
let faceShape = 0;
let faceInc = 0;
@@ -16,7 +17,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) {
if (V.hormoneUpgradeMood === 0 || !selfManufactured) {
moodConflict();
}
- if (PC.physicalAge >= 18 || V.loliGrow === 0 || PC.geneMods.NCS === 1) {
+ if (PC.physicalAge >= 18 || V.loliGrow === 0 || PC.geneMods.NCS === 1 || V.playerAging < 2) {
hormonesEffects();
}
@@ -37,7 +38,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) {
} else if (PC.hormoneBalance <= -200) {
r.push(`Your body is awash with masculine hormones`);
} else if (PC.hormoneBalance <= -100) {
- r.push(`Your hormone balance is overly masculine.`);
+ r.push(`Your hormone balance is overly masculine`);
} else if (PC.hormoneBalance < -20) {
if (PC.hormones === 0 && PC.genes === "XY") {
r.push(`Your hormone balance is normal.`);
@@ -65,7 +66,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) {
} else if (PC.hormoneBalance >= 200) {
r.push(`Your body is awash with feminine hormones`);
} else if (PC.hormoneBalance >= 100) {
- r.push(`Your hormone balance is overly feminine.`);
+ r.push(`Your hormone balance is overly feminine`);
} else if (PC.hormoneBalance > 20) {
if (PC.hormones === 0 && PC.genes === "XX") {
r.push(`Your hormone balance is normal.`);
@@ -81,10 +82,10 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) {
}
} else {
r.push(`Your hormone balance is very androgynous`);
- if (PC.hormones === 1) {
- r.push(r.pop() + `, but are taking male hormones in an attempt to become more masculine.`);
- } else if (PC.hormones === -1) {
- r.push(r.pop() + `, but are taking female hormones in an attempt to become more feminine.`);
+ if (PC.hormones === -1) {
+ r.push(r.pop() + `, but you are taking male hormones in an attempt to become more masculine.`);
+ } else if (PC.hormones === 1) {
+ r.push(r.pop() + `, but you are taking female hormones in an attempt to become more feminine.`);
} else {
r.push(r.pop() + `.`);
}
@@ -121,9 +122,11 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) {
function hormonesEffects() {
if (Math.abs(PC.hormoneBalance) >= 50) {
if (PC.hormoneBalance > 30 && PC.geneMods.NCS !== 1) {
+ const slimModBreasts = (V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 1 && !canEatFood(PC)) ? 0.45 : 1; // 600 average breast target, 270 target, 475 @ 350 hormone
+ const slimModButts = (V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 1 && !canEatFood(PC)) ? 0.6 : 1; // 2.5 average butt, 1.5 target
/* 'Expected' breast size based on weight for feminine-bodied player. Masculine-bodied takes a small hit. */
- normBreasts = Math.trunc((100 + (PC.weight + 100) * 5 + 2 * PC.lactationAdaptation) * (0.85 + PC.hormoneBalance / 400) * gigantomastiaMod / Math.max(PC.title * 1.25, 1));
- normButt = ((PC.weight + 100) * 0.025 * (0.9 + PC.hormoneBalance / 600) * (rearLipedemaMod / 2 + 1) / Math.max(PC.title * 1.10, 1));
+ normBreasts = Math.trunc((100 + (PC.weight + 100) * 5 + 2 * PC.lactationAdaptation) * (0.85 + PC.hormoneBalance / 400) * gigantomastiaMod * slimModBreasts / Math.max(PC.title * 1.25, 1));
+ normButt = ((PC.weight + 100) * 0.025 * (0.9 + PC.hormoneBalance / 600) * (rearLipedemaMod / 2 + 1) * slimModButts / Math.max(PC.title * 1.10, 1));
}
if (PC.hormoneBalance >= 350) {
@@ -529,7 +532,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) {
}
if (faceValue.isBetween(0, 100)) {
effects.push(`<span class="change positive">facial structure to harden`);
- faceDec = 1 + hormonePower;
+ const faceDec = 1 + hormonePower;
PC.face = Math.clamp(PC.face - faceDec, -100, 100);
}
if (PC.voice > 1) {
@@ -539,7 +542,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) {
}
if (V.hormoneUpgradeShrinkage === 0 || !selfManufactured) {
- if (buttSize > 1 && rearLipedemaMod !== 2) {
+ if (buttSize > 1 && rearLipedemaMod === 0) {
if (PC.geneMods.NCS === 1 && random(1, 100) > 50 && buttSize > 2) {
effects.push(`<span class="change negative">butt to greatly diminish`);
PC.butt--;
@@ -612,7 +615,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) {
}
if (V.hormoneUpgradeShrinkage === 0 || !selfManufactured) {
- if (buttSize > 1 && rearLipedemaMod !== 2) {
+ if (buttSize > 1 && rearLipedemaMod === 0) {
if (PC.geneMods.NCS === 1 && random(1, 100) > 50 && buttSize > 2) {
effects.push(`<span class="change negative">butt to greatly diminish`);
PC.butt--;
@@ -681,7 +684,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) {
}
if (V.hormoneUpgradeShrinkage === 0 || !selfManufactured) {
- if (buttSize > 2 && rearLipedemaMod !== 2) {
+ if (buttSize > 2 && rearLipedemaMod === 0) {
if (PC.geneMods.NCS === 1 && random(1, 100) > 50) {
effects.push(`<span class="change negative">butt to greatly diminish`);
PC.butt--;
@@ -750,7 +753,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) {
}
if (V.hormoneUpgradeShrinkage === 0 || !selfManufactured) {
- if (buttSize > 3 && rearLipedemaMod !== 2) {
+ if (buttSize > 3 && rearLipedemaMod === 0) {
if (PC.geneMods.NCS === 1 && random(1, 100) > 50) {
effects.push(`<span class="change negative">butt to greatly diminish`);
PC.butt--;
@@ -811,7 +814,7 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) {
}
if (V.hormoneUpgradeShrinkage === 0 || !selfManufactured) {
- if (buttSize > 4 && rearLipedemaMod !== 2) {
+ if (buttSize > 4 && rearLipedemaMod === 0) {
if (PC.geneMods.NCS === 1 && random(1, 100) > 50) {
effects.push(`<span class="change negative">butt to greatly diminish`);
PC.butt--;
@@ -867,11 +870,11 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) {
if (effects.length > 0) {
r.push(`Hormonal effects cause your`);
- r.push(effectsListToText(effectsList));
+ r.push(effectsListToText(effects));
r.push(`${r.pop()}.</span>`);
}
if (faceShape !== 0) {
- if (effecs.length > 0) {
+ if (effects.length > 0) {
r.push(`More importantly, they cause`);
} else {
r.push(`Hormonal effects cause`);
diff --git a/src/endWeek/player/prInflation.js b/src/endWeek/player/prInflation.js
index 94afe36a6874bade19da95c42c00a647a2b3030d..22968e742f97db7a4f3da91874215b4a97a57529 100644
--- a/src/endWeek/player/prInflation.js
+++ b/src/endWeek/player/prInflation.js
@@ -2,10 +2,10 @@ App.EndWeek.Player.inflation = function(PC = V.PC) {
const r = [];
const gigantomastiaMod = PC.geneticQuirks.gigantomastia === 2 ? (PC.geneticQuirks.macromastia === 2 ? 3 : 2) : 1;
- const rearQuirk = PC.geneticQuirks.rearLipedema === 2 ? 2 : 0;
const boobSize = PC.boobs - PC.boobsImplant - PC.boobsMilk;
const buttSize = PC.butt - PC.buttImplant;
- const rearQuirkDivider = rearLipedemaMod === 0 ? 1 : rearQuirk;
+ const rearLipedemaMod = PC.geneticQuirks.rearLipedema === 2 ? 2 : 0;
+ const rearQuirkDivider = rearLipedemaMod === 0 ? 1 : rearLipedemaMod;
const dairyL = App.Entity.facilities.dairy.employeesIDs().size;
let distensionTerm;
let quantityTerm;
@@ -13,7 +13,7 @@ App.EndWeek.Player.inflation = function(PC = V.PC) {
let cow;
let harvest;
- if (cow.inflationMethod === 3) {
+ if (PC.inflationMethod === 3) {
cow = PC.inflationType === "milk" ? getSlave(PC.milkSource) : getSlave(PC.cumSource);
}
@@ -45,8 +45,12 @@ App.EndWeek.Player.inflation = function(PC = V.PC) {
deflate(PC);
} else if (PC.bellyImplant >= 1500 || PC.bellyPreg >= 1500) {
if (PC.inflationType === "undigested food") {
- r.push(`You were already feeling full before your diet started backing up inside you; <span class="health dec">now it's just agonizing.</span>`);
- healthDamage(PC, 5);
+ if (PC.diet !== "weaning") {
+ deflate(PC);
+ } else {
+ r.push(`You were already feeling full before your diet started backing up inside you; <span class="health dec">now it's just agonizing.</span>`);
+ healthDamage(PC, 5);
+ }
} else if (PC.inflation > 1) {
r.push(`You feel a bit too full already to inflate yourself as large as you'd like, so <span class="yellow">you'll have to settle for a lesser filling.</span>`);
PC.inflation = 1;
@@ -75,6 +79,10 @@ App.EndWeek.Player.inflation = function(PC = V.PC) {
} else if (PC.inflation === 1 && harvest < 2) {
r.push(`you at all. <span class="yellow">You are unable continue to inflate yourself by this means.</span>`);
}
+ } else if (PC.inflationType === "undigested food" && PC.diet !== "weaning") {
+ r.push(`Since you started eating slave food again, the food backing up in your system has broken down, once again <span class="yellow">leaving you with a flat belly.</span>`);
+ deflate(PC);
+ PC.weaningDuration = 0;
}
}
@@ -115,7 +123,7 @@ App.EndWeek.Player.inflation = function(PC = V.PC) {
} else if (PC.inflation === 2) {
r.push(`Being bloated with aphrodisiacs helps to amplify their effects,`);
} else if (PC.inflation === 1) {
- r.push(`Allowing your body to direcly absorb aphrodisiacs amplifies their effects,`);
+ r.push(`Allowing your body to directly absorb aphrodisiacs amplifies their effects,`);
}
if (PC.energy <= 95) {
r.push(`<span class="libido inc">sending your sex drive into overdrive.</span>`);
diff --git a/src/endWeek/player/prLongTermEffects.js b/src/endWeek/player/prLongTermEffects.js
index 3584f0d0eb0954fd0c422536c42696679d71f2b4..94df518c24a893b47ec5ccd5402bf0ebd63a3ee3 100644
--- a/src/endWeek/player/prLongTermEffects.js
+++ b/src/endWeek/player/prLongTermEffects.js
@@ -54,7 +54,7 @@ App.EndWeek.Player.longTermEffects = function(PC = V.PC) {
function piercingEffects() {
if (PC.piercing.vagina.weight > 1) {
if (PC.vagina > -1 && PC.labia < 2 && random(1, 100) > 90) {
- r.push(`The amount of weight hangning from your labia <span class="change positive">stretches out your pussylips a bit.</span>`);
+ r.push(`The amount of weight hanging from your labia <span class="change positive">stretches out your pussylips a bit.</span>`);
PC.labia += 1;
}
}
@@ -267,7 +267,7 @@ App.EndWeek.Player.longTermEffects = function(PC = V.PC) {
}
function hormoneBalance() {
- const selfManufactured = false; // Once a means to buy the recipes is added, this will become a ternary.
+ const selfManufactured = V.consumerDrugs;
const hormonePower = selfManufactured ? V.hormoneUpgradePower : 1; // Prescribed ones are better to match their base price.
if (PC.diet === "XX") {
PC.hormoneBalance += 4;
@@ -561,6 +561,7 @@ App.EndWeek.Player.longTermEffects = function(PC = V.PC) {
if (PC.pubertyXX === 0) {
if (PC.physicalAge >= PC.pubertyAgeXX) {
PC.pubertyXX = 1;
+ // in the future, improve this to hide puberty up until period?
r.push(`After several days of unrelenting pain in your stomach, you have your first period.`);
if (PC.genes === "XX") {
r.push(`<span class="puberty">You're a woman now.</span>`);
@@ -928,6 +929,9 @@ App.EndWeek.Player.longTermEffects = function(PC = V.PC) {
if (PC.inflationType === "aphrodisiac") {
deathSeed -= (100 * PC.inflation);
}
+ if (PC.diet === "medicinal") {
+ deathSeed += 200;
+ }
if (random(1, 1000) > (600 + deathSeed)) {
planDeath(PC, "lowHealth");
}
diff --git a/src/endWeek/player/prLongTermPhysicalEffects.js b/src/endWeek/player/prLongTermPhysicalEffects.js
index 91475a85b6dd34a6388c99b079e191565671fe5d..e141c20d2011e029a943da9c321abaf1a8dfde43 100644
--- a/src/endWeek/player/prLongTermPhysicalEffects.js
+++ b/src/endWeek/player/prLongTermPhysicalEffects.js
@@ -32,8 +32,6 @@ App.EndWeek.Player.longTermPhysicalEffects = function(PC = V.PC) {
lactationEffects();
boobsEffects(); // Moved up from middle of the mobility and oversized asset set of text.
bellyEffects(); // Moved up from middle of the mobility and oversized asset set of text.
- // player mobility function goes here.
- healthBlips();
return r.join(" ");
@@ -68,7 +66,7 @@ App.EndWeek.Player.longTermPhysicalEffects = function(PC = V.PC) {
}
r.push(`will require braces to correct.`);
} else {
- r.push(`Such a <span class="noteworthy">lovely smile</span> will be a boon when business deals.`);
+ r.push(`Such a <span class="noteworthy">lovely smile</span> will be a boon when negotiating business deals.`);
PC.teeth = "normal";
}
}
@@ -310,6 +308,15 @@ App.EndWeek.Player.longTermPhysicalEffects = function(PC = V.PC) {
PC.energy++;
}
PC.energy = Math.max(PC.energy, 0);
+ if (PC.pubertyXX === 1 && PC.vagina >= 0) {
+ if (PC.energy > 60 && PC.vaginaLube === 0 && (V.policies.sexualOpenness === 1 || averageDicking.length > 0) && random(1, 100) > 95) {
+ r.push(`With all the excitement in your life, your formerly dry pussy <span class="change positive">starts moistening up.</span>`);
+ PC.vaginaLube++;
+ } else if (PC.energy <= 20 && PC.vaginaLube > 0 && V.policies.sexualOpenness === 0 && averageDicking.length === 0 && random(1, 100) <= 5) {
+ r.push(`Since you aren't getting any and have no interest in doing so, your naturally wet pussy <span class="change negative">cuts back on fluid production.</span>`);
+ PC.vaginaLube--;
+ }
+ }
}
function sexualSatisfaction() {
@@ -336,7 +343,7 @@ App.EndWeek.Player.longTermPhysicalEffects = function(PC = V.PC) {
});
// Still horny? Fuck your chattel.
let prLTPE = 0;
- while (PC.need > 0 || sexPartners.length !== prLTPE) {
+ while (PC.need > 0 && sexPartners.length !== prLTPE) {
if (averageDicking.includes(sexPartners[prLTPE])) {
if (PC.vagina > 0) {
seX(PC, "vaginal", sexPartners[prLTPE], "penetrative");
@@ -391,19 +398,23 @@ App.EndWeek.Player.longTermPhysicalEffects = function(PC = V.PC) {
if (PC.physicalAge >= 45) {
if (PC.physicalAge >= 70) {
if (PC.health.condition >= -90) {
- if (PC.diet !== "healthy" || !canEatFood(PC) || PC.chem > 0) {
- if (PC.physicalAge - 30 > random(1, 100)) {
- r.push(`Your advanced age comes hand in hand with increased health complications. <span class="health dec">This was not a good week for you.</span>`);
- healthDamage(PC, 10);
+ if (PC.diet !== "medicinal") {
+ if (PC.diet !== "healthy" || !canEatFood(PC) || PC.chem > 0) {
+ if (PC.physicalAge - 30 > random(1, 100)) {
+ r.push(`Your advanced age comes hand in hand with increased health complications. <span class="health dec">This was not a good week for you.</span>`);
+ healthDamage(PC, 10);
+ }
}
}
}
} else {
if (PC.health.condition > 20) {
- if (PC.diet !== "healthy" || !canEatFood(PC) || PC.chem > 0) {
- if (PC.physicalAge - 30 > random(1, 100)) {
- r.push(`This was a rough week for you. It seems your <span class="health dec">age</span> is catching up to you.`);
- healthDamage(PC, 10);
+ if (PC.diet !== "medicinal") {
+ if (PC.diet !== "healthy" || !canEatFood(PC) || PC.chem > 0) {
+ if (PC.physicalAge - 30 > random(1, 100)) {
+ r.push(`This was a rough week for you. It seems your <span class="health dec">age</span> is catching up to you.`);
+ healthDamage(PC, 10);
+ }
}
}
}
@@ -419,7 +430,7 @@ App.EndWeek.Player.longTermPhysicalEffects = function(PC = V.PC) {
}
if (V.seeAge === 1) {
if (PC.visualAge > 15 && PC.physicalAge > 15 && PC.geneticQuirks.neoteny !== 2) {
- if (PC.health.condition < random(-50, 0) || PC.chem > 0 || PC.tired > 90) {
+ if (PC.health.condition < random(-50, 0) || PC.chem > 0 || PC.health.tired > 90) {
if (PC.ageAdjust === -40) {
r.push(`Life has been hard on you lately, leaving you <span class="change negative">looking a little older</span> than you should.`);
PC.visualAge++;
@@ -535,6 +546,7 @@ App.EndWeek.Player.longTermPhysicalEffects = function(PC = V.PC) {
** the slave's accumulated youthening is 6 or higher,
** or by a 50% chance.
*/
+ /** @type {FC.NippleShape} */
let nipplesString;
if ((boobSize >= 5000) && (random(1, 100) < 90) && gigantomastiaMod !== 3) {
r.push(`Your <span class="ncs">NCS</span> <span class="change negative">reduces the size of your heaving breasts.</span>`);
@@ -802,6 +814,7 @@ App.EndWeek.Player.longTermPhysicalEffects = function(PC = V.PC) {
PC.rules.lactation = "none";
} else if (PC.rules.lactation === "maintain") {
r.push(`You regularly see to your breasts to make sure your milk production doesn't dry up; be it by hand, milker, or mouth, you keep yourself comfortably drained.`);
+ PC.lactationDuration = 2;
} else if (PC.rules.lactation === "sell") {
const milk = milkAmount(PC);
let milkSale;
@@ -818,6 +831,7 @@ App.EndWeek.Player.longTermPhysicalEffects = function(PC = V.PC) {
milkSale = milk * 8;
r.push(`Your milk is sold for <span class="yellowgreen">${cashFormat(milkSale)}.</span>`);
}
+ PC.lactationDuration = 2;
cashX(milkSale, "personalBusiness");
}
if (PC.lactation === 1) {
@@ -938,81 +952,4 @@ App.EndWeek.Player.longTermPhysicalEffects = function(PC = V.PC) {
}
}
}
-
- function healthBlips() {
- if (PC.chem > 5) {
- if (random(1, 220) < (PC.chem * 2) + PC.physicalAge - PC.health.condition) {
- healthDamage(PC, 5);
- switch (random(1, 10)) {
- case 1:
- r.push(`A bout of foreplay was interrupted when your partner discovered a small lump in your ${PC.boobs >= 300 ? "breast" : "chest"}. Your doctor removed it easily enough, <span class="cash">for a small fee,</span> with testing revealing it as benign.`);
- cashX(forceNeg(500), "PCmedical");
- break;
- case 2:
- r.push(`A bout of intense virtigo kept you stuck in bed, unwilling to move. Eventually the feeling passes on it's own, just as suddenly as it arrived.`);
- break;
- case 3:
- r.push(`You spent the morning experiencing an unshakable sense of dread. Eventually the feeling passes on it's own, just as suddenly as it arrived.`);
- break;
- case 4:
- r.push(`You're plagued by a series of severe headaches that are calmed easily enough by a dose of aspirin each.`);
- break;
- case 5:
- r.push(`You experience recurrent nausea each morning this week.`);
- if (PC.preg.isBetween(0, 4)) {
- if (PC.pregKnown === 0) {
- r.push(`It turns out <span class="pregnant">you're pregnant,</span> but it still didn't feel like ${PC.counter.birthsTotal > 0 ? "your morning sickness did last pregnancy" : "morning sickness to you"}.`);
- PC.pregKnown = 1;
- } else {
- r.push(`You have been experiencing morning sickness already, and this is not helping matters.`);
- }
- } else {
- r.push(`Your stomach is soothed with a little medication, but it was still unpleasant.`);
- }
- break;
- case 6:
- r.push(`You had trouble sleeping without taking anything before bed, several nights in a row.`);
- break;
- case 7:
- r.push(`After a vigorous lovemaking session, you discover your heart rate is not coming down. A minor dose of medication resolves it, but it was still alarming.`);
- break;
- case 8:
- r.push(`Much to your dismay, you discover that your blood isn't clotting properly. Eventually the cut stops bleeding on its own, but it does not bode well should anything worse happen to you.`);
- break;
- case 9:
- r.push(`You've developed several ugly little ${PC.skin} skin tags. The autosurgery has everything you need to trivially remove them, but they are still annoying.`);
- break;
- default:
- r.push(`Often you just feel wrong for a short spell before recovering.`);
- }
- r.push(`This likely was <span class="health dec">a side effect</span> of some treatment you've undergone.`);
- }
- }
-
- if (PC.weight > 190) {
- r.push(`Your extreme obesity <span class="health dec">directly impacts</span> your health, but since you let yourself get this large, it's not really that bothersome.`);
- healthDamage(PC, 2);
- if (random(1, 100 + PC.health.condition) < 5) {
- r.push(`Unfortunately, this week ushered in <span class="health dec">severe health complications</span> related to it. After extensive, <span class="cash">and very costly,</span> heart surgery, your life was saved, though you'd better set aside some ¤ for when it happens again.`);
- cashX(forceNeg(15000), "PCmedical");
- healthDamage(PC, 80);
- }
- } else if (PC.weight > 160) {
- if (random(1, 150 + PC.health.condition) < 5) {
- r.push(`Your obesity has brought <span class="health dec">severe health complications</span> upon you this week. They required extensive, <span class="cash">and costly,</span> surgery to correct, so it may be time to pay more mind to your wellbeing.`);
- cashX(forceNeg(5000), "PCmedical");
- healthDamage(PC, 40);
- }
- } else if (PC.weight > 130) {
- if (random(1, 175 + PC.health.condition) < 5) {
- r.push(`Your weight caused you some <span class="health dec">severe health complications</span> this week. They passed after some time, but are rather concerning.`);
- healthDamage(PC, 20);
- }
- } else if (PC.weight > 95) {
- if (random(1, 200 + PC.health.condition) < 5) {
- r.push(`Your weight caused you some <span class="health dec">minor health complications</span> this week. It passed quickly enough, and shouldn't be a real problem.`);
- healthDamage(PC, 5);
- }
- }
- }
};
diff --git a/src/endWeek/player/prMobility.js b/src/endWeek/player/prMobility.js
new file mode 100644
index 0000000000000000000000000000000000000000..a982cdca9ee423882ccde79745f2c2f9727b0e69
--- /dev/null
+++ b/src/endWeek/player/prMobility.js
@@ -0,0 +1,552 @@
+App.EndWeek.Player.mobility = function(PC = V.PC) {
+ const r = [];
+
+ const immobilities = [];
+ const noWalking = [];
+
+ const {hisP, girlP} = getPronouns(PC).appendSuffix("P");
+
+ mobility();
+ muscularAtrophy();
+ bodyAccessibility();
+ hugeBreasts();
+ boobAccessibility();
+ hugeBelly();
+ bellyAccessibility();
+ hugeDick();
+ dickAccessibility();
+ hugeBalls();
+ ballsAccessibility();
+ hugeHips();
+ hugeButt();
+ buttAccessibility();
+ hindrance();
+
+ return r.join(" ");
+
+ function mobility() {
+ if (PC.weight >= 300) {
+ immobilities.push("fat body");
+ }
+ if (PC.belly >= 1100000) {
+ immobilities.push("belly");
+ }
+ if (PC.boobs >= 1500000) {
+ immobilities.push("breasts");
+ }
+ if (PC.balls >= 160) {
+ immobilities.push("balls");
+ }
+ if (immobilities.length > 0) {
+ r.push(`You have been rendered <span class="immobile">completely immobile</span> by the size and weight of your`);
+ r.push(toSentence(immobilities));
+ r.push(r.pop() + `, leaving you stuck on your bed. Nothing short of industrial equipment is capable of lifting you, and the logistics of getting something like that into the penthouse make it pretty clear that you aren't going to be going anywhere until you deal with all of this.`);
+ }
+ if (tooFatSlave(PC) && !immobilities.includes("fat body")) {
+ noWalking.push("fat body");
+ }
+ if (tooBigBreasts(PC) && !immobilities.includes("breasts")) {
+ noWalking.push("breasts");
+ }
+ if (tooBigBelly(PC) && !immobilities.includes("belly")) {
+ noWalking.push("belly");
+ }
+ if (tooBigButt(PC) && !immobilities.includes("butt")) {
+ noWalking.push("butt");
+ }
+ if (tooBigDick(PC) && !immobilities.includes("dick")) {
+ noWalking.push("dick");
+ }
+ if (tooBigBalls(PC) && !immobilities.includes("balls")) {
+ noWalking.push("balls");
+ }
+ if (PC.physicalImpairment > 1 || noWalking.length > 0) {
+ if (immobilities.length > 0) {
+ r.push(`Ignoring the obvious,`);
+ if (noWalking.length > 0) {
+ r.push(`the weight of your ${toSentence(noWalking)} would prevent you from walking anyway.`);
+ if (PC.physicalImpairment > 1) {
+ r.push(`Your injuries may also be contributing to that, but it's hard to tell when you can't even try.`);
+ }
+ } else {
+ r.push(`it's not like you could walk anyway, having never regained the ability after being injured.`);
+ }
+ if (isMovable(PC)) {
+ r.push(`You have to use a wheelchair if you want to get anywhere, which is subject to its own host of day-to-day problems.`);
+ }
+ } else {
+ r.push(`You've <span class="hindrance mid">lost the ability to walk</span> due to`);
+ if (noWalking.length > 0) {
+ r.push(`the size and weight of your ${toSentence(noWalking)}, forcing you to rely on a wheelchair to get around.`);
+ if (PC.physicalImpairment > 1) {
+ r.push(`Your injuries may also be contributing to that, but it's hard to tell when you can't even try.`);
+ }
+ if (canMove(PC)) {
+ r.push(`At the very least, you can still crawl if needed, so you aren't completely helpless.`);
+ }
+ } else {
+ r.push(`crippling injuries, forcing you to rely on a wheelchair to get around.`);
+ if (canMove(PC)) {
+ r.push(`At the very least, you can still crawl if needed, so you aren't completely helpless.`);
+ }
+ }
+ }
+ }
+ if (isTrapped(PC)) {
+ if (!isMovable(PC)) {
+ r.push(`It's not like you could leave your room anyway; the door is too small.`);
+ } else {
+ r.push(`To make matters even worse, you can't leave your room; the door is too small to fit through.`);
+ }
+ }
+
+ if (onBedRest(PC)) {
+ // One would assume that the player will realize that being unmovable/trapped also means they are more or less on bed rest.
+ if (isInduced(PC)) {
+ r.push(`<span class="hindrance high">You are on bed rest,</span> getting ready to give birth, so you are a little too preoccupied to focus on anything else at the moment.`);
+ } else if (PC.preg > PC.pregData.normalBirth / 1.05 && PC.pregControl !== "labor suppressors") {
+ r.push(`You're past your due date and having contractions, so until you give birth, you'll be <span class="hindrance high">staying in bed</span> and focusing on that over anything else.`);
+ } else if (PC.majorInjury > 0) {
+ r.push(`<span class="hindrance high">You are on mandatory bed rest due to serious injury.</span> You won't be able to do much until your body recovers.`);
+ } else if (PC.health.condition < -90) {
+ r.push(`<span class="hindrance high">You are on mandatory bed rest due to your poor health.</span> You won't be doing much other than sleeping until you recover.`);
+ } else if ((PC.womb.find((ft) => ft.genetics.geneticQuirks.polyhydramnios === 2 && ft.age >= 20)) || (PC.bellyPreg >= PC.pregAdaptation * 2200)) {
+ r.push(`<span class="hindrance high">You are on bed rest</span> in an attempt to not further complicate your already troublesome pregnancy. While it is not compulsory, it does cut into both your work and play time.`);
+ }
+ }
+ }
+
+ function muscularAtrophy() {
+ if (!isMovable(PC)) {
+ if (PC.muscles > -80) {
+ r.push(`Being bedbound takes its toll on your musculature, as what limited, awkward movements you are capable of can do little to sustain it.`);
+ if (PC.muscles > 5) {
+ r.push(`You <span class="change negative">lose some muscle definition.</span>`);
+ PC.muscles -= 2;
+ } else {
+ r.push(`What's left of your <span class="change negative">muscles steadily atrophy.</span>`);
+ PC.muscles--;
+ }
+ }
+ } else if (onBedRest(PC, true)) {
+ if (PC.health.shortDamage >= 50 || PC.health.condition < -90) {
+ r.push(`Stuck completely unable to move, your <span class="change negative">muscles rapidly atrophy.</span>`);
+ PC.muscles -= 3;
+ } else if (PC.muscles > 5) {
+ r.push(`Without proper maintenance, your <span class="change negative">muscles slowly soften.</span>`);
+ PC.muscles--;
+ }
+ } else if (!canWalk(PC) && PC.diet !== "muscle building") {
+ if (PC.muscles.isBetween(-80, 6)) {
+ r.push(`Without any muscle definition to maintain, and an electric wheelchair alleviating most of the effort of getting around, your unused <span class="change negative">muscles slowly atrophy.</span>`);
+ }
+ }
+ }
+
+ function bodyAccessibility() {
+ if (isMovable(PC) && !(onBedRest(PC, true))) {
+ if (PC.physicalImpairment !== 0) {
+ r.push(`Due to the lasting effects of your injuries, any exertion you undertake requires plenty of rest afterward. Understandably, <span class="hindrance mid">this limits how much you can get done in a day.</span>`);
+ }
+ if (PC.weight >= 130 || (PC.weight >= 95 + ((PC.physicalAge - 9) * 5))) {
+ r.push(`You're so overweight that any <span class="hindrance low">physical activity needs to be followed by a breather</span> and a little snack to get your energy back.`);
+ }
+ if (PC.muscles > 95 && PC.height <= (Height.mean(PC) + 10)) {
+ r.push(`Your frame is inadequate to properly support your musculature, <span class="hindrance low">limiting your range of motion.</span> Frankly, this hinders you more in the gym than it does your other work.`);
+ } else if (PC.muscles < -30) {
+ r.push(`You're physically frail and can't do too much without having to stop and get your strength back, <span class="hindrance low">limiting how much you can accomplish in a day.</span>`);
+ }
+ }
+ }
+
+ function hugeBreasts() {
+ if (canWalk(PC) && !(onBedRest(PC, true))) {
+ if (PC.physicalAge >= 18) {
+ if (PC.boobs > 25000) {
+ if (PC.muscles <= 30) {
+ r.push(`Your giant tits are debilitatingly big and exceedingly heavy. It's difficult to keep yourself from hunching forward while standing and slouching while sitting, so you often find your back <span class="health dec">rather sore</span> by evening.`);
+ healthDamage(PC, 2);
+ } else {
+ r.push(`Your giant tits are debilitatingly big, but you know how to properly manage them. Needless to say, you do a lot of back exercises.`);
+ }
+ } else if (PC.boobs > 10000) {
+ if (PC.muscles <= 5) {
+ r.push(`Your huge boobs are troublesome for your slight form; your back is often quite <span class="health dec">sore</span> by evening.`);
+ healthDamage(PC, 1);
+ } else {
+ r.push(`Some people would say boobs as huge as yours would be uncomfortable, but with proper exercise and support, their weight is no trouble at all.`);
+ }
+ } else if (PC.boobs > 4000) {
+ if (PC.muscles <= 5) {
+ r.push(`The weight of your big boobs is a little uncomfortable, but nothing you can't handle.`);
+ }
+ }
+ } else if (PC.physicalAge > 12) {
+ if (PC.boobs > 15000) {
+ if (PC.muscles <= 50) {
+ r.push(`Your giant tits are debilitatingly big and exceedingly heavy. Your youthful body can barely keep upright with them, and by day's end, your <span class="health dec">back aches</span> considerably.`);
+ healthDamage(PC, 2);
+ } else {
+ r.push(`Your giant tits are debilitatingly big, but you know how to properly manage them; your back muscles are ripped, to say the least.`);
+ }
+ } else if (PC.boobs > 7500) {
+ if (PC.muscles <= 30) {
+ r.push(`Your huge boobs are troublesome for your youthful body; your back is often quite <span class="health dec">sore</span> by evening.`);
+ healthDamage(PC, 1);
+ } else {
+ r.push(`Some people say huge boobs on a young ${girlP} like you must be uncomfortable, but with proper support and plenty of back exercise, their weight doesn't bother you at all.`);
+ }
+ } else if (PC.boobs > 3000) {
+ if (PC.muscles <= 5) {
+ r.push(`The weight of your big boobs is a little uncomfortable, but nothing you can't handle.`);
+ }
+ }
+ } else {
+ if (PC.boobs > 10000) {
+ if (PC.muscles <= 95) {
+ r.push(`Your enormous tits are nearly crippling you; your childish body just can't support that much weight hanging from your chest. You savor every moment you get to rest them on something and take the strain off your back, but each morning you still wake up with a <span class="health dec">variety of aches and pains.</span>`);
+ healthDamage(PC, 3);
+ } else {
+ r.push(`As a preteen ${girlP} with a pair of enormous boobs wobbling from ${hisP} chest, you catch a lot of stares and the occasional comment over how much pain your back must be in. A simple flex of your muscles tends to quell those worries quickly enough.`);
+ }
+ } else if (PC.boobs > 8000) {
+ if (PC.muscles <= 50) {
+ r.push(`Your giant tits are debilitatingly big and exceedingly heavy for your childish body. You can barely keep upright with them, and by day's end, your <span class="health dec">back aches</span> considerably from carrying them around.`);
+ healthDamage(PC, 2);
+ } else {
+ r.push(`Your giant tits are debilitatingly big for your preteen body, but you know how to properly carry them; your back muscles are ripped, to say the least.`);
+ }
+ } else if (PC.boobs > 5000) {
+ if (PC.muscles <= 30) {
+ r.push(`Your huge boobs are troublesome for your childish body; your back is often quite <span class="health dec">sore</span> by evening.`);
+ healthDamage(PC, 1);
+ } else {
+ r.push(`As a preteen ${girlP} with boobs bigger than ${hisP} head, you get a lot of comments about how they'll ruin your back, but with proper support and a muscular back, you're doing just fine.`);
+ }
+ } else if (PC.boobs > 2000) {
+ if (PC.muscles <= 5) {
+ r.push(`Your big boobs are uncomfortably heavy for your childish body, but a little back pain is nothing you can't handle.`);
+ }
+ }
+ }
+ }
+ }
+
+ function boobAccessibility() {
+ if (isMovable(PC) && !(onBedRest(PC, true))) {
+ if (PC.boobs > 5000) {
+ r.push(`Your breasts tend to <span class="hindrance low">get in the way when conducting business;</span> using a tablet is awkward, you smother traditional keyboards, video calls have to be adjusted around your bust, and that's not even to mention the trouble of carrying out your daily affairs throughout the arcology.`);
+ if (V.boobAccessibility === 1) {
+ r.push(`Luckily, the penthouse has been adapted for life with gigantic boobs, so you feel right at home.`);
+ } else if (PC.boobs > 25000) {
+ r.push(`Life at home is no better:`);
+ if (V.buttAccessibility === 1 || V.pregAccessibility === 1 || V.ballsAccessibility === 1) {
+ r.push(`the appliances are always out of reach, the furniture tough to get out of, and things are the perfect height to jab you right in the tits. At least the doors are wide enough for you to get through.`);
+ } else {
+ r.push(`the appliances are always out of reach, the furniture tough to get out of, things are the perfect height to jab you right in the tits, and you cause traffic just trying to move between rooms.`);
+ }
+ }
+ }
+ }
+ }
+
+ function hugeBelly() {
+ let resting = onBedRest(PC) ? 2 : 1;
+ let RCGmod = 1 + PC.geneMods.rapidCellGrowth;
+ if (PC.belly > (PC.pregAdaptation * 4500)) {
+ r.push(`You may have made a mistake; your bloated`);
+ if (PC.mpreg === 0 && PC.ovaries === 0) {
+ r.push(`implant-filled middle`);
+ } else {
+ r.push(`womb`);
+ }
+ r.push(`is under immense strain and puts <span class="health dec">overwhelming pressure on your skin and organs.</span> It's turned black and blue from the tension and the deep stretch marks are truly worrying.`);
+ if (PC.geneticQuirks.uterineHypersensitivity === 2 && PC.preg > 0) {
+ r.push(`You're trapped in a constant state of mixed pleasure and pain,`);
+ if (V.geneticMappingUpgrade >= 1) {
+ r.push(`thanks to your uterine hypersensitivity,`);
+ }
+ r.push(`making it difficult to focus on anything other than orgasming.`);
+ } else {
+ r.push(`The pain is excruciating, and each`);
+ if (PC.bellyPreg > 100) {
+ r.push(`movement within you`);
+ } else {
+ r.push(`breath`);
+ }
+ r.push(`feels like it could force you to burst.`);
+ }
+ healthDamage(PC, 30, 2);
+ if (PC.geneticQuirks.uterineHypersensitivity === 2) {
+ PC.pregAdaptation += 5 * RCGmod;
+ } else {
+ PC.pregAdaptation += 1 * RCGmod;
+ }
+ } else if (PC.belly > (PC.pregAdaptation * 3200)) {
+ r.push(`You may have overdone it a little; your`);
+ if (PC.mpreg === 0 && PC.ovaries === 0) {
+ r.push(`implant filled abdominal cavity`);
+ } else {
+ r.push(`straining womb`);
+ }
+ r.push(`takes up all the available space in your body, putting <span class="health dec">tremendous pressure on your skin and crushing your organs.</span>`);
+ if (PC.geneticQuirks.uterineHypersensitivity === 2 && PC.preg > 0) {
+ if (V.geneticMappingUpgrade >= 1) {
+ r.push(`Your uterine hypersensitivity renders it extremely pleasurable, often forcing you to become lost in playing with your belly.`);
+ } else {
+ r.push(`The uncanny way you rub, tease and grab at your belly, even in public, is becoming rather disturbing to people.`);
+ }
+ } else {
+ r.push(`You feel a distinct, stabbing pain alongside`);
+ if (PC.bellyPreg > 100) {
+ r.push(`each movement inside you;`);
+ } else {
+ r.push(`each breath;`);
+ }
+ r.push(`your body can't take much more of this.`);
+ }
+ healthDamage(PC, 20);
+ if (PC.geneticQuirks.uterineHypersensitivity === 2) {
+ PC.pregAdaptation += 4 * RCGmod;
+ } else {
+ PC.pregAdaptation += .4 * RCGmod;
+ }
+ } else if (PC.belly > (PC.pregAdaptation * 2000)) {
+ r.push(`Your body cavity is completely filled by your`);
+ if (PC.mpreg === 0 && PC.ovaries === 0) {
+ r.push(`belly implant,`);
+ } else {
+ r.push(`womb,`);
+ }
+ r.push(`<span class="health dec">putting pressure on your skin and organs.</span>`);
+ if (PC.geneticQuirks.uterineHypersensitivity === 2 && PC.preg > 0) {
+ if (V.geneticMappingUpgrade >= 1) {
+ r.push(`The pleasure derived from your uterine hypersensitivity completely masks any discomfort.`);
+ } else {
+ r.push(`The pressure makes you really horny for some reason.`);
+ }
+ } else {
+ r.push(`It's really uncomfortable, but mostly limited to when`);
+ if (PC.bellyPreg > 100) {
+ r.push(`your babies are active.`);
+ } else {
+ r.push(`you have to move.`);
+ }
+ }
+ healthDamage(PC, (10 / resting));
+ if (PC.geneticQuirks.uterineHypersensitivity === 2) {
+ PC.pregAdaptation += 3 * RCGmod;
+ } else {
+ PC.pregAdaptation += .3 * RCGmod;
+ }
+ } else if (PC.belly > (PC.pregAdaptation * 1000)) {
+ r.push(`Your body is filled by your`);
+ if (PC.mpreg === 0 && PC.ovaries === 0) {
+ r.push(`belly implant,`);
+ } else {
+ r.push(`womb,`);
+ }
+ r.push(`<span class="health dec">compressing your internal organs.</span>`);
+ if (PC.geneticQuirks.uterineHypersensitivity === 2 && PC.preg > 0) {
+ if (V.geneticMappingUpgrade >= 1) {
+ r.push(`Your uterine hypersensitivity renders having such a stretched womb rather enjoyable.`);
+ } else {
+ r.push(`It feels pretty good, in fact.`);
+ }
+ } else {
+ r.push(`There's no way to get comfortable around it, so all you can do is bear it.`);
+ }
+ healthDamage(PC, (2 / resting));
+ if (PC.geneticQuirks.uterineHypersensitivity === 2) {
+ PC.pregAdaptation += 2 * RCGmod;
+ } else {
+ PC.pregAdaptation += .2 * RCGmod;
+ }
+ } else if (PC.belly > (PC.pregAdaptation * 750)) {
+ if (PC.geneticQuirks.uterineHypersensitivity === 2) {
+ PC.pregAdaptation += 1 * RCGmod;
+ } else {
+ PC.pregAdaptation += .1 * RCGmod;
+ }
+ }
+ if (PC.wombImplant === "restraint" && PC.belly >= 400000) {
+ r.push(`The mesh implanted into the walls of your uterus is nearing its limit and <span class="health dec">beginning to strangle</span> the organ it is meant to support. While it is still structurally sound, it may fail on you if it is forced to stretch much more.`);
+ healthDamage(PC, 15, 2);
+ }
+
+ /* body inconvenience */
+ if (canWalk(PC) && !(onBedRest(PC, true))) {
+ const belly = bellyAdjective(PC);
+ if (PC.physicalAge >= 18) {
+ if (PC.belly >= 300000) {
+ r.push(`Your ${belly} belly is debilitatingly large; waddling around is a challenge, and you need to take things extra slow to make sure you don't accidentally bump into anything.`);
+ } else if (PC.belly >= 150000) {
+ r.push(`Your ${belly} belly is troublesome; each step is slow and ponderous, and you have to be careful not to accidentally drive the bulbous mass into anything.`);
+ } else if (PC.belly >= 75000) {
+ r.push(`Your ${belly} belly juts out heavily from your frame, messing with your sense of balance and leaving you second guessing what you can fit through.`);
+ }
+ } else if (PC.physicalAge > 12) {
+ if (PC.belly >= 300000) {
+ r.push(`Your ${belly} belly constantly threatens to drag you to the floor, which would be nice to take the weight off your teenage body, but would also mean you'd need help getting back to your feet.`);
+ } else if (PC.belly >= 200000) {
+ r.push(`Your ${belly} belly is debilitatingly large on your teenage body; waddling around is a challenge, and you need to take things extra slow to make sure you don't accidentally bump into anything.`);
+ } else if (PC.belly >= 80000) {
+ r.push(`Your ${belly} belly is troublesome for your teenage body; each step is slow and ponderous, and you have to be careful not to accidentally drive the bulbous mass into anything.`);
+ } else if (PC.belly >= 30000) {
+ r.push(`Your ${belly} belly juts out heavily from your teenage frame, messing with your sense of balance and just how big you actually are.`);
+ }
+ } else {
+ if (PC.belly >= 200000) {
+ r.push(`Your ${belly} belly is overwhelming on your immature body. You really would like to let it rest on the floor and take its weight off you, but then you'd need help getting back upright.`);
+ } else if (PC.belly >= 120000) {
+ r.push(`Your ${belly} belly is debilitatingly large on your immature body; you can barely waddle at all, and you need to take things extra slow since it blocks you from seeing the floor ahead of you.`);
+ } else if (PC.belly >= 60000) {
+ r.push(`Your ${belly} belly is troublesome for your immature body; each step is slow and ponderous, and you have to be careful not to accidentally drive the bulbous mass into anything.`);
+ } else if (PC.belly >= 30000) {
+ r.push(`Your ${belly} belly juts out heavily from your juvenile frame, messing with your sense of balance and making you feel absolutely enormous.`);
+ }
+ }
+ }
+ }
+
+ function bellyAccessibility() {
+ if (isMovable(PC) && !(onBedRest(PC, true))) {
+ if (PC.belly >= 60000 || PC.belly >= 60000 / (1 + Math.pow(Math.E, -0.4 * (PC.physicalAge - 14))) || PC.belly >= Math.max(10000, ((12500 / 19) * PC.height) - (1172500 / 19))) {
+ r.push(`Your middle <span class="hindrance low">gets in the way of your typical routine;</span> it's tough to get comfortable, you have to dress around it if you don't want to look like a harlot, and it takes way more effort than it ever should to sit at any sort of furniture.`);
+ if (V.pregAccessibility === 1) {
+ r.push(`Good thing the penthouse has been adapted for heavily pregnant life, alleviating most of your concerns, so long as you don't need to leave it.`);
+ } else if (PC.belly >= 100000) {
+ r.push(`Homelife is full of frustrations too:`);
+ if (V.buttAccessibility === 1 || V.boobAccessibility === 1 || V.ballsAccessibility === 1) {
+ r.push(`appliances are most easily reached sideways, you've gotten stuck sitting down, and one too many corners have made contact with your sensitive bump. At least there's plenty of room to maneuver in the halls.`);
+ } else {
+ r.push(`appliances are most easily reached sideways, you've gotten stuck sitting down, one too many corners have made contact with your sensitive bump, and slaves keep getting stuck behind you in the halls.`);
+ }
+ }
+ }
+ }
+ }
+
+ function hugeDick() {
+ if (canWalk(PC) && !(onBedRest(PC, true))) {
+ const dickLength = dickToCM(PC.dick);
+ if (dickLength >= ((PC.height / 2) + 30)) {
+ r.push(`Left unrestrained, your enormous penis rests on the ground, even while standing. It's easy to manage at least, though that probably wouldn't be the case if you became erect.`);
+ } else if (dickLength >= (PC.height / 2)) {
+ r.push(`When left hanging, your cockhead grazes the ground as you stand. It's easy to manage,`);
+ if (canAchieveErection(PC)) {
+ r.push(`though erections complicate things a bit; if you get too hard, there's no way you can contain it, and`);
+ if (PC.belly >= 100000) {
+ r.push(`it ends up painfully trapped under your belly until you deal with it.`);
+ } else if (PC.weight > 130) {
+ r.push(`it inadvertently presses against your gut. Attending a business meeting is pretty risky when every motion pushes your self-inflicted bellyfuck closer to completion.`);
+ } else if (PC.boobs >= 300) {
+ r.push(`you end up inadvertently giving yourself a titfuck. Attending a business meeting coated in your own load doesn't make you look good.`);
+ } else {
+ r.push(`you're stuck with your own dick prodding your face until you deal with it.`);
+ }
+ } else {
+ r.push(`all things considered, though you doubt that would be the case if you could get erect.`);
+ }
+ } else if (dickLength >= (PC.height / 4)) {
+ r.push(`When let loose, your cockhead hangs past your knees. It may get in the way at times, but attention your bulge gets makes it all worthwhile.`);
+ }
+ }
+ }
+
+ function dickAccessibility() {
+ if (isMovable(PC) && !(onBedRest(PC, true))) {
+ if (PC.dick >= 20) {
+ if (V.dickAccessibility === 1) {
+ r.push(`It was a good move having your living space redesigned around enormous dicks; taking a piss should never be that complicated.`);
+ } else {
+ r.push(`The penthouse itself is tolerable to live in with your cock, but the bathrooms are an unspeakable horror, for both yourself and the slaves that have to clean them.`);
+ }
+ }
+ }
+ }
+
+ function hugeBalls() {
+ if (canWalk(PC) && !(onBedRest(PC, true))) {
+ const estimatedSackSag= ballsToCM(PC.balls) * .8 * (1 + ((PC.scrotum - PC.balls) * .5)); // Oval shape + scrotal sag
+ if (estimatedSackSag > (PC.height / 2)) {
+ r.push(`Your titanic balls never leave the floor, even when standing, unless you make an effort to lift them yourself. Once they're situated, getting around isn't too bad, though they are pretty heavy.`);
+ } else if (estimatedSackSag >= (PC.height / 2) - 10) {
+ r.push(`Your enormous balls hang down to the floor when you stand, and rest on it when you sit. You can get around with some sturdy supports, but you might need a cart soon.`);
+ } else if (estimatedSackSag >= (PC.height / 4)) {
+ r.push(`Your huge balls hang past your knees when you stand. Having them bouncing around while walking usually results in you kneeing yourself in the nuts, so supportive underwear is a must when touring your domain.`);
+ }
+ }
+ }
+
+ function ballsAccessibility() {
+ if (isMovable(PC) && !(onBedRest(PC, true))) {
+ if (PC.balls >= 14) {
+ r.push(`It <span class="hindrance low">takes extra time to get anywhere</span> carrying a sack like yours around, limiting the number of potential places you can be in a day, and seating is often an issue with them in the way.`);
+ if (V.ballsAccessibility === 1) {
+ r.push(`You never have to deal with that in the penthouse after having refitted for the comfort of those with sizable testicles.`);
+ } else if (PC.balls >= 50) {
+ r.push(`The latter issue follows you back to the penthouse, giving you no real place to relax and unwind; the number of rotations you need to do in the bathroom is irritating.`);
+ if (V.buttAccessibility === 1 || V.pregAccessibility === 1 || V.boobAccessibility === 1) {
+ r.push(`At least there is plenty of room to maneuver, due to the other structural renovations you've had done.`);
+ } else {
+ r.push(`You are also starting to become painfully aware of just how wide the doorframes are compared to you.`);
+ }
+ }
+ }
+ }
+ }
+
+ function hugeHips() {
+ if (isMovable(PC) && !(onBedRest(PC, true))) {
+ if (PC.hips > 2) {
+ r.push(`Your inhumanly wide hips <span class="hindrance low">frequently get in the way</span> as your try to work and conduct business.`);
+ }
+ }
+ }
+
+ function hugeButt() {
+ if (canWalk(PC) && !(onBedRest(PC, true))) {
+ if (PC.butt > 10) {
+ r.push(`Your butt is a wonderful burden; it fills out whatever you wear, but also is a real pain to dress around, and then there is the looming chance of getting chairs stuck around it when you sit down. It also substantially juts out from you, leading to a tendency of accidentally bumping people with it as you walk by; more than one person has taken this as an invitation to give it a good feel.`);
+ }
+ }
+ }
+
+ function buttAccessibility() {
+ if (isMovable(PC) && !(onBedRest(PC, true))) {
+ if (PC.butt > 6) {
+ r.push(`Your rear <span class="hindrance low">slows you down considerably,</span> and you have to plan ahead of time where to meet people to avoid any embarrassing situations involving it.`);
+ if (V.buttAccessibility === 1) {
+ r.push(`You're free from any of those concerns in the penthouse, so long as your slaves know how to get out of your junk filled trunk's way.`);
+ } else if (PC.butt > 15) {
+ r.push(`Too bad the same can't be said for the penthouse; chairs constantly follow you when you try to leave them, you're always trying to avoid knocking things over,`);
+ if (V.boobAccessibility === 1 || V.pregAccessibility === 1 || V.ballsAccessibility === 1) {
+ r.push(`but your ass has the clearance it demands due to the widened doors and halls.`);
+ } else {
+ r.push(`and you swear it is impossible to get anywhere without bouncing off door frames, walls, and bewildered slaves.`);
+ }
+ }
+ }
+ }
+ }
+
+ function hindrance() {
+ const degree = isHinderedDegree(PC);
+
+ if (degree !== 1 && !onBedRest(PC, true)) {
+ r.push(`Overall,`);
+ if (onBedRest(PC)) {
+ r.push(`<span class="hindrance high">you're pretty limited,</span> but since you're working from bed, that's to be expected.`);
+ } else if (degree <= .3) {
+ r.push(`your body is <span class="hindrance max">a crippling hindrance to you.</span> It may be better to stop trying to live a normal life and just keep growing until you can no longer leave your bed; this way you'll never be expected to do things outside the penthouse and can work around your body.`);
+ } else if (degree <= .5) {
+ r.push(`your body is <span class="hindrance high">a major hindrance to you.</span>`);
+ } else if (degree <= .7) {
+ r.push(`your body is <span class="hindrance mid">a hindrance to you.</span>`);
+ } else {
+ r.push(`your body is only a <span class="hindrance low">minor hindrance.</span>`);
+ }
+ }
+ }
+};
diff --git a/src/endWeek/player/prPregnancy.js b/src/endWeek/player/prPregnancy.js
index ddd20fd98f42e8b46e5ffc1941a55fc5c8db1d9d..eceaf20e7065684e97a4636a63407553f4608d2e 100644
--- a/src/endWeek/player/prPregnancy.js
+++ b/src/endWeek/player/prPregnancy.js
@@ -269,6 +269,7 @@ App.EndWeek.Player.pregnancy = function(PC = V.PC) {
function pregnancyPhysicalEffects() {
let boobTarget;
+ const slimnessFoodMod = (V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 1 && !canEatFood(PC)) ? 0.5 : 1;
if (PC.geneMods.NCS === 1) {
// NCS: always working against secondary sexual characteristics even in pregnancies.
boobTarget = 0;
@@ -322,6 +323,7 @@ App.EndWeek.Player.pregnancy = function(PC = V.PC) {
}
}
boobTarget *= gigantomastiaMod;
+ boobTarget *= slimnessFoodMod;
if (PC.geneMods.NCS === 0) {
if (PC.pregType >= 30) {
if (PC.weight <= 65) {
@@ -372,12 +374,25 @@ App.EndWeek.Player.pregnancy = function(PC = V.PC) {
} else if (PC.preg > PC.pregData.normalBirth / 1.42 && PC.physicalAge >= 16 && PC.hips === 0 && PC.hipsImplant === 0 && random(1, 100) > 70 / uterineHypersensitivityMod) {
r.push(`Your hips <span class="change positive">widen</span> to better support your gravidity.`);
PC.hips += 1;
+ } else if (PC.drugs === "hip wideners" && PC.preg > PC.pregData.normalBirth / 1.42 && PC.hips === -2 && PC.hipsImplant === 0 && random(1, 100) > 70 / uterineHypersensitivityMod) {
+ r.push(`Your hips <span class="change positive">widen</span> to better support your gravidity.`);
+ PC.hips += 1;
}
if (PC.preg > PC.pregData.normalBirth / 1.42 && PC.physicalAge >= 12 && buttSize < (4 + (rearQuirk * 3)) && PC.weight >= -30 && random(1, 100) > 70) {
r.push(`Your butt <span class="change positive">gets a little bigger</span> as your body ripens.`);
PC.butt += 1;
}
}
+ if (PC.preg > PC.pregData.normalBirth / 1.42 && PC.vagina >= 0 && PC.vaginaLube < 1 && PC.energy > 20 && random(1, 100) > 80) {
+ r.push(`You heard sex tends to be a little wet during pregnancy, and you now know why;`);
+ if (random(1, 100) > 75) {
+ r.push(`your <span class="change positive">pussy has gotten really moist.</span>`);
+ PC.vaginaLube += 1;
+ } else {
+ r.push(`your pussy <span class="change positive">liberally soaks you, your partner, and your surroundings</span> during any sort of intimacy.`);
+ PC.vaginaLube += 2;
+ }
+ }
if (PC.preg === PC.pregData.normalBirth / 2.66) { // change me when nipple color gets hardset
if (PC.pregKnown === 0) {
r.push(`Your areolae have gotten dark. Some cursory tests reveal <span class="pregnant">you are about fifteen weeks pregnant.</span> How did that manage to slip past you?`);
diff --git a/src/endWeek/reports/arcadeReport.js b/src/endWeek/reports/arcadeReport.js
index 1282b47ee97e935aa6c3610810772c593fe795a2..ac525bb6afbfc9bf1df9480c28e54f4e80a426aa 100644
--- a/src/endWeek/reports/arcadeReport.js
+++ b/src/endWeek/reports/arcadeReport.js
@@ -85,17 +85,9 @@ App.EndWeek.arcadeReport = function() {
const oldCash = V.cash;
if (V.showEWD !== 0) {
const {He} = getPronouns(slave);
- const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
+ const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry);
- App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave);
- r = [];
- r.push(App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name"));
- if (slave.choosesOwnAssignment === 2) {
- r.push(App.SlaveAssignment.choosesOwnJob(slave));
- } else {
- r.push(`is confined in ${V.arcadeName}.`);
- }
- App.Events.addNode(slaveEntry, r);
+ slaveEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is confined in ${V.arcadeName}.`));
App.Events.addNode(
slaveEntry,
@@ -109,7 +101,6 @@ App.EndWeek.arcadeReport = function() {
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
// discard return values silently
- App.SlaveAssignment.choosesOwnJob(slave);
App.SlaveAssignment.workAGloryHole(slave);
}
profits += V.cash - oldCash;
@@ -243,7 +234,7 @@ App.EndWeek.arcadeReport = function() {
* @param {App.Entity.SlaveState} slave
*/
function fuckdollQualifier(slave) {
- if (slave.sentence === 0 && slave.fuckdoll === 0 && slave.fetish === "mindbroken") {
+ if (slave.sentence === 0 && slave.fuckdoll === 0 && slave.fetish === Fetish.MINDBROKEN) {
if (slave.physicalAge > 35) {
return true;
} else if (slave.vagina >= 4 || slave.anus >= 4) {
diff --git a/src/endWeek/reports/brothelReport.js b/src/endWeek/reports/brothelReport.js
index 3713800278ac40aa075f885cb00d3eac16edd938..beda0c9ec103b0e11901265e07ee01c6e754c799 100644
--- a/src/endWeek/reports/brothelReport.js
+++ b/src/endWeek/reports/brothelReport.js
@@ -63,7 +63,11 @@ App.EndWeek.brothelReport = function() {
} = getPronouns(S.Madam);
r = [];
- r.push(`${SlaveFullName(S.Madam)} is serving as the madam.`);
+ const popup = App.UI.DOM.referenceSlaveWithPreview(S.Madam, SlaveFullName(S.Madam));
+
+ popup.classList.add("slave-name", "bold");
+ r.push(popup, `is serving as the madam.`);
+
if (S.Madam.relationship === -3 && S.Madam.devotion > 50) {
r.push(`As your loving ${wife}, ${he} does ${his} best to attract attention to your brothel.`);
}
@@ -91,7 +95,7 @@ App.EndWeek.brothelReport = function() {
}
if (App.Data.Careers.Leader.madam.includes(S.Madam.career)) {
r.push(`${He} has experience from ${his} life before ${he} was a slave that helps ${him} in the seedy business of selling other people's bodies for sex.`);
- } else if (S.Madam.skill.madam >= V.masteredXP) {
+ } else if (S.Madam.skill.madam >= Constant.MASTERED_XP) {
r.push(`${He} has experience from working for you that helps ${him} in the seedy business of selling other people's bodies for sex.`);
} else if (S.Madam.skill.madam > 120) {
r.push(`${He} understands how to handle whores while keeping customers happy.`);
@@ -100,7 +104,7 @@ App.EndWeek.brothelReport = function() {
} else if (S.Madam.skill.madam > 20) {
r.push(`${He} has basic knowledge of how to run a whorehouse.`);
}
- if (S.Madam.skill.madam < V.masteredXP) {
+ if (S.Madam.skill.madam < Constant.MASTERED_XP) {
const skillIncrease = jsRandom(1, Math.ceil((S.Madam.intelligence + S.Madam.intelligenceImplant) / 15) + 8);
r.push(slaveSkillIncrease('madam', S.Madam, skillIncrease));
}
@@ -220,7 +224,8 @@ App.EndWeek.brothelReport = function() {
}
App.Events.addNode(el, r);
- if ((SL + V.brothelSlavesGettingHelp < 10) && V.MadamNoSex !== 1 && !slaveResting(madam)) {
+ if ((SL + V.brothelSlavesGettingHelp < 10 * App.SlaveAssignment.PartTime.efficiencyModifier(madam)) &&
+ V.MadamNoSex !== 1 && !slaveResting(madam)) {
const oldCash = V.cash;
if (V.showEWD !== 0) {
App.Events.addParagraph(
@@ -262,17 +267,10 @@ App.EndWeek.brothelReport = function() {
if (madam) {
tired(madam);
- if (V.showEWD !== 0) {
- const madamEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
+ if (V.showEWD) {
+ const madamEntry = App.UI.DOM.appendNewElement("div", el, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", madamEntry);
- App.SlaveAssignment.appendSlaveLinks(madamEntry, madam);
- App.Events.addNode(
- madamEntry,
- [
- App.UI.DOM.makeElement("span", SlaveFullName(madam), "slave-name"),
- `is serving as the Madam.`
- ]
- );
+ madamEntry.append(App.SlaveAssignment.saSlaveIntro(madam, `is serving as the Madam.`));
madamEntry.append(App.SlaveAssignment.standardSlaveReport(madam, false));
App.SlaveAssignment.appendSlaveArt(artSpan, madam);
} else {
@@ -327,19 +325,11 @@ App.EndWeek.brothelReport = function() {
slave.energy++;
}
- if (V.showEWD !== 0) {
+ if (V.showEWD) {
const {He} = getPronouns(slave);
- const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
+ const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry);
- App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave);
- r = [];
- r.push(App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name"));
- if (slave.choosesOwnAssignment === 2) {
- r.push(App.SlaveAssignment.choosesOwnJob(slave));
- } else {
- r.push(`is working out of ${V.brothelName}.`);
- }
- App.Events.addNode(slaveEntry, r);
+ slaveEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is working out of ${V.brothelName}.`));
App.Events.addNode(
slaveEntry,
@@ -354,7 +344,6 @@ App.EndWeek.brothelReport = function() {
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
// discard return values silently
- App.SlaveAssignment.choosesOwnJob(slave);
App.SlaveAssignment.whore(slave);
App.SlaveAssignment.standardSlaveReport(slave, true);
}
diff --git a/src/endWeek/reports/cellblockReport.js b/src/endWeek/reports/cellblockReport.js
index cb063ff01ffec5dcbd7cfc7df7304ae87ad3bfb5..69dee68ef6bfa68ec31af5e3761b162f50e7bdbd 100644
--- a/src/endWeek/reports/cellblockReport.js
+++ b/src/endWeek/reports/cellblockReport.js
@@ -3,7 +3,7 @@
*/
App.EndWeek.cellblockReport = function() {
const el = new DocumentFragment();
- let r;
+ let r = [];
const slaves = App.Utils.sortedEmployees(App.Entity.facilities.cellblock);
let brokenSlaves = 0;
@@ -67,7 +67,10 @@ App.EndWeek.cellblockReport = function() {
trustMalus++;
idleBonus++;
}
- r.push(`${SlaveFullName(S.Wardeness)} is serving as the Wardeness.`);
+ const popup = App.UI.DOM.slaveDescriptionDialog(S.Wardeness, SlaveFullName(S.Wardeness));
+ popup.classList.add("slave-name", "bold");
+ r.push(popup, `is serving as the Wardeness.`);
+
if (S.Wardeness.relationship === -3 && S.Wardeness.devotion > 50) {
devBonus++;
trustMalus++;
@@ -84,7 +87,7 @@ App.EndWeek.cellblockReport = function() {
trustMalus++;
idleBonus++;
r.push(`${He} has experience with detecting security issues and grinding down potential miscreants from ${his} life before ${he} was a slave, making ${him} more effective.`);
- } else if (S.Wardeness.skill.wardeness >= V.masteredXP) {
+ } else if (S.Wardeness.skill.wardeness >= Constant.MASTERED_XP) {
devBonus++;
trustMalus++;
idleBonus++;
@@ -127,7 +130,15 @@ App.EndWeek.cellblockReport = function() {
idleBonus++;
r.push(`${His} devotion to you is so absolute that ${he} sees breaking bitches for your service as a noble calling.`);
}
+ const pMod = App.SlaveAssignment.PartTime.efficiencyModifier(S.Wardeness);
+ devBonus *= pMod;
+ trustMalus *= pMod;
+ idleBonus *= pMod;
+ if (pMod < 1) {
+ r.push(`Some part of ${his} day is taken up by ${his} part-time job, making ${him} less effective.`);
+ }
App.Events.addNode(el, r, "div", "indent");
+
for (const slave of slaves) {
r = [];
if (S.Wardeness.rivalryTarget === slave.ID) {
@@ -179,14 +190,7 @@ App.EndWeek.cellblockReport = function() {
if (V.showEWD !== 0) {
const wardenessEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
const artSpan = App.UI.DOM.appendNewElement("span", wardenessEntry);
- App.SlaveAssignment.appendSlaveLinks(wardenessEntry, slave);
- App.Events.addNode(
- wardenessEntry,
- [
- App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name"),
- `is serving as the Wardeness in ${V.cellblockName}.`,
- ]
- );
+ wardenessEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is serving as the Wardeness in ${V.cellblockName}.`));
wardenessEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false));
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
@@ -296,18 +300,10 @@ App.EndWeek.cellblockReport = function() {
improveCondition(slave, 3);
}
- if (V.showEWD !== 0) {
- const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
+ if (V.showEWD) {
+ const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry);
- App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave);
- r = [];
- r.push(App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name"));
- if (slave.choosesOwnAssignment === 2) {
- r.push(App.SlaveAssignment.choosesOwnJob(slave));
- } else {
- r.push(`is confined in ${V.cellblockName}.`);
- }
- App.Events.addNode(slaveEntry, r);
+ slaveEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is confined in ${V.cellblockName}.`));
confinedResults = App.SlaveAssignment.stayConfined(slave);
App.Events.addNode(slaveEntry, [He, confinedResults.text], "div", "indent");
@@ -319,7 +315,6 @@ App.EndWeek.cellblockReport = function() {
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
// discard return values silently
- App.SlaveAssignment.choosesOwnJob(slave);
confinedResults = App.SlaveAssignment.stayConfined(slave);
if (confinedResults.broken) {
brokenSlaves++;
diff --git a/src/endWeek/reports/childrenReport.js b/src/endWeek/reports/childrenReport.js
index 7785b082a0be98b343ff73a1544df77f292e92c5..59380074097ed7e27e4f3e9a75ef3f75a4e24073 100644
--- a/src/endWeek/reports/childrenReport.js
+++ b/src/endWeek/reports/childrenReport.js
@@ -14,30 +14,28 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
const medianNannyIntelligenceImplant = NL ? findMedianNannyIntelligenceImplant() : null;
for (const child of V.cribs) {
- const childDiv = App.UI.DOM.appendNewElement("div", frag, '', "child-section");
+ const childDiv = App.UI.DOM.appendNewElement("div", frag, '', ["child-section"]);
childDiv.append(childGrowTime(child));
if (child.actualAge >= 3) {
if (Matron) {
- if (Matron.fetish !== "none") {
+ if (Matron.fetish !== Fetish.NONE) {
childDiv.append(matronFetishEffects(child));
}
childDiv.append(matronEducationEffects(child));
- // childDiv.append(matronFitnessEffects(child));
}
if (NL > 0) {
const randomNanny = NL > 1 ? jsRandom(0, nannies.length - 1) : 0;
const nanny = nannies[randomNanny];
- if (nanny.fetish !== "none") {
+ if (nanny.fetish !== Fetish.NONE) {
childDiv.append(nannyFetishEffects(child, nanny));
}
childDiv.append(nannyEducationEffects(child));
- // childDiv.append(nannyFitnessEffects(child));
}
if (multipleChildrenOverTargetAge(V.cribs.findIndex(c => c.ID === child.ID))) {
@@ -54,14 +52,10 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
}
}
-
-
- // MARK: Matron Effects
-
function matronFetishEffects(child) {
const chance = jsRandom(1, 100);
- if ((chance > 90 && child.fetish === "none") || chance > 95) {
+ if ((chance > 90 && child.fetish === Fetish.NONE) || chance > 95) {
child.fetish = Matron.fetish;
return `${child.slaveName} has taken a few cues from ${Matron.slaveName}, and ${newChildFetish(child.fetish)}. `;
@@ -88,7 +82,7 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
return `Though ${Matron.slaveName} has had little to no formal education, ${his} natural brilliance allows ${him} to teach ${theChildren} quite effectively, and so ${CL > 1 ? `they grow` : `${child.slaveName} grows`} a bit smarter. `;
} else {
const totalSpan = App.UI.DOM.makeElement("span", `${Matron.slaveName} isn't the brightest and not well educated, `);
- const damageSpan = App.UI.DOM.makeElement("span", `damaging the amount of real education ${theChildren} receive. `, "red");
+ const damageSpan = App.UI.DOM.makeElement("span", `damaging the amount of real education ${theChildren} receive. `, ["red"]);
child.intelligenceImplant--;
@@ -98,21 +92,12 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
}
}
- // function matronFitnessEffects(child) {
- // // TODO:
- // return;
- // }
-
-
-
- // MARK: Nanny Effects
-
function nannyFetishEffects(child, slave) {
const {he} = getPronouns(child);
const chance = jsRandom(1, 100);
if (chance > 85) {
- if (child.fetish === "none") {
+ if (child.fetish === Fetish.NONE) {
child.fetish = slave.fetish;
return `${slave.slaveName} has left quite an impression on ${child.slaveName}, and ${he} ${newChildFetish(child.fetish)}. `;
@@ -152,15 +137,6 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
}
}
- // function nannyFitnessEffects(child) {
- // // TODO:
- // return;
- // }
-
-
-
- // MARK: Nursery Rules Effects
-
function weightRulesEffects(child) {
// TODO: redo this entire section
// TODO: double check these classes, make sure they make sense
@@ -180,14 +156,14 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
span.append(`${He} is being fed an excessive amount of food, causing`, weightSpan);
} else if (V.nurseryWeightSetting === 2) {
- const weightSpan = App.UI.DOM.makeElement("span", `decreases the amount of food ${he} eats. `, "improvement");
+ const weightSpan = App.UI.DOM.makeElement("span", `decreases the amount of food ${he} eats. `, ["improvement"]);
if (child.weight > 10) {
child.weight--;
span.append(`${caretaker} notices ${he} is overweight and `, weightSpan);
} else if (child.weight <= -10) {
- const weightSpan = App.UI.DOM.makeElement("span", `increases the amount of food ${he} eats. `, "improvement");
+ const weightSpan = App.UI.DOM.makeElement("span", `increases the amount of food ${he} eats. `, ["improvement"]);
child.weight++;
@@ -229,13 +205,12 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
const caretaker = Matron ? Matron.slaveName : NL > 1 ? `A nanny` : firstNanny.slaveName;
const {His, He, he} = getPronouns(child);
-
- const muscleSpan = App.UI.DOM.makeElement("div", 'rapid muscle development.', "improvement");
+ const muscleSpan = App.UI.DOM.makeElement("div", 'rapid muscle development.', ["improvement"]);
div.append(`${He} is being worked out as often as possible, resulting in `, muscleSpan);
if (V.nurseryMusclesSetting === 2) {
- const muscleSpan = App.UI.DOM.makeElement("span", `decreases the amount of exercise ${he} receives. `, "improvement");
+ const muscleSpan = App.UI.DOM.makeElement("span", `decreases the amount of exercise ${he} receives. `, ["improvement"]);
if (child.muscles > 100) {
child.muscles -= 5;
@@ -244,7 +219,7 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
div.append(`${caretaker} notices ${he} is overly muscular and `, muscleSpan);
} else if (V.nurseryMusclesSetting === 1) {
if (child.muscles < -10) {
- const muscleSpan = App.UI.DOM.makeElement("span", `increases the amount of exercise ${he} receives. `, "improvement");
+ const muscleSpan = App.UI.DOM.makeElement("span", `increases the amount of exercise ${he} receives. `, ["improvement"]);
child.muscles--;
@@ -273,10 +248,6 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
return div;
}
-
-
- // MARK: Miscellaneous Functions
-
function childFriendshipRivalries(child) {
const el = new DocumentFragment();
const cribsCopy = Array.from(V.cribs);
@@ -286,7 +257,7 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
for (const target of cribsCopy) {
const becomeFriends = () => `${child.slaveName} and ${target.slaveName} have realized that they have more in common that they originally thought, and have become friends. `;
const becomeRivals = () => `${child.slaveName} and ${target.slaveName} have more differences between them than they could put aside and have become rivals. `;
- const haveSameFetish = () => child.fetish === target.fetish && child.fetish !== "none";
+ const haveSameFetish = () => child.fetish === target.fetish && child.fetish !== Fetish.NONE;
const haveSameBehavioralQuirk = () => child.behavioralQuirk && child.behavioralQuirk === target.behavioralQuirk && child.behavioralQuirk !== "none";
const haveSameSexualQuirk = () => child.sexualQuirk && child.sexualQuirk === target.sexualQuirk && child.sexualQuirk !== "none";
@@ -417,7 +388,7 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
case "pregnancy":
return `The idea of pregnancy titillates both ${child.slaveName} and ${target.slaveName}`;
default:
- throw Error(`Unexpected value ${child.fetish} in sameFetish(). Please report this.`);
+ throw Error(`Unexpected .fetish value of "${child.fetish}" in sameFetish(). Please report this.`);
}
}
@@ -442,7 +413,7 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
case "advocate":
return `${child.slaveName} and ${target.slaveName} can both make a strong case for slavery`;
default:
- throw Error(`Unexpected value ${child.behavioralQuirk} in sameBehavioralQuirk(). Please report this.`);
+ throw Error(`Unexpected .behavioralQuirk value of "${child.behavioralQuirk}" in sameBehavioralQuirk(). Please report this.`);
}
}
@@ -468,7 +439,7 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
case "size queen":
return `${sameQuirk ? `the two also` : `${child.slaveName} and ${target.slaveName} both`} have a love for huge cock`;
default:
- throw Error(`Unexpected value ${child.fetish} in sameSexualQuirk(). Please report this.`);
+ throw Error(`Unexpected .sexualQuirk value of "${child.sexualQuirk}" in sameSexualQuirk(). Please report this.`);
}
}
}
@@ -494,13 +465,13 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
case "pregnancy":
return `has developed a fascination for all things pregnancy-related`;
default:
- throw Error(`Unexpected fetish value of "${fetish}" in newChildFetish(). Please report this.`);
+ throw Error(`Unexpected .fetish value of "${fetish}" in newChildFetish(). Please report this.`);
}
}
function childGrowTime(child) {
- const nameSpan = App.UI.DOM.makeElement("span", child.slaveName, "pink");
- const limeSpan = App.UI.DOM.makeElement("span", 'ready for release.', "lime");
+ const nameSpan = App.UI.DOM.makeElement("span", child.slaveName, ["pink"]);
+ const limeSpan = App.UI.DOM.makeElement("span", 'ready for release.', ["lime"]);
const mainSpan = document.createElement("span");
const {He} = getPronouns(child);
diff --git a/src/endWeek/reports/clinicReport.js b/src/endWeek/reports/clinicReport.js
index 9d559ae2137250d01cf1992be2b7b0662478240c..4f0bc7592882bc1bece8433a083aabdeecf99a98 100644
--- a/src/endWeek/reports/clinicReport.js
+++ b/src/endWeek/reports/clinicReport.js
@@ -61,7 +61,7 @@ App.EndWeek.clinicReport = function() {
r.push(`${He} has experience with medicine from ${his} life before ${he} was a slave, and can often recognize conditions before even the medical scanners can.`);
idleBonus++;
healthBonus++;
- } else if (S.Nurse.skill.nurse >= V.masteredXP) {
+ } else if (S.Nurse.skill.nurse >= Constant.MASTERED_XP) {
r.push(`${He} has experience with medicine from working for you, and can often recognize conditions before even the medical scanners can.`);
idleBonus++;
healthBonus++;
@@ -132,7 +132,7 @@ App.EndWeek.clinicReport = function() {
r.push(`dick hourly.`);
improveCondition(slave, 4);
if (jsRandom(1, 100) > 65 && canTaste(S.Nurse)) {
- if (S.Nurse.fetish === "none") {
+ if (S.Nurse.fetish === Fetish.NONE) {
r.push(`It's not uncommon for ${him} to receive a load to the face; before long, <span class="fetish gain">${he} starts to enjoy the taste.</span>`);
S.Nurse.fetish = "cumslut";
} else if (S.Nurse.fetish === "cumslut") {
@@ -155,7 +155,7 @@ App.EndWeek.clinicReport = function() {
improveCondition(slave, 4);
slave.lactationDuration = 2;
if (jsRandom(1, 100) > 65 && canTaste(S.Nurse)) {
- if (S.Nurse.fetish === "none") {
+ if (S.Nurse.fetish === Fetish.NONE) {
r.push(`Those lovely globes are just too tantalizing for ${him} to resist, <span class="fetish gain">${he} can't help but take a drink ${himself}.</span>`);
S.Nurse.fetish = "boobs";
} else if (S.Nurse.fetish === "boobs") {
@@ -205,7 +205,7 @@ App.EndWeek.clinicReport = function() {
} else if (hasAnyArms(slave)) {
r.push(`feel ${his2} belly pushing further and further out with life beneath ${his2} fingers.`);
} else {
- r.push(`feel the ever growing pressure inside ${his2} abdomen.`);
+ r.push(`feel the ever-growing pressure inside ${his2} abdomen.`);
}
r.push(`Careful attention, along with numerous drug injections, are used to make sure ${his2} body is able to safely adjust to ${his2} pregnancy's rapid growth.`);
healthDamage(slave, 10);
@@ -229,8 +229,15 @@ App.EndWeek.clinicReport = function() {
}
}
+ const pMod = App.SlaveAssignment.PartTime.efficiencyModifier(S.Nurse);
+ healthBonus *= pMod;
+ idleBonus *= pMod;
+ if (pMod < 1) {
+ r.push(`Some part of ${his} day is taken up by ${his} part-time job, making ${him} less effective.`);
+ }
+
if (slaves.length < V.clinic && !slaveResting(S.Nurse)) {
- const idlePay = jsRandom(1, 10) + ((V.clinic - slaves.length) * (jsRandom(150, 170) + (idleBonus * 10)));
+ const idlePay = Math.ceil(jsRandom(1, 10) + ((V.clinic - slaves.length) * (jsRandom(150, 170) + (idleBonus * 10))));
cashX(idlePay, "clinic", S.Nurse);
r.push(`<div class="indent">Since ${he} doesn't have enough patients to occupy all of ${his} time, ${V.clinicName} takes in citizens' slaves on a contract basis and ${he} helps them too, earning <span class="cash inc">${cashFormat(idlePay)}.</span></div>`);
}
@@ -256,10 +263,9 @@ App.EndWeek.clinicReport = function() {
tired(slave);
/* apply following SA passages to facility leader */
if (V.showEWD !== 0) {
- const nurseEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
+ const nurseEntry = App.UI.DOM.appendNewElement("div", frag, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", nurseEntry);
- App.SlaveAssignment.appendSlaveLinks(nurseEntry, slave);
- $(nurseEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> is serving as the clinical nurse.`);
+ nurseEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is serving as the clinical nurse.`));
nurseEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false));
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
@@ -404,38 +410,33 @@ App.EndWeek.clinicReport = function() {
}
if (V.showEWD !== 0) {
- const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
+ const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry);
- App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave);
- $(slaveEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> `);
- if (slave.choosesOwnAssignment === 2) {
- $(slaveEntry).append(App.SlaveAssignment.choosesOwnJob(slave));
- } else {
- $(slaveEntry).append(`is receiving treatment in ${V.clinicName}.`);
- }
- const patientContent = App.UI.DOM.appendNewElement("div", slaveEntry, '', "indent");
- $(patientContent).append(`${He} ${App.SlaveAssignment.rest(slave)} `);
+ slaveEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is receiving treatment in ${V.clinicName}.`));
+
+ let r = [];
+ r.push(He, App.SlaveAssignment.rest(slave));
if (remainReasons.length > 0) {
- $(patientContent).append(`${He} stays in the clinic ${toSentence(remainReasons)}.`);
+ r.push(`${He} stays in the clinic ${toSentence(remainReasons)}.`);
}
+ App.Events.addNode(slaveEntry, r, "div", "indent");
slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false));
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
// discard return values silently
- App.SlaveAssignment.choosesOwnJob(slave);
App.SlaveAssignment.rest(slave);
App.SlaveAssignment.standardSlaveReport(slave, true);
}
}
if (restedSlaves > 0) {
- const rested = App.UI.DOM.appendNewElement("p", frag, '', "indent");
+ const rested = App.UI.DOM.appendNewElement("p", frag, '', ["indent"]);
rested.append((restedSlaves === 1) ? `One slave has` : `${restedSlaves} slaves have`, " been returned to ");
App.UI.DOM.appendNewElement("span", rested, `health${(S.Nurse && V.clinicUpgradeFilters > 0) ? ' and purity' : ''}`, "green");
rested.append(` and will be released from the clinic before the end of the week.`);
if (V.clinicDecoration !== "standard") {
- const decorationEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
+ const decorationEffects = App.UI.DOM.appendNewElement("p", frag, '', ["indent"]);
$(decorationEffects).append(`${capFirstChar(V.clinicName)}'s ${V.clinicDecoration} atmosphere <span class="hotpink">had an impact on them</span> while they were getting treatment.`);
}
}
diff --git a/src/endWeek/reports/clubReport.js b/src/endWeek/reports/clubReport.js
index 9431446209c442d5e1c26798c90dbda0ddf73878..aec12291544ebf7c81a06684fd1c6ff695375c76 100644
--- a/src/endWeek/reports/clubReport.js
+++ b/src/endWeek/reports/clubReport.js
@@ -5,6 +5,7 @@ App.EndWeek.clubReport = function() {
const el = new DocumentFragment();
let r;
+ const dj = S.DJ ? App.SlaveAssignment.reportSlave(S.DJ) : undefined;
const slaves = App.Utils.sortedEmployees(App.Entity.facilities.club);
// Statistics gathering; income is rep boosts in numbers, and profit will be rep per cash unit, or cash unit per rep
@@ -92,7 +93,7 @@ App.EndWeek.clubReport = function() {
}
if (App.Data.Careers.Leader.DJ.includes(S.DJ.career)) {
r.push(`${He} has musical experience from ${his} life before ${he} was a slave, a grounding that gives ${his} tracks actual depth.`);
- } else if (S.DJ.skill.DJ >= V.masteredXP) {
+ } else if (S.DJ.skill.DJ >= Constant.MASTERED_XP) {
r.push(`${He} has musical experience from working for you, giving ${his} tracks actual depth.`);
} else if (S.DJ.skill.DJ > 120) {
r.push(`${He} understands what tracks pair well with each other and how to tailor them to ${his} audience.`);
@@ -101,12 +102,14 @@ App.EndWeek.clubReport = function() {
} else if (S.DJ.skill.DJ > 20) {
r.push(`${He} has basic musical knowledge and can keep the party going.`);
}
- if (S.DJ.skill.DJ < V.masteredXP) {
+ if (S.DJ.skill.DJ < Constant.MASTERED_XP) {
const skillIncrease = random(1, Math.ceil((S.DJ.intelligence + S.DJ.intelligenceImplant) / 15) + 8);
r.push(slaveSkillIncrease('DJ', S.DJ, skillIncrease));
}
App.Events.addNode(el, r, "p", "indent");
- if (slaves.length + V.clubSlavesGettingHelp < 10 && V.DJnoSex !== 1 && !slaveResting(S.DJ)) {
+
+ if (slaves.length + V.clubSlavesGettingHelp < 10 * App.SlaveAssignment.PartTime.efficiencyModifier(dj) &&
+ V.DJnoSex !== 1 && !slaveResting(S.DJ)) {
App.Events.addNode(
el,
[`Since ${he} doesn't have enough sluts in ${V.clubName} to make it worthwhile for ${him} to be on stage 24/7, ${he} spends ${his} extra time slutting it up ${himself}. ${He} has sex with ${S.DJ.sexAmount} citizens, <span class="green">pleasing them immensely,</span> since it's more appealing to fuck the DJ than some club slut.`],
@@ -118,13 +121,13 @@ App.EndWeek.clubReport = function() {
el,
[
He,
- App.SlaveAssignment.serveThePublic(S.DJ)
+ App.SlaveAssignment.serveThePublic(dj)
],
"div",
"indent"
);
} else {
- App.SlaveAssignment.serveThePublic(S.DJ);
+ App.SlaveAssignment.serveThePublic(dj);
}
}
}
@@ -141,24 +144,16 @@ App.EndWeek.clubReport = function() {
}
if (S.DJ) {
- const slave = App.SlaveAssignment.reportSlave(S.DJ);
- tired(slave);
+ tired(dj);
/* apply following SA passages to facility leader */
if (V.showEWD !== 0) {
- const DJEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
+ const DJEntry = App.UI.DOM.appendNewElement("div", el, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", DJEntry);
- App.SlaveAssignment.appendSlaveLinks(DJEntry, slave);
- App.Events.addNode(
- DJEntry,
- [
- App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name"),
- `is performing as the DJ in ${V.clubName}.`,
- ]
- );
- DJEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false));
- App.SlaveAssignment.appendSlaveArt(artSpan, slave);
+ DJEntry.append(App.SlaveAssignment.saSlaveIntro(dj, `is performing as the DJ in ${V.clubName}.`));
+ DJEntry.append(App.SlaveAssignment.standardSlaveReport(dj, false));
+ App.SlaveAssignment.appendSlaveArt(artSpan, dj);
} else {
- App.SlaveAssignment.standardSlaveReport(slave, true);
+ App.SlaveAssignment.standardSlaveReport(dj, true);
}
}
@@ -191,18 +186,10 @@ App.EndWeek.clubReport = function() {
slave.rules.living = "normal";
}
- if (V.showEWD !== 0) {
- const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
+ if (V.showEWD) {
+ const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry);
- App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave);
- r = [];
- r.push(App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name"));
- if (slave.choosesOwnAssignment === 2) {
- r.push(App.SlaveAssignment.choosesOwnJob(slave));
- } else {
- r.push(`is serving in ${V.clubName}.`);
- }
- App.Events.addNode(slaveEntry, r);
+ slaveEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is serving in ${V.clubName}.`));
const {He} = getPronouns(slave);
App.Events.addNode(
@@ -218,7 +205,6 @@ App.EndWeek.clubReport = function() {
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
// discard return values silently
- App.SlaveAssignment.choosesOwnJob(slave);
App.SlaveAssignment.serveThePublic(slave);
App.SlaveAssignment.standardSlaveReport(slave, true);
}
diff --git a/src/endWeek/reports/dairyReport.js b/src/endWeek/reports/dairyReport.js
index 844e4eec9fb5a0ede49687a6b27ff3f45fdfc1a3..89668fe49f3005e2fd64a80a95b92ece618eec4e 100644
--- a/src/endWeek/reports/dairyReport.js
+++ b/src/endWeek/reports/dairyReport.js
@@ -263,7 +263,7 @@ App.EndWeek.dairyReport = function() {
if (App.Data.Careers.Leader.milkmaid.includes(S.Milkmaid.career)) {
V.milkmaidHealthBonus++;
r.push(`${He} has career experience dealing with milk animals.`);
- } else if (S.Milkmaid.skill.milkmaid >= V.masteredXP) {
+ } else if (S.Milkmaid.skill.milkmaid >= Constant.MASTERED_XP) {
V.milkmaidHealthBonus++;
r.push(`${He} has experience harvesting slave products from working for you.`);
} else {
@@ -348,21 +348,14 @@ App.EndWeek.dairyReport = function() {
App.Events.addNode(el, r, "div");
}
- if (V.MilkmaidID !== 0) {
+ if (S.Milkmaid) {
const slave = App.SlaveAssignment.reportSlave(S.Milkmaid);
tired(slave);
/* apply following SA passages to facility leader */
if (V.showEWD !== 0) {
- const milkMaidEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
+ const milkMaidEntry = App.UI.DOM.appendNewElement("div", el, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", milkMaidEntry);
- App.SlaveAssignment.appendSlaveLinks(milkMaidEntry, slave);
- App.Events.addNode(
- milkMaidEntry,
- [
- App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name"),
- `is serving as your Milkmaid.`,
- ]
- );
+ milkMaidEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is serving as your Milkmaid.`));
milkMaidEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false));
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
@@ -460,17 +453,9 @@ App.EndWeek.dairyReport = function() {
milkWeek += milkResults.milk;
cumWeek += milkResults.cum;
if (V.showEWD !== 0) {
- const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
+ const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry);
- App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave);
- r = [];
- r.push(App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name"));
- if (slave.choosesOwnAssignment === 2) {
- r.push(App.SlaveAssignment.choosesOwnJob(slave));
- } else {
- r.push(`is serving as a cow in ${V.dairyName}.`);
- }
- App.Events.addNode(slaveEntry, r);
+ slaveEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is serving as a cow in ${V.dairyName}.`));
const {He} = getPronouns(slave);
App.Events.addNode(
@@ -486,7 +471,6 @@ App.EndWeek.dairyReport = function() {
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
// discard return values silently
- App.SlaveAssignment.choosesOwnJob(slave);
App.SlaveAssignment.standardSlaveReport(slave, true);
}
@@ -800,7 +784,7 @@ App.EndWeek.dairyReport = function() {
if (slave.muscles > -100) {
slave.muscles -= 1 + slave.geneticQuirks.mLoss;
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (slave.boobs > 48000 && (slave.balls >= 10 || slave.balls === 0)) {
V.bioreactorPerfectedID = slave.ID;
}
@@ -883,7 +867,7 @@ App.EndWeek.dairyReport = function() {
if (slave.intelligence < -50) {
stupidified.push(slave);
}
- } else if (slave.fetish !== "mindbroken") {
+ } else if (slave.fetish !== Fetish.MINDBROKEN) {
applyMindbroken(slave);
mindbroken++;
}
@@ -948,7 +932,7 @@ App.EndWeek.dairyReport = function() {
if (slave.intelligence < -50) {
stupidified.push(slave);
}
- } else if (slave.fetish !== "mindbroken") {
+ } else if (slave.fetish !== Fetish.MINDBROKEN) {
applyMindbroken(slave);
mindbroken++;
}
diff --git a/src/endWeek/reports/farmyardReport.js b/src/endWeek/reports/farmyardReport.js
index d3ee19f721ff34fbc465be2d0c2ef0ef3d8fd560..1b366b048420da8bf4c947bb4044fcee6f8cd314 100644
--- a/src/endWeek/reports/farmyardReport.js
+++ b/src/endWeek/reports/farmyardReport.js
@@ -1,36 +1,36 @@
App.EndWeek.farmyardReport = function farmyardReport() {
const frag = new DocumentFragment();
+ const text = new SpacedTextAccumulator(frag);
const slaves = App.Utils.sortedEmployees(App.Entity.facilities.farmyard);
const devBonus = (V.farmyardDecoration !== "standard") ? 1 : 0;
const Farmer = S.Farmer ? App.SlaveAssignment.reportSlave(S.Farmer) : undefined;
-
- let profits = 0;
- let foodWeek = 0;
-
- const statsSpan = document.createElement("span");
- frag.append(statsSpan);
+ const profits = getProfits();
+ const food = App.Facilities.Farmyard.foodProduction();
// Statistics gathering
V.facility = V.facility || {};
V.facility.farmyard = initFacilityStatistics(V.facility.farmyard);
- farmyardStatsRecords();
+ const statsSpan = document.createElement("span");
+ frag.append(statsSpan);
+
+ text.push(
+ farmyardDecoration(),
+ farmyardMultipliers(),
+ farmyardProfit(),
+ );
- farmyardDecoration();
- farmyardProfit(profits, foodWeek);
+ text.toParagraph();
- V.mods.food.amount += foodWeek;
+ V.mods.food.amount += food;
if (Farmer) {
- const farmerEffects = App.UI.DOM.appendNewElement("p", frag, null, ["indent"]);
-
if (V.showEWD) {
const farmerEntry = App.UI.DOM.appendNewElement("div", frag, null, ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", farmerEntry);
- App.SlaveAssignment.appendSlaveLinks(farmerEntry, Farmer);
- $(farmerEntry).append(`<span class="slave-name">${SlaveFullName(Farmer)}</span> is serving as the Farmer.`);
- farmerEntry.append(App.SlaveAssignment.standardSlaveReport(Farmer, false));
+ App.Events.addNode(farmerEntry, [App.SlaveAssignment.saSlaveIntro(Farmer, `is serving as the Farmer.`), farmerText()]);
+ farmerEntry.append(App.SlaveAssignment.standardSlaveReport(Farmer));
App.SlaveAssignment.appendSlaveArt(artSpan, Farmer);
} else {
App.SlaveAssignment.standardSlaveReport(Farmer, true);
@@ -39,7 +39,6 @@ App.EndWeek.farmyardReport = function farmyardReport() {
getSlaveStatisticData(S.Farmer, V.facility.farmyard);
farmerChanges();
- $(farmerEffects).append(farmerText());
}
if (slaves) {
@@ -53,14 +52,7 @@ App.EndWeek.farmyardReport = function farmyardReport() {
if (V.showEWD) {
const slaveEntry = App.UI.DOM.appendNewElement("div", frag, null, ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry);
- App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave);
- $(slaveEntry).append(`<span class="slave-name">${SlaveFullName(slave)}</span> `);
-
- if (slave.choosesOwnAssignment) {
- $(slaveEntry).append(App.SlaveAssignment.choosesOwnJob(slave));
- } else {
- $(slaveEntry).append(`is working out of ${V.farmyardName}.`);
- }
+ slaveEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is working out of ${V.farmyardName}.`));
farmhandLivingRules(slave);
farmhandHealth(slave);
@@ -69,40 +61,18 @@ App.EndWeek.farmyardReport = function farmyardReport() {
farmhandEnergy(slave);
farmhandFood(slave);
- profits += farmhandProfit(slave);
-
- const farmhandContent = App.UI.DOM.appendNewElement("div", slaveEntry, null, ["indent"]);
-
- $(farmhandContent).append(App.SlaveAssignment.workTheFarm(slave));
- slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false));
+ App.Events.addNode(slaveEntry, [
+ App.SlaveAssignment.workTheFarm(slave),
+ App.SlaveAssignment.standardSlaveReport(slave, false)
+ ], "div", ["indent"]);
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else { // silently discard return values
App.SlaveAssignment.workTheFarm(slave);
App.SlaveAssignment.standardSlaveReport(slave, true);
}
}
- }
-
- if (V.farmMenials) {
- let farmMenialProductivity = 9;
-
- if (V.farmyardUpgrades.pump) {
- farmMenialProductivity += 1;
- }
-
- if (V.farmyardUpgrades.fertilizer) {
- farmMenialProductivity += 2;
- }
-
- if (V.farmyardUpgrades.seeds) {
- farmMenialProductivity += 3;
- }
-
- if (V.farmyardUpgrades.machinery) {
- farmMenialProductivity += 3;
- }
- foodWeek += (V.farmMenials * farmMenialProductivity);
+ farmyardStatsRecords();
}
frag.append(App.Facilities.Farmyard.Stats(false));
@@ -171,10 +141,10 @@ App.EndWeek.farmyardReport = function farmyardReport() {
if (App.Data.Careers.Leader.farmer.includes(slave.career)) {
FarmerCashBonus += 0.05;
- if (slave.skill.farmer >= V.masteredXP) {
+ if (slave.skill.farmer >= Constant.MASTERED_XP) {
FarmerCashBonus += 0.05;
}
- } else if (slave.skill.farmer >= V.masteredXP) {
+ } else if (slave.skill.farmer >= Constant.MASTERED_XP) {
FarmerCashBonus += 0.05;
}
@@ -194,7 +164,6 @@ App.EndWeek.farmyardReport = function farmyardReport() {
const r = [];
r.push(
- farmerIntro(Farmer),
farmerRelationshipPC(Farmer),
farmerFetishEffects(Farmer, farmerFetish(Farmer)),
farmerSkill(Farmer),
@@ -265,7 +234,7 @@ App.EndWeek.farmyardReport = function farmyardReport() {
if (App.Data.Careers.Leader.farmer.includes(slave.career)) {
return `${He} has experience from ${his} life before ${he} was a slave that helps ${him} in the difficult life of managing animals and property.`;
- } else if (slave.skill.farmer >= V.masteredXP) {
+ } else if (slave.skill.farmer >= Constant.MASTERED_XP) {
return `${He} has experience from working for you that helps ${him} in the difficult life of managing animals and property.`;
} else {
const skillIncrease = random(1, Math.ceil((slave.intelligence + slave.intelligenceImplant) / 32));
@@ -355,10 +324,6 @@ App.EndWeek.farmyardReport = function farmyardReport() {
}
}
- function farmerIntro(slave) {
- return `<span class="indent">${SlaveFullName(slave)} is serving as the Farmer</span>.`;
- }
-
// Farmhands
function farmhandCount(count) {
@@ -439,24 +404,26 @@ App.EndWeek.farmyardReport = function farmyardReport() {
return;
}
- f.farmhandIncome = 0;
+ f.whoreIncome = 0;
f.customers = 0;
- f.farmhandCosts = 0;
+ f.whoreCosts = 0;
f.rep = 0;
+ f.food = 0;
for (const si of f.income.values()) {
- f.farmhandIncome += si.income + si.adsIncome;
+ f.whoreIncome += si.income + si.adsIncome;
f.customers += si.customers;
- f.farmhandCosts += si.cost;
+ f.whoreCosts += si.cost;
f.rep += si.rep;
+ f.food += si.food;
}
f.maintenance = V.farmyard * V.facilityCost;
- f.totalIncome = f.farmhandIncome + f.adsIncome;
- f.totalExpenses = f.farmhandCosts + f.maintenance;
+ f.totalIncome = f.whoreIncome + f.adsIncome;
+ f.totalExpenses = f.whoreCosts + f.maintenance;
f.profit = f.totalIncome - f.totalExpenses;
}
function farmyardDecoration() {
- const text = new SpacedTextAccumulator(frag);
+ const text = [];
// TODO: add checks for the different FSs
if (V.farmyardDecoration !== 'standard') {
@@ -473,21 +440,57 @@ App.EndWeek.farmyardReport = function farmyardReport() {
}
}
- return text.toParagraph();
+ return text.join(' ');
+ }
+
+ function farmyardMultipliers() {
+ const animals = [...V.animals.canine, ...V.animals.feline, ...V.animals.hooved].map(animal => getAnimal(animal));
+ const total = animals.length;
+ const exotic = animals.filter(animal => animal.rarity === "exotic");
+ const text = [];
+ const animalText = [];
+
+ if (total > 1) {
+ text.push(`Having a ${total > 6 ? `wide` : ``} variety of`);
+ if (V.animals.canine.length > 0) {
+ if (V.animals.canine.every(c => getAnimal(c).species === "dog")) {
+ animalText.push(`dogs`);
+ } else {
+ animalText.push(`canines`);
+ }
+ }
+ if (V.animals.hooved.length > 0) {
+ animalText.push(`hooved animals`);
+ }
+ if (V.animals.feline.length > 0) {
+ if (V.animals.feline.every(f => getAnimal(f).species === "cat")) {
+ animalText.push(`cats`);
+ } else {
+ animalText.push(`felines`);
+ }
+ }
+ text.push(`${toSentence(animalText)} keeps the guests of ${V.farmyardName} more entertained than they would have been otherwise, <span class="cash inc">earning you more.</span>`);
+ }
+
+ if (exotic.length > 0) {
+ text.push(`The fact that some of the animals are normally only founds in zoos is <span class="reputation inc">not lost on your citizenry,</span> either, and <span class="cash inc">many are willing to pay more</span> to watch shows with them.`);
+ }
+
+ return text.join(' ');
}
- function farmyardProfit(profit, food) {
- const text = new SpacedTextAccumulator(frag);
+ function farmyardProfit() {
+ const text = [];
- if (profit || food) {
+ if (profits || food) {
text.push(capFirstChar(V.farmyardName));
- if (profit) {
- text.push(`makes you <span class="cash">${cashFormat(Math.trunc(profit))}</span>`);
+ if (profits) {
+ text.push(`makes you <span class="cash">${cashFormat(Math.trunc(profits))}</span>`);
}
if (V.mods.food.market) {
- if (profit && food) {
+ if (profits && food) {
text.push(`and`);
}
if (food) {
@@ -497,6 +500,16 @@ App.EndWeek.farmyardReport = function farmyardReport() {
text.push(`this week.`);
}
- return text.toParagraph();
+ return text.join(' ');
+ }
+
+ function getProfits() {
+ let total = 0;
+
+ for (const slave of slaves) {
+ total += farmhandProfit(slave);
+ }
+
+ return total;
}
};
diff --git a/src/endWeek/reports/incubatorReport.js b/src/endWeek/reports/incubatorReport.js
index 0f9bb4cf469a1699d6b5bd9058164edc65b94e73..ac5dc09d1fc551356cea0e6c5c5451797cc7f6b7 100644
--- a/src/endWeek/reports/incubatorReport.js
+++ b/src/endWeek/reports/incubatorReport.js
@@ -168,7 +168,7 @@ App.EndWeek.incubatorReport = function() {
* a little more or less. So using V.minimumSlaveAge or 8, whichever is lesser. */
const limitAge = Math.min(8, V.minimumSlaveAge);
/* Generate new average height for slave of age limitAge */
- heightLimitAge = Height.mean(tank.nationality, tank.race, tank.genes, limitHeight);
+ heightLimitAge = Height.mean(tank.nationality, tank.race, tank.genes, limitAge);
heightLimit = heightLimitAge; /* TODO: Add some variation, right now all NCS slaves will be the exact same height */
} else if (tank.geneticQuirks.neoteny === 2 && tank.physicalAge > 12) {
/* Generate new average height for slave of age 12 */
@@ -183,8 +183,8 @@ App.EndWeek.incubatorReport = function() {
r.push(`The monitoring system floods ${his} body with growth stimulants, but ${his} <span class="orange">NCS prevents an increase in ${his} growth rate.</span>`);
tank.height = heightLimitAge;
} else {
- r.push(`The monitoring system floods ${his} body with growth stimulants, causing <span class="green">a sharp increase in growth rate.</span>`);
if (V.incubator.setting.weight >= 1 && V.incubator.setting.muscles <= 1 && V.incubator.setting.reproduction <= 1) {
+ r.push(`The monitoring system floods ${his} body with growth stimulants. ${His} caloric intake and expenditure rates are ideal for maximum response, causing <span class="green">explosive growth.</span>`);
if (V.incubator.upgrade.speed === 52) {
tank.height += random(3, 6);
} else if (V.incubator.upgrade.speed === 18) {
@@ -197,6 +197,7 @@ App.EndWeek.incubatorReport = function() {
tank.height += random(1, 2);
}
} else {
+ r.push(`The monitoring system floods ${his} body with growth stimulants, causing <span class="green">a sharp increase in growth rate.</span>`);
if (V.incubator.upgrade.speed === 52) {
tank.height += random(2, 5);
} else if (V.incubator.upgrade.speed === 18) {
@@ -273,7 +274,7 @@ App.EndWeek.incubatorReport = function() {
}
if (tank.hips < 2 && random(1, 100) > 50) {
r.push(`The excess estrogen-laced growth hormones <span class="green">cause ${his} hips to widen for childbirth.</span>`);
- tank.hips += 2;
+ tank.hips = Math.clamp(tank.hips + 2, -2, 2);
}
if (tank.butt < 12*rearQuirk && random(1, 100) > 30/rearQuirk) {
r.push(`The excess estrogen-laced growth hormones <span class="green">cause ${his} rear to grow fatter.</span>`);
@@ -537,7 +538,7 @@ App.EndWeek.incubatorReport = function() {
}
if (tank.hips < 2 && random(1, 100) > 90) {
r.push(`The excess estrogen-laced growth hormones <span class="green">cause ${his} hips to widen for childbirth.</span>`);
- tank.hips += 2;
+ tank.hips = Math.clamp(tank.hips + 2, -2, 2);
}
if (tank.butt < 6*rearQuirk && random(1, 100) > 70/rearQuirk) {
r.push(`The excess estrogen-laced growth hormones <span class="green">cause ${his} rear to grow fatter.</span>`);
@@ -853,6 +854,7 @@ App.EndWeek.incubatorReport = function() {
tank.hips = Math.clamp(tank.hips, -2, 3);
tank.balls = Math.clamp(tank.balls, 0, 40);
tank.boobs = Math.clamp(tank.boobs, 10, 30000);
+ tank.butt = Math.clamp(tank.butt, 0, 20);
tank.height = Math.clamp(tank.height, 0, 274);
tank.hormoneBalance = Math.clamp(tank.hormoneBalance, -500, 500);
tank.foreskin = tank.dick; /* simple, clean way of making sure foreskins and scrotums grow appropriately */
diff --git a/src/endWeek/reports/masterSuiteReport.js b/src/endWeek/reports/masterSuiteReport.js
index 3b47eb3727e82ebeb78276cb16c3d1de98e1e97a..ece7e1579348577a73a9cf953b7bb5c417390cbe 100644
--- a/src/endWeek/reports/masterSuiteReport.js
+++ b/src/endWeek/reports/masterSuiteReport.js
@@ -1,5 +1,5 @@
App.EndWeek.masterSuiteReport = function() {
- let frag = document.createDocumentFragment();
+ const frag = new DocumentFragment();
const concubine = S.Concubine ? App.SlaveAssignment.reportSlave(S.Concubine) : undefined;
const slaves = App.Utils.sortedEmployees(App.Entity.facilities.masterSuite);
const msAvg = App.Utils.masterSuiteAverages();
@@ -7,10 +7,11 @@ App.EndWeek.masterSuiteReport = function() {
const pregnantSlaves = V.masterSuiteUpgradePregnancy ? slaves.filter((s) => s.pregKnown > 0).length : 0;
function concubineText() {
+ const frag = new DocumentFragment();
let r = [];
const {He, he, his, him, himself} = getPronouns(S.Concubine);
-
- r.push(`Your concubine <span class='slave-name'>${SlaveFullName(S.Concubine)}</span> is serving you in ${V.masterSuiteName}. More than any other slave, ${his} sexual brilliance and physical appeal are <span class="green">critical</span> to your reputation.`);
+ r.push(App.SlaveAssignment.saSlaveIntro(S.Concubine, `is serving as your concubine in ${V.masterSuiteName}.`));
+ r.push(`More than any other slave, ${his} sexual brilliance and physical appeal are <span class="green">critical</span> to your reputation.`);
if (S.Concubine.prestigeDesc === "You bankrupted and enslaved $him in revenge for $his part in the attack on your arcology by the Daughters of Liberty." && S.Concubine.newGamePlus === 0) {
r.push(`${He} was once your rival, and your relationship is widely thought to be <span class="green">the perfect modern romance.</span>`);
@@ -88,21 +89,20 @@ App.EndWeek.masterSuiteReport = function() {
S.Concubine.trust += 2;
}
repX(Beauty(S.Concubine) * 5 + (S.Concubine.skill.vaginal || 0) + (S.Concubine.skill.anal || 0) + (S.Concubine.skill.oral || 0) + (S.Concubine.skill.whoring || 0) + (S.Concubine.skill.entertainment || 0), "concubine", S.Concubine);
- return r.join(' ');
+
+ App.Events.addNode(frag, r);
+
+ return frag;
}
/** Generate text specific to non-concubine MS slaves
* @param {App.Entity.SlaveState} slave
- * @returns {string}
+ * @returns {DocumentFragment}
*/
function nonConcubineText(slave) {
- let r = [];
- r.push(`<span class='slave-name'>${SlaveFullName(slave)}</span>`);
- if (slave.choosesOwnAssignment === 2) {
- r.push(App.SlaveAssignment.choosesOwnJob(slave));
- } else {
- r.push(`sees to your pleasure in ${V.masterSuiteName}.`);
- }
+ const frag = new DocumentFragment();
+ frag.append(App.SlaveAssignment.saSlaveIntro(slave, `sees to your pleasure in ${V.masterSuiteName}.`));
+
/* Perform facility based rule changes - FIXME - dev/trust living condition changes probably should be in saRules; there's no text reporting these changes here */
if (V.masterSuiteUpgradeLuxury === 1) {
slave.rules.living = "luxurious";
@@ -147,7 +147,8 @@ App.EndWeek.masterSuiteReport = function() {
if (V.masterSuiteDecoration !== "standard") {
slave.devotion++;
}
- return r.join(' ');
+
+ return frag;
}
/** Generate text shared by concubine and non-concubine MS slaves
@@ -155,7 +156,7 @@ App.EndWeek.masterSuiteReport = function() {
* @returns {DocumentFragment}
*/
function commonText(slave) {
- const smallFrag = document.createDocumentFragment();
+ const frag = new DocumentFragment();
let r = [];
const {He, he, His, his, him, himself} = getPronouns(slave);
@@ -168,7 +169,7 @@ App.EndWeek.masterSuiteReport = function() {
if (slave.nipples === "fuckable" && msAvg.dick > 2) {
actX(slave, "mammary", random(1, 3) * energy);
}
- if ((slave.trust >= -20) && (slave.devotion > -10) && (slave.fetishStrength <= 95) && slave.fetish !== "mindbroken") {
+ if ((slave.trust >= -20) && (slave.devotion > -10) && (slave.fetishStrength <= 95) && slave.fetish !== Fetish.MINDBROKEN) {
const fetishChange = fetishChangeChance(slave);
if (msAvg.milk > 2000 && fetishChange > random(0, 50)) {
if (slave.fetish === "boobs") {
@@ -231,7 +232,7 @@ App.EndWeek.masterSuiteReport = function() {
}
} else if (msAvg.dom > 25 && fetishChange > random(0, 50)) {
r.push(`${He}`);
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`<span class="lightcoral">becomes even more submissive,</span> since there are so many doms in the fuckpit that ${he}'s often used by more than one at once.`);
slave.fetishStrength += 4;
} else {
@@ -328,33 +329,31 @@ App.EndWeek.masterSuiteReport = function() {
}
}
- $(smallFrag).append(r.join(' '));
+ App.Events.addNode(frag, r);
if (V.verboseDescriptions === 1) {
- const msContent = App.UI.DOM.appendNewElement("div", smallFrag, '', "indent");
- $(msContent).append(`${He} ${App.SlaveAssignment.pleaseYou(slave)}`);
+ App.Events.addNode(frag, [He, App.SlaveAssignment.pleaseYou(slave)], "div", ["indent"]);
- if (V.servantMilkers === 1 && slave.lactation > 0 && slave.fuckdoll === 0 && slave.fetish !== "mindbroken" && canMove(slave) && slave.intelligence + slave.intelligenceImplant >= -90) {
+ if (V.servantMilkers === 1 && slave.lactation > 0 && slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN && canMove(slave) && slave.intelligence + slave.intelligenceImplant >= -90) {
const milkingResults = App.SlaveAssignment.getMilked(slave, 0.25);
- const milkDiv = App.UI.DOM.appendNewElement("div", smallFrag, `When ${his} breasts begin to feel full and you aren't around, ${he} avails ${himself} to the penthouse milkers and gives ${milkingResults.milk} liters of milk over the week, which is sold for `, "indent");
+ const milkDiv = App.UI.DOM.appendNewElement("div", frag, `When ${his} breasts begin to feel full and you aren't around, ${he} avails ${himself} to the penthouse milkers and gives ${milkingResults.milk} liters of milk over the week, which is sold for `, ["indent"]);
App.UI.DOM.appendNewElement("span", milkDiv, `${cashFormat(milkingResults.milkSale)}.`, ["cash", "inc"]);
}
- App.Events.addNode(smallFrag, [
+ App.Events.addNode(frag, [
App.SlaveAssignment.choosesOwnClothes(slave),
...App.SlaveAssignment.individualSlaveReport(slave),
- ], "div", "indent");
+ ], "div", ["indent"]);
} else {
// discard return values silently
- App.SlaveAssignment.choosesOwnJob(slave);
App.SlaveAssignment.pleaseYou(slave);
- if (V.servantMilkers === 1 && slave.lactation > 0 && slave.fuckdoll === 0 && slave.fetish !== "mindbroken" && canMove(slave) && slave.intelligence + slave.intelligenceImplant >= -90) {
+ if (V.servantMilkers === 1 && slave.lactation > 0 && slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN && canMove(slave) && slave.intelligence + slave.intelligenceImplant >= -90) {
App.SlaveAssignment.getMilked(slave, 0.25);
}
App.SlaveAssignment.choosesOwnClothes(slave);
App.SlaveAssignment.individualSlaveReport(slave);
}
- smallFrag.append(App.PersonalAttention.slaveReport(slave));
- App.Events.addNode(smallFrag, [App.SlaveAssignment.devotion(slave)], "div", "indent");
+ frag.append(App.PersonalAttention.slaveReport(slave));
+ App.Events.addNode(frag, [App.SlaveAssignment.devotion(slave)], "div", ["indent"]);
if (slave.health.condition < 80) {
if (V.masterSuiteUpgradeLuxury === 1) {
@@ -364,11 +363,11 @@ App.EndWeek.masterSuiteReport = function() {
}
}
- return smallFrag;
+ return frag;
}
if (slaves.length > 0) {
- const intro = App.UI.DOM.appendNewElement("p", frag, '', "indent");
+ const intro = App.UI.DOM.appendNewElement("p", frag, '', ["indent"]);
let r = [];
if (S.Concubine) {
r.push(`<strong>${SlaveFullName(S.Concubine)} and ${numberWithPluralOne(slaves.length, "other slave")} are`);
@@ -428,35 +427,31 @@ App.EndWeek.masterSuiteReport = function() {
r.push(`relatively normal.`);
}
}
- $(intro).append(r.join(' '));
+ App.Events.addNode(intro, r);
}
if (concubine) {
tired(concubine);
- const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
- const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry);
- App.SlaveAssignment.appendSlaveLinks(slaveEntry, concubine);
- App.Events.addNode(slaveEntry, [concubineText(), commonText(concubine)]);
+ const concubineEntry = App.UI.DOM.appendNewElement("div", frag, '', ["slave-report"]);
+ const artSpan = App.UI.DOM.appendNewElement("span", concubineEntry);
+ App.Events.addNode(concubineEntry, [concubineText(), commonText(concubine)]);
App.SlaveAssignment.appendSlaveArt(artSpan, concubine);
}
for (const slave of App.SlaveAssignment.reportSlaves(slaves)) {
- const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
+ const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry);
- App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave);
App.Events.addNode(slaveEntry, [nonConcubineText(slave), commonText(slave)]);
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
}
if (pregnantSlaves > 0 && V.arcologies[0].FSRestart !== "unset" && V.propOutcome !== 1 && V.eugenicsFullControl !== 1) {
- const eliteEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
- $(eliteEffects).append(`The Societal Elite know what you are doing with your bedslaves. <span class="red">They do not approve.</span>`);
+ App.Events.addNode(frag, [`The Societal Elite know what you are doing with your bedslaves. <span class="red">They do not approve.</span>`], "p", ["indent"]);
V.failedElite += (5 * pregnantSlaves);
}
if (V.masterSuiteDecoration !== "standard") {
- const decorationEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
- $(decorationEffects).append(`${capFirstChar(V.masterSuiteName)}'s ${V.masterSuiteDecoration} atmosphere <span class="hotpink">has a minor impact on your fucktoys.</span>`);
+ App.Events.addNode(frag, [`${capFirstChar(V.masterSuiteName)}'s ${V.masterSuiteDecoration} atmosphere <span class="hotpink">has a minor impact on your fucktoys.</span>`], "p", ["indent"]);
}
return frag;
diff --git a/src/endWeek/reports/nurseryReport.js b/src/endWeek/reports/nurseryReport.js
index f97a9a47fcdd065ed615e83cdf67db6e19cf30e7..b448ccfe3a4d284c82d15cb7887518f79c7fd317 100644
--- a/src/endWeek/reports/nurseryReport.js
+++ b/src/endWeek/reports/nurseryReport.js
@@ -45,17 +45,16 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
}
function matronText() {
+ const frag = new DocumentFragment();
+
if (S.Matron) {
const {He, he, His, his, him} = getPronouns(S.Matron);
let r = [];
-
- r.push(`${SlaveFullName(S.Matron)} is serving as your Matron.`);
-
if (S.Matron.relationship === -3 && S.Matron.devotion > 50) {
- r.push(`${He} does ${his} best to ${V.nurseryChildren ?
- `properly raise and look after the children in ${V.nurseryName}` :
- `look after ${V.nurseryName} and keep it tidy and running smoothly`}.`);
+ r.push(`${He} does ${his} best to ${V.nurseryChildren
+ ? `properly raise and look after the children in ${V.nurseryName}`
+ : `look after ${V.nurseryName} and keep it tidy and running smoothly`}.`);
}
if (S.Matron.health.condition < 10) {
@@ -74,7 +73,7 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
r.push(`${He} has experience with looking after children from ${his} life before ${he} was a slave.`);
matronBonus += 25;
- } else if (S.Matron.skill.matron >= V.masteredXP) {
+ } else if (S.Matron.skill.matron >= Constant.MASTERED_XP) {
r.push(`${He} has applicable experience with taking care of children from working for you.`);
matronBonus += 25;
@@ -110,18 +109,14 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
r.push(`Society <span class='green'>loves</span> the way you are raising more children for ${arcology.name}.`);
FutureSocieties.Change("Repopulationist", 2);
}
- return r.join(' ');
- }
- }
- const matronEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
+ App.Events.addNode(frag, r);
+ }
- matronChanges();
- $(matronEffects).append(matronText());
+ return frag;
+ }
if (slaves) {
- const intro = App.UI.DOM.appendNewElement("p", frag, '', "indent");
-
let r = [];
r.push(`${slaves.length > 1 ? `There are ${slaves.length} slaves` : `There is one slave`} working in ${V.nurseryName}.</strong>`);
@@ -132,17 +127,18 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
r.push(`Society <span class="green">approves</span> of your assigning slaves to a traditionally feminine role.`);
}
- $(intro).append(r.join(' '));
+ App.Events.addNode(frag, r);
}
if (S.Matron) {
const slave = App.SlaveAssignment.reportSlave(S.Matron);
- if (V.showEWD !== 0) {
- const matronEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
+ matronChanges();
+
+ if (V.showEWD) {
+ const matronEntry = App.UI.DOM.appendNewElement("div", frag, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", matronEntry);
- App.SlaveAssignment.appendSlaveLinks(matronEntry, slave);
- $(matronEntry).append(`<span class="slave-name">${SlaveFullName(slave)}</span> is serving as your Matron.`);
+ App.Events.addNode(matronEntry, [App.SlaveAssignment.saSlaveIntro(slave, `is serving as your Matron.`), matronText()]);
matronEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false));
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
@@ -196,33 +192,21 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
if (V.showEWD) {
const {He} = getPronouns(slave);
- const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
+ const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry);
- App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave);
- $(slaveEntry).append(`<span class="slave-name">${SlaveFullName(slave)}</span> `);
-
- if (slave.choosesOwnAssignment === 2) {
- $(slaveEntry).append(App.SlaveAssignment.choosesOwnJob(slave));
- } else {
- $(slaveEntry).append(`is working out of ${V.nurseryName}.`);
- }
-
- const nannyContent = App.UI.DOM.appendNewElement("div", slaveEntry, '', "indent");
-
- $(nannyContent).append(`${He} ${App.SlaveAssignment.nanny(slave, matronBonus)}`); // FIXME: nanny() takes one argument
+ slaveEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is working out of ${V.nurseryName}.`));
+ App.Events.addNode(slaveEntry, [He, App.SlaveAssignment.nanny(slave)], "div", ["indent"]);
slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false));
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else { // silently discard return values
- App.SlaveAssignment.nanny(slave, matronBonus); // FIXME: nanny() takes one argument
+ App.SlaveAssignment.nanny(slave);
App.SlaveAssignment.standardSlaveReport(slave, true);
}
}
if (V.nurseryDecoration !== "standard") {
- const decorationEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
-
- $(decorationEffects).append(`${capFirstChar(V.nurseryName)}'s ${V.nurseryDecoration} atmosphere <span class="devotion inc">has a minor impact on your servants.</span>`);
+ App.Events.addNode(frag, [`${capFirstChar(V.nurseryName)}'s ${V.nurseryDecoration} atmosphere <span class="devotion inc">has a minor impact on your servants.</span>`]);
}
return frag;
diff --git a/src/endWeek/reports/penthouseReport.js b/src/endWeek/reports/penthouseReport.js
index 61def6f566f0b30de55a8690240bfc14a89a2cd5..4f3086c0076c7e957e46dd76a44413a4adccab49 100644
--- a/src/endWeek/reports/penthouseReport.js
+++ b/src/endWeek/reports/penthouseReport.js
@@ -18,31 +18,27 @@ App.EndWeek.penthouseReport = function() {
}
for (const slave of App.SlaveAssignment.reportSlaves(penthouseSlaves)) {
- const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
+ const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', ["slave-report"]);
if (penthouseArtRenderer) {
App.UI.DOM.drawOneSlaveRight(slaveEntry, slave, penthouseArtRenderer);
}
- App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave);
slaveEntry.append(fullReport(slave));
if (slave.ID === V.HeadGirlID && hgSlave) {
/* Output the HG's slave immediately after the hg */
- const {He2, he2} = getPronouns(hgSlave).appendSuffix("2");
+ const {He2} = getPronouns(hgSlave).appendSuffix("2");
const hgSlaveEntry = App.UI.DOM.appendNewElement("div", el, '', ["slave-report"]);
- if (hgSlave.assignment !== Job.HEADGIRLSUITE) {
- App.UI.DOM.appendNewElement("span", hgSlaveEntry, `${hgSlave.slaveName} had been assigned to live with your Head Girl, but this week ${he2} was assigned to ${hgSlave.assignment}. ${He2} has been released to your penthouse for reassignment.`, ["warning"]);
- removeJob(hgSlave, Job.HEADGIRLSUITE);
- } else {
- if (penthouseArtRenderer) {
- App.UI.DOM.drawOneSlaveRight(hgSlaveEntry, hgSlave, penthouseArtRenderer);
- }
- App.SlaveAssignment.appendSlaveLinks(hgSlaveEntry, hgSlave);
- App.UI.DOM.appendNewElement("span", hgSlaveEntry, SlaveFullName(hgSlave), ["slave-name"]);
- if (hgSlave.choosesOwnAssignment === 2) {
- hgSlaveEntry.append(App.SlaveAssignment.choosesOwnJob(hgSlave), ` ${He2}`);
- }
- hgSlaveEntry.append(` `, App.SlaveAssignment.liveWithHG(hgSlave));
+ const r = [];
+ if (penthouseArtRenderer) {
+ App.UI.DOM.drawOneSlaveRight(hgSlaveEntry, hgSlave, penthouseArtRenderer);
}
+ r.push(App.SlaveAssignment.saSlaveIntro(hgSlave, ''));
+ if (hgSlave.choosesOwnAssignment) {
+ r.push(He2); // starts new sentence
+ }
+ r.push(App.SlaveAssignment.liveWithHG(hgSlave));
+
+ App.Events.addNode(hgSlaveEntry, r);
}
}
@@ -66,10 +62,9 @@ App.EndWeek.penthouseReport = function() {
let r = [];
let milkResults;
- r.push(App.UI.DOM.makeElement("span", SlaveFullName(slave), ["slave-name"]));
- if (slave.choosesOwnAssignment === 2) {
- r.push(App.SlaveAssignment.choosesOwnJob(slave));
- r.push(He);
+ r.push(App.SlaveAssignment.saSlaveIntro(slave, ''));
+ if (slave.choosesOwnAssignment) {
+ r.push(He); // starts new sentence
}
switch (slave.assignment) {
@@ -153,7 +148,11 @@ App.EndWeek.penthouseReport = function() {
}
App.Events.addNode(el, r);
+ const partTime = App.SlaveAssignment.PartTime.saPartTime(slave);
if (V.showEWD !== 0) {
+ if (partTime.length > 0) {
+ App.Events.addNode(el, partTime, "div", "indent");
+ }
r = [];
if (slave.minorInjury !== 0) {
r.push(`${His} ${slave.minorInjury} will heal by the end of the week.`);
@@ -191,6 +190,8 @@ App.EndWeek.penthouseReport = function() {
} = getPronouns(S.HeadGirl);
const {he2, His2, his2, him2, himself2, girl2} = getPronouns(slave).appendSuffix("2");
let r = [];
+ const popup = App.UI.DOM.slaveDescriptionDialog(slave, SlaveFullName(S.HeadGirl));
+ popup.classList.add("slave-name", "bold");
slave.training = Math.clamp(slave.training, 0, 150);
let effectiveness = S.HeadGirl.actualAge + ((S.HeadGirl.intelligence + S.HeadGirl.intelligenceImplant) / 3) - (S.HeadGirl.accent * 5) + (V.HGSeverity * 10) + ((slave.intelligence + slave.intelligenceImplant) / 4) - (slave.accent * 5);
@@ -204,7 +205,7 @@ App.EndWeek.penthouseReport = function() {
slave.health.tired += 25;
}
- r.push(`<span style="font-weight: bold">Your Head Girl</span> <span class='slave-name'>${S.HeadGirl.slaveName}</span> notices that <span class='slave-name'>${slave.slaveName}</span>`);
+ r.push(`<span style="font-weight: bold">Your Head Girl</span>`, popup, ` notices that <span class='slave-name'>${slave.slaveName}</span>`);
switch (headGirlsTraining) {
case "health":
r.push(`is unwell.`);
@@ -249,7 +250,7 @@ App.EndWeek.penthouseReport = function() {
} else if (App.Data.Careers.Leader.HG.includes(S.HeadGirl.career)) {
r.push(`${He} was used to giving commands and being obeyed in ${his} life before ${he} was a slave, experience ${he} can call on now.`);
effectiveness += 5;
- } else if (S.HeadGirl.skill.headGirl >= V.masteredXP) {
+ } else if (S.HeadGirl.skill.headGirl >= Constant.MASTERED_XP) {
r.push(`${He} is used to giving commands and being obeyed through experience, rendering ${him} very effective.`);
effectiveness += 5;
} else if (S.HeadGirl.skill.headGirl > 120) {
@@ -646,7 +647,7 @@ App.EndWeek.penthouseReport = function() {
/** @type {FC.HeadGirlTrainee[][]} */
const HGPossibleSlaves = [[], [], [], [], [], []];
for (const slave of penthouseSlaves) {
- if (slave.fuckdoll === 1 || slave.ID === V.BodyguardID || slave.ID === V.HeadGirlID || slave.fetish === "mindbroken") {
+ if (slave.fuckdoll === 1 || slave.ID === V.BodyguardID || slave.ID === V.HeadGirlID || slave.fetish === Fetish.MINDBROKEN) {
continue;
} else if (V.personalAttention.task === PersonalAttention.TRAINING && V.personalAttention.slaves.some(p => p.ID === slave.ID)) {
continue;
diff --git a/src/endWeek/reports/personalAttention.js b/src/endWeek/reports/personalAttention.js
index cf2cf452a4d2c150944527e7ecd1baa751e34df7..e720f56e42b9871e9d754d9f488a1e01801c1ba5 100644
--- a/src/endWeek/reports/personalAttention.js
+++ b/src/endWeek/reports/personalAttention.js
@@ -20,7 +20,7 @@ App.PersonalAttention.slaveReport = function(slave) {
const {womenP} = getPronouns(V.PC).appendSuffix("P");
let r = [];
- if (V.PC.health.shortDamage >= 30) {
+ if (onBedRest(V.PC, true) && V.PC.dick < -4000) { // Impossible condition to prevent scope creep. Need to finish this later, not right now.
// too badly injured to train this week
r.push(`You planned to ${pa.objective === "health" ? "care for" : "train"}`);
r.push(App.UI.DOM.makeElement("span", slave.slaveName, ["slave-name"]));
@@ -51,7 +51,7 @@ App.PersonalAttention.slaveReport = function(slave) {
switch (pa.objective) {
case "build devotion":
slave.devotion += 6;
- if (slave.fetishKnown === 1 && slave.fetishStrength > 60 && slave.fetish === "submissive") {
+ if (slave.fetishKnown === 1 && slave.fetishStrength > 60 && slave.fetish === Fetish.SUBMISSIVE) {
r.push(`Since ${slave.slaveName} is a submissive, you`);
r.push(App.UI.DOM.makeElement("span", `build ${his} devotion to you`, ["hotpink"]));
r.push(`by indulging ${his} need to be dominated. Already smiling to ${himself}, ${he} changes into bondage gear that`);
@@ -228,7 +228,7 @@ App.PersonalAttention.slaveReport = function(slave) {
slave.training = 0;
break;
case "health":
- if (slave.relationship === -3 && slave.fetish === "mindbroken") {
+ if (slave.relationship === -3 && slave.fetish === Fetish.MINDBROKEN) {
r.push(`Since ${slave.slaveName} is your ${wife} and not all there, you keep ${him} under a watchful eye to make sure no harm comes to the broken ${girl}. ${He} almost seems in better spirits under your care, not that it will matter in an hour or two.`);
if (slave.kindness) {
slave.kindness++;
@@ -317,28 +317,28 @@ App.PersonalAttention.slaveReport = function(slave) {
} else {
slave.training = 0;
r.push(`By the end of the week,`);
- r.push(App.UI.DOM.makeElement("span", `you resolve ${his} flaw into something special.`, "green"));
+ r.push(App.UI.DOM.makeElement("span", `you resolve ${his} flaw into something special.`, ["green"]));
r.push(App.UI.DOM.makeElement("span", `${His} obedience has increased.`, ["hotpink"]));
SoftenBehavioralFlaw(slave);
slave.devotion += 4;
}
if (slave.fetishKnown !== 1) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He} really takes to your close attention;`);
- r.push(App.UI.DOM.makeElement("span", `${he}'s a natural submissive!`, "pink"));
- (slave.fetishKnown = 1);
+ r.push(App.UI.DOM.makeElement("span", `${he}'s a natural submissive!`, ["pink"]));
+ slave.fetishKnown = 1;
} else if (slave.fetish === "cumslut") {
r.push(`While you're giving ${him} personal attention, you discover by chance that`);
- r.push(App.UI.DOM.makeElement("span", `${he} has an oral fixation!`, "pink"));
- (slave.fetishKnown = 1);
+ r.push(App.UI.DOM.makeElement("span", `${he} has an oral fixation!`, ["pink"]));
+ slave.fetishKnown = 1;
} else if (slave.fetish === "masochist") {
r.push(`While you're giving ${him} personal correction, you discover by chance that`);
- r.push(App.UI.DOM.makeElement("span", `${he} likes pain!`, "pink"));
- (slave.fetishKnown = 1);
+ r.push(App.UI.DOM.makeElement("span", `${he} likes pain!`, ["pink"]));
+ slave.fetishKnown = 1;
} else if (slave.fetish === "humiliation") {
r.push(`While you're giving ${him} personal attention in public, you discover by chance that`);
- r.push(App.UI.DOM.makeElement("span", `${he} likes humiliation!`, "pink"));
- (slave.fetishKnown = 1);
+ r.push(App.UI.DOM.makeElement("span", `${he} likes humiliation!`, ["pink"]));
+ slave.fetishKnown = 1;
}
}
if (slave.behavioralFlaw === "none") {
@@ -417,7 +417,7 @@ App.PersonalAttention.slaveReport = function(slave) {
break;
case "judgemental":
r.push(`has a bad habit of being sexually judgemental, belittling anyone who doesn't live up to ${his} pretensions of standards. You do your best to train ${him} to perform regardless of ${his} partners' endowments, aiming for a delicate balance that will allow ${him} to get off with anyone while permitting ${him} to retain and even build on ${his} appetite for big dicks. You permit ${him} to achieve release only when ${he}'s done well with`);
- if (V.PC.dick !== 0) {
+ if (V.PC.dick > 3) {
r.push(`your thick cock`);
} else {
r.push(`a fat dildo`);
@@ -474,27 +474,27 @@ App.PersonalAttention.slaveReport = function(slave) {
} else {
slave.training = 0;
r.push(`By the end of the week,`);
- r.push(App.UI.DOM.makeElement("span", `you resolve ${his} flaw into something special.`, "green"));
+ r.push(App.UI.DOM.makeElement("span", `you resolve ${his} flaw into something special.`, ["green"]));
r.push(App.UI.DOM.makeElement("span", `${His} obedience has increased.`, ["hotpink"]));
SoftenSexualFlaw(slave);
slave.devotion += 4;
}
if (slave.fetishKnown !== 1) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He} really takes to your close attention;`);
- r.push(App.UI.DOM.makeElement("span", `${he}'s a natural submissive!`, "pink"));
+ r.push(App.UI.DOM.makeElement("span", `${he}'s a natural submissive!`, ["pink"]));
slave.fetishKnown = 1;
} else if (slave.fetish === "cumslut") {
r.push(`While you're giving ${him} personal attention, you discover by chance that`);
- r.push(App.UI.DOM.makeElement("span", `${he} has an oral fixation!`, "pink"));
+ r.push(App.UI.DOM.makeElement("span", `${he} has an oral fixation!`, ["pink"]));
slave.fetishKnown = 1;
} else if (slave.fetish === "masochist") {
r.push(`While you're giving ${him} personal correction, you discover by chance that`);
- r.push(App.UI.DOM.makeElement("span", `${he} likes pain!`, "pink"));
+ r.push(App.UI.DOM.makeElement("span", `${he} likes pain!`, ["pink"]));
slave.fetishKnown = 1;
} else if (slave.fetish === "humiliation") {
r.push(`While you're giving ${him} personal attention in public, you discover by chance that`);
- r.push(App.UI.DOM.makeElement("span", `${he} likes humiliation!`, "pink"));
+ r.push(App.UI.DOM.makeElement("span", `${he} likes humiliation!`, ["pink"]));
slave.fetishKnown = 1;
}
}
@@ -875,7 +875,7 @@ App.PersonalAttention.slaveReport = function(slave) {
slave.devotion -= 5;
slave.trust -= 10;
healthDamage(slave, 1);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
slave.minorInjury = either("black eye", "bruise", "split lip");
r.push(`${slave.slaveName}'s mind is broken. ${He} is a boring slave to torture, though ${his} body will still occasionally react to intense pain. No matter what you try, nothing really reaches ${his} destroyed soul. The agonies do`);
r.push(App.UI.DOM.makeElement("span", `affect ${his} health, leaving ${him} with a ${slave.minorInjury}.`, ["health", "dec"]));
@@ -958,7 +958,7 @@ App.PersonalAttention.slaveReport = function(slave) {
slave.health.tired = 120;
}
}
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
seed = random(1, 100);
if (seed > 90) {
r.push(`This abuse has shattered ${his} already-fragile self;`);
@@ -1057,7 +1057,7 @@ App.PersonalAttention.slaveReport = function(slave) {
slave.devotion += 4;
}
if (slave.fetishKnown !== 1) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He} really takes to your close attention;`);
r.push(App.UI.DOM.makeElement("span", `${he}'s a natural submissive!`, "pink"));
(slave.fetishKnown = 1);
@@ -1296,7 +1296,7 @@ App.PersonalAttention.slaveReport = function(slave) {
slave.devotion += 4;
}
if (slave.fetishKnown !== 1) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He} really takes to your close attention;`);
r.push(App.UI.DOM.makeElement("span", `${he}'s a natural submissive!`, "pink"));
(slave.fetishKnown = 1);
@@ -1405,7 +1405,7 @@ App.PersonalAttention.slaveReport = function(slave) {
r.push(`Nothing unusual happens.`);
}
r.push(`Next, you demand extreme submission from ${him}. You make ${him} change into bondage gear that blinds ${him}, restricts ${his} movement, forces ${him} to present ${his} breasts uncomfortably, and holds vibrators against ${him}. Thus attired, ${he} is forced to serve you in whatever petty ways occur to you.`);
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`During the first hour of this treatment, ${he} cums hard against the vibrators. ${He}'s a natural submissive! Discovering this about ${himself} under your hands has`);
r.push(App.UI.DOM.makeElement("span", `increased ${his} devotion to you.`, ["hotpink"]));
slave.devotion += 4;
@@ -1506,7 +1506,7 @@ App.PersonalAttention.slaveReport = function(slave) {
r.push(`is a`);
r.push(App.UI.DOM.makeElement("span", `${slave.fetish},`, "coral"));
break;
- case "mindbroken":
+ case Fetish.MINDBROKEN:
r.push(`is`);
r.push(App.UI.DOM.makeElement("span", `mindbroken,`, "red"));
break;
diff --git a/src/endWeek/reports/schoolroomReport.js b/src/endWeek/reports/schoolroomReport.js
index dc32b6e563a82e0a08ebb78185f1b9891afd3266..2c992bfef93ac578ac3a5cb16285be93983f1c8d 100644
--- a/src/endWeek/reports/schoolroomReport.js
+++ b/src/endWeek/reports/schoolroomReport.js
@@ -1,11 +1,13 @@
App.EndWeek.schoolroomReport = function() {
- let frag = document.createDocumentFragment();
+ const frag = new DocumentFragment();
const slaves = App.Utils.sortedEmployees(App.Entity.facilities.schoolroom);
const devBonus = (V.schoolroomDecoration !== "standard") ? 1 : 0;
App.EndWeek.saVars.flSex = App.EndWeek.getFLSex(App.Entity.facilities.schoolroom);
function schoolteacherText() {
+ const frag = new DocumentFragment();
+
let r = [];
let FLsFetish = 0;
let idleBonus = 0;
@@ -51,7 +53,6 @@ App.EndWeek.schoolroomReport = function() {
}
const {He, he, His, his, him, himself, wife} = getPronouns(S.Schoolteacher);
- r.push(`${SlaveFullName(S.Schoolteacher)} is serving as your Schoolteacher.`);
if (S.Schoolteacher.relationship === -3 && S.Schoolteacher.devotion > 50) {
r.push(`As your loving ${wife}, ${he} tries ${his} best to teach ${his} pupils how to please you.`);
}
@@ -63,7 +64,7 @@ App.EndWeek.schoolroomReport = function() {
if (App.Data.Careers.Leader.schoolteacher.includes(S.Schoolteacher.career)) {
r.push(`${He} has experience with students and learning from ${his} life before ${he} was a slave, making ${him} more effective.`);
idleBonus++;
- } else if (S.Schoolteacher.skill.teacher >= V.masteredXP) {
+ } else if (S.Schoolteacher.skill.teacher >= Constant.MASTERED_XP) {
r.push(`${He} has experience with students and learning from working for you, making ${him} more effective.`);
idleBonus++;
} else {
@@ -123,27 +124,33 @@ App.EndWeek.schoolroomReport = function() {
slave.trust++;
}
}
+ const pMod = App.SlaveAssignment.PartTime.efficiencyModifier(S.Schoolteacher);
+ idleBonus *= pMod;
+ if (pMod < 1) {
+ r.push(`Some part of ${his} day is taken up by ${his} part-time job, making ${him} less effective.`);
+ }
if (slaves.length < V.schoolroom && !slaveResting(S.Schoolteacher)) {
- const idlePay = jsRandom(1, 10) + ((V.schoolroom - slaves.length) * (jsRandom(150, 170) + (idleBonus * 10)));
+ const idlePay = Math.ceil(jsRandom(1, 10) + ((V.schoolroom - slaves.length) * (jsRandom(150, 170) + (idleBonus * 10))));
cashX(idlePay, "school", S.Schoolteacher);
r.push(`<div class="indent">Since ${he} doesn't have enough students to occupy all of ${his} time, ${V.schoolroomName} takes in citizens' slaves on a contract basis and ${he} teaches them too, earning <span class="yellowgreen">${cashFormat(idlePay)}.</span></div>`);
}
- return r.join(" ");
+ App.Events.addNode(frag, r);
}
- }
- const schoolteacherEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
- $(schoolteacherEffects).append(schoolteacherText());
+ return frag;
+ }
if (slaves.length > 0) {
- const intro = App.UI.DOM.appendNewElement("p", frag, '', "indent");
+ const intro = App.UI.DOM.appendNewElement("p", frag, '', ["indent"]);
+ const r = [];
if (slaves.length > 1) {
- $(intro).append(`<strong>There are ${slaves.length} slaves studying in ${V.schoolroomName}.</strong>`);
+ r.push(`<strong>There are ${slaves.length} slaves studying in ${V.schoolroomName}.</strong>`);
} else {
- $(intro).append(`<strong>There is one slave studying in ${V.schoolroomName}.</strong>`);
+ r.push(`<strong>There is one slave studying in ${V.schoolroomName}.</strong>`);
}
+ App.Events.addNode(intro, r);
}
if (S.Schoolteacher) {
@@ -153,8 +160,8 @@ App.EndWeek.schoolroomReport = function() {
if (V.showEWD !== 0) {
const schoolteacherEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
const artSpan = App.UI.DOM.appendNewElement("span", schoolteacherEntry);
- App.SlaveAssignment.appendSlaveLinks(schoolteacherEntry, slave);
- $(schoolteacherEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> is serving as your Schoolteacher.`);
+ schoolteacherEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is serving as your Schoolteacher.`));
+ App.Events.addNode(schoolteacherEntry, [schoolteacherText()], "div", ["indent"]);
schoolteacherEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false));
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
@@ -178,7 +185,7 @@ App.EndWeek.schoolroomReport = function() {
slave.rules.living = "normal";
}
/* Education done? Has to be here before we run the standard slave report or there will be double entries for slave */
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.assignmentRecords[slave.ID]) {
assignJobSafely(slave, V.assignmentRecords[slave.ID]);
} else {
@@ -225,52 +232,47 @@ App.EndWeek.schoolroomReport = function() {
}
r.push(`</span>`);
restedSlaves++;
- $(reassignment).append(r.join(" "));
+ App.Events.addNode(reassignment, r);
continue;
}
- if (V.showEWD !== 0) {
+ if (V.showEWD) {
const {He} = getPronouns(slave);
const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry);
- App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave);
- $(slaveEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> `);
- if (slave.choosesOwnAssignment === 2) {
- $(slaveEntry).append(App.SlaveAssignment.choosesOwnJob(slave));
- } else {
- let leaderTraining = '';
- for (const role of Object.keys(V.slaveTutor)) {
- if (V.slaveTutor[role].contains(slave.ID)) {
- leaderTraining = ` on being a ${role}`; break;
- }
+ let leaderTraining = '';
+ for (const role of Object.keys(V.slaveTutor)) {
+ if (V.slaveTutor[role].includes(slave.ID)) {
+ leaderTraining = ` on being a ${role}`; break;
}
- $(slaveEntry).append(`is studying in ${V.schoolroomName}${leaderTraining}.`);
}
- const studentContent = App.UI.DOM.appendNewElement("div", slaveEntry, '', "indent");
- $(studentContent).append(`${He} ${App.SlaveAssignment.takeClasses(slave)}`);
+ slaveEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is studying in ${V.schoolroomName}${leaderTraining}.`));
+
+ App.Events.addNode(slaveEntry, [He, App.SlaveAssignment.takeClasses(slave)], "div", ["indent"]);
slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false));
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
// discard return values silently
- App.SlaveAssignment.choosesOwnJob(slave);
App.SlaveAssignment.takeClasses(slave);
App.SlaveAssignment.standardSlaveReport(slave, true);
}
}
if (restedSlaves > 0) {
- const rested = App.UI.DOM.appendNewElement("p", frag, '', "indent");
- rested.append((restedSlaves === 1) ? `One slave has ` : `${restedSlaves} slaves have `);
- App.UI.DOM.appendNewElement("span", rested, "learned", "green");
- rested.append(` all they can, and will be released from the schoolroom before the end of the week.`);
+ const r = [];
+ r.push((restedSlaves === 1) ? `One slave has ` : `${restedSlaves} slaves have`);
+ r.push(App.UI.DOM.makeElement("span", "learned", ["green"]));
+ r.push(`all they can, and will be released from the schoolroom before the end of the week.`);
+ App.Events.addNode(frag, r, "p", ["indent"]);
}
if (V.schoolroomDecoration !== "standard") {
- const decorationEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
- $(decorationEffects).append(`${capFirstChar(V.schoolroomName)}'s ${V.schoolroomDecoration} atmosphere <span class="hotpink">has a minor impact on the students.</span>`);
+ const r = [];
+ r.push(`${capFirstChar(V.schoolroomName)}'s ${V.schoolroomDecoration} atmosphere <span class="hotpink">has a minor impact on the students.</span>`);
if (App.Entity.facilities.schoolroom.revivalistLanguageDecorationBonus()) {
- $(decorationEffects).append(` They also <span class="positive">learn ${V.language} more quickly</span> in this environment.`);
+ r.push(`They also <span class="positive">learn ${V.language} more quickly</span> in this environment.`);
}
+ App.Events.addNode(frag, r, "p", ["indent"]);
}
return frag;
diff --git a/src/endWeek/reports/servantsQuartersReport.js b/src/endWeek/reports/servantsQuartersReport.js
index ea2c9eb26adc5e7483aa860de57fc103d52a9098..ab81126f41577a82535d80bbbe0212a5c5624817 100644
--- a/src/endWeek/reports/servantsQuartersReport.js
+++ b/src/endWeek/reports/servantsQuartersReport.js
@@ -1,11 +1,13 @@
App.EndWeek.servantsQuartersReport = function() {
- let frag = document.createDocumentFragment();
+ const frag = new DocumentFragment();
const slaves = App.Utils.sortedEmployees(App.Entity.facilities.servantsQuarters);
const devBonus = (V.servantsQuartersDecoration !== "standard") ? 1 : 0;
let stewardessBonus = 0;
function stewardessText() {
+ const frag = new DocumentFragment();
+
let r = [];
let FLsFetish = 0;
let stewardessImpregnated = 0;
@@ -52,7 +54,6 @@ App.EndWeek.servantsQuartersReport = function() {
}
const {He, he, His, his, him, wife} = getPronouns(S.Stewardess);
- r.push(`${SlaveFullName(S.Stewardess)} is serving as your Stewardess.`);
if (S.Stewardess.relationship === -3 && S.Stewardess.devotion > 50) {
r.push(`${He} does ${his} best to be your perfect lovely house${wife}.`);
}
@@ -118,7 +119,7 @@ App.EndWeek.servantsQuartersReport = function() {
if (App.Data.Careers.Leader.stewardess.includes(S.Stewardess.career)) {
stewardessBonus += 25;
r.push(`${He} has applicable experience with daily sums and organizational trifles from ${his} life before ${he} was a slave.`);
- } else if (S.Stewardess.skill.stewardess >= V.masteredXP) {
+ } else if (S.Stewardess.skill.stewardess >= Constant.MASTERED_XP) {
stewardessBonus += 25;
r.push(`${He} has applicable experience with daily sums and organizational trifles from working for you.`);
} else if (S.Stewardess.skill.stewardess > 120) {
@@ -131,7 +132,7 @@ App.EndWeek.servantsQuartersReport = function() {
stewardessBonus += 5;
r.push(`${He} understands the basics of what it takes to keep your penthouse operational.`);
}
- if (S.Stewardess.skill.stewardess < V.masteredXP) {
+ if (S.Stewardess.skill.stewardess < Constant.MASTERED_XP) {
const skillIncrease = jsRandom(1, Math.ceil((S.Stewardess.intelligence + S.Stewardess.intelligenceImplant) / 15) + 8);
r.push(slaveSkillIncrease('stewardess', S.Stewardess, skillIncrease));
}
@@ -139,13 +140,19 @@ App.EndWeek.servantsQuartersReport = function() {
stewardessBonus += 25;
r.push(`${His} age and experience give ${him} added effectiveness.`);
} else if (V.AgePenalty === 0) {
- stewardessBonus +=25;
+ stewardessBonus += 25;
}
if (S.Stewardess.intelligence + S.Stewardess.intelligenceImplant > 15) {
stewardessBonus += S.Stewardess.intelligence + S.Stewardess.intelligenceImplant;
r.push(`${He}'s smart enough that ${he} misses very little.`);
}
stewardessBonus *= restEffects(S.Stewardess);
+ const pMod = App.SlaveAssignment.PartTime.efficiencyModifier(S.Stewardess);
+ stewardessBonus *= pMod;
+ if (pMod < 1) {
+ r.push(`Some part of ${his} day is taken up by ${his} part-time job, making ${him} less effective.`);
+ }
+
const bonusToggle = S.Stewardess.energy > 95 || (S.Stewardess.fetishKnown === 1 && S.Stewardess.fetish === "dom");
for (const slave of slaves) {
const {he2, him2, his2} = getPronouns(slave).appendSuffix('2');
@@ -215,35 +222,35 @@ App.EndWeek.servantsQuartersReport = function() {
r.push(`<br>The Societal Elite know you've ordered ${S.Stewardess.slaveName} to impregnate your maids. <span class="red">They are not amused by your disinterest in eugenics.</span>`);
V.failedElite += 10;
}
+ App.Events.addNode(frag, r);
}
- return r.join(' ');
+ return frag;
}
const stewardessEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
$(stewardessEffects).append(stewardessText());
if (slaves.length > 0) {
- const intro = App.UI.DOM.appendNewElement("p", frag, '', "indent");
let r = [];
if (slaves.length > 1) {
- r.push(`<strong>There are ${slaves.length} slaves working out of the servants' quarters.</strong> They work to`);
+ r.push(`<strong>There are ${num(slaves.length)} slaves working out of the servants' quarters.</strong> They work to`);
} else {
const {He} = getPronouns(slaves[0]);
- r.push(`<strong>There is one slave working out of the servants' quarters.</strong> ${He} works to`);
+ r.push(`<strong>There is ${num(1)} slave working out of the servants' quarters.</strong> ${He} works to`);
}
r.push(`<span class="yellowgreen">reduce</span> your household expenses; having a well-staffed house slightly <span class="green">increases</span> your reputation.`);
- $(intro).append(r.join(' '));
+ App.Events.addNode(frag, r);
}
if (S.Stewardess) {
const slave = App.SlaveAssignment.reportSlave(S.Stewardess);
tired(slave);
/* apply following SA passages to facility leader */
- if (V.showEWD !== 0) {
+ if (V.showEWD) {
const stewardessEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
const artSpan = App.UI.DOM.appendNewElement("span", stewardessEntry);
- App.SlaveAssignment.appendSlaveLinks(stewardessEntry, slave);
- $(stewardessEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> is serving as your Stewardess.`);
+ stewardessEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is serving as your Stewardess.`));
+ App.Events.addNode(stewardessEntry, [stewardessText()], "div", ["indent"])
stewardessEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false));
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
@@ -312,23 +319,15 @@ App.EndWeek.servantsQuartersReport = function() {
slave.rules.living = "normal";
}
- if (V.showEWD !== 0) {
+ if (V.showEWD) {
const {He} = getPronouns(slave);
- const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
+ const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry);
- App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave);
- $(slaveEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> `);
- if (slave.choosesOwnAssignment === 2) {
- $(slaveEntry).append(App.SlaveAssignment.choosesOwnJob(slave));
- } else {
- $(slaveEntry).append(`is working out of ${V.servantsQuartersName}.`);
- }
- const servantContent = App.UI.DOM.appendNewElement("div", slaveEntry, '', "indent");
- $(servantContent).append(`${He} ${App.SlaveAssignment.servant(slave, stewardessBonus)}`);
+ slaveEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is working out of ${V.servantsQuartersName}.`));
+ App.Events.addNode(slaveEntry, [He, App.SlaveAssignment.servant(slave, stewardessBonus)], "div", ["indent"]);
if (V.servantMilkers === 1 && slave.lactation > 0) {
- const milkContent = App.UI.DOM.appendNewElement("div", slaveEntry, '', "indent");
const milkResults = App.SlaveAssignment.getMilked(slave, 0.5);
- $(milkContent).append(`${He} ${milkResults.text}`);
+ App.Events.addNode(slaveEntry, [He, milkResults.text], "div", ["indent"]);
SQMilk += milkResults.milk;
SQMilkSale += milkResults.milkSale;
}
@@ -336,7 +335,6 @@ App.EndWeek.servantsQuartersReport = function() {
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
// discard return values silently
- App.SlaveAssignment.choosesOwnJob(slave);
App.SlaveAssignment.servant(slave, stewardessBonus);
if (V.servantMilkers === 1 && slave.lactation > 0) {
const milkResults = App.SlaveAssignment.getMilked(slave, 0.5);
@@ -349,12 +347,12 @@ App.EndWeek.servantsQuartersReport = function() {
if (SQMilk > 0) {
const milkEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
- $(milkEffects).append(`Since your lactating servants spend most of their time working in the penthouse, they use the milkers there, giving ${SQMilk} liters of milk over the week, which is sold for <span class="yellowgreen">${cashFormat(SQMilkSale)}.</span>`);
+ App.Events.addNode(milkEffects, [`Since your lactating servants spend most of their time working in the penthouse, they use the milkers there, giving ${SQMilk} liters of milk over the week, which is sold for <span class="yellowgreen">${cashFormat(SQMilkSale)}.</span>`]);
}
if (V.servantsQuartersDecoration !== "standard") {
const decorationEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
- $(decorationEffects).append(`${capFirstChar(V.servantsQuartersName)}'s ${V.servantsQuartersDecoration} atmosphere <span class="hotpink">has a minor impact on your servants.</span>`);
+ App.Events.addNode(decorationEffects, [`${capFirstChar(V.servantsQuartersName)}'s ${V.servantsQuartersDecoration} atmosphere <span class="hotpink">has a minor impact on your servants.</span>`]);
}
repX(slaves.length * 20, "servantsQuarters");
diff --git a/src/endWeek/reports/spaReport.js b/src/endWeek/reports/spaReport.js
index 78c93a24f1a4f42f0c1146aa31c2aeef68849156..e98640a80dad5a6504c53b7be419a0ff71ac3585 100644
--- a/src/endWeek/reports/spaReport.js
+++ b/src/endWeek/reports/spaReport.js
@@ -32,7 +32,7 @@ App.EndWeek.spaReport = function() {
S.Attendant.rules.living = "luxurious";
}
if (S.Attendant.fetishStrength <= 95) {
- if (S.Attendant.fetish !== "submissive") {
+ if (S.Attendant.fetish !== Fetish.SUBMISSIVE) {
if (fetishChangeChance(S.Attendant) > random(0, 100)) {
FLsFetish = 1;
S.Attendant.fetishKnown = 1;
@@ -47,7 +47,7 @@ App.EndWeek.spaReport = function() {
S.Attendant.fetishStrength += 4;
}
}
- if (S.Attendant.fetish === "none" || S.Attendant.fetish === "submissive") {
+ if (S.Attendant.fetish === Fetish.NONE || S.Attendant.fetish === Fetish.SUBMISSIVE) {
devBonus++;
}
S.Attendant.devotion += devBonus;
@@ -55,7 +55,9 @@ App.EndWeek.spaReport = function() {
He, His,
he, his, him, himself, wife
} = getPronouns(S.Attendant);
- r.push(`${SlaveFullName(S.Attendant)} is serving as the spa attendant.`);
+ const popup = App.UI.DOM.slaveDescriptionDialog(S.Attendant, SlaveFullName(S.Attendant));
+ popup.classList.add("slave-name", "bold");
+ r.push(popup, `is serving as the spa attendant.`);
if (S.Attendant.relationship === -3 && S.Attendant.devotion > 50) {
r.push(`${He} tries ${his} best to be your perfect attentive, caring and loving ${wife}.`);
}
@@ -68,7 +70,7 @@ App.EndWeek.spaReport = function() {
r.push(`${He} has experience with counseling from ${his} life before ${he} was a slave, making ${him} better at building rapport with troubled slaves, and giving ${him} a better chance of softening flaws into beneficial quirks.`);
bonusToggle = 1;
idleBonus++;
- } else if (S.Attendant.skill.attendant >= V.masteredXP) {
+ } else if (S.Attendant.skill.attendant >= Constant.MASTERED_XP) {
r.push(`${He} has experience with counseling from working for you, making ${him} better at building rapport with troubled slaves, and giving ${him} a better chance of softening flaws into beneficial quirks.`);
bonusToggle = 1;
idleBonus++;
@@ -80,10 +82,10 @@ App.EndWeek.spaReport = function() {
r.push(`${His} blindness allows ${him} to deeply connect with ${his} charges.`);
idleBonus++;
}
- if (S.Attendant.fetish === "none") {
+ if (S.Attendant.fetish === Fetish.NONE) {
r.push(`${S.Attendant.slaveName} respects the slaves lounging in the spa, allowing them to relax completely.`);
idleBonus++;
- } else if (S.Attendant.fetish === "submissive") {
+ } else if (S.Attendant.fetish === Fetish.SUBMISSIVE) {
r.push(`${S.Attendant.slaveName} lets the slaves resting in the spa take the lead sexually, doing ${his} best to please them.`);
idleBonus++;
} else if (S.Attendant.fetishKnown === 1) {
@@ -105,11 +107,11 @@ App.EndWeek.spaReport = function() {
}
let attendantUsedCure = false;
App.Events.addNode(el, r, "div", "indent");
+ r = [];
const softenFlawBonus = bonusToggle ? 10 : 0;
for (const slave of slaves) {
const {he2, his2, him2} = getPronouns(slave).appendSuffix("2");
- r = [];
- if (slave.fetish === "mindbroken" && slave.health.condition > 20 && !attendantUsedCure && V.spaFix !== 2) {
+ if (slave.fetish === Fetish.MINDBROKEN && slave.health.condition > 20 && !attendantUsedCure && V.spaFix !== 2) {
attendantUsedCure = true;
if (random(1, 100) > 90 - S.Attendant.devotion) {
const curedSlave = App.UI.DOM.makeElement("div", null, "indent");
@@ -175,7 +177,7 @@ App.EndWeek.spaReport = function() {
S.Attendant.fetishStrength += 4;
} else {
r.push(`${He} does ${his} best to accommodate ${slave.slaveName}'s massive genitals and tends to ${him2} whenever ${he2} feels a need for release.`);
- if (random(1, 100) > 65 && S.Attendant.fetish === "none") {
+ if (random(1, 100) > 65 && S.Attendant.fetish === Fetish.NONE) {
r.push(`After taking several massive loads to the face, ${S.Attendant.slaveName} begins to find satisfaction in being coated in cum.`);
S.Attendant.fetish = "cumslut";
}
@@ -192,7 +194,7 @@ App.EndWeek.spaReport = function() {
S.Attendant.fetishStrength += 4;
} else {
r.push(`${He} does ${his} best to accommodate ${slave.slaveName}'s massive breasts and tends to ${him2} whenever ${he2} feels a need for release.`);
- if (random(1, 100) > 65 && S.Attendant.fetish === "none") {
+ if (random(1, 100) > 65 && S.Attendant.fetish === Fetish.NONE) {
r.push(`After multiple milking sessions, ${S.Attendant.slaveName} begins to find ${himself} fantasizing about having giant milky breasts too.`);
S.Attendant.fetish = "boobs";
}
@@ -212,7 +214,7 @@ App.EndWeek.spaReport = function() {
S.Attendant.fetishStrength += 4;
} else {
r.push(`${He} does ${his} best to accommodate ${slave.slaveName}'s pregnancy and to make sure the mother-to-be is happy and comfortable.`);
- if (random(1, 100) > 65 && S.Attendant.fetish === "none") {
+ if (random(1, 100) > 65 && S.Attendant.fetish === Fetish.NONE) {
r.push(`After massaging ${slave.slaveName}'s growing belly multiple times, ${S.Attendant.slaveName} begins to find ${himself} fantasizing about being swollen with life too.`);
S.Attendant.fetish = "pregnancy";
}
@@ -258,17 +260,25 @@ App.EndWeek.spaReport = function() {
slave.boobsMilk = 0;
}
App.Events.addNode(el, r, "div", "indent");
+ r = [];
+ }
+
+ const pMod = App.SlaveAssignment.PartTime.efficiencyModifier(S.Attendant);
+ idleBonus *= pMod;
+ if (pMod < 1) {
+ r.push(`Some part of ${his} day is taken up by ${his} part-time job, making ${him} less effective.`);
}
if (slaves.length < V.spa) {
- const seed = random(1, 10) + ((V.spa - slaves.length) * (random(150, 170) + (idleBonus * 10)));
+ const seed = Math.ceil(random(1, 10) + ((V.spa - slaves.length) * (random(150, 170) + (idleBonus * 10))));
cashX(seed, "spa", S.Attendant);
- r = [];
r.push(`Since ${he} doesn't have enough slaves to occupy all ${his} time, the spa takes in citizens' slaves on a contract basis and ${he} helps them too, earning <span class="yellowgreen"> ${cashFormat(seed)}.</span>`);
if (V.arcologies[0].FSHedonisticDecadence > 0 && slaves.length === 0) {
r.push(`Society <span class="green">loves</span> being allowed to lounge in your spa, greatly advancing your laid back culture.`);
FutureSocieties.Change("Hedonistic", 2);
}
+ }
+ if (r.length > 0) {
App.Events.addNode(el, r, "div", "indent");
}
}
@@ -291,15 +301,8 @@ App.EndWeek.spaReport = function() {
if (V.showEWD !== 0) {
const attendantEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
const artSpan = App.UI.DOM.appendNewElement("span", attendantEntry);
- App.SlaveAssignment.appendSlaveLinks(attendantEntry, slave);
- App.Events.addNode(
- attendantEntry,
- [
- App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name"),
- `is serving as the Attendant in ${V.spaName}.`,
- App.SlaveAssignment.standardSlaveReport(slave, false),
- ]
- );
+ attendantEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is serving as the Attendant in ${V.spaName}.`));
+ attendantEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false));
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
App.SlaveAssignment.standardSlaveReport(slave, true);
@@ -339,7 +342,7 @@ App.EndWeek.spaReport = function() {
default:
slave.rules.living = "luxurious";
}
- if (slave.health.condition >= 20 && slave.health.tired <= 30 && slave.trust > 60 && slave.devotion > 60 && slave.fetish !== "mindbroken" && slave.sexualFlaw === "none" && slave.behavioralFlaw === "none") {
+ if (slave.health.condition >= 20 && slave.health.tired <= 30 && slave.trust > 60 && slave.devotion > 60 && slave.fetish !== Fetish.MINDBROKEN && slave.sexualFlaw === "none" && slave.behavioralFlaw === "none") {
const slaveFixed = App.UI.DOM.makeElement("p");
App.Events.addNode(
slaveFixed,
@@ -375,23 +378,15 @@ App.EndWeek.spaReport = function() {
}
if (V.showEWD !== 0) {
- const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', "slave-report");
+ const slaveEntry = App.UI.DOM.appendNewElement("div", el, '', ["slave-report"]);
const artSpan = App.UI.DOM.appendNewElement("span", slaveEntry);
- App.SlaveAssignment.appendSlaveLinks(slaveEntry, slave);
- r = [];
- r.push(App.UI.DOM.makeElement("span", SlaveFullName(slave), "slave-name"));
- if (slave.choosesOwnAssignment === 2) {
- r.push(App.SlaveAssignment.choosesOwnJob(slave));
- } else {
- r.push(`is resting in ${V.spaName}.`);
- }
- App.Events.addNode(slaveEntry, r);
+ slaveEntry.append(App.SlaveAssignment.saSlaveIntro(slave, `is resting in ${V.spaName}.`));
r = [];
r.push(He);
r.push(App.SlaveAssignment.rest(slave));
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} remains in the Spa, completely mindbroken.`);
} else if (slave.sexualFlaw !== "none" || slave.behavioralFlaw !== "none") {
r.push(`${He} remains in the Spa, stubborn in ${his} flaw.`);
@@ -407,7 +402,7 @@ App.EndWeek.spaReport = function() {
App.SlaveAssignment.appendSlaveArt(artSpan, slave);
} else {
// discard return values silently
- App.SlaveAssignment.choosesOwnJob(slave);
+ App.SlaveAssignment.rest(slave);
App.SlaveAssignment.standardSlaveReport(slave, true);
}
}
diff --git a/src/endWeek/saAgent.js b/src/endWeek/saAgent.js
index df50161b1a48ece0fc61aeed2533a64e01f0b8d0..f7031b142ec4f6e4776e0a366e09281b37ba34d9 100644
--- a/src/endWeek/saAgent.js
+++ b/src/endWeek/saAgent.js
@@ -531,7 +531,7 @@ App.SlaveAssignment.agent = function(slave) {
if (slave.birthsTat > -1) {
slave.birthsTat++;
}
- } else if ((slave.preg > 37) && (slave.broodmother > 0)) {
+ } else if ((slave.preg >= 37) && (slave.broodmother > 0)) {
if (slave.broodmother > 0) {
slave.counter.birthsTotal += WombBirthReady(slave, 37);
WombBirth(slave, 37);
@@ -545,7 +545,7 @@ App.SlaveAssignment.agent = function(slave) {
SetBellySize(slave); // Actually it's now better to set belly size without checking of any conditions. Just to be sure. Should correct forgotten variables too.
if (slave.lactation === 1) {
- if (slave.fetish !== "boobs") {
+ if (slave.fetish !== Fetish.BOOBS) {
if (slave.lactationDuration === 0) {
slave.boobs -= slave.boobsMilk;
slave.boobsMilk = 0;
@@ -560,7 +560,7 @@ App.SlaveAssignment.agent = function(slave) {
}
} else if (slave.lactation === 2) {
slave.lactationDuration = 2;
- } else if (slave.fetish === "boobs" && slave.boobs - slave.boobsImplant >= 2000) {
+ } else if (slave.fetish === Fetish.BOOBS && slave.boobs - slave.boobsImplant >= 2000) {
slave.induceLactation += 2;
if (slave.lactationDuration >= 20) {
slave.induceLactation = 0;
diff --git a/src/endWeek/saArena.js b/src/endWeek/saArena.js
new file mode 100644
index 0000000000000000000000000000000000000000..b466fb35e6e975e9d18b9787a2c799b7d5606626
--- /dev/null
+++ b/src/endWeek/saArena.js
@@ -0,0 +1,110 @@
+/**
+ * @param {FC.ReportSlave} slave
+ * @returns {string}
+ */
+App.SlaveAssignment.arena = function saArena(slave) {
+ const {
+ he, him, his, He, His
+ } = getPronouns(slave);
+
+ let skillIncrease = 0;
+ let learningBlocked = false;
+
+ const r = [];
+ intro();
+ health();
+ body();
+ mind();
+ if (!learningBlocked) {
+ effects();
+ accidents();
+ }
+ result();
+
+ return r.join(" ");
+
+ function intro() {
+ r.push(`${He} trains at ${App.Entity.facilities.pit.name} to hone ${his} combat skill.`);
+ }
+
+ function health() {
+ skillIncrease -= 0.5 * slave.health.illness;
+ if (slave.health.illness > 1) {
+ if (slave.health.illness < 4) {
+ r.push(`${His} illness is preventing ${him} from doing strenuous exercise, making ${him} focus on theorie this week.`);
+ } else {
+ r.push(`${He} is so ill that ${he} is just laying on the sidelines the whole time.`);
+ learningBlocked = true;
+ }
+ }
+ if (slave.health.tired > 60) {
+ r.push(`Being tired, ${he} is unable to keep up ${his} exercises properly.`);
+ skillIncrease -= 1;
+ if (slave.health.tired > 90) {
+ skillIncrease -= 1;
+ }
+ }
+ if (slave.health.illness <= 1 && slave.health.tired <= 30 && slave.health.condition > -20) {
+ r.push(`${He} is in`);
+ skillIncrease += 1;
+ if (slave.health.condition > 50) {
+ r.push(`perfect`);
+ skillIncrease += 1;
+ } else {
+ r.push("good");
+ }
+ r.push(`condition and can train harder.`);
+ }
+ }
+
+ function body() {
+ if (slave.muscles < -30) {
+ r.push(`${His} frail body prevents ${him} from doing continues training, hampering ${his} progress.`);
+ skillIncrease -= 1;
+ } else if (
+ slave.muscles > 30) {
+ r.push(`${He} is fit and can train for extended amounts of time.`);
+ skillIncrease += 1;
+ }
+ }
+
+ function mind() {
+ if (slave.assignment === Job.BODYGUARD) {
+ r.push(`As your Bodyguard ${he} trains extra hard.`);
+ skillIncrease += 1;
+ }
+ }
+
+ function effects() {
+ r.push(`Training every day in addition to ${his} normal duties leaves ${him} <span class="health dec">more tired.</span>`);
+ slave.health.tired += 5;
+ }
+
+ function accidents() {
+ const accident = Math.random();
+ if (accident > 0.9) {
+ r.push(`${He} had a <span class="health dec">bad training accident</span> this week and had to cut ${his} training short.`);
+ healthDamage(slave, 20);
+ skillIncrease -= 2;
+ } else if (accident > 0.5) {
+ r.push(`${His} combat exercises leave ${him} <span class="health dec">worse for wear,</span> though it helps ${him} learn faster.`);
+ healthDamage(slave, 5);
+ skillIncrease += 1;
+ }
+ }
+
+ function result() {
+ if (slave.skill.combat < 100) {
+ if (learningBlocked || skillIncrease <= -4) {
+ r.push(`${He} was unable to make any progress this week.`);
+ }
+
+ skillIncrease = Math.clamp(skillIncrease, -4, 6);
+ skillIncrease += 10 + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32);
+
+ r.push(slaveSkillIncrease("combat", slave, skillIncrease));
+ } else {
+ r.push(`${He} is already a combat master and maintains ${his} combat skill with practice in ${App.Entity.facilities.pit.name}.`);
+ }
+ }
+};
diff --git a/src/endWeek/saBeYourHeadGirl.js b/src/endWeek/saBeYourHeadGirl.js
index 49e340b920d501efa27692e74ce264bef505afd1..ec31d2338776a18df49e103ce298588e6b7bebd1 100644
--- a/src/endWeek/saBeYourHeadGirl.js
+++ b/src/endWeek/saBeYourHeadGirl.js
@@ -160,6 +160,9 @@ App.SlaveAssignment.beYourHeadGirl = function saBeYourHeadGirl(slave) {
}
r.push(`waiting for ${him} in the slave dormitory.`);
}
+ if (App.SlaveAssignment.PartTime.efficiencyModifier(slave) < 1) {
+ r.push(`${His} part-time job takes time away from managing your slaves.`);
+ }
}
/**
@@ -199,29 +202,25 @@ App.SlaveAssignment.beYourHeadGirl = function saBeYourHeadGirl(slave) {
*/
function jobEffects(slave) {
if (slave.fetishKnown === 1) {
- if (slave.fetish === "dom") {
+ if (slave.fetish === Fetish.DOM) {
if (slave.fetishKnown === 1 && slave.fetishStrength <= 95) {
r.push(`Having all the slaves look up to and obey ${him} advances ${his} <span class="lightcoral">dominant tendencies.</span>`);
slave.fetishStrength += 4;
}
} else if (fetishChangeChance(slave) > jsRandom(0, 100)) {
r.push(`Having all the slaves look up to and obey ${him} affects ${his} sexuality, turning ${him} into a <span class="lightcoral">bit of a dominatrix.</span>`);
- slave.fetish = "dom";
- slave.fetishStrength = 20;
- slave.fetishKnown = 1;
+ fetishChange(slave, Fetish.DOM, 20);
} else if (slave.fetishStrength <= jsRandom(20, 60)) {
r.push(`The sheer variety of sexual situations ${he} sees and participates in <span class="pink">broaden ${his} sexual interests</span> and incline ${him} to take a dominant sexual role.`);
slave.fetishStrength -= 4;
}
} else {
- if (slave.fetish === "dom") {
+ if (slave.fetish === Fetish.DOM) {
r.push(`Having all the slaves look up to and obey ${him} clearly excites ${him}; <span class="lightcoral">${he}'s a natural dom!</span>`);
slave.fetishKnown = 1;
} else if (fetishChangeChance(slave) > jsRandom(0, 100)) {
r.push(`Having all the slaves look up to and obey ${him} affects ${his} sexuality, turning ${him} into a <span class="lightcoral">bit of a dominatrix.</span>`);
- slave.fetish = "dom";
- slave.fetishStrength = 20;
- slave.fetishKnown = 1;
+ fetishChange(slave, Fetish.DOM, 20);
}
}
@@ -264,7 +263,7 @@ App.SlaveAssignment.beYourHeadGirl = function saBeYourHeadGirl(slave) {
*
*/
function cleanupVars(slave) {
- if (!App.Data.Careers.Leader.HG.includes(slave.career) && slave.skill.headGirl < V.masteredXP) {
+ if (!App.Data.Careers.Leader.HG.includes(slave.career) && slave.skill.headGirl < Constant.MASTERED_XP) {
const skillIncrease = jsRandom(1, Math.ceil((slave.intelligence + slave.intelligenceImplant) / 15) + 8);
r.push(slaveSkillIncrease('headGirl', slave, skillIncrease));
}
diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js
index 8ad7448b35bd8f1138f0c62f62d3ec130b35535a..d82d70518886c64e8f0c7882e6b232cba504f74f 100644
--- a/src/endWeek/saChoosesOwnClothes.js
+++ b/src/endWeek/saChoosesOwnClothes.js
@@ -13,7 +13,7 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
He, His, he, him, his, himself,
} = getPronouns(slave);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
const corsetChoice = todaysCorset(slave);
const clothingChoice = todaysOutfit(slave);
slave.bellyAccessory = corsetChoice.bellyAccessory;
@@ -90,9 +90,13 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
/** @type {{text: string, clothes: FC.Clothes}} */
let selection;
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.arcologies[0].FSChattelReligionist > 0) {
- selection = {text: `${he} commonly sees others wearing chattel habits and is drawn to doing so ${himself}.`, clothes: "a chattel habit"};
+ if (V.arcologies[0].FSChattelReligionistLaw2 === 1) {
+ selection = {text: `${he} sees others wearing nothing at all, and stays nude ${himself}.`, clothes: "no clothing"};
+ } else {
+ selection = {text: `${he} commonly sees others wearing chattel habits and is drawn to doing so ${himself}.`, clothes: "a chattel habit"};
+ }
} else {
/** @type {string} */
let text;
@@ -186,9 +190,7 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
}
selection = jsEither(clothing);
} else {
- if (V.arcologies[0].FSChattelReligionist > 0) {
- clothing.push({text: `and wears a chattel habit to conform to your arcology's culture.`, clothes: "a chattel habit"});
- } else if (slave.assignment === Job.NURSE) { /* Chooses clothes according to assignment (no exceptions)*/
+ if (slave.assignment === Job.NURSE) { /* Chooses clothes according to assignment (no exceptions)*/
if (slave.energy > 95 || slave.need > 100) {
wardrobeAssignment.push({text: `and wears a slutty nurse outfit to make it clear just how much this nurse needs ${his} daily lay.`, clothes: "a slutty nurse outfit"});
} else if (slave.energy > 80) {
@@ -277,7 +279,9 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
wardrobeAssignment.push({text: `and wears a slutty suit to give ${him} an air of authority while keeping all eyes focused on ${him}.`, clothes: "slutty business attire"});
wardrobeAssignment.push({text: `and wears a schoolgirl outfit to help keep ${his} charges focused on ${him}.`, clothes: "a schoolgirl outfit"});
wardrobeAssignment.push({text: `and dresses up as a succubus to give ${his} sex lessons an extra kick.`, clothes: "a succubus outfit"});
- if (isItemAccessible.entry("conservative clothing") === true) {
+ if (slave.race === "middle eastern" && isItemAccessible.entry("a burqa") === true) {
+ wardrobeAssignment.push({text: `and wears a conservative burqa to not detract from this week's lesson.`, clothes: "a burqa"});
+ } else if (isItemAccessible.entry("conservative clothing") === true) {
wardrobeAssignment.push({text: `and wears conservative clothes to not detract from this week's lesson.`, clothes: "conservative clothing"});
}
if (isItemAccessible.entry("a toga") === true) {
@@ -328,7 +332,7 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
if (isItemAccessible.entry("attractive lingerie for a pregnant woman") === true && slave.belly >= 1500) {
wardrobeAssignment.push({text: `and slips into some attractive lingerie to enjoy ${himself} as ${he} unwinds.`, clothes: "attractive lingerie for a pregnant woman"});
}
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
wardrobeAssignment.push({text: `and decides the best way to relax is tied up nice and tight.`, clothes: "shibari ropes"});
}
} else if (slave.assignment === Job.MILKED || slave.assignment === Job.DAIRY) {
@@ -350,7 +354,11 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
}
wardrobeAssignment.push({text: `and dons a slutty outfit. If ${his} breasts are going to hang out, might as well wear something to complement them.`, clothes: "a slutty outfit"});
} else if (slave.assignment === Job.BODYGUARD) {
- wardrobeAssignment.push({text: `and wears a bodysuit to show off ${his} curves without hindering ${his} deadliness.`, clothes: "a comfortable bodysuit"});
+ if (isItemAccessible.entry("a tight Imperial bodysuit") && V.arcologies[0].FSNeoImperialist > 0) {
+ wardrobeAssignment.push({text: `and wears a tight Imperial bodysuit to show off ${his} curves without hindering ${his} deadliness.`, clothes: "a tight Imperial bodysuit"});
+ } else {
+ wardrobeAssignment.push({text: `and wears a bodysuit to show off ${his} curves without hindering ${his} deadliness.`, clothes: "a comfortable bodysuit"});
+ }
if (isItemAccessible.entry("a military uniform") === true) {
wardrobeAssignment.push({text: `and wears a military uniform to look the part of the honor guard.`, clothes: "a military uniform"});
}
@@ -427,7 +435,7 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
if (isItemAccessible.entry("Western clothing") === true) {
wardrobeAssignment.push({text: `and chooses a pair of crotchless chaps so your other slaves don't have to waste time undressing ${him}.`, clothes: "Western clothing"});
}
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
wardrobeAssignment.push({text: `and chooses to slip on a pair of spats and a tank top in the hopes that ${he} gets to be a violated schoolgirl.`, clothes: "spats and a tank top"});
wardrobeAssignment.push({text: `and chooses to slip on a schoolgirl outfit in the hope that ${he} gets held down and raped.`, clothes: "a schoolgirl outfit"});
wardrobeAssignment.push({text: `and chooses to wear the sluttiest outfit available to make it clear what ${he} wants done to ${him}.`, clothes: "a slutty outfit"});
@@ -661,12 +669,21 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
wardrobeFS.push({text: `and wears one of the beautiful folk costumes of the asian race.`, clothes: "a long qipao"});
}
if (isItemAccessible.entry("a kimono") === true) {
- wardrobeAssignment.push({text: `and wears one of the beautiful folk costumes of the asian race.`, clothes: "a kimono"});
+ wardrobeFS.push({text: `and wears one of the beautiful folk costumes of the asian race.`, clothes: "a kimono"});
}
if (isItemAccessible.entry("a hanbok") === true) {
- wardrobeAssignment.push({text: `and wears one of the beautiful folk costumes of the asian race.`, clothes: "a hanbok"});
+ wardrobeFS.push({text: `and wears one of the beautiful folk costumes of the asian race.`, clothes: "a hanbok"});
+ }
+ }
+ }
+ if (V.arcologies[0].FSChattelReligionist > 0) {
+ if (V.arcologies[0].FSChattelReligionistLaw2 === 1) {
+ wardrobeFS.push({text: `but chooses to stay nude to promote Holy Nudism.`, clothes: "no clothing"});
+ if (isItemAccessible.entry("body oil") === true) {
+ wardrobeFS.push({text: `and coats ${his} body in oil to highlight what God has given ${him}.`, clothes: "body oil"});
}
}
+ wardrobeFS.push({text: `and wears a chattel habit to conform to your arcology's culture.`, clothes: "a chattel habit"});
}
if (V.arcologies[0].FSSubjugationist > 0) {
@@ -812,10 +829,10 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
/* fetishes */
if (slave.fetishKnown === 1) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
wardrobeTastes.push({text: `and wears restrictive latex to encourage others to dominate ${him}.`, clothes: "restrictive latex"});
wardrobeTastes.push({text: `and wears shibari ropes to encourage others to dominate ${him}.`, clothes: "shibari ropes"});
- } else if (slave.fetish === "dom") {
+ } else if (slave.fetish === Fetish.DOM) {
if (isItemAccessible.entry("nice business attire") === true) {
wardrobeTastes.push({text: `and wears a handsome suit, since ${he} likes other slaves to look up to ${him}.`, clothes: "nice business attire"});
}
@@ -823,29 +840,29 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
wardrobeTastes.push({text: `and wears a full body latex catsuit to look the part of the whip cracking dom.`, clothes: "a latex catsuit"});
}
wardrobeTastes.push({text: `and wears a scalemail bikini to make ${himself} look tough.`, clothes: "a scalemail bikini"});
- } else if (slave.fetish === "masochist") {
+ } else if (slave.fetish === Fetish.MASOCHIST) {
wardrobeTastes.push({text: `and wears painfully restrictive bondage gear, since ${he} likes the torment.`, clothes: "uncomfortable straps"});
if (isItemAccessible.entry("chains") === true) {
wardrobeTastes.push({text: `and wears painfully tight chains, since ${he} likes the torment.`, clothes: "chains"});
}
- } else if (slave.fetish === "sadist") {
+ } else if (slave.fetish === Fetish.SADIST) {
if (isItemAccessible.entry("a slave gown") === true) {
wardrobeTastes.push({text: `and wears an elegant gown, since ${he} thinks it makes ${him} look the part of the femme fatale.`, clothes: "a slave gown"});
}
wardrobeTastes.push({text: `and wears a scalemail bikini, since ${he} thinks it makes ${him} look fierce.`, clothes: "a scalemail bikini"});
- } else if (slave.fetish === "cumslut") {
+ } else if (slave.fetish === Fetish.CUMSLUT) {
wardrobeTastes.push({text: `and wears cutoffs and a t-shirt, because the fun yet relatively conservative outfit seems to encourage others to ask ${him} for blowjobs.`, clothes: "cutoffs and a t-shirt"});
- } else if (slave.fetish === "humiliation") {
+ } else if (slave.fetish === Fetish.HUMILIATION) {
wardrobeTastes.push({text: `and wears leather straps with rings over ${his} private parts because ${he} enjoys the embarrassment such a humiliating outfit causes ${him}.`, clothes: "uncomfortable straps"});
- } else if (slave.fetish === "buttslut") {
+ } else if (slave.fetish === Fetish.BUTTSLUT) {
wardrobeTastes.push({text: `and wears nothing other than slutty bangles, because ${he} likes to catch the eye without putting anything between cocks and ${his} rear end.`, clothes: "slutty jewelry"});
wardrobeTastes.push({text: `and wears nothing other than an apron, because ${he} likes to catch the eye without putting anything between cocks and ${his} rear end.`, clothes: "an apron"});
- } else if (slave.fetish === "pregnancy") {
+ } else if (slave.fetish === Fetish.PREGNANCY) {
wardrobeTastes.push({text: `and wears a short maid dress, because ${he} wants to look motherly and fuckable at the same time.`, clothes: "a slutty maid outfit"});
if (isItemAccessible.entry("a maternity dress") === true && canGetPregnant(slave)) {
wardrobeTastes.push({text: `and wears a maternity dress in the hope someone fills out its middle.`, clothes: "a maternity dress"});
}
- } else if (slave.fetish === "boobs") {
+ } else if (slave.fetish === Fetish.BOOBS) {
wardrobeTastes.push({text: `and wears a cheerleader outfit, since ${he} loves the way it hugs ${his} tits as ${he} moves.`, clothes: "a cheerleader outfit"});
if (isItemAccessible.entry("a monokini") === true) {
wardrobeTastes.push({text: `and wears a monokini, since ${he} loves how it leaves ${his} breasts totally bare.`, clothes: "a monokini"});
@@ -862,10 +879,10 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
wardrobeTastes.push({text: `and wears nothing but a pair of panties so ${his} tits can bounce freely.`, clothes: "panties"});
}
} else {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
wardrobeTastes.push({text: `and strangely opts for restrictive latex.`, clothes: "restrictive latex"});
wardrobeTastes.push({text: `and strangely opts for shibari ropes.`, clothes: "shibari ropes"});
- } else if (slave.fetish === "dom") {
+ } else if (slave.fetish === Fetish.DOM) {
if (isItemAccessible.entry("nice business attire") === true) {
wardrobeTastes.push({text: `and wears a handsome suit; ${he} seems to think highly of ${himself} in it.`, clothes: "nice business attire"});
}
@@ -873,29 +890,29 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
wardrobeTastes.push({text: `and wears a full body latex catsuit; there is a strange look on ${his} face as ${he} wears it.`, clothes: "a latex catsuit"});
}
wardrobeTastes.push({text: `and wears a scalemail bikini; ${he} keeps flexing and acting tough to ${himself}.`, clothes: "a scalemail bikini"});
- } else if (slave.fetish === "masochist") {
+ } else if (slave.fetish === Fetish.MASOCHIST) {
wardrobeTastes.push({text: `and strangely opts for painfully restrictive bondage gear.`, clothes: "uncomfortable straps"});
if (isItemAccessible.entry("chains") === true) {
wardrobeTastes.push({text: `and strangely opts for painfully tight chains.`, clothes: "chains"});
}
- } else if (slave.fetish === "sadist") {
+ } else if (slave.fetish === Fetish.SADIST) {
if (isItemAccessible.entry("a slave gown") === true) {
wardrobeTastes.push({text: `and wears an elegant gown for some reason.`, clothes: "a slave gown"});
}
wardrobeTastes.push({text: `and wears a scalemail bikini; an odd choice.`, clothes: "a scalemail bikini"});
- } else if (slave.fetish === "cumslut") {
+ } else if (slave.fetish === Fetish.CUMSLUT) {
wardrobeTastes.push({text: `and wears cutoffs and a t-shirt; ${he} can't stop licking ${his} lips.`, clothes: "cutoffs and a t-shirt"});
- } else if (slave.fetish === "humiliation") {
+ } else if (slave.fetish === Fetish.HUMILIATION) {
wardrobeTastes.push({text: `and strangely opts for leather straps with rings over ${his} private parts.`, clothes: "uncomfortable straps"});
- } else if (slave.fetish === "buttslut") {
+ } else if (slave.fetish === Fetish.BUTTSLUT) {
wardrobeTastes.push({text: `and wears nothing other than slutty bangles, an odd choice; ${his} ass is completely exposed.`, clothes: "slutty jewelry"});
wardrobeTastes.push({text: `and wears nothing other than an apron, an odd choice; ${his} ass is completely exposed.`, clothes: "an apron"});
- } else if (slave.fetish === "pregnancy") {
+ } else if (slave.fetish === Fetish.PREGNANCY) {
wardrobeTastes.push({text: `and wears a short maid dress; you frequently notice ${him} observing ${his} stomach.`, clothes: "a slutty maid outfit"});
if (isItemAccessible.entry("a maternity dress") === true && canGetPregnant(slave)) {
wardrobeTastes.push({text: `and wears a maternity dress even though ${he} isn't pregnant.`, clothes: "a maternity dress"});
}
- } else if (slave.fetish === "boobs") {
+ } else if (slave.fetish === Fetish.BOOBS) {
wardrobeTastes.push({text: `and wears a cheerleader outfit; ${he} seems to enjoy jiggling ${his} breasts in it.`, clothes: "a cheerleader outfit"});
if (isItemAccessible.entry("a monokini") === true) {
wardrobeTastes.push({text: `and strangely decides to wear a monokini, which leaves ${his} breasts totally bare.`, clothes: "a monokini"});
@@ -979,6 +996,17 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
clothing.push(wardrobeTastes[i]);
}
}
+ if (V.arcologies[0].FSChattelReligionist > 0) {
+ // Chattel religionism is currently the only FS with a hard advancement link to clothing. Accepting slaves should never voluntarily select an outfit that won't help.
+ clothing.deleteWith(c => !ChattelReligionistClothingPass(c.clothes));
+ if (clothing.length < 1) {
+ if (V.arcologies[0].FSChattelReligionistLaw2 === 1) {
+ clothing.push({text: `but chooses to stay nude to promote Holy Nudism.`, clothes: "no clothing"});
+ } else {
+ clothing.push({text: `and wears a chattel habit to conform to your arcology's culture.`, clothes: "a chattel habit"});
+ }
+ }
+ }
selection = jsEither(clothing);
}
@@ -993,7 +1021,7 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
/** @type {{text:string, shoes:FC.WithNone<FC.Shoes>}[]} */
const shoes = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (hasBothLegs(slave) && slave.heels === 1) {
shoes.push({text: `${He} finds ${he} can inexplicably walk if ${he} wears heels; a daily lesson for ${him}, as ${he} forgets shortly after leaving.`, shoes: jsEither(["boots", "extreme heels", "heels"])});
}
@@ -1011,11 +1039,11 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
} else {
if (V.arcologies[0].FSStatuesqueGlorification > 0) {
shoes.push({text: `${He} wears heels to boost ${his} height further.`, shoes: jsEither(["heels"])});
- } else if (slave.fetishKnown === 1 && slave.fetish === "dom") {
+ } else if (slave.fetishKnown === 1 && slave.fetish === Fetish.DOM) {
shoes.push({text: `${He} wears boots to look like a proper dominant.`, shoes: "boots"});
- } else if (slave.fetishKnown === 1 && slave.fetish === "sadist") {
+ } else if (slave.fetishKnown === 1 && slave.fetish === Fetish.SADIST) {
shoes.push({text: `${He} wears boots, since ${he} thinks they make ${him} look dangerous.`, shoes: "boots"});
- } else if (slave.fetishKnown === 1 && slave.fetish === "masochist") {
+ } else if (slave.fetishKnown === 1 && slave.fetish === Fetish.MASOCHIST) {
shoes.push({text: `${He} wears painfully tall heels, since ${he} enjoys the twinge of pain with each step.`, shoes: "extreme heels"});
} else if (slave.heels === 1) {
shoes.push({text: `${He} wears the heels ${he} needs to walk.`, shoes: "heels"});
@@ -1034,9 +1062,9 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
} else if (V.arcologies[0].FSIntellectualDependencyLawBeauty === 1) {
shoes.push({text: `${He} slips on a pair of heels like a proper bimbo.`, shoes: "heels"});
} else {
- if (slave.fetishKnown === 1 && slave.fetish === "pregnancy" && slave.bellyPreg >= 500) {
+ if (slave.fetishKnown === 1 && slave.fetish === Fetish.PREGNANCY && slave.bellyPreg >= 500) {
shoes.push({text: `${He} goes barefoot to complement ${his} pregnancy.`, shoes: "none"});
- } else if (slave.fetishKnown === 1 && slave.fetish === "none") {
+ } else if (slave.fetishKnown === 1 && slave.fetish === Fetish.NONE) {
shoes.push({text: `${He} wears comfortable flats, since ${he} doesn't have a fetish to show off.`, shoes: "flats"});
}
shoes.push({text: `${He} wears heels to strut ${his} stuff.`, shoes: "heels"});
@@ -1055,7 +1083,7 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
/** @type {Array<{text: string, collar: FC.Collar}>} */
const neck = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
//
} else if (slave.devotion <= 20) {
//
@@ -1066,13 +1094,13 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
if (V.arcologies[0].FSEgyptianRevivalist > 0) {
neck.push({text: `dons a wesekh to support your ancient Egyptian pretensions,`, collar: "ancient Egyptian"});
}
- if (slave.fetish === "masochist") {
+ if (slave.fetish === Fetish.MASOCHIST) {
neck.push({text: `dons a tight steel collar around ${his} neck,`, collar: "tight steel"});
neck.push({text: `dons a painful leather collar,`, collar: "uncomfortable leather"});
neck.push({text: `dons a painfully tight neck corset,`, collar: "neck corset"});
- } else if (slave.fetish === "pregnancy" && (canGetPregnant(slave) || slave.pregKnown === 1)) {
+ } else if (slave.fetish === Fetish.PREGNANCY && (canGetPregnant(slave) || slave.pregKnown === 1)) {
neck.push({text: `dons a digital display that tells everything about ${his} womb,`, collar: "preg biometrics"});
- } else if (slave.fetish === "boobs" && slave.boobs >= 1000) {
+ } else if (slave.fetish === Fetish.BOOBS && slave.boobs >= 1000) {
neck.push({text: `dons a cowbell to draw attention to ${his} luscious udders,`, collar: "leather with cowbell"});
}
neck.push({text: `decides ${his} neck needs no accenting,`, collar: "none"});
@@ -1099,7 +1127,7 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
}
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.arcologies[0].FSRepopulationFocus > 0 && slave.belly < 1500) {
if (slave.weight > 130) {
belly.push({text: `${He} notices the fake bellies; since every girl ${he} has ever met has a rounded middle, it's only natural ${he} is compelled to wear one. ${He} struggles to fit it around ${his} huge gut, only stopping when another slave takes it away from ${him} so ${he} moves on and stops blocking the wardrobe with ${his} fat ass.`, bellyAccessory: "none"});
@@ -1122,7 +1150,7 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
} else {
belly.push({text: `straps on a fake pregnant belly to fit in with all the other pregnant girls,`, bellyAccessory: jsEither(["a small empathy belly", "a medium empathy belly", "a large empathy belly"])});
}
- } else if (slave.belly < 1500 && slave.fetish === "pregnancy" && isItemAccessible.entry("a small empathy belly", "bellyAccessory") && slave.sexualFlaw !== "breeder" && slave.weight <= 130) {
+ } else if (slave.belly < 1500 && slave.fetish === Fetish.PREGNANCY && isItemAccessible.entry("a small empathy belly", "bellyAccessory") && slave.sexualFlaw !== "breeder" && slave.weight <= 130) {
if (slave.fetishStrength <= 30) {
belly.push({text: `straps on a 1st trimester belly to sate ${his} curiosity,`, bellyAccessory: "a small empathy belly"});
belly.push({text: `straps on a 2nd trimester belly to sate ${his} curiosity,`, bellyAccessory: "a medium empathy belly"});
diff --git a/src/endWeek/saChoosesOwnJob.js b/src/endWeek/saChoosesOwnJob.js
index 7a314efa96b7c548d8182a095cc3824e2ad1fbd1..7df731ba4980d4796aa1750114e52e1bf1373d4f 100644
--- a/src/endWeek/saChoosesOwnJob.js
+++ b/src/endWeek/saChoosesOwnJob.js
@@ -1,4 +1,6 @@
/**
+ * This function is the old "first pass", which actually picks the job.
+ * The slaves' reasoning is saved in saVars for later use.
* @param {App.Entity.SlaveState} slave
* @returns {string}
*/
@@ -21,27 +23,25 @@ App.SlaveAssignment.choosesOwnJob = function saChoosesOwnJob(slave) {
He, he, him, his, himself, girl,
} = getPronouns(slave);
- /*
- "I suspect something might be awry with that too" - Pregmodder - 2021-09-26
- */
- if (slave.choosesOwnAssignment === 0 || slave.fuckdoll > 0 || slave.fetish === "mindbroken") {
- // nothing to do
- } else if (slave.choosesOwnAssignment === 2) {
- // second pass happens visibly during weekly report for the location where this slave decided to go (or stay)
- // display text but don't change assignment (already done)
- r.push(V.choosesOwnAssignmentText[slave.ID]);
- delete V.choosesOwnAssignmentText[slave.ID];
- slave.choosesOwnAssignment = 1;
- // continue cycle for next week
+ if (slave.fuckdoll > 0 || slave.fetish === Fetish.MINDBROKEN) {
+ // deal with slaves who are incapable of actually choosing their own assignment
+ r.push(`was assigned to ${slave.assignment}. ${He}'s allowed to choose ${his} own job, but is <span style="warning">mentally incapable</span> of doing so,`);
+ if (slave.assignment === Job.CHOICE) {
+ r.push(`and <span class="job change">rests for the week</span> instead.`);
+ removeJob(slave, slave.assignment);
+ } else {
+ r.push(`and just keeps doing the same thing this week.`);
+ }
+ slave.choosesOwnAssignment = 0;
+ App.EndWeek.saVars.choosesOwnAssignmentText[slave.ID] = r.join(' ');
} else {
- // first pass happens silently before all reports: give stats bonus, construct decision string for display during second pass, actually change assignment
+ // give stats bonus, construct decision string for display during slave report, and actually change the assignment
slave.devotion++;
slave.trust++;
- V.choosesOwnAssignmentText[slave.ID] = jobSelection(slave);
+ App.EndWeek.saVars.choosesOwnAssignmentText[slave.ID] = jobSelection(slave);
}
- return r.join(" ");
-
+ return;
/**
* @param {App.Entity.SlaveState} slave
@@ -248,7 +248,7 @@ App.SlaveAssignment.choosesOwnJob = function saChoosesOwnJob(slave) {
}
}
} else if (slave.fetishKnown === 1 || jsRandom(1, 100) > 5) { // Yes, this segways into other things than fetish. PM - I added a 5% chance for her to not think of something just for flavor.
- if (slave.fetish === "submissive" && canWalk(slave) && canSee(slave)) {
+ if (slave.fetish === Fetish.SUBMISSIVE && canWalk(slave) && canSee(slave)) {
if (V.universalRulesAssignsSelfFacility === 1 && V.servantsQuarters > servQL) {
choice.push(`thinks ${he} belongs at the bottom of the penthouse hierarchy, so ${he} <span class="job change">goes to live in ${V.servantsQuartersName}.</span>`);
choice.push(assignJob(slave, "work as a servant"));
@@ -256,7 +256,7 @@ App.SlaveAssignment.choosesOwnJob = function saChoosesOwnJob(slave) {
choice.push(`thinks ${he} belongs at the bottom of the penthouse hierarchy, so ${he} <span class="job change">decides ${he} should be a servant.</span>`);
choice.push(assignJob(slave, "be a servant"));
}
- } else if (slave.fetish === "dom" || slave.fetish === "sadist") {
+ } else if (slave.fetish === Fetish.DOM || slave.fetish === Fetish.SADIST) {
if (V.universalRulesAssignsSelfFacility === 1 && V.club > clubL) {
choice.push(`is self-confident, so ${he} <span class="job change">decides to work in ${V.clubName}.</span>`);
choice.push(assignJob(slave, "serve in the club"));
@@ -265,7 +265,7 @@ App.SlaveAssignment.choosesOwnJob = function saChoosesOwnJob(slave) {
choice.push(assignJob(slave, "serve the public"));
}
slave.sexAmount = 10;
- } else if (slave.fetish === "masochist") {
+ } else if (slave.fetish === Fetish.MASOCHIST) {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`enjoys abuse, so ${he} <span class="job change">hurries down to ${V.brothelName}.</span>`);
choice.push(assignJob(slave, "work in the brothel"));
@@ -274,7 +274,7 @@ App.SlaveAssignment.choosesOwnJob = function saChoosesOwnJob(slave) {
choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
- } else if (slave.fetish === "cumslut") {
+ } else if (slave.fetish === Fetish.CUMSLUT) {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`<span class="job change">hurries down to ${V.brothelName}</span> to suck cocks.`);
choice.push(assignJob(slave, "work in the brothel"));
@@ -283,7 +283,7 @@ App.SlaveAssignment.choosesOwnJob = function saChoosesOwnJob(slave) {
choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
- } else if (slave.fetish === "humiliation") {
+ } else if (slave.fetish === Fetish.HUMILIATION) {
if (V.universalRulesAssignsSelfFacility === 1 && V.brothel > brothelL) {
choice.push(`<span class="job change">decides to work in ${V.brothelName},</span> since it's even more embarrassing to be a whore than a club slut.`);
choice.push(assignJob(slave, "work in the brothel"));
@@ -292,7 +292,7 @@ App.SlaveAssignment.choosesOwnJob = function saChoosesOwnJob(slave) {
choice.push(assignJob(slave, "whore"));
}
slave.sexAmount = 10;
- } else if (slave.fetish === "buttslut") {
+ } else if (slave.fetish === Fetish.BUTTSLUT) {
if (slave.balls > 0 && slave.prostate > 0 && V.universalRulesAssignsSelfFacility === 1 && V.dairyRestraintsSetting < 2 && V.dairyStimulatorsSetting > 0 && V.dairy > dairyL) {
choice.push(`<span class="job change">chooses confinement in ${V.dairyName},</span> since all ${he} will be expected to do is produce cum by orgasming to buttsex.`);
choice.push(assignJob(slave, "work in the dairy"));
@@ -315,7 +315,7 @@ App.SlaveAssignment.choosesOwnJob = function saChoosesOwnJob(slave) {
}
slave.sexAmount = 10;
}
- } else if (slave.fetish === "pregnancy") {
+ } else if (slave.fetish === Fetish.PREGNANCY) {
if (V.PC.dick > 0 && isFertile(slave)) {
if (V.universalRulesAssignsSelfFacility === 1 && V.masterSuite > masterSL) {
choice.push(`<span class="job change">decides to serve you in ${V.masterSuiteName},</span> hoping that you'll get ${him} pregnant.`);
@@ -394,7 +394,7 @@ App.SlaveAssignment.choosesOwnJob = function saChoosesOwnJob(slave) {
}
slave.sexAmount = 10;
}
- } else if (slave.fetish === "boobs") {
+ } else if (slave.fetish === Fetish.BOOBS) {
if (slave.lactation > 0) {
if (V.universalRulesAssignsSelfFacility === 1 && V.dairyRestraintsSetting < 2 && V.dairy > dairyL) {
choice.push(`<span class="job change">heads down to ${V.dairyName}</span> for all the attention that'll be lavished on ${his} nipples.`);
@@ -554,8 +554,7 @@ App.SlaveAssignment.choosesOwnJob = function saChoosesOwnJob(slave) {
}
}
- slave.choosesOwnAssignment = 2;
- // ready for second pass
+ slave.choosesOwnAssignment = 1; // removeJob may have cleared this, but we want it to stay
return choice.join(" ");
}
diff --git a/src/endWeek/saClothes.js b/src/endWeek/saClothes.js
index a68558cd20e3eba3ce45195a79f2532f2b6d0d1f..b110fdce3e27809804179bc05cf24032ab5ebc3f 100644
--- a/src/endWeek/saClothes.js
+++ b/src/endWeek/saClothes.js
@@ -13,7 +13,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
} = getPronouns(slave);
updateAccessories(slave);
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
clothingEffects(slave);
}
if (slave.collar !== "none") {
@@ -72,15 +72,13 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
* @param {App.Entity.SlaveState} slave
*/
function chainMakesMasochist(slave) {
- if (slave.fetish === "masochist" && slave.fetishKnown === 0) {
+ if (slave.fetish === Fetish.MASOCHIST && slave.fetishKnown === 0) {
r.push(`${His} chains pinch and constrict ${him} whenever ${he}'s used. ${He} seems to get off on the discomfort; ${he}'s a <span class="lightcoral">natural masochist.</span>`);
slave.fetishKnown = 1;
- } else if (slave.fetish === "none" || slave.fetishKnown === 0) {
+ } else if (slave.fetish === Fetish.NONE || slave.fetishKnown === 0) {
if (fetishChangeChance(slave) > jsRandom(0, 100)) {
r.push(`${His} chains pinch and constrict ${him} whenever ${he}'s used. ${He} learns to come in spite of, and then <span class="lightcoral">because of the discomfort.</span>`);
- slave.fetish = "masochist";
- slave.fetishKnown = 1;
- slave.fetishStrength = 10;
+ fetishChange(slave, Fetish.MASOCHIST, 10);
}
}
}
@@ -89,15 +87,13 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
* @param {App.Entity.SlaveState} slave
*/
function harshMakesMasochist(slave) {
- if (slave.fetish === "masochist" && slave.fetishKnown === 0) {
+ if (slave.fetish === Fetish.MASOCHIST && slave.fetishKnown === 0) {
r.push(`${His} outfit pinches and constricts ${him} whenever ${he}'s used. ${He} seems to get off on the discomfort; ${he}'s a <span class="lightcoral">natural masochist.</span>`);
slave.fetishKnown = 1;
- } else if (slave.fetish === "none" || slave.fetishKnown === 0) {
+ } else if (slave.fetish === Fetish.NONE || slave.fetishKnown === 0) {
if (fetishChangeChance(slave) > jsRandom(0, 100)) {
r.push(`${His} outfit pinches and constricts ${him} whenever ${he}'s used. ${He} learns to come in spite of, and then <span class="lightcoral">because of the discomfort.</span>`);
- slave.fetish = "masochist";
- slave.fetishKnown = 1;
- slave.fetishStrength = 10;
+ fetishChange(slave, Fetish.MASOCHIST, 10);
}
}
}
@@ -125,13 +121,13 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
function clothingEffects(slave) {
if (App.Data.clothes.get(slave.clothes) && getExposure(slave) === 4) {
if (slave.devotion >= -20) {
- if (slave.fetish === "humiliation" && slave.fetishKnown === 0) {
+ if (slave.fetish === Fetish.HUMILIATION && slave.fetishKnown === 0) {
r.push(`${He} pretends to be embarrassed by ${his} nudity but seems to get off on it. <span class="lightcoral">${He}'s into humiliation.</span>`);
slave.fetishKnown = 1;
- } else if (slave.fetish === "humiliation" && slave.fetishStrength > 60) {
+ } else if (slave.fetish === Fetish.HUMILIATION && slave.fetishStrength > 60) {
r.push(`${He} pretends to be embarrassed by ${his} nudity but <span class="hotpink">openly gets off on it.</span>`);
slave.devotion += 2;
- } else if (slave.fetish === "humiliation") {
+ } else if (slave.fetish === Fetish.HUMILIATION) {
r.push(`${He} pretends to be embarrassed by ${his} nudity but <span class="hotpink">secretly gets off on it.</span>`);
slave.devotion += 1;
} else if (slave.energy > 95) {
@@ -141,13 +137,11 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
}
// humiliating clothing effects
- if (slave.fetishKnown === 0 || slave.fetish === "none") {
+ if (slave.fetishKnown === 0 || slave.fetish === Fetish.NONE) {
if (getExposure(slave) === 3) {
if (fetishChangeChance(slave) > jsRandom(0, 100)) {
r.push(`Surprisingly, ${he} takes to ${his} extremely revealing clothing, and gets an obvious thrill from it. <span class="lightcoral">${He}'s become a humiliation fetishist!</span>`);
- slave.fetish = "humiliation";
- slave.fetishKnown = 1;
- slave.fetishStrength = 10;
+ fetishChange(slave, Fetish.HUMILIATION, 10);
}
}
}
@@ -160,53 +154,47 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
slave.devotion += 2;
slave.trust -= 2;
healthDamage(slave, 3);
- if (slave.fetish === "masochist" && slave.fetishKnown === 0) {
+ if (slave.fetish === Fetish.MASOCHIST && slave.fetishKnown === 0) {
r.push(`${His} chafed skin makes sex an agonizing prospect. ${He} seems to get off on the pain; ${he}'s a <span class="lightcoral">natural masochist.</span>`);
slave.fetishKnown = 1;
- } else if (slave.fetish === "none" || slave.fetishKnown === 0) {
+ } else if (slave.fetish === Fetish.NONE || slave.fetishKnown === 0) {
if (fetishChangeChance(slave) > jsRandom(0, 100)) {
r.push(`${His} chafed skin makes sex an agonizing prospect. ${He} learns to come in spite of, and then <span class="lightcoral">because of the pain.</span>`);
- slave.fetish = "masochist";
- slave.fetishKnown = 1;
- slave.fetishStrength = 10;
+ fetishChange(slave, Fetish.MASOCHIST, 10);
}
}
break;
case "uncomfortable straps":
- if (slave.devotion >= -20 && slave.fetish === "masochist" && slave.fetishKnown === 1) {
+ if (slave.devotion >= -20 && slave.fetish === Fetish.MASOCHIST && slave.fetishKnown === 1) {
r.push(`The uncomfortable straps ${he}'s wearing constantly give ${him} little twinges of pain, <span class="hotpink">titillating ${him}.</span>`);
slave.devotion += 2;
} else if (slave.devotion <= 20 && slave.trust >= -50) {
r.push(`The uncomfortable straps ${he}'s wearing keep ${him} <span class="hotpink">servile</span> and <span class="gold">afraid.</span>`);
slave.devotion += 1;
slave.trust -= 1;
- if (slave.fetish === "masochist" && slave.fetishKnown === 0) {
+ if (slave.fetish === Fetish.MASOCHIST && slave.fetishKnown === 0) {
r.push(`The straps pinch and constrict ${him} whenever ${he}'s used. ${He} seems to get off on the discomfort; ${he}'s a <span class="lightcoral">natural masochist.</span>`);
slave.fetishKnown = 1;
- } else if (slave.fetish === "none" || slave.fetishKnown === 0) {
+ } else if (slave.fetish === Fetish.NONE || slave.fetishKnown === 0) {
if (fetishChangeChance(slave) > jsRandom(0, 100)) {
r.push(`The straps pinch and constrict ${him} whenever ${he}'s used. ${He} learns to come in spite of, and then <span class="lightcoral">because of the discomfort.</span>`);
- slave.fetish = "masochist";
- slave.fetishKnown = 1;
- slave.fetishStrength = 10;
+ fetishChange(slave, Fetish.MASOCHIST, 10);
}
}
} else {
- if (slave.fetish === "masochist" && slave.fetishKnown === 0) {
+ if (slave.fetish === Fetish.MASOCHIST && slave.fetishKnown === 0) {
r.push(`${His} straps pinch and constrict ${him} whenever ${he}'s used. ${He} seems to get off on the discomfort; ${he}'s a <span class="lightcoral">natural masochist.</span>`);
slave.fetishKnown = 1;
- } else if (slave.fetish === "none" || slave.fetishKnown === 0) {
+ } else if (slave.fetish === Fetish.NONE || slave.fetishKnown === 0) {
if (fetishChangeChance(slave) > jsRandom(0, 100)) {
r.push(`${His} straps pinch and constrict ${him} whenever ${he}'s used. ${He} learns to come in spite of, and then <span class="lightcoral">because of the discomfort.</span>`);
- slave.fetish = "masochist";
- slave.fetishKnown = 1;
- slave.fetishStrength = 10;
+ fetishChange(slave, Fetish.MASOCHIST, 10);
}
}
}
break;
case "chains":
- if (slave.devotion >= -20 && slave.fetish === "masochist" && slave.fetishKnown === 1) {
+ if (slave.devotion >= -20 && slave.fetish === Fetish.MASOCHIST && slave.fetishKnown === 1) {
r.push(`The chains ${he}'s wearing constantly give ${him} little twinges of pain, <span class="hotpink">titillating ${him}.</span>`);
slave.devotion += 2;
} else if (slave.devotion <= 20 && slave.trust >= -50) {
@@ -219,7 +207,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
break;
case "restrictive latex":
- if (slave.devotion > 20 && slave.trust >= -50 && slave.fetish === "submissive") {
+ if (slave.devotion > 20 && slave.trust >= -50 && slave.fetish === Fetish.SUBMISSIVE) {
if (slave.fetishKnown === 0) {
r.push(`The latex ${he}'s wearing limits ${his} world to your input and control. ${He} seems to get off on the lack of control; ${he}'s a <span class="lightcoral">total submissive.</span>`);
slave.fetishKnown = 1;
@@ -237,7 +225,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
break;
case "shibari ropes":
- if (slave.devotion > 20 && slave.trust >= -50 && slave.fetish === "submissive") {
+ if (slave.devotion > 20 && slave.trust >= -50 && slave.fetish === Fetish.SUBMISSIVE) {
if (slave.fetishKnown === 0) {
r.push(`The ropes ${he}'s wearing restrict ${him} and leave ${him} completely helpless. ${He} seems to get off on the lack of control; ${he}'s a <span class="lightcoral">natural submissive.</span>`);
slave.fetishKnown = 1;
@@ -255,7 +243,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
break;
case "no clothing":
- if (slave.devotion > 20 && slave.trust >= -50 && slave.fetish === "submissive") {
+ if (slave.devotion > 20 && slave.trust >= -50 && slave.fetish === Fetish.SUBMISSIVE) {
if (slave.fetishKnown === 0) {
r.push(`${His} complete lack of clothing is a constant reminder that you are in control of access to ${his} body, and there is nowhere to hide. ${He} seems to get off on the lack of control; ${he}'s a <span class="lightcoral">total submissive.</span>`);
slave.fetishKnown = 1;
@@ -273,7 +261,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
break;
default:
- if (slave.devotion >= -20 && slave.fetish === "masochist" && slave.fetishKnown === 1) {
+ if (slave.devotion >= -20 && slave.fetish === Fetish.MASOCHIST && slave.fetishKnown === 1) {
r.push(`The outfit ${he}'s wearing constantly give ${him} little twinges of pain, <span class="hotpink">titillating ${him}.</span>`);
slave.devotion += 2;
} else if (slave.devotion <= 20 && slave.trust >= -50) {
@@ -288,7 +276,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
} else { // nice
switch (slave.clothes) {
case "an apron":
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
if (slave.fetishKnown === 0) {
r.push(`${He} pretends to be embarrassed by wearing nothing but an apron, but seems to get off on how it invites other to take control and use ${him}. <span class="lightcoral">${He}'s a natural submissive.</span>`);
slave.fetishKnown = 1;
@@ -296,9 +284,9 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
r.push(`${He} pretends to be embarrassed by wearing nothing but an apron but <span class="hotpink">secretly gets off</span> on how it invites men to bend ${him} over and put ${him} in ${his} place.`);
slave.devotion += 1;
}
- } else if (slave.fetish === "humiliation") {
+ } else if (slave.fetish === Fetish.HUMILIATION) {
humiliationLikesExposed(slave);
- } else if (slave.fetish === "pregnancy" && (slave.bellyPreg >= 1500 || slave.bellyImplant >= 1500)) {
+ } else if (slave.fetish === Fetish.PREGNANCY && (slave.bellyPreg >= 1500 || slave.bellyImplant >= 1500)) {
if (slave.fetishKnown === 0) {
r.push(`${He} pretends to be embarrassed over only having an apron to cover ${his} gravid swell but seems to get off on it. <span class="lightcoral">${He}'s a pregnancy fetishist.</span>`);
slave.fetishKnown = 1;
@@ -340,7 +328,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
slave.trust += 3;
}
slave.devotion -= 5;
- } else if (slave.fetish === "boobs" && slave.clothes === "a monokini") {
+ } else if (slave.fetish === Fetish.BOOBS && slave.clothes === "a monokini") {
if (slave.fetishKnown === 0) {
r.push(`${He} pretends to be embarrassed by how ${his} monokini draws attention to ${his} breasts but <span class="hotpink">seems to get off on it.</span>`);
slave.devotion += 1;
@@ -351,7 +339,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
r.push(`${He} pretends to be embarrassed by ${his} clearly exposed breasts but <span class="hotpink">secretly gets off on it.</span>`);
slave.devotion += 1;
}
- } else if (slave.fetish === "humiliation" && getExposure(slave) === 3) {
+ } else if (slave.fetish === Fetish.HUMILIATION && getExposure(slave) === 3) {
humiliationLikesExposed(slave);
} else if (slave.dick > 0) {
/* males have trouble with outfit block */ /* return to with crotch description overhaul */
@@ -396,7 +384,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
*/
function collarEffects(slave) {
if (slave.collar === "preg biometrics") {
- if (slave.fetish === "pregnancy" && slave.fetishKnown === 1) {
+ if (slave.fetish === Fetish.PREGNANCY && slave.fetishKnown === 1) {
if (slave.preg < -1) {
r.push(`${His} collar's display reveals all sorts of personal information about ${his} womb, which as an infertile pregnancy fetishist, is <span class="mediumorchid">crippling</span> to ${him}.`);
slave.devotion -= 3;
@@ -404,7 +392,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
r.push(`${His} collar's display reveals all sorts of personal information about ${his} womb, which as a pregnancy fetishist, is <span class="hotpink">pleasing</span> to ${him}.`);
slave.devotion += 1;
}
- } else if (slave.fetish === "pregnancy" && slave.fetishKnown === 0) {
+ } else if (slave.fetish === Fetish.PREGNANCY && slave.fetishKnown === 0) {
if (slave.preg < -1) {
r.push(`${His} collar's display reveals all sorts of personal information about ${his} womb, which nearly causes ${him} to have a <span class="mediumorchid">mental breakdown,</span> painting ${him} as an infertile <span class="lightcoral">pregnancy fetishist.</span>`);
slave.devotion -= 3;
@@ -413,10 +401,10 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
slave.devotion += 1;
}
slave.fetishKnown = 1;
- } else if (slave.fetish === "humiliation" && slave.fetishKnown === 1) {
+ } else if (slave.fetish === Fetish.HUMILIATION && slave.fetishKnown === 1) {
r.push(`${His} collar's display reveals all sorts of personal information about ${his} womb, which is completely humiliating, and <span class="hotpink">pleasing</span> to ${him}.`);
slave.devotion += 1;
- } else if (slave.fetish === "humiliation" && slave.fetishKnown === 0) {
+ } else if (slave.fetish === Fetish.HUMILIATION && slave.fetishKnown === 0) {
r.push(`${His} collar's display reveals all sorts of personal information about ${his} womb, which is completely humiliating, and <span class="hotpink">oddly pleasing</span> to ${him}. ${He} seems to have a <span class="lightcoral">humiliation fetish!</span>`);
slave.devotion += 1;
slave.fetishKnown = 1;
@@ -470,10 +458,10 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
r.push(`The lovely collar ${he} wears fills ${him} with <span class="mediumaquamarine">confidence.</span>`);
slave.trust += 1;
} else if (slave.collar === "leather with cowbell") {
- if (slave.fetish === "boobs" && slave.fetishStrength > 95) {
+ if (slave.fetish === Fetish.BOOBS && slave.fetishStrength > 95) {
r.push(`${He} <span class="hotpink">loves</span> how ${his} cow collar encourages everyone to fuck ${his} udders.`);
slave.devotion += 1;
- } else if (slave.fetish === "boobs" || slave.energy > 95) {
+ } else if (slave.fetish === Fetish.BOOBS || slave.energy > 95) {
r.push(`${He} <span class="hotpink">likes</span> how ${his} cow collar encourages everyone to touch ${his} udders.`);
slave.devotion += 1;
}
@@ -498,18 +486,18 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
} else {
if (slave.faceAccessory === "porcelain mask") {
- if (slave.fetish === "submissive" && slave.fetishStrength > 95) {
+ if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 95) {
r.push(`${He} <span class="hotpink">loves</span> how ${his} mask makes ${him} beautiful enough for you.`);
slave.devotion += 1;
- } else if (slave.fetish === "submissive" || slave.energy > 95) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE || slave.energy > 95) {
r.push(`${He} <span class="hotpink">likes</span> how ${his} mask makes ${him} beautiful enough for you.`);
slave.devotion += 1;
}
} else if (slave.faceAccessory === "cat ears") {
- if (slave.fetish === "submissive" && slave.fetishStrength > 95) {
+ if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 95) {
r.push(`${He} <span class="hotpink">loves</span> how ${his} cat ears make ${him} especially adorable for you.`);
slave.devotion += 1;
- } else if (slave.fetish === "submissive" || slave.energy > 95) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE || slave.energy > 95) {
r.push(`${He} <span class="hotpink">likes</span> how ${his} cat ears make ${him} especially adorable for you.`);
slave.devotion += 1;
}
@@ -545,10 +533,10 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
} else {
if (slave.mouthAccessory === "ball gag" || slave.mouthAccessory === "bit gag" || slave.mouthAccessory === "ring gag") {
- if (slave.fetish === "submissive" && slave.fetishStrength > 95) {
+ if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 95) {
r.push(`${He} <span class="hotpink">loves</span> how ${his} gag forces ${him} to keep silent.`);
slave.devotion += 1;
- } else if (slave.fetish === "submissive" || slave.energy > 95) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE || slave.energy > 95) {
r.push(`${He} <span class="hotpink">likes</span> how ${his} gag forces ${him} to keep silent.`);
slave.devotion += 1;
}
@@ -576,7 +564,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
if (slave.chastityVagina) {
if (slave.devotion > 20) {
if (slave.vagina === 0) {
- if (slave.fetish === "buttslut" && slave.fetishStrength > 60) {
+ if (slave.fetish === Fetish.BUTTSLUT && slave.fetishStrength > 60) {
if (slave.fetishKnown === 1) {
r.push(`${He}'s such an anal whore that ${he}'s <span class="hotpink">perversely proud</span> of the chastity belt that covers ${his} neglected pussy.`);
slave.devotion += 1;
@@ -590,7 +578,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
} else {
if (slave.energy > 60) {
- if (slave.fetish === "buttslut" && slave.fetishStrength > 60) {
+ if (slave.fetish === Fetish.BUTTSLUT && slave.fetishStrength > 60) {
if (slave.fetishKnown === 1) {
r.push(`${He}'s such a butthole slut that ${he} doesn't care about having ${his} pussy kept off limits.`);
} else {
@@ -611,7 +599,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
if (slave.devotion >= -20) {
if (slave.energy > 40) {
if (slave.hormoneBalance < 100) {
- if (slave.fetish === "buttslut" && slave.fetishStrength > 60) {
+ if (slave.fetish === Fetish.BUTTSLUT && slave.fetishStrength > 60) {
if (slave.fetishKnown === 1) {
r.push(`${He}'s such a butthole slut that ${he} manages to get off just fine despite ${his} dick being kept untouchable and soft behind a chastity cage.`);
} else {
@@ -625,7 +613,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
r.push(`keeps ${his} dick soft and untouched;`);
}
r.push(`it's almost always dripping a stream of precum.`);
- } else if (slave.fetish === "masochist" && slave.fetishStrength > 60 && canAchieveErection(slave)) {
+ } else if (slave.fetish === Fetish.MASOCHIST && slave.fetishStrength > 60 && canAchieveErection(slave)) {
if (slave.fetishKnown === 1) {
r.push(`${He}'s such a masochist that the pain of even getting semi-hard in ${his} chastity cage turns ${him} on even more, <span class="libido inc">slightly increasing ${his} sexual appetite.</span>`);
slave.energy++;
@@ -664,6 +652,10 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
*/
function bellyAccessories(slave) {
if (slave.bellyAccessory === "an extreme corset") {
+ if (slave.inflation > 0) {
+ r.push(`The pressure of ${his} corsetage <span class="change negative">renders ${him} unable to keep filling ${his} guts with ${slave.inflationType}.</span>`);
+ deflate(slave);
+ }
if (slave.belly >= 100000) {
r.push(`${His} straining corset finally gives in to ${his} giant stomach and bursts, freeing ${his} belly.`);
slave.bellyAccessory = "none";
@@ -677,7 +669,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
TerminatePregnancy(slave);
actX(slave, "miscarriages");
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.devotion < -50) {
r.push(`${He} is <span class="mediumorchid">filled with violent, consuming hatred</span> and <span class="gold">fear.</span> Even though ${he} knew ${his} baby was destined for a slave orphanage, it seems ${he} cared for it and views you as its killer.`);
slave.devotion -= 25;
@@ -711,13 +703,13 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
if (slave.waist >= -40) {
r.push(`It's so tight that it's <span class="health dec">unhealthy.</span>`);
healthDamage(slave, 5);
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.devotion < -20) {
r.push(`${He} <span class="hotpink">barely has breath to think,</span> though ${he} has enough to <span class="gold">fear.</span>`);
slave.devotion += 2;
slave.trust -= 2;
}
- if (slave.fetish === "masochist") {
+ if (slave.fetish === Fetish.MASOCHIST) {
r.push(`During sex, every breath in and out is agonizing.`);
if (slave.fetishKnown === 0) {
r.push(`Despite this, ${he} seems to get off on the pain; ${he}'s a <span class="lightcoral">natural masochist.</span>`);
@@ -730,12 +722,10 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
slave.fetishStrength += 2;
}
}
- } else if (slave.fetish === "none" || slave.fetishKnown === 0) {
+ } else if (slave.fetish === Fetish.NONE || slave.fetishKnown === 0) {
if (fetishChangeChance(slave) > jsRandom(0, 100)) {
r.push(`During sex, every breath in and out is agonizing. ${He} learns to come in spite of, and then <span class="lightcoral">because of the pain.</span>`);
- slave.fetish = "masochist";
- slave.fetishKnown = 1;
- slave.fetishStrength = 10;
+ fetishChange(slave, Fetish.MASOCHIST, 10);
}
}
}
@@ -743,6 +733,10 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
}
} else if (slave.bellyAccessory === "a corset") {
+ if (slave.inflation > 0) {
+ r.push(`The pressure of ${his} corsetage <span class="change negative">renders ${him} unable to keep filling ${his} guts with ${slave.inflationType}.</span>`);
+ deflate(slave);
+ }
if (slave.bellyPreg >= 1500) {
r.push(`${His} corset lets ${his} growing belly protrude comfortably, preventing any danger to ${his} pregnancy but preventing any effect on ${his} waist.`);
} else if (slave.belly >= 1500) {
@@ -764,11 +758,11 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
r.push(`${He} has trouble keeping ${his} fake belly strapped around ${his} huge gut, forcing it to be removed to prevent damage.`);
slave.bellyAccessory = "none";
} else {
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.sexualFlaw === "breeder") {
r.push(`${He} <span class="mediumorchid">resents</span> being forced to carry a fake pregnancy instead of a real one.`);
slave.devotion -= 5;
- } else if (slave.devotion <= 20 && slave.trust >= -50 && slave.fetish === "pregnancy") {
+ } else if (slave.devotion <= 20 && slave.trust >= -50 && slave.fetish === Fetish.PREGNANCY) {
if (slave.fetishStrength > 60) {
r.push(`As a pregnancy fetishist, ${he} <span class="hotpink">openly enjoys</span> wearing ${his} fake belly around.`);
slave.devotion += 2;
@@ -776,10 +770,10 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
r.push(`${His} interest in pregnancy helps ${him} <span class="hotpink">enjoy</span> wearing a fake belly.`);
slave.devotion += 1;
}
- } else if (slave.fetish === "pregnancy" && slave.devotion > 50) {
+ } else if (slave.fetish === Fetish.PREGNANCY && slave.devotion > 50) {
r.push(`${He} carries ${his} fake belly <span class="hotpink">with pride,</span> eager for the day you give ${him} one of ${his} own.`);
slave.devotion += 1;
- } else if (slave.fetish === "pregnancy" && slave.pregKnown === 0 && (slave.ovaries === 1 || slave.mpreg === 1)) {
+ } else if (slave.fetish === Fetish.PREGNANCY && slave.pregKnown === 0 && (slave.ovaries === 1 || slave.mpreg === 1)) {
r.push(`The fake belly ${he} wears <span class="mediumorchid">reminds ${him}</span> that ${he} isn't pregnant with a child.`);
slave.devotion -= 1;
} else if (slave.vagina === 0 && isFertile(slave) && arcology.FSRepopulationFocus === "unset" && slave.devotion <= 20) {
@@ -795,14 +789,13 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
slave.devotion -= 1;
}
}
- if (slave.fetish === "pregnancy" && slave.fetishStrength <= 95) {
+ if (slave.fetish === Fetish.PREGNANCY && slave.fetishStrength <= 95) {
if (jsRandom(1, 100) >= 20) {
r.push(`Pretending to be pregnant has <span class="lightcoral">furthered ${his} interest in pregnancy.</span>`);
slave.fetishStrength += 4;
} else if (slave.fetishStrength <= 40) {
r.push(`Lugging around a fake pregnancy for the week has shown ${him} ${he} <span class="coral">isn't as into pregnancy as ${he} thought.</span>`);
- slave.fetish = "none";
- slave.fetishStrength = 10;
+ fetishChange(slave, Fetish.NONE, 10);
}
}
}
@@ -817,7 +810,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
function legAccessories(slave) {
if (slave.shoes === "heels") {
if (hasAnyNaturalLegs(slave)) {
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.devotion < -20) {
r.push(`${He} <span class="mediumorchid">resents being forced</span> to wear high heels.`);
slave.devotion -= 2;
@@ -840,7 +833,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
} else if (slave.shoes === "boots") {
if (hasAnyNaturalLegs(slave)) {
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.devotion < -20) {
r.push(`${He} <span class="mediumorchid">resents being forced</span> to wear high heeled boots.`);
slave.devotion -= 2;
@@ -863,12 +856,12 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
} else if (slave.shoes === "extreme heels") {
if (hasAnyNaturalLegs(slave)) {
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.devotion < -20) {
r.push(`${He} <span class="mediumorchid">resents being forced</span> to wear <span class="gold">painfully</span> high heels.`);
slave.devotion -= 2;
slave.trust -= 2;
- } else if (slave.fetish === "masochist") {
+ } else if (slave.fetish === Fetish.MASOCHIST) {
r.push(`It is difficult to walk in ${his} extreme heels, but ${he}`);
if (slave.fetishKnown === 0) {
r.push(`seems to enjoy every painful step; ${he}'s a <span class="lightcoral">natural masochist.</span>`);
@@ -906,7 +899,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
r.push(`out of them.`);
}
} else {
- if (slave.heels === 1 && !canWalk(slave) && slave.fetish !== "mindbroken") {
+ if (slave.heels === 1 && !canWalk(slave) && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.shoes === "pumps") {
r.push(`While ${he} can just barely stand with ${his} heeled pumps, ${he} is incapable of taking a step in them.`);
}
@@ -937,7 +930,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
} else {
r.push(`${His} pussy easily accommodates the dildo ${he}'s required to wear.`);
}
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.sexualFlaw === "hates penetration" && jsRandom(1, 100) > 50) {
r.push(`The habit <span class="green">reduces ${his} dislike of having ${his} pussy filled.</span>`);
slave.sexualFlaw = "none";
@@ -964,7 +957,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
r.push(`${His} pussy accommodates the large dildo ${he}'s required to wear.`);
}
if (slave.fuckdoll === 0) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.vagina < 2) {
if (dildo.length === 1) {
r.push(`The big dildo in ${his} tight cunt`);
@@ -1001,11 +994,11 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
if (dildo.length === 1) {
if (slave.vagina < 4) {
if (slave.fuckdoll === 0) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.sexualQuirk === "size queen") {
r.push(`${He} thinks of the massive dildo stretching out ${his} womanhood as <span class="lime">preparation for the biggest cocks,</span> and <span class="hotpink">looks forward</span> to take anything — dicks, hands, truly anything — inside ${his} newly capacious cunt.`);
slave.devotion += 4;
- } else if (slave.fetish === "masochist" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
+ } else if (slave.fetish === Fetish.MASOCHIST && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
r.push(`${He} gets off on the agony of having ${his} cunt`);
if (V.seeStretching === 1) {
r.push(`<span class="lime">permanently stretched</span>`);
@@ -1015,7 +1008,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
r.push(`by a huge dildo. The terrible combination of pain and pleasure <span class="hotpink">breaks ${his} will</span> but fills ${him} with <span class="gold">fear.</span>`);
slave.devotion += 5;
slave.trust -= 5;
- } else if (slave.fetish === "submissive" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
r.push(`${He} submits to the agony of having ${his} cunt`);
if (V.seeStretching === 1) {
r.push(`<span class="lime">permanently stretched</span>`);
@@ -1049,11 +1042,11 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
} else {
if (slave.vagina < 4) {
if (slave.fuckdoll === 0) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.sexualQuirk === "size queen") {
r.push(`${He} thinks of the massive dildo stretching out ${his} womanhood and stomach as <span class="lime">preparation for the biggest cocks,</span> and <span class="hotpink">looks forward</span> to take anything — dicks, hands, arms, truly anything — inside ${his} newly capacious cunt.`);
slave.devotion += 4;
- } else if (slave.fetish === "masochist" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
+ } else if (slave.fetish === Fetish.MASOCHIST && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
r.push(`${He} gets off on the agony of having ${his} cunt`);
if (V.seeStretching === 1) {
r.push(`<span class="lime">permanently stretched</span>`);
@@ -1063,7 +1056,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
r.push(`and ${his} cervix penetrated by a huge dildo. The terrible combination of pain and pleasure <span class="hotpink">breaks ${his} will</span> but fills ${him} with <span class="gold">fear.</span>`);
slave.devotion += 5;
slave.trust -= 5;
- } else if (slave.fetish === "submissive" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
r.push(`${He} submits to the agony of having ${his} cunt`);
if (V.seeStretching === 1) {
r.push(`<span class="lime">permanently stretched</span>`);
@@ -1160,7 +1153,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
*/
function largeButtPlugEffect(slave) {
r.push(`${His} anus accommodates the large plug ${he}'s required to wear.`);
- if (slave.fetish === "buttslut" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
+ if (slave.fetish === Fetish.BUTTSLUT && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
r.push(`In fact, ${he} <span class="hotpink">regularly orgasms</span> even in non-sexual situations as the plug is <span class="libido inc">constantly stimulating</span> ${his} rear-end.`);
slave.devotion += 1;
slave.energy += 1;
@@ -1174,7 +1167,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
const plugDiameter = plugWidth(slave);
if (plugDiameter === 1) {
if (["cat tail", "cow tail", "fox tail", "tail"].includes(slave.buttplugAttachment)) {
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.anus < 1) {
r.push(`Constantly wearing a tail plug in ${his} virgin butthole <span class="lime">stretches it out</span> and <span class="gold">is a constant degrading reminder of ${his} submission.</span>`);
slave.anus += 1;
@@ -1186,7 +1179,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
smallButtPlugEffects(slave);
}
} else {
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.anus < 1) {
r.push(`Constantly wearing a plug in ${his} virgin butthole <span class="lime">stretches it out.</span>`);
slave.anus += 1;
@@ -1198,7 +1191,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
} else if (plugDiameter === 2) {
if (["cat tail", "cow tail", "fox tail", "tail"].includes(slave.buttplugAttachment)) {
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.anus < 2) {
r.push(`The uncomfortable tailed plug in ${his} asshole`);
if (slave.sexualQuirk === "size queen") {
@@ -1227,7 +1220,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
largeButtPlugEffect(slave);
}
} else {
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.anus < 2) {
r.push(`The uncomfortable plug in ${his} asshole`);
if (slave.sexualQuirk === "size queen") {
@@ -1257,12 +1250,12 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
} else if (plugDiameter === 3) {
if (["cat tail", "cow tail", "fox tail", "tail"].includes(slave.buttplugAttachment)) {
if (slave.anus < 4) {
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.sexualQuirk === "size queen") {
r.push(`${He} thinks of the horribly huge tailed plug ${he} has wear in ${his} butt as <span class="lime">preparation for the biggest cocks,</span> and <span class="hotpink">looks forward</span> to being able to safely take unlubricated anal from them. Even so, the tail hanging from ${his} rear is <span class="gold">a constant degrading reminder of ${his} submission.</span>`);
slave.devotion += 4;
slave.trust -= 5;
- } else if (slave.fetish === "masochist" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
+ } else if (slave.fetish === Fetish.MASOCHIST && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
r.push(`${He} gets off on the agony of having ${his} anal sphincter`);
if (V.seeStretching === 1) {
r.push(`<span class="lime">permanently gaped</span>`);
@@ -1272,7 +1265,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
r.push(`by a huge tailed buttplug, but can't ignore the tail hanging from the back of the plug. The terrible combination of anal pleasure and degradation <span class="hotpink">breaks ${his} will</span> and fills ${him} with <span class="gold">humiliation.</span>`);
slave.devotion += 5;
slave.trust -= 7;
- } else if (slave.fetish === "submissive" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
r.push(`${He} submits to the agony of having ${his} anal sphincter`);
if (V.seeStretching === 1) {
r.push(`<span class="lime">permanently gaped</span>`);
@@ -1301,7 +1294,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
} else {
r.push(`${His} gaping anus accommodates the huge tailed plug ${he}'s required to wear, serving little purpose other than to remind ${him} of ${his} <span class="gold">humiliation.</span>`);
- if (slave.fetish === "buttslut" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
+ if (slave.fetish === Fetish.BUTTSLUT && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
r.push(`In fact, ${he} <span class="hotpink">regularly orgasms</span> even in non-sexual situations as the plug is <span class="libido inc">constantly stimulating</span> ${his} rear-end.`);
slave.devotion += 1;
slave.energy += 1;
@@ -1309,11 +1302,11 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
} else {
if (slave.anus < 4) {
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.sexualQuirk === "size queen") {
r.push(`${He} thinks of the horribly huge plug ${he} has wear in ${his} butt as <span class="lime">preparation for the biggest cocks,</span> and <span class="hotpink">looks forward</span> to being able to safely take unlubricated anal from them.`);
slave.devotion += 4;
- } else if (slave.fetish === "masochist" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
+ } else if (slave.fetish === Fetish.MASOCHIST && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
r.push(`${He} gets off on the agony of having ${his} anal sphincter`);
if (V.seeStretching === 1) {
r.push(`<span class="lime">permanently gaped</span>`);
@@ -1323,7 +1316,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
r.push(`by a huge buttplug. The terrible combination of pain and pleasure <span class="hotpink">breaks ${his} will</span> but fills ${him} with <span class="gold">fear.</span>`);
slave.devotion += 5;
slave.trust -= 5;
- } else if (slave.fetish === "submissive" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
r.push(`${He} submits to the agony of having ${his} anal sphincter`);
if (V.seeStretching === 1) {
r.push(`<span class="lime">permanently gaped</span>`);
@@ -1352,7 +1345,7 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
} else {
r.push(`${His} gaping anus accommodates the huge plug ${he}'s required to wear.`);
- if (slave.fetish === "buttslut" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
+ if (slave.fetish === Fetish.BUTTSLUT && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
r.push(`In fact, ${he} <span class="hotpink">regularly orgasms</span> even in non-sexual situations as the plug is <span class="libido inc">constantly stimulating</span> ${his} rear-end.`);
slave.devotion += 1;
slave.energy += 1;
@@ -1360,29 +1353,25 @@ App.SlaveAssignment.clothes = function saClothes(slave) {
}
}
}
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (["cat tail", "cow tail", "fox tail", "tail"].includes(slave.buttplugAttachment)) {
- if (slave.fetish === "humiliation" && slave.fetishKnown === 0) {
+ if (slave.fetish === Fetish.HUMILIATION && slave.fetishKnown === 0) {
r.push(`${He} shows a surprising lack of resistance to the routine of having a tail inserted in ${his} ass each morning; ${he} seems to <span class="lightcoral">naturally enjoy the humiliation.</span>`);
slave.fetishKnown = 1;
- } else if (slave.fetish === "none" || slave.fetishKnown === 0) {
+ } else if (slave.fetish === Fetish.NONE || slave.fetishKnown === 0) {
if (fetishChangeChance(slave) > jsRandom(0, 100)) {
r.push(`Slowly, ${his} shame at having a tail inserted in ${his} ass each morning turns to secret enjoyment and finally to <span class="lightcoral">open arousal at the humiliating accessory.</span>`);
- slave.fetish = "humiliation";
- slave.fetishKnown = 1;
- slave.fetishStrength = 10;
+ fetishChange(slave, Fetish.HUMILIATION, 10);
}
}
} else if (plugWidth(slave) > 0) {
- if (slave.fetish === "buttslut" && slave.fetishKnown === 0) {
+ if (slave.fetish === Fetish.BUTTSLUT && slave.fetishKnown === 0) {
r.push(`${He} shows a surprising lack of resistance to the routine of getting the plug up ${his} butt in the morning; ${he} seems to <span class="lightcoral">naturally enjoy anal stimulation.</span>`);
slave.fetishKnown = 1;
- } else if (slave.fetish === "none" || slave.fetishKnown === 0) {
+ } else if (slave.fetish === Fetish.NONE || slave.fetishKnown === 0) {
if (fetishChangeChance(slave) > jsRandom(0, 100)) {
r.push(`Slowly, ${his} anguish at getting the plug up ${his} butt in the morning turns to secret enjoyment and finally to <span class="lightcoral">open arousal at having ${his} anus filled.</span>`);
- slave.fetish = "buttslut";
- slave.fetishKnown = 1;
- slave.fetishStrength = 10;
+ fetishChange(slave, Fetish.BUTTSLUT, 10);
}
}
}
diff --git a/src/endWeek/saDevotion.js b/src/endWeek/saDevotion.js
index 5582875272dd5b5fcf740e65a0baee2aa4ea95ad..a9ebe078047c094c8b60dd962d5ab7c5e6e6505a 100644
--- a/src/endWeek/saDevotion.js
+++ b/src/endWeek/saDevotion.js
@@ -15,7 +15,7 @@ App.SlaveAssignment.devotion = function saDevotion(slave) {
const gettingPersonalAttention = V.personalAttention.task === PersonalAttention.TRAINING && V.personalAttention.slaves.some((s) => s.ID === slave.ID);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
mindbreakDevotion(slave);
} else if (slave.fuckdoll !== 0) {
fuckdollDevotion(slave);
diff --git a/src/endWeek/saDiet.js b/src/endWeek/saDiet.js
index a6fc4a50cf315bfc8e9df705ca10dabcf11808e1..956fdc75980fe920c2f3773b3db0abcdda518d4b 100644
--- a/src/endWeek/saDiet.js
+++ b/src/endWeek/saDiet.js
@@ -26,7 +26,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
}
foodEffects(slave);
geneticQuirkEffects(slave);
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.dietCum > 0) {
cumDiet(slave);
}
@@ -91,7 +91,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
slave.weight -= 9;
}
} else {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.behavioralFlaw === "anorexic") {
if (slave.devotion >= -20) {
r.push(`As an anorexic, <span class="devotion inc">${he} derives perverse enjoyment from being underfed.</span>`);
@@ -112,7 +112,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
if (slave.devotion <= 20) {
if (slave.dietCum > 0) {
if (slave.sexualFlaw !== "cum addict") {
- if (slave.fetish !== "cumslut") {
+ if (slave.fetish !== Fetish.CUMSLUT) {
if (slave.dietCum === 2) {
if (V.cockFeeder === 0) {
if (random(1, 100) > 50) {
@@ -273,7 +273,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
}
weightGainShared(slave);
} else {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.behavioralFlaw === "anorexic") {
r.push(`Suffering from anorexia, <span class="devotion dec">${he} is intensely resentful of being overfed.</span>`);
slave.devotion -= 5;
@@ -295,7 +295,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
if (slave.devotion <= 20) {
if (slave.dietCum > 0) {
if (slave.sexualFlaw !== "cum addict") {
- if (slave.fetish !== "cumslut") {
+ if (slave.fetish !== Fetish.CUMSLUT) {
if (slave.dietCum === 2) {
if (V.cockFeeder === 0) {
if (random(1, 100) > 50) {
@@ -380,7 +380,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
}
if (slave.dietMilk > 0) {
if (slave.sexualFlaw !== "breast growth") {
- if (slave.fetish !== "pregnancy") {
+ if (slave.fetish !== Fetish.PREGNANCY) {
if (slave.dietMilk === 2) {
if (V.cockFeeder === 0) {
r.push(`Despite ${his} food being based on huge quantities of breast milk, ${he} manages to keep most of it down, but <span class="devotion dec">${he} hates you for it.</span>`);
@@ -525,7 +525,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
r.push(`By carefully adjusting ${his} intake, ${he} slowly puts on weight without realizing it.`);
} else if (slave.weight > 10) {
weightShift = -(V.feeder + 1);
- r.push(`By carefully adjusting ${his} intake, ${he} slowly loses on weight without realizing it.`);
+ r.push(`By carefully adjusting ${his} intake, ${he} slowly loses weight without realizing it.`);
}
if (slave.weightDirection === -1) {
slave.weight += (weightShift - random(0, 1));
@@ -930,27 +930,25 @@ App.SlaveAssignment.diet = function saDiet(slave) {
slave.balls += 1;
}
} else {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.attrXX < 80) {
r.push(`${He} finds ${himself} <span class="improvement">fantasizing about fucking girls</span> in ${his} free time.`);
slave.attrXX += 2;
}
if (slave.fetishKnown === 1) {
- if (slave.fetishStrength < 95 && slave.fetish === "pregnancy") {
+ if (slave.fetishStrength < 95 && slave.fetish === Fetish.PREGNANCY) {
r.push(`${His} thoughts frequently drift towards <span class="fetish inc">bellies swelling with ${his} children</span> whenever ${he} has sex or pleasures ${himself}.`);
slave.fetishStrength += 1;
- } else if (slave.energy < 90 && slave.fetish === "pregnancy") {
+ } else if (slave.energy < 90 && slave.fetish === Fetish.PREGNANCY) {
r.push(`${His} eagerness for sex <span class="libido inc">grows stronger</span> the more ${his} aching nuts yearn to inseminate a fertile womb.`);
slave.energy += 1;
}
}
if (slave.fetishStrength <= 65) {
- if (slave.fetish !== "pregnancy") {
+ if (slave.fetish !== Fetish.PREGNANCY) {
if (fetishChangeChance(slave) > random(0, 100)) {
r.push(`${He} begins to find the thought of filling a fertile womb with sperm <span class="fetish gain">irresistible.</span>`);
- slave.fetish = "pregnancy";
- slave.fetishStrength = 10;
- slave.fetishKnown = 1;
+ fetishChange(slave, Fetish.PREGNANCY, 10);
}
}
}
@@ -1080,7 +1078,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
}
}
if (slave.fuckdoll === 0) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.attrXY < 100) {
r.push(`${He} begins to find men <span class="change positive">a little more attractive</span> thanks to the female hormones.`);
slave.attrXY += 1;
@@ -1176,7 +1174,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
}
}
if (slave.fuckdoll === 0) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.attrXX < 100) {
r.push(`${He} begins to find women <span class="change positive">a little more attractive</span> thanks to the male hormones.`);
slave.attrXX += 1;
@@ -1236,7 +1234,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
slave.waist--;
}
if (slave.fuckdoll === 0) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.attrXX < 100) {
r.push(`${He} begins to find women <span class="change positive">a little more attractive</span> thanks to ${his} specialized hormones.`);
slave.attrXX += 1;
@@ -1263,7 +1261,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
function cleansingDiet(slave) {
if (slave.fuckdoll > 0) {
r.push(`The ports in Fuckdoll suits allow total dietary control, and ${he}'s barely aware ${he}'s <span class="health inc">becoming healthier.</span>`);
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${His} diet tastes and smells awful, but such things are lost on ${his} broken mind. ${His} body <span class="health inc">appreciates</span> it, however.`);
} else if (!canSmell(slave) && !canTaste(slave)) {
r.push(`${His} diet tastes and smells awful, but ${he} is incapable of recognizing it, allowing ${him} to feel nothing but its <span class="health inc">significant restorative effect.</span> ${He} <span class="trust inc">trusts you more</span> since you seem to care about ${his} health.`);
@@ -1329,7 +1327,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
}
}
if (slave.diet === "fertility" && slave.fuckdoll === 0) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} doesn't really notice that <span class="change positive">${his} body is being prepared to`);
if (superFetKnown) {
r.push(`develop additional pregnancies`);
@@ -1443,7 +1441,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
roll = 75;
target = Math.trunc(Math.clamp(weightGain * 2 - (boobSize - growthGoal) / 20, 0, 68));
}
- if (slave.geneMods.NCS === 1) {
+ if (slave.geneMods.NCS === 1 || V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 1) {
roll *= 2;
}
if (random(1, roll) <= target) {
@@ -1464,7 +1462,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
roll = 80000;
target = Math.trunc(Math.clamp(weightGain * 1000 - (buttSize * 1000 - growthGoal) * 4, 0, 72000));
}
- if (slave.geneMods.NCS === 1) {
+ if (slave.geneMods.NCS === 1 || V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 1) {
roll *= 2;
}
if (random(1, roll) <= target) {
@@ -1525,25 +1523,25 @@ App.SlaveAssignment.diet = function saDiet(slave) {
* @returns {string}
*/
function ejaculateDescription(slave) {
- if (slave.fetish === "masochist") {
+ if (slave.fetish === Fetish.MASOCHIST) {
return `ejaculate of an abusive lover`;
- } else if (slave.fetish === "boobs") {
+ } else if (slave.fetish === Fetish.BOOBS) {
return `fresh milk from a pretty dairy cow`;
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
return `ejaculate of a dominant partner`;
- } else if (slave.fetish === "pregnancy") {
+ } else if (slave.fetish === Fetish.PREGNANCY) {
if (slave.ovaries === 1 || slave.mpreg === 1) {
return `ejaculate of ${his} future baby's father`;
} else {
return `key to someday siring a child.`;
}
- } else if (slave.fetish === "sadist") {
+ } else if (slave.fetish === Fetish.SADIST) {
return `ejaculate of a painslut ${he} recently milked`;
- } else if (slave.fetish === "buttslut") {
+ } else if (slave.fetish === Fetish.BUTTSLUT) {
return `ejaculate of a cock that just came from ${his} butt`;
- } else if (slave.fetish === "dom") {
+ } else if (slave.fetish === Fetish.DOM) {
return `ejaculate of a weak-minded submissive`;
- } else if (slave.fetish === "humiliation") {
+ } else if (slave.fetish === Fetish.HUMILIATION) {
return `ejaculate of a publicly used slut`;
} else {
return `ejaculate of a gentle lover`;
@@ -1555,30 +1553,28 @@ App.SlaveAssignment.diet = function saDiet(slave) {
*/
function cumDiet(slave) {
if (slave.devotion > 20) { // Diet effects for Devotion over 20 — For ALL cum diets
- if (slave.fetishStrength > 95 && slave.fetish === "cumslut" && slave.fetishKnown === 1) {
+ if (slave.fetishStrength > 95 && slave.fetish === Fetish.CUMSLUT && slave.fetishKnown === 1) {
r.push(`${He} <span class="devotion inc">regularly orgasms</span> while sucking down ${his} cum-infused breakfast.`);
slave.devotion += 1;
- } else if (slave.energy > 95 || (slave.fetish === "cumslut" && slave.fetishKnown === 1)) {
+ } else if (slave.energy > 95 || (slave.fetish === Fetish.CUMSLUT && slave.fetishKnown === 1)) {
r.push(`${He} <span class="devotion inc">enjoys</span> the perversity of having large amounts of ejaculate in ${his} diet.`);
slave.devotion += 1;
- } else if (slave.fetish === "cumslut") { // high energy obscures cumlust
+ } else if (slave.fetish === Fetish.CUMSLUT) { // high energy obscures cumlust
r.push(`${He} <span class="devotion inc">seems to enjoy</span> consuming large amounts of ejaculate with each meal. ${He} undeniably <span class="fetish gain">has a taste for cum.</span>`);
slave.devotion += 1;
slave.fetishKnown = 1;
}
if (slave.fetishStrength <= 95) {
- if (slave.fetish !== "cumslut") {
+ if (slave.fetish !== Fetish.CUMSLUT) {
if (fetishChangeChance(slave) > random(0, 100)) {
r.push(`After sucking down cum for sustenance, ${he} has started to think of the stuff as a <span class="fetish gain">normal part</span> of life.`);
- slave.fetish = "cumslut";
- slave.fetishKnown = 1;
- slave.fetishStrength = 10;
+ fetishChange(slave, Fetish.CUMSLUT, 10);
}
}
}
} else { // For devotion under 20. This is for all cum diets EXCEPT restricted and fattening diets. See above for those effects
if (slave.sexualFlaw !== "cum addict") {
- if (slave.fetish !== "cumslut") {
+ if (slave.fetish !== Fetish.CUMSLUT) {
if (slave.diet !== "fattening" && slave.diet !== "restricted") {
if (slave.energy < 60) {
if (slave.dietCum === 2) {
@@ -1655,7 +1651,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
slave.devotion -= 4;
}
}
- } else if (slave.fetish === "cumslut") {
+ } else if (slave.fetish === Fetish.CUMSLUT) {
if (slave.fetishKnown === 0) {
r.push(`Being forced to get ${his} sustenance only by working the phallic food dispensers in the kitchen has revealed something: <span class="fetish gain">${he}'s got an oral fetish!</span>`);
slave.fetishKnown = 1;
@@ -1670,9 +1666,7 @@ App.SlaveAssignment.diet = function saDiet(slave) {
slave.devotion -= 2;
} else if (fetishChangeChance(slave) > random(0, 100)) {
r.push(`Getting ${his} sustenance only after working the phallic food dispensers in the kitchen makes sucking cock to completion such an integral part of ${his} life that ${he} starts to <span class="fetish gain">fetishize ejaculate.</span>`);
- slave.fetish = "cumslut";
- slave.fetishKnown = 1;
- slave.fetishStrength = 10;
+ fetishChange(slave, Fetish.CUMSLUT, 10);
}
}
}
diff --git a/src/endWeek/saDrugs.js b/src/endWeek/saDrugs.js
index 9c47f80ea24b7b25b56386f727b575597f3857ed..5395ab1892f4788c4e452654d521684a8b855630 100644
--- a/src/endWeek/saDrugs.js
+++ b/src/endWeek/saDrugs.js
@@ -109,7 +109,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
}
break;
case "psychosuppressants":
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
r += `The psychosuppressants <span class="hotpink">reduce ${his} ability to question ${his} role</span> or <span class="mediumaquamarine">think independently.</span>`;
slave.devotion += 4;
slave.trust += 4;
@@ -117,7 +117,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
r += ` They <span class="orange">negatively impact ${his} intelligence,</span> as well.`;
slave.intelligence -= 5;
}
- if (slave.fuckdoll === 0 && slave.intelligence < -15 && slave.fetishStrength <= 60 && slave.fetish !== "submissive" && fetishChangeChance(slave) > jsRandom(0, 100)) {
+ if (slave.fuckdoll === 0 && slave.intelligence < -15 && slave.fetishStrength <= 60 && slave.fetish !== Fetish.SUBMISSIVE && fetishChangeChance(slave) > jsRandom(0, 100)) {
r += ` The willingness to <span class="lightcoral">submit</span> created by the drugs invades ${his} sexuality, too.`;
slave.fetish = "submissive";
slave.fetishKnown = 1;
@@ -129,7 +129,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
break;
case "psychostimulants":
r += `${He} takes a cup of <span class="deepskyblue">mind stimulating</span> tea with each meal;`;
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
r += ` the soothing drink <span class="mediumaquamarine">sets ${his} thoughts at ease.</span>`;
if (slave.devotion < -50) {
slave.trust += 6;
@@ -188,7 +188,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
}
growth -= 1;
} else if (slave.weight > 130) {
- r += ` the enormous diet ${he} eats to maintain ${his} hugely fat body helps support growth, `;
+ r += ` the enormous diet ${he} eats to maintain ${his} ${slave.weight > 195 ? `whale-like` : `hugely fat`} body helps support growth, `;
if (slave.health.condition > -20) {
r += `and`;
} else {
@@ -196,7 +196,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
}
growth += 4;
} else if (slave.weight > 30) {
- r += ` the generous diet ${he} eats to maintain ${his} fat body helps support growth, `;
+ r += ` the generous diet ${he} eats to maintain ${his} ${slave.weight > 95 ? `fat` : `chubby`} body helps support growth, `;
if (slave.health.condition > -20) {
r += `and`;
} else {
@@ -349,7 +349,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
}
growth -= 2;
} else if (slave.weight > 130) {
- r += ` the enormous diet ${he} eats to maintain ${his} hugely fat body helps support growth, `;
+ r += ` the enormous diet ${he} eats to maintain ${his} ${slave.weight > 195 ? `whale-like` : `hugely fat`} body helps support growth, `;
if (slave.health.condition > -20) {
r += `and`;
} else {
@@ -357,7 +357,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
}
growth++;
} else if (slave.weight > 30) {
- r += ` the generous diet ${he} eats to maintain ${his} fat body helps support growth, `;
+ r += ` the generous diet ${he} eats to maintain ${his} ${slave.weight > 95 ? `fat` : `chubby`} body helps support growth, `;
if (slave.health.condition > -20) {
r += `and`;
} else {
@@ -565,11 +565,11 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
dietInfluence = true;
growth -= 2;
} else if (slave.weight > 130) {
- r += ` the generous diet ${he} eats to maintain ${his} fat body helps support growth, `;
+ r += ` the enormous diet ${he} eats to maintain ${his} ${slave.weight > 195 ? `whale-like` : `hugely fat`} body helps support growth, `;
dietInfluence = true;
growth += 3;
} else if (slave.weight > 30) {
- r += ` the generous diet ${he} eats to maintain ${his} fat body helps support growth, `;
+ r += ` the generous diet ${he} eats to maintain ${his} ${slave.weight > 95 ? `fat` : `chubby`} body helps support growth, `;
dietInfluence = true;
growth++;
} else if (slave.weight <= -30) {
@@ -668,11 +668,11 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
dietInfluence = true;
growth -= 0.2;
} else if (slave.weight > 130) {
- r += ` the enormous diet ${he} eats to maintain ${his} hugely fat body helps support growth, `;
+ r += ` the enormous diet ${he} eats to maintain ${his} ${slave.weight > 195 ? `whale-like` : `hugely fat`} body helps support growth, `;
dietInfluence = true;
growth += 0.2;
} else if (slave.weight > 30) {
- r += ` the generous diet ${he} eats to maintain ${his} fat body helps support growth, `;
+ r += ` the generous diet ${he} eats to maintain ${his} ${slave.weight > 95 ? `fat` : `chubby`} body helps support growth, `;
dietInfluence = true;
growth += 0.1;
} else if (slave.weight <= -30) {
@@ -1579,7 +1579,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
}
TerminatePregnancy(slave);
actX(slave, "miscarriages");
- if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0) {
r += ` ${He} is`;
if (slave.devotion < -50) {
r += ` <span class="mediumorchid">filled with violent, consuming hatred</span> and <span class="gold">fear.</span> Even though ${he} knew ${his} baby was destined for a slave orphanage, it seems ${he} cared for it and views you as its killer.`;
@@ -1633,7 +1633,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
if (slave.health.condition > 90) {
r += ` ${His} health is already outstanding and cannot be improved with further drug treatment. <span class="yellow">${His} drug regimen has defaulted to preventatives.</span>`;
slave.curatives = 1;
- } else if ((slave.assignment === Job.REST || slave.assignment === Job.SPA) && (slave.fetish !== "mindbroken")) {
+ } else if ((slave.assignment === Job.REST || slave.assignment === Job.SPA) && (slave.fetish !== Fetish.MINDBROKEN)) {
if (slave.inflationType !== "curative" || slave.inflation === 0) {
r += ` The curatives ${he}'s taking synergize with rest, keeping ${him} asleep most of the time. This is an <span class="health inc">extremely effective health treatment.</span>`;
} else {
@@ -1646,7 +1646,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
} else {
r += ` <span class="health inc">${His} health improves</span> under curative treatment.`;
}
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
r += ` ${He} <span class="mediumaquamarine">trusts you more</span> for giving ${him} access to expensive modern medicine.`;
slave.trust += 1;
}
@@ -1670,7 +1670,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
} else {
r += `can't improve ${his} absurd sex drive.`;
}
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
r += ` They <span class="hotpink">increase ${his} acceptance</span> of sexual slavery.`;
slave.devotion += 5;
}
@@ -1687,7 +1687,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
} else {
r += `can't improve ${his} absurd sex drive.`;
}
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
r += ` They <span class="hotpink">increase ${his} acceptance</span> of sexual slavery.`;
slave.devotion += 3;
}
@@ -1713,7 +1713,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
r += `slightly`;
}
if (slave.fuckdoll === 0) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r += ` ill, yet still continues to mindlessly carry out ${his} duties.`;
} else if (slave.health.illness < 2) {
r += ` ill, though not enough to complain about.`;
@@ -1736,7 +1736,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
}
}
if (slave.fuckdoll === 0) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.health.condition < -50) {
r += ` It's difficult being so in such poor condition, and ${he} <span class="mediumorchid">resents you</span> for ignoring ${his} plight.`;
slave.devotion -= 2;
@@ -1790,7 +1790,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
slave.addict -= 2;
slave.devotion -= 10;
} else {
- r += ` ${He} gets ${his} fix from ${his} aphrodisiac filled belly.`;
+ r += ` ${He} gets ${his} fix from ${his} aphrodisiac-filled belly.`;
}
} else {
if (slave.aphrodisiacs > 0) {
@@ -1805,7 +1805,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
if (V.suppository === 1) {
if ((slave.aphrodisiacs > 0) || (slave.curatives > 0) || (slave.drugs === "psychosuppressants") || (slave.drugs === "hormone enhancers") || (slave.drugs === "hormone blockers") || (slave.hormones !== 0)) {
if (slave.anus === 0) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r += ` ${His} <span class="lime">virgin anus is broken in</span> by a callous machine, but ${he} didn't notice.`;
} else if (slave.devotion <= 20) {
r += ` ${His} <span class="lime">anal virginity is taken</span> by a machine whose sole purpose is to fuck drugs into ${him}; <span class="mediumorchid">an indignity ${he} does not take well.</span>`;
@@ -1815,7 +1815,7 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
}
slave.anus = 1;
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r += ` A reciprocating dildo pumps ${his} drug regime into ${him} each morning and night.`;
} else if (slave.sexualFlaw === "hates anal") {
if (jsRandom(1, 100) > 80) {
diff --git a/src/endWeek/saGetMilked.js b/src/endWeek/saGetMilked.js
index 24ff3a20be4af6b5572c1f421798967825328d32..4e73732bb5970ef3278e1c3ae23d8f052a8ef064 100644
--- a/src/endWeek/saGetMilked.js
+++ b/src/endWeek/saGetMilked.js
@@ -299,13 +299,15 @@
r.text += ` As a result, ${he} produces ${numberWithPluralOne(r.milk, "liter")} of milk over the week.`;
// make sure milkSale is set here
- if (arcology.FSPastoralistLaw === 1) {
- r.milkSale = (r.milk * (8 + Math.trunc(arcology.FSPastoralist / 30)));
- r.text += ` Since breast milk is ${arcology.name}'s only legal dairy product, ${he} can scarcely be milked fast enough, and ${he} makes <span class="cash inc">${cashFormat(r.milkSale)}.</span>`;
- } else if (arcology.FSPastoralist !== "unset") {
- r.milkSale = (r.milk * (6 + Math.trunc(arcology.FSPastoralist / 30)));
- r.text += ` Since milk is fast becoming a major part of ${arcology.name}'s dietary culture, ${his} milk is in demand, and ${he} makes <span class="cash inc">${cashFormat(r.milkSale)}.</span>`;
- } else if (arcology.FSRepopulationFocusLaw === 1) {
+ if (arcology.FSPastoralist !== "unset") {
+ if (arcology.FSPastoralistLaw === 1) {
+ r.milkSale = (r.milk * (8 + Math.trunc(arcology.FSPastoralist / 30)));
+ r.text += ` Since breast milk is ${arcology.name}'s only legal dairy product, ${he} can scarcely be milked fast enough, and ${he} makes <span class="cash inc">${cashFormat(r.milkSale)}.</span>`;
+ } else {
+ r.milkSale = (r.milk * (6 + Math.trunc(arcology.FSPastoralist / 30)));
+ r.text += ` Since milk is fast becoming a major part of ${arcology.name}'s dietary culture, ${his} milk is in demand, and ${he} makes <span class="cash inc">${cashFormat(r.milkSale)}.</span>`;
+ }
+ } else if (arcology.FSRepopulationFocus !== "unset" && arcology.FSRepopulationFocusLaw === 1) {
r.milkSale = (r.milk * (6 + Math.trunc(arcology.FSRepopulationFocus / 50)));
r.text += ` Since the number of hungry babies outweighs the supply of available breasts in ${arcology.name}, ${his} milk is in demand, and ${he} makes <span class="cash inc">${cashFormat(r.milkSale)}.</span>`;
} else {
@@ -328,7 +330,7 @@
}
}
- if (slave.career === "a dairy cow" && slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
+ if (slave.career === "a dairy cow" && slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0) {
r.text += ` ${He} feels like <span class="devotion inc">${he} was made to be milked,</span> <span class="trust inc">not that ${he}'d complain about such a good feeling.</span>`;
slave.devotion++;
slave.trust++;
@@ -497,6 +499,7 @@
if (slave.prostate > 0) {
if (slave.prostate > 2) {
r.text += ` ${His} heavily altered prostate greatly increases the volume of ${his} ejaculations and promotes excessive, watery semen production. This dilute ejaculate <span class="cash dec">sells poorly</span> compared to normal cum.`;
+ qualityMultiplier *= 0.5;
} else if (slave.prostate > 1) {
r.text += ` ${His} hyperactive prostate increases the volume of ${his} ejaculations and promotes good semen production.`;
}
diff --git a/src/endWeek/saGuardYou.js b/src/endWeek/saGuardYou.js
index 4ab6b852e2663e160d4a19b5f0a4c224250b435a..78a53086a4aa201213c5b02ec29d6b4dcfbcfe7a 100644
--- a/src/endWeek/saGuardYou.js
+++ b/src/endWeek/saGuardYou.js
@@ -40,19 +40,26 @@ App.SlaveAssignment.guardYou = function saGuardYou(slave) {
/**
* @param {App.Entity.SlaveState} slave
- *
+ * TODO @Arkerthan
+ * Sync with actual deadliness calculation
*/
function publicImpression(slave) {
- if (slave.skill.combat > 0) {
+ const pMod = App.SlaveAssignment.PartTime.efficiencyModifier(slave);
+
+ if (slave.skill.combat > 30) {
r.push(`${His} combat skills greatly increase ${his} deadliness.`);
}
if (App.Data.Careers.Leader.bodyguard.includes(slave.career)) {
r.push(`${He} has experience in personal defense from before ${he} was a slave.`);
- } else if (slave.skill.bodyguard >= V.masteredXP) {
+ } else if (slave.skill.bodyguard >= Constant.MASTERED_XP) {
r.push(`${He} has experience in personal defense from working for you.`);
} else {
- const skillIncrease = jsRandom(1, Math.ceil((slave.intelligence + slave.intelligenceImplant) / 15) + 8);
+ let max = 8 + (pMod * (slave.intelligence + slave.intelligenceImplant) / 15);
+ if (!(V.dojo > 1)) {
+ max /= 2;
+ }
+ const skillIncrease = jsRandom(1, Math.ceil(max));
r.push(slaveSkillIncrease('bodyguard', slave, skillIncrease));
}
@@ -164,21 +171,21 @@ App.SlaveAssignment.guardYou = function saGuardYou(slave) {
}
} else if (slave.bellyImplant >= 1500) {
if (slave.bellyImplant >= 750000) {
- r.push(`${His} monolithic, ${slave.bellyImplant}cc implant filled belly greatly restricts ${his} movement and renders ${him} nearly useless in combat. ${He} can barely waddle after you, and when ${he} does, finds doors and small passages don't agree with ${his} bloated figure.`);
+ r.push(`${His} monolithic, ${slave.bellyImplant}cc implant-filled belly greatly restricts ${his} movement and renders ${him} nearly useless in combat. ${He} can barely waddle after you, and when ${he} does, finds doors and small passages don't agree with ${his} bloated figure.`);
} else if (slave.bellyImplant >= 450000) {
- r.push(`${His} gigantic, ${slave.bellyImplant}cc implant filled belly greatly hinders ${his} movement and terribly reduces ${his} effectiveness in combat. It also limits where ${he} can follow you, as doors and small passages don't agree with ${his} bloated figure.`);
+ r.push(`${His} gigantic, ${slave.bellyImplant}cc implant-filled belly greatly hinders ${his} movement and terribly reduces ${his} effectiveness in combat. It also limits where ${he} can follow you, as doors and small passages don't agree with ${his} bloated figure.`);
} else if (slave.bellyImplant >= 300000) {
- r.push(`${His} massive, ${slave.bellyImplant}cc implant filled belly obstructs ${his} movement and greatly hinders ${his} ability to protect you. It also limits where ${he} can follow you, as doors and small passages don't agree with ${his} bloated figure.`);
+ r.push(`${His} massive, ${slave.bellyImplant}cc implant-filled belly obstructs ${his} movement and greatly hinders ${his} ability to protect you. It also limits where ${he} can follow you, as doors and small passages don't agree with ${his} bloated figure.`);
} else if (slave.bellyImplant >= 150000) {
- r.push(`${His} giant, ${slave.bellyImplant}cc implant filled belly obstructs ${his} movement and greatly slows ${him} down. It also limits where ${he} can follow you, as ${he} has trouble waddling through crowds.`);
+ r.push(`${His} giant, ${slave.bellyImplant}cc implant-filled belly obstructs ${his} movement and greatly slows ${him} down. It also limits where ${he} can follow you, as ${he} has trouble waddling through crowds.`);
} else if (slave.bellyImplant >= 100000) {
- r.push(`${His} giant, ${slave.bellyImplant}cc implant filled belly is very heavy and unwieldy, frequently getting in the way of ${his} job.`);
+ r.push(`${His} giant, ${slave.bellyImplant}cc implant-filled belly is very heavy and unwieldy, frequently getting in the way of ${his} job.`);
} else if (slave.bellyImplant >= 10000) {
- r.push(`${His} huge, ${slave.bellyImplant}cc implant filled belly is very heavy and unwieldy, throwing off ${his} weight and making ${him} far less effective.`);
+ r.push(`${His} huge, ${slave.bellyImplant}cc implant-filled belly is very heavy and unwieldy, throwing off ${his} weight and making ${him} far less effective.`);
} else if (slave.bellyImplant >= 5000) {
- r.push(`${His} large, ${slave.bellyImplant}cc implant filled belly is heavy and unwieldy, limiting ${his} effectiveness.`);
+ r.push(`${His} large, ${slave.bellyImplant}cc implant-filled belly is heavy and unwieldy, limiting ${his} effectiveness.`);
} else if (slave.bellyImplant >= 1500) {
- r.push(`${His} swollen, ${slave.bellyImplant}cc implant filled belly is heavy and occasionally distracts ${him}.`);
+ r.push(`${His} swollen, ${slave.bellyImplant}cc implant-filled belly is heavy and occasionally distracts ${him}.`);
}
}
if (isInLabor(slave)) {
@@ -199,17 +206,41 @@ App.SlaveAssignment.guardYou = function saGuardYou(slave) {
r.push(`${His} sharp teeth add nothing to ${his} actual effectiveness, but they're certainly intimidating.`);
}
- if ((slave.skill.combat < 1) && (jsRandom(-100, 150) <= (slave.intelligence + slave.intelligenceImplant))) {
- r.push(`After some experience guarding you, and diligent practice in the armory, <span class="green">${his} combat skills increase.</span>`);
- slave.skill.combat += 1;
- } else if (slave.skill.combat >= 1) {
- r.push(`${He} maintains ${his} combat skill with practice in the armory.`);
+ if (slave.skill.combat < 100 && App.Entity.facilities.pit.job("trainee").isEmployed(slave)) {
+ r.push(`${He} diligently trains in ${App.Entity.facilities.pit.name} to better protect you.`);
} else {
- r.push(`Though ${he} practices diligently, ${his} basic combat skills do not impress.`);
+ let increase = 10 + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32);
+ if (V.dojo > 1) {
+ if (slave.skill.combat < 60) {
+ r.push(`After some experience guarding you, and diligent practice in the armory, <span class="green">${his} combat skills increase.</span>`);
+ } else {
+ if (slave.skill.combat < 100) {
+ r.push(`${He} has learned all ${he} can on ${his} own and`);
+ } else {
+ r.push(He);
+ }
+ r.push(` maintains ${his} combat skill with practice in the armory.`);
+ }
+ } else {
+ r.push(`${He} is unable to properly train making ${him} <span class="devotion dec">worried</span> whether ${he} can properly protect you in the future.`);
+ slave.devotion -= 2;
+ increase *= 0.3;
+ }
+ if (slave.skill.combat < 60) {
+ slave.skill.combat += pMod * increase;
+ }
}
- r.push(`${His} constant presence is`);
- const impressiveness = deadliness(slave);
+ r.push(His);
+ if (pMod < 0.4) {
+ r.push("rare");
+ } else if (pMod < 0.9) {
+ r.push("regular");
+ } else {
+ r.push("constant");
+ }
+ r.push(`presence is`);
+ const impressiveness = deadliness(slave).value * pMod;
if (impressiveness > 6) {
r.push(`extremely intimidating, <span class="green">adding much to your reputation.</span>`);
if (slave.career === "an arcology owner") {
@@ -248,17 +279,29 @@ App.SlaveAssignment.guardYou = function saGuardYou(slave) {
*
*/
function trainReplacements(slave) {
- if (slave.devotion > 95 && slave.trust > 50 && slave.skill.combat > 0 && slave.intelligence + slave.intelligenceImplant > 15) {
- const successorCandidates = V.slaves.filter(function(s) { return (assignmentVisible(s) || s.assignment === Job.CONCUBINE || s.assignment === Job.WARDEN || s.assignment === Job.HEADGIRL || s.assignment === Job.QUARTER || s.assignment === Job.MASTERSUITE) && bodyguardSuccessorEligible(s); });
- const combatSkilled = successorCandidates.filter(function(s) { return s.skill.combat > 0; });
+ /** @type {[boolean, string][]} */
+ const requirements = [
+ [slave.devotion <= 95, "not devoted enough"],
+ [slave.trust <= 50, "too fearful"],
+ [slave.skill.combat <= 60, "hasn't had enough training"],
+ [slave.intelligence + slave.intelligenceImplant <= 15, "too stupid"],
+ ];
+
+ if (requirements.filter(s => s[0]).length > 0) {
+ if (V.debugMode > 0) {
+ r.push(`<span class="yellow">${He} is ${toSentence(requirements.filter(s => s[0]).map(s => s[1]))} to train any successors.</span>`);
+ }
+ } else {
+ const successorCandidates = V.slaves.filter(s => (assignmentVisible(s) || [Job.CONCUBINE, Job.WARDEN, Job.HEADGIRL, Job.QUARTER, Job.MASTERSUITE].includes(s.assignment)) && bodyguardSuccessorEligible(s));
+ const combatSkilled = successorCandidates.filter(s => s.skill.combat > 60);
r.push(`${He}'s confident in ${his} martial skills, but smart enough to know that${slave.geneMods.immortality > 0 ? `, while technically immortal, ${he} isn't invincible` : ` ${he} isn't immortal`}, and devoted enough to worry about who will protect you should ${he} die.`);
if (combatSkilled.length < 2) {
let candidate = null;
- let flawedTrainee = 0;
+ let flawedTrainee = false;
if (slave.relationship > 1) {
candidate = getSlave(slave.relationshipTarget);
- if (candidate !== undefined && candidate.skill.combat === 0 && bodyguardSuccessorEligible(candidate)) {
+ if (candidate !== undefined && candidate.skill.combat <= 60 && bodyguardSuccessorEligible(candidate)) {
const candidatePronouns = getPronouns(candidate);
r.push(`${He} does ${his} best to train ${candidate.slaveName} whenever ${he} can, hoping that ${his}`);
if (slave.relationship > 4) {
@@ -274,37 +317,41 @@ App.SlaveAssignment.guardYou = function saGuardYou(slave) {
}
}
if (!candidate) {
- if (V.HeadGirlID !== 0 && S.HeadGirl.skill.combat === 0 && bodyguardSuccessorEligible(S.HeadGirl)) {
+ if (V.HeadGirlID !== 0 && S.HeadGirl.skill.combat <= 60 && bodyguardSuccessorEligible(S.HeadGirl)) {
r.push(`${He} does ${his} best to train ${S.HeadGirl.slaveName} whenever ${he} can, hoping that your Head Girl can be made capable of stepping into ${his} place.`);
candidate = S.HeadGirl;
}
}
if (!candidate) {
- if (V.ConcubineID !== 0 && S.Concubine.skill.combat === 0 && S.Concubine.devotion > 50 && S.Concubine.muscles >= -30 && S.Concubine.weight < 160 && S.Concubine.butt < 10 && S.Concubine.boobs < 25000 && S.Concubine.belly < 5000 && S.Concubine.balls < 20 && S.Concubine.dick < 15 && S.Concubine.fuckdoll === 0 && S.Concubine.fetish !== "mindbroken" && canWalk(S.Concubine)) {
+ if (V.ConcubineID !== 0 && S.Concubine.skill.combat <= 60 && S.Concubine.devotion > 50 && S.Concubine.muscles >= -30 && S.Concubine.weight < 160 && S.Concubine.butt < 10 && S.Concubine.boobs < 25000 && S.Concubine.belly < 5000 && S.Concubine.balls < 20 && S.Concubine.dick < 15 && S.Concubine.fuckdoll === 0 && S.Concubine.fetish !== Fetish.MINDBROKEN && canWalk(S.Concubine)) {
r.push(`${He} does ${his} best to train ${S.Concubine.slaveName} whenever ${he} can, hoping that your Concubine can be made capable of stepping into ${his} place.`);
if (S.Concubine.boobs >= 8000 || S.Concubine.butt >= 10 || S.Concubine.belly >= 5000 || S.Concubine.balls >= 10 || S.Concubine.dick >= 10 || S.Concubine.muscles < 0 || S.Concubine.weight >= 130) {
r.push(`${His} body is poorly suited for combat, but ${he} can learn to work around it with enough effort.`);
- flawedTrainee = jsRandom(0, 50);
+ flawedTrainee = true;
}
candidate = S.Concubine;
}
}
if (!candidate) {
- if (V.WardenessID !== 0 && S.Wardeness.skill.combat === 0 && bodyguardSuccessorEligible(S.Wardeness)) {
+ if (V.WardenessID !== 0 && S.Wardeness.skill.combat <= 60 && bodyguardSuccessorEligible(S.Wardeness)) {
r.push(`${He} does ${his} best to train ${S.Wardeness.slaveName} whenever ${he} can, hoping that your Wardeness can be made capable of stepping into ${his} place.`);
candidate = S.Wardeness;
}
}
if (!candidate) {
- candidate = successorCandidates.find(function(s) { return s.skill.combat === 0; });
+ candidate = successorCandidates.find(function(s) { return s.skill.combat <= 60; });
if (candidate) {
r.push(`${He} does ${his} best to train ${candidate.slaveName} whenever ${he} can, hoping that ${his} subordinate can be made capable of stepping into ${his} place.`);
}
}
if (candidate) {
- if ((slave.intelligence + slave.intelligenceImplant - flawedTrainee) > jsRandom(1, 500)) {
+ let gain = 10 + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32);
+ if (flawedTrainee) {
+ gain /= 2;
+ }
+ candidate.skill.combat += gain;
+ if (candidate.skill.combat > 60) {
r.push(`By the end of the week, ${he} is satisfied that ${candidate.slaveName} <span class="green">has the combat skill</span> to contribute to your defense.`);
- candidate.skill.combat = 1;
} else {
r.push(`Unfortunately, ${candidate.slaveName} wasn't able to pass the rigorous combat tests to ${his} satisfaction this week.`);
}
diff --git a/src/endWeek/saHormonesEffects.js b/src/endWeek/saHormonesEffects.js
index 053971b00123c4801acf7461a0be0046928b78c3..b2894623bce139dea361153c53d97beaeeb832e9 100644
--- a/src/endWeek/saHormonesEffects.js
+++ b/src/endWeek/saHormonesEffects.js
@@ -22,7 +22,7 @@ App.SlaveAssignment.hormonesEffects = function saHormonesEffects(slave) {
if (slave.physicalAge >= 18 || V.loliGrow === 0 || slave.geneMods.NCS === 1) {
hormonesEffects(slave);
}
- if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0) {
hormoneReactions(slave);
}
@@ -318,9 +318,11 @@ App.SlaveAssignment.hormonesEffects = function saHormonesEffects(slave) {
let normBreasts = 0;
let normButt = 0;
if (slave.hormoneBalance > 30 && slave.geneMods.NCS !== 1) {
+ const slimModBreasts = (V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 1) ? 0.45 : 1; // 600 average breast target, 270 target, 475 @ 350 hormone
+ const slimModButts = (V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 1) ? 0.6 : 1; // 2.5 average butt, 1.5 target
/* 'Expected' breast size based on weight for feminine-bodied slaves */
- normBreasts = Math.trunc((100 + (slave.weight + 100) * 5 + 2 * slave.lactationAdaptation) * (0.85 + slave.hormoneBalance / 400) * gigantomastiaMod);
- normButt = ((slave.weight + 100) * 0.025 * (0.9 + slave.hormoneBalance / 600) * (rearLipedemaMod / 2 + 1));
+ normBreasts = Math.trunc((100 + (slave.weight + 100) * 5 + 2 * slave.lactationAdaptation) * (0.85 + slave.hormoneBalance / 400) * gigantomastiaMod * slimModBreasts);
+ normButt = ((slave.weight + 100) * 0.025 * (0.9 + slave.hormoneBalance / 600) * (rearLipedemaMod / 2 + 1) * slimModButts);
}
if (slave.hormoneBalance >= 350) {
@@ -978,7 +980,7 @@ App.SlaveAssignment.hormonesEffects = function saHormonesEffects(slave) {
if (slave.devotion > 20) {
if ((slave.boobs < 800 && slave.butt < 3) || (slave.faceShape === "masculine") || (slave.shoulders > slave.hips) || (slave.balls > 4)) {
if (slave.career === "a Futanari Sister") {
- r.push(`${He} wishes ${he} were more feminine, but isn't unhappy to be off hormones, since ${he} likes being a stiff dicked futa.`);
+ r.push(`${He} wishes ${he} were more feminine, but isn't unhappy to be off hormones, since ${he} likes being a stiff-dicked futa.`);
} else if (slave.fetish === "buttslut" && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
r.push(`${He} wishes ${he} were more feminine, but ${he} loves getting fucked in the butt so much that it doesn't much bother ${him}.`);
} else if (slave.fetish === "sadist" && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
diff --git a/src/endWeek/saInflation.js b/src/endWeek/saInflation.js
index 848d627fc1fceaa15fa0be58117cd68cc71f1e36..6a6e26785ac152cf015ee335eb26bf334c10ec85 100644
--- a/src/endWeek/saInflation.js
+++ b/src/endWeek/saInflation.js
@@ -24,7 +24,7 @@ App.SlaveAssignment.inflation = function saInflation(slave) {
if (slave.inflation > 0) {
fillUp(slave);
}
- if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0) {
mentalEffects(slave);
}
if (slave.inflationType === "milk" || slave.inflationType === "food") {
@@ -241,7 +241,7 @@ App.SlaveAssignment.inflation = function saInflation(slave) {
} else if (slave.inflation === 2) {
r.push(`four liters of an aphrodisiac solution, leaving ${him} looking pregnant, whenever ${he} leaks or ${his} body absorbs too much. ${He} is full enough to be distended but not enough to grow taut. While having ${his} body bloated with aphrodisiacs doesn't make ${him} additionally submissive, it does amplify the effects of them. ${His} overfilled aphrodisiac belly`);
} else if (slave.inflation === 1) {
- r.push(`two liters of an aphrodisiac solution, leaving ${his} belly noticeably distended, whenever ${he} leaks or ${his} body absorbs too much. ${He} is full enough to be swollen but not enough to visibly jiggle. ${His} aphrodisiac filled belly`);
+ r.push(`two liters of an aphrodisiac solution, leaving ${his} belly noticeably distended, whenever ${he} leaks or ${his} body absorbs too much. ${He} is full enough to be swollen but not enough to visibly jiggle. ${His} aphrodisiac-filled belly`);
}
if (slave.energy <= 95) {
r.push(`<span class="libido inc">rapidly boosts ${his} sex drive.</span>`);
@@ -249,7 +249,7 @@ App.SlaveAssignment.inflation = function saInflation(slave) {
} else {
r.push(`can't improve ${his} absurd sex drive.`);
}
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
r.push(`Besides being humiliating, it chemically <span class="hotpink">increases ${his} acceptance</span> of sexual slavery.`);
slave.devotion += 5;
}
@@ -270,7 +270,7 @@ App.SlaveAssignment.inflation = function saInflation(slave) {
r.push(`${He} makes sure to fill ${his} rear with nearly`);
if (slave.inflation === 3) {
r.push(`two gallons of a curative solution, leaving ${him} looking ready to burst, whenever ${he} leaks or ${his} body absorbs too much. ${He} keeps ${himself} full for you; the curatives in ${his} gut keeping ${him} healthy despite the pain.`);
- if ((slave.assignment === Job.REST || slave.assignment === Job.SPA) && slave.fetish !== "mindbroken") {
+ if ((slave.assignment === Job.REST || slave.assignment === Job.SPA) && slave.fetish !== Fetish.MINDBROKEN) {
r.push(`The curative enema ${he}'s on synergize with rest, keeping ${him} asleep most of the time. This is an <span class="health inc">extremely effective health treatment,</span> though being filled to ${his} limit doesn't hasten ${his} recovery at all; it's just perverted.`);
improveCondition(slave, 4);
} else if (slave.health.condition < -20) {
@@ -282,7 +282,7 @@ App.SlaveAssignment.inflation = function saInflation(slave) {
improveCondition(slave, 1);
} else if (slave.inflation === 2) {
r.push(`four liters of a curative solution, leaving ${him} looking pregnant, whenever ${he} leaks or ${his} body absorbs too much. ${He} is full enough to be distended but not enough to grow taut.`);
- if ((slave.assignment === Job.REST || slave.assignment === Job.SPA) && slave.fetish !== "mindbroken") {
+ if ((slave.assignment === Job.REST || slave.assignment === Job.SPA) && slave.fetish !== Fetish.MINDBROKEN) {
r.push(`The curative enema ${he}'s on synergize with rest, keeping ${him} asleep most of the time. This is an <span class="health inc">extremely effective health treatment,</span> though being overfilled doesn't hasten ${his} recovery at all; it's just perverted.`);
improveCondition(slave, 4);
} else if (slave.health.condition < -20) {
@@ -294,7 +294,7 @@ App.SlaveAssignment.inflation = function saInflation(slave) {
improveCondition(slave, 6);
} else if (slave.inflation === 1) {
r.push(`two liters of a curative solution, leaving ${his} belly noticeably distended, whenever ${he} leaks or ${his} body absorbs too much. ${He} is full enough to be swollen but not enough to visibly jiggle.`);
- if ((slave.assignment === Job.REST || slave.assignment === Job.SPA) && slave.fetish !== "mindbroken") {
+ if ((slave.assignment === Job.REST || slave.assignment === Job.SPA) && slave.fetish !== Fetish.MINDBROKEN) {
r.push(`The curative enema ${he}'s on synergize with rest, keeping ${him} asleep most of the time. This is an <span class="health inc">extremely effective health treatment.</span>`);
improveCondition(slave, 4);
} else if (slave.health.condition < -20) {
@@ -305,7 +305,7 @@ App.SlaveAssignment.inflation = function saInflation(slave) {
}
improveCondition(slave, 6);
}
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
r.push(`${He} <span class="mediumaquamarine">trusts you more</span> for giving ${him} access to expensive modern medicine, even if it is really embarrassing to be seen with that belly.`);
slave.trust += 1;
}
diff --git a/src/endWeek/saLiveWithHG.js b/src/endWeek/saLiveWithHG.js
index 6b9c9a383b83bc87d902e457bfe8e3126e8bc75d..5155cf7a013707b969ea1d7f2cbb630d3e73db13 100644
--- a/src/endWeek/saLiveWithHG.js
+++ b/src/endWeek/saLiveWithHG.js
@@ -112,9 +112,9 @@ App.SlaveAssignment.liveWithHG = function saliveWithHG(slave) {
} else {
t.push(`and keeps ${him} on ${his} diet.`);
}
- } else if (((slave.muscles <= 95 && ((arcology.FSPhysicalIdealist > 0 && arcology.FSPhysicalIdealistLaw === 0) || (HG.fetish === "submissive" || HG.fetish === "masochist"))) || (slave.muscles <= 45 && (arcology.FSPhysicalIdealist !== "unset" && arcology.FSPhysicalIdealistLaw === 1)) || slave.muscles <= 5) && !isAmputee(slave)) {
+ } else if (((slave.muscles <= 95 && ((arcology.FSPhysicalIdealist > 0 && arcology.FSPhysicalIdealistLaw === 0) || (HG.fetish === Fetish.SUBMISSIVE || HG.fetish === "masochist"))) || (slave.muscles <= 45 && (arcology.FSPhysicalIdealist !== "unset" && arcology.FSPhysicalIdealistLaw === 1)) || slave.muscles <= 5) && !isAmputee(slave)) {
t.push(`${HG.slaveName} thinks ${slave.slaveName}`);
- if (HG.fetish === "submissive" && HG.fetishKnown === 1) {
+ if (HG.fetish === Fetish.SUBMISSIVE && HG.fetishKnown === 1) {
t.push(`could use bigger muscles to better dominate ${him2} with in bed`);
} else if (HG.fetish === "masochist" && HG.fetishKnown === 1) {
t.push(`could use bigger muscles to better spank ${him2}`);
@@ -212,7 +212,7 @@ App.SlaveAssignment.liveWithHG = function saliveWithHG(slave) {
} else if (HG.fetish === "cumslut" && slave.balls < 10 && slave.balls > 0 && slave.dick > 0) {
t.push(`${HG.slaveName} gives ${slave.slaveName} testicle injections, since ${he2} wants ${slave.slaveName} shooting bigger loads.`);
slave.drugs = "testicle enhancement";
- } else if ((HG.fetish === "masochist" || HG.fetish === "submissive") && canImproveHeight(slave)) {
+ } else if ((HG.fetish === "masochist" || HG.fetish === Fetish.SUBMISSIVE) && canImproveHeight(slave)) {
t.push(`${HG.slaveName}`);
if (HG.fetishKnown === 1) {
t.push(`has a subconscious need to be hurt by the biggest, strongest ${girl} possible,`);
@@ -485,7 +485,7 @@ App.SlaveAssignment.liveWithHG = function saliveWithHG(slave) {
HG.devotion += 3;
slave.devotion += 3;
HG.trust += 2;
- HG.devotion += 2;
+ slave.trust += 2;
}
} else {
r.push(`Since ${HG.slaveName} and ${slave.slaveName} are`);
@@ -498,7 +498,7 @@ App.SlaveAssignment.liveWithHG = function saliveWithHG(slave) {
HG.devotion += 4;
slave.devotion += 4;
HG.trust += 3;
- HG.devotion += 3;
+ slave.trust += 3;
}
}
HG.relationship = slave.relationship;
@@ -684,8 +684,8 @@ App.SlaveAssignment.liveWithHG = function saliveWithHG(slave) {
* @param {App.Entity.SlaveState} HG
*/
function HGCausesFetish(slave, HG) {
- if (fetishChangeChance(slave) > random(0, 100) && HG.fetishKnown === 1 && HG.fetishStrength > 60 && slave.fetish !== "mindbroken") {
- if (HG.fetish === "submissive") {
+ if (fetishChangeChance(slave) > random(0, 100) && HG.fetishKnown === 1 && HG.fetishStrength > 60 && slave.fetish !== Fetish.MINDBROKEN) {
+ if (HG.fetish === Fetish.SUBMISSIVE) {
if (slave.fetish !== "dom") {
r.push(`${slave.slaveName} slowly gets used to ${HG.slaveName}'s need to be sexually dominated, and begins to <span class="fetish gain">enjoy being a top</span> within the confines of the suite.`);
slave.fetish = "dom";
@@ -693,7 +693,7 @@ App.SlaveAssignment.liveWithHG = function saliveWithHG(slave) {
slave.fetishStrength = 10;
}
} else if (HG.fetish === "dom") {
- if (slave.fetish !== "submissive") {
+ if (slave.fetish !== Fetish.SUBMISSIVE) {
r.push(`${slave.slaveName} slowly gets used to being tied up and fucked regularly, and accepts that it's how ${HG.slaveName}'s sexual attraction to ${him} expresses itself. ${He} begins to <span class="fetish gain">enjoy being a sub,</span> especially for ${HG.slaveName}.`);
slave.fetish = "submissive";
slave.fetishKnown = 1;
@@ -760,7 +760,7 @@ App.SlaveAssignment.liveWithHG = function saliveWithHG(slave) {
}
} else {
if (canDoAnal(slave) || canDoVaginal(slave)) {
- if (slave.fetish !== "none") {
+ if (slave.fetish !== Fetish.NONE) {
r.push(`${slave.slaveName} often takes ${HG.slaveName}'s`);
if (canPenetrate(HG)) {
r.push(`dick`);
@@ -884,7 +884,7 @@ App.SlaveAssignment.liveWithHG = function saliveWithHG(slave) {
? "anal"
: "oral",
HG, "penetrative", 15);
- } else if (HG.fetish === "submissive" && HG.fetishKnown === 1) {
+ } else if (HG.fetish === Fetish.SUBMISSIVE && HG.fetishKnown === 1) {
r.push(`${HG.slaveName} walks a fine line with ${slave.slaveName}. They work out a sexual life in which ${HG.slaveName} is in charge, but ${slave.slaveName} takes the sexual lead: ${slave.slaveName} serves ${his} superior by taking ${him2} firmly.`);
mediumUse(slave, HG);
} else if (HG.fetish === "dom" && HG.fetishKnown === 1) {
@@ -1142,7 +1142,7 @@ App.SlaveAssignment.liveWithHG = function saliveWithHG(slave) {
r.push(`${HG.slaveName} keeps ${slave.slaveName} in a torturous habit since ${he} still clings to ${his} dignity and remains defiant.`);
slave.clothes = "a penitent nuns habit";
} else if (HG.fetishKnown === 1) {
- if (HG.fetish === "submissive") {
+ if (HG.fetish === Fetish.SUBMISSIVE) {
r.push(`${HG.slaveName} keeps ${slave.slaveName} dressed up in slutty power clothing, since ${he2}'s attracted to competence.`);
slave.clothes = "slutty business attire";
} else if (HG.fetish === "masochist") {
@@ -1374,7 +1374,7 @@ App.SlaveAssignment.liveWithHG = function saliveWithHG(slave) {
r.push(rulesAutosurgery(slave, getHGSurgeryTargets()));
}
if (HG.fetishKnown === 1) {
- if (HG.fetish === "sadist" && HG.fetishStrength > 95 && V.seeExtreme === 1 && slave.fetish !== "mindbroken") {
+ if (HG.fetish === "sadist" && HG.fetishStrength > 95 && V.seeExtreme === 1 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.health.condition > 40) {
if (hasAnyNaturalLimbs(slave) && slave.devotion < -20) {
let frag = `${HG.slaveName} decides to extract the ultimate in sadistic pleasure from ${slave.slaveName}, and directs the autosurgery to <span class="health dec">amputate ${his}`;
@@ -1420,7 +1420,7 @@ App.SlaveAssignment.liveWithHG = function saliveWithHG(slave) {
applyMindbroken(slave);
surgeryDamage(slave, 20);
}
- } else if (HG.fetish === "dom" && HG.fetishStrength > 60 && V.seeExtreme === 1 && slave.fetish !== "mindbroken" && slave.devotion <= 50) {
+ } else if (HG.fetish === "dom" && HG.fetishStrength > 60 && V.seeExtreme === 1 && slave.fetish !== Fetish.MINDBROKEN && slave.devotion <= 50) {
if (slave.health.condition > 40) {
if (slave.heels === 0 && hasAnyNaturalLegs(slave)) {
r.push(`${HG.slaveName} is not satisfied with ${slave.slaveName}'s submissiveness, and directs the autosurgery to <span class="health dec">clip ${his} Achilles tendons.</span> Once the slave has recovered from surgery, ${HG.slaveName} removes all shoes from the suite, too, so ${slave.slaveName} is forced to crawl like a good little bitch. ${slave.slaveName} is <span class="devotion dec">angry</span> and <span class="trust dec">frightened.</span>`);
@@ -1438,7 +1438,7 @@ App.SlaveAssignment.liveWithHG = function saliveWithHG(slave) {
}
}
} else if (HG.energy > 95) {
- if (slave.health.condition > 40 && slave.heels === 0 && hasAnyNaturalLegs(slave) && slave.devotion <= 50 && slave.fetish !== "mindbroken") {
+ if (slave.health.condition > 40 && slave.heels === 0 && hasAnyNaturalLegs(slave) && slave.devotion <= 50 && slave.fetish !== Fetish.MINDBROKEN) {
r.push(`${HG.slaveName} wants a good little bimbo who sticks ${his} butt out all the time, and directs the autosurgery to <span class="health dec">clip ${slave.slaveName}'s Achilles tendons.</span> Once the slave has recovered from surgery, ${HG.slaveName} presents ${slave.slaveName} with a new pair of extra-tall heels to totter around in like a good little slut. ${slave.slaveName} is <span class="devotion dec">angry</span> and <span class="trust dec">frightened.</span>`);
slave.devotion -= 5;
slave.trust -= 5;
@@ -1453,7 +1453,7 @@ App.SlaveAssignment.liveWithHG = function saliveWithHG(slave) {
slave.height += 10;
surgeryDamage(slave, 20);
}
- } else if (HG.fetish === "submissive") {
+ } else if (HG.fetish === Fetish.SUBMISSIVE) {
if (slave.health.condition > 40 && slave.heightImplant === 0 && slave.height < 185 && hasAllLimbs(slave)) {
r.push(`${HG.slaveName} wants to be topped by the biggest, strongest ${girl} possible, and directs the autosurgery to extend ${slave.slaveName}'s arm and leg bones to make ${him} a little <span class="change positive">taller.</span>`);
slave.heightImplant = 1;
diff --git a/src/endWeek/saLongTermEffects.js b/src/endWeek/saLongTermEffects.js
index 6c867d0b2548183364725e120e677ce3648d79c2..e76577b5909b250d51a1d39beb5e2a6cae20a222 100644
--- a/src/endWeek/saLongTermEffects.js
+++ b/src/endWeek/saLongTermEffects.js
@@ -46,7 +46,7 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) {
}
bellySagging(slave);
bellyImplantStuff(slave);
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
mindbreak(slave);
if (slave.fuckdoll === 0) {
mentalTension(slave);
@@ -59,16 +59,16 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) {
solidSlaveFoodEffects(slave);
}
}
- r.push(App.SlaveAssignment.saSocialEffects(slave));
+ r.push(App.SlaveAssignment.saSocialEffects(slave).report());
if (slave.fuckdoll === 0) { // swap to fuckdoll suit in the future
brandEffects(slave);
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
disabilityEffects(slave);
}
}
r.push(App.SlaveAssignment.longTermPhysicalEffects(slave));
anaphrodisiacEffects(slave, oldEnergy); // must come after all .energy gains!
- if (slave.accent > 0 && slave.fetish !== "mindbroken") {
+ if (slave.accent > 0 && slave.fetish !== Fetish.MINDBROKEN) {
languageLearning(slave);
}
if (slave.prestige > 0) {
@@ -226,7 +226,7 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) {
r.push(`phalli`);
}
r.push(`that are currently inside ${him}, as hard as ${he} possibly can.`);
- if (slave.fetish !== "none" && slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.NONE && slave.fetish !== Fetish.MINDBROKEN) {
r.push(`${He} <span class="fetish loss">no longer retains any sexual preferences</span> at all. ${He} just wants to be penetrated.`);
slave.fetish = "none";
slave.fetishStrength = 0;
@@ -789,12 +789,12 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) {
slave.energy--;
}
if (supp === 1) {
- if ((slave.attrXX !== 50 || slave.attrXY !== 50) && slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if ((slave.attrXX !== 50 || slave.attrXY !== 50) && slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
r.push(`<span class="stat drop">suppressed,</span> alongside what ${he} <span class="stat drop">finds sexually attractive.</span> Though that may not be a bad thing, should ${he} find a sex repulsive.`);
} else {
r.push(`<span class="stat drop">suppressed.</span>`);
}
- } else if ((slave.attrXX !== 50 || slave.attrXY !== 50) && slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ } else if ((slave.attrXX !== 50 || slave.attrXY !== 50) && slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
r.push(`${His} <span class="stat drop">sexual tastes are also suppressed by the drugs,</span> though that may not be a bad thing should ${he} find a sex repulsive.`);
}
if (slave.attrXX > 50) {
@@ -922,7 +922,7 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) {
slave.boobs -= 50 / gigantomastiaMod;
}
if (slave.geneMods.NCS === 0) {
- if (slave.clit < 2 && random(1, 100) < 10) {
+ if (slave.clit < 2 && slave.vagina >= 0 && slave.dick === 0 && random(1, 100) < 10) {
r.push(`${He} feels <span class="change positive">unusual warmness</span> in ${his} clitoris.`);
slave.clit += 1;
}
@@ -946,7 +946,7 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) {
r.push(`${He} feels a <span class="change positive">strange weight</span> on ${his} rear.`);
slave.butt += 1;
}
- if (slave.labia < 2 && random(1, 100) < 10) {
+ if (slave.labia < 2 && slave.vagina >= 0 && random(1, 100) < 10) {
r.push(`${He} feels an <span class="change positive">unusual tenderness</span> in ${his} labia.`);
slave.labia += 1;
}
@@ -1163,13 +1163,13 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) {
r.push(`with the weight of the fake belly resting on ${his} swollen stomach, forcing it to be removed.`);
slave.bellyAccessory = "none";
}
- if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0) {
if (slave.bellyFluid >= 10000) {
if (slave.fetish !== "masochist" && slave.sexualFlaw !== "self hating") {
r.push(`Being so distended with fluids is <span class="devotion dec">very uncomfortable</span> to ${him}.`);
slave.devotion -= 3;
}
- if (slave.fetish === "none" && fetishChangeChance(slave) > random(0, 100)) {
+ if (slave.fetish === Fetish.NONE && fetishChangeChance(slave) > random(0, 100)) {
r.push(`Having such a round, heavy belly leads ${him} to <span class="fetish gain">begin fantasizing about being pregnant.</span>`);
slave.fetish = "pregnancy";
slave.fetishStrength = 10;
@@ -1489,8 +1489,8 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) {
function bellyImplantStuff(slave) {
if (slave.bellyImplant >= 5000) {
if (slave.fuckdoll === 0) {
- if (slave.fetish !== "mindbroken") {
- if ((slave.fetish === "none" || slave.fetishStrength <= 10) && slave.devotion > 20 && random(1, 100) > 85) {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
+ if ((slave.fetish === Fetish.NONE || slave.fetishStrength <= 10) && slave.devotion > 20 && random(1, 100) > 85) {
r.push(`Having an implant simulating pregnancy drives ${him} to <span class="fetish gain">begin fantasizing about being actually pregnant.</span>`);
slave.fetish = "pregnancy";
slave.fetishStrength = 10;
@@ -2188,6 +2188,7 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) {
if (V.week - slave.weekAcquired > 10 + minWeeks) {
slave.accent -= 1;
r.push(`${He} does ${his} best to speak proper, unaccented ${V.language}, as encouraged by the rules. <span class="improvement">${His} accent has diminished to imperceptibility.</span>`);
+ slave.rules.speech = "restrictive";
}
}
}
@@ -2233,7 +2234,7 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) {
} else {
r.push(`week.`);
}
- if (slave.fuckdoll > 0 || slave.fetish === "mindbroken") {
+ if (slave.fuckdoll > 0 || slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} did not know.`);
} else if (slave.devotion > 50) {
r.push(`${He} did not notice.`);
@@ -2369,7 +2370,7 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) {
} else {
r.push(`${His} overwhelmed body has <span class="miscarriage">forced ${him} to miscarry,</span> possibly saving ${his} life.`);
slave.preg = rulesDemandContraceptives(slave, V.defaultRules) ? -1 : 0;
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.sexualFlaw === "breeder") {
r.push(`${He} is <span class="devotion dec">filled with violent, all-consuming hatred</span> at ${himself} for failing to carry to term and you for allowing this to happen.`);
if (slave.pregType > 4) {
diff --git a/src/endWeek/saLongTermMentalEffects.js b/src/endWeek/saLongTermMentalEffects.js
index 25081270e116a901675081433b247a2122c68238..2dcc2198169cfb4342f67e2bc0fd7a2b583db5f8 100644
--- a/src/endWeek/saLongTermMentalEffects.js
+++ b/src/endWeek/saLongTermMentalEffects.js
@@ -9,7 +9,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
he, him, his, himself, girl, He, His,
} = getPronouns(slave);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
applyMindbroken(slave);
} else if (slave.fuckdoll === 0) {
asexualOvariesBurnout(slave);
@@ -36,9 +36,9 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
careerEffects(slave);
}
r.push(App.SlaveAssignment.saSmartPiercingEffects(slave));
- if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0) {
organicFetishDevelopments(slave);
- if (slave.fetishKnown !== 0 && slave.fetish !== "none") {
+ if (slave.fetishKnown !== 0 && slave.fetish !== Fetish.NONE) {
paraphiliaAcquisition(slave);
}
}
@@ -77,7 +77,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
let t = [];
if (slave.attrXY <= 35) {
if (slave.energy >= 20) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
if (slave.fetishKnown === 1) {
t.push(`Recently, ${he}'s been fantasizing about submitting to big strong men. ${His} revulsion at the idea of sex with a man <span class="positive">mellows.</span>`);
}
@@ -190,7 +190,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
}
} else if (slave.attrXY <= 65) {
if (slave.energy >= 40) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
if (slave.fetishKnown === 1) {
t.push(`${He}'s found ${himself} enjoying watching big strong men use other slaves recently. ${He}'s now <span class="positive">more attracted to men.</span>`);
}
@@ -227,7 +227,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
}
} else if (slave.attrXY <= 85) {
if (slave.energy >= 60) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
if (slave.fetishKnown === 1) {
t.push(`${He} can no longer see a man without fantasizing about how it would feel if he held ${him} down. ${He}'s now <span class="positive">more aroused by men.</span>`);
}
@@ -523,7 +523,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
}
break;
case "insecure":
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
if (slave.fetishKnown === 1) {
r.push(`${His} desperation for validation from others <span class="fetish inc">increases ${his} submission.</span>`);
}
@@ -539,7 +539,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
}
break;
case "advocate":
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
if (slave.fetishKnown === 1) {
r.push(`${His} conviction that slavery is right <span class="fetish inc">increases ${his} willingness to submit.</span>`);
}
@@ -605,7 +605,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
}
break;
case "insecure":
- if (slave.fetish !== "submissive") {
+ if (slave.fetish !== Fetish.SUBMISSIVE) {
r.push(`${He} gets so desperate for validation from others that ${he} becomes willing to submit to anything. <span class="fetish gain">${He}'s now a submissive!</span>`);
slave.fetish = "submissive";
slave.fetishKnown = 1;
@@ -621,7 +621,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
}
break;
case "advocate":
- if (slave.fetish !== "submissive") {
+ if (slave.fetish !== Fetish.SUBMISSIVE) {
r.push(`${His} conviction that slavery is right seeps into ${his} sexuality. <span class="fetish gain">${He}'s now a submissive!</span>`);
slave.fetish = "submissive";
slave.fetishKnown = 1;
@@ -743,7 +743,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
}
break;
case "caring":
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
if (slave.fetishKnown === 1) {
r.push(`${His} caring nature has <span class="fetish inc">advanced ${his} submissiveness.</span>`);
}
@@ -819,7 +819,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
}
break;
case "caring":
- if (slave.fetish !== "submissive") {
+ if (slave.fetish !== Fetish.SUBMISSIVE) {
r.push(`${His} caring nature has matured into a need to submit. <span class="fetish gain">${He}'s a submissive!</span>`);
slave.fetish = "submissive";
slave.fetishKnown = 1;
@@ -853,7 +853,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
*
*/
function fetishEffects(slave) {
- if (slave.fetish !== "none") {
+ if (slave.fetish !== Fetish.NONE) {
if (slave.fetishStrength <= 75) {
if (slave.devotion > 50) {
if (slave.trust > 50) {
@@ -935,7 +935,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
} else if (slave.behavioralQuirk === "none" && slave.fetishKnown === 1) {
if (slave.fetishStrength + slave.devotion + slave.trust > random(1, 500)) {
if (slave.behavioralFlaw === "arrogant") {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${His} need to submit has <span class="flaw break">softened ${his} arrogance into confidence.</span>`);
SoftenBehavioralFlaw(slave);
}
@@ -993,7 +993,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
} else if (slave.fetishKnown === 1) {
if (slave.fetishStrength + slave.devotion + slave.trust > random(1, 500)) {
if (slave.behavioralFlaw === "arrogant") {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${His} arrogance was probably a reflection of ${his} subconscious need to submit, which is so satisfied by sexual slavery that <span class="flaw break">${he} no longer needs to act arrogant.</span>`);
slave.behavioralFlaw = "none";
}
@@ -1086,7 +1086,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
SoftenSexualFlaw(slave);
}
} else if (slave.sexualFlaw === "apathetic") {
- if (slave.fetish === "submissive" && slave.fetishKnown === 1) {
+ if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishKnown === 1) {
r.push(`${His} subconscious drive to submit <span class="flaw break">softens ${his} sexual apathy into constant care for ${his} partners' wants.</span>`);
SoftenSexualFlaw(slave);
} else if (slave.energy > 95) {
@@ -1102,7 +1102,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
SoftenSexualFlaw(slave);
}
} else if (slave.sexualFlaw === "judgemental") {
- if (slave.fetish === "submissive" && slave.fetishKnown === 1) {
+ if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishKnown === 1) {
r.push(`${His} subconscious belief that ${he}'s worthless <span class="flaw break">softens ${his} judgemental behavior into eagerness to be fucked by the biggest cocks.</span>`);
SoftenSexualFlaw(slave);
} else if (slave.energy > 95) {
@@ -1118,7 +1118,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
SoftenSexualFlaw(slave);
}
} else if (slave.sexualFlaw === "idealistic") {
- if (slave.fetish === "submissive" && slave.fetishKnown === 1) {
+ if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishKnown === 1) {
r.push(`${His} appetite for submission has <span class="flaw break">softened ${his} innocent ideas about sex into an ability to find romance</span> in the life of a sex slave.`);
SoftenSexualFlaw(slave);
} else if (slave.energy > 95) {
@@ -1169,6 +1169,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
slave.sexualFlaw = "none";
} else if (slave.fetish === "pregnancy" && slave.fetishKnown === 1 && (slave.ovaries === 1 || slave.mpreg === 1)) {
r.push(`It would be unreasonable to expect to become pregnant with out being penetrated, so <span class="flaw break">${his} previous hesitations about getting fucked vanish.</span>`);
+ slave.sexualFlaw = "none";
} else if (slave.energy > 95) {
r.push(`${He} needs sex like ${he} needs air, so <span class="flaw break">${his} previous hesitations about getting fucked vanish.</span>`);
slave.sexualFlaw = "none";
@@ -1200,7 +1201,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
slave.sexualFlaw = "none";
}
} else if (slave.sexualFlaw === "idealistic") {
- if (slave.fetish === "submissive" && slave.fetishKnown === 1) {
+ if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishKnown === 1) {
r.push(`${He} always expected to be able to turn down sex, but <span class="flaw break">${he}'s finally realized that ${he} doesn't want to be asked.</span>`);
slave.sexualFlaw = "none";
} else if (slave.energy > 95) {
@@ -1516,7 +1517,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
break;
}
case "neglectful":
- if (slave.fetish !== "submissive") {
+ if (slave.fetish !== Fetish.SUBMISSIVE) {
if (slave.fetishStrength > 60) {
r.push(`${His} sexual self neglect <span class="fetish inc">disinterests ${him} in ${his} current fetish,</span> and the conflict of sexual identity causes ${him} <span class="mediumorchid">some anguish.</span>`);
slave.fetishStrength -= 5;
@@ -1827,7 +1828,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
}
if (slave.heels === 1) {
if (shoeHeelCategory(slave) === 0) {
- if (slave.fetish !== "submissive") {
+ if (slave.fetish !== Fetish.SUBMISSIVE) {
if (slave.career === "a dairy cow" || slave.career === "a breeding bull") {
r.push(`${He} sees ${himself} as an animal, and as such, is perfectly content`);
if (hasAllLimbs(slave)) {
@@ -2160,7 +2161,7 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
slave.sexualFlaw = "breeder";
slave.fetishStrength = 100;
FSApproves = 1;
- } else if (slave.preg > 37 && slave.broodmother > 0) {
+ } else if (slave.preg >= 37 && slave.broodmother > 0) {
if (slave.broodmother === 2) {
r.push(`${He}'s nearly bursting with life and giving birth constantly,`);
} else {
diff --git a/src/endWeek/saLongTermPhysicalEffects.js b/src/endWeek/saLongTermPhysicalEffects.js
index cb0d9548ccf44043929e567cfbffcc67c5a08d68..725074a2f2a3059d990bfd917215629658bba563 100644
--- a/src/endWeek/saLongTermPhysicalEffects.js
+++ b/src/endWeek/saLongTermPhysicalEffects.js
@@ -46,13 +46,13 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
if (slave.fuckdoll === 0) {
mobility(slave);
hugeBreasts(slave);
- if (slave.fetish !== "mindbroken" && isSlaveAvailable(slave)) {
+ if (slave.fetish !== Fetish.MINDBROKEN && isSlaveAvailable(slave)) {
boobAccessibility(slave);
}
}
hugeBelly(slave);
if (slave.fuckdoll === 0) {
- if (slave.fetish !== "mindbroken" && isSlaveAvailable(slave)) {
+ if (slave.fetish !== Fetish.MINDBROKEN && isSlaveAvailable(slave)) {
bellyAccessibility(slave);
hugeDick(slave);
dickAccessibility(slave);
@@ -106,7 +106,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
*/
function teeth(slave) {
if (slave.teeth === "straightening braces") {
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.devotion <= 20) {
r.push(`${His} mouth full of orthodontia is quite uncomfortable,`);
if (totalInt > 15) {
@@ -215,19 +215,16 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
*
*/
function holeRelaxation(slave) {
- if (!["be confined in the arcade", "serve in the club", "serve the public", "whore", "work a glory hole", "work in the brothel"].includes(slave.assignment)) {
- if (slave.assignment !== Job.MASTERSUITE || V.masterSuiteUpgradeLuxury < 2) {
- if (slave.assignment !== Job.DAIRY || V.dairyStimulatorsSetting === 0) {
- if (slave.geneMods.rapidCellGrowth !== 1) {
- if (slave.vagina >= 3 && dildoWidth(slave) < 2) {
- r.push(`With a rest from strenuous use, <span class="improvement">${his} loose vagina recovers a little.</span>`);
- slave.vagina -= 1;
- } else if (slave.anus >= 3 && plugWidth(slave) < 2) {
- r.push(`With a rest from continual sodomy, <span class="improvement">${his} gaping anus recovers a little.</span>`);
- slave.anus -= 1;
- }
- }
- }
+ const jobStressesHoles = [Job.ARCADE, Job.CLUB, Job.PUBLIC, Job.WHORE, Job.GLORYHOLE, Job.BROTHEL].includes(slave.assignment) ||
+ (slave.assignment === Job.MASTERSUITE && V.masterSuiteUpgradeLuxury === 2) ||
+ (slave.assignment === Job.DAIRY && V.dairyStimulatorsSetting > 0);
+ if (slave.geneMods.rapidCellGrowth !== 1) {
+ if (slave.vagina >= 3 && dildoWidth(slave) < 2 && (!jobStressesHoles || slave.chastityVagina === 1)) {
+ r.push(`With a rest from strenuous use, <span class="improvement">${his} loose vagina recovers a little.</span>`);
+ slave.vagina -= 1;
+ } else if (slave.anus >= 3 && plugWidth(slave) < 2 && (!jobStressesHoles || slave.chastityAnus === 1)) {
+ r.push(`With a rest from continual sodomy, <span class="improvement">${his} gaping anus recovers a little.</span>`);
+ slave.anus -= 1;
}
}
if (slave.anus >= slave.analArea) {
@@ -445,7 +442,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
*
*/
function adjustSexualAppetite(slave) {
- if (slave.fetish !== "mindbroken") { // future proofing for mindbreak-pleasure
+ if (slave.fetish !== Fetish.MINDBROKEN) { // future proofing for mindbreak-pleasure
if (slave.devotion > 95) {
if (slave.energy <= 50) {
r.push(`${He}'s so worshipful of you that ${he} derives erotic satisfaction simply from being your slave, giving ${him} <span class="libido inc">more of an appetite for sex.</span>`);
@@ -544,7 +541,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
r.push(`off as frequently as ${his}`);
if (slave.aphrodisiacs > 0 || slave.inflationType === "aphrodisiac") {
r.push(`aphrodisiac fueled sex drive demands, and the constant frustration`);
- if (slave.fuckdoll !== 0 || slave.fetish === "mindbroken") {
+ if (slave.fuckdoll !== 0 || slave.fetish === Fetish.MINDBROKEN) {
r.push(`<span class="health dec">stresses ${his} body considerably.</span>`);
healthDamage(slave, decay);
} else {
@@ -554,7 +551,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
}
} else if (slave.need > slave.energy && slave.energy >= 70) {
r.push(`powerful sex drive demands, and the constant frustration`);
- if (slave.fuckdoll !== 0 || slave.fetish === "mindbroken") {
+ if (slave.fuckdoll !== 0 || slave.fetish === Fetish.MINDBROKEN) {
r.push(`<span class="health dec">stresses ${his} body considerably.</span>`);
healthDamage(slave, decay);
} else {
@@ -1358,7 +1355,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
}
}
if (slave.preg > 30) {
- if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0) {
if (hasAnyArms(slave)) {
if (slave.devotion < -20) {
r.push(`When ${he} isn't laboring or performing ${his} duties ${he} can be seen pressing down on ${his} grotesque belly desperately trying to coax the device out of ${his} body. ${He} is <span class="trust dec">mortified</span> by ${his} body and <span class="devotion dec">loathes you</span> for doing this to ${him}.`);
@@ -1402,17 +1399,17 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
}
if (slave.counter.births > 100 && slave.devotion <= 20 && slave.trust <= 20) {
r.push(`Being constantly pregnant and giving birth to over a hundred offspring has taken its toll on ${slave.slaveName}'s mind. Feeling that ${he} is nothing more than a breeder has destroyed any hopes that ${he} had. ${slave.slaveName} has become <span class="mindbreak">completely broken,</span> leaving ${him} nothing more than a baby-filled sack.`);
- slave.fetish = "mindbroken";
+ slave.fetish = Fetish.MINDBROKEN;
slave.sexualFlaw = "none";
slave.behavioralFlaw = "none";
} else if (slave.weight <= -95 && slave.boobs < 100 && slave.butt < 1 && slave.muscles < -95) {
r.push(`Watching ${his} body sacrifice itself for a pregnancy ${he} hates takes its toll on ${slave.slaveName}'s mind. Feeling that ${he} is nothing more than a host for ${his} brood has destroyed any hopes ${he} had left. ${slave.slaveName} has become <span class="mindbreak">completely broken.</span>`);
- slave.fetish = "mindbroken";
+ slave.fetish = Fetish.MINDBROKEN;
slave.sexualFlaw = "none";
slave.behavioralFlaw = "none";
}
}
- if (slave.fetish === "mindbroken" && slave.weight <= -95 && slave.butt < 1 && slave.boobs < 100 && slave.muscles < -95 && ((slave.physicalAge < 18 && slave.counter.births > 50) || (slave.physicalAge <= 32 && slave.counter.births > 100) || (slave.physicalAge > 32 && slave.counter.births > 150))) {
+ if (slave.fetish === Fetish.MINDBROKEN && slave.weight <= -95 && slave.butt < 1 && slave.boobs < 100 && slave.muscles < -95 && ((slave.physicalAge < 18 && slave.counter.births > 50) || (slave.physicalAge <= 32 && slave.counter.births > 100) || (slave.physicalAge > 32 && slave.counter.births > 150))) {
slave.counter.births += 50;
slave.counter.birthsTotal += 50;
V.birthsTotal += 50;
@@ -1422,7 +1419,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
}
}
} else {
- r.push(`${His} high-calorie and nutrient filled diet allows ${his} body to handle its demanding pregnancy, though being stuffed only compounds the pressure within ${his} abdomen. ${He} <span class="devotion dec">resents</span> needing to have ${his} stomach bloated with food at all times, but <span class="trust inc">appreciates</span> the effort you are putting into keeping ${him} healthy.`);
+ r.push(`${His} high-calorie and nutrient-filled diet allows ${his} body to handle its demanding pregnancy, though being stuffed only compounds the pressure within ${his} abdomen. ${He} <span class="devotion dec">resents</span> needing to have ${his} stomach bloated with food at all times, but <span class="trust inc">appreciates</span> the effort you are putting into keeping ${him} healthy.`);
slave.devotion -= 1;
slave.trust += 2;
}
@@ -1579,7 +1576,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
}
}
r.push(`making ${his} life more difficult.`);
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (mobility) {
if (slave.rules.mobility === "restrictive") {
if (slave.devotion < -20) {
@@ -1587,7 +1584,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
slave.devotion -= 2;
slave.trust -= 4;
} else if (slave.devotion >= -20) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
if (slave.fetishKnown === 1) {
r.push(`${He} <span class="devotion inc">loves being forced</span> to crawl around like some kind of animal.`);
slave.devotion += 1;
@@ -1653,7 +1650,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
r.push(`${He} can't escape those looking to prey upon ${him}, <span class="trust dec">terrifying ${him}.</span>`);
slave.trust -= 4;
} else if (slave.devotion >= -20) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
if (slave.fetishKnown === 1) {
r.push(`${He} <span class="devotion inc">loves having no choice but to be submissive</span> if ${he} wants assistance.`);
slave.devotion += 1;
@@ -1688,7 +1685,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
} else {
r.push(`${He} requires help to do nearly everything, which`);
}
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (likesImmobility) {
r.push(`suits ${his} fetish just fine.`);
} else if (slave.devotion > 50) {
@@ -2157,7 +2154,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
r.push(`it distracts from the possibilities at least.`);
} else if (slave.devotion > 90) {
r.push(`${He} believes in you so absolutely that even if ${he} doesn't make it, ${he} accepts it as your will.`);
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} struggles along ${his} daily tasks as if nothing is out of the ordinary.`);
} else {
r.push(`This is <span class="devotion dec">horrifying</span> to ${him}. ${He} is in excruciating pain and each`);
@@ -2189,7 +2186,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
} else if (slave.belly > (slave.pregAdaptation * 3200)) {
r.push(`${His}`);
if (slave.mpreg === 0 && slave.ovaries === 0) {
- r.push(`implant filled abdominal cavity`);
+ r.push(`implant-filled abdominal cavity`);
} else {
r.push(`straining womb`);
}
@@ -2211,7 +2208,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
r.push(`every breath`);
}
r.push(`feeling like a knife being driven into ${his} body, ${he} has faith in your plans for ${him}.`);
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} carries on ${his} daily tasks as if nothing is bothering ${him}.`);
} else {
r.push(`This is <span class="devotion dec">very worrying</span> to ${him}. ${He} is in constant pain and`);
@@ -2270,7 +2267,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
r.push(`every motion ${he} takes is uncomfortable,`);
}
r.push(`${he} tries ${his} best to not bother you with ${his} worries.`);
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} tries ${his} best to stay still to minimize the amount of discomfort ${he}'s in.`);
} else {
r.push(`This is <span class="devotion dec">very worrying</span> to ${him}. ${He} moans in discomfort`);
@@ -2315,7 +2312,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
}
} else if (slave.devotion > 50) {
r.push(`${He} is in constant discomfort, but ${he} grins and bears it for you.`);
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Such discomforts are meaningless to ${his} broken mind.`);
} else {
r.push(`${He} is in constant <span class="devotion dec">discomfort</span> and can't wait for these children to be born.`);
@@ -2364,7 +2361,7 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
}
/* body inconvenience */
- if (slave.fuckdoll !== 0 && slave.fetish !== "mindbroken" && isSlaveAvailable(slave)) {
+ if (slave.fuckdoll !== 0 && slave.fetish !== Fetish.MINDBROKEN && isSlaveAvailable(slave)) {
const belly = bellyAdjective(slave);
if (slave.physicalAge < 4) {
if (slave.belly >= 150000) {
diff --git a/src/endWeek/saNanny.js b/src/endWeek/saNanny.js
index 0f74cf6faa22b8e58739e21d499d94aa83e36575..9e78a66c07bb6679db4701b8285c9328883318a8 100644
--- a/src/endWeek/saNanny.js
+++ b/src/endWeek/saNanny.js
@@ -63,7 +63,7 @@ App.SlaveAssignment.nanny = function(slave) {
// TODO:
if (App.Data.Careers.General.servant.includes(slave.career)) {
t += ` ${He} has experience with nannying from ${his} life before ${he} was a slave, making ${him} more effective.`;
- } else if (slave.skill.servant >= V.masteredXP) {
+ } else if (slave.skill.servant >= Constant.MASTERED_XP) {
t += ` ${He} has experience with nannying from working for you, making ${him} more effective.`;
} else {
slave.skill.servant += jsRandom(1, Math.ceil((slave.intelligence + slave.intelligenceImplant) / 15) + 8);
@@ -77,7 +77,7 @@ App.SlaveAssignment.nanny = function(slave) {
// TODO:
if (slave.fetishStrength > 60) {
- if (slave.fetish === "submissive" && slave.fetishKnown === 1) {
+ if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishKnown === 1) {
t += ` ${His} natural affinity for submission increases ${his} effectiveness.`;
} else if (slave.fetishKnown === 1 && slave.fetish === "dom") {
t += ` ${His} sexual appetite for domination reduces ${his} effectiveness.`;
diff --git a/src/endWeek/saPartTime.js b/src/endWeek/saPartTime.js
new file mode 100644
index 0000000000000000000000000000000000000000..cd00265068a8dc6fb5410d062f66967a0d6247b0
--- /dev/null
+++ b/src/endWeek/saPartTime.js
@@ -0,0 +1,70 @@
+App.SlaveAssignment.PartTime = Object.freeze(function() {
+ /**
+ * How much do part-time jobs degrade the normal performance. Gives a multiplier for the work that still gets done.
+ * @param {FC.SlaveState} slave
+ * @returns {number} Between 0 (exclusive) and 1 (inclusive)
+ */
+ function efficiencyModifier(slave) {
+ let workTime = 0; // time spent working, in hours per day
+
+ switch (slave.rules.rest) {
+ case "none":
+ workTime = 16;
+ break;
+ case "cruel":
+ workTime = 15;
+ break;
+ case "restrictive":
+ workTime = 13;
+ break;
+ case "permissive":
+ workTime = 12;
+ break;
+ case "mandatory":
+ workTime = 10;
+ break;
+ }
+
+ const partTime = arenaTime(slave);
+ let efficiency = 1 - (partTime / workTime);
+
+ return Math.max(0.1, efficiency); // Some work would always be done;
+ }
+
+ /**
+ * Hours per day the slave devotes to the arena.
+ *
+ * @param {FC.SlaveState} slave
+ * @returns {number}
+ */
+ function arenaTime(slave) {
+ if (App.Entity.facilities.pit.job("trainee").isEmployed(slave)) {
+ if (slave.skill.combat >= 100) {
+ return 1; // They just work on maintaining skill
+ }
+ return 4;
+ }
+ return 0;
+ }
+
+ /**
+ * Assembles the part-time report for all part-time jobs the slave is assigned to.
+ *
+ * @param {FC.ReportSlave} slave
+ * @returns {Array<string>}
+ */
+ function saPartTime(slave) {
+ /** @type {Array<string>} */
+ const f = [];
+ if (App.Entity.facilities.pit.job("trainee").isEmployed(slave)) {
+ f.push(App.SlaveAssignment.arena(slave));
+ }
+ return f;
+ }
+
+ return {
+ efficiencyModifier,
+ arenaTime,
+ saPartTime,
+ };
+}());
diff --git a/src/endWeek/saPleaseYou.js b/src/endWeek/saPleaseYou.js
index ad03a000ef3ba7acd05b0ee8159ab9d49c71a9c7..b1b494e55e1bc433ec362c3160a28c41c96e1beb 100644
--- a/src/endWeek/saPleaseYou.js
+++ b/src/endWeek/saPleaseYou.js
@@ -14,7 +14,9 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
const fetishChange = fetishChangeChance(slave);
const arcology = V.arcologies[0];
const fuckSlavesCount = fuckSlavesLength();
- const trainingEfficiency = 5 + Math.trunc(slave.devotion / 30) + ((slave.intelligence + slave.intelligenceImplant) / 32);
+ let trainingEfficiency = 5 + Math.trunc(slave.devotion / 30) + ((slave.intelligence + slave.intelligenceImplant) / 32);
+ const pMod = App.SlaveAssignment.PartTime.efficiencyModifier(slave);
+ trainingEfficiency *= pMod;
const canFuck = slave.rules.release.master !== 0;
let oralUse = 0;
@@ -53,7 +55,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
physicalEffects(slave);
const familyMult = familyBonus(slave);
addRep(slave, familyMult);
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
mentalEffects(slave);
}
@@ -101,7 +103,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
physicalEffects(slave);
const familyMult = familyBonus(slave);
addRep(slave, familyMult);
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
mentalEffects(slave);
}
@@ -127,7 +129,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
}
if (slave.fuckdoll === 0) {
r.push(`${He} spends the week`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`unaware of your intent to use ${his} pussy.`);
} else if (slave.trust < -20) {
r.push(`in terrified compliance with your use of ${his} pussy.`);
@@ -135,7 +137,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
r.push(`alternately struggling and lying corpse-like as you use ${his} pussy.`);
} else if (slave.devotion <= 20) {
r.push(`reluctantly accepting your use of ${his} pussy.`);
- } else if (slave.fetishKnown === 1 && slave.fetish === "submissive") {
+ } else if (slave.fetishKnown === 1 && slave.fetish === Fetish.SUBMISSIVE) {
r.push(`as your adoring submissive, seeing to your pleasure with ${his} womanhood.`);
} else if (slave.devotion <= 50) {
r.push(`obediently serving you in the classical way, taking you into ${his} womanhood.`);
@@ -143,7 +145,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
r.push(`serving you in the classical way, warming your bed and lovingly taking you into ${his} womanhood.`);
}
r.push(`You have the sexual energy to fuck ${him}`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (vaginalUse >= 14) {
r.push(`several times a day.`);
slave.devotion -= 5;
@@ -201,7 +203,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
}
r.push(`enjoyable sex with you draws ${him} <span class="hotpink">closer to you</span> and encourages ${him} to <span class="mediumaquamarine">trust you.</span>`);
}
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.sexualFlaw === "hates penetration" && slave.devotion > 50) {
r.push(`The emotional closeness <span class="green">resolves ${his} hatred of penetration.</span>`);
slave.sexualFlaw = "none";
@@ -212,8 +214,8 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
}
}
if (V.PC.dick !== 0) {
- if (slave.fetish !== "mindbroken") {
- if (slave.fetish === "submissive") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He} frequently climaxes with your`);
if (V.PC.title === 1) {
r.push(`strong`);
@@ -285,7 +287,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
}
if (slave.fuckdoll === 0) {
r.push(`${He} spends the week`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`unaware of your intent to use ${his} anus.`);
} else if (slave.trust < -20) {
r.push(`in terrified compliance with your use of ${his} anus.`);
@@ -307,7 +309,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
r.push(`warming your bed and devotedly serving your sexual needs with ${his} anus.`);
}
r.push(`You have the sexual energy to fuck ${his} butt`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (analUse >= 14) {
r.push(`several times a day.`);
slave.devotion -= 5;
@@ -365,7 +367,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
}
r.push(`climaxing to your penetration of ${his} rear brings ${him} <span class="hotpink">closer to you</span> and encourages ${him} to <span class="mediumaquamarine">trust you.</span>`);
}
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.sexualFlaw === "hates anal" && slave.devotion > 50) {
r.push(`${He}'s devoted enough to derive emotional closeness from buttsex, which <span class="green">resolves ${his} hatred of the act.</span>`);
slave.sexualFlaw = "none";
@@ -437,7 +439,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
}
if (slave.fuckdoll === 0) {
r.push(`${He} spends the week`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`unaware of your intent to use ${his} mouth.`);
} else if (slave.trust < -20) {
r.push(`in terrified compliance with your use of ${his}`);
@@ -507,7 +509,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
r.push(`with ${his} loving mouth.`);
}
r.push(`You have the sexual energy to`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.PC.dick !== 0) {
r.push(`use ${his} mouth`);
} else {
@@ -590,7 +592,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
}
r.push(`giving you pleasure brings ${him} <span class="hotpink">closer to you</span> and encourages ${him} to <span class="mediumaquamarine">trust you.</span>`);
}
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.sexualFlaw === "hates oral" && slave.devotion > 50) {
r.push(`${He}'s devoted enough to derive emotional closeness from giving you oral, which <span class="green">resolves ${his} hatred of the act.</span>`);
slave.sexualFlaw = "none";
@@ -686,7 +688,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
}
if (slave.fuckdoll === 0) {
r.push(`${He} spends the week`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`unaware of your intent to use ${his} breasts.`);
} else if (slave.trust < -20) {
r.push(`in terrified compliance with your use of ${his} breasts.`);
@@ -706,7 +708,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
r.push(`resting them against you as you work, and serving as a comfortable pillow at bedtime.`);
}
r.push(`You have the sexual energy to`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.PC.dick !== 0) {
if (slave.nipples === "fuckable") {
r.push(`fuck ${his} boobs`);
@@ -806,7 +808,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
}
r.push(`giving you pleasure brings ${him} <span class="hotpink">closer to you</span> and encourages ${him} to <span class="mediumaquamarine">trust you.</span>`);
}
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.sexualFlaw === "hates oral" && slave.devotion > 50) {
r.push(`${He}'s devoted enough to derive emotional closeness from giving you oral, which <span class="green">resolves ${his} hatred of the act.</span>`);
slave.sexualFlaw = "none";
@@ -912,7 +914,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
r.push(`on occasion.`);
}
r.push(`You have to do all the work, unfortunately.`);
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
if (slave.career === "a breeding bull") {
if (canGetPregnant(V.PC)) {
r.push(`${He} spends the week eagerly trying to breed you. You have the sexual energy to take ${him}`);
@@ -949,7 +951,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
} else if (V.PC.preg >= 24 && V.PC.pregMood === 1) {
r.push(`${He} spends the week`);
if (slave.trust < -20) {
- r.push(`cautiously fucking you in the missionary position. It takes a gentle touch to ${him} know it safe to get hard, but after that ${he} knows what to do.`);
+ r.push(`cautiously fucking you in the missionary position. It takes a gentle touch to let ${him} know it's safe to get hard, but after that ${he} knows what to do.`);
} else if (slave.devotion < -20) {
r.push(`aggressively fucking your pussy with little regard for you or your child${V.PC.pregType > 1 ? 'ren' : ''}.`);
} else if (slave.devotion <= 20) {
@@ -1018,7 +1020,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
r.push(`alternately struggling or lying corpse-like under your gravid bulk as you forcibly ride ${his} dick in a futile attempt to cool your raging hormones.`);
} else if (slave.devotion <= 20) {
r.push(`reluctantly trying to avoid having to take all of your pregnancy weight while not pissing you off whenever you ride ${his} dick in a futile attempt to cool your raging hormones.`);
- } else if (slave.fetishKnown === 1 && slave.fetish === "submissive") {
+ } else if (slave.fetishKnown === 1 && slave.fetish === Fetish.SUBMISSIVE) {
r.push(`doing ${his} best to be a good belly support as ${he} submissively gives you what you want.`);
} else if (slave.devotion <= 50) {
r.push(`obediently bearing your weight as you aggressively ride ${his} dick in a futile attempt to cool your raging hormones.`);
@@ -1077,7 +1079,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
r.push(`alternately struggling or lying corpse-like as you ride ${his} dick.`);
} else if (slave.devotion <= 20) {
r.push(`reluctantly accepting your use of ${his} dick.`);
- } else if (slave.fetishKnown === 1 && slave.fetish === "submissive") {
+ } else if (slave.fetishKnown === 1 && slave.fetish === Fetish.SUBMISSIVE) {
r.push(`as your adoring submissive, seeing to your pleasure with ${his} shaft.`);
} else if (slave.devotion <= 50 && V.PC.vagina !== -1) {
r.push(`obediently serving you in the classical way, driving into your womanhood.`);
@@ -1137,7 +1139,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
r.push(`enjoyable sex with you draws ${him} <span class="hotpink">closer to you</span> and encourages ${him} to <span class="mediumaquamarine">trust you.</span>`);
}
}
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.behavioralFlaw === "hates women" && V.PC.title === 0 && V.PC.vagina !== -1 && V.PC.dick === 0 && slave.devotion > 20) {
r.push(`Spending so much intimate time with an attractive woman <span class="green">reconciles ${him} to serving the fairer sex.</span>`);
slave.behavioralFlaw = "none";
@@ -1403,7 +1405,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
mammaryUse = Math.trunc((mammaryUse / demand) * acts);
if (slave.fuckdoll === 0) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.skill.oral < 100) {
r.push(`After a lot of time spent with`);
if (V.PC.dick !== 0) {
@@ -1524,7 +1526,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
}
if (cervixPump > 0) {
if (slave.fuckdoll === 0) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is completely oblivious to ${his} <span class="lime">increasingly swollen belly</span> and stands no chance of linking it to`);
} else {
r.push(`${He} notices ${his} <span class="lime">belly has swollen</span> after`);
@@ -1555,46 +1557,46 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
case "masochist":
case "submissive":
if (analUse + vaginalUse > 0) {
- r.push(`${He} got tremendous sexual satisfaction from the ${analUse + vaginalUse} times you really fucked ${him} this week.`);
+ r.push(`${He} got tremendous sexual satisfaction from the ${num(analUse + vaginalUse)} times you really fucked ${him} this week.`);
slave.need = 0;
}
break;
case "dom":
if (penetrativeUse > 0) {
- r.push(`${He} got tremendous sexual satisfaction from the ${penetrativeUse} times ${he} got to fuck you this week.`);
+ r.push(`${He} got tremendous sexual satisfaction from the ${num(penetrativeUse)} times ${he} got to fuck you this week.`);
slave.need = 0;
}
break;
case "boobs":
if (mammaryUse > 0) {
- r.push(`${He} got tremendous sexual satisfaction from the ${mammaryUse} times you groped ${his} breasts to orgasm this week.`);
+ r.push(`${He} got tremendous sexual satisfaction from the ${num(mammaryUse)} times you groped ${his} breasts to orgasm this week.`);
slave.need = 0;
}
break;
case "sadist":
case "cumslut":
if (oralUse > 0) {
- r.push(`${He} got tremendous sexual satisfaction from the ${oralUse} times you fucked ${his} face this week.`);
+ r.push(`${He} got tremendous sexual satisfaction from the ${num(oralUse)} times you fucked ${his} face this week.`);
slave.need = 0;
}
break;
case "buttslut":
if (analUse > 0) {
- r.push(`${He} got tremendous sexual satisfaction from the ${analUse} times you fucked ${his} ass this week.`);
+ r.push(`${He} got tremendous sexual satisfaction from the ${num(analUse)} times you fucked ${his} ass this week.`);
slave.need = 0;
}
break;
case "pregnancy":
if (vaginalUse > 0 && slave.mpreg === 0) {
- r.push(`${He} got tremendous sexual satisfaction from the ${vaginalUse} times you fucked ${his} pussy this week.`);
+ r.push(`${He} got tremendous sexual satisfaction from the ${num(vaginalUse)} times you fucked ${his} pussy this week.`);
slave.need = 0;
} else if (analUse > 0 && slave.mpreg === 1) {
- r.push(`${He} got tremendous sexual satisfaction from the ${analUse} times you fucked ${his} butt this week.`);
+ r.push(`${He} got tremendous sexual satisfaction from the ${num(analUse)} times you fucked ${his} butt this week.`);
slave.need = 0;
}
break;
case "humiliation":
- // nothing here
+ // nothing here
break;
}
}
@@ -1658,7 +1660,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
function addRep(slave, familyMult) {
let multiplier = 0.1 + familyMult;
if (slave.fuckdoll === 0) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.relationship === -2) {
multiplier += 0.04;
} else if (slave.relationship === -3 && slave.devotion > 50) {
@@ -1678,7 +1680,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
multiplier += 0.02;
}
if (slave.prestige > 0) {
- multiplier += 0.03*slave.prestige;
+ multiplier += 0.03 * slave.prestige;
}
if (slave.porn.prestige > 2) {
multiplier += 0.1;
@@ -1698,7 +1700,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
multiplier += 0.05;
}
- repX(Math.trunc(( Beauty(slave) * FResult(slave) ) * multiplier / 4), "fucktoy", slave);
+ repX(Math.trunc((Beauty(slave) * FResult(slave)) * multiplier / 4), "fucktoy", slave);
r.push(`Keeping ${him} as nothing but your personal`);
if (!canFuck) {
@@ -1726,7 +1728,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
} else if (slave.porn.prestige > 1) {
r.push(`Having a rising porn star to sate your urges with <span class="green">demonstrates how well off you are.</span>`);
}
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.relationship === -2) {
r.push(`${His} satisfaction with ${his} place near you is obvious, <span class="green">bringing attention</span> to how completely you've broken ${him}.`);
} else if (slave.relationship === -3 && slave.devotion > 50) {
@@ -1790,7 +1792,7 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
slave.fetishStrength += 4;
}
} else if (fetishChange > random(0, 100) && (V.PC.preg >= 20 || (V.PC.preg >= 16 && V.PC.career === "escort"))) {
- r.push(`At first ${he} found the prospect of being used by ${his} increasingly pregnant ${getWrittenTitle(slave)} a turn off, but being so close to your gravid form serves to be more erotic than ${he} anticipated. Soon ${he} finds ${himself} aroused less from the prospect of sex and more <span class="lightcoral">the chance to be near your child laden belly.</span>`);
+ r.push(`At first ${he} found the prospect of being used by ${his} increasingly pregnant ${getWrittenTitle(slave)} a turn off, but being so close to your gravid form serves to be more erotic than ${he} anticipated. Soon ${he} finds ${himself} aroused less from the prospect of sex and more <span class="lightcoral">the chance to be near your child-laden belly.</span>`);
slave.fetish = "pregnancy";
slave.fetishKnown = 1;
slave.fetishStrength = 10;
diff --git a/src/endWeek/saPorn.js b/src/endWeek/saPorn.js
index 246dd03b18271fc20704997010d1b765182c4464..bd150b1ca283b00ca8c971b9f2cd2d924724159a 100644
--- a/src/endWeek/saPorn.js
+++ b/src/endWeek/saPorn.js
@@ -28,6 +28,7 @@ App.SlaveAssignment.porn = function saPorn(slave) {
prestigeCommentary(slave);
faceCommentary(slave);
hack();
+ checkFocus();
allGenreViews(slave);
updateViewerCount(slave);
@@ -158,7 +159,7 @@ App.SlaveAssignment.porn = function saPorn(slave) {
*/
function prestigeCommentary(slave) {
if (slave.porn.prestige > 1) {
- r += `${He} is widely regarded in ${slave.porn.fameType} porn, but with so many watchers, turn over is high. `;
+ r += `${He} is widely regarded in ${slave.porn.fameType} porn, but with so many watchers, turnover is high. `;
} else if (slave.porn.prestige > 0) {
if (slave.porn.fameType === "generic") {
r += `${He} has claimed a niche in slave porn, so there is a constant cycle of new arrivals and bored ex-watchers. `;
@@ -212,6 +213,16 @@ App.SlaveAssignment.porn = function saPorn(slave) {
}
}
+ function checkFocus() {
+ if (slave.porn.focus !== "none") {
+ const focusGenre = App.Porn.getGenreByFocusName(slave.porn.focus);
+ if (!focusGenre || !focusGenre.valid(slave)) {
+ r += `${He} has been instructed to focus on ${slave.porn.focus} aspects of ${his} sex life to improve the porn ${he} produces, but ${he} <span class="red">can no longer do so.</span>`;
+ slave.porn.focus = "none";
+ }
+ }
+ }
+
function hack() {
if (V.PC.skill.hacking > 10) {
r += `With your hacking skills, you manage to tweak search algorithms to display ${his} content more often. `;
diff --git a/src/endWeek/saPregnancy.js b/src/endWeek/saPregnancy.js
index 766ddca086d0578850b520c7e12540112c02cf4f..ef80741b563ab763ab57554183a6da752587d278 100644
--- a/src/endWeek/saPregnancy.js
+++ b/src/endWeek/saPregnancy.js
@@ -30,13 +30,13 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
*/
function pregnancyEffects(slave) {
pregnancyDiscovery(slave);
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
pregnancyLibido(slave);
}
fetalAdjustment(slave);
if (slave.preg >= slave.pregData.normalBirth / 4) {
pregnancyAdjustments(slave);
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
pregnancyMentalEffects(slave);
}
pregnancyPhysicalEffects(slave);
@@ -525,7 +525,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
}
r.push(`${He} is far enough along that ${he} may go into early labor.`);
}
- } else if (slave.broodmother > 0 && slave.preg > 37) {
+ } else if (slave.broodmother > 0 && slave.preg >= 37) {
if (slave.broodmother === 2) {
r.push(`${He} often has to stop for breaks to soothe ${his} kicking`);
if (slave.geneticQuirks.uterineHypersensitivity === 2) {
@@ -615,6 +615,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
*/
function pregnancyPhysicalEffects(slave) {
let boobTarget;
+ const slimnessFoodMod = V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 1 ? 0.5 : 1;
if (slave.geneMods.NCS === 1) {
// NCS: always working against secondary sexual characteristics even in pregnancies.
boobTarget = 0;
@@ -668,6 +669,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
}
}
boobTarget *= gigantomastiaMod;
+ boobTarget *= slimnessFoodMod;
if (slave.geneMods.NCS === 0) {
const boobSize = slave.boobs - slave.boobsImplant - slave.boobsMilk;
const buttSize = slave.butt - slave.buttImplant;
@@ -790,7 +792,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
function needToBreed(slave) {
if (slave.geneticQuirks.uterineHypersensitivity === 2) {
slave.need *= 2;
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.fetish !== "pregnancy") {
if (slave.fetishStrength > 10) {
r.push(`${He} feels a constant compulsion to breed, <span class="fetish loss">steadily eroding ${his} sexuality.</span>`);
@@ -872,7 +874,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
function impregnation(slave) {
const conceptionSeed = random(1, 100);
let Stud = slaveStateById(V.StudID); // May be null!
- const studIgnoresRules = (Stud && V.universalRulesImpregnation === "Stud" && Stud.career === "a breeding bull" && Stud.fetish === "mindbroken" && canMove(Stud));
+ const studIgnoresRules = (Stud && V.universalRulesImpregnation === "Stud" && Stud.career === "a breeding bull" && Stud.fetish === Fetish.MINDBROKEN && canMove(Stud));
const pussy = (slave.mpreg === 1 ? "asspussy" : "pussy");
let satisfiedPregFetish = 0;
let StudVaginal = 0;
@@ -888,7 +890,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
r.push(`cunt,`);
}
r.push(`you keep ${him} around as you fuck other slaves so you can pull out of them, shove your cock into ${him}, and fill ${him} with your seed anyway.`);
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.devotion <= 20 && slave.trust >= -20) {
r.push(`${He} attempts to resist this treatment, and spends most of ${his} days bound securely, with your cum dripping out of ${his}`);
if (slave.mpreg === 1) {
@@ -976,7 +978,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
} else {
r.push(`Head Girl approaches dutifully.`);
}
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.career === "a dairy cow" && slave.devotion <= 20) {
r.push(`${slave.slaveName} feels a need to be bred by the Head Girl, and submits ${himself} to ${his} superior's virile cock until <span class="pregnant">conception</span> is verified.`);
} else if (slave.devotion <= 20 && slave.trust >= -20) {
@@ -1054,7 +1056,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
const {
He2, he2, his2, him2, himself2,
} = getPronouns(Stud).appendSuffix('2');
- if ((slave.StudExclude === 1 || slave.breedingMark === 1) && (Stud.career !== "a breeding bull" || Stud.fetish !== "mindbroken" || !canMove(Stud))) {
+ if ((slave.StudExclude === 1 || slave.breedingMark === 1) && (Stud.career !== "a breeding bull" || Stud.fetish !== Fetish.MINDBROKEN || !canMove(Stud))) {
r.push(`It's ${Stud.slaveName}'s role to provide sperm for fertile slaves, but ${slave.slaveName} is not included on the list.`);
} else if (V.universalHGImpregnateMasterSuiteToggle === 1 && ["serve in the master suite", "be your Concubine"].includes(slave.assignment)) {
r.push(`It's ${Stud.slaveName}'s role to provide sperm for fertile slaves, but ${slave.slaveName} is off-limits.`);
@@ -1068,7 +1070,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
// stud's reaction to the role
if (Stud.fuckdoll > 0) {
r.push(`provide sperm for ${him}; all ${he} needs to do is signal the suit to stimulate an ejaculation.`);
- } else if (Stud.fetish === "mindbroken") {
+ } else if (Stud.fetish === Fetish.MINDBROKEN) {
if (Stud.career === "a breeding bull" && canMove(Stud)) {
r.push(`impregnate fertile slaves, a task the amorous Stud performs with gusto and little regard for rules.`);
StudRandiness = 1;
@@ -1152,7 +1154,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
Stud.fetishStrength += 1;
}
StudRandiness = -1;
- } else if (Stud.fetish === "submissive" && Stud.fetishKnown === 1 && Stud.fetishStrength > 60) {
+ } else if (Stud.fetish === Fetish.SUBMISSIVE && Stud.fetishKnown === 1 && Stud.fetishStrength > 60) {
r.push(`provide sperm for ${him}, a task your submissive Stud <span class="trust inc">warms up to</span> in spite of ${his2} fear of you.`);
Stud.trust += 1;
if (Stud.fetishStrength <= 95) {
@@ -1175,7 +1177,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
Stud.fetishStrength += 2;
}
StudRandiness = 1;
- } else if (Stud.fetish === "submissive" && Stud.fetishKnown === 1 && Stud.fetishStrength > 60) {
+ } else if (Stud.fetish === Fetish.SUBMISSIVE && Stud.fetishKnown === 1 && Stud.fetishStrength > 60) {
r.push(`provide sperm for ${him}, a task your submissive Stud <span class="devotion inc">enjoys</span> more than ${he2} lets on.`);
Stud.devotion += 1;
if (Stud.fetishStrength <= 95) {
@@ -1202,7 +1204,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
r.push(`The opportunity <span class="fetish inc">strengthens ${his2} masochistic tendencies</span> by indulgence.`);
Stud.fetishStrength += 1;
}
- } else if (Stud.fetish === "submissive" && Stud.fetishKnown === 1 && Stud.fetishStrength > 60) {
+ } else if (Stud.fetish === Fetish.SUBMISSIVE && Stud.fetishKnown === 1 && Stud.fetishStrength > 60) {
r.push(`provide sperm for ${him}, a task your submissive Stud <span class="devotion inc">is more than happy</span> to allow ${him} to take responsibility of.`);
Stud.devotion += 1;
if (Stud.fetishStrength <= 95) {
@@ -1235,7 +1237,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
StudRandiness = 1;
}
// slave's response to the deed
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (Stud.fuckdoll > 0) {
if (slave.career === "a dairy cow" && slave.devotion <= 20) {
r.push(`${slave.slaveName} <span class="devotion dec">is not amused</span> that ${he} is expected to use a syringe to <span class="pregnant">inseminate ${himself}.</span>`);
@@ -1604,7 +1606,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
/* these assignments are safe from random impregnation */
break;
case "be your Concubine":
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken" && canImpreg(slave, V.PC)) {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN && canImpreg(slave, V.PC)) {
if (slave.pregKnown === 0) {
r.push(`As your concubine, ${he} takes care to only share ${his} fertile`);
if (slave.mpreg === 1) {
@@ -1690,7 +1692,7 @@ App.SlaveAssignment.pregnancy = function saPregnancy(slave) {
if (App.Utils.sexAllowed(slave, tempLover)) {
pregSource = tempLover.ID;
} else if (disobedience(slave) + disobedience(tempLover) + 5 > random(0, 100)) { /* note higher than normal disobedience chance...telling lovers they can't play is just asking for trouble */
- r.push(`Although sexual contact between them is forbidden, ${slave.slaveName} and ${his} ${relationshipTerm(slave)} ${tempLover.slaveName} took a risk and <span class="trust dec">flaunted the rules.</span>`);
+ r.push(`Although sexual contact between them is forbidden, ${slave.slaveName} and ${his} ${relationshipTerm(slave)} ${tempLover.slaveName} took a risk and <span class="trust dec">flouted the rules.</span>`);
slave.trust -= 5;
tempLover.trust -= 5;
pregSource = tempLover.ID;
diff --git a/src/endWeek/saRecruitGirls.js b/src/endWeek/saRecruitGirls.js
index 21a2a1c507c0a955c48e04d28d24f6b7608c2ae8..998c8d2c6b269849ce0d8f7a3c4886866fb0a84a 100644
--- a/src/endWeek/saRecruitGirls.js
+++ b/src/endWeek/saRecruitGirls.js
@@ -17,7 +17,7 @@ App.SlaveAssignment.recruitGirls = function recruitGirls(slave) {
const idleTarget = calcIdleTarget();
physicalAdjustments(slave);
if (slave.health.tired > 80) {
- tooTired(slave);
+ tooTired();
} else if (V.recruiterTarget === "other arcologies") {
influenceNeighbor(slave);
} else if (V.slaves.length < idleTarget) {
@@ -72,11 +72,7 @@ App.SlaveAssignment.recruitGirls = function recruitGirls(slave) {
tired(slave);
}
- /**
- * @param {App.Entity.SlaveState} slave
- *
- */
- function tooTired(slave) {
+ function tooTired() {
r.push(`uses the week to recover from fatigue and`);
if (V.recruiterTarget === "other arcologies") {
if (targetArcology !== undefined) {
@@ -98,12 +94,9 @@ App.SlaveAssignment.recruitGirls = function recruitGirls(slave) {
}
/**
- * @param {App.Entity.SlaveState} slave
- *
+ * @param {FC.ReportSlave} slave
*/
function influenceNeighbor(slave) {
- let influenced = 0;
-
if (targetArcology !== undefined) {
r.push(`acts as a sexual Ambassador to ${targetArcology.name}, which mostly means that ${he} travels there in ${his} official capacity and has culturally influential sex with its leading citizens.`);
@@ -650,7 +643,7 @@ App.SlaveAssignment.recruitGirls = function recruitGirls(slave) {
} else if (arcology.FSAztecRevivalist !== "unset") {
if (targetArcology.FSAztecRevivalist !== "unset") {
r.push(`${He} advances Aztec Revivalism there by taking an active part in the bloodier`);
- if (slave.skill.combat >= 1) {
+ if (slave.skill.combat > 60) {
r.push(`spectacles, which ${he}'s perfect for, since ${he} has enough experience with blood to make it look good.`);
targetArcology.FSAztecRevivalist++;
} else {
@@ -703,11 +696,7 @@ App.SlaveAssignment.recruitGirls = function recruitGirls(slave) {
targetArcology.FSChineseRevivalist += influence;
}
}
-
- influenced = 1;
- }
-
- if (!influenced) {
+ } else {
r.push(`assigned to be a sexual Ambassador to other arcologies, but you have not targeted a neighboring arcology for cultural influence, making the assignment pointless.`);
if (V.oldRecruiterTarget) {
V.recruiterTarget = clone(V.oldRecruiterTarget);
@@ -722,76 +711,76 @@ App.SlaveAssignment.recruitGirls = function recruitGirls(slave) {
*
*/
function recruiting(slave) {
- V.recruiterProgress += random(0, 1);
+ let progress = random(0, 1);
r.push(`uses your online resources and some <span class="cash">modest funds</span> to convince ${V.recruiterTarget} from the old world to immigrate for voluntary enslavement.`);
if (V.recruiterIOUs > 0) {
- V.recruiterProgress += V.recruiterIOUs;
+ progress += V.recruiterIOUs;
V.recruiterIOUs = 0;
}
if (slave.devotion > 95) {
r.push(`${His} extreme devotion to you lends ${him} total cogency.`);
- V.recruiterProgress += 2;
+ progress += 2;
} else if (slave.devotion > 50) {
r.push(`${His} devotion to you lends ${him} conviction.`);
- V.recruiterProgress += 1;
+ progress += 1;
} else {
r.push(`${His} imperfect feelings toward you give ${him} little conviction.`);
}
if (App.Data.Careers.Leader.recruiter.includes(slave.career)) {
r.push(`${He} has experience in recruitment from before ${he} was a slave.`);
- V.recruiterProgress += 2;
- } else if (slave.skill.recruiter >= V.masteredXP) {
+ progress += 2;
+ } else if (slave.skill.recruiter >= Constant.MASTERED_XP) {
r.push(`${He} has experience in recruitment from working for you.`);
- V.recruiterProgress += 2;
+ progress += 2;
} else if (slave.skill.recruiter > 120) {
r.push(`${He} has enough experience in recruitment to begin applying it.`);
- V.recruiterProgress += 1;
+ progress += 1;
}
- if (slave.skill.recruiter < V.masteredXP) {
+ if (slave.skill.recruiter < Constant.MASTERED_XP) {
const skillIncrease = random(1, Math.ceil((totalInt) / 15) + 8);
r.push(slaveSkillIncrease('recruiter', slave, skillIncrease));
}
if (totalInt > 50) {
r.push(`${His} intelligence enables ${him} to cleverly entrap potential slaves.`);
- V.recruiterProgress += 1;
+ progress += 1;
}
if (slave.skill.entertainment >= 100) {
r.push(`${He} has the entertainment skills necessary to convince any target.`);
- V.recruiterProgress += 2;
+ progress += 2;
} else if (slave.skill.entertainment > 60) {
r.push(`${He} has the entertainment expertise to lure in most targets.`);
- V.recruiterProgress += 1.5;
+ progress += 1.5;
} else if (slave.skill.entertainment > 30) {
r.push(`${He} has the necessary entertainment skills to banter successfully with ${his} targets.`);
- V.recruiterProgress += 1;
+ progress += 1;
} else if (slave.skill.entertainment > 10) {
r.push(`${His} mediocre entertainment skills do nothing to convince ${his} targets.`);
} else {
r.push(`${His} total lack of entertainment skills seriously hinders ${his} efforts.`);
- V.recruiterProgress -= 1;
+ progress -= 1;
}
if (slave.bellyPreg >= 300000) {
r.push(`${His} massive overfilled womb is detrimental to ${his} efforts to recruit slaves. It instills a fear of being turned into nothing more than a baby-filled sack.`);
- V.recruiterProgress -= 3;
+ progress -= 3;
}
const clubSlaves = App.Utils.sortedEmployees(App.Entity.facilities.club);
if (V.clubUpgradePDAs === 1 && clubSlaves.length > 0) {
r.push(`The slaves in ${V.clubName} help ${him} by passing ${him} tips they pick up while working the crowds.`);
- clubSlaves.forEach(() => V.recruiterProgress += 0.5);
+ clubSlaves.forEach(() => progress += 0.5);
}
if (V.recruiterTarget === "desperate whores") {
if (S.Recruiter.counter.publicUse > 200) {
r.push(`As a veteran slut, ${he} speaks from experience when ${he} says that being your slave whore will be safer and healthier than streetwalking.`);
- V.recruiterProgress += 1;
+ progress += 1;
} else {
r.push(`${He} does ${his} best to convince them that being your slave whore will be safer and healthier than streetwalking.`);
}
@@ -802,35 +791,35 @@ App.SlaveAssignment.recruitGirls = function recruitGirls(slave) {
} else {
r.push(`Since ${he} looks visibly pregnant, ${he}'s more convincing when ${he} says that Free Cities medicine can keep them and their pregnancies safe and healthy.`);
}
- V.recruiterProgress += 1;
+ progress += 1;
} else {
r.push(`${He} does ${his} best to convince them that Free Cities medicine can keep them and their pregnancies safe and healthy.`);
}
} else if (V.recruiterTarget === "young migrants") {
if (S.Recruiter.health.condition >= 80 && S.Recruiter.face > 10) {
r.push(`${His} lovely face and shining health go a long way to convince them that being your slave promises a better life.`);
- V.recruiterProgress += 1;
+ progress += 1;
} else {
r.push(`${He} does ${his} best to convince them that being your slave promises a better life.`);
}
} else if (V.recruiterTarget === "dissolute sissies") {
if (S.Recruiter.dick > 1 && canAchieveErection(S.Recruiter) && !S.Recruiter.chastityPenis) {
r.push(`${He} giggles and shows off ${his} erection, making it easy to convince them that your slaves with dicks enjoy a sexually satisfying life.`);
- V.recruiterProgress += 1;
+ progress += 1;
} else {
r.push(`${He} does ${his} best to convince them that your slaves with dicks enjoy a sexually satisfying life.`);
}
} else if (V.recruiterTarget === "reassignment candidates") {
if (((S.Recruiter.balls > 0 && S.Recruiter.ovaries === 0 && S.Recruiter.genes === "XX") || (S.Recruiter.ovaries === 1 && S.Recruiter.scrotum === 0 && S.Recruiter.genes === "XY")) && S.Recruiter.face > 10) { // turn into appearance checks!
r.push(`${He} shows off ${his} lovely face and describes ${his} unusual biological situation under your care, convincing them that you'll turn them into happy little slave girls.`);
- V.recruiterProgress += 1;
+ progress += 1;
} else {
r.push(`${He} does ${his} best to convince them that you'll turn them into happy little slave girls.`);
}
} else if (V.recruiterTarget === "recent divorcees") {
if (S.Recruiter.devotion + S.Recruiter.trust >= 175) {
r.push(`${His} total dedication to you goes a long way in convincing them that you'll provide far more for them than their prior partners ever did.`);
- V.recruiterProgress += 1;
+ progress += 1;
} else {
r.push(`${He} does ${his} best to convince them that you'll be supportive.`);
}
@@ -838,9 +827,17 @@ App.SlaveAssignment.recruitGirls = function recruitGirls(slave) {
if (slave.rules.living !== "luxurious") {
r.push(`${He} would be more effective if ${he} could show off a luxurious standard of living.`);
- V.recruiterProgress -= 1;
+ progress -= 1;
}
+ const pMod = App.SlaveAssignment.PartTime.efficiencyModifier(slave);
+ progress *= pMod;
+ if (pMod < 1) {
+ const loss = Math.floor((1 - pMod) * 100);
+ r.push(`Due to ${his} part-time job, ${he} is ${loss}% less effective.`);
+ }
+ V.recruiterProgress += progress;
+
if (V.recruiterProgress > 7) {
r.push(`${He} has several excellent prospects and will probably get one of them to agree to enslavement soon.`);
} else if (V.recruiterProgress > 3) {
@@ -1419,20 +1416,33 @@ App.SlaveAssignment.recruitGirls = function recruitGirls(slave) {
const clothes = App.Data.clothes.get(slave.clothes);
if (arcology.FSChattelReligionist !== "unset") {
if (totalInt > 15 && (slave.devotion > 95 || slave.trust > 95)) {
- if (clothes.fs && clothes.fs.loves && clothes.fs.loves.has("FSChattelReligionist")) {
- pushFS(`Clad in ${his} holy garb, ${slave.slaveName} preaches to the atrium with a powerful appeal to the new morality, in which ${his} absolute faith in your revelations is unmistakable.`);
- seed += 1;
- } else if (arcology.FSNeoImperialist !== "unset" && slave.clothes === "a tight Imperial bodysuit") {
- pushFS(`${He} lectures eloquently on the importance of hierarchy and noble lineage in a pseudo-religious fashion, dressed out in ${his} form-fitting bodysuit; most of the listeners' eyes fall on ${his} tightly-outlined chest and how ${his} nipples protrude obviously underneath the cybersuit, your crest emblazoned over the rock-hard nubs doing more of the arguing.`);
- seed += 1;
- } else if (arcology.FSNeoImperialist !== "unset" && slave.clothes === "Imperial Plate") {
- pushFS(`${He} gives a lengthy speech about the importance of hierarchy and noble lineage in a pseudo-religious fashion, speaking on the divine right of the nobility to rule while dominating the floor in ${his} ultra-heavy Imperial plate.`);
- seed += 1;
- } else if (arcology.FSRomanRevivalist !== "unset" && slave.clothes === "a toga") {
- pushFS(`${He} preaches in the atrium, delivering a powerful and faith-filled appeal in support of the new state religion and its Prophet-Emperor, descendant of the gods.`);
- seed += 1;
+ if (arcology.FSChattelReligionistLaw2 !== 1) {
+ if (ChattelReligionistClothingPass(slave.clothes)) {
+ pushFS(`Clad in ${his} holy garb, ${slave.slaveName} preaches to the atrium with a powerful appeal to the new morality, in which ${his} absolute faith in your revelations is unmistakable.`);
+ seed += 2;
+ } else if (arcology.FSNeoImperialist !== "unset" && slave.clothes === "a tight Imperial bodysuit") {
+ pushFS(`${He} lectures eloquently on the importance of hierarchy and noble lineage in a pseudo-religious fashion, dressed out in ${his} form-fitting bodysuit; most of the listeners' eyes fall on ${his} tightly-outlined chest and how ${his} nipples protrude obviously underneath the cybersuit, your crest emblazoned over the rock-hard nubs doing more of the arguing.`);
+ seed += 1;
+ } else if (arcology.FSNeoImperialist !== "unset" && slave.clothes === "Imperial Plate") {
+ pushFS(`${He} gives a lengthy speech about the importance of hierarchy and noble lineage in a pseudo-religious fashion, speaking on the divine right of the nobility to rule while dominating the floor in ${his} ultra-heavy Imperial plate.`);
+ seed += 1;
+ } else if (arcology.FSRomanRevivalist !== "unset" && slave.clothes === "a toga") {
+ pushFS(`${He} preaches in the atrium, delivering a powerful and faith-filled appeal in support of the new state religion and its Prophet-Emperor, descendant of the gods.`);
+ seed += 1;
+ } else {
+ pushFS(`${He} heads to the atrium to deliver a powerful, faith-based appeal for everyone to join the new moral order, though one cynical onlooker heckles ${him} about ${his} style of dress.`);
+ }
} else {
- pushFS(`${He} heads to the atrium to deliver a powerful, faith-based appeal for everyone to join the new moral order, though one cynical onlooker heckles ${him} about ${his} style of dress.`);
+ if (clothes.exposure > 3) {
+ pushFS(`${He} preaches to the atrium clad in essentially nothing but what God gave him. ${His} absolute faith in your revelations is unmistakable, and ${he} wins many converts.`);
+ seed += 2;
+ } else if (ChattelReligionistClothingPass(slave.clothes)) {
+ pushFS(`Clad in ${his} holy garb (which leaves ${him} attractively exposed), ${slave.slaveName} preaches to the atrium with a powerful appeal to the new morality, in which ${his} absolute faith in your revelations is unmistakable.`);
+ seed += 1;
+ } else {
+ // no free pass for any other clothing if you're going the Holy Nudist route, sorry
+ pushFS(`${He} heads to the atrium to deliver a powerful, faith-based appeal for everyone to join the new moral order, though ${he} draws chuckles from the crowd when ${he} argues for Holy Nudism while fully clothed.`);
+ }
}
seed += 1;
FSdefend++;
@@ -1502,7 +1512,7 @@ App.SlaveAssignment.recruitGirls = function recruitGirls(slave) {
}
} else if (arcology.FSEgyptianRevivalist !== "unset") {
if (totalRelatives(slave) > 0) {
- const recruiterRelation = arcology.FSEgyptianRevivalist !== "unset" ? randomRelatedAvailableSlave(slave) : null;
+ const recruiterRelation = randomRelatedAvailableSlave(slave);
if (recruiterRelation) {
const relationType = relativeTerm(slave, recruiterRelation);
if (slave.energy > 60 || slave.sexualQuirk === "tease" || slave.sexualQuirk === "perverted") {
@@ -1639,6 +1649,12 @@ App.SlaveAssignment.recruitGirls = function recruitGirls(slave) {
}
}
+ const pMod = App.SlaveAssignment.PartTime.efficiencyModifier(slave);
+ seed *= pMod;
+ if (pMod < 1) {
+ pushFS(`Some part of ${his} day is taken up by ${his} part-time job, making ${him} <span class="reputation dec">less effective</span>.`);
+ }
+
repX(Math.trunc(seed * 5), "futureSocieties", slave);
// the summary lines always show, regardless of showEWM
diff --git a/src/endWeek/saRelationships.js b/src/endWeek/saRelationships.js
index 252c5c85f3964836da9dc60b8e2616891a3b5d29..928b34bde1f861a5259c537536ef62401a159470 100644
--- a/src/endWeek/saRelationships.js
+++ b/src/endWeek/saRelationships.js
@@ -15,7 +15,7 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
if (slave.relationship > 0) {
sanityCheck(slave);
}
- if (slave.relationship === 0 && slave.fetish !== "mindbroken") {
+ if (slave.relationship === 0 && slave.fetish !== Fetish.MINDBROKEN) {
generateRelationship(slave);
} else if (slave.relationship !== 0) {
existingRelationship(slave);
@@ -23,7 +23,7 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
consummateRelationship(slave);
}
}
- if (slave.fetish !== "mindbroken" && totalRelatives(slave) > 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && totalRelatives(slave) > 0) {
familyFeelings(slave);
}
}
@@ -36,7 +36,7 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
* @returns {boolean}
*/
function canStartFriendship(slave, potentialFriend) {
- return (potentialFriend.relationship === 0 && slave.rivalryTarget !== potentialFriend.ID && potentialFriend.ID !== slave.ID && potentialFriend.fetish !== "mindbroken" && potentialFriend.fuckdoll === 0 && isSlaveAvailable(potentialFriend));
+ return (potentialFriend.relationship === 0 && slave.rivalryTarget !== potentialFriend.ID && potentialFriend.ID !== slave.ID && potentialFriend.fetish !== Fetish.MINDBROKEN && potentialFriend.fuckdoll === 0 && isSlaveAvailable(potentialFriend));
}
/** Does the facility head accept her advances?
@@ -137,7 +137,7 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
startFriendship(slave, potentialFriend, 4);
}
} else if (slave.origin === "You were acquainted with $him before you were an arcology owner; your rival tried to use $him to manipulate you, but you rescued $him." && V.rival.duration > 20 && !["Intellectual Dependency", "Paternalism", "Racial Supremacism", "Slave Professionalism"].includes(V.rival.FS.name) && slave.newGamePlus === 0) {
- const potentialFriend = V.slaves.find((s) => (s.prestigeDesc === "You bankrupted and enslaved $him in revenge for $his part in the attack on your arcology by the Daughters of Liberty." && s.fuckdoll === 0 && s.fetish !== "mindbroken" && s.newGamePlus === 0));
+ const potentialFriend = V.slaves.find((s) => (s.prestigeDesc === "You bankrupted and enslaved $him in revenge for $his part in the attack on your arcology by the Daughters of Liberty." && s.fuckdoll === 0 && s.fetish !== Fetish.MINDBROKEN && s.newGamePlus === 0));
if (potentialFriend !== undefined) {
r.push(`${slave.slaveName} greets ${potentialFriend.slaveName} with joy, happy to see a familiar face again. Without any regard to you, <span class="relationship">they continue their prior relationship.</span>`);
if (potentialFriend.relationship > 0) { // remove me with multi-friend system
@@ -256,7 +256,7 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
startFriendship(slave, potentialFriend, 1);
break;
} else {
- if (slave.devotion < -20 && potentialFriend.fetish !== "mindbroken") {
+ if (slave.devotion < -20 && potentialFriend.fetish !== Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} tries to strike up a friendship with the Concubine, ${potentialFriend.slaveName}, and is gently <span class="devotion inc">counseled</span> by ${him2} that such things are against the rules.`);
slave.devotion += 1;
}
@@ -306,8 +306,8 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
slave.trust -= 2;
}
}
- } else if (potentialFriend.fetish === slave.fetish || (potentialFriend.fetish === "sadist" && slave.fetish === "masochist") || (slave.fetish === "sadist" && potentialFriend.fetish === "masochist") || (potentialFriend.fetish === "dom" && slave.fetish === "submissive") || (slave.fetish === "submissive" && potentialFriend.fetish === "dom")) {
- if (slave.fetish !== "none" && App.Utils.sexAllowed(slave, potentialFriend)) {
+ } else if (potentialFriend.fetish === slave.fetish || (potentialFriend.fetish === Fetish.SADIST && slave.fetish === Fetish.MASOCHIST) || (slave.fetish === Fetish.SADIST && potentialFriend.fetish === Fetish.MASOCHIST) || (potentialFriend.fetish === Fetish.DOM && slave.fetish === Fetish.SUBMISSIVE) || (slave.fetish === Fetish.DOM && potentialFriend.fetish === Fetish.SUBMISSIVE)) {
+ if (slave.fetish !== Fetish.NONE && App.Utils.sexAllowed(slave, potentialFriend)) {
if (potentialFriend.rules.relationship === "permissive") {
r.push(`${slave.slaveName} and ${potentialFriend.slaveName} share sexual inclinations, so it's only natural that they <span class="relationship">become friends with benefits.</span>`);
startFriendship(slave, potentialFriend, 3);
@@ -364,7 +364,7 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
him2, his2, wife2
} = getPronouns(friend).appendSuffix("2"));
}
- if (slave.fetish === "mindbroken" && slave.relationship !== -3) {
+ if (slave.fetish === Fetish.MINDBROKEN && slave.relationship !== -3) {
r.push(`Since ${he} is mindbroken, ${he} <span class="relationship dec">can't really maintain</span>`);
if (slave.relationship > 0) {
r.push(`any meaningful relationship with ${friend.slaveName}.`);
@@ -424,7 +424,7 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
}
} else if (slave.relationship === -3) {
incestReactions(slave, V.PC);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
switch (slave.assignment) {
case Job.HOUSE:
case Job.CONCUBINE:
@@ -861,7 +861,7 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
const repType = relative.ID === -1 ? "PCRelationships" : "SlaveRelationships";
const whose = relative.ID === -1 ? "your" : "their";
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (relative.ID === -1) {
r.push(`${He}`);
} else {
@@ -1000,7 +1000,7 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
if (lover.energy > 95) {
r.push(`${lover.slaveName} is such a sex addict that ${he2} drags ${slave.slaveName} along with ${him2} in their enthusiastic sex life, <span class="libido inc">slowly improving ${his} sex drive.</span>`);
slave.energy += 3;
- } else if (lover.fetish === slave.fetish && lover.fetish !== "none") {
+ } else if (lover.fetish === slave.fetish && lover.fetish !== Fetish.NONE) {
r.push(`${lover.slaveName} and ${slave.slaveName} enjoy sharing their sexual fetishes so much it <span class="libido inc">improves their sex drives</span> in proportion to the strength of their kinks.`);
slave.energy += 1 + Math.trunc(slave.fetishStrength / 30);
} else if (slave.attrXX > 65 && (lover.vagina > -1 || (lover.face > 0 && lover.faceShape !== "masculine"))) {
@@ -1023,65 +1023,65 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
}
slave.attrXY += 2;
}
- if (lover.fetish !== "none" && lover.fetish !== "mindbroken" && slave.fetishStrength <= 95 && lover.fetish !== slave.fetish && fetishChangeChance(slave) > (random(0, 100) - (slave.relationship * 5))) {
+ if (lover.fetish !== Fetish.NONE && lover.fetish !== Fetish.MINDBROKEN && slave.fetishStrength <= 95 && lover.fetish !== slave.fetish && fetishChangeChance(slave) > (random(0, 100) - (slave.relationship * 5))) {
switch (lover.fetish) {
- case "boobs":
+ case Fetish.BOOBS:
r.push(`After experiencing ${lover.slaveName}'s love of breasts, both ${his2} own and ${slave.slaveName}'s, ${slave.slaveName} happily joins ${him2} as a <span class="fetish gain">boob fanatic.</span>`);
- slave.fetish = "boobs";
+ slave.fetish = Fetish.BOOBS;
slave.fetishKnown = 1;
slave.fetishStrength = 65;
break;
- case "buttslut":
+ case Fetish.BUTTSLUT:
r.push(`${lover.slaveName} begs ${slave.slaveName} to fuck ${his2} ass so many times that ${slave.slaveName} reconsiders ${his} stance on buttsex. ${He} becomes just as much of an <span class="fetish gain">anal slut</span> as ${lover.slaveName}.`);
- slave.fetish = "buttslut";
+ slave.fetish = Fetish.BUTTSLUT;
slave.fetishKnown = 1;
slave.fetishStrength = 65;
break;
- case "cumslut":
+ case Fetish.CUMSLUT:
r.push(`After sharing blowjobs with ${lover.slaveName} enough times, ${slave.slaveName} develops an <span class="fetish gain">oral fixation</span> of ${his} own.`);
- slave.fetish = "cumslut";
+ slave.fetish = Fetish.CUMSLUT;
slave.fetishKnown = 1;
slave.fetishStrength = 65;
break;
- case "submissive":
- if (slave.fetish !== "dom") {
+ case Fetish.SUBMISSIVE:
+ if (slave.fetish !== Fetish.DOM) {
r.push(`${lover.slaveName} begs ${slave.slaveName} to dominate ${him2} so many times that ${slave.slaveName} gets used to domination, and finds ${he} likes it. ${He} becomes just as much of a <span class="fetish gain">sexual dominant</span> as a slave can be.`);
- slave.fetish = "dom";
+ slave.fetish = Fetish.DOM;
slave.fetishKnown = 1;
slave.fetishStrength = 65;
}
break;
- case "dom":
- if (slave.fetish !== "submissive") {
+ case Fetish.DOM:
+ if (slave.fetish !== Fetish.SUBMISSIVE) {
r.push(`${lover.slaveName} holds ${slave.slaveName} down and fucks ${him} so many times that ${slave.slaveName} starts to get off on being used. ${He} becomes a true <span class="fetish gain">sexual submissive,</span> and loves ${lover.slaveName} all the more for dominating ${him}.`);
- slave.fetish = "submissive";
+ slave.fetish = Fetish.SUBMISSIVE;
slave.fetishKnown = 1;
slave.fetishStrength = 65;
}
break;
- case "masochist":
- if (slave.fetish !== "sadist") {
+ case Fetish.MASOCHIST:
+ if (slave.fetish !== Fetish.SADIST) {
r.push(`${lover.slaveName} begs ${slave.slaveName} to hurt ${him2} so many times that ${slave.slaveName} gets used to sadism, and finds ${he} likes it. ${He} becomes just as much of an <span class="fetish gain">sexual sadist</span> as a slave can be.`);
- slave.fetish = "sadist";
+ slave.fetish = Fetish.SADIST;
slave.fetishKnown = 1;
slave.fetishStrength = 65;
}
break;
- case "sadist":
- if (slave.fetish !== "masochist") {
+ case Fetish.SADIST:
+ if (slave.fetish !== Fetish.MASOCHIST) {
r.push(`${lover.slaveName} hits ${slave.slaveName} during sex so often that ${slave.slaveName} starts to get off on being beaten. ${He} becomes a true <span class="fetish gain">masochist,</span> and loves ${lover.slaveName} all the more for abusing ${him}.`);
- slave.fetish = "masochist";
+ slave.fetish = Fetish.MASOCHIST;
slave.fetishKnown = 1;
slave.fetishStrength = 65;
}
break;
- case "humiliation":
+ case Fetish.HUMILIATION:
r.push(`${lover.slaveName} begs ${slave.slaveName} to humiliate ${him2} sexually so many times that ${slave.slaveName} can't help but be embarrassed by all the public sex, ${himself}. ${He} gets off on the <span class="fetish gain">humiliation</span> with ${lover.slaveName}.`);
slave.fetish = "humiliation";
slave.fetishKnown = 1;
slave.fetishStrength = 65;
break;
- case "pregnancy":
+ case Fetish.PREGNANCY:
r.push(`${lover.slaveName} shares ${his2} hopes and dreams of pregnancy and children with ${slave.slaveName} all the time, and ${slave.slaveName} can't help but feel`);
if (isFertile(slave) && isFertile(lover)) {
r.push(`${his} <span class="fetish gain">biological clock</span> tick in time with ${lover.slaveName}'s.`);
@@ -1162,7 +1162,6 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
/**
* @param {App.Entity.SlaveState} slave
- *
*/
function familyFeelings(slave) {
/** @param {Map<string, Array<App.Entity.SlaveState>>} map
@@ -1178,8 +1177,10 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
}
}
- /** @param {Map<string, Array<App.Entity.SlaveState>>} map
- * @returns {Array<string>} */
+ /**
+ * @param {Map<string, Array<App.Entity.SlaveState>>} map
+ * @returns {Array<string>}
+ */
function relativeMapToGroupArray(map) {
let groups = [];
for (const [type, people] of map) {
@@ -1192,8 +1193,10 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
return groups;
}
- /** @param {Map<string, Array<App.Entity.SlaveState>>} map
- * @returns {App.Entity.SlaveState} */
+ /**
+ * @param {Map<string, Array<App.Entity.SlaveState>>} map
+ * @returns {App.Entity.SlaveState}
+ */
function singleRelativeInMap(map) {
if (map.size !== 1) {
return null;
@@ -1206,8 +1209,10 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
return slavesOfType[0];
}
- /** @param {Map<string, Array<App.Entity.SlaveState>>} map
- * @returns {number} */
+ /**
+ * @param {Map<string, Array<App.Entity.SlaveState>>} map
+ * @returns {number}
+ */
function relativeMapTotalSize(map) {
let size = 0;
for (const people of map.values()) {
@@ -1288,7 +1293,7 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
r.push(`${slave.slaveName} knows that ${his} ${relativeTerm(slave, singleRelative)} ${singleRelative.slaveName} loves being your sex slave, and is <span class="devotion inc">happy</span> for ${him2}.`);
} else if (devotedRelatives.size > 0) {
const groups = relativeMapToGroupArray(devotedRelatives);
- r.push(`${slave.slaveName} knows that ${toSentence(groups)} all love being your sex slaves, and is <span class="devotion inc">happy</span> for them.`);
+ r.push(`${slave.slaveName} knows that ${toSentence(groups)} ${devotedRelatives.size === 2 ? `both` : `all`} love being your sex slaves, and is <span class="devotion inc">happy</span> for them.`);
}
if (relativeMapTotalSize(devotedRelatives) > overwhelmed) {
r.push(`${He} has so many relatives that love being your slaves that ${he} is sometimes overwhelmed with joy and <span class="devotion dec">neglects ${his} duties.</span>`);
@@ -1310,7 +1315,7 @@ App.SlaveAssignment.relationships = function saRelationships(slave) {
r.push(`${slave.slaveName} knows that ${his} ${relativeTerm(slave, singleRelative)} ${singleRelative.slaveName} hates being a sex slave, and is <span class="trust dec">afraid</span> for ${him2}.`);
} else if (hatefulRelatives.size > 0) {
const groups = relativeMapToGroupArray(hatefulRelatives);
- r.push(`${slave.slaveName} knows that ${toSentence(groups)} all hate being sex slaves, and is <span class="trust dec">afraid</span> for them.`);
+ r.push(`${slave.slaveName} knows that ${toSentence(groups)} ${hatefulRelatives.size === 2 ? `both` : `all`} hate being sex slaves, and is <span class="trust dec">afraid</span> for them.`);
}
if (relativeMapTotalSize(hatefulRelatives) > overwhelmed) {
r.push(`${He} has so many relatives that hate being your sex slaves that ${he} is overwhelmed with fear and <span class="trust inc">just has to trust you to take care of them.</span>`);
diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js
index 0cfb0568fa914c8652c171dd83304674c7147445..1befb5172973487954f1acff129f8966831677e9 100644
--- a/src/endWeek/saRest.js
+++ b/src/endWeek/saRest.js
@@ -24,7 +24,8 @@ App.SlaveAssignment.rest = function(slave) {
t += ` ${His} health is so outstanding that rest does not improve it.`;
} else if (slave.health.condition > -100) {
t += ` ${His} <span class="health inc">health recovers</span> with rest.`;
- improveCondition(slave, 10);
+ const pMod = App.SlaveAssignment.PartTime.efficiencyModifier(slave);
+ improveCondition(slave, 10 * pMod);
if (!(canHear(slave))) {
t += ` Since ${he} is deaf, the hustle and bustle of daily life in the penthouse <span class="health inc">didn't bother ${him} at all.</span>`;
improveCondition(slave, 3);
@@ -32,9 +33,12 @@ App.SlaveAssignment.rest = function(slave) {
t += ` Since ${he} is hard of hearing, the hustle and bustle of daily life in the penthouse <span class="health inc">didn't disturb ${his} rest as much.</span>`;
improveCondition(slave, 1);
}
+ if (pMod < 1) {
+ t += ` Some time of ${his} day was used up by ${his} part-time job, <span class="health dec">reducing the effectiveness of ${his} rest.</span>`;
+ }
}
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN) {
if (slave.devotion > 20) {
if (slave.trust <= 20) {
t += ` Being allowed to rest <span class="trust inc">reduces ${his} fear</span> of you.`;
diff --git a/src/endWeek/saRivalries.js b/src/endWeek/saRivalries.js
index c12986b7cb64042c0653b7d2eba9c1056d8e2f8e..bc160cac60935ea9e20341e47c8d37a7379589fc 100644
--- a/src/endWeek/saRivalries.js
+++ b/src/endWeek/saRivalries.js
@@ -33,7 +33,7 @@ App.SlaveAssignment.rivalries = function saRivalries(slave) {
function canStartRivalry(slave) {
const headstrong = (slave.devotion < jsRandom(20, 100)) && (slave.trust > jsRandom(-100, -20));
const distant = (slave.assignment === Job.AGENTPARTNER || slave.assignment === Job.AGENT);
- return (slave.rivalry === 0 && slave.fetish !== "mindbroken" && slave.fuckdoll === 0 && !distant && headstrong);
+ return (slave.rivalry === 0 && slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0 && !distant && headstrong);
}
/**
@@ -221,7 +221,7 @@ App.SlaveAssignment.rivalries = function saRivalries(slave) {
if (slave.fuckdoll) {
r.push(`${slave.slaveName} is a living sex toy, not a person, it <span class="rivalry dec">can't really maintain any meaningful rivalry</span> with ${SlaveFullName(rival)}.`);
reconcile(slave, rival);
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Since ${slave.slaveName} is mindbroken, ${he} <span class="rivalry dec">can't really maintain any meaningful rivalry</span> with ${SlaveFullName(rival)}.`);
reconcile(slave, rival);
} else if (rival.ID === slave.relationshipTarget && slave.relationship > 3) {
diff --git a/src/endWeek/saRules.js b/src/endWeek/saRules.js
index 0773271fe34b427805e4760aa16f361c65234451..673579c6180cba2948ebb9705932c0d5fcccede4 100644
--- a/src/endWeek/saRules.js
+++ b/src/endWeek/saRules.js
@@ -15,11 +15,9 @@ App.SlaveAssignment.rules = function(slave) {
he, his, him, himself, girl, wife
} = getPronouns(slave);
const hands = (hasBothArms(slave)) ? `hands` : `hand`;
- let wife2;
let milkResult;
- let wardenFunTimes;
r.push(`${He}`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`is mentally broken so none of the rules have any impact.`);
} else {
switch (slave.assignment) {
@@ -234,7 +232,7 @@ App.SlaveAssignment.rules = function(slave) {
r.push(`${He}'s permitted to rest when fatigue sets in, but not enough to shake ${his} tiredness; ${he} feels this <span class="gold">deprivation</span> is intentional.`);
slave.trust -= 1;
} else if (slave.devotion <= 20) {
- r.push(`${He}'s permitted to rest when fatigue sets in, and <span class="hotpink">understands</span> this is less for ${his} wellbeing and more to prevent ${him} from become unproductive.`);
+ r.push(`${He}'s permitted to rest when fatigue sets in, and <span class="hotpink">understands</span> this is less for ${his} well-being and more to prevent ${him} from become unproductive.`);
slave.devotion += 1;
} else {
r.push(`${He}'s permitted to rest when fatigue sets in and is <span class="mediumaquamarine">thankful</span> you would allow ${him} the privilege so that ${he} may serve you better.`);
@@ -427,7 +425,7 @@ App.SlaveAssignment.rules = function(slave) {
r.push(`${He}'s permitted to rest when fatigue sets in, but not enough to shake ${his} tiredness; ${he} feels this <span class="gold">deprivation</span> is intentional.`);
slave.trust -= 1;
} else if (slave.devotion <= 20) {
- r.push(`${He}'s permitted to rest when fatigue sets in, and <span class="hotpink">understands</span> this is less for ${his} wellbeing and more to prevent ${him} from become unproductive.`);
+ r.push(`${He}'s permitted to rest when fatigue sets in, and <span class="hotpink">understands</span> this is less for ${his} well-being and more to prevent ${him} from become unproductive.`);
slave.devotion += 1;
} else {
r.push(`${He}'s permitted to rest when fatigue sets in and is <span class="mediumaquamarine">thankful</span> you would allow ${him} the privilege so that ${he} may serve you better.`);
@@ -573,9 +571,6 @@ App.SlaveAssignment.rules = function(slave) {
}
break;
case "lover":
- ({
- wife2
- } = getPronouns(partner.slave).appendSuffix("2"));
slave.need = 0;
r.push(`is well taken care of during ${his} stay in ${V.clinicName}; ${his}`);
if (slave.relationship === 3) {
@@ -583,7 +578,7 @@ App.SlaveAssignment.rules = function(slave) {
} else if (slave.relationship === 4) {
r.push(`sweetheart`);
} else {
- r.push(wife2);
+ r.push(getPronouns(partner.slave).wife);
}
r.push(`frequently stops by when ${he} gets the chance to make sure ${his} sexual needs are properly handled.`);
seX(partner.slave, "oral", slave, "penetrative", 14);
@@ -634,7 +629,7 @@ App.SlaveAssignment.rules = function(slave) {
if (!hasAnyArms(slave)) {
r.push(`imagination`);
} else {
- r.push(`${hands}.`);
+ r.push(`${hands}`);
}
r.push(`and toys, but <span class="mediumaquamarine">understands you care about ${his} current health.</span>`);
slave.trust += 1;
@@ -875,17 +870,32 @@ App.SlaveAssignment.rules = function(slave) {
r.push(App.SlaveAssignment.rewardAndPunishment(slave));
break;
- case "be confined in the cellblock":
- wardenFunTimes = 0;
+ case "be confined in the cellblock": {
+ let wardenFunTimes = 0;
+ let pregNotice = ``;
if (App.EndWeek.saVars.flSex.has(slave.ID)) {
wardenFunTimes = random(0, 5);
slave.need -= (10 * wardenFunTimes);
+ SimpleSexAct.Slaves(slave, S.Wardeness, wardenFunTimes);
+ if (canImpreg(slave, S.Wardeness) && (V.cellblockWardenCumsInside === 1 || S.Wardeness.fetish === Fetish.MINDBROKEN)) {
+ pregNotice = knockMeUp(slave, 3 * wardenFunTimes, 2, V.WardenessID);
+ }
}
if (slave.devotion < -50) {
r.push(`is so unhappy that ${he} has little interest in getting off, making the rule restricting ${his} sexual outlets superfluous.`);
+ if (wardenFunTimes > 0) {
+ r.push(`${His} unhappiness doesn't stop ${S.Wardeness.slaveName} from raping ${him}, of course, which <span class="trust dec">contributes to ${his} growing fear.</span>`);
+ r.push(pregNotice);
+ slave.trust--;
+ }
slave.need = 0;
} else if (slave.energy <= 20) {
r.push(`is frigid and has little interest in getting off, making the rule restricting ${his} sexual outlets superfluous.`);
+ if (wardenFunTimes > 0) {
+ r.push(`${His} disinterest doesn't stop ${S.Wardeness.slaveName} from raping ${him}, of course, which <span class="trust dec">contributes to ${his} growing fear.</span>`);
+ r.push(pregNotice);
+ slave.trust--;
+ }
slave.need = 0;
} else if (slave.relationship === -3) {
r.push(`You make sure your troublesome ${wife}'s sexual needs are handled, openly, in the middle of ${V.cellblockName}, where everyone can see, hear, and smell your dominance.`);
@@ -905,35 +915,28 @@ App.SlaveAssignment.rules = function(slave) {
}
} else {
if (wardenFunTimes > 0) {
- SimpleSexAct.Slaves(slave, S.Wardeness, wardenFunTimes);
- if (wardenFunTimes > 0 && canImpreg(slave, S.Wardeness) && (V.cellblockWardenCumsInside === 1 || S.Wardeness.fetish === "mindbroken")) {
- if (canDoVaginal(slave) && slave.vagina > 0 && slave.ovaries === 1) {
- knockMeUp(slave, 10, 0, V.WardenessID);
- } else if (canDoAnal(slave) && slave.anus > 0 && slave.mpreg === 1) {
- knockMeUp(slave, 10, 1, V.WardenessID);
- }
- }
+ r.push(`is regularly raped to climax by ${S.Wardeness.slaveName}.`);
+ r.push(pregNotice);
}
- if (slave.need < App.EndWeek.saVars.needCapPerSlave[slave.ID] * 0.5) {
- if (slave.devotion <= 20) {
- r.push(`gets off despite ${his} reluctance, <span class="hotpink">habituating ${him} to sexual slavery.</span>`);
- slave.devotion += 1;
- if (slave.trust >= -20 && slave.devotion <= 20) {
- r.push(`${He} hates ${himself} for climaxing, and knows the mild aphrodisiacs in the food are forcing ${his} arousal, <span class="gold">frightening ${him}.</span>`);
- slave.trust -= 1;
- }
- slave.need -= 20;
+ if (slave.need < App.EndWeek.saVars.needCapPerSlave[slave.ID] * 0.5 && wardenFunTimes > 0) {
+ r.push(`${He} gets off despite ${his} reluctance, <span class="hotpink">habituating ${him} to sexual slavery.</span>`);
+ slave.devotion += 1;
+ if (slave.trust >= -20 && slave.devotion <= 20) {
+ r.push(`${He} hates ${himself} for climaxing, and knows the mild aphrodisiacs in the food are forcing ${his} arousal, <span class="gold">frightening ${him}.</span>`);
+ slave.trust -= 1;
}
+ slave.need -= 20;
} else {
+ if (wardenFunTimes > 0) {
+ r.push(`It's not enough to satisfy ${his} needs, and ${he}`);
+ }
if (random(-100, 0) > slave.devotion) {
r.push(`refuses to not touch ${himself} and is <span class="gold">severely punished</span> for illicit masturbation.`);
slave.trust -= 2;
slave.need -= 10;
} else {
r.push(`<span class="gold">fears</span> trying to`);
- if (slave.chastityPenis) {
- r.push(`touch ${himself}`);
- } else if (canAchieveErection(slave)) {
+ if (canAchieveErection(slave) && !slave.chastityPenis) {
r.push(`jack off`);
} else {
r.push(`touch ${himself}`);
@@ -1002,6 +1005,7 @@ App.SlaveAssignment.rules = function(slave) {
r.push(App.SlaveAssignment.rewardAndPunishment(slave));
break;
+ }
case "be the Attendant":
slave.need -= App.EndWeek.saVars.flSex.size * 3;
if (slave.energy <= 20) {
@@ -1779,7 +1783,7 @@ App.SlaveAssignment.rules = function(slave) {
r.push(`${He}'s permitted to rest when fatigue sets in, but not enough to shake ${his} tiredness; ${he} feels this <span class="gold">deprivation</span> is intentional.`);
slave.trust -= 1;
} else if (slave.devotion <= 20) {
- r.push(`${He}'s permitted to rest when fatigue sets in, and <span class="hotpink">understands</span> this is less for ${his} wellbeing and more to prevent ${him} from become unproductive.`);
+ r.push(`${He}'s permitted to rest when fatigue sets in, and <span class="hotpink">understands</span> this is less for ${his} well-being and more to prevent ${him} from become unproductive.`);
slave.devotion += 1;
} else {
r.push(`${He}'s permitted to rest when fatigue sets in and is <span class="mediumaquamarine">thankful</span> you would allow ${him} the privilege so that ${he} may serve you better.`);
@@ -2089,7 +2093,7 @@ App.SlaveAssignment.rules = function(slave) {
r.push(`${He}'s permitted to rest when fatigue sets in, but not enough to shake ${his} tiredness; ${he} feels this <span class="gold">deprivation</span> is intentional.`);
slave.trust -= 1;
} else if (slave.devotion <= 20) {
- r.push(`${He}'s permitted to rest when fatigue sets in, and <span class="hotpink">understands</span> this is less for ${his} wellbeing and more to prevent ${him} from become unproductive.`);
+ r.push(`${He}'s permitted to rest when fatigue sets in, and <span class="hotpink">understands</span> this is less for ${his} well-being and more to prevent ${him} from become unproductive.`);
slave.devotion += 1;
} else {
r.push(`${He}'s permitted to rest when fatigue sets in and is <span class="mediumaquamarine">thankful</span> you would allow ${him} the privilege so that ${he} may serve you better.`);
@@ -2711,7 +2715,7 @@ App.SlaveAssignment.rules = function(slave) {
r.push(`${He}'s permitted to rest when fatigue sets in, but not enough to shake ${his} tiredness; ${he} feels this <span class="gold">deprivation</span> is intentional.`);
slave.trust -= 1;
} else if (slave.devotion <= 20) {
- r.push(`${He}'s permitted to rest when fatigue sets in, and <span class="hotpink">understands</span> this is less for ${his} wellbeing and more to prevent ${him} from become unproductive.`);
+ r.push(`${He}'s permitted to rest when fatigue sets in, and <span class="hotpink">understands</span> this is less for ${his} well-being and more to prevent ${him} from become unproductive.`);
slave.devotion += 1;
} else {
r.push(`${He}'s permitted to rest when fatigue sets in and is <span class="mediumaquamarine">thankful</span> you would allow ${him} the privilege so that ${he} may serve you better.`);
diff --git a/src/endWeek/saRulesFunctions.js b/src/endWeek/saRulesFunctions.js
index 165ca14d7fd92dceb7fe4234c7dc0d5c6e1a8fcb..8b9a9e0425a3c6fac0bc4f45ae6d8cc95a64eb25 100644
--- a/src/endWeek/saRulesFunctions.js
+++ b/src/endWeek/saRulesFunctions.js
@@ -396,7 +396,7 @@ App.EndWeek.Rules.masturbationFetishPlay = function(slave) {
const el = new DocumentFragment();
const {he, his, himself} = getPronouns(slave);
if (slave.fetishKnown === 1 && slave.fetishStrength > 60) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
el.append(`frequently pretends to be getting held down and dominated. `);
} else if (slave.fetish === "cumslut") {
if (slave.dick > 5) {
@@ -466,7 +466,7 @@ App.EndWeek.Rules.masturbationDiscoversFetish = function(slave) {
if (slave.fetishKnown === 0 && random(1, 20) === 1) {
slave.fetishKnown = 1;
el.append(`However, you start to notice a trend in ${his} fantasies,`);
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
el.append(`${he} likes to tie ${himself} up and boss ${himself} around; `);
App.UI.DOM.appendNewElement("span", el, `${he}'s a submissive!`, ["lightcoral"]);
} else if (slave.fetish === "cumslut") {
@@ -623,7 +623,7 @@ App.EndWeek.Rules.rapeFetish = function(slave) {
const who = (slave.rules.release.slaves === 1) ? "other slaves" : `${his} family`;
/* should be the only two choices if we get here */
if (slave.fetishKnown === 1 && slave.fetishStrength > 60) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
el.append(`plead that ${who} fuck ${him}. `);
if (V.seeStretching === 1 && App.EndWeek.saVars.averageDick > 4) {
if (slave.anus.isBetween(0, 3) && canDoAnal(slave)) {
@@ -915,7 +915,7 @@ App.EndWeek.Rules.consentFetish = function(slave) {
} = getPronouns(slave);
if (slave.fetishKnown === 1 && slave.fetishStrength > 60) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
el.append(`usually pairing off with a more dominant slave. `);
if (V.seeStretching === 1 && App.EndWeek.saVars.averageDick > 4) {
if (slave.anus.isBetween(0, 3) && canDoAnal(slave)) {
@@ -1100,7 +1100,7 @@ App.EndWeek.Rules.consentDiscoversFetish = function(slave) {
if (random(1, 2) === 1) {
slave.fetishKnown = 1;
el.append(`However, one of ${his} partners `);
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
el.append(`holds ${him} down, and ${he} loves it; `);
App.UI.DOM.appendNewElement("span", el, `${he}'s a submissive!`, ["lightcoral"]);
} else if (slave.fetish === "cumslut") {
@@ -1168,7 +1168,7 @@ App.EndWeek.Rules.rapeDiscoversFetish = function(slave) {
if (random(1, 2) === 1) {
slave.fetishKnown = 1;
el.append(`You discover that ${he} really likes it when the other slaves `);
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
el.append(`hold ${him} down and fuck ${him}; `);
App.UI.DOM.appendNewElement("span", el, `${he}'s a submissive!`, ["lightcoral"]);
} else if (slave.fetish === "cumslut") {
@@ -1323,8 +1323,12 @@ App.EndWeek.Rules.noRelease = function(slave) {
const el = new DocumentFragment();
const {he, him, his} = getPronouns(slave);
+ el.append("is forbidden to masturbate or seek sexual release");
+ if (slave.rules.reward === "orgasm") {
+ el.append(" outside of rewards");
+ }
if (disobedience(slave) > random(0, 100)) {
- el.append(`is forbidden to masturbate or seek sexual release. In ${his} `);
+ el.append(`. In ${his} `);
App.UI.DOM.appendNewElement("span", el, `intense frustration`, "mediumorchid");
el.append(` ${he} disobeys and is `);
App.UI.DOM.appendNewElement("span", el, `severely punished`, "gold");
@@ -1332,7 +1336,7 @@ App.EndWeek.Rules.noRelease = function(slave) {
slave.devotion -= 2;
slave.trust -= 2;
} else {
- el.append(`is forbidden to masturbate or seek sexual release, which `);
+ el.append(`, which `);
App.UI.DOM.appendNewElement("span", el, `highly frustrates`, "mediumorchid");
el.append(` ${him}. `);
slave.devotion -= 2;
@@ -1352,6 +1356,22 @@ App.EndWeek.Rules.noReleaseDrugEffects = function(slave) {
he, him, his
} = getPronouns(slave);
+ if (slave.rules.reward === "orgasm" && slave.devotion > 20) {
+ // The orgasms from rewards are enough to keep them healthy and not too annoyed.
+ if (slave.energy > 50) {
+ el.append(`${His} enforced chastity `);
+ App.UI.DOM.appendNewElement("span", el, `dampens ${his} libido.`, ["libido", "dec"]);
+ slave.energy -= 1;
+ if (slave.energy > 70) {
+ el.append(` ${He} becomes more `);
+ App.UI.DOM.appendNewElement("span", el, `willing`, ["devotion", "inc"]);
+ el.append(" in an effort to get more rewards and thus sexual relief.");
+ slave.devotion += 1;
+ }
+ }
+ return el;
+ }
+
if (slave.balls > 0) {
if (slave.drugs === "testicle enhancement" || slave.drugs === "intensive testicle enhancement") {
if (slave.hormoneBalance >= 100) {
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index 968505b33ce52ce512c8dfa1e3faabf6975dc9f5..bd5e27d659c9304fc15d7eca31b88673e796b41c 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -102,6 +102,10 @@ App.SlaveAssignment.servant = function saServant(slave, stewardessBonus = 0) {
} else {
r.push(`so happy to serve your other slaves that ${he} often sees to their needs before they know they have them, and greatly <span class="cash inc">reduces the upkeep</span> of your slaves.`);
}
+
+ if (App.SlaveAssignment.PartTime.efficiencyModifier(slave) < 1) {
+ r.push(`Some time of ${his} day is taken up by ${his} part-time job, <span class="cash dec">reducing</span> the time spent cleaning.`);
+ }
}
/**
@@ -138,14 +142,14 @@ App.SlaveAssignment.servant = function saServant(slave, stewardessBonus = 0) {
if (App.Data.Careers.General.servant.includes(slave.career)) {
r.push(`${He} has experience with house keeping from ${his} life before ${he} was a slave, making ${him} more effective.`);
- } else if (slave.skill.servant >= V.masteredXP) {
+ } else if (slave.skill.servant >= Constant.MASTERED_XP) {
r.push(`${He} has experience with house keeping from working for you, making ${him} more effective.`);
} else {
slave.skill.servant += jsRandom(1, Math.ceil((slave.intelligence + slave.intelligenceImplant) / 15) + 8);
}
if (slave.fetishStrength > 60) {
- if (slave.fetish === "submissive" && slave.fetishKnown === 1) {
+ if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishKnown === 1) {
r.push(`${His} natural affinity for submission increases ${his} effectiveness.`);
} else if (slave.fetishKnown === 1 && slave.fetish === "dom") {
r.push(`${His} sexual appetite for domination reduces ${his} effectiveness.`);
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index ab9180f36cb3f4ee6618210960c109ccc9f5ba57..a4da21e76b877ccf0d91a8126ad1912106f7dbc6 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -1,5 +1,5 @@
/**
- * @param {App.Entity.SlaveState} slave
+ * @param {FC.ReportSlave} slave
* @returns {string}
*/
App.SlaveAssignment.serveThePublic = function saServeThePublic(slave) {
@@ -215,6 +215,11 @@ App.SlaveAssignment.serveThePublic = function saServeThePublic(slave) {
} else {
r += `liked using ${him}.`;
}
+ const pMod = App.SlaveAssignment.PartTime.efficiencyModifier(slave);
+ if (pMod < 1) {
+ const loss = Math.ceil((slave.sexAmount / pMod) * (1 - pMod));
+ r += ` Due to ${his} part-time job, ${he} served ${loss} less than ${he} would have normally.`;
+ }
}
/**
@@ -265,8 +270,7 @@ App.SlaveAssignment.serveThePublic = function saServeThePublic(slave) {
}
/**
- * @param {App.Entity.SlaveState} slave
- *
+ * @param {FC.ReportSlave} slave
*/
function physicalEffects(slave) {
if (slave.health.illness > 0 || slave.health.tired > 60) {
@@ -454,12 +458,12 @@ App.SlaveAssignment.serveThePublic = function saServeThePublic(slave) {
*/
function slaveSkills(slave) {
let skillIncrease;
- if (!App.Data.Careers.General.entertainment.includes(slave.career) && slave.skill.entertainer < V.masteredXP) {
+ if (!App.Data.Careers.General.entertainment.includes(slave.career) && slave.skill.entertainer < Constant.MASTERED_XP) {
slave.skill.entertainer += jsRandom(1, Math.ceil((slave.intelligence + slave.intelligenceImplant) / 15) + 8);
}
if (App.Data.Careers.General.entertainment.includes(slave.career)) {
r += ` ${He} has experience with entertainment from ${his} life before ${he} was a slave, making ${him} more effective.`;
- } else if (slave.skill.entertainer >= V.masteredXP) {
+ } else if (slave.skill.entertainer >= Constant.MASTERED_XP) {
r += ` ${He} has learned to be entertaining from working for you, making ${him} more effective.`;
}
@@ -991,7 +995,7 @@ App.SlaveAssignment.serveThePublic = function saServeThePublic(slave) {
}
}
break;
- case "mindbroken":
+ case Fetish.MINDBROKEN:
r += ` ${He} receives less attention because ${he} just lies there, totally unresponsive.`;
break;
}
diff --git a/src/endWeek/saServeYourOtherSlaves.js b/src/endWeek/saServeYourOtherSlaves.js
index 0a9250478c9c4ed40648615a08f5d44a90fb8138..787a547f04250f8cc3d6083c7b858773174be55a 100644
--- a/src/endWeek/saServeYourOtherSlaves.js
+++ b/src/endWeek/saServeYourOtherSlaves.js
@@ -77,7 +77,7 @@ App.SlaveAssignment.serveYourOtherSlaves = function saServeYourOtherSlaves(slave
function studLife(slave) {
if (slave.fuckdoll > 0) {
r.push(`is positioned as a sperm dispenser for fertile slaves to ride or milk at their discretion.`);
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
if (slave.career === "a breeding bull" && canMove(slave)) {
r.push(`is allowed to freely breed any fertile slaves ${he} can find.`);
} else {
@@ -107,7 +107,7 @@ App.SlaveAssignment.serveYourOtherSlaves = function saServeYourOtherSlaves(slave
r.push(`${He} secretly gets off at the thought of all the wombs ${he} will seed <span class="hotpink">and can't wait to get to work.</span>`);
slave.devotion += 1;
subSlaveLikedFetish = 1;
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He} secretly enjoys the prospect of being pinned by mothers-to-be and milked to orgasm; <span class="hotpink">${he} needs it.</span>`);
slave.devotion += 1;
subSlaveLikedFetish = 1;
@@ -126,7 +126,7 @@ App.SlaveAssignment.serveYourOtherSlaves = function saServeYourOtherSlaves(slave
r.push(`${He} privately enjoys the prospect of rough treatment <span class="hotpink">and accepts it.</span>`);
slave.devotion += 1;
subSlaveLikedFetish = 1;
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He} privately enjoys the prospect of being treated as a mere tool <span class="hotpink">and accepts it.</span>`);
slave.devotion += 1;
subSlaveLikedFetish = 1;
@@ -162,7 +162,7 @@ App.SlaveAssignment.serveYourOtherSlaves = function saServeYourOtherSlaves(slave
r.push(`With little competition for ${his} body and so many slaves eager to use ${him}, ${his} dreams of being the center of attention are <span class="hotpink">have come true.</span>`);
if (slave.weight < 10 && slave.belly < 100) {
if (canDoVaginal(slave) && slave.vagina > 0 && canDoAnal(slave) && slave.anus > 0) {
- r.push(`${He} ends each day cradling ${his} cum swollen stomach, marveling at the "attention" bestowed upon ${him}.`);
+ r.push(`${He} ends each day cradling ${his} cum-swollen stomach, marveling at the "attention" bestowed upon ${him}.`);
} else if ((canDoVaginal(slave) && slave.vagina > 0) || (canDoAnal(slave) && slave.anus > 0)) {
r.push(`By the end of the day, ${his} stomach has a noticeable bulge to it from all the "attention" bestowed upon ${him}.`);
}
@@ -496,7 +496,7 @@ App.SlaveAssignment.serveYourOtherSlaves = function saServeYourOtherSlaves(slave
}
subSlaveLikedFetish = 1;
}
- } else if (slave.devotion >= -20 && domSlave.fetish === "submissive" && domSlave.fetishStrength > 60) {
+ } else if (slave.devotion >= -20 && domSlave.fetish === Fetish.SUBMISSIVE && domSlave.fetishStrength > 60) {
domSlaveUsedFetish = 1;
if (domFetishKnown) {
r.push(`${domName} loves to submit, and tells`);
@@ -639,7 +639,7 @@ App.SlaveAssignment.serveYourOtherSlaves = function saServeYourOtherSlaves(slave
}
r.push(`edging ${him} right up to the point of orgasm and making ${him} beg. It's a long but <span class="hotpink">obedience-building</span> week for ${subName}, and ${domName} certainly <span class="hotpink">enjoys ${his2} toy.</span>`);
slave.devotion += 1;
- if (slave.need && slave.fetish === "submissive") {
+ if (slave.need && slave.fetish === Fetish.SUBMISSIVE) {
if (slave.fetishKnown) {
r.push(`${subName} needs this kind of treatment to be truly sexually satisfied; this week, ${his} desire to be controlled is sated.`);
}
@@ -826,7 +826,7 @@ App.SlaveAssignment.serveYourOtherSlaves = function saServeYourOtherSlaves(slave
domSlave.fetishKnown = 1;
}
stimulateSlaveProstate(slave, domSlave);
- r.push(`to force ${him} to climax so ${domName} can plant ${his2} ${domRace} lips overs ${subName}'s ${subRace}`);
+ r.push(`to force ${him} to climax so ${domName} can plant ${his2} ${domRace} lips over ${subName}'s ${subRace}`);
if (slave.vagina >= 0) {
r.push(`urethra`);
} else {
@@ -1084,7 +1084,7 @@ App.SlaveAssignment.serveYourOtherSlaves = function saServeYourOtherSlaves(slave
r.push(`has ${him} get in position`);
}
if (canPenetrate(slave)) {
- r.push(`and mounts ${his} rigid dick`);
+ r.push(`and mounts ${his} rigid dick.`);
} else {
r.push(`and begins to work ${him} to orgasm.`);
}
@@ -1206,7 +1206,7 @@ App.SlaveAssignment.serveYourOtherSlaves = function saServeYourOtherSlaves(slave
} else if (slave.dick > 0 && hasAnyArms(domSlave) && domSlave.attrXY > 85) {
if (canPenetrate(slave)) {
if (slave.devotion < -20) {
- r.push(`Since ${domName} loves hard cocks, ${subName} finds ${him} self forced to get hard and fuck. ${He} spends the week trying to avoid ${domName}'s constant demands. <span class="hotpink">${domName} enjoys having a nice dick right at hand,</span> even if it does have to be forced to stand up for ${him2}.`);
+ r.push(`Since ${domName} loves hard cocks, ${subName} finds ${himself} forced to get hard and fuck. ${He} spends the week trying to avoid ${domName}'s constant demands. <span class="hotpink">${domName} enjoys having a nice dick right at hand,</span> even if it does have to be forced to stand up for ${him2}.`);
} else if (slave.devotion <= 50) {
r.push(`Since ${domName} loves hard cocks, ${subName} finds ${himself} required to get hard and fuck constantly. ${He} spends the week doing ${his} best to satisfy ${domName}'s constant demands. <span class="hotpink">${domName} enjoys having a nice dick right at hand,</span> and won't leave it alone.`);
} else {
@@ -1356,7 +1356,7 @@ App.SlaveAssignment.serveYourOtherSlaves = function saServeYourOtherSlaves(slave
if (slave.fetishStrength < 100) {
slave.fetishStrength++;
}
- } else if (fetishChange > random(0, 100) && slave.fetish !== "masochist" && slave.fetish !== "submissive" && App.EndWeek.saVars.subSlaveRatio.isBetween(0, 0.8)) {
+ } else if (fetishChange > random(0, 100) && slave.fetish !== "masochist" && slave.fetish !== Fetish.SUBMISSIVE && App.EndWeek.saVars.subSlaveRatio.isBetween(0, 0.8)) {
r.push(`Being used as much as ${he} is starts to take a toll on ${him} sexuality; <span class="lightcoral">${he} begins to enjoy being your chattel's fucktoy.</span>`);
slave.fetish = "submissive";
slave.fetishStrength = 65;
@@ -1393,7 +1393,7 @@ App.SlaveAssignment.serveYourOtherSlaves = function saServeYourOtherSlaves(slave
}
break;
case "dom":
- if (slave.fetish !== "submissive") {
+ if (slave.fetish !== Fetish.SUBMISSIVE) {
r.push(`${domName}'s sexual domination has a lasting effect on ${subName}; <span class="lightcoral">${he}'s grown a taste for submitting.</span>`);
slave.fetish = "submissive";
slave.fetishStrength = 35;
@@ -1586,7 +1586,7 @@ App.SlaveAssignment.serveYourOtherSlaves = function saServeYourOtherSlaves(slave
if (jobType === "stud") {
if (slaveResting(slave)) {
r.push(`${He} is only made available during certain hours to maximize ${his} potency while <span class="health inc">keeping ${him} rested.</span>`);
- if (slave.fetish === "mindbroken" && slave.fuckdoll > 0) {
+ if (slave.fetish === Fetish.MINDBROKEN && slave.fuckdoll > 0) {
r.push(`This doesn't stop recreational breeding, should ${he} be in the mood, but gives ${him} a chance to recover as needed.`);
}
} else if (slave.health.tired + 5 >= 90 && !willWorkToDeath(slave)) {
diff --git a/src/endWeek/saSharedVariables.js b/src/endWeek/saSharedVariables.js
index 3bd4691282a027cf9f6cf3ee829f53d6654e3e15..d4c7d2942ea2b35b34452bc6f74fa075ca644e8a 100644
--- a/src/endWeek/saSharedVariables.js
+++ b/src/endWeek/saSharedVariables.js
@@ -35,9 +35,15 @@ App.EndWeek.SASharedVariables = class {
/** Need cap per slave. Array indices are the slave IDs (resulting in a sparse array, but that's ok, because we never save this array) */
this.needCapPerSlave = [];
/** Which employees the leader of the currently processed facility is having sex with this week
+ * @type {Set<number>}
* @see App.EndWeek.getFLSex
*/
- this.flSex = 0;
+ this.flSex = new Set();
+ /**
+ * Assignments texts for slaves who choose their own assignment, set in App.SlaveAssignment.choosesOwnJob()
+ * @type {Object.<number, string>}
+ */
+ this.choosesOwnAssignmentText = {};
}
/** Compute shared subslave ratio (subslaves per ordinary slave) */
diff --git a/src/endWeek/saSmartPiercingEffects.js b/src/endWeek/saSmartPiercingEffects.js
index 1b7e936f37b73cb16b2b982f0d3bd6adb3185af5..e26ac1651641247c823fb65237c78b21c37d020b 100644
--- a/src/endWeek/saSmartPiercingEffects.js
+++ b/src/endWeek/saSmartPiercingEffects.js
@@ -219,7 +219,7 @@ App.SlaveAssignment.SmartPiercing.vanilla = class extends App.SlaveAssignment.Sm
trigger(magnitude, plural) {
// Vanilla does NOT increase the strength of the "none" fetish, but otherwise behaves like any other fetish setting
- if (this.slave.fetish !== "none") {
+ if (this.slave.fetish !== Fetish.NONE) {
return super.trigger(magnitude, plural);
}
return '';
@@ -422,13 +422,13 @@ App.SlaveAssignment.saSmartPiercingEffects = function(slave) {
if (hasSP) {
if (slave.fuckdoll > 0) {
return `${His} ${piercing} is slaved to ${his} stimulation systems.`;
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
return `The effects of ${his} ${piercing} cannot reach ${his} shattered mind.`;
}
} else if (hasSmartVibe || hasDumbVibe) {
if (hasSmartVibe && slave.fuckdoll > 0) { // note: ordinary vibes DO affect fuckdolls
return `${His} ${vibrator} is slaved to ${his} stimulation systems.`;
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
return `The effects of the ${vibrator} ${he} is wearing cannot reach ${his} shattered mind.`;
}
}
@@ -484,7 +484,7 @@ App.SlaveAssignment.saSmartPiercingEffects = function(slave) {
// all dumb vibrators do exactly the same thing: dampen any existing fetish, and push libido into the average (40-60) range
const intro = `${His} ${vibrator} intermittently stimulates ${him} no matter what ${he}'s doing, which `;
const effects = [];
- if (slave.fetish !== "none") {
+ if (slave.fetish !== Fetish.NONE) {
if (slave.fetishKnown === 1) {
effects.push(`<span class="fetish loss">weakens</span> ${his} fetish`);
}
diff --git a/src/endWeek/saSocialEffects.js b/src/endWeek/saSocialEffects.js
index 8e9e302993b5e60e35062daa8c74daa067ca5b2e..d963d68285f4f9ad6c88f6554669e7b58bced06d 100644
--- a/src/endWeek/saSocialEffects.js
+++ b/src/endWeek/saSocialEffects.js
@@ -1,12 +1,12 @@
/** Apply and return description of social effects
* @param {FC.ReportSlave} slave
- * @returns {DocumentFragment}
*/
App.SlaveAssignment.saSocialEffects = function(slave) {
const {His, his, him, he, girl, wife} = getPronouns(slave);
+ let netFailedElite = 0;
/** Build a social effect object
- * @param {FC.FutureSocietyDeco} FS
+ * @param {FC.FutureSocietyDeco|""} FS
* @param {number} magnitude positive or negative value (a small integer, or a fraction between -1 and 1)
* @param {string} shortDesc for compact/list mode (text string)
* @param {string} longDesc for expanded mode (HTML string)
@@ -48,12 +48,12 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
if (slave.pregSource > 0) {
const dad = findFather(slave.pregSource);
if (dad) {
- if (slave.race !== dad.race && V.arcologies[0].FSSupremacistRace === "mixed race") {
+ if (V.arcologies[0].FSSupremacistRace === "mixed race") {
t.push(new SocialEffect("Supremacist", 2, "Mixed race breeding",
- `Society <span class="green">approves</span> of your using slave breeders like ${slave.slaveName} to propagate the ${V.arcologies[0].FSSupremacistRace} civilization.`));
+ `Society <span class="green">strongly approves</span> of your using slave breeders like ${slave.slaveName} to propagate the new mixed race civilization.`));
} else if (slave.race !== dad.race) {
t.push(new SocialEffect("Supremacist", -2, "Miscegenation",
- `Society <span class="red">strongly disapproves</span> of your allowing a pure ${V.arcologies[0].FSSupremacistRace} slave to be miscegenated by ${dad.slaveName}.`));
+ `Society <span class="red">strongly disapproves</span> of your allowing a pure ${V.arcologies[0].FSSupremacistRace} slave's womb to be sullied by ${dad.slaveName}'s ${dad.race} seed.`));
} else {
t.push(new SocialEffect("Supremacist", 2, "Pure race breeding",
`Society <span class="green">strongly approves</span> of your using slave breeders like ${slave.slaveName} to propagate the ${V.arcologies[0].FSSupremacistRace} civilization.`));
@@ -72,6 +72,22 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
t.push(new SocialEffect("Supremacist", 1, "Inferior race fuckdoll",
`Society <span class="green">approves</span> of your keeping a Fuckdoll of an inferior race.`));
}
+ if (V.arcologies[0].FSSupremacistRace === "mixed race") {
+ if (slave.pregKnown === 1) {
+ if (slave.pregSource > 0) {
+ const dad = findFather(slave.pregSource);
+ if (dad) {
+ if (slave.race === dad.race) {
+ t.push(new SocialEffect("Supremacist", -2, "Pure race breeding",
+ `Society <span class="red">strongly disapproves</span> of your allowing your slave breeders to propagate their supposedly pure race instead of contributing to the advancement of race-mixing.`));
+ } else {
+ t.push(new SocialEffect("Supremacist", 2, "Mixed race breeding",
+ `Society <span class="green">strongly approves</span> of your producing superior mixed race offspring from an inferior pureblooded ${slave.race} mother and ${dad.race} father.`));
+ }
+ }
+ }
+ }
+ }
}
}
@@ -101,9 +117,14 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
} else {
if (slave.pregKnown === 1 && slave.pregSource > 0) {
const dad = findFather(slave.pregSource);
- if (dad && dad.race === V.arcologies[0].FSSubjugationistRace) {
- t.push(new SocialEffect("Subjugationist", -2, "Miscegenation",
- `Society <span class="red">strongly disapproves</span> of your allowing ${slave.slaveName} to be miscegenated by ${addA(V.arcologies[0].FSSubjugationistRace)} subhuman like ${dad.slaveName}.`));
+ if (dad) {
+ if (dad.race === V.arcologies[0].FSSubjugationistRace) {
+ t.push(new SocialEffect("Subjugationist", -2, "Miscegenation",
+ `Society <span class="red">strongly disapproves</span> of your allowing ${slave.slaveName}'s womb to be sullied by ${addA(V.arcologies[0].FSSubjugationistRace)} subhuman like ${dad.slaveName}.`));
+ } else if (V.arcologies[0].FSSubjugationistRace === "mixed race" && slave.race !== dad.race) {
+ t.push(new SocialEffect("Subjugationist", -2, "Miscegenation",
+ `Society <span class="red">strongly disapproves</span> of your producing mixed race mongrels by miscegenating pureblooded slave stock.`));
+ }
}
}
}
@@ -228,10 +249,10 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
repopRacialPregnancy();
} else if (V.arcologies[0].FSSubjugationist !== "unset" && (slave.race === V.arcologies[0].FSSubjugationistRace) && slave.bellyImplant >= 1500) {
t.push(new SocialEffect("", 0.1, "Belly implant for inferior race (Repopulation Focus)",
- `Society <span class="green">is satisfied</span> with ${slave.slaveName}'s implant filled belly since ${his} kind really shouldn't be breeding.`));
+ `Society <span class="green">is satisfied</span> with ${slave.slaveName}'s implant-filled belly since ${his} kind really shouldn't be breeding.`));
} else if (slave.bellyImplant >= 1500 && ((slave.ovaries === 0 && slave.mpreg === 0) || slave.preg < -1)) {
t.push(new SocialEffect("", 0.1, "Belly implant for infertile slave (Repopulation Focus)",
- `Society <span class="green">accepts</span> ${slave.slaveName}'s implant filled belly due to ${his} infertility.`));
+ `Society <span class="green">accepts</span> ${slave.slaveName}'s implant-filled belly due to ${his} infertility.`));
} else if (slave.collar === "preg biometrics" && slave.preg > 0) {
t.push(new SocialEffect("Repopulationist", 1, "Pregnancy biometrics",
`Society is <span class="green">pleased</span> by ${slave.slaveName}'s collar revealing ${his} womb's secret${slave.pregType > 1 ? 's' : ''} even when ${his} body is trying its best to keep ${slave.pregType > 1 ? "them" : "it"} hidden.`));
@@ -290,7 +311,7 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
r.push(`an Elite`);
}
r.push(`child${slave.pregType > 1 ? 'ren are' : ' is'} growing within ${him}. The mark covering ${his} lower belly, coupled with ${his} gravidity and blessing, <span class="green">enamors</span> your populace.`);
- V.failedElite -= (5 + slave.pregType);
+ netFailedElite -= (5 + slave.pregType);
t.push(new SocialEffect("Eugenics", 3, "Breeder carrying elite baby", r.join(' ')));
if (slave.abortionTat > 0) {
r = [];
@@ -330,7 +351,7 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
if (slave.pregKnown === 1 && V.eugenicsFullControl !== 1) {
t.push(new SocialEffect("Eugenics", 0, "Unapproved pregnancy (ELITE WARNING)",
`The Societal Elite <span class="red">judge you</span> for keeping pregnant slaves. It falls to the slaveowner to deal with subhuman pregnancies and you are failing in your duties as a member of the Elite.`));
- V.failedElite += (5 + slave.pregType);
+ netFailedElite += (5 + slave.pregType);
}
}
if (slave.balls > 0 && slave.pubertyXY === 1 && slave.vasectomy === 0 && slave.ballType !== "sterile") {
@@ -356,11 +377,11 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
if (slave.geneMods.NCS > 0 && slave.visualAge <= V.potencyAge && slave.physicalAge >= V.potencyAge) {
t.push(new SocialEffect("Paternalist", 1, "NCS Youthening",
`Society <span class="green">approves</span> of you keeping ${slave.slaveName} perpetually young and innocent looking so you can keep taking care of ${him}; this advances paternalistic ideals.`));
- } else if (slave.intelligenceImplant >= 15 && slave.fetish !== "mindbroken") {
+ } else if (slave.intelligenceImplant >= 15 && slave.fetish !== Fetish.MINDBROKEN) {
t.push(new SocialEffect("Paternalist", 1, "Educated",
`Society <span class="green">approves</span> of ${slave.slaveName} being properly educated; this advances ideas about slave improvement.`));
}
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.intelligenceImplant <= -15) {
t.push(new SocialEffect("Paternalist", -2, "Miseducated",
`Society <span class="red">is appalled</span> by ${slave.slaveName}'s twisted education; it goes against paternalistic values.`));
@@ -380,6 +401,13 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
t.push(new SocialEffect("Paternalist", 1, "Healthy",
`Society <span class="green">approves</span> of ${his} shining health; this advances belief in a slaveowner's duty.`));
}
+ if (slave.health.tired > 60 && !slave.slaveUsedRest && ![Job.REST, Job.SPA, Job.CLINIC, Job.CONFINEMENT, Job.CELLBLOCK].includes(slave.assignment)) {
+ t.push(new SocialEffect("Paternalist", -2, "Exhausted and not resting",
+ `Society <span class="red">is appalled</span> that ${he}'s required to work in ${his} exhausted state.`));
+ } else if (slave.health.tired > 70 && slave.assignment === Job.CELLBLOCK && !!S.Wardeness) {
+ t.push(new SocialEffect("Paternalist", -1, "Sleep deprived by Wardeness",
+ `Society <span class="red">disapproves</span> of the harsh measures that ${S.Wardeness.slaveName} is using to break ${him}.`));
+ }
if (slave.devotion + slave.trust > 180) {
if (slave.relationship === -3) {
t.push(new SocialEffect("Paternalist", 5, `Happy slave ${wife}`,
@@ -406,7 +434,7 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
`Society <span class="green">approves</span> of ${slave.slaveName} being allowed to choose ${his} own job, advancing ideals about slave self-actualization.`));
}
if (slave.relationship === -3) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
t.push(new SocialEffect("Paternalist", 1, `Mindbroken, married`,
`Society is mixed over your marriage to the mindbroken ${girl}; on one hand ${he} had no consent, but on the other, you <span class="green">surely must love ${him}</span> to marry ${him}.`));
} else if (slave.devotion <= 20) {
@@ -426,7 +454,7 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
`Society <span class="red">disapproves</span> that you are forcing ${him} to crawl instead of aiding ${his} mobility.`));
}
} else if (V.arcologies[0].FSDegradationist !== "unset") {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
t.push(new SocialEffect("Degradationist", 1, `Mindbroken`,
`Society <span class="green">approves</span> of ${his} broken spirit; ${he} serves as an example of a soulless fuckpuppet.`));
} else {
@@ -457,6 +485,10 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
t.push(new SocialEffect("Degradationist", 1, `Restrained for sex`,
`Society <span class="green">approves</span> of how ${he} is restrained for involuntary use, seeing this as the future of sexual relations.`));
}
+ if (slave.health.tired > 60 && !slave.slaveUsedRest && ![Job.REST, Job.SPA, Job.CLINIC, Job.CONFINEMENT, Job.CELLBLOCK].includes(slave.assignment)) {
+ t.push(new SocialEffect("Degradationist", 1, "Exhausted but still working",
+ `Society <span class="green">approves</span> of the harsh discipline required to get ${him} to work productively in ${his} exhausted state.`));
+ }
if (modScore.total > 15 || (modScore.piercing > 8 && modScore.tat > 5)) {
t.push(new SocialEffect("Degradationist", 1, `Heavily modified`,
`Society <span class="green">approves</span> of ${his} many body modifications, which advances the public taste for such degradation of slave bodies.`));
@@ -640,7 +672,7 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
}
if (slave.faceImplant > 95 && slave.face > 40) {
t.push(new SocialEffect("Transformation Fetishist", 1, `Uncannily beautiful face`,
- `Society <span class="green">approves</span> of ${his} beautiful face, considering it's uncanny nature a boon rather than a fault; this supports the belief that there is no such thing as too much surgery.`));
+ `Society <span class="green">approves</span> of ${his} beautiful face, considering its uncanny nature a boon rather than a fault; this supports the belief that there is no such thing as too much surgery.`));
transformed++;
}
let addons = [];
@@ -849,13 +881,33 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
`Society <span class="green">approves</span> of ${slave.slaveName}'s collar as an expression of the old ideal of mortification of the flesh, advancing the combination of religious originalism and modern slavery.`));
}
const clothes = App.Data.clothes.get(slave.clothes);
- if (clothes && clothes.fs && clothes.fs.loves && clothes.fs.loves.has("FSChattelReligionist")) {
- t.push(new SocialEffect("Chattel Religionist", 1, `Religious clothing`,
- `Society <span class="green">approves</span> of ${his} religiously themed clothing, strengthening the connection between sexual servitude and faith.`));
- } else if (clothes && clothes.fs && clothes.fs.tolerates && clothes.fs.tolerates.has("FSChattelReligionist")) {
- t.push(new SocialEffect("Chattel Religionist", 0, `Spartan clothing`,
- `Society accepts ${his} spartan clothing, seeing it as permissible under the new religious mores.`));
- } else if (slave.fuckdoll === 0) {
+ let clothesOK = false;
+ if (V.arcologies[0].FSChattelReligionistLaw2 !== 1) {
+ if (ChattelReligionistClothingPass(slave.clothes)) {
+ t.push(new SocialEffect("Chattel Religionist", 1, `Religious clothing`,
+ `Society <span class="green">approves</span> of ${his} religiously themed clothing, strengthening the connection between sexual servitude and faith.`));
+ clothesOK = true;
+ } else if (clothes && clothes.fs && clothes.fs.tolerates && clothes.fs.tolerates.has("FSChattelReligionist")) {
+ t.push(new SocialEffect("Chattel Religionist", 0, `Spartan clothing`,
+ `Society accepts ${his} spartan clothing, seeing it as permissible under the new religious mores.`));
+ clothesOK = true;
+ }
+ } else {
+ if (clothes && clothes.exposure > 3) {
+ t.push(new SocialEffect("Chattel Religionist", 2, `Holy Nudism`,
+ `Society <span class="green">strongly approves</span> of ${his} holy nudism, strengthening the connection between sexual servitude and faith.`));
+ clothesOK = true;
+ } else if (ChattelReligionistClothingPass(slave.clothes)) {
+ t.push(new SocialEffect("Chattel Religionist", 1, `Revealing religious clothing`,
+ `Society <span class="green">approves</span> of ${his} revealing, religiously themed clothing, strengthening the connection between sexual servitude and faith.`));
+ clothesOK = true;
+ } else if (clothes && clothes.fs && clothes.fs.loves && clothes.fs.loves.has("FSChattelReligionist")) {
+ t.push(new SocialEffect("Chattel Religionist", 0, `Conservative religious clothing`,
+ `Society accepts ${his} religiously themed clothing, but finds it insufficiently revealing to promote Holy Nudism.`));
+ clothesOK = true;
+ }
+ }
+ if (!clothesOK && slave.fuckdoll === 0) {
t.push(new SocialEffect("Chattel Religionist", -1, `Extravagant clothing`,
`Society <span class="red">disapproves</span> of ${his} unnecessarily gaudy attire; this slows acceptance of a link between faith and sexual servitude.`));
}
@@ -886,7 +938,7 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
function makeShelterGirlEffects() {
let t = [];
if (slave.fuckdoll === 0) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (isShelterSlave(slave)) {
if ([Job.CLUB, Job.PUBLIC, Job.WHORE, Job.BROTHEL].includes(slave.assignment)) {
if (slave.trust > 20 && slave.health.condition > 40) {
@@ -928,6 +980,9 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
}
}
}
+
+ // apply elite failure
+ V.failedElite += netFailedElite;
}
function renderTooltip() {
@@ -962,65 +1017,91 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
return el;
}
- function displayCompressed() {
- const positiveSum = socialEffects.filter(e => e.magnitude > 0).reduce((acc, cur) => acc += cur.magnitude, 0);
- const negativeSum = socialEffects.filter(e => e.magnitude < 0).reduce((acc, cur) => acc += cur.magnitude, 0);
+ function report() {
+ function displayCompressed() {
+ const positiveSum = socialEffects.filter(e => e.magnitude > 0).reduce((acc, cur) => acc += cur.magnitude, 0);
+ const negativeSum = socialEffects.filter(e => e.magnitude < 0).reduce((acc, cur) => acc += cur.magnitude, 0);
- const sumFrag = document.createDocumentFragment();
- sumFrag.append(`(`);
- App.UI.DOM.appendNewElement("span", sumFrag, '+' + positiveSum.toString(), positiveSum > 0 ? "green" : "gray");
- sumFrag.append(`/`);
- App.UI.DOM.appendNewElement("span", sumFrag, '-' + Math.abs(negativeSum).toString(), negativeSum < 0 ? "red" : "gray"); // literal '-' + Math.abs needed to handle 0 case
- sumFrag.append(`)`);
+ const sumFrag = document.createDocumentFragment();
+ sumFrag.append(`(`);
+ App.UI.DOM.appendNewElement("span", sumFrag, '+' + positiveSum.toString(), positiveSum > 0 ? "green" : "gray");
+ sumFrag.append(`/`);
+ App.UI.DOM.appendNewElement("span", sumFrag, '-' + Math.abs(negativeSum).toString(), negativeSum < 0 ? "red" : "gray"); // literal '-' + Math.abs needed to handle 0 case
+ sumFrag.append(`)`);
- const sum = positiveSum + negativeSum;
- frag.append(`Society has a `);
- if (sum > 0) {
- const opinion = App.UI.DOM.makeElement("span", "positive", ["green", "major-link", "has-tooltip"]);
- tippy(opinion, {content: renderTooltip(), placement: "right"});
- frag.append(opinion, ` overall view of ${slave.slaveName} `, sumFrag, `, which improves your reputation and advances social progress.`);
- } else if (sum === 0) {
- const opinion = App.UI.DOM.makeElement("span", "neutral", ["yellow", "major-link", "has-tooltip"]);
- tippy(opinion, {content: renderTooltip(), placement: "right"});
- frag.append(opinion, ` overall view of ${slave.slaveName} `, sumFrag, `; ${he} had no net impact on your reputation or social progress this week.`);
- } else {
- const opinion = App.UI.DOM.makeElement("span", "negative", ["red", "major-link", "has-tooltip"]);
- tippy(opinion, {content: renderTooltip(), placement: "right"});
- frag.append(opinion, ` overall view of ${slave.slaveName} `, sumFrag, `, which decreases your reputation and retards social progress.`);
+ const sum = positiveSum + negativeSum;
+ frag.append(`Society has a `);
+ if (sum > 0) {
+ const opinion = App.UI.DOM.makeElement("span", "positive", ["green", "major-link", "has-tooltip"]);
+ tippy(opinion, {content: renderTooltip(), placement: "right"});
+ frag.append(opinion, ` overall view of ${slave.slaveName} `, sumFrag, `, which improves your reputation and advances social progress.`);
+ } else if (sum === 0) {
+ const opinion = App.UI.DOM.makeElement("span", "neutral", ["yellow", "major-link", "has-tooltip"]);
+ tippy(opinion, {content: renderTooltip(), placement: "right"});
+ frag.append(opinion, ` overall view of ${slave.slaveName} `, sumFrag, `; ${he} had no net impact on your reputation or social progress this week.`);
+ } else {
+ const opinion = App.UI.DOM.makeElement("span", "negative", ["red", "major-link", "has-tooltip"]);
+ tippy(opinion, {content: renderTooltip(), placement: "right"});
+ frag.append(opinion, ` overall view of ${slave.slaveName} `, sumFrag, `, which decreases your reputation and retards social progress.`);
+ }
}
- }
- function displayLong() {
- $(frag).append(socialEffects.map(e => e.longDesc).join(" "));
- }
+ function displayLong() {
+ $(frag).append(socialEffects.map(e => e.longDesc).join(" "));
+ }
- const frag = document.createDocumentFragment();
+ const frag = document.createDocumentFragment();
- let socialEffects = [];
- if (V.FSAnnounced > 0) {
- if (V.studio === 1) {
- if (slave.porn.viewerCount > 0) {
- slave.pornFameBonus += (Math.ceil(slave.porn.viewerCount / 100000));
- if (slave.porn.viewerCount >= 100000) {
- frag.append(`${His} near-ubiquitous presence in arcology pornography greatly increases ${his} impact on society. `);
- } else if (slave.porn.viewerCount >= 10000) {
- frag.append(`${His} presence in arcology pornography increases ${his} impact on society. `);
- } else {
- frag.append(`${His} occasional presence in arcology pornography slightly increases ${his} impact on society. `);
+ if (V.FSAnnounced > 0) {
+ if (V.studio === 1) {
+ if (slave.porn.viewerCount > 0) {
+ slave.pornFameBonus += (Math.ceil(slave.porn.viewerCount / 100000));
+ if (slave.porn.viewerCount >= 100000) {
+ frag.append(`${His} near-ubiquitous presence in arcology pornography greatly increases ${his} impact on society. `);
+ } else if (slave.porn.viewerCount >= 10000) {
+ frag.append(`${His} presence in arcology pornography increases ${his} impact on society. `);
+ } else {
+ frag.append(`${His} occasional presence in arcology pornography slightly increases ${his} impact on society. `);
+ }
}
}
}
- socialEffects.push(...makeSocialEffects());
+ if (socialEffects.length > 0) {
+ applySocialEffects();
+ if (!V.UI.compressSocialEffects) {
+ displayLong();
+ } else {
+ displayCompressed();
+ }
+ }
+
+ return frag;
}
- socialEffects.push(...makeShelterGirlEffects());
- if (socialEffects.length > 0) {
- applySocialEffects();
- if (!V.UI.compressSocialEffects) {
- displayLong();
- } else {
- displayCompressed();
+
+ /** Test what new social effects this slave would gain if a new FS were added
+ * Note that this function does not currently take into account the social effects
+ * that would be *lost* if a new FS was enacted; this is a rare but extant case.
+ * @param {FC.FutureSociety} proposedFS
+ */
+ function newForFS(proposedFS) {
+ // make sure the FS is not currently enacted
+ if (V.arcologies[0][proposedFS] !== "unset") {
+ throw new Error(`Cannot test new FS social effects for existing FS ${proposedFS}`);
}
+ // temporarily enact the FS at full strength
+ V.arcologies[0][proposedFS] = 100;
+ // see what the slave's social effects would be under the proposed FS
+ const newSocialEffects = [...makeSocialEffects(), ...makeShelterGirlEffects()];
+ // undo the temporary FS enactment
+ V.arcologies[0][proposedFS] = "unset";
+ // return the differences between the current and new states
+ return _.differenceBy(newSocialEffects, socialEffects, s => s.shortDesc);
}
- return frag;
+ const socialEffects = [...makeSocialEffects(), ...makeShelterGirlEffects()];
+
+ return {
+ report,
+ newForFS
+ };
};
diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js
index 4c131c7d30d355cef66578ff1bf80ba312ccbca7..8bdb4c15035568edd7310b2b28ec0078554b3584 100644
--- a/src/endWeek/saStayConfined.js
+++ b/src/endWeek/saStayConfined.js
@@ -12,12 +12,11 @@ App.SlaveAssignment.stayConfined = function(slave) {
const {
he, him, his, He, His
} = getPronouns(slave);
- /* eslint-enable */
let t = "";
let brokenSlaves = false;
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.devotion < -50) {
t += `is kept in solitary confinement whenever ${he} is not being forced to do something else. ${He} still hates ${his} place in the world, but being forced to rely on slave life as ${his} only human contact <span class="devotion inc">grinds down ${his} resistance.</span>`;
slave.devotion += 2;
@@ -67,7 +66,7 @@ App.SlaveAssignment.stayConfined = function(slave) {
}
if (slave.assignment === Job.CELLBLOCK && V.WardenessID !== 0) {
t += ` The stress of confinement <span class="health dec">damages ${his} health.</span> ${S.Wardeness.slaveName}`;
- if (S.Wardeness.fetish === "mindbroken") {
+ if (S.Wardeness.fetish === Fetish.MINDBROKEN) {
if (slave.health.tired > 80) {
t += `'s empty mind often overlooks ${him} when ${he} falls inert from exhaustion, giving ${him} <span class="health inc">a much needed chance to rest.</span>`;
} else {
@@ -118,14 +117,9 @@ App.SlaveAssignment.stayConfined = function(slave) {
}
if (slave.sentence !== 0) {
- t += ` ${He} has ${slave.sentence}`;
- if (slave.sentence === 1) {
- t += ` week remaining.`;
- } else {
- t += ` weeks remaining.`;
- }
- } else if (slave.devotion > 20 || (slave.devotion >= -20 && slave.trust < -20) || (slave.devotion >= -50 && slave.trust < -50) || slave.fetish === "mindbroken") {
- if (slave.fetish === "mindbroken") {
+ t += ` ${He} has ${numberWithPluralOne(slave.sentence, "week")} remaining.`;
+ } else if (slave.devotion > 20 || (slave.devotion >= -20 && slave.trust < -20) || (slave.devotion >= -50 && slave.trust < -50) || slave.fetish === Fetish.MINDBROKEN) {
+ if (slave.fetish === Fetish.MINDBROKEN) {
t += ` ${His} broken mind hinges entirely on other's guidance,`;
} else {
t += ` ${He} is now willing to <span class="devotion accept">do as ${he}'s told,</span>`;
diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js
index ad1aaa51571b4ce03b438b82e42dda31c60163bf..416b698764ea06d5047e7a6a3617592dbb180b28 100644
--- a/src/endWeek/saTakeClasses.js
+++ b/src/endWeek/saTakeClasses.js
@@ -9,11 +9,11 @@ App.SlaveAssignment.takeClasses = function saTakeClasses(slave) {
let r = ` `;
+ const pMod = App.SlaveAssignment.PartTime.efficiencyModifier(slave);
let learning = 1;
- let teaching = 0;
jobPreface(slave);
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
learningDisability(slave);
jobHealthImpact(slave);
learningProgress(slave);
@@ -37,7 +37,7 @@ App.SlaveAssignment.takeClasses = function saTakeClasses(slave) {
*
*/
function jobPreface(slave) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r += `is no longer mentally capable and <span class="noteworthy">has been dropped from class.</span>`;
slave.health.tired = Math.clamp(slave.health.tired - 10, 0, 100); // Since they avoid the tired call altogether, just toss them some reduction. It's not like they were listening anyway.
if (slave.assignment === Job.CLASSES) {
@@ -50,13 +50,13 @@ App.SlaveAssignment.takeClasses = function saTakeClasses(slave) {
}
if (slave.assignment === Job.SCHOOL && S.Schoolteacher) {
const schoolteacherPronouns = getPronouns(S.Schoolteacher);
- teaching = (S.Schoolteacher.intelligence + S.Schoolteacher.intelligenceImplant);
+ let teaching = (S.Schoolteacher.intelligence + S.Schoolteacher.intelligenceImplant);
if (S.Schoolteacher.visualAge > 35) {
teaching += 10;
}
if (App.Data.Careers.Leader.schoolteacher.includes(S.Schoolteacher.career)) {
teaching += 10;
- } else if (S.Schoolteacher.skill.teacher >= V.masteredXP) {
+ } else if (S.Schoolteacher.skill.teacher >= Constant.MASTERED_XP) {
teaching += 10;
} else if (S.Schoolteacher.skill.teacher > 120) {
teaching += 6;
@@ -68,6 +68,7 @@ App.SlaveAssignment.takeClasses = function saTakeClasses(slave) {
if (S.Schoolteacher.face > 40) {
teaching += 10;
}
+ teaching *= App.SlaveAssignment.PartTime.efficiencyModifier(slave);
if (jsRandom(1, 150) < teaching) {
learning += 1;
}
@@ -250,6 +251,8 @@ App.SlaveAssignment.takeClasses = function saTakeClasses(slave) {
r += ` and neither likes you nor is afraid of you,`;
}
+ learning = Math.floor(learning * pMod);
+
r += ` and ${he} `;
if (V.schoolroomRemodelBimbo !== 1 || slave.assignment !== Job.SCHOOL) {
if (learning <= 1) {
@@ -269,6 +272,14 @@ App.SlaveAssignment.takeClasses = function saTakeClasses(slave) {
}
}
r += ` this week.`;
+
+ if (pMod < 1) {
+ if (App.SlaveAssignment.PartTime.arenaTime(slave) > 0) {
+ r += ` Some of ${his} classes focus on learning combat instead.`;
+ } else {
+ r += ` ${His} part-time job take up some part of ${his} day.`;
+ }
+ }
}
/**
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 5879da42cdea33905e7980cf6f1985f9bf23658d..985b425f0431d13ac9659a910925dff0a95dbeb9 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -1,78 +1,59 @@
-App.SlaveAssignment.whore = (function() {
- "use strict";
+/**
+ * @param {FC.ReportSlave} slave
+ * @returns {string}
+ */
+App.SlaveAssignment.whore = function(slave) {
+ let r = ` `;
+ const {
+ he, him, his, hers, himself, girl, He, His, loli
+ } = getPronouns(slave);
- let incomeStats;
- let r;
- let arcology;
-
- // if the following are set outside this file, they must be set in it too!
let beauty;
let customers;
let FuckResult;
let cash;
let cervixPump;
- let he;
- let him;
- let his;
- let hers;
- let himself;
- let girl;
- let loli;
- let He;
- let His;
-
- // if the following are set outside this file, they must be set in it too!
+
let oralUse;
let analUse;
let vaginalUse;
let mammaryUse;
let penetrativeUse;
- return saWhore;
+ const arcology = V.arcologies[0];
- /**
- * @param {FC.ReportSlave} slave
- * @returns {string}
- */
- function saWhore(slave) {
- arcology = V.arcologies[0];
- r = ` `;
- ({
- he, him, his, hers, himself, girl, He, His, loli
- } = getPronouns(slave));
-
- gatherStatistics(slave);
- updateNonSlaveVariables(slave); // must be run before applyFSDecoration() or you will face NaNs
- if (slave.assignment === Job.BROTHEL || slave.assignment === Job.MADAM) {
- // By being at the end, every slave after the first will get a bonus. By moving it up, the first can enjoy it too. slaveJobValues() checks Edo Revivalist, so here we are.
- applyFSDecoration();
- }
- addCash(slave);
- sexCounts(slave);
- jobPreface(slave);
- bonusMultiplierText(slave);
- usageCountDescriptions(slave);
- if (V.seeAge === 1) {
- comingOfAge(slave);
- }
- mentalEffects(slave);
- physicalEffects(slave);
- slaveSkills(slave);
- if (V.showEWM === 1) {
- publicReactions(slave);
- }
- if (slave.sexualFlaw === "none") {
- addFlaw(slave);
- }
- addCashText(slave);
- sexualSatiation(slave);
- if (V.showVignettes === 1) {
- assignmentVignette(slave);
- }
-
- return r;
+ const incomeStats = gatherStatistics(slave);
+
+ updateNonSlaveVariables(slave); // must be run before applyFSDecoration() or you will face NaNs
+ if (slave.assignment === Job.BROTHEL || slave.assignment === Job.MADAM) {
+ // By being at the end, every slave after the first will get a bonus. By moving it up, the first can enjoy it too. slaveJobValues() checks Edo Revivalist, so here we are.
+ applyFSDecoration();
}
+ addCash(slave);
+ sexCounts(slave);
+ jobPreface(slave);
+ bonusMultiplierText(slave);
+ usageCountDescriptions(slave);
+ if (V.seeAge === 1) {
+ comingOfAge(slave);
+ }
+ mentalEffects(slave);
+ physicalEffects(slave);
+ slaveSkills(slave);
+ if (V.showEWM === 1) {
+ publicReactions(slave);
+ }
+ if (slave.sexualFlaw === "none") {
+ addFlaw(slave);
+ }
+ addCashText(slave);
+ sexualSatiation(slave);
+ if (V.showVignettes === 1) {
+ assignmentVignette(slave);
+ }
+
+ return r;
/**
* @param {App.Entity.SlaveState} slave
@@ -80,7 +61,7 @@ App.SlaveAssignment.whore = (function() {
function gatherStatistics(slave) {
/* Statistics gathering */
const facility = (slave.assignment === Job.BROTHEL || slave.assignment === Job.MADAM) ? V.facility.brothel : undefined;
- incomeStats = getSlaveStatisticData(slave, facility);
+ return getSlaveStatisticData(slave, facility);
}
// I suspect this one will mostly be cut out in the overhauling
@@ -276,6 +257,11 @@ App.SlaveAssignment.whore = (function() {
} else if (beauty > 70) {
r += `, so many that ${he} occasionally had sex with multiple customers at once`;
}
+ const pMod = App.SlaveAssignment.PartTime.efficiencyModifier(slave);
+ if (pMod < 1) {
+ const loss = Math.ceil((beauty / pMod) * (1 - pMod));
+ r += `. Due to ${his} part-time job, ${he} served ${loss} less than ${he} would have normally`;
+ }
r += `. They paid ${cashFormat(FuckResult)} on average`;
r += `.`;
}
@@ -546,12 +532,12 @@ App.SlaveAssignment.whore = (function() {
*/
function slaveSkills(slave) {
let skillIncrease;
- if (!App.Data.Careers.General.whore.includes(slave.career) && slave.skill.whore < V.masteredXP) {
+ if (!App.Data.Careers.General.whore.includes(slave.career) && slave.skill.whore < Constant.MASTERED_XP) {
slave.skill.whore += jsRandom(1, Math.ceil((slave.intelligence + slave.intelligenceImplant) / 15) + 8);
}
if (App.Data.Careers.General.whore.includes(slave.career)) {
r += ` ${He} has sex work experience from ${his} life before ${he} was a slave, making ${him} more effective.`;
- } else if (slave.skill.whore >= V.masteredXP) {
+ } else if (slave.skill.whore >= Constant.MASTERED_XP) {
r += ` ${He} has experience as a prostitute from working for you, making ${him} more effective.`;
}
@@ -1093,7 +1079,7 @@ App.SlaveAssignment.whore = (function() {
}
}
break;
- case "mindbroken":
+ case Fetish.MINDBROKEN:
r += ` ${He} gets less ¤ because ${he} just lies there, totally unresponsive.`;
break;
}
@@ -1625,4 +1611,4 @@ App.SlaveAssignment.whore = (function() {
incomeStats.rep += Math.trunc(FuckResult * vignette.effect * 0.1);
}
}
-})();
+};
diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js
index f1610d7e139b7a531dd3ec54bd15b80cfc7430a6..cbb19dcbf6096c78b864140b535bd147937a0935 100644
--- a/src/endWeek/saWorkAGloryHole.js
+++ b/src/endWeek/saWorkAGloryHole.js
@@ -69,6 +69,11 @@ App.SlaveAssignment.workAGloryHole = function saWorkAGloryHole(slave) {
if (V.arcologies[0].FSDegradationist > 0) {
r += ` Demand for ${his} holes is strong due to the appetite for degradation rampant in ${V.arcologies[0].name}.`;
}
+ const pMod = App.SlaveAssignment.PartTime.efficiencyModifier(slave);
+ if (pMod < 1) {
+ const loss = Math.ceil((beauty / pMod) * (1 - pMod));
+ r += ` Due to ${his} part-time job, ${he} served ${loss} less than ${he} would have normally.`;
+ }
}
/**
@@ -205,7 +210,7 @@ App.SlaveAssignment.workAGloryHole = function saWorkAGloryHole(slave) {
*
*/
function mentalEffects(slave) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r += ` ${He} serves ${his} role as a mindless set of holes to perfection.`;
} else {
if (slave.skill.oral <= 10) {
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index bc5d56aa3274bf1c5226ebed6ef9f5d9bb784814..2dafe08482d37b44e72f74e51939afc3dd34c2df 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -8,9 +8,12 @@ App.SlaveAssignment.workTheFarm = function(slave) {
const {he, him, his, He} = getPronouns(slave);
const incomeStats = getSlaveStatisticData(slave, V.facility.farmyard);
+ /** @type {FC.SexualQuirk[]} */
const sexualQuirks = ["perverted", "unflinching"];
+ /** @type {FC.BehavioralQuirk[]} */
const behavioralQuirks = ["sinful"];
- const fetishes = ["humiliation", "masochist"];
+ /** @type {FC.Fetish[]} */
+ const fetishes = [Fetish.HUMILIATION, Fetish.MASOCHIST, Fetish.BESTIALITY];
const slaveApproves = sexualQuirks.includes(slave.sexualQuirk) ||
behavioralQuirks.includes(slave.behavioralQuirk) ||
@@ -40,15 +43,6 @@ App.SlaveAssignment.workTheFarm = function(slave) {
return text.toChildren();
}
- // function farmer(slave) {
- // TODO: update this with devotion and health effects
- // const F = getPronouns(S.Farmer);
-
- // if (S.Farmer) {
- // return `${S.Farmer.slaveName} watches over ${him}, making sure that ${he} doesn't slack off and works as hard as ${he} should. ${F.He}'s a tough boss, but a fair one. ${slave.slaveName} benefits from ${F.his} care while working in ${V.farmyardName}.`;
- // }
- // }
-
function food() {
if (V.mods.food.market && V.farmyardShows < 2) {
const fsGain = 0.0001 * foodAmount;
@@ -59,7 +53,9 @@ App.SlaveAssignment.workTheFarm = function(slave) {
V.mods.food.total += foodAmount;
incomeStats.food += foodAmount;
- return App.Facilities.Farmyard.produceFood(slave);
+ if (V.farmyardShows !== 2) {
+ return App.Facilities.Farmyard.produceFood(slave);
+ }
}
}
@@ -72,13 +68,40 @@ App.SlaveAssignment.workTheFarm = function(slave) {
}
function longTermEffects() {
- // TODO: rewrite these
+ const {canine, hooved, feline} = V.animals;
+ const largeAnimals = [
+ ...canine
+ .map(c => getAnimal(c))
+ .filter(c => c.dick.size > 3),
+ ...hooved
+ .map(h => getAnimal(h))
+ .filter(h => h.dick.size > 3),
+ ...feline
+ .map(f => getAnimal(f))
+ .filter(f => f.dick.size > 3),
+ ];
+
if (V.farmyardShows > 0) {
if (V.seeBestiality) {
+ if (slave.sexualQuirk !== "size queen" && random(100) > 95 && largeAnimals.length > 0) {
+ slave.sexualQuirk = "size queen";
+
+ return `After taking rough pounding after rough pounding from dicks that would put all but the most well-endowed pornstars to shame, normal-sized cocks just don't feel quite the same to ${slave.slaveName}. <span class="flaw break">${He}'s become a bit of a size queen.</span>`;
+ }
if (slave.fetishKnown && slaveApproves) {
slave.devotion += 1;
return `Getting fucked by animals is the perfect job for ${him}, as far as ${he} can tell. <span class="devotion inc">${He} is happy</span> to spend ${his} days being utterly degraded.`;
+ } else if (slave.fetish === Fetish.NONE ||
+ (slave.fetish !== Fetish.BESTIALITY && slave.fetishStrength < 75) &&
+ slaveApproves) {
+ if (random(100) < 10) {
+ slave.need = 0;
+ slave.devotion += 5;
+ fetishChange(slave, Fetish.BESTIALITY);
+
+ return `${He} seems to have <span class="devotion inc">really taken to</span> getting fucked by animals <span class="fetish gain">– ${he} has a bestiality fetish!</span>`;
+ }
} else if (slave.energy > 95) {
slave.need = 0;
slave.devotion += 5;
@@ -100,12 +123,12 @@ App.SlaveAssignment.workTheFarm = function(slave) {
text.push(`All said and done,`);
- if (V.mods.food.market && V.farmyardShows < 2) {
+ if (foodAmount) {
text.push(`${he} produces <span class="chocolate">${massFormat(foodAmount)}</span> of food`);
}
if (V.farmyardShows > 0) {
- if (V.mods.food.market) {
+ if (foodAmount) {
text.push(`and`);
} else {
text.push(`${he}`);
diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index 4795a0df978902f2ac8566a77971bb77935ab8b4..7f1f9148817f979d2c1db50ea6bada21379c7fc8 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -38,7 +38,7 @@ App.EndWeek.slaveAssignmentReport = function() {
// fire unqualified special slaves
_ensureEmployeeMeetsJobRequirements(slave);
- // first pass on choosesOwnJob is silent
+ // allow slaves to choose their jobs for later output
if (slave.choosesOwnAssignment === 1) {
App.SlaveAssignment.choosesOwnJob(slave);
}
@@ -151,7 +151,7 @@ App.EndWeek.slaveAssignmentReport = function() {
}
}
- if (slave.fetish === "mindbroken" && slave.relationship === -3) {
+ if (slave.fetish === Fetish.MINDBROKEN && slave.relationship === -3) {
if (slave.kindness > 0) {
slave.kindness--;
}
@@ -165,7 +165,7 @@ App.EndWeek.slaveAssignmentReport = function() {
if (V.HeadGirlID !== 0) {
App.EndWeek.saVars.HGEnergy++;
const slave = slaveStateById(V.HeadGirlID);
- if (V.personalAttention.task === PersonalAttention.SUPPORTHG && V.PC.health.shortDamage < 30) {
+ if (V.personalAttention.task === PersonalAttention.SUPPORTHG) { // onBedRest trigger here!
App.EndWeek.saVars.HGEnergy++;
if (slave.trust > 95) {
App.EndWeek.saVars.HGEnergy++;
@@ -180,6 +180,8 @@ App.EndWeek.slaveAssignmentReport = function() {
if (canAchieveErection(slave)) {
App.EndWeek.saVars.HGCum = resetHGCum(slave);
}
+ App.EndWeek.saVars.HGEnergy *= App.SlaveAssignment.PartTime.efficiencyModifier(slave);
+ App.EndWeek.saVars.HGEnergy = Math.max(1, Math.floor(App.EndWeek.saVars.HGEnergy));
}
// Stud gets off based on impregnations, so we need to check and see if they actually do anyone
@@ -226,8 +228,8 @@ App.EndWeek.slaveAssignmentReport = function() {
// initialize slave art
if (V.seeImages && V.seeReportImages) {
// agents and partners are not drawn; penthouse partners and the head girl's slave will be drawn via a different mechanism (since they are larger and right-aligned)
- const undrawnJobs = [Job.AGENT, Job.AGENTPARTNER, ...App.Entity.facilities.penthouse.jobsNames, Job.HEADGIRLSUITE];
- const drawnSlaveIDs = V.slaves.filter(s => !undrawnJobs.includes(s.assignment)).map(s => s.ID);
+ const undrawnJobs = [Job.AGENT, Job.AGENTPARTNER, Job.HEADGIRLSUITE];
+ const drawnSlaveIDs = V.slaves.filter(s => !assignmentVisible(s) && !undrawnJobs.includes(s.assignment)).map(s => s.ID);
// this batch renderer object will be accessible to all the facility reports
App.EndWeek.saVars.slaveArt = new App.Art.SlaveArtBatch(drawnSlaveIDs, 0);
res.append(App.EndWeek.saVars.slaveArt.writePreamble());
@@ -297,7 +299,7 @@ App.EndWeek.slaveAssignmentReport = function() {
name: capFirstChar(ar[1].name),
established: ar[1].established,
entriesNumberInitial: initialEmployeesCount[ar[1].desc.baseName],
- entriesNumber: ar[1].hostedSlaves,
+ entriesNumber: ar[1].hostedSlaves(),
manager: ar[1].manager,
alwaysExists: 0,
};
@@ -366,7 +368,7 @@ App.EndWeek.slaveAssignmentReport = function() {
function _ensureEmployeeMeetsJobRequirements(slave) {
switch (slave.assignment) {
case Job.HEADGIRL:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
_printSlaveUnassignedNote(slave, "is mindbroken");
V.HeadGirlID = 0;
} else if (!canTalk(slave)) {
@@ -384,7 +386,7 @@ App.EndWeek.slaveAssignmentReport = function() {
} else if (!canHear(slave)) {
_printSlaveUnassignedNote(slave, "can no longer hear");
V.HeadGirlID = 0;
- } else if (slave.preg > 37 && slave.broodmother === 2) {
+ } else if (slave.preg >= 37 && slave.broodmother === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Head Girl any longer`);
V.HeadGirlID = 0;
} else if (slave.devotion <= 20) {
@@ -397,13 +399,13 @@ App.EndWeek.slaveAssignmentReport = function() {
break;
case Job.RECRUITER:
V.RecruiterID = slave.ID;
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
_printSlaveUnassignedNote(slave, "is mindbroken");
V.RecruiterID = 0;
} else if (!canTalk(slave)) {
_printSlaveUnassignedNote(slave, "can't verbally entice marks");
V.RecruiterID = 0;
- } else if (slave.preg > 37 && slave.broodmother === 2) {
+ } else if (slave.preg >= 37 && slave.broodmother === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your recruiter any longer`);
V.RecruiterID = 0;
} else if (!canWalk(slave)) {
@@ -424,10 +426,10 @@ App.EndWeek.slaveAssignmentReport = function() {
if (!canTalk(slave)) {
_printSlaveUnassignedNote(slave, "can't give whores verbal orders");
V.MadamID = 0;
- } else if (slave.preg > 37 && slave.broodmother === 2) {
+ } else if (slave.preg >= 37 && slave.broodmother === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Madam any longer`);
V.MadamID = 0;
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
_printSlaveUnassignedNote(slave, "is mindbroken");
V.MadamID = 0;
} else if (!canWalk(slave)) {
@@ -451,10 +453,10 @@ App.EndWeek.slaveAssignmentReport = function() {
if (!canTalk(slave)) {
_printSlaveUnassignedNote(slave, "can't speak");
V.djID = 0;
- } else if (slave.preg > 37 && slave.broodmother === 2) {
+ } else if (slave.preg >= 37 && slave.broodmother === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your DJ any longer`);
V.djID = 0;
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
_printSlaveUnassignedNote(slave, "is mindbroken");
V.djID = 0;
} else if (!canWalk(slave)) {
@@ -469,10 +471,10 @@ App.EndWeek.slaveAssignmentReport = function() {
}
break;
case Job.MILKMAID:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
_printSlaveUnassignedNote(slave, "is mindbroken");
V.MilkmaidID = 0;
- } else if (slave.preg > 37 && slave.broodmother === 2) {
+ } else if (slave.preg >= 37 && slave.broodmother === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Milkmaid any longer`);
V.MilkmaidID = 0;
} else if (!canWalk(slave)) {
@@ -496,7 +498,7 @@ App.EndWeek.slaveAssignmentReport = function() {
}
break;
case Job.FARMER:
- if (S.Farmer.fetish === "mindbroken") {
+ if (S.Farmer.fetish === Fetish.MINDBROKEN) {
_printSlaveUnassignedNote(slave, "is mindbroken");
V.FarmerID = 0;
} else if (S.Farmer.preg > 37 && S.Farmer.broodmother === 2) {
@@ -523,10 +525,10 @@ App.EndWeek.slaveAssignmentReport = function() {
if (!canTalk(slave)) {
_printSlaveUnassignedNote(slave, "can't give servants verbal orders");
V.StewardessID = 0;
- } else if (slave.preg > 37 && slave.broodmother === 2) {
+ } else if (slave.preg >= 37 && slave.broodmother === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Stewardess any longer`);
V.StewardessID = 0;
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
_printSlaveUnassignedNote(slave, "is mindbroken");
V.StewardessID = 0;
} else if (!canWalk(slave)) {
@@ -550,10 +552,10 @@ App.EndWeek.slaveAssignmentReport = function() {
if (!canTalk(slave)) {
_printSlaveUnassignedNote(slave, "can't give verbal instruction");
V.SchoolteacherID = 0;
- } else if (slave.preg > 37 && slave.broodmother === 2) {
+ } else if (slave.preg >= 37 && slave.broodmother === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Schoolteacher any longer`);
V.SchoolteacherID = 0;
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
_printSlaveUnassignedNote(slave, "is mindbroken");
V.SchoolteacherID = 0;
} else if (!canSee(slave)) {
@@ -574,7 +576,7 @@ App.EndWeek.slaveAssignmentReport = function() {
} else if (!canHold(slave)) {
_printSlaveUnassignedNote(slave, `can no longer handle ${getPronouns(slave).his} charges`);
V.WardenessID = 0;
- } else if (slave.preg > 37 && slave.broodmother === 2) {
+ } else if (slave.preg >= 37 && slave.broodmother === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Wardeness any longer`);
V.WardenessID = 0;
} else if (!canSee(slave)) {
@@ -589,10 +591,10 @@ App.EndWeek.slaveAssignmentReport = function() {
}
break;
case Job.ATTENDANT:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
_printSlaveUnassignedNote(slave, "is mindbroken");
V.AttendantID = 0;
- } else if (slave.preg > 37 && slave.broodmother === 2) {
+ } else if (slave.preg >= 37 && slave.broodmother === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Attendant any longer`);
V.AttendantID = 0;
} else if (!canWalk(slave)) {
@@ -610,10 +612,10 @@ App.EndWeek.slaveAssignmentReport = function() {
}
break;
case Job.MATRON:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
_printSlaveUnassignedNote(slave, "is mindbroken");
V.MatronID = 0;
- } else if (slave.preg > 37 && slave.broodmother === 2) {
+ } else if (slave.preg >= 37 && slave.broodmother === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Matron any longer`);
V.MatronID = 0;
} else if (!canWalk(slave)) {
@@ -634,10 +636,10 @@ App.EndWeek.slaveAssignmentReport = function() {
}
break;
case Job.NURSE:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
_printSlaveUnassignedNote(slave, "is mindbroken");
V.NurseID = 0;
- } else if (slave.preg > 37 && slave.broodmother === 2) {
+ } else if (slave.preg >= 37 && slave.broodmother === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Nurse any longer`);
V.NurseID = 0;
} else if (!canWalk(slave)) {
@@ -658,7 +660,7 @@ App.EndWeek.slaveAssignmentReport = function() {
}
break;
case Job.BODYGUARD:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
_printSlaveUnassignedNote(slave, "is mindbroken");
V.BodyguardID = 0;
} else if (!canWalk(slave)) {
@@ -667,7 +669,7 @@ App.EndWeek.slaveAssignmentReport = function() {
} else if (!canHold(slave)) {
_printSlaveUnassignedNote(slave, "is no longer able to hold a weapon");
V.BodyguardID = 0;
- } else if (slave.preg > 37 && slave.broodmother === 2) {
+ } else if (slave.preg >= 37 && slave.broodmother === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your bodyguard any longer`);
V.BodyguardID = 0;
} else if (!canSee(slave)) {
@@ -733,15 +735,33 @@ App.EndWeek.slaveAssignmentReport = function() {
}
}
- if (V.pit && V.pit.fighterIDs.includes(slave.ID)) {
- if (!canWalk(slave)) {
- _printSlaveUnassignedNote(slave, "is no longer independently mobile",
- `and cannot fight any more. ${getPronouns(slave).He} has been removed from ${App.Entity.facilities.pit.name} roster`);
- removeJob(slave, Job.PIT, true);
- } else if (!canHold(slave)) {
- _printSlaveUnassignedNote(slave, "is no longer able to strike",
- `and cannot fight any more. ${getPronouns(slave).he} has been removed from ${App.Entity.facilities.pit.name} roster`);
- removeJob(slave, Job.PIT, true);
+ if (V.pit) {
+ const trainee = App.Entity.facilities.pit.job("trainee").isEmployed(slave);
+ const fighter = App.Entity.facilities.pit.job("fighter").isEmployed(slave);
+ if (trainee || fighter) {
+ if (!canWalk(slave)) {
+ _printSlaveUnassignedNote(slave, "is no longer independently mobile",
+ `and cannot fight any more. ${getPronouns(slave).He} has been removed from ${App.Entity.facilities.pit.name} roster`);
+ removeJob(slave, Job.ARENA, true);
+ removeJob(slave, Job.PIT, true);
+ } else if (!canHold(slave)) {
+ _printSlaveUnassignedNote(slave, "is no longer able to strike",
+ `and cannot fight any more. ${getPronouns(slave).he} has been removed from ${App.Entity.facilities.pit.name} roster`);
+ removeJob(slave, Job.ARENA, true);
+ removeJob(slave, Job.PIT, true);
+ }
+ }
+ if (trainee) {
+ if (slave.skill.combat >= 100) {
+ _printSlaveUnassignedNote(slave, "has nothing left to learn",
+ `and has been removed from ${App.Entity.facilities.pit.name}`);
+ removeJob(slave, Job.ARENA, true);
+ }
+ if ([Job.AGENT, Job.AGENTPARTNER].includes(slave.assignment)) {
+ _printSlaveUnassignedNote(slave, "is now outside of your arcology",
+ `and cannot train combat any more`);
+ removeJob(slave, Job.ARENA, true);
+ }
}
}
}
@@ -776,7 +796,6 @@ App.EndWeek.slaveAssignmentReport = function() {
const warningLine = App.UI.DOM.appendNewElement("div", res);
App.UI.DOM.appendNewElement("span", warningLine, slave.slaveName, 'slave-name');
warningLine.appendChild(document.createTextNode(' ' + condition + ' '));
- App.UI.DOM.appendNewElement("span", warningLine, outcome ? outcome : `and ${cantServeNotes.get(assignment || slave.assignment)}`, "yellow");
- warningLine.appendChild(document.createTextNode("."));
+ App.UI.DOM.appendNewElement("span", warningLine, outcome ? outcome + "." : `and ${cantServeNotes.get(assignment || slave.assignment)}.`, "yellow");
}
};
diff --git a/src/endWeek/standardSlaveReport.js b/src/endWeek/standardSlaveReport.js
index 5de0aa6debf72c9e549b7faebe5db282e841eada..9255d2e6fef5f57e034e7b99f7aef5fbfc9a55b2 100644
--- a/src/endWeek/standardSlaveReport.js
+++ b/src/endWeek/standardSlaveReport.js
@@ -1,5 +1,5 @@
/**
- * Generates (and returns if not silent) a standard slave report
+ * Generates (and returns if not silent) a standard slave report.
* This is the part after the slave's job in most facilities.
* @param {FC.ReportSlave} slave
* @param {boolean} silent
@@ -9,9 +9,13 @@ App.SlaveAssignment.standardSlaveReport = function(slave, silent = false) {
const clothes = App.SlaveAssignment.choosesOwnClothes(slave);
const individualReport = App.SlaveAssignment.individualSlaveReport(slave);
const devotion = App.SlaveAssignment.devotion(slave);
+ const partTime = App.SlaveAssignment.PartTime.saPartTime(slave);
if (!silent) {
const container = document.createDocumentFragment();
+ if (partTime.length > 0) {
+ App.Events.addNode(container, partTime, "div", "indent");
+ }
App.Events.addNode(container, [clothes, ...individualReport], "div", "indent");
App.Events.addNode(container, [devotion], "div", "indent");
return container;
@@ -41,19 +45,39 @@ App.SlaveAssignment.individualSlaveReport = function(slave) {
* @param {App.Entity.SlaveState} slave
*/
App.SlaveAssignment.appendSlaveArt = function(node, slave) {
- if (V.seeImages && V.seeReportImages) {
- App.UI.DOM.appendNewElement("div", node, App.EndWeek.saVars.slaveArt.render(slave), ["imageRef", "tinyImg"]);
+ if (V.seeImages && V.seeReportImages && (!V.seeCustomImagesOnly || (V.seeCustomImagesOnly && slave.custom.image))) {
+ App.UI.DOM.appendNewElement("div", node, App.EndWeek.saVars.slaveArt.render(slave), ["imageRef", "tinyImg", "margin-right"]);
}
};
/**
- * Render favorite and reminder links
- * @param {ParentNode} node
+ * Render slave name (with popup link) and favorite and reminder links
* @param {App.Entity.SlaveState} slave
*/
-App.SlaveAssignment.appendSlaveLinks = function(node, slave) {
- node.append(
+App.SlaveAssignment.saSlaveName = function(slave) {
+ const frag = new DocumentFragment();
+ const popup = App.UI.DOM.slaveDescriptionDialog(slave, SlaveFullName(slave));
+ popup.classList.add("slave-name", "bold");
+ frag.append(
App.UI.favoriteToggle(slave), " ",
- App.Reminders.slaveLink(slave.ID), " "
+ App.Reminders.slaveLink(slave.ID), " ",
+ popup, " "
);
+ return frag;
+};
+
+/**
+ * Render linkified slave name with job assignment statement.
+ * @param {App.Entity.SlaveState} slave
+ * @param {string} def - this statement will be used if the slave ISN'T choosing her own job. Generally, something like "is <verb>ing in <facility>." Note that penthouse jobs do not have a default job statement, instead leading directly into the job text if the slave is not choosing her own job.
+ */
+App.SlaveAssignment.saSlaveIntro = function(slave, def) {
+ const frag = this.saSlaveName(slave);
+ const choice = App.EndWeek.saVars.choosesOwnAssignmentText[slave.ID];
+ if (slave.choosesOwnAssignment && choice) {
+ $(frag).append(choice);
+ } else {
+ $(frag).append(def);
+ }
+ return frag;
};
diff --git a/src/events/Elites/pInsemination.js b/src/events/Elites/pInsemination.js
index 115726754551c88cdf474f51e0b52d9bfa904b26..bfaa4eb1a8d1336c0c86a264f779476ff1997f8c 100644
--- a/src/events/Elites/pInsemination.js
+++ b/src/events/Elites/pInsemination.js
@@ -122,7 +122,7 @@ App.Events.PInsemination = class PInsemination extends App.Events.BaseEvent {
}
r.push(`as she thrusts up into you, driving you wild with lust. It doesn't take long for you to start bucking with orgasm and wrapping your arms around her gravid middle. Her occupants send several kicks your way as she quickens her pace, grabs your hips, and thrusts hard, cumming deep in your pussy. Panting, you slide off her and snuggle up beside her as you catch your breath. "You're looking good after having a child, you know? But obviously you looked even better heavy with my child. I'm keeping those pictures of you close!" she says with a giggle as you rise. With a gentle pat on your bottom, she sends you on your way.`);
} else {
- r.push(`You arrive once more at the apartment of the heavily pregnant futa, though this time she takes a while to reach the door by the sound of it. When it opens, you are greeted by her usual smile and an octuplets stuffed belly. She grabs your hand and pulls it to her taut middle. "Feel them kick! There's so many of them, it feels amazing!" You wrap your arms around your heavy lover for the evening and help her back to her bed, savoring the weight of her pregnancy. She stops you once she takes a seat and asks "My offer still stands, cutie. I assure you it feels amazing to be so full of babies." You shake your head "no"; being that pregnant would definitely impede your ability to run the arcology and even enjoy your slaves properly. She lies back, before shifting her weight to her side out of discomfort. Her belly is really big, and hangs low enough that reaching her needy cock is quite the challenge; you take a moment to think of a good position to receive her. You take her dick, and gently sliding yourself between her legs, fit it into your pussy. The two of you buck against each other as best you can; a struggle, seeing as you are bearing the weight of her children right now. You have no choice but to wrap your arms around the eagerly kicking mass${(V.PC.dick !== 0) ? ", trapping your dick between it and yourself," : ""} as you near your climax. You feel your nethers clamp down as she cums, hard, deep into your pussy. Her children shift under your arms as her water breaks onto you. You quickly untangle yourself and help her to her feet; you can't help but enjoy the feeling of her close contractions under your hand. She points you to her bathroom; "Water birth," she pants, struggling to not give birth where she stands. The tub is already prepared for her, so you help her into it. She refuses to let go of your hand, pleading "Join me?" You take her up on the offer and slide in behind her. You massage her taxed stomach as she struggles to bring her children into the world. A loud moan escapes her lips as the first of her children slips from her pussy and into your waiting hands. Setting her aside, you prepare for the next. After several hours, and a mutual shower, you and her recover together with her eight children; as thanks, you have one milky nipple all to yourself. When it's time to leave, she blows you a kiss and thanks you sincerely for helping her through this.`);
+ r.push(`You arrive once more at the apartment of the heavily pregnant futa, though this time she takes a while to reach the door by the sound of it. When it opens, you are greeted by her usual smile and an octuplets-stuffed belly. She grabs your hand and pulls it to her taut middle. "Feel them kick! There's so many of them, it feels amazing!" You wrap your arms around your heavy lover for the evening and help her back to her bed, savoring the weight of her pregnancy. She stops you once she takes a seat and asks "My offer still stands, cutie. I assure you it feels amazing to be so full of babies." You shake your head "no"; being that pregnant would definitely impede your ability to run the arcology and even enjoy your slaves properly. She lies back, before shifting her weight to her side out of discomfort. Her belly is really big, and hangs low enough that reaching her needy cock is quite the challenge; you take a moment to think of a good position to receive her. You take her dick, and gently sliding yourself between her legs, fit it into your pussy. The two of you buck against each other as best you can; a struggle, seeing as you are bearing the weight of her children right now. You have no choice but to wrap your arms around the eagerly kicking mass${(V.PC.dick !== 0) ? ", trapping your dick between it and yourself," : ""} as you near your climax. You feel your nethers clamp down as she cums, hard, deep into your pussy. Her children shift under your arms as her water breaks onto you. You quickly untangle yourself and help her to her feet; you can't help but enjoy the feeling of her close contractions under your hand. She points you to her bathroom; "Water birth," she pants, struggling to not give birth where she stands. The tub is already prepared for her, so you help her into it. She refuses to let go of your hand, pleading "Join me?" You take her up on the offer and slide in behind her. You massage her taxed stomach as she struggles to bring her children into the world. A loud moan escapes her lips as the first of her children slips from her pussy and into your waiting hands. Setting her aside, you prepare for the next. After several hours, and a mutual shower, you and her recover together with her eight children; as thanks, you have one milky nipple all to yourself. When it's time to leave, she blows you a kiss and thanks you sincerely for helping her through this.`);
}
V.PC.counter.preggo++;
}
diff --git a/src/events/JE/jeSlaveDisputeBreedingDeal.js b/src/events/JE/jeSlaveDisputeBreedingDeal.js
index c59d2d39e0203472f848a4150bd3769f686418da..7f630e7ac23b5760a1f74751e312b16323a21995 100644
--- a/src/events/JE/jeSlaveDisputeBreedingDeal.js
+++ b/src/events/JE/jeSlaveDisputeBreedingDeal.js
@@ -32,6 +32,7 @@ App.Events.JESlaveDisputeBreedingDeal = class JESlaveDisputeBreedingDeal extends
slave.bellySag = 10;
slave.bellySagPreg = 10;
slave.counter.birthsTotal = 3;
+ slave.pregWeek = -3;
slave.hips = 2;
slave.boobs = random(4, 6) * 100;
if (V.seePreg === 1) {
@@ -40,12 +41,11 @@ App.Events.JESlaveDisputeBreedingDeal = class JESlaveDisputeBreedingDeal extends
const {he, his, girl} = getPronouns(slave);
App.Events.drawEventArt(node, slave);
+ slave.belly = 0; // remove the dummy belly after art is drawn
App.UI.DOM.appendNewElement("p", node, App.Events.jeCommon());
r.push(`A small-time slave breeder is accusing a customer of reneging on their agreement. For the last nine months, one of his best breeders has been busy growing his client's future slave and now`);
if (V.seePreg === 1) {
r.push(`that ${he}'s ready to give birth,`);
- slave.belly = 0;
- slave.pregWeek = -3;
} else {
r.push(`that it's born,`);
}
@@ -87,7 +87,7 @@ App.Events.JESlaveDisputeBreedingDeal = class JESlaveDisputeBreedingDeal extends
let r = [];
r.push(`You settle the dispute in favor of the slave breeder, and against the prominent accuser, by declaring that the standard paternity test will suffice.`);
if (V.seePreg === 1) {
- r.push(`As if on queue, the ${girl}'s water breaks and soaks ${his} pants. The call ends to the sight of ${his} crotch bulging as ${his} child is born into ${his} clothing.`);
+ r.push(`As if on cue, the ${girl}'s water breaks and soaks ${his} pants. The call ends to the sight of ${his} crotch bulging as ${his} child is born into ${his} clothing.`);
}
r.push(`While he is satisfied with his future slave, he speaks <span class="red">openly</span> in public about how you were so quick to use cheap services to settle the claim instead of listening to his requests. The breeder, however, passes a <span class="green">good word</span> around the industry that slavers trading with your arcology can expect to be protected from abusive claims.`);
V.arcologies[0].prosperity += 5;
@@ -99,7 +99,7 @@ App.Events.JESlaveDisputeBreedingDeal = class JESlaveDisputeBreedingDeal extends
const frag = new DocumentFragment();
let r = [];
cashX(forceNeg(contractCost), "slaveTransfer");
- r.push(`You offer to buy out the deal, paying the breeder and taking the slave yourself, and passing the child off to the buyer. The citizen gets what he wants and speaks <span class="green">kindly</span> in public about how you helped smooth over a rather rough dispute. The breeder sends a <span class="green">positive note</span> around the industry to the effect that slavers trading with your arcology can expect to be aided in times of need; though the loss of a star mother always stings.`);
+ r.push(`You offer to buy out the deal, paying the breeder and taking the slave yourself, and passing the child off to the buyer. The citizen gets what he wants and speaks <span class="green">kindly</span> in public about how you helped smooth over a rather rough dispute. The breeder sends a <span class="green">positive note</span> around the industry to the effect that slavers trading with your arcology can expect to be aided in times of need, though the loss of a star mother always stings.`);
V.arcologies[0].prosperity += 3;
repX(300, "event");
App.Events.addParagraph(frag, r);
diff --git a/src/events/PE/UnderageConcubine.js b/src/events/PE/UnderageConcubine.js
index d961c38950f6eccb7b0b1c8ce8ffe08626ce4220..1053fecebeb80f4cfdce3958e8ae2eca0fe4ba30 100644
--- a/src/events/PE/UnderageConcubine.js
+++ b/src/events/PE/UnderageConcubine.js
@@ -12,7 +12,7 @@ App.Events.PEUnderageConcubine = class PEUnderageConcubine extends App.Events.Ba
actorPrerequisites() {
return [ [ // one actor, must be able-bodied, devoted, hearing/speaking, underaged concubine; eyes not necessary
(s) => s.ID === V.ConcubineID,
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
(s) => s.actualAge < 18, // it's in the name of the event
(s) => s.visualAge < 18, // so they must also look it
(s) => s.actualAge > 6, // event text assumes fluent speech, inductive reasoning, etc
diff --git a/src/events/PE/concubineInterview.js b/src/events/PE/concubineInterview.js
index 8ef819176efc6e13edddc1631f785e7189e44ad3..7e74cf7380f8d2f16762666667f519c7b80336c7 100644
--- a/src/events/PE/concubineInterview.js
+++ b/src/events/PE/concubineInterview.js
@@ -192,7 +192,7 @@ App.Events.PEConcubineInterview = class PEConcubineInterview extends App.Events.
t.push(speak(`"That's for me and my ${Master} only," ${he} teases, sticking out ${his} tongue.`));
}
}
- if (eventSlave.broodmother === 2 && eventSlave.preg > 37) {
+ if (eventSlave.broodmother === 2 && eventSlave.preg >= 36) {
t.push(`${He} grunts and struggles to ${hasBothLegs(eventSlave) ? `spread ${his} legs` : `get into position`}. ${speak(`"I'm sorry, another one is coming out right now..."`)} ${he} ${say}s, turning red. The host, at a loss for words, can only watch as`);
if (App.Data.clothes.get(eventSlave.clothes).exposure >= 4) {
t.push(`a child is born into the world, live on screen.`);
@@ -342,7 +342,7 @@ App.Events.PEConcubineInterview = class PEConcubineInterview extends App.Events.
t.push(`The host, taken off guard, laughs in surprise and says he envies you that. He asks a follow up question that hints at ${his} sexual preferences without coming straight out and asking how ${he} likes it.`);
if (eventSlave.intelligence + eventSlave.intelligenceImplant + eventSlave.skill.entertainment > 130 && !eventSlave.tankBaby) {
t.push(`${He} has enough knowledge of the old world to be able to answer without going too far, and <span class="green">subtly alludes</span> to how much ${he} enjoys`);
- if (eventSlave.fetish === "submissive") {
+ if (eventSlave.fetish === Fetish.SUBMISSIVE) {
t.push(`submitting to you in bed.`);
} else if (eventSlave.fetish === "cumslut") {
if (!PC.dick) {
@@ -379,7 +379,7 @@ App.Events.PEConcubineInterview = class PEConcubineInterview extends App.Events.
rep(500);
} else {
t.push(`${His} answer betrays how ${eventSlave.tankBaby ? `little ${he} knows` : `much ${he}'s forgotten`} about the old world: ${he} mildly shocks the studio audience by describing`);
- if (eventSlave.fetish === "submissive") {
+ if (eventSlave.fetish === Fetish.SUBMISSIVE) {
t.push(`how good it feels when you hold ${him} down and fuck ${him}`);
} else if (eventSlave.fetish === "cumslut") {
if (!PC.dick) {
diff --git a/src/events/PE/foodplay.js b/src/events/PE/foodplay.js
new file mode 100644
index 0000000000000000000000000000000000000000..fbd1d709c3c1db3f3c842a07ea868a6560ca09db
--- /dev/null
+++ b/src/events/PE/foodplay.js
@@ -0,0 +1,290 @@
+App.Events.PEFoodplay = class PEFoodplay extends App.Events.BaseEvent {
+ eventPrerequisites() {
+ return [
+ () => ((V.rep > 10000) || (V.debugMode > 0 && V.debugModeEventSelection > 0)),
+ () => ((V.HeadGirlID !== 0) || (V.ConcubineID !== 0) || (V.BodyguardID !==0))
+ ];
+ }
+
+ execute(node) {
+ let eventSlave = undefined;
+ App.Events.addParagraph(node, [`You are relaxing in the Penthouse after a day of hard work when your PA alerts you to an incoming shipment. One of the aristocrats in your arcology was able to get their hands on a shipment of fresh, wild-caught fish and has sent you a few prime cuts as a sign of goodwill. Such a delicacy is rare to come across, given the rapidly deteriorating global climate.`]);
+ App.Events.addParagraph(node, [`As the leader of a well-established and renowned arcology, it isn't uncommon for you to receive these gestures of friendship and goodwill on a semi-regular basis. Perhaps it wouldn't be such a bad idea to enjoy this latest gift with one of your slaves.`]);
+
+ App.Events.addResponses(node, [
+ (V.HeadGirlID !== 0)
+ ? new App.Events.Result(`Accept the gift and invite your Head Girl to join you `, () => scene(S.HeadGirl))
+ : new App.Events.Result(),
+ (V.ConcubineID !== 0)
+ ? new App.Events.Result(`Accept the gift and share it with your Concubine`, () => scene(S.Concubine))
+ : new App.Events.Result(),
+ (V.BodyguardID !== 0)
+ ? new App.Events.Result(`Accept the gift, and have your Bodyguard join you`, () => scene(S.Bodyguard))
+ : new App.Events.Result(),
+ new App.Events.Result(`Decline the gift`, decline)
+ ]);
+
+ function decline() {
+ const r = new SpacedTextAccumulator();
+ r.push(`You politely decline the shipment of seafood. You receive plenty of gifts, and can't spend time entertaining each individual that wishes to gain your favor.`);
+ return r.container();
+ }
+
+ function scene(slave){
+ const r = new SpacedTextAccumulator();
+ eventSlave = slave;
+ const {
+ He, he, his, him
+ } = getPronouns(eventSlave);
+ const {title: Master} = getEnunciation(eventSlave);
+
+ App.Events.drawEventArt(node, eventSlave, "no clothing");
+
+ r.push(`You summon`);
+ r.push(contextualIntro(V.PC, eventSlave, true));
+ r.push(`to your office and order ${him} to lie down on your desk.`);
+ if (hasAnyLegs(eventSlave)){
+ if (eventSlave.devotion > 50){
+ r.push(`${He} complies with a smile, excited to see what you have in store for ${him}.`);
+ } else if (eventSlave.devotion > 20){
+ r.push(`${He} complies with a smile, curious to see what you have in store for ${him}.`);
+ } else if (eventSlave.trust < 20 && eventSlave.devotion > -20){
+ r.push(`${He} nervously complies, curious to see what you have in store for ${him}.`);
+ } else if (eventSlave.trust < -50) {
+ r.push(`Terrified of what you have in store for ${him}, ${he} nervously complies, dreading what you have in store for ${him}.`);
+ } else {
+ r.push(`${He} nervously complies, and lays down on the desk.`);
+ }
+ } else {
+ r.push(`${He} is laid onto your desk with the help of other slaves.`);
+ }
+
+ r.push(`After ${he} is situated, you go over to ${him} and being to peel off ${his} clothing, ${(eventSlave.trust > 20) ? `to which ${he} gives you a soft smile.` : `the slave shivering against your touch.`}`);
+ r.push(`You take a seat at your desk, resuming your work while enjoying the sight of ${eventSlave.slaveName}'s naked body.`);
+ r.push(`Another slave brings a pair of chopsticks and several pieces of sushi, prepared from the seafood that was just delivered. She begins placing them along ${eventSlave.slaveName}'s`);
+ if (eventSlave.weight > 190) {
+ r.push(`immense`);
+ } else if (eventSlave.weight > 160) {
+ r.push(`massive`);
+ } else if (eventSlave.weight > 130) {
+ r.push(`huge`);
+ } else if (eventSlave.weight > 95) {
+ r.push(`thick`);
+ } else if (eventSlave.weight > 10) {
+ r.push(`ample`);
+ } else if (eventSlave.weight >= -10) {
+ r.push(`trim`);
+ }
+ r.push(`body. ${He} shivers as the cold food comes into contact with ${his} skin`);
+ if (eventSlave.devotion < -20){
+ r.push(`and wriggles on the desk, nearly causing the carefully placed food to fall off of ${him}.`);
+ } else {
+ r.push(`but diligently remains still so as to make sure none of the precious delicacy falls off ${his} body.`);
+ }
+
+ r.toParagraph();
+
+ r.push(`Two pieces are laid onto ${his}`);
+ if (eventSlave.boobs > 40000) {
+ r.push(`gargantuan`);
+ } else if (eventSlave.boobs > 25000) {
+ r.push(`immense`);
+ } else if (eventSlave.boobs > 10000) {
+ r.push(`ridiculous`);
+ } else if (eventSlave.boobs > 5000) {
+ r.push(`enormous`);
+ } else if (eventSlave.boobs > 3200) {
+ r.push(`giant`);
+ } else if (eventSlave.boobs > 1600) {
+ r.push(`huge`);
+ } else if (eventSlave.boobs > 800) {
+ r.push(`big`);
+ } else if (eventSlave.boobs > 300) {
+ r.push(`modest`);
+ } else {
+ r.push(`flat`);
+ }
+ if (eventSlave.boobs > 300) {
+ r.push(`tits`);
+ } else {
+ r.push(`chest`);
+ }
+
+ if (eventSlave.areolae > 2){
+ r.push(`, barely covering ${his} huge areolas`);
+ }
+
+ r.push(`and ${eventSlave.nipples} nipples.`);
+
+ if (eventSlave.boobs > 1600){
+ r.push(`The size of ${his} breasts makes it appear as if the delicate piece of food is about to swallowed by an ocean of undulating flesh.`);
+ }
+
+ r.push(`Four pieces of the sliced seafood are laid out on ${his}`);
+
+ if (eventSlave.belly >= 750000) {
+ if (eventSlave.bellyPreg > 0) {
+ r.push(`grotesquely pregnant`);
+ } else {
+ r.push(`grotesquely inflated`);
+ }
+ } else if (eventSlave.belly >= 600000) {
+ if (eventSlave.bellyPreg > 0) {
+ r.push(`dangerously pregnant`);
+ } else {
+ r.push(`dangerously distended`);
+ }
+ } else if (eventSlave.belly >= 450000) {
+ if (eventSlave.bellyPreg > 0) {
+ r.push(`immensely pregnant`);
+ } else {
+ r.push(`immensely distended`);
+ }
+ } else if (eventSlave.belly >= 150000) {
+ if (eventSlave.bellyPreg > 0) {
+ r.push(`massively pregnant`);
+ } else {
+ r.push(`massively distended`);
+ }
+ } else if (eventSlave.belly >= 120000) {
+ if (eventSlave.bellyPreg > 0) {
+ r.push(`enormously pregnant`);
+ } else {
+ r.push(`greatly gravid`);
+ }
+ } else if (eventSlave.belly >= 10000) {
+ if (eventSlave.bellyPreg > 3000) {
+ r.push(`heavily pregnant`);
+ } else if (eventSlave.bellyImplant > 3000) {
+ r.push(`very gravid`);
+ } else {
+ r.push(`taut`);
+ }
+ } else if (eventSlave.belly >= 5000) {
+ if (eventSlave.bellyPreg > 3000) {
+ r.push(`very pregnant`);
+ } else if (eventSlave.bellyImplant > 3000) {
+ r.push(`gravid`);
+ } else {
+ r.push(`distended`);
+ }
+ } else if (eventSlave.belly >= 1500) {
+ if (eventSlave.bellyPreg > 0) {
+ r.push(`slightly pregnant`);
+ } else if (eventSlave.bellyImplant > 0) {
+ r.push(`slightly distended`);
+ } else {
+ r.push(`bloated`);
+ }
+ }
+
+ r.push(`belly, with one over ${his} navel, hiding it from sight.`);
+ r.push(`Your eyes trace over the`);
+
+ if (eventSlave.weight > 10){
+ r.push(`curves of ${his} soft`);
+ } else if (eventSlave.muscles > 6){
+ r.push(`lines of ${his} toned`);
+ } else {
+ r.push(`line of ${his} flat`);
+ }
+
+ r.push(`midriff, and down towards ${his}`);
+
+ if (eventSlave.vagina !== -1){
+ r.push(`pussy`);
+ } else if (eventSlave.dick !== 0){
+ r.push('cock');
+ } else {
+ r.push(`groin`);
+ }
+
+ r.push(`as a final piece of fish is placed right above it.`);
+
+ r.toParagraph();
+
+ r.push(`As you resume your work, you begin plucking pieces of the prepared fish off of the slave's vulnerable body, savoring the freshness and mouth-watering flavor of this rare food. Starting at ${his}`);
+
+ if (eventSlave.boobs > 40000) {
+ r.push(`beanbag-sized`);
+ } else if (eventSlave.boobs > 25000) {
+ r.push(`torso-covering`);
+ } else if (eventSlave.boobs > 10000) {
+ r.push(`obscenely massive`);
+ } else if (eventSlave.boobs > 5000) {
+ r.push(`beachball-sized`);
+ } else if (eventSlave.boobs > 3200) {
+ r.push(`arm-filling`);
+ } else if (eventSlave.boobs > 1600) {
+ r.push(`head-sized`);
+ } else if (eventSlave.boobs > 800) {
+ r.push(`big`);
+ } else if (eventSlave.boobs > 300) {
+ r.push(`modest`);
+ }
+ if (eventSlave.boobs > 300) {
+ r.push(`tits`);
+ } else {
+ r.push(`chest`);
+ }
+
+ r.push(`you pluck at ${his} ${eventSlave.nipples} nipples, eliciting a moan as ${eventSlave.slaveName} helplessly squirms under your teasing. You calmly remind ${him} that such a delicacy is hard to come by, and warn ${him} against dropping any of the pieces. Otherwise, there will be consequences.`);
+
+ if (eventSlave.trust > 50){
+ r.push(`${eventSlave.slaveName} pokes ${his} tongue out at you playfully and shakes ${his} body, confident that any punishment you can bring forth will only mean more time that ${he} can spend in your presence.`);
+ } else {
+ r.push(`Fear flashes across the slave's face as they will their body to be still. ${eventSlave.slaveName} imagines the punishment that could possibly result from ruining ${his} ${Master}'s meal and shudders at the thought, causing the remaining pieces of sushi to precariously teeter atop ${his} body.`);
+ }
+
+ r.push(`You work your way down ${his} belly, and arrive at the final piece above ${his}`);
+
+ if (eventSlave.vagina !== -1){
+ r.push(`wet pussy.`);
+ } else if (eventSlave.dick !== 0){
+ r.push('throbbing cock.');
+ } else {
+ r.push(`groin.`);
+ }
+
+ r.push(`Eyeing the piece of food, as well as the last piece of sushi, you decide to play with it for a little.`);
+
+ if (eventSlave.piercing.genitals.weight > 0){
+ r.push(`You wrap your chopsticks around the glinting piercing at your slave's waist and give it a sharp tug, causing ${eventSlave.slaveName} to scream out in equal parts pain and pleasure.`);
+ } else if (eventSlave.vagina !== -1){
+ r.push(`You use the chopsticks to fondle with ${his} clit roughly, causing ${eventSlave.slaveName} to gasp out in surprise. Spreading ${him} open, you use your tongue to edge ${him} towards climax.`);
+ } else if (eventSlave.dick > 0){
+ r.push(`You use the chopsticks to grip with ${his} dick roughly, causing ${eventSlave.slaveName} to gasp out in surprise. Using the utensils to tease and stroke ${his}`);
+
+ if (eventSlave.dick > 4) {
+ r.push(`gigantic cock,`);
+ } else if (eventSlave.dick > 2) {
+ r.push(`impressive erection,`);
+ } else if (eventSlave.dick > 0) {
+ r.push(`little penis,`);
+ }
+
+ r.push(`you skillfully work ${him} towards climax, and he shoots ${his} seed in ropes across his body.`);
+ } else {
+ r.push(`You use the chopsticks to tease ${his} needy hole, causing ${eventSlave.slaveName} to gasp out in surprise. Spreading ${him} open, you use your tongue to edge ${him} towards climax.`);
+ }
+
+ r.toParagraph();
+
+ r.push(`Under your eager attention, ${eventSlave.slaveName} collapses in a moaning, writhing puddle on your desk. You clean your mouth with a handkerchief and tell ${him} to get back to ${his} assignment before calling in another slave to clean up the mess.`);
+
+ r.toParagraph();
+
+ if (eventSlave.trust > 20 || eventSlave.devotion > 20) {
+ r.push(`As ${he} goes about the rest of ${his} day, ${eventSlave.slaveName} recalls the events of the morning and smiles. ${He} <span class = "trust inc">enjoyed</span> the attention that you lavished on ${him}, and wonders if such an opportunity will ever arise again.`);
+ eventSlave.trust += 5;
+ } else {
+ r.push(`After being carried out and cleaned up, ${eventSlave.slaveName} avoids walking past your office for the remainder of the day, <span class = "trust dec">worried</span> that ${he} might catch your eye and be called to entertain you again.`);
+ eventSlave.trust -= 5;
+ }
+
+ r.toParagraph();
+
+ return r.container();
+ }
+ }
+};
diff --git a/src/events/PE/peCombatTraining.js b/src/events/PE/peCombatTraining.js
index b44bbe3f7c2e8cc3ee51fcfc2a54f0c61010e7c4..c8d2c07e1d90463d7e4262ffb77acb1d82294be2 100644
--- a/src/events/PE/peCombatTraining.js
+++ b/src/events/PE/peCombatTraining.js
@@ -35,7 +35,7 @@ App.Events.PECombatTraining = class PECombatTraining extends App.Events.BaseEven
function instruct() {
S.Bodyguard.trust += 4;
- S.Bodyguard.skill.combat = 1;
+ S.Bodyguard.skill.combat = 15 + Math.floor((S.Bodyguard.intelligence + S.Bodyguard.intelligenceImplant) / 32);
return `${S.Bodyguard.slaveName} starts as you enter the range and don ear protection. ${He} is distracted by your body against ${hers} as you come in close to correct ${his} stance, but ${he} concentrates hard for you. You take whatever time you can spare over the week for serious lessons. ${He} <span class="skill inc">is diligent and learns well,</span> and <span class="trust inc">places greater trust</span> in your judgment.`;
}
@@ -43,7 +43,7 @@ App.Events.PECombatTraining = class PECombatTraining extends App.Events.BaseEven
const frag = new DocumentFragment();
let r = [];
r.push(`Over the feed, you tell ${S.Bodyguard.slaveName} that ${he} can have ${his} choice of sexual release if ${he} scores well on the next set of targets. ${He} concentrates desperately, trying to ignore ${his} mounting arousal as ${he} imagines enjoying`);
- if (S.Bodyguard.fetish === "none") {
+ if (S.Bodyguard.fetish === Fetish.NONE) {
r.push(`passionate sexual`);
} else if (S.Bodyguard.fetish === "boobs") {
r.push(`breast`);
diff --git a/src/events/PE/peHeadgirlConcubine.js b/src/events/PE/peHeadgirlConcubine.js
index ddc13892f7c6637151d857e8b504b1bf2ca8e878..7083da4d2ab02b10da214ebc73b011e295c13f9d 100644
--- a/src/events/PE/peHeadgirlConcubine.js
+++ b/src/events/PE/peHeadgirlConcubine.js
@@ -7,7 +7,7 @@ App.Events.PEHeadgirlConcubine = class PEHeadgirlConcubine extends App.Events.Ba
() => canTalk(S.Concubine),
() => canSee(S.Concubine),
() => canHear(S.Concubine),
- () => S.Concubine.fetish !== "mindbroken",
+ () => S.Concubine.fetish !== Fetish.MINDBROKEN,
() => canHold(S.Concubine),
() => canWalk(S.Concubine),
];
diff --git a/src/events/PE/peLonelyBodyguard.js b/src/events/PE/peLonelyBodyguard.js
index f5d371dcdfdcb289b60e833d9c23f29872b39a88..ca1b9129adf4b2c6816d5125793458500bccb3da 100644
--- a/src/events/PE/peLonelyBodyguard.js
+++ b/src/events/PE/peLonelyBodyguard.js
@@ -4,7 +4,7 @@ App.Events.PELonelyBodyguard = class PELonelyBodyguard extends App.Events.BaseEv
() => !!S.Bodyguard,
() => S.Bodyguard.rules.relationship === "permissive",
() => S.Bodyguard.relationship === 0,
- () => S.Bodyguard.fetish !== "mindbroken",
+ () => S.Bodyguard.fetish !== Fetish.MINDBROKEN,
];
}
diff --git a/src/events/PE/pePitFight.js b/src/events/PE/pePitFight.js
index 456ccc7b30e1e63c448a811d4a06ca702a9334fd..c5e90dfd14bd18e9405a12896fb6a530d69932f0 100644
--- a/src/events/PE/pePitFight.js
+++ b/src/events/PE/pePitFight.js
@@ -18,7 +18,7 @@ App.Events.PEPitFight = class PEPitFight extends App.Events.BaseEvent {
he, him, his, himself
} = getPronouns(slave);
- const deadlinessValue = deadliness(slave);
+ const deadlinessValue = deadliness(slave).value;
App.Events.drawEventArt(node, slave, "no clothing");
@@ -33,7 +33,7 @@ App.Events.PEPitFight = class PEPitFight extends App.Events.BaseEvent {
r.push(`Across the ring, ${his} opponent's owner nods civilly to you and examines ${slave.slaveName}.`);
- if (slave.skill.combat > 0) {
+ if (slave.skill.combat > 30) {
r.push(`${His} combat skills greatly increase ${his} deadliness.`);
}
@@ -90,7 +90,7 @@ App.Events.PEPitFight = class PEPitFight extends App.Events.BaseEvent {
} else if (slave.health.tired > 60) {
r.push(`${He} is fatigued and will most likely never see it coming.`);
} else if (slave.health.tired > 30) {
- r.push(`${He} is tired and more likely to take a hit then to give one.`);
+ r.push(`${He} is tired and more likely to take a hit than to give one.`);
}
if (slave.pregKnown === 1 || slave.bellyPreg >= 1500) {
@@ -117,23 +117,23 @@ App.Events.PEPitFight = class PEPitFight extends App.Events.BaseEvent {
}
} else if (slave.bellyImplant >= 1500) {
if (slave.bellyImplant >= 750000) {
- r.push(`${His} monolithic, ${slave.bellyImplant}cc implant filled belly guarantees ${his} loss; not only is ${he} on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag ${him} to the ground. ${He} has no hope of attacking around the straining mass, let alone stopping ${his} opponent.`);
+ r.push(`${His} monolithic, ${slave.bellyImplant}cc implant-filled belly guarantees ${his} loss; not only is ${he} on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag ${him} to the ground. ${He} has no hope of attacking around the straining mass, let alone stopping ${his} opponent.`);
} else if (slave.bellyImplant >= 600000) {
- r.push(`${His} titanic, ${slave.bellyImplant}cc implant filled belly is practically a guaranteed loss; ${he} can barely stand let alone fight. Not only is it cripplingly heavy, unwieldy and an easy target, but ${he} can feel it straining to hold the sheer amount of filler forced into it.`);
+ r.push(`${His} titanic, ${slave.bellyImplant}cc implant-filled belly is practically a guaranteed loss; ${he} can barely stand let alone fight. Not only is it cripplingly heavy, unwieldy and an easy target, but ${he} can feel it straining to hold the sheer amount of filler forced into it.`);
} else if (slave.bellyImplant >= 450000) {
- r.push(`${His} gigantic, ${slave.bellyImplant}cc implant filled belly is nearly a guaranteed loss; it presents an unmissable, indefensible target for ${his} adversary.`);
+ r.push(`${His} gigantic, ${slave.bellyImplant}cc implant-filled belly is nearly a guaranteed loss; it presents an unmissable, indefensible target for ${his} adversary.`);
} else if (slave.bellyImplant >= 300000) {
- r.push(`${His} massive, ${slave.bellyImplant}cc implant filled belly is extremely heavy, unwieldy and an easy target, practically damning ${him} in combat.`);
+ r.push(`${His} massive, ${slave.bellyImplant}cc implant-filled belly is extremely heavy, unwieldy and an easy target, practically damning ${him} in combat.`);
} else if (slave.bellyImplant >= 150000) {
- r.push(`${His} giant, ${slave.bellyImplant}cc implant filled belly obstructs ${his} movement and greatly slows ${him} down.`);
+ r.push(`${His} giant, ${slave.bellyImplant}cc implant-filled belly obstructs ${his} movement and greatly slows ${him} down.`);
} else if (slave.bellyImplant >= 100000) {
- r.push(`${His} giant, ${slave.bellyImplant}cc implant filled belly is very heavy and unwieldy, throwing off ${his} weight and making ${him} far less effective.`);
+ r.push(`${His} giant, ${slave.bellyImplant}cc implant-filled belly is very heavy and unwieldy, throwing off ${his} weight and making ${him} far less effective.`);
} else if (slave.bellyImplant >= 10000) {
- r.push(`${His} huge, ${slave.bellyImplant}cc implant filled belly is very heavy and unwieldy, throwing off ${his} weight and making ${him} far less effective.`);
+ r.push(`${His} huge, ${slave.bellyImplant}cc implant-filled belly is very heavy and unwieldy, throwing off ${his} weight and making ${him} far less effective.`);
} else if (slave.bellyImplant >= 5000) {
- r.push(`${His} large, ${slave.bellyImplant}cc implant filled belly is heavy and unwieldy, rendering ${him} less effective.`);
+ r.push(`${His} large, ${slave.bellyImplant}cc implant-filled belly is heavy and unwieldy, rendering ${him} less effective.`);
} else if (slave.bellyImplant >= 1500) {
- r.push(`${His} swollen, ${slave.bellyImplant}cc implant filled belly is heavy and makes ${him} less effective.`);
+ r.push(`${His} swollen, ${slave.bellyImplant}cc implant-filled belly is heavy and makes ${him} less effective.`);
}
}
if (isInLabor(slave)) {
diff --git a/src/events/PESS/pessBodyguardBeatdown.js b/src/events/PESS/pessBodyguardBeatdown.js
index 3e01011da378bfaeb3873d00691a24dc1780fa87..e15003b65aff2191fb2e3548c86d62436cd3af45 100644
--- a/src/events/PESS/pessBodyguardBeatdown.js
+++ b/src/events/PESS/pessBodyguardBeatdown.js
@@ -43,10 +43,10 @@ App.Events.pessBodyguardBeatdown = class pessBodyguardBeatdown extends App.Event
choices.push(new App.Events.Result(`${He} de-escalates the situation with tact`, persuade));
}
- if (S.Bodyguard.skill.combat < 1) {
- choices.push(new App.Events.Result(null, null, `Your bodyguard lacks the combat skill required to fight him hand to hand.`));
- } else {
+ if (S.Bodyguard.skill.combat > 30) {
choices.push(new App.Events.Result(`${He} fights him hand to hand`, fight));
+ } else {
+ choices.push(new App.Events.Result(null, null, `Your bodyguard lacks the combat skill required to fight him hand to hand.`));
}
choices.push(new App.Events.Result(`${He} fires a few dozen warning shots`, warn));
diff --git a/src/events/PESS/pessBodyguardBedtime.js b/src/events/PESS/pessBodyguardBedtime.js
index 0b5b5a99baa6e9d4a4a6b5d7f744f32b77f500f7..d2e928df1d80105bcffde2778158d31c5a64c8fb 100644
--- a/src/events/PESS/pessBodyguardBedtime.js
+++ b/src/events/PESS/pessBodyguardBedtime.js
@@ -2,7 +2,7 @@ App.Events.pessBodyguardBedtime = class pessBodyguardBedtime extends App.Events.
eventPrerequisites() {
return [
() => !!S.Bodyguard,
- () => S.Bodyguard.skill.combat !== 0
+ () => S.Bodyguard.skill.combat > 30
];
}
diff --git a/src/events/PESS/pessDjPublicity.js b/src/events/PESS/pessDjPublicity.js
index f0cf2371af6eb05ae39cf8b860eb55c6e0a35d11..3fa4e464fc6507eed243d07873dddf957dad9d49 100644
--- a/src/events/PESS/pessDjPublicity.js
+++ b/src/events/PESS/pessDjPublicity.js
@@ -48,7 +48,7 @@ App.Events.pessDjPublicity = class pessDjPublicity extends App.Events.BaseEvent
}
r.push(`tall, giving the viewer a sultry look. ${He} only breaks down for a single moment, but it's quite a moment: ${he} cries rather inelegantly,`);
if (canTalk(S.DJ)) {
- const {say: say, title:Master} = getEnunciation(S.DJ);
+ const {say: say, title: Master} = getEnunciation(S.DJ);
r.push(
`${say}ing a sobbing`,
Spoken(S.DJ, `"I love you, ${Master}" into your ear`)
diff --git a/src/events/PETS/petsAggressiveSchoolteacher.js b/src/events/PETS/petsAggressiveSchoolteacher.js
index e0e45dd8cddebce9b21be3bffc3ba7a6a3ec2cad..7dcda2b4a5ebfc4a5ced167e7a98376b6f7d21ea 100644
--- a/src/events/PETS/petsAggressiveSchoolteacher.js
+++ b/src/events/PETS/petsAggressiveSchoolteacher.js
@@ -39,7 +39,7 @@ App.Events.petsAggressiveSchoolteacher = class petsAggressiveSchoolteacher exten
function encourage() {
App.Entity.facilities.schoolroom.employees().forEach(function(s) {
if (s.intelligenceImplant < 30) {
- s.intelligenceImplant += 0.1;
+ s.intelligenceImplant = Math.min(s.intelligenceImplant + 1, 30);
seX(s, "oral", S.Schoolteacher, S.Schoolteacher.dick > 0 ? "penetrative" : "vaginal");
}
});
@@ -57,8 +57,8 @@ App.Events.petsAggressiveSchoolteacher = class petsAggressiveSchoolteacher exten
}
r.push(`for you this time. After class is over, you tell ${him2} that since ${he2} can't have been paying particularly good attention, ${he2}'ll have to take <span class="green">remedial classes</span> after everyone else is done. ${S.Schoolteacher.slaveName} gives ${subSlave.slaveName} a very thorough grope at 'remedial classes,' making sure to pinch ${his} student's nipples.`);
seX(subSlave, "oral", S.Schoolteacher, "penetrative");
- if (subSlave.intelligenceImplant < 29.5) {
- subSlave.intelligenceImplant += 0.5;
+ if (subSlave.intelligenceImplant < 30) {
+ subSlave.intelligenceImplant = Math.min(subSlave.intelligenceImplant + 5, 30);
}
App.Events.addParagraph(frag, r);
return frag;
diff --git a/src/events/RE/REBusyArcade.js b/src/events/RE/REBusyArcade.js
index b6d3f1611268dc12d35307d69f571613dee20a51..f2ee8212c64bda6f489b67dc8ea72e47e921e5de 100644
--- a/src/events/RE/REBusyArcade.js
+++ b/src/events/RE/REBusyArcade.js
@@ -9,7 +9,7 @@ App.Events.REBusyArcade = class REBusyArcade extends App.Events.BaseEvent {
return [
[
s => s.assignment === Job.ARCADE,
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => canMove(s) || hasAnyLegs(s),
s => s.devotion < 45
]
diff --git a/src/events/RE/reAWOL.js b/src/events/RE/reAWOL.js
index a962091df7ba7a34e6eb5db225201f560b66f111..b4974b09ae2fd26be12df0172218befde16b964d 100644
--- a/src/events/RE/reAWOL.js
+++ b/src/events/RE/reAWOL.js
@@ -29,10 +29,11 @@ App.Events.REAWOL = class REAWOL extends App.Events.BaseEvent {
slave.anus = 0;
slave.skill.anal = 0;
slave.skill.whoring = 0;
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.behavioralFlaw = "arrogant";
slave.sexualFlaw = "crude";
- slave.hStyle = "shaved into a mohawk";
+ slave.hStyle = "strip";
+ slave.hLength = 5;
slave.custom.tattoo = "$He has a number of tattoos from a variety of mercenary companies.";
slave.clothes = "a military uniform";
diff --git a/src/events/RE/reAnalPunishment.js b/src/events/RE/reAnalPunishment.js
index 2e4050bb76fb6285e4c77de527b31d54c0fff4b3..64f552fec0cf85e08759aa26808b1fc9bbeea7c9 100644
--- a/src/events/RE/reAnalPunishment.js
+++ b/src/events/RE/reAnalPunishment.js
@@ -10,7 +10,7 @@ App.Events.REAnalPunishment = class REAnalPunishment extends App.Events.BaseEven
return [[
(s) => s.devotion <= 50,
(s) => s.anus !== 0,
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
canDoAnal,
canMove,
hasAnyArms,
diff --git a/src/events/RE/reArcologyInspection.js b/src/events/RE/reArcologyInspection.js
index 672c62c8bccb55bb30c2d03b90b42676d84ef51c..9439ab95fe34a2250d63f92b57b669a0d2fd732a 100644
--- a/src/events/RE/reArcologyInspection.js
+++ b/src/events/RE/reArcologyInspection.js
@@ -181,7 +181,7 @@ App.Events.REArcologyInspection = class REArcologyInspection extends App.Events.
// Threesome
const {his2, himself2} = getPronouns(agentLover).appendSuffix('2');
t.push(`${agent.slaveName} and ${agentLover.slaveName} start by undressing themselves and you, teasing you all the while.`);
- if (agent.fetish === "submissive") {
+ if (agent.fetish === Fetish.SUBMISSIVE) {
t.push(`Impatient, you show ${agent.slaveName} ${his} place by pushing ${him} back onto ${his} bed and mounting ${him}. You and ${agentLover.slaveName} take turns dominating the confirmed sub as ${he} screams in pleasure.`);
if (agent.vagina >= 0) {
t.push(VCheck.Vaginal(agent, 2));
@@ -320,7 +320,7 @@ App.Events.REArcologyInspection = class REArcologyInspection extends App.Events.
} else {
// Agent alone
t.push(`${agent.slaveName} starts by undressing ${himself} and you, teasing you all the while.`);
- if (agent.fetish === "submissive") {
+ if (agent.fetish === Fetish.SUBMISSIVE) {
t.push(`Impatient, you show ${him} ${his} place by pushing ${him} back onto ${his} bed and mounting ${him}. You know ${his} submissive tendencies and leverage them to your mutual pleasure.`);
if (agent.vagina >= 0) {
t.push(VCheck.Vaginal(agent, 3));
@@ -454,7 +454,7 @@ App.Events.REArcologyInspection = class REArcologyInspection extends App.Events.
function discipline() {
t = [];
- t.push(`Every arcology has its share of dissidents; it's one of the inevitable results of the semi-anarchic nature of the Free Cities. You have an opportunity to build your own <span class="reputation inc">reputation</span> and also help secure ${agent ? `${agent.slaveName}'s` : `your indirect`} <span class="darkviolet">authority</span> over ${arcology.name}, and it would be a shame to let it pass unheeded. You spend the rest of the day helping pass judgement, and even administer a few whippings and assfuckings yourself, just for good measure.`);
+ t.push(`Every arcology has its share of dissidents; it's one of the inevitable results of the semi-anarchic nature of the Free Cities. You have an opportunity to build your own <span class="reputation inc">reputation</span> and also help secure ${agent ? `${agent.slaveName}'s` : `your indirect`} ${V.secExpEnabled ? `<span class="darkviolet">authority</span>` : `authority`} over ${arcology.name}, and it would be a shame to let it pass unheeded. You spend the rest of the day helping pass judgement, and even administer a few whippings and assfuckings yourself, just for good measure.`);
repX(100, "event");
if (V.secExpEnabled) {
App.Mods.SecExp.authorityX(250);
diff --git a/src/events/RE/reBoomerang.js b/src/events/RE/reBoomerang.js
index bdda25df037bdf90b0b0c65101693f4ed751f578..146144bfc63526ac944131361edce9b678178f91 100644
--- a/src/events/RE/reBoomerang.js
+++ b/src/events/RE/reBoomerang.js
@@ -420,7 +420,7 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
r.push(Spoken(slave, `"I had to kill, um, girls. I, I can't. Couldn't. Not again."`));
slave.behavioralFlaw = "odd";
slave.sexualFlaw = "crude";
- slave.skill.combat = 1;
+ slave.skill.combat = Math.max(slave.skill.combat, 50);
break;
case "neoimperialist arcology":
r.push(Spoken(slave, `"It was horrible."`));
@@ -748,7 +748,7 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
break;
case "monster movie":
r.push(`You sold ${him} to a film studio to act as a double for a famous actress where ${he} was installed with a massive fake pregnancy for the ending.`);
- r.push(Spoken(slave, `"It's too big... Can't breath right... Was going to be sold... Since I was a disposable prop... I'd rather be your prop."`));
+ r.push(Spoken(slave, `"It's too big... Can't breathe right... Was going to be sold... Since I was a disposable prop... I'd rather be your prop."`));
r.push(`${He} returns to wheezing against the solid mass bulging from ${his} middle.`);
healthDamage(slave, random(60, 70));
if (V.seeHyperPreg !== 1) {
diff --git a/src/events/RE/reBusyMasterSuite.js b/src/events/RE/reBusyMasterSuite.js
index e8bbcef6f5e61c59a3ee229a1dab2d4eb6c2ef57..11f7ccc633a8ede9d721ec9fd0ea49a59003c951 100644
--- a/src/events/RE/reBusyMasterSuite.js
+++ b/src/events/RE/reBusyMasterSuite.js
@@ -275,7 +275,7 @@ App.Events.REBusyMasterSuite = class REBusyMasterSuite extends App.Events.BaseEv
if (bottomSlave.lips > 95) {
r.push(`facepussy`);
} else if (bottomSlave.lips > 70) {
- r.push(`dick sucking lips`);
+ r.push(`dick-sucking lips`);
} else if (bottomSlave.lips > 20) {
r.push(`pretty lips`);
} else {
diff --git a/src/events/RE/reCitizenHookup.js b/src/events/RE/reCitizenHookup.js
index 39e8a0b1379ad0c95dfe6d82801a67239bd7718f..53b73a42a9003800ac9b64c99c140feb3d86537b 100644
--- a/src/events/RE/reCitizenHookup.js
+++ b/src/events/RE/reCitizenHookup.js
@@ -9,9 +9,8 @@ App.Events.RECitizenHookup = class RECitizenHookup extends App.Events.BaseEvent
let r = [];
let repopHookupPregnant;
- const fsArray = App.Data.FutureSociety.fsNames.filter(f => V.arcologies[0][f] !== "unset");
- const FS = fsArray.random();
- const fsAdj = (fsArray.length > 0) ? App.Data.FutureSociety.records[FS].adj : "none";
+ const FSArray = FutureSocieties.activeFSes(V.arcologies[0]);
+ const FS = (FSArray.length > 0) ? FSArray.random() : "none";
r.push(`At night, the best living areas in the arcology offer a constant mélange of selective entertainments. There's a perpetual social scrum of who is to be invited to what going on, and you occupy a preeminent place atop it, mostly aloof from the struggles of your citizens for recognition and influence. You're invited to almost everything, since everyone who lives here knows the value of being in favor with the owner of the arcology. Invitations to your parties, of course, are some of the most valuable social currency in the arcology and one of ${V.assistant.name}'s most important duties is to help you manage them without wasting your valuable time. It's not actually necessary for you to attend your own parties, since almost everyone will be glad to be seen in the entertainment area of the penthouse whether or not the`);
r.push(`${V.PC.title === 1 ? 'proprietor' : 'proprietress'} is actually present.`);
@@ -26,18 +25,18 @@ App.Events.RECitizenHookup = class RECitizenHookup extends App.Events.BaseEvent
r.push(`alcohol`);
}
r.push(`and eating your food, though of course they helped pay for it through their rent. They're performing a complex dance of social dominance, and it all radiates around you, with complex unspoken rules of collective approval governing which citizens cycle past you for a word, and for how long. During a low point in the ebb and flow,`);
- switch (fsAdj) {
- case "Subjugationist":
- case "Supremacist":
+ switch (FS) {
+ case "FSSubjugationist":
+ case "FSSupremacist":
r.push(`a pretty, racially pure young woman`);
break;
- case "Gender Radicalist":
+ case "FSGenderRadicalist":
r.push(`a beautiful young futa`);
break;
- case "Gender Fundamentalist":
+ case "FSGenderFundamentalist":
r.push(`a good-looking young lady`);
break;
- case "Repopulationist":
+ case "FSRepopulationFocus":
if (V.arcologies[0].FSRepopulationFocusLaw === 1 && (random(1, 10) > 3)) {
repopHookupPregnant = 1;
r.push(`a heavily pregnant young lady`);
@@ -46,22 +45,22 @@ App.Events.RECitizenHookup = class RECitizenHookup extends App.Events.BaseEvent
r.push(`a pretty, fertile young woman with wide, child-bearing hips`);
}
break;
- case "Eugenics":
+ case "FSRestart":
r.push(`a stunningly gorgeous woman`);
break;
- case "Paternalist":
+ case "FSPaternalist":
r.push(`a pretty, cheerful young woman`);
break;
- case "Degradationist":
+ case "FSDegradationist":
r.push(`a confident girl`);
break;
- case "Body Purist":
+ case "FSBodyPurist":
r.push(`a clean-looking young woman`);
break;
- case "Transformation Fetishist":
+ case "FSTransformationFetishist":
r.push(`a nicely augmented girl`);
break;
- case "Youth Preferentialist":
+ case "FSYouthPreferentialist":
if (V.minimumSlaveAge < 13) {
r.push(`an adorable little loli`);
} else if (V.minimumSlaveAge < 18) {
@@ -70,83 +69,83 @@ App.Events.RECitizenHookup = class RECitizenHookup extends App.Events.BaseEvent
r.push(`a nice looking girl`);
}
break;
- case "Maturity Preferentialist":
+ case "FSMaturityPreferentialist":
r.push(`an attractive, mature woman`);
break;
- case "Slimness Enthusiast":
+ case "FSSlimnessEnthusiast":
r.push(`a slim young thing`);
break;
- case "Asset Expansionist":
+ case "FSAssetExpansionist":
r.push(`a curvaceous young woman`);
break;
- case "Pastoralist":
+ case "FSPastoralist":
r.push(`a hot little lady`);
break;
- case "Physical Idealist":
+ case "FSPhysicalIdealist":
r.push(`a hot little amazon`);
break;
- case "Hedonistic":
+ case "FSHedonisticDecadence":
r.push(`a plump little cutey`);
break;
- case "Chattel Religionist":
+ case "FSChattelReligionist":
r.push(`a pretty, devout-looking young woman`);
break;
- case "Roman Revivalist":
+ case "FSRomanRevivalist":
r.push(`a proper young Roman lady`);
break;
- case "Neo-Imperialism":
+ case "FSNeoImperialist":
r.push(`a gorgeous young Imperial Knight with flowing blonde hair and a scarred face`);
break;
- case "Aztec Revivalist":
+ case "FSAztecRevivalist":
r.push(`a natural Aztec beauty`);
break;
- case "Egyptian Revivalist":
+ case "FSEgyptianRevivalist":
r.push(`a pretty, sun-kissed lady`);
break;
- case "Edo Revivalist":
+ case "FSEdoRevivalist":
r.push(`a proper Edo lady`);
break;
- case "Arabian Revivalist":
+ case "FSArabianRevivalist":
r.push(`a pretty Arabian princess`);
break;
- case "Chinese Revivalist":
+ case "FSChineseRevivalist":
r.push(`a pretty Chinese lady`);
break;
- case "Intellectual Dependency":
+ case "FSIntellectualDependency":
r.push(`a cute party girl`);
break;
- case "Slave Professionalism":
+ case "FSSlaveProfessionalism":
r.push(`an elegant woman`);
break;
- case "Petite Admiration":
+ case "FSPetiteAdmiration":
r.push(`a delightfully short young lady`);
break;
- case "Statuesque Glorification":
+ case "FSStatuesqueGlorification":
r.push(`a towering figure`);
break;
default:
r.push(`a pretty young woman`);
}
r.push(`sidles up to you. She begins to introduce herself, but one of the advantages of your connection to the arcology is that you always know who everyone is, and you greet her by name, which people have never learned not to be impressed by. She gushes about some of your recent`);
- if (fsAdj !== "none") {
- r.push(fsAdj);
+ if (FS !== "none") {
+ r.push(FutureSocieties.displayAdj(FS));
}
r.push(`actions, displaying an unusual grasp of what you've been planning. Despite her sincere interest, she's obviously got something else on her mind.`);
App.Events.addParagraph(node, r);
r = [];
r.push(`She's yours for the taking, if you want her, and if her praise and proximity weren't enough to make that clear, she manages to`);
- switch (fsAdj) {
- case "Subjugationist":
- case "Supremacist":
+ switch (FS) {
+ case "FSSubjugationist":
+ case "FSSupremacist":
r.push(`give you an excellent view straight down her ethnically superior cleavage, straining against the top of her fashionable dress.`);
break;
- case "Gender Radicalist":
+ case "FSGenderRadicalist":
r.push(`simultaneously give you an excellent view straight down her cleavage, and bring the material of her sheer dress tight across her legs in a way that outlines her dick.`);
break;
- case "Gender Fundamentalist":
+ case "FSGenderFundamentalist":
r.push(`press her flirting as far she can decorously take it, batting her eyes at you coquettishly.`);
break;
- case "Repopulationist":
+ case "FSRepopulationFocus":
if (repopHookupPregnant === 1) {
r.push(`lean back just far enough that her full term, triplets rounded middle splits the front of her overly tight dress.`);
} else {
@@ -158,76 +157,76 @@ App.Events.RECitizenHookup = class RECitizenHookup extends App.Events.BaseEvent
}
}
break;
- case "Eugenics":
+ case "FSRestart":
r.push(`give you an excellent view straight down her perfect cleavage, straining against the top of her name-brand dress.`);
break;
- case "Paternalist":
+ case "FSPaternalist":
r.push(`brush her breasts against your arm, presuming on the egalitarian nature of your Paternalist society to flirt a little aggressively.`);
break;
- case "Degradationist":
+ case "FSDegradationist":
r.push(`raise one shoulder far enough that her breast on that side pulls its nipple just clear of her tight leather dress, revealing a spiked piercing.`);
break;
- case "Body Purist":
+ case "FSBodyPurist":
r.push(`arch her back with such warm propinquity that her natural breasts almost spill out of her tight little dress, and actually reveal the upper edges of their areolae.`);
break;
- case "Transformation Fetishist":
+ case "FSTransformationFetishist":
r.push(`pop her huge fake boobs entirely out of her tight little evening dress without even using her hands.`);
break;
- case "Youth Preferentialist":
+ case "FSYouthPreferentialist":
r.push(`perfectly balance her youthful, innocent appeal with the proper decorum between you and a citizen.`);
break;
- case "Maturity Preferentialist":
+ case "FSMaturityPreferentialist":
r.push(`perfectly balance her matronly, sensual appeal with the proper decorum between you and a citizen.`);
break;
- case "Slimness Enthusiast":
+ case "FSSlimnessEnthusiast":
r.push(`turn from side to side as she flirts with you in a way that shows off the coquettish forum under her tight dress to great effect.`);
break;
- case "Asset Expansionist":
+ case "FSAssetExpansionist":
r.push(`arch her back with such warm propinquity that her huge breasts spill out of her tight little dress, springing clear to offer themselves glorious and nude.`);
break;
- case "Pastoralist":
+ case "FSPastoralist":
r.push(`let you know that she's almost entirely milk-fed, while giving you quite an eyeful of her straining cleavage.`);
break;
- case "Physical Idealist":
+ case "FSPhysicalIdealist":
r.push(`get a pretty good flex going without being obvious about it, outlining her abs against the sheer midsection of her tight dress.`);
break;
- case "Hedonistic":
+ case "FSHedonisticDecadence":
r.push(`lean her chubby body back far enough to pop the buttons off her top and allow her ample breasts and armful of a belly to hang free.`);
break;
- case "Chattel Religionist":
+ case "FSChattelReligionist":
r.push(`assume just a hint of a Chattel Religionist devotional pose used to request penetration. It's heavy flirting, of a modern religious sort.`);
break;
- case "Roman Revivalist":
+ case "FSRomanRevivalist":
r.push(`hint that her pudicitia, that is her purity, would be if anything enhanced by sexual commerce with someone as powerful as you.`);
break;
- case "Neo-Imperialism":
+ case "FSNeoImperialist":
r.push(`hint that as a Knight under your banner, to serve you in *any* way would be among the greatest of honors.`);
break;
- case "Aztec Revivalist":
+ case "FSAztecRevivalist":
r.push(`hint that her devotion, which is the most important thing, cannot be besmirched by tasting your divine power.`);
break;
- case "Egyptian Revivalist":
+ case "FSEgyptianRevivalist":
r.push(`hint that she would like nothing better than to bask in the pharaonic light in the arcology, very close to its source, while loosening her linen dress a little.`);
break;
- case "Edo Revivalist":
+ case "FSEdoRevivalist":
r.push(`allude to the refined pleasures, while assuming a slightly less dignified posture in her gorgeous kimono.`);
break;
- case "Arabian Revivalist":
+ case "FSArabianRevivalist":
r.push(`reference young Scheherazade and mighty Shahryar in a way that suggests she's quite willing to play the former.`);
break;
- case "Chinese Revivalist":
+ case "FSChineseRevivalist":
r.push(`allude to the divinity that resides with the powerful, implying that she'd very much like to come closer to it.`);
break;
- case "Intellectual Dependency":
+ case "FSIntellectualDependency":
r.push(`hint that she forgot to put on panties and that she needs that dripping sound checked out.`);
break;
- case "Slave Professionalism":
+ case "FSSlaveProfessionalism":
r.push(`bring you fully erect with a single, masterful stroke of her fingers.`);
break;
- case "Petite Admiration":
+ case "FSPetiteAdmiration":
r.push(`give the bulge in your pants a quick kiss.`);
break;
- case "Statuesque Glorification":
+ case "FSStatuesqueGlorification":
r.push(`affectionately rest her breasts on your head.`);
break;
default:
@@ -240,7 +239,7 @@ App.Events.RECitizenHookup = class RECitizenHookup extends App.Events.BaseEvent
new App.Events.Result(`Keep aloof without offending her`, aloof),
new App.Events.Result(`To them that hath, it shall be given`, give)
];
- if (fsAdj !== "none") {
+ if (FS !== "none") {
choices.push(new App.Events.Result(`Emphasize her societal style with exhibitionism`, exhibitionism));
}
App.Events.addResponses(node, choices);
@@ -284,23 +283,23 @@ App.Events.RECitizenHookup = class RECitizenHookup extends App.Events.BaseEvent
r.push(`realize`);
}
r.push(`that ${his} presence might not be wanted.`);
- } else if (S.Concubine.fetish === "mindbroken") {
+ } else if (S.Concubine.fetish === Fetish.MINDBROKEN) {
r.push(`${S.Concubine.slaveName} is there, of course, completely indifferent to you or your guest's presence.`);
}
}
r.push(`Your guest restrains her eager praise now that you're in private, but her wide-eyed appreciation of your domain is compliment enough. Once in your suite, she strips, revealing`);
- switch (fsAdj) {
- case "Subjugationist":
- case "Supremacist":
+ switch (FS) {
+ case "FSSubjugationist":
+ case "FSSupremacist":
r.push(`her fresh, pure body.`);
break;
- case "Gender Radicalist":
+ case "FSGenderRadicalist":
r.push(`perky young breasts, a pretty pussy, and a stiff dick above it.`);
break;
- case "Gender Fundamentalist":
+ case "FSGenderFundamentalist":
r.push(`perky young breasts and an elegantly coiffed strip of hair that perfectly highlights her demure pussy.`);
break;
- case "Repopulationist":
+ case "FSRepopulationFocus":
if (repopHookupPregnant === 1) {
if (random(1, 10) > 7) {
r.push(`an experienced body, comfortable with the burdens of pregnancy.`);
@@ -316,76 +315,76 @@ App.Events.RECitizenHookup = class RECitizenHookup extends App.Events.BaseEvent
}
}
break;
- case "Eugenics":
+ case "FSRestart":
r.push(`a near flawless body; the only distinguishable mark on it: a small tattoo of a prestigious school.`);
break;
- case "Paternalist":
+ case "FSPaternalist":
r.push(`a nice young body, with all the little attractions and flaws of a free girl's.`);
break;
- case "Degradationist":
+ case "FSDegradationist":
r.push(`a taut body covered in dominant tattoos and spiky piercings.`);
break;
- case "Body Purist":
+ case "FSBodyPurist":
r.push(`a delectably curvaceous young body unmarred by any trace of surgical intervention.`);
break;
- case "Transformation Fetishist":
+ case "FSTransformationFetishist":
r.push(`a massive fake bubble butt to go with her fake boobs.`);
break;
- case "Youth Preferentialist":
+ case "FSYouthPreferentialist":
r.push(`that her whole body looks fresh, untouched, and quite young.`);
break;
- case "Maturity Preferentialist":
+ case "FSMaturityPreferentialist":
r.push(`a big pair of motherly tits, generous hips, a broad ass, and total self confidence.`);
break;
- case "Slimness Enthusiast":
+ case "FSSlimnessEnthusiast":
r.push(`perky little breasts, a smooth waist, trim hips, and a cute little ass.`);
break;
- case "Asset Expansionist":
+ case "FSAssetExpansionist":
r.push(`an inhumanly enormous ass to match her similarly improbable boobs.`);
break;
- case "Pastoralist":
+ case "FSPastoralist":
r.push(`amply milk-fed assets.`);
break;
- case "Physical Idealist":
+ case "FSPhysicalIdealist":
r.push(`the dimples that form on the sides of her cute buttocks when she flexes.`);
break;
- case "Hedonistic":
+ case "FSHedonisticDecadence":
r.push(`well-fed and delightfully jiggly assets.`);
break;
- case "Chattel Religionist":
+ case "FSChattelReligionist":
r.push(`a fresh and ready body, adorned here and there with sensual devotional jewelry.`);
break;
- case "Roman Revivalist":
+ case "FSRomanRevivalist":
r.push(`a graceful, milk-pale vision of classical beauty.`);
break;
- case "Neo-Imperialism":
+ case "FSNeoImperialist":
r.push(`a statuesque body, corded with fit musculature made for practical service.`);
break;
- case "Aztec Revivalist":
+ case "FSAztecRevivalist":
r.push(`a strong, tight, bronze body.`);
break;
- case "Egyptian Revivalist":
+ case "FSEgyptianRevivalist":
r.push(`a perfect expanse of smooth, warm, tanned skin.`);
break;
- case "Edo Revivalist":
+ case "FSEdoRevivalist":
r.push(`a graceful form so perfectly pale that her face requires almost no whitening at all.`);
break;
- case "Arabian Revivalist":
+ case "FSArabianRevivalist":
r.push(`a nubile young body perfectly formed for a Sultan's bed.`);
break;
- case "Chinese Revivalist":
+ case "FSChineseRevivalist":
r.push(`a pretty young body that would not look out of place in an Imperial bed.`);
break;
- case "Intellectual Dependency":
+ case "FSIntellectualDependency":
r.push(`a young body practically begging you for dick.`);
break;
- case "Slave Professionalism":
+ case "FSSlaveProfessionalism":
r.push(`an elegant, mature body that knows its way around the bedroom.`);
break;
- case "Petite Admiration":
+ case "FSPetiteAdmiration":
r.push(`an adorably petite figure.`);
break;
- case "Statuesque Glorification":
+ case "FSStatuesqueGlorification":
r.push(`that you have to crane your neck back to take in her full stature.`);
break;
default:
@@ -401,16 +400,16 @@ App.Events.RECitizenHookup = class RECitizenHookup extends App.Events.BaseEvent
r.push(`and kiss your favorite deeply, playing with ${him} as you fuck.`);
} else if (S.Concubine.intelligence+S.Concubine.intelligenceImplant < -50) {
r.push(`and kiss your favorite idiot deeply, keeping ${him} from feeling left out as you fuck.`);
- } else if (S.Concubine.fetish === "mindbroken") {
+ } else if (S.Concubine.fetish === Fetish.MINDBROKEN) {
r.push(`and play with ${his} body as you fuck.`);
}
}
r.push(`When your guest is finally spent, she showers, dresses, and leaves discreetly, offering you a proper thank you. This is the kind of thing that <span class="green">builds a lasting reputation</span> in the Free Cities.`);
repX(5000, "event");
- if (fsAdj === "Repopulationist" && V.PC.dick !== 0 && repopHookupPregnant === 0 && (random(1, 100) > 40)) {
- addTrinket(`a tasteful morning-after message, with attached positive pregnancy test, from a pretty ${fsAdj} citizen you bred`);
- } else if (fsAdj !== "none") {
- addTrinket(`a tasteful morning-after message from a pretty ${fsAdj} citizen`);
+ if (FS === "FSRepopulationFocus" && V.PC.dick !== 0 && repopHookupPregnant === 0 && (random(1, 100) > 40)) {
+ addTrinket(`a tasteful morning-after message, with attached positive pregnancy test, from a pretty citizen you bred`);
+ } else if (FS !== "none") {
+ addTrinket(`a tasteful morning-after message from a pretty ${FutureSocieties.displayAdj(FS)} citizen`);
} else {
addTrinket("a tasteful morning-after message from a pretty citizen");
}
@@ -422,99 +421,99 @@ App.Events.RECitizenHookup = class RECitizenHookup extends App.Events.BaseEvent
const frag = new DocumentFragment();
let r = [];
r.push(`You turn to face her straight on, and something about the look in your eye fills her with mixed apprehension and anticipation. You agree with her banter and praise her for being so forward-thinking, before transitioning to more direct praise of her style and then her body. You're speaking in a tone that cuts through the room, and by the time you kiss your willing conquest, there's not a person in the room who isn't paying attention. They all understand the message: this gathering is turning into something else, now. Those few who aren't willing to fuck in public withdraw, and everyone who didn't come with a sexual partner sends urgent messages to have appropriate slaves brought from their apartments. You make out with her for a while, letting everyone make arrangements, and then pull her clothes off, making sure her`);
- if (!["none", "Multiculturalist"].includes(fsAdj)) {
+ if (!["none", "FSNull"].includes(FS)) {
V.arcologies[0][FS] += 5;
}
- switch (fsAdj) {
- case "Subjugationist":
- case "Supremacist":
+ switch (FS) {
+ case "FSSubjugationist":
+ case "FSSupremacist":
r.push(`superior body`);
break;
- case "Gender Radicalist":
+ case "FSGenderRadicalist":
r.push(`tits and stiff dick`);
break;
- case "Gender Fundamentalist":
+ case "FSGenderFundamentalist":
r.push(`femininity`);
break;
- case "Repopulationist":
+ case "FSRepopulationFocus":
if (repopHookupPregnant === 1) {
r.push(`fecund body`);
} else {
r.push(`ready-to-be-bred body`);
}
break;
- case "Eugenics":
+ case "FSRestart":
r.push(`perfect body`);
break;
- case "Paternalist":
+ case "FSPaternalist":
r.push(`appealing body`);
break;
- case "Degradationist":
+ case "FSDegradationist":
r.push(`dominant form`);
break;
- case "Body Purist":
+ case "FSBodyPurist":
r.push(`natural body`);
break;
- case "Transformation Fetishist":
+ case "FSTransformationFetishist":
r.push(`fake butt`);
break;
- case "Youth Preferentialist":
+ case "FSYouthPreferentialist":
r.push(`young body`);
break;
- case "Maturity Preferentialist":
+ case "FSMaturityPreferentialist":
r.push(`mature body`);
break;
- case "Slimness Enthusiast":
+ case "FSSlimnessEnthusiast":
r.push(`slender body`);
break;
- case "Asset Expansionist":
+ case "FSAssetExpansionist":
r.push(`curvaceous form`);
break;
- case "Pastoralist":
+ case "FSPastoralist":
r.push(`milk-fed plushness`);
break;
- case "Physical Idealist":
+ case "FSPhysicalIdealist":
r.push(`muscular body`);
break;
- case "Hedonistic":
+ case "FSHedonisticDecadence":
r.push(`plump body`);
break;
- case "Chattel Religionist":
+ case "FSChattelReligionist":
r.push(`divine sexuality`);
break;
- case "Roman Revivalist":
+ case "FSRomanRevivalist":
r.push(`elegant form`);
break;
- case "Neo-Imperialism":
+ case "FSNeoImperialist":
r.push(`chiseled body`);
break;
- case "Aztec Revivalist":
+ case "FSAztecRevivalist":
r.push(`well-built form`);
break;
- case "Egyptian Revivalist":
+ case "FSEgyptianRevivalist":
r.push(`beautiful tanned body`);
break;
- case "Arabian Revivalist":
- case "Chinese Revivalist":
- case "Edo Revivalist":
+ case "FSArabianRevivalist":
+ case "FSChineseRevivalist":
+ case "FSEdoRevivalist":
r.push(`graceful form`);
break;
- case "Intellectual Dependency":
+ case "FSIntellectualDependency":
r.push(`extreme horniness`);
break;
- case "Slave Professionalism":
+ case "FSSlaveProfessionalism":
r.push(`experienced body`);
break;
- case "Petite Admiration":
+ case "FSPetiteAdmiration":
r.push(`tiny form`);
break;
- case "Statuesque Glorification":
+ case "FSStatuesqueGlorification":
r.push(`towering form`);
break;
default:
r.push(`hot young body`);
}
- r.push(`is obvious to everyone. The message is clear, and your guest of honor is the center of attention as you take her there in view of the arcology's leading citizens. Naturally, the story percolates, making it clear that there's nothing you won't do to <span class="green">further acceptance of ${fsArray.length > 0 ? FutureSocieties.displayAdj(FS) : "societal"} principles.</span>`);
+ r.push(`is obvious to everyone. The message is clear, and your guest of honor is the center of attention as you take her there in view of the arcology's leading citizens. Naturally, the story percolates, making it clear that there's nothing you won't do to <span class="green">further acceptance of ${FS !== "none" ? FutureSocieties.displayAdj(FS) : "societal"} principles.</span>`);
App.Events.addParagraph(frag, r);
return frag;
diff --git a/src/events/RE/reDevotedTwins.js b/src/events/RE/reDevotedTwins.js
index d438e3af668d95780b2a10317a68522d2b5aba26..d717f2f873150a5cdf11ac4e53a3af8b2e0334fa 100644
--- a/src/events/RE/reDevotedTwins.js
+++ b/src/events/RE/reDevotedTwins.js
@@ -9,14 +9,14 @@ App.Events.REDevotedTwins = class REDevotedTwins extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.sisters > 0,
s => s.devotion > 50,
canWalk,
hasAnyArms
],
[
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => areSisters(s, getSlave(this.actors[0])) === 1,
s => s.rivalTarget !== this.actors[0],
s => s.devotion > 50,
diff --git a/src/events/RE/reDrunkenTourist.js b/src/events/RE/reDrunkenTourist.js
new file mode 100644
index 0000000000000000000000000000000000000000..e66aa8a833fc635c4c6781a2b529f5f11a696dce
--- /dev/null
+++ b/src/events/RE/reDrunkenTourist.js
@@ -0,0 +1,77 @@
+App.Events.REDrunkenTourist = class REDrunkenTourist extends App.Events.BaseEvent {
+ eventPrerequisites() {
+ return [
+ () => V.arcologies[0].prosperity >= 100,
+ () => V.rep > random(1, 30000) || (V.debugMode > 0 && V.debugModeEventSelection > 0)
+ ];
+ }
+
+ execute(node) {
+ const tourist = GenerateNewSlave("XX", {race: "nonslave", disableDisability: 1});
+ tourist.origin = "$He came to your arcology as a tourist and found $himself enslaved.";
+ tourist.devotion = random(-70, -55);
+ tourist.trust = random(-45, -25);
+ setHealth(tourist, jsRandom(10, 20), undefined, undefined, undefined, 5);
+ tourist.vagina++;
+ tourist.hips = 2;
+ tourist.butt = random(4, 6);
+ tourist.boobs = 100 * random(10, 18);
+ tourist.weight = random(60, 140);
+ tourist.behavioralQuirk = "none";
+ tourist.sexualQuirk = "none";
+ tourist.canRecruit = 0;
+ App.Events.drawEventArt(node, tourist, "slutty business attire"); // "nice business attire" is not currently supported by WebGL
+ App.Events.addParagraph(node, [
+ "While on a midnight stroll through the arcology, you notice a young woman stumbling along one of the pathways, looking lost.",
+ "From her clothing to her demeanor you can tell she is a tourist, and an extremely drunk one at that.",
+ "Upon seeing you, she stumbles up to you as quickly as she can manage, almost falling over in the process.",
+ "She clearly doesn't recognize you as the owner of the arcology, as she makes no attempt at showing deference. "
+ ]);
+ App.Events.addParagraph(node, [`"Excuse *hic* me... I'm lost. I don't know how to get back to my hotel... can you help me? These streets are so confusing..."`]);
+ App.Events.addParagraph(node, ["She's going to be in for quite the hangover."]);
+
+ const choices = [];
+ choices.push(new App.Events.Result(`Escort her to her hotel`, escort));
+ if (V.cash > 20000) {
+ choices.push(new App.Events.Result(`Enslave her`, enslave, `This will require an unprofitable ${cashFormat(20000)}, since she is wealthy and obfuscating her fate will require considerable spending`));
+ } else {
+ choices.push(new App.Events.Result(null, null, `You cannot afford the ${cashFormat(20000)} enslaving her would require, since she is wealthy and obfuscating her fate would necessitate considerable spending`));
+ }
+ choices.push(new App.Events.Result(`Ignore her`, ignore));
+ App.Events.addResponses(node, choices);
+
+ function escort() {
+ const frag = new DocumentFragment();
+ App.Events.addParagraph(frag, [
+ "You escort the drunken woman back to her hotel, and she asks you how long you've lived in the arcology.",
+ "When you tell her you own the arcology, she thanks you profusely for taking the time to lead her back to her suite and presses herself up against you, trying her best to be sexy despite her impaired state.",
+ "She promises to spread a good word about you, and lets you know that you can come up to her room any time."
+ ]);
+ repX(500, "event");
+ return frag;
+ }
+
+ function enslave() {
+ const frag = new DocumentFragment();
+ App.Events.refreshEventArt(tourist, "no clothing");
+ App.Events.addParagraph(frag, [
+ "Under the pretense of leading her back to her hotel, you bring her to the penthouse and have her scanned and tagged.",
+ "She's so inebriated she thinks it's just a routine security scan, and ends up passing out before you can explain the situation to her fully.",
+ "You have a slave carry her off in the meantime so you can initiate her when she wakes.",
+ App.UI.newSlaveIntro(tourist)
+ ]);
+ cashX(-20000, "event", tourist);
+ return frag;
+ }
+
+ function ignore() {
+ const frag = new DocumentFragment();
+ App.Events.addParagraph(frag, [
+ "You ignore the woman and move on with your night.",
+ "You don't have time to involve yourself in such trivial matters.",
+ "Dumbfounded, she stumbles onward in search of her hotel room."
+ ]);
+ return frag;
+ }
+ }
+};
diff --git a/src/events/RE/reFSNonconformist.js b/src/events/RE/reFSNonconformist.js
index eced09c07bfc1de5baa4a6b166afd0f5abf08721..88c4c6b562eb9ab3e9eaddca265b39b0c341dd4d 100644
--- a/src/events/RE/reFSNonconformist.js
+++ b/src/events/RE/reFSNonconformist.js
@@ -148,7 +148,7 @@ App.Events.REFSNonconformist = class REFSNonconformist extends App.Events.BaseEv
} else if (FSNonconformist === "Roman Revivalist") {
r.push(`has been a longtime skeptic of historical revivalism, publicly deploring it as a childish game of dress-up. This never got much traction, since Rome has become quite fashionable here. Frustrated, they're rumored to be planning a change of approach. Despairing of getting the population to give up the Roman project, they're going to set up a competing Gaulish Revivalism. The quixotic effort is almost certainly doomed to fail, but the oligarchs fear it will be a distraction.`);
} else if (FSNonconformist === "Neo-Imperialist") {
- r.push(`has been a staunch and lifelong egalitarian, despite holding slaves for most of their later life, committed to the tenets of a free democratic society. They have loudly and openly criticzed Imperial society and its relegation of the lower classes to serfdom and subservience for the benefit of your Knights and Barons; now you hear they're planning to set up a competing societal design they call Neo-Republicanism, modifying the old world Republican style into a directly democratic arcology governance. The Barons fear that this might rile up a number of serfs against Imperial society.`);
+ r.push(`has been a staunch and lifelong egalitarian, despite holding slaves for most of their later life, committed to the tenets of a free democratic society. They have loudly and openly criticized Imperial society and its relegation of the lower classes to serfdom and subservience for the benefit of your Knights and Barons; now you hear they're planning to set up a competing societal design they call Neo-Republicanism, modifying the old world Republican style into a directly democratic arcology governance. The Barons fear that this might rile up a number of serfs against Imperial society.`);
} else if (FSNonconformist === "Aztec Revivalist") {
r.push(`has been a longtime skeptic of historical revivalism, publicly deploring it as a childish game of dress-up. This never got much traction, since Aztec has become quite fashionable here. Frustrated, they're rumored to be planning a change of approach. Despairing of getting the population to give up the Aztec project, they're going to set up a competing Spanish Revivalism. The quixotic effort is almost certainly doomed to fail, but the oligarchs fear it will be a distraction.`);
} else if (FSNonconformist === "Edo Revivalist") {
diff --git a/src/events/RE/reFullBed.js b/src/events/RE/reFullBed.js
index aa857c728e10dcd3d049885161f8698a0bfd655f..a79b378669cd25647710b3caae3ce48a829952eb 100644
--- a/src/events/RE/reFullBed.js
+++ b/src/events/RE/reFullBed.js
@@ -244,9 +244,9 @@ App.Events.REFullBed = class REFullBed extends App.Events.BaseEvent {
}
t.push(`belly and cum pooling from their thoroughly seeded holes. You slide back in between them for a well earned`);
if (V.PC.balls >= 30) {
- t.push(`sleep, their middles resting on your own, their cum stuffed wombs a testament to your virility.`);
+ t.push(`sleep, their middles resting on your own, their cum-stuffed wombs a testament to your virility.`);
} else if (V.PC.balls >= 14) {
- t.push(`sleep, their middles resting on your own, their cum filled wombs a testament to your virility.`);
+ t.push(`sleep, their middles resting on your own, their cum-filled wombs a testament to your virility.`);
} else {
t.push(`sleep.`);
}
diff --git a/src/events/RE/reHGReplacement.js b/src/events/RE/reHGReplacement.js
index 8b34b3f58a98e2f54825996459d77f322b42c161..72386ade6372b398838cc169d0116b6b29d63a7d 100644
--- a/src/events/RE/reHGReplacement.js
+++ b/src/events/RE/reHGReplacement.js
@@ -15,7 +15,7 @@ App.Events.REHGReplacement = class REHGReplacement extends App.Events.BaseEvent
(s) => s.intelligence + s.intelligenceImplant >= S.HeadGirl.intelligence + S.HeadGirl.intelligenceImplant,
(s) => s.skill.vaginal > S.HeadGirl.skill.vaginal,
(s) => s.assignment !== Job.QUARTER,
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
canSee,
canHear,
canWalk,
diff --git a/src/events/RE/reLegendaryBalls.js b/src/events/RE/reLegendaryBalls.js
index eba22e52650163c4dd940d6c76ea1f3723b86c35..dc7dd8093dc5d9943ab4dd01b1e2fe238461cfb0 100644
--- a/src/events/RE/reLegendaryBalls.js
+++ b/src/events/RE/reLegendaryBalls.js
@@ -1,7 +1,7 @@
App.Events.RELegendaryBalls = class RELegendaryBalls extends App.Events.BaseEvent {
actorPrerequisites() {
return [[
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RE/reLegendaryCow.js b/src/events/RE/reLegendaryCow.js
index 63fcd865fbe95594d646e67827d711a925a2c6ac..bac7d53233e4691563ffbe72bbc001a34fa9f58b 100644
--- a/src/events/RE/reLegendaryCow.js
+++ b/src/events/RE/reLegendaryCow.js
@@ -1,7 +1,7 @@
App.Events.RELegendaryCow = class RELegendaryCow extends App.Events.BaseEvent {
actorPrerequisites() {
return [[
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
@@ -28,7 +28,7 @@ App.Events.RELegendaryCow = class RELegendaryCow extends App.Events.BaseEvent {
r.push(
App.UI.DOM.slaveDescriptionDialog(slave),
- `is an incredible producer of ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor} flavored `}milk. ${He}'s lactating in volumes that would have been unthinkable in the days when drug treatments were limited by consent. A nascent slave dairy trade organization will be holding a public stock show tomorrow, and since they're aware you keep cows, they've sent you an invitation to enter stock to be judged.`
+ `is an incredible producer of ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor}-flavored `}milk. ${He}'s lactating in volumes that would have been unthinkable in the days when drug treatments were limited by consent. A nascent slave dairy trade organization will be holding a public stock show tomorrow, and since they're aware you keep cows, they've sent you an invitation to enter stock to be judged.`
);
App.Events.addParagraph(node, r);
@@ -109,7 +109,7 @@ App.Events.RELegendaryCow = class RELegendaryCow extends App.Events.BaseEvent {
id: slave.ID
});
} else {
- r.push(`${slave.slaveName} is shown in public, closely inspected by the judging committee, and then publicly milked. You are surprised to see that the judging committee has been changed at the last minute. They choose another cow as best in show. There are persistent <span class="reputation inc">rumors</span> after the show that there was an absolute massacre of firings at the dairy organization headquarters the night before the show after it was discovered that someone, widely thought to be you, had been corrupting the judges.`);
+ r.push(`${slave.slaveName} is shown in public, closely inspected by the judging committee, and then publicly milked. You are surprised to see that the judging committee has been changed at the last minute. They choose another cow as best in show. There are persistent <span class="reputation dec">rumors</span> after the show that there was an absolute massacre of firings at the dairy organization headquarters the night before the show after it was discovered that someone, widely thought to be you, had been corrupting the judges.`);
repX(-100, "event", slave);
}
App.Events.addParagraph(frag, r);
diff --git a/src/events/RE/reLegendaryEntertainer.js b/src/events/RE/reLegendaryEntertainer.js
index 5dc54799b2f42d2d1a4464b411f81cdf07cb97ad..08e96088f6b5117e5f3b7caf17bf99c13bb338c6 100644
--- a/src/events/RE/reLegendaryEntertainer.js
+++ b/src/events/RE/reLegendaryEntertainer.js
@@ -1,7 +1,7 @@
App.Events.RELegendaryEntertainer = class RELegendaryEntertainer extends App.Events.BaseEvent {
actorPrerequisites() {
return [[
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
canTalk,
diff --git a/src/events/RE/reLegendaryFormerAbolitionist.js b/src/events/RE/reLegendaryFormerAbolitionist.js
index 0022604945e33494fc67abcdcf62691585d2622f..1d3f5e51fe59afdb60c48416ec6cb75942f78278 100644
--- a/src/events/RE/reLegendaryFormerAbolitionist.js
+++ b/src/events/RE/reLegendaryFormerAbolitionist.js
@@ -1,7 +1,7 @@
App.Events.RELegendaryFormerAbolitionist = class RELegendaryFormerAbolitionist extends App.Events.BaseEvent {
actorPrerequisites() {
return [[
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
canTalk,
diff --git a/src/events/RE/reLegendaryWhore.js b/src/events/RE/reLegendaryWhore.js
index 6b464af2997601f93cd18b33436c31440d678643..426f66908edec195599315ee82ffca9df0f103f1 100644
--- a/src/events/RE/reLegendaryWhore.js
+++ b/src/events/RE/reLegendaryWhore.js
@@ -1,7 +1,7 @@
App.Events.RELegendaryWhore = class RELegendaryWhore extends App.Events.BaseEvent {
actorPrerequisites() {
return [[
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
canTalk,
diff --git a/src/events/RE/reLegendaryWomb.js b/src/events/RE/reLegendaryWomb.js
index e07d1631cbd551742b85b9cc886e58950c0ab8a7..59337a8b58b98245a7abec5f7a92f0dc2c47844e 100644
--- a/src/events/RE/reLegendaryWomb.js
+++ b/src/events/RE/reLegendaryWomb.js
@@ -1,10 +1,11 @@
App.Events.RELegendaryWomb = class RELegendaryWomb extends App.Events.BaseEvent {
actorPrerequisites() {
return [[
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canMove,
canTalk,
+ (s) => s.prestige === 0,
(s) => s.devotion > 50,
(s) => s.trust > 50,
(s) => s.broodmother === 0,
diff --git a/src/events/RE/reMaleArcologyOwner.js b/src/events/RE/reMaleArcologyOwner.js
index d30b527a5ac085996a7cb9d5fe631e465ac22f02..5194bc5a33c90d798f4a01099a1f6dcc7caa8fec 100644
--- a/src/events/RE/reMaleArcologyOwner.js
+++ b/src/events/RE/reMaleArcologyOwner.js
@@ -3,6 +3,7 @@ App.Events.REMaleArcologyOwner = class REMaleArcologyOwner extends App.Events.Ba
return [
() => V.policies.regularParties === 1,
() => V.PC.vagina > 0,
+ () => V.PC.dick === 0,
() => V.PC.title === 0,
() => (V.rep-10000 > random(1, 10000) && random(0, 99) < V.seeDicks) || (V.debugMode > 0 && V.debugModeEventSelection > 0)
];
@@ -97,7 +98,7 @@ App.Events.REMaleArcologyOwner = class REMaleArcologyOwner extends App.Events.Ba
addTrinket("a thank-you note from a male arcology owner of your acquaintance that not-so-subtly suggests getting a bigger pair of implants");
}
} else if (randomForeignFS > 40 && V.PC.boobsImplant === 0) { // purist + expansion
- r.push(`conversation between him and the woman trying to convince him to invest in her solar power concern. After a few minutes of you jiggling your cleavage around, it becomes clear that his attention span for renewable energy is no where near what it is for big breasts just begging to pop out of their top. He excuses himself from the conversion, though not without intentionally bumping into your rack and slipping into the hall. The woman glares daggers at you and returns to her drink, leaving you to follow suit and slip out of the party. As you wander down the hall, you feel a hand struggle to cup one of your jiggly globes and pull you into an embrace. While he seems content to just grope you, you had other plans and begin undoing his belt. You gasp a little as his member pops out into your hands, eager for some attention of its own. He wastes no time in pulling your ample bust downwards and slipping his eager cock between your breasts. You grab his hips for support as he vigorously pistons into your chest in an attempt to keep your balance under their motion and to make an attempt to retake control of the situation before he renders you unable to return to the party. With a joyous groan, he blows his load deep into your bosom and down your dress. As he helps you to your feet, and the stain under your rack grows larger, you give him a kiss on the cheek and head off to change. He returns to the party, and from what your serving slaves tell you later, seems to have boasted about how well you do business. <span class="reputation inc">Your reputation has slightly improved,</span> though nowhere near as much as his.`);
+ r.push(`conversation between him and the woman trying to convince him to invest in her solar power concern. After a few minutes of you jiggling your cleavage around, it becomes clear that his attention span for renewable energy is nowhere near what it is for big breasts just begging to pop out of their top. He excuses himself from the conversion, though not without intentionally bumping into your rack and slipping into the hall. The woman glares daggers at you and returns to her drink, leaving you to follow suit and slip out of the party. As you wander down the hall, you feel a hand struggle to cup one of your jiggly globes and pull you into an embrace. While he seems content to just grope you, you had other plans and begin undoing his belt. You gasp a little as his member pops out into your hands, eager for some attention of its own. He wastes no time in pulling your ample bust downwards and slipping his eager cock between your breasts. You grab his hips for support as he vigorously pistons into your chest in an attempt to keep your balance under their motion and to make an attempt to retake control of the situation before he renders you unable to return to the party. With a joyous groan, he blows his load deep into your bosom and down your dress. As he helps you to your feet, and the stain under your rack grows larger, you give him a kiss on the cheek and head off to change. He returns to the party, and from what your serving slaves tell you later, seems to have boasted about how well you do business. <span class="reputation inc">Your reputation has slightly improved,</span> though nowhere near as much as his.`);
repX(100, "event");
addTrinket("a thank-you note from a male arcology owner of your acquaintance with an attached list of natural supplements to make your tits even bigger");
} else {
diff --git a/src/events/RE/reMaleCitizenHookup.js b/src/events/RE/reMaleCitizenHookup.js
index 080a5e7ee85f7a0f9505ac55572119cf1e137dfa..95328e7bfb4116a810796020b2a6384277731079 100644
--- a/src/events/RE/reMaleCitizenHookup.js
+++ b/src/events/RE/reMaleCitizenHookup.js
@@ -3,6 +3,7 @@ App.Events.REMaleCitizenHookup = class REMaleCitizenHookup extends App.Events.Ba
return [
() => V.policies.regularParties === 1,
() => V.PC.vagina > 0,
+ () => V.PC.dick === 0,
() => V.PC.title === 0,
];
}
@@ -242,7 +243,7 @@ App.Events.REMaleCitizenHookup = class REMaleCitizenHookup extends App.Events.Ba
if (FS === "FSPhysicalIdealist" || FS === "FSStatuesqueGlorification") {
r.push(`You nudge him in the ribs and motion to the door.`);
} else if (FS === "FSPetiteAdmiration") {
- r.push(`You place your hand on the nap of his neck and begin to lead him away.`);
+ r.push(`You place your hand on the nape of his neck and begin to lead him away.`);
} else {
r.push(`You pull his arm around your waist.`);
}
@@ -271,7 +272,7 @@ App.Events.REMaleCitizenHookup = class REMaleCitizenHookup extends App.Events.Ba
r.push(`realize`);
}
r.push(`that ${his} presence might not be wanted.`);
- } else if (S.Concubine.fetish === "mindbroken") {
+ } else if (S.Concubine.fetish === Fetish.MINDBROKEN) {
r.push(`${S.Concubine.slaveName} is there, of course, completely indifferent to you or your guest's presence.`);
}
}
@@ -583,11 +584,11 @@ App.Events.REMaleCitizenHookup = class REMaleCitizenHookup extends App.Events.Ba
r.push(`and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.`);
}
if (FS === "FSAssetExpansionist") {
- if (S.Concubine && canMove(S.Concubine) && S.Concubine.fetish !== "mindbroken") {
+ if (S.Concubine && canMove(S.Concubine) && S.Concubine.fetish !== Fetish.MINDBROKEN) {
r.push(`${S.Concubine.slaveName} eagerly joins the two of you to help clean the massive cumshot up.`);
}
} else if (FS !== "FSYouthPreferentialist") {
- if (S.Concubine && canMove(S.Concubine) && S.Concubine.fetish !== "mindbroken") {
+ if (S.Concubine && canMove(S.Concubine) && S.Concubine.fetish !== Fetish.MINDBROKEN) {
const {he} = getPronouns(S.Concubine);
r.push(`The`);
if (canSee(S.Concubine)) {
diff --git a/src/events/RE/reMalefactor.js b/src/events/RE/reMalefactor.js
index fd2f9c636917ffaa3e9ae9b446233c27c1a2580e..f279c5ebdb9fe91239488a112a96e900c66fc7ad 100644
--- a/src/events/RE/reMalefactor.js
+++ b/src/events/RE/reMalefactor.js
@@ -854,12 +854,13 @@ App.Events.REMalefactor = class REMalefactor extends App.Events.BaseEvent {
slave.skill.oral = 0;
slave.skill.anal = 0;
slave.skill.whoring = 0;
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
slave.anus = 0;
setHealth(slave, jsRandom(60, 80), undefined, undefined, 0, 10);
slave.behavioralFlaw = "arrogant";
slave.sexualFlaw = "hates penetration";
- slave.hStyle = "shaved into a mohawk";
+ slave.hStyle = "strip";
+ slave.hLength = 5;
slave.custom.tattoo = "$He seems to have had slave tattoos at one time, but has had them cheaply removed.";
break;
case "passfail":
diff --git a/src/events/RE/reNickname.js b/src/events/RE/reNickname.js
index 310939edb9d5aa86102b3d078cfb40af04b2230e..27893d81f1eb3bc8434774943df9584c562f8145 100644
--- a/src/events/RE/reNickname.js
+++ b/src/events/RE/reNickname.js
@@ -1129,7 +1129,7 @@ App.Events.RENickname = class RENickname extends App.Events.BaseEvent {
nickMap.set("butt toy", {
nicknameArray: ["Assplay", "Back Door", "Backside", "Behind", "Beso Negro", "Booty", "Butt Toy", "Buttcrack", "Butthole", "Buttjob", "Cheeky", "Hotdog", "Reach Around", "Rear End", "Rim Job", "Rump Roast", "Spanky", "Sphincter", "Stinky Pinky", "Tossed Salad"],
situationDesc: `loves it when attention is lavished on ${his} butt, even though ${he} has never done anal. ${He}'s a sex slave and takes it however it's given, but honest enjoyment is hard to fake and it's pretty obvious how much fun ${he} has when a client is roughly groping ${his} rear. ${His} typical come-on is to 'accidentally' find ${his} client's dick hotdogged betwixt ${his} cheeks.`,
- applyDesc: `knows that whatever the rest of ${his} slave life holds, it will involve an ever growing amount of attention to ${his} rear.`,
+ applyDesc: `knows that whatever the rest of ${his} slave life holds, it will involve an ever-growing amount of attention to ${his} rear.`,
notApplyDesc: `understands that ${he}'ll have to take what butt play ${he} can get.`,
});
}
diff --git a/src/events/RE/rePokerNight.js b/src/events/RE/rePokerNight.js
index d229f9428f02b766e89a1de3bcf872e25a5022a1..aa3e5c35ea9839c2f71428590210f3367835cbe0 100644
--- a/src/events/RE/rePokerNight.js
+++ b/src/events/RE/rePokerNight.js
@@ -90,11 +90,12 @@ App.Events.REPokerNight = class REPokerNight extends App.Events.BaseEvent {
slave.anus = 0;
slave.skill.anal = 0;
slave.skill.whoring = 0;
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.accent = random(0, 1);
slave.behavioralFlaw = "arrogant";
slave.hLength = 1;
- slave.hStyle = "shaved into a mohawk";
+ slave.hStyle = "strip";
+ slave.hLength = 5;
slave.custom.tattoo = "$He has a number of tattoos from a variety of mercenary companies.";
slave.clothes = "a military uniform";
App.Events.drawEventArt(frag, slave);
diff --git a/src/events/RE/rePregInventorFCTV.js b/src/events/RE/rePregInventorFCTV.js
index 57ce2aacfec1e0d6cc8d1062106779ac48d3477e..3b7cd8c56c9e1f730faddca1d3ef8c420c4a3518 100644
--- a/src/events/RE/rePregInventorFCTV.js
+++ b/src/events/RE/rePregInventorFCTV.js
@@ -12,7 +12,7 @@ App.Events.rePregInventorFCTV = class rePregInventorFCTV extends App.Events.Base
[
s => s.ID === V.pregInventorID,
s => s.bellyPreg >= 1000000, // even bigger than before
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.fuckdoll === 0,
s => s.devotion > 50,
s => s.porn.prestige >= 1 || s.prestige >= 1
@@ -147,10 +147,10 @@ App.Events.rePregInventorFCTV = class rePregInventorFCTV extends App.Events.Base
frag.append(interview());
if (slave.porn.prestige >= 3 && random(1, 100) > 50) {
- r.push(`You turn your FCTV screen off satisfied that your slave has just finished a job very well done. Over the course of the next several weeks, it becomes clear that ${slave.slaveName}'s appearance on "Husbandry With Milly" has had <span class="reputation inc">world changing</span> consequences.`);
+ r.push(`You turn your FCTV screen off satisfied that your slave has just finished a job very well done. Over the course of the next several weeks, it becomes clear that ${slave.slaveName}'s appearance on "Husbandry With Milly" has had <span class="reputation inc">world-changing</span> consequences.`);
if (slave.prestige < 3) {
slave.prestige = 3;
- slave.prestigeDesc = "$He is a world renowned inventor of hyperpregnant sex accessories and toys.";
+ slave.prestigeDesc = "$He is a world-renowned inventor of hyperpregnant sex accessories and toys.";
}
repX(25000, "event");
V.pregInventions = 3;
@@ -161,7 +161,7 @@ App.Events.rePregInventorFCTV = class rePregInventorFCTV extends App.Events.Base
arc.FSRestart -= 60;
}
}
- addTrinket(`a cut out magazine cover of your world renowned hyperbroodmother inventor, ${slave.slaveName}, and ${his} myriad toys`);
+ addTrinket(`a cut out magazine cover of your world-renowned hyperbroodmother inventor, ${slave.slaveName}, and ${his} myriad toys`);
} else if (slave.porn.prestige >= 3 && random(1, 100) > 30) {
r.push(`You turn your FCTV screen off satisfied that your slave has just completed a job well done. Over the course of the next several weeks, it becomes clear that ${slave.slaveName}'s appearance on "Husbandry With Milly" has had a <span class="reputation inc">significant positive impact</span> on public opinion.`);
if (slave.prestige < 2) {
@@ -203,10 +203,10 @@ App.Events.rePregInventorFCTV = class rePregInventorFCTV extends App.Events.Base
}
}
} else if (slave.porn.prestige >= 2 && random(1, 100) > 75) {
- r.push(`You turn your FCTV screen off satisfied that your slave has just finished a job very well done. Over the course of the next several weeks, it becomes clear that ${slave.slaveName}'s appearance on "Husbandry With Milly" has had <span class="reputation inc">world changing</span> consequences.`);
+ r.push(`You turn your FCTV screen off satisfied that your slave has just finished a job very well done. Over the course of the next several weeks, it becomes clear that ${slave.slaveName}'s appearance on "Husbandry With Milly" has had <span class="reputation inc">world-changing</span> consequences.`);
if (slave.prestige < 3) {
slave.prestige = 3;
- slave.prestigeDesc = "$He is a world renowned inventor of hyperpregnant sex accessories and toys.";
+ slave.prestigeDesc = "$He is a world-renowned inventor of hyperpregnant sex accessories and toys.";
}
repX(25000, "event");
V.pregInventions = 3;
@@ -217,7 +217,7 @@ App.Events.rePregInventorFCTV = class rePregInventorFCTV extends App.Events.Base
arc.FSRestart -= 60;
}
}
- addTrinket(`a cut out magazine cover of your world renowned hyperbroodmother inventor, ${slave.slaveName}, and ${his} myriad toys`);
+ addTrinket(`a cut out magazine cover of your world-renowned hyperbroodmother inventor, ${slave.slaveName}, and ${his} myriad toys`);
} else if (slave.porn.prestige >= 2 && random(1, 100) > 50) {
r.push(`You turn your FCTV screen off satisfied that your slave has just completed a job well done. Over the course of the next several weeks, it becomes clear that ${slave.slaveName}'s appearance on "Husbandry With Milly" has had a <span class="reputation inc">significant positive impact</span> on public opinion.`);
if (slave.prestige < 2) {
@@ -259,10 +259,10 @@ App.Events.rePregInventorFCTV = class rePregInventorFCTV extends App.Events.Base
}
}
} else if (random(1, 100) > 90) {
- r.push(`You turn your FCTV screen off satisfied that your slave has just finished a job very well done. Over the course of the next several weeks, it becomes clear that ${slave.slaveName}'s appearance on "Husbandry With Milly" has had <span class="reputation inc">world changing</span> consequences.`);
+ r.push(`You turn your FCTV screen off satisfied that your slave has just finished a job very well done. Over the course of the next several weeks, it becomes clear that ${slave.slaveName}'s appearance on "Husbandry With Milly" has had <span class="reputation inc">world-changing</span> consequences.`);
if (slave.prestige < 3) {
slave.prestige = 3;
- slave.prestigeDesc = "$He is a world renowned inventor of hyperpregnant sex accessories and toys.";
+ slave.prestigeDesc = "$He is a world-renowned inventor of hyperpregnant sex accessories and toys.";
}
repX(25000, "event");
V.pregInventions = 3;
@@ -273,7 +273,7 @@ App.Events.rePregInventorFCTV = class rePregInventorFCTV extends App.Events.Base
arc.FSRestart -= 60;
}
}
- addTrinket(`a cut out magazine cover of your world renowned hyperbroodmother inventor, ${slave.slaveName}, and ${his} myriad toys`);
+ addTrinket(`a cut out magazine cover of your world-renowned hyperbroodmother inventor, ${slave.slaveName}, and ${his} myriad toys`);
} else if (random(1, 100) > 70) {
r.push(`You turn your FCTV screen off satisfied that your slave has just completed a job well done. Over the course of the next several weeks, it becomes clear that ${slave.slaveName}'s appearance on "Husbandry With Milly" has had a <span class="reputation inc">significant positive impact</span> on public opinion.`);
if (slave.prestige < 2) {
@@ -330,13 +330,13 @@ App.Events.rePregInventorFCTV = class rePregInventorFCTV extends App.Events.Base
r.push(`"Everybody, give one last round of applause for renowned breakout porn star 'Twinner Jennie'!" she says. "Who'd have thought an eighteen year old slave could be pregnant with their own eighteen year old cloned sister? Quite a world — thank you again for that fascinating interview! Our next guest on 'Husbandry with Millie' is a clever 'broodmother' class breeding slave and mother of ${num(slave.counter.birthsTotal)} children from the ${V.continent} arcology of '${V.arcologies[0].name}.' Everybody, please give a hearty welcome to ${SlaveFullName(slave)}!"`);
App.Events.addParagraph(el, r);
r = [];
- r.push(`The first thing that the audience sees of your slave is a colossal ${slave.skin} orb pressing forward through an inadequate looking faux doorway at the rear of the set. "Husbandry with Millie" is a show about breeders and for breeders, and the host, Millie, has seen pregnant slaves of innumerable sizes and descriptions. Despite this, she does a clear double take as your slave enters, and enters, and enters stage right, ${his} grossly distorted belly seeming to go on forever as it precedes ${him}. ${He} is always growing, and you are constantly increasing the size of ${his} menial entourage to ensure ${his} unhindered mobility. As a result, a veritable platoon of masked menials can be seen throwing themselves into your overladen babyfactory before ${his}`);
+ r.push(`The first thing that the audience sees of your slave is a colossal ${slave.skin} orb pressing forward through an inadequate-looking faux doorway at the rear of the set. "Husbandry with Millie" is a show about breeders and for breeders, and the host, Millie, has seen pregnant slaves of innumerable sizes and descriptions. Despite this, she does a clear double take as your slave enters, and enters, and enters stage right, ${his} grossly distorted belly seeming to go on forever as it precedes ${him}. ${He} is always growing, and you are constantly increasing the size of ${his} menial entourage to ensure ${his} unhindered mobility. As a result, a veritable platoon of masked menials can be seen throwing themselves into your overladen babyfactory before ${his}`);
if (slave.boobs >= 20000) {
- r.push(`debilitatingly enormous, mind boggling breasts`);
+ r.push(`debilitatingly enormous, mind-boggling breasts`);
} else if (slave.boobs >= 3000) {
r.push(`enormous breasts`);
} else if ((slave.boobsImplant / slave.boobs) >= .60) {
- r.push(`implant inflated tits`);
+ r.push(`implant-inflated tits`);
} else {
r.push(`upper body`);
}
@@ -361,12 +361,15 @@ App.Events.rePregInventorFCTV = class rePregInventorFCTV extends App.Events.Base
} else {
r.push(`pushing one arm stump into the side of ${his} belly while waving the other at the studio audience.`);
}
- r.push(`After ${he} has entered and taken ${his} place next to the interview couch — rolling forward to lay on ${his} belly so that ${he} can speak at eye level with ${his} interviewer while reclined in relative comfort — more menials enter the stage, carrying portable versions of the specialized maternity swing and moisturizing pool that ${he} has developed.`);
+ r.push(`After ${he} has entered and taken ${his} place next to the interview couch — rolling forward to lie on ${his} belly so that ${he} can speak at eye level with ${his} interviewer while reclined in relative comfort — more menials enter the stage, carrying portable versions of the specialized maternity swing and moisturizing pool that ${he} has developed.`);
App.Events.addParagraph(el, r);
r = [];
r.push(`"Wow!" Millie says, "You're just about ready to pop, aren't you?"`);
App.Events.addParagraph(el, r);
r = [];
+ if (!canHear(slave) || !canSee(slave)) {
+ r.push(`A specially-trained slave from ${slave.slaveName}'s menial entourage quickly relays Millie's words to ${him} in ${canSee(slave) ? `sign` : `contact`} language.`);
+ }
if (canTalk(slave)) {
r.push(
Spoken(slave, `"Mmm,"`),
@@ -431,7 +434,7 @@ App.Events.rePregInventorFCTV = class rePregInventorFCTV extends App.Events.Base
}
App.Events.addParagraph(el, r);
r = [];
- r.push(`Millie places an appreciative hand on your slave's silk clad flank. The poor ${girl} is so packed full of children that ${his} brood can be seen pressed in outline along the full swell of ${his} belly, and Millie's hand rests on the embossed figure of one such child. The camera zooms in as its form can be clearly made out pushing through the skin of your slave and against the host's touch. It turns over, allowing her to cup its back in her palm. Your slave flexes ${his}`);
+ r.push(`Millie places an appreciative hand on your slave's silk-clad flank. The poor ${girl} is so packed full of children that ${his} brood can be seen pressed in outline along the full swell of ${his} belly, and Millie's hand rests on the embossed figure of one such child. The camera zooms in as its form can be clearly made out pushing through the skin of your slave and against the host's touch. It turns over, allowing her to cup its back in her palm. Your slave flexes ${his}`);
if (hasAnyLegs(slave)) {
r.push(legs);
} else {
@@ -470,7 +473,7 @@ App.Events.rePregInventorFCTV = class rePregInventorFCTV extends App.Events.Base
}
App.Events.addParagraph(el, r);
r = [];
- r.push(`The host quirks an eyebrow, then nods. "Alright," she says. "How about we start with that pool of yours?" She then strips her outer layer of clothing, showing off her own famously heavily pregnant figure in an inadequate bra and panties. She makes her way to the curative jelly filled pool, after your slave has been situated within it. Millie dips a toe into the substance and giggles. "Oh my, it tingles!"`);
+ r.push(`The host quirks an eyebrow, then nods. "Alright," she says. "How about we start with that pool of yours?" She then strips her outer layer of clothing, showing off her own famously heavily pregnant figure in an inadequate bra and panties. She makes her way to the curative jelly-filled pool, after your slave has been situated within it. Millie dips a toe into the substance and giggles. "Oh my, it tingles!"`);
App.Events.addParagraph(el, r);
r = [];
if (canTalk(slave)) {
@@ -522,7 +525,7 @@ App.Events.rePregInventorFCTV = class rePregInventorFCTV extends App.Events.Base
} else if (hasAnyArms(slave)) {
r.push(`Your slave signs that this was the best method ${he} could think of to keep ${himself} pretty for you, given ${his} size, then starts moaning as a grinning Millie seems to have started enacting her revenge.`);
} else {
- r.push(`Your slave's speaker explains that this was the best method the broodmother could think of to keep ${himself} pretty for you, given ${his} size. The baby laden breeder starts moaning in the middle of ${his} assistant's description as a grinning Millie seems to have taken this opportunity to start enacting her revenge.`);
+ r.push(`Your slave's speaker explains that this was the best method the broodmother could think of to keep ${himself} pretty for you, given ${his} size. The baby-laden breeder starts moaning in the middle of ${his} assistant's description as a grinning Millie seems to have taken this opportunity to start enacting her revenge.`);
}
r.push(`Millie has turned her body sideways and snaked an arm between`);
if (slave.boobs >= 20000) {
@@ -543,7 +546,7 @@ App.Events.rePregInventorFCTV = class rePregInventorFCTV extends App.Events.Base
);
App.Events.addParagraph(el, r);
r = [];
- r.push(`They both exit the pool, dripping clear, slippery gel onto the wood floor of "Husbandry with Millie"'s set. Without a thorough rinsing, your slave's slathered up belly will be dripping for an hour or more, and ${he} seems to know that as ${he} motions to stop ${his} assistants from wiping ${him} off before strapping ${him} into ${his} aerial gymnastics maternity swing. As a result, when the two visibly panting preggos are strapped into the machine and elevated several`);
+ r.push(`They both exit the pool, dripping clear, slippery gel onto the wood floor of "Husbandry with Millie"'s set. Without a thorough rinsing, your slave's slathered-up belly will be dripping for an hour or more, and ${he} seems to know that as ${he} motions to stop ${his} assistants from wiping ${him} off before strapping ${him} into ${his} aerial gymnastics maternity swing. As a result, when the two visibly panting preggos are strapped into the machine and elevated several`);
if (V.showInches === 2) {
r.push(`feet`);
} else {
diff --git a/src/events/RE/rePregInventorInvite.js b/src/events/RE/rePregInventorInvite.js
index ac6f4262f3ba07d01f40b0eda2ee4c917475a1d0..543ec460c7cb7ad6c02bd28ba49cee429cb8cd66 100644
--- a/src/events/RE/rePregInventorInvite.js
+++ b/src/events/RE/rePregInventorInvite.js
@@ -13,7 +13,7 @@ App.Events.rePregInventorInvite = class rePregInventorInvite extends App.Events.
s => s.ovaries === 1,
canDoVaginal,
canSee,
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.fuckdoll === 0,
s => (s.devotion > 90 && s.trust > 50) || s.sexualFlaw === "breeder",
s => s.intelligence + s.intelligenceImplant > 50
@@ -54,12 +54,7 @@ App.Events.rePregInventorInvite = class rePregInventorInvite extends App.Events.
r = [];
r.push(`Once ${he} is safely resting on the ground, your slave`);
if (hasAnyArms(slave)) {
- r.push(`pushes up against it, stretching so that ${he} `);
- if (canSee(slave)) {
- r.push(`can look you in the eyes.`);
- } else {
- r.push(`is face-to-face with you.`);
- }
+ r.push(`pushes up against it, stretching so that ${he} can look you in the eyes.`);
} else {
r.push(`blushes and wiggles ${his} stumps, looking down.`);
}
@@ -97,9 +92,9 @@ App.Events.rePregInventorInvite = class rePregInventorInvite extends App.Events.
r.push(`"${Master}," ${he} ${say}s, "I want the whole world to love hyperpregnant baby machines as much as I do. I know it's selfish, but I've been looking into ways to make sex with broodmothers even better than it already is. It feels great to get fucked while I'm so packed full and helpless, but, if you'll let me try, I've got some ideas for making it even better for broodmothers. And, more importantly, ${Master}, for you and any other potential partners, too."`);
} else {
if (hasAnyArms(slave)) {
- r.push(`${He} explains through gestures that ${he}'s been thinking of ways to make sex with overly pregnant slaves more convenient and enjoyable and would like your permission to develop them.`);
+ r.push(`${He} explains through gestures that ${he}'s been thinking of ways to make sex with overly pregnant slaves more convenient and enjoyable, and would like your permission to develop them.`);
} else {
- r.push(`Your assistant explains that the ${girl} has been thinking of ways to make sex with overly pregnant slaves more convenient and enjoyable and would like your permission to develop them.`);
+ r.push(`Your assistant explains that the ${girl} has been thinking of ways to make sex with overly pregnant slaves more convenient and enjoyable, and would like your permission to develop them.`);
}
}
@@ -192,7 +187,7 @@ App.Events.rePregInventorInvite = class rePregInventorInvite extends App.Events.
if (slave.lips > 95) {
r.push(`plush mouth pussy`);
} else if (slave.lips > 70) {
- r.push(`thick, dick sucking lips`);
+ r.push(`thick, dick-sucking lips`);
} else if (slave.lips > 20) {
r.push(`lips`);
} else {
@@ -233,7 +228,7 @@ App.Events.rePregInventorInvite = class rePregInventorInvite extends App.Events.
);
} else {
if (hasAnyArms(slave)) {
- r.push(`${He} signs to you, begging you to keep feeding ${him} your cum as ${he}'s eating for a lot more than two.`);
+ r.push(`${He} signs to you, begging you to keep feeding ${him} your cum, as ${he}'s eating for a lot more than two.`);
} else {
r.push(`${He} then nuzzles your crotch possessively, looking up at your face with devoted eyes.`);
}
@@ -250,7 +245,7 @@ App.Events.rePregInventorInvite = class rePregInventorInvite extends App.Events.
);
} else {
if (hasAnyArms(slave)) {
- r.push(`${He} signs to you, begging you to keep feeding ${him} your pussy juice as ${he}'s eating for a lot more than two.`);
+ r.push(`${He} signs to you, begging you to keep feeding ${him} your pussy juice, as ${he}'s eating for a lot more than two.`);
} else {
r.push(`${He} then nuzzles your crotch possessively, looking up at your face with devoted eyes.`);
}
@@ -297,11 +292,11 @@ App.Events.rePregInventorInvite = class rePregInventorInvite extends App.Events.
}
r.push(`and, as the description continues, you move around behind your broodmother, pushing ${him} up onto ${his} tremendous womb so that you can fuck ${him} against it. ${His} belly squashes down slightly under your weight, but less than you'd expect — ${he}'s so packed full of children that ${his} stomach resists changing shape. ${He} wiggles ${his} hips as you`);
if (slave.butt > 11) {
- r.push(`sink face first into ${his} warm, room filling ass cleavage`);
+ r.push(`sink face first into ${his} warm, room-filling ass cleavage`);
} else if (slave.butt > 5) {
r.push(`grab generous handfuls of ${his} humongous ass`);
} else if ((slave.buttImplant / slave.butt) > .60) {
- r.push(`rest the weight of your upper body on ${his} implant inflated ass cheeks`);
+ r.push(`rest the weight of your upper body on ${his} implant-inflated ass cheeks`);
} else if (slave.butt > 2) {
r.push(`slap ${his} generous ass`);
} else {
diff --git a/src/events/RE/rePregInventorShowOff.js b/src/events/RE/rePregInventorShowOff.js
index 253d4c39e3455a8687d8e09d01dedb1b085f1152..30fa6ac21e85327c2196443fdd8fc355ee7728a2 100644
--- a/src/events/RE/rePregInventorShowOff.js
+++ b/src/events/RE/rePregInventorShowOff.js
@@ -10,7 +10,7 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
[
s => s.ID === V.pregInventorID,
s => s.bellyPreg >= 600000,
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.fuckdoll === 0,
s => s.devotion > 50
],
@@ -73,7 +73,7 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
seX(slave, "vaginal", V.PC, "penetrative");
App.Events.addParagraph(frag, r);
r = [];
- r.push(`With gentle coaching from your slave, you rotate the two of you in the air so that ${he} can ride you reverse cowgirl style. ${VCheck.Vaginal(slave, 2)} You then switch ${him} around, allowing ${his} belly to eclipse your vision entirely as ${he} rides you in the traditional cowgirl position. The contents of ${his} womb have exploded its weight to the point that this position would have previously been hazardous to both your health and ${hers}, if not completely impossible, and the illusion of having sex while perpetually on the knife's edge of being flattened by literal tons of baby packed slave flesh sends you over the edge. You`);
+ r.push(`With gentle coaching from your slave, you rotate the two of you in the air so that ${he} can ride you reverse cowgirl style. ${VCheck.Vaginal(slave, 2)} You then switch ${him} around, allowing ${his} belly to eclipse your vision entirely as ${he} rides you in the traditional cowgirl position. The contents of ${his} womb have exploded its weight to the point that this position would have previously been hazardous to both your health and ${hers}, if not completely impossible, and the illusion of having sex while perpetually on the knife's edge of being flattened by literal tons of baby-packed slave flesh sends you over the edge. You`);
if (V.PC.dick !== 0) {
r.push(`ejaculate into ${him}, your cum dripping out of ${his} vagina, splattering on the ground below.`);
} else {
@@ -107,19 +107,21 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
} else if (slave.butt > 5) {
r.push(`huge ass`);
} else if ((slave.buttImplant / slave.butt) > .60) {
- r.push(`implant swollen ass cheeks`);
+ r.push(`implant-swollen ass cheeks`);
} else if (slave.butt > 2) {
r.push(`plump ass`);
} else {
r.push(`slender ass`);
}
- r.push(`and then shakes ${his} booty, glancing over ${his} shoulder to `);
+ r.push(`and then shakes ${his} booty,`);
if (canSee(slave)) {
- r.push(`see`);
+ r.push(`glancing over ${his} shoulder to see`);
+ } else if (canHear(slave)) {
+ r.push(`turning ${his} head to hear`);
} else {
- r.push(`judge`);
+ r.push(`waiting patiently to find out`);
}
- r.push(`how you react. You motion for ${him} to continue and ${he} turns around and approaches you, stopping only when ${his} massive belly is looming in front of you, almost touching you. You look over the apex of ${his} stomach to consider the "invention" ${he}'s developed to enable ${his} miraculous mobility.`);
+ r.push(`how you react. You prompt ${him} to continue and ${he} turns around and approaches you, stopping only when ${his} massive belly is looming in front of you, almost touching you. You look over the apex of ${his} stomach to consider the "invention" ${he}'s developed to enable ${his} miraculous mobility.`);
App.Events.addParagraph(frag, r);
r = [];
r.push(`A significant number of menial slaves have been repurposed and specially trained to aid your hyperbroodmother and ${his} incredible belly. These menials,`);
@@ -140,7 +142,12 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
} else if (V.arcologies[0].FSHedonisticDecadence > 60) {
r.push(`surprisingly strong, given how plush they are, and well suited for their job,`);
} else if (V.arcologies[0].FSChattelReligionist > 60) {
- r.push(`dressed in skimpy monks habits and eyes flashing with exalted fervor as they go about their duties,`);
+ if (V.arcologies[0].FSChattelReligionistLaw2 === 0) {
+ r.push(`dressed in skimpy monks habits`);
+ } else {
+ r.push(`completely nude`);
+ }
+ r.push(`and eyes flashing with exalted fervor as they go about their duties,`);
} else if (V.arcologies[0].FSYouthPreferentialist > 60) {
r.push(`just barely the legal age for consent in your arcology and clearly eager to prove themselves,`);
} else if (V.arcologies[0].FSMaturityPreferentialist > 60) {
@@ -162,13 +169,7 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
} else if (V.arcologies[0].FSAztecRevivalist > 60) {
r.push(`clad only in exotic feathers,`);
} else if (V.arcologies[0].FSEgyptianRevivalist > 60) {
- r.push(`dressed in `);
- if (hasAnyLegs(slave)) {
- r.push(`ankle-length`);
- } else {
- r.push(`long`);
- }
- r.push(`tarkhans made of brass and turquoise colored beads,`);
+ r.push(`dressed in ankle-length tarkhans made of brass and turquoise colored beads,`);
} else if (V.arcologies[0].FSEdoRevivalist > 60) {
r.push(`dressed in skimpy noh theater costumes,`);
} else if (V.arcologies[0].FSArabianRevivalist > 60) {
@@ -221,7 +222,7 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
r.push(`${His} servants spin ${him} again, giving you a glorious view of ${his}`);
}
if (slave.boobs >= 20000) {
- r.push(`eye wateringly massive tits`);
+ r.push(`eye-wateringly massive tits`);
} else if (slave.boobs >= 3000) {
r.push(`huge tits`);
} else if ((slave.boobsImplant / slave.boobs) >= .60) {
@@ -231,13 +232,13 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
}
r.push(`and`);
if (slave.butt > 11) {
- r.push(`couch smothering ass cheeks.`);
+ r.push(`couch-smothering ass cheeks.`);
} else if (slave.butt > 5) {
r.push(`enormous ass.`);
} else if ((slave.buttImplant / slave.butt) > .60) {
r.push(`implant-filled ass.`);
} else if (slave.butt > 2) {
- r.push(`delicious looking ass.`);
+ r.push(`delicious-looking ass.`);
} else {
r.push(`small ass.`);
}
@@ -274,11 +275,13 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
r.push(`${He}'s spinning around the pole now, reminding you of ${his} earlier motions. ${He} seems weightless, ${his} massive bulk perfectly supported regardless of the personal cost to those supporting ${him}. Your gaze turns to several motionless servants who have been knocked unconscious by ${his} careening bulk. They're piled up against a side wall, but inconspicuous. You can't recall when they collapsed, or when they were dragged away. The passiveness with which your slave's glorified human clothing moves makes even the collapsed menials seem natural and perfectly reasonable — just something that happens when your hyperbroodmother exercises ${his} body, sometimes. Not an abuse of another person. More like flexing a limb.`);
App.Events.addParagraph(frag, r);
r = [];
- r.push(`${His} servants surge upward, piling on top of each other and rotating ${him}. ${He} flips upside down and, for a moment, you worry that ${he} might fall with disastrous consequences. The mass of human bodies working in tandem to protect and enable ${him} executes its motions in perfect synchrony, however, and you are treated to the sight of an impossibly pregnant slave spinning upside down, hooking one`);
+ r.push(`${His} servants surge upward, piling on top of each other and rotating ${him}. ${He} flips upside down and, for a moment, you worry that ${he} might fall with disastrous consequences. The mass of human bodies working in tandem to protect and enable ${him} executes its motions in perfect synchrony, however, and you are treated to the sight of an impossibly pregnant slave`);
if (hasAnyLegs(slave)) {
- r.push(legs);
+ r.push(`spinning upside down, hooking one leg around a stripper pole,`);
+ } else {
+ r.push(`spinning upside down`);
}
- r.push(`around a stripper pole, and performing a slow, effortless body inversion, ${his} massive upside down belly rotating just a split second slower than the rest of ${him}. ${He} rotates some more and then flips back into a normal standing position, leaning over ${his} stomach and once again slightly crushing ${his} now visibly exhausted servants as ${he} performs a mock bow.`);
+ r.push(`and performing a slow, effortless body inversion, ${his} massive upside down belly rotating just a split second slower than the rest of ${him}. ${He} rotates some more and then flips back into a normal standing position, leaning over ${his} stomach and once again slightly crushing ${his} now visibly exhausted servants as ${he} performs a mock bow.`);
App.Events.addParagraph(frag, r);
r = [];
if (canTalk(slave)) {
@@ -307,7 +310,7 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
} else if (V.spaDecoration === "Repopulationist") {
r.push(`sight of all of the maternity aid devices scattered throughout the room. Whatever the nature of ${his} invention, your slave's toy is guaranteed to fit in well in these particular baths.`);
} else if (V.spaDecoration === "Eugenics") {
- r.push(`sight of the dualistic, caste based facilities.`);
+ r.push(`sight of the dualistic, caste-based facilities.`);
} else if (V.spaDecoration === "Pastoralist") {
r.push(`faint smell of milk that wafts through the room with the steam and the sight of the many aid devices that your hypermassive slaves absolutely require to make use of the facilities.`);
} else if (V.spaDecoration === "Asset Expansionist") {
@@ -323,7 +326,7 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
} else if (V.spaDecoration === "Youth Preferentialist") {
r.push(`carnival atmosphere created by the waterpark theming of the facilities.`);
} else if (V.spaDecoration === "Gender Radicalist") {
- r.push(`sight of the extreme penetration based pornography feeds streaming from the many screens set on the walls of the room.`);
+ r.push(`sight of the extreme penetration-based pornography feeds streaming from the many screens set on the walls of the room.`);
} else if (V.spaDecoration === "Gender Fundamentalist") {
r.push(`sight of the traditionalist pornographic feeds streaming from the many screens set on the walls of the room.`);
} else if (V.spaDecoration === "Maturity Preferentialist") {
@@ -337,7 +340,7 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
} else if (V.spaDecoration === "Aztec Revivalist") {
r.push(`sight of its golden idols and exotic animal trophies as well as the warm smell of tropical herbs.`);
} else if (V.spaDecoration === "Egyptian Revivalist") {
- r.push(`heavy perfumed air pervading the room and the sight of its warm, reed lined pools.`);
+ r.push(`heavy perfumed air pervading the room and the sight of its warm, reed-lined pools.`);
} else if (V.spaDecoration === "Edo Revivalist") {
r.push(`steam rising up off of the stone-lined onsen pools.`);
} else if (V.spaDecoration === "Arabian Revivalist") {
@@ -378,7 +381,7 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
} else if (hasAnyArms(slave)) {
r.push(`${He} motions to you in more formal greetings and then lets out an involuntary moan of pleasure, rubbing at the sides of ${his} tremendous belly. ${He} beckons you to enter the pool.`);
} else {
- r.push(`${He} is limbless as well as mute, so ${he} can't greet you more formally, but ${his} pleasurable, incomprehensible moaning and the way ${he} presses ${his} stumps into ${his} monstrously inflated, baby packed belly makes it clear to you that ${he}'s happy to see you. You decide to get into the pool to try out your slave's invention for yourself.`);
+ r.push(`${He} is limbless as well as mute, so ${he} can't greet you more formally, but ${his} pleasurable, incomprehensible moaning and the way ${he} presses ${his} stumps into ${his} monstrously inflated, baby-packed belly makes it clear to you that ${he}'s happy to see you. You decide to get into the pool to try out your slave's invention for yourself.`);
}
App.Events.addParagraph(frag, r);
r = [];
@@ -460,13 +463,15 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
r.push(`Your arousal gives you an idea, and you push back on your hyperbroodmother's colossal belly. ${He} steps away from you until ${he} is in the center of the pool, a look of confusion on ${his} face. You take control of the remote and then manipulate the reticulating frame supporting the pool such that it lifts the floor, slowly rendering both you and your colossal-bellied breeder knee deep in the warm gel. You hunker down into an aggressive, combative stance and`);
if (hasAnyCyberneticEyes(slave)) {
r.push(`${his} ${App.Desc.eyesColor(slave, "synthetic")} flash white for a moment as a look of understanding dawns on ${his} face.`);
- } else {
+ } else if (canSee(slave)) {
r.push(`a look of understanding lights up in ${his} ${App.Desc.eyesColor(slave)}.`);
+ } else {
+ r.push(`a look of understanding spreads on ${his} face as ${he} ${canHear(slave) ? `hears and ` : ``}feels the ripples of your exaggerated motions in the thick gel.`);
}
if (!canTalk(slave)) {
if (hasAnyArms(slave)) {
r.push(`${He} waves ${his} ${arms} in mock dismay`);
- if (slave.skill.combat > 0) {
+ if (slave.skill.combat > 30) {
r.push(`and lowers ${his} guard`);
}
r.push(`as you prepare to wrestle ${him} in the pool of goop.`);
@@ -474,7 +479,7 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
r.push(`${He} waves ${his} stubs in mock dismay as you prepare to wrestle ${him} in the pool of goop.`);
}
} else {
- r.push(Spoken(slave, `"Oh no,"`), `${he} ${say}s in mock dismay${(slave.skill.combat > 0) ? `, lowering ${his} guard` : ``}. "My ${Master} is going to wrestle me into submission in this hot, heavy, goo pool. Whatever will I do?"`);
+ r.push(Spoken(slave, `"Oh no,"`), `${he} ${say}s in mock dismay${(slave.skill.combat > 30) ? `, lowering ${his} guard` : ``}. "My ${Master} is going to wrestle me into submission in this hot, heavy, goo pool. Whatever will I do?"`);
}
r.push(`You circle around ${him}, slowly approaching ${him}, and ${he} uses the pool's mobility assistance tools to rotate ${his} body so that ${he} can just barely keep you in ${his} gaze, drizzling gel over ${his} belly as ${he} keeps it between you and ${him} to use as a protective barrier. When you're close enough to touch the apex of ${his} fecund body, you leap forward through the gel, diving to one side and disappearing under it. Your momentum carries you a reasonable distance despite the resistance of the thick substance and you pop back up directly behind ${him}. You grab ${him} under ${his} armpits, pressing your`);
if (V.PC.dick !== 0) {
@@ -535,7 +540,7 @@ App.Events.rePregInventorShowOff = class rePregInventorShowOff extends App.Event
slave.trust -= 4;
slave.devotion -= 10;
} else {
- r.push(`The look of pride and accomplishment on ${his} face transforms into a look of disappointment. <span class="trust dec">${slave.slaveName} finds you less trust worthy</span> as a result of your unkindness, but ${he} soon gets over ${his} disappointment and begins thinking of ways to truly impress you.`);
+ r.push(`The look of pride and accomplishment on ${his} face transforms into a look of disappointment. <span class="trust dec">${slave.slaveName} finds you less trustworthy</span> as a result of your unkindness, but ${he} soon gets over ${his} disappointment and begins thinking of ways to truly impress you.`);
slave.trust -= 4;
}
App.Events.addParagraph(frag, r);
diff --git a/src/events/RE/reRelationshipAdvice.js b/src/events/RE/reRelationshipAdvice.js
index ae286e23d9baaf42164b273540755412a280891a..3f3d513d66eef68ba68a2a3a499382b595ac131d 100644
--- a/src/events/RE/reRelationshipAdvice.js
+++ b/src/events/RE/reRelationshipAdvice.js
@@ -1,7 +1,7 @@
App.Events.RERelationshipAdvice = class RERelationshipAdvice extends App.Events.BaseEvent {
actorPrerequisites() {
return[[
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
canTalk,
@@ -199,7 +199,7 @@ App.Events.RERelationshipAdvice = class RERelationshipAdvice extends App.Events.
Spoken(slave, `to be your top."`),
` ${relSlave.slaveName} looks relieved that that's all it is, and ${agrees()} ${He2} sidles up to ${slave.slaveName}, looking up at ${him} submissively.`
);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(
Spoken(slave, `to be your bottom."`),
` ${relSlave.slaveName} looks relieved that that's all it is, and says, ${agrees()} `
@@ -266,7 +266,7 @@ App.Events.RERelationshipAdvice = class RERelationshipAdvice extends App.Events.
r.push(`holding you down.`);
} else if (slave.fetish === "dom") {
r.push(`topping you.`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`being your bottom.`);
} else if (slave.fetish === "boobs") {
r.push(`fucking your boobs.`);
diff --git a/src/events/RE/reRelativeRecruiter.js b/src/events/RE/reRelativeRecruiter.js
index 7ceacf88562d2e16de5481f847b90d22e4752ffd..8d2e6a2ec87ec1a3d463bf223d6dbfe15bf9ab6b 100644
--- a/src/events/RE/reRelativeRecruiter.js
+++ b/src/events/RE/reRelativeRecruiter.js
@@ -6,7 +6,7 @@ App.Events.RERelativeRecruiter = class RERelativeRecruiter extends App.Events.Ba
actorPrerequisites() {
return [
[ // first actor - recruiter
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.fuckdoll === 0,
s => s.devotion > 50,
s => s.canRecruit === 1,
@@ -229,7 +229,7 @@ App.Events.RERelativeRecruiter = class RERelativeRecruiter extends App.Events.Ba
if (eventSlave.fetish === "cumslut") {
t.push(Spoken(eventSlave, `the taste of your cum`));
- } else if (eventSlave.fetish === "submissive") {
+ } else if (eventSlave.fetish === Fetish.SUBMISSIVE) {
t.push(Spoken(eventSlave, `submission`));
} else if (eventSlave.fetish === "humiliation") {
t.push(Spoken(eventSlave, `being treated like a dirty slut`));
@@ -264,7 +264,7 @@ App.Events.RERelativeRecruiter = class RERelativeRecruiter extends App.Events.Ba
if (eventSlave.fetish === "cumslut") {
t.push(Spoken(eventSlave, `We could blow you at the same time, ${Master}! And share cum!"`));
- } else if (eventSlave.fetish === "submissive") {
+ } else if (eventSlave.fetish === Fetish.SUBMISSIVE) {
t.push(Spoken(eventSlave, `You could use us together, ${Master}!"`));
} else if (eventSlave.fetish === "humiliation") {
t.push(Spoken(eventSlave, `You could make us fuck each other in public, ${Master}!"`));
@@ -589,8 +589,9 @@ App.Events.RERelativeRecruiter = class RERelativeRecruiter extends App.Events.Ba
const origSlave = BaseSlave();
const genepoolRec = V.genePool.find(s => s.ID === that.actors[0]);
App.Entity.Utils.GenePoolRecordCleanup(genepoolRec);
- Object.assign(origSlave, genepoolRec);
+ deepAssign(origSlave, genepoolRec);
updateGPRecordAgeFromEventSlave(origSlave);
+ generatePronouns(origSlave);
const newSlave = generateRelatedSlave(origSlave, that.params.relative);
clearMods(newSlave);
diff --git a/src/events/RE/reRoyalBlood.js b/src/events/RE/reRoyalBlood.js
index 8ceca921623800fd1ea4fd83389968a5fe8f92a3..6f02d3fc4d26ded7ab4b901feb8f72aef2cf14f2 100644
--- a/src/events/RE/reRoyalBlood.js
+++ b/src/events/RE/reRoyalBlood.js
@@ -394,7 +394,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
// Queen
repX(-queenSF, "event", queen);
}
- newSlave(queen); // skip New Slave Intro
text.append(App.UI.newSlaveIntro(queen));
@@ -736,7 +735,7 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
slave.intelligenceImplant = 15;
slave.skill.anal = 0;
slave.skill.oral = 0;
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
setHealth(slave, jsRandom(30, 60), 0, 0, 0, 0);
slave.behavioralFlaw = either("arrogant", "bitchy");
diff --git a/src/events/RE/reShelterInspection.js b/src/events/RE/reShelterInspection.js
index 709782727e7a3a02b502dac32ddea9d72c1bd8a8..9c445ee2c64da348b2319ea9e00d5d7e20b4083d 100644
--- a/src/events/RE/reShelterInspection.js
+++ b/src/events/RE/reShelterInspection.js
@@ -264,7 +264,7 @@ App.Events.REShelterInspection = class REShelterInspection extends App.Events.Ba
if (isAmputee(inspectee) && !isAmputee(originSlave)) {
r.push(`You may have lopped off the poor ${girl}'s arms and legs, a fact not lost on the inspector. ${He2} can barely conceal ${his2} terror as ${he2} makes lengthy notes on ${his2} tablet before practically running out of the penthouse.`);
V.shelterAbuse += 10;
- } else if (inspectee.fetish === "mindbroken") {
+ } else if (inspectee.fetish === Fetish.MINDBROKEN) {
if (inspectee.origin === "You got $him at the Slave Shelter. $He has never communicated anything about $his background, since $he arrived at the shelter with a broken mind.") {
r.push(`Of course, the poor ${girl} is just as mindbroken as ever. The inspector asks some cursory questions and gives up.`);
r.push(Spoken(inspector, `"Don't worry,"`));
@@ -490,7 +490,7 @@ App.Events.REShelterInspection = class REShelterInspection extends App.Events.Ba
*/
if (inspectee.origin === "You got $him at the Slave Shelter. $He has never communicated anything about $his background, since $he arrived at the shelter with a broken mind.") {
- if (inspectee.fetish === "mindbroken") {
+ if (inspectee.fetish === Fetish.MINDBROKEN) {
r.push(`Of course, the poor ${girl} is just as mindbroken as ever. The inspector asks some cursory questions and gives up. "Don't worry," ${he2} ${say2}s.`);
r.push(Spoken(inspector, `"I know ${he} was like this when you got ${him}. Just - just keep trying, would you?"`));
r.push(`${He2} leaves, looking bitter.`);
@@ -505,7 +505,7 @@ App.Events.REShelterInspection = class REShelterInspection extends App.Events.Ba
V.shelterAbuse -= 5;
}
} else if (inspectee.origin === "You got $him at the Slave Shelter. $He was found unresponsive in the lower arcology with a gaping pussy and deflated belly. It is unclear what happened to $him.") {
- if (inspectee.fetish === "mindbroken") {
+ if (inspectee.fetish === Fetish.MINDBROKEN) {
r.push(`Of course, the poor ${girl} is just as mindbroken as ever. The inspector asks some cursory questions and gives up.`);
r.push(Spoken(inspector, `"Don't worry,"`));
r.push(`${he2} ${say2}s.`);
@@ -535,7 +535,7 @@ App.Events.REShelterInspection = class REShelterInspection extends App.Events.Ba
r.push(`You swear ${he2} seems in much better spirits as ${he2} leaves your penthouse, even though ${he2} forgot to check ${his} pussy.`);
V.shelterAbuse -= 5;
}
- } else if (inspectee.fetish === "mindbroken") {
+ } else if (inspectee.fetish === Fetish.MINDBROKEN) {
r.push(`Of course, the poor ${girl} is mindbroken now. The inspector is horrified, though ${he2} tries to conceal it. ${He2} makes lengthy notes on ${his2} tablet, and almost runs out of the penthouse.`);
V.shelterAbuse += 5;
} else if (inspectee.voice === 0) {
@@ -695,7 +695,7 @@ App.Events.REShelterInspection = class REShelterInspection extends App.Events.Ba
r.push(Spoken(inspectee, `"I'm a milk cow!"`));
r.push(`The inspector arches an eyebrow skeptically, and the slave continues,`);
r.push(Spoken(inspectee, `"I give milk. See?"`));
- r.push(`${He} expresses a squirt of ${inspectee.milkFlavor === "none" ? `` : `${inspectee.milkFlavor} flavored `}milk from one nipple.`);
+ r.push(`${He} expresses a squirt of ${inspectee.milkFlavor === "none" ? `` : `${inspectee.milkFlavor}-flavored `}milk from one nipple.`);
r.push(Spoken(inspectee, `"It's a nice life. I'm much happier with my current owner, thank you."`));
r.push(`The inspector looks pleased, and ${say2}s ${he2}'ll put out a <span class="reputation inc">good word</span> about you.`);
repX(500, "event", inspectee);
diff --git a/src/events/RE/reShowerPunishment.js b/src/events/RE/reShowerPunishment.js
index 6f3bc05fe77eaa77160450dd4f37ddbf826a5920..4c91c98befc14d1db2e4a9b3b552f76b2e63edd0 100644
--- a/src/events/RE/reShowerPunishment.js
+++ b/src/events/RE/reShowerPunishment.js
@@ -9,7 +9,7 @@ App.Events.REShowerPunishment = class REShowerPunishment extends App.Events.Base
return [[
(s) => s.devotion <= 50,
(s) => s.anus !== 0,
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
canDoAnal,
hasAnyLegs,
hasAnyArms,
diff --git a/src/events/RE/reSiblingPlease.js b/src/events/RE/reSiblingPlease.js
index fa663935d92fcfe30c16ed8f9460299ef162fc0f..4f7d39989acf0c940eb85e1c06c5ff665582fac6 100644
--- a/src/events/RE/reSiblingPlease.js
+++ b/src/events/RE/reSiblingPlease.js
@@ -14,7 +14,7 @@ App.Events.RESiblingPlease = class RESiblingPlease extends App.Events.BaseEvent
canTalk,
canHear,
canMove,
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.devotion > 50,
s => s.trust > 50,
hasAnyEyes, // for winking
diff --git a/src/events/RE/reSlaveMarriage.js b/src/events/RE/reSlaveMarriage.js
index 6e221b477f33f95dba0c91f5125d824361466e3e..38eaba48f9ae7407caac675c702e6c0df6ece23d 100644
--- a/src/events/RE/reSlaveMarriage.js
+++ b/src/events/RE/reSlaveMarriage.js
@@ -1,7 +1,7 @@
App.Events.RESlaveMarriage = class RESlaveMarriage extends App.Events.BaseEvent {
actorPrerequisites() {
return[[
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canMove,
(s) => s.relationship === 4,
diff --git a/src/events/RE/reSnatchAndGrabFollowup.js b/src/events/RE/reSnatchAndGrabFollowup.js
index 52b48d67563640706a1787ab758774b32dc3a303..b3a5840edc28d9829125a0e53d77a46a61332ea0 100644
--- a/src/events/RE/reSnatchAndGrabFollowup.js
+++ b/src/events/RE/reSnatchAndGrabFollowup.js
@@ -13,7 +13,7 @@ App.Events.RESnatchAndGrabFollowup = class RESnatchAndGrabFollowup extends App.E
(s) => s.newGamePlus === 0,
(s) => s.health.condition > 25,
(s) => s.devotion > 50,
- (s) => s.fetish !== "mindbroken"
+ (s) => s.fetish !== Fetish.MINDBROKEN
]];
}
diff --git a/src/events/RE/reStandardPunishment.js b/src/events/RE/reStandardPunishment.js
index 74e339eecf2cb5fbe1a2e5508a92439dc5315e25..31f7349244e43a9aea4d5d4fa887e4258fc647b4 100644
--- a/src/events/RE/reStandardPunishment.js
+++ b/src/events/RE/reStandardPunishment.js
@@ -562,7 +562,7 @@ App.Events.REStandardPunishment = class REStandardPunishment extends App.Events.
} else {
r.push(`shriek`);
}
- r.push(`at ${him} to run! ${He} takes off,`);
+ r.push(`at ${him} to <b><i>RUN!</i></b> ${He} takes off,`);
if (!canWalk(slave)) {
r.push(`crawling as fast as ${his} body will let ${him}. Sure ${he} isn't running, since ${he} can't, but ${he} is struggling along at an impressive pace.`);
} else if (shoeHeelCategory(slave) === 3) {
diff --git a/src/events/RECI/butthole.js b/src/events/RECI/butthole.js
index 9e1ae161fe224d9157101df7e88106f63617ff3d..75e80fdd25cd7502b8ed5da5c6fcf35455a60bd8 100644
--- a/src/events/RECI/butthole.js
+++ b/src/events/RECI/butthole.js
@@ -6,7 +6,7 @@ App.Events.RECIButthole = class RECIButthole extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => V.REButtholeCheckinIDs.includes(s.ID),
s => s.assignment !== Job.QUARTER,
s => s.devotion > 50,
@@ -233,7 +233,7 @@ App.Events.RECIButthole = class RECIButthole extends App.Events.BaseEvent {
(S.HeadGirl && eventSlave.ID !== V.HeadGirlID)
? new App.Events.Result(`Double anal with the Head Girl`, () => DoubleTeam(S.HeadGirl))
: new App.Events.Result(),
- (S.Concubine && eventSlave.ID !== V.ConcubineID && hasAnyLegs(S.Concubine) && hasAnyArms(S.Concubine) && S.Concubine.fetish !== "mindbroken")
+ (S.Concubine && eventSlave.ID !== V.ConcubineID && hasAnyLegs(S.Concubine) && hasAnyArms(S.Concubine) && S.Concubine.fetish !== Fetish.MINDBROKEN)
? new App.Events.Result(`Double anal with your Concubine`, () => DoubleTeam(S.Concubine))
: new App.Events.Result(),
(S.Bodyguard && eventSlave.ID !== V.BodyguardID)
diff --git a/src/events/RECI/feminization.js b/src/events/RECI/feminization.js
index 3437a508cb589cfd8ffba1b8ff207ea3a98837c2..354db278cf88d92de3df8704b883506619305c4c 100644
--- a/src/events/RECI/feminization.js
+++ b/src/events/RECI/feminization.js
@@ -6,7 +6,7 @@ App.Events.RECIFeminization = class RECIFeminization extends App.Events.BaseEven
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => V.REFeminizationCheckinIDs.includes(s.ID),
s => s.assignment !== Job.QUARTER,
s => s.devotion >= 10,
@@ -83,7 +83,7 @@ App.Events.RECIFeminization = class RECIFeminization extends App.Events.BaseEven
t.push(Spoken(eventSlave, `But, ${Master}, girls suck cock. And I love sucking cock so much. If that makes me a girl then I'm happy being a girl.`));
} else if (eventSlave.fetish === "pregnancy" && eventSlave.fetishStrength > 60) {
t.push(Spoken(eventSlave, `But, ${Master}, girls get bred. And I love being held down and bred. If that makes me a girl then I'm happy being a girl.`));
- } else if ((eventSlave.fetish === "submissive" || eventSlave.fetish === "masochist") && eventSlave.fetishStrength > 60) {
+ } else if ((eventSlave.fetish === Fetish.SUBMISSIVE || eventSlave.fetish === "masochist") && eventSlave.fetishStrength > 60) {
t.push(Spoken(eventSlave, `But, ${Master}, girls get held down and fucked. And I love being used so much. If that makes me a girl then I'm happy being a girl.`));
} else if (eventSlave.boobs > 400) {
t.push(Spoken(eventSlave, `Getting a girl's body made it easier for me, though. When I`));
diff --git a/src/events/RECI/futa.js b/src/events/RECI/futa.js
index 1b0235f088d337d2347d2b9f03ed8efa9c2872a7..f7b3c8251ad68114d7c514605c51d25c02785c91 100644
--- a/src/events/RECI/futa.js
+++ b/src/events/RECI/futa.js
@@ -6,7 +6,7 @@ App.Events.RECIFuta = class RECIFuta extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => V.REFutaSisterCheckinIDs.includes(s.ID),
s => s.assignment !== Job.QUARTER,
s => s.trust >= 10,
diff --git a/src/events/RECI/milf.js b/src/events/RECI/milf.js
index 2381280e9eaea2383362568ca4f2ff176d1288bc..25d1dd749b600ec4ed0cb05de881e593827ae234 100644
--- a/src/events/RECI/milf.js
+++ b/src/events/RECI/milf.js
@@ -6,7 +6,7 @@ App.Events.RECIMilf = class RECIMilf extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => V.REMILFCheckinIDs.includes(s.ID),
s => s.assignment !== Job.QUARTER,
s => s.devotion >= 10,
@@ -680,7 +680,7 @@ App.Events.RECIMilf = class RECIMilf extends App.Events.BaseEvent {
} else if (eventSlave.bellyImplant >= 2000) {
t.push(`massaging the taut skin of ${his} belly before teasing ${his} popped navel.`);
} else {
- t.push(`cupping the hugely bloated expanse of ${his} fluid filled middle.`);
+ t.push(`cupping the hugely bloated expanse of ${his} fluid-filled middle.`);
}
} else if (eventSlave.weight > 130) {
t.push(`fondling and groping the soft mass of ${his} hugely fat belly.`);
diff --git a/src/events/RECI/orientation.js b/src/events/RECI/orientation.js
index 8e64ed28482a7b09d9ab1ae0495aa3e62916b918..1b785e848af316b15fa97e46dc58ddb0d2e49d86 100644
--- a/src/events/RECI/orientation.js
+++ b/src/events/RECI/orientation.js
@@ -6,7 +6,7 @@ App.Events.RECIOrientation = class RECIOrientation extends App.Events.BaseEvent
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => V.REOrientationCheckinIDs.includes(s.ID),
s => s.assignment !== Job.QUARTER,
s => s.attrXY > 50,
diff --git a/src/events/RECI/ugly.js b/src/events/RECI/ugly.js
index e5d355168aab2a6d474b99a0d37ece8cbaff9c51..f889fe3eac9cc79c00e7d5d32c574509e5387f6a 100644
--- a/src/events/RECI/ugly.js
+++ b/src/events/RECI/ugly.js
@@ -6,7 +6,7 @@ App.Events.RECIUgly = class RECIUgly extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => V.REUglyCheckinIDs.includes(s.ID),
s => s.face >= -10,
s => (s.assignment === Job.PUBLIC || s.assignment === Job.WHORE),
diff --git a/src/events/REFI/reBestiality.js b/src/events/REFI/reBestiality.js
new file mode 100644
index 0000000000000000000000000000000000000000..7dffd8bdae233e70324adf60dfca18af89527049
--- /dev/null
+++ b/src/events/REFI/reBestiality.js
@@ -0,0 +1,164 @@
+App.Events.REFIBestiality = class REFIBestiality extends App.Events.BaseEvent {
+ eventPrerequisites() {
+ return [
+ () => !!V.seeBestiality,
+ () =>
+ V.animals.canine.map(c => getAnimal(c)).some(c => c.dick.size > 3) ||
+ V.animals.hooved.map(h => getAnimal(h)).some(h => h.dick.size > 3) ||
+ V.animals.feline.map(f => getAnimal(f)).some(f => f.dick.size > 3),
+ ];
+ }
+
+ /** @returns {Array<Array<actorPredicate>>} */
+ actorPrerequisites() {
+ return [
+ [ // event slave
+ s => App.Events.qualifiesForREFIeventSlave(s),
+ ],
+ [ // and subslave /subID
+ s => App.Events.qualifiesForREFIsubSlave(s, Fetish.BESTIALITY),
+ s => s.partners.has(-8),
+ ]
+ ];
+ }
+
+ execute(node) {
+ const [eventSlave, subSlave] = this.actors.map(a => getSlave(a));
+ const {His, he, his, him, himself} = getPronouns(eventSlave);
+ const {he: he2, his: his2, himself: himself2} = getPronouns(subSlave);
+ const {canine, hooved, feline} = V.animals;
+ const animals = [
+ ...canine.filter(c => getAnimal(c).dick.size > 3),
+ ...hooved.filter(h => getAnimal(h).dick.size > 3),
+ ...feline.filter(f => getAnimal(f).dick.size > 3),
+ ];
+ const animal = getAnimal(animals.random());
+ const subOral = !canDoVaginal(subSlave) && !canDoAnal(subSlave);
+ /** @type {FC.SlaveActs} */
+ const act = canDoVaginal(eventSlave) ? "vaginal" : canDoAnal(eventSlave) ? "anal" : "oral";
+
+ App.Events.drawEventArt(node, [eventSlave, subSlave], [eventSlave.clothes, "no clothing"]);
+
+ let t = [];
+ let hole = () => '';
+
+ if (canDoVaginal(subSlave)) {
+ hole = () => either('pussy', 'cunt', 'sex', 'slit');
+ } else if (canDoAnal(subSlave)) {
+ hole = () => either('asshole', 'rectum');
+ } else {
+ hole = () => either('throat', 'face');
+ }
+
+ t.push(`It's time for`);
+ t.push(contextualIntro(V.PC, subSlave, true));
+ t.push(`to receive ${his2} scheduled daily rutting, and ${he2}'s enjoying ${himself2} to an almost indecent degree as`);
+ if (subOral) {
+ t.push(`${he} takes the ${animal.name} as deep in ${his2} throat as ${he} can.`);
+ } else {
+ t.push(`the ${animal.name} pounds away at ${his2} ${hole()}.`);
+ }
+
+ t.push(`A small noise at the door alerts you to the fact that`);
+ t.push(contextualIntro(subSlave, eventSlave, true));
+ t.push(`is watching the proceedings with a raptorial focus. You call ${him} in.`);
+
+ App.Events.addParagraph(node, t);
+ t = [];
+
+ t.push(`${eventSlave.slaveName} hesitates before explaining ${himself}, and the ${SlaveTitle(eventSlave)} is obviously aroused:`);
+ if ((eventSlave.dick > 0) && (eventSlave.chastityPenis === 1)) {
+ t.push(`${he}'s got a string of precum leaking out of ${his} chastity cage.`);
+ } else if ((eventSlave.dick > 0) && (eventSlave.hormoneBalance >= 100)) {
+ t.push(`though ${his} hormone-filled body can't get ${his} dick hard any more, ${he}'s got a string of precum coming off ${his} member.`);
+ } else if (eventSlave.dick > 0 && eventSlave.balls > 0 && eventSlave.ballType === "sterile") {
+ t.push(`though ${his} useless balls can't muster the effort to get ${his} dick hard any more, ${he}'s got a string of precum coming off ${his} limp member.`);
+ } else if ((eventSlave.dick > 0) && (eventSlave.balls === 0)) {
+ t.push(`though ${his} gelded body can't get ${his} dick hard any more, ${he}'s got a string of precum coming off ${his} limp member.`);
+ } else if (canAchieveErection(eventSlave)) {
+ if (eventSlave.dick > 4) {
+ t.push(`${his} gigantic cock is standing out like a mast.`);
+ } else if (eventSlave.dick > 2) {
+ t.push(`${he}'s sporting an impressive erection.`);
+ } else if (eventSlave.dick > 0) {
+ t.push(`${his} little penis is rock hard.`);
+ }
+ } else if (eventSlave.dick > 7) {
+ t.push(`${he}'s got a string of precum coming off ${his} engorged member.`);
+ } else if (eventSlave.dick > 0) {
+ t.push(`${he}'s got a string of precum coming off ${his} limp member.`);
+ } else if (eventSlave.clit > 0) {
+ t.push(`${his} large clit is visibly engorged.`);
+ } else if (eventSlave.vagina > -1) {
+ if (eventSlave.nipples !== "fuckable") {
+ t.push(`${his} nipples are hard and`);
+ }
+ t.push(`there's a sheen on ${his} pussylips.`);
+ } else if (eventSlave.balls > 0) {
+ if (eventSlave.nipples !== "fuckable") {
+ t.push(`${his} nipples are hard and`);
+ }
+ t.push(`there is a distinct dribble of precum running from ${his} featureless crotch.`);
+ } else {
+ if (eventSlave.nipples !== "fuckable") {
+ t.push(`${his} nipples are hard and`);
+ }
+ t.push(`there is a clear scent of lust around ${him}.`);
+ }
+ t.push(`It seems ${he} passed by while the animal was enjoying ${subSlave.slaveName} and found the`);
+ if (canSee(eventSlave)) {
+ t.push(`sight`);
+ } else if (canHear(eventSlave)) {
+ t.push(`sounds`);
+ } else {
+ t.push(`sensations`);
+ }
+ t.push(`rather compelling. It should be possible to either encourage this fascination or steer ${him} away from it for now.`);
+
+ App.Events.addParagraph(node, t);
+ App.Events.addResponses(node, [
+ new App.Events.Result(`Turn ${him} into another animal fucktoy`, turn, virginityWarning()),
+ new App.Events.Result(`Steer ${him} away from bestiality obsession for the moment`, steer),
+ ]);
+
+ function virginityWarning() {
+ if (canBeDeflowered(eventSlave)) {
+ if (canDoAnal(eventSlave)) {
+ return `This option will take ${his} anal virginity`;
+ }
+ return `This option will take ${his} virginity`;
+ }
+ return null;
+ }
+
+ function turn() {
+ t = [];
+
+ t.push(`Focusing a slave's sexuality on intercourse with animals is almost laughably easy; you simply add a rutting session to ${eventSlave.slaveName}'s daily schedule, at around the time when ${he}'s normally least sexually active. ${His} carnal desires, you tell ${him}, are to be met only via sex with one of your animals, and the consequences for failing to obey these simple instructions will be dire. With the correct amount of training, praise, and punishment, <span class="devotion inc">${he} has become more submissive to your will,</span> and <span class="fetish gain">now has a bestiality fetish.</span>`);
+
+ eventSlave.devotion += 4;
+ seX(eventSlave, act, "animal", "penetrative", random(10, 15));
+ fetishChange(eventSlave, Fetish.BESTIALITY);
+ return t;
+ }
+
+ function steer() {
+ t = [];
+
+ t.push(`Good slaves get aroused according to their masters' whim, not their own silly tendencies. You call ${eventSlave.slaveName} over before ${he} can give voice to ${his} interest in bestiality, and`);
+ if ((canDoVaginal(eventSlave) && eventSlave.vagina > 0) || (canDoAnal(eventSlave) && eventSlave.anus > 0)) {
+ t.push(`fuck ${him} until ${he} orgasms, reminding ${him} of how much better of a partner another human is.`);
+ } else {
+ t.push(`enjoy ${him} until ${he} orgasms, reminding ${him} of how much better of a partner another human is.`);
+ }
+ t.push(`You'll keep an eye on ${him}, and with this correction <span class="devotion inc">${he}'ll become more submissive to you.</span>`);
+ if (canDoVaginal(eventSlave) && eventSlave.vagina > 0) {
+ t.push(VCheck.Vaginal(eventSlave, 1));
+ } else if (canDoAnal(eventSlave) && eventSlave.anus > 0) {
+ t.push(VCheck.Anal(eventSlave, 1));
+ }
+ eventSlave.devotion += 4;
+ return t;
+ }
+ }
+};
diff --git a/src/events/REFI/reBoobslut.js b/src/events/REFI/reBoobslut.js
index b88b01ba877301d44fd4b097cd3e143b5f7c7495..df131aff500003514b5de15786ce43e27a917c0e 100644
--- a/src/events/REFI/reBoobslut.js
+++ b/src/events/REFI/reBoobslut.js
@@ -8,7 +8,7 @@ App.Events.REFIBoobslut = class REFIBoobslut extends App.Events.BaseEvent {
return [
[ // event slave /InterestTargetID
isSlaveAvailable,
- s => (s.fetish === "none" || s.fetishStrength <= 60),
+ s => (s.fetish === Fetish.NONE || s.fetishStrength <= 60),
s => (canSee(s) || canHear(s)),
s => s.rules.speech !== "restrictive",
],
@@ -23,7 +23,7 @@ App.Events.REFIBoobslut = class REFIBoobslut extends App.Events.BaseEvent {
const [eventSlave, subSlave] = this.actors.map(a => getSlave(a));
const {He, he, his, him, himself} = getPronouns(eventSlave);
const {he2, his2} = getPronouns(subSlave).appendSuffix("2");
- const {say} = getEnunciation(eventSlave);
+ const {say, title: master} = getEnunciation(eventSlave);
App.Events.drawEventArt(node, [eventSlave, subSlave], [eventSlave.clothes, "no clothing"]);
@@ -53,7 +53,7 @@ App.Events.REFIBoobslut = class REFIBoobslut extends App.Events.BaseEvent {
} else {
t.push("over,");
}
- t.push(`take some of ${his2} creamy, ${subSlave.milkFlavor === "none" ? `` : `${subSlave.milkFlavor} flavored `}milk straight from the source. Every time you do, ${he2} shudders convulsively,`);
+ t.push(`take some of ${his2} creamy${subSlave.milkFlavor === "none" ? `` : `, ${subSlave.milkFlavor}-flavored`} milk straight from the source. Every time you do, ${he2} shudders convulsively,`);
if (canTalk(subSlave)) {
t.push(`giving little mewling whimpers.`);
} else {
@@ -155,7 +155,7 @@ App.Events.REFIBoobslut = class REFIBoobslut extends App.Events.BaseEvent {
} else {
t.push(`${He} ${say}s,`);
}
- t.push(Spoken(eventSlave, `"${getWrittenTitle(eventSlave)}, may I have a nipple orgasm, too?"`));
+ t.push(Spoken(eventSlave, `"${capFirstChar(master)}, may I have a nipple orgasm, too?"`));
}
t.push(`You make ${him} state it more explicitly, so ${he} tries again:`);
if (!hasAnyArms(eventSlave) && !canTalk(eventSlave)) {
@@ -174,7 +174,7 @@ App.Events.REFIBoobslut = class REFIBoobslut extends App.Events.BaseEvent {
t.push(`you, pinching ${his} nipples hard.`);
}
} else {
- t.push(Spoken(eventSlave, `"Please use my boobs, ${getWrittenTitle(eventSlave)}!"`));
+ t.push(Spoken(eventSlave, `"Please use my boobs, ${master}!"`));
}
t.push(`${He} gasps as you seize ${him} and carry ${him}`);
if (V.PC.belly >= 30000) {
diff --git a/src/events/REFI/reButtslut.js b/src/events/REFI/reButtslut.js
index 6c840fc66fd0ede34c27e2a95cfafa3848797fdd..5c098916c342e16685b2a345314f7add59c25dfc 100644
--- a/src/events/REFI/reButtslut.js
+++ b/src/events/REFI/reButtslut.js
@@ -8,7 +8,7 @@ App.Events.REFIButtslut = class REFIButtslut extends App.Events.BaseEvent {
return [
[ // event slave /InterestTargetID
isSlaveAvailable,
- s => (s.fetish === "none" || s.fetishStrength <= 60),
+ s => (s.fetish === Fetish.NONE || s.fetishStrength <= 60),
s => (canSee(s) || canHear(s)),
s => s.rules.speech !== "restrictive",
],
@@ -24,7 +24,7 @@ App.Events.REFIButtslut = class REFIButtslut extends App.Events.BaseEvent {
const [eventSlave, subSlave] = this.actors.map(a => getSlave(a));
const {He, he, his, him, himself} = getPronouns(eventSlave);
const {he2, his2, himself2} = getPronouns(subSlave).appendSuffix("2");
- const {say} = getEnunciation(eventSlave);
+ const {say, title: master} = getEnunciation(eventSlave);
App.Events.drawEventArt(node, [eventSlave, subSlave], [eventSlave.clothes, "no clothing"]);
@@ -132,7 +132,7 @@ App.Events.REFIButtslut = class REFIButtslut extends App.Events.BaseEvent {
} else {
t.push(`${He} ${say}s,`);
}
- t.push(Spoken(eventSlave, `"${getWrittenTitle(eventSlave)}, would you please do me like that?"`));
+ t.push(Spoken(eventSlave, `"${capFirstChar(master)}, would you please do me like that?"`));
}
t.push(`You make ${him} state it more explicitly, so ${he} tries again:`);
if (!hasAnyArms(eventSlave) && !canTalk(eventSlave)) {
@@ -145,7 +145,7 @@ App.Events.REFIButtslut = class REFIButtslut extends App.Events.BaseEvent {
} else if (!canTalk(eventSlave)) {
t.push(`${he} tries to depict anal sex with hand gestures, then gives up and turns around and points to ${his} ass.`);
} else {
- t.push(Spoken(eventSlave, `"Please fuck my butt, ${getWrittenTitle(eventSlave)}!"`));
+ t.push(Spoken(eventSlave, `"Please fuck my butt, ${master}!"`));
}
if (canDoAnal(eventSlave)) {
t.push(`${He} squeaks with surprise as you throw ${him} on the couch, but ${his} eagerness is obvious. ${He} does everything right, relaxing as you`);
diff --git a/src/events/REFI/reMasochist.js b/src/events/REFI/reMasochist.js
index 065ab1cd8396e8647ad5109c796e69af19bc12bc..f38765b6ace1d6f647a6bef75a70fd35a78a6519 100644
--- a/src/events/REFI/reMasochist.js
+++ b/src/events/REFI/reMasochist.js
@@ -19,6 +19,7 @@ App.Events.REFIMasochist = class REFIMasochist extends App.Events.BaseEvent {
const [eventSlave, subSlave] = this.actors.map(a => getSlave(a));
const {He, he, his, him, himself} = getPronouns(eventSlave);
const {He2, he2, his2, him2} = getPronouns(subSlave).appendSuffix("2");
+ const {title: master} = getEnunciation(eventSlave);
App.Events.drawEventArt(node, [eventSlave, subSlave], "no clothing");
const subBelly = bellyAdjective(subSlave);
@@ -240,7 +241,7 @@ App.Events.REFIMasochist = class REFIMasochist extends App.Events.BaseEvent {
} else {
t.push(`${He} asks,`);
}
- t.push(Spoken(eventSlave, `"${getWrittenTitle(eventSlave)}, can — can you hurt me? Like that?"`));
+ t.push(Spoken(eventSlave, `"${capFirstChar(master)}, can — can you hurt me? Like that?"`));
}
t.push(`You make ${him} state it more explicitly, so ${he} tries again:`);
if (!hasAnyArms(eventSlave) && !canTalk(eventSlave)) {
@@ -248,7 +249,7 @@ App.Events.REFIMasochist = class REFIMasochist extends App.Events.BaseEvent {
} else if (!canTalk(eventSlave)) {
t.push(`${he} turns around and starts to spank ${himself} roughly.`);
} else {
- t.push(Spoken(eventSlave, `"Please beat me, ${getWrittenTitle(eventSlave)}!"`));
+ t.push(Spoken(eventSlave, `"Please beat me, ${master}!"`));
}
t.push(`You shove ${him}`);
if (eventSlave.belly >= 300000) {
diff --git a/src/events/REFI/rePregnancy.js b/src/events/REFI/rePregnancy.js
index 65fffdb526c3950f87e82a993cc6f0fd346d1b71..cfc264ed64de8ce65119de85fe55e8ba9c00c4a0 100644
--- a/src/events/REFI/rePregnancy.js
+++ b/src/events/REFI/rePregnancy.js
@@ -20,7 +20,7 @@ App.Events.REFIPregnancy = class REFIPregnancy extends App.Events.BaseEvent {
const [eventSlave, subSlave] = this.actors.map(a => getSlave(a));
const {He, he, his, him, himself, girl, His} = getPronouns(eventSlave);
const {He2, he2, his2, him2, His2, girl2} = getPronouns(subSlave).appendSuffix("2");
- const {say} = getEnunciation(eventSlave);
+ const {say, title: master} = getEnunciation(eventSlave);
const subBelly = bellyAdjective(subSlave);
App.Events.drawEventArt(node, [eventSlave, subSlave], [eventSlave.clothes, "no clothing"]);
@@ -264,7 +264,7 @@ App.Events.REFIPregnancy = class REFIPregnancy extends App.Events.BaseEvent {
} else {
t.push(`${He} asks,`);
}
- t.push(Spoken(eventSlave, `"${getWrittenTitle(eventSlave)}, can — can I be — can I be like, you know, that?"`));
+ t.push(Spoken(eventSlave, `"${capFirstChar(master)}, can — can I be — can I be like, you know, that?"`));
}
t.push(`You make ${him} state it more explicitly, so ${he} tries again:`);
return t;
@@ -288,7 +288,7 @@ App.Events.REFIPregnancy = class REFIPregnancy extends App.Events.BaseEvent {
t.push(`cunt.`);
}
} else {
- t.push(Spoken(eventSlave, `"Please knock me up, ${getWrittenTitle(eventSlave)}!"`));
+ t.push(Spoken(eventSlave, `"Please knock me up, ${master}!"`));
}
t.push(`You shove ${him} over the desk, rub`);
if (V.PC.dick !== 0) {
@@ -391,7 +391,7 @@ App.Events.REFIPregnancy = class REFIPregnancy extends App.Events.BaseEvent {
t.push(`cunt.`);
}
} else {
- t.push(Spoken(eventSlave, `"Please knock me up, ${getWrittenTitle(eventSlave)}!"`));
+ t.push(Spoken(eventSlave, `"Please knock me up, ${master}!"`));
}
t.push(`You direct ${him} to the couch and run a hand along ${his} stomach, reminding ${him} that ${he} is already pregnant and efforts to knock ${him} up more won't satisfy ${his} craving. However, ${he}'s already got the pregnancy part covered, all ${he} needs to feel whole is to use ${his} gravid body to please you. ${He} shudders with anticipation at the realization as you`);
if (eventSlave.belly >= 300000 || (V.PC.belly+eventSlave.belly >= 30000)) {
@@ -492,7 +492,7 @@ App.Events.REFIPregnancy = class REFIPregnancy extends App.Events.BaseEvent {
} else {
t.push(`${He} ${say}s,`);
}
- t.push(Spoken(eventSlave, `"${getWrittenTitle(eventSlave)}, I don't know. I just thought that was really hot."`));
+ t.push(Spoken(eventSlave, `"${capFirstChar(master)}, I don't know. I just thought that was really hot."`));
}
return t;
}
@@ -531,7 +531,7 @@ App.Events.REFIPregnancy = class REFIPregnancy extends App.Events.BaseEvent {
} else if (!canTalk(eventSlave)) {
t.push(`${he} points at your gravid middle before quivering with lust.`);
} else {
- t.push(Spoken(eventSlave, `"You're so hot, ${getWrittenTitle(eventSlave)}!"`));
+ t.push(Spoken(eventSlave, `"You're so hot, ${master}!"`));
}
t.push(`You tell ${him} that getting to spend time with your gravid swell is a very special reward for very good slaves, and if ${he} keeps being a good ${girl} you'll make sure ${he} gets the chance to lavish attention on it. With that, you pull ${him} in and hug ${him} to your stomach, sending ${him} over the edge.`);
t.push(`<span class="devotion inc">${He} has become more devoted to you,</span> and <span class="fetish gain">${he} has developed a pregnancy fetish.</span>`);
@@ -552,7 +552,7 @@ App.Events.REFIPregnancy = class REFIPregnancy extends App.Events.BaseEvent {
} else if (!canTalk(eventSlave)) {
t.push(`${he} pantomimes a pregnant belly before stroking the length of ${his} cock.`);
} else {
- t.push(Spoken(eventSlave, `"I would love to knock someone up, ${getWrittenTitle(eventSlave)}!"`));
+ t.push(Spoken(eventSlave, `"I would love to knock someone up, ${master}!"`));
}
if (eventSlave.toyHole === "dick" || V.policies.sexualOpenness === 1) {
t.push(`You push ${him} onto the couch, line yourself up with ${his} throbbing erection, and ask if ${he} wants to impregnate a girl. ${He}'s almost beside ${himself}, shuddering at the titillation, but before ${he} can answer, you tell ${him} that getting to use ${his} dick is a very special reward for very good slaves, and you might give it to ${him} one day — but that ${he} doesn't deserve it yet. With that, you tease the tip of ${his} penis with your pussy; a clear mistake, as this sets ${him} over the edge. ${He} can only gasp wordlessly over having just accidentally came in ${his} ${getWrittenTitle(eventSlave)}, something you take full advantage of. You clearly inform ${him} that you were fertile. <span style="italic">Were.</span> You continue to tease the blooming impregnation fetishist with descriptions of how hard it will be for you so heavily laden with child and how ${he} had better plan on taking responsibility. ${He} can't take it and releases another spurt of cum, this time onto ${himself};`);
@@ -587,7 +587,7 @@ App.Events.REFIPregnancy = class REFIPregnancy extends App.Events.BaseEvent {
} else if (!canTalk(eventSlave)) {
t.push(`${he} pantomimes a pregnant belly, and uses gestures to indicate arousal.`);
} else {
- t.push(Spoken(eventSlave, `"I would love to get pregnant, ${getWrittenTitle(eventSlave)}!"`));
+ t.push(Spoken(eventSlave, `"I would love to get pregnant, ${master}!"`));
}
t.push(`You shove ${him} over the desk, rub your hard dick between ${his} slick thighs, and ask if ${he} wants you to impregnate ${him}. ${He}'s almost beside ${himself}, shuddering at the titillation, but before ${he} can answer, you tell ${him} that it's a pointless dream, ${he}'ll never be pregnant, but that doesn't mean ${he} can't fuck pregnant girls. Or fertile girls. Perhaps you'll even take the time to simulate a pregnancy with ${him}, if ${he}'s particularly well behaved, you hint as you rub your hands across the quivering slave's belly. <span class="devotion inc">${He} has become more devoted to you,</span> and <span class="fetish gain">${he} has developed a pregnancy fetish.</span>`);
eventSlave.devotion += 4;
@@ -616,7 +616,7 @@ App.Events.REFIPregnancy = class REFIPregnancy extends App.Events.BaseEvent {
if (!canTalk(eventSlave)) {
t.push(`${he} pantomimes a pregnant belly, your pregnant belly, and uses gestures to how much ${he} enjoyed it atop ${him}.`);
} else {
- t.push(Spoken(eventSlave, `"Pregnant sex with ${getWrittenTitle(eventSlave)} is the best!"`));
+ t.push(Spoken(eventSlave, `"Pregnant sex with ${master} is the best!"`));
}
t.push(`${He} has become <span class="devotion inc">more devoted to you,</span> <span class="gold">mostly out of fear of your sexual appetite,</span> but <span class="fetish gain">with a newfound pregnancy fetish,</span> even if though you got a little domineering.`);
eventSlave.devotion += 4;
@@ -638,9 +638,9 @@ App.Events.REFIPregnancy = class REFIPregnancy extends App.Events.BaseEvent {
if (!canTalk(eventSlave)) {
t.push(`${he} pantomimes a pregnant belly, your pregnant belly, and uses gestures to indicate arousal.`);
} else {
- t.push(Spoken(eventSlave, `"Of course I find you attractive, ${getWrittenTitle(eventSlave)}, but the way your belly bulges out so far and the way it moves when you use us just... It turns me on so much lately!"`));
+ t.push(Spoken(eventSlave, `"Of course I find you attractive, ${master}, but the way your belly bulges out so far and the way it moves when you use us just... It turns me on so much lately!"`));
}
- t.push(`You waddle to the couch, slowly settle yourself onto it and spread your legs wide revealing your aching sex. ${He}'s almost beside ${himself}, shuddering at the invitation, but before ${he} can answer, you struggle forward and pull ${him} onto you. ${He} wastes no more time on words, instead trying ${his} hardest to split ${his} focus between filling your pussy and molesting your gravid swell. Mentally, you are in no position to control ${his} actions, being in such a hormonal state, but ${he} doesn't overstep ${his} boundaries and dutifully brings you to orgasm. Even better, once ${he} is satisfied, ${he} still doesn't leave your vulnerable side, instead cozying up for some post-coital quality time with ${his} fecund ${getWrittenTitle(eventSlave)}.`);
+ t.push(`You waddle to the couch, slowly settle yourself onto it, and spread your legs wide, revealing your aching sex. ${He}'s almost beside ${himself}, shuddering at the invitation, but before ${he} can answer, you struggle forward and pull ${him} onto you. ${He} wastes no more time on words, instead trying ${his} hardest to split ${his} focus between filling your pussy and molesting your gravid swell. Mentally, you are in no position to control ${his} actions, being in such a hormonal state, but ${he} doesn't overstep ${his} boundaries and dutifully brings you to orgasm. Even better, once ${he} is satisfied, ${he} still doesn't leave your vulnerable side, instead cozying up for some post-coital quality time with ${his} fecund ${getWrittenTitle(eventSlave)}.`);
t.push(`${He} has become <span class="devotion inc">much more devoted to you,</span> <span class="mediumaquamarine">more trusting of you,</span> and <span class="fetish gain">${he} has developed a pregnancy fetish.</span>`);
eventSlave.devotion += 6;
eventSlave.trust += 4;
@@ -650,7 +650,7 @@ App.Events.REFIPregnancy = class REFIPregnancy extends App.Events.BaseEvent {
if (!canTalk(eventSlave)) {
t.push(`${he} only manages a nod before you spear yourself on ${his} dick. This was happening either way.`);
} else {
- t.push(Spoken(eventSlave, `"Yes, ${getWrittenTitle(eventSlave)}, that must feel ama-"`), `${his} voice catches as you spear yourself on ${his} dick. ${His} answer really didn't matter since ${his} cock already spilled ${his} thoughts.`);
+ t.push(Spoken(eventSlave, `"Yes, ${master}, that must feel ama-"`), `${his} voice catches as you spear yourself on ${his} dick. ${His} answer really didn't matter since ${his} cock already spilled ${his} thoughts.`);
}
t.push(`You begin riding ${him}, eager to scratch that growing itch that's been hounding you lately, only to find ${his}`);
if (hasAnyArms(eventSlave)) {
diff --git a/src/events/REFI/reSadist.js b/src/events/REFI/reSadist.js
index d2075b4dbbf3d2c65ce5017e33cea1184e8e20bf..f19e87fc9b962566e29dc94bc45d332f11176412 100644
--- a/src/events/REFI/reSadist.js
+++ b/src/events/REFI/reSadist.js
@@ -21,6 +21,7 @@ App.Events.REFISadist = class REFISadist extends App.Events.BaseEvent {
const {He, he, his, him, himself} = getPronouns(eventSlave);
const {He2, he2, his2, him2} = getPronouns(subSlave).appendSuffix("2");
const {HeU, himU, girlU} = getNonlocalPronouns(V.seeDicks).appendSuffix('U');
+ const {title: master} = getEnunciation(eventSlave);
App.Events.drawEventArt(node, [eventSlave, subSlave], "no clothing");
@@ -98,20 +99,10 @@ App.Events.REFISadist = class REFISadist extends App.Events.BaseEvent {
App.Events.addParagraph(node, t);
App.Events.addResponses(node, [
- new App.Events.Result(`Show ${him} how enjoyable causing pain is`, turn, virginityWarning()),
+ new App.Events.Result(`Show ${him} how enjoyable causing pain is`, turn),
new App.Events.Result(`Steer ${him} away from an obsession with causing pain for the moment`, steer),
]);
- function virginityWarning() {
- if (canDoAnal(eventSlave) && (eventSlave.anus === 0)) {
- return `This option will take ${his} anal virginity`;
- } else if (!canDoAnal(eventSlave) && canDoVaginal(eventSlave) && (eventSlave.vagina === 0)) {
- return `This option will take ${his} virginity`;
- }
- return null;
- }
-
-
function turn() {
t = [];
if (!canTalk(eventSlave)) {
@@ -148,7 +139,7 @@ App.Events.REFISadist = class REFISadist extends App.Events.BaseEvent {
} else {
t.push(`${He} asks,`);
}
- t.push(Spoken(eventSlave, `"${getWrittenTitle(eventSlave)}, can — can I hurt someone? Like that?"`));
+ t.push(Spoken(eventSlave, `"${capFirstChar(master)}, can — can I hurt someone? Like that?"`));
}
t.push(`You make ${him} state it more explicitly, so ${he} tries again:`);
if (!hasAnyArms(eventSlave) && !canTalk(eventSlave)) {
@@ -156,7 +147,7 @@ App.Events.REFISadist = class REFISadist extends App.Events.BaseEvent {
} else if (!canTalk(eventSlave)) {
t.push(`${he} turns around and starts to spank ${himself} roughly.`);
} else {
- t.push(Spoken(eventSlave, `"Please let me beat someone, ${getWrittenTitle(eventSlave)}!"`));
+ t.push(Spoken(eventSlave, `"Please let me beat someone, ${master}!"`));
}
t.push(`You call in another slave and have ${himU} kneel on the floor, ass up. You then hand ${him} a leathern cat-o-nine tails and tell ${him} to get busy, or ${he}'ll take the other slave's place. As you note the remorse on ${his} face, you tell ${him} to get used to it. One of ${his} jobs is to cause pain now, second thoughts or not.`);
diff --git a/src/events/REFS/refsKnightlyDuel.js b/src/events/REFS/refsKnightlyDuel.js
index a1e8d64f1b574817da8d52174a27e04a40c49e5b..553601054a002fb75c884a2a026ecdd76cc287c7 100644
--- a/src/events/REFS/refsKnightlyDuel.js
+++ b/src/events/REFS/refsKnightlyDuel.js
@@ -12,7 +12,7 @@ App.Events.refsKnightlyDuel = class refsKnightlyDuel extends App.Events.BaseEven
slave.career = "spec ops";
slave.devotion = random(-80, -60);
slave.muscles = random(50, 75);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.sexualFlaw = "malicious";
slave.behavioralQuirk = "none";
slave.trust = random(-30, -20);
@@ -47,7 +47,7 @@ App.Events.refsKnightlyDuel = class refsKnightlyDuel extends App.Events.BaseEven
}
function televise() {
- cashX(3000, "televised a duel");
+ cashX(3000, "event");
repX(-2500, "event");
return `The Knights straighten up as you inform them that you'll allow the duel, and they're hardly listening when you explain that it'll be televised under your supervision. If anything, they seem more excited to have an audience for their fight. A few days later, you host the event between your two champions, giving each a longsword and a tabard bearing their coat of arms as their only protection against the other. With the cameras rolling, you announce for the duel to commence, and the two massive men lunge at once another with the immediate clatter of steel on steel. As the crowd cheers fanatically, the two Knights wrestle and fight, slashing violently at the slightest sign of exposure from their enemy. After a few intense minutes of close, bloody fighting, one of the Knights slips for a moment on a pocket of loose sand, and the other rams his longsword through their neck immediately, nearly decapitating him in single motion. The crowd cheers wildly as the victorious Knight drives the rest of his longsword to the side, totally severing his enemy's head from their shoulders. As you congratulate the victor on his success, ${V.assistant.name} sends you a series of statistics indicating that the short, televised brutality has earned you <span class="cash inc">several thousand credits,</span> but that many of the public are absolutely <span class="reputation dec">horrified</span> to have seen idolized Knights murder one another in such a senseless display of brutality.`;
}
diff --git a/src/events/REFS/refsWarhound.js b/src/events/REFS/refsWarhound.js
index b841a48fe9db2327866413f8ba00c9a3a471357e..27e7b6f1aa2ca8f819e956e05dd682a7699be756 100644
--- a/src/events/REFS/refsWarhound.js
+++ b/src/events/REFS/refsWarhound.js
@@ -93,7 +93,7 @@ App.Events.refsWarhound = class refsWarhound extends App.Events.BaseEvent {
App.Events.addResponses(node, choices);
function buy() {
- cashX(-enormousCash, "Bought a Warbeast");
+ cashX(forceNeg(enormousCash), "slaveTransfer", slave);
return [
`You nod once to the merchant and electronically transfer the money to him without a second thought. The pudgy man clasps his hands together gleefully and then hands you the leash, smiling like a snake. "Oh, and we have not yet assigned ${him} a name, my liege - please feel free to call ${him} whatever you wish. Enjoy your new beast!"`,
App.UI.newSlaveIntro(slave)
diff --git a/src/events/REFS/refsYouthPreferentialistEncounter.js b/src/events/REFS/refsYouthPreferentialistEncounter.js
index 602ade45ac05463e7c5fcbce119182850de3f80c..b6ede6649d6c130594bfc5a5dfa9f97caf4be329 100644
--- a/src/events/REFS/refsYouthPreferentialistEncounter.js
+++ b/src/events/REFS/refsYouthPreferentialistEncounter.js
@@ -32,7 +32,15 @@ App.Events.refsYouthPreferentialistEncounter = class refsYouthPreferentialistEnc
App.Events.addParagraph(node, [`Your excursions out of your penthouse and into the arcology as a whole often put you in close proximity with citizens from all levels of the social strata. After all, they themselves have their own lives to live within the walls of ${V.arcologies[0].name}.`]);
- App.Events.addParagraph(node, [`On this particular outing you happen to cross paths with a nubile young ${woman}, accompanied by ${his} father. From ${his} plain clothes and rudimentary makeup, it is readily apparent that ${he} is not one of the arcology's well-to-do inhabitants. ${He} recognizes you quickly and dips ${his} head in deference to your high status, ${(V.PC.visualAge >= 50) ? `${his} cheeks flushed in embarrassment and delight at an aged arcology owner's interest in a young ${girl} like ${him}.` : `${his} expression awestruck by the presence of an arcology owner before ${him}.`}`]);
+ let womanTerm = `little ${girl}`;
+ if (slave.physicalAge > 19) {
+ womanTerm = `young ${woman}`;
+ } else if (slave.physicalAge > 12) {
+ womanTerm = `teen`;
+ } else if (slave.physicalAge > 9) {
+ womanTerm = `pre-teen`;
+ }
+ App.Events.addParagraph(node, [`On this particular outing you happen to cross paths with a nubile ${womanTerm}, accompanied by ${his} father. From ${his} plain clothes and rudimentary makeup, it is readily apparent that ${he} is not one of the arcology's well-to-do inhabitants. ${He} recognizes you quickly and dips ${his} head in deference to your high status, ${(V.PC.visualAge >= 50) ? `${his} cheeks flushed in embarrassment and delight at an aged arcology owner's interest in a young ${girl} like ${him}.` : `${his} expression awestruck by the presence of an arcology owner before ${him}.`}`]);
const choices = [];
choices.push(new App.Events.Result(`Let them pass`, ignore));
@@ -52,7 +60,7 @@ App.Events.refsYouthPreferentialistEncounter = class refsYouthPreferentialistEnc
function pay() {
repX(2500, "event");
cashX(-cost, "event");
- return `It takes a moment for you to convince the young ${girl} and ${his} father that you aren't playing some cruel joke on them, but once you do ${he} enthusiastically agrees to be your companion for the evening. With a pretty young thing on your arm for the rest of the night, and ${his} father trailing behind the two of you at a respectful distance, you take ${V.arcologies[0].name} by storm amidst a flurry of speculative whispers and contemplative rumors. Later that night, you conclude your date with a pleasant meal at one of ${V.arcologies[0].name}'s choicest restaurants with fine dining and even finer conversation. To the credit of ${his} father, he politely continues eating his dinner without batting an eye when you${(V.PC.dick === 0) ? ` don a strap-on and` : ''} take his ${daughter} over the dinner table. When you part ways, the young ${girl} is clearly smitten with you — so it's no wonder that by the next day the story of your encounter has <span class="reputation inc">spread across ${V.arcologies[0].name} like wildfire.</span>`;
+ return `It takes a moment for you to convince the young ${girl} and ${his} father that you aren't playing some cruel joke on them, but once you do ${he} enthusiastically agrees to be your companion for the evening. With a pretty young thing on your arm for the rest of the night, and ${his} father trailing behind the two of you at a respectful distance, you take ${V.arcologies[0].name} by storm amidst a flurry of speculative whispers and contemplative rumors. Later that night, you conclude your date with a pleasant meal at one of ${V.arcologies[0].name}'s choicest restaurants with fine dining and even finer conversation. To the credit of ${his} father, he politely continues eating his dinner without batting an eye when you${(V.PC.dick === 0) ? ` don a strap-on and` : ''} take his ${num(slave.physicalAge)}-year-old ${daughter} over the dinner table. When you part ways, the young ${girl} is clearly smitten with you — so it's no wonder that by the next day the story of your encounter has <span class="reputation inc">spread across ${V.arcologies[0].name} like wildfire.</span>`;
}
function fuck() {
@@ -60,7 +68,7 @@ App.Events.refsYouthPreferentialistEncounter = class refsYouthPreferentialistEnc
App.Events.refreshEventArt(slave);
const frag = new DocumentFragment();
- App.Events.addParagraph(frag, [`It only takes a moment for ${V.assistant.name} to uncover the father's financial records and the copious debt therein, and only another moment for you to browbeat the terrified father into allowing his ${daughter} to sleep with you under threat of purchasing all their debt and summarily enslaving ${him}.`]);
+ App.Events.addParagraph(frag, [`It only takes a moment for ${V.assistant.name} to uncover the father's financial records and the copious debt therein, and only another moment for you to browbeat the terrified father into allowing his ${num(slave.physicalAge)}-year-old ${daughter} to sleep with you under threat of purchasing all their debt and summarily enslaving ${him}.`]);
App.Events.addParagraph(frag, [`Once you both retire to your private suite, you peel the ${girl}'s clothes off as easily as one might shed a gift of its wrapping. In the nude ${his} body is tastefully youthful, with narrow hips, firm breasts, and a delicate blush across ${his} shamefaced, rosy cheeks. Despite the circumstances of your sexual conquest of ${him}, ${he} seems to enjoy the fuck well enough by the sounds of ${his} frenzied moans — citizens like ${him} often do since sexual submission to a slave would be a crippling scandal to a prominent citizen, let alone one of ${his} diminished social stature.`]);
const choices = [];
diff --git a/src/events/RESS/PAFlirting.js b/src/events/RESS/PAFlirting.js
index 547d0875276ef98e6de2e6a5c7b491cc4519ab08..6c87b9b3aa69e16dd48e82bf359ddcd393fd52e8 100644
--- a/src/events/RESS/PAFlirting.js
+++ b/src/events/RESS/PAFlirting.js
@@ -9,7 +9,7 @@ App.Events.RESSPAFlirting = class RESSPAFlirting extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canTalk,
canSee,
@@ -342,7 +342,7 @@ App.Events.RESSPAFlirting = class RESSPAFlirting extends App.Events.BaseEvent {
if (eventSlave.bellyPreg >= 1500) {
r.push(`${belly} pregnant belly is growing ever more full of children.`);
} else if (eventSlave.belly >= 1500) {
- r.push(`${belly} belly is growing ever larger and kicks begin to dot its surface.`);
+ r.push(`${belly} belly is growing ever larger as kicks begin to dot its surface.`);
} else {
r.push(`belly is becoming distended.`);
}
@@ -416,7 +416,7 @@ App.Events.RESSPAFlirting = class RESSPAFlirting extends App.Events.BaseEvent {
} else {
r.push(`vibrators wedged in ${his} nipples violently vibrating`);
}
- r.push(`and a whip lined wheel steadily slapping at ${his} ass and back.`);
+ r.push(`and a whip-lined wheel steadily slapping at ${his} ass and back.`);
seX(eventSlave, "oral", "assistant", "penetrative");
break;
case "witch":
@@ -642,7 +642,7 @@ App.Events.RESSPAFlirting = class RESSPAFlirting extends App.Events.BaseEvent {
r = [];
r.push(`Several minutes later, ${V.assistant.name}'s avatar reappears on your desk,`);
- if ((eventSlave.fetishKnown === 0) || (eventSlave.fetish === "none")) {
+ if ((eventSlave.fetishKnown === 0) || (eventSlave.fetish === Fetish.NONE)) {
r.push(`making love to an avatar of ${eventSlave.slaveName}.`);
} else if (eventSlave.fetish === "buttslut") {
r.push(`fucking an avatar of ${eventSlave.slaveName} up the ass. "Excellent idea, ${properTitle()}," ${heA} says, and the slave's avatar, which is a little overwhelmed, waves weakly.`);
@@ -660,7 +660,7 @@ App.Events.RESSPAFlirting = class RESSPAFlirting extends App.Events.BaseEvent {
} else if (eventSlave.fetish === "dom") {
r.push(`getting fucked by an avatar of ${eventSlave.slaveName}. "Excellent idea, ${properTitle()}," ${heA} says, and the slave's avatar waves cheerily.`);
seX(eventSlave, "penetrative", "assistant", "anal");
- } else if (eventSlave.fetish === "submissive") {
+ } else if (eventSlave.fetish === Fetish.SUBMISSIVE) {
r.push(`along with a crowd of copies of ${himself}. They're gangbanging an avatar of ${eventSlave.slaveName}. "Excellent idea, ${properTitle()}," ${heA} says, and the slave's avatar waves weakly.`);
seX(eventSlave, "oral", "assistant", "penetrative", 5);
if (canDoAnal(eventSlave)) {
diff --git a/src/events/RESS/ageDifferenceOldPC.js b/src/events/RESS/ageDifferenceOldPC.js
index da9f5ca6004bfdb7b06c73d7748c3ab0404256eb..42d8121c1ae986a9c199dfe54fe60b74f9e2e1d9 100644
--- a/src/events/RESS/ageDifferenceOldPC.js
+++ b/src/events/RESS/ageDifferenceOldPC.js
@@ -8,7 +8,7 @@ App.Events.RESSAgeDifferenceOldPC = class RESSAgeDifferenceOldPC extends App.Eve
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canWalk,
canTalk,
canHear,
diff --git a/src/events/RESS/ageDifferenceYoungPC.js b/src/events/RESS/ageDifferenceYoungPC.js
index a62e44e992c8427d62e4a3f072e66b80dcb6d2e4..3293ed7246658a1140f6ed35f269190edcb51518 100644
--- a/src/events/RESS/ageDifferenceYoungPC.js
+++ b/src/events/RESS/ageDifferenceYoungPC.js
@@ -8,7 +8,7 @@ App.Events.RESSAgeDifferenceYoungPC = class RESSAgeDifferenceYoungPC extends App
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canWalk,
canTalk,
canHear,
diff --git a/src/events/RESS/ampResting.js b/src/events/RESS/ampResting.js
index e0708ef3370ca6e372023a63648a68819f0bdd7a..db8bfb649f6f95a06a6c7ba29753c49ea73546cb 100644
--- a/src/events/RESS/ampResting.js
+++ b/src/events/RESS/ampResting.js
@@ -6,7 +6,7 @@ App.Events.RESSAmpResting = class RESSAmpResting extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => (s.assignment === Job.REST || s.rules.rest === "mandatory"),
isAmputee,
]
diff --git a/src/events/RESS/assFitting.js b/src/events/RESS/assFitting.js
index 84ba29586caca59add7eeb4acd1e829a7d7331a0..b10249dabfa2b6d4162f028c3fd434c16882f58b 100644
--- a/src/events/RESS/assFitting.js
+++ b/src/events/RESS/assFitting.js
@@ -6,7 +6,7 @@ App.Events.RESSAssFitting = class RESSAssFitting extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.assignment !== Job.QUARTER,
s => s.devotion > 20,
s => s.butt > 5,
diff --git a/src/events/RESS/bedSnuggle.js b/src/events/RESS/bedSnuggle.js
index 7f7d55871fa3b352644ae13258e7837a6ec3eb6b..af1b10800111d9ff946d47f40150ddec4cd25889 100644
--- a/src/events/RESS/bedSnuggle.js
+++ b/src/events/RESS/bedSnuggle.js
@@ -6,7 +6,7 @@ App.Events.RESSBedSnuggle = class RESSBedSnuggle extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => [Job.CONCUBINE, Job.FUCKTOY, Job.MASTERSUITE].includes(s.assignment),
s => s.devotion > 50,
s => s.trust > 50,
diff --git a/src/events/RESS/birthday.js b/src/events/RESS/birthday.js
index a9157b706c356f7e7dafca9d67baf01137e7a29d..cbf21d509aaf3b1f82052afc718f1d5c164037a9 100644
--- a/src/events/RESS/birthday.js
+++ b/src/events/RESS/birthday.js
@@ -8,7 +8,7 @@ App.Events.RESSBirthday = class RESSBirthday extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
canTalk,
diff --git a/src/events/RESS/bondageGear.js b/src/events/RESS/bondageGear.js
index 4fa1e1e255f19f3ce573d2fcb568a79c62f912b0..d70a393a4a98c06b9a0a504744774fed4bfdd655 100644
--- a/src/events/RESS/bondageGear.js
+++ b/src/events/RESS/bondageGear.js
@@ -6,7 +6,7 @@ App.Events.RESSBondageGear = class RESSBondageGear extends App.Events.BaseEvent
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.devotion < -20,
s => s.trust >= -20,
s => s.clothes === "uncomfortable straps",
diff --git a/src/events/RESS/breedingBull.js b/src/events/RESS/breedingBull.js
index d24523da271bbd99c2a6ac0bcfde256af4cb1671..762b15b8273f241c89adcbf3c3cd4411643a10cf 100644
--- a/src/events/RESS/breedingBull.js
+++ b/src/events/RESS/breedingBull.js
@@ -10,7 +10,7 @@ App.Events.RESSBreedingBull = class RESSBreedingBull extends App.Events.BaseEven
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish === "mindbroken",
+ s => s.fetish === Fetish.MINDBROKEN,
s => s.career === "a breeding bull",
s => canImpreg(V.PC, s),
s => s.assignment === Job.MASTERSUITE,
@@ -24,7 +24,7 @@ App.Events.RESSBreedingBull = class RESSBreedingBull extends App.Events.BaseEven
get weight() {
let weight = 1;
- if (V.PC.fertDrugs > 0) {
+ if (V.PC.drugs === "fertility supplements" || V.PC.diet === "fertility") {
weight += 2;
}
if (V.PC.forcedFertDrugs > 0) {
@@ -154,7 +154,7 @@ App.Events.RESSBreedingBull = class RESSBreedingBull extends App.Events.BaseEven
r.push(`face to your violated pussy to feel the heat emanating from it`);
}
r.push(`unsatisfied, ${he} moves back into position to properly seed you this time. You black out as ${his} second load joins the first, only to awaken sometime later`);
- if (S.Concubine && S.Concubine.fetish !== "mindbroken") {
+ if (S.Concubine && S.Concubine.fetish !== Fetish.MINDBROKEN) {
const {his2, He2, him2} = getPronouns(S.Concubine).appendSuffix("2");
r.push(`with ${S.Concubine.slaveName} trying ${his2} best to drain your swollen belly.`);
if (canTalk(S.Concubine)) {
diff --git a/src/events/RESS/cockfeederResistance.js b/src/events/RESS/cockfeederResistance.js
index c4f3586de3126e24d6bd437f09a9024d512c0c16..34103923ee0e93fe04392d64e809f1739bfed4a1 100644
--- a/src/events/RESS/cockfeederResistance.js
+++ b/src/events/RESS/cockfeederResistance.js
@@ -8,7 +8,7 @@ App.Events.RESSCockFeederResistance = class RESSCockFeederResistance extends App
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canStand,
hasAnyArms,
s => s.devotion <= 20 && s.devotion >= -50,
diff --git a/src/events/RESS/comfortableSeat.js b/src/events/RESS/comfortableSeat.js
index f214e1b88b624e51f4e059f8e8b0280d5149bbaf..82629387baf852b879fee2f6a747b323e7325403 100644
--- a/src/events/RESS/comfortableSeat.js
+++ b/src/events/RESS/comfortableSeat.js
@@ -9,7 +9,7 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canStand,
hasAnyArms,
canSee,
@@ -140,7 +140,7 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
App.Events.addParagraph(frag, t);
t = [];
- if (eventSlave.fetishKnown === 1 && eventSlave.fetish !== "none") {
+ if (eventSlave.fetishKnown === 1 && eventSlave.fetish !== Fetish.NONE) {
t.push(`Finally making ${his} decision, ${he}`);
switch (eventSlave.fetish) {
case "submissive":
@@ -356,7 +356,7 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
t.push(`You command ${him} to turn around and show you ${his} ass. ${He} obeys eagerly, spinning and bringing you face to face with ${his}`);
if (eventSlave.butt > 12) {
- t.push("view filling rear.");
+ t.push("view-filling rear.");
} else if (eventSlave.butt > 5) {
t.push("monstrous bottom.");
} else if (eventSlave.butt > 2) {
diff --git a/src/events/RESS/coolerLockin.js b/src/events/RESS/coolerLockin.js
index e67c90c252f244ce2b0ef7f32dcc26c59c7a9df8..545482f0b24d19e5859cfcce5dbfa34fcbc732f2 100644
--- a/src/events/RESS/coolerLockin.js
+++ b/src/events/RESS/coolerLockin.js
@@ -6,7 +6,7 @@ App.Events.RESSCoolerLockin = class RESSCoolerLockin extends App.Events.BaseEven
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
canHear,
diff --git a/src/events/RESS/devotedAnalVirgin.js b/src/events/RESS/devotedAnalVirgin.js
index 98e7678bec56338a2eb7e0eda0dca3c889de9753..6238c0cbc5718afe83445bee3006de0908fb6096 100644
--- a/src/events/RESS/devotedAnalVirgin.js
+++ b/src/events/RESS/devotedAnalVirgin.js
@@ -6,7 +6,7 @@ App.Events.RESSDevotedAnalVirgin = class RESSDevotedAnalVirgin extends App.Event
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
s => s.anus === 0,
diff --git a/src/events/RESS/devotedEducated.js b/src/events/RESS/devotedEducated.js
index 747e82b13da79cd38890c83b609d95b8ad82cd95..3266cf8119a43f7b8973ff5bb96b67a1174f6b70 100644
--- a/src/events/RESS/devotedEducated.js
+++ b/src/events/RESS/devotedEducated.js
@@ -6,7 +6,7 @@ App.Events.RESSDevotedEducated = class RESSDevotedEducated extends App.Events.Ba
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => (canWalk(s) || (canMove(s) && s.rules.mobility === "permissive")),
hasAnyArms,
canTalk,
diff --git a/src/events/RESS/devotedFearfulSlave.js b/src/events/RESS/devotedFearfulSlave.js
index 93fe34c47ac5f02ffa07ff95d5b57a3b9974fe14..864a9a3aee6065f0e920c5fd14ca62faa91a46be 100644
--- a/src/events/RESS/devotedFearfulSlave.js
+++ b/src/events/RESS/devotedFearfulSlave.js
@@ -6,7 +6,7 @@ App.Events.RESSDevotedFearfulSlave = class RESSDevotedFearfulSlave extends App.E
actorPrerequisites() {
return [
[
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canWalk,
canSee,
canHear,
@@ -55,7 +55,7 @@ App.Events.RESSDevotedFearfulSlave = class RESSDevotedFearfulSlave extends App.E
function comfort() {
t = [];
- t.push(`You set the ${V.PC.refreshment} aside on your desk for now, and take ${him} gently by the hand. You lead ${him} out onto the balcony of the Penthouse over to the railing. ${He} obediently assumes a position for you, bracing ${his} arm${hasBothArms(eventSlave) ? 's' : ''} on the railing, arching ${his} back and sticking ${his} bottom out to present ${himself} for use. Much to ${his} surprise, your hand guides ${him} back into a comfortable position, and simply pulls ${him} close into you. You explain to ${him} that ${he} is a good ${girl} who tries ${his} best, and that you don't want ${him} to fear you. After a little coddling, you fall silent, and simply hold ${him} tight, watching the street lights of ${V.arcologies[0].name} blink to life one after the other, slowly transforming the arcology into a vibrant, elegant light show. ${eventSlave.slaveName} can hardly believe what's happening, but eventually is able to relax fully, melting into your arms like butter into a hot pan. ${He} rests ${his} head lovingly against your chest and silently appreciates the view with you. When ${he} eventually departs, ${he} does so with <span class="devotion inc">tears of joy,</span> <span class="trust inc">rather than fear,</span> welling behind ${his} eyes.`);
+ t.push(`You set the ${V.PC.refreshment} aside on your desk for now, and take ${him} gently by the hand. You lead ${him} out onto the balcony of the penthouse over to the railing. ${He} obediently assumes a position for you, bracing ${his} arm${hasBothArms(eventSlave) ? 's' : ''} on the railing, arching ${his} back and sticking ${his} bottom out to present ${himself} for use. Much to ${his} surprise, your hand guides ${him} back into a comfortable position, and simply pulls ${him} close into you. You explain to ${him} that ${he} is a good ${girl} who tries ${his} best, and that you don't want ${him} to fear you. After a little coddling, you fall silent, and simply hold ${him} tight, watching the street lights of ${V.arcologies[0].name} blink to life one after the other, slowly transforming the arcology into a vibrant, elegant light show. ${eventSlave.slaveName} can hardly believe what's happening, but eventually is able to relax fully, melting into your arms like butter into a hot pan. ${He} rests ${his} head lovingly against your chest and silently appreciates the view with you. When ${he} eventually departs, ${he} does so with <span class="devotion inc">tears of joy,</span> <span class="trust inc">rather than fear,</span> welling behind ${his} eyes.`);
eventSlave.devotion += 15;
eventSlave.trust += 15;
diff --git a/src/events/RESS/devotedNympho.js b/src/events/RESS/devotedNympho.js
index c44a7b9d37b6ef65b74da5639b88c67a89ebc574..12d3443d043a192e7d28ee046abed8b6c6266a1a 100644
--- a/src/events/RESS/devotedNympho.js
+++ b/src/events/RESS/devotedNympho.js
@@ -6,7 +6,7 @@ App.Events.RESSDevotedNympho = class RESSDevotedNympho extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
canTalk,
@@ -373,7 +373,7 @@ App.Events.RESSDevotedNympho = class RESSDevotedNympho extends App.Events.BaseEv
r.push(`in ${his} eyes`);
}
r.push(`is undiminished. You pause to consider ${him} and ${his} face falls a little as ${he} wonders what you're planning. ${He}'s wrong to doubt you;`);
- if (eventSlave.fetish === "submissive" && eventSlave.fetishKnown === 1) {
+ if (eventSlave.fetish === Fetish.SUBMISSIVE && eventSlave.fetishKnown === 1) {
r.push(`you pull ${him} in and embrace ${him} strongly, causing the submissive slut to melt into your`);
if (V.PC.boobs >= 300) {
if (V.PC.boobsImplant !== 0) {
@@ -526,7 +526,7 @@ App.Events.RESSDevotedNympho = class RESSDevotedNympho extends App.Events.BaseEv
r.push(`to learn ${he}'s`);
}
r.push(`on the inspection schedule for the same time tomorrow, and is almost bouncing with eagerness the next morning.`);
- if (eventSlave.fetishStrength === 100 || eventSlave.fetishKnown === 0 || eventSlave.fetish === "none") {
+ if (eventSlave.fetishStrength === 100 || eventSlave.fetishKnown === 0 || eventSlave.fetish === Fetish.NONE) {
r.push(`Being a nympho is a never-ending struggle in some ways, and ${he} is <span class="hotpink">deeply grateful</span> to you for understanding ${him}.`);
eventSlave.devotion += 5;
} else {
diff --git a/src/events/RESS/devotedShortstack.js b/src/events/RESS/devotedShortstack.js
index 96eb91c704844e1ea4b1ef2a62347ab0c747bb71..923f07a62f4d12b290847bbe5d7185246773284e 100644
--- a/src/events/RESS/devotedShortstack.js
+++ b/src/events/RESS/devotedShortstack.js
@@ -10,7 +10,7 @@ App.Events.RESSDevotedShortstack = class RESSDevotedShortstack extends App.Event
s => s.height < (Height.mean(s) * 0.95),
s => s.physicalAge > 12,
canDoAnal,
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canStand,
s => s.trust <= 95,
diff --git a/src/events/RESS/devotedVirgin.js b/src/events/RESS/devotedVirgin.js
index 75e84cf06d813f34db5e77b8345167d61e5e9de8..830defd4fc024abc6dfd6681c8b4c8ec5fa606bf 100644
--- a/src/events/RESS/devotedVirgin.js
+++ b/src/events/RESS/devotedVirgin.js
@@ -6,7 +6,7 @@ App.Events.RESSDevotedVirgin = class RESSDevotedVirgin extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
s => s.vagina === 0,
diff --git a/src/events/RESS/devotedWaist.js b/src/events/RESS/devotedWaist.js
index c6300183c81479c027689e27c727488897dde0fe..f7dd13b8b19ea15b7511bd935fd372dd0b379626 100644
--- a/src/events/RESS/devotedWaist.js
+++ b/src/events/RESS/devotedWaist.js
@@ -6,7 +6,7 @@ App.Events.RESSDevotedWaist = class RESSDevotedWaist extends App.Events.BaseEven
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canStand,
s => s.waist < -95,
diff --git a/src/events/RESS/escapee.js b/src/events/RESS/escapee.js
index 3a9ff67451ee2520a29b7957e56886e8cdfb86ff..5a047747641b864216552289e9d91192cf2eab24 100644
--- a/src/events/RESS/escapee.js
+++ b/src/events/RESS/escapee.js
@@ -6,7 +6,7 @@ App.Events.RESSEscapee = class RESSEscapee extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canWalk,
s => s.devotion < -50,
s => s.trust >= -50,
diff --git a/src/events/RESS/forbiddenMasturbation.js b/src/events/RESS/forbiddenMasturbation.js
index e20031f6cc700128dd45b2a5e8cfc114e7039835..955d35a905fbf9e23aaf88d279b42c80a0224feb 100644
--- a/src/events/RESS/forbiddenMasturbation.js
+++ b/src/events/RESS/forbiddenMasturbation.js
@@ -6,7 +6,7 @@ App.Events.RESSForbiddenMasturbation = class RESSForbiddenMasturbation extends A
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.rules.release.masturbation === 0,
s => !App.Utils.hasNonassignmentSex(s),
s => s.need > 0,
@@ -513,10 +513,10 @@ App.Events.RESSForbiddenMasturbation = class RESSForbiddenMasturbation extends A
r.push(`and a shriek of agony.`);
}
r.push(`${He} masturbates furiously, but you're an accomplished spanker, and you repeatedly cause ${him} just enough pain to prevent climax. Eventually ${he} gets off in part because of, rather than in spite of, the lengthy beating.`);
- if (eventSlave.fetish === "submissive" && eventSlave.fetishKnown === 1) {
+ if (eventSlave.fetish === Fetish.SUBMISSIVE && eventSlave.fetishKnown === 1) {
eventSlave.fetishStrength += 4;
r.push(`<span class="fetish inc">${His} enjoyment of submission has increased.</span>`);
- } else if (eventSlave.fetish === "submissive") {
+ } else if (eventSlave.fetish === Fetish.SUBMISSIVE) {
eventSlave.fetishKnown = 1;
r.push(`<span class="fetish gain">${His} enjoyment of submission is now clear to you.</span>`);
} else if (random(1, 100) > 50) {
diff --git a/src/events/RESS/frighteningDick.js b/src/events/RESS/frighteningDick.js
index d4e989f96888d93ba60d2d6eba01b2e04a5cadf2..424056f6a7af50fa7a4f085356046bccccfd9345 100644
--- a/src/events/RESS/frighteningDick.js
+++ b/src/events/RESS/frighteningDick.js
@@ -9,7 +9,7 @@ App.Events.RESSFrighteningDick = class RESSFrighteningDick extends App.Events.Ba
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canMove,
canTalk,
diff --git a/src/events/RESS/hotPC.js b/src/events/RESS/hotPC.js
index 395abc33de7fd1f3d96dd3fe50e61afa2e97d591..0367fafed15d5c385ee3702708958e341b754300 100644
--- a/src/events/RESS/hotPC.js
+++ b/src/events/RESS/hotPC.js
@@ -6,7 +6,7 @@ App.Events.RESSHotPC = class RESSHotPC extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.energy > 40,
s => s.devotion > 0 && s.devotion <= 50,
s => s.trust >= -50,
diff --git a/src/events/RESS/imScared.js b/src/events/RESS/imScared.js
index e7f328b053a89b85d4b3a56159fcbdad4bdf1cec..193c973242cb61f025c223ebb89cdd83c9b4fa17 100644
--- a/src/events/RESS/imScared.js
+++ b/src/events/RESS/imScared.js
@@ -6,7 +6,7 @@ App.Events.RESSImScared = class RESSImScared extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canMove,
canTalk,
diff --git a/src/events/RESS/impregnationPlease.js b/src/events/RESS/impregnationPlease.js
index 647dcd982d9cf1e056023dfcb46e92bc8bd8507f..9f38dac2bb6213681899a9fa57018e407cece425 100644
--- a/src/events/RESS/impregnationPlease.js
+++ b/src/events/RESS/impregnationPlease.js
@@ -9,7 +9,7 @@ App.Events.RESSImpregnationPlease = class RESSImpregnationPlease extends App.Eve
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => (s.fetish === "pregnancy" || s.energy > 95),
s => s.devotion > 50,
s => s.vagina !== 0,
@@ -269,7 +269,7 @@ App.Events.RESSImpregnationPlease = class RESSImpregnationPlease extends App.Eve
if (eventSlave.bellyPreg >= 5000) {
r.push(`but the gravid swell of ${his} current pregnancy thwarts ${his} efforts as you take ${him}.`);
} else if (eventSlave.belly >= 5000 && eventSlave.boobs < 600) {
- r.push(`${his} big ${eventSlave.inflationType} stuffed belly pushing against you as you take ${him}.`);
+ r.push(`${his} big ${eventSlave.inflationType}-stuffed belly pushing against you as you take ${him}.`);
} else if (V.PC.belly >= 5000) {
r.push(`but the best ${he} can do is press ${himself} against your bulging middle.`);
} else if (eventSlave.boobs < 600 && eventSlave.belly < 5000) {
@@ -277,7 +277,7 @@ App.Events.RESSImpregnationPlease = class RESSImpregnationPlease extends App.Eve
} else if (eventSlave.boobs < 10000) {
r.push(`and ${his} big tits`);
if (eventSlave.bellyFluid >= 2000) {
- r.push(`and ${eventSlave.inflationType} stuffed belly`);
+ r.push(`and ${eventSlave.inflationType}-stuffed belly`);
}
r.push(`form a soft cushion between you as you take ${him}.`);
} else {
diff --git a/src/events/RESS/injectionsPlease.js b/src/events/RESS/injectionsPlease.js
index 3dd77c759fe8e787cded564e976f20ba6a6dbd5d..d2bcfe36c420dac64a6a7446325e0a252405d74f 100644
--- a/src/events/RESS/injectionsPlease.js
+++ b/src/events/RESS/injectionsPlease.js
@@ -9,7 +9,7 @@ App.Events.RESSInjectionsPlease = class RESSInjectionsPlease extends App.Events.
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canTalk,
s => s.drugs === "no drugs",
s => s.rules.speech === "permissive",
@@ -116,7 +116,12 @@ App.Events.RESSInjectionsPlease = class RESSInjectionsPlease extends App.Events.
eventSlave.clit++;
break;
}
- surgeryDamage(eventSlave, 10);
+ if (V.arcologies[0].FSBodyPuristLaw === 0 && V.healthyDrugsUpgrade === 0) {
+ surgeryDamage(eventSlave, 10);
+ } else {
+ surgeryDamage(eventSlave, 5);
+ }
+ App.Events.refreshEventArt(eventSlave);
return r;
}
@@ -169,7 +174,7 @@ App.Events.RESSInjectionsPlease = class RESSInjectionsPlease extends App.Events.
if (eventSlave.butt < 9) {
possibleDrugs.push({type: "butt", text: `ass growth drugs? It would just beg for a good spanking!`});
}
- } else if (eventSlave.fetish === "submissive") {
+ } else if (eventSlave.fetish === Fetish.SUBMISSIVE) {
if (eventSlave.dick > 1 && V.arcologies[0].FSSlimnessEnthusiastResearch === 1) {
possibleDrugs.push({type: "dickMinus", text: `hormones to shrink my dick? I don't need a big dick to get fucked, ${Master}. I don't want to intimidate anyone who might use me.`});
}
diff --git a/src/events/RESS/kitchenMolestation.js b/src/events/RESS/kitchenMolestation.js
index 08de58143352a75bd198431d329ee3528fc0e6ea..be84f87f730fa081bf93da93b2394c597a71353b 100644
--- a/src/events/RESS/kitchenMolestation.js
+++ b/src/events/RESS/kitchenMolestation.js
@@ -9,7 +9,7 @@ App.Events.RESSKitchenMolestation = class RESSKitchenMolestation extends App.Eve
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.rules.release.slaves !== 0,
hasAnyArms,
canWalk,
@@ -148,7 +148,7 @@ App.Events.RESSKitchenMolestation = class RESSKitchenMolestation extends App.Eve
} else {
chaste = true;
}
- if (s.fetishKnown === 1 && s.fetish === "submissive") {
+ if (s.fetishKnown === 1 && s.fetish === Fetish.SUBMISSIVE) {
s.devotion++;
subLove = true;
}
diff --git a/src/events/RESS/languageLesson.js b/src/events/RESS/languageLesson.js
index 5820545a134236066bb39dccb5d741ea946a9680..e5e308abba2ea2f44ef450bcbdf4f713c2946568 100644
--- a/src/events/RESS/languageLesson.js
+++ b/src/events/RESS/languageLesson.js
@@ -6,7 +6,7 @@ App.Events.RESSLanguageLesson = class RESSLanguageLesson extends App.Events.Base
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canStand,
canHear,
diff --git a/src/events/RESS/lazyEvening.js b/src/events/RESS/lazyEvening.js
index 64703d90c07ce8fb25c1bd300be3e3199a8e58dc..c554054efa537c7657791a78268e34e833ae0e65 100644
--- a/src/events/RESS/lazyEvening.js
+++ b/src/events/RESS/lazyEvening.js
@@ -6,7 +6,7 @@ App.Events.RESSLazyEvening = class RESSLazyEvening extends App.Events.BaseEvent
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canStand,
hasAnyArms,
s => (s.assignment === Job.FUCKTOY || s.assignment === Job.MASTERSUITE || s.assignment === Job.CONCUBINE),
diff --git a/src/events/RESS/masterfulWhore.js b/src/events/RESS/masterfulWhore.js
index 56455f5a8bcaf01d32c6490eeab64d8fa270bc9f..6fa69ac843e36b9558f8ba449edc383a0c4434aa 100644
--- a/src/events/RESS/masterfulWhore.js
+++ b/src/events/RESS/masterfulWhore.js
@@ -6,7 +6,7 @@ App.Events.RESSMasterfulWhore = class RESSMasterfulWhore extends App.Events.Base
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canHear,
s => s.skill.whoring >= 100,
s => s.trust > 50,
diff --git a/src/events/RESS/meanGirls.js b/src/events/RESS/meanGirls.js
index 82313244a78d1aebee05b095b4ee27de48d7a72c..35249c1269f2bb4bc8b07ec8faf23774b30a06f5 100644
--- a/src/events/RESS/meanGirls.js
+++ b/src/events/RESS/meanGirls.js
@@ -9,7 +9,7 @@ App.Events.RESSMeanGirls = class RESSMeanGirls extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.assignment === Job.PUBLIC,
hasAnyArms,
canStand,
diff --git a/src/events/RESS/milkgasm.js b/src/events/RESS/milkgasm.js
index f613d0969fc00b827e96610c0e4d6760ed058b0b..2b2da7935e3a8dfab4792f4d709842b22bc8f98d 100644
--- a/src/events/RESS/milkgasm.js
+++ b/src/events/RESS/milkgasm.js
@@ -6,7 +6,7 @@ App.Events.RESSMilkgasm = class RESSMilkgasm extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canMove,
s => s.devotion >= -20,
s => (canDoAnal(s) || canDoVaginal(s)),
diff --git a/src/events/RESS/mindbrokenMorning.js b/src/events/RESS/mindbrokenMorning.js
index 231aa995c2954fb36496f7fc302a2522f519eaf8..7b7680615014968862ebdcb4b15e051bb1dcc728 100644
--- a/src/events/RESS/mindbrokenMorning.js
+++ b/src/events/RESS/mindbrokenMorning.js
@@ -8,7 +8,7 @@ App.Events.RESSMindbrokenMorning = class RESSMindbrokenMorning extends App.Event
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish === "mindbroken",
+ s => s.fetish === Fetish.MINDBROKEN,
canWalk,
s => s.clothes !== "a Fuckdoll suit",
isFaceVisible
@@ -87,9 +87,9 @@ App.Events.RESSMindbrokenMorning = class RESSMindbrokenMorning extends App.Event
r.push(`fat`);
} else if (eventSlave.belly >= 5000) {
if (eventSlave.bellyPreg >= 3000) {
- r.push(`pregnancy swollen`);
+ r.push(`pregnancy-swollen`);
} else if (eventSlave.bellyImplant >= 3000) {
- r.push(`implant swollen`);
+ r.push(`implant-swollen`);
} else {
r.push(`${eventSlave.inflationType}-bloated`);
}
diff --git a/src/events/RESS/modestClothes.js b/src/events/RESS/modestClothes.js
index b24bc1d3bdc20452e593a5d5685cfb0d572c36fb..73504b5784ab6c345fde3e1edb4ea1f2110efb54 100644
--- a/src/events/RESS/modestClothes.js
+++ b/src/events/RESS/modestClothes.js
@@ -6,7 +6,7 @@ App.Events.RESSModestClothes = class RESSModestClothes extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
canTalk,
diff --git a/src/events/RESS/moistPussy.js b/src/events/RESS/moistPussy.js
index 01fe3bbe6b3849e85e919fccd8b6b686d9177e11..15a5341df03dd81a6c037cc155fe10d6457fc5e1 100644
--- a/src/events/RESS/moistPussy.js
+++ b/src/events/RESS/moistPussy.js
@@ -199,7 +199,7 @@ App.Events.RESSMoistPussy = class RESSMoistPussy extends App.Events.BaseEvent {
t.push(`mount ${him} with such force that your first stroke brings ${his} butt against your hips with an audible smack. There's also a deliciously lewd noise as ${V.PC.dick !== 0 ? "your invading penis" : "the invading phallus"} forces a little gush of pussyjuice out of ${him}.`);
t.push(`${He} ${eventSlave.voice > 0 ? "shrieks, but it's a shriek" : "gasps, but it's a gasp"} of pleasure, and your rutting is so well-lubricated that ${he} has no trouble getting off on it. Wanting ${his} climax, you reach around ${him} and grab hold of ${his} pussy, feeling the slippery fluid between your fingers and the lewd thrusting motion as ${V.PC.dick !== 0 ? "your cock" : "the phallus"} pistons in and out of ${him}.`);
t.push(`That bit of stimulation is enough to tip ${him} over, and you feel a gush of femcum against your hand as ${V.PC.dick !== 0 ? "your dickhead" : "the head of the strap-on"} forces an orgasm out of ${his} g-spot. ${He}'s so discombobulated that ${he} collapses into the puddle of pussyjuice ${he} left on the floor when you stand up and head off for a shower, but ${he} <span class="hotpink">crawls after you</span> as best ${he} can${hasBothLegs(eventSlave) ? " on rubbery legs." : "."}`);
- if (eventSlave.fetish === "submissive") {
+ if (eventSlave.fetish === Fetish.SUBMISSIVE) {
if (eventSlave.fetishKnown === 1) {
t.push(`The ${SlaveTitle(eventSlave)} sub loves getting fucked like that, and`);
if (eventSlave.fetishStrength > 95) {
diff --git a/src/events/RESS/muscles.js b/src/events/RESS/muscles.js
index 31e9b95594a086729650fd646711c8e767188054..b2eb0a9543d1c845ce1fecb7863e13faf9eaedfe 100644
--- a/src/events/RESS/muscles.js
+++ b/src/events/RESS/muscles.js
@@ -6,7 +6,7 @@ App.Events.RESSMuscles = class RESSMuscles extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canMove,
hasAnyArms,
s => s.muscles > 30,
@@ -48,7 +48,7 @@ App.Events.RESSMuscles = class RESSMuscles extends App.Events.BaseEvent {
t.push(`washboard abs,`);
}
t.push(`ripped biceps, and strapping lats.`);
- if (eventSlave.dick > 2) {
+ if (eventSlave.dick > 3) {
t.push(`${His} massive cock completes the picture.`);
}
App.Events.addParagraph(node, t);
@@ -151,7 +151,7 @@ App.Events.RESSMuscles = class RESSMuscles extends App.Events.BaseEvent {
}
t.push("pregnant");
} else if (eventSlave.bellyFluid >= 5000) {
- t.push(`${eventSlave.inflationType} filled`);
+ t.push(`${eventSlave.inflationType}-filled`);
} else {
t.push(`${bellyAdjective(eventSlave)} bellied`);
}
diff --git a/src/events/RESS/mutinyAttempt.js b/src/events/RESS/mutinyAttempt.js
index e509c846e3d3c7b34828e9d35b583acc8386397c..f3c9b75f4f0de9333e895854ebae99744866ca87 100644
--- a/src/events/RESS/mutinyAttempt.js
+++ b/src/events/RESS/mutinyAttempt.js
@@ -8,7 +8,7 @@ App.Events.RESSMutinyAttempt = class RESSMutinyAttempt extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canSee,
canWalk,
@@ -37,7 +37,7 @@ App.Events.RESSMutinyAttempt = class RESSMutinyAttempt extends App.Events.BaseEv
r.push(`Finishing your work, you lean back for a well-deserved break. Your peace is quickly disturbed by several loud smashes from down the penthouse hall. As you get up from your desk, you hear somebody running down the hallway, and before you know it,`);
r.push(contextualIntro(V.PC, eventSlave, true));
r.push(`is inside. ${He} is looking quite treacherous and`);
- if (eventSlave.skill.combat > 0) {
+ if (eventSlave.skill.combat > 30) {
r.push(`relatively confident.`);
} else {
r.push(`somewhat unsure.`);
@@ -105,7 +105,7 @@ App.Events.RESSMutinyAttempt = class RESSMutinyAttempt extends App.Events.BaseEv
he2, his2
} = getPronouns(S.HeadGirl).appendSuffix("2");
r.push(`You jump in surprise as ${S.HeadGirl.slaveName} tackles ${him} off you and to the floor`);
- if (S.HeadGirl.skill.combat > 0) {
+ if (S.HeadGirl.skill.combat > 60) {
r.push(`where ${he2} twists ${his} arm in an arm hold until the rebellious slave stops struggling.`);
} else {
r.push(`where ${he2} settles ${his2} weight on the struggling rebel, lacking any better idea of what to do.`);
@@ -295,7 +295,7 @@ App.Events.RESSMutinyAttempt = class RESSMutinyAttempt extends App.Events.BaseEv
function flog() {
eventSlave.trust -= 15;
healthDamage(eventSlave, 15);
- V.slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 5; } });
+ V.slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 5; } });
return `You bind ${his} naked body to the wall in preparation for a good beating. Going against one's master is bad, but going against you is even worse. You thoroughly strike ${him}, showering extra attention to ${his} crotch, while making sure ${he} will be in pain for days to come. Such a beating leaves ${him} <span class="health dec">in agonizing pain</span> and makes a clear example to ${him} and all your other rebellious slaves that <span class="trust dec">you are not to be trifled with.</span>`;
}
@@ -311,7 +311,9 @@ App.Events.RESSMutinyAttempt = class RESSMutinyAttempt extends App.Events.BaseEv
function castrate() {
eventSlave.trust -= 20;
eventSlave.devotion -= 10;
- V.slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 5; } });
+ eventSlave.balls = 0;
+ eventSlave.scrotum = 0;
+ V.slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 10; } });
cashX(forceNeg(V.surgeryCost), "slaveSurgery", eventSlave);
surgeryDamage(eventSlave, 10);
return `As you pull ${his} limp body to the remote surgery, you notice ${he} understands what ${he} has done and begs you to reconsider your decision; but your mind is set. ${He} had the balls to try and rape you, and now ${he} won't. Restrained as ${he} is, the most ${he} can do is cry and beg. Once ${he} comes to after the surgery, ${he} faces ${his} new life; <span class="devotion dec">${he}'ll never get hard again</span> and ${he}'s <span class="trust dec">the only one to blame</span> for ${his} <span class="health dec">suffering.</span> Every other rebellious slave is <span class="trust dec">mortified by the example.</span>`;
diff --git a/src/events/RESS/nightVisit.js b/src/events/RESS/nightVisit.js
index 832643f8765c2880baeabd7918f33ae5054eae31..f79f215aa323e1c0045a78e281eb5ec59491834c 100644
--- a/src/events/RESS/nightVisit.js
+++ b/src/events/RESS/nightVisit.js
@@ -7,7 +7,7 @@ App.Events.RESSNightVisit = class RESSNightVisit extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canMove,
s => s.rules.speech !== "restrictive",
s => s.rules.release.master === 1,
@@ -137,10 +137,10 @@ App.Events.RESSNightVisit = class RESSNightVisit extends App.Events.BaseEvent {
r.push(eventSlave.race);
}
r.push(`pussy to the limit of what you can get away with without damaging ${him}.`);
- if (((eventSlave.fetish === "submissive" && (eventSlave.fetishStrength > 60 || eventSlave.energy > 95))) && (eventSlave.fetishKnown === 1)) { // TODO: .energy should behave differently
+ if (((eventSlave.fetish === Fetish.SUBMISSIVE && (eventSlave.fetishStrength > 60 || eventSlave.energy > 95))) && (eventSlave.fetishKnown === 1)) { // TODO: .energy should behave differently
r.push(`${He}'s such a submissive that after a while pleasure overwhelms pain to the extent that ${he} manages a <span class="devotion inc">sobbing orgasm.</span>`);
} else {
- r.push(`${He} gets the message: ${he}'s your property and ${his} desires are entirely subject to your will. ${His} <span class="devotion inc">submission</span> to you and <span class="trust inc">fear of you</span> have both increased.`);
+ r.push(`${He} gets the message: ${he}'s your property and ${his} desires are entirely subject to your will. ${His} <span class="devotion inc">submission</span> to you and <span class="trust dec">fear of you</span> have both increased.`);
eventSlave.trust -= 3;
}
eventSlave.devotion += 3;
@@ -167,7 +167,7 @@ App.Events.RESSNightVisit = class RESSNightVisit extends App.Events.BaseEvent {
if (((eventSlave.fetish === "buttslut" && eventSlave.fetishStrength > 60) || (eventSlave.energy > 95)) && (eventSlave.fetishKnown === 1)) {
r.push(`${He} loves anal so much that after a while pleasure overwhelms pain to the extent that ${he} manages a <span class="devotion inc">sobbing orgasm.</span>`);
} else {
- r.push(`${He} gets the message: ${he}'s your property and ${his} desires are entirely subject to your will. ${His} <span class="devotion inc">submission</span> to you and <span class="trust inc">fear of you</span> have both increased.`);
+ r.push(`${He} gets the message: ${he}'s your property and ${his} desires are entirely subject to your will. ${His} <span class="devotion inc">submission</span> to you and <span class="trust dec">fear of you</span> have both increased.`);
eventSlave.trust -= 3;
}
eventSlave.devotion += 3;
diff --git a/src/events/RESS/obedientAddict.js b/src/events/RESS/obedientAddict.js
index db593565c3e879a013ff5921e4709c2a6edb0d4e..de62f5f05925078f050b309550202aaddbdcee0d 100644
--- a/src/events/RESS/obedientAddict.js
+++ b/src/events/RESS/obedientAddict.js
@@ -8,7 +8,7 @@ App.Events.RESSObedientAddict = class RESSObedientAddict extends App.Events.Base
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.aphrodisiacs > 0 || s.inflationType === "aphrodisiac",
diff --git a/src/events/RESS/obedientBitchy.js b/src/events/RESS/obedientBitchy.js
index 95d216d07b4b3361c328de734243333f48376847..433c22297fedfb8387df54709b784f9c4ec80c66 100644
--- a/src/events/RESS/obedientBitchy.js
+++ b/src/events/RESS/obedientBitchy.js
@@ -6,7 +6,7 @@ App.Events.RESSObedientBitchy = class RESSObedientBitchy extends App.Events.Base
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canTalk,
canSee,
s => s.behavioralFlaw === "bitchy",
diff --git a/src/events/RESS/obedientGirlish.js b/src/events/RESS/obedientGirlish.js
index 9d6fc40da40cd57e6baad1e7eec34862948e4dc9..a5ff45bb5a7ac241b9a0c8ae700e9fd6ea0eed39 100644
--- a/src/events/RESS/obedientGirlish.js
+++ b/src/events/RESS/obedientGirlish.js
@@ -6,7 +6,7 @@ App.Events.RESSObedientGirlish = class RESSObedientGirlish extends App.Events.Ba
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.assignment !== "work as a servant",
s => canDoAnal(s) || canDoVaginal(s),
s => s.butt < 3,
diff --git a/src/events/RESS/obedientIdiot.js b/src/events/RESS/obedientIdiot.js
index e538f626020eef25d599d89976362d77d772c46e..8dd723c5b6795c8ecdd492dd29f83f5f1937cff7 100644
--- a/src/events/RESS/obedientIdiot.js
+++ b/src/events/RESS/obedientIdiot.js
@@ -8,7 +8,7 @@ App.Events.RESSObedientIdiot = class RESSObedientIdiot extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canMove,
hasAnyArms,
s => s.intelligence + s.intelligenceImplant < -50,
diff --git a/src/events/RESS/obedientShemale.js b/src/events/RESS/obedientShemale.js
index e91a19c89b69601c297cd0255e763823b1eb675d..2b821e060c0448b7904a8a415aba891a54fda4c9 100644
--- a/src/events/RESS/obedientShemale.js
+++ b/src/events/RESS/obedientShemale.js
@@ -6,7 +6,7 @@ App.Events.RESSObedientShemale = class RESSObedientShemale extends App.Events.Ba
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.rules.release.masturbation !== 0,
hasAnyArms,
hasAnyLegs,
diff --git a/src/events/RESS/passingDeclaration.js b/src/events/RESS/passingDeclaration.js
index 299110647df0283383d07bea0e8e00de5962d415..a34f7f57c2c96449210ea727832da4df2ef53e6f 100644
--- a/src/events/RESS/passingDeclaration.js
+++ b/src/events/RESS/passingDeclaration.js
@@ -6,7 +6,7 @@ App.Events.RESSPassingDeclaration = class RESSPassingDeclaration extends App.Eve
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
canTalk,
diff --git a/src/events/RESS/penitent.js b/src/events/RESS/penitent.js
index 5a94f6b4296df3909a7f72dc2645a780e1ab1b4c..9b73e917f0d7b203ce2a42768c0fac4d71fdbb07 100644
--- a/src/events/RESS/penitent.js
+++ b/src/events/RESS/penitent.js
@@ -6,7 +6,7 @@ App.Events.RESSPenitent = class RESSPenitent extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canStand,
canTalk,
diff --git a/src/events/RESS/permittedMasturbation.js b/src/events/RESS/permittedMasturbation.js
index 9b27d4dbf88909a07af0d0f78395d50f6049c2c2..58320866ce6661492fd513abbc6dbf5ec31ebd53 100644
--- a/src/events/RESS/permittedMasturbation.js
+++ b/src/events/RESS/permittedMasturbation.js
@@ -6,7 +6,7 @@ App.Events.RESSPermittedMasturbation = class RESSPermittedMasturbation extends A
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasBothArms,
canMove,
canHear,
@@ -125,7 +125,7 @@ App.Events.RESSPermittedMasturbation = class RESSPermittedMasturbation extends A
App.Events.addResponses(node, [
new App.Events.Result(`Sleep with ${him}`, sleep),
new App.Events.Result(`Exhaust ${him}`, exhaust, virginityWarning()),
- (eventSlave.fetishKnown === 1 && eventSlave.fetish !== "none")
+ (eventSlave.fetishKnown === 1 && eventSlave.fetish !== Fetish.NONE)
? new App.Events.Result(`Play into ${his} fetish at bedtime`, bedtime, virginityWarning())
: new App.Events.Result(),
]);
@@ -350,7 +350,7 @@ App.Events.RESSPermittedMasturbation = class RESSPermittedMasturbation extends A
r.push(`soft`);
}
r.push(`shoulders,`);
- if (eventSlave.fetish === "submissive") {
+ if (eventSlave.fetish === Fetish.SUBMISSIVE) {
r.push(`but ${he} relaxes into submissive compliance as you slide them up to the nape of ${his} neck, grinding ${his} face deeper into the pillow. ${He} gives muffled whines of happiness as you give ${him} some light spanks before`);
if (canDoVaginal(eventSlave) && (eventSlave.vagina > 0 || !canDoAnal(eventSlave) || eventSlave.anus === 0)) {
r.push(`hilting yourself in ${him}`);
diff --git a/src/events/RESS/plimbHelp.js b/src/events/RESS/plimbHelp.js
index 2f969abe3956131b2c41f15a12882840794049c1..94af1b5f619ab260c64aac31304cdc1f462590be 100644
--- a/src/events/RESS/plimbHelp.js
+++ b/src/events/RESS/plimbHelp.js
@@ -6,7 +6,7 @@ App.Events.RESSPlimbHelp = class RESSPlimbHelp extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.devotion > 50,
s => s.trust > 20,
s => s.assignment !== Job.CONCUBINE,
diff --git a/src/events/RESS/plugDisobedience.js b/src/events/RESS/plugDisobedience.js
index 11a55a4d20a84a2071f397d88f83ce6f0330a59e..d4af3e95425a37f788917b314fda57395f47683d 100644
--- a/src/events/RESS/plugDisobedience.js
+++ b/src/events/RESS/plugDisobedience.js
@@ -6,7 +6,7 @@ App.Events.RESSPlugDisobedience = class RESSPlugDisobedience extends App.Events.
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canMove,
s => plugWidth(s) > 1 || plugLength(s) > 0,
s => s.devotion <= 20,
diff --git a/src/events/RESS/refreshmentDelivery.js b/src/events/RESS/refreshmentDelivery.js
index 90f5777d00b6c3505801b29ab55f75371df66a6a..56d1e633ac6ce307b48c8a38bd302825a2fc1bbc 100644
--- a/src/events/RESS/refreshmentDelivery.js
+++ b/src/events/RESS/refreshmentDelivery.js
@@ -6,7 +6,7 @@ App.Events.RESSRefreshmentDelivery = class RESSRefreshmentDelivery extends App.E
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
s => s.devotion > 20,
diff --git a/src/events/RESS/restrictedSmart.js b/src/events/RESS/restrictedSmart.js
index 674b75cd39636d8fa83b76635bbbd4df80dec589..3eaca156202e225649b283b43cdfe20d7631b6a1 100644
--- a/src/events/RESS/restrictedSmart.js
+++ b/src/events/RESS/restrictedSmart.js
@@ -6,7 +6,7 @@ App.Events.RESSRestrictedSmart = class RESSRestrictedSmart extends App.Events.Ba
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canTalk,
canHear,
s => s.assignment !== Job.QUARTER,
diff --git a/src/events/RESS/retchingCum.js b/src/events/RESS/retchingCum.js
index f138370bcf1739fd26cab8171ac35f5c841c6fd6..4f50c973ff1b48a11c51a052c2c73aca4c59264f 100644
--- a/src/events/RESS/retchingCum.js
+++ b/src/events/RESS/retchingCum.js
@@ -6,7 +6,7 @@ App.Events.RESSRetchingCum = class RESSRetchingCum extends App.Events.BaseEvent
actorPrerequisites() {
return [
[
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.assignment !== "work as a servant",
canStand,
hasAnyArms,
diff --git a/src/events/RESS/review/PAservant.js b/src/events/RESS/review/PAservant.js
index f7ff1e29060e28a7d5f35c625413f4d1cbfc0b0f..899b1bbb00dd4015167924010b171b17c93a4f3b 100644
--- a/src/events/RESS/review/PAservant.js
+++ b/src/events/RESS/review/PAservant.js
@@ -9,7 +9,7 @@ App.Events.RESSPAServant = class RESSPAServant extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RESS/review/aGift.js b/src/events/RESS/review/aGift.js
index 8c7a11db0dd4ed5ea1d1edc205749c81c5477331..6abddc6ef8a95f1136dcb0ccda3cb120459ae886 100644
--- a/src/events/RESS/review/aGift.js
+++ b/src/events/RESS/review/aGift.js
@@ -6,7 +6,7 @@ App.Events.RESSAGift = class RESSAGift extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.devotion > 50,
s => s.trust > 50,
hasAnyArms,
@@ -134,7 +134,7 @@ App.Events.RESSAGift = class RESSAGift extends App.Events.BaseEvent {
App.Events.addResponses(node, [
new App.Events.Result(`That's nice`, nice),
new App.Events.Result(`These slaves clearly have too much time on their hands`, time),
- (eventSlave.fetishKnown === 1 && eventSlave.fetish !== "none")
+ (eventSlave.fetishKnown === 1 && eventSlave.fetish !== Fetish.NONE)
? new App.Events.Result(`Give ${him} something in return`, give, ((eventSlave.anus === 0 && canDoAnal(eventSlave)) || (eventSlave.vagina === 0 && canDoVaginal(eventSlave)) ? `This option may take ${his} virginity` : null))
: new App.Events.Result(),
new App.Events.Result(`${He}'s already gift enough`, enough),
diff --git a/src/events/RESS/review/ageImplant.js b/src/events/RESS/review/ageImplant.js
index d0a2d28846124ce7a9afce8e7ef0e41e95938165..0985c8856279fc61ecb41f10948935187485c8ff 100644
--- a/src/events/RESS/review/ageImplant.js
+++ b/src/events/RESS/review/ageImplant.js
@@ -6,7 +6,7 @@ App.Events.RESSAgeImplant = class RESSAgeImplant extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
@@ -223,8 +223,8 @@ App.Events.RESSAgeImplant = class RESSAgeImplant extends App.Events.BaseEvent {
r.push(`${his} absurd boobs rubbing against your arm.`);
}
r.push(`${He} cheers lustily at all the right moments, earning repeated crowd focus shots on the big screen; many fans wonder who their ridiculously hot fellow fan is before <span class="reputation inc">recognizing you,</span> putting two and two together, and realizing enviously that ${he}'s your sex slave. Since this is the Free Cities, the big screen gives ${him} more attention rather than cutting away when ${he} intentionally cheers hard enough that ${his} skirt rides up.`);
- if (eventSlave.broodmother === 2 && eventSlave.preg > 37) {
- r.push(`The only slightly embarrassing incident is when ${he}'s standing up to rally the crowd behind ${him}, facing away from the game and goes into labor on another of ${his} brood; the contractions forcing ${him} to lean forward onto ${his} r.push(belly);stomach and give the players below a clear view of ${his} crowning child.`);
+ if (eventSlave.broodmother === 2 && eventSlave.preg >= 36) {
+ r.push(`The only slightly embarrassing incident is when ${he}'s standing up to rally the crowd behind ${him}, facing away from the game and goes into labor on another of ${his} brood; the contractions forcing ${him} to lean forward onto ${his} ${belly} stomach and give the players below a clear view of ${his} crowning child.`);
} else if (eventSlave.belly < 300000) {
r.push(`The only slightly embarrassing incident is when ${he}'s standing up to rally the crowd behind ${him}, facing away from the game and bending down to show cleavage to the stands in such a way that ${his}`);
if (eventSlave.butt > 5) {
diff --git a/src/events/RESS/review/ampDevoted.js b/src/events/RESS/review/ampDevoted.js
index cf7bfaf93406001ff9ddd25bc4652d225df91798..1b7064ed6308805c9e74743d70a8de0bdba101ca 100644
--- a/src/events/RESS/review/ampDevoted.js
+++ b/src/events/RESS/review/ampDevoted.js
@@ -6,7 +6,7 @@ App.Events.RESSAmpDevoted = class RESSAmpDevoted extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.devotion > 20,
s => s.assignment !== Job.QUARTER,
isAmputee,
@@ -39,7 +39,7 @@ App.Events.RESSAmpDevoted = class RESSAmpDevoted extends App.Events.BaseEvent {
} else if (eventSlave.bellyImplant >= 3000) {
r.push(`blow-up`);
} else {
- r.push(`${eventSlave.inflationType} filled`);
+ r.push(`${eventSlave.inflationType}-filled`);
}
r.push(`sex toy`);
} else {
diff --git a/src/events/RESS/review/araAra.js b/src/events/RESS/review/araAra.js
index d97dbd197b937f10b61d7d2b28b1514bb5d9c0a6..1e8d2f8bc7eb17726a2ca882fdfd78b231c73feb 100644
--- a/src/events/RESS/review/araAra.js
+++ b/src/events/RESS/review/araAra.js
@@ -6,7 +6,7 @@ App.Events.RESSAraAra = class RESSAraAra extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
@@ -32,7 +32,7 @@ App.Events.RESSAraAra = class RESSAraAra extends App.Events.BaseEvent {
const r = new SpacedTextAccumulator(node);
r.push(`Passing by the kitchen in the morning, you take a moment to listen to the low hum of your slaves chatting as they`);
- if (V.feeder !== 0) {
+ if (V.cockFeeder !== 0) {
r.push(`wait their turn at the phallic feeders.`);
} else {
r.push(`drink their breakfasts.`);
@@ -196,9 +196,9 @@ App.Events.RESSAraAra = class RESSAraAra extends App.Events.BaseEvent {
r.push(`fat`);
} else if (eventSlave.belly >= 5000) {
if (eventSlave.bellyPreg >= 3000) {
- r.push(`pregnancy swollen`);
+ r.push(`pregnancy-swollen`);
} else if (eventSlave.bellyImplant >= 3000) {
- r.push(`implant swollen`);
+ r.push(`implant-swollen`);
} else {
r.push(`${eventSlave.inflationType}-bloated`);
}
diff --git a/src/events/RESS/review/backStretch.js b/src/events/RESS/review/backStretch.js
index 653d133de17d14071dfd2c11aa03fb635de0099a..5aad051bf13b4b2b5dedb8670c65214a8115bdde 100644
--- a/src/events/RESS/review/backStretch.js
+++ b/src/events/RESS/review/backStretch.js
@@ -6,7 +6,7 @@ App.Events.RESSBackStretch = class RESSBackStretch extends App.Events.BaseEvent
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.assignment !== Job.QUARTER,
@@ -41,7 +41,7 @@ App.Events.RESSBackStretch = class RESSBackStretch extends App.Events.BaseEvent
} else if (eventSlave.relationship >= 4) {
const relation = getSlave(eventSlave.relationshipTarget);
const {his2, girl2, wife2} = getPronouns(relation).appendSuffix("2");
- r.push(`climbed out of bed. ${eventSlave.slaveName}'s`);
+ r.push(`climbed out of bed. (${eventSlave.slaveName}'s`);
if (eventSlave.relationship === 5) {
r.push(wife2);
} else {
diff --git a/src/events/RESS/review/badDream.js b/src/events/RESS/review/badDream.js
index a5124c5633f065ff7bc0cfbacf3a80c3dbcc29ec..28096d572fa85b0c119cc339ad753b962882cb05 100644
--- a/src/events/RESS/review/badDream.js
+++ b/src/events/RESS/review/badDream.js
@@ -6,7 +6,7 @@ App.Events.RESSBadDream = class RESSBadDream extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => canTalk(s, false),
diff --git a/src/events/RESS/review/birthdaySex.js b/src/events/RESS/review/birthdaySex.js
index 199d4d1db2946e581ecc86a6b7e9a27b2291d166..73ffa808b68f8ff1243c05ba6bbc911cb3a7ce0d 100644
--- a/src/events/RESS/review/birthdaySex.js
+++ b/src/events/RESS/review/birthdaySex.js
@@ -1,7 +1,7 @@
App.Events.RESSBirthdaySex = class RESSBirthdaySex extends App.Events.BaseEvent {
actorPrerequisites() {
return [[
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.devotion > 50,
s => s.trust > 50,
s => s.birthWeek >= 51,
@@ -16,6 +16,7 @@ App.Events.RESSBirthdaySex = class RESSBirthdaySex extends App.Events.BaseEvent
He,
he, his, him, girl,
} = getPronouns(eventSlave);
+ const {title: Master} = getEnunciation(eventSlave);
const vaginal = canDoVaginal(eventSlave);
const isAnalVirgin = (canDoAnal(eventSlave) && eventSlave.anus === 0);
const isVirgin = isAnalVirgin || (vaginal && eventSlave.vagina === 0);
@@ -29,7 +30,7 @@ App.Events.RESSBirthdaySex = class RESSBirthdaySex extends App.Events.BaseEvent
]);
App.Events.addParagraph(node, [
- Spoken(eventSlave, `"${capFirstChar(getWrittenTitle(eventSlave))},"`),
+ Spoken(eventSlave, `"${capFirstChar(Master)},"`),
`${he} says.`,
Spoken(eventSlave, `"Today is my birthday."`),
`A quick glance down at your desk confirms that it is, indeed, ${his} birthday.`,
@@ -48,8 +49,8 @@ App.Events.RESSBirthdaySex = class RESSBirthdaySex extends App.Events.BaseEvent
const frag = new DocumentFragment();
const r = [];
r.push(
- `The work you were previously doing isn't particularly pressing, and one of your slave${girl}s throwing themselves at you begging for sex is a good distraction as any. You stand up and extend a hand, then lead ${him} to your bedchambers. After a fair bit of foreplay focused primarily on ${him} (this is your gift, after all), you lay ${him} on ${his} back and slowly push your cockhead into ${his} ${vaginal ? `pussy` : `asshole`}. Slowly at first and gradually increasing in speed, you begin to fuck ${him}, managing to bring ${him} to climax with the help of some ${vaginal ? `clitoral` : `manual`} stimulation with one hand. After you blow your own load inside ${him} and pull out, ${he} impulsively throws ${his} arms around your neck and pulls ${him}self in to plant a deep kiss on your lips.`,
- Spoken(eventSlave, `<span class="devotion inc">"I love you, ${getWrittenTitle(eventSlave)},"</span> ${he} says in a hushed tone.`),
+ `The work you were previously doing isn't particularly pressing, and one of your slave${girl}s throwing themselves at you begging for sex is as good a distraction as any. You stand up and extend a hand, then lead ${him} to your bedchambers. After a fair bit of foreplay focused primarily on ${him} (this is your gift, after all), you lay ${him} on ${his} back and slowly push your cockhead into ${his} ${vaginal ? `pussy` : `asshole`}. Slowly at first and gradually increasing in speed, you begin to fuck ${him}, managing to bring ${him} to climax with the help of some ${vaginal ? `clitoral` : `manual`} stimulation with one hand. After you blow your own load inside ${him} and pull out, ${he} impulsively throws ${his} arms around your neck and pulls ${him}self in to plant a deep kiss on your lips.`,
+ Spoken(eventSlave, `<span class="devotion inc">"I love you, ${Master},"</span>`), `${he} says in a hushed tone.`,
vaginal ? VCheck.Vaginal(eventSlave) : VCheck.Anal(eventSlave),
);
diff --git a/src/events/RESS/review/bondedLove.js b/src/events/RESS/review/bondedLove.js
index 3b1f9553131385d1525a8c94d611cf05f26c097e..64c85313302a6eecbae623f1094172b96581a04e 100644
--- a/src/events/RESS/review/bondedLove.js
+++ b/src/events/RESS/review/bondedLove.js
@@ -6,7 +6,7 @@ App.Events.RESSBondedLove = class RESSBondedLove extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.relationship <= -2,
@@ -42,15 +42,15 @@ App.Events.RESSBondedLove = class RESSBondedLove extends App.Events.BaseEvent {
}
r.push(`to see if ${he}'s unwelcome, and seeing no sign that ${he} is, the devoted ${SlaveTitle(eventSlave)} comes over to your desk.`);
if (eventSlave.boobs < 400) {
- r.push(`${His} little ${eventSlave.boobShape} tits barely move at all as ${he} walks, though ${his} ${eventSlave.nipples} nipples certainly catch your eye.`);
+ r.push(`${His} little${eventSlave.boobShape === "normal" ? `` : ` ${eventSlave.boobShape}`} tits barely move at all as ${he} walks, though ${his} ${eventSlave.nipples} nipples certainly catch your eye.`);
} else if ((eventSlave.boobsImplant/eventSlave.boobs) >= .75) { // tiny little 200cc implants in 20000cc tits are laughable. Now we make sure those tits are fake.
r.push(`${His} fake tits barely move at all as ${he} walks, their shape maintained by ${his} implants.`);
} else if (eventSlave.boobs < 1000) {
- r.push(`${His} lovely ${eventSlave.boobShape} boobs move delightfully as ${he} walks, and ${his} ${eventSlave.nipples} nipples bounce prettily.`);
+ r.push(`${His} lovely${eventSlave.boobShape === "normal" ? `` : ` ${eventSlave.boobShape}`} boobs move delightfully as ${he} walks, and ${his} ${eventSlave.nipples} nipples bounce prettily.`);
} else if (eventSlave.boobs < 2500) {
- r.push(`${His} heavy, ${eventSlave.boobShape} breasts bounce up and down as ${he} walks, making ${his} ${eventSlave.nipples} nipples dance around distractingly.`);
+ r.push(`${His} heavy${eventSlave.boobShape === "normal" ? `` : `, ${eventSlave.boobShape}`} breasts bounce up and down as ${he} walks, making ${his} ${eventSlave.nipples} nipples dance around distractingly.`);
} else {
- r.push(`${His} massive, ${eventSlave.boobShape} udders jiggle alluringly as ${he} walks, and ${his} ${eventSlave.nipples} nipples sway from side to side distractingly.`);
+ r.push(`${His} massive${eventSlave.boobShape === "normal" ? `` : `, ${eventSlave.boobShape}`} udders jiggle alluringly as ${he} walks, and ${his} ${eventSlave.nipples} nipples sway from side to side distractingly.`);
}
r.push(`Your eyes move down ${his} body, noting`);
if (eventSlave.bellyPreg >= 450000) {
diff --git a/src/events/RESS/review/breastExpansionBlues.js b/src/events/RESS/review/breastExpansionBlues.js
index 49e58ed50efbd65937cab732558f1b69dce10984..3f8a250c2a058502af301d9a09950e6c5e166a97 100644
--- a/src/events/RESS/review/breastExpansionBlues.js
+++ b/src/events/RESS/review/breastExpansionBlues.js
@@ -6,7 +6,7 @@ App.Events.RESSBreastExpansionBlues = class RESSBreastExpansionBlues extends App
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
@@ -161,7 +161,7 @@ App.Events.RESSBreastExpansionBlues = class RESSBreastExpansionBlues extends App
if (V.assistant.fsAppearance === "asset expansionist") {
r.push(`openly groping ${hisA} own immense breasts while dropping comments about how big you like 'em.`);
} else if (V.assistant.fsAppearance === "pastoralist") {
- r.push(`openly groping ${hisA} milk filled quad-breasts while dropping comments about how you love 'em big and milky.`);
+ r.push(`openly groping ${hisA} milk-filled quad-breasts while dropping comments about how you love 'em big and milky.`);
} else if (V.assistant.fsAppearance === "transformation fetishist") {
r.push(`openly groping ${hisA} own immense chest balloons while dropping comments about filling ${eventSlave.slaveName} with the biggest implants possible.`);
} else {
@@ -205,7 +205,7 @@ App.Events.RESSBreastExpansionBlues = class RESSBreastExpansionBlues extends App
eventSlave.lactation = 2;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", eventSlave);
surgeryDamage(eventSlave, 10);
- return `You announce that you're resolved to continue growing ${his} breasts, and since ${he} feels like a cow, plan to help ${him} fulfill ${his} image of ${himself}. ${He}'s experienced enough to know not to question what that means, just to <span class="trust dec">fear the intent behind it.</span> ${He}'s right to worry, as you drag ${him} to the remote surgery for an impromptu lactation implant installation. When ${he} comes to, ${he} immediately realizes ${his} breasts are larger than ever. As ${he} brings a hand to each of the full mounds, a moan laced with relief and disdain escapes ${his} lips; along with a strong gush of milk from ${his} engorged breasts. ${He} has been taught a harsh lesson about questioning your will, a lesson ${he} will be reminded of every time ${he} has to empty ${his} ever swelling breasts of their excessive milk. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`;
+ return `You announce that you're resolved to continue growing ${his} breasts, and since ${he} feels like a cow, plan to help ${him} fulfill ${his} image of ${himself}. ${He}'s experienced enough to know not to question what that means, just to <span class="trust dec">fear the intent behind it.</span> ${He}'s right to worry, as you drag ${him} to the remote surgery for an impromptu lactation implant installation. When ${he} comes to, ${he} immediately realizes ${his} breasts are larger than ever. As ${he} brings a hand to each of the full mounds, a moan laced with relief and disdain escapes ${his} lips; along with a strong gush of milk from ${his} engorged breasts. ${He} has been taught a harsh lesson about questioning your will, a lesson ${he} will be reminded of every time ${he} has to empty ${his} ever-swelling breasts of their excessive milk. As with all surgery <span class="health dec">${his} health has been slightly affected.</span>`;
}
function boost() {
diff --git a/src/events/RESS/review/cageRelief.js b/src/events/RESS/review/cageRelief.js
index deb222a2c95ec2174734bebe63de1784130054ae..c14151864365cc2b4ccb6558a8398708663299d5 100644
--- a/src/events/RESS/review/cageRelief.js
+++ b/src/events/RESS/review/cageRelief.js
@@ -6,7 +6,7 @@ App.Events.RESSCageRelief = class RESSCageRelief extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.balls > 0,
diff --git a/src/events/RESS/review/confidentTanning.js b/src/events/RESS/review/confidentTanning.js
index bd439b81c6152f3469d35cdaea582b691d2321bf..9ef216eafb05c65f2f6929cd094999d5d9541f98 100644
--- a/src/events/RESS/review/confidentTanning.js
+++ b/src/events/RESS/review/confidentTanning.js
@@ -8,7 +8,7 @@ App.Events.RESSConfidentTanning = class RESSConfidentTanning extends App.Events.
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
@@ -115,7 +115,7 @@ App.Events.RESSConfidentTanning = class RESSConfidentTanning extends App.Events.
r.push(`on to the swing of things.`);
}
r.push(`"Ooh," ${he} ${say}s cheekily,`);
- if (eventSlave.fetish === "submissive" && eventSlave.fetishKnown === 1 && eventSlave.fetishStrength > 60) {
+ if (eventSlave.fetish === Fetish.SUBMISSIVE && eventSlave.fetishKnown === 1 && eventSlave.fetishStrength > 60) {
r.push(
Spoken(eventSlave, `"my back is getting sunburnt! Please, ${Master}, help me!"`),
`${He} rolls over and lies still, sighing with submissive relaxation as you`
diff --git a/src/events/RESS/review/cowMilking.js b/src/events/RESS/review/cowMilking.js
index 84543d89835c13aab330e3c4794694638263f44f..211d68f956ae6e241b48838da6c5f7d14e3f1cb5 100644
--- a/src/events/RESS/review/cowMilking.js
+++ b/src/events/RESS/review/cowMilking.js
@@ -6,7 +6,7 @@ App.Events.RESSCowMilking = class RESSCowMilking extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RESS/review/cumslutWhore.js b/src/events/RESS/review/cumslutWhore.js
index 84520762437fe2891bb9e4a0352cde931147560c..2b81c364fb86ef8898ea49929cc55877740422f2 100644
--- a/src/events/RESS/review/cumslutWhore.js
+++ b/src/events/RESS/review/cumslutWhore.js
@@ -8,7 +8,7 @@ App.Events.RESSCumslutWhore = class RESSCumslutWhore extends App.Events.BaseEven
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.devotion > 20,
s => s.fetishKnown === 1,
s => [Job.PUBLIC, Job.WHORE, Job.GLORYHOLE].includes(s.assignment),
@@ -119,9 +119,11 @@ App.Events.RESSCumslutWhore = class RESSCumslutWhore extends App.Events.BaseEven
}
r.push(`of the stuff hitting ${his}`);
if (V.PC.balls >= 10) {
- r.push(`mouth, even as your load keeps flowing into ${his} gullet`);
+ r.push(`mouth, even as your load keeps flowing into ${his}`);
if (V.PC.balls >= 30) {
- r.push(`steadily bloated the poor ${girl}`);
+ r.push(`gullet, steadily bloating the poor ${girl}.`);
+ } else {
+ r.push(`gullet.`);
}
} else {
r.push(`mouth.`);
diff --git a/src/events/RESS/review/desperateNull.js b/src/events/RESS/review/desperateNull.js
index 217d6dbfa9cafb48628abfa254cf6f72691a955d..9375fa2ef62fbcee24dd852ee24001a4059b69d7 100644
--- a/src/events/RESS/review/desperateNull.js
+++ b/src/events/RESS/review/desperateNull.js
@@ -6,7 +6,7 @@ App.Events.RESSDesperateNull = class RESSDesperateNull extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RESS/review/desperatelyHorny.js b/src/events/RESS/review/desperatelyHorny.js
index dc918a7a9620fa22a07d333cc405b08e225d1e06..b2a3eb7eeb02ce96619328b456a6d0ca2ab61109 100644
--- a/src/events/RESS/review/desperatelyHorny.js
+++ b/src/events/RESS/review/desperatelyHorny.js
@@ -6,7 +6,7 @@ App.Events.RESSDesperatelyHorny = class RESSDesperatelyHorny extends App.Events.
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.rules.release.masturbation === 0,
@@ -106,7 +106,7 @@ App.Events.RESSDesperatelyHorny = class RESSDesperatelyHorny extends App.Events.
App.Events.addParagraph(node, [`This is the result of not getting off for several days while on the slave diet provided by the nutritional systems. The mild aphrodisiacs included in ${his} food increase ${his} sex drive, and the increased libido can become cumulative if it's not regularly addressed. It looks like ${he} hasn't really gotten ${hers} in a couple of days, and the poor ${girl} can likely think of nothing but that. ${He}'s so horny ${he}'ll do anything for release. However, ${he} did come to you with ${his} trouble rather than masturbating illicitly.`]);
let choices = [new App.Events.Result(`Touch ${him} enough to get ${him} off`, touch)];
- if (eventSlave.fetishKnown === 1 && eventSlave.fetish !== "none") {
+ if (eventSlave.fetishKnown === 1 && eventSlave.fetish !== Fetish.NONE) {
choices.push(new App.Events.Result(`Reward ${him} for coming to you`, reward, virginityWarning()));
}
choices.push(new App.Events.Result(null, null, `Let ${him} get off:`));
@@ -944,7 +944,7 @@ App.Events.RESSDesperatelyHorny = class RESSDesperatelyHorny extends App.Events.
seX(eventSlave, "oral", PC, "penetrative", 5);
}
eventSlave.devotion += 4;
- if (eventSlave.fetish === "submissive" && eventSlave.fetishKnown === 1) {
+ if (eventSlave.fetish === Fetish.SUBMISSIVE && eventSlave.fetishKnown === 1) {
eventSlave.fetishStrength += 4;
r.push(`<span class="fetish inc">${His} enjoyment of submission has increased.</span>`);
} else if (random(1, 100) > 50) {
diff --git a/src/events/RESS/review/devotedExhibition.js b/src/events/RESS/review/devotedExhibition.js
index 01c010d38ed7e082ec071af4356a1b9c6b319c07..6f2e118a1587ba71787ff7e7d9577b3b4710a4e9 100644
--- a/src/events/RESS/review/devotedExhibition.js
+++ b/src/events/RESS/review/devotedExhibition.js
@@ -6,7 +6,7 @@ App.Events.RESSDevotedExhibition = class RESSDevotedExhibition extends App.Event
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
@@ -64,7 +64,7 @@ App.Events.RESSDevotedExhibition = class RESSDevotedExhibition extends App.Event
App.Events.addResponses(node, [
new App.Events.Result(`Inspect ${him} normally`, normally),
new App.Events.Result(`Inspect ${him} and then leave ${him} out for the public to use`, leave),
- (eventSlave.fetishKnown === 1 && eventSlave.fetish !== "none")
+ (eventSlave.fetishKnown === 1 && eventSlave.fetish !== Fetish.NONE)
? new App.Events.Result(`Fuck ${him} like ${he} likes it`, like)
: new App.Events.Result()
]);
@@ -199,7 +199,7 @@ App.Events.RESSDevotedExhibition = class RESSDevotedExhibition extends App.Event
let didAnal = false;
const r = new SpacedTextAccumulator();
r.push(`${He}'s completely unsurprised when you crook a finger at ${him} after a brief inspection, and skips over, looking excited. It's not in vain.`);
- if (eventSlave.fetish === "submissive") {
+ if (eventSlave.fetish === Fetish.SUBMISSIVE) {
r.push(`You shove ${him} across the back of a balcony bench and take ${him} as ${he} moans with pleasure, happy you're using ${his} body. ${He} pays no attention to the <span class="reputation inc">mildly appreciative</span> stares from passersby.`);
repX(250, "event", eventSlave);
if (canDoVaginal(eventSlave)) {
@@ -234,7 +234,7 @@ App.Events.RESSDevotedExhibition = class RESSDevotedExhibition extends App.Event
}
r.push(`and then pull ${his} legs as wide as they'll go as you fuck ${him}, displaying everything to the whole balcony`);
if (eventSlave.belly >= 120000) {
- r.addToLast(`; ${his} _belly stomach hangs so low that it blocks the view, however`);
+ r.addToLast(`; ${his} ${belly} stomach hangs so low that it blocks the view, however`);
} else {
if (V.PC.vagina !== -1) {
if (V.PC.dick !== 0) {
@@ -359,7 +359,7 @@ App.Events.RESSDevotedExhibition = class RESSDevotedExhibition extends App.Event
} else if (didVaginal) {
r.push(VCheck.Vaginal(eventSlave, 1));
}
- if (eventSlave.fetishStrength === 100 || eventSlave.fetish === "none") {
+ if (eventSlave.fetishStrength === 100 || eventSlave.fetish === Fetish.NONE) {
r.push(`Since ${he}'s totally sure of what gets ${him} off, this public display that you know it too makes ${him} <span class="trust inc">trust you.</span>`);
eventSlave.trust += 5;
} else {
diff --git a/src/events/RESS/review/devotedLotion.js b/src/events/RESS/review/devotedLotion.js
index bbb1ade3448bbb6644e93f7d8a146d290fa8ebed..847c38462ec8d4d76c60434ff38d09ed899c6560 100644
--- a/src/events/RESS/review/devotedLotion.js
+++ b/src/events/RESS/review/devotedLotion.js
@@ -6,7 +6,7 @@ App.Events.RESSDevotedLotion = class RESSDevotedLotion extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RESS/review/devotedOld.js b/src/events/RESS/review/devotedOld.js
index a2c07da2d1c79a7be9907c08824dcc096fb80927..554c7cd4486fd0080fee7765287f75c4f08afc1c 100644
--- a/src/events/RESS/review/devotedOld.js
+++ b/src/events/RESS/review/devotedOld.js
@@ -6,7 +6,7 @@ App.Events.RESSDevotedOld = class RESSDevotedOld extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RESS/review/dickWringing.js b/src/events/RESS/review/dickWringing.js
index 78c556f50b0aecfdd66c218caea1d0dac12fbdb0..8851dcf1b09109ad1bc12c6a603a7eac9e894637 100644
--- a/src/events/RESS/review/dickWringing.js
+++ b/src/events/RESS/review/dickWringing.js
@@ -6,7 +6,7 @@ App.Events.RESSDickWringing = class RESSDickWringing extends App.Events.BaseEven
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.dick > 8,
diff --git a/src/events/RESS/review/dickgirlPC.js b/src/events/RESS/review/dickgirlPC.js
index 975342afe761967e20c6464e5a8580e3ed6b5bb6..79e3e579f15479b312131cfd99827a095c979819 100644
--- a/src/events/RESS/review/dickgirlPC.js
+++ b/src/events/RESS/review/dickgirlPC.js
@@ -9,7 +9,7 @@ App.Events.RESSDickgirlPC = class RESSDickgirlPC extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canSee,
diff --git a/src/events/RESS/review/diet.js b/src/events/RESS/review/diet.js
index d8c604a6984a735c66fca99454ccb9bf01caf33f..73a635c56a87be2e0e089ab3053e83e4906caf89 100644
--- a/src/events/RESS/review/diet.js
+++ b/src/events/RESS/review/diet.js
@@ -6,7 +6,7 @@ App.Events.RESSDiet = class RESSDiet extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.devotion <= 50,
diff --git a/src/events/RESS/review/extremeAphrodisiacs.js b/src/events/RESS/review/extremeAphrodisiacs.js
index 286889c2924329c2292010295e3d1c0a002702f9..53105a557ead9ecbc72dc8ef0a42a197e25e67a1 100644
--- a/src/events/RESS/review/extremeAphrodisiacs.js
+++ b/src/events/RESS/review/extremeAphrodisiacs.js
@@ -6,7 +6,7 @@ App.Events.RESSExtremeAphrodisiacs = class RESSExtremeAphrodisiacs extends App.E
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.aphrodisiacs > 1 || s.inflationType === "aphrodisiac",
s => s.rules.speech === "restrictive",
s => s.rules.release.master === 1,
diff --git a/src/events/RESS/review/fearfulBalls.js b/src/events/RESS/review/fearfulBalls.js
index fa2a5f3e311fe3a6fae474baaafafc70a8cd7356..379cf0c9654799f90b649272b09704092483161c 100644
--- a/src/events/RESS/review/fearfulBalls.js
+++ b/src/events/RESS/review/fearfulBalls.js
@@ -8,7 +8,7 @@ App.Events.RESSFearfulBalls = class RESSFearfulBalls extends App.Events.BaseEven
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.assignment !== Job.QUARTER,
s => s.balls > 1,
s => s.scrotum > 0,
diff --git a/src/events/RESS/review/fearfulHumiliation.js b/src/events/RESS/review/fearfulHumiliation.js
index 2d7351cd90dfbdacf39c836328a2639233f7f3fa..2c21a43274d7a5b0d97a317d0b30feb924fc33cd 100644
--- a/src/events/RESS/review/fearfulHumiliation.js
+++ b/src/events/RESS/review/fearfulHumiliation.js
@@ -6,10 +6,11 @@ App.Events.RESSFearfulHumiliation = class RESSFearfulHumiliation extends App.Eve
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
+ canHear,
s => s.fetish === "humiliation" || s.energy > 95,
s => s.devotion <= 50,
s => s.devotion >= -20,
@@ -91,7 +92,13 @@ App.Events.RESSFearfulHumiliation = class RESSFearfulHumiliation extends App.Eve
function tactic() {
let r = []; // TODO: redo art with "nicest clothing"
- r.push(`You instruct ${him} to get cleaned up and get dressed in ${his} nicest clothing. ${He} obeys, mystified, and is further puzzled to find that you're taking ${him} out for a nice evening at a small bar. You share a tasty meal and listen to good music played on the little stage by an older slave. As the set concludes, you lean over and give ${eventSlave.slaveName} ${his} real orders for the evening. ${He} freezes in terror but eventually makes ${his} way up to the stage, strips in front of all the patrons, and says`);
+ r.push(`You instruct ${him} to get cleaned up and get dressed in ${his} nicest clothing. ${He} obeys, mystified, and is further puzzled to find that you're taking ${him} out for a nice evening at a small bar. You share a`);
+ if (canTaste(eventSlave)) {
+ r.push(`tasty`);
+ } else {
+ r.push(`fancy`);
+ }
+ r.push(`meal and listen to good music played on the little stage by an older slave. As the set concludes, you lean over and give ${eventSlave.slaveName} ${his} real orders for the evening. ${He} freezes in terror but eventually makes ${his} way up to the stage, strips in front of all the patrons, and says`);
if (!canTalk(eventSlave)) {
r.push(
`in embarrassed gestures,`,
diff --git a/src/events/RESS/review/firstPeriod.js b/src/events/RESS/review/firstPeriod.js
index 3346782c5bc689a97dcc6299f2a651d58c02aaed..56d427a6271c2fa33e03300493e740bbda715cb4 100644
--- a/src/events/RESS/review/firstPeriod.js
+++ b/src/events/RESS/review/firstPeriod.js
@@ -8,7 +8,7 @@ App.Events.RESSFirstPeriod = class RESSFirstPeriod extends App.Events.BaseEvent
actorPrerequisites() {
return [
[ // single event slave
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
(s) => s.actualAge < 18,
@@ -29,8 +29,7 @@ App.Events.RESSFirstPeriod = class RESSFirstPeriod extends App.Events.BaseEvent
const [slave] = this.actors.map(a => getSlave(a));
const {His, He, he, his, him, himself, girl} = getPronouns(slave);
let r = [];
- const {title: Master} = getEnunciation(slave);
- const {say} = getEnunciation(slave);
+ const {title: Master, say} = getEnunciation(slave);
App.Events.drawEventArt(node, slave);
@@ -80,7 +79,7 @@ App.Events.RESSFirstPeriod = class RESSFirstPeriod extends App.Events.BaseEvent
r.push(`You tell ${him} that ${he} is just undergoing ${his} first period, and that the pain ${he} is feeling is perfectly natural.`);
if (canTalk(slave)) {
r.push(
- Spoken(slave, `"I-I'm a woman now? ${Master}, that m-means, I can get pregnant now."`),
+ Spoken(slave, `"I-I'm a woman now? ${capFirstChar(Master)}, that m-means, I can get pregnant now."`),
`${He} trails off.`
);
} else {
@@ -95,13 +94,21 @@ App.Events.RESSFirstPeriod = class RESSFirstPeriod extends App.Events.BaseEvent
function demonstrate() {
const frag = new DocumentFragment();
let r = [];
+ let restoreChastity = false;
+ if (slave.chastityVagina === 1) {
+ r.push(`You unlock ${his} chastity belt and set it aside, ${his} ${canSee(slave) ? `eyes widening as ${he} watches` : `body stiffening as ${he} feels`} your movements.`);
+ slave.chastityVagina = 0;
+ restoreChastity = true;
+ }
r.push(`You tell ${him} that ${he} is just becoming a woman, and to celebrate, you are going to put a child in ${him}.`);
- if (!canTalk(slave)) {
- r.push(`${He} gasps and rubs a hand across ${his} stomach.`);
- } else {
+ if (canTalk(slave)) {
r.push(Spoken(slave, `"But I'm still a child myself, ${Master}, I can't get pregnant yet!"`));
+ r.push(`You tell ${him} that prior to this week, that would have been true. However, now that ${he} has become fertile, it's time that ${he} learned what ${his} body was made for.`);
+ } else {
+ r.push(`${He} gasps and rubs a hand across ${his} stomach.`);
+ r.push(`You tell ${him} that ${he} has become fertile, and it's now time that ${he} learned what ${his} body was made for.`);
}
- r.push(`You tell ${him} that prior to this week, that would have been true. However, now that ${he} has become fertile, it's time that ${he} learned what ${his} body was made for. You guide ${him} to the couch and tell ${him} to lie on ${his} back so that you may take ${him}. ${He} breaks down when ${he} feels your cock enter ${his}`);
+ r.push(`You guide ${him} to the couch and tell ${him} to lie on ${his} back so that you may take ${him}. ${He} breaks down when ${he} feels your cock enter ${his}`);
if (slave.vagina === 0) {
r.push(`delightfully tight, virgin`);
} else if (slave.vagina === 1) {
@@ -119,7 +126,7 @@ App.Events.RESSFirstPeriod = class RESSFirstPeriod extends App.Events.BaseEvent
} else {
r.push(`${his} massive tits stop ${him} from bringing ${himself} too close to you as you take ${him}.`);
}
- r.push(`${He} enjoys ${himself} immensely, but ${he} loses it again when ${he} feels your seed in ${him}, realizing that ${he} will find ${himself} swelling with your child over the coming months. ${He} has become <span class="devotion inc">more submissive</span> to your will now that ${his} very first egg has been fertilized by ${his} ${getWrittenTitle(slave)}.`);
+ r.push(`${He} enjoys ${himself} immensely, but ${he} loses it again when ${he} feels your seed in ${him}, realizing that ${he} will find ${himself} swelling with your child over the coming months. ${He} has become <span class="devotion inc">more submissive</span> to your will now that ${his} very first egg has been <span class="pregnant">fertilized by ${his} ${getWrittenTitle(slave)}.</span>`);
slave.devotion += 5;
slave.preg = 1;
slave.pregWeek = 1;
@@ -129,6 +136,11 @@ App.Events.RESSFirstPeriod = class RESSFirstPeriod extends App.Events.BaseEvent
WombImpregnate(slave, slave.pregType, -1, 1);
r.push(VCheck.Vaginal(slave, 1));
+ if (restoreChastity) {
+ r.push(`The deed done, you return ${his} chastity belt to its accustomed place before allowing ${him} to leave your office.`);
+ slave.chastityVagina = 1;
+ }
+
App.Events.addParagraph(frag, r);
return frag;
}
@@ -136,20 +148,29 @@ App.Events.RESSFirstPeriod = class RESSFirstPeriod extends App.Events.BaseEvent
function ass() {
const frag = new DocumentFragment();
let r = [];
- r.push(`In one swift motion, you pull out a chastity belt and lock it onto ${him}. ${He} gasps as ${he} feels it hug close to ${his} pussy. You explain that ${he} has just become a woman, and thus, will be taking it up the ass until you decide it's time for ${him} to become pregnant.`);
- if (!canTalk(slave)) {
- r.push(`${He} rubs a hand across ${his} stomach.`);
- } else {
+ if (slave.chastityAnus === 1 && slave.chastityVagina === 1) { // double chastity, remove anal
+ r.push(`In one swift motion, you unlock and detach ${his} anal chastity belt. ${He} gasps at the sudden feeling of freedom at ${his} back door.`);
+ } else if (slave.chastityAnus === 1) { // anal chastity, swap for vaginal
+ r.push(`In a few swift motions, you remove ${his} anal chastity belt and replace it with one encasing ${his} vagina. ${He} gasps as ${he} feels it hug close to ${his} pussy.`);
+ } else if (slave.chastityVagina === 1) { // vaginal chastity, don't remove
+ r.push(`You bring your hand to ${his} chastity belt, feigning dramatically that you might remove it, before 'reconsidering' and pulling your hand away.`);
+ } else { // no chastity, give vaginal
+ r.push(`In one swift motion, you pull out a chastity belt and lock it onto ${him}. ${He} gasps as ${he} feels it hug close to ${his} pussy.`);
+ }
+ r.push(`You explain that ${he} has just become a woman, and thus, will be taking it up the ass until you decide it's time for ${him} to become pregnant.`);
+ if (canTalk(slave)) {
r.push(Spoken(slave, `"You don't want me to get pregnant, ${Master}?"`));
+ } else {
+ r.push(`${He} rubs a hand across ${his} stomach.`);
}
r.push(`You bring ${him} over to the couch, set ${him} on your lap, and teasingly call ${him} a buttslut. Every so often you graze a finger around ${his} chastity belt, noting how much ${his} body wants you in ${him}, but you only make it the center of attention once the poor over-aroused slave`);
- if (!canTalk(slave)) {
- r.push(`begins to use piteous gestures to beg you abjectly to penetrate ${him}.`);
- } else {
+ if (canTalk(slave)) {
r.push(
`${say}s,`,
Spoken(slave, `"I can't take it any more, ${Master}! Please fuck me pregnant!"`)
);
+ } else {
+ r.push(`begins to use piteous gestures to beg you abjectly to penetrate ${him}.`);
}
r.push(`You snicker, but remind ${him} that no matter how much ${he} wants to be knocked up, ${his} belt will direct all the dicks ${he} takes into ${his} rear. You line up and insert your`);
if (V.PC.dick === 0) {
@@ -164,13 +185,14 @@ App.Events.RESSFirstPeriod = class RESSFirstPeriod extends App.Events.BaseEvent
r.push(`the strength of ${his} spasming sphincter`);
}
r.push(`sends you over as well. ${He}'s left in a confused haze; ${his} body tells ${him} to get pregnant, but you tell ${him} to take it anally. ${He} <span class="devotion inc">sides with your decision</span> and vows to be an anal whore for you.`);
- if (slave.fetish === "none") { // TODO: text and the original "coral" color suggests fetish loss here, perhaps pregnancy.
+ if (slave.fetish === Fetish.NONE) { // TODO: text and the original "coral" color suggests fetish loss here, perhaps pregnancy.
r.push(`<span class="fetish loss">Overcoming ${his} urges to become a mother via anal causes ${him} to become a buttslut.</span>`);
slave.fetish = "buttslut";
slave.fetishStrength = 10;
}
slave.devotion += 5;
slave.chastityVagina = 1;
+ slave.chastityAnus = 0;
r.push(VCheck.Anal(slave, 1));
App.Events.addParagraph(frag, r);
diff --git a/src/events/RESS/review/fucktoyTribbing.js b/src/events/RESS/review/fucktoyTribbing.js
index ce03ad3ade48986632ab904ebba320560c8dcc08..d33c8a493f7e60c55d334d0eb9b087f15b283969 100644
--- a/src/events/RESS/review/fucktoyTribbing.js
+++ b/src/events/RESS/review/fucktoyTribbing.js
@@ -9,7 +9,7 @@ App.Events.RESSFucktoyTribbing = class RESSFucktoyTribbing extends App.Events.Ba
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canTalk,
s => [Job.CONCUBINE, Job.FUCKTOY, Job.MASTERSUITE].includes(s.assignment),
s => s.devotion > 20,
@@ -148,7 +148,7 @@ App.Events.RESSFucktoyTribbing = class RESSFucktoyTribbing extends App.Events.Ba
if (eventSlave.fetishKnown === 0) {
r.push(`Knowing little about ${his} sexual peccadilloes, but confident that ${he}'ll do ${his} best to enjoy your lovemaking, you continue this shockingly intimate intercourse until ${he} climaxes.`);
- } else if (eventSlave.fetish === "none") {
+ } else if (eventSlave.fetish === Fetish.NONE) {
r.push(`Knowing ${him} to be quite endearingly vanilla, you continue this shockingly intimate intercourse until ${he} climaxes, kissing ${him} all the way through your soft missionary lovemaking.`);
} else if (eventSlave.fetish === "buttslut") {
r.push(`Knowing ${his} tastes and wanting the intimacy of mutual pleasure, you slide a hand around behind and under ${him} so you can tease ${his} ass. ${He} gives ${his} butt a little wiggle of thanks, and orgasms promptly.`);
@@ -161,7 +161,7 @@ App.Events.RESSFucktoyTribbing = class RESSFucktoyTribbing extends App.Events.Ba
r.push(`Knowing ${his} tastes and wanting the intimacy of mutual pleasure, you nip ${his} lower lip in your teeth with each kiss, and rake your nails across ${his} flanks just hard enough to hurt a little. ${He} climaxes quickly to the mixed pain and missionary intimacy.`);
} else if (eventSlave.fetish === "dom") {
r.push(`You know ${his} tastes, but by the act of this intimate missionary lovemaking, you wordlessly command ${him} to join you for more equal pleasures, if only for the moment. ${He} complies with something like relief, climaxing with surprising speed; perhaps ${he} appreciates a turn on the bottom.`);
- } else if (eventSlave.fetish === "submissive") {
+ } else if (eventSlave.fetish === Fetish.SUBMISSIVE) {
r.push(`Being on the bottom for some missionary lovemaking is very much to ${his} tastes, and ${he} rises to the point of climax with almost indecent speed. You slow your pace to nothing more than a gentle pressure now and then, and keep ${him} on the edge of orgasm for a long time.`);
} else if (eventSlave.fetish === "boobs") {
r.push(`Knowing ${his} tastes and wanting the intimacy of mutual pleasure, you make sure your nipples line up`);
diff --git a/src/events/RESS/review/gaggedSlave.js b/src/events/RESS/review/gaggedSlave.js
index 2188948867f603c725ae6f62d435d52af5276560..56dee1a1ba1ea84fcff932ad56b75edce21662eb 100644
--- a/src/events/RESS/review/gaggedSlave.js
+++ b/src/events/RESS/review/gaggedSlave.js
@@ -6,7 +6,7 @@ App.Events.RESSGaggedSlave = class RESSGaggedSlave extends App.Events.BaseEvent
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.devotion > 20,
diff --git a/src/events/RESS/review/gapedAsshole.js b/src/events/RESS/review/gapedAsshole.js
index 5b71cdc2462db7856e328fa25cd66c78ef084aae..03545eb1baf486ef54e3e99a7a0bc4758672a3b1 100644
--- a/src/events/RESS/review/gapedAsshole.js
+++ b/src/events/RESS/review/gapedAsshole.js
@@ -6,7 +6,7 @@ App.Events.RESSGapedAsshole = class RESSGapedAsshole extends App.Events.BaseEven
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RESS/review/gorging.js b/src/events/RESS/review/gorging.js
index da6a3ee46443eebc4f0befb1da8c2edb4ba31593..704137e696b4572b9e42a915f5600711742a7876 100644
--- a/src/events/RESS/review/gorging.js
+++ b/src/events/RESS/review/gorging.js
@@ -7,7 +7,7 @@ App.Events.RESSGorging = class RESSGorging extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canMove,
canTalk,
@@ -46,16 +46,15 @@ App.Events.RESSGorging = class RESSGorging extends App.Events.BaseEvent {
);
if (V.assistant.personality === 1) {
- r.push(`"There's been issues with that feeder for the past week, I just haven't been able to get the proper technicians here to look at it.", ${heA} explains. "It still works, so disabling it entirely seemed unnecessary.`);
+ r.push(`"There's been issues with that feeder for the past week, I just haven't been able to get the proper technicians here to look at it.", ${heA} explains. "It still works, so disabling it entirely seemed unnecessary."`);
} else {
- r.push(`"That feeder has been malfunctioning for the last two days, and the proper technician has not yet arrived to service it.", ${heA} states. "As it still serves its purpose at meal time, disabling it was deemed inefficient.`);
+ r.push(`"That feeder has been malfunctioning for the last two days, and the proper technician has not yet arrived to service it.", ${heA} states. "As it still serves its purpose at meal time, disabling it was deemed inefficient."`);
}
r.push(`As ${V.assistant.name} continues about ${hisA} oversight, you direct your attention back towards the source of the loud noises filling the cafeteria and echoing out into the halls.`);
App.Events.addParagraph(node, r);
r = [];
- r.push(``);
if (V.cockFeeder === 1) {
r.push(`${eventSlave.slaveName} is kneeling on the floor, passionately working the phallic dispenser. ${His} ${eventSlave.lips > 50 ? "plush" : ""} lips are wrapped around the rod, producing loud slurping sounds as ${he} aggressively sucks it while rubbing ${his} growing belly.`);
} else {
@@ -75,9 +74,9 @@ App.Events.RESSGorging = class RESSGorging extends App.Events.BaseEvent {
} else if (eventSlave.trust < -50) {
r.push(`${He} attempts to get up quickly, terror clouding ${his} face. However, ${his} cumbersome belly hinders ${his} movements and in ${his} haste, ${he} slips in the puddle of slave food. ${He} quickly prostrates ${himself} in front of you, begging for your forgiveness.`);
} else if (eventSlave.devotion > 50){
- r.push(Spoken(eventSlave, `${Master}! I was just so ${slave.energy > 80 ? "horny" : "hungry"}, I don't know what came over me. I just needed to feel my belly growing..."`), ` ${he} ${eventSlave.trust > 50 ? "" : "nervously"} explains while continuing to tease ${his} bloated form. ${He} must have been in the cafeteria for a while already, as ${his} swollen belly sloshes slightly as ${he} speaks.`);
+ r.push(Spoken(eventSlave, `"${Master}! I was just so ${eventSlave.energy > 80 ? "horny" : "hungry"}, I don't know what came over me. I just needed to feel my belly growing..."`), ` ${he} ${eventSlave.trust > 50 ? "" : "nervously"} explains while continuing to tease ${his} bloated form. ${He} must have been in the cafeteria for a while already, as ${his} swollen belly sloshes slightly as ${he} speaks.`);
} else if (eventSlave.devotion > 20){
- r.push(Spoken(eventSlave, `${Master}! I don't know what came over me!`), ` ${he} ${eventSlave.trust > 50 ? "" : "nervously"} exclaims while continuing to massage ${his} bloated form, waiting to see how you will react. ${He} must have been in the cafeteria for a while already, as ${his} swollen belly sloshes slightly as ${he} speaks.`);
+ r.push(Spoken(eventSlave, `"${Master}! I don't know what came over me!"`), ` ${he} ${eventSlave.trust > 50 ? "" : "nervously"} exclaims while continuing to massage ${his} bloated form, waiting to see how you will react. ${He} must have been in the cafeteria for a while already, as ${his} swollen belly sloshes slightly as ${he} speaks.`);
} else {
r.push(`${He} attempts to get up quickly, fear clouding ${his} face, but stumbles under ${his} weight. With ${his} cumbersome belly hindering ${his} movement, ${he} is forced to awkwardly prop ${himself} against the feeder to keep ${himself} upright.`);
}
@@ -120,7 +119,7 @@ App.Events.RESSGorging = class RESSGorging extends App.Events.BaseEvent {
r.push(`${His} chest heaves`);
}
- r.push(`as ${he} struggles to breath through ${his} nose as the food continues to pour down ${his} throat. The slight swell to ${his} belly that greeted you when you walked into the cafeteria balloons forwards, churning and gurgling as serving after serving of food is pumped into the stretched organ. As the feeding system alerts you that nearly two gallons of food has been forced into ${eventSlave.slaveName}, ${his} ${canSee(eventSlave) ? "eyes roll back" : "head whips back"} towards the ceiling`);
+ r.push(`as ${he} struggles to breathe through ${his} nose as the food continues to pour down ${his} throat. The slight swell to ${his} belly that greeted you when you walked into the cafeteria balloons forwards, churning and gurgling as serving after serving of food is pumped into the stretched organ. As the feeding system alerts you that nearly two gallons of food has been forced into ${eventSlave.slaveName}, ${his} ${canSee(eventSlave) ? "eyes roll back" : "head whips back"} towards the ceiling`);
if (eventSlave.vagina >= 0) {
r.push(`and vaginal fluids`);
if (eventSlave.dick > 0) {
@@ -209,14 +208,13 @@ App.Events.RESSGorging = class RESSGorging extends App.Events.BaseEvent {
eventSlave.devotion += 5;
if (canDoVaginal(eventSlave)) {
- t.push(VCheck.Vaginal(eventSlave, 1));
+ r.push(VCheck.Vaginal(eventSlave, 1));
} else {
- t.push(VCheck.Anal(eventSlave, 1));
+ r.push(VCheck.Anal(eventSlave, 1));
}
eventSlave.inflation = 3;
SetBellySize(eventSlave);
App.Events.refreshEventArt(eventSlave);
- deflate(eventSlave);
return r;
}
@@ -267,6 +265,7 @@ App.Events.RESSGorging = class RESSGorging extends App.Events.BaseEvent {
}
eventSlave.devotion += 2;
eventSlave.trust += 7;
+ cashX(5000, "event");
} else if (V.arcologies[0].FSSlimnessEnthusiast !== "unset") {
r.push(`A <span class = "devotion dec">worried</span> look crosses ${his} features as ${he} senses the disdain and disgust levied towards ${his} direction, both from yourself and the slaves currently servicing you. ${He} scampers away quickly, eager to escape your presence; ${he}'s had <span class = "trust dec">plenty of torment thrown ${his} way</span> today already, and so ${he} will spend the night eating away ${his} sorrows.`);
eventSlave.devotion -= 5;
diff --git a/src/events/RESS/review/happyDance.js b/src/events/RESS/review/happyDance.js
index 3b84a31a86d0cbc2c23e0a2825380bf63ba23414..51fe598789edc47f09cffa9161cb58392dade722 100644
--- a/src/events/RESS/review/happyDance.js
+++ b/src/events/RESS/review/happyDance.js
@@ -6,7 +6,7 @@ App.Events.RESSHappyDance = class RESSHappyDance extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => canTalk(s, false),
@@ -141,9 +141,9 @@ App.Events.RESSHappyDance = class RESSHappyDance extends App.Events.BaseEvent {
if (eventSlave.boobsImplant/eventSlave.boobs >= .75) {
r.push(`fake tits staying perfectly in place.`);
} else if (eventSlave.boobs > 2000) {
- r.push(`${eventSlave.boobShape} boobs swaying along.`);
+ r.push(`${eventSlave.boobShape === "normal" ? `` : `${eventSlave.boobShape} `}boobs swaying along.`);
} else if (eventSlave.boobs > 400) {
- r.push(`${eventSlave.boobShape} tits bouncing along.`);
+ r.push(`${eventSlave.boobShape === "normal" ? `` : `${eventSlave.boobShape} `}tits bouncing along.`);
} else {
r.push(`petite chest accentuating ${his} gamine charm.`);
}
diff --git a/src/events/RESS/review/hatesOral.js b/src/events/RESS/review/hatesOral.js
index 5ac64c36ed7713cb96b88545b7a095f2b8ab8a66..9781b3eacc1ccd0eba7a2a05bde739c21b02ff72 100644
--- a/src/events/RESS/review/hatesOral.js
+++ b/src/events/RESS/review/hatesOral.js
@@ -8,7 +8,7 @@ App.Events.RESSHatesOral = class RESSHatesOral extends App.Events.BaseEvent { //
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.devotion <= 50,
s => s.sexualFlaw === "hates oral",
]
@@ -212,7 +212,7 @@ App.Events.RESSHatesOral = class RESSHatesOral extends App.Events.BaseEvent { //
r.push(`${eventSlave.slaveName}'s cock oozes cum from ${his} intense orgasm, and you command ${him} to clean it off the floor before ${he} gets back to ${his} duties.`);
}
if (random(1, 4) === 4) {
- r.push(`<span class="fatish gain">You've successfully linked cum and pleasure in ${his} mind,</span> guaranteeing ${him} a confusing few days as ${he} tries to reconcile this with ${his} hatred of oral sex.`);
+ r.push(`<span class="fetish gain">You've successfully linked cum and pleasure in ${his} mind,</span> guaranteeing ${him} a confusing few days as ${he} tries to reconcile this with ${his} hatred of oral sex.`);
eventSlave.fetish = "cumslut";
eventSlave.fetishKnown = 1;
eventSlave.fetishStrength = 10;
diff --git a/src/events/RESS/review/heavyPiercing.js b/src/events/RESS/review/heavyPiercing.js
index 700b8e259c01f9ca2e311ff02c0c6ad3506aae8b..15bfce6d1e441b4f3ebcb1dc25b777b4c6eae552 100644
--- a/src/events/RESS/review/heavyPiercing.js
+++ b/src/events/RESS/review/heavyPiercing.js
@@ -6,7 +6,7 @@ App.Events.RESSHeavyPiercing = class RESSHeavyPiercing extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.piercing.vagina.weight > 1,
s => s.piercing.nipple.weight > 1,
s => s.piercing.genitals.weight > 1,
diff --git a/src/events/RESS/review/heels_event.js b/src/events/RESS/review/heels_event.js
index f14926455c34f260880e54dfac207add92f91cea..8d81c0f95436b3292e1678e4e06a771432c9d2a4 100644
--- a/src/events/RESS/review/heels_event.js
+++ b/src/events/RESS/review/heels_event.js
@@ -6,7 +6,7 @@ App.Events.RESSHeels = class RESSHeels extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => (canDoAnal(s) || canDoVaginal(s)),
s => s.heels === 1, // tendons are shortened
s => shoeHeelCategory(s) > 0 // changed during conversion; previously accepted only "heels" and "extreme heels"
diff --git a/src/events/RESS/review/hormoneDysfunction.js b/src/events/RESS/review/hormoneDysfunction.js
index bc0ad3802dd81419fb839f3ac69a0f8e98f305f5..e7564e4f031fd4654222f39c797fd127d3d056c5 100644
--- a/src/events/RESS/review/hormoneDysfunction.js
+++ b/src/events/RESS/review/hormoneDysfunction.js
@@ -6,7 +6,7 @@ App.Events.RESSHormoneDysfunction = class RESSHormoneDysfunction extends App.Eve
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.hormoneBalance >= 50,
s => s.vagina === -1,
s => s.balls >= 0,
diff --git a/src/events/RESS/review/hugeNaturals.js b/src/events/RESS/review/hugeNaturals.js
index be5381d885c59b7dff522ab6df4816f1af577005..6807a51a15c0e230b773f13cfeea83d823ad0203 100644
--- a/src/events/RESS/review/hugeNaturals.js
+++ b/src/events/RESS/review/hugeNaturals.js
@@ -6,7 +6,7 @@ App.Events.RESSHugeNaturals = class RESSHugeNaturals extends App.Events.BaseEven
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.boobs >= 2000,
diff --git a/src/events/RESS/review/hugeTits.js b/src/events/RESS/review/hugeTits.js
index 9c18f1b7865157f9d1cd0c07728179f911aad6bc..af027551133a0f21152da524f165ac07b3f9a026 100644
--- a/src/events/RESS/review/hugeTits.js
+++ b/src/events/RESS/review/hugeTits.js
@@ -11,7 +11,7 @@ App.Events.RESSHugeTits = class RESSHugeTits extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RESS/review/hugelyPregnant.js b/src/events/RESS/review/hugelyPregnant.js
index ed6d28a30674568ff8155dcfcfc6390d7a50a27f..3d0d70e60392cf43fc176bd9809616b731923df4 100644
--- a/src/events/RESS/review/hugelyPregnant.js
+++ b/src/events/RESS/review/hugelyPregnant.js
@@ -8,7 +8,7 @@ App.Events.RESSHugelyPregnant = class RESSHugelyPregnant extends App.Events.Base
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.bellyPreg >= 10000,
]
];
diff --git a/src/events/RESS/review/hyperpregStuck.js b/src/events/RESS/review/hyperpregStuck.js
index b82c622b5556a62cb4e98d9fe69d26e810605777..503fb9ddfdd4a454d1b2dda5c44fe4b66ff8a737 100644
--- a/src/events/RESS/review/hyperpregStuck.js
+++ b/src/events/RESS/review/hyperpregStuck.js
@@ -8,7 +8,7 @@ App.Events.RESSHyperpregStuck = class RESSHyperpregStuck extends App.Events.Base
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.bellyPreg >= 300000,
]
];
@@ -73,9 +73,9 @@ App.Events.RESSHyperpregStuck = class RESSHyperpregStuck extends App.Events.Base
}
r.push(`backwards and, as a result, you have a glorious view of ${his}`);
if (eventSlave.broodmother === 2 && eventSlave.preg >= 30) {
- r.push(`mind boggling, obscenely swollen belly`);
+ r.push(`mind-boggling, obscenely swollen belly`);
} else if (eventSlave.broodmother === 1 && eventSlave.preg >= 30) {
- r.push(`massive, brood swollen belly`);
+ r.push(`massive, brood-swollen belly`);
} else {
r.push(`inhumanly gravid belly`);
}
@@ -330,7 +330,7 @@ App.Events.RESSHyperpregStuck = class RESSHyperpregStuck extends App.Events.Base
} else {
r.push(`centimeter`);
}
- r.push(`of ${his} colossal tits, noting with satisfaction ${his} distant nipples, stuck on the other side of the doorway with the bulk of ${his} room filling breasts, harden with arousal.`);
+ r.push(`of ${his} colossal tits, noting with satisfaction ${his} distant nipples, stuck on the other side of the doorway with the bulk of ${his} room-filling breasts, harden with arousal.`);
} else if (eventSlave.boobs >= 12000) {
r.push(`massage the soft butter into ${his} massive tits as they push up between the arch of the doorway and ${his} bulging belly. You note with satisfaction ${his} nipples harden with arousal.`);
} else if (eventSlave.boobs >= 7000) {
diff --git a/src/events/RESS/review/ignorantHorny.js b/src/events/RESS/review/ignorantHorny.js
index 19e7afc10b326d18a338ef02c0d837ad8cd916b0..c0262024e4681fbf4507d2e6c179e0de1ee6a866 100644
--- a/src/events/RESS/review/ignorantHorny.js
+++ b/src/events/RESS/review/ignorantHorny.js
@@ -6,7 +6,7 @@ App.Events.RESSIgnorantHorny = class RESSIgnorantHorny extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RESS/review/implantInspection.js b/src/events/RESS/review/implantInspection.js
index 66a93a9eaf407036628f7501030830237d595f92..5f1b4c4b085df763bd6613e02559a3a62f117f32 100644
--- a/src/events/RESS/review/implantInspection.js
+++ b/src/events/RESS/review/implantInspection.js
@@ -6,7 +6,7 @@ App.Events.RESSImplantInspection = class RESSImplantInspection extends App.Event
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.assignment !== Job.QUARTER,
diff --git a/src/events/RESS/review/inconvenientLabia.js b/src/events/RESS/review/inconvenientLabia.js
index 8cad0b2ad6bcdaded0c1fa7b8d7c55d3cb6da1cc..aeb3272dbd3b90bf589b0747877e2f4f769acc0e 100644
--- a/src/events/RESS/review/inconvenientLabia.js
+++ b/src/events/RESS/review/inconvenientLabia.js
@@ -6,7 +6,7 @@ App.Events.RESSInconvenientLabia = class RESSInconvenientLabia extends App.Event
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.labia > 1,
@@ -52,7 +52,7 @@ App.Events.RESSInconvenientLabia = class RESSInconvenientLabia extends App.Event
r.push(`${He} lisps through ${his} huge piercings,`);
}
r.push(
- Spoken(eventSlave, `"${Master}, my pussylips are really big. They make running on the treadmill really painful, even wearing my compression shorts"`),
+ Spoken(eventSlave, `"${Master}, my pussylips are really big. They make running on the treadmill really painful, even wearing my compression shorts,"`),
`${he} explains.`,
Spoken(eventSlave, `"They just kind of get in the way."`)
);
diff --git a/src/events/RESS/review/likeMe.js b/src/events/RESS/review/likeMe.js
index 1f97cdaa71e2fd3ae1cc2ea528528b4f3cc9ff61..21781716c4d2b820b55a6ff494445c4d6913cae7 100644
--- a/src/events/RESS/review/likeMe.js
+++ b/src/events/RESS/review/likeMe.js
@@ -6,7 +6,7 @@ App.Events.RESSLikeMe = class RESSLikeMe extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.trust <= 20,
diff --git a/src/events/RESS/review/looseButtslut.js b/src/events/RESS/review/looseButtslut.js
index d39409aea5fa80a7359fe9484b0e12601da30b59..3b9240e439f0acd5af4fc32cb1349261020e1c88 100644
--- a/src/events/RESS/review/looseButtslut.js
+++ b/src/events/RESS/review/looseButtslut.js
@@ -6,10 +6,10 @@ App.Events.RESSLooseButtslut = class RESSLooseButtslut extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canHold,
canDoAnal,
- s => s.fetish === "buttslut" || (s.energy > 95 && s.fetish !== "none"),
+ s => s.fetish === "buttslut" || (s.energy > 95 && s.fetish !== Fetish.NONE),
s => s.anus > 2,
s => s.belly < 300000,
s => s.rules.release.masturbation === 1,
diff --git a/src/events/RESS/review/masterfulEntertainer.js b/src/events/RESS/review/masterfulEntertainer.js
index 9bcbbb48c5f218b4fab5d5cbcb86017f738186eb..4a9fd1c40212cb49df41dc07ca8c4ea022ee1aea 100644
--- a/src/events/RESS/review/masterfulEntertainer.js
+++ b/src/events/RESS/review/masterfulEntertainer.js
@@ -6,7 +6,7 @@ App.Events.RESSMasterfulEntertainer = class RESSMasterfulEntertainer extends App
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.assignment === Job.PUBLIC,
diff --git a/src/events/RESS/review/millenary.js b/src/events/RESS/review/millenary.js
index 0e2d51813d52b41398dc14d64002fdef81234aa5..fd7f18297274c9fb89f8c7e9a3e72061b48b29ab 100644
--- a/src/events/RESS/review/millenary.js
+++ b/src/events/RESS/review/millenary.js
@@ -6,7 +6,7 @@ App.Events.RESSMillenary = class RESSMillenary extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canTalk,
s => (canDoAnal(s) || canDoVaginal(s)),
s => s.anus > 0,
diff --git a/src/events/RESS/review/modsPlease.js b/src/events/RESS/review/modsPlease.js
index abc3e0618cba9bb15342c8a9b5e160d64ab405f2..d7f8a015721e25f898f591dfb0714db2937c3a97 100644
--- a/src/events/RESS/review/modsPlease.js
+++ b/src/events/RESS/review/modsPlease.js
@@ -8,7 +8,7 @@ App.Events.RESSModsPlease = class RESSModsPlease extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
@@ -74,8 +74,8 @@ App.Events.RESSModsPlease = class RESSModsPlease extends App.Events.BaseEvent {
r.push(`acknowledgment,`);
}
r.push(he);
- if (eventSlave.fetishKnown === 1 && eventSlave.fetish !== "none") {
- if (eventSlave.fetish === "submissive") {
+ if (eventSlave.fetishKnown === 1 && eventSlave.fetish !== Fetish.NONE) {
+ if (eventSlave.fetish === Fetish.SUBMISSIVE) {
r.push(
`gives a submissive shudder, and turns to show you ${his} bare back.`,
Spoken(eventSlave, `"${Master}, may I have a corset piercing? I would love to feel more, um, bound. Tied up. Please?"`)
@@ -243,8 +243,8 @@ App.Events.RESSModsPlease = class RESSModsPlease extends App.Events.BaseEvent {
App.Events.addParagraph(frag, r);
r = [];
r.push(`Manipulating the machine, you`);
- if (eventSlave.fetishKnown === 1 && eventSlave.fetish !== "none") {
- if (eventSlave.fetish === "submissive") {
+ if (eventSlave.fetishKnown === 1 && eventSlave.fetish !== Fetish.NONE) {
+ if (eventSlave.fetish === Fetish.SUBMISSIVE) {
r.push(`place the first piercing, eliciting a hum of mild pain and abject submission from ${eventSlave.slaveName}. The piercing session goes on and on, with the slave sinking into a boneless, mindless state in which ${his} being is completely in your hands. ${He}'s almost sleepy when you finally release ${him}, but ${he} rises and`);
if (canSee(eventSlave)) {
r.push(`turns, craning around to see in the mirror.`);
diff --git a/src/events/RESS/review/newlyDevotedSunrise.js b/src/events/RESS/review/newlyDevotedSunrise.js
index 3db2143408e7ec270a68b5ace52bc98f1778c7ac..c64a82ec851c8b9a31432b3b14baa13a63b5221c 100644
--- a/src/events/RESS/review/newlyDevotedSunrise.js
+++ b/src/events/RESS/review/newlyDevotedSunrise.js
@@ -6,7 +6,7 @@ App.Events.RESSNewlyDevotedSunrise = class RESSNewlyDevotedSunrise extends App.E
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RESS/review/niceGuys.js b/src/events/RESS/review/niceGuys.js
index 46fedf8b35f6862fad6adf0bd7fec09df1c8f0dc..528e54213969190ece2264316757011a89b0751f 100644
--- a/src/events/RESS/review/niceGuys.js
+++ b/src/events/RESS/review/niceGuys.js
@@ -6,7 +6,7 @@ App.Events.RESSNiceGuys = class RESSNiceGuys extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.assignment === Job.PUBLIC,
diff --git a/src/events/RESS/review/notMyName.js b/src/events/RESS/review/notMyName.js
index eb48b24b2c29f630f89430346aee3b472ac07da8..7751ce65adcf5e6a643a3d628aa97489f83ab73d 100644
--- a/src/events/RESS/review/notMyName.js
+++ b/src/events/RESS/review/notMyName.js
@@ -6,7 +6,7 @@ App.Events.RESSNotMyName = class RESSNotMyName extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RESS/review/nymphoWithAssistant.js b/src/events/RESS/review/nymphoWithAssistant.js
index 264f876f73612c42e45833640daac0e9e8cae32f..e972041e668ff2f60a623792f8a58bd2b7c47a3f 100644
--- a/src/events/RESS/review/nymphoWithAssistant.js
+++ b/src/events/RESS/review/nymphoWithAssistant.js
@@ -8,7 +8,7 @@ App.Events.RESSNymphoWithAssistant = class RESSNymphoWithAssistant extends App.E
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.fetishKnown === 1,
s => s.energy > 95,
s => s.devotion > 20,
diff --git a/src/events/RESS/review/objectifyingVisit.js b/src/events/RESS/review/objectifyingVisit.js
index ec9fe5b155084e8930aa585e32eca979a3affed6..1b41059d75fdad19789a861b8f85534622bd34be 100644
--- a/src/events/RESS/review/objectifyingVisit.js
+++ b/src/events/RESS/review/objectifyingVisit.js
@@ -6,7 +6,7 @@ App.Events.RESSObjectifyingVisit = class RESSObjectifyingVisit extends App.Event
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.trust > 20,
diff --git a/src/events/RESS/review/orchiectomyPlease.js b/src/events/RESS/review/orchiectomyPlease.js
index 5c3bbdc3fa51e3ad1fa11269e094104899072b5c..57b3ad256626bde61124f8a30fe3e7517ca341e4 100644
--- a/src/events/RESS/review/orchiectomyPlease.js
+++ b/src/events/RESS/review/orchiectomyPlease.js
@@ -8,7 +8,7 @@ App.Events.RESSOrchiectomyPlease = class RESSOrchiectomyPlease extends App.Event
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.assignment !== Job.QUARTER,
diff --git a/src/events/RESS/review/rebelliousArrogant.js b/src/events/RESS/review/rebelliousArrogant.js
index 384f87fa571c5a8e48c1d7891007a5bf377762c3..7d4c03e207835048a98e7801f54e83ab30160379 100644
--- a/src/events/RESS/review/rebelliousArrogant.js
+++ b/src/events/RESS/review/rebelliousArrogant.js
@@ -6,7 +6,7 @@ App.Events.RESSRebelliousArrogant = class RESSRebelliousArrogant extends App.Eve
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.assignment !== Job.QUARTER,
s => s.behavioralFlaw === "arrogant",
s => s.devotion < -50,
diff --git a/src/events/RESS/review/resistantAnalVirgin.js b/src/events/RESS/review/resistantAnalVirgin.js
index cefa5b969603dd94560719e95d18c6ab53277b93..84f4939ac352c65c63062aa09e4af316f714bf58 100644
--- a/src/events/RESS/review/resistantAnalVirgin.js
+++ b/src/events/RESS/review/resistantAnalVirgin.js
@@ -6,7 +6,7 @@ App.Events.RESSResistantAnalVirgin = class RESSResistantAnalVirgin extends App.E
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.devotion < -20,
s => s.trust >= -20,
s => s.anus === 0,
diff --git a/src/events/RESS/review/resistantGelding.js b/src/events/RESS/review/resistantGelding.js
index b06c781300216e45bff3c3c779f91f77a980dc83..c60afd07637ff853a50eefb53acdb6c575b6c691 100644
--- a/src/events/RESS/review/resistantGelding.js
+++ b/src/events/RESS/review/resistantGelding.js
@@ -6,7 +6,7 @@ App.Events.RESSResistantGelding = class RESSResistantGelding extends App.Events.
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.dick > 0,
diff --git a/src/events/RESS/review/resistantShower.js b/src/events/RESS/review/resistantShower.js
index 561fde083aeef0c814ef3605a50910361b9cb81b..e37410ff6fffe395c28f62ee931c2c4c6e34b167 100644
--- a/src/events/RESS/review/resistantShower.js
+++ b/src/events/RESS/review/resistantShower.js
@@ -6,7 +6,7 @@ App.Events.RESSResistantShower = class RESSResistantShower extends App.Events.Ba
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.devotion <= 20,
diff --git a/src/events/RESS/review/restrictedProfession.js b/src/events/RESS/review/restrictedProfession.js
index f77aee7d4e2b7b2bfc3816ae2a975c164d3b7eb2..fc2a192537dfd1a661aab0f140666ec60b9e2579 100644
--- a/src/events/RESS/review/restrictedProfession.js
+++ b/src/events/RESS/review/restrictedProfession.js
@@ -6,7 +6,7 @@ App.Events.RESSRestrictedProfession = class RESSRestrictedProfession extends App
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canTalk,
s => s.assignment !== Job.QUARTER,
s => s.rules.speech === "restrictive",
diff --git a/src/events/RESS/review/servantMaid.js b/src/events/RESS/review/servantMaid.js
index 70b91d2bce09a5a89717e1612348bbb9f12535de..2b3e8da0deeeef0fc120af94b13c926a675f678e 100644
--- a/src/events/RESS/review/servantMaid.js
+++ b/src/events/RESS/review/servantMaid.js
@@ -6,7 +6,7 @@ App.Events.RESSServantMaid = class RESSServantMaid extends App.Events.BaseEvent
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.devotion <= 20,
s => [Job.QUARTER, Job.HOUSE].includes(s.assignment),
s => ["a nice maid outfit", "a slutty maid outfit"].includes(s.clothes),
diff --git a/src/events/RESS/review/sexySuccubus.js b/src/events/RESS/review/sexySuccubus.js
index 8301d248f28fb93b625fd907ad24e17c65a765a8..794d83e57610f18bb8af1655b5ae6bb90f2f6b1c 100644
--- a/src/events/RESS/review/sexySuccubus.js
+++ b/src/events/RESS/review/sexySuccubus.js
@@ -6,7 +6,7 @@ App.Events.RESSSexySuccubus = class RESSSexySuccubus extends App.Events.BaseEven
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
@@ -276,7 +276,7 @@ App.Events.RESSSexySuccubus = class RESSSexySuccubus extends App.Events.BaseEven
Spoken(eventSlave, `"So tight! So full! So Good! I need more! Oh, ${Master}..."`),
`${He} may be getting a little too into the fantasy.`
);
- if (eventSlave.broodmother === 2 && eventSlave.preg > 37) {
+ if (eventSlave.broodmother === 2 && eventSlave.preg >= 36) {
r.push(
`A gush of fluid flows from ${his} pussy, snapping ${him} out of ${his} roleplay.`,
Spoken(eventSlave, `"${Master}! I need... One's coming now!"`),
@@ -384,10 +384,10 @@ App.Events.RESSSexySuccubus = class RESSSexySuccubus extends App.Events.BaseEven
}
r.push(`${he} whines at your sudden aggression, wiggling within your dominating grip. You fill ${his} ass with cum as ${he} struggles, still playing ${his} part, begging you not to cum in ${his} bottom, since succubi can't live on buttsex.`);
eventSlave.trust += 4;
- if (eventSlave.fetish === "submissive" && eventSlave.fetishStrength > 95) {
+ if (eventSlave.fetish === Fetish.SUBMISSIVE && eventSlave.fetishStrength > 95) {
r.push(`It's a role the submissive slut <span class="devotion inc">loves.</span>`);
eventSlave.devotion += 2;
- } else if (eventSlave.fetish === "submissive") {
+ } else if (eventSlave.fetish === Fetish.SUBMISSIVE) {
r.push(`It's a role that <span class="fetish inc">reinforces ${his} submissive streak.</span>`);
eventSlave.fetishStrength += 4;
} else if ((eventSlave.fetishStrength <= 95 || eventSlave.fetishKnown === 0) && random(0, 1) === 0) {
diff --git a/src/events/RESS/review/shapedAreolae.js b/src/events/RESS/review/shapedAreolae.js
index d464dd987158d37912672a3ca13ea652b373bd57..58b0ee9152710bc7b18e73fe701f62da9b105669 100644
--- a/src/events/RESS/review/shapedAreolae.js
+++ b/src/events/RESS/review/shapedAreolae.js
@@ -6,7 +6,7 @@ App.Events.RESSShapedAreolae = class RESSShapedAreolae extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.boobs > 1200,
s => s.areolaeShape !== "circle",
s => s.devotion > 50,
diff --git a/src/events/RESS/review/shiftDoorframe.js b/src/events/RESS/review/shiftDoorframe.js
index 57a0824a12472c79104cce0297dca5b9dc0daf54..cb070708fed9466b1d7ed6e611ece0bfd85f463a 100644
--- a/src/events/RESS/review/shiftDoorframe.js
+++ b/src/events/RESS/review/shiftDoorframe.js
@@ -6,7 +6,7 @@ App.Events.RESSShiftDoorframe = class RESSShiftDoorframe extends App.Events.Base
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => ([Job.CONCUBINE, Job.FUCKTOY, Job.MASTERSUITE].includes(s.assignment)),
canTalk,
s => s.devotion > 20,
diff --git a/src/events/RESS/review/shiftMasturbation.js b/src/events/RESS/review/shiftMasturbation.js
index 624960a99772797add1241ff9d3732fd326ca92d..61a4e1e4f14c441fe7df7ffef09841b59987881e 100644
--- a/src/events/RESS/review/shiftMasturbation.js
+++ b/src/events/RESS/review/shiftMasturbation.js
@@ -6,7 +6,7 @@ App.Events.RESSShiftMasturbation = class RESSShiftMasturbation extends App.Event
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canTalk,
s => [Job.CONCUBINE, Job.FUCKTOY, Job.MASTERSUITE].includes(s.assignment),
s => s.devotion > 20,
@@ -196,7 +196,7 @@ App.Events.RESSShiftMasturbation = class RESSShiftMasturbation extends App.Event
r.push(`jerking off,`);
} else if (eventSlave.dick > 0) {
r.push(`teasing ${his} girly little dick,`);
- } else if (eventSlave.clit > 0) {
+ } else if (eventSlave.clit > 2) {
r.push(`jerking off ${his} ridiculous clit,`);
} else if (eventSlave.labia > 0) {
r.push(`spreading and teasing ${his} petals,`);
diff --git a/src/events/RESS/review/shiftSleep.js b/src/events/RESS/review/shiftSleep.js
index 63424455ff8fbdc384e3c534253187c2490294b9..2643a1fdc1066dd2b62f2be3ad5f96e2339fe11b 100644
--- a/src/events/RESS/review/shiftSleep.js
+++ b/src/events/RESS/review/shiftSleep.js
@@ -8,7 +8,7 @@ App.Events.RESSShiftSleep = class RESSShiftSleep extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canTalk,
s => [Job.CONCUBINE, Job.FUCKTOY, Job.MASTERSUITE].includes(s.assignment),
s => s.devotion > 20,
diff --git a/src/events/RESS/review/showerSlip.js b/src/events/RESS/review/showerSlip.js
index 3e08e2726dae2e1455e2a6237e150b980c0b911b..46455d095cf398655af67639b5653e3c1c51ba1f 100644
--- a/src/events/RESS/review/showerSlip.js
+++ b/src/events/RESS/review/showerSlip.js
@@ -8,7 +8,7 @@ App.Events.RESSShowerSlip = class RESSShowerSlip extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.trust > 20,
diff --git a/src/events/RESS/review/slaveDickHuge.js b/src/events/RESS/review/slaveDickHuge.js
index 101072cb9e2fc191d66285a0f09729c3b260f253..04b7bbc1d10ff8dbff9126144b9c7e5f98773d9b 100644
--- a/src/events/RESS/review/slaveDickHuge.js
+++ b/src/events/RESS/review/slaveDickHuge.js
@@ -6,7 +6,7 @@ App.Events.RESSSlaveDickHuge = class RESSSlaveDickHuge extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.rules.release.masturbation === 1,
s => s.dick > 4,
hasAnyArms,
diff --git a/src/events/RESS/review/sleepingAmbivalent.js b/src/events/RESS/review/sleepingAmbivalent.js
index 721e65ae6378d1ce1da8d1f80aeefbed890c8383..4c48cb057c8b063c5827ab890ee05ed3fb2920e7 100644
--- a/src/events/RESS/review/sleepingAmbivalent.js
+++ b/src/events/RESS/review/sleepingAmbivalent.js
@@ -6,7 +6,7 @@ App.Events.RESSSleepingAmbivalent = class RESSSleepingAmbivalent extends App.Eve
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RESS/review/soreAss.js b/src/events/RESS/review/soreAss.js
index 0784388fc115e36e50b9ab759c7aeb1f3dc2f658..e99df61a704cc4e7ea2ad50977588928d7e5cdd0 100644
--- a/src/events/RESS/review/soreAss.js
+++ b/src/events/RESS/review/soreAss.js
@@ -6,7 +6,7 @@ App.Events.RESSSoreAss = class RESSSoreAss extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.devotion <= 50,
s => s.minorInjury === "sore ass",
]
diff --git a/src/events/RESS/review/soreShoulders.js b/src/events/RESS/review/soreShoulders.js
index b6399325d0c35fe06d239830f0af6bf881529d96..eb881efd43d3c0d0b9ca3961adb3e37d7ff2e4e0 100644
--- a/src/events/RESS/review/soreShoulders.js
+++ b/src/events/RESS/review/soreShoulders.js
@@ -6,7 +6,7 @@ App.Events.RESSSoreShoulders = class RESSSoreShoulders extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => canTalk(s, false),
diff --git a/src/events/RESS/review/spaBoobs.js b/src/events/RESS/review/spaBoobs.js
index 1c18008769bb3534e6139ef0b12fefc05ccabf5a..1ec3301c3f61d82aecca396cc827d84fa15ead04 100644
--- a/src/events/RESS/review/spaBoobs.js
+++ b/src/events/RESS/review/spaBoobs.js
@@ -8,7 +8,7 @@ App.Events.RESSSpaBoobs = class RESSSpaBoobs extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
@@ -222,7 +222,7 @@ App.Events.RESSSpaBoobs = class RESSSpaBoobs extends App.Events.BaseEvent {
}
r.push(`the bottom of the pool. Before ${he} can panic, ${he} feels your mouth against ${his}`);
if (eventSlave.lips > 70) {
- r.push(`dick sucking`);
+ r.push(`dick-sucking`);
} else if (eventSlave.lips > 20) {
r.push(`lovely`);
}
diff --git a/src/events/RESS/review/subjugationBlues.js b/src/events/RESS/review/subjugationBlues.js
index 47adbaa00c8765c4b6bcea155071087f65230495..edefbe6839fa5c48c12334ace93452e8508295b4 100644
--- a/src/events/RESS/review/subjugationBlues.js
+++ b/src/events/RESS/review/subjugationBlues.js
@@ -8,7 +8,7 @@ App.Events.RESSSubjugationBlues = class RESSSubjugationBlues extends App.Events.
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
@@ -162,7 +162,7 @@ App.Events.RESSSubjugationBlues = class RESSSubjugationBlues extends App.Events.
r.push(`There are the segregated milking stalls, where only the dirtiest and most dilapidated machines are reserved for filthy ${FSSubjugationistRace} sluts.`);
}
if (V.club > 0) {
- r.push(`There are the "refresher" sinks in ${V.clubName} where normal slaves can go to periodically clean the cum out of their holes before returning to service more citizens — but such a luxury is off limits to ${FSSubjugationistRace} animals, who simply have to work through their long shifts with ever increasing amount of ejaculate covering their worthless bodies.`);
+ r.push(`There are the "refresher" sinks in ${V.clubName} where normal slaves can go to periodically clean the cum out of their holes before returning to service more citizens — but such a luxury is off limits to ${FSSubjugationistRace} animals, who simply have to work through their long shifts with ever-increasing amount of ejaculate covering their worthless bodies.`);
} else {
r.push(`There are the "animal fuckers" in the public square — groups of racial purists who specifically seek out slaves of the inferior ${FSSubjugationistRace} race to mistreat through extreme public use.`);
}
diff --git a/src/events/RESS/review/surgeryAddict.js b/src/events/RESS/review/surgeryAddict.js
index 36225bebce33f52d61f5317a50442f29b52bc1de..b9603f80f4f52c1dbeb6d24816368e14ea43d8d7 100644
--- a/src/events/RESS/review/surgeryAddict.js
+++ b/src/events/RESS/review/surgeryAddict.js
@@ -6,7 +6,7 @@ App.Events.RESSSurgeryAddict = class RESSSurgeryAddict extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canTalk,
s => s.rules.speech !== "restrictive",
s => s.boobsImplant > 400,
diff --git a/src/events/RESS/review/surprisingWakeup.js b/src/events/RESS/review/surprisingWakeup.js
index 71058f56eda9e903a977c94e6c0a1fe673056bc1..756d7cdf9b9051e98b79a7e37299999210944050 100644
--- a/src/events/RESS/review/surprisingWakeup.js
+++ b/src/events/RESS/review/surprisingWakeup.js
@@ -6,7 +6,7 @@ App.Events.RESSSurprisingWakeup = class RESSSurprisingWakeup extends App.Events.
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.kindness !== undefined && s.kindness >= 100,
s => (isSlaveAvailable(s) && canWalk(s)) || ([Job.CONCUBINE, Job.FUCKTOY, Job.MASTERSUITE].includes(s.assignment)),
s => s.relationship === -3,
diff --git a/src/events/RESS/review/tendonFall.js b/src/events/RESS/review/tendonFall.js
index ec344579ff71b873edea87a277fa43aba5b74f6c..9646daee96564227fecc0eb7ffd34efd27783c54 100644
--- a/src/events/RESS/review/tendonFall.js
+++ b/src/events/RESS/review/tendonFall.js
@@ -8,7 +8,7 @@ App.Events.RESSTendonFall = class RESSTendonFall extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.devotion >= -20,
diff --git a/src/events/RESS/review/terrifiedInspection.js b/src/events/RESS/review/terrifiedInspection.js
index 7816020eb6e5af886530a29db4335c3bfa3bd42d..11a1381bd94bdd54188cc9d385b2a81f626a62b7 100644
--- a/src/events/RESS/review/terrifiedInspection.js
+++ b/src/events/RESS/review/terrifiedInspection.js
@@ -6,7 +6,7 @@ App.Events.RESSTerrifiedInspection = class RESSTerrifiedInspection extends App.E
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RESS/review/tittymonsterInspection.js b/src/events/RESS/review/tittymonsterInspection.js
index 3f11655ae7259ebfe8fbfc3b2a527d4ff94acf61..c1003fe3bef85c109acbb4509c27143ebddc5ae3 100644
--- a/src/events/RESS/review/tittymonsterInspection.js
+++ b/src/events/RESS/review/tittymonsterInspection.js
@@ -6,7 +6,7 @@ App.Events.RESSTittymonsterInspection = class RESSTittymonsterInspection extends
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.assignment !== Job.QUARTER,
s => s.boobs > 25000,
s => s.belly < 100000,
diff --git a/src/events/RESS/review/torpedoSqueeze.js b/src/events/RESS/review/torpedoSqueeze.js
index 49b8cf6723b067f580bbd19cada253444e93833f..762a38de419add6a94913c4638c1362eb253ca8e 100644
--- a/src/events/RESS/review/torpedoSqueeze.js
+++ b/src/events/RESS/review/torpedoSqueeze.js
@@ -6,7 +6,7 @@ App.Events.RESSTorpedoSqueeze = class RESSTorpedoSqueeze extends App.Events.Base
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.assignment !== Job.QUARTER,
diff --git a/src/events/RESS/review/transitionAnxiety.js b/src/events/RESS/review/transitionAnxiety.js
index 241c6f0e8335f3bf8c93c76f75b0ef622fa0272f..57ccce26da3c86245a6f8a89caaacd485f0a9b8a 100644
--- a/src/events/RESS/review/transitionAnxiety.js
+++ b/src/events/RESS/review/transitionAnxiety.js
@@ -6,7 +6,7 @@ App.Events.RESSTransitionAnxiety = class RESSTransitionAnxiety extends App.Event
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => s.assignment !== Job.QUARTER,
@@ -167,9 +167,9 @@ App.Events.RESSTransitionAnxiety = class RESSTransitionAnxiety extends App.Event
r.push(`fat`);
} else if (eventSlave.belly >= 5000) {
if (eventSlave.bellyPreg >= 3000) {
- r.push(`pregnancy swollen`);
+ r.push(`pregnancy-swollen`);
} else if (eventSlave.bellyImplant >= 3000) {
- r.push(`implant swollen`);
+ r.push(`implant-swollen`);
} else {
r.push(`${eventSlave.inflationType}-bloated`);
}
diff --git a/src/events/RESS/review/trustingHG.js b/src/events/RESS/review/trustingHG.js
index 3cae954b06d02deab7c2cf92339cdba3823c0d69..2f5458942a1df5133ec4e773214a84a2a9d93f21 100644
--- a/src/events/RESS/review/trustingHG.js
+++ b/src/events/RESS/review/trustingHG.js
@@ -6,7 +6,7 @@ App.Events.RESSTrustingHG = class RESSTrustingHG extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RESS/review/unhappyVirgin.js b/src/events/RESS/review/unhappyVirgin.js
index cfba18dcd2742060d6b9ea180fdfd21ee7d9bea8..81a61eefcdd79e20638267995e2f1915d814033e 100644
--- a/src/events/RESS/review/unhappyVirgin.js
+++ b/src/events/RESS/review/unhappyVirgin.js
@@ -6,7 +6,7 @@ App.Events.RESSUnhappyVirgin = class RESSUnhappyVirgin extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.assignment !== Job.QUARTER,
s => s.rules.speech !== "restrictive",
canDoVaginal,
diff --git a/src/events/RESS/review/usedWhore.js b/src/events/RESS/review/usedWhore.js
index 90ef6cd54cb865f7b0d70d8a3a55d7edc078085e..46dff012ffca0cc1d376f92957fb719de6f9e7bc 100644
--- a/src/events/RESS/review/usedWhore.js
+++ b/src/events/RESS/review/usedWhore.js
@@ -6,7 +6,7 @@ App.Events.RESSUsedWhore = class RESSUsedWhore extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
s => [Job.PUBLIC, Job.WHORE].includes(s.assignment),
diff --git a/src/events/RESS/review/vocalDisobedience.js b/src/events/RESS/review/vocalDisobedience.js
index ea15bbc16d79ab9e1a80b8335c5bb000a4fbee71..48d9f15c15dfbd242e852b845e49e76d87f87ef8 100644
--- a/src/events/RESS/review/vocalDisobedience.js
+++ b/src/events/RESS/review/vocalDisobedience.js
@@ -6,7 +6,7 @@ App.Events.RESSVocalDisobedience = class RESSVocalDisobedience extends App.Event
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canTalk,
diff --git a/src/events/RESS/review/wetDreams.js b/src/events/RESS/review/wetDreams.js
index c35ccb7c256f4a99070be291ff77af7ddaf78d2f..c2d9fc368a31def5594fe352252ab558f6b16bb5 100644
--- a/src/events/RESS/review/wetDreams.js
+++ b/src/events/RESS/review/wetDreams.js
@@ -8,7 +8,7 @@ App.Events.RESSWetDreams = class RESSWetDreams extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
(s) => s.actualAge < 18,
@@ -157,7 +157,7 @@ App.Events.RESSWetDreams = class RESSWetDreams extends App.Events.BaseEvent {
r.push(`belly`);
}
r.push(`in ${his} virile sperm. You turn around and order the exhausted ${girl} to clean ${himself} up and go back to ${his} assignment; ${he} <span class="devotion inc">complies meekly,</span> understanding that having a potent penis is meaningless in ${his} position.`);
- if (slave.fetish === "none") { // TODO: was coral, should probably be fetish gain.
+ if (slave.fetish === Fetish.NONE) { // TODO: was coral, should probably be fetish gain.
r.push(`The next time ${he} walks past your office, you can't help notice the growing erection ${he} carries. <span class="fetish dec"> Your dominating display has left ${him} craving domination.</span>`);
slave.fetish = "submissive";
slave.fetishStrength = 10;
@@ -247,7 +247,7 @@ App.Events.RESSWetDreams = class RESSWetDreams extends App.Events.BaseEvent {
r.push(`belly`);
}
r.push(`in ${his} virile sperm. You dismount and order the exhausted ${girl} to clean ${himself} and the couch up before going back to ${his} assignment; ${he} <span class="devotion inc">complies meekly,</span> understanding that having a potent penis is meaningless in ${his} position.`);
- if (slave.fetish === "none") {
+ if (slave.fetish === Fetish.NONE) {
r.push(`The next time ${he} walks past your office, you can't help notice the growing erection ${he} carries. <span class="fetish gain">Your dominating display has left ${him} craving domination.</span>`);
slave.fetish = "submissive";
slave.fetishStrength = 10;
@@ -381,7 +381,7 @@ App.Events.RESSWetDreams = class RESSWetDreams extends App.Events.BaseEvent {
r.push(`the strength of ${his} spasming sphincter`);
}
r.push(`sends you over as well. ${He}'s left in a confused haze; ${his} body tells ${him} to fuck, but you tell ${him} to get fucked. ${He} <span class="hotpink">sides with your decision</span> and vows to be the one taking dick for you.`);
- if (slave.fetish === "none") {
+ if (slave.fetish === Fetish.NONE) {
r.push(`<span class="fetish dec">Overcoming ${his} urges to become a father via anal cause ${him} to become a buttslut.</span>`);
slave.fetish = "buttslut";
slave.fetishStrength = 10;
diff --git a/src/events/RESS/scrubbing.js b/src/events/RESS/scrubbing.js
index 449ba4d622ddc5c5ec1bbc3afea661f9ba397c93..396a50e83062db98d9a7c1a3939728c667d3b76d 100644
--- a/src/events/RESS/scrubbing.js
+++ b/src/events/RESS/scrubbing.js
@@ -6,7 +6,7 @@ App.Events.RESSScrubbing = class RESSScrubbing extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => (s.assignment === Job.QUARTER || s.assignment === Job.HOUSE),
s => s.devotion <= 50,
hasAnyArms,
@@ -351,7 +351,7 @@ App.Events.RESSScrubbing = class RESSScrubbing extends App.Events.BaseEvent {
r.push(Spoken(eventSlave, `"${Master}, what would you —"`), `${he} begins to ${say} but is cut short by you gesturing to`);
}
if (V.PC.belly >= 10000) {
- r.push(`your swollen belly and commenting on how its ever growing surface could use a good polishing.`);
+ r.push(`your swollen belly and commenting on how its ever-growing surface could use a good polishing.`);
if (eventSlave.fetish === "pregnancy") {
if (eventSlave.fetishKnown === 1) {
r.push(`${He} wastes no time in rushing over to your firm dome and bringing ${his} tongue to your navel. ${He} happily massages your middle with surprising gusto, becoming intensely aroused as your child`);
@@ -382,7 +382,7 @@ App.Events.RESSScrubbing = class RESSScrubbing extends App.Events.BaseEvent {
r.push(`while keeping your enjoyment above all else.`);
}
} else if (V.PC.dick !== 0) {
- r.push(`your erect dick and commenting on how it could use a good cleaning. ${He} carefully takes your cock into ${his} mouth, doing ${his} best to bring you to a quick orgasm so ${he} can escape your gaze. After downing your cum, ${he} attempts to pull back, but you hold ${him} down, clearly ${he} has more work to do here.`);
+ r.push(`your erect dick and commenting on how it could use a good cleaning. ${He} carefully takes your cock into ${his} mouth, doing ${his} best to bring you to a quick orgasm so ${he} can escape your gaze. After downing your cum, ${he} attempts to pull back, but you hold ${him} down; clearly ${he} has more work to do here.`);
seX(eventSlave, "oral", V.PC, "penetrative");
} else if (V.PC.vagina !== -1) {
r.push(`your soaked pussy and commenting on how someone needs to clean up after it, preferably with their tongue. ${He} carefully ${his} tongue to your clit, doing ${his} best to bring you to a quick orgasm so ${he} can escape your gaze. After bring you to a rather unsatisfying climax, ${he} attempts to pull back, but you grab ${him} and force ${him} to lick the depths of your pussy.`);
diff --git a/src/events/RESS/serveThePublicDevoted.js b/src/events/RESS/serveThePublicDevoted.js
index 6ab4f146292b3a4d99613e3dabb9450c8aac9b62..3cc43cf8a40a6a4032250fa614c5014562c4319d 100644
--- a/src/events/RESS/serveThePublicDevoted.js
+++ b/src/events/RESS/serveThePublicDevoted.js
@@ -9,7 +9,7 @@ App.Events.RESSServeThePublicDevoted = class RESSServeThePublicDevoted extends A
s => s.assignment === Job.PUBLIC,
s => canDoAnal(s) || canDoVaginal(s),
s => s.devotion > 50,
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canTalk,
]
@@ -55,7 +55,7 @@ App.Events.RESSServeThePublicDevoted = class RESSServeThePublicDevoted extends A
t.push(`${his} cheeks are flushed and ${he}'s panting a little.`);
}
t.push(`Apparently, ${he} can't wait to`);
- if (eventSlave.fetish === "submissive") {
+ if (eventSlave.fetish === Fetish.SUBMISSIVE) {
t.push(`play the submissive.`);
} else if (eventSlave.fetish === "humiliation") {
t.push(`be publicly degraded.`);
diff --git a/src/events/RESS/slaveOnSlaveClit.js b/src/events/RESS/slaveOnSlaveClit.js
index 6644362ecb59916ffcc978809afbcf9f12c9ecd3..4367c9b371e6951bb324cf338f773dd84b2bae3c 100644
--- a/src/events/RESS/slaveOnSlaveClit.js
+++ b/src/events/RESS/slaveOnSlaveClit.js
@@ -6,7 +6,7 @@ App.Events.RESSSlaveOnSlaveClit = class RESSSlaveOnSlaveClit extends App.Events.
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => App.Utils.hasFamilySex(s) || s.rules.release.slaves === 1,
s => s.clit > 2
]
diff --git a/src/events/RESS/slaveOnSlaveDick.js b/src/events/RESS/slaveOnSlaveDick.js
index 1d11a67110ea0896a30b6fe6f8c170583cf1f7d2..b12e2394e55661461798f574329b2713f0e3a575 100644
--- a/src/events/RESS/slaveOnSlaveDick.js
+++ b/src/events/RESS/slaveOnSlaveDick.js
@@ -6,7 +6,7 @@ App.Events.RESSSlaveOnSlaveDick = class RESSSlaveOnSlaveDick extends App.Events.
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
hasAnyLegs,
canPenetrate,
diff --git a/src/events/RESS/solitaryDesperation.js b/src/events/RESS/solitaryDesperation.js
index dbfd3691acdc56ef1355de04749536790e24044e..6fd570f63f2bbfbf146bcfbeb401843e5e8d327c 100644
--- a/src/events/RESS/solitaryDesperation.js
+++ b/src/events/RESS/solitaryDesperation.js
@@ -6,7 +6,7 @@ App.Events.RESSSolitaryDesperation = class RESSSolitaryDesperation extends App.E
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canTalk,
canHear,
hasAnyLegs,
diff --git a/src/events/RESS/suppositoryResistance.js b/src/events/RESS/suppositoryResistance.js
index 0a9d589c411f19b2d060b652fbc9c1c6a7221d46..bc8c15880f8621033d7dd6e84b7d00e055018876 100644
--- a/src/events/RESS/suppositoryResistance.js
+++ b/src/events/RESS/suppositoryResistance.js
@@ -8,7 +8,7 @@ App.Events.RESSSuppositoryResistance = class RESSSuppositoryResistance extends A
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canStand,
hasAnyArms,
s => s.drugs !== "none",
diff --git a/src/events/RESS/tooThinForCumDiet.js b/src/events/RESS/tooThinForCumDiet.js
index 40ca7c432cfef195552178531e02a51ec1bab588..1c128b6d0a9523369f7aee8be95a31b64904e8ff 100644
--- a/src/events/RESS/tooThinForCumDiet.js
+++ b/src/events/RESS/tooThinForCumDiet.js
@@ -8,7 +8,7 @@ App.Events.RESSTooThinForCumDiet = class RESSTooThinForCumDiet extends App.Event
return [
/** @param {App.Entity.SlaveState} s */
[
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
canTalk,
diff --git a/src/events/RESS/waistlineWoes.js b/src/events/RESS/waistlineWoes.js
index 0399602a05be8434d88872e42eedc8fa70ca454f..e0d872d5d25f5cb8c4e4b574dae6bcb6f9165204 100644
--- a/src/events/RESS/waistlineWoes.js
+++ b/src/events/RESS/waistlineWoes.js
@@ -6,7 +6,7 @@ App.Events.RESSWaistlineWoes = class RESSWaistlineWoes extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canHear,
canWalk,
hasAnyArms,
diff --git a/src/events/RESS/whoreRebellious.js b/src/events/RESS/whoreRebellious.js
index e0d6bd16290d76ebb58aa5405d9fb459f89add13..9d3c33f87ac74bc855ca3a481ee43bb6b1c796a5 100644
--- a/src/events/RESS/whoreRebellious.js
+++ b/src/events/RESS/whoreRebellious.js
@@ -6,7 +6,7 @@ App.Events.RESSWhoreRebellious = class RESSWhoreRebellious extends App.Events.Ba
actorPrerequisites() {
return [
[ // single event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.assignment === Job.WHORE,
s => s.devotion < -20,
s => s.trust >= -20,
diff --git a/src/events/RETS/reAnalCowgirl.js b/src/events/RETS/reAnalCowgirl.js
index 36a76da7857d8908112284017f42b08d7f7d91cc..13d23f09653c081e5dd2ff3bcd7aa2d607b9d4e7 100644
--- a/src/events/RETS/reAnalCowgirl.js
+++ b/src/events/RETS/reAnalCowgirl.js
@@ -8,7 +8,7 @@ App.Events.RETSAnalCowgirl = class RETSAnalCowgirl extends App.Events.BaseEvent
actorPrerequisites() {
return [
[ // event slave /domslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.fuckdoll === 0,
hasAnyArms,
canMove,
@@ -22,7 +22,7 @@ App.Events.RETSAnalCowgirl = class RETSAnalCowgirl extends App.Events.BaseEvent
s => s.belly < 30000,
],
[ // and subslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.fuckdoll === 0,
canWalk,
canTalk,
@@ -42,11 +42,11 @@ App.Events.RETSAnalCowgirl = class RETSAnalCowgirl extends App.Events.BaseEvent
He, he, his, him, himself
} = getPronouns(eventSlave);
const hands = hasBothArms(eventSlave) ? "hands" : "hand";
- const {say} = getEnunciation(eventSlave);
+ const {say, title: master} = getEnunciation(eventSlave);
const {
He2, he2, His2, his2, him2, girl2, himself2
} = getPronouns(subSlave).appendSuffix("2");
- const {say: say2} = getEnunciation(subSlave);
+ const {say: say2, title: master2} = getEnunciation(subSlave);
App.Events.drawEventArt(node, [eventSlave, subSlave], "no clothing");
const canP = canPenetrate(eventSlave);
@@ -205,7 +205,7 @@ App.Events.RETSAnalCowgirl = class RETSAnalCowgirl extends App.Events.BaseEvent
} else {
t.push(`homely`);
}
- t.push(`face instantly appears, craning out from behind ${subSlave.slaveName}'s back to see. ${Spoken(eventSlave, `"Oh, hi, ${getWrittenTitle(eventSlave)}!"`)} ${he} ${say}s with a cheerful smile,`);
+ t.push(`face instantly appears, craning out from behind ${subSlave.slaveName}'s back to see. ${Spoken(eventSlave, `"Oh, hi, ${master}!"`)} ${he} ${say}s with a cheerful smile,`);
if (eventSlave.muscles > 30) {
t.push(`not breathing hard at all despite bouncing a ${girl2} off ${his} crotch.`);
} else if (eventSlave.muscles > 5) {
@@ -242,7 +242,7 @@ App.Events.RETSAnalCowgirl = class RETSAnalCowgirl extends App.Events.BaseEvent
t.push(`You tell ${him} you'll inspect ${him} after ${he}'s done, but add that ${subSlave.slaveName} is clearly being a very good little anal slut, and ${he2} deserves to be rewarded.`);
t.push(`${canHear(subSlave) ? "Hearing" : "Learning"} this, ${subSlave.slaveName} <span class="hotpink">looks at you very gratefully,</span> and mouths a quiet thanks.`);
- t.push(Spoken(subSlave, `"Yes, ${getWrittenTitle(subSlave)}!"`));
+ t.push(Spoken(subSlave, `"Yes, ${master2}!"`));
t.push(`comes the response. ${eventSlave.slaveName} shifts ${his} bitch to one side, and cranes ${his} head upward to make out with the compliant slave. ${subSlave.slaveName} kisses ${him} back with gusto, surprising ${eventSlave.slaveName} again. ${He} recoils in shock at how much tongue ${subSlave.slaveName} gives ${him}, but moans aggressively and gets ${his} revenge by dropping one of ${subSlave.slaveName}'s knees and`);
if (subSlave.chastityPenis) {
t.push(`playing with one of ${his2} nipples.`);
@@ -250,7 +250,7 @@ App.Events.RETSAnalCowgirl = class RETSAnalCowgirl extends App.Events.BaseEvent
t.push(`jacking ${him2} off.`);
} else if (subSlave.dick > 0) {
t.push(`playing with ${his2} soft cock.`);
- } else if (subSlave.clit > 1) {
+ } else if (subSlave.clit > 2) {
t.push(`rubbing ${his2} ridiculous clit.`);
} else if (subSlave.labia > 0) {
t.push(`fingering ${his2} glorious labia.`);
diff --git a/src/events/RETS/reBoobCollision.js b/src/events/RETS/reBoobCollision.js
index b664d9648b5b41920bf5594a1500b02787c90cc1..a1d69e88eecd7d04f731549d5ab705c0693324fd 100644
--- a/src/events/RETS/reBoobCollision.js
+++ b/src/events/RETS/reBoobCollision.js
@@ -6,7 +6,7 @@ App.Events.RETSBoobCollision = class RETSBoobCollision extends App.Events.BaseEv
actorPrerequisites() {
return [
[
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
canTalk,
@@ -18,7 +18,7 @@ App.Events.RETSBoobCollision = class RETSBoobCollision extends App.Events.BaseEv
s => (s.attrXX >= 50 || (s.fetish === "boobs" && s.fetishStrength > 95))
],
[ // and subslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canStand,
canTalk,
diff --git a/src/events/RETS/reCockmilkInterception.js b/src/events/RETS/reCockmilkInterception.js
index e704283d4f8e65a10e9327208b6b537bf84f39f9..81b7daac0298b85efdacad379c874a21db2808f5 100644
--- a/src/events/RETS/reCockmilkInterception.js
+++ b/src/events/RETS/reCockmilkInterception.js
@@ -6,7 +6,7 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
actorPrerequisites() {
return [
[ // event slave /domslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canMove,
canTalk,
s => s.devotion > 20,
@@ -14,7 +14,7 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
s => s.belly < 60000,
],
[ // and subslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => (s.assignment === Job.DAIRY || s.assignment === Job.MILKED),
isSlaveAvailable,
canMove,
@@ -33,7 +33,7 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
const {
He, he, his, him, himself, His
} = getPronouns(slave);
- const {say} = getEnunciation(slave);
+ const {say, title: master} = getEnunciation(slave);
const doVaginal = (canDoVaginal(subSlave) && subSlave.vagina > 0);
const doAnal = (canDoAnal(subSlave) && subSlave.anus > 0);
const hands = hasBothArms(slave) ? "hands" : "hand";
@@ -47,11 +47,11 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
t.push(`${he2}'s not lactating, but ${he2}'s a good semen producer and when ${he2} wakes up, ${he2}'s usually very ready to have one of the machines drain ${his2} balls for ${him2}.`);
} else {
if (subSlave.preg > subSlave.pregData.normalBirth / 1.33) {
- t.push(`it's late in ${his2} pregnancy and ${he2} wakes up every day with ${his2} ${subSlave.boobShape} breasts sore, painfully swollen with rich, nutritious ${subSlave.milkFlavor === "none" ? `` : `${subSlave.milkFlavor} flavored `}milk.`);
+ t.push(`it's late in ${his2} pregnancy and ${he2} wakes up every day with ${his2} ${subSlave.boobShape === "normal" ? `` : `${subSlave.boobShape} `}breasts sore, painfully swollen with rich, nutritious ${subSlave.milkFlavor === "none" ? `` : `${subSlave.milkFlavor}-flavored `}milk.`);
} else if (subSlave.preg > subSlave.pregData.normalBirth / 2) {
- t.push(`${he2}'s pregnant and ${he2} wakes up every day with ${his2} ${subSlave.boobShape} breasts sore and swollen with rich, nutritious ${subSlave.milkFlavor === "none" ? `` : `${subSlave.milkFlavor} flavored `}milk.`);
+ t.push(`${he2}'s pregnant and ${he2} wakes up every day with ${his2} ${subSlave.boobShape === "normal" ? `` : `${subSlave.boobShape} `}breasts sore and swollen with rich, nutritious ${subSlave.milkFlavor === "none" ? `` : `${subSlave.milkFlavor}-flavored `}milk.`);
} else if (subSlave.lactation > 1) {
- t.push(`the tiny little slow-release implant in each of ${his2} breasts is merciless. It keeps ${his2} mammary glands in a permanent state of barely-safe hyperproduction, and ${he2} wakes up every day with ${his2} terribly sore breasts spontaneously dribbling ${subSlave.milkFlavor === "none" ? `` : `${subSlave.milkFlavor} flavored `}milk.`);
+ t.push(`the tiny little slow-release implant in each of ${his2} breasts is merciless. It keeps ${his2} mammary glands in a permanent state of barely-safe hyperproduction, and ${he2} wakes up every day with ${his2} terribly sore breasts spontaneously dribbling ${subSlave.milkFlavor === "none" ? `` : `${subSlave.milkFlavor}-flavored `}milk.`);
} else {
t.push(`${his2} lactation is natural, but it's still enough that ${he2} wakes up most days with full, sore breasts.`);
}
@@ -335,7 +335,7 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
} else {
t.push(`see,`);
}
- t.push(`but ${he} knows it's you.`, Spoken(slave, `"Mhhf, hi, ${getWrittenTitle(slave)},"`), `${he} manages, letting ${subSlave.slaveName}'s`);
+ t.push(`but ${he} knows it's you.`, Spoken(slave, `"Mhhf, hi, ${master},"`), `${he} manages, letting ${subSlave.slaveName}'s`);
if (canAchieveErection(subSlave)) {
t.push(`hard cockhead spring free of ${his} mouth with a pop.`);
} else {
@@ -345,7 +345,7 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
App.Events.addParagraph(frag, t);
t = [];
- t.push(`You order ${him} to stay where ${he} is, and go back to sucking dick.`, Spoken(slave, `"Yes, ${getWrittenTitle(slave)},"`), `${he} giggles, and then shuts up as ${his} mouth is occupied once more. ${subSlave.slaveName}, who's been obediently still under you as ${he2} waits for your pleasure, stiffens as ${he2} feels ${his2} dickhead surrounded by warm wetness once more. ${He2}'s got more coming.`);
+ t.push(`You order ${him} to stay where ${he} is, and go back to sucking dick.`, Spoken(slave, `"Yes, ${master},"`), `${he} giggles, and then shuts up as ${his} mouth is occupied once more. ${subSlave.slaveName}, who's been obediently still under you as ${he2} waits for your pleasure, stiffens as ${he2} feels ${his2} dickhead surrounded by warm wetness once more. ${He2}'s got more coming.`);
if (doVaginal && doAnal) {
t.push(`${He2}'s got a cock and two fuckholes, so you instruct the machine to go back to stimulating, and adroitly lift ${his2} hips a little so that when the machine reinserts its stimulator, it penetrates ${his2} vagina and fucks that instead. Then you insert your`);
if (V.PC.dick) {
@@ -412,7 +412,7 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
t = [];
t.push(`As ${subSlave.slaveName} stumbles off, looking <span class="devotion inc">rather submissive,</span> ${slave.slaveName} scoots out from underneath the machine.`);
- t.push(Spoken(slave, `"${getWrittenTitle(slave)},"`), `${he} ${say}s <span class="devotion inc">devotedly,</span>`, Spoken(slave, `"that ${canTaste(slave) ? `tasted` : "was"} incredible. It ${canTaste(slave) ? `tastes` : "feels"} so much better when you fuck it out of ${him2}!"`));
+ t.push(Spoken(slave, `"${capFirstChar(master)},"`), `${he} ${say}s <span class="devotion inc">devotedly,</span>`, Spoken(slave, `"that ${canTaste(slave) ? `tasted` : "was"} incredible. It ${canTaste(slave) ? `tastes` : "feels"} so much better when you fuck it out of ${him2}!"`));
t.push(`${He}`);
if (hasAnyArms(slave)) {
t.push(`rubs ${his}`);
@@ -478,11 +478,11 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
} else {
t.push(`${he}'s no oral master, but ${his} mouth is wet and hot, and ${subSlave.slaveName} clearly likes it more than machine's dick receptacle. ${He2}`);
}
- t.push(`can feel that ${his2} breasts aren't nearly empty of ${subSlave.milkFlavor === "none" ? `` : `${subSlave.milkFlavor} flavored `}milk yet, and of course the milkers are tugging at ${his2} teats as industriously as ever, so ${he2} relaxes luxuriantly as ${slave.slaveName} starts to climb out from under ${him2}.`);
+ t.push(`can feel that ${his2} breasts aren't nearly empty of ${subSlave.milkFlavor === "none" ? `` : `${subSlave.milkFlavor}-flavored `}milk yet, and of course the milkers are tugging at ${his2} teats as industriously as ever, so ${he2} relaxes luxuriantly as ${slave.slaveName} starts to climb out from under ${him2}.`);
App.Events.addParagraph(frag, t);
t = [];
- t.push(`You announce your presence by ordering ${slave.slaveName} to stay where ${he} is. Startled, ${he} sticks ${his} head out from under ${subSlave.slaveName} and chirps`, Spoken(slave, `"Yes, ${getWrittenTitle(slave)}!"`), `and scoots back under, waiting to see what you're planning. You straddle ${subSlave.slaveName}'s face; as`);
+ t.push(`You announce your presence by ordering ${slave.slaveName} to stay where ${he} is. Startled, ${he} sticks ${his} head out from under ${subSlave.slaveName} and chirps`, Spoken(slave, `"Yes, ${master}!"`), `and scoots back under, waiting to see what you're planning. You straddle ${subSlave.slaveName}'s face; as`);
if (canSee(subSlave)) {
t.push(`${his2} vision is filled by your`);
if (V.PC.dick) {
@@ -521,7 +521,7 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
if (subSlave.lactation > 1) {
t.push(`lactation is unnaturally copious,`);
} else {
- t.push(`${subSlave.milkFlavor === "none" ? `` : `${subSlave.milkFlavor} flavored `}milk is really flowing now,`);
+ t.push(`${subSlave.milkFlavor === "none" ? `` : `${subSlave.milkFlavor}-flavored `}milk is really flowing now,`);
}
t.push(`and a thin stream of cream squirts out of ${him2}. It lands on ${slave.slaveName}'s face below, surprising ${him}. ${He} splutters comically, but obeys eagerly when you squeeze ${subSlave.slaveName}'s freed boob and order ${slave.slaveName} to start drinking. After all, you point out, a balanced diet is important. ${slave.slaveName} <span class="trust inc">giggles complaisantly</span> and reaches for the proffered tit. ${subSlave.slaveName} is still basking in the afterglow of ${his2} orgasm and shudders silently with overstimulation as ${he2} feels ${slave.slaveName}'s lips`);
if (subSlave.nipples !== "fuckable") {
@@ -545,7 +545,7 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
const frag = document.createDocumentFragment();
t = [];
- t.push(`You order ${slave.slaveName} to put the dick back where it belongs and come out from under there. There's a lewd noise as ${he} spits out ${subSlave.slaveName}'s penis.`, Spoken(slave, `"Yes, ${getWrittenTitle(slave)}!"`), `${he} ${say}s automatically, knowing your voice, and ${he} scrabbles to obey, stuffing poor moaning ${subSlave.slaveName}'s member back in its proper cum receptacle before hurriedly scooting out from under,`);
+ t.push(`You order ${slave.slaveName} to put the dick back where it belongs and come out from under there. There's a lewd noise as ${he} spits out ${subSlave.slaveName}'s penis.`, Spoken(slave, `"Yes, ${master}!"`), `${he} ${say}s automatically, knowing your voice, and ${he} scrabbles to obey, stuffing poor moaning ${subSlave.slaveName}'s member back in its proper cum receptacle before hurriedly scooting out from under,`);
if (slave.clitSetting === "oral") {
t.push(`gasping with the stimulation applied by ${his} smart piercing, which is encouraging ${him} to suck dick.`);
} else if (slave.belly >= 10000) {
@@ -617,7 +617,7 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
} else {
t.push(`centimeters`);
}
- t.push(`in front of ${his} face.`, Spoken(slave, `"I'm so happy, ${getWrittenTitle(slave)},"`), `${he} purrs.`, Spoken(slave, `"You have the best cum. ${V.PC.balls >= 10 ? "I'll never go hungry with you either." : "."}"`), `${He}'s still right up against ${subSlave.slaveName},`);
+ t.push(`in front of ${his} face.`, Spoken(slave, `"I'm so happy, ${master},"`), `${he} purrs.`, Spoken(slave, `"You have the best cum. ${V.PC.balls >= 10 ? "I'll never go hungry with you either." : "."}"`), `${He}'s still right up against ${subSlave.slaveName},`);
if (hasAnyArms(slave)) {
t.push(`and ${he} reaches back to pat ${subSlave.slaveName}'s butt reassuringly.`);
} else {
@@ -625,7 +625,7 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
}
t.push(Spoken(slave, `"Yours is nice, but there's only one ${getWrittenTitle(slave)}."`), `Then ${he} starts sucking your dick.`);
} else {
- t.push(Spoken(slave, `"Thank you, ${getWrittenTitle(slave)},"`), `${he} ${say}s dutifully.`, Spoken(slave, `"Your, um, your cum is the best.${V.PC.balls >= 10 ? " I'll never go hungry with you either." : ""}"`));
+ t.push(Spoken(slave, `"Thank you, ${master},"`), `${he} ${say}s dutifully.`, Spoken(slave, `"Your, um, your cum is the best.${V.PC.balls >= 10 ? " I'll never go hungry with you either." : ""}"`));
t.push(`Momentarily unsure of ${himself}, ${he} blushes, and decides to take refuge in dicksucking.`);
}
if (slave.skill.oral > 60) {
@@ -637,7 +637,7 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
} else {
t.push(`cups your`);
if (V.PC.balls >= 30) {
- t.push(`monstrous balls`);
+ t.push(`monstrous`);
} else if (V.PC.balls >= 14) {
t.push(`hand-filling`);
} else if (V.PC.balls >= 9) {
@@ -653,7 +653,7 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
t.push(`your pussy without any hands.`);
} else {
if (V.PC.balls >= 30) {
- t.push(`monstrous balls`);
+ t.push(`monstrous`);
} else if (V.PC.balls >= 14) {
t.push(`hand-filling`);
} else if (V.PC.balls >= 9) {
diff --git a/src/events/RETS/reDatePlease.js b/src/events/RETS/reDatePlease.js
index e4da345a5bb73488e783b14adcbbd4d675e89cc0..3ca0965beb5c00fd6695b40d0672f9212ba94531 100644
--- a/src/events/RETS/reDatePlease.js
+++ b/src/events/RETS/reDatePlease.js
@@ -6,7 +6,7 @@ App.Events.RETSDatePlease = class RETSDatePlease extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // event slave/domslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canTalk,
canWalk,
canHear,
@@ -18,7 +18,7 @@ App.Events.RETSDatePlease = class RETSDatePlease extends App.Events.BaseEvent {
],
[ // and subslave
s => s.ID === getSlave(this.actors[0]).relationshipTarget, // relationshipTarget of event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
isSlaveAvailable,
canMove,
canTalk,
@@ -99,7 +99,7 @@ App.Events.RETSDatePlease = class RETSDatePlease extends App.Events.BaseEvent {
t = [];
t.push(`It costs you a small sum in upkeep and other trifles to cover an unexpected unavailability of both slaves, but they deserve it, and your Attendant does not disappoint. After the slaves have soaked in the main pool for a while, ${he3} gives them a series of mud packs, hot rock massages, and skin treatments, always setting them up right next to each other. They chat a bit at first, but soon relax into companionable silence, ${hasAnyArms(eventSlave) && hasAnyArms(subSlave) ? "holding hands and enjoying" : "side by side to enjoy"} the pampering.`);
if (S.Attendant.lactation > 0) {
- t.push(`${S.Attendant.slaveName} has their evening meal sent down, and supplements it with ${S.Attendant.milkFlavor === "none" ? `` : `${S.Attendant.milkFlavor} flavored `}milk drunk fresh from ${his3} own nipples.`);
+ t.push(`${S.Attendant.slaveName} has their evening meal sent down, and supplements it with ${S.Attendant.milkFlavor === "none" ? `` : `${S.Attendant.milkFlavor}-flavored `}milk drunk fresh from ${his3} own nipples.`);
}
t.push(`This being your penthouse, ${his3} services become quite sexual later in the night, as the Attendant applies all ${his3} talents in choosing positions that emphasize ${eventSlave.slaveName} and ${subSlave.slaveName} being close to each other, a difficult task given`);
if (S.Attendant.bellyPreg >= 10000 && eventSlave.bellyPreg >= 10000 && subSlave.bellyPreg >= 10000) {
diff --git a/src/events/RETS/reFucktoyPrefersRelative.js b/src/events/RETS/reFucktoyPrefersRelative.js
index ca2a8b3855b7277e4b861bab61a9a9abfbd0701f..9cc5a37c17dce51c85ff2c7d907931f055d2b49c 100644
--- a/src/events/RETS/reFucktoyPrefersRelative.js
+++ b/src/events/RETS/reFucktoyPrefersRelative.js
@@ -8,7 +8,7 @@ App.Events.RETSFucktoyPrefersRelative = class RETSFucktoyPrefersRelative extends
actorPrerequisites() {
return [
[ // event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.devotion > 20,
s => s.relationship > -2, // ebonded and lower always prefer PC
s => s.devotion < 95, // perfectly devoted prefer PC
@@ -19,7 +19,7 @@ App.Events.RETSFucktoyPrefersRelative = class RETSFucktoyPrefersRelative extends
canHear
],
[ // and a relative that they prefer over you
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.genes === RETSFucktoyPrefersRelative.preferredSex(getSlave(this.actors[0])),
s => areRelated(s, getSlave(this.actors[0])),
s => s.rivalTarget !== this.actors[0],
@@ -196,7 +196,7 @@ App.Events.RETSFucktoyPrefersRelative = class RETSFucktoyPrefersRelative extends
t.push(`${He} meekly acknowledges your instructions and <span class="devotion inc">vows to do better</span> for you, and you can tell that ${he} <span class="trust dec">fears</span> a repeat of this lesson.`);
fucktoy.devotion += 4;
fucktoy.trust -= 4;
- if (fucktoy.fetish === "submissive" && fucktoy.fetishKnown === 1) {
+ if (fucktoy.fetish === Fetish.SUBMISSIVE && fucktoy.fetishKnown === 1) {
t.push(`Still, when you glance down, you catch the faintest hint of a smile; it seems your punishment appealed to ${him}, <span class="fetish inc">reinforcing ${his} submission</span> to your will.`);
fucktoy.fetishStrength += 10;
} else {
diff --git a/src/events/RETS/reIfYouEnjoyIt.js b/src/events/RETS/reIfYouEnjoyIt.js
index 8d0212d81611a79aadddbaf6d6beac48835b0506..e672d89ddb1c128e78106db5f144d2215c5f4f08 100644
--- a/src/events/RETS/reIfYouEnjoyIt.js
+++ b/src/events/RETS/reIfYouEnjoyIt.js
@@ -8,14 +8,14 @@ App.Events.RETSIfYouEnjoyIt = class RETSIfYouEnjoyIt extends App.Events.BaseEven
actorPrerequisites() {
return [
[
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasBothArms,
hasAnyLegs,
canTalk,
s => s.devotion > 50,
],
[ // and subslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canTalk,
isSlaveAvailable,
s => s.devotion <= 20,
diff --git a/src/events/RETS/reIncestuousNursing.js b/src/events/RETS/reIncestuousNursing.js
index d61a97e1d863dd5194cbf38e419326d61d41692e..056f7b8289b6f5788ec6817ffcd3fd70f1f64717 100644
--- a/src/events/RETS/reIncestuousNursing.js
+++ b/src/events/RETS/reIncestuousNursing.js
@@ -8,7 +8,7 @@ App.Events.RETSIncestuousNursing = class RETSIncestuousNursing extends App.Event
actorPrerequisites() {
return [
[
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.daughters > 0,
hasBothArms,
canMove,
@@ -21,7 +21,7 @@ App.Events.RETSIncestuousNursing = class RETSIncestuousNursing extends App.Event
s => s.boobsImplant / s.boobs < .60,
],
[ // and subslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
isSlaveAvailable,
hasAnyArms,
canTalk,
@@ -37,7 +37,7 @@ App.Events.RETSIncestuousNursing = class RETSIncestuousNursing extends App.Event
const {
He, he, his, him, himself, girl
} = getPronouns(eventSlave);
- const {say} = getEnunciation(eventSlave);
+ const {title: master, say} = getEnunciation(eventSlave);
const {
him2, his2, he2, He2, daughter2, himself2
} = getPronouns(subSlave).appendSuffix("2");
@@ -131,7 +131,7 @@ App.Events.RETSIncestuousNursing = class RETSIncestuousNursing extends App.Event
} else {
t.push(`turns to`);
}
- t.push(`you complacently.`, Spoken(eventSlave, `"Hi, ${getWrittenTitle(eventSlave)},"`), `${he} ${say}s quietly, ${his}`);
+ t.push(`you complacently.`, Spoken(eventSlave, `"Hi, ${master},"`), `${he} ${say}s quietly, ${his}`);
if (eventSlave.voice > 2) {
t.push(`bimbo's`);
} else if (eventSlave.voice > 1) {
@@ -193,7 +193,7 @@ App.Events.RETSIncestuousNursing = class RETSIncestuousNursing extends App.Event
t.push(`naturally, but in such healthy profusion that a milky stream is running down ${his} unoccupied breast.`);
}
t.push(`You get down beside ${subSlave.slaveName} and start nursing too.`);
- t.push(Spoken(eventSlave, `"Oh, ${getWrittenTitle(eventSlave)},"`), `gasps ${eventSlave.slaveName}, as much from surprise as from the additional stimulation. Then ${he} sighs contentedly, and goes back to petting ${subSlave.slaveName}'s head. ${He} picks up ${his} other hand and hesitates, not sure whether ${he} should stroke ${his} owner's hair, but you take ${his} hand in yours and place it on the back of your head. There's a <span class="trust inc">sharp intake of breath</span> in the chest behind the breast you're nursing from, and ${he} strokes your head with a motherly caress, gently holding you against ${his} milky tit as you drain it of its cream.`);
+ t.push(Spoken(eventSlave, `"Oh, ${master},"`), `gasps ${eventSlave.slaveName}, as much from surprise as from the additional stimulation. Then ${he} sighs contentedly, and goes back to petting ${subSlave.slaveName}'s head. ${He} picks up ${his} other hand and hesitates, not sure whether ${he} should stroke ${his} owner's hair, but you take ${his} hand in yours and place it on the back of your head. There's a <span class="trust inc">sharp intake of breath</span> in the chest behind the breast you're nursing from, and ${he} strokes your head with a motherly caress, gently holding you against ${his} milky tit as you drain it of its cream.`);
App.Events.addParagraph(frag, t);
t = [];
@@ -225,7 +225,7 @@ App.Events.RETSIncestuousNursing = class RETSIncestuousNursing extends App.Event
}
t.push(`that ${he} orgasms yet again, moaning ${his} ${daughter2}'s name.`);
} else {
- t.push(`${subSlave.slaveName}`);
+ t.push(subSlave.slaveName);
if (canAchieveErection(subSlave)) {
t.push(`blew ${his2} load all over`);
} else {
@@ -267,7 +267,7 @@ App.Events.RETSIncestuousNursing = class RETSIncestuousNursing extends App.Event
function relationship() {
const frag = document.createDocumentFragment();
t = [];
- t.push(`Deciding that this should be encouraged, you praise ${eventSlave.slaveName} for ${his} close relationship to ${his} ${daughter2}.`, Spoken(eventSlave, `"Thank you, ${getWrittenTitle(eventSlave)},"`), `${he} ${say}s.`);
+ t.push(`Deciding that this should be encouraged, you praise ${eventSlave.slaveName} for ${his} close relationship to ${his} ${daughter2}.`, Spoken(eventSlave, `"Thank you, ${master},"`), `${he} ${say}s.`);
t.push(Spoken(eventSlave, `"I try to be the best`));
if (subSlave.mother === eventSlave.ID) {
t.push(`mom`);
@@ -278,7 +278,7 @@ App.Events.RETSIncestuousNursing = class RETSIncestuousNursing extends App.Event
App.Events.addParagraph(frag, t);
t = [];
- t.push(`${subSlave.slaveName}`);
+ t.push(subSlave.slaveName);
if (eventSlave.nipples !== "fuckable") {
t.push(`lets the nipple pop free of`);
} else {
diff --git a/src/events/RETS/reInterslaveBegging.js b/src/events/RETS/reInterslaveBegging.js
index 2326a0cab54f265556ce8ba05b8394391d5aab8b..af60a69cd306e59dee6d0b8f3506811020b819af 100644
--- a/src/events/RETS/reInterslaveBegging.js
+++ b/src/events/RETS/reInterslaveBegging.js
@@ -8,7 +8,7 @@ App.Events.RETSInterslaveBegging = class RETSInterslaveBegging extends App.Event
actorPrerequisites() {
return [
[ // event slave /domslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canStand,
canTalk,
@@ -22,7 +22,7 @@ App.Events.RETSInterslaveBegging = class RETSInterslaveBegging extends App.Event
s => s.rules.release.slaves === 1,
],
[ // and subslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canWalk,
canTalk,
canHear,
@@ -41,11 +41,11 @@ App.Events.RETSInterslaveBegging = class RETSInterslaveBegging extends App.Event
const {
He, he, his, him, himself, girl
} = getPronouns(eventSlave);
- const {say} = getEnunciation(eventSlave);
+ const {say, title: master} = getEnunciation(eventSlave);
const {
He2, he2, His2, his2, him2, girl2, himself2
} = getPronouns(subSlave).appendSuffix("2");
- const {say: say2} = getEnunciation(subSlave);
+ const {say: say2, title: master2} = getEnunciation(subSlave);
const {
girlP
} = getPronouns(V.PC).appendSuffix("P");
@@ -56,7 +56,7 @@ App.Events.RETSInterslaveBegging = class RETSInterslaveBegging extends App.Event
let t = [];
t.push(`Passing the slave quarters late at night, you hear`);
- t.push(App.UI.DOM.combineNodes(contextualIntro(V.PC, eventSlave, true), "'s'"));
+ t.push(App.UI.DOM.combineNodes(contextualIntro(V.PC, eventSlave, true), "'s"));
if (eventSlave.voice > 2) {
t.push(`girly voice raised in`);
} else if (eventSlave.voice > 1) {
@@ -64,9 +64,9 @@ App.Events.RETSInterslaveBegging = class RETSInterslaveBegging extends App.Event
} else {
t.push(`deep voice raised in`);
}
- if (eventSlave.trust <= 20 || (eventSlave.fetish === "submissive" && eventSlave.fetishKnown)) {
+ if (eventSlave.trust <= 20 || (eventSlave.fetish === Fetish.SUBMISSIVE && eventSlave.fetishKnown)) {
t.push(`${his} usual begging tones. ${He}'s`);
- if (eventSlave.fetish === "submissive" && eventSlave.fetishKnown) {
+ if (eventSlave.fetish === Fetish.SUBMISSIVE && eventSlave.fetishKnown) {
t.push(`a shameless little slut of a sub, and`);
} else {
t.push(`got a lot to be afraid of, as a sex slave, so`);
@@ -304,7 +304,7 @@ App.Events.RETSInterslaveBegging = class RETSInterslaveBegging extends App.Event
t.push(`You make a subtle, yet clearly sexual sound`);
}
t.push(`in ${eventSlave.slaveName}'s direction. That's all that's necessary.`);
- t.push(Spoken(subSlave, `"Yes, ${getWrittenTitle(subSlave)}!"`));
+ t.push(Spoken(subSlave, `"Yes, ${master2}!"`));
t.push(`${say2}s ${subSlave.slaveName} obediently, and`);
if (vaginal) {
t.push(`gets right down at ${eventSlave.slaveName}'s feet, lying on ${his2} back, legs`);
@@ -326,8 +326,8 @@ App.Events.RETSInterslaveBegging = class RETSInterslaveBegging extends App.Event
App.Events.addParagraph(frag, t);
t = [];
- t.push(Spoken(eventSlave, `"Thank you, ${getWrittenTitle(subSlave)},"`));
- t.push(`says ${eventSlave.slaveName} <span class="hotpink">devotedly.</span>`);
+ t.push(Spoken(eventSlave, `"Thank you, ${master},"`));
+ t.push(`${say}s ${eventSlave.slaveName} <span class="hotpink">devotedly.</span>`);
if (!vaginal || subSlave.vaginaLube > 1) {
t.push(`${He} lets a gob of ${his} saliva fall onto ${his} cockhead,`);
if (!vaginal) {
@@ -552,7 +552,7 @@ App.Events.RETSInterslaveBegging = class RETSInterslaveBegging extends App.Event
t = [];
const domBelly = bellyAdjective(eventSlave);
- t.push(`You brush past ${eventSlave.slaveName} without a word. ${Spoken(eventSlave, `"Um, ${getWrittenTitle(eventSlave)},"`)} ${he} starts to greet you, and then loses track of the greeting as ${he} sees what you're doing. You stride forward, grab ${subSlave.slaveName} by ${his2}`);
+ t.push(`You brush past ${eventSlave.slaveName} without a word. ${Spoken(eventSlave, `"Um, ${master},"`)} ${he} starts to greet you, and then loses track of the greeting as ${he} sees what you're doing. You stride forward, grab ${subSlave.slaveName} by ${his2}`);
if (subSlave.hips > 2) {
t.push(`door-jamming hips`);
} else if (subSlave.belly >= 100000) {
@@ -661,7 +661,7 @@ App.Events.RETSInterslaveBegging = class RETSInterslaveBegging extends App.Event
} else {
t.push(`hot ${girl2},`);
}
- t.push(`right in front of ${him}. And this while already laboring under a severe case of blue balls. ${Spoken(eventSlave, `"${getWrittenTitle(eventSlave)},"`)} ${he} ${say}s unspecifically. ${He} knows you did that in front of ${him} for ${his} benefit, at least partly, and ${he} wouldn't know what to make of it or how to respond, even if ${he} were in possession of ${his} faculties. Which ${he} isn't. All ${his} blood is very obviously located in`);
+ t.push(`right in front of ${him}. And this while already laboring under a severe case of blue balls. ${Spoken(eventSlave, `"${capFirstChar(master)},"`)} ${he} ${say}s unspecifically. ${He} knows you did that in front of ${him} for ${his} benefit, at least partly, and ${he} wouldn't know what to make of it or how to respond, even if ${he} were in possession of ${his} faculties. Which ${he} isn't. All ${his} blood is very obviously located in`);
if (eventSlave.vagina > -1) {
t.push(`${his} lovely futanari hard-on.`);
} else {
@@ -704,7 +704,7 @@ App.Events.RETSInterslaveBegging = class RETSInterslaveBegging extends App.Event
} else {
t.push(`anus,`);
}
- t.push(`and since you've just climaxed recently, it's a while before you orgasm again. ${eventSlave.slaveName} cums long before you, spattering ${himself} messily, moaning ${Spoken(eventSlave, `"Oh, ${getWrittenTitle(eventSlave)}, yes, oh fuck yes, my ${canDoVaginal(eventSlave) ? "pussy, my fucking pussy" : "ass, my fucking asshole"}"`)}`);
+ t.push(`and since you've just climaxed recently, it's a while before you orgasm again. ${eventSlave.slaveName} cums long before you, spattering ${himself} messily, moaning ${Spoken(eventSlave, `"Oh, ${master}, yes, oh fuck yes, my ${canDoVaginal(eventSlave) ? "pussy, my fucking pussy" : "ass, my fucking asshole"}"`)}`);
t.push(`so <span class="hotpink">whorishly</span> that there's no indication ${he} was ever even considering fucking anyone.`);
eventSlave.devotion += 3;
if (canDoVaginal(eventSlave) && eventSlave.vagina > 0) {
@@ -753,7 +753,7 @@ App.Events.RETSInterslaveBegging = class RETSInterslaveBegging extends App.Event
t = [];
t.push(`You give no explicit command to the pair of slaves in front of you, but they understand you perfectly. ${subSlave.slaveName} pales;`);
- if (subSlave.fetishKnown && subSlave.fetish === "submissive") {
+ if (subSlave.fetishKnown && subSlave.fetish === Fetish.SUBMISSIVE) {
t.push(`${he2} likes getting fucked, but having someone ordered to rape ${him2} is a bit much.`);
} else if (subSlave.fetishKnown && subSlave.fetish === "masochist") {
t.push(`${he2} likes being hurt, but having the flirty interchange converted instantly into a situation in which ${he2} has no control at all kills ${his2} mood.`);
@@ -809,7 +809,7 @@ App.Events.RETSInterslaveBegging = class RETSInterslaveBegging extends App.Event
}
t.push(`and starts to fuck.`);
}
- t.push(Spoken(eventSlave, `"Thanks, ${getWrittenTitle(eventSlave)},"`));
+ t.push(Spoken(eventSlave, `"Thanks, ${master},"`));
t.push(`pants ${eventSlave.slaveName} as ${he} humps away.`);
t.push(Spoken(eventSlave, `"I'm <span class="mediumaquamarine">looking forward</span> to being able to do this whenever I want."`));
t.push(`${subSlave.slaveName} gasps, from`);
diff --git a/src/events/RETS/reRepressedAnalVirgin.js b/src/events/RETS/reRepressedAnalVirgin.js
index 8ebadf80f104c0616a19331ff1aacbf011562cb1..0fe111c83c974434357a35f04956d943a7e755c3 100644
--- a/src/events/RETS/reRepressedAnalVirgin.js
+++ b/src/events/RETS/reRepressedAnalVirgin.js
@@ -7,7 +7,7 @@ App.Events.RETSAnalRepressedVirgin = class RETSAnalRepressedVirgin extends App.E
actorPrerequisites() {
return [
[ // event slave /domslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
canTalk,
@@ -21,7 +21,7 @@ App.Events.RETSAnalRepressedVirgin = class RETSAnalRepressedVirgin extends App.E
s => s.fetish !== "buttslut",
],
[ // and subslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canWalk,
canTalk,
isSlaveAvailable,
@@ -39,6 +39,7 @@ App.Events.RETSAnalRepressedVirgin = class RETSAnalRepressedVirgin extends App.E
const {
he2, his2, him2, girl2, himself2
} = getPronouns(subSlave).appendSuffix("2");
+ const {say, title: master} = getEnunciation(eventSlave);
const pDick = V.PC.dick !== 0;
App.Events.drawEventArt(node, [eventSlave, subSlave]);
@@ -81,9 +82,9 @@ App.Events.RETSAnalRepressedVirgin = class RETSAnalRepressedVirgin extends App.E
t = [];
t.push(`${eventSlave.slaveName} coughs and looks doubtful, like ${he}'s mulling over a question. You let the poor repressed ${girl} chew on it for a while, and eventually ${he} bursts out,`);
- t.push(Spoken(eventSlave, `"${getWrittenTitle(eventSlave)}, what were you doing with ${subSlave.slaveName}?"`));
+ t.push(Spoken(eventSlave, `"${capFirstChar(master)}, what were you doing with ${subSlave.slaveName}?"`));
t.push(`The absurdity gives you a moment's pause, but you answer gamely that you were fucking ${his2} ass. ${eventSlave.slaveName} blushes furiously but plunges on,`);
- t.push(Spoken(eventSlave, `"I'm s-sorry, ${getWrittenTitle(eventSlave)}, but I still don't understand. I thought sex happened in a v-vagina. I d-didn't think b-butts were — were for, you know, that."`));
+ t.push(Spoken(eventSlave, `"I'm s-sorry, ${master}, but I still don't understand. I thought sex happened in a v-vagina. I d-didn't think b-butts were — were for, you know, that."`));
seX(subSlave, "anal", V.PC, "penetrative");
if (canImpreg(subSlave, V.PC)) {
knockMeUp(subSlave, 5, 1, -1);
@@ -107,10 +108,10 @@ App.Events.RETSAnalRepressedVirgin = class RETSAnalRepressedVirgin extends App.E
} else {
t.push(`listen to your actions.`);
}
- t.push(`${He}'s a healthy ${girl}, ${(eventSlave.preg > eventSlave.pregData.normalBirth/2) ? `ripe with pregnancy,` : ""} and ${his} food is laced with mild aphrodisiacs. The boredom and ${his} building arousal begin to torture ${him}, until finally ${he} grinds out a hesitant`);
- t.push(Spoken(eventSlave, `"P-please fuck me, ${getWrittenTitle(eventSlave)}."`));
+ t.push(`${He}'s a healthy ${girl}, ${(eventSlave.preg > eventSlave.pregData.normalBirth / 2) ? `ripe with pregnancy,` : ""} and ${his} food is laced with mild aphrodisiacs. The boredom and ${his} building arousal begin to torture ${him}, until finally ${he} grinds out a hesitant`);
+ t.push(Spoken(eventSlave, `"P-please fuck me, ${master}."`));
t.push(`You glance at ${him} and ${he} quickly looks down, blushing. You go back to your work, and an hour later ${he} manages a more confident`);
- t.push(Spoken(eventSlave, `"Please fuck me, ${getWrittenTitle(eventSlave)}."`));
+ t.push(Spoken(eventSlave, `"Please fuck me, ${master}."`));
App.Events.addParagraph(frag, t);
t = [];
@@ -164,7 +165,7 @@ App.Events.RETSAnalRepressedVirgin = class RETSAnalRepressedVirgin extends App.E
t.push(`visibly compressing the strap-on. `);
}
t.push(`Confused, ${he} mumbles into the couch,`);
- t.push(Spoken(eventSlave, `"${getWrittenTitle(eventSlave)}, I c-came. I came to your thing in my butt. A-am I — does that make me a slut?"`));
+ t.push(Spoken(eventSlave, `"${capFirstChar(master)}, I c-came. I came to your thing in my butt. A-am I — does that make me a slut?"`));
t.push(`You assure ${him} that it does. Surprisingly, ${he} does not break down, but exhales slowly and squares ${his} shoulders, visibly resolving to <span class="devotion inc">be a slut</span> if ${he} has to. ${He} even takes a bit longer than strictly necessary giving ${himself} ${his} <span class="virginity loss">first</span> post-sex enema.`);
eventSlave.devotion += 5;
eventSlave.anus += 1;
@@ -179,8 +180,8 @@ App.Events.RETSAnalRepressedVirgin = class RETSAnalRepressedVirgin extends App.E
function pounding() {
t = [];
t.push(`You tell ${him} that ${his} butt is your property, just like ${subSlave.slaveName}'s. ${He} looks <span class="trust dec">terrified.</span> You continue, telling ${him} to bring your property over to you. ${He} stumbles over, begging,`);
- t.push(Spoken(eventSlave, `"P-please, fuck me ${getWrittenTitle(eventSlave)}, please don't do stuff to my butt. It's going t-to h-hurt.`));
- if (eventSlave.preg > eventSlave.pregData.normalBirth/2) {
+ t.push(Spoken(eventSlave, `"P-please, fuck me ${master}, please don't do stuff to my butt. It's going t-to h-hurt.`));
+ if (eventSlave.preg > eventSlave.pregData.normalBirth / 2) {
t.push(`And I-I'm r-really pregnant.`);
} else if (eventSlave.pregKnown === 1) {
t.push(`And I-I'm p-pregnant.`);
@@ -193,7 +194,7 @@ App.Events.RETSAnalRepressedVirgin = class RETSAnalRepressedVirgin extends App.E
t.push(`a lubed strap-on`);
}
t.push(`sliding between ${his} buttocks and then pressing against ${his} anus, ${he} bursts out,`);
- t.push(Spoken(eventSlave, `"Please no, ${getWrittenTitle(eventSlave)}! Please not my — AAAH! OW!"`));
+ t.push(Spoken(eventSlave, `"Please no, ${master}! Please not my — AAAH! OW!"`));
t.push(`and bursts into tears. You give ${him} a few seconds to get used to your girth and then begin to fuck ${his} delicious little virgin behind. Despite the pain, the`);
if (eventSlave.vagina !== -1) {
t.push(`stimulation gets ${him} wet,`);
@@ -223,7 +224,6 @@ App.Events.RETSAnalRepressedVirgin = class RETSAnalRepressedVirgin extends App.E
}
function later() {
- const {say} = getEnunciation(eventSlave);
t = [];
t.push(`You tell ${him} to sit down on the couch and listen. ${He} obeys, carefully avoiding the spot where you and ${subSlave.slaveName} embraced. You explain that ${subSlave.slaveName} is an experienced anal slave, and that you enjoy having sex with ${him2} there. You point out how much ${subSlave.slaveName} enjoyed ${himself2} (${eventSlave.slaveName} studiously avoids`);
@@ -243,7 +243,7 @@ App.Events.RETSAnalRepressedVirgin = class RETSAnalRepressedVirgin extends App.E
t.push(`${his} hand resting on ${his} rounded middle,`);
}
t.push(`so you try a different tack. You tell ${him} that ${his} anal virginity has a price: it makes ${him} a more valuable slave. ${He}'ll probably be fucked back there someday soon, but it's not something you plan to do lightly. And in any case, ${he}'ll be trained to enjoy the experience when it happens. Hesitantly, ${he} ${say}s`);
- t.push(Spoken(eventSlave, `"I understand, ${getWrittenTitle(eventSlave)}. I <span class="trust inc">trust you.</span>"`));
+ t.push(Spoken(eventSlave, `"I understand, ${master}. <span class="trust inc">I trust you.</span>"`));
t.push(`${He} seems more confident for the rest of the inspection, and when it's done, ${he} leaves with less worry on ${his} face.`);
eventSlave.trust += 5;
return t;
@@ -252,7 +252,7 @@ App.Events.RETSAnalRepressedVirgin = class RETSAnalRepressedVirgin extends App.E
function sold() {
t = [];
t.push(`You tell ${him} that ${his} butt is your property, just like ${subSlave.slaveName}'s. ${He} looks <span class="trust dec">terrified,</span> but this is nothing to ${his} reaction when another slave arrives to bring ${him} out for an auction of ${his} virgin anus. ${He}'s dragged out, whining,`);
- t.push(Spoken(eventSlave, `"P-please, ${getWrittenTitle(eventSlave)}, please don't sell my butthole! I'll do anything! Please!"`));
+ t.push(Spoken(eventSlave, `"P-please, ${master}, please don't sell my butthole! I'll do anything! Please!"`));
t.push(`${His} pleas are unavailing.`);
t.push(`${V.assistant.name} conducts a brisk streetside auction of the weeping slave${girl}, using compliance systems to force ${him} to spread ${his} quivering buttocks for the crowd. The <span class="cash inc">winning bidder</span> uses a public stall to do the deed; its thin walls are nowhere near enough to disguise ${his} whining and sobbing as he <span class="virginity loss">takes ${his} anal virginity.</span> ${He} now <span class="flaw gain">hates anal.</span>`);
cashX(500, "event", eventSlave);
diff --git a/src/events/RETS/reSadisticDescription.js b/src/events/RETS/reSadisticDescription.js
index fc926567013151dc18ad9304152737393197dce5..adbb2cc78316ecbcaf678bf4b46b43ce2baddca3 100644
--- a/src/events/RETS/reSadisticDescription.js
+++ b/src/events/RETS/reSadisticDescription.js
@@ -8,7 +8,7 @@ App.Events.RETSSadisticDescription = class RETSSadisticDescription extends App.E
actorPrerequisites() {
return [
[ // event slave /domslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.anus > 0,
canTalk,
canWalk,
@@ -18,7 +18,7 @@ App.Events.RETSSadisticDescription = class RETSSadisticDescription extends App.E
s => s.fetish === "sadist" || s.fetish === "dom" || s.energy > 95,
],
[ // and subslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canWalk,
canTalk,
canSee,
diff --git a/src/events/RETS/reShowerForce.js b/src/events/RETS/reShowerForce.js
index 440a0a46f3799f500b17026ed3fdeeac8a16260a..1c71f14674e66def98a97a7b1075af2c3ced2e9e 100644
--- a/src/events/RETS/reShowerForce.js
+++ b/src/events/RETS/reShowerForce.js
@@ -8,7 +8,7 @@ App.Events.RETSShowerForce = class RETSShowerForce extends App.Events.BaseEvent
actorPrerequisites() {
return [
[ // event slave /domslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canWalk,
canTalk,
@@ -18,7 +18,7 @@ App.Events.RETSShowerForce = class RETSShowerForce extends App.Events.BaseEvent
s => (["sadist", "dom"].includes(s.fetish) || s.energy > 95),
],
[ // and subslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canStand,
canTalk,
canHear,
diff --git a/src/events/RETS/reSiblingTussle.js b/src/events/RETS/reSiblingTussle.js
index 2866bc84caf6a4a92e78e199cc342324a9ad488e..949ac99053306588d7185e63568f998da3914488 100644
--- a/src/events/RETS/reSiblingTussle.js
+++ b/src/events/RETS/reSiblingTussle.js
@@ -8,7 +8,7 @@ App.Events.RETSSiblingTussle = class RETSSiblingTussle extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canStand,
hasAnyArms,
hasBothLegs,
@@ -16,7 +16,7 @@ App.Events.RETSSiblingTussle = class RETSSiblingTussle extends App.Events.BaseEv
s => s.sisters > 0
],
[ // and her sibling
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canStand,
hasAnyArms,
hasBothLegs,
@@ -154,8 +154,8 @@ App.Events.RETSSiblingTussle = class RETSSiblingTussle extends App.Events.BaseEv
}
function watch() {
- const dead1 = deadliness(sib1);
- const dead2 = deadliness(sib2);
+ const dead1 = deadliness(sib1).value;
+ const dead2 = deadliness(sib2).value;
if (Math.abs(dead1 - dead2) <= 1) {
// fight between equals
t = [];
@@ -197,7 +197,7 @@ App.Events.RETSSiblingTussle = class RETSSiblingTussle extends App.Events.BaseEv
if (sexType === "oral") {
t.push(`${HeW} moves over ${loser.slaveName}'s prone body until ${heW}'s above ${hisL} mouth, and orders ${hisW} ${siblingTerm(winner, loser)} to orally service ${himW}.`);
}
- if (loser.fetish === "submissive") {
+ if (loser.fetish === Fetish.SUBMISSIVE) {
t.push(`${loser.slaveName} enjoys being dominated anyway, so this situation is good for ${himL} too.`);
} else if (V.universalRulesConsent === 1) {
t.push(`${loser.slaveName} knows he's lost; technically ${heL} could reject ${winner.slaveName}'s advances, but ${heL} isn't exactly opposed to this anyway.`);
diff --git a/src/events/RETS/reSimpleAssault.js b/src/events/RETS/reSimpleAssault.js
index 1f5c441b84c622e3e6d053cfc17d73213d534a4d..a62f2141c64afce6e99cfa5a6df07b07d0183be3 100644
--- a/src/events/RETS/reSimpleAssault.js
+++ b/src/events/RETS/reSimpleAssault.js
@@ -8,7 +8,7 @@ App.Events.RETSSimpleAssault = class RETSSimpleAssault extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.rules.release.slaves !== 0,
hasAnyArms,
canStand,
@@ -17,7 +17,7 @@ App.Events.RETSSimpleAssault = class RETSSimpleAssault extends App.Events.BaseEv
s => s.devotion > 50
],
[ // and her sub
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canStand,
canTalk,
isSlaveAvailable,
@@ -25,7 +25,7 @@ App.Events.RETSSimpleAssault = class RETSSimpleAssault extends App.Events.BaseEv
s => (canDoAnal(s) && s.anus !== 0) || (canDoVaginal(s) && s.vagina !== 0),
s => s.devotion < 20,
s => s.belly < 2000,
- s => s.skill.combat === 0,
+ s => s.skill.combat <= 30,
s => s.muscles <= 30
]
];
diff --git a/src/events/RETS/reTasteTest.js b/src/events/RETS/reTasteTest.js
index 93e774c2421505406c3cd905f88e7fdc95cfb2bd..5819b79f8ca7f6e1345ee11fcc9bee862dac983f 100644
--- a/src/events/RETS/reTasteTest.js
+++ b/src/events/RETS/reTasteTest.js
@@ -7,7 +7,7 @@ App.Events.RETSTasteTest = class RETSTasteTest extends App.Events.BaseEvent {
actorPrerequisites() {
return [
[ // event slave /domslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
hasAnyArms,
canMove,
canTalk,
@@ -18,7 +18,7 @@ App.Events.RETSTasteTest = class RETSTasteTest extends App.Events.BaseEvent {
s => s.chastityVagina === 0 || s.chastityPenis === 0,
],
[ // and subslave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
canWalk,
canTalk,
canHear,
@@ -40,7 +40,7 @@ App.Events.RETSTasteTest = class RETSTasteTest extends App.Events.BaseEvent {
const {
he2, his2, him2, He2
} = getPronouns(subSlave).appendSuffix("2");
- const {say: say2} = getEnunciation(subSlave);
+ const {say: say2, title: master2} = getEnunciation(subSlave);
const arms2 = hasBothArms(subSlave) ? "arms" : "arm";
App.Events.drawEventArt(node, [eventSlave, subSlave], "no clothing");
@@ -149,7 +149,7 @@ App.Events.RETSTasteTest = class RETSTasteTest extends App.Events.BaseEvent {
t.push(`of ${his2} ${subSlave.inflationType}-filled belly gurgling`);
}
} else if (subSlave.lactation > 1) {
- t.push(`of the ${subSlave.milkFlavor === "none" ? `` : `${subSlave.milkFlavor} flavored `}milk dripping from ${his2} nipples`);
+ t.push(`of the ${subSlave.milkFlavor === "none" ? `` : `${subSlave.milkFlavor}-flavored `}milk dripping from ${his2} nipples`);
} else {
t.push(`of ${his2} bare skin against the cool air`);
}
@@ -273,7 +273,7 @@ App.Events.RETSTasteTest = class RETSTasteTest extends App.Events.BaseEvent {
} else {
t.push(`wet cunt, a bead of pussyjuice already trailing down your inner thigh.`);
}
- t.push(`${Spoken(subSlave, `"Oh, um, hi ${getWrittenTitle(subSlave)},"`)} ${he2} stammers, and then starts to`);
+ t.push(`${Spoken(subSlave, `"Oh, um, hi ${master2},"`)} ${he2} stammers, and then starts to`);
if (V.PC.dick !== 0 && V.PC.vagina !== -1) {
t.push(`suck your dick and eat your pussy.`);
} else if (V.PC.dick !== 0) {
@@ -313,7 +313,7 @@ App.Events.RETSTasteTest = class RETSTasteTest extends App.Events.BaseEvent {
t.push(`climax wetly against ${subSlave.slaveName}'s mouth,`);
seX(subSlave, "oral", V.PC, "vaginal");
}
- t.push(`you pull away slightly, letting the slave on ${his2} knees below you gasp ${Spoken(subSlave, `"You taste great, ${getWrittenTitle(subSlave)}!"`)} before you spin ${him2} around in turn so ${he2} can give ${eventSlave.slaveName} ${his} own allotment of oral sex. You leave them to it. They <span class="trust inc">trust you a bit more</span> after such a lighthearted little escapade.`);
+ t.push(`you pull away slightly, letting the slave on ${his2} knees below you gasp ${Spoken(subSlave, `"You taste great, ${master2}}!"`)} before you spin ${him2} around in turn so ${he2} can give ${eventSlave.slaveName} ${his} own allotment of oral sex. You leave them to it. They <span class="trust inc">trust you a bit more</span> after such a lighthearted little escapade.`);
if (eventSlave.dick > 0 && eventSlave.chastityPenis === 0) {
seX(subSlave, "oral", eventSlave, "penetrative");
} else if (canDoVaginal(eventSlave)) {
diff --git a/src/events/RETS/reTopExhaustion.js b/src/events/RETS/reTopExhaustion.js
index c2679a623d9c808d61185734bcc1a9e68daa3283..3f82d65a55ec1e3d5e48b042b79ed194b76dfc16 100644
--- a/src/events/RETS/reTopExhaustion.js
+++ b/src/events/RETS/reTopExhaustion.js
@@ -8,7 +8,7 @@ App.Events.RETSTopExhaustion = class RETSTopExhaustion extends App.Events.BaseEv
actorPrerequisites() {
return [
[ // event slave
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.rules.release.partner !== 0,
s => (canDoAnal(s) && s.anus !== 0) || (canDoVaginal(s) && s.vagina !== 0 && s.fetish !== "buttslut"),
hasAnyArms,
@@ -21,7 +21,7 @@ App.Events.RETSTopExhaustion = class RETSTopExhaustion extends App.Events.BaseEv
s => s.trust > 50
],
[ // and her dom
- s => s.fetish !== "mindbroken",
+ s => s.fetish !== Fetish.MINDBROKEN,
s => s.relationshipTarget === this.actors[0],
isSlaveAvailable,
s => (s.assignment !== Job.MASTERSUITE && s.assignment !== Job.CONCUBINE && s.assignment !== Job.QUARTER),
@@ -301,7 +301,7 @@ App.Events.RETSTopExhaustion = class RETSTopExhaustion extends App.Events.BaseEv
} else {
t.push(`Nevertheless, ${he2} clumsily wiggles ${his2} hips for you. As you begin to grind against ${him2},`);
if (canPenetrate(domSlave)) {
- t.push(`the lewdity of the act manages to get ${his2} member hard again.`);
+ t.push(`the lewdness of the act manages to get ${his2} member hard again.`);
} else {
t.push(`${he2} starts to move along with you.`);
}
diff --git a/src/events/assistant/assistantFS.js b/src/events/assistant/assistantFS.js
index 2e5caa9ccaa215605ed274405bac1d4df72831fc..66e26ceb7213d4804546035dce257cdc2868feaa 100644
--- a/src/events/assistant/assistantFS.js
+++ b/src/events/assistant/assistantFS.js
@@ -234,7 +234,11 @@ App.Events.assistantFS = class assistantFS extends App.Events.BaseEvent {
} else if (V.arcologies[0].FSStatuesqueGlorification !== "unset") {
r.push(`adjusts ${hisA} height to conform with your vision of a society glorifying the tall.`);
} else if (V.arcologies[0].FSChattelReligionist !== "unset") {
- r.push(`adjusts ${hisA} outfit to resemble a crusader of your new religion.`);
+ if (V.arcologies[0].FSChattelReligionistLaw2 === 1) {
+ r.push(`adjusts ${hisA} appearance to include a holy symbol painted onto ${hisA} nude body.`);
+ } else {
+ r.push(`adjusts ${hisA} outfit to resemble a crusader of your new religion.`);
+ }
} else if (V.arcologies[0].FSRomanRevivalist !== "unset") {
r.push(`adjusts ${hisA} outfit to resemble a Roman warrior to conform with your vision of building a new Rome.`);
} else if (V.arcologies[0].FSNeoImperialist !== "unset") {
@@ -350,7 +354,7 @@ App.Events.assistantFS = class assistantFS extends App.Events.BaseEvent {
} else if (V.arcologies[0].FSStatuesqueGlorification !== "unset") {
r.push(`adjusts ${hisA} height to conform with your vision of a society glorifying the tall.`);
} else if (V.arcologies[0].FSChattelReligionist !== "unset") {
- r.push(`adjusts ${hisA} outfit to prominently display a religious symbol of your new religion.`);
+ r.push(`adjusts ${hisA} outfit to resemble the revealing habit of your new religion in a beautiful gold and white color scheme.`);
} else if (V.arcologies[0].FSRomanRevivalist !== "unset") {
r.push(`adjusts ${hisA} outfit to resemble a respectable Roman ${girlA} to conform with your vision of building a new Rome.`);
} else if (V.arcologies[0].FSNeoImperialist !== "unset") {
@@ -411,7 +415,7 @@ App.Events.assistantFS = class assistantFS extends App.Events.BaseEvent {
} else if (V.arcologies[0].FSStatuesqueGlorification !== "unset") {
r.push(`adjusts ${hisA} height to conform with your vision of a society glorifying the tall.`);
} else if (V.arcologies[0].FSChattelReligionist !== "unset") {
- r.push(`adjusts ${hisA} outfit to prominently display a religious symbol of your new religion.`);
+ r.push(`adjusts ${hisA} outfit to resemble the revealing habit of your new religion in a beautiful gold and white color scheme.`);
} else if (V.arcologies[0].FSRomanRevivalist !== "unset") {
r.push(`adjusts ${hisA} outfit to resemble a Roman ${girlA} to conform with your vision of building a new Rome.`);
} else if (V.arcologies[0].FSNeoImperialist !== "unset") {
diff --git a/src/events/assistant/assistantSP.js b/src/events/assistant/assistantSP.js
index 5c5810746f9bc073220f8ed56727c4757e18f9fa..12c9c76d295aabb7fde9701416ae039d38ce54f6 100644
--- a/src/events/assistant/assistantSP.js
+++ b/src/events/assistant/assistantSP.js
@@ -37,7 +37,7 @@ App.Events.assistantSP = class assistantSP extends App.Events.BaseEvent {
r = [];
r.push(`"One more thing, ${properTitle()}!" ${HisA} symbol flashes brightly. "I could stay like I am now, a hot voice with this symbol representing me when I need to show up on screens. Or, I could slip into something a little sexier. How about this?" The symbol vanishes, and is replaced by a cute little school${girlA} character. ${HeA} bounces up and down experimentally. "This appearance would work best with an excited voice," ${heA} exclaims. ${HeA} blows you a kiss. The school${girlA}'s body shrinks down and all ${hisA} clothing falls off. A small pair of wings pops out from the pile of clothes and a fairy stands up. "Or I could be your tiny and adorable fairy companion!" ${HeA} shouts excitedly while waving ${hisA} arms.`);
if (V.seePreg !== 0) {
- r.push(`The fairy's belly begins to swell out, ${hisA} breasts getting puffier and leaking a drop of milk. "Or maybe you want your little buddy to be filled with adorable little babies, you little minx" ${heA} playfully teases.`);
+ r.push(`The fairy's belly begins to swell out, ${hisA} breasts getting puffier and leaking a drop of milk. "Or maybe you want your little buddy to be filled with adorable little babies, you little minx," ${heA} playfully teases.`);
}
r.push(`The fairy rapidly grows to adult size, becomes curvier and more mature, ${hisA} hair pulls itself back into a bun, and ${hisA} clothes change into a business suit. A pair of glasses appears on ${hisA} nose, and ${heA} looks at you over their tops. "Or I could be businesslike. And mature." ${HeA} snaps ${hisA} fingers, and ${hisA} bun falls away into long flowing locks.`);
if (V.seePreg !== 0) {
@@ -173,7 +173,7 @@ App.Events.assistantSP = class assistantSP extends App.Events.BaseEvent {
function shemale() {
V.assistant.appearance = "shemale";
refreshArt();
- return App.UI.DOM.makeElement("span", `At your order, ${heA} installs the shemale appearance. ${HeA} spins to show off ${hisA} new body, and starts to play with ${hisA} dick experimentally. "Like, thank you, ${properTitle()}. I wonder, can I generate avatars of the slaves? I would love to fuck an ass right now." ${HeA} looks meditative, pursing ${hisA} dick sucking lips. "Oh, and you can always customize me from the arcology management menu," ${heA} adds.`);
+ return App.UI.DOM.makeElement("span", `At your order, ${heA} installs the shemale appearance. ${HeA} spins to show off ${hisA} new body, and starts to play with ${hisA} dick experimentally. "Like, thank you, ${properTitle()}. I wonder, can I generate avatars of the slaves? I would love to fuck an ass right now." ${HeA} looks meditative, pursing ${hisA} dick-sucking lips. "Oh, and you can always customize me from the arcology management menu," ${heA} adds.`);
}
function monstergirl() {
diff --git a/src/events/eventUtils.js b/src/events/eventUtils.js
index 37f975a09b1c4df7560ca9430a4f0fe108215f4a..2237922b24613cac75e95920deafb7d6f12a149e 100644
--- a/src/events/eventUtils.js
+++ b/src/events/eventUtils.js
@@ -256,7 +256,7 @@ App.Events.Result = class {
node.append(" ");
}
if (this.note) {
- node.appendChild(App.UI.DOM.makeElement("span", this.note, "detail"));
+ node.appendChild(App.UI.DOM.makeElement("span", this.note, ["detail"]));
wrote = true;
}
return wrote;
@@ -416,7 +416,7 @@ App.Events.canExecute = function(event, eventSlave) {
* @returns {boolean}
*/
App.Events.qualifiesForREFIeventSlave = function(slave) {
- return slave.rules.speech !== "restrictive" && isSlaveAvailable(slave) && (slave.fetish === "none" || slave.fetishStrength <= 60) && (canSee(slave) || canHear(slave)) && (canTalk(slave) || hasAnyArms(slave));
+ return slave.rules.speech !== "restrictive" && isSlaveAvailable(slave) && (slave.fetish === Fetish.NONE || slave.fetishStrength <= 60) && (canSee(slave) || canHear(slave)) && (canTalk(slave) || hasAnyArms(slave));
};
/** Qualifies for REFI subSlave event?
diff --git a/src/events/intro/acquisition.js b/src/events/intro/acquisition.js
index 19e6afd9fb78d5a0463d697cd7ad1b5ad1b619e9..5fb5199d62be0bbf195916d37e62d6db4f8338a3 100644
--- a/src/events/intro/acquisition.js
+++ b/src/events/intro/acquisition.js
@@ -1,8 +1,6 @@
App.Intro.acquisition = function() {
const el = new DocumentFragment();
-
const valueOwed = (V.saveImported === 1) ? 5000 : 50000;
-
const r = [];
if (_.isArray(V.careerBonusNeeded)) {
@@ -28,11 +26,10 @@ App.Intro.acquisition = function() {
App.UI.DOM.appendNewElement("p", el, "You've done it.");
App.UI.DOM.appendNewElement("p", el, `You arrive at your new arcology, ${V.arcologies[0].name}, and head straight to the penthouse to enter the access codes that will tell the ${V.arcologies[0].name} systems to recognize you as their owner. The penthouse office is ready to receive the codes, and they authenticate. A voice activates in your earpiece.`);
- App.UI.DOM.appendNewElement("p", el, `Congratulations. I am a personal assistant program, and it is my pleasure to assist you, ${PlayerName()} the new owner of ${V.arcologies[0].name}. I will offer useful information whenever possible in italics. Your new arcology has some unusual equipment. The previous owner kept a small stable of sex slaves. The penthouse therefore has a body modification studio for tattooing, bleaching and piercing, and an auto salon for more prosaic things like hair care. It also has a remote surgery, a small surgical theater that can be operated remotely by a qualified surgeon if you can pay the fee. Finally, it has a slave nutrition system connected to the arcology's hydroponics bays. This system produces a tasty protein-rich drink that provides the physically active female body all its necessary nutrients while leaving the lower digestive tract extremely clean. It even causes a mild increase in sex drive.`, "note");
+ App.UI.DOM.appendNewElement("p", el, `Congratulations. I am a personal assistant program, and it is my pleasure to assist you, ${PlayerName()} the new owner of ${V.arcologies[0].name}. I will offer useful information whenever possible in italics. Your new arcology has some unusual equipment. The previous owner kept a small stable of sex slaves. The penthouse therefore has a body modification studio for tattooing, bleaching and piercing, and an auto salon for more prosaic things like hair care. It also has a remote surgery, a small surgical theater that can be operated remotely by a qualified surgeon if you can pay the fee. Finally, it has a slave nutrition system connected to the arcology's hydroponics bays. This system produces a tasty protein-rich drink that provides the physically active female body all its necessary nutrients while leaving the lower digestive tract extremely clean. It even causes a mild increase in sex drive.`, ["note"]);
r.push(`The previous owner seems to have left in something of a hurry.`);
let valueGiven = 0;
- const heroSlaves = App.Utils.buildHeroArray().shuffle();
if (V.cheatMode === 1) {
r.push(`Since you've elected to take over an arcology with special advantages, you've acquired a very special group of slaves.`);
r.push(App.Intro.cheatModeSlaves());
@@ -73,7 +70,7 @@ App.Intro.acquisition = function() {
r.push(`Their personal slaves were all Fuckdolls, slaves who have been permanently encased in advanced latex suits and converted into living sex toys. Several of them are still here.`);
break;
case "FSAssetExpansionist":
- r.push(`They kept a collection of bejeweled boobs for company, but they focused on breast expansion to the exclusion the slaves' emotional training. Several of them are still here.`);
+ r.push(`They kept a collection of bejeweled boobs for company, but they focused on breast expansion to the exclusion of the slaves' emotional training. Several of them are still here.`);
break;
case "FSSlimnessEnthusiast":
r.push(`They kept a harem of slim, pretty girls, and treated them very well. Several of them are still here. They should be very trusting of a new owner.`);
@@ -152,6 +149,7 @@ App.Intro.acquisition = function() {
r.push(`did not have the time in control of the arcology to develop a specific stable of sex slaves,`);
}
r.push(`their slaves were quite varied.`);
+ const heroSlaves = App.Utils.buildHeroArray().shuffle();
for (let j = 0; j < heroSlaves.length; j++) {
if (valueOwed - valueGiven <= 5000) {
break;
@@ -169,7 +167,7 @@ App.Intro.acquisition = function() {
newSlave(slave);
r.push(slave.slaveName);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`is, sadly, not mentally competent, and is wandering through the penthouse at the moment.`);
} else if (isAmputee(slave)) {
r.push(`is a quadruple amputee and is quite helpless, so you can attend to ${him} at your leisure.`);
@@ -207,7 +205,7 @@ App.Intro.acquisition = function() {
r.push(`is currently in the dormitory playing with ${his} nipples, and I believe ${he} will be happy to meet you.`);
} else if (slave.fetish === "humiliation") {
r.push(`is currently in the entryway flashing passersby, and I believe ${he} will be happy to meet you.`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`is currently in the dormitory, experimenting with self-bondage using the sheets; I believe ${he} will be happy to meet you.`);
} else if (slave.fetish === "dom") {
r.push(`is currently in the exercise area keeping fit; ${he} likes to take an active role sexually and is using this down time to work out.`);
@@ -238,7 +236,7 @@ App.Intro.acquisition = function() {
if (assignmentVisible(slave)) {
V.averageTrust += slave.trust;
V.averageDevotion += slave.devotion;
- slavesContributing += 1;
+ slavesContributing++;
} else {
if (slave.assignment !== Job.CELLBLOCK && slave.assignment !== Job.ARCADE) {
if (slave.assignment !== Job.DAIRY || V.dairyRestraintsSetting < 2) {
@@ -274,9 +272,8 @@ App.Intro.acquisition = function() {
V.menialSupplyFactor = -30000;
}
Save.autosave.save("Week Start Autosave");
- },
- [],
- "Main"
+ }
+ , [], "Main"
)
);
return el;
@@ -316,24 +313,24 @@ App.Intro.acquisition = function() {
}
for (const slave of V.slaves) {
if (slave.mother === -1) {
- V.PC.counter.birthsTotal += 1;
+ V.PC.counter.birthsTotal++;
if (slave.father === -1) {
- V.PC.counter.birthSelf += 1;
+ V.PC.counter.birthSelf++;
} else {
slave.father = -3;
- V.PC.counter.birthMaster += 1;
+ V.PC.counter.birthMaster++;
}
}
}
} else if (V.PC.career === "escort" || V.PC.career === "prostitute" || V.PC.career === "child prostitute") {
for (const slave of V.slaves) {
if (slave.mother === -1) {
- V.PC.counter.birthsTotal += 1;
+ V.PC.counter.birthsTotal++;
if (slave.father === -1) {
- V.PC.counter.birthSelf += 1;
+ V.PC.counter.birthSelf++;
} else {
slave.father = -5;
- V.PC.counter.birthClient += 1;
+ V.PC.counter.birthClient++;
}
} else if (slave.father === -1) {
slave.mother = -5;
@@ -342,17 +339,16 @@ App.Intro.acquisition = function() {
} else {
for (const slave of V.slaves) {
if (slave.mother === -1) {
- V.PC.counter.birthsTotal += 1;
+ V.PC.counter.birthsTotal++;
if (slave.father === -1) {
- V.PC.counter.birthSelf += 1;
+ V.PC.counter.birthSelf++;
} else {
- V.PC.counter.birthOther += 1;
+ V.PC.counter.birthOther++;
}
}
}
}
if (V.PC.preg > 0) {
- V.PC.pregWeek = V.PC.preg;
if (V.PC.pregType !== 8) {
V.PC.pregType = 1;
} else {
@@ -367,8 +363,8 @@ App.Intro.acquisition = function() {
V.PC.pregSource = -5;
}
V.PC.pregKnown = 1;
- V.PC.belly = getPregBellySize(V.PC);
- WombImpregnate(V.PC, V.PC.pregType, V.PC.pregSource, V.PC.preg);
+ WombForceFatherID(V.PC, V.PC.pregSource);
+ WombUpdatePregVars(V.PC);
}
} else {
V.PC.trueVirgin = 1;
@@ -746,7 +742,7 @@ App.Intro.acquisition = function() {
setHealth(slave, 100, 0, 0, 0, jsRandom(10, 30));
slave.face = random(0, 55);
slave.muscles = random(25, 50);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.behavioralFlaw = "none";
slave.behavioralQuirk = "fitness";
slave.clothes = "a toga";
@@ -764,7 +760,7 @@ App.Intro.acquisition = function() {
setHealth(slave, 100, 0, 0, 0, jsRandom(10, 30));
slave.face = random(20, 75);
slave.muscles = random(25, 60);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.behavioralFlaw = "none";
slave.behavioralQuirk = "fitness";
slave.skill.entertainment = random(15, 35);
@@ -780,7 +776,7 @@ App.Intro.acquisition = function() {
slave.trust = 75;
setHealth(slave, jsRandom(-20, 20), 0, 0, 0, 0);
slave.muscles = random(50, 75);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.sexualFlaw = "malicious";
slave.behavioralQuirk = "none";
slave.clothes = "a huipil";
diff --git a/src/events/intro/arcologySelection.js b/src/events/intro/arcologySelection.js
index 70e79b634c7ee08e8363536af1f3fcf0d79c802d..245e3d1493019e5f63b5098ed962710b0e72b8e7 100644
--- a/src/events/intro/arcologySelection.js
+++ b/src/events/intro/arcologySelection.js
@@ -1,4 +1,5 @@
-App.Intro.generateEstablishedArcologies = function() {
+/** @param {boolean} inIntro */
+App.Intro.generateEstablishedArcologies = function(inIntro = false) {
/* setup */
const fsAllowed = {
FSGenderRadicalist: () => V.seeDicks !== 0,
@@ -6,9 +7,6 @@ App.Intro.generateEstablishedArcologies = function() {
FSDegradationist: () => V.seeExtreme !== 0
};
const allowedFS = App.Data.FutureSociety.playerFSNames.filter(fs => !(fs in fsAllowed) || fsAllowed[fs]());
- const terrainTypes = ["marine", "marine", "oceanic", "ravine", "rural", "rural", "rural", "urban", "urban"];
- const continents = ["Africa", "Asia", "Asia", "Australia", "Western Europe", "Southern Europe", "Central Europe", "Eastern Europe", "Scandinavia", "Japan", "North America", "North America", "South America", "the Middle East"];
- const races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"];
let targets = 4;
if (V.PC.career === "arcology owner") {
@@ -16,26 +14,21 @@ App.Intro.generateEstablishedArcologies = function() {
}
/* generation */
- const fragment = document.createDocumentFragment();
+ const div = document.createElement("div");
for (let i = 0; i < targets; i++) {
- fragment.append(arcologyCard());
+ div.append(arcologyCard());
}
- return fragment;
+ return div;
function arcologyCard() {
- const arcology = generateArcology();
const div = document.createElement("div");
- div.classList.add("card");
-
- div.append(App.UI.DOM.passageLink(arcology.name, "Intro Summary", () => {
- V.targetArcology = arcology;
- V.terrain = arcology.terrain;
- V.continent = arcology.continent;
- V.language = arcology.language;
- arcology.apply();
- }));
+ const arcology = generateArcology();
- div.append(" is an established arcology located in a Free City ");
+ div.classList.add("card");
+ div.append(
+ App.UI.DOM.makeElement("span", inIntro ? App.UI.DOM.passageLink(arcology.name, "Intro Summary", () => acceptArcology()) : arcology.name, ['bold']),
+ ` is an established arcology located in a Free City `,
+ );
if (arcology.terrain === "urban") {
div.append(`carved out of an urban area of ${arcology.continent}.`);
} else if (arcology.terrain === "rural") {
@@ -134,7 +127,7 @@ App.Intro.generateEstablishedArcologies = function() {
innerDiv.append(App.UI.DOM.makeElement("span", `Neo-Imperialism,`, ["intro", "question"]), " adopting old world customs and remodeling them under an absolutist Imperial fist.");
break;
case "FSAztecRevivalist":
- innerDiv.append(App.UI.DOM.makeElement("span", `Aztec Revivalism,`, ["intro", "question"]), " which aspires to reach the heights of the Aztec Empire at it's peak.");
+ innerDiv.append(App.UI.DOM.makeElement("span", `Aztec Revivalism,`, ["intro", "question"]), " which aspires to reach the heights of the Aztec Empire at its peak.");
innerDiv.append(App.UI.DOM.makeElement("div", "It has an established lingua franca: Nahuatl."));
break;
case "FSEgyptianRevivalist":
@@ -177,9 +170,83 @@ App.Intro.generateEstablishedArcologies = function() {
default:
innerDiv.append(App.UI.DOM.makeElement("span", `Multiculturalism,`, ["intro", "question"]), " a celebration of the total liberty that was the original purpose of the Free Cities.");
}
- div.append(innerDiv);
- div.append(App.UI.DOM.makeElement("span", arcology.building.render(), "intro"));
+
+ div.append(
+ innerDiv,
+ App.UI.DOM.makeElement("div", arcology.building.render(), ["intro"]),
+ );
+
+ if (!inIntro) {
+ // for some reason we put the acquisition link at the bottom instead of the top when moving arcologies
+ const sectionPrice = {
+ "spire": 2_500_000,
+ "penthouse": 10_000_000,
+ "shops": 1_000_000,
+ "fountain": 5_000_000,
+ "apartments": 500_000,
+ "markets": 250_000,
+ "ravine-markets": 250_000,
+ "manufacturing": 100_000,
+ };
+ const rows = (/** @type {App.Arcology.Section} */ section) => section.rows
+ .reduce((acc, cur) => acc + cur.length * sectionPrice[section.id], 0);
+ const price = arcology.building.sections.reduce((acc, cur) => acc + rows(cur), 10_000_000) || 25_000_000; // base price of ¤10,000,000
+
+ div.append(App.UI.DOM.makeElement("div", makePurchase(`Purchase ${arcology.name}`, price, "capEx", {
+ handler: () => {
+ acceptArcology();
+ updatePlayerArcology();
+ Engine.play("Main");
+ },
+ prereqs: [
+ [
+ V.rival.state === 0 || V.rival.state > 2,
+ `Your inter-arcology war is preventing you from leaving ${V.arcologies[0].name}.`
+ ],
+ [
+ V.daughtersVictory !== 1,
+ `You cannot leave ${V.arcologies[0].name} behind while the Daughters of Liberty are still a threat.`
+ ],
+ ],
+ }), ['center']));
+ }
+
return div;
+
+ function acceptArcology() {
+ V.targetArcology = arcology;
+ V.terrain = arcology.terrain;
+ V.continent = arcology.continent;
+ V.language = arcology.language;
+ V.building = arcology.building;
+
+ arcology.apply();
+ }
+
+ function updatePlayerArcology() {
+ V.arcologies[0].name = arcology.name;
+ V.arcologies[0].weeks = 1;
+
+ V.weatherCladding = 0;
+ V.rep = 0;
+ if (V.secExpEnabled && V.SecExp.core) {
+ V.SecExp.core.authority = 0;
+ }
+
+ updateFS();
+ }
+
+ function updateFS() {
+ const {fs} = arcology;
+
+ App.Data.FutureSociety.fsNames.forEach(f => {
+ FutureSocieties.remove(f);
+ });
+
+ if (fs) {
+ V.arcologies[0][fs] = arcology.FSProgress;
+ }
+ }
}
function generateArcology() {
@@ -189,8 +256,8 @@ App.Intro.generateEstablishedArcologies = function() {
arcology.FSProgress = either(10, 30, 50);
arcology.prosperity = either(40, 50, 60);
arcology.citizens = random(-1, 1);
- arcology.terrain = terrainTypes.random();
- arcology.continent = continents.random();
+ arcology.terrain = App.Data.Arcology.Terrain.random();
+ arcology.continent = App.Data.Arcology.Continents.random();
arcology.language = getLanguage();
const env = {terrain: arcology.terrain, established: true, fs: arcology.fs};
@@ -203,7 +270,7 @@ App.Intro.generateEstablishedArcologies = function() {
function getFS() {
const type = allowedFS.pluck();
if (type === "FSSupremacist" || type === "FSSubjugationist") {
- arcology.race = races.random();
+ arcology.race = App.Data.Slave.Races.random();
}
return type;
}
diff --git a/src/events/intro/customizeSlaveTrade.js b/src/events/intro/customizeSlaveTrade.js
index fc381fb63760d45e4447fc3fd8a32e2af8fac9de..145609c8029afaf90ea424f61f79c5ea88473b6f 100644
--- a/src/events/intro/customizeSlaveTrade.js
+++ b/src/events/intro/customizeSlaveTrade.js
@@ -368,14 +368,24 @@ App.Intro.CustomSlaveTrade = function() {
function generatePresetLinks(group) {
let links = [];
for (const [name, nationalities] of App.Data.NationalityPresets[group]) {
- links.push(
- App.UI.DOM.link(
- name,
- () => {
- V.nationalities = clone(nationalities);
- refresh();
+ const span = document.createElement("span");
+ links.push(span);
+ span.append(
+ App.UI.DOM.link(name, () => {
+ V.nationalities = clone(nationalities);
+ refresh();
+ }),
+ " ",
+ App.UI.DOM.link("[+]", () => {
+ for (const nat in nationalities) {
+ if (V.nationalities.hasOwnProperty(nat)) {
+ V.nationalities[nat] += nationalities[nat];
+ } else {
+ V.nationalities[nat] = nationalities[nat];
+ }
}
- )
+ refresh();
+ }),
);
}
return App.UI.DOM.generateLinksStrip(links);
@@ -390,12 +400,17 @@ App.UI.nationalitiesDisplay = function() {
/* Generates cloned array of V.nationalities, removing duplicates and then sorting */
const nationalitiesCheck = App.UI.nationalitiesCheck();
+ const nationalities = [];
+ for (const nat in nationalitiesCheck) {
+ nationalities.push(nat);
+ }
+ nationalities.sort((a, b) => nationalitiesCheck[b] - nationalitiesCheck[a]);
/* Prints distribution of V.nationalities, using nationalitiesCheck to render array */
let percentPerPoint = 100.0 / hashSum(V.nationalities);
let len = Object.keys(nationalitiesCheck).length;
let j = 0;
- for (const nation in nationalitiesCheck) {
+ for (const nation of nationalities) {
const span = document.createElement("span");
span.append(`${nation} `);
App.UI.DOM.appendNewElement("span", span, (V.nationalities[nation] * percentPerPoint).toFixed(2), "orange");
diff --git a/src/events/intro/initNationalities.js b/src/events/intro/initNationalities.js
index 4ddc3e8ef7d462bbc5cb61fffdbda0a69d38f41f..3cde7bf881b3f4e0c32ab2cd6595bd21f80a1125 100644
--- a/src/events/intro/initNationalities.js
+++ b/src/events/intro/initNationalities.js
@@ -230,7 +230,8 @@ App.Intro.initNationalities = function() {
FSPetiteAdmirationResearch: 0,
FSStatuesqueGlorificationResearch: 0,
FSCummunismResearch: 0,
- FSIncestFetishistResearch: 0
+ FSIncestFetishistResearch: 0,
+ weeks: 0,
};
if (i === 0) {
newArcology.direction = 0;
@@ -333,6 +334,7 @@ App.Intro.initNationalities = function() {
V.arcologies[0].FSMaturityPreferentialistSMR = 0;
V.arcologies[0].FSSlimnessEnthusiastSMR = 0;
V.arcologies[0].FSSlimnessEnthusiastLaw = 0;
+ V.arcologies[0].FSSlimnessEnthusiastFoodLaw = 0;
V.arcologies[0].FSAssetExpansionistSMR = 0;
V.arcologies[0].FSPastoralistLaw = 0;
V.arcologies[0].FSPastoralistSMR = 0;
@@ -340,6 +342,7 @@ App.Intro.initNationalities = function() {
V.arcologies[0].FSPhysicalIdealistLaw = 0;
V.arcologies[0].FSPhysicalIdealistStrongFat = 0;
V.arcologies[0].FSChattelReligionistLaw = 0;
+ V.arcologies[0].FSChattelReligionistLaw2 = 0;
V.arcologies[0].FSChattelReligionistSMR = 0;
V.arcologies[0].FSChattelReligionistCreed = 0;
V.arcologies[0].FSRomanRevivalistLaw = 0;
@@ -422,7 +425,7 @@ App.Intro.initNationalities = function() {
const random12 = jsRandomMany(sellable, 12);
random12.forEach(cell => { cell.owner = 0; });
- App.Mods.SecExp.generalInit();
+ App.Mods.SecExp.Obj.Init();
if (V.localEcon > 100) {
V.mods.food.cost = Math.max(5 / (1 + (Math.trunc(1000-100000/V.localEcon)/10)/100), 3.125);
diff --git a/src/events/intro/introSummary.js b/src/events/intro/introSummary.js
index c4d10c54f608e19f2c98417680d56a16171dac2c..9528b40b147f3120d8c83f09b144721740a54090 100644
--- a/src/events/intro/introSummary.js
+++ b/src/events/intro/introSummary.js
@@ -17,11 +17,10 @@ App.Intro.summary = function() {
let minAge = V.minimumSlaveAge;
let maxAge = V.retirementAge - 1 > 60 ? 60 : V.retirementAge - 1;
let defaultAge = 18;
- if(V.targetArcology.fs === "FSMaturityPreferentialist") {
+ if (V.targetArcology.fs === "FSMaturityPreferentialist") {
minAge = 30;
defaultAge = 30;
- }
- else if(V.targetArcology.fs === "FSYouthPreferentialist") {
+ } else if (V.targetArcology.fs === "FSYouthPreferentialist") {
maxAge = 29;
}
V.idealAge = variableAsNumber(V.idealAge, minAge, maxAge, defaultAge);
@@ -35,6 +34,7 @@ App.Intro.summary = function() {
V.PC.origRace = V.PC.race;
V.PC.origSkin = V.PC.skin;
V.PC.origHColor = V.PC.hColor;
+ V.PC.eyebrowHColor = V.PC.hColor;
}
const tabBar = new App.UI.Tabs.TabBar("IntroSummary");
@@ -184,6 +184,7 @@ App.Intro.summary = function() {
case "medicine":
V.PC.skill.medicine = 100;
V.PC.muscles = 0;
+ V.consumerDrugs = 1;
break;
case "medical assistant":
V.PC.intelligenceImplant = 15;
@@ -305,6 +306,8 @@ App.Intro.summary = function() {
}
if (V.PC.vagina >= 0) {
V.PC.geneticQuirks.fertility = 2;
+ } else {
+ V.PC.geneticQuirks.fertility = 1;
}
V.PC.skill.trading = -100;
V.PC.skill.warfare = -100;
@@ -313,7 +316,6 @@ App.Intro.summary = function() {
V.PC.skill.medicine = -100;
V.PC.skill.hacking = -100;
V.PC.muscles = 0;
- V.PC.geneticQuirks.fertility = 1;
V.PC.digestiveSystem = "atrophied";
break;
case "handmaiden":
@@ -324,6 +326,8 @@ App.Intro.summary = function() {
}
if (V.PC.vagina >= 0) {
V.PC.geneticQuirks.fertility = 2;
+ } else {
+ V.PC.geneticQuirks.fertility = 1;
}
V.PC.skill.trading = -100;
V.PC.skill.warfare = -100;
@@ -343,6 +347,8 @@ App.Intro.summary = function() {
}
if (V.PC.vagina >= 0) {
V.PC.geneticQuirks.fertility = 2;
+ } else {
+ V.PC.geneticQuirks.fertility = 1;
}
V.PC.skill.trading = -100;
V.PC.skill.warfare = -100;
@@ -383,6 +389,32 @@ App.Intro.summary = function() {
V.PC.skill.medicine = -100;
V.PC.skill.hacking = -100;
break;
+ case "test subject":
+ V.PC.intelligenceImplant = 0;
+ V.PC.skill.trading = -100;
+ V.PC.skill.warfare = -100;
+ V.PC.skill.slaving = -100;
+ V.PC.skill.engineering = -100;
+ V.PC.skill.medicine = -100;
+ V.PC.skill.hacking = -100;
+ V.PC.muscles = -100;
+ V.PC.boobs = 50000;
+ V.PC.lactation = 1;
+ V.PC.lactationAdaptation = 100;
+ if (V.PC.pubertyXX === 1) {
+ V.PC.pregType = 100;
+ V.PC.preg = 27;
+ } else {
+ V.PC.bellyImplant = 800000;
+ }
+ V.PC.pregAdaptation = 200;
+ V.PC.hips = 3;
+ V.PC.butt = 20;
+ V.PC.dick = 50;
+ V.PC.balls = 100;
+ V.PC.weight = 200;
+ V.PC.digestiveSystem = "atrophied";
+ break;
}
if (V.PC.rumor === "diligence") {
V.PC.weight = 0;
@@ -459,6 +491,7 @@ App.Intro.summary = function() {
if (V.PC.pubertyXY === 1 && V.PC.physicalAge < V.PC.pubertyAgeXY) {
V.PC.pubertyAgeXY = 8;
}
+ V.genePool.push(clone(V.PC));
}
V.PC.birthName = V.PC.slaveName;
@@ -595,6 +628,9 @@ App.Intro.summary = function() {
}
V.PC.birthName = V.PC.slaveName;
V.PC.birthSurname = V.PC.slaveSurname;
+ if (V.freshPC === 1 || V.saveImported === 0) {
+ V.genePool.push(clone(V.PC));
+ }
App.Intro.initNationalities();
},
[],
@@ -717,7 +753,7 @@ App.Intro.summary = function() {
.addValue("Loli mode", 1, () => V.minimumSlaveAge = 5).addValue("Normal mode", 0);
V.minimumSlaveAge = Math.clamp(V.minimumSlaveAge, 3, 18);
- options.addOption("Girls appearing in the game will be no younger than", "minimumSlaveAge").showTextBox();
+ options.addOption("Slaves appearing in the game will be no younger than", "minimumSlaveAge").showTextBox();
options.addOption(`Molestation of slaves younger than ${V.minimumSlaveAge} is`, "extremeUnderage")
.addValue("Permitted", 1).on().addValue("Forbidden", 0).off();
@@ -731,10 +767,10 @@ App.Intro.summary = function() {
.addComment("Perceived beauty will decrease the farther (younger or older) one's appearance is from the ideal.").showTextBox();
V.fertilityAge = Math.clamp(V.fertilityAge, 3, 18);
- options.addOption("Girls will not be able to become pregnant if their age is under", "fertilityAge").showTextBox();
+ options.addOption("Slaves will not be able to become pregnant if their age is under", "fertilityAge").showTextBox();
V.potencyAge = Math.clamp(V.potencyAge, 3, 18);
- options.addOption("Girls will not be able to impregnate others if their age is under", "potencyAge").showTextBox();
+ options.addOption("Slaves will not be able to impregnate others if their age is under", "potencyAge").showTextBox();
options.addOption("Age penalties are", "AgePenalty").addComment("Job and career penalties due to age.")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off();
@@ -775,7 +811,7 @@ App.Intro.economy = function(isIntro) {
.addValue("Vanilla", 0, () => V.difficultySwitch = 0)
.addValue("Easy", 1, () => V.difficultySwitch = 1)
.addValue("Default", 2, () => V.difficultySwitch = 1)
- .addValue("Hard", 3, () => V.difficultySwitch = 1);
+ .addValue("Hard", 4, () => V.difficultySwitch = 1);
/* Not functional yet
All the things you need to run your arcology are getting more expensive
diff --git a/src/events/intro/newGamePlusPassage.js b/src/events/intro/newGamePlusPassage.js
index a7fa901b07841b53d50a7baac81df3290ef671e6..f2b27c4f23d9903b776116f85fa32c0a1e262123 100644
--- a/src/events/intro/newGamePlusPassage.js
+++ b/src/events/intro/newGamePlusPassage.js
@@ -1,9 +1,7 @@
App.Intro.newGamePlus = function() {
const node = new DocumentFragment();
V.ui = "start";
- if (!V.hasOwnProperty("slavesToImportMax")) {
- V.slavesToImportMax = 5;
- }
+ V.slavesToImportMax = V.slavesToImportMax || 5;
const fee = 50000 + (V.slavesToImportMax * 10000);
setupLastWeeksCash();
@@ -13,13 +11,9 @@ App.Intro.newGamePlus = function() {
if (V.cash >= fee) {
App.Events.addNode(node, [`You have allocated funds to bring up to ${V.slavesToImportMax} slaves with you (or your equivalent) to a new arcology. It will cost <span class="yellowgreen">${cashFormat(fee)}</span> to ensure another slave's safe transfer. You have <span class="yellowgreen">${cashFormat(V.cash)}</span> to spend.`], "div");
- App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
- "Increase slave import capacity by 1.",
- () => {
- cashX(forceNeg(fee), "capEx");
- V.slavesToImportMax++;
- App.UI.reload();
- }
+ App.UI.DOM.appendNewElement("div", node, makePurchase(
+ "Increase slave import capacity by 1.", fee, "capEx",
+ {handler: () => { V.slavesToImportMax++; }}
));
} else {
App.Events.addNode(node, [`You lack the <span class="yellowgreen">${cashFormat(fee)}</span> needed to bring any more than ${V.slavesToImportMax} slaves with you (or your equivalent) to a new arcology.`], "div");
@@ -37,7 +31,7 @@ App.Intro.newGamePlus = function() {
`An eye for gingered slaves.`,
`An edge in all things data.`
]) {
- App.UI.DOM.appendNewElement("div", node, text, "lime");
+ App.UI.DOM.appendNewElement("div", node, text, ["lime"]);
}
V.oldCareer = V.PC.career;
if (V.retainCareer === 1) {
diff --git a/src/events/intro/pcAppearance.js b/src/events/intro/pcAppearance.js
index bee834922d9428f2559b46044a05a97faf55c317..11c2862ec7920564bd698a26eb3038f3b9518efa 100644
--- a/src/events/intro/pcAppearance.js
+++ b/src/events/intro/pcAppearance.js
@@ -7,11 +7,11 @@ App.UI.Player.appearance = function(options, summary = false) {
.addValueList(App.Data.misc.baseNationalities)
.addComment("For best result capitalize it.").pulldown();
- options.addOption("Your race is", "race", V.PC).showTextBox()
+ options.addOption(`Your current ethnicity is`, "race", V.PC).showTextBox()
.addValueList(Array.from(App.Data.misc.filterRaces, (k => [k[1], k[0]])));
if (V.cheatMode) {
- options.addOption("Your race is", "origRace", V.PC).showTextBox()
+ options.addOption("Your original ethnicity is", "origRace", V.PC).showTextBox()
.addValueList(Array.from(App.Data.misc.filterRaces, (k => [k[1], k[0]])));
}
@@ -28,7 +28,7 @@ App.UI.Player.appearance = function(options, summary = false) {
option = options.addCustomOption()
.addButton(
"Make average",
- () => resyncSlaveHight(V.PC),
+ () => resyncSlaveHeight(V.PC),
""
);
@@ -101,6 +101,9 @@ App.UI.Player.appearance = function(options, summary = false) {
option.addValue("Very broad", 2);
}
+ options.addOption(`Your armpits`, "underArmHStyle", V.PC)
+ .addValueList([["Are naturally hairless", "hairless"], ["Can grow hair", "neat"]]);
+
if (V.PC.boobs >= 200 || summary) {
if (V.PC.title === 1 && V.PC.boobs <= 200) {
option = options.addOption("Your chest is", "boobs", V.PC).addValue("Manly", 200, () => { V.PC.boobsImplant = 0; V.PC.boobsImplantType = "none"; });
@@ -246,7 +249,7 @@ App.UI.Player.appearance = function(options, summary = false) {
if (V.PC.physicalAge < 14) {
options.addOption("You are", "pubertyXY", V.PC)
.addValueList([["Not producing potent sperm yet", 0], ["Producing potent sperm", 1]]);
- }
+ }
if (V.PC.pubertyXY === 1) {
options.addOption("You went through puberty when you were", "pubertyAgeXY", V.PC).showTextBox({unit: "years old."});
}
@@ -266,10 +269,13 @@ App.UI.Player.appearance = function(options, summary = false) {
}
}
if (V.PC.pubertyXX === 1) {
- options.addOption("You went through puberty when you were", "pubertyAgeXX", V.PC).showTextBox({unit: "years old."});
+ options.addOption(`You ${V.PC.pubertyXY === 1 ? "had your first period" : "went through puberty"} when you were`, "pubertyAgeXX", V.PC).showTextBox({unit: "years old."});
}
}
+ options.addOption(`You`, "pubicHStyle", V.PC)
+ .addValueList([["Are naturally hairless", "hairless"], ["Can grow pubic hair", "neat"]]);
+
options.addOption("You are", "anus", V.PC)
.addValueList([["An anal virgin", 0], ["Not an anal virgin", 1]]);
@@ -417,7 +423,7 @@ App.UI.Player.assignCareerByAge = function(selection) {
career = selection;
} else {
for (const data of App.Data.player.career.values()) {
- if (Object.values(data).includes(V.PC.career)) {
+ if (Object.values(data).includes(selection)) {
if (V.PC.actualAge <= 13) {
career = data.child;
} else if (V.PC.actualAge <= 21) {
@@ -519,7 +525,7 @@ App.UI.Player.design = function() {
if (V.PC.title === 1) {
r.push(`masculine <strong>Master</strong>`);
} else {
- r.push(`feminine ''Mistress'`);
+ r.push(`feminine <strong>Mistress</strong>`);
}
r.push(`and everyone that matters calls you ${PlayerName()}.`);
@@ -638,6 +644,7 @@ App.UI.Player.design = function() {
// History
if (allowEdits) {
option = options.addOption("Before you came to the Free Cities, you were a", "career", V.PC);
+ // option.addValue("Test subject", "test subject");
if (V.PC.career === "arcology owner") {
option.addValue("Arcology owner", "arcology owner");
} else {
@@ -1214,13 +1221,7 @@ App.UI.Player.design = function() {
options.addOption(`Sexual Energy`, "sexualEnergy", V.PC).showTextBox();
options.addOption(`Cum Tap`, "cumTap", V.PC.skill).showTextBox();
options.addOption(`Stored Cum`, "storedCum", V.PC.counter).showTextBox();
- options.addOption(`Fertility Drugs`, "fertDrugs", V.PC)
- .addValue("Yes", 1).on()
- .addValue("No", 0).off();
options.addOption(`Forced Fertility Drugs`, "forcedFertDrugs", V.PC).showTextBox();
- options.addOption(`Stamina Pills`, "staminaPills", V.PC)
- .addValue("Yes", 1).on()
- .addValue("No", 0).off();
el.append(options.render());
}
diff --git a/src/events/intro/pcExperienceIntro.js b/src/events/intro/pcExperienceIntro.js
index f8bf09ef3ffbe8803f5e1d0ee43a29a8c51a3196..fee4ed27ccceeed1f31a5073a374f7a65bb9997f 100644
--- a/src/events/intro/pcExperienceIntro.js
+++ b/src/events/intro/pcExperienceIntro.js
@@ -1,5 +1,4 @@
App.Intro.PCExperienceIntro = function() {
- // :: PC Experience Intro [nobr]
const node = new DocumentFragment();
V.showSecExp = V.showSecExp || 0;
@@ -61,14 +60,14 @@ App.Intro.PCExperienceIntro = function() {
makeOption(
"Sex industry", "escort",
App.Events.makeNode([
- `As an ex-whore, you will find it <span class="red">hard to maintain reputation</span>${(V.showSecExp === 1) ? `, <span class="red">in addition to authority</span>` : ``}.`,
+ `As an ex-whore, you will find it <span class="red">hard to maintain reputation${(V.showSecExp === 1) ? `, in addition to authority` : ``}.</span>`,
`Your starting slaves will have a free level of <span class="cyan">sex skills</span> available, along with a free level of <span class="cyan">entertainment and prostitution.</span>`])
);
makeOption(
"Servant", "servant",
App.Events.makeNode([
- `As an ex-servant, you will find it <span class="red">hard to maintain reputation</span>${(V.showSecExp === 1) ? `, <span class="red">in addition to authority</span>` : ``}.`, `You know how to <span class="cash inc">lower your upkeep,</span> but <span class="red">not much else.</span> Your starting slaves will have free <span class="mediumaquamarine">trust</span> and <span class="hotpink">devotion.</span>`
+ `As an ex-servant, you will find it <span class="red">hard to maintain reputation${(V.showSecExp === 1) ? `, in addition to authority` : ``}.</span>`, `You know how to <span class="cash inc">lower your upkeep,</span> but <span class="red">not much else.</span> Your starting slaves will have free <span class="mediumaquamarine">trust</span> and <span class="hotpink">devotion.</span>`
])
);
diff --git a/src/events/intro/pcRumorIntro.js b/src/events/intro/pcRumorIntro.js
index a9d29db217e28ca9006a6cb1af05377bb958747b..ce59b6e765fcb036b1ecd78dc218dba1e922bcd4 100644
--- a/src/events/intro/pcRumorIntro.js
+++ b/src/events/intro/pcRumorIntro.js
@@ -1,5 +1,4 @@
App.Intro.PCRumorIntro = function() {
- // :: PC Experience Intro [nobr]
const node = new DocumentFragment();
delete V.showSecExp;
diff --git a/src/events/intro/takeoverTarget.js b/src/events/intro/takeoverTarget.js
index ae52407a0cde46d8da4457b2195fec3ee10056c5..17dbfb2b757691fb433156ccb8c4da63faf24987 100644
--- a/src/events/intro/takeoverTarget.js
+++ b/src/events/intro/takeoverTarget.js
@@ -1,7 +1,21 @@
App.Intro.takeoverTarget = function() {
- // :: Takeover Target [nobr]
+ const slavesImported = V.slaves.filter(s => s.newGamePlus === 1);
+ if (slavesImported.length > 0) {
+ V.retirementAge = Math.max(V.retirementAge, _.max(slavesImported.map(s => s.actualAge)) + 2);
+ const highestActualAge = _.max(slavesImported.map(s => s.actualAge));
+ const highestPhysicalAge = _.max(slavesImported.map(s => s.physicalAge));
+ if (highestActualAge > 65) {
+ V.retirementAge = highestPhysicalAge + 2;
+ V.policies.retirement.physicalAgePolicy = 1;
+ if (highestPhysicalAge > 65) {
+ V.retirementAge = highestActualAge + 2;
+ V.policies.retirement.physicalAgePolicy = 0;
+ }
+ }
+ }
const node = new DocumentFragment();
- let r = [];
+ const r = [];
+
r.push(`Before you deploy the`);
if (V.PC.rumor === "wealth") {
r.push(`financial reserves that`);
@@ -9,7 +23,8 @@ App.Intro.takeoverTarget = function() {
r.push(`carefully constructed plan that`);
} else if (V.PC.rumor === "force") {
r.push(`mercenaries and`);
- if (V.continent === "Eastern Europe") { // maskirovka//
+ if (V.continent === "Eastern Europe") {
+ r.push(`maskirovka`);
} else {
r.push(`cover plan`);
}
@@ -40,7 +55,7 @@ App.Intro.takeoverTarget = function() {
r.push(App.UI.DOM.makeElement("div", `Which arcology will you target?`, ["intro", "question"]));
App.Events.addParagraph(node, r);
- const card = App.UI.DOM.appendNewElement("div", node, null, "card");
+ const card = App.UI.DOM.appendNewElement("div", node, null, ["card"]);
card.append(App.UI.DOM.passageLink(
"A newly constructed arcology",
"Terrain Intro",
@@ -49,6 +64,6 @@ App.Intro.takeoverTarget = function() {
App.UI.DOM.appendNewElement("div", card, `With many new arcologies being constructed, you will be able to select which area of the world and type of Free City you'd like your target arcology to be located in.`, ["indent", "note"]);
App.UI.DOM.appendNewElement("div", card, `Recommended for new players.`, ["indent", "note"]);
- node.append(App.Intro.generateEstablishedArcologies());
+ node.append(App.Intro.generateEstablishedArcologies(true));
return node;
};
diff --git a/src/events/intro/terrainIntro.js b/src/events/intro/terrainIntro.js
index bccd6131a31fcc8c73942d6243621861e070c10d..24aa9d9336e3a8af10c5ba80c04949376f2ccbc9 100644
--- a/src/events/intro/terrainIntro.js
+++ b/src/events/intro/terrainIntro.js
@@ -11,7 +11,6 @@
*/
App.Intro.terrainIntro = function() {
- // :: Terrain Intro [nobr]
const node = new DocumentFragment();
App.Events.addParagraph(node, [`The Free Cities are located wherever the rule of law is weak enough or permissive enough to allow a small area to secede, and where founders can afford to buy an area on which to build.`]);
diff --git a/src/events/nonRandom/daughters/pBombing.js b/src/events/nonRandom/daughters/pBombing.js
index 4527f383f25a15374d90fb23a2221648672f06ae..8020a3be723e54c525bf017615b0c1d9875e7c9f 100644
--- a/src/events/nonRandom/daughters/pBombing.js
+++ b/src/events/nonRandom/daughters/pBombing.js
@@ -61,7 +61,7 @@ App.Events.PBombing = class PBombing extends App.Events.BaseEvent {
cashX(-1000, "event", S.Bodyguard);
repX(2500, "event", S.Bodyguard);
V.arcologies[0].prosperity += 1;
- } else if (S.Bodyguard.skill.combat > 0) {
+ } else if (S.Bodyguard.skill.combat > 30) {
r.push(`${S.Bodyguard.slaveName} glances at you to check that ${his} principal is alive for the moment, already`);
if ((S.Bodyguard.muscles + S.Bodyguard.height - 100) / 25 > 5) {
r.push(`getting ${his} light machine gun into action. Since they're so close, ${he} doesn't even bother to shoulder the weapon, simply using ${his} weapon's firepower to dump rounds into each attacker.`);
diff --git a/src/events/nonRandom/daughters/pHackerSupport.js b/src/events/nonRandom/daughters/pHackerSupport.js
index 369e49e690b7135f9c704c647a0b7e77a0b78dcf..2ff435db54351bb49fa4fed475854f1984bd1898 100644
--- a/src/events/nonRandom/daughters/pHackerSupport.js
+++ b/src/events/nonRandom/daughters/pHackerSupport.js
@@ -7,7 +7,7 @@ App.Events.PHackerSupport = class PHackerSupport extends App.Events.BaseEvent {
V.fcnn.push("...the Daughters of Liberty as 'cyberterrorists', after an attempted...");
- r.push(`While you are reviewing your information security posture in light of the Daughters of Liberty and their apparent ability to get into your systems, you receive yet another well-secured message unannounced. To your surprise, it isn't the Daughters. It's a video call from a rather interesting individual. She is quite pretty, and has a variety of facial tattoos and piercings; her face is androgynous enough that you aren't entirely sure what gender (probably) she considers herself. Her pale skin is illuminated by the diffuse glow from what's clearly a huge bank of monitors, and the clacking sound of a traditional mechanical keyboard can be heard over the line.`);
+ r.push(`While you are reviewing your information security posture in light of the Daughters of Liberty and their apparent ability to get into your systems, you receive yet another well-secured message unannounced. To your surprise, it isn't the Daughters. It's a video call from a rather interesting individual. She is quite pretty, and has a variety of facial tattoos and piercings; her face is androgynous enough that you aren't entirely sure what gender she (probably) considers herself. Her pale skin is illuminated by the diffuse glow from what's clearly a huge bank of monitors, and the clacking sound of a traditional mechanical keyboard can be heard over the line.`);
App.Events.addParagraph(node, r);
r = [];
@@ -172,7 +172,7 @@ App.Events.PHackerSupport = class PHackerSupport extends App.Events.BaseEvent {
case "angel":
r.push(`She seems to have left a present for your poor personal assistant; ${hisA} little angel avatar is visible in the bottom corner of a screen on the wall opposite you. ${HisA} virginity is being forcibly taken by a representation of the hacker in the same style. ${HeA} pleads for them to stop before ${heA} falls, but it goes unheeded. ${HeA} cries out in orgasm as the hacker unloads their corrupting jism deep into ${hisA} womb before pulling out and letting ${himA} drop to the ground. ${HeA} rolls from side to side in anguish,`);
if (V.seePreg !== 0) {
- r.push(`gripping ${hisA} cum filled belly as it rounds more and more, before settling on ${hisA} back and cradling ${hisA} now full-term pregnancy. As it continues to grow, ${hisA} body becomes increasingly withered, until ${heA} appears to be pregnant with a fully grown person.`);
+ r.push(`gripping ${hisA} cum-filled belly as it rounds more and more, before settling on ${hisA} back and cradling ${hisA} now full-term pregnancy. As it continues to grow, ${hisA} body becomes increasingly withered, until ${heA} appears to be pregnant with a fully grown person.`);
if (V.seeExtreme === 1) {
r.push(`As the light fades from ${himA}, ${hisA} gravid belly begins to shudder violently, its occupant trying to tear its way free. Before long, it splits open, revealing a gorgeous ${womanA} with all the features of the fallen angel. ${V.assistant.name} spreads ${hisA} bat-like wings as ${heA} rises from the disintegrating remains of ${hisA} once holy body, turns to you, and sensually traces ${hisA} new curves seductively.`);
} else {
diff --git a/src/events/nonRandom/daughters/pUndergroundRailroad.js b/src/events/nonRandom/daughters/pUndergroundRailroad.js
index adffa438b3c93839ea31129dcc695722887f81f2..1636009b2dd0cc9d2f8c236b91bf2f42ccfd362f 100644
--- a/src/events/nonRandom/daughters/pUndergroundRailroad.js
+++ b/src/events/nonRandom/daughters/pUndergroundRailroad.js
@@ -191,8 +191,8 @@ App.Events.PUndergroundRailroad = class PUndergroundRailroad extends App.Events.
} else {
r.push(`shakily gestures an apology, and admits that ${he} does.`);
}
- App.Events.addParagraph(node, r);
}
+ App.Events.addParagraph(node, r);
const responses = [
new App.Events.Result(`Free ${him}`, free),
@@ -218,7 +218,7 @@ App.Events.PUndergroundRailroad = class PUndergroundRailroad extends App.Events.
// The order of qualities does not matter.
const qualities = [
(s) => s.fuckdoll === 0,
- (s) => s.fetish !== "mindbroken",
+ (s) => s.fetish !== Fetish.MINDBROKEN,
(s) => canWalk(s),
(s) => canTalk(s),
(s) => canSee(s),
@@ -320,9 +320,9 @@ App.Events.PUndergroundRailroad = class PUndergroundRailroad extends App.Events.
V.traitor.sisters = 0;
V.traitor.daughters = 0;
if (V.traitor.bodySwap > 0) {
- const myBody = V.slaves.findIndex(function(s) { return s.origBodyOwnerID === V.traitor.ID; });
- if (myBody !== -1) {
- V.traitorStats.traitorBody = V.slaves[myBody].ID;
+ const myBody = V.slaves.find(s => s.origBodyOwnerID === traitor.ID);
+ if (myBody) {
+ V.traitorStats.traitorBody = myBody.ID;
}
}
removeSlave(traitor);
diff --git a/src/events/nonRandom/mercs/pMercenaryRomeo.js b/src/events/nonRandom/mercs/pMercenaryRomeo.js
index 6bb287d1bee51291f2da92d1f3006e15b657745e..f9d40a0de8de27eadd04b1b1864c69d9962f7055 100644
--- a/src/events/nonRandom/mercs/pMercenaryRomeo.js
+++ b/src/events/nonRandom/mercs/pMercenaryRomeo.js
@@ -12,7 +12,7 @@ App.Events.PMercenaryRomeo = class PMercenaryRomeo extends App.Events.BaseEvent
this.actors = [];
const juliet =
// first try - find an available sex worker
- V.slaves.filter(s => s.fetish !== "mindbroken" && s.fuckdoll === 0 && ["serve in the club", "serve the public", "whore", "work in the brothel"].includes(s.assignment)).random() ||
+ V.slaves.filter(s => s.fetish !== Fetish.MINDBROKEN && s.fuckdoll === 0 && ["serve in the club", "serve the public", "whore", "work in the brothel"].includes(s.assignment)).random() ||
// second try - find a slave who had public exposure and is hopefully not important to the PC personally
V.slaves.filter(s => (s.counter.publicUse > 0) && (s.newGamePlus === 0) && (s.relationship > -3) && !["be your Concubine", "serve in the master suite"].includes(s.assignment)).random();
if (juliet) {
@@ -81,7 +81,7 @@ App.Events.PMercenaryRomeo = class PMercenaryRomeo extends App.Events.BaseEvent
function declinePolitely() {
let r = [];
r.push(`"Ah well," he says, "didn't think you would, but I had to ask. If you'd be so kind as to keep ${him} assigned so's I can see ${him}, I would be grateful. That was a fine victory, ${properTitle()}; come down to the bar and join the boys and I. We'll buy you a drink. Devil knows, thanks to you we can afford to."`);
- if (juliet.relationship === -3 && juliet.fetish !== "mindbroken" && juliet.devotion + juliet.trust > 190) {
+ if (juliet.relationship === -3 && juliet.fetish !== Fetish.MINDBROKEN && juliet.devotion + juliet.trust > 190) {
r.push(`${juliet.slaveName} politely thanks you for not letting him take ${him} away.`);
}
return r;
@@ -90,7 +90,7 @@ App.Events.PMercenaryRomeo = class PMercenaryRomeo extends App.Events.BaseEvent
function accept() {
let r = [];
r.push(`The mercenary leaves to collect his purchase. On the video feeds, you see that ${juliet.slaveName} can hardly believe what's`);
- if (juliet.relationship === -3 && juliet.fetish !== "mindbroken" && juliet.devotion + juliet.trust > 190) {
+ if (juliet.relationship === -3 && juliet.fetish !== Fetish.MINDBROKEN && juliet.devotion + juliet.trust > 190) {
r.push(`happening. You can't hear what he says as he takes out a ring, but ${his} reaction speaks clearly. ${He} says "No."`);
if (canWalk(juliet) && hasAnyArms(juliet)) {
r.push(`${He} points back into your penthouse and returns to ${his} home.`);
@@ -122,7 +122,7 @@ App.Events.PMercenaryRomeo = class PMercenaryRomeo extends App.Events.BaseEvent
function gift() {
let r = [];
r.push(`The mercenary cannot believe his ears. After you repeat yourself twice, he leaves to collect your gift, thanking you clumsily. On the video feeds, you see that ${juliet.slaveName} can hardly believe what's`);
- if (juliet.relationship === -3 && juliet.fetish !== "mindbroken" && juliet.devotion + juliet.trust > 190) {
+ if (juliet.relationship === -3 && juliet.fetish !== Fetish.MINDBROKEN && juliet.devotion + juliet.trust > 190) {
r.push(`happening. You can't hear what he says as he takes out a ring, but ${his} reaction speaks clearly. ${He} says "No."`);
if (canWalk(juliet) && hasAnyArms(juliet)) {
r.push(`${He} points back into your penthouse and returns to ${his} home.`);
diff --git a/src/events/nonRandom/mercs/pMercsHelpCorp.js b/src/events/nonRandom/mercs/pMercsHelpCorp.js
index f4fe0b6264e5312303f2f7d0f65b1426c09d02b9..26d8b1a88b07e5b62dd3a4a2a92745433e149e76 100644
--- a/src/events/nonRandom/mercs/pMercsHelpCorp.js
+++ b/src/events/nonRandom/mercs/pMercsHelpCorp.js
@@ -2,7 +2,7 @@ App.Events.PMercsHelpCorp = class PMercsHelpCorp extends App.Events.BaseEvent {
eventPrerequisites() {
return [
() => V.corp.Incorporated > 0,
- () => V.rival.state === 5,
+ () => V.rival.state > 2,
() => V.mercenaries >= 3,
() => V.mercenariesHelpCorp === 0,
() => V.corp.DivExtra > 0,
diff --git a/src/events/nonRandom/pAbducted.js b/src/events/nonRandom/pAbducted.js
index dfc61d192a5007ee1c810c0fabc54990de48db96..58314473eb082c4dd6b1dd2986ac1425fb8d4087 100644
--- a/src/events/nonRandom/pAbducted.js
+++ b/src/events/nonRandom/pAbducted.js
@@ -15,9 +15,7 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
}
execute(node) {
- // disable Continue
- V.nextButton = " ";
-
+ V.nextButton = " "; // disable Continue
let r = [];
const {
girlP
@@ -31,7 +29,7 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
abductor.skill.oral = 0;
abductor.skill.anal = 0;
abductor.muscles = Math.max(abductor.muscles, 40);
- abductor.origin = `You sentenced $him to enslavement for the attempted abduction of a child.`;
+ abductor.origin = `You sentenced $him to enslavement for the attempted abduction of a child - you, to be exact.`;
abductor.devotion = -100;
abductor.trust = -100;
setHealth(abductor, jsRandom(-40, -20), normalRandInt(15, 3), undefined, 1, random(30, 80));
@@ -41,10 +39,10 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
const {
He,
- his, he, him
+ his, he, him, himself, woman
} = getPronouns(abductor);
- r.push(`While returning from a meeting with a prospective investor, an unfortunate wrong turn has led you into a rather seedy area of your arcology. You feel distinctly uncomfortable for some reason. You suspicions are quickly confirmed as a bag is swung over your head. Your grab your assailant's wrists and struggle to keep them from completely engulfing you,`);
+ r.push(`While returning from a meeting with a prospective investor, an unfortunate wrong turn has led you into a rather seedy area of your arcology. You feel distinctly uncomfortable for some reason. Your suspicions are quickly confirmed as a bag is swung over your head. Your grab your assailant's wrists and struggle to keep them from completely engulfing you,`);
if (overpowerCheck(abductor, V.PC) >= random(1, 100)) {
r.push(`only to find that you're quite capable of keeping them at bay.`);
@@ -62,7 +60,7 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
r.push(`You cry out as you yank the weapon from your body, and clutching the gushing wound, hobble back the way you came — the way back to safety. The world spins as you lose consciousnesses.`);
App.Events.addParagraph(node, r);
r = [];
- r.push(`You awaken on a hard cot, staring face to face with a rather haggard looking man. You leap in shock, sending the man swearing and tearing your stitches open. As you regain composure, and get restitched, you realize that you are in a particularly shitty clinic known for their outrageous treatment fees. The wound was minor and should heal readily, but it will keep you out of commission for a little. `);
+ r.push(`You awaken on a hard cot, staring face to face with a rather haggard looking man. You leap in shock, sending the man swearing and tearing your stitches open. As you regain your composure, and get restitched, you realize that you are in a particularly shitty clinic known for their outrageous treatment fees. The wound was minor and should heal readily, but it will keep you out of commission for a little. `);
if (V.PC.preg > 2 && V.PC.pregKnown) {
r.push(`You're just glad it didn't harm your womb. This could have been a lot worse.`);
}
@@ -81,7 +79,7 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
}
App.Events.addParagraph(node, r);
r = [];
- r.push(`It would be prudent to up security in your arcology. That or take a guard along when you leave the penthouse. You are undeniably a high-value target for wealthy collectors and would rather avoid any future attempts and or stabbings. Even with a full description of them, your assailant got away; there was just nobody interested in tracking him down.`);
+ r.push(`It would be prudent to up security in your arcology. That or take a guard along when you leave the penthouse. You are undeniably a high-value target for wealthy collectors and would rather avoid any future attempts and or stabbings. Even with a full description of him, your assailant got away; there was just nobody interested in tracking him down.`);
App.Events.addParagraph(node, r);
cashX(-1000, "event");
}
@@ -124,14 +122,14 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
function scream() {
const node = new DocumentFragment();
- let bounty = 500 * random(3, 6);
+ const bounty = 500 * random(3, 6);
let r = [];
- r.push(`Calling for help when it's just you and your abductor is nothing short of an invitation for trouble, so you keep your mouth shut and wait for an opportunity. There's only so many ways in and out of the arcology, and there's bound to be people going about their business through them at this hour. After an uncomfortably cramped ride and having to put up with your captive merrily humming to himself and arriving at a suitably populated loading dock, the thought occurs to you; what if they don't believe you are anything more than an unbroken slave?`);
+ r.push(`Calling for help when it's just you and your abductor is nothing short of an invitation for trouble, so you keep your mouth shut and wait for an opportunity. There's only so many ways in and out of the arcology, and there's bound to be people going about their business through them at this hour. After an uncomfortably cramped ride and having to put up with your captive merrily humming to himself and arriving at a suitably populated loading dock, the thought occurs to you: what if they don't believe you are anything more than an unbroken slave?`);
if (V.PC.actualAge < V.minimumSlaveAge) {
r.push(`Fortunately, you are actually underage, so your screams for help quickly attract concerned workers. They corner the man and pry the lid off your box, allowing you to clamber back onto solid ground. Your would-be captor makes a short lived escape attempt straight into a fist once he realizes his plans are ruined. He's quickly tied up and presented to you for revenge.`);
abductor.minorInjury = "black eye";
} else {
- r.push(`Sometimes simple is better, so you scream out that you're being kidnapped and will give ${cashFormat(500)} to anyone that assures your return to safety. The prospect of easy money quickly has your captor tackled and you freed and helped to your feet. It may have costed you ${cashFormatColor(bounty, true)}, but the sight of the man groveling at your feet for mercy is worth it.`);
+ r.push(`Sometimes simple is better, so you scream out that you're being kidnapped and will give ${cashFormat(bounty)} to anyone that assures your return to safety. The prospect of easy money quickly has your captor tackled, you freed and helped to your feet. It may have costed you ${cashFormatColor(bounty, true)}, but the sight of the man groveling at your feet for mercy is worth it.`);
cashX(-bounty, "event");
}
App.Events.addParagraph(node, r);
@@ -142,11 +140,8 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
App.Utils.scheduleSidebarRefresh();
V.fcnn.push("...plans for increased security measures following the unsuccessful abduction of...");
- App.UI.DOM.appendNewElement("div", node, `Now the only remaining question is what to do with the would-be kidnapper. You could toss them out of the arcology, but it might be more fun to turn the tables on ${him}.`);
-
- let slaveCosts = slaveCost(abductor);
- slaveCosts -= contractCost;
- App.UI.DOM.appendNewElement("div", node, `Applying enslavement as punishment will cost ${cashFormat(contractCost)}. Doing so and then selling ${him} immediately will bring in approximately ${cashFormat(slaveCosts)}.`, "note");
+ App.UI.DOM.appendNewElement("div", node, `Now the only remaining question is what to do with the would-be kidnapper. You could toss ${him} out of the arcology, but it might be more fun to turn the tables on ${him}.`);
+ App.UI.DOM.appendNewElement("div", node, `Applying enslavement as punishment will cost ${cashFormat(contractCost)}. Doing so and then selling ${him} immediately will bring in approximately ${cashFormat(slaveCost(abductor) - contractCost)}.`, ["note"]);
node.append(App.Desc.longSlave(abductor, {market: "generic"}));
const choices = [];
@@ -235,24 +230,14 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
function farmyard() {
const el = new DocumentFragment();
+ const actions = [`${V.seeBestiality ? 'getting fucked by' : 'putting on shows with'} animals`];
+ if (V.farmyardShows < 2) {
+ actions.push(`working the fields`);
+ }
const r = [];
assignJob(abductor, "work as a farmhand");
cashX(forceNeg(contractCost), "slaveTransfer", abductor);
- r.push(`You complete the legalities and biometric scanning quickly and cautiously. The idiot will wake up in ${V.farmyardName}, where ${he} will spend the rest of ${his} days`);
- if (V.farmyardShows < 2) {
- r.push(`working the fields`);
-
- if (V.farmyardShows > 0) {
- r.push(`and`);
- }
- }
- if (V.farmyardShows > 0) {
- if (V.seeBestiality) {
- r.push(`getting fucked by animals.`);
- } else {
- r.push(`putting on shows with animals.`);
- }
- }
+ r.push(`You complete the legalities and biometric scanning quickly and cautiously. The idiot will wake up in ${V.farmyardName}, where ${he} will spend the rest of ${his} days ${toSentence(actions)}.`);
newSlave(abductor);/* skip New Slave Intro */
App.Events.addNode(el, r);
return el;
diff --git a/src/events/nonRandom/pAidResult.js b/src/events/nonRandom/pAidResult.js
index 54733f9cf20f9690a9115ec2d70ed30e3d06e37f..1753645d214ec5af3a6e2489833c00cf9fa59e09 100644
--- a/src/events/nonRandom/pAidResult.js
+++ b/src/events/nonRandom/pAidResult.js
@@ -314,7 +314,6 @@ App.Events.pAidResult = class pAidResult extends App.Events.BaseEvent {
newSlaves.push(missLeader);
/* preggo */
- pram = {disableDisability: 1, ageOverridesPedoMode: 1, race: "white"};
if (V.pedo_mode === 1) {
pram.minAge = 16;
pram.maxAge = 18;
@@ -358,7 +357,6 @@ App.Events.pAidResult = class pAidResult extends App.Events.BaseEvent {
newSlaves.push(slave);
/* post preggo */
- pram = {disableDisability: 1, ageOverridesPedoMode: 1, race: "white"};
if (V.pedo_mode === 1) {
pram.minAge = 16;
pram.maxAge = 18;
@@ -399,7 +397,6 @@ App.Events.pAidResult = class pAidResult extends App.Events.BaseEvent {
newSlaves.push(slave);
/* young preggo*/
- pram = {disableDisability: 1, ageOverridesPedoMode: 1, race: "white"};
if (V.minimumSlaveAge < V.fertilityAge) {
if (V.minimumSlaveAge < 8) {
pram.minAge = 8;
diff --git a/src/events/nonRandom/pBadBreasts.js b/src/events/nonRandom/pBadBreasts.js
index 3431da85a7cc80c52c5044fdb14fd58d9a2e2e5a..f3c7db1924a1cc544d2379088a8d5c57e6d05204 100644
--- a/src/events/nonRandom/pBadBreasts.js
+++ b/src/events/nonRandom/pBadBreasts.js
@@ -31,7 +31,7 @@ App.Events.pBadBreasts = class pBadBreasts extends App.Events.BaseEvent {
}
});
let r = [];
- r.push(`Early one morning, you hear heaving coming from one of the bathrooms. On investigation, it seems that ${slave.slaveName} woke up feeling terribly nauseous. ${He}'s in no danger, but you've hardly checked ${him} over before more slaves stagger in. Every one of your slaves on breast focused A-HGH has been struck by the mysterious malady and has <span class="health dec">sickened.</span>`);
+ r.push(`Early one morning, you hear heaving coming from one of the bathrooms. On investigation, it seems that ${slave.slaveName} woke up feeling terribly nauseous. ${He}'s in no danger, but you've hardly checked ${him} over before more slaves stagger in. Every one of your slaves on breast-focused A-HGH has been struck by the mysterious malady and has <span class="health dec">sickened.</span>`);
App.Events.addParagraph(node, r);
r = [];
r.push(`It doesn't take much investigation before you find other slaveowners reporting the same thing. Elementary detective work fingers a particular drug supplier as the culprit, and before long the unfortunate pharmaceutical concern is drowning under a rain of harsh public comment and harsher private contract warfare. As the day wears on, the poor slaves feel much better, and appear positively glowing. However, their breasts swell slightly and their bellies bulge, pointing to the issue being the contamination of the A-HGH production line with fertility agents.`);
diff --git a/src/events/nonRandom/pBioreactorPerfected.js b/src/events/nonRandom/pBioreactorPerfected.js
index 860b03663dbcca51f6b64fd7b2f659283a188cef..b969018913282951b6f1c6cfe54663f2fe883805 100644
--- a/src/events/nonRandom/pBioreactorPerfected.js
+++ b/src/events/nonRandom/pBioreactorPerfected.js
@@ -11,7 +11,7 @@ App.Events.PBioreactorPerfected = class PBioreactorPerfected extends App.Events.
(s) => s.assignment === Job.DAIRY,
(s) => s.boobs > 48000,
(s) => (s.balls === 0 || s.balls >= 10),
- (s) => s.fetish === "mindbroken",
+ (s) => s.fetish === Fetish.MINDBROKEN,
]];
}
diff --git a/src/events/nonRandom/pFSAnnouncement.js b/src/events/nonRandom/pFSAnnouncement.js
index 10b47e27cc9339832b6a3cbaea41bb9b3942bc7c..36bca5e37c0a6aec29220e3cda1f18839609be24 100644
--- a/src/events/nonRandom/pFSAnnouncement.js
+++ b/src/events/nonRandom/pFSAnnouncement.js
@@ -15,7 +15,7 @@ App.Events.PFSAnnouncement = class PFSAnnouncement extends App.Events.BaseEvent
App.Events.drawEventArt(node, "assistant");
- const {heA} = getPronouns(assistant.pronouns().main).appendSuffix("A"); // Assistant Awakens doesn't have a rep requirement, but this event does. It's possible for them to trigger in either order.
+ const {heA} = getPronouns(assistant.pronouns().main).appendSuffix("A"); // Assistant Awakens doesn't have a rep requirement, but this event does. It's possible for them to trigger in either order.
App.Events.addParagraph(node, [`The simple pleasure of power has to be experienced to be understood. You often take a moment to stand on a balcony overlooking an interior atrium, watching the living, breathing, flowing current of your demesne. ${capFirstChar(V.assistant.name)} knows to allow you these moments of peace.`]);
App.Events.addParagraph(node, [`You immediately pay attention, therefore, when ${heA} interrupts. "${properTitle()}," ${heA} says, "this is an appropriate moment to bring a serious matter to your attention. I monitor conversations, social media, and general opinion within the arcology where I can. You are respected, and the inhabitants of this arcology are starting to look to you to give direction to society."`]);
diff --git a/src/events/nonRandom/pInvasion.js b/src/events/nonRandom/pInvasion.js
index 0aa592ac02b2043400908087ea378b4e4d7ff7b5..e97fc9a0debc75c3f3fb49e2774b5581f9bc9c37 100644
--- a/src/events/nonRandom/pInvasion.js
+++ b/src/events/nonRandom/pInvasion.js
@@ -2,18 +2,18 @@ App.Events.PInvasion = class PInvasion extends App.Events.BaseEvent {
execute(node) {
let r = [];
V.nextButton = "Continue";
- const newSlaves = [];
V.invasionVictory = 1;
const {
HeA, HisA,
heA, hisA, womanA
} = getPronouns(assistant.pronouns().main).appendSuffix("A");
+ const newSlaves = [];
+ const ravineArc = V.terrain === "ravine";
r.push(`The day that wasn't supposed to come is here. The troubled little country next door is falling apart. Last month, its stock market collapsed. Last week, its government fell. Yesterday, there was open looting in its cities. And today, a faction of disaffected citizens that blames the Free Cities for siphoning off business and causing the collapse seized weapons from unguarded army depots${(V.terrain === "marine" || V.terrain === "oceanic") ? ", armed merchant ships and private vessels, and are approaching the Free City over the water." : " and advanced towards your home."}`);
-
App.Events.addParagraph(node, r);
- r = [];
+ r = [];
r.push(`Sirens are blaring; there is a crump far above as ${V.arcologies[0].name}'s defensive systems knock down one of the first mortar rounds fired into the Free City. The lights in your office changed to a harsh emergency scheme as soon as the attack became a certainty.`);
if (V.assistant.personality <= 0) {
r.push(`Your personal assistant offers terse reports on the efficiency of the point defense fire.`);
@@ -82,15 +82,13 @@ App.Events.PInvasion = class PInvasion extends App.Events.BaseEvent {
}
}
r.push(`It's going well. Whoever's in command of the attackers sees that their fire is having no effect, and orders an advance. The mortars and other artillery systems maintain their fire, trying to occupy as many guns as possible.`);
-
App.Events.addParagraph(node, r);
- r = [];
+ r = [];
r.push(`The loose militia lately organized by the arcology owners has been called out to defend the city. Its commander, seeing that the attackers have more passion than tactical skill, orders an immediate counterattack by anyone able${(V.terrain === "marine" || V.terrain === "oceanic") ? " to push the invaders landing in the dock areas back into the sea" : ""}. Technology has advanced to the point that rich militiamen who buy their own gear can form a powerful fighting force. With luck, the counterattack should shatter the enemy.`);
-
App.Events.addParagraph(node, r);
- r = [];
+ r = [];
if (V.personalArms === 0) {
r.push(`Since you are not well armed or armored, you stay back and oversee the defense of your own arcology.`);
} else if (V.personalArms === 1) {
@@ -98,44 +96,36 @@ App.Events.PInvasion = class PInvasion extends App.Events.BaseEvent {
} else {
r.push(`Since you are well armed and armored and your drones are combat ready, you take part in the counterattack. You are preceded into combat by a wedge of your drones, which lack the intelligence to take good cover but are remorseless and highly accurate. Your exoskeleton mounts a smart mortar system that independently targets and eliminates enemy groups even as you lay down fire from the guns mounted on your forearms.`);
}
-
App.Events.addParagraph(node, r);
- r = [];
+ r = [];
if (V.mercenaries === 0) {
r.push(`You are alone in contributing to the defense of your home.`);
- } else if (V.mercenaries === 1) {
+ } else if (V.mercenaries >= 1) {
r.push(`Your mercenaries see to the defense of ${V.arcologies[0].name}, ensuring that nothing that gets through will do truly serious damage.`);
- } else {
- r.push(`Your mercenaries see to the defense of ${V.arcologies[0].name}, ensuring that nothing that gets through will do truly serious damage. There are enough of them that they can even spare a squad to accompany the counterattack. They're mostly old veterans of many bitter brush wars, and they go about the bloody business with the air of men and women who saw their first battlefield long before their hair was shot with grey.`);
+ if (V.mercenaries > 1) {
+ r.push(`There are enough of them that they can even spare a squad to accompany the counterattack. They're mostly old veterans of many bitter brush wars, and they go about the bloody business with the air of men and women who saw their first battlefield long before their hair was shot with grey.`);
+ }
}
-
App.Events.addParagraph(node, r);
- r = [];
+ r = [];
if (V.mercenaries + V.personalArms < 2) {
r.push(`<span class="red">The counterattack fails.</span> The enemy is eventually defeated, but only after they get mired in urban combat in the streets of the Free City. <span class="red">${V.arcologies[0].name} takes considerable damage from`);
- if (V.terrain === "ravine") {
- r.push(`cliffside fire,`);
- } else {
- r.push(`stray fire,`);
- }
- r.push(`and many supplies have been lost or stolen.</span> The repairs will be extremely costly.`);
- if (V.terrain === "ravine") {
- cashX(forceNeg(Math.trunc(V.cash * 0.8)), "war");
- cashX(-50000, "war");
- } else {
- cashX(forceNeg(Math.trunc(V.cash * 0.9)), "war");
- cashX(-10000, "war");
- }
+ r.push(`${ravineArc ? 'cliffside' : 'stray'} fire, and many supplies have been lost or stolen.</span> The repairs will be extremely costly.`);
+ App.Events.addParagraph(node, r);
+ cashX(forceNeg(Math.trunc(V.cash * (ravineArc ? 0.8 : 0.9))), "war");
+ cashX(ravineArc ? -50000 : -10000, "war");
} else if (V.mercenaries + V.personalArms < 6) {
r.push(`<span class="yellow">The counterattack succeeds.</span> <span class="red">${V.arcologies[0].name} takes minor damage from stray fire,</span> but the repairs are not too costly. Your participation in the counterattack that saved the Free City was noted, and <span class="green">you are acclaimed as a protector of its people.</span>`);
+ App.Events.addParagraph(node, r);
V.invasionVictory = 2;
cashX(forceNeg(Math.trunc(V.cash * 0.2)), "war");
cashX(-5000, "war");
repX(5000, "event");
} else {
r.push(`<span class="green">The counterattack is a crushing success.</span> Your mercenary squad and your drones form an irresistible phalanx around you that smashes everything it touches. The enemy is put to flight, and you send your drones racing ahead to take captives. By law these are shared among the militia. There is talk that your contributions deserve more than a few wretched slaves in reward. A public subscription pays for the damage ${V.arcologies[0].name} took from stray fire, and <span class="green">you are acclaimed a hero.</span>`);
+ App.Events.addParagraph(node, r);
V.invasionVictory = 3;
repX(10000, "event");
@@ -144,12 +134,9 @@ App.Events.PInvasion = class PInvasion extends App.Events.BaseEvent {
slave.origin = "$He is an enslaved prisoner of war.";
newSlaves.push(slave);
}
-
V.menials += 5;
addTrinket("a shot-torn flag of the failed nation whose militants attacked the Free City");
- App.Events.addParagraph(node, r);
-
App.Events.addResponses(node, [
new App.Events.Result(`Sell your prisoners immediately`, sell),
new App.Events.Result(`Give your prisoners to citizens who displayed bravery during the counterattack`, give),
@@ -157,23 +144,17 @@ App.Events.PInvasion = class PInvasion extends App.Events.BaseEvent {
]);
}
function sell() {
- for (const s of newSlaves) {
- cashX(slaveCost(s), "slaveTransfer");
- }
+ newSlaves.forEach(s => cashX(slaveCost(s), "slaveTransfer"));
return `Prisoners sold.`;
}
function give() {
- for (const s of newSlaves) {
- repX(Math.trunc(slaveCost(s) / 2), "event");
- }
+ newSlaves.forEach(s => repX(Math.trunc(slaveCost(s) / 2), "event"));
return `Prisoners <span class="green">given away.</span>`;
}
function enslave() {
- for (const s of newSlaves) {
- newSlave(s); /* skip New Slave Intro */
- }
+ newSlaves.forEach(s => newSlave(s)); // skip New Slave Intro
return `You simply enslave all of your prisoners yourself. These slaves will regret attacking your arcology.`;
}
}
diff --git a/src/events/nonRandom/pRaped.js b/src/events/nonRandom/pRaped.js
index 9944294ed0282fe4b8e949b0894efa3e6a079922..af88f3fa18929fd12342af8670a23e706c7bc38c 100644
--- a/src/events/nonRandom/pRaped.js
+++ b/src/events/nonRandom/pRaped.js
@@ -15,6 +15,7 @@ App.Events.pRaped = class pRaped extends App.Events.BaseEvent {
}
execute(node) {
+ V.nextButton = " "; // disable Continue
let r = [];
const {
hisP, womanP, girlP
@@ -32,7 +33,7 @@ App.Events.pRaped = class pRaped extends App.Events.BaseEvent {
rapist.waist = 50;
rapist.skill.oral = 0;
rapist.skill.anal = 0;
- rapist.pronoun = 1; //janky workaround - reset later by repeating generatePronouns - reexamine in any diversePronouns rework
+ rapist.pronoun = 1; // janky workaround - reset later by repeating generatePronouns - reexamine in any diversePronouns rework
} else {
rapist = GenerateNewSlave("XX", genParam);
rapist.vagina = 1;
@@ -48,7 +49,6 @@ App.Events.pRaped = class pRaped extends App.Events.BaseEvent {
rapist.anus = 0;
rapist.behavioralFlaw = "arrogant";
rapist.sexualFlaw = "judgemental";
-
const {
He,
his, he, him, himself, woman
@@ -92,6 +92,7 @@ App.Events.pRaped = class pRaped extends App.Events.BaseEvent {
}
App.Events.addParagraph(node, r);
if (V.raped === 1) {
+ V.nextButton = "Continue";
r = [];
V.fcnn.push("...plans for increased security measures, but refused to answer questions regarding...");
if (V.PC.vagina >= 0) {
@@ -494,7 +495,7 @@ App.Events.pRaped = class pRaped extends App.Events.BaseEvent {
}
if (V.PC.balls >= 9) {
r.push(`It's impossible to hide the two firm globes beneath your dick, so you can only wince as ${he} reaches a little lower.`);
- r.push(Spoken(rapist, `"Did not expect them to be so, profound... Compensating for all the years you weren't allowed to use them?"`));
+ r.push(Spoken(rapist, `"Did not expect them to be so... profound. Compensating for all the years you weren't allowed to use them?"`));
r.push(`${He} ${say}s excitedly, rubbing your sizeable balls while licking ${his} lips.`);
} else if (V.PC.balls >= 5) {
r.push(`${He} no doubt noticed your bulge as ${he} reaches a little lower.`);
@@ -523,7 +524,7 @@ App.Events.pRaped = class pRaped extends App.Events.BaseEvent {
r.push(`${He} teases as ${he} pushes you to the ground and climbs on top of you.`);
App.Events.addParagraph(node, r);
r = [];
- r.push(`${He} lines ${himself} up with the tip of your dick before taking its entire length into ${himself}. ${He} lets out a lust filled moan as ${he} begins to bounce on your traitorous member. You can do nothing to stop ${him} from riding you to climax, so you just enjoy the sight of ${his} breasts bouncing to ${his} pace. As you feel your orgasm approaching, you try to time it so you can slip out of ${him} just before you blow your load, but you have no such luck.`);
+ r.push(`${He} lines ${himself} up with the tip of your dick before taking its entire length into ${himself}. ${He} lets out a lust-filled moan as ${he} begins to bounce on your traitorous member. You can do nothing to stop ${him} from riding you to climax, so you just enjoy the sight of ${his} breasts bouncing to ${his} pace. As you feel your orgasm approaching, you try to time it so you can slip out of ${him} just before you blow your load, but you have no such luck.`);
r.push(Spoken(rapist, `"You really think I'd let you spoil my plans?"`));
r.push(`${he} asks as ${he} grinds against you, making sure you cum deep in ${his} pussy. ${He} leans back and massages ${his}`);
if (V.PC.balls >= 20) {
@@ -541,10 +542,7 @@ App.Events.pRaped = class pRaped extends App.Events.BaseEvent {
}
} else {
App.UI.DOM.appendNewElement("div", node, `Now the only question is what to do with the would-be rapist. You could toss them out of the arcology, but it might be more fun to turn the tables on ${him}.`);
-
- let slaveCosts = slaveCost(rapist);
- slaveCosts -= contractCost;
- App.UI.DOM.appendNewElement("div", node, `Applying enslavement as punishment will cost ${cashFormat(contractCost)}. Doing so and then selling ${him} immediately will bring in approximately ${cashFormat(slaveCosts)}.`, "note");
+ App.UI.DOM.appendNewElement("div", node, `Applying enslavement as punishment will cost ${cashFormat(contractCost)}. Doing so and then selling ${him} immediately will bring in approximately ${cashFormat(slaveCost(rapist) - contractCost)}.`, ["note"]);
node.append(App.Desc.longSlave(rapist, {market: "generic"}));
const choices = [];
@@ -571,6 +569,7 @@ App.Events.pRaped = class pRaped extends App.Events.BaseEvent {
}
function enslave() {
+ V.nextButton = "Continue";
const el = new DocumentFragment();
cashX(forceNeg(contractCost), "slaveTransfer", rapist);
generatePronouns(rapist);
@@ -580,6 +579,7 @@ App.Events.pRaped = class pRaped extends App.Events.BaseEvent {
}
function stocks() {
+ V.nextButton = "Continue";
const el = new DocumentFragment();
const r = [];
generatePronouns(rapist);
@@ -609,6 +609,7 @@ App.Events.pRaped = class pRaped extends App.Events.BaseEvent {
}
function arcade() {
+ V.nextButton = "Continue";
generatePronouns(rapist);
assignJob(rapist, "be confined in the arcade");
rapist.sentence = 4;
@@ -618,6 +619,7 @@ App.Events.pRaped = class pRaped extends App.Events.BaseEvent {
}
function dairy() {
+ V.nextButton = "Continue";
const el = new DocumentFragment();
const r = [];
generatePronouns(rapist);
@@ -636,32 +638,24 @@ App.Events.pRaped = class pRaped extends App.Events.BaseEvent {
}
function farmyard() {
+ V.nextButton = "Continue";
const el = new DocumentFragment();
+ const actions = [`${V.seeBestiality ? 'getting fucked by' : 'putting on shows with'} animals`];
+ if (V.farmyardShows < 2) {
+ actions.push(`working the fields`);
+ }
const r = [];
generatePronouns(rapist);
assignJob(rapist, "work as a farmhand");
cashX(forceNeg(contractCost), "slaveTransfer", rapist);
- r.push(`You complete the legalities and biometric scanning quickly and cautiously. The idiot will wake up in ${V.farmyardName}, where ${he} will spend the rest of ${his} days`);
- if (V.farmyardShows < 2) {
- r.push(`working the fields`);
-
- if (V.farmyardShows > 0) {
- r.push(`and`);
- }
- }
- if (V.farmyardShows > 0) {
- if (V.seeBestiality) {
- r.push(`getting fucked by animals.`);
- } else {
- r.push(`putting on shows with animals.`);
- }
- }
+ r.push(`You complete the legalities and biometric scanning quickly and cautiously. The idiot will wake up in ${V.farmyardName}, where ${he} will spend the rest of ${his} days ${toSentence(actions)}.`);
newSlave(rapist);/* skip New Slave Intro */
App.Events.addNode(el, r);
return el;
}
function amputate() {
+ V.nextButton = "Continue";
const el = new DocumentFragment();
const r = [];
generatePronouns(rapist);
@@ -691,6 +685,7 @@ App.Events.pRaped = class pRaped extends App.Events.BaseEvent {
}
function flog() {
+ V.nextButton = "Continue";
const el = new DocumentFragment();
const r = [];
r.push(`Naturally, the wretch will be thrown out of the arcology, but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The protesting malefactor is stripped and flogged on the promenade before being escorted bleeding from the arcology. The public <span class="green">approves of this harshness.</span>`);
diff --git a/src/events/nonRandom/peacekeepers/pPeacekeepersInfluence.js b/src/events/nonRandom/peacekeepers/pPeacekeepersInfluence.js
index 373b6a331e046ae34ee9734e0217a828b690a46f..15e7c39ac701319a83bf4fa3fa59470b26cccef7 100644
--- a/src/events/nonRandom/peacekeepers/pPeacekeepersInfluence.js
+++ b/src/events/nonRandom/peacekeepers/pPeacekeepersInfluence.js
@@ -15,7 +15,7 @@ App.Events.PPeacekeepersInfluence = class PPeacekeepersInfluence extends App.Eve
let r = [];
r.push(`You provided money to General ${V.peacekeepers.generalName} to help him through this difficult time of transition, making him an investment of yours. That investment has already shown a small return; the first regular tribute of slaves arrived this week, free of charge. General ${V.peacekeepers.generalName} seems determined to pay his debts properly, and he sent you good stock, healthy menials ready for`);
if (V.menials) {
- r.push(`work${(V.Sweatshops) ? `. They're already toiling away in ${V.arcologies[0].name}'s sweatshops` : ``}.`);
+ r.push(`work${(sweatshopCount() > 0) ? `. They're already toiling away in ${V.arcologies[0].name}'s sweatshops` : ``}.`);
} else {
r.push(`resale.`);
}
diff --git a/src/events/nonRandom/rival/pHostageAcquisition.js b/src/events/nonRandom/rival/pHostageAcquisition.js
index 884ac491685ee5b5edfd7e69cbdec721b673552e..107e777b166d5786e0687dd26c290cf43231a1d5 100644
--- a/src/events/nonRandom/rival/pHostageAcquisition.js
+++ b/src/events/nonRandom/rival/pHostageAcquisition.js
@@ -818,7 +818,7 @@ App.Events.pHostageAcquisition = class pHostageAcquisition extends App.Events.Ba
r.push(`While ${he} looks the same as you remember, ${he} certainly doesn't think the same anymore.`);
} else if (V.rival.duration <= 15) {
r.push(`Upon seeing you, ${V.hostage.slaveName} shifts ${his} weight back and forth, unsure of what to make of you. As you step forward, ${he} hesitatingly approaches. Once ${he} is close enough ${he} pleads`);
- r.push(Spoken(V.hostage, `"Please don't turn me into a big boobed freak..."`));
+ r.push(Spoken(V.hostage, `"Please don't turn me into a big-boobed freak..."`));
r.push(`While ${he} looks the same as you remember, ${he} certainly doesn't think the same anymore.`);
} else if (V.rival.duration <= 20) {
r.push(`Upon seeing you, ${V.hostage.slaveName} shifts ${his} weight back and forth, unsure of what to make of you. As you step forward, ${he} quickly steps back. After several steps, ${he} screams`);
diff --git a/src/events/nonRandom/rival/pRivalryActions.js b/src/events/nonRandom/rival/pRivalryActions.js
index 1b7df31f25e646552c50e116687a73a8da8f085e..4d21a3303466f9a933ed5c03c504c832969ca461 100644
--- a/src/events/nonRandom/rival/pRivalryActions.js
+++ b/src/events/nonRandom/rival/pRivalryActions.js
@@ -2162,7 +2162,7 @@ App.Events.pRivalryActions = function() {
V.hostage.counter.anal += 100;
V.hostage.counter.mammary += 100;
if (V.seeHyperPreg !== 1) {
- hostageAction.push(`happily rubbing ${his} cum filled belly, eager for ${his} next pregnancy to take.`);
+ hostageAction.push(`happily rubbing ${his} cum-filled belly, eager for ${his} next pregnancy to take.`);
hostageAction.push(`eagerly checking a pregnancy test before dropping it sadly.`);
hostageAction.push(`injecting cum into ${his} vagina, hoping to get pregnant again sooner.`);
} else {
@@ -2532,7 +2532,7 @@ App.Events.pRivalryActions = function() {
V.hostage.counter.oral += 1;
V.hostage.counter.vaginal += 1;
V.hostage.counter.anal += 1;
- hostageAction.push(`struggling to escape the grasp of an energetic young $woman2}.`);
+ hostageAction.push(`struggling to escape the grasp of an energetic young ${woman2}.`);
hostageAction.push(`shouting profanity at ${his} young partner.`);
hostageAction.push(`rebuking ${his} young partner's advances.`);
} else if (V.rival.duration <= 10) {
@@ -2678,7 +2678,7 @@ App.Events.pRivalryActions = function() {
V.hostage.counter.vaginal += 1;
hostageAction.push(`lifting weights, ${his} soft body barely hiding ${his} bulging muscles.`);
hostageAction.push(`pinching ${his} remaining flab and making a disgusted face.`);
- hostageAction.push(`running laps around the track to burn off ${his} excess bodyfat.`);
+ hostageAction.push(`running laps around the track to burn off ${his} excess body fat.`);
} else if (V.rival.duration <= 20) {
V.hostage.trust -= 5;
V.hostage.devotion -= 5;
@@ -2785,7 +2785,7 @@ App.Events.pRivalryActions = function() {
SetBellySize(V.hostage);
break;
}
- hostageAction.push(`relaxing in ${his} comfy bed carefully exploring ${his} food stuffed belly and its unique curvature. ${He}'s certainly getting soft.`);
+ hostageAction.push(`relaxing in ${his} comfy bed carefully exploring ${his} food-stuffed belly and its unique curvature. ${He}'s certainly getting soft.`);
hostageAction.push(`crying as ${he} rubs the uncomfortable bulge of ${his} overfilled stomach and soft belly as yet another guy fucks ${his} loosening cunt.`);
switch (V.hostage.fetish) {
case "submissive":
@@ -3029,7 +3029,7 @@ App.Events.pRivalryActions = function() {
V.hostage.counter.vaginal += 1;
hostageAction.push(`lifting weights, ${his} soft body barely hiding ${his} bulging muscles.`);
hostageAction.push(`pinching ${his} remaining flab and making a disgusted face.`);
- hostageAction.push(`running laps around the track to burn off ${his} excess bodyfat.`);
+ hostageAction.push(`running laps around the track to burn off ${his} excess body fat.`);
} else if (V.rival.duration <= 20) {
V.hostage.trust -= 5;
V.hostage.devotion -= 5;
@@ -3258,7 +3258,7 @@ App.Events.pRivalryActions = function() {
hostageAction.push(`sloppily sucking a dick while taking it in both ${his} ass and pussy.`);
hostageAction.push(`struggling to fasten ${his} top before giving up and going without it.`);
if (V.seePreg !== 0) {
- hostageAction.push(`attempting to suck in ${his} ever growing pregnancy.`);
+ hostageAction.push(`attempting to suck in ${his} ever-growing pregnancy.`);
}
hostageAction.push(`pursing ${his} swollen lips at ${his} own reflection.`);
} else {
diff --git a/src/events/nonRandom/rival/pRivalryCapture.js b/src/events/nonRandom/rival/pRivalryCapture.js
index 1dff371f2e31c1e56d46dbaea715b89293d96b23..5e738015335deb1163b9e43a82369c5522836a60 100644
--- a/src/events/nonRandom/rival/pRivalryCapture.js
+++ b/src/events/nonRandom/rival/pRivalryCapture.js
@@ -230,7 +230,7 @@ globalThis.pRivalryCapture = function(condition) {
slave.skill.anal = 0;
slave.skill.whoring = 0;
slave.skill.entertainment = 15;
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
slave.behavioralFlaw = "hates men";
slave.behavioralQuirk = "fitness";
slave.sexualFlaw = "hates anal";
@@ -297,7 +297,7 @@ globalThis.pRivalryCapture = function(condition) {
slave.skill.anal = 15;
slave.skill.whoring = 0;
slave.skill.entertainment = 0;
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
slave.piercing.genitals.weight = 1;
slave.piercing.ear.weight = 1;
slave.behavioralFlaw = "hates men";
@@ -400,7 +400,7 @@ globalThis.pRivalryCapture = function(condition) {
slave.behavioralQuirk = "insecure";
slave.sexualFlaw = "shamefast";
slave.sexualQuirk = "tease";
- slave.hStyle = "twin tails";
+ slave.hStyle = "tails";
slave.hLength = 40;
break;
case "cow":
diff --git a/src/events/nonRandom/rival/pRivalryHostage.js b/src/events/nonRandom/rival/pRivalryHostage.js
index bb46874eab9c77929b0a8c5fb8effca86a1c0cd6..181f580381deef246c012cbaa3772dbaa868c636 100644
--- a/src/events/nonRandom/rival/pRivalryHostage.js
+++ b/src/events/nonRandom/rival/pRivalryHostage.js
@@ -425,357 +425,303 @@ App.Events.pRivalryHostage = function() {
return node;
function createHostage() {
- const slave = GenerateNewSlave("XX", {race: "nonslave", disableDisability: 1});
- slave.origin = "You were acquainted with $him before you were an arcology owner; your rival tried to use $him to manipulate you, but you rescued $him.";
- slave.boobs = 400;
- if (slave.butt > 3) {
- slave.butt = 3;
- }
- slave.muscles = 0;
- slave.behavioralFlaw = "none";
- slave.sexualFlaw = "none";
- slave.behavioralQuirk = "none";
- slave.sexualQuirk = "none";
- slave.waist = Math.clamp(slave.waist, -55, 15);
- slave.lactation = 0;
- slave.lactationDuration = 0;
- slave.hips = 0;
- slave.shoulders = -1;
- if (slave.vagina <= 0) {
- slave.vagina = 1;
- }
- if (slave.anus === 0) {
- slave.anus = 1;
- }
- slave.energy = 50;
- slave.canRecruit = 0;
- if (slave.voice < 2) {
- slave.voice = 2;
- }
- if (slave.faceShape === "masculine") {
- slave.faceShape = "cute";
- }
- slave.geneMods.NCS = 0;
- slave.geneMods.rapidCellGrowth = 0;
- slave.NCSyouthening = 0;
- slave.slaveName = slave.birthName;
- slave.slaveSurname = slave.birthSurname;
+ const params = new GenerateNewSlavePram();
+ params.race = "nonslave";
+ params.disableDisability = 1;
- slave.actualAge = Number(slave.actualAge) || 18;
- slave.devotion = Number(slave.devotion) || 0;
- slave.trust = Number(slave.trust) || 0;
- slave.boobs = Number(slave.boobs) || 400;
-
- WombFlush(slave);
-
- if (isPCCareerInCategory("wealth")) {
- slave.career = "a party girl";
- if (V.PC.career === "wealth" || V.PC.actualAge > 24) {
- slave.actualAge = random(18, 24);
- } else if (V.PC.career === "trust fund" || V.PC.actualAge > 16) {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = random(V.minimumSlaveAge, V.PC.actualAge);
- } else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge+1));
- }
+ /** The hostage is always a peer of a young PC, but younger than an adult PC. Find the appropriate age range for slave generation.
+ * @param {number} adultMin
+ * @param {number} adultMax
+ */
+ function setHostageAge(adultMin, adultMax) {
+ const tier = PCCareerTier();
+ if (tier === "master" || V.PC.actualAge > 24) {
+ params.minAge = adultMin;
+ params.maxAge = adultMax;
} else {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = V.minimumSlaveAge;
+ params.minAge = V.PC.actualAge - 1;
+ if (tier === "apprentice" || V.PC.actualAge > 16) {
+ params.maxAge = V.PC.actualAge + 1;
} else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge));
+ params.maxAge = V.PC.actualAge;
}
}
- slave.face = 100;
- slave.intelligence = random(51, 95);
- slave.intelligenceImplant = 0;
- slave.skill.oral = 100;
- slave.skill.entertainment = 100;
- } else if (isPCCareerInCategory("escort")) {
- if (V.PC.career === "escort" || V.PC.actualAge > 24) {
- slave.career = "an escort";
- slave.actualAge = random(18, 20);
- App.Medicine.Modification.addScar(slave, "belly", "c-section");
- slave.counter.birthsTotal = 1;
- } else if (V.PC.career === "prostitute" || V.PC.actualAge > 16) {
- slave.career = "a prostitute";
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = random(V.minimumSlaveAge, V.PC.actualAge);
- } else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge+1));
- }
- } else {
- slave.career = "child prostitute";
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = V.minimumSlaveAge;
- } else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge));
- }
- slave.custom.tattoo = "$He has $his ID number tattooed on $his left breast.";
- }
- slave.face = 100;
- slave.intelligence = random(-15, 15);
- slave.intelligenceImplant = 0;
- slave.skill.oral = 100;
- slave.skill.entertainment = 100;
- slave.skill.anal = 100;
- slave.skill.vaginal = 100;
- slave.skill.whoring = 100;
- } else if (isPCCareerInCategory("servant")) {
- slave.career = "a maid";
- if (V.PC.career === "servant" || V.PC.actualAge > 24) {
- slave.actualAge = random(18, 20);
- slave.counter.birthsTotal = 3;
- } else if (V.PC.career === "handmaiden" || V.PC.actualAge > 16) {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = random(V.minimumSlaveAge, V.PC.actualAge);
- } else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge+1));
- }
- slave.counter.birthsTotal = 1;
- } else {
- slave.career = "child servant";
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = V.minimumSlaveAge;
- } else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge));
- }
- if (slave.actualAge >= V.fertilityAge + 2) {
- slave.counter.birthsTotal = 1;
- }
+ }
+
+ /** @param {App.Entity.SlaveState} slave */
+ function setCommonProperties(slave) {
+ slave.origin = "You were acquainted with $him before you were an arcology owner; your rival tried to use $him to manipulate you, but you rescued $him.";
+ slave.boobs = 400;
+ if (slave.butt > 3) {
+ slave.butt = 3;
}
- if (V.pedo_mode === 1 && slave.actualAge > 18) {
- slave.actualAge = random(12, 18);
+ slave.muscles = 0;
+ slave.behavioralFlaw = "none";
+ slave.sexualFlaw = "none";
+ slave.behavioralQuirk = "none";
+ slave.sexualQuirk = "none";
+ slave.waist = Math.clamp(slave.waist, -55, 15);
+ slave.lactation = 0;
+ slave.lactationDuration = 0;
+ slave.hips = 0;
+ slave.shoulders = -1;
+ if (slave.vagina <= 0) {
+ slave.vagina = 1;
}
- slave.face = 25;
- slave.intelligence = random(-50, -16);
- slave.intelligenceImplant = 0;
- slave.skill.oral = 15;
- slave.skill.entertainment = 0;
- slave.skill.anal = 15;
- slave.skill.vaginal = 15;
- slave.skill.whoring = 0;
- slave.custom.tattoo = "$He has your Master's brand on $his left breast.";
- } else if (isPCCareerInCategory("gang")) {
- if (V.PC.career === "gang" || V.PC.actualAge > 24) {
- slave.actualAge = random(20, 24);
- slave.custom.tattoo = "$He has your former gang's sign tattooed on $his neck.";
- slave.career = "a gang member";
- slave.skill.combat = 1;
- } else if (V.PC.career === "hoodlum" || V.PC.actualAge > 16) {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = random(V.minimumSlaveAge, V.PC.actualAge);
- } else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge+1));
- }
- slave.custom.tattoo = "$He has the gang's sign that you rolled with tattooed on $his neck.";
- slave.career = "a gang member";
- slave.skill.combat = 1;
- } else {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = V.minimumSlaveAge;
- } else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge));
- }
- slave.custom.tattoo = "$He has the gang's sign that you associated with tattooed on $his neck.";
- slave.career = "street urchin";
- slave.weight = -80;
+ if (slave.anus === 0) {
+ slave.anus = 1;
}
- slave.muscles = 40;
- setHealth(slave, 100, 0, 0, 0, jsRandom(10, 30));
- slave.skill.combat = 1;
- } else if (isPCCareerInCategory("BlackHat")) {
- slave.career = "a shut-in";
- if (V.PC.career === "BlackHat" || V.PC.actualAge > 24) {
- slave.actualAge = random(18, 21);
- slave.intelligenceImplant = 30;
- } else if (V.PC.career === "hacker" || V.PC.actualAge > 16) {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = random(V.minimumSlaveAge, V.PC.actualAge);
- } else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge+1));
- }
- slave.intelligenceImplant = 15;
- } else {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = V.minimumSlaveAge;
- } else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge));
- }
- slave.intelligenceImplant = 15;
+ slave.energy = 50;
+ slave.canRecruit = 0;
+ if (slave.voice < 2) {
+ slave.voice = 2;
}
- if (V.pedo_mode === 1 && slave.actualAge > 18) {
- slave.actualAge = random(13, 18);
+ if (slave.faceShape === "masculine") {
+ slave.faceShape = "cute";
}
- slave.face = 75;
- slave.intelligence = 100;
- } else if (isPCCareerInCategory("capitalist")) {
- if (V.PC.career === "capitalist" || V.PC.actualAge > 24) {
- slave.actualAge = random(18, 24);
- slave.career = "a manager";
- slave.intelligenceImplant = 30;
- } else if (V.PC.career === "entrepreneur" || V.PC.actualAge > 16) {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = random(V.minimumSlaveAge, V.PC.actualAge);
- } else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge+1));
- }
- slave.career = "an intern";
- slave.intelligenceImplant = 15;
- } else {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = V.minimumSlaveAge;
+ slave.slaveName = slave.birthName;
+ slave.slaveSurname = slave.birthSurname;
+ slave.trust = 0;
+ slave.devotion = 0;
+ WombFlush(slave);
+ }
+
+ /** @type {Record<string, function(void): App.Entity.SlaveState>} */
+ const HostageFactory = {
+ wealth() {
+ setHostageAge(18, 24);
+ const slave = GenerateNewSlave("XX", params);
+ setCommonProperties(slave);
+ slave.career = "a party girl";
+ slave.face = 100;
+ slave.intelligence = random(51, 95);
+ slave.intelligenceImplant = 0;
+ slave.skill.oral = 100;
+ slave.skill.entertainment = 100;
+ return slave;
+ },
+ escort() {
+ setHostageAge(18, 20);
+ const slave = GenerateNewSlave("XX", params);
+ setCommonProperties(slave);
+ if (V.PC.career === "escort" || V.PC.actualAge > 24) {
+ slave.career = "an escort";
+ App.Medicine.Modification.addScar(slave, "belly", "c-section");
+ slave.counter.birthsTotal = 1;
+ } else if (V.PC.career === "prostitute" || V.PC.actualAge > 16) {
+ slave.career = "a prostitute";
} else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge));
+ slave.career = "child prostitute";
+ slave.custom.tattoo = "$He has $his ID number tattooed on $his left breast.";
}
- slave.career = "a student from a private school";
- slave.intelligenceImplant = 15;
- }
- slave.face = 55;
- slave.intelligence = 100;
- } else if (isPCCareerInCategory("mercenary")) {
- if (V.PC.career === "mercenary" || V.PC.actualAge > 24) {
- slave.actualAge = random(20, 24);
- slave.career = "a soldier";
- slave.intelligenceImplant = 15;
- } else if (V.PC.career === "recruit" || V.PC.actualAge > 16) {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = random(V.minimumSlaveAge, V.PC.actualAge);
- } else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge+1));
+ slave.face = 100;
+ slave.intelligence = random(-15, 15);
+ slave.intelligenceImplant = 0;
+ slave.skill.oral = 100;
+ slave.skill.entertainment = 100;
+ slave.skill.anal = 100;
+ slave.skill.vaginal = 100;
+ slave.skill.whoring = 100;
+ return slave;
+ },
+ servant() {
+ setHostageAge(18, 20);
+ if (V.pedo_mode === 1) {
+ params.minAge = Math.min(params.minAge, 12);
+ params.maxAge = Math.min(params.maxAge, 18);
}
- slave.career = "a soldier";
- slave.intelligenceImplant = 15;
- } else {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = V.minimumSlaveAge;
+ const slave = GenerateNewSlave("XX", params);
+ setCommonProperties(slave);
+ slave.career = "a maid";
+ if (V.PC.career === "servant" || V.PC.actualAge > 24) {
+ slave.counter.birthsTotal = 3;
+ } else if (V.PC.career === "handmaiden" || V.PC.actualAge > 16) {
+ slave.counter.birthsTotal = 1;
} else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge));
+ slave.career = "child servant";
+ if (slave.actualAge >= V.fertilityAge + 2) {
+ slave.counter.birthsTotal = 1;
+ }
}
- slave.career = "a child soldier";
+ slave.face = 25;
+ slave.intelligence = random(-50, -16);
slave.intelligenceImplant = 0;
- }
- slave.face = 55;
- slave.intelligence = 100;
- slave.skill.combat = 1;
- } else if (isPCCareerInCategory("engineer")) {
- if (V.PC.career === "engineer" || V.PC.actualAge > 24) {
- slave.actualAge = random(18, 24);
- slave.career = "a saleswoman";
- slave.intelligenceImplant = 30;
- } else if (V.PC.career === "construction" || V.PC.actualAge > 16) {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = random(V.minimumSlaveAge, V.PC.actualAge);
+ slave.skill.oral = 15;
+ slave.skill.entertainment = 0;
+ slave.skill.anal = 15;
+ slave.skill.vaginal = 15;
+ slave.skill.whoring = 0;
+ slave.custom.tattoo = "$He has your Master's brand on $his left breast.";
+ return slave;
+ },
+ gang() {
+ setHostageAge(20, 24);
+ const slave = GenerateNewSlave("XX", params);
+ setCommonProperties(slave);
+ if (V.PC.career === "gang" || V.PC.actualAge > 24) {
+ slave.custom.tattoo = "$He has your former gang's sign tattooed on $his neck.";
+ slave.career = "a gang member";
+ slave.skill.combat = 40;
+ } else if (V.PC.career === "hoodlum" || V.PC.actualAge > 16) {
+ slave.custom.tattoo = "$He has the gang's sign that you rolled with tattooed on $his neck.";
+ slave.career = "a gang member";
+ slave.skill.combat = 40;
} else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge+1));
+ slave.custom.tattoo = "$He has the gang's sign that you associated with tattooed on $his neck.";
+ slave.career = "street urchin";
+ slave.weight = -80;
}
- slave.career = "a saleswoman";
- slave.intelligenceImplant = 15;
- } else {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = V.minimumSlaveAge;
- } else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge));
+ slave.muscles = 40;
+ setHealth(slave, 100, 0, 0, 0, jsRandom(10, 30));
+ return slave;
+ },
+ BlackHat() {
+ setHostageAge(18, 21);
+ if (V.pedo_mode === 1) {
+ params.minAge = Math.min(params.minAge, 12);
+ params.maxAge = Math.min(params.maxAge, 18);
}
- slave.career = "a child prodigy";
- slave.intelligenceImplant = 0;
- }
- slave.face = 100;
- slave.intelligence = 100;
- } else if (isPCCareerInCategory("medicine")) {
- slave.career = "a nurse";
- if (V.PC.career === "medicine" || V.PC.actualAge > 24) {
- slave.actualAge = random(16, 24);
- slave.intelligenceImplant = 30;
- } else if (V.PC.career === "medical assistant" || V.PC.actualAge > 16) {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = random(V.minimumSlaveAge, V.PC.actualAge);
+ const slave = GenerateNewSlave("XX", params);
+ setCommonProperties(slave);
+ slave.career = "a shut-in";
+ if (V.PC.career === "BlackHat" || V.PC.actualAge > 24) {
+ slave.intelligenceImplant = 30;
} else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge+1));
+ slave.intelligenceImplant = 15;
}
- slave.intelligenceImplant = 30;
- } else {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = V.minimumSlaveAge;
+ slave.face = 75;
+ slave.intelligence = 100;
+ return slave;
+ },
+ capitalist() {
+ setHostageAge(18, 24);
+ const slave = GenerateNewSlave("XX", params);
+ setCommonProperties(slave);
+ if (V.PC.career === "capitalist" || V.PC.actualAge > 24) {
+ slave.career = "a manager";
+ slave.intelligenceImplant = 30;
+ } else if (V.PC.career === "entrepreneur" || V.PC.actualAge > 16) {
+ slave.career = "an intern";
+ slave.intelligenceImplant = 15;
} else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge));
+ slave.career = "a student from a private school";
+ slave.intelligenceImplant = 15;
}
- slave.intelligenceImplant = 15;
- }
- slave.face = 55;
- slave.intelligence = 100;
- } else if (isPCCareerInCategory("slaver")) {
- slave.career = "a prison guard";
- if (V.PC.career === "slaver" || V.PC.actualAge > 24) {
- slave.actualAge = random(20, 24);
- } else if (V.PC.career === "slave overseer" || V.PC.actualAge > 16) {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = random(V.minimumSlaveAge, V.PC.actualAge);
+ slave.face = 55;
+ slave.intelligence = 100;
+ return slave;
+ },
+ mercenary() {
+ setHostageAge(20, 24);
+ const slave = GenerateNewSlave("XX", params);
+ setCommonProperties(slave);
+ if (V.PC.career === "mercenary" || V.PC.actualAge > 24) {
+ slave.career = "a soldier";
+ slave.intelligenceImplant = 15;
+ } else if (V.PC.career === "recruit" || V.PC.actualAge > 16) {
+ slave.career = "a soldier";
+ slave.intelligenceImplant = 15;
} else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge+1));
+ slave.career = "a child soldier";
+ slave.intelligenceImplant = 0;
}
- } else {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = V.minimumSlaveAge;
+ slave.face = 55;
+ slave.intelligence = 100;
+ slave.skill.combat = 70;
+ return slave;
+ },
+ engineer() {
+ setHostageAge(18, 24);
+ const slave = GenerateNewSlave("XX", params);
+ setCommonProperties(slave);
+ if (V.PC.career === "engineer" || V.PC.actualAge > 24) {
+ slave.career = "a saleswoman";
+ slave.intelligenceImplant = 30;
+ } else if (V.PC.career === "construction" || V.PC.actualAge > 16) {
+ slave.career = "a saleswoman";
+ slave.intelligenceImplant = 15;
} else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge));
+ slave.career = "a child prodigy";
+ slave.intelligenceImplant = 0;
}
- }
- slave.face = 55;
- slave.intelligence = random(51, 95);
- slave.intelligenceImplant = 0;
- slave.muscles = 20;
- slave.fetish = "sadist";
- slave.fetishStrength = 100;
- slave.fetishKnown = 1;
- } else if (isPCCareerInCategory("celebrity")) {
- if (V.PC.career === "celebrity" || V.PC.actualAge > 24) {
- slave.actualAge = random(18, 24);
- slave.career = "a party girl";
- } else if (V.PC.career === "rising star" || V.PC.actualAge > 16) {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = random(V.minimumSlaveAge, V.PC.actualAge);
+ slave.face = 100;
+ slave.intelligence = 100;
+ return slave;
+ },
+ medicine() {
+ setHostageAge(16, 24);
+ const slave = GenerateNewSlave("XX", params);
+ setCommonProperties(slave);
+ slave.career = "a nurse";
+ if (V.PC.career === "medicine" || V.PC.actualAge > 24) {
+ slave.intelligenceImplant = 30;
+ } else if (V.PC.career === "medical assistant" || V.PC.actualAge > 16) {
+ slave.intelligenceImplant = 30;
} else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge+1));
+ slave.intelligenceImplant = 15;
}
- slave.career = "a party girl";
- } else {
- if (V.PC.actualAge < V.minimumSlaveAge) {
- slave.actualAge = V.minimumSlaveAge;
+ slave.face = 55;
+ slave.intelligence = 100;
+ return slave;
+ },
+ slaver() {
+ setHostageAge(20, 24);
+ const slave = GenerateNewSlave("XX", params);
+ setCommonProperties(slave);
+ slave.career = "a prison guard";
+ slave.face = 55;
+ slave.intelligence = random(51, 95);
+ slave.intelligenceImplant = 0;
+ slave.muscles = 20;
+ slave.fetish = "sadist";
+ slave.fetishStrength = 100;
+ slave.fetishKnown = 1;
+ return slave;
+ },
+ celebrity() {
+ setHostageAge(20, 24);
+ const slave = GenerateNewSlave("XX", params);
+ setCommonProperties(slave);
+ if (V.PC.career === "celebrity" || V.PC.actualAge > 24) {
+ slave.career = "a party girl";
+ } else if (V.PC.career === "rising star" || V.PC.actualAge > 16) {
+ slave.career = "a party girl";
} else {
- slave.actualAge = Math.max(V.minimumSlaveAge, random(V.PC.actualAge-1, V.PC.actualAge));
+ slave.career = "a child actress";
}
- slave.career = "a child actress";
- }
- slave.face = 100;
- slave.intelligence = random(51, 95);
- slave.intelligenceImplant = 0;
- slave.skill.oral = 100;
- slave.skill.entertainment = 100;
- } else if (isPCCareerInCategory("arcology owner")) {
- slave.career = "a leading arcology citizen";
- if (V.pedo_mode === 1) {
- slave.actualAge = random(16, 18);
- } else {
- slave.actualAge = random(36, 39);
+ slave.face = 100;
+ slave.intelligence = random(51, 95);
+ slave.intelligenceImplant = 0;
+ slave.skill.oral = 100;
+ slave.skill.entertainment = 100;
+ return slave;
+ },
+ "arcology owner"() {
+ // fixed age range for this one
+ params.minAge = V.pedo_mode ? 16 : 36;
+ params.maxAge = V.pedo_mode ? 18 : 39;
+ const slave = GenerateNewSlave("XX", params);
+ setCommonProperties(slave);
+ slave.career = "a leading arcology citizen";
+ slave.face = 100;
+ slave.faceImplant = 15;
+ slave.intelligence = 100;
+ slave.intelligenceImplant = 30;
+ slave.skill.whoring = 100;
+ slave.skill.entertainment = 100;
+ return slave;
+ },
+ default() {
+ App.UI.DOM.appendNewElement("p", node, `PC career category "${careerCategory}" not recognized; using default hostage. Report this error.`, ["red"]);
+ setHostageAge(18, 24);
+ const slave = GenerateNewSlave("XX", params);
+ setCommonProperties(slave);
+ return slave;
}
- slave.face = 100;
- slave.faceImplant = 15;
- slave.intelligence = 100;
- slave.intelligenceImplant = 30;
- slave.skill.whoring = 100;
- slave.skill.entertainment = 100;
}
- slave.trust = 0;
- slave.devotion = 0;
- if (V.pedo_mode === 1 && slave.actualAge > 18) {
- slave.actualAge = random(16, 18);
- }
- slave.visualAge = slave.actualAge;
- slave.physicalAge = slave.actualAge;
- slave.ovaryAge = slave.actualAge;
- slave.pubertyXX = 1;
- resyncSlaveHight(slave);
+ const careerCategory = PCCareerCategory();
+ const slave = (HostageFactory[careerCategory] || HostageFactory.default)();
switch (V.rival.FS.name) {
case "Repopulation Focus":
diff --git a/src/events/nonRandom/rival/pRivalryVictory.js b/src/events/nonRandom/rival/pRivalryVictory.js
index e61627a5369772d28c0a572045747e0dc19df3fc..9c7db22975e2c69db3ac114f26fe865e9392e024 100644
--- a/src/events/nonRandom/rival/pRivalryVictory.js
+++ b/src/events/nonRandom/rival/pRivalryVictory.js
@@ -35,6 +35,7 @@ App.Events.pRivalryVictory = function() {
if (V.rival.hostageState === 1) {
V.rival.hostageState = 2;
}
+ V.rival.state = 4;
} else {
r.push(`${HisR} arcology will go to satisfy ${hisR} great debts, but you will still profit <span class="yellowgreen">immensely</span> from your victory${(V.rival.hostageState > 0 && V.hostage) ? `, and acquire ${V.hostage.slaveName} as a slave` : ``}.`);
cashX(random(100000, 250000), "war");
diff --git a/src/events/nonRandom/slaveFood.js b/src/events/nonRandom/slaveFood.js
index 6f4296860d349c1b157c99e5982f79ae80755fd4..08480c1ab33f047118de50337367f25b936b10c4 100644
--- a/src/events/nonRandom/slaveFood.js
+++ b/src/events/nonRandom/slaveFood.js
@@ -51,7 +51,7 @@ App.Events.PSlaveFood = class PSlaveFood extends App.Events.BaseEvent {
r.push(`The goddess beams. "It's wonderful," ${heA} says radiantly. "Their place is here, with us." ${HeA} pauses.`);
break;
case "hypergoddess":
- r.push(`The child filled goddess beams. "It's wonderful," ${heA} says radiantly. "They are like our children, and this arcology our womb; even after they are born they are forever bound to us." ${HeA} pauses.`);
+ r.push(`The child-filled goddess beams. "It's wonderful," ${heA} says radiantly. "They are like our children, and this arcology our womb; even after they are born they are forever bound to us." ${HeA} pauses.`);
break;
case "loli":
r.push(`The little ${girlA} smiles happily while jumping up and down. "So we can be friends forever? That's great!" ${HeA} pauses.`);
diff --git a/src/events/nonRandomEvent.js b/src/events/nonRandomEvent.js
index 099becebf49a6b1e683879ba2605dca226488b07..47b8cecae690e6498619c3c29d399f6cf9c555c9 100644
--- a/src/events/nonRandomEvent.js
+++ b/src/events/nonRandomEvent.js
@@ -55,9 +55,6 @@ App.Events.getNonrandomEvents = function() {
// secExp
new App.Events.secExpSmilingMan0(),
- new App.Events.secExpSmilingMan1(),
- new App.Events.secExpSmilingMan2(),
- new App.Events.secExpSmilingMan3(),
new App.Events.PMercsHelpCorp(),
new App.Events.PMercenaryRomeo(),
diff --git a/src/events/randomEvent.js b/src/events/randomEvent.js
index fa1f6c97e466ad63080ab7e94e1d98aad42b3e8e..dc3fffff62c43ba80cca4211deed8b1115a7d328 100644
--- a/src/events/randomEvent.js
+++ b/src/events/randomEvent.js
@@ -223,6 +223,7 @@ App.Events.getNonindividualEvents = function() {
new App.Events.PECombatTraining(),
new App.Events.PELonelyBodyguard(),
new App.Events.PEAssociatesPublicSlut(),
+ new App.Events.PEFoodplay(),
new App.Events.REDevotees(),
new App.Events.RERelativeRecruiter(),
@@ -250,6 +251,7 @@ App.Events.getNonindividualEvents = function() {
new App.Events.REMaleArcologyOwner(),
new App.Events.REBoomerang(),
new App.Events.REMilfTourist(),
+ new App.Events.REDrunkenTourist(),
new App.Events.REAWOL(),
new App.Events.REPokerNight(),
new App.Events.TrickShotNight(),
@@ -532,7 +534,7 @@ App.Events.playRandomNonindividualEvent = function() {
d.append(App.Events.renderEventDebugger("Random Nonindividual Event"));
} else {
// pick a random nonindividual event. there should always be at least one.
- const maxRecruitNumber = Math.min(10, Math.floor(nonRecEvents.length/4) + 1);
+ const maxRecruitNumber = Math.min(10, Math.floor(nonRecEvents.length / 4) + 1);
if (recEvents.length > maxRecruitNumber) {
recEvents = recEvents.pluckMany(maxRecruitNumber);
}
diff --git a/src/events/reRecruit/desperatePreg.js b/src/events/reRecruit/desperatePreg.js
index 87a87328a0c0e5ed29334483d4b8d1d1c347d2bb..8c629cc4e8aa9ab42c262c271f1972e59b69b578 100644
--- a/src/events/reRecruit/desperatePreg.js
+++ b/src/events/reRecruit/desperatePreg.js
@@ -88,15 +88,15 @@ App.Events.recDesperatePreg = class recDesperatePreg extends App.Events.BaseEven
slave.vagina = 1;
slave.anus = 0;
slave.skill.anal = 0;
+ slave.face = normalRandInt(50, 50, 10, 95);
+ slave.fetish = "none";
+ slave.fetishKnown = 0;
slave.preg = random(30, 39);
slave.pregType = 1;
slave.pregWeek = slave.preg;
slave.pregKnown = 1;
SetBellySize(slave);
- slave.fetish = "none";
- slave.fetishKnown = 0;
setHealth(slave, random(-40, -20), undefined, undefined, undefined, 50);
- slave.face = normalRandInt(50, 50, 10, 95);
return slave;
}
}
diff --git a/src/events/reRecruit/gangLeader.js b/src/events/reRecruit/gangLeader.js
index 794465901fe8972648d32807edc147f7f55bf656..70c990795dd7972b77984aecae428c21e8021f28 100644
--- a/src/events/reRecruit/gangLeader.js
+++ b/src/events/reRecruit/gangLeader.js
@@ -104,7 +104,7 @@ App.Events.recGangLeader = class recGangLeader extends App.Events.BaseEvent {
slave.skill.anal = 0;
slave.skill.oral = 0;
slave.skill.whoring = 0;
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
slave.hLength = random(10, 30);
slave.boobs = 150;
slave.vagina = -1;
diff --git a/src/events/reRecruit/handsomePC.js b/src/events/reRecruit/handsomePC.js
index 70ddc462cab1277f6b1ef7ed34716b1c31dc92cd..425dc48b035ace91e28cf33886a616ab4f0832ea 100644
--- a/src/events/reRecruit/handsomePC.js
+++ b/src/events/reRecruit/handsomePC.js
@@ -39,7 +39,7 @@ App.Events.recHandsomePC = class recHandsomePC extends App.Events.BaseEvent {
} else {
r.push(`"Sweetheart,`);
}
- r.push(`${he} doesn't live here. Look at this." ${heA} pulls up footage of a public event several weeks ago, and the ${girl} is in the crowd, staring at you with limpid eyes. Rather than confronting ${him} directly, you probe the subject, and after some evasion ${he} admits that yes, ${he} did come here out of infatuation with you.`);
+ r.push(`${he} doesn't live here. Look at this." ${HeA} pulls up footage of a public event several weeks ago, and the ${girl} is in the crowd, staring at you with limpid eyes. Rather than confronting ${him} directly, you probe the subject, and after some evasion ${he} admits that yes, ${he} did come here out of infatuation with you.`);
r.push(Spoken(slave, `"Pretty fuckin' stupid,"`));
r.push(`${he} admits.`);
r.push(Spoken(slave, `"But I've come too far now. I just really want to live here. With you, I guess. If that means being your slave, that's okay. Can I be your house servant, maybe?"`));
@@ -87,6 +87,10 @@ App.Events.recHandsomePC = class recHandsomePC extends App.Events.BaseEvent {
slave.trust = random(-15, -10);
setHealth(slave, jsRandom(0, 20), undefined, undefined, 0, 0);
slave.anus = 1;
+ slave.attrXY = random(70, 100);
+ if (slave.behavioralFlaw === "hates men") {
+ slave.behavioralFlaw = "none";
+ }
slave.skill.anal = 15;
slave.skill.oral = 15;
if (slave.vagina > 0) {
diff --git a/src/events/reRecruit/heldPOW.js b/src/events/reRecruit/heldPOW.js
index d2a00ff2fd2404d1a6af1bf48d4bf290826e561a..de2940d522804bfdeff607f9734b128640b42b1a 100644
--- a/src/events/reRecruit/heldPOW.js
+++ b/src/events/reRecruit/heldPOW.js
@@ -103,7 +103,7 @@ App.Events.recHeldPOW = class recHeldPOW extends App.Events.BaseEvent {
slave.muscles = random(-80, 0);
slave.weight = random(-80, -60);
slave.waist = random(-40, -20);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.boobs = random(3, 6) * 100;
slave.behavioralFlaw = "odd";
slave.behavioralQuirk = "insecure";
diff --git a/src/events/reRecruit/maleRecruit.js b/src/events/reRecruit/maleRecruit.js
index 2a4691e207aba175c6c2db569436875da57640b4..f4763a57f047c042a07b0ff1ecc09eeb8ddc20c5 100644
--- a/src/events/reRecruit/maleRecruit.js
+++ b/src/events/reRecruit/maleRecruit.js
@@ -28,6 +28,7 @@ App.Events.recMaleRecruit = class recMaleRecruit extends App.Events.BaseEvent {
App.Events.addParagraph(node, r);
r = [];
r.push(Spoken(slave, `"${title}, my name is ${slave.slaveName}. I'm, um, bored, I guess. I go to clubs and get drunk and fuck guys and it's just kinda boring. I thought it would be different when I turned ${num(slave.actualAge)}, but that was a couple months ago and, well, nothing's different. I saw ${S.HeadGirl.slaveName} and ${he2} was just so beautiful and has a dick like me and ${he2} seemed so confident in what ${he2} was doing and who he was and I talked to ${him2} and ${he} said ${he2} was your Head Girl and... I want to be like ${him2}. Can I be your slave? I'd be good, I'm good at sucking dicks and stuff."`));
+ App.Events.addParagraph(node, r);
const contractCost = 1000;
const cost = slaveCost(slave) - contractCost;
diff --git a/src/events/reRecruit/overwhelmedFarmgirl.js b/src/events/reRecruit/overwhelmedFarmgirl.js
index acdbd4196b3040399b17d8c457e12050d9f10d28..8ea0ae708518418adf83e33ff3723653eee320b4 100644
--- a/src/events/reRecruit/overwhelmedFarmgirl.js
+++ b/src/events/reRecruit/overwhelmedFarmgirl.js
@@ -23,7 +23,7 @@ App.Events.recOverwhelmedFarmgirl = class recOverwhelmedFarmgirl extends App.Eve
const title = (V.PC.title !== 0) ? `Sir` : `Ma'am`;
let r = [];
- r.push(`Your desk flags a video message as having potential. It's a rather homely farmer begging for you to enslave ${him}, not truly unusual given the ever increasing droughts and dangerous weather patterns. Given the huge stomach rounding out ${his} worn clothing, ${he} is likely ready to drop quints and desperately seeking any sort of future for them. You allow ${him} to speak ${his} plea.`);
+ r.push(`Your desk flags a video message as having potential. It's a rather homely farmer begging for you to enslave ${him}, not truly unusual given the ever-increasing droughts and dangerous weather patterns. Given the huge stomach rounding out ${his} worn clothing, ${he} is likely ready to drop quints and desperately seeking any sort of future for them. You allow ${him} to speak ${his} plea.`);
r.push(Spoken(slave, `"Please ${title.toLowerCase()}, I just can't go on out here. I'm always hungry and can barely even work with this belly in the way. I swear, it gets heavier every day and a life of physical labor just won't let me get by. I don't know what I'll do if you say no, so please, have mercy on a poor farmer."`));
App.Events.addParagraph(node, r);
diff --git a/src/events/reRecruit/racerDgChaser.js b/src/events/reRecruit/racerDgChaser.js
index 870b201c87e85540c9c15a9d7d632227d7594424..06347da66a3ad7dc638aee4b96d741a3612ec738 100644
--- a/src/events/reRecruit/racerDgChaser.js
+++ b/src/events/reRecruit/racerDgChaser.js
@@ -74,10 +74,7 @@ App.Events.recRacerDgChaser = class recRacerDgChaser extends App.Events.BaseEven
slave.dick = random(4, 5);
slave.balls = random(3, 4);
slave.scrotum = slave.balls;
- slave.height = random(180, 200);
- if (V.pedo_mode === 1) {
- resyncSlaveHight(slave);
- }
+ slave.height = Height.forAge(random(180, 200), slave);
slave.weight = 0;
slave.muscles = 50;
slave.intelligence = random(-50, 50);
diff --git a/src/events/reRecruit/racerLoser.js b/src/events/reRecruit/racerLoser.js
index a12919bf83a811935289bf3a9ce8d17b92ec3600..dd73371cc025768fe3fad3550d8b152bd2088462 100644
--- a/src/events/reRecruit/racerLoser.js
+++ b/src/events/reRecruit/racerLoser.js
@@ -85,10 +85,7 @@ App.Events.recRacerLoser = class recRacerLoser extends App.Events.BaseEvent {
WombImpregnate(slave, slave.pregType, slave.pregSource, 0);
slave.pubicHStyle = "waxed";
slave.underArmHStyle = "waxed";
- slave.height = random(180, 200);
- if (V.pedo_mode === 1) {
- resyncSlaveHight(slave);
- }
+ slave.height = Height.forAge(random(180, 200), slave);
slave.hips = -1;
slave.butt = 0;
slave.anus = 0;
diff --git a/src/events/reRecruit/racerWinner.js b/src/events/reRecruit/racerWinner.js
index c0c2d5b47d35a67d08050f9c7b89a9d5da4d58cf..7f6fce10e2d4e6554fa7265042981ef848ff8529 100644
--- a/src/events/reRecruit/racerWinner.js
+++ b/src/events/reRecruit/racerWinner.js
@@ -84,6 +84,7 @@ App.Events.recRacerWinner = class recRacerWinner extends App.Events.BaseEvent {
slave.preg = -1;
slave.pubicHStyle = "waxed";
slave.underArmHStyle = "waxed";
+ slave.height = Height.forAge(random(180, 200), slave);
slave.shoulders = random(-1, 1);
slave.hips = -1;
slave.butt = 0;
diff --git a/src/events/reRecruit/rogueCyborg.js b/src/events/reRecruit/rogueCyborg.js
index d3ada4449494a639eded2557bc0f4d5b970c8b62..00e67aaac1abfeb588bf8a5e1fb48afe4b6dd9fc 100644
--- a/src/events/reRecruit/rogueCyborg.js
+++ b/src/events/reRecruit/rogueCyborg.js
@@ -66,7 +66,7 @@ App.Events.recRogueCyborg = class recRogueCyborg extends App.Events.BaseEvent {
setHealth(slave, 100);
slave.weight = random(-11 - 30);
slave.waist = random(-11, -40);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
configureLimbs(slave, "all", 6);
slave.teeth = "pointy";
slave.muscles = random(30, 70);
diff --git a/src/events/reRecruit/shemalePC.js b/src/events/reRecruit/shemalePC.js
index 11142b4a1fad0047bcf38933e639e97c6cc0363a..fb196567cfe5c56d10c8126b136273e955a5abed 100644
--- a/src/events/reRecruit/shemalePC.js
+++ b/src/events/reRecruit/shemalePC.js
@@ -19,7 +19,7 @@ App.Events.recShemalePC = class recShemalePC extends App.Events.BaseEvent {
execute(node) {
const slave = makeSlave();
- const {He, he, his, him, girl} = getPronouns(slave);
+ const {He, he, his, him, himself, girl} = getPronouns(slave);
const {himselfA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
let r = [];
r.push(`${capFirstChar(V.assistant.name)} alerts you that a supplicant has arrived at the door to the penthouse. A constant stream of hopefuls appear at your door, and ${V.assistant.name} makes ${himselfA} invaluable by filtering them. One of the few categories of applicant that is always admitted is people willing to be enslaved for some reason; this is just such a ${girl}.`);
@@ -53,7 +53,7 @@ App.Events.recShemalePC = class recShemalePC extends App.Events.BaseEvent {
const el = new DocumentFragment();
let r = [];
cashX(forceNeg(contractCost), "slaveTransfer", slave);
- r.push(`You put ${him} through the enslavement procedures. ${He} looks relieved, as though ${he} thinks ${he} no longer has anything to worry about. ${He}'s certainly more complacent than the average inductee.`);
+ r.push(`You put ${him} through the enslavement procedures. ${He}'s almost excited. Though ${he} knows ${he}'s signed ${himself} over to a life of sexual slavery, the anticipation of becoming more feminine is clearly more important to ${him} than any kind of fear.`);
r.push(App.UI.newSlaveIntro(slave));
App.Events.addNode(el, r);
return el;
@@ -84,6 +84,8 @@ App.Events.recShemalePC = class recShemalePC extends App.Events.BaseEvent {
slave.balls = random(1, 2);
slave.scrotum = slave.balls;
slave.anus = 1;
+ slave.attrXX = Math.max(slave.attrXX, 70);
+ slave.attrXY = Math.max(slave.attrXY, 70);
slave.skill.anal = 15;
slave.skill.oral = 15;
slave.boobs += 400;
diff --git a/src/events/reRecruit/starvingArtist.js b/src/events/reRecruit/starvingArtist.js
index af85671900c434405883d98873844c542dd06b35..4b62ba3121aa7b07f70b12953d96bc938feace7c 100644
--- a/src/events/reRecruit/starvingArtist.js
+++ b/src/events/reRecruit/starvingArtist.js
@@ -5,7 +5,7 @@ App.Events.recStarvingArtist = class recStarvingArtist extends App.Events.BaseEv
eventPrerequisites() {
return [
- () => V.seeDicks !== 100
+ () => V.rep > 500
];
}
@@ -59,10 +59,7 @@ App.Events.recStarvingArtist = class recStarvingArtist extends App.Events.BaseEv
slave.origin = "$He offered $himself to you for enslavement out of devotion to $his artistic 'craft'.";
slave.boobs = random(4, 6) * 50;
slave.weight = -20;
- slave.height = random(160, 200);
- if (V.pedo_mode === 1) {
- resyncSlaveHight(slave);
- }
+ slave.height = Height.forAge(random(160, 200), slave);
slave.face = random(15, 100);
slave.butt = random(1, 2);
slave.lips = 0;
diff --git a/src/events/reRecruit/whoreRecruit.js b/src/events/reRecruit/whoreRecruit.js
index 80f3d8f95de066c63c46d07e8fd9765c5c2a41ba..9f57776c34b0fb31b13bb4cb59e41298520f8868 100644
--- a/src/events/reRecruit/whoreRecruit.js
+++ b/src/events/reRecruit/whoreRecruit.js
@@ -30,6 +30,7 @@ App.Events.recWhoreRecruit = class recWhoreRecruit extends App.Events.BaseEvent
r = [];
r.push(Spoken(slave, `"${title}, my name is ${slave.slaveName}. I'm a street whore. Working ${girl}s get to know each other, so I know ${S.HeadGirl.slaveName} pretty well. I've been having a bad time on the streets, and last night a john beat on me pretty good. I'm broke and I'm sick of this. Being free isn't worth shit. ${S.HeadGirl.slaveName} likes you and ${he2} seems to do OK. So, can I be your slave? I'm a good bet, ${title.toLowerCase()}. I'd be happy enough working for you as a slave whore if you keep me healthy and safe, and I'm a good fuck."`));
+ App.Events.addParagraph(node, r);
const contractCost = 1000;
const cost = slaveCost(slave) - contractCost;
diff --git a/src/events/reRecruit/womanlyPC.js b/src/events/reRecruit/womanlyPC.js
index 3521828f60c46b8edb36deb7553cbe44b6f182f4..cb3239fcd9d9f1411932043d5460187272d8c04d 100644
--- a/src/events/reRecruit/womanlyPC.js
+++ b/src/events/reRecruit/womanlyPC.js
@@ -20,7 +20,7 @@ App.Events.recWomanlyPC = class recWomanlyPC extends App.Events.BaseEvent {
execute(node) {
const slave = makeSlave();
- const {He, he, his, him, himself, woman} = getPronouns(slave);
+ const {He, he, his, him, woman} = getPronouns(slave);
const {himselfA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
let r = [];
@@ -57,7 +57,7 @@ App.Events.recWomanlyPC = class recWomanlyPC extends App.Events.BaseEvent {
const el = new DocumentFragment();
let r = [];
cashX(forceNeg(contractCost), "slaveTransfer", slave);
- r.push(`You put ${him} through the enslavement procedures. ${He}'s almost excited. Though ${he} knows ${he}'s signed ${himself} over to a life of sexual slavery, the anticipation of becoming more feminine is clearly more important to ${him} than any kind of fear.`);
+ r.push(`You put ${him} through the enslavement procedures. ${He} looks relieved, as though ${he} thinks ${he} no longer has anything to worry about. ${He}'s certainly more complacent than the average inductee.`);
r.push(App.UI.newSlaveIntro(slave));
App.Events.addNode(el, r);
return el;
@@ -86,6 +86,7 @@ App.Events.recWomanlyPC = class recWomanlyPC extends App.Events.BaseEvent {
slave.skill.anal = 0;
slave.skill.oral = 15;
slave.vagina = 1;
+ slave.behavioralFlaw = "hates men";
slave.skill.vaginal = 15;
slave.piercing.ear.weight = either(0, 1);
slave.piercing.navel.weight = either(0, 1);
diff --git a/src/events/recETS/recetsIdenticalHermPair.js b/src/events/recETS/recetsIdenticalHermPair.js
index dec8a9432dac3116e71bc2e5371a96b9d5435d6e..8728ca3e09b1686ce2a1de58fbe188c5facd5535 100644
--- a/src/events/recETS/recetsIdenticalHermPair.js
+++ b/src/events/recETS/recetsIdenticalHermPair.js
@@ -60,9 +60,7 @@ App.Events.recetsIdenticalHermPair = class recetsIdenticalHermPair extends App.E
setMissingParents(thing1);
thing1.canRecruit = 0;
thing1.relationship = 4;
-
- let cost = slaveCost(thing1);
- let contractCost = cost;
+ const contractCost = slaveCost(thing1) * 2;
const thing2 = generateRelatedSlave(thing1, "twin");
thing2.energy = Math.max(thing2.energy, 40);
@@ -106,12 +104,12 @@ App.Events.recetsIdenticalHermPair = class recetsIdenticalHermPair extends App.E
const {He2, sister2} = getPronouns(thing2).appendSuffix("2");
App.Events.addParagraph(node, [
- `A pair of young slaves is going door to door offering themselves for sale on behalf of their owner. It's rare to see a slave obedient enough to be entrusted with their own sale, and the price alone suggests there's something interesting, so you let them up. They stand in front of your desk, an arm around the other, and wait for instructions. They appear to be twins, and are dressed identically: they're wearing very skimpy miniskirts, which fail to conceal their semi erect cocks at all, bikini tops so brief that their areolae are clearly visible around the scrap of cloth over each nipple, and nothing ${V.seePreg ? `over their huge pregnant bellies` : `else to speak of`}. You instruct them to tell you about themselves.`
+ `A pair of young slaves is going door to door offering themselves for sale on behalf of their owner. It's rare to see a slave obedient enough to be entrusted with their own sale, and the price alone suggests there's something interesting, so you let them up. They stand in front of your desk, an arm around the other, and wait for instructions. They appear to be twins, and are dressed identically: they're wearing very skimpy miniskirts, which fail to conceal their semi-erect cocks at all, bikini tops so brief that their areolae are clearly visible around the scrap of cloth over each nipple, and nothing ${V.seePreg ? `over their huge pregnant bellies` : `else to speak of`}. You instruct them to tell you about themselves.`
]);
App.Events.addParagraph(node, [
`They pull themselves together, bringing their ${V.seePreg ? `gravid middles` : `unique bodies`} in tight contact with one another. One of them speaks up.`,
- Spoken(thing1, `"We're twins, ${(V.PC.title !== 0) ? "sir" : "ma'am"}. Identical twins. We've also been trained ${(thing2.actualAge > V.minimumSlaveAge) ? `ever since we turned ${V.minimumSlaveAge}` : ``} to be completely obedient, ${(V.PC.title !== 0) ? "sir" : "ma'am"}, in everything, and sexually proficient."`)
+ Spoken(thing1, `"We're twins, ${(V.PC.title !== 0) ? "sir" : "ma'am"}. Identical twins. We've also been trained ${(thing2.actualAge > V.minimumSlaveAge) ? `ever since we turned ${num(V.minimumSlaveAge)}` : ``} to be completely obedient, ${(V.PC.title !== 0) ? "sir" : "ma'am"}, in everything, and sexually proficient."`)
]);
if (V.seePreg) {
@@ -123,15 +121,15 @@ App.Events.recetsIdenticalHermPair = class recetsIdenticalHermPair extends App.E
}
App.Events.addParagraph(node, [Spoken(thing2, `"We cost ${cashFormat(contractCost)}, ${(V.PC.title !== 0) ? "sir" : "ma'am"}."`)]);
- App.UI.DOM.appendNewElement("p", node, `${His} ${sister2} is identical.`, "detail");
+ App.UI.DOM.appendNewElement("p", node, `${His} ${sister2} is identical.`, ["detail"]);
const newSlaves = [thing1, thing2];
node.append(App.UI.MultipleInspect(newSlaves, true, "generic"));
const choices = [];
- if (V.cash >= (contractCost * 2)) {
- choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost * 2)}`));
+ if (V.cash >= contractCost) {
+ choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave them.`));
}
@@ -139,9 +137,9 @@ App.Events.recetsIdenticalHermPair = class recetsIdenticalHermPair extends App.E
function both() {
newSlave(thing1);
- cashX(forceNeg(contractCost), "slaveTransfer", thing1);
newSlave(thing2);
- cashX(forceNeg(contractCost), "slaveTransfer", thing2);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", thing1);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", thing2);
return [
`They giggle and kiss each other rather passionately, their miniskirts ${V.seePreg ? `becoming pinned against their pregnancies` : `being lifted toward their navels`} by their stiffening pricks. They're very well trained but not very disciplined, though their pervertedness will be fun.`,
Spoken(thing2, `"You know we ${V.seePreg ? `each are carrying the other's twins` : `took each other's virginities`}, right?"`),
diff --git a/src/events/recETS/recetsIdenticalPair.js b/src/events/recETS/recetsIdenticalPair.js
index 8467412741688b15be462974433f36a1dbc32fb0..551ad443bdb640dd50a64fda94e1458e8cbe5113 100644
--- a/src/events/recETS/recetsIdenticalPair.js
+++ b/src/events/recETS/recetsIdenticalPair.js
@@ -53,8 +53,7 @@ App.Events.recetsIdenticalPair = class recetsIdenticalPair extends App.Events.Ba
setMissingParents(thing1);
thing1.canRecruit = 0;
thing1.relationship = 2;
- let cost = slaveCost(thing1);
- const contractCost = cost;
+ const contractCost = slaveCost(thing1) * 2 ;
const thing2 = generateRelatedSlave(thing1, "twin");
thing2.energy = Math.max(thing2.energy, 40);
@@ -73,19 +72,19 @@ App.Events.recetsIdenticalPair = class recetsIdenticalPair extends App.Events.Ba
App.Events.addParagraph(node, [
`One of them speaks up.`,
- Spoken(thing2, `"We're twins, ${(V.PC.title !== 0) ? "sir" : "ma'am"}. Identical twins. We've also been trained ${(thing2.actualAge > V.minimumSlaveAge) ? `ever since we turned ${V.minimumSlaveAge}` : ``} to be completely obedient, ${(V.PC.title !== 0) ? "sir" : "ma'am"}, in everything, and sexually proficient."`)
+ Spoken(thing2, `"We're twins, ${(V.PC.title !== 0) ? "sir" : "ma'am"}. Identical twins. We've also been trained ${(thing2.actualAge > V.minimumSlaveAge) ? `ever since we turned ${num(V.minimumSlaveAge)}` : ``} to be completely obedient, ${(V.PC.title !== 0) ? "sir" : "ma'am"}, in everything, and sexually proficient."`)
]);
App.Events.addParagraph(node, [Spoken(thing2, `"We cost ${cashFormat(contractCost)}, ${(V.PC.title !== 0) ? "sir" : "ma'am"}."`)]);
- App.UI.DOM.appendNewElement("p", node, `${His} ${sister2} is identical.`, "detail");
+ App.UI.DOM.appendNewElement("p", node, `${His} ${sister2} is identical.`, ["detail"]);
const newSlaves = [thing1, thing2];
node.append(App.UI.MultipleInspect(newSlaves, true, "generic"));
const choices = [];
- if (V.cash >= (contractCost * 2)) {
- choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost * 2)}`));
+ if (V.cash >= contractCost) {
+ choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave them.`));
}
@@ -93,9 +92,9 @@ App.Events.recetsIdenticalPair = class recetsIdenticalPair extends App.Events.Ba
function both() {
newSlave(thing1);
- cashX(forceNeg(contractCost), "slaveTransfer", thing1);
newSlave(thing2);
- cashX(forceNeg(contractCost), "slaveTransfer", thing2);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", thing1);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", thing2);
return App.UI.DOM.combineNodes(
`They giggle and kiss each other rather sexually, pressing their nearly identical bodies closely together. They're clearly very well trained.`,
newSlaveIncestSex(thing1, thing2)
diff --git a/src/events/recETS/recetsIncestBrotherBrother.js b/src/events/recETS/recetsIncestBrotherBrother.js
index 6268372492c0142c2ff3b94233d7e9d66db9d7f5..f32c9036ae9b21ea231589f0d2062833c2d5e8a7 100644
--- a/src/events/recETS/recetsIncestBrotherBrother.js
+++ b/src/events/recETS/recetsIncestBrotherBrother.js
@@ -13,7 +13,7 @@ App.Events.recetsIncestBrotherBrother = class recetsIncestBrotherBrother extends
execute(node) {
V.encyclopedia = "Enslaving People";
- const contractCost = 10000;
+ const contractCost = 10000 * 2;
const brother1 = GenerateNewSlave("XY", {
minAge: Math.max(V.potencyAge + 2, V.minimumSlaveAge + 2), maxAge: 20, ageOverridesPedoMode: 1, disableDisability: 1
});
@@ -35,7 +35,6 @@ App.Events.recetsIncestBrotherBrother = class recetsIncestBrotherBrother extends
setMissingParents(brother1);
brother1.canRecruit = 0;
brother1.relationship = 3;
- /* cost not needed, no option to sell */
const brother2 = generateRelatedSlave(brother1, "younger brother");
brother2.height += random(-5, 5);
@@ -55,9 +54,7 @@ App.Events.recetsIncestBrotherBrother = class recetsIncestBrotherBrother extends
brother2.relationshipTarget = brother1.ID;
brother1.relationshipTarget = brother2.ID;
- const {
- sister
- } = getPronouns(brother1);
+ const {sister} = getPronouns(brother1);
const {HeA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
App.Events.addParagraph(node, [`You receive so many messages, as a noted titan of the new Free Cities world, that ${V.assistant.name} has to be quite draconian in culling them. ${HeA} lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.`]);
@@ -66,15 +63,15 @@ App.Events.recetsIncestBrotherBrother = class recetsIncestBrotherBrother extends
App.Events.addParagraph(node, [`${capFirstChar(V.assistant.name)} assembles a dossier of information and photos from information they've sent describing their bodies and skills, to be used as a substitute for an in-person inspection.`]);
- App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost * 2)} to enslave the two of them.`, "detail");
+ App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost)} to enslave the two of them.`, ["detail"]);
const newSlaves = [brother1, brother2];
node.append(App.UI.MultipleInspect(newSlaves, true, "generic"));
const choices = [];
- if (V.cash >= (contractCost * 2)) {
- choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost * 2)}`));
+ if (V.cash >= contractCost) {
+ choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave them.`));
}
@@ -83,8 +80,8 @@ App.Events.recetsIncestBrotherBrother = class recetsIncestBrotherBrother extends
function both() {
newSlave(brother2);
newSlave(brother1);
- cashX(forceNeg(contractCost), "slaveTransfer", brother1);
- cashX(forceNeg(contractCost), "slaveTransfer", brother2);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", brother1);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", brother2);
return [
`They hug each other tightly as the older ${sister} slips a hand down the younger's pants. They ought to be an interesting addition to your penthouse.`,
newSlaveIncestSex(brother1, brother2)
diff --git a/src/events/recETS/recetsIncestBrotherSister.js b/src/events/recETS/recetsIncestBrotherSister.js
index 4ac96e91b55d4f673783576c10733906c2bb4e4c..33d02a20b8d8b5ca1af275345268644bcd6d5e8e 100644
--- a/src/events/recETS/recetsIncestBrotherSister.js
+++ b/src/events/recETS/recetsIncestBrotherSister.js
@@ -14,7 +14,7 @@ App.Events.recetsIncestBrotherSister = class recetsIncestBrotherSister extends A
execute(node) {
V.encyclopedia = "Enslaving People";
- const contractCost = 10000;
+ const contractCost = 10000 * 2;
const sis = GenerateNewSlave("XX", {
minAge: Math.max(V.fertilityAge, V.potencyAge + 2, V.minimumSlaveAge + 2), maxAge: 20, ageOverridesPedoMode: 1, disableDisability: 1
});
@@ -24,6 +24,7 @@ App.Events.recetsIncestBrotherSister = class recetsIncestBrotherSister extends A
sis.trust = random(-15, 15);
sis.oldDevotion = sis.devotion;
sis.ovaries = 1;
+ sis.vagina = 1;
sis.face = random(15, 40);
sis.skill.vaginal = 15;
sis.clothes = "cutoffs and a t-shirt";
@@ -38,7 +39,6 @@ App.Events.recetsIncestBrotherSister = class recetsIncestBrotherSister extends A
setMissingParents(sis);
sis.canRecruit = 0;
sis.relationship = 3;
- /* cost not needed, no option to sell */
const bro = generateRelatedSlave(sis, "younger brother");
bro.pubicHStyle = "shaved";
@@ -82,15 +82,15 @@ App.Events.recetsIncestBrotherSister = class recetsIncestBrotherSister extends A
App.Events.addParagraph(node, [`${capFirstChar(V.assistant.name)} assembles a dossier of information and photos from information they've sent describing their bodies and skills, to be used as a substitute for an in-person inspection.`]);
- App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost * 2)} to enslave the two of them.`, "detail");
+ App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost)} to enslave the two of them.`, ["detail"]);
const newSlaves = [sis, bro];
node.append(App.UI.MultipleInspect(newSlaves, true, "generic"));
const choices = [];
- if (V.cash >= (contractCost * 2)) {
- choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost * 2)}`));
+ if (V.cash >= contractCost) {
+ choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave them.`));
}
@@ -99,8 +99,8 @@ App.Events.recetsIncestBrotherSister = class recetsIncestBrotherSister extends A
function both() {
newSlave(bro);
newSlave(sis);
- cashX(forceNeg(contractCost), "slaveTransfer", sis);
- cashX(forceNeg(contractCost), "slaveTransfer", bro);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", sis);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", bro);
return [
`They cheer happily and hug each other tightly. They ought to be an interesting addition to your penthouse.`,
newSlaveIncestSex(sis, bro)
diff --git a/src/events/recETS/recetsIncestFatherDaughter.js b/src/events/recETS/recetsIncestFatherDaughter.js
index 1feb9d539cbff392c4b18b889039eb97b4ae3616..b45a91f700f868aad58e1988ec70cdc1b6f5b7a6 100644
--- a/src/events/recETS/recetsIncestFatherDaughter.js
+++ b/src/events/recETS/recetsIncestFatherDaughter.js
@@ -15,7 +15,7 @@ App.Events.recetsIncestFatherDaughter = class recetsIncestFatherDaughter extends
execute(node) {
V.encyclopedia = "Enslaving People";
- const contractCost = 10000;
+ const contractCost = 10000 * 2;
const father = GenerateNewSlave("XY", {
minAge: Math.max(V.potencyAge + 20, V.fertilityAge + 20, V.minimumSlaveAge + 20), maxAge: 40, ageOverridesPedoMode: 1, disableDisability: 1
});
@@ -38,7 +38,6 @@ App.Events.recetsIncestFatherDaughter = class recetsIncestFatherDaughter extends
father.behavioralQuirk = "sinful";
father.canRecruit = 0;
father.relationship = 3;
- /* cost not needed, no option to sell */
const daughter = generateRelatedSlave(father, "daughter");
daughter.vagina = 3;
@@ -92,15 +91,15 @@ App.Events.recetsIncestFatherDaughter = class recetsIncestFatherDaughter extends
App.Events.addParagraph(node, [`${capFirstChar(V.assistant.name)} assembles a dossier of information and photos from information they've sent describing their bodies and skills, to be used as a substitute for an in-person inspection.`]);
- App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost*2)} to enslave the two of them.`, "detail");
+ App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost)} to enslave the two of them.`, ["detail"]);
const newSlaves = [father, daughter];
node.append(App.UI.MultipleInspect(newSlaves, true, "generic"));
const choices = [];
- if (V.cash >= (contractCost * 2)) {
- choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost * 2)}`));
+ if (V.cash >= contractCost) {
+ choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave them.`));
}
@@ -109,8 +108,8 @@ App.Events.recetsIncestFatherDaughter = class recetsIncestFatherDaughter extends
function both() {
newSlave(daughter);
newSlave(father);
- cashX(forceNeg(contractCost), "slaveTransfer", father);
- cashX(forceNeg(contractCost), "slaveTransfer", daughter);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", father);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", daughter);
return [
`The ${daughter2} cheers happily and hugs ${his2} relieved father. ${He} leans in and kisses ${him2} deeply. They ought to be an interesting addition to your penthouse.`,
newSlaveIncestSex(father, daughter)
diff --git a/src/events/recETS/recetsIncestFatherSon.js b/src/events/recETS/recetsIncestFatherSon.js
index 44a969d7d21a960001f4d8422158357cbe9de019..50458bd83118316f521bfd5f5e1b318ab8075375 100644
--- a/src/events/recETS/recetsIncestFatherSon.js
+++ b/src/events/recETS/recetsIncestFatherSon.js
@@ -13,7 +13,7 @@ App.Events.recetsIncestFatherSon = class recetsIncestFatherSon extends App.Event
execute(node) {
V.encyclopedia = "Enslaving People";
- const contractCost = 10000;
+ const contractCost = 10000 * 2;
const father = GenerateNewSlave("XY", {
minAge: Math.max(V.potencyAge + 20, V.minimumSlaveAge + 20), maxAge: 40, ageOverridesPedoMode: 1, disableDisability: 1
});
@@ -36,7 +36,6 @@ App.Events.recetsIncestFatherSon = class recetsIncestFatherSon extends App.Event
father.behavioralQuirk = "sinful";
father.canRecruit = 0;
father.relationship = 3;
- /* cost not needed, no option to sell */
const son = generateRelatedSlave(father, "son");
son.career = "a student";
@@ -66,15 +65,15 @@ App.Events.recetsIncestFatherSon = class recetsIncestFatherSon extends App.Event
App.Events.addParagraph(node, [`${capFirstChar(V.assistant.name)} assembles a dossier of information and photos from information they've sent describing their bodies and skills, to be used as a substitute for an in-person inspection.`]);
- App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost * 2)} to enslave the two of them.`, "detail");
+ App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost)} to enslave the two of them.`, ["detail"]);
const newSlaves = [father, son];
node.append(App.UI.MultipleInspect(newSlaves, true, "generic"));
const choices = [];
- if (V.cash >= (contractCost * 2)) {
- choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost * 2)}`));
+ if (V.cash >= contractCost) {
+ choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave them.`));
}
@@ -83,8 +82,8 @@ App.Events.recetsIncestFatherSon = class recetsIncestFatherSon extends App.Event
function both() {
newSlave(son);
newSlave(father);
- cashX(forceNeg(contractCost), "slaveTransfer", father);
- cashX(forceNeg(contractCost), "slaveTransfer", son);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", father);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", son);
return [
`The father hugs ${his} ${daughter2} tight and slips a hand down ${his2} pants. They ought to be an interesting addition to your penthouse.`,
newSlaveIncestSex(father, son)
diff --git a/src/events/recETS/recetsIncestMotherDaughter.js b/src/events/recETS/recetsIncestMotherDaughter.js
index 9d24ea18678e4d4f738c17d998680d3a3cc85f13..bc220e238aff8684bf8388882a0cc9a68f36c569 100644
--- a/src/events/recETS/recetsIncestMotherDaughter.js
+++ b/src/events/recETS/recetsIncestMotherDaughter.js
@@ -13,7 +13,7 @@ App.Events.recetsIncestMotherDaughter = class recetsIncestMotherDaughter extends
execute(node) {
V.encyclopedia = "Enslaving People";
- const contractCost = 10000;
+ const contractCost = 10000 * 2;
const mother = GenerateNewSlave("XX", {
minAge: Math.max(V.fertilityAge + 20, V.minimumSlaveAge + 20), maxAge: 40, ageOverridesPedoMode: 1, disableDisability: 1
});
@@ -47,7 +47,6 @@ App.Events.recetsIncestMotherDaughter = class recetsIncestMotherDaughter extends
mother.behavioralQuirk = "sinful";
mother.canRecruit = 0;
mother.relationship = 3;
- /* cost not needed, no option to sell */
const daughter = generateRelatedSlave(mother, "daughter");
daughter.career = "a student";
@@ -87,15 +86,15 @@ App.Events.recetsIncestMotherDaughter = class recetsIncestMotherDaughter extends
App.Events.addParagraph(node, [`${capFirstChar(V.assistant.name)} assembles a dossier of information and photos from information they've sent describing their bodies and skills, to be used as a substitute for an in-person inspection.`]);
- App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost * 2)} to enslave the two of them.`, "detail");
+ App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost)} to enslave the two of them.`, ["detail"]);
const newSlaves = [mother, daughter];
node.append(App.UI.MultipleInspect(newSlaves, true, "generic"));
const choices = [];
- if (V.cash >= (contractCost * 2)) {
- choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost * 2)}`));
+ if (V.cash >= contractCost) {
+ choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave them.`));
}
@@ -104,8 +103,8 @@ App.Events.recetsIncestMotherDaughter = class recetsIncestMotherDaughter extends
function both() {
newSlave(daughter);
newSlave(mother);
- cashX(forceNeg(contractCost), "slaveTransfer", mother);
- cashX(forceNeg(contractCost), "slaveTransfer", daughter);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", mother);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", daughter);
return [
`The ${daughter2} cheers happily and hugs ${his2} relieved mother. ${He} leans in and kisses ${him2} deeply. They ought to be an interesting addition to your penthouse.`,
newSlaveIncestSex(mother, daughter)
diff --git a/src/events/recETS/recetsIncestMotherSon.js b/src/events/recETS/recetsIncestMotherSon.js
index c4c921ccda5e5bb565bc6513fadcba4d047b445a..4cc7983b64c523863af89e51790b46e96be6357f 100644
--- a/src/events/recETS/recetsIncestMotherSon.js
+++ b/src/events/recETS/recetsIncestMotherSon.js
@@ -14,7 +14,7 @@ App.Events.recetsIncestMotherSon = class recetsIncestMotherSon extends App.Event
execute(node) {
V.encyclopedia = "Enslaving People";
- const contractCost = 10000;
+ const contractCost = 10000 * 2;
const mother = GenerateNewSlave("XX", {
minAge: Math.max(V.fertilityAge + 20, V.potencyAge + 20, V.minimumSlaveAge + 20), maxAge: 40, ageOverridesPedoMode: 1, disableDisability: 1
});
@@ -47,7 +47,6 @@ App.Events.recetsIncestMotherSon = class recetsIncestMotherSon extends App.Event
mother.behavioralQuirk = "sinful";
mother.canRecruit = 0;
mother.relationship = 3;
- /* cost not needed, no option to sell */
const son = generateRelatedSlave(mother, "son");
son.career = "a student";
@@ -82,16 +81,11 @@ App.Events.recetsIncestMotherSon = class recetsIncestMotherSon extends App.Event
WombChangeGene(mother, "motherName", mother.slaveName);
}
- const {
- He,
- his
- } = getPronouns(mother);
+ const {He, his} = getPronouns(mother);
const {
daughter2, his2, him2
} = getPronouns(son).appendSuffix("2");
- const {
- HeA
- } = getPronouns(assistant.pronouns().main).appendSuffix("A");
+ const {HeA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
const children = mother.pregType > 1 ? "children" : "child";
App.Events.addParagraph(node, [`You receive so many messages, as a noted titan of the new Free Cities world, that ${V.assistant.name} has to be quite draconian in culling them. ${HeA} lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.`]);
@@ -100,15 +94,15 @@ App.Events.recetsIncestMotherSon = class recetsIncestMotherSon extends App.Event
App.Events.addParagraph(node, [`${capFirstChar(V.assistant.name)} assembles a dossier of information and photos from information they've sent describing their bodies and skills, to be used as a substitute for an in-person inspection.`]);
- App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost * 2)} to enslave the two of them.`, "detail");
+ App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost)} to enslave the two of them.`, ["detail"]);
const newSlaves = [mother, son];
node.append(App.UI.MultipleInspect(newSlaves, true, "generic"));
const choices = [];
- if (V.cash >= (contractCost * 2)) {
- choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost * 2)}`));
+ if (V.cash >= contractCost) {
+ choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave them.`));
}
@@ -117,8 +111,8 @@ App.Events.recetsIncestMotherSon = class recetsIncestMotherSon extends App.Event
function both() {
newSlave(son);
newSlave(mother);
- cashX(forceNeg(contractCost), "slaveTransfer", mother);
- cashX(forceNeg(contractCost), "slaveTransfer", son);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", mother);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", son);
return [
`The ${daughter2} cheers happily and hugs ${his2} relieved mother. ${He} leans in and kisses ${him2} deeply. They ought to be an interesting addition to your penthouse.`,
newSlaveIncestSex(mother, son)
diff --git a/src/events/recETS/recetsIncestSisterSister.js b/src/events/recETS/recetsIncestSisterSister.js
index ff684f5355d1c16f100e5af37f1e844107e777b6..9c81d5d7d17a61854fc7f588b5db618b2d379f8e 100644
--- a/src/events/recETS/recetsIncestSisterSister.js
+++ b/src/events/recETS/recetsIncestSisterSister.js
@@ -13,7 +13,7 @@ App.Events.recetsIncestSisterSister = class recetsIncestSisterSister extends App
execute(node) {
V.encyclopedia = "Enslaving People";
- const contractCost = 10000;
+ const contractCost = 10000 * 2;
const sis1 = GenerateNewSlave("XX", {
minAge: V.minimumSlaveAge + 2, maxAge: 20, ageOverridesPedoMode: 1, disableDisability: 1
});
@@ -37,7 +37,6 @@ App.Events.recetsIncestSisterSister = class recetsIncestSisterSister extends App
setMissingParents(sis1);
sis1.canRecruit = 0;
sis1.relationship = 3;
- /* cost not needed, no option to sell */
const sis2 = generateRelatedSlave(sis1, "younger sister");
sis2.pubicHStyle = "bushy";
@@ -54,12 +53,8 @@ App.Events.recetsIncestSisterSister = class recetsIncestSisterSister extends App
sis1.relationshipTarget = sis2.ID;
- const {
- sister
- } = getPronouns(sis1);
- const {
- HeA
- } = getPronouns(assistant.pronouns().main).appendSuffix("A");
+ const {sister} = getPronouns(sis1);
+ const {HeA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
App.Events.addParagraph(node, [`You receive so many messages, as a noted titan of the new Free Cities world, that ${V.assistant.name} has to be quite draconian in culling them. ${HeA} lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.`]);
@@ -67,15 +62,15 @@ App.Events.recetsIncestSisterSister = class recetsIncestSisterSister extends App
App.Events.addParagraph(node, [`${capFirstChar(V.assistant.name)} assembles a dossier of information and photos from information they've sent describing their bodies and skills, to be used as a substitute for an in-person inspection.`]);
- App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost * 2)} to enslave the two of them.`, "detail");
+ App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost)} to enslave the two of them.`, ["detail"]);
const newSlaves = [sis1, sis2];
node.append(App.UI.MultipleInspect(newSlaves, true, "generic"));
const choices = [];
- if (V.cash >= (contractCost * 2)) {
- choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost * 2)}`));
+ if (V.cash >= contractCost) {
+ choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave them.`));
}
@@ -84,8 +79,8 @@ App.Events.recetsIncestSisterSister = class recetsIncestSisterSister extends App
function both() {
newSlave(sis2);
newSlave(sis1);
- cashX(forceNeg(contractCost), "slaveTransfer", sis1);
- cashX(forceNeg(contractCost), "slaveTransfer", sis2);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", sis1);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", sis2);
return [
`They cheer happily and hug each other tightly. They ought to be an interesting addition to your penthouse.`,
newSlaveIncestSex(sis1, sis2)
diff --git a/src/events/recETS/recetsIncestTwinBrother.js b/src/events/recETS/recetsIncestTwinBrother.js
index 1606396cb110305e872d6d7bbb0c7d64d97f012a..8ab785f01258588c744138c8b8ef81215b3bfdfa 100644
--- a/src/events/recETS/recetsIncestTwinBrother.js
+++ b/src/events/recETS/recetsIncestTwinBrother.js
@@ -13,7 +13,7 @@ App.Events.recetsIncestTwinBrother = class recetsIncestTwinBrother extends App.E
execute(node) {
V.encyclopedia = "Enslaving People";
- const contractCost = 10000;
+ const contractCost = 10000 * 2;
const brother1 = GenerateNewSlave("XY", {
minAge: Math.max(V.potencyAge, V.minimumSlaveAge), maxAge: 20, ageOverridesPedoMode: 1, disableDisability: 1
});
@@ -47,10 +47,7 @@ App.Events.recetsIncestTwinBrother = class recetsIncestTwinBrother extends App.E
brother2.relationshipTarget = brother1.ID;
brother1.relationshipTarget = brother2.ID;
- const {
- sister
- } = getPronouns(brother1);
-
+ const {sister} = getPronouns(brother1);
const {HeA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
App.Events.addParagraph(node, [`You receive so many messages, as a noted titan of the new Free Cities world, that ${V.assistant.name} has to be quite draconian in culling them. ${HeA} lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.`]);
@@ -59,15 +56,15 @@ App.Events.recetsIncestTwinBrother = class recetsIncestTwinBrother extends App.E
App.Events.addParagraph(node, [`${capFirstChar(V.assistant.name)} assembles a dossier of information and photos from information they've sent describing their bodies and skills, to be used as a substitute for an in-person inspection.`]);
- App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost * 2)} to enslave the two of them.`, "detail");
+ App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost)} to enslave the two of them.`, ["detail"]);
const newSlaves = [brother1, brother2];
node.append(App.UI.MultipleInspect(newSlaves, true, "generic"));
const choices = [];
- if (V.cash >= (contractCost * 2)) {
- choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost * 2)}`));
+ if (V.cash >= contractCost) {
+ choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave them.`));
}
@@ -76,8 +73,8 @@ App.Events.recetsIncestTwinBrother = class recetsIncestTwinBrother extends App.E
function both() {
newSlave(brother2);
newSlave(brother1);
- cashX(forceNeg(contractCost), "slaveTransfer", brother1);
- cashX(forceNeg(contractCost), "slaveTransfer", brother2);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", brother1);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", brother2);
return [
`They hug each other tightly as they slip a hand down the other's pants. They ought to be an interesting addition to your penthouse.`,
newSlaveIncestSex(brother1, brother2)
diff --git a/src/events/recETS/recetsIncestTwinSister.js b/src/events/recETS/recetsIncestTwinSister.js
index 86359872b6232ac9d254533d7227f666c5a69722..091551daba1c0aa53aff34f6db38158740bd63df 100644
--- a/src/events/recETS/recetsIncestTwinSister.js
+++ b/src/events/recETS/recetsIncestTwinSister.js
@@ -13,7 +13,7 @@ App.Events.recetsIncestTwinSister = class recetsIncestTwinSister extends App.Eve
execute(node) {
V.encyclopedia = "Enslaving People";
- const contractCost = 10000;
+ const contractCost = 10000 * 2;
const sis1 = GenerateNewSlave("XX", {
minAge: Math.max(V.fertilityAge, V.minimumSlaveAge), maxAge: 20, ageOverridesPedoMode: 1, disableDisability: 1
});
@@ -36,7 +36,6 @@ App.Events.recetsIncestTwinSister = class recetsIncestTwinSister extends App.Eve
setMissingParents(sis1);
sis1.canRecruit = 0;
sis1.relationship = 3;
- /* cost not needed, no option to sell */
const sis2 = generateRelatedSlave(sis1, "twin");
sis2.slaveName = sis2.birthName;
@@ -51,10 +50,7 @@ App.Events.recetsIncestTwinSister = class recetsIncestTwinSister extends App.Eve
sis1.relationshipTarget = sis2.ID;
const {sister} = getPronouns(sis1);
-
- const {
- HeA
- } = getPronouns(assistant.pronouns().main).appendSuffix("A");
+ const {HeA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
App.Events.addParagraph(node, [`You receive so many messages, as a noted titan of the new Free Cities world, that ${V.assistant.name} has to be quite draconian in culling them. ${HeA} lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.`]);
@@ -62,15 +58,15 @@ App.Events.recetsIncestTwinSister = class recetsIncestTwinSister extends App.Eve
App.Events.addParagraph(node, [`${capFirstChar(V.assistant.name)} assembles a dossier of information and photos from information they've sent describing their bodies and skills, to be used as a substitute for an in-person inspection.`]);
- App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost * 2)} to enslave the two of them.`, "detail");
+ App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost)} to enslave the two of them.`, ["detail"]);
const newSlaves = [sis1, sis2];
node.append(App.UI.MultipleInspect(newSlaves, true, "generic"));
const choices = [];
- if (V.cash >= (contractCost * 2)) {
- choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost * 2)}`));
+ if (V.cash >= contractCost) {
+ choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave them.`));
}
@@ -79,8 +75,8 @@ App.Events.recetsIncestTwinSister = class recetsIncestTwinSister extends App.Eve
function both() {
newSlave(sis2);
newSlave(sis1);
- cashX(forceNeg(contractCost), "slaveTransfer", sis1);
- cashX(forceNeg(contractCost), "slaveTransfer", sis2);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", sis1);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", sis2);
return [
`They cheer happily and hug each other tightly. They ought to be an interesting addition to your penthouse.`,
newSlaveIncestSex(sis1, sis2)
diff --git a/src/events/recETS/recetsIncestTwinsMixed.js b/src/events/recETS/recetsIncestTwinsMixed.js
index 7ce1c60997e0e337fdf09cb3d11c856c26d51c9a..b8f46f391e77f63a4c5b6854ae8a61af278e4013 100644
--- a/src/events/recETS/recetsIncestTwinsMixed.js
+++ b/src/events/recETS/recetsIncestTwinsMixed.js
@@ -14,7 +14,7 @@ App.Events.recetsIncestTwinsMixed = class recetsIncestTwinsMixed extends App.Eve
execute(node) {
V.encyclopedia = "Enslaving People";
- const contractCost = 10000;
+ const contractCost = 10000 * 2;
const sis = GenerateNewSlave("XX", {
minAge: Math.max(V.fertilityAge, V.potencyAge, V.minimumSlaveAge), maxAge: 20, ageOverridesPedoMode: 1, disableDisability: 1
});
@@ -38,7 +38,6 @@ App.Events.recetsIncestTwinsMixed = class recetsIncestTwinsMixed extends App.Eve
setMissingParents(sis);
sis.canRecruit = 0;
sis.relationship = 3;
- /* cost not needed, no option to sell */
const bro = generateRelatedSlave(sis, "twin", true);
bro.height += random(-5, 5);
@@ -63,7 +62,7 @@ App.Events.recetsIncestTwinsMixed = class recetsIncestTwinsMixed extends App.Eve
bro.clothes = "conservative clothing";
bro.relationship = 3;
bro.relationshipTarget = sis.ID;
-
+
sis.relationshipTarget = bro.ID;
if (V.seePreg) {
@@ -78,10 +77,8 @@ App.Events.recetsIncestTwinsMixed = class recetsIncestTwinsMixed extends App.Eve
WombChangeGene(sis, "motherName", sis.slaveName);
}
+ const {he, his} = getPronouns(sis);
const {HeA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
- const {
- he, his
- } = getPronouns(sis);
const children = sis.pregType > 1 ? "children" : "child";
App.Events.addParagraph(node, [`You receive so many messages, as a noted titan of the new Free Cities world, that ${V.assistant.name} has to be quite draconian in culling them. ${HeA} lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.`]);
@@ -90,15 +87,15 @@ App.Events.recetsIncestTwinsMixed = class recetsIncestTwinsMixed extends App.Eve
App.Events.addParagraph(node, [`${capFirstChar(V.assistant.name)} assembles a dossier of information and photos from information they've sent describing their bodies and skills, to be used as a substitute for an in-person inspection.`]);
- App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost * 2)} to enslave the two of them.`, "detail");
+ App.UI.DOM.appendNewElement("p", node, `It would cost ${cashFormat(contractCost)} to enslave the two of them.`, ["detail"]);
const newSlaves = [sis, bro];
node.append(App.UI.MultipleInspect(newSlaves, true, "generic"));
const choices = [];
- if (V.cash >= (contractCost * 2)) {
- choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost * 2)}`));
+ if (V.cash >= contractCost) {
+ choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave them.`));
}
@@ -107,8 +104,8 @@ App.Events.recetsIncestTwinsMixed = class recetsIncestTwinsMixed extends App.Eve
function both() {
newSlave(bro);
newSlave(sis);
- cashX(forceNeg(contractCost), "slaveTransfer", sis);
- cashX(forceNeg(contractCost), "slaveTransfer", bro);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", sis);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", bro);
return [
`They cheer happily and hug each other tightly. They ought to be an interesting addition to your penthouse.`,
newSlaveIncestSex(sis, bro)
diff --git a/src/events/recETS/recetsMatchedPair.js b/src/events/recETS/recetsMatchedPair.js
index 84dd394ec1bd703545464342ff51e48947520d6d..27ffa9b7645aa30a94a4647d429436711873e265 100644
--- a/src/events/recETS/recetsMatchedPair.js
+++ b/src/events/recETS/recetsMatchedPair.js
@@ -13,7 +13,6 @@ App.Events.recetsMatchedPair = class recetsMatchedPair extends App.Events.BaseEv
execute(node) {
V.encyclopedia = "Enslaving People";
- /* contractCost not needed, no option to sell */
const sis1 = GenerateNewSlave("XY", {minAge: 12, maxAge: 21, disableDisability: 1});
sis1.origin = "$He was brought up in a radical slave school to match $his twin.";
sis1.career = "a slave";
@@ -55,8 +54,7 @@ App.Events.recetsMatchedPair = class recetsMatchedPair extends App.Events.BaseEv
setMissingParents(sis1);
sis1.canRecruit = 0;
sis1.relationship = 2;
- let cost = slaveCost(sis1);
- let contractCost = cost;
+ const contractCost = slaveCost(sis1) * 2;
const sis2 = generateRelatedSlave(sis1, "twin", true);
sis2.vagina = 1;
@@ -82,9 +80,7 @@ App.Events.recetsMatchedPair = class recetsMatchedPair extends App.Events.BaseEv
sis1.relationshipTarget = sis2.ID;
const {His, his} = getPronouns(sis1);
- const {
- he2, sister2,
- } = getPronouns(sis2).appendSuffix("2");
+ const {he2, sister2} = getPronouns(sis2).appendSuffix("2");
let r = [];
@@ -104,15 +100,15 @@ App.Events.recetsMatchedPair = class recetsMatchedPair extends App.Events.BaseEv
r = [];
r.push(Spoken(sis2, `"We cost ${cashFormat(contractCost)}, ${(V.PC.title !== 0) ? "sir" : "ma'am"}."`));
App.Events.addParagraph(node, r);
- App.UI.DOM.appendNewElement("p", node, `${His} ${sister2} is identical except that ${he2} is naturally female and lacks implants, having reached that size the normal way.`, "detail");
+ App.UI.DOM.appendNewElement("p", node, `${His} ${sister2} is identical except that ${he2} is naturally female and lacks implants, having reached that size the normal way.`, ["detail"]);
const newSlaves = [sis1, sis2];
node.append(App.UI.MultipleInspect(newSlaves, true, "generic"));
const choices = [];
- if (V.cash >= (contractCost * 2)) {
- choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost * 2)}`));
+ if (V.cash >= contractCost) {
+ choices.push(new App.Events.Result(`Buy them both`, both, `This will cost ${cashFormat(contractCost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave them.`));
}
@@ -120,9 +116,9 @@ App.Events.recetsMatchedPair = class recetsMatchedPair extends App.Events.BaseEv
function both() {
newSlave(sis1);
- cashX(forceNeg(contractCost), "slaveTransfer", sis1);
newSlave(sis2);
- cashX(forceNeg(contractCost), "slaveTransfer", sis2);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", sis1);
+ cashX(forceNeg(contractCost / 2), "slaveTransfer", sis2);
return [
`They giggle and kiss each other rather sexually, pressing their nearly identical bodies closely together so their hips and shapely buttocks hide any sign of their difference. They're clearly very well trained.`,
newSlaveIncestSex(sis1, sis2)];
diff --git a/src/events/recETS/recetsMismatchedPair.js b/src/events/recETS/recetsMismatchedPair.js
index a29631effe56604bfe04022b766f361968227133..eb07df36e443b4edc4acae61e8829f6939a66ab7 100644
--- a/src/events/recETS/recetsMismatchedPair.js
+++ b/src/events/recETS/recetsMismatchedPair.js
@@ -141,8 +141,8 @@ App.Events.recetsMismatchedPair = class recetsMismatchedPair extends App.Events.
function both() {
newSlave(bro);
- cashX(forceNeg(contractCost), "slaveTransfer", bro);
newSlave(sis);
+ cashX(forceNeg(contractCost), "slaveTransfer", bro);
cashX(forceNeg(contractCost), "slaveTransfer", sis);
const frag = new DocumentFragment();
App.Events.addParagraph(frag, [`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. ${bro.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.`]);
diff --git a/src/events/recETS/recetsPoshMotherDaughter.js b/src/events/recETS/recetsPoshMotherDaughter.js
index 1ed9aff9edb3324ad044f672b8328597b8b3c256..7feaaee95e718172cad705d56e040433c9d9e1ee 100644
--- a/src/events/recETS/recetsPoshMotherDaughter.js
+++ b/src/events/recETS/recetsPoshMotherDaughter.js
@@ -53,7 +53,17 @@ App.Events.recetsPoshMotherDaughter = class recetsPoshMotherDaughter extends App
daught.trust -= 10;
daught.oldDevotion = daught.devotion;
daught.oldTrust = daught.trust;
- daught.boobs = Math.max(daught.boobs - 200, 0);
+ daught.boobs = Math.max(daught.boobs - 200, 100);
+ if (daught.boobs >= 400) { // if daughter is physically mature enough to have at least natural B-cups, she's had them enhanced
+ daught.boobs += 200;
+ daught.boobsImplant = 200;
+ daught.boobsImplantType = "normal";
+ } else { // otherwise, clear implants inherited from mother's data
+ daught.boobsImplant = 0;
+ daught.boobsImplantType = "none";
+ }
+ daught.buttImplant = 0;
+ daught.buttImplantType = "none";
daught.anus = 0;
daught.skill.vaginal = 0;
@@ -107,7 +117,7 @@ App.Events.recetsPoshMotherDaughter = class recetsPoshMotherDaughter extends App
mother.devotion -= 25;
r.push(`You press your thumb down on your desk interface and then tell ${him} to read the display, strip, and show you ${his} body. ${He} knits ${his} brow in confusion and begins to curse at you but reads anyway. Comprehension dawns on ${him} and ${he} stares you in the eye for a long moment — and then drops to`);
- if (hasBothLegs(daught)) {
+ if (hasBothLegs(mother)) {
r.push(`${his} knees`);
} else {
r.push(`the floor`);
diff --git a/src/events/recFS/recfsBodyPurist.js b/src/events/recFS/recfsBodyPurist.js
index 4083596c9573a2eae8256372dd5ca4fe71b29de6..f9f11314a9d2210f85c24f3b910fc51837ef26f5 100644
--- a/src/events/recFS/recfsBodyPurist.js
+++ b/src/events/recFS/recfsBodyPurist.js
@@ -19,6 +19,7 @@ App.Events.recFSBodyPurist = class recFSBodyPurist extends App.Events.BaseEvent
his, he, him, himself
} = getPronouns(slave);
const {HeA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
+ const {title: Master, say} = getEnunciation(slave);
const contractCost = 1000;
const cost = slaveCost(slave) - contractCost;
r.push(`You receive so many messages, as a noted titan of the new Free Cities world, that ${V.assistant.name} has to be quite draconian in culling them. ${HeA} lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.`);
@@ -46,8 +47,8 @@ App.Events.recFSBodyPurist = class recFSBodyPurist extends App.Events.BaseEvent
function enslave() {
const frag = new DocumentFragment();
r = [];
- r.push(`When ${he} arrives, it's obvious that ${he} isn't particularly happy with the situation, but there is some evident relief to ${him}. When asked about it, ${he} says,`);
- r.push(Spoken(slave, `"I really hate the idea of surgery, especially implant surgery, ${getWrittenTitle(slave)}. Just — the idea of having fake shit in here —"`));
+ r.push(`When ${he} arrives, it's obvious that ${he} isn't particularly happy with the situation, but there is some evident relief to ${him}. When asked about it, ${he} ${say}s,`);
+ r.push(Spoken(slave, `"I really hate the idea of surgery, especially implant surgery, ${Master}. Just — the idea of having fake shit in here —"`));
r.push(`${he} rubs ${his} chest a little`);
r.push(Spoken(slave, `"— Ugh."`));
r.push(`${He} laughs bitterly at ${himself}, and then rubs ${his} chest again, looking at you with mixed fear and invitation.`);
diff --git a/src/events/recFS/recfsChattelReligionist.js b/src/events/recFS/recfsChattelReligionist.js
index 1fffa066d8b57294d5b1451231dc4a4789ea9f97..ed074148f9c96dd53d52a73a303d0fdc00754772 100644
--- a/src/events/recFS/recfsChattelReligionist.js
+++ b/src/events/recFS/recfsChattelReligionist.js
@@ -19,7 +19,7 @@ App.Events.recFSChattelReligionist = class recFSChattelReligionist extends App.E
const {
He,
- his, he, him, himself, girl
+ his, he, him, himself, girl, woman
} = getPronouns(slave);
const {HeA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
const contractCost = 1000;
@@ -49,7 +49,7 @@ App.Events.recFSChattelReligionist = class recFSChattelReligionist extends App.E
function enslave() {
const frag = new DocumentFragment();
r = [];
- r.push(`${He} lets out a convulsive sob when you accept ${his} servitude, and is painfully obsequious as you complete the formalities of enslavement. Your exam reveals several minor indications of self-harm — chewed nails, bitten lips, and such. But for all that, a remarkable look of peace has settled on the poor woman's face. ${He} waits patiently for a hint of your will,`);
+ r.push(`${He} lets out a convulsive sob when you accept ${his} servitude, and is painfully obsequious as you complete the formalities of enslavement. Your exam reveals several minor indications of self-harm — chewed nails, bitten lips, and such. But for all that, a remarkable look of peace has settled on the poor ${woman}'s face. ${He} waits patiently for a hint of your will,`);
if (canAchieveErection(slave)) {
r.push(`${his} cock painfully erect`);
} else if (slave.dick > 0) {
diff --git a/src/events/recFS/recfsNeoImperialist.js b/src/events/recFS/recfsNeoImperialist.js
index f84bbaa8bf2fc881ba9fc7a1b5a415b814e26008..5a1d4faa0f7baa4edc5e95ed820a1695d7c3f3f8 100644
--- a/src/events/recFS/recfsNeoImperialist.js
+++ b/src/events/recFS/recfsNeoImperialist.js
@@ -26,7 +26,7 @@ App.Events.recFSNeoImperialist = class recFSNeoImperialist extends App.Events.Ba
slave.face = random(15, 50);
slave.skill.whoring = 0;
slave.skill.entertainment = 0;
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.intelligence = random(-50, 50);
slave.intelligenceImplant = 0;
slave.teeth = "normal";
diff --git a/src/events/recFS/recfsPastoralistTwo.js b/src/events/recFS/recfsPastoralistTwo.js
index 70f314e17507f939ba99f67b47ba9a3da57ecfb8..128971114480ff836df1d5ebe610dbc96918ea6c 100644
--- a/src/events/recFS/recfsPastoralistTwo.js
+++ b/src/events/recFS/recfsPastoralistTwo.js
@@ -64,7 +64,7 @@ App.Events.recFSPastoralistTwo = class recFSPastoralistTwo extends App.Events.Ba
function enslave() {
const frag = new DocumentFragment();
r = [];
- r.push(`${He} speaks to you as a free ${woman} while working through the enslavement process, perhaps ${he} hasn't quite grasped ${his} new role. Nonetheless, it seems as if a vast weight has been lifted from ${his} shoulders. You've seen this before, the perverse internal freedom that comes with the knowledge that ${his} life is in the hands of another now, and that all ${he} has to do or can do is obey. ${His} last words to you as a free ${woman} are an ironic statement that, people always praised ${his} milk filled udders as givers of life, yet ${he} never thought they'd save ${hers} one day.`);
+ r.push(`${He} speaks to you as a free ${woman} while working through the enslavement process, perhaps ${he} hasn't quite grasped ${his} new role. Nonetheless, it seems as if a vast weight has been lifted from ${his} shoulders. You've seen this before, the perverse internal freedom that comes with the knowledge that ${his} life is in the hands of another now, and that all ${he} has to do or can do is obey. ${His} last words to you as a free ${woman} are an ironic statement that, people always praised ${his} milk-filled udders as givers of life, yet ${he} never thought they'd save ${hers} one day.`);
r.push(App.UI.newSlaveIntro(slave));
App.Events.addParagraph(frag, r);
diff --git a/src/events/recFS/recfsPetiteAdmiration.js b/src/events/recFS/recfsPetiteAdmiration.js
index cdf852ec1acdd6c4691df6aa9d8396f10890ee47..c016347525bcdf4ff3badbea79524b455ee4740e 100644
--- a/src/events/recFS/recfsPetiteAdmiration.js
+++ b/src/events/recFS/recfsPetiteAdmiration.js
@@ -11,12 +11,12 @@ App.Events.recFSPetiteAdmiration = class recFSPetiteAdmiration extends App.Event
const slave = GenerateNewSlave(null, {minAge: 13, maxAge: 22, disableDisability: 1});
generateSalonModifications(slave);
slave.origin = "$He offered $himself for voluntary enslavement to avoid being singled out by ruthless slavers.";
- if (slave.height >= 150) {
+ if (slave.height >= Height.forAge(150, slave)) {
slave.height = Height.random(slave, {limitMult: [-2, 0]});
- if (slave.height >= 150) {
+ if (slave.height >= Height.forAge(150, slave)) {
slave.height = Height.random(slave, {limitMult: [-3, -1]});
- if (slave.height >= 150) {
- slave.height = random(90, 130);
+ if (slave.height >= Height.forAge(150, slave)) {
+ slave.height = Height.forAge(random(90, 130), slave);
slave.geneticQuirks.dwarfism = 2;
}
}
diff --git a/src/events/recFS/recfsSlaveProfessionalismTwo.js b/src/events/recFS/recfsSlaveProfessionalismTwo.js
index 279bf95f1257094f7b426bbde0cc69aff122b402..644ca6c9a876142295210c6feb1b25c72df669cc 100644
--- a/src/events/recFS/recfsSlaveProfessionalismTwo.js
+++ b/src/events/recFS/recfsSlaveProfessionalismTwo.js
@@ -27,7 +27,7 @@ App.Events.recFSSlaveProfessionalismTwo = class recFSSlaveProfessionalismTwo ext
slave.skill.anal = 100;
slave.skill.whoring = 100;
slave.skill.entertainment = 100;
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
slave.behavioralFlaw = "none";
slave.sexualFlaw = "none";
diff --git a/src/events/recFS/recfsStatuesqueGlorification.js b/src/events/recFS/recfsStatuesqueGlorification.js
index 7a121fd57258b9d4637ba13786cb39fa86ad18e2..a8701cd3b7b499207e9c4cdb148589c803017a85 100644
--- a/src/events/recFS/recfsStatuesqueGlorification.js
+++ b/src/events/recFS/recfsStatuesqueGlorification.js
@@ -18,7 +18,7 @@ App.Events.recFSStatuesqueGlorification = class recFSStatuesqueGlorification ext
const slave = GenerateNewSlave(null, {disableDisability: 1});
generateSalonModifications(slave);
slave.origin = "$He offered $himself for voluntary enslavement to avoid being singled out by ruthless slavers.";
- slave.height = random(200, 264);
+ slave.height = Height.forAge(random(200, 264), slave);
setHealth(slave, jsRandom(20, 40), undefined, undefined, 0, 0);
slave.geneticQuirks.gigantism = 2;
slave.devotion = random(15, 20);
diff --git a/src/events/scheduled/assholeKnight.js b/src/events/scheduled/assholeKnight.js
index c93aa374234e9602b98faaeb4859978b2f181c73..98014450cd255ce3def4a3e0de6e0eeefd78d4ce 100644
--- a/src/events/scheduled/assholeKnight.js
+++ b/src/events/scheduled/assholeKnight.js
@@ -11,58 +11,68 @@ App.Events.SEAssholeKnight = class SEAssholeKnight extends App.Events.BaseEvent
V.assholeKnight = 1;
V.imperialEventWeek = App.Events.effectiveWeek();
+ const assholeKnight = GenerateNewSlave(V.seeDicks > 0 ? "XY" : "XX", {minAge: 22, maxAge: 34, disableDisability: 1});
+ assholeKnight.prestige = 1;
+ assholeKnight.prestigeDesc = "$He was formerly an Imperial Knight, a highly prestigious position indicating both nobility and exceptional combat prowess. Although $he has had $his coat of arms stripped, many still recognize $him from his former Knighthood.";
+ assholeKnight.origin = "$He used to be a Knight within your arcology, until you had $him stripped of $his title and summarily enslaved for cruelly abusing citizens beneath $his stature.";
+ assholeKnight.career = "spec ops";
+ assholeKnight.devotion = random(-80, -60);
+ assholeKnight.muscles = random(50, 75);
+ assholeKnight.skill.combat = 100;
+ assholeKnight.sexualFlaw = "malicious";
+ assholeKnight.behavioralQuirk = "none";
+ assholeKnight.trust = random(-30, -20);
+ assholeKnight.butt = random(0, 1);
+ assholeKnight.height = random(175, 195);
+ assholeKnight.fetish = "sadist";
+ assholeKnight.fetishStrength = 80;
+ assholeKnight.preg = 0;
+ if (assholeKnight.genes === "XY") {
+ assholeKnight.faceShape = "masculine";
+ assholeKnight.dick = random(3, 5);
+ assholeKnight.balls = random(2, 4);
+ assholeKnight.scrotum = assholeKnight.balls;
+ assholeKnight.boobs = 150;
+ } else {
+ assholeKnight.faceShape = "androgynous";
+ assholeKnight.vagina = 0;
+ assholeKnight.boobs = Math.min(assholeKnight.boobs, 450);
+ }
+ assholeKnight.accent = random(0, 1);
+
+ const {he, his, him, woman} = getPronouns(assholeKnight);
+
+ App.Events.drawEventArt(node, assholeKnight, "Imperial Plate");
+
App.Events.addParagraph(node, [`The group of citizens you hand-picked as your Knights have quickly proven themselves a reliable staple of the Arcology. Being visibly a league above the common citizen with their heavy Imperial Plate decorated with glimmering pendants and marks of their individual, flowery coats of arms, their mere presence is enough to make most common criminals cower and keep merchants selling their wares at fair prices. The tenets of neo-Imperial hierarchy and their own social prestige have already gone to their heads, and many Knights are now recognized immediately by the common citizens as heroic, uncowed citizen-soldiers.`]);
App.Events.addParagraph(node, [`Despite the noble reputations of many of your Knights, their image as defenders of the downtrodden and honest protectors of the Arcology is not universal. Although you Knighted every last one of them yourself, it seems you might have made a misjudgment on the character of one of your new servants; a stream of minor offenses from one Knight in particular has been building up in your inbox for quite some time, and reviewing the whole dossier now paints a portrait of abuses and misconduct.`]);
- App.Events.addParagraph(node, [`This singular Knight has apparently been using their position to extort and bully the populace, demanding unreasonably steep discounts from merchants and regularly beating the peasantry - often for no reason other than momentary amusement, and treating them as "less than even slaves". A number of frustrated citizens have sent you a petition demanding that you denounce and punish them for their petty offenses - a picture of a woman with her face blurred out and a trail of bruises over every inch of her naked body is attached. No names have been attached to the petition, apparently for fear of what the Knight in question will do to them should their attempts be uncovered. Whatever you decide to do with this man will undoubtedly set the precedent for how you deal with Knights who abuse their station in the future.`]);
+ App.Events.addParagraph(node, [`This singular Knight has apparently been using ${his} position to extort and bully the populace, demanding unreasonably steep discounts from merchants and regularly beating the peasantry - often for no reason other than momentary amusement, and treating them as "less than even slaves". A number of frustrated citizens have sent you a petition demanding that you denounce and punish ${him} for ${his} petty offenses - a picture of a woman with her face blurred out and a trail of bruises over every inch of her naked body is attached. No names have been attached to the petition, apparently for fear of what the Knight in question will do to them should their attempts be uncovered. Whatever you decide to do with this ${woman} will undoubtedly set the precedent for how you deal with Knights who abuse their station in the future.`]);
const choices = [];
- choices.push(new App.Events.Result(`Remove his title and confiscate his weapons`, demTitles));
- choices.push(new App.Events.Result(`Have him publicly flogged, then enslaved`, flogMeat));
+ choices.push(new App.Events.Result(`Remove ${his} title and confiscate ${his} weapons`, demTitles));
+ choices.push(new App.Events.Result(`Have ${him} publicly flogged, then enslaved`, flogMeat));
choices.push(new App.Events.Result(`Turn a blind eye`, blindInjustice));
App.Events.addResponses(node, choices);
function demTitles() {
repX(2500, "event");
- return `You have the insolent Knight's plate armor confiscated, his apartment seized and his right to bear a coat of arms redacted. The knight is nothing short of utterly furious, but puts up no fight as your guards seize his advanced weaponry; to do so would be suicidal. While he swears revenge against you for taking away his "noble rights", you receive a letter from a relieved merchant <span class="green">thanking you</span> for putting the jumped-up bandit down.`;
+ return `You have the insolent Knight's plate armor confiscated, ${his} apartment seized and ${his} right to bear a coat of arms redacted. The knight is nothing short of utterly furious, but puts up no fight as your guards seize ${his} advanced weaponry; to do so would be suicidal. While ${he} swears revenge against you for taking away ${his} "noble rights", you receive a letter from a relieved merchant <span class="green">thanking you</span> for putting the jumped-up bandit down.`;
}
function flogMeat() {
const frag = new DocumentFragment();
let r = [];
- r.push(`You have the insolent Knight's gear and weapons confiscated, then publicly flog him in the plaza and announce that he's to be enslaved for crimes against the people of ${V.arcologies[0].name}. Although the watching peasants are clearly <span class="green">relieved</span> that the cruel bully is off the streets, some of them, those who did not feel the fist of the howling man on their own neck, <span class="red">recoil</span> somewhat at the sudden brutality against a class that most of them idolize and romanticize.`);
+ r.push(`You have the insolent Knight's gear and weapons confiscated, then publicly flog ${him} in the plaza and announce that ${he}'s to be enslaved for crimes against the people of ${V.arcologies[0].name}. Although the watching peasants are clearly <span class="green">relieved</span> that the cruel bully is off the streets, some of them, those who did not feel the fist of the howling ${woman} on their own neck, <span class="red">recoil</span> somewhat at the sudden brutality against a class that most of them idolize and romanticize.`);
repX(1000, "event");
- const assholeKnight = GenerateNewSlave("XY", {minAge: 22, maxAge: 34, disableDisability: 1});
- assholeKnight.prestige = 1;
- assholeKnight.prestigeDesc = "$He was formerly an Imperial Knight, a highly prestigious position indicating both nobility and exceptional combat prowess. Although $he has had $his coat of arms stripped, many still recognize $him from his former Knighthood.";
- assholeKnight.origin = "$He used to be a Knight within your arcology, until you had $him stripped of $his title and summarily enslaved for cruelly abusing citizens beneath $his stature.";
- assholeKnight.career = "spec ops";
- assholeKnight.devotion = random(-80, -60);
- assholeKnight.muscles = random(50, 75);
- assholeKnight.skill.combat = 1;
- assholeKnight.sexualFlaw = "malicious";
- assholeKnight.behavioralQuirk = "none";
- assholeKnight.trust = random(-30, -20);
- assholeKnight.boobs = 150;
- assholeKnight.butt = random(0, 1);
- assholeKnight.faceShape = "masculine";
- assholeKnight.height = random(175, 195);
- assholeKnight.fetish = "sadist";
- assholeKnight.fetishStrength = 80;
- assholeKnight.preg = 0;
- assholeKnight.dick = random(3, 5);
- assholeKnight.balls = random(2, 4);
- assholeKnight.scrotum = assholeKnight.balls;
- assholeKnight.prostate = 1;
- assholeKnight.accent = random(0, 1);
r.push(App.UI.newSlaveIntro(assholeKnight));
App.Events.addParagraph(frag, r);
return frag;
}
function blindInjustice() {
- cashX(500, "bribe");
+ cashX(500, "event");
repX(-2000, "event");
return `You opt to ignore the abuses of the cruel knight completely. Every few weeks, you receive another <span class="red">pleading</span> message in your inbox about the Knight, until they simply stop coming as the lower class accepts the random abuse of their betters. A few days later, as you socialize with your upper-class, the Knight in question passes you a <span class="green">full envelope</span> and winks with no further explanation.`;
}
diff --git a/src/events/scheduled/murderAttempt.js b/src/events/scheduled/murderAttempt.js
index 5af3bc3b4821f045e6dbff1efd7d5eb8fc232167..7c09350860ef795a95991c2af4944b81cd2150f3 100644
--- a/src/events/scheduled/murderAttempt.js
+++ b/src/events/scheduled/murderAttempt.js
@@ -208,7 +208,7 @@ App.Events.MurderAttempt = class MurderAttempt extends App.Events.BaseEvent {
} else {
let r = [];
r.push(`"If you say so..." ${He} continues and starts ${his} explanation anew, sometimes with great gestures, but never actually getting to the point. You start to grow bored of ${his} drivel`);
- if (S.Bodyguard.intelligence + S.Bodyguard.intelligenceImplant + (30 * S.Bodyguard.skill.combat) > 60) {
+ if (S.Bodyguard.intelligence + S.Bodyguard.intelligenceImplant + (S.Bodyguard.skill.combat/2) > 60) {
r.push(`until ${he} does one of ${his} grand motions again and ${S.Bodyguard.slaveName} jumps forward,`);
if (perceptionChance()) {
r.push("just a moment faster than you,");
@@ -236,7 +236,7 @@ App.Events.MurderAttempt = class MurderAttempt extends App.Events.BaseEvent {
if ((S.Bodyguard.muscles > 95 && S.Bodyguard.height < 185) || S.Bodyguard.muscles < -30 || S.Bodyguard.boobs > 4000 || S.Bodyguard.weight > 130 || S.Bodyguard.health.tired > 30 || S.Bodyguard.belly >= 100000) { // BG is too big or weak to draw fast enough to matter
paragraphStart.push("shoots you through the heart; having a bodyguard who cannot actually defend you might have been a poor choice in retrospect.");
paragraphStart.push(`With you dead, ${S.Bodyguard.slaveName} knows ${heBG} has to put this to rest.`);
- if (deadliness(S.Bodyguard) > 1) {
+ if (deadliness(S.Bodyguard).value > 1) {
paragraphStart.push(`Out of ammo, your murderer moves to grab ${himBG} by the head and introduce ${hisBG} skull to the corner of your table. ${S.Bodyguard.slaveName} may have been slow on the draw, but is not incompetent. ${HeBG} subdues ${him}, pinning ${him} down until security may collect ${him}, but it's all in vain when ${he} starts convulsing and quickly perishes to the contents of a false tooth. With nothing left, ${S.Bodyguard.slaveName} readies ${hisBG} weapon, puts it under ${hisBG} chin, and pulls the trigger.`);
} else {
paragraphStart.push(`Alas, ${heBG} is too incompetent to even do that. By the time ${heBG} manages to get a steady grip on ${hisBG} weapon, your murderer is already introducing ${hisBG} skull to the corner of your table. Sure ${he} is detained before ${he} makes it out of the building, but does that really matter when you're dead?`);
@@ -245,8 +245,8 @@ App.Events.MurderAttempt = class MurderAttempt extends App.Events.BaseEvent {
gameOver(fragment);
} else {
paragraphStart.push(paragraphStart.pop() + ",");
- if (deadliness(S.Bodyguard) > 1 || (S.Bodyguard.muscles > 95 && S.Bodyguard.height >= 185)) {
- if (deadliness(S.Bodyguard) > 1) {
+ if (deadliness(S.Bodyguard).value > 1 || (S.Bodyguard.muscles > 95 && S.Bodyguard.height >= 185)) {
+ if (deadliness(S.Bodyguard).value > 1) {
paragraphStart.push(`just a little quicker, ${S.Bodyguard.slaveName} draws ${hisBG} own, shooting ${him} in the shoulder. Screaming in pain, ${he} drops ${his} weapon and ${S.Bodyguard.slaveName} swiftly moves to secure ${him}.`);
} else {
paragraphStart.push(`to your surprise and later annoyance, find ${S.Bodyguard.slaveName} has used ${hisBG} impressive strength to flip your desk at ${him}. Crushed beneath the heavy piece of furniture and writhing in pain, ${he} is in no position to take any further actions against you.`);
diff --git a/src/events/scheduled/newBaron.js b/src/events/scheduled/newBaron.js
index be34ca48bff96acf1becf9b7a4aafac909cdfb97..a777b423ce3a1a7b66b0b3d49507e1c48d8309d8 100644
--- a/src/events/scheduled/newBaron.js
+++ b/src/events/scheduled/newBaron.js
@@ -26,7 +26,7 @@ App.Events.SENewBaron = class SENewBaron extends App.Events.BaseEvent {
App.Events.addResponses(node, choices);
function executive() {
- cashX(5000, "Baron gift");
+ cashX(5000, "event");
V.arcologies[0].prosperity -= 1;
return `You select one of your loyal executives, an ultra-wealthy trader within the arcology who made a fortune in the sale of human bodies, for the new Barony. The man, a portly and unintimidating man that hides a razor-sharp mind behind his fat and an expensive suit, smiles full of teeth as you announce your decision to a waiting crowd of elites. After you go through the formalities and hand him the golden band that'll represent his symbol of office, he shakes your hand vigorously, still smiling devilishly. The next day, the newly-appointed Baron sends you a platter of expensive gifts and foreign candies, complimented with a <span class="green">massive direct deposit to your bank account.</span> You can't help but feel that such a crafty fox might use his new power to <span class="red">corner the market</span> in his barony, though.`;
}
diff --git a/src/events/scheduled/pitFight.js b/src/events/scheduled/pitFight.js
index 934149bb4335ba54d84fd4c17fd64510d95b2eaf..e8675c43d9a40a1230886706be4df1913461466c 100644
--- a/src/events/scheduled/pitFight.js
+++ b/src/events/scheduled/pitFight.js
@@ -66,7 +66,7 @@ App.Events.SEPitFight = class SEPitFight extends App.Events.BaseEvent {
if (V.active.canine || V.active.hooved || V.active.feline) {
fightDelegates.push(getAnimalFight);
}
- if (S.Bodyguard) {
+ if (S.Bodyguard) {
fightDelegates.push(getBodyguardFight);
}
if (available.length > 1) {
@@ -77,6 +77,10 @@ App.Events.SEPitFight = class SEPitFight extends App.Events.BaseEvent {
}
function getAnimalFight() {
+ if ((!V.active.canine && !V.active.hooved && !V.active.feline) ||
+ ((!V.active.canine && !V.active.hooved && V.active.feline && getAnimal(V.active.feline).species === "cat"))) {
+ return getSlavesFight();
+ }
const fighter = available.pluck();
V.pit.slaveFightingAnimal = fighter;
@@ -84,7 +88,10 @@ App.Events.SEPitFight = class SEPitFight extends App.Events.BaseEvent {
}
function getBodyguardFight() {
- available.delete(S.Bodyguard.ID);
+ if (!S.Bodyguard) { return getSlavesFight(); }
+ if (available.includes(S.Bodyguard.ID)) {
+ available.delete(S.Bodyguard.ID);
+ }
return [available.pluck(), S.Bodyguard.ID];
}
diff --git a/src/events/scheduled/pitFightLethal.js b/src/events/scheduled/pitFightLethal.js
index fe732f1cec3174a842786ae8c6abac160a8cd338..85b9386db29b114e3f5d3b1264bf3341aeab3127 100644
--- a/src/events/scheduled/pitFightLethal.js
+++ b/src/events/scheduled/pitFightLethal.js
@@ -16,7 +16,7 @@ App.Facilities.Pit.lethalFight = function(fighters) {
animals.push(V.active.feline);
}
- if (V.pit.fighters === 2 || V.pit.slaveFightingAnimal) {
+ if (V.pit.fighters === 2 || V.pit.slaveFightingAnimal) {
animal = V.pit.animal === 'random'
? getAnimal(animals.random())
: getAnimal(V.pit.animal);
@@ -110,7 +110,7 @@ App.Facilities.Pit.lethalFight = function(fighters) {
*/
function fighterDeadliness(parent, fighter) {
const {he, his, him, himself, He, His} = getPronouns(fighter);
- const fighterDeadliness = deadliness(fighter);
+ const fighterDeadliness = deadliness(fighter).value;
const r = [];
@@ -135,7 +135,7 @@ App.Facilities.Pit.lethalFight = function(fighters) {
App.Events.addParagraph(parent, r);
function confidence() {
- if (fighter.fetish === "mindbroken") {
+ if (fighter.fetish === Fetish.MINDBROKEN) {
return `${fighter.slaveName} is too broken to care about whether ${he} lives or dies;`;
} else if (fighterDeadliness > 5) {
return `${fighter.slaveName} seems very confident;`;
@@ -149,7 +149,7 @@ App.Facilities.Pit.lethalFight = function(fighters) {
}
function willingness() {
- if (fighter.fetish === "mindbroken") {
+ if (fighter.fetish === Fetish.MINDBROKEN) {
return `${he} is indifferent to the prospect of killing, as well.`;
} else if (fighter.devotion > 95) {
return `${he} is clearly willing to do ${his} best to kill for you.`;
@@ -165,7 +165,7 @@ App.Facilities.Pit.lethalFight = function(fighters) {
}
function skill() {
- if (fighter.skill.combat > 0) {
+ if (fighter.skill.combat > 30) {
return `${His} grip on ${his} sword is sure and easy.`;
}
}
@@ -234,7 +234,7 @@ App.Facilities.Pit.lethalFight = function(fighters) {
} else if (fighter.health.tired > 60) {
return `${He} is fatigued, sapping the strength ${he}'ll need to strike true.`;
} else if (fighter.health.tired > 30) {
- return `${He} is tired and more likely to take a hit then to give one.`;
+ return `${He} is tired and more likely to take a hit than to give one.`;
}
}
@@ -403,8 +403,8 @@ App.Facilities.Pit.lethalFight = function(fighters) {
repX(-20, "pit", loser);
}
- } else if (deadliness(winner) < deadliness(loser) + 3) {
- if (loser.skill.combat > 0) {
+ } else if (animal.deadliness < deadliness(loser).value + 3) {
+ if (loser.skill.combat > 30) {
r.push(`${loser.slaveName} is fairly confident in ${his} fighting abilities, and ${he} knows that this fight is fairly evenly matched.`);
} else {
r.push(`${loser.slaveName} doesn't know how to handle a sword, but ${he} feels fairly confident in ${his} chances all the same.`);
@@ -448,7 +448,7 @@ App.Facilities.Pit.lethalFight = function(fighters) {
repX(100, "pit", loser);
}
} else {
- if (loser.skill.combat > 0) {
+ if (loser.skill.combat > 30) {
r.push(`${loser.slaveName} is reasonably confident in ${his} fighting abilities, but ${he} isn't sure how to go about attacking the ${animal.species}. ${He} decides to open with a series of wide horizontal slashes, but the beast manages to stay out of range of ${his} sword. Realizing this isn't working, ${he} lunges at the animal, leaving ${his} side exposed. The ${animal.species} sees this and ${animal.type === "hooved"
? `headbutts ${him} as hard as it can, sending ${him} flying into the side of ${V.pit.name}. Battered`
: `leaves some ${App.UI.DOM.makeElement("span", `deep claw marks in ${his} side.`, ['health', 'dec'])} Bleeding`} and unable to stand, ${loser.slaveName} can do little to stop the ${animal.species} from finishing ${him} off with a ${animal.type === "canine" ? `fierce bite of its fangs to ${his} throat.` : animal.type === "hooved" ? `swift kick to the head.` : `ferocious swipe of its claws to ${his} throat.`}`);
@@ -481,8 +481,8 @@ App.Facilities.Pit.lethalFight = function(fighters) {
}
}
} else {
- const winnerDeadliness = deadliness(winner);
- const loserDeadliness = deadliness(loser);
+ const winnerDeadliness = deadliness(winner).value;
+ const loserDeadliness = deadliness(loser).value;
const {he, his, him, himself, girl, He} = getPronouns(winner);
const {He: He2, he: he2, his: his2, him: him2, girl: girl2} = getPronouns(loser);
@@ -552,7 +552,7 @@ App.Facilities.Pit.lethalFight = function(fighters) {
cashX(40, "pit", winner);
}
} else if (winnerDeadliness > (loserDeadliness + 3)) {
- if (winner.skill.combat > 0) {
+ if (winner.skill.combat > 30) {
r.push(`${winner.slaveName} wants to win, and ${he} opens the fight with a furious attack. ${loser.slaveName} manages to get ${his2} blade up, blocking a strike with a ringing clash and a few sparks, but by doing so leaves ${his2} abdomen open and obscures ${his2} vision enough that ${he2} is unprepared for the following horizontal slash, which opens ${his2} belly wide. The stricken ${girl2} collapses, feebly trying to push ${his2} viscera back into place. Whether out of mercy or a desire to get it over with, ${winner.slaveName} quickly removes the dying ${girl2}'s head.`);
if (V.pit.audience === "free") {
@@ -579,7 +579,7 @@ App.Facilities.Pit.lethalFight = function(fighters) {
cashX(4000, "pit", winner);
}
}
- } else if (winner.skill.combat > 0 && loser.skill.combat > 0) {
+ } else if (winner.skill.combat > 30 && loser.skill.combat > 30) {
r.push(`Upon your word the two combatants approach each other warily, both knowing the other is reasonably competent. Before long they are trading thrust and parry, swing and block. ${winner.slaveName} is slowly pressed back, so ${he} decides to change the nature of the fight. After three tries ${he} manages to force ${loser.slaveName} to close, suffering a `, App.UI.DOM.makeElement("span", `nearly severed ear`, ['health', 'dec']), ` as ${he} does. ${loser.slaveName} realizes ${he2} only retains an advantage at long range but cannot back up fast enough to avoid close combat. ${loser.slaveName} is forced back fast enough that ${he2} trips; ${he2}'s barely fallen on ${his2} back before ${he2} grunts with shock and pain, dying with a look of surprise as ${he2} stares at the sword growing out of ${his2} chest.`);
if (V.pit.audience === "free") {
@@ -692,7 +692,7 @@ App.Facilities.Pit.lethalFight = function(fighters) {
r.push(`You let the winner ${winner.slaveName}, shaking as ${he} comes off the adrenaline, drugs, and fear, exit the pit.`);
- if (winner.fetish === "mindbroken") {
+ if (winner.fetish === Fetish.MINDBROKEN) {
r.push(`${He} was already so broken before today that ${he} will not be seriously affected by having killed another creature with ${his} own ${hasBothArms ? `hands` : `hand`}.`);
} else if (winner.devotion > 50) {
r.push(`${He} is so devoted that ${he} doesn't see anything wrong with killing another creature.`);
@@ -708,7 +708,7 @@ App.Facilities.Pit.lethalFight = function(fighters) {
r.push(`You let the winner ${winner.slaveName}, shaking as ${he} comes off the adrenaline, drugs, and fear, exit the pit.`);
- if (winner.fetish === "mindbroken") {
+ if (winner.fetish === Fetish.MINDBROKEN) {
r.push(`${He} was already so broken before today that ${he} will not be seriously affected by having killed with ${his} own ${hasBothArms(winner) ? `hands` : `hand`}.`);
} else if (winner.devotion > 95) {
r.push(`${He} is so worshipful of you that ${he} does not see killing ${loser.slaveName} as special in ${his} own internal listing of things that ${he} has willingly done and would willingly do again on your behalf.`);
@@ -808,10 +808,10 @@ App.Facilities.Pit.lethalFight = function(fighters) {
V.pit.slaveFightingBodyguard = null;
- if (winner.skill.combat === 0) {
+ if (winner.skill.combat < 60) {
r.push(`With lethal experience in ${V.pit.name}, ${winner.slaveName} has `, experienceSpan);
- winner.skill.combat++;
+ winner.skill.combat += 5 + Math.floor(0.5 * (winner.intelligence + winner.intelligenceImplant) / 32);
}
winner.counter.pitKills++;
@@ -839,9 +839,9 @@ App.Facilities.Pit.lethalFight = function(fighters) {
/** @returns {boolean} Returns true if fighters[0] won */
function getWinner() {
if (animal) {
- if (deadliness(getSlave(fighters[0])) > animal.deadliness) {
+ if (deadliness(getSlave(fighters[0])).value > animal.deadliness) {
return random(1, 100) > 20; // 80% chance of winning
- } else if (deadliness(getSlave(fighters[0])) < animal.deadliness) {
+ } else if (deadliness(getSlave(fighters[0])).value < animal.deadliness) {
return random(1, 100) > 80; // 20% chance of winning
} else if (random(1, 100) > 50) { // 50/50
return true;
@@ -850,9 +850,9 @@ App.Facilities.Pit.lethalFight = function(fighters) {
return false;
}
- if (deadliness(getSlave(fighters[0])) > deadliness(getSlave(fighters[1]))) {
+ if (deadliness(getSlave(fighters[0])).value > deadliness(getSlave(fighters[1])).value) {
return random(1, 100) > 20; // 80% chance of winning
- } else if (deadliness(getSlave(fighters[0])) < deadliness(getSlave(fighters[1]))) {
+ } else if (deadliness(getSlave(fighters[0])).value < deadliness(getSlave(fighters[1])).value) {
return random(1, 100) > 80; // 20% chance of winning
} else if (random(1, 100) > 50) { // 50/50
return true;
diff --git a/src/events/scheduled/pitFightNonlethal.js b/src/events/scheduled/pitFightNonlethal.js
index e2ab147a072a451bb6efe3e385ec802bb4754d22..849b3185d5f2927799da3648f1a2965c0d2a6f6a 100644
--- a/src/events/scheduled/pitFightNonlethal.js
+++ b/src/events/scheduled/pitFightNonlethal.js
@@ -152,7 +152,7 @@ App.Facilities.Pit.nonlethalFight = function(fighters) {
*/
function fighterDeadliness(parent, fighter) {
const {he, his, him, himself, He, His} = getPronouns(fighter);
- const fighterDeadliness = deadliness(fighter);
+ const fighterDeadliness = deadliness(fighter).value;
const r = [];
@@ -177,7 +177,7 @@ App.Facilities.Pit.nonlethalFight = function(fighters) {
App.Events.addParagraph(parent, r);
function confidence() {
- if (fighter.fetish === "mindbroken") {
+ if (fighter.fetish === Fetish.MINDBROKEN) {
return `${fighter.slaveName} is too broken to care what happens to ${him}.`;
} else if (fighterDeadliness > 5) {
return `${fighter.slaveName} seems very confident, even eager to win a break.`;
@@ -197,7 +197,7 @@ App.Facilities.Pit.nonlethalFight = function(fighters) {
}
function skill() {
- if (fighter.skill.combat > 0) {
+ if (fighter.skill.combat > 30) {
return `${His} stance is obviously well-practiced.`;
}
}
@@ -266,7 +266,7 @@ App.Facilities.Pit.nonlethalFight = function(fighters) {
} else if (fighter.health.tired > 60) {
return `${He} is fatigued, sapping the strength ${he}'ll need in ${his} strikes.`;
} else if (fighter.health.tired > 30) {
- return `${He} is tired and more likely to take a hit then to give one.`;
+ return `${He} is tired and more likely to take a hit than to give one.`;
}
}
@@ -275,7 +275,7 @@ App.Facilities.Pit.nonlethalFight = function(fighters) {
if (fighter.bellyPreg > 750000) {
return `${His} monolithic pregnancy guarantees ${his} loss; not only is ${he} on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag ${him} to the ground. ${He} has no hope of attacking around the straining mass, let alone stopping ${his} opponent. The fear of what would happen should ${his} adversary land a hit on ${his} belly also weighs upon ${his} mind.`;
} else if (fighter.bellyPreg > 600000) {
- return `${His} titanic pregnancy is practically a guaranteed loss; ${he} can barely stand let alone fight. The worry of a solid hit striking ${his} life swollen womb also weighs on ${his} mind.`;
+ return `${His} titanic pregnancy is practically a guaranteed loss; ${he} can barely stand let alone fight. The worry of a solid hit striking ${his} life-swollen womb also weighs on ${his} mind.`;
} else if (fighter.bellyPreg > 450000) {
return `${His} gigantic pregnancy is nearly a guaranteed loss; it presents an unmissable, indefensible target for ${his} adversary.`;
} else if (fighter.bellyPreg > 300000) {
@@ -422,8 +422,8 @@ App.Facilities.Pit.nonlethalFight = function(fighters) {
}
}
} else {
- const winnerDeadliness = deadliness(winner);
- const loserDeadliness = deadliness(loser);
+ const winnerDeadliness = deadliness(winner).value;
+ const loserDeadliness = deadliness(loser).value;
const {he, his, him, himself, girl, He} = getPronouns(winner);
const {
@@ -499,7 +499,7 @@ App.Facilities.Pit.nonlethalFight = function(fighters) {
cashX(40, "pit", winner);
}
} else if (winnerDeadliness > (loserDeadliness + 3)) {
- if (winner.skill.combat > 0) {
+ if (winner.skill.combat > 30) {
r.push(`${winner.slaveName} wants to win, and ${he} opens the fight with a furious attack. ${loser.slaveName} manages to get ${his2} ${hasBothArms(loser) ? `forearms` : `forearm`} up, blocking a few blows, but by doing so leaves ${his2} abdomen open and obscures ${his2} vision enough that ${he2} is unprepared for the following kidney strike, which brings ${him2} gasping to one knee. ${winner.slaveName} lets ${him2} rise just a little before delivering a calculated hard right that sends ${loser.slaveName} to the mat.`);
if (V.pit.audience === "free") {
@@ -550,7 +550,7 @@ App.Facilities.Pit.nonlethalFight = function(fighters) {
cashX(1000, "pit", winner);
}
- } else if (winner.skill.combat > 0 && loser.skill.combat > 0) {
+ } else if (winner.skill.combat > 30 && loser.skill.combat > 30) {
const healthSpans = [App.UI.DOM.makeElement("span", `broken nose`, ["health", "dec"]), App.UI.DOM.makeElement("span", `to the point of damage`, ["health", "dec"])];
r.push(`Upon your word the two combatants approach each other warily, both knowing the other is reasonably competent. Before long they are trading expert blows. ${winner.slaveName} is getting the worst of it, so ${he} decides to change the nature of the fight. After three tries ${he} manages to bring ${loser.slaveName} to the ground, suffering a `, healthSpans[0], ` as ${he} does. ${loser.slaveName} tries to break the imperfect hold but only earns ${himself2} an elbow to the face. ${He2}'s furious and ${winner.slaveName} is obliged to wrench ${his2} arm `, healthSpans[1], ` before ${he2} allows ${himself2} to go limp.`);
@@ -1018,12 +1018,11 @@ App.Facilities.Pit.nonlethalFight = function(fighters) {
App.Events.addParagraph(parent, [...rape(), ...rapeEffects()]);
r = [];
- if (winner.skill.combat === 0 && random(1, 100) < (20 + winner.devotion)) {
- const experienceSpan = App.UI.DOM.makeElement("span", `learned basic combat skills.`, ["improvement"]);
+ if (winner.skill.combat < 60) {
+ const experienceSpan = App.UI.DOM.makeElement("span", `improved their combat skills.`, ["improvement"]);
+ winner.skill.combat += 5 + Math.floor(0.5 * (winner.intelligence + winner.intelligenceImplant) / 32);
r.push(`With experience in ${V.pit.name}, ${winner.slaveName} has `, experienceSpan);
-
- winner.skill.combat++;
}
loser.counter.pitLosses++;
@@ -1259,9 +1258,9 @@ App.Facilities.Pit.nonlethalFight = function(fighters) {
}
}
- if (deadliness(getSlave(fighters[0])) > deadliness(getSlave(fighters[1]))) {
+ if (deadliness(getSlave(fighters[0])).value > deadliness(getSlave(fighters[1])).value) {
return random(1, 100) > 20; // 80% chance of winning
- } else if (deadliness(getSlave(fighters[0])) < deadliness(getSlave(fighters[1]))) {
+ } else if (deadliness(getSlave(fighters[0])).value < deadliness(getSlave(fighters[1])).value) {
return random(1, 100) > 80; // 20% chance of winning
} else if (random(1, 100) > 50) { // 50/50
return true;
diff --git a/src/events/scheduled/seCoursing.js b/src/events/scheduled/seCoursing.js
index 4115c6b3f2633755486da121f77f5e435e49dfde..bbfa849328ad282b74de77855401b4d567863aa6 100644
--- a/src/events/scheduled/seCoursing.js
+++ b/src/events/scheduled/seCoursing.js
@@ -671,7 +671,7 @@ App.Events.SECoursing = class SECoursing extends App.Events.BaseEvent {
r.push(`One of ${his} rival lurchers has the same idea, however, and tries to trip ${him} up.`);
if (!canSee(activeLurcher)) {
r.push(`Unable to see it coming, ${he} goes down with a crash; ${his} course is over.`);
- } else if (activeLurcher.skill.combat === 1) {
+ } else if (activeLurcher.skill.combat > 60) {
r.push(`${He} parries the attempt with contemptuous ease and catches up to ${his} new target.`);
caught = true;
} else if (activeLurcher.tail === "combat") {
@@ -711,7 +711,7 @@ App.Events.SECoursing = class SECoursing extends App.Events.BaseEvent {
} else if (!canSee(activeLurcher) && random(1, 3) === 1) {
r.push(`${His} prey takes advantage of ${his} lack of eyesight, baiting ${activeLurcher.slaveName} to dive in the wrong direction. As ${he} rises to ${his} feet, the slave is too far gone to make another lunge. ${activeLurcher.slaveName}'s course is over.`);
caught = false;
- } else if (activeLurcher.skill.combat === 1) {
+ } else if (activeLurcher.skill.combat > 60) {
r.push(`${His} tackle is expert: ${he} wraps ${his} quarry up and pulls ${him2} down, falling on top of the struggling body.`);
} else if (activeLurcher.muscles > 30) {
r.push(`${He}'s burly enough that ${he} tackles ${his} quarry by simple force, an approach no less effective for its inelegance.`);
diff --git a/src/events/scheduled/seFCNNstation.js b/src/events/scheduled/seFCNNstation.js
index 8f87cfd72c76afcb23ee9cca054a6cac212e4b34..8a80674f28fa36779bd74b162f7ecd81236f4e8f 100644
--- a/src/events/scheduled/seFCNNstation.js
+++ b/src/events/scheduled/seFCNNstation.js
@@ -16,7 +16,7 @@ App.Events.SEFcnnStation = class SEFcnnStation extends App.Events.BaseEvent {
const cost = 100000;
const {girlP} = getPronouns(V.PC).appendSuffix("P");
- App.Events.addParagraph(node, [`One of the first groups to take advantage of the Free Cities' nearly nonexistent regulations for media and communications was the Free Cities News Network. As one of the few stations covering news within the Free Cities, and the only one doing so without any form of censorship, FCNN quickly became one the most popular news networks in the world. Presently, however, the network's future looks grim. Its reluctance on portraying explicitly pornographic content has lead to plummeting audience figures, especially in comparison to the upstart 8HGG Inc. media empire. In addition, governments within and outside the Free Cities have become increasingly restrictive towards the press, to the point that many FCNN branches have been effectively silenced.`]);
+ App.Events.addParagraph(node, [`One of the first groups to take advantage of the Free Cities' nearly nonexistent regulations for media and communications was the Free Cities News Network. As one of the few stations covering news within the Free Cities, and the only one doing so without any form of censorship, FCNN quickly became one of the most popular news networks in the world. Presently, however, the network's future looks grim. Its reluctance on portraying explicitly pornographic content has led to plummeting audience figures, especially in comparison to the upstart 8HGG Inc. media empire. In addition, governments within and outside the Free Cities have become increasingly restrictive towards the press, to the point that many FCNN branches have been effectively silenced.`]);
App.Events.addParagraph(node, [`This is the situation when you receive a personal video call from the network's beleaguered president. The former FCNN headquarters has been outright destroyed for reporting on its host nation's human rights abuses, and they're hoping to relocate to ${V.arcologies[0].name}. "We are, of course, in dire financial straits," the president nervously explains, "So we'll need a small subsidy to establish our new headquarters. Probably, oh, let's say... <span class="yellowgreen">${cashFormat(cost)}</span> or so?" He flinches while forcing a grin.`]);
diff --git a/src/events/scheduled/seFCTVinstall.js b/src/events/scheduled/seFCTVinstall.js
index e3986a75f43f1f5342775e95bbb4247a977c43a0..e7952257769cead67ee73703f7a2d9bc6d060353 100644
--- a/src/events/scheduled/seFCTVinstall.js
+++ b/src/events/scheduled/seFCTVinstall.js
@@ -9,7 +9,7 @@ App.Events.SEFctvInstall = class SEFctvInstall extends App.Events.BaseEvent {
execute(node) {
V.encyclopedia = "FCTV";
V.FCTV.receiver = 0;
- App.Events.addParagraph(node, [`You've been sitting in your office into the early afternoon going over bothersome lease documents that need your approval. When you take a break to look out the window, ${V.assistant.name} speaks up. "${properTitle()}, you have received an approval welcome packet from 8HGG Inc. in regards to Free Cities TV. It seems that they've determined that ${V.arcologies[0].name} is now sufficiently developed enough to warrant a FCTV-Citizen connection. All the details and contracts necessary are included in the packet. From there, a receiver will need to be built onto ${V.arcologies[0].name} in order to access FCTV."`]);
+ App.Events.addParagraph(node, [`You've been sitting in your office into the early afternoon, going over bothersome lease documents that need your approval. When you take a break to look out the window, ${V.assistant.name} speaks up. "${properTitle()}, you have received an approval welcome packet from 8HGG Inc. in regards to Free Cities TV. It seems that they've determined that ${V.arcologies[0].name} is now sufficiently developed enough to warrant an FCTV-Citizen connection. All the details and contracts necessary are included in the packet. From there, a receiver will need to be built onto ${V.arcologies[0].name} in order to access FCTV."`]);
App.Events.addParagraph(node, [`You browse the guide: home shopping networks, random dramas, how-to shows and a myriad of other things. Of more interest are some of the programs showing glimpses into foreign arcologies and how they are using the service to help mold society.`]);
diff --git a/src/events/scheduled/seFctvWatch.js b/src/events/scheduled/seFctvWatch.js
index 4ac7c13910194d7df7706f388c7ed1d29defc6cc..f2e9fe824f237b69c388ae8167172125af1c5148 100644
--- a/src/events/scheduled/seFctvWatch.js
+++ b/src/events/scheduled/seFctvWatch.js
@@ -247,9 +247,9 @@ App.Events.SEfctvWatch = class SEfctvWatch extends App.Events.BaseEvent {
* @returns {Node}
*/
function channelFailed(text) {
- const frag = new DocumentFragment;
+ const frag = new DocumentFragment();
frag.append(`A notification is shown: `);
- App.UI.DOM.appendNewElement("span", frag, text, "note");
+ App.UI.DOM.appendNewElement("span", frag, text, ["note"]);
frag.append(`, changing program.`);
return frag;
}
diff --git a/src/events/scheduled/seIndependenceDay.js b/src/events/scheduled/seIndependenceDay.js
index f9cd29ec7b692ce33fcc5f6793fab204d802e3e0..c00ed0355430ec195bd0d6d061ea7a528c646a68 100644
--- a/src/events/scheduled/seIndependenceDay.js
+++ b/src/events/scheduled/seIndependenceDay.js
@@ -258,12 +258,30 @@ App.Events.SEIndependenceDay = class SEIndependenceDay extends App.Events.BaseEv
} else if (V.PC.career === "child soldier") {
r.push(`You share an impressive anecdote from your limited time as a mercenary; the moral of the story being that you know how to keep your head. From the murmurs, you can tell they suspect the enemy may have hesitated due to your age.`);
} else if (V.PC.career === "slaver" || V.PC.career === "slave overseer") {
- r.push(`You share a cruelly amusing anecdote from your background as a slaver; the moral of the story is that you're not one to spare the lash when it's necessary.`);
+ r.push(`You share`);
+ if (arc.FSPaternalist > 60) {
+ r.push(`an amusing`);
+ } else {
+ r.push(`a cruelly amusing`);
+ }
+ r.push(`anecdote from your background as a slaver; the moral of the story is that you're not one to spare the lash when it's necessary.`);
} else if (V.PC.career === "slave tender") {
if (V.PC.actualAge >= 18) {
- r.push(`You share a cruelly amusing anecdote from your background working the slave pens; the moral of the story is that you recognize when a slave needs the lash.`);
+ r.push(`You share`);
+ if (arc.FSPaternalist > 60) {
+ r.push(`an amusing`);
+ } else {
+ r.push(`a cruelly amusing`);
+ }
+ r.push(`anecdote from your background working the slave pens; the moral of the story is that you recognize when a slave needs the lash.`);
} else {
- r.push(`You share some cruelly amusing anecdotes from your time in the slave pens demonstrating you know what it takes to break a willful slave. From the murmurs, you can tell you should have made it more clear that you were on the slaver's side of the cage, not the slave's.`);
+ r.push(`You share some`);
+ if (arc.FSPaternalist > 60) {
+ r.push(`amusing`);
+ } else {
+ r.push(`cruelly amusing`);
+ }
+ r.push(`anecdotes from your time in the slave pens demonstrating you know what it takes to break a willful slave. From the murmurs, you can tell you should have made it more clear that you were on the slaver's side of the cage, not the slave's.`);
}
} else if (V.PC.career === "engineer") {
r.push(`You reference your background as an arcology engineer, cleverly making it obvious that you know this huge building down to its very bones.`);
diff --git a/src/events/scheduled/seNicaeaCouncil.js b/src/events/scheduled/seNicaeaCouncil.js
index a84db3a84a94f58bed996f0fb317460d7bfd7fdc..5b8af802a69930e7563daf6c7d691a0edb4e60a1 100644
--- a/src/events/scheduled/seNicaeaCouncil.js
+++ b/src/events/scheduled/seNicaeaCouncil.js
@@ -66,6 +66,7 @@ App.Events.SENicaeaCouncil = class SENicaeaCouncil extends App.Events.BaseEvent
r.push(`but the weak Council may lead to a weak creed.`);
}
App.Events.addParagraph(node, r);
+ r = [];
}
const container = App.UI.DOM.appendNewElement("div", node);
diff --git a/src/events/scheduled/sePCBirthday.desc.js b/src/events/scheduled/sePCBirthday.desc.js
index 932f69b801eb631ef1640b3f51e8931b888cd03d..3a5c9624c13660f76ad938974899f4ac46f174b7 100644
--- a/src/events/scheduled/sePCBirthday.desc.js
+++ b/src/events/scheduled/sePCBirthday.desc.js
@@ -942,7 +942,7 @@ App.Events.pcBirthday.Desc = (function(bday) {
chair. You feel her shifting her weight against you. With uncanny abdominal strength, she coils herself up and over you, spreads her legs to give
her hands room to find purchase on your shoulders, then brings her weight down upon you there. She is so light that this registers as little more
than a slight pressure. She's free to extend her legs almost fully outward. In an unexpected burst of energy, she twirls around your head as she uses
- you like a pommel horse; her face stops before yours just long enough to plant a finalé kiss on your cheek, and she disappears somewhere behind you.
+ you like a pommel horse; her face stops before yours just long enough to plant a finale kiss on your cheek, and she disappears somewhere behind you.
</p>
<p>
As her body launched out of sight, however, another two bodies were waiting at your feet. Or – you begin to wonder if it is actually two, or
@@ -986,7 +986,7 @@ App.Events.pcBirthday.Desc = (function(bday) {
return html;
},
/**
- * Context: PC finds a tasty prey while taking a relaxing stroll through the arco.
+ * Context: PC finds a tasty prey while taking a relaxing stroll through the arc.
* @param {App.Events.pcBirthday.EventData} data
*/
renderStrangerScene: function(data) {
@@ -1018,8 +1018,8 @@ App.Events.pcBirthday.Desc = (function(bday) {
"Fair enough." She puts her phone – her failed (or successful?) prop – away. "There's a lot of rumors about you, you know. I don't know how much you pay
attention to that shit." You shrug and invite her to share a few. "You've got a giant dong. Or you've got no dong. Or sometimes two, but I think that one
started as a joke that some people took too seriously. They say you're a killer. Cold-blooded. Anyone gets in your way..." Her hand mimes a gun and shoots
- an invisible bullet. "They say you designed the arco yourself. They say you overtook it from someone else. They say you stole it from your own father. They
- say you barely know what an arco is because you're fried out of your fucking mind most days. Like I said, they say a lot of shit."
+ an invisible bullet. "They say you designed the arc yourself. They say you overtook it from someone else. They say you stole it from your own father. They
+ say you barely know what an arc is because you're fried out of your fucking mind most days. Like I said, they say a lot of shit."
</p>
<p>
You ask her what she believes. "Well you ain't fried right now. And I don't know if you built it or stole it but you have enough sense that you keep it
@@ -1157,7 +1157,7 @@ App.Events.pcBirthday.Desc = (function(bday) {
You're pleased she won your game, but now you want something inside you. And not just prodding your outer opening... Something deep and
substantial. You shuffle back down her body and meet the tip of her cock to the flush lips now coated with a mix of her saliva. She tries to
bring her head off the mattress to touch any part of your skin with her lips, but she doesn't succeed. In fact, you take a hand to her chest
- and hold her in place. With your other hand you ensure her engorged phallus enters you properly. By inches you feel it slip deeper. Your
+ and hold her in place. With your other hand you ensure her engorged phallus enters you properly. By ${V.showInches === 2 ? "inches" : "centimeters"} you feel it slip deeper. Your
walls convulse around it, involuntarily. Whenever she seems to speak, you put a finger to her lips. Always she stops speaking; on occasion
she suckles the fingertip. Now the base of her shaft passes through your inner labia, and she is fully inside you. You rock your clit
against the manifest protrusion of her dick from her crotch. From barely any motion you slowly build your tempo. You give yourself time
diff --git a/src/events/scheduled/sePlayerBirth.js b/src/events/scheduled/sePlayerBirth.js
index a4f3f5dd4a3c23b9d8d941f437a7f86040894e63..27ef156774919844764ce3475fe913bad0c8b5f6 100644
--- a/src/events/scheduled/sePlayerBirth.js
+++ b/src/events/scheduled/sePlayerBirth.js
@@ -950,7 +950,7 @@ App.Events.SEPlayerBirth = class SEPlayerBirth extends App.Events.BaseEvent {
if (V.PC.pregSource > 0 && curBabies > 0) {
- let pb = findFather(V.PC.pregSource);
+ const pb = findFather(V.PC.pregSource);
if (pb) {
if (V.arcologies[0].FSRestartDecoration === 100 && V.eugenicsFullControl !== 1) {
r.push(`Word spreads fast through your peers that you gave birth to`);
@@ -965,13 +965,7 @@ App.Events.SEPlayerBirth = class SEPlayerBirth extends App.Events.BaseEvent {
r.push(`Rumors spread that The Prophet gave birth to a slave's ${(curBabies > 1) ? "children" : "child"}.`);
if (V.arcologies[0].FSSupremacist !== "unset") {
if (pb.race !== V.arcologies[0].FSSupremacistRace) {
- r.push(`Word is that your child`);
- if (curBabies > 1) {
- r.push(`ren were`);
- } else {
- r.push(`was`);
- }
- r.push(`not ${V.arcologies[0].FSSupremacistRace}. As The Prophet saw fit to bear such a child, society views it as a sign to <span class="red">reject ${V.arcologies[0].FSSupremacistRace} supremacy.</span>`);
+ r.push(`Word is that your child${curBabies > 1? `ren were` : `was`} not ${V.arcologies[0].FSSupremacistRace}. As The Prophet saw fit to bear such a child, society views it as a sign to <span class="red">reject ${V.arcologies[0].FSSupremacistRace} supremacy.</span>`);
V.arcologies[0].FSSupremacist -= 120;
}
}
@@ -982,23 +976,11 @@ App.Events.SEPlayerBirth = class SEPlayerBirth extends App.Events.BaseEvent {
}
}
} else {
- r.push(`Rumors spread that your child`);
- if (curBabies > 1) {
- r.push(`ren were`);
- } else {
- r.push(`was`);
- }
- r.push(`fathered by a slave, <span class="red">harming your lasting reputation.</span>`);
+ r.push(`Rumors spread that your child${curBabies > 1? `ren were` : `was`} fathered by a slave, <span class="red">harming your lasting reputation.</span>`);
V.PC.degeneracy += 20;
if (V.arcologies[0].FSSupremacist !== "unset") {
if (pb.race !== V.arcologies[0].FSSupremacistRace) {
- r.push(`Furthermore, word is that your child`);
- if (curBabies > 1) {
- r.push(`ren were`);
- } else {
- r.push(`was`);
- }
- r.push(`not ${V.arcologies[0].FSSupremacistRace}, <span class="red">further hurting your lasting reputation.</span>`);
+ r.push(`Furthermore, word is that your child${curBabies > 1? `ren were` : `was`} not ${V.arcologies[0].FSSupremacistRace}, <span class="red">further hurting your lasting reputation.</span>`);
V.PC.degeneracy += 10;
}
}
@@ -1145,7 +1127,7 @@ App.Events.SEPlayerBirth = class SEPlayerBirth extends App.Events.BaseEvent {
function breeding() {
V.breederOrphanageTotal += curBabies;
- return `You have decided to send them to be raised into a proper breeder. Perhaps you'll even see them again, though it's unlikely you'll recognize them with their reproduction focused body.`;
+ return `You have decided to send them to be raised into a proper breeder. Perhaps you'll even see them again, though it's unlikely you'll recognize them with their reproduction-focused body.`;
}
function auction() {
diff --git a/src/events/scheduled/seRaiding.js b/src/events/scheduled/seRaiding.js
index 4b2165462534046f96ca68a8ec0defd85f8e6212..e94dcba6b7a683799aeeb0f07c27be649ddf785f 100644
--- a/src/events/scheduled/seRaiding.js
+++ b/src/events/scheduled/seRaiding.js
@@ -449,7 +449,7 @@ App.Events.SERaiding = class SERaiding extends App.Events.BaseEvent {
slave.skill.oral = 35;
slave.skill.anal = 15;
slave.skill.whoring = 0;
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.skill.entertainment = 10;
slave.intelligence = random(20, 60);
slave.intelligenceImplant = 15;
@@ -465,7 +465,7 @@ App.Events.SERaiding = class SERaiding extends App.Events.BaseEvent {
slave.skill.anal = 0;
slave.skill.oral = 0;
slave.skill.whoring = 0;
- slave.skill.combat = 1;
+ slave.skill.combat =70;
slave.intelligence = random(20, 60);
slave.intelligenceImplant = 15;
slave.hStyle = either("buzzcut", "bun", "shaved", "neat");
@@ -496,7 +496,7 @@ App.Events.SERaiding = class SERaiding extends App.Events.BaseEvent {
slave.skill.oral = 35;
slave.skill.anal = 15;
slave.skill.whoring = 0;
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.skill.entertainment = 10;
slave.intelligenceImplant = 15;
slave.teeth = "normal";
@@ -648,7 +648,7 @@ App.Events.SERaiding = class SERaiding extends App.Events.BaseEvent {
slave.skill.oral = 35;
slave.skill.anal = 15;
slave.skill.whoring = 0;
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.skill.entertainment = 10;
slave.intelligenceImplant = 15;
slave.weight = random(-10, 90);
diff --git a/src/events/scheduled/seTheSirenStrikesBack.js b/src/events/scheduled/seTheSirenStrikesBack.js
index 5a1799cf16227235ff27bd2af00488bca5c28a56..e6d023e191c41ac3549ace0dd4b1d1ff4f15265a 100644
--- a/src/events/scheduled/seTheSirenStrikesBack.js
+++ b/src/events/scheduled/seTheSirenStrikesBack.js
@@ -58,9 +58,9 @@ App.Events.SETheSirenStrikesBack = class SETheSirenStrikesBack extends App.Event
App.Events.addParagraph(node, [`Several weeks have passed since you gained the musical prodigy and you couldn't help but notice ${his} constant scowl and muttering about "getting revenge one day" or "wishing ${his} producer would pay for what happened" whenever ${he} was not working. You decide to look into the incident and direct ${V.assistant.name} to look into the financial situation of ${his} record label. It turns out that not only should this slave not be eligible for enslavement due to ${his} performance profits, but a certain someone has been taking that money for themselves. You issue a bounty for ${his} producer and await a response. With surprising speed, an answer comes from a bounty hunter. The underhanded producer never left the arcology, instead opting to make use of the guest living arrangements you had set up for the concert. Only when an announcement of the bounty went out did ${he2} realize ${his2} peril and attempt to flee. The bounty hunter literally drags the escapee by the collar into your penthouse and throws ${him2} at your feet. The coward shivers as your eyes meet ${hers2}.`]);
- App.Events.addParagraph(node, [`"Please, don't hurt me! I'll pay for that slave I sent you to be released, even set ${him} up with the life ${he2} would have had if I hadn't embezzled the profits!"`]);
+ App.Events.addParagraph(node, [`"Please, don't hurt me! I'll pay for that slave I sent you to be released, even set ${him} up with the life ${he} would have had if I hadn't embezzled the profits!"`]);
- if (swan && swan.fuckdoll === 0 && swan.fetish !== "mindbroken") {
+ if (swan && swan.fuckdoll === 0 && swan.fetish !== Fetish.MINDBROKEN) {
const {title: Master} = getEnunciation(swan);
r.push(`Just as the little weasel at your feet finishes, ${swan.slaveName}`);
if (canWalk(swan)) {
@@ -70,7 +70,7 @@ App.Events.SETheSirenStrikesBack = class SETheSirenStrikesBack extends App.Event
}
r.push(`${his} face quickly donning a scowl of pure anger and hatred.`);
if (canTalk(swan)) {
- r.push(`"${Master}, please let me have my revenge on this despicable lowlife," ${he} hisses. "I promise not to kill ${him2}, just hurt ${him2} enough to let ${him2} know the suffering they caused me."`);
+ r.push(`"${Master}, please let me have my revenge on this despicable lowlife," ${he} hisses. "I promise not to kill ${him2}, just hurt ${him2} enough to let ${him2} know the suffering ${he2} caused me."`);
} else {
r.push(`${He} may not be able to talk anymore, but ${his} request of you is very clear across ${his} face.`);
}
@@ -106,7 +106,7 @@ App.Events.SETheSirenStrikesBack = class SETheSirenStrikesBack extends App.Event
healthDamage(producer, 20);
swan.devotion += 2;
swan.trust += 2;
- App.Events.drawEventArt(node, producer); // TODO: update event art instead, maybe
+ App.Events.refreshEventArt(producer);
r.push(`You decide to give the victimized prodigy a chance for payback. ${He} moves over to ${his} former boss and begins to caress the despicable thief as ${he2} shakes with dread of what is to come. As ${he} moves lower, ${he} applies more pressure, peaking right on the genitals. The cowardly former executive yelps in pain, instinctively trying to get away from the`);
if (hasAnyArms(swan)) {
@@ -146,7 +146,7 @@ App.Events.SETheSirenStrikesBack = class SETheSirenStrikesBack extends App.Event
const frag = new DocumentFragment();
let r = [];
producer.clothes = "no clothing";
- App.Events.drawEventArt(node, producer); // TODO: update event art instead, maybe
+ App.Events.refreshEventArt(producer);
r.push(`You spare the coward the pain and humiliation ${he2} deserves and simply enslave ${him2}.`);
r.push(App.UI.newSlaveIntro(producer));
App.Events.addParagraph(frag, r);
@@ -157,7 +157,7 @@ App.Events.SETheSirenStrikesBack = class SETheSirenStrikesBack extends App.Event
const frag = new DocumentFragment();
let r = [];
producer.clothes = "no clothing";
- App.Events.drawEventArt(node, producer); // TODO: update event art instead, maybe
+ App.Events.refreshEventArt(producer);
r.push(`You decide the coward needs more punishment. You order a whip brought to you and give ${him2} several lashes directly across ${his2} exposed genitalia. ${He2} cries out with each lash as ${his2} nethers accumulate angry red welts, some even bleeding slightly. After the yelps stop, you feel enough punishment has been given for now and have the producer turned slave hauled to ${his2} feet for a proper inspection.`);
r.push(App.UI.newSlaveIntro(producer));
App.Events.addParagraph(frag, r);
diff --git a/src/events/scheduled/seWedding.js b/src/events/scheduled/seWedding.js
index 2058936bd59c7fe0a48fb08a94916025e43b3a3b..3b0399cb8f538597f73c53ee1cadd893d4ccd904 100644
--- a/src/events/scheduled/seWedding.js
+++ b/src/events/scheduled/seWedding.js
@@ -341,7 +341,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
}
r.push(`${himC} there; this symbolizes ${hisC} submission to you`);
- if (!solo && brides.every((b) => b.fetish === "mindbroken")) {
+ if (!solo && brides.every((b) => b.fetish === Fetish.MINDBROKEN)) {
r.push(`despite the fact that ${both} the slaves had to be pushed into walking towards you.`);
} else if (!solo && brides.every((b) => b.devotion + b.trust >= 175)) {
r.push(`of ${both} the slaves' own choice, and they do so with smiles.`);
@@ -358,19 +358,19 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
const end = (i + 1 === ML) ? "." : ",";
if (i === 0) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`despite the fact that ${slave.slaveName} had`);
} else {
r.push(`of ${slave1.slaveName}'s`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`while ${slave.slaveName} has`);
} else {
r.push(`while ${slave.slaveName} does this of ${his}`);
}
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`to be pushed into walking towards you${end}`);
} else if (slave.devotion + slave.trust >= 175) {
r.push(`own choice, and ${he} does so with a smile${end}`);
@@ -391,7 +391,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
r.push(`When ${heC} ${is} in front of you,`);
if (brides.every(b => !hasAnyLegs(b))) {
r.push(`the slaves carrying ${hisC} legless torso${s} set${notS} ${himC} down on the floor and prop ${himC} up so ${hisC} head${s} ${is} level with your crotch.`);
- } else if (!solo && brides.every((b) => b.fetish === "mindbroken")) {
+ } else if (!solo && brides.every((b) => b.fetish === Fetish.MINDBROKEN)) {
r.push(`you push them onto their knees so their heads are level with your crotch.`);
} else if (!solo && brides.every((b) => b.devotion + b.trust >= 175)) {
r.push(`they happily get down on their knees so their heads are level with your crotch.`);
@@ -412,7 +412,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
if (!hasAnyLegs(slave)) {
floor.push(`the slave carrying ${slave.slaveName}'s legless torso sets ${him} down on the floor in front of you and props ${him} up so ${his} head is level with your crotch`);
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
floor.push(`you push ${slave.slaveName} onto ${his} ${knees} so ${his} head`);
} else if (slave.devotion + slave.trust >= 175) {
floor.push(`${slave.slaveName} happily gets down on ${his} ${knees} so ${his} head`);
@@ -455,7 +455,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
}
if (V.weddingPlanned === 3) { // Impregnation ceremony
- if (!solo && brides.every((b) => b.fetish === "mindbroken")) {
+ if (!solo && brides.every((b) => b.fetish === Fetish.MINDBROKEN)) {
const {He, he, his, him} = getPronouns(slave1);
const knees = (hasBothLegs(slave1)) ? "knees" : "knee";
r.push(`The slaves are mindbroken, so you gather them up and hold them in front of you, pulling their panties off as you do. They follow your motions like ragdolls. You maneuver your dick inside ${slave1.slaveName} first while holding ${him} against your`);
@@ -691,7 +691,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
if (i !== 0) {
r.push(`Then, you turn your attention to ${slave.slaveName}.`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is mindbroken, so you gather ${him} up and hold ${him} in front of you, pulling ${his} panties off as you do. ${He} follows your motions like a ragdoll. You maneuver your dick inside ${him} while holding ${him} against your`);
if (V.PC.boobs >= 300) {
r.push(`breasts.`);
@@ -792,7 +792,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
}
if (brides.every((b) => b.vagina === 0 || (b.mpreg === 1 && b.anus === 0))) {
r.push(`Naturally, the ceremony <span class="lime">took their virginities;</span>`);
- if (!solo && brides.every((b) => b.fetish === "mindbroken")) {
+ if (!solo && brides.every((b) => b.fetish === Fetish.MINDBROKEN)) {
r.push(`they didn't notice.`);
} else if (!solo && brides.every((b) => b.devotion + b.trust >= 175)) {
r.push(`they were very happy <span class="hotpink">their first time was with you and so special.</span>`);
@@ -823,7 +823,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
const slave = brides[i];
const {his} = getPronouns(slave);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} didn't notice,`);
} else if (slave.devotion + slave.trust >= 175) {
r.push(`${slave.slaveName} was very happy <span class="hotpink">${his} first time was with you and so special</span>`);
@@ -853,7 +853,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
const {he, his} = getPronouns(slave);
if (slave.vagina === 0 || (slave.mpreg === 1 && slave.anus === 0)) {
r.push(`Naturally, the ceremony <span class="lime">took ${slave.slaveName}'s virginity;</span>`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${he} didn't notice.`);
} else if (slave.devotion + slave.trust >= 175) {
r.push(`${he} was so happy <span class="hotpink">${his} first time was with you and so special.</span>`);
@@ -953,7 +953,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
r.push(`eat you out`);
}
r.push(`in front of your guests, as the ceremony requires.`);
- if (!solo && brides.every((b) => b.fetish === "mindbroken")) {
+ if (!solo && brides.every((b) => b.fetish === Fetish.MINDBROKEN)) {
r.push(`${HeC} approach ${hisC} task with robotic obedience. You climax promptly,`);
if (V.PC.dick !== 0) {
r.push(`shooting your cum down ${slave1.slaveName}'s throat.`);
@@ -1046,7 +1046,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
r.push(`Next, it's ${slave.slaveName}'s turn. ${He} takes on ${his} task`);
}
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`with robotic obedience. You climax promptly,`);
if (V.PC.dick !== 0) {
r.push(`shooting your cum down ${his} throat.`);
@@ -1120,7 +1120,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
if (V.weddingPlanned === 3 || V.weddingPlanned === 1) {
if (brides.some(b => b.relationship !== 0)) {
if (slave1.relationshipTarget === V.marrying[1]) {
- if (!solo && brides.every((b) => b.fetish === "mindbroken")) {
+ if (!solo && brides.every((b) => b.fetish === Fetish.MINDBROKEN)) {
// TODO: write these
} else if (!solo && brides.every((b) => b.devotion + b.trust >= 175)) {
r.push(`The fact that their relationship together now involves you <span class="hotpink">excites them to no end.</span>`);
@@ -1272,13 +1272,13 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
}
} else if (V.weddingPlanned === 2) { // Orgiastic ceremony
if (
- brides.every((b) => b.fetish === "mindbroken") ||
+ brides.every((b) => b.fetish === Fetish.MINDBROKEN) ||
brides.every((b) => b.devotion + b.trust >= 175) ||
brides.every((b) => b.devotion < -20 && b.trust > 20) ||
brides.every((b) => b.devotion < -20) ||
brides.every((b) => b.devotion >= -20)
) {
- if (slave1.fetish === "mindbroken") {
+ if (slave1.fetish === Fetish.MINDBROKEN) {
// TODO: rewrite for slaves that can't walk
r.push(`They spent the day before resting and preparing themselves, if you can call sitting around mindlessly preparing. They spend most of the day-long party at the center of a nonstop gangbang, occasionally moaning as more of a physical reaction than anything. The theory is that they'll be bound to you as your slave ${wives} from this day onward, so they must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter emptiness. Many brought their own slaves to participate, too. ${namesString} spend hours with numerous cocks inside them, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, they are extracted and taken off to be bathed.`);
App.Events.addParagraph(node, r);
@@ -1322,7 +1322,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
App.Events.addParagraph(node, r);
r = [];
// TODO: marked for rewrite
- r.push(`Once the ceremony is complete, you scoop up your new, protesting, slave ${wives} to carry them back into the master bedroom. They rest their heads against your ${PCChest}, simply too tired to care anymore. By the time they're home, they're fast asleep. You set them gently down on the bed and curl up behind them, feeling the animal warmth of their bodies as the exhausted slaves' chest rise and fall with their breathing. They squirms slightly in their sleep to the unwelcome feeling of your arm around them.`);
+ r.push(`Once the ceremony is complete, you scoop up your new, protesting, slave ${wives} to carry them back into the master bedroom. They rest their heads against your ${PCChest}, simply too tired to care anymore. By the time they're home, they're fast asleep. You set them gently down on the bed and curl up behind them, feeling the animal warmth of their bodies as the exhausted slaves' chests rise and fall with their breathing. They squirm slightly in their sleep to the unwelcome feeling of your arm around them.`);
} else if (slave1.devotion < -20) {
// TODO: rewrite for slaves that can't walk
r.push(`They spent the day before resting and crying to themselves, and this was a necessary precaution. They spend most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that they'll be bound to you as your slave ${wives} from this day onward, so they must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. ${namesString} spend hours with numerous cocks inside them, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, they're extracted and taken off to be bathed.`);
@@ -1362,7 +1362,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
} else {
r.push(`${slave.slaveName}, meanwhile,`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`spent the day before resting and preparing ${himself}, if you can call sitting around mindlessly preparing. ${He} spends most of the day-long party at the center of a nonstop gangbang, occasionally moaning as more of a physical reaction than anything. The theory is that ${he}'ll be bound to you as your slave ${wife} from this day onward, so ${he} must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter emptiness. Many brought their own slaves to participate, too. ${slave.slaveName} spends hours with numerous cocks inside ${him}, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, ${he}'s extracted and taken off to be bathed.`);
App.Events.addParagraph(node, r);
r = [];
@@ -1640,7 +1640,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
}
r.push(`this, of course, and`);
const nameCheck = !solo && brides.every(b => b.slaveSurname !== V.PC.slaveSurname);
- if (nameCheck && brides.every((b) => b.fetish === "mindbroken")) {
+ if (nameCheck && brides.every((b) => b.fetish === Fetish.MINDBROKEN)) {
r.push(`show no reaction. Like many things, names mean nothing to them now. Your guests, on the other hand, appreciate the gift.`);
} else if (nameCheck && brides.every((b) => b.devotion + b.trust >= 175)) {
r.push(`break down again; it's like a dream come true.`);
@@ -1661,7 +1661,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
r.push(`${slave.slaveName}, meanwhile,`);
}
meanwhile = true;
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} shows no reaction. Like many things, names mean nothing to ${him} now. Your guests, on the other hand, appreciate the gift.`);
} else if (slave.devotion + slave.trust >= 175) {
if (V.weddingPlanned === 3) {
@@ -1697,7 +1697,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
function makeTrinkets(trinketSlave) {
if (V.weddingPlanned === 3) {
- if (trinketSlave.fetish === "mindbroken") {
+ if (trinketSlave.fetish === Fetish.MINDBROKEN) {
addTrinket(`a framed shot of you impregnating the blank-faced ${trinketSlave.slaveName} at your wedding`);
} else if (trinketSlave.devotion + trinketSlave.trust >= 175) {
addTrinket(`a framed shot of you impregnating the joyous ${trinketSlave.slaveName} at your wedding`);
@@ -1709,7 +1709,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
addTrinket(`a framed shot of you impregnating ${trinketSlave.slaveName} at your wedding`);
}
} else if (V.weddingPlanned === 2) {
- if (trinketSlave.fetish === "mindbroken") {
+ if (trinketSlave.fetish === Fetish.MINDBROKEN) {
addTrinket(`a framed shot of the broken ${trinketSlave.slaveName} getting gangbanged at your wedding`);
} else if (trinketSlave.devotion + trinketSlave.trust >= 175) {
addTrinket(`a framed shot of the tear and cum soaked ${trinketSlave.slaveName} getting gangbanged at your wedding`);
@@ -1721,7 +1721,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
addTrinket(`a framed shot of ${trinketSlave.slaveName} getting gangbanged at your wedding`);
}
} else if (V.weddingPlanned === 1) {
- if (trinketSlave.fetish === "mindbroken") {
+ if (trinketSlave.fetish === Fetish.MINDBROKEN) {
addTrinket(`a framed shot of your uneventful wedding to the mindbroken ${trinketSlave.slaveName}`);
} else if (trinketSlave.devotion + trinketSlave.trust >= 175) {
addTrinket(`a framed shot of your romantic wedding to the joyous ${trinketSlave.slaveName}`);
diff --git a/src/facilities/arcade/arcade.js b/src/facilities/arcade/arcade.js
index c559c2327e9760c250ce85690525cddd5a31f23f..39ac9ba3a1afeab5888351f4de03b23f6abfbf5b 100644
--- a/src/facilities/arcade/arcade.js
+++ b/src/facilities/arcade/arcade.js
@@ -29,9 +29,9 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
text.push(this.facility.nameCaps, this.decorations);
- if (this.facility.hostedSlaves > 2) {
+ if (this.facility.hostedSlaves() > 2) {
text.push(`It's busy. Customers are entering and exiting, leaving a few ¤ behind in the charge machines and loads of semen behind in the holes.`);
- } else if (this.facility.hostedSlaves > 0) {
+ } else if (this.facility.hostedSlaves() > 0) {
text.push(`It's understaffed; there are lines here and there for the few holes available.`);
} else {
text.push(`It's empty and quiet.`);
@@ -88,7 +88,7 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
/** @returns {FC.Facilities.Expand} */
get expand() {
return {
- desc: `It can support ${num(V.arcade)} inmates. There ${this.facility.hostedSlaves === 1 ? `is currently ${num(this.facility.hostedSlaves)} slave` : `are currently ${num(this.facility.hostedSlaves)} slaves`} incarcerated in ${V.arcadeName}.`,
+ desc: `It can support ${num(V.arcade)} inmates. There ${this.facility.hostedSlaves() === 1 ? `is` : `are`} currently ${numberWithPluralOne(this.facility.hostedSlaves(), "slave")} incarcerated in ${V.arcadeName}.`,
removeSlave: "work a glory hole",
};
}
@@ -115,7 +115,7 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
`is mutually exclusive with the collectors`,
],
prereqs: [
- () => V.arcadeUpgradeCollectors < 1,
+ V.arcadeUpgradeCollectors < 1,
],
},
{
@@ -125,7 +125,7 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
link: `Apply aphrodisiacs`,
handler: () => V.PC.skill.engineering += .1,
prereqs: [
- () => V.arcadeUpgradeCollectors < 1,
+ V.arcadeUpgradeCollectors < 1,
],
},
{
@@ -153,7 +153,7 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
`is mutually exclusive with the injectors`,
],
prereqs: [
- () => V.arcadeUpgradeInjectors < 1,
+ V.arcadeUpgradeInjectors < 1,
],
},
{
@@ -207,8 +207,8 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
{
property: "arcadeUpgradeFuckdolls",
prereqs: [
- () => V.arcadeUpgradeFuckdolls > 0,
- () => App.Entity.facilities.arcade.hostedSlaves > 0,
+ V.arcadeUpgradeFuckdolls > 0,
+ App.Entity.facilities.arcade.hostedSlaves() > 0,
],
options: [
{
@@ -227,8 +227,8 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
},
],
nodes: [
- V.arcade > App.Entity.facilities.arcade.hostedSlaves && V.fuckdolls > 0
- ? `There is room in the arcade for ${V.arcade - App.Entity.facilities.arcade.hostedSlaves} menial Fuckdolls. ${V.fuckdolls > 1
+ V.arcade > App.Entity.facilities.arcade.hostedSlaves() && V.fuckdolls > 0
+ ? `There is room in the arcade for ${V.arcade - App.Entity.facilities.arcade.hostedSlaves()} menial Fuckdolls. ${V.fuckdolls > 1
? `They'll be more efficient in the arcade, so you restrain them here.`
: `Your Fuckdoll will be more efficient serving in the arcade, so you send it here.`}`
: ``,
@@ -237,7 +237,7 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
{
property: "arcadeUpgradeHealth",
prereqs: [
- () => V.arcadeUpgradeHealth > -1,
+ V.arcadeUpgradeHealth > -1,
],
options: [
{
@@ -266,7 +266,7 @@ App.Facilities.Arcade.arcade = class Arcade extends App.Facilities.Facility {
{
property: "arcadeUpgradeFuckdolls",
prereqs: [
- () => V.arcadeUpgradeFuckdolls > 0,
+ V.arcadeUpgradeFuckdolls > 0,
],
options: [
{
diff --git a/src/facilities/arcade/arcadeFramework.js b/src/facilities/arcade/arcadeFramework.js
index 4093d972395e50c7181ea436ee24ac4f157c2aff..e1d08b73707c7347e73406ac3f61435396fca612 100644
--- a/src/facilities/arcade/arcadeFramework.js
+++ b/src/facilities/arcade/arcadeFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.arcade = {
baseName: "arcade",
genericName: null,
diff --git a/src/facilities/armory/BGSelect.js b/src/facilities/armory/BGSelect.js
index 4f8e58c763e182a878b635dda80d0e15fd88b139..da26e5dcd19fd7ea67c24296355972a45a0483ca 100644
--- a/src/facilities/armory/BGSelect.js
+++ b/src/facilities/armory/BGSelect.js
@@ -18,6 +18,16 @@ App.Facilities.BGSelect = function() {
f.append(`No Bodyguard assigned, appoint one from your devoted slaves.`);
}
- f.append(App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.armory, "BG Select"));
+ f.append(App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.armory, "BG Select", deadlinessNote));
return f;
+
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {HTMLDivElement}
+ */
+ function deadlinessNote(slave) {
+ const div = document.createElement("div");
+ div.append("Deadliness: ", DeadlinessTooltip(slave));
+ return div;
+ }
};
diff --git a/src/facilities/armory/armoryFramework.js b/src/facilities/armory/armoryFramework.js
index a1ed3c9055918920b2043292a3ca990b5942e940..e5dfab7527cd2b97706b41e97d55924fc63469d7 100644
--- a/src/facilities/armory/armoryFramework.js
+++ b/src/facilities/armory/armoryFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.armory = {
baseName: "dojo",
genericName: "Armory",
diff --git a/src/facilities/bodyModification/bodyModification.js b/src/facilities/bodyModification/bodyModification.js
index 3027d2be6463945738bed93aae86af03932eef71..b691a8d4dcfad48d2425eacc3c99ce72ce11bff2 100644
--- a/src/facilities/bodyModification/bodyModification.js
+++ b/src/facilities/bodyModification/bodyModification.js
@@ -149,7 +149,7 @@ App.UI.bodyModification = function(slave, cheat = false) {
r.push(`Afterwards you seal the wounds with a white medical spray. Infection is no risk to ${slave.slaveName} thanks to your curatives, but in order to form obvious scar tissue you had to keep air out and delay normal healing as long as possible.`);
scarApplied = false;
}
- if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0) {
if (degradation > 1) {
if (degradation > 5) {
if (slave.devotion <= 50 && slave.trust < -50) {
@@ -433,7 +433,6 @@ App.UI.bodyModification = function(slave, cheat = false) {
if (!hasAnyNaturalArms(slave)) {
removeTattooLocation("upper arm");
}
-
if (!hasAnyNaturalArms(slave)) {
removeTattooLocation("thigh");
}
@@ -441,7 +440,10 @@ App.UI.bodyModification = function(slave, cheat = false) {
if (slave.dick === 0 || tattooChoice === "scenes") {
removeTattooLocation("dick");
}
- if ((tattooChoice === "Asian art" || tattooChoice === "scenes") && slave.anusTat === "bleached") { // leave existing bleached anus alone
+ if (tattooChoice === "scenes") {
+ removeTattooLocation("lips");
+ }
+ if ((tattooChoice === "Asian art" || tattooChoice === "scenes") || slave.anusTat === "bleached") { // leave existing bleached anus alone
removeTattooLocation("anus");
}
}
@@ -469,7 +471,7 @@ App.UI.bodyModification = function(slave, cheat = false) {
() => {
for (const location of validTattooLocations) {
if (slave[`${location}tattoo`] !== tattooChoice) {
- applyTat(location);
+ applyTat(location, tattooChoice);
}
}
refresh();
@@ -484,7 +486,7 @@ App.UI.bodyModification = function(slave, cheat = false) {
App.UI.DOM.link(
capFirstChar(location),
() => {
- applyTat(location);
+ applyTat(location, tattooChoice);
refresh();
}
)
@@ -515,10 +517,9 @@ App.UI.bodyModification = function(slave, cheat = false) {
return el;
- function applyTat(location) {
- tattooChoice = (location === "lips" && tattooChoice === "scenes") ? "permanent makeup" : tattooChoice;
- modReaction += App.Medicine.Modification.setTattoo(slave, tattooLocations.get(location), tattooChoice, cheat);
- if (!["flowers", "paternalist", "tribal patterns", 0].includes(tattooChoice)) {
+ function applyTat(location, style) {
+ modReaction += App.Medicine.Modification.setTattoo(slave, tattooLocations.get(location), style, cheat);
+ if (!["flowers", "paternalist", "tribal patterns", 0].includes(style)) {
degradation += 1;
}
}
@@ -565,11 +566,11 @@ App.UI.bodyModification = function(slave, cheat = false) {
}
}
} else if (slave.bellyPreg >= 450000) {
- r.push(`${His} middle is large and taut enough to be a suitable canvas for a navel focused tattoo, but ${his} brood is too active to permit the needle to do its work.`);
+ r.push(`${His} middle is large and taut enough to be a suitable canvas for a navel-focused tattoo, but ${his} brood is too active to permit the needle to do its work.`);
} else if (slave.bellyFluid >= 10000) {
- r.push(`${His} middle is large and taut enough to be a suitable canvas for a navel focused tattoo, but the pressure applied to ${his} stomach will likely force ${him} to release its contents.`);
+ r.push(`${His} middle is large and taut enough to be a suitable canvas for a navel-focused tattoo, but the pressure applied to ${his} stomach will likely force ${him} to release its contents.`);
} else {
- r.push(`${His} middle isn't large enough to be a suitable canvas for a navel focused tattoo.`);
+ r.push(`${His} middle isn't large enough to be a suitable canvas for a navel-focused tattoo.`);
}
r.push(App.UI.DOM.generateLinksStrip(linkArray));
App.Events.addNode(frag, r, "div");
diff --git a/src/facilities/brothel/brothel.js b/src/facilities/brothel/brothel.js
index f1807bb98c678ade01573a225701205239d9d6e4..4d618a9474ec8c2d4eb71fd01cf5f91c02762b27 100644
--- a/src/facilities/brothel/brothel.js
+++ b/src/facilities/brothel/brothel.js
@@ -79,7 +79,7 @@ App.Facilities.Brothel.brothel = class Brothel extends App.Facilities.Facility {
const is = num => num === 1 ? `is` : `are`;
const text = [];
- text.push(`It can support ${num(V.brothel)} whores. There ${is(this.facility.hostedSlaves)} currently ${numberWithPluralOne(this.facility.hostedSlaves, 'whore')} working in ${V.brothelName}.`);
+ text.push(`It can support ${num(V.brothel)} whores. There ${is(this.facility.hostedSlaves())} currently ${numberWithPluralOne(this.facility.hostedSlaves(), 'whore')} working in ${V.brothelName}.`);
if (V.brothelAdsSpending > 0) {
text.push(`Screens outside the entrance are showing porn to advertise ${V.brothelName}.`);
@@ -163,9 +163,9 @@ App.Facilities.Brothel.brothel = class Brothel extends App.Facilities.Facility {
}
}
- if (this.facility.hostedSlaves > 2) {
+ if (this.facility.hostedSlaves() > 2) {
text.push(`${capFirstChar(V.brothelName)} is bustling with activity. Customers are coming and going and slave girls are displaying themselves. When a slave catches a customer's eye, he leads her back into a little cubicle.`);
- } else if (this.facility.hostedSlaves > 0) {
+ } else if (this.facility.hostedSlaves() > 0) {
text.push(`${capFirstChar(V.brothelName)} is working steadily. Customers are present and slave girls are on offer. When a slave catches a customer's eye, he leads her back into a little cubicle.`);
} else if (S.Madam) {
text.push(`${S.Madam.slaveName} is alone in ${V.brothelName}, and has nothing to do but keep the place clean and plan future sales efforts.`);
@@ -219,7 +219,7 @@ App.Facilities.Brothel.brothel = class Brothel extends App.Facilities.Facility {
{
property: "brothelUpgradeDrugs",
prereqs: [
- () => V.brothelUpgradeDrugs > 0,
+ V.brothelUpgradeDrugs > 0,
],
options: [
{
@@ -248,7 +248,7 @@ App.Facilities.Brothel.brothel = class Brothel extends App.Facilities.Facility {
{
property: "MadamIgnoresFlaws",
prereqs: [
- () => !!S.Madam,
+ !!S.Madam,
],
options: [
{
@@ -272,7 +272,7 @@ App.Facilities.Brothel.brothel = class Brothel extends App.Facilities.Facility {
{
property: "MadamNoSex",
prereqs: [
- () => !!S.Madam,
+ !!S.Madam,
],
options: [
{
@@ -308,10 +308,10 @@ App.Facilities.Brothel.brothel = class Brothel extends App.Facilities.Facility {
const profit = V.lastWeeksCashIncome.brothelAds + V.lastWeeksCashExpenses.brothelAds;
App.Events.addNode(div, [`${capFirstChar(V.brothelName)} ${V.brothelAdsSpending > 0 ? `is the subject of an active ad campaign.` : `advertises by word of mouth.`} Last week this ${profit > 0
- ? `made you an extra <span class="cash inc">${cashFormat(profit)},</span>${this.facility.hostedSlaves > 0
+ ? `made you an extra <span class="cash inc">${cashFormat(profit)},</span>${this.facility.hostedSlaves() > 0
? ` as well as increasing business for your whores.` : ``}`
: profit < 0
- ? `cost you <span class="cash dec">${cashFormat(profit)},</span>${this.facility.hostedSlaves > 0
+ ? `cost you <span class="cash dec">${cashFormat(profit)},</span>${this.facility.hostedSlaves() > 0
? ` but still increased business for your whores.` : ``}`
: `didn't make you any extra money, but didn't lose you any, either.`}`]);
diff --git a/src/facilities/brothel/brothelAds.js b/src/facilities/brothel/brothelAds.js
index 77401739874eb540f0420783bbafc890b9856eaf..72429689ed5aa881f8bc580699343ea1909f19b1 100644
--- a/src/facilities/brothel/brothelAds.js
+++ b/src/facilities/brothel/brothelAds.js
@@ -196,7 +196,7 @@ App.Facilities.Brothel.ads = function() {
text.push(`You are spending ${cashFormatColor(V.brothelAdsSpending, true)} each week to advertise ${V.brothelName}.`);
if (V.lastWeeksCashIncome.brothelAds > 0) {
- text.push(`Last week's ads increased profits by ${cashFormatColor(V.lastWeeksCashIncome.brothelAds)}${App.Entity.facilities.brothel.hostedSlaves > 1 ? ` and increased business for your whores` : ``}, and cost ${cashFormatColor(V.lastWeeksCashExpenses.brothelAds)}.`);
+ text.push(`Last week's ads increased profits by ${cashFormatColor(V.lastWeeksCashIncome.brothelAds)}${App.Entity.facilities.brothel.hostedSlaves() > 1 ? ` and increased business for your whores` : ``}, and cost ${cashFormatColor(V.lastWeeksCashExpenses.brothelAds)}.`);
}
App.Events.addNode(div, text);
diff --git a/src/facilities/brothel/brothelAssignmentScene.js b/src/facilities/brothel/brothelAssignmentScene.js
index 8ebea09a1471af05a83d8e5533f1f31871a6ea52..0a17b64aedc8caf1cc2ca7dc2e16ea7922f8154d 100644
--- a/src/facilities/brothel/brothelAssignmentScene.js
+++ b/src/facilities/brothel/brothelAssignmentScene.js
@@ -80,7 +80,7 @@ App.Facilities.Brothel.assignmentScene = function(slave) {
App.Events.addParagraph(node, r);
r = [];
if (slave.devotion > 50) {
- if (slave.fetishKnown === 1 && slave.fetishStrength > 60 && slave.fetish !== "none") {
+ if (slave.fetishKnown === 1 && slave.fetishStrength > 60 && slave.fetish !== Fetish.NONE) {
r.push(`${He} looks excited.`);
if (canTalk(slave)) {
r.push(Spoken(slave, `"${Master}, I hoped you would send me down there sometime!`));
@@ -239,7 +239,7 @@ App.Facilities.Brothel.assignmentScene = function(slave) {
}
} else if (slave.devotion > 20 || (slave.devotion >= -20 && slave.trust < -20 && slave.trust >= -50)) {
if (canTalk(slave)) {
- if (slave.fetishKnown === 1 && slave.fetishStrength > 60 && slave.fetish !== "none") {
+ if (slave.fetishKnown === 1 && slave.fetishStrength > 60 && slave.fetish !== Fetish.NONE) {
r.push(`${He} looks cautiously excited.`);
switch (slave.fetish) {
case "submissive":
@@ -420,7 +420,7 @@ App.Facilities.Brothel.assignmentScene = function(slave) {
);
}
} else {
- if (slave.fetishKnown === 1 && slave.fetishStrength > 60 && slave.fetish !== "none") {
+ if (slave.fetishKnown === 1 && slave.fetishStrength > 60 && slave.fetish !== Fetish.NONE) {
r.push(`${He} looks cautiously excited.`);
switch (slave.fetish) {
case "submissive":
diff --git a/src/facilities/brothel/brothelFramework.js b/src/facilities/brothel/brothelFramework.js
index b50d706ae25df7d2bd508becc0b027976ab51aee..920452717a7e78a2dab7c6a3374d1f4b00c163a4 100644
--- a/src/facilities/brothel/brothelFramework.js
+++ b/src/facilities/brothel/brothelFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.brothel = {
baseName: "brothel",
genericName: null,
diff --git a/src/facilities/cellblock/cellblock.js b/src/facilities/cellblock/cellblock.js
index 5240c175c7fe8ec142b51f38924df1a8f5a72999..22728dba063c0c2a00f1c78a4856668676186ba2 100644
--- a/src/facilities/cellblock/cellblock.js
+++ b/src/facilities/cellblock/cellblock.js
@@ -23,9 +23,9 @@ App.Facilities.Cellblock.cellblock = class Cellblock extends App.Facilities.Faci
text.push(this.facility.nameCaps, this.decorations);
- if (this.facility.hostedSlaves > 2) {
+ if (this.facility.hostedSlaves() > 2) {
text.push(`${this.facility.nameCaps} is full of slaves, though it's difficult to tell at first. In many of the cells, a scene of loneliness and misery may be witnessed, but not one sound escapes them in fear of the punishment that would follow.`);
- } else if (this.facility.hostedSlaves > 0) {
+ } else if (this.facility.hostedSlaves() > 0) {
text.push(`${this.facility.nameCaps} holds a few slaves, though it's difficult to tell at first. In several of the cells, a scene of loneliness and misery may be witnessed, but not one sound escapes them in fear of the punishment that would follow.`);
} else if (S.Wardeness) {
text.push(`${S.Wardeness.slaveName} is alone in ${this.facility.name}, and seems rather lonely without anyone to oppress.`);
@@ -84,9 +84,9 @@ App.Facilities.Cellblock.cellblock = class Cellblock extends App.Facilities.Faci
/** @returns {FC.Facilities.Expand} */
get expand() {
return {
- desc: `${capFirstChar(V.cellblockName)} has room for ${num(V.cellblock)} slaves to be kept in close confinement. There ${this.facility.hostedSlaves === 1
- ? `is currently ${num(this.facility.hostedSlaves)} slave`
- : `are currently ${num(this.facility.hostedSlaves)} slaves`} kept in close confinement in ${V.cellblockName}.`,
+ desc: `${capFirstChar(V.cellblockName)} has room for ${num(V.cellblock)} slaves to be kept in close confinement. There ${this.facility.hostedSlaves() === 1
+ ? `is currently ${num(this.facility.hostedSlaves())} slave`
+ : `are currently ${num(this.facility.hostedSlaves())} slaves`} kept in close confinement in ${V.cellblockName}.`,
removeSlave: "stay confined",
};
}
@@ -123,8 +123,8 @@ App.Facilities.Cellblock.cellblock = class Cellblock extends App.Facilities.Faci
{
property: "cellblockWardenCumsInside",
prereqs: [
- () => !!S.Wardeness,
- () => !!S.Wardeness && canPenetrate(S.Wardeness),
+ !!S.Wardeness,
+ !!S.Wardeness && canPenetrate(S.Wardeness),
],
options: [
{
diff --git a/src/facilities/cellblock/cellblockFramework.js b/src/facilities/cellblock/cellblockFramework.js
index 999da56441c4333d71e8a57be0fdec024505bbe7..f24e87f5034b1d1f962b7c89664250b38b028260 100644
--- a/src/facilities/cellblock/cellblockFramework.js
+++ b/src/facilities/cellblock/cellblockFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.cellblock = {
baseName: "cellblock",
genericName: null,
diff --git a/src/facilities/clinic/clinic.js b/src/facilities/clinic/clinic.js
index ffa099a63148740ca1504f37953e1681fbaf9f5c..6feeb8eaf7ef02688032b6a981be7c22beefc6a2 100644
--- a/src/facilities/clinic/clinic.js
+++ b/src/facilities/clinic/clinic.js
@@ -28,9 +28,9 @@ App.Facilities.Clinic.clinic = class Clinic extends App.Facilities.Facility {
text.push(this.facility.nameCaps, this.decorations);
- if (this.facility.hostedSlaves > 2) {
+ if (this.facility.hostedSlaves() > 2) {
text.push(`${this.facility.nameCaps} is busy. Patients occupy many of the beds; most are alert, but a few are dozing under medication designed to promote healing through deep rest.`);
- } else if (this.facility.hostedSlaves > 0) {
+ } else if (this.facility.hostedSlaves() > 0) {
text.push(`${this.facility.nameCaps} is sparsely populated. Patients occupy a few of the beds; most are alert, but a few are dozing under medication designed to promote healing through deep rest.`);
} else if (S.Nurse) {
text.push(`${S.Nurse.slaveName} is alone in the clinic, and has nothing to do but keep the place spotlessly clean and ready for its next patients.`);
@@ -89,7 +89,7 @@ App.Facilities.Clinic.clinic = class Clinic extends App.Facilities.Facility {
/** @returns {FC.Facilities.Expand} */
get expand() {
return {
- desc: `${this.facility.nameCaps} has room to support ${num(V.clinic)} slaves while they receive treatment. There ${this.facility.hostedSlaves === 1 ? `is currently ${num(this.facility.hostedSlaves)} slave` : `are currently ${num(this.facility.hostedSlaves)} slaves`} receiving treatment in ${V.clinicName}.`,
+ desc: `${this.facility.nameCaps} has room to support ${num(V.clinic)} slaves while they receive treatment. There ${this.facility.hostedSlaves() === 1 ? `is currently ${num(this.facility.hostedSlaves())} slave` : `are currently ${num(this.facility.hostedSlaves())} slaves`} receiving treatment in ${V.clinicName}.`,
};
}
@@ -147,7 +147,7 @@ App.Facilities.Clinic.clinic = class Clinic extends App.Facilities.Facility {
cost: 30000 * V.upgradeMultiplierArcology * Math.min(V.upgradeMultiplierMedicine, V.HackingSkillMultiplier),
notes: [`helps prevent and fight illness in large slave populations`],
prereqs: [
- () => V.geneticMappingUpgrade > 0
+ V.geneticMappingUpgrade > 0
]
},
{
@@ -171,7 +171,7 @@ App.Facilities.Clinic.clinic = class Clinic extends App.Facilities.Facility {
handler: () => V.PC.skill.hacking += 0.1,
notes: [`may cause health problems in slaves`],
prereqs: [
- () => V.clinicUpgradeFilters > 0,
+ V.clinicUpgradeFilters > 0,
],
},
{
@@ -201,7 +201,7 @@ App.Facilities.Clinic.clinic = class Clinic extends App.Facilities.Facility {
{
property: "clinicInflateBelly",
prereqs: [
- () => !!S.Nurse,
+ !!S.Nurse,
],
options: [
{
@@ -235,7 +235,7 @@ App.Facilities.Clinic.clinic = class Clinic extends App.Facilities.Facility {
{
property: "clinicRegularCheckups",
prereqs: [
- () => !!S.Nurse,
+ !!S.Nurse,
],
options: [
{
@@ -253,7 +253,7 @@ App.Facilities.Clinic.clinic = class Clinic extends App.Facilities.Facility {
{
property: "clinicSpeedGestation",
prereqs: [
- () => !!S.Nurse,
+ !!S.Nurse,
],
options: [
{
diff --git a/src/facilities/clinic/clinicFramework.js b/src/facilities/clinic/clinicFramework.js
index dbdde301ccfaae7ce7f3ad2f810862a83a48e022..b55c9b8c15db4b681463bc97d155bcdf3ee35f50 100644
--- a/src/facilities/clinic/clinicFramework.js
+++ b/src/facilities/clinic/clinicFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.clinic = {
baseName: "clinic",
genericName: null,
diff --git a/src/facilities/club/club.js b/src/facilities/club/club.js
index bccf3b33b65a38649dfa25da4342803251215ecf..eaf07a2cd9b27e9c40036b0d1b207ac344f5f350 100644
--- a/src/facilities/club/club.js
+++ b/src/facilities/club/club.js
@@ -26,9 +26,9 @@ App.Facilities.Club.club = class Club extends App.Facilities.Facility {
text.push(this.facility.nameCaps, this.decorations);
- if (this.facility.hostedSlaves > 2) {
+ if (this.facility.hostedSlaves() > 2) {
text.push(`${this.facility.nameCaps} is dotted with pretty, flirtatious slaves, stripping on stages, serving drinks, and dancing. They're very willing to suck patrons off in the open or give a public handjob, and there are little private rooms for them to use when engaging in heavier intercourse.`);
- } else if (this.facility.hostedSlaves > 0) {
+ } else if (this.facility.hostedSlaves() > 0) {
text.push(`There are a few pretty, flirtatious slaves, stripping on stages, serving drinks, and dancing. They're very willing to suck patrons off in the open or give a public handjob, and there are little private rooms for them to use when engaging in heavier intercourse.`);
} else if (S.DJ) {
text.push(`${this.facility.nameCaps} is doing business normally, without a complement of sex slaves to spice things up. ${S.DJ.slaveName} is alone in ${V.clubName}, and can accomplish little by ${getPronouns(S.DJ).himself}.`);
@@ -114,7 +114,7 @@ App.Facilities.Club.club = class Club extends App.Facilities.Facility {
}
}
- if (this.facility.hostedSlaves > 2) {
+ if (this.facility.hostedSlaves() > 2) {
switch (V.clubDecoration) {
case "Chattel Religionist":
text.push(`From one of the private rooms, praying interspersed with the slap of leather on flesh can be heard.`);
@@ -223,7 +223,7 @@ App.Facilities.Club.club = class Club extends App.Facilities.Facility {
"Repopulationist": `has a gaudy appearance. There are lots of deep soft chairs for pregnant patrons and slaves to rest in and screens showing girls with large bellies lining the walls.`,
"Eugenics": `has a gaudy appearance. There are screens lining the walls discouraging unprotected slave sex. The real action happens in the several exclusive rooms reserved for society's best.`,
"Asset Expansionist": `has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing off big tits and plush asses.`,
- "Transformation Fetishist": `has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing off huge fake tits and plastic dick sucking lips.`,
+ "Transformation Fetishist": `has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing off huge fake tits and plastic dick-sucking lips.`,
"Gender Radicalist": `has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing closeups of cocks fucking every imaginable orifice.`,
"Gender Fundamentalist": `has an old world appearance, a decidedly throwback atmosphere harking back to the glory days of cultures past.`,
"Physical Idealist": `isn't a gym, but it smells like one. The dancing is rough and competitive, and the drinks are rich with protein.`,
@@ -255,7 +255,7 @@ App.Facilities.Club.club = class Club extends App.Facilities.Facility {
/** @returns {FC.Facilities.Expand} */
get expand() {
return {
- desc: `There are rooms off ${V.clubName} to support slaves as they work as club sluts. They can support ${num(V.club)} slaves. There ${this.facility.hostedSlaves === 1 ? `is currently ${num(this.facility.hostedSlaves)} slave` : `are currently ${num(this.facility.hostedSlaves)} slaves`} serving in ${V.clubName
+ desc: `There are rooms off ${V.clubName} to support slaves as they work as club sluts. They can support ${num(V.club)} slaves. There ${this.facility.hostedSlaves() === 1 ? `is currently ${num(this.facility.hostedSlaves())} slave` : `are currently ${num(this.facility.hostedSlaves())} slaves`} serving in ${V.clubName
}.`,
removeSlave: "serve the public",
};
@@ -291,7 +291,7 @@ App.Facilities.Club.club = class Club extends App.Facilities.Facility {
{
property: "DJignoresFlaws",
prereqs: [
- () => !!S.DJ,
+ !!S.DJ,
],
options: [
{
@@ -313,7 +313,7 @@ App.Facilities.Club.club = class Club extends App.Facilities.Facility {
{
property: "DJnoSex",
prereqs: [
- () => !!S.DJ,
+ !!S.DJ,
],
options: [
{
diff --git a/src/facilities/club/clubAdvertisement.js b/src/facilities/club/clubAdvertisement.js
index 9b0036b238fb17a3079afe73f1f52d172aad86c2..2c4a45b35e95cdc3329120d0ad08ee65efb88a3b 100644
--- a/src/facilities/club/clubAdvertisement.js
+++ b/src/facilities/club/clubAdvertisement.js
@@ -41,7 +41,7 @@ App.Facilities.Club.ads = function() {
r.push(`${clubNameCaps} has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing off big tits and plush asses.`);
break;
case "Transformation Fetishist":
- r.push(`${clubNameCaps} has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing off huge fake tits and plastic dick sucking lips.`);
+ r.push(`${clubNameCaps} has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing off huge fake tits and plastic dick-sucking lips.`);
break;
case "Gender Radicalist":
r.push(`${clubNameCaps} has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing closeups of cocks fucking every imaginable orifice.`);
diff --git a/src/facilities/club/clubFramework.js b/src/facilities/club/clubFramework.js
index 19bb8d05833876586882ba767e0f60968580b8a6..ac5ae912fe437c4242efe411daeedd2b84302ec3 100644
--- a/src/facilities/club/clubFramework.js
+++ b/src/facilities/club/clubFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.club = {
baseName: "club",
genericName: null,
diff --git a/src/facilities/dairy/dairy.js b/src/facilities/dairy/dairy.js
index c340f700bc9815f8794a72188ad7638af5d3c01f..3c16b0e062ed48a70abccc34c246c63ff8817689 100644
--- a/src/facilities/dairy/dairy.js
+++ b/src/facilities/dairy/dairy.js
@@ -59,7 +59,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
const text = [];
text.push(`${this.facility.nameCaps} ${V.dairyRestraintsSetting > 1 ? `is an industrial facility, but there's a viewing gallery for visitors.` : ``} ${this.decorations}`);
- if (this.facility.hostedSlaves > 2) {
+ if (this.facility.hostedSlaves() > 2) {
text.push(`${this.facility.nameCaps} is working steadily.`);
if (V.dairyRestraintsUpgrade === 1 && V.dairyRestraintsSetting > 1) {
@@ -106,7 +106,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
}
} else if (V.bioreactorsXY + V.bioreactorsXX + V.bioreactorsHerm + V.bioreactorsBarren > 0) {
text.push(`${this.facility.nameCaps} is quiet and calm. The only sounds are faint sucking and gushing noises.`);
- } else if (this.facility.hostedSlaves > 0) {
+ } else if (this.facility.hostedSlaves() > 0) {
text.push(`${this.facility.nameCaps} is sparsely populated.`);
} else if (S.Milkmaid) {
text.push(`${S.Milkmaid.slaveName} is alone in ${this.facility.name}, and has nothing to do but clean and maintain the equipment.`);
@@ -200,7 +200,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
/** @returns {FC.Facilities.Expand} */
get expand() {
return {
- desc: `${this.facility.nameCaps} can support ${V.dairy} milkers. There ${this.facility.hostedSlaves === 1 ? 'is' : 'are'} currently ${numberWithPluralOne(this.facility.hostedSlaves, 'cow')} being drained in ${V.dairyName}.`,
+ desc: `${this.facility.nameCaps} can support ${V.dairy} milkers. There ${this.facility.hostedSlaves() === 1 ? 'is' : 'are'} currently ${numberWithPluralOne(this.facility.hostedSlaves(), 'cow')} being drained in ${V.dairyName}.`,
removeSlave: "get milked",
};
}
@@ -274,7 +274,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
cost: 5000 * V.upgradeMultiplierArcology,
handler: () => V.PC.skill.engineering += 0.1,
prereqs: [
- () => (V.dairyPregSetting === 2 || V.dairyStimulatorsSetting === 2)
+ (V.dairyPregSetting === 2 || V.dairyStimulatorsSetting === 2)
],
},
{
@@ -311,11 +311,11 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
cost: 10000 * V.upgradeMultiplierArcology,
handler: () => V.PC.skill.engineering += 0.1,
prereqs: [
- () => !!V.seeHyperPreg,
- () => V.dairyRestraintsSetting === 2,
- () => V.dairyStimulatorsSetting === 2,
- () => V.dairyFeedersSetting === 2,
- () => V.dairyPregSetting > 0,
+ !!V.seeHyperPreg,
+ V.dairyRestraintsSetting === 2,
+ V.dairyStimulatorsSetting === 2,
+ V.dairyFeedersSetting === 2,
+ V.dairyPregSetting > 0,
],
},
{
@@ -338,7 +338,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
V.dairySlimMaintain = 1;
},
prereqs: [
- () => V.arcologies[0].FSSlimnessEnthusiast > 80,
+ V.arcologies[0].FSSlimnessEnthusiast > 80,
],
},
{
@@ -352,8 +352,8 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
V.dairySlimMaintain = 1;
},
prereqs: [
- () => V.arcologies[0].FSSlimnessEnthusiast > 20,
- () => V.arcologies[0].FSSlimnessEnthusiast <= 80,
+ V.arcologies[0].FSSlimnessEnthusiast > 20,
+ V.arcologies[0].FSSlimnessEnthusiast <= 80,
],
},
{
@@ -375,7 +375,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
cost: 5000 * V.upgradeMultiplierArcology,
handler: () => V.PC.skill.engineering += 0.1,
prereqs: [
- () => V.arcologies[0].FSPaternalist === "unset",
+ V.arcologies[0].FSPaternalist === "unset",
],
},
{
@@ -395,7 +395,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "dairyFeedersSetting",
prereqs: [
- () => V.dairyFeedersUpgrade > 0,
+ V.dairyFeedersUpgrade > 0,
],
options: [
{
@@ -416,7 +416,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
value: 2,
handler: App.UI.DialogHandler(() => this._getEffect("feeders")),
prereqs: [
- () => V.dairyRestraintsSetting > 1,
+ V.dairyRestraintsSetting > 1,
],
},
],
@@ -424,7 +424,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "dairyPregSetting",
prereqs: [
- () => V.dairyPregUpgrade > 0,
+ V.dairyPregUpgrade > 0,
],
options: [
{
@@ -445,7 +445,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
value: 2,
handler: App.UI.DialogHandler(() => this._getEffect("preg")),
prereqs: [
- () => V.dairyRestraintsSetting > 1,
+ V.dairyRestraintsSetting > 1,
],
},
{
@@ -454,10 +454,10 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
value: 3,
handler: App.UI.DialogHandler(() => this._getEffect("preg")),
prereqs: [
- () => V.seeExtreme > 0,
- () => V.seeHyperPreg > 0,
- () => V.dairyRestraintsSetting > 1,
- () => V.dairyHyperPregRemodel === 1,
+ V.seeExtreme > 0,
+ V.seeHyperPreg > 0,
+ V.dairyRestraintsSetting > 1,
+ V.dairyHyperPregRemodel === 1,
],
},
],
@@ -465,7 +465,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "dairyStimulatorsSetting",
prereqs: [
- () => V.dairyStimulatorsUpgrade > 0,
+ V.dairyStimulatorsUpgrade > 0,
],
options: [
{
@@ -486,8 +486,8 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
value: 2,
handler: App.UI.DialogHandler(() => this._getEffect("stimulators")),
prereqs: [
- () => !!V.seeExtreme,
- () => V.dairyRestraintsSetting > 1,
+ !!V.seeExtreme,
+ V.dairyRestraintsSetting > 1,
],
},
],
@@ -495,7 +495,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "dairyRestraintsSetting",
prereqs: [
- () => V.dairyFeedersUpgrade > 0,
+ V.dairyFeedersUpgrade > 0,
],
options: [
{
@@ -521,10 +521,10 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "createBioreactors",
prereqs: [
- () => V.bioreactorsAnnounced !== 0,
- () => V.dairyRestraintsSetting === 2,
- () => V.dairyStimulatorsSetting === 2,
- () => V.dairyFeedersSetting === 2,
+ V.bioreactorsAnnounced !== 0,
+ V.dairyRestraintsSetting === 2,
+ V.dairyStimulatorsSetting === 2,
+ V.dairyFeedersSetting === 2,
],
options: [
{
@@ -543,7 +543,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "dairySlimMaintain",
prereqs: [
- () => !!V.dairySlimMaintainUpgrade,
+ !!V.dairySlimMaintainUpgrade,
],
options: [
{
@@ -563,7 +563,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "dairyImplantsSetting",
prereqs: [
- () => V.dairySlimMaintain === 0,
+ V.dairySlimMaintain === 0,
],
options: [
{
@@ -642,7 +642,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
{
property: "milkmaidImpregnates",
prereqs: [
- () => !!S.Milkmaid,
+ !!S.Milkmaid,
],
options: [
{
@@ -713,7 +713,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
const text = [];
const {He: HeU, he: heU, him: himU, his: hisU, himself: himselfU} = getNonlocalPronouns(V.seeDicks);
- if (this.facility.hostedSlaves > 1) {
+ if (this.facility.hostedSlaves() > 1) {
if (setting === "feeders") {
if (V.dairyFeedersSetting < 2) {
text.push(`In unison, the milking machines withdraw their feeders from the slaves' throats. The slaves gag and cough, strings of feeding fluid and saliva running between their lips and the heads of the feeding phalli. These remain close to their faces so that the slaves can suck them off once they get hungry, which they will, soon. The slaves' mouths and tongues are very tired, and most of them rest with their mouths open and their tongues hanging out.`);
@@ -753,7 +753,7 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
}
} else if (setting === "stimulators") {
if (V.dairyStimulatorsSetting < 2) {
- for (const slave of this.facility.employees().filter(s => s.vagina.isBetween(-1, 3))) {
+ for (const slave of this.facility.employees().filter(s => s.anus.isBetween(-1, 3))) {
const {He, him, his} = getPronouns(slave);
text.push(`${slave.slaveName}'s milking machine ejects ${him}, since it cannot fit its massive anal dildo up ${his} tight asshole. <span class="yellow">${He} has been kicked out of ${this.facility.name}.</span>`);
removeJob(slave, Job.DAIRY);
diff --git a/src/facilities/dairy/dairyFramework.js b/src/facilities/dairy/dairyFramework.js
index 3c3b1db0d8054ae929590e721fe46151f87aa6c8..f50004d6d362455064c5e334d3abb730e39a164e 100644
--- a/src/facilities/dairy/dairyFramework.js
+++ b/src/facilities/dairy/dairyFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.dairy = {
baseName: "dairy",
genericName: null,
diff --git a/src/facilities/dairy/freeRangeDairyAssignmentScene.js b/src/facilities/dairy/freeRangeDairyAssignmentScene.js
index d5fd1d75c907818c4c1cd8fff39583f636e50e3b..21ab965c10b577573f545915bd9c86925f7e6e18 100644
--- a/src/facilities/dairy/freeRangeDairyAssignmentScene.js
+++ b/src/facilities/dairy/freeRangeDairyAssignmentScene.js
@@ -1,5 +1,5 @@
App.Facilities.Dairy.freeRangeAssignmentScene = function(slave) {
- /* This scene wants V.dairyRestraintsSetting === 0 && slave.devotion > 0 && slave.fetish !== "mindbroken" */
+ /* This scene wants V.dairyRestraintsSetting === 0 && slave.devotion > 0 && slave.fetish !== Fetish.MINDBROKEN */
const node = new DocumentFragment();
V.nextButton = "Continue";
@@ -224,7 +224,7 @@ App.Facilities.Dairy.freeRangeAssignmentScene = function(slave) {
} else {
r.push(`women`);
}
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`submitting to their sexual partners.`);
} else if (slave.fetish === "cumslut") {
if (slave.attrXY > slave.attrXX || slave.behavioralQuirk === "adores men") {
diff --git a/src/facilities/facilityRetrievalWorkaround.js b/src/facilities/facilityRetrievalWorkaround.js
index 864638388abd43dd3485abac205ebe5804441876..2fa4db315169853d4910ff5af0e06d553012df10 100644
--- a/src/facilities/facilityRetrievalWorkaround.js
+++ b/src/facilities/facilityRetrievalWorkaround.js
@@ -115,15 +115,12 @@ App.UI.facilityRetrievalWorkaround = function(facility) {
}
function checkOrgans(slave) {
- if (V.incubator.organs.length > 0) {
- for (const organ of V.incubator.organs.filter(o => o.ID === slave.ID)) {
- const newOrgan = {type: organ.type, weeksToCompletion: organ.weeksToCompletion, ID: slave.ID};
- if (newOrgan.weeksToCompletion <= 0) {
- V.completedOrgans.push(organ);
- } else {
- V.organs.push(newOrgan);
- }
- V.incubator.organs.deleteAt(organ);
+ const movedOrgans = V.incubator.organs.deleteWith(o => o.ID === slave.ID);
+ for (const organ of movedOrgans) {
+ if (organ.weeksToCompletion <= 0) {
+ V.completedOrgans.push(organ);
+ } else {
+ V.organs.push(organ);
}
}
}
diff --git a/src/facilities/farmyard/farmyard.js b/src/facilities/farmyard/farmyard.js
index ef13c786155f9f80f1ea2b45bca68ffbef9e880f..d7b88f3578079493340bf3bd1e1004967d06b765 100644
--- a/src/facilities/farmyard/farmyard.js
+++ b/src/facilities/farmyard/farmyard.js
@@ -62,17 +62,33 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
/** @returns {string} */
get intro() {
const text = [];
+ const {canine, hooved, feline} = V.animals;
+ const count = canine.length + hooved.length + feline.length;
+ let collection = ``;
+
+ if (count > 15) {
+ collection = `enormous`;
+ } else if (count > 10) {
+ collection = `impressive`;
+ } else if (count < 5) {
+ collection = `pathetic`;
+ }
- text.push(
- `${this.facility.nameCaps} is an oasis of growth in the midst of the jungle of steel and concrete that is ${V.arcologies[0].name}. Animals are kept in pens, tended to by your slaves, while ${V.farmyardUpgrades.hydroponics
+ if (V.farmyardShows === 1) {
+ text.push(`${this.facility.nameCaps} is an oasis of growth in the midst of the jungle of steel and concrete that is ${V.arcologies[0].name}. Animals are kept in pens, tended to by your slaves, while ${V.farmyardUpgrades.hydroponics
? `rows of hydroponics equipment`
- : `makeshift fields`} grow crops.`,
- this.decorations,
- );
+ : `basic dirt fields`} grow feed crops.`);
+ } else if (V.farmyardShows === 2) {
+ text.push(`${this.facility.nameCaps} is a large zoo, with a ticket booth at one end collecting patrons' ¤, a large open area where shows with animals are put on, and exhibits lining the exterior walls displaying your ${collection} collection of animals.`);
+ } else {
+ text.push(`${this.facility.nameCaps} is an oasis of growth in the midst of the jungle of steel and concrete that is ${V.arcologies[0].name}. Lush gardens are complemented by orchards and fields of various types of crops grow in ${V.farmyardUpgrades.hydroponics ? `large, complex, hydroponic setups` : `basic dirt fields`}.`);
+ }
+
+ text.push(this.decorations);
- if (this.facility.hostedSlaves > 2) {
+ if (this.facility.hostedSlaves() > 2) {
text.push(`${this.facility.nameCaps} is bustling with activity. Farmhands are hurrying about, on their way to feed animals and maintain farming equipment.`);
- } else if (this.facility.hostedSlaves) {
+ } else if (this.facility.hostedSlaves()) {
text.push(`${this.facility.nameCaps} is working steadily. Farmhands are moving about, looking after the animals and crops.`);
} else if (S.Farmer) {
text.push(`${S.Farmer.slaveName} is alone in ${V.farmyardName}, and has nothing to do but look after the animals and crops.`);
@@ -85,39 +101,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
/** @returns {string} */
get decorations() {
- /** @type {FC.Facilities.Decoration} */
- const FS = {
- "Roman Revivalist": `Its red tiles and white stone walls are the very picture of a Roman farm villa's construction, as are the marble statues and reliefs. Saturn and Ceres look over the prosperity of the fields${V.seeBestiality ? `. Mercury watches over the health of the animals, and Feronia ensures strong litters in your slaves.` : `, and Mercury watches over the health of the animals.`} The slaves here are all looked after well, as they have one of the most important jobs in ${V.arcologies[0].name}.`,
- "Neo-Imperialist": `Its high-tech, sleek black design invocates an embracement of the future, tempered by the hanging banners displaying your family crest as the rightful lord and master of these farms. Serf-like peasants work tirelessly in the fields, both to grow crops and oversee the slaves beneath them. Despite the harsh nature of the fieldwork, the slaves here are all looked after well, as they have one of the most important jobs in ${V.arcologies[0].name}.`,
- "Aztec Revivalist": `It can't completely recreate the floating farms in the ancient Aztec fashion, but it comes as close as it can, shallow pseudo-canals dividing each field into multiple sections. Smooth stone and colorful murals cover the walls, depicting bloody stories of gods and mortals alike.`,
- "Egyptian Revivalist": `It does its best to capture the wide open nature of ancient Egyptian farms, including mimicking the irrigation systems fed by the Nile. The stone walls are decorated with murals detailing its construction and your prowess in general, ${V.seeBestiality ? `with animal-bloated slaves featured prominently.` : `hieroglyphs spelling out volumes of praise.`}`,
- "Edo Revivalist": `It does its best to mimic the rice patties and thatch roofed buildings of the Edo period despite the wide variety of crops tended by various slaves. Not every crop can thrive in flooded fields, but the ones that can take advantage of your attention to detail.`,
- "Arabian Revivalist": `Large plots of olive trees and date palms line the outer edges of the main crop area, while a combination of wheat, flax, and barley occupies the interior space. Irrigation canals snake through the area, ensuring every inch of cropland is well-watered.`,
- "Chinese Revivalist": `It does its best to capture the terraces that covered the ancient Chinese hills and mountains, turning every floor into ribbons of fields following a slight incline. Slaves wade through crops that can handle flooding and splash through the irrigation of the others when they aren't tending to${V.seeBestiality ? ` or breeding with` : ``} your animals.`,
- "Chattel Religionist": `It runs like a well oiled machine, slaves bent in humble service as they tend crops grown on the Prophet's command, or see to the animals' needs. Their clothing is tucked up and out of the way as they see to their tasks, keeping them clean as they work ${V.seeBestiality ? `around animal-bloated bellies ` : ``}as divine will dictates.`,
- "Degradationist": `It is constructed less as a converted warehouse and more as something to visit, allowing guests to enjoy the spectacle of slaves ${V.seeBestiality ? `being pounded by eager animals` : `elbow deep in scrubbing animal waste`} to their satisfaction.`,
- "Repopulationist": `It teems with life, both in the belly of every animal and the belly of every slave, though the latter makes tending the fields difficult. They're ordered to take care, as they carry the future ${V.seeBestiality ? `of this farm` : `of the arcology`} in their bellies.`,
- "Eugenics": `It holds a wide variety of crops and animals, but the best of the best is easy to find. They're set apart from the others, given only the best care and supplies${V.seeBestiality ? ` and bred with only the highest quality slaves` : ``}, while the sub-par stock is neglected off to the side.`,
- "Asset Expansionist": `It is not easy to look after animals and till fields with such enormous body parts, but your slaves are diligent regardless, working hard to provide food and livestock for the arcology.`,
- "Transformation Fetishist": `The plants and animals here all look slightly unnatural, as though they were engineered in a lab to be stronger or larger – which, of course, they were.`,
- "Gender Radicalist": `The plants and animals here all look slightly unnatural, as though they were treated with hormones to be stronger or larger – which, of course, they were.`,
- "Gender Fundamentalist": `The majority of the population of ${V.farmyardName} is pregnant, and the space is outfitted with childbearing in mind.`,
- "Physical Idealist": `Its animals are in exceptional shape, their coats unable to hide how muscular they are, requiring your slaves to be equally toned to control them. There's plenty of space for their exercise as well${V.seeBestiality ? ` and an abundance of curatives for the slaves full of their fierce, kicking offspring` : ``}.`,
- "Supremacist": `It is a clean and orderly operation, stables and cages mucked by a multitude of inferior slaves, along with grooming your animals and harvesting your crops.`,
- "Subjugationist": `It is a clean and orderly operation, stables and cages mucked by a multitude of ${V.arcologies[0].FSSubjugationistRace} slaves, while the others are tasked with grooming your animals and harvesting your crops.`,
- "Paternalist": `It's full of healthy animals, crops, and slaves, the former's every need diligently looked after by the latter. The fields flourish to capacity under such care, and the animals give the distinct impression of happiness${V.seeBestiality ? ` — some more than others if the growing bellies of your slaves are anything to go by, the only indication that such rutting takes place` : ``}.`,
- "Pastoralist": `The space is outfitted with milkers every so often so that lactating farmhands don't have to travel far to relieve themselves of their milk, and the animals are milked of what they can be as well.`,
- "Maturity Preferentialist": `The majority of the population here is older and wiser, and the older animals are all treated with a bit more luxury than the younger ones.`,
- "Youth Preferentialist": `The majority of the population here is full of youth and more energetic, and the younger animals are all treated with a bit more luxury than the older ones.`,
- "Body Purist": `Organic crops and animals are the main feature here, and the animal manure is used as a natural fertilizer for the different plants.`,
- "Slimness Enthusiast": `It features trim animals and slaves alike, not a pound of excess among them. The feed for both livestock and crops are carefully maintained to ensure optimal growth without waste, letting them flourish without being weighed down.`,
- "Hedonistic": `It features wider gates and stalls, for both the humans visiting or tending the occupants, and the animals starting to mimic their handlers${V.seeBestiality ? ` and company` : ``}, with plenty of seats along the way.`,
- "Intellectual Dependency": `Large signs covered in cartoonish illustrations dot the pens, illustrating how to take care of the needs of the occupant within.${V.seeBestiality ? ` There is a strong emphasis on proper breeding positions for your slaves, with step by step instructions.` : ``}`,
- "Slave Professionalism": `Despite the surroundings, those of your slaves that are allowed to wear clothes are dressed in clean outfits.${V.seeBestiality ? ` Those bearing litters walk with practiced care, protecting their young.` : ``} They go about their tasks methodically and with care, with ${S.Farmer ? S.Farmer.slaveName : `senior farmhands`} watching carefully to correct any lax behavior.`,
- "Petite Admiration": `The buildings are squat, one story affairs that allow those of smaller stature easier access. ${V.seeBestiality ? ` Those closer to physical perfection bear the cum stains of their recent breedings.` : ``}`,
- "Statuesque Glorification": `Those workers who are smaller and less fit have been given the worst jobs, mucking out the pens and stables. ${V.seeBestiality ? ` Those closer to physical perfection bear the cum stains of their recent breedings.` : ``}`,
- "standard": `It is very much a converted warehouse still, sectioned off into various "departments"${V.farmyardUpgrades.machinery ? ` with machinery placed where it can be` : V.farmyardUpgrades.hydroponics ? ` and plumbing for the hydroponics system running every which way` : ``}.`,
- };
+ const FS = App.Facilities.Farmyard.getDecoration();
const res = FS[V.farmyardDecoration];
@@ -130,7 +114,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
/** @returns {FC.Facilities.Expand} */
get expand() {
- const slaves = this.facility.hostedSlaves;
+ const slaves = this.facility.hostedSlaves();
const is = slaves === 1 ? `is` : `are`;
return {
@@ -185,7 +169,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
`slightly increases upkeep costs`,
],
prereqs: [
- () => V.farmyardUpgrades.pump > 0,
+ V.farmyardUpgrades.pump > 0,
],
},
{
@@ -203,7 +187,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
upgraded: 1,
text: `There is room enough in ${this.facility.name} to install a hydroponics system for irrigation.`,
link: `Purchase an advanced hydroponics system`,
- cost: 20000 * V.upgradeMultiplierArcology,
+ cost: 25000 * V.upgradeMultiplierArcology,
handler: () => {
V.PC.skill.engineering += 0.1;
@@ -213,7 +197,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
`moderately decreases upkeep costs`,
],
prereqs: [
- () => V.farmyardUpgrades.fertilizer > 0,
+ V.farmyardUpgrades.fertilizer > 0,
],
},
{
@@ -231,7 +215,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
upgraded: 1,
text: `The seeds ${this.facility.name} is using are the standard seeds one could pick up at the local farmers' market.`,
link: `Purchase genetically modified seeds`,
- cost: 25000 * V.upgradeMultiplierArcology,
+ cost: 50000 * V.upgradeMultiplierArcology,
handler: () => {
V.PC.skill.engineering += 0.1;
@@ -242,7 +226,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
`slightly increases upkeep costs`,
],
prereqs: [
- () => V.farmyardUpgrades.hydroponics > 0,
+ V.farmyardUpgrades.hydroponics > 0,
],
},
{
@@ -260,7 +244,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
upgraded: 1,
text: `The machinery in ${this.facility.name} is equipment that was imported before the old world began to fall apart and is fairly old and outdated.`,
link: `Upgrade the machinery`,
- cost: 50000 * V.upgradeMultiplierArcology,
+ cost: 100000 * V.upgradeMultiplierArcology,
handler: () => {
V.PC.skill.engineering += 0.1;
@@ -271,7 +255,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
`slightly increases upkeep costs`,
],
prereqs: [
- () => V.farmyardUpgrades.seeds > 0
+ V.farmyardUpgrades.seeds > 0
],
},
{
@@ -290,8 +274,8 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
{
property: "farmyardShows",
prereqs: [
- () => this.facility.hostedSlaves > 0,
- () => V.farmyardKennels > 0 || V.farmyardStables > 0 || V.farmyardCages > 0,
+ this.facility.hostedSlaves() > 0,
+ V.farmyardKennels > 0 || V.farmyardStables > 0 || V.farmyardCages > 0,
],
options: [
{
@@ -314,9 +298,9 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
{
property: "farmyardBreeding",
prereqs: [
- () => !!V.seeBestiality,
- () => !!V.farmyardShows,
- () => !!V.animals.canine || !!V.animals.hooved || !!V.animals.feline,
+ !!V.seeBestiality,
+ !!V.farmyardShows,
+ !!V.animals.canine || !!V.animals.hooved || !!V.animals.feline,
],
options: [
{
@@ -334,8 +318,8 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
{
property: "farmyardRestraints",
prereqs: [
- () => !!V.farmyardBreeding,
- () => V.farmyardShows !== 0,
+ !!V.farmyardBreeding,
+ V.farmyardShows !== 0,
],
options: [
{
@@ -490,7 +474,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
if (V.farmMenialsSpace < 2000) {
App.UI.DOM.appendNewElement("div", div, `There is enough room in ${V.farmyardName} to build enough housing for an additional ${num(100)} menial slaves.`);
- App.UI.DOM.appendNewElement("div", div, makePurchase(`Build a new housing unit`, unitCost, "capEx", {
+ App.UI.DOM.appendNewElement("div", div, makePurchase(`Build a new housing unit`, unitCost * 100, "capEx", {
handler: () => {
V.farmMenialsSpace += 100;
},
diff --git a/src/facilities/farmyard/farmyardDecorations.js b/src/facilities/farmyard/farmyardDecorations.js
new file mode 100644
index 0000000000000000000000000000000000000000..0d01068c68dcb64b63a912c5126f7f4596087af9
--- /dev/null
+++ b/src/facilities/farmyard/farmyardDecorations.js
@@ -0,0 +1,109 @@
+/** @returns {FC.Facilities.Decoration} */
+App.Facilities.Farmyard.getDecoration = function() {
+ // both shows and food (ranch)
+ // TODO: go through these descriptions and rewrite any that need to be rewritten
+ if (V.farmyardShows === 1) {
+ return {
+ "Roman Revivalist": `Its red tiles and white stone walls are the very picture of a Roman villa's construction, as are the marble statues and reliefs. ${V.seeBestiality ? `Mercury watches over the health of the animals, and Feronia ensures strong litters in your slaves.` : `Mercury watches over the health of the animals.`} The slaves here are all looked after well, as they have one of the most important jobs in ${V.arcologies[0].name}.`,
+ "Neo-Imperialist": `Its high-tech, sleek black design invocates an embracement of the future, tempered by the hanging banners displaying your family crest as the rightful lord and master of this ranch. Serf-like peasants work tirelessly in the stables and pens, making sure one of the most important sources of food and entertainment in ${V.arcologies[0].name} is well-maintained. Despite the sometimes harsh nature of ranching, the slaves here are all looked after well, as they have one of the most important jobs in ${V.arcologies[0].name}.`,
+ "Aztec Revivalist": `It features a large, open ranch, with shallow canals snaking throughout to provide constant fresh water for the livestock in the pens. Large stone sacrificial altars are featured prominently in the middle, and large stone murals depicting warfare between Huitzilopochtli and the forces of darkness line the entire perimeter of the space.`,
+ "Egyptian Revivalist": `It does its best to capture the wide open nature of ancient Egyptian farms, including mimicking the irrigation systems fed by the Nile. The stone walls are decorated with murals detailing its construction and your prowess in general, ${V.seeBestiality ? `with animal-bloated slaves featured prominently.` : `hieroglyphs spelling out volumes of praise.`}`,
+ "Edo Revivalist": `It does its best to mimic the rice patties and thatch roofed buildings of the Edo period despite the wide variety of crops tended by various slaves. Not every crop can thrive in flooded fields, but the ones that can take advantage of your attention to detail.`,
+ "Arabian Revivalist": `Large plots of olive trees and date palms line the outer edges of the main crop area, while a combination of wheat, flax, and barley occupies the interior space. Irrigation canals snake through the area, ensuring every inch of cropland is well-watered.`,
+ "Chinese Revivalist": `It does its best to capture the terraces that covered the ancient Chinese hills and mountains, turning every floor into ribbons of fields following a slight incline. Slaves wade through crops that can handle flooding and splash through the irrigation of the others when they aren't tending to${V.seeBestiality ? ` or breeding with` : ``} your animals.`,
+ "Chattel Religionist": `It runs like a well oiled machine, slaves bent in humble service as they tend crops grown on the Prophet's command, or see to the animals' needs. Their clothing is tucked up and out of the way as they see to their tasks, keeping them clean as they work ${V.seeBestiality ? `around animal-bloated bellies ` : ``}as divine will dictates.`,
+ "Degradationist": `It is constructed less as a converted warehouse and more as something to visit, allowing guests to enjoy the spectacle of slaves ${V.seeBestiality ? `being pounded by eager animals` : `elbow deep in scrubbing animal waste`} to their satisfaction.`,
+ "Repopulationist": `It teems with life, both in the belly of every animal and the belly of every slave, though the latter makes tending the fields difficult. They're ordered to take care, as they carry the future ${V.seeBestiality ? `of this farm` : `of the arcology`} in their bellies.`,
+ "Eugenics": `It holds a wide variety of crops and animals, but the best of the best is easy to find. They're set apart from the others, given only the best care and supplies${V.seeBestiality ? ` and bred with only the highest quality slaves` : ``}, while the sub-par stock is neglected off to the side.`,
+ "Asset Expansionist": `It is not easy to look after animals and till fields with such enormous body parts, but your slaves are diligent regardless, working hard to provide food and livestock for the arcology.`,
+ "Transformation Fetishist": `The plants and animals here all look slightly unnatural, as though they were engineered in a lab to be stronger or larger – which, of course, they were.`,
+ "Gender Radicalist": `The plants and animals here all look slightly unnatural, as though they were treated with hormones to be stronger or larger – which, of course, they were.`,
+ "Gender Fundamentalist": `The majority of the population of ${V.farmyardName} is pregnant, and the space is outfitted with childbearing in mind.`,
+ "Physical Idealist": `Its animals are in exceptional shape, their coats unable to hide how muscular they are, requiring your slaves to be equally toned to control them. There's plenty of space for their exercise as well${V.seeBestiality ? ` and an abundance of curatives for the slaves full of their fierce, kicking offspring` : ``}.`,
+ "Supremacist": `It is a clean and orderly operation, stables and cages mucked by a multitude of inferior slaves, along with grooming your animals and harvesting your crops.`,
+ "Subjugationist": `It is a clean and orderly operation, stables and cages mucked by a multitude of ${V.arcologies[0].FSSubjugationistRace} slaves, while the others are tasked with grooming your animals and harvesting your crops.`,
+ "Paternalist": `It's full of healthy animals, crops, and slaves, the former's every need diligently looked after by the latter. The fields flourish to capacity under such care, and the animals give the distinct impression of happiness${V.seeBestiality ? ` — some more than others if the growing bellies of your slaves are anything to go by, the only indication that such rutting takes place` : ``}.`,
+ "Pastoralist": `The space is outfitted with milkers every so often so that lactating farmhands don't have to travel far to relieve themselves of their milk, and the animals are milked of what they can be as well.`,
+ "Maturity Preferentialist": `The majority of the population here is older and wiser, and the older animals are all treated with a bit more luxury than the younger ones.`,
+ "Youth Preferentialist": `The majority of the population here is full of youth and more energetic, and the younger animals are all treated with a bit more luxury than the older ones.`,
+ "Body Purist": `Organic crops and animals are the main feature here, and the animal manure is used as a natural fertilizer for the different plants.`,
+ "Slimness Enthusiast": `It features trim animals and slaves alike, not a pound of excess among them. The feed for both livestock and crops are carefully maintained to ensure optimal growth without waste, letting them flourish without being weighed down.`,
+ "Hedonistic": `It features wider gates and stalls, for both the humans visiting or tending the occupants, and the animals starting to mimic their handlers${V.seeBestiality ? ` and company` : ``}, with plenty of seats along the way.`,
+ "Intellectual Dependency": `Large signs covered in cartoonish illustrations dot the pens, illustrating how to take care of the needs of the occupant within.${V.seeBestiality ? ` There is a strong emphasis on proper breeding positions for your slaves, with step by step instructions.` : ``}`,
+ "Slave Professionalism": `Despite the surroundings, those of your slaves that are allowed to wear clothes are dressed in clean outfits.${V.seeBestiality ? ` Those bearing litters walk with practiced care, protecting their young.` : ``} They go about their tasks methodically and with care, with ${S.Farmer ? S.Farmer.slaveName : `senior farmhands`} watching carefully to correct any lax behavior.`,
+ "Petite Admiration": `The buildings are squat, one story affairs that allow those of smaller stature easier access. ${V.seeBestiality ? ` Those closer to physical perfection bear the cum stains of their recent breedings.` : ``}`,
+ "Statuesque Glorification": `Those workers who are smaller and less fit have been given the worst jobs, mucking out the pens and stables. ${V.seeBestiality ? ` Those closer to physical perfection bear the cum stains of their recent breedings.` : ``}`,
+ "standard": `It is very much a converted warehouse still, sectioned off into various different areas for the various types of livestock ${V.arcologies[0].name} eats.`,
+ };
+ }
+
+ // shows only (zoo)
+ if (V.farmyardShows === 2) {
+ return {
+ "Roman Revivalist": `Its red tiles and white stone walls are the very picture of a Roman farm villa's construction, as are the marble statues and reliefs. Saturn and Ceres look over the prosperity of the fields${V.seeBestiality ? `. Mercury watches over the health of the animals, and Feronia ensures strong litters in your slaves.` : `, and Mercury watches over the health of the animals.`} The slaves here are all looked after well, as they have one of the most important jobs in ${V.arcologies[0].name}.`,
+ "Neo-Imperialist": `Its high-tech, sleek black design invocates an embracement of the future, tempered by the hanging banners displaying your family crest as the rightful lord and master of these farms. Serf-like peasants work tirelessly in the fields, both to grow crops and oversee the slaves beneath them. Despite the harsh nature of the fieldwork, the slaves here are all looked after well, as they have one of the most important jobs in ${V.arcologies[0].name}.`,
+ "Aztec Revivalist": `It can't completely recreate the floating farms in the ancient Aztec fashion, but it comes as close as it can, shallow pseudo-canals dividing each field into multiple sections. Smooth stone and colorful murals cover the walls, depicting bloody stories of gods and mortals alike.`,
+ "Egyptian Revivalist": `It does its best to capture the wide open nature of ancient Egyptian farms, including mimicking the irrigation systems fed by the Nile. The stone walls are decorated with murals detailing its construction and your prowess in general, ${V.seeBestiality ? `with animal-bloated slaves featured prominently.` : `hieroglyphs spelling out volumes of praise.`}`,
+ "Edo Revivalist": `It does its best to mimic the rice patties and thatch roofed buildings of the Edo period despite the wide variety of crops tended by various slaves. Not every crop can thrive in flooded fields, but the ones that can take advantage of your attention to detail.`,
+ "Arabian Revivalist": `Large plots of olive trees and date palms line the outer edges of the main crop area, while a combination of wheat, flax, and barley occupies the interior space. Irrigation canals snake through the area, ensuring every inch of cropland is well-watered.`,
+ "Chinese Revivalist": `It does its best to capture the terraces that covered the ancient Chinese hills and mountains, turning every floor into ribbons of fields following a slight incline. Slaves wade through crops that can handle flooding and splash through the irrigation of the others when they aren't tending to${V.seeBestiality ? ` or breeding with` : ``} your animals.`,
+ "Chattel Religionist": `It runs like a well oiled machine, slaves bent in humble service as they tend crops grown on the Prophet's command, or see to the animals' needs. Their clothing is tucked up and out of the way as they see to their tasks, keeping them clean as they work ${V.seeBestiality ? `around animal-bloated bellies ` : ``}as divine will dictates.`,
+ "Degradationist": `It is constructed less as a converted warehouse and more as something to visit, allowing guests to enjoy the spectacle of slaves ${V.seeBestiality ? `being pounded by eager animals` : `elbow deep in scrubbing animal waste`} to their satisfaction.`,
+ "Repopulationist": `It teems with life, both in the belly of every animal and the belly of every slave, though the latter makes tending the fields difficult. They're ordered to take care, as they carry the future ${V.seeBestiality ? `of this farm` : `of the arcology`} in their bellies.`,
+ "Eugenics": `It holds a wide variety of crops and animals, but the best of the best is easy to find. They're set apart from the others, given only the best care and supplies${V.seeBestiality ? ` and bred with only the highest quality slaves` : ``}, while the sub-par stock is neglected off to the side.`,
+ "Asset Expansionist": `It is not easy to look after animals and till fields with such enormous body parts, but your slaves are diligent regardless, working hard to provide food and livestock for the arcology.`,
+ "Transformation Fetishist": `The plants and animals here all look slightly unnatural, as though they were engineered in a lab to be stronger or larger – which, of course, they were.`,
+ "Gender Radicalist": `The plants and animals here all look slightly unnatural, as though they were treated with hormones to be stronger or larger – which, of course, they were.`,
+ "Gender Fundamentalist": `The majority of the population of ${V.farmyardName} is pregnant, and the space is outfitted with childbearing in mind.`,
+ "Physical Idealist": `Its animals are in exceptional shape, their coats unable to hide how muscular they are, requiring your slaves to be equally toned to control them. There's plenty of space for their exercise as well${V.seeBestiality ? ` and an abundance of curatives for the slaves full of their fierce, kicking offspring` : ``}.`,
+ "Supremacist": `It is a clean and orderly operation, stables and cages mucked by a multitude of inferior slaves, along with grooming your animals and harvesting your crops.`,
+ "Subjugationist": `It is a clean and orderly operation, stables and cages mucked by a multitude of ${V.arcologies[0].FSSubjugationistRace} slaves, while the others are tasked with grooming your animals and harvesting your crops.`,
+ "Paternalist": `It's full of healthy animals, crops, and slaves, the former's every need diligently looked after by the latter. The fields flourish to capacity under such care, and the animals give the distinct impression of happiness${V.seeBestiality ? ` — some more than others if the growing bellies of your slaves are anything to go by, the only indication that such rutting takes place` : ``}.`,
+ "Pastoralist": `The space is outfitted with milkers every so often so that lactating farmhands don't have to travel far to relieve themselves of their milk, and the animals are milked of what they can be as well.`,
+ "Maturity Preferentialist": `The majority of the population here is older and wiser, and the older animals are all treated with a bit more luxury than the younger ones.`,
+ "Youth Preferentialist": `The majority of the population here is full of youth and more energetic, and the younger animals are all treated with a bit more luxury than the older ones.`,
+ "Body Purist": `Organic crops and animals are the main feature here, and the animal manure is used as a natural fertilizer for the different plants.`,
+ "Slimness Enthusiast": `It features trim animals and slaves alike, not a pound of excess among them. The feed for both livestock and crops are carefully maintained to ensure optimal growth without waste, letting them flourish without being weighed down.`,
+ "Hedonistic": `It features wider gates and stalls, for both the humans visiting or tending the occupants, and the animals starting to mimic their handlers${V.seeBestiality ? ` and company` : ``}, with plenty of seats along the way.`,
+ "Intellectual Dependency": `Large signs covered in cartoonish illustrations dot the pens, illustrating how to take care of the needs of the occupant within.${V.seeBestiality ? ` There is a strong emphasis on proper breeding positions for your slaves, with step by step instructions.` : ``}`,
+ "Slave Professionalism": `Despite the surroundings, those of your slaves that are allowed to wear clothes are dressed in clean outfits.${V.seeBestiality ? ` Those bearing litters walk with practiced care, protecting their young.` : ``} They go about their tasks methodically and with care, with ${S.Farmer ? S.Farmer.slaveName : `senior farmhands`} watching carefully to correct any lax behavior.`,
+ "Petite Admiration": `The buildings are squat, one story affairs that allow those of smaller stature easier access. ${V.seeBestiality ? ` Those closer to physical perfection bear the cum stains of their recent breedings.` : ``}`,
+ "Statuesque Glorification": `Those workers who are smaller and less fit have been given the worst jobs, mucking out the pens and stables. ${V.seeBestiality ? ` Those closer to physical perfection bear the cum stains of their recent breedings.` : ``}`,
+ "standard": `It is very much a converted warehouse still, with basic cages for the animals and a noticeable lack of flair to the various types of equipment used to take care of them – everything is expected to remain clean and functional, but not necessarily pretty.`,
+ };
+ }
+
+ // food only (farm)
+ return {
+ "Roman Revivalist": `Its red tiles and white stone walls are the very picture of a Roman farm villa's construction, as are the marble statues and reliefs. Saturn and Ceres look over the prosperity of the fields${V.seeBestiality ? `. Mercury watches over the health of the animals, and Feronia ensures strong litters in your slaves.` : `, and Mercury watches over the health of the animals.`} The slaves here are all looked after well, as they have one of the most important jobs in ${V.arcologies[0].name}.`,
+ "Neo-Imperialist": `Its high-tech, sleek black design invocates an embracement of the future, tempered by the hanging banners displaying your family crest as the rightful lord and master of these farms. Serf-like peasants work tirelessly in the fields, both to grow crops and oversee the slaves beneath them. Despite the harsh nature of the fieldwork, the slaves here are all looked after well, as they have one of the most important jobs in ${V.arcologies[0].name}.`,
+ "Aztec Revivalist": `It can't completely recreate the floating farms in the ancient Aztec fashion, but it comes as close as it can, shallow pseudo-canals dividing each field into multiple sections. Smooth stone and colorful murals cover the walls, depicting bloody stories of gods and mortals alike.`,
+ "Egyptian Revivalist": `It does its best to capture the wide open nature of ancient Egyptian farms, including mimicking the irrigation systems fed by the Nile. The stone walls are decorated with murals detailing its construction and your prowess in general, ${V.seeBestiality ? `with animal-bloated slaves featured prominently.` : `hieroglyphs spelling out volumes of praise.`}`,
+ "Edo Revivalist": `It does its best to mimic the rice patties and thatch roofed buildings of the Edo period despite the wide variety of crops tended by various slaves. Not every crop can thrive in flooded fields, but the ones that can take advantage of your attention to detail.`,
+ "Arabian Revivalist": `Large plots of olive trees and date palms line the outer edges of the main crop area, while a combination of wheat, flax, and barley occupies the interior space. Irrigation canals snake through the area, ensuring every inch of cropland is well-watered.`,
+ "Chinese Revivalist": `It does its best to capture the terraces that covered the ancient Chinese hills and mountains, turning every floor into ribbons of fields following a slight incline. Slaves wade through crops that can handle flooding and splash through the irrigation of the others when they aren't tending to${V.seeBestiality ? ` or breeding with` : ``} your animals.`,
+ "Chattel Religionist": `It runs like a well oiled machine, slaves bent in humble service as they tend crops grown on the Prophet's command, or see to the animals' needs. Their clothing is tucked up and out of the way as they see to their tasks, keeping them clean as they work ${V.seeBestiality ? `around animal-bloated bellies ` : ``}as divine will dictates.`,
+ "Degradationist": `It is constructed less as a converted warehouse and more as something to visit, allowing guests to enjoy the spectacle of slaves ${V.seeBestiality ? `being pounded by eager animals` : `elbow deep in scrubbing animal waste`} to their satisfaction.`,
+ "Repopulationist": `It teems with life, both in the belly of every animal and the belly of every slave, though the latter makes tending the fields difficult. They're ordered to take care, as they carry the future ${V.seeBestiality ? `of this farm` : `of the arcology`} in their bellies.`,
+ "Eugenics": `It holds a wide variety of crops and animals, but the best of the best is easy to find. They're set apart from the others, given only the best care and supplies${V.seeBestiality ? ` and bred with only the highest quality slaves` : ``}, while the sub-par stock is neglected off to the side.`,
+ "Asset Expansionist": `It is not easy to look after animals and till fields with such enormous body parts, but your slaves are diligent regardless, working hard to provide food and livestock for the arcology.`,
+ "Transformation Fetishist": `The plants and animals here all look slightly unnatural, as though they were engineered in a lab to be stronger or larger – which, of course, they were.`,
+ "Gender Radicalist": `The plants and animals here all look slightly unnatural, as though they were treated with hormones to be stronger or larger – which, of course, they were.`,
+ "Gender Fundamentalist": `The majority of the population of ${V.farmyardName} is pregnant, and the space is outfitted with childbearing in mind.`,
+ "Physical Idealist": `Its animals are in exceptional shape, their coats unable to hide how muscular they are, requiring your slaves to be equally toned to control them. There's plenty of space for their exercise as well${V.seeBestiality ? ` and an abundance of curatives for the slaves full of their fierce, kicking offspring` : ``}.`,
+ "Supremacist": `It is a clean and orderly operation, stables and cages mucked by a multitude of inferior slaves, along with grooming your animals and harvesting your crops.`,
+ "Subjugationist": `It is a clean and orderly operation, stables and cages mucked by a multitude of ${V.arcologies[0].FSSubjugationistRace} slaves, while the others are tasked with grooming your animals and harvesting your crops.`,
+ "Paternalist": `It's full of healthy animals, crops, and slaves, the former's every need diligently looked after by the latter. The fields flourish to capacity under such care, and the animals give the distinct impression of happiness${V.seeBestiality ? ` — some more than others if the growing bellies of your slaves are anything to go by, the only indication that such rutting takes place` : ``}.`,
+ "Pastoralist": `The space is outfitted with milkers every so often so that lactating farmhands don't have to travel far to relieve themselves of their milk, and the animals are milked of what they can be as well.`,
+ "Maturity Preferentialist": `The majority of the population here is older and wiser, and the older animals are all treated with a bit more luxury than the younger ones.`,
+ "Youth Preferentialist": `The majority of the population here is full of youth and more energetic, and the younger animals are all treated with a bit more luxury than the older ones.`,
+ "Body Purist": `Organic crops and animals are the main feature here, and the animal manure is used as a natural fertilizer for the different plants.`,
+ "Slimness Enthusiast": `It features trim animals and slaves alike, not a pound of excess among them. The feed for both livestock and crops are carefully maintained to ensure optimal growth without waste, letting them flourish without being weighed down.`,
+ "Hedonistic": `It features wider gates and stalls, for both the humans visiting or tending the occupants, and the animals starting to mimic their handlers${V.seeBestiality ? ` and company` : ``}, with plenty of seats along the way.`,
+ "Intellectual Dependency": `Large signs covered in cartoonish illustrations dot the pens, illustrating how to take care of the needs of the occupant within.${V.seeBestiality ? ` There is a strong emphasis on proper breeding positions for your slaves, with step by step instructions.` : ``}`,
+ "Slave Professionalism": `Despite the surroundings, those of your slaves that are allowed to wear clothes are dressed in clean outfits.${V.seeBestiality ? ` Those bearing litters walk with practiced care, protecting their young.` : ``} They go about their tasks methodically and with care, with ${S.Farmer ? S.Farmer.slaveName : `senior farmhands`} watching carefully to correct any lax behavior.`,
+ "Petite Admiration": `The buildings are squat, one story affairs that allow those of smaller stature easier access. ${V.seeBestiality ? ` Those closer to physical perfection bear the cum stains of their recent breedings.` : ``}`,
+ "Statuesque Glorification": `Those workers who are smaller and less fit have been given the worst jobs, mucking out the pens and stables. ${V.seeBestiality ? ` Those closer to physical perfection bear the cum stains of their recent breedings.` : ``}`,
+ "standard": `It is very much a converted warehouse still, sectioned off into various "departments"${V.farmyardUpgrades.machinery ? ` with machinery placed where it can be` : V.farmyardUpgrades.hydroponics ? ` and plumbing for the hydroponics system running every which way` : ``}.`,
+ };
+};
diff --git a/src/facilities/farmyard/farmyardFramework.js b/src/facilities/farmyard/farmyardFramework.js
index 399caad3194f222d414b4d7d0866f8bc75f9375a..5c700f61b4e11719a24b98b2ee10df0a4fcb9e41 100644
--- a/src/facilities/farmyard/farmyardFramework.js
+++ b/src/facilities/farmyard/farmyardFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.farmyard = {
baseName: "farmyard",
genericName: null,
diff --git a/src/facilities/farmyard/food/food.js b/src/facilities/farmyard/food/food.js
index 50d0c3b770b882e764671af8c398f79bd7f1eb35..16970dd575b34e24ec1a66b6fdae2d9c46658912 100644
--- a/src/facilities/farmyard/food/food.js
+++ b/src/facilities/farmyard/food/food.js
@@ -6,6 +6,8 @@
* @returns {number}
*/
App.Facilities.Farmyard.foodAmount = function(slave) {
+ if (slave && V.farmyardShows === 2) { return 0; }
+
let food = 100;
if (V.farmyardUpgrades.pump) {
@@ -27,7 +29,7 @@ App.Facilities.Farmyard.foodAmount = function(slave) {
if (S.Farmer) {
food *= 1.1;
- if (S.Farmer.skill.farmer >= V.masteredXP) {
+ if (S.Farmer.skill.farmer >= Constant.MASTERED_XP) {
food *= 1.3;
}
@@ -107,8 +109,12 @@ App.Facilities.Farmyard.foodAmount = function(slave) {
}
};
-/** The total amount of food produced in a given week. */
-App.Facilities.Farmyard.foodProduction = function() {
+/**
+ * The total amount of food produced in a given week.
+ *
+ * @param {'menials'|'slaves'|'both'} [target] Whose production to target.
+ */
+App.Facilities.Farmyard.foodProduction = function(target='both') {
function menialProduction() {
return V.farmMenials * App.Facilities.Farmyard.foodAmount();
}
@@ -117,11 +123,18 @@ App.Facilities.Farmyard.foodProduction = function() {
return App.Entity.facilities.farmyard.employees().reduce((acc, cur) => acc + App.Facilities.Farmyard.foodAmount(cur), 0);
}
+ if (target === 'menials') { return menialProduction(); }
+ if (target === 'slaves') { return slaveProduction(); }
+
return menialProduction() + slaveProduction();
};
-/** The total amount of food consumed in a given week. */
-App.Facilities.Farmyard.foodConsumption = function() {
+/**
+ * The total amount of food consumed in a given week.
+ *
+ * @param {'citizens'|'slaves'|'both'} target Whose consumption to target.
+ */
+App.Facilities.Farmyard.foodConsumption = function(target = 'both') {
function citizenConsumption() {
return (
(V.lowerClass * V.mods.food.rate.lower) +
@@ -153,5 +166,8 @@ App.Facilities.Farmyard.foodConsumption = function() {
return total;
}
+ if (target === 'citizens') { return citizenConsumption(); }
+ if (target === 'slaves') { return slaveConsumption(); }
+
return citizenConsumption() + slaveConsumption();
};
diff --git a/src/facilities/farmyard/food/foodReport.js b/src/facilities/farmyard/food/foodReport.js
index 88d9c689e47e7ec78884c51f2efceba709caa923..cfea24055a188b25b5036ead0aea5ed7e220596d 100644
--- a/src/facilities/farmyard/food/foodReport.js
+++ b/src/facilities/farmyard/food/foodReport.js
@@ -1,20 +1,53 @@
App.UI.foodReport = function() {
const text = [];
- const farmhands = App.Entity.facilities.farmyard.hostedSlaves;
- const slaveAmount = App.Entity.facilities.farmyard.employees().reduce((acc, cur) => acc + App.Facilities.Farmyard.foodAmount(cur), 0);
- const menialAmount = V.farmMenials * App.Facilities.Farmyard.foodAmount();
- const total = slaveAmount + menialAmount;
- text.push(`${V.arcologies[0].name} produced ${massFormat(total)} of food this week.`);
+ text.push(
+ production(),
+ consumption(),
+ );
- if (slaveAmount > 0) {
- text.push(`${V.farmMenials ? capFirstChar(massFormat(slaveAmount)) : `All of it`} was produced by your ${num(farmhands)} farmhands`);
- }
- if (menialAmount > 0) {
- text.push(`${slaveAmount > 0 ? text.pop() + `, and ${massFormat(total - slaveAmount)}` : `All of it`} was produced by ${num(V.farmMenials)} menial slaves`);
+ return text.join(' ');
+
+ function production() {
+ const text = [];
+ const production = App.Facilities.Farmyard.foodProduction();
+ const farmhands = App.Entity.facilities.farmyard.hostedSlaves();
+ const slaveAmount = App.Entity.facilities.farmyard.employees()
+ .reduce((acc, cur) => acc + App.Facilities.Farmyard.foodAmount(cur), 0);
+ const menialAmount = V.farmMenials * App.Facilities.Farmyard.foodAmount();
+
+ text.push(`${V.arcologies[0].name} produced ${massFormat(production)} of food this week.`);
+
+ if (slaveAmount > 0) {
+ text.push(`${V.farmMenials ? capFirstChar(massFormat(slaveAmount)) : `All of it`} was produced by your ${num(farmhands)} farmhands`);
+ }
+ if (menialAmount > 0) {
+ text.push(`${slaveAmount > 0 ? text.pop() + `, and ${massFormat(production - slaveAmount)}` : `All of it`} was produced by ${num(V.farmMenials)} menial slaves`);
+ }
+
+ text.push(text.pop() + `.`);
+
+ return text.join(' ');
}
- text.push(text.pop() + `.`);
+ function consumption() {
+ const text = [];
+ const production = App.Facilities.Farmyard.foodProduction();
+ const consumption = App.Facilities.Farmyard.foodConsumption();
+ const deficit = Math.abs(consumption - production);
+ const cost = deficit * V.mods.food.cost;
+ const storage = V.mods.food.amount;
- return text.join(' ');
+ if (production > consumption) {
+ text.push(`${capFirstChar(massFormat(consumption))} of it was consumed, with a spare ${massFormat(production - consumption)} moved into long-term storage.`);
+ } else {
+ if (storage > deficit) {
+ text.push(`Unfortunately, this wasn't enough to cover needs of your hungry arcology, and ${massFormat(deficit)} had to be brought up from storage.`);
+ } else if (V.cash > cost) {
+ text.push(`Unfortunately, this wasn't enough to cover needs of your hungry arcology, and because you didn't have enough food in storage, you has to purchase and additional ${massFormat(deficit - storage)} for ${cashFormat()}.`);
+ }
+ }
+
+ return text.join(' ');
+ }
};
diff --git a/src/facilities/farmyard/food/saProduceFood.js b/src/facilities/farmyard/food/saProduceFood.js
index d5e89f19b891d8ab4d4a6289e0ec380fb9fbef8e..26fe219c3ba808d73ab2772e1d905ba8fa94e844 100644
--- a/src/facilities/farmyard/food/saProduceFood.js
+++ b/src/facilities/farmyard/food/saProduceFood.js
@@ -123,7 +123,7 @@ App.Facilities.Farmyard.produceFood = function(slave) {
}
function shows() {
- if (V.farmyardShows > 0) {
+ if (V.farmyardShows === 1) {
return `Since ${he} also has to put on shows for your citizens, ${he} can only work on food production for half of ${his} shift, cutting down on the amount of food ${he} would have otherwise produced.`;
}
}
diff --git a/src/facilities/farmyard/shows/farmShowsIncome.js b/src/facilities/farmyard/shows/farmShowsIncome.js
index ee6d2b6b21027f2531e7e918f20a101f9c48613b..3c5b619a40f652c638b8472007adc25b9bf3a3aa 100644
--- a/src/facilities/farmyard/shows/farmShowsIncome.js
+++ b/src/facilities/farmyard/shows/farmShowsIncome.js
@@ -10,19 +10,29 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
const behavioralQuirks = ["sinful"];
const fetishes = ["humiliation", "masochist"];
- let cash = 25;
+ let cash = 20;
if (!slave) {
return null;
} else {
+ const animals = [...V.animals.canine, ...V.animals.feline, ...V.animals.hooved].map(animal => getAnimal(animal));
+ const exotic = animals.filter(animal => animal.rarity === "exotic").length;
+ const exoticChance = exotic ? (exotic / App.Entity.facilities.farmyard.employees().length) * 100 : 0;
+
if (S.Farmer) {
cash *= 1.1;
- if (S.Farmer.skill.farmer >= V.masteredXP) {
+ if (S.Farmer.skill.farmer >= Constant.MASTERED_XP) {
cash *= 1.1;
}
}
- // FS Effects
+ // Animal type
+
+ if (exoticChance > random(100)) {
+ cash *= 1.5;
+ }
+
+ // FS effects
if (arcology.FSSupremacist !== "unset") {
if (isSuperiorRace(slave)) {
@@ -122,18 +132,22 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
if (arcology.FSPaternalist !== "unset") {
if (V.seeBestiality) {
- if (!V.policies.bestialityOpenness) {
+ if (V.policies.bestialityOpenness) {
+ if (slave.devotion > 50) {
+ cash *= 1.25;
+ }
+ } else {
if (V.farmyardBreeding) {
if (V.farmyardRestraints) {
- cash *= 0.5;
+ cash *= 0.25;
} else {
- cash *= 0.7;
+ cash *= 0.5;
}
} else {
if (V.farmyardRestraints) {
- cash *= 0.8;
+ cash *= 0.5;
} else {
- cash *= 0.9;
+ cash *= 0.75;
}
}
}
@@ -461,6 +475,18 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
cash *= 0.5;
}
+ // Multipliers
+
+ if (V.animals.canine.length > 0) {
+ cash *= (1 + (V.animals.canine.length * 0.05));
+ }
+ if (V.animals.hooved.length > 0) {
+ cash *= (1 + (V.animals.hooved.length * 0.05));
+ }
+ if (V.animals.feline.length > 0) {
+ cash *= (1 + (V.animals.feline.length * 0.05));
+ }
+
setSlaveDevotion();
setSlaveTrust();
diff --git a/src/facilities/farmyard/shows/saFarmyardShows.js b/src/facilities/farmyard/shows/saFarmyardShows.js
index 556140b72adee13453f069874f439507667757da..4fe5910d4bbdec90ad356b34a822e34838a1795e 100644
--- a/src/facilities/farmyard/shows/saFarmyardShows.js
+++ b/src/facilities/farmyard/shows/saFarmyardShows.js
@@ -131,6 +131,9 @@ App.Facilities.Farmyard.putOnShows = function(slave) {
if (V.seeBestiality) {
if (V.policies.bestialityOpenness) {
text.push(`Your citizens would normally disapprove of your using slaves as toys for your animals, but the policy you enacted encouraging bestiality, combined with some clever, subtle advertising, leads them to see nothing wrong with it.`);
+ if (slave.devotion > 50) {
+ text.push(`That ${slave.slaveName} seems to be enjoying ${him}self so thoroughly also <span class="reputation inc">helps put their minds at ease.</span>`);
+ }
} else {
if (V.farmyardBreeding) {
if (V.farmyardRestraints) {
@@ -385,18 +388,20 @@ App.Facilities.Farmyard.putOnShows = function(slave) {
}
function energy() {
- if (slave.energy > 95) {
- return `The fact that ${he} is a nymphomaniac helps ${him} to go for longer, allowing ${him} to really put on an amazing show.`;
- } else if (slave.energy > 80) {
- return `The fact that ${his} sex drive is so powerful helps ${him} to really put on good shows.`;
- } else if (slave.energy > 60) {
- return `The fact that ${his} sex drive is so good helps ${him} to put on good shows.`;
- } else if (slave.energy > 40) {
- return `${His} average sex drive allows ${him} to put on a decent show.`;
- } else if (slave.energy > 20) {
- return `The fact that ${his} sex drive is so poor affects ${his} performance.`;
- } else {
- return `The fact that ${his} sex drive is nonexistent really hinders ${his} ability to put on a decent show.`;
+ if (V.seeBestiality) {
+ if (slave.energy > 95) {
+ return `The fact that ${he} is a nymphomaniac helps ${him} to go for longer, allowing ${him} to really put on an amazing show.`;
+ } else if (slave.energy > 80) {
+ return `The fact that ${his} sex drive is so powerful helps ${him} to really put on good shows.`;
+ } else if (slave.energy > 60) {
+ return `The fact that ${his} sex drive is so good helps ${him} to put on good shows.`;
+ } else if (slave.energy > 40) {
+ return `${His} average sex drive allows ${him} to put on a decent show.`;
+ } else if (slave.energy > 20) {
+ return `The fact that ${his} sex drive is so poor affects ${his} performance.`;
+ } else {
+ return `The fact that ${his} sex drive is nonexistent really hinders ${his} ability to put on a decent show.`;
+ }
}
}
@@ -407,7 +412,7 @@ App.Facilities.Farmyard.putOnShows = function(slave) {
if (slave.fetishKnown) {
return `${He} is so submissive that ${he} willingly accepts ${his} position as an animal's fucktoy and <span class="reputation inc">is able to put on a decent show.</span>`;
} else {
- return `${S.HeadGirl ? `${S.HeadGirl.slaveName} notices` : `You notice`} that ${slave.slaveName} seems to have really taken to ${his} position as a fucktoy for animals. <span class="lightcoral">${He}'s a submissive!</span>`;
+ return `${S.HeadGirl ? `${S.HeadGirl.slaveName} notices` : `You notice`} that ${slave.slaveName} seems to really have taken to ${his} position as a fucktoy for animals. <span class="lightcoral">${He}'s a submissive!</span>`;
}
} else {
if (slave.fetishKnown) {
@@ -419,7 +424,7 @@ App.Facilities.Farmyard.putOnShows = function(slave) {
case "humiliation":
if (V.seeBestiality) {
if (slave.fetishKnown) {
- return `${slave.slaveName} uses the most of this humiliating experience to really put on a show, to <span class="reputation inc">the approval of ${his} audience</span>.`;
+ return `${slave.slaveName} uses the most of this humiliating experience to really put on a show, to <span class="reputation inc">the approval of ${his} audience.</span>`;
}
}
}
@@ -463,7 +468,7 @@ App.Facilities.Farmyard.putOnShows = function(slave) {
}
function rival() {
- if (slave.rivalry > 0 && V.seeBestiality) {
+ if (slave.rivalry > 0 && V.seeBestiality && V.farmyardShows !== 0) {
return `${getSlave(slave.rivalryTarget).slaveName} hates ${him} and is glad to see that ${he}'s been assigned to fuck animals all day.`;
}
}
diff --git a/src/facilities/headGirlSuite/headGirlSuite.js b/src/facilities/headGirlSuite/headGirlSuite.js
index c47653f56f4b2d04c799f39daee4debf10729d97..1a5abf715089c41b5d550660ba05e49b36fedc4c 100644
--- a/src/facilities/headGirlSuite/headGirlSuite.js
+++ b/src/facilities/headGirlSuite/headGirlSuite.js
@@ -78,7 +78,7 @@ App.Facilities.HGSuite.headGirlSuite = class HeadGirlSuite extends App.Facilitie
{
property: "HGSuiteSurgery",
prereqs: [
- () => !V.HGSuiteEquality,
+ !V.HGSuiteEquality,
],
options: [
{
@@ -96,7 +96,7 @@ App.Facilities.HGSuite.headGirlSuite = class HeadGirlSuite extends App.Facilitie
{
property: "HGSuiteAbortion",
prereqs: [
- () => !V.HGSuiteEquality,
+ !V.HGSuiteEquality,
],
options: [
{
@@ -114,7 +114,7 @@ App.Facilities.HGSuite.headGirlSuite = class HeadGirlSuite extends App.Facilitie
{
property: "HGSuiteDrugs",
prereqs: [
- () => !V.HGSuiteEquality,
+ !V.HGSuiteEquality,
],
options: [
{
@@ -132,7 +132,7 @@ App.Facilities.HGSuite.headGirlSuite = class HeadGirlSuite extends App.Facilitie
{
property: "HGSuiteHormones",
prereqs: [
- () => !V.HGSuiteEquality,
+ !V.HGSuiteEquality,
],
options: [
{
diff --git a/src/facilities/headGirlSuite/headGirlSuiteFramework.js b/src/facilities/headGirlSuite/headGirlSuiteFramework.js
index ae9d465fd8b0f4adcd058cbb7f45e03c076500d2..8d19936edd3e52b17cdda5f7f3daca85176a2878 100644
--- a/src/facilities/headGirlSuite/headGirlSuiteFramework.js
+++ b/src/facilities/headGirlSuite/headGirlSuiteFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.headGirlSuite = {
baseName: "HGSuite",
genericName: null,
@@ -37,7 +38,7 @@ App.Entity.Facilities.HeadGirlSuite = class extends App.Entity.Facilities.Single
/** @override */
occupancyReport(long) {
return this.manager.currentEmployee
- ? `HG${this.hostedSlaves ? long
+ ? `HG${this.hostedSlaves() ? long
? ` and ${getPronouns(this.manager.currentEmployee).his} slave`
: ", 1" : ""}`
: "";
diff --git a/src/facilities/incubator/incubatorFramework.js b/src/facilities/incubator/incubatorFramework.js
index dce45c6cd6c235338f01d2d59d97953f0ded7dcb..126f3d74648f907b54e098bc2667d716f5affa16 100644
--- a/src/facilities/incubator/incubatorFramework.js
+++ b/src/facilities/incubator/incubatorFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.incubator = {
baseName: "incubator",
genericName: null,
diff --git a/src/facilities/incubator/incubatorInteract.js b/src/facilities/incubator/incubatorInteract.js
index b97f065d16fc52366bdc05c7e139697cf685f8f8..5209b253c0e19a0bbe99b8ecfd01783c5c43f808 100644
--- a/src/facilities/incubator/incubatorInteract.js
+++ b/src/facilities/incubator/incubatorInteract.js
@@ -46,6 +46,8 @@ App.UI.incubator = function() {
const incubatorSlaves = V.incubator.tanks.length;
const freeTanks = V.incubator.capacity - incubatorSlaves;
const reservedChildren = FetusGlobalReserveCount("incubator");
+ el.append(App.UI.DOM.makeElement("h1", incubatorNameCaps));
+
r.push(`${incubatorNameCaps} is a clean, cold hall designed to be lined with tanks and their connected monitoring systems.`);
if (incubatorSlaves > 2) {
@@ -64,7 +66,7 @@ App.UI.incubator = function() {
)
);
}
- App.Events.addNode(el, r, "p");
+ App.Events.addNode(el, r, "div", ["scene-intro"]);
const tankP = document.createElement("p");
r = [];
@@ -183,7 +185,7 @@ App.UI.incubator = function() {
};
const sortingBar = document.createElement("div");
- sortingBar.classList.add("incubator-underscore");
+ sortingBar.classList.add("border-bottom");
V.sortIncubatorList = V.sortIncubatorList || 'Unsorted';
sortingBar.append(sortingBarFunc(sortingOptions));
@@ -647,7 +649,7 @@ App.UI.incubator = function() {
for (let i = 0; i < incubatorSlaves; i++) {
const p = document.createElement("p");
- p.classList.add("incubator-tank");
+ p.classList.add("card");
let r = [];
const {
He, His,
@@ -770,7 +772,7 @@ App.UI.incubator = function() {
} else if (safeCC > 150000) {
r.push(`${His} body looks almost spherical, having been grotesquely inflated with the stimulator sacs inserted into ${his} internals. The incubator constantly maintains high pressure inside ${him}, forcing the displacement of ${his} organs and stretching skin, tissues, and muscles. Even ${his} chest has been forced to become a part of the top of ${his} belly, having been pushed forward from the overwhelming volume inside.`);
} else if (safeCC > 75000) {
- r.push(`${His} belly has become so huge that it can be easily compared with belly of a woman ready to birth quintuplets. It pulses from the pressure applied within by the incubator probes.`);
+ r.push(`${His} belly has become so huge that it can be easily be compared with that of a woman ready to birth quintuplets. It pulses from the pressure applied within by the incubator probes.`);
} else if (safeCC > 45000) {
r.push(`${His} belly, in its current state, would look normal on a woman who was ready to birth triplets. On ${his} still growing form, it's something completely out of the ordinary.`);
} else if (safeCC > 30000) {
@@ -929,7 +931,7 @@ App.UI.incubator = function() {
)
);
} else {
- linkArray.push(App.UI.DOM.makeElement("span", `Ovaries are already prepared.`, "detail"));
+ linkArray.push(App.UI.DOM.makeElement("span", `Ovaries are already prepared.`, ["detail"]));
}
}
if (V.incubator.tanks[i].dick === 0 && (V.seeDicks > 0 || V.makeDicks > 0)) {
@@ -938,14 +940,14 @@ App.UI.incubator = function() {
makeLink("Prepare penis", () => { App.Medicine.OrganFarm.growIncubatorOrgan(V.incubator.tanks[i], "penis"); }, refresh)
);
} else {
- linkArray.push(App.UI.DOM.makeElement("span", `A penis is already prepared`, "detail"));
+ linkArray.push(App.UI.DOM.makeElement("span", `A penis is already prepared`, ["detail"]));
}
}
if (V.incubator.tanks[i].balls === 0) {
if (tankOrgans.testicles !== 1) {
linkArray.push(makeLink("Prepare testicles", () => { App.Medicine.OrganFarm.growIncubatorOrgan(V.incubator.tanks[i], "testicles"); }, refresh));
} else {
- linkArray.push(App.UI.DOM.makeElement("span", `Testicles are already prepared.`, "detail"));
+ linkArray.push(App.UI.DOM.makeElement("span", `Testicles are already prepared.`, ["detail"]));
}
}
const vision = {
@@ -1014,7 +1016,7 @@ App.UI.incubator = function() {
for (let i = 0; i < reservedChildren; i++) {
const empty = document.createElement("div");
- empty.classList.add("incubator-tank");
+ empty.classList.add("card");
empty.append("This tank is currently reserved");
el.append(empty);
}
@@ -1029,9 +1031,9 @@ App.UI.incubator = function() {
function tankSettings() {
const el = new DocumentFragment();
- let p;
+ let div;
let r = [];
- let row;
+ let section;
let linkArray;
r.push("Target age for release:");
r.push(
@@ -1086,10 +1088,10 @@ App.UI.incubator = function() {
r.push(App.UI.DOM.makeElement("span", `Setting will not be applied to tanks in use.`, "note"));
App.Events.addNode(el, r, "p");
- row = document.createElement("p");
+ section = document.createElement("p");
if (V.incubator.setting.bulkRelease === 1) {
- row.append(`Released children will be handled in bulk and not receive personal attention. `);
- row.append(
+ section.append(`Released children will be handled in bulk and not receive personal attention. `);
+ section.append(
App.UI.DOM.link(
`Individual release`,
() => {
@@ -1099,8 +1101,8 @@ App.UI.incubator = function() {
)
);
} else {
- row.append(`Released children will be seen to personally. `);
- row.append(
+ section.append(`Released children will be seen to personally. `);
+ section.append(
App.UI.DOM.link(
`Bulk release`,
() => {
@@ -1110,404 +1112,374 @@ App.UI.incubator = function() {
)
);
}
- el.append(row);
+ el.append(section);
- row = document.createElement("p");
+ section = document.createElement("div");
if (V.incubator.upgrade.speed === 52) {
- row.append(`It has been upgraded with perfected growth accelerants; children grow at the rate of 1 week to 1 year.`);
+ section.append(`It has been upgraded with perfected growth accelerants; children grow at the rate of 1 week to 1 year.`);
} else if (V.incubator.upgrade.speed === 18) {
const cost = Math.trunc(500000 * V.upgradeMultiplierArcology);
- row.append(`It has been upgraded with advanced experimental growth accelerants; children grow at the rate of 3 weeks to 1 year. `);
- row.append(
- choice(
- `Fund speculative research into maximizing growth rate`,
- () => {
- cashX(forceNeg(cost), "capEx");
+ section.append(`It has been upgraded with advanced experimental growth accelerants; children grow at the rate of 3 weeks to 1 year.`);
+ section.append(
+ makePurchase(`Fund speculative research into maximizing growth rate`, cost, "capEx", {
+ handler: () => {
V.incubator.upgrade.speed = 52;
refresh();
},
- "",
- `Costs ${cashFormat(cost)} and will increase upkeep costs`
- )
+ notes: [`will increase upkeep costs`]
+ })
);
} else if (V.incubator.upgrade.speed === 9) {
const cost = Math.trunc(75000 * V.upgradeMultiplierArcology);
- row.append(`It has been upgraded with advanced growth accelerants; children grow at the rate of 6 weeks to 1 year. `);
- row.append(
- choice(
- `Fund research into increasing growth rate even further`,
- () => {
- cashX(forceNeg(cost), "capEx");
+ section.append(`It has been upgraded with advanced growth accelerants; children grow at the rate of 6 weeks to 1 year.`);
+ section.append(
+ makePurchase(`Fund research into increasing growth rate even further`, cost, "capEx", {
+ handler: () => {
V.incubator.upgrade.speed = 18;
refresh();
},
- "",
- `Costs ${cashFormat(cost)} and will increase upkeep costs`
- )
+ notes: [`will increase upkeep costs`]
+ })
);
} else if (V.incubator.upgrade.speed === 6) {
const cost = Math.trunc(30000 * V.upgradeMultiplierArcology);
- row.append(`It has been upgraded with growth accelerants; children grow at the rate of 9 weeks to 1 year. `);
- row.append(
- choice(
- `Further upgrade the incubators with specialized stem cells to speed growth`,
- () => {
- cashX(forceNeg(cost), "capEx");
+ section.append(`It has been upgraded with growth accelerants; children grow at the rate of 9 weeks to 1 year.`);
+ section.append(
+ makePurchase(`Further upgrade the incubators with specialized stem cells to speed growth`, cost, "capEx", {
+ handler: () => {
V.incubator.upgrade.speed = 9;
refresh();
},
- "",
- `Costs ${cashFormat(cost)} and will increase upkeep costs`
- )
+ notes: [`will increase upkeep costs`]
+ })
);
} else if (V.incubator.upgrade.speed === 5) {
const cost = Math.trunc(30000 * V.upgradeMultiplierArcology);
- row.append(`The incubation tanks are basic; children grow at the rate of 12 weeks to 1 year. `);
- row.append(
- choice(
- `Upgrade the incubators with growth accelerating drugs`,
- () => {
- cashX(forceNeg(cost), "capEx");
+ section.append(`The incubation tanks are basic; children grow at the rate of 12 weeks to 1 year.`);
+ section.append(
+ makePurchase(`Upgrade the incubators with growth accelerating drugs`, cost, "capEx", {
+ handler: () => {
V.incubator.upgrade.speed = 6;
refresh();
},
- "",
- `Costs ${cashFormat(cost)} and will increase upkeep costs`
- )
+ notes: [`will increase upkeep costs`]
+ })
);
}
- el.append(row);
+ el.append(section);
- p = document.createElement("p");
- row = document.createElement("div");
+ div = document.createElement("div");
+ section = document.createElement("div");
if (V.incubator.upgrade.weight === 1) {
- row.append(`Advanced caloric monitoring systems have been installed in the tanks to monitor and maintain a developing child's weight.`);
- p.append(row);
- row = document.createElement("div");
+ section.append(`Advanced caloric monitoring systems have been installed in the tanks to monitor and maintain a developing child's weight.`);
+ div.append(section);
+ section = document.createElement("div");
linkArray = [];
if (V.incubator.setting.weight === 1) {
- row.append(`Weight is not being properly managed; excessive weight gain is likely. `);
+ section.append(`Weight is not being properly managed; excessive weight gain is likely.`);
} else {
linkArray.push(makeLink(`Estimate only`, () => { V.incubator.setting.weight = 1; }, refresh));
}
if (V.incubator.setting.weight === 2) {
- row.append(`Weight is being carefully managed; children will be released at a healthy weight. `);
+ section.append(`Weight is being carefully managed; children will be released at a healthy weight.`);
} else {
linkArray.push(makeLink(`Activate`, () => { V.incubator.setting.weight = 2; }, refresh));
}
if (V.incubator.setting.weight === 0) {
- row.append(`Weight management systems are offline; children will likely be malnourished. `);
+ section.append(`Weight management systems are offline; children will likely be malnourished.`);
} else {
linkArray.push(makeLink(`Disable`, () => { V.incubator.setting.weight = 0; }, refresh));
}
- row.append(App.UI.DOM.generateLinksStrip(linkArray));
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
} else {
const cost = Math.trunc(20000 * V.upgradeMultiplierArcology);
- row.append(`There are no systems in place to control a growing child's weight; they will likely come out emaciated from the rapid growth. `);
- row.append(
- choice(
- `Upgrade the growth tanks with weight monitoring systems`,
- () => {
- cashX(forceNeg(cost), "capEx");
+ section.append(`There are no systems in place to control a growing child's weight; they will likely come out emaciated from the rapid growth.`);
+ section.append(
+ makePurchase(`Upgrade the growth tanks with weight monitoring systems`, cost, "capEx", {
+ handler: () => {
V.incubator.upgrade.weight = 1;
refresh();
},
- "",
- `Costs ${cashFormat(cost)} and will increase upkeep costs`
- )
+ notes: [`will increase upkeep costs`]
+ })
);
}
- p.append(row);
- el.append(p);
+ div.append(section);
+ el.append(div);
- p = document.createElement("p");
- row = document.createElement("div");
+ div = document.createElement("div");
+ section = document.createElement("div");
if (V.incubator.upgrade.muscles === 1) {
- row.append(`Advanced monitoring and steroid injection systems have been installed in the tanks to monitor and maintain a developing child's musculature.`);
- p.append(row);
- row = document.createElement("div");
+ section.append(`Advanced monitoring and steroid injection systems have been installed in the tanks to monitor and maintain a developing child's musculature.`);
+ div.append(section);
+ section = document.createElement("div");
linkArray = [];
if (V.incubator.setting.muscles === 2) {
- row.append(`Strength levels are purposefully set higher than recommended; excessive muscle gain is likely. `);
+ section.append(`Strength levels are purposefully set higher than recommended; excessive muscle gain is likely.`);
} else {
linkArray.push(makeLink(`Overload`, () => { V.incubator.setting.muscles = 2; }, refresh));
}
if (V.incubator.setting.muscles === 1) {
- row.append(`Musculature is being carefully managed; children will be released with near normal strength. `);
+ section.append(`Musculature is being carefully managed; children will be released with near normal strength.`);
} else {
linkArray.push(makeLink(`Activate`, () => { V.incubator.setting.muscles = 1; }, refresh));
}
if (V.incubator.setting.muscles === 0) {
- row.append(`Strength management systems are offline; children will likely be released extremely weak. `);
+ section.append(`Strength management systems are offline; children will likely be released extremely weak.`);
} else {
linkArray.push(makeLink(`Disable`, () => { V.incubator.setting.muscles = 0; }, refresh));
}
- row.append(App.UI.DOM.generateLinksStrip(linkArray));
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
} else {
const cost = Math.trunc(20000 * V.upgradeMultiplierArcology);
- row.append(`There are no systems in place to control a growing child's musculature; they will likely come out frail and weak from the rapid growth. `);
- row.append(
- choice(
- `Upgrade the growth tanks with muscle monitoring systems`,
- () => {
- cashX(forceNeg(cost), "capEx");
+ section.append(`There are no systems in place to control a growing child's musculature; they will likely come out frail and weak from the rapid growth.`);
+ section.append(
+ makePurchase(`Upgrade the growth tanks with muscle monitoring systems`, cost, "capEx", {
+ handler: () => {
V.incubator.upgrade.muscles = 1;
refresh();
},
- "",
- `Costs ${cashFormat(cost)} and will increase upkeep costs`
- )
+ notes: [`will increase upkeep costs`]
+ })
);
}
- p.append(row);
- el.append(p);
+ div.append(section);
+ el.append(div);
- p = document.createElement("p");
- row = document.createElement("div");
+ div = document.createElement("div");
+ section = document.createElement("div");
if (V.incubator.upgrade.reproduction === 1) {
- row.append(`Advanced monitoring and hormone injection systems have been installed in the tanks to influence a developing child's reproductive organs.`);
- p.append(row);
- row = document.createElement("div");
+ section.append(`Advanced monitoring and hormone injection systems have been installed in the tanks to influence a developing child's reproductive organs.`);
+ div.append(section);
+ section = document.createElement("div");
linkArray = [];
if (V.incubator.setting.reproduction === 2) {
- row.append(`Hormone levels are purposefully set higher than recommended; over-active reproductive systems are likely. `);
+ section.append(`Hormone levels are purposefully set higher than recommended; over-active reproductive systems are likely.`);
} else {
linkArray.push(makeLink(`Overload`, () => { V.incubator.setting.reproduction = 2; }, refresh));
}
if (V.incubator.setting.reproduction === 1) {
- row.append(`Hormone levels are being carefully managed; children will be released with fully functional reproductive organs. `);
+ section.append(`Hormone levels are being carefully managed; children will be released with fully functional reproductive organs.`);
} else {
linkArray.push(makeLink(`Limit`, () => { V.incubator.setting.reproduction = 1; }, refresh));
}
if (V.incubator.setting.reproduction === 0) {
- row.append(`Reproduction management systems are offline; children will undergo normal puberty. `);
+ section.append(`Reproduction management systems are offline; children will undergo normal puberty.`);
} else {
linkArray.push(makeLink(`Disable`, () => { V.incubator.setting.reproduction = 0; }, refresh));
}
- row.append(App.UI.DOM.generateLinksStrip(linkArray));
- p.append(row);
- el.append(p);
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
+ div.append(section);
+ el.append(div);
if (V.incubator.upgrade.pregAdaptation === 1) {
// Should be visible only after incubator.upgrade.reproduction is installed
- p = document.createElement("p");
- row = document.createElement("div");
+ div = document.createElement("div");
+ section = document.createElement("div");
linkArray = [];
if (V.incubator.setting.pregAdaptation === 3) {
- row.append(`Pregnancy adaptation system online: All. `);
+ section.append(`Pregnancy adaptation system online: All.`);
} else {
linkArray.push(makeLink(`All`, () => { V.incubator.setting.pregAdaptation = 3; }, refresh));
}
if (V.incubator.setting.pregAdaptation === 2) {
- row.append(`Pregnancy adaptation system online: Males only. `);
+ section.append(`Pregnancy adaptation system online: Males only.`);
} else {
linkArray.push(makeLink(`Males`, () => { V.incubator.setting.pregAdaptation = 2; }, refresh));
}
if (V.incubator.setting.pregAdaptation === 1) {
- row.append(`Pregnancy adaptation system online: Females only. `);
+ section.append(`Pregnancy adaptation system online: Females only.`);
} else {
linkArray.push(makeLink(`Females`, () => { V.incubator.setting.pregAdaptation = 1; }, refresh));
}
if (V.incubator.setting.pregAdaptation === 0) {
- row.append(`Pregnancy adaptation system offline. `);
+ section.append(`Pregnancy adaptation system offline.`);
} else {
linkArray.push(makeLink(`Disable`, () => { V.incubator.setting.pregAdaptation = 0; }, refresh));
}
- row.append(App.UI.DOM.generateLinksStrip(linkArray));
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
if (V.incubator.upgrade.pregAdaptation === 1 && V.incubator.setting.pregAdaptation > 0) {
// Should be visible only after incubator.upgrade.reproduction is installed and turned on
- p.append(row);
- row = document.createElement("div");
+ div.append(section);
+ section = document.createElement("div");
linkArray = [];
if (V.incubator.setting.pregAdaptationPower === 1) {
- row.append(`Pregnancy adaptation programmed to advanced procedures. Up to triplet pregnancy should be safe for the subjects. `);
+ section.append(`Pregnancy adaptation programmed to advanced procedures. Up to triplet pregnancy should be safe for the subjects.`);
} else {
linkArray.push(makeLink(`Advanced`, () => { V.incubator.setting.pregAdaptationPower = 1; }, refresh));
}
if (V.incubator.setting.pregAdaptationPower === 2) {
- row.append(`Pregnancy adaptation programmed to intensive procedures. Up to octuplet pregnancy should be possible for the subjects. Warning! Side effects may occur to health and mental condition. `);
+ section.append(`Pregnancy adaptation programmed to intensive procedures. Up to octuplet pregnancy should be possible for the subjects. Warning! Side effects may occur to health and mental condition.`);
} else {
linkArray.push(makeLink(`Intensive`, () => { V.incubator.setting.pregAdaptationPower = 2; }, refresh));
}
if (V.incubator.setting.pregAdaptationPower === 3) {
- row.append(`Pregnancy adaptation programmed to extreme procedures. Normally unsustainable pregnancies may be possible for some subjects. Actual capacity will vary with genetic and other individual conditions. WARNING! Extreme side effects may occur to health and mental condition! `);
+ section.append(`Pregnancy adaptation programmed to extreme procedures. Normally unsustainable pregnancies may be possible for some subjects. Actual capacity will vary with genetic and other individual conditions. WARNING! Extreme side effects may occur to health and mental condition! `);
} else {
linkArray.push(makeLink(`Extreme`, () => { V.incubator.setting.pregAdaptationPower = 3; }, refresh));
}
if (V.incubator.setting.pregAdaptationPower === 0) {
- row.append(`Pregnancy adaptation programmed to standard procedures. Normal pregnancy should be safe for subjects. `);
+ section.append(`Pregnancy adaptation programmed to standard procedures. Normal pregnancy should be safe for subjects.`);
} else {
linkArray.push(makeLink(`Standard`, () => { V.incubator.setting.pregAdaptationPower = 0; }, refresh));
}
- row.append(App.UI.DOM.generateLinksStrip(linkArray));
- p.append(row);
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
+ div.append(section);
- row = document.createElement("div");
- App.UI.DOM.appendNewElement("span", row, `Due to the high complexity and steep risks of the procedure, settings will not be changed on tanks in use.`, "note");
+ section = document.createElement("div");
+ App.UI.DOM.appendNewElement("span", section, `Due to the high complexity and steep risks of the procedure, settings will not be changed on tanks in use.`, "note");
}
}
- p.append(row);
- el.append(p);
+ div.append(section);
+ el.append(div);
} else {
const cost = Math.trunc(50000 * V.upgradeMultiplierArcology);
- row.append(`There are no systems in place to control a growing child's reproductive capability. `);
- row.append(
- choice(
- `Upgrade the growth tanks with hormone monitoring systems`,
- () => {
- cashX(forceNeg(cost), "capEx");
+ section.append(`There are no systems in place to control a growing child's reproductive capability.`);
+ section.append(
+ makePurchase(`Upgrade the growth tanks with hormone monitoring systems`, cost, "capEx", {
+ handler: () => {
V.incubator.upgrade.reproduction = 1;
refresh();
},
- "",
- `Costs ${cashFormat(cost)} and will increase upkeep costs`
- )
+ notes: [`will increase upkeep costs`]
+ })
);
- p.append(row);
- el.append(p);
+ div.append(section);
+ el.append(div);
}
- row = document.createElement("div");
+ section = section = App.UI.DOM.makeElement("div", null, ["margin-top"]);
if (V.incubator.upgrade.organs === 1) {
- row.append(`Surgical tools have been added to the tank to be able to extract tissue samples from the occupant.`);
+ section.append(`Surgical tools have been added to the tank to be able to extract tissue samples from the occupant.`);
} else if (V.organFarmUpgrade >= 1) {
const cost = Math.trunc(10000 * V.upgradeMultiplierArcology);
- row.append(`The tanks lack the ability to extract tissue samples to be used by the organ fabricator. `);
- row.append(
- choice(
- `Upgrade the growth tanks with surgical extraction tools`,
- () => {
- cashX(forceNeg(cost), "capEx");
+ section.append(`The tanks lack the ability to extract tissue samples to be used by the organ fabricator.`);
+ section.append(
+ makePurchase(`Upgrade the growth tanks with surgical extraction tools`, cost, "capEx", {
+ handler: () => {
V.incubator.upgrade.organs = 1;
refresh();
},
- "",
- `Costs ${cashFormat(cost)} and will increase upkeep costs`
- )
+ notes: [`will increase upkeep costs`]
+ })
);
} else {
- row.append(`The tanks lack the ability to extract tissue samples and the dispensary lacks the ability to make use of them to fabricate organs.`);
+ App.UI.DOM.appendNewElement("span", section, `The tanks lack the ability to extract tissue samples and the dispensary lacks the ability to make use of them to fabricate organs.`, ["note"]);
}
- el.append(row);
+ el.append(section);
- p = document.createElement("p");
- row = document.createElement("div");
+ div = document.createElement("div");
+ section = document.createElement("div");
if (V.incubator.upgrade.growthStims === 1) {
- row.append(`Advanced monitoring and stimulant injection systems have been installed in the tanks to monitor and maintain a developing child's height.`);
- row = document.createElement("div");
+ section.append(`Advanced monitoring and stimulant injection systems have been installed in the tanks to monitor and maintain a developing child's height.`);
+ section = document.createElement("div");
linkArray = [];
if (V.incubator.setting.growthStims === 2) {
- row.append(`Children are injected with higher than recommended doses of stimulants; exceeding expected final height is likely. `);
+ section.append(`Children are injected with higher than recommended doses of stimulants; exceeding expected final height is likely.`);
} else {
linkArray.push(makeLink(`Overload`, () => { V.incubator.setting.growthStims = 2; }, refresh));
}
if (V.incubator.setting.growthStims === 1) {
- row.append(`Children are injected with the recommended dosage of stimulants; they will grow to their full expected height. `);
+ section.append(`Children are injected with the recommended dosage of stimulants; they will grow to their full expected height.`);
} else {
linkArray.push(makeLink(`Limit`, () => { V.incubator.setting.growthStims = 1; }, refresh));
}
if (V.incubator.setting.growthStims === 0) {
- row.append(`Growth stimulant injection systems are offline; children will develop normally. `);
+ section.append(`Growth stimulant injection systems are offline; children will develop normally.`);
} else {
linkArray.push(makeLink(`Disable`, () => { V.incubator.setting.growthStims = 0; }, refresh));
}
- row.append(App.UI.DOM.generateLinksStrip(linkArray));
+ section.append(App.UI.DOM.generateLinksStrip(linkArray));
} else if (V.growthStim === 1) {
const cost = Math.trunc(20000 * V.upgradeMultiplierArcology);
- row.append(`There are no systems in place to control a growing child's height. `);
- row.append(
- choice(
- `Upgrade the growth tanks with stimulants injection systems`,
- () => {
- cashX(forceNeg(cost), "capEx");
+ section.append(`There are no systems in place to control a growing child's height.`);
+ section.append(
+ makePurchase(`Upgrade the growth tanks with stimulants injection systems`, cost, "capEx", {
+ handler: () => {
V.incubator.upgrade.growthStims = 1;
refresh();
},
- "",
- `Costs ${cashFormat(cost)} and will increase upkeep costs`
- )
+ notes: [`will increase upkeep costs`]
+ })
);
} else {
- row.append(`There are no systems in place to control a growing child's height and you lack the capability to fabricate growth stimulants.`);
+ App.UI.DOM.appendNewElement("span", section, `There are no systems in place to control a growing child's height and you lack the capability to fabricate growth stimulants.`, ["note"]);
}
- p.append(row);
- el.append(p);
+ div.append(section);
+ el.append(div);
if (V.minimumSlaveAge <= 6 && (V.arcologies[0].FSRepopulationFocus >= 60 || V.BlackmarketPregAdaptation === 1)) {
/* Main prerequisite - stable repopulation FS OR documentation purchased from black market. And age gate. */
- p = document.createElement("p");
- row = document.createElement("div");
+ div = document.createElement("div");
+ section = document.createElement("div");
if (V.incubator.upgrade.pregAdaptation === 1) {
- row.append(`The incubators have been upgraded with special set of manipulators, probes, nozzles and syringes coupled together with specific programs to take advantage of the accelerated growth to heighten viable reproductive capacity. These include injections of specialized serums and mechanical manipulation of the reproductive system and associated tissues, organs, muscles and bones.`);
+ section.append(`The incubators have been upgraded with special set of manipulators, probes, nozzles and syringes coupled together with specific programs to take advantage of the accelerated growth to heighten viable reproductive capacity. These include injections of specialized serums and mechanical manipulation of the reproductive system and associated tissues, organs, muscles and bones.`);
} else {
- row.append(`The highly controlled environment inside incubation tube coupled with the greatly accelerated growth process is the perfect opportunity to push the boundaries of a body's ability to sustain pregnancy. This will include injections of specialized serums and mechanical manipulation of their reproductive system through a special set of manipulators, probes, nozzles and syringes supervised by a powerful monitoring program. Costly to maintain.`);
- p.append(row);
+ section.append(`The highly controlled environment inside incubation tube coupled with the greatly accelerated growth process is the perfect opportunity to push the boundaries of a body's ability to sustain pregnancy. This will include injections of specialized serums and mechanical manipulation of their reproductive system through a special set of manipulators, probes, nozzles and syringes supervised by a powerful monitoring program. Costly to maintain.`);
+ div.append(section);
- row = document.createElement("div");
+ section = document.createElement("div");
if (V.incubator.upgrade.reproduction < 1) {
/* Now with reports - what is lacking for construction */
- row.append(`${incubatorNameCaps} lacks advanced monitoring and hormone injection systems. Construction not possible.`);
+ section.append(`${incubatorNameCaps} lacks advanced monitoring and hormone injection systems. Construction not possible.`);
} else if (V.incubator.upgrade.organs < 1) {
- row.append(`${incubatorNameCaps} lacks the ability to extract tissue samples. Construction not possible.`);
+ section.append(`${incubatorNameCaps} lacks the ability to extract tissue samples. Construction not possible.`);
} else if (V.dispensaryUpgrade < 1) {
- row.append(`${incubatorNameCaps} lacks a connection to an advanced pharmaceutical fabricator. Cutting-edge targeted serums production needed as integral part. Construction not possible.`);
+ section.append(`${incubatorNameCaps} lacks a connection to an advanced pharmaceutical fabricator. Cutting-edge targeted serums production needed as integral part. Construction not possible.`);
} else if (V.bellyImplants < 1) {
- row.append(`${incubatorNameCaps} lacks a connection with an implant manufacturing to construct fillable abdominal implants to simulate expansion. Construction not possible.`);
+ section.append(`${incubatorNameCaps} lacks a connection with an implant manufacturing to construct fillable abdominal implants to simulate expansion. Construction not possible.`);
} else if (V.incubator.upgrade.growthStims < 1) {
- row.append(`${incubatorNameCaps} lacks advanced monitoring and stimulant injection systems. Construction not possible.`);
+ section.append(`${incubatorNameCaps} lacks advanced monitoring and stimulant injection systems. Construction not possible.`);
} else {
const cost = Math.trunc(2000000 * V.upgradeMultiplierArcology);
- row.append(
- choice(
- `Manufacture and install this subsystem`,
- () => {
- cashX(forceNeg(cost), "capEx");
+ section.append(
+ makePurchase(`Manufacture and install this subsystem`, cost, "capEx", {
+ handler: () => {
V.incubator.upgrade.pregAdaptation = 1;
refresh();
},
- "",
- `Costs ${cashFormat(cost)} and will increase upkeep costs`
- )
+ notes: [`will increase upkeep costs`]
+ })
);
}
}
- p.append(row);
- el.append(p);
+ div.append(section);
+ el.append(div);
}
- p = document.createElement("p");
- row = document.createElement("div");
+ div = document.createElement("div");
+ section = App.UI.DOM.makeElement("div", null, ["margin-top"]);
if (V.incubator.setting.imprint === "terror") {
- row.append(`The imprinting system is currently focused on making them devoted but fearful of you. The imprinting cycle is locked upon incubation start. `);
- App.UI.DOM.appendNewElement("span", row, `Only affects new infants`, "note");
+ section.append(`The imprinting system is currently focused on making them devoted but fearful of you. The imprinting cycle is locked upon incubation start. `);
+ App.UI.DOM.appendNewElement("span", section, `Only affects new infants`, ["note"]);
if (V.bodyswapAnnounced === 1) {
- row.append(
+ section.append(
choice(
`Switch the system to focus on preparation for body-swapping`,
() => {
@@ -1517,7 +1489,7 @@ App.UI.incubator = function() {
)
);
}
- row.append(
+ section.append(
choice(
`Switch the system to focus on attachment`,
() => {
@@ -1527,9 +1499,9 @@ App.UI.incubator = function() {
)
);
} else if (V.incubator.setting.imprint === "trust") {
- row.append(`The imprinting system is currently focused on making them devoted and trusting of you. The imprinting cycle is locked upon incubation start.`);
+ section.append(`The imprinting system is currently focused on making them devoted and trusting of you. The imprinting cycle is locked upon incubation start.`);
if (V.bodyswapAnnounced === 1) {
- row.append(
+ section.append(
choice(
`Switch the system to focus preparation for body-swapping`,
() => {
@@ -1539,7 +1511,7 @@ App.UI.incubator = function() {
)
);
}
- row.append(
+ section.append(
choice(
`Switch the system to focus on dependence`,
() => {
@@ -1549,8 +1521,8 @@ App.UI.incubator = function() {
)
);
} else {
- row.append(`The imprinting system is currently focused on producing complete vegetables ready to be used as hosts for body swapping. The imprinting cycle is locked upon incubation start.`);
- row.append(
+ section.append(`The imprinting system is currently focused on producing complete vegetables ready to be used as hosts for body swapping. The imprinting cycle is locked upon incubation start.`);
+ section.append(
choice(
`Switch the system to focus on dependence`,
() => {
@@ -1559,7 +1531,7 @@ App.UI.incubator = function() {
}
)
);
- row.append(
+ section.append(
choice(
`Switch the system to focus on attachment`,
() => {
@@ -1569,12 +1541,12 @@ App.UI.incubator = function() {
)
);
}
- p.append(row);
- el.append(p);
+ div.append(section);
+ el.append(div);
- row = document.createElement("div");
- row.append(App.Facilities.rename(App.Entity.facilities.incubator, () => refresh()));
- el.append(row);
+ section = document.createElement("div");
+ section.append(App.Facilities.rename(App.Entity.facilities.incubator, () => refresh()));
+ el.append(section);
return el;
diff --git a/src/facilities/masterSuite/masterSuite.js b/src/facilities/masterSuite/masterSuite.js
index d9b7c76cb11c4ece1d2812bc5c67c4bb3421c95b..9bd1ab46014bcdaecf737aa859b469b9fb2b1eae 100644
--- a/src/facilities/masterSuite/masterSuite.js
+++ b/src/facilities/masterSuite/masterSuite.js
@@ -263,7 +263,7 @@ App.Facilities.MasterSuite.masterSuite = class MasterSuite extends App.Facilitie
amount: 2,
desc: `${capFirstChar(V.masterSuiteName)} has room for ${numberWithPluralOne(V.masterSuite, "slave")} to live comfortably${V.masterSuiteUpgradeLuxury === 2
? ` in the moments when they're not in the fuckpit`
- : V.masterSuiteUpgradeLuxury === 1 ? ` on its huge bed` : ``}. There ${this.facility.hostedSlaves === 1 ? `is ${num(this.facility.hostedSlaves)} slaves` : `are ${num(this.facility.hostedSlaves)} slave`} in ${V.masterSuiteName}.`,
+ : V.masterSuiteUpgradeLuxury === 1 ? ` on its huge bed` : ``}. There ${this.facility.hostedSlaves() === 1 ? `is ${num(this.facility.hostedSlaves())} slave` : `are ${num(this.facility.hostedSlaves())} slaves`} in ${V.masterSuiteName}.`,
removeSlave: "please you",
};
}
@@ -325,7 +325,7 @@ App.Facilities.MasterSuite.masterSuite = class MasterSuite extends App.Facilitie
App.UI.reload();
},
prereqs: [
- () => !!V.seePreg,
+ !!V.seePreg,
],
},
{
@@ -343,7 +343,7 @@ App.Facilities.MasterSuite.masterSuite = class MasterSuite extends App.Facilitie
{
property: "masterSuitePregnancySlaveLuxuries",
prereqs: [
- () => V.masterSuiteUpgradePregnancy > 0,
+ V.masterSuiteUpgradePregnancy > 0,
],
options: [
{
@@ -385,7 +385,7 @@ App.Facilities.MasterSuite.masterSuite = class MasterSuite extends App.Facilitie
{
property: "masterSuiteHyperPregnancy",
prereqs: [
- () => V.masterSuitePregnancyFertilityDrugs > 0,
+ V.masterSuitePregnancyFertilityDrugs > 0 || V.masterSuiteHyperPregnancy > 0,
],
options: [
{
@@ -407,7 +407,7 @@ App.Facilities.MasterSuite.masterSuite = class MasterSuite extends App.Facilitie
{
property: "masterSuitePregnancyFertilitySupplements",
prereqs: [
- () => V.masterSuitePregnancyFertilityDrugs === 1 || V.masterSuiteHyperPregnancy === 1,
+ V.masterSuitePregnancyFertilityDrugs === 1 || V.masterSuiteHyperPregnancy === 1 || V.masterSuitePregnancyFertilitySupplements > 0,
],
options: [
{
diff --git a/src/facilities/masterSuite/masterSuiteFramework.js b/src/facilities/masterSuite/masterSuiteFramework.js
index 83e67a773242e968831fc29ed8c173bd852b533e..67e0e8537cd36fe13ed65449b056f1bc654860a1 100644
--- a/src/facilities/masterSuite/masterSuiteFramework.js
+++ b/src/facilities/masterSuite/masterSuiteFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.masterSuite = {
baseName: "masterSuite",
genericName: "Master Suite",
diff --git a/src/facilities/nursery/nursery.js b/src/facilities/nursery/nursery.js
index c8723e569509e44c892cf9278086fecf671e86dd..3476dba689cea02c9a95ac20a83757f13e51d4b4 100644
--- a/src/facilities/nursery/nursery.js
+++ b/src/facilities/nursery/nursery.js
@@ -26,9 +26,9 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
text.push(this.facility.nameCaps, this.decorations);
- if (this.facility.hostedSlaves > 2) {
+ if (this.facility.hostedSlaves() > 2) {
text.push(`${this.facility.nameCaps} is bustling with activity. Nannies are busily moving about, feeding babies and changing diapers.`);
- } else if (this.facility.hostedSlaves > 0) {
+ } else if (this.facility.hostedSlaves() > 0) {
text.push(`${this.facility.nameCaps} is working steadily. Nannies are moving about, cleaning up and feeding hungry children.`);
} else if (S.Matron) {
text.push(`${S.Matron.slaveName} is alone in ${this.facility.name}, and keeps the place clean and looks after the children ${getPronouns(S.Matron).himself}.`);
@@ -86,7 +86,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
/** @returns {FC.Facilities.Expand} */
get expand() {
- const slaves = this.facility.hostedSlaves;
+ const slaves = this.facility.hostedSlaves();
const nannies = numberWithPluralOne(V.nurseryNannies, 'nanny', 'nannies');
return {
@@ -162,7 +162,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
{
property: "MatronIgnoresFlaws",
prereqs: [
- () => !!S.Matron,
+ !!S.Matron,
],
options: [
{
@@ -180,7 +180,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
{
property: "nurserySex",
prereqs: [
- () => !!V.extremeUnderage,
+ !!V.extremeUnderage,
],
options: [
{
@@ -199,7 +199,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
{
property: "nurseryWeightSetting",
prereqs: [
- () => !!V.nurseryWeight,
+ !!V.nurseryWeight,
],
options: [
{
@@ -217,7 +217,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
{
property: "nurseryMusclesSetting",
prereqs: [
- () => !!V.nurseryMuscles,
+ !!V.nurseryMuscles,
],
options: [
{
@@ -235,7 +235,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
{
property: "nurseryHormonesSetting",
prereqs: [
- () => !!V.nurseryHormones,
+ !!V.nurseryHormones,
],
options: [
{
@@ -371,7 +371,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
};
const sortingBar = document.createElement("div");
- sortingBar.classList.add("incubator-underscore");
+ sortingBar.classList.add("border-bottom");
V.sortIncubatorList = V.sortIncubatorList || 'Unsorted';
sortingBar.append(sortingBarFunc(sortingOptions));
diff --git a/src/facilities/nursery/nurseryDatatypeCleanup.js b/src/facilities/nursery/nurseryDatatypeCleanup.js
index f92a3b63a0171d67f00d6fb469c1f9803df1a498..e79986ba6ed9a8a58fa545ee9dc0659455b0634a 100644
--- a/src/facilities/nursery/nurseryDatatypeCleanup.js
+++ b/src/facilities/nursery/nurseryDatatypeCleanup.js
@@ -412,7 +412,7 @@ App.Facilities.Nursery.ChildDatatypeCleanup = function(child) {
child.skill.anal = Math.clamp(+child.skill.anal, 0, 100) || 0;
child.skill.whoring = Math.clamp(+child.skill.whoring, 0, 100) || 0;
child.skill.entertainment = Math.clamp(+child.skill.entertainment, 0, 100) || 0;
- child.skill.combat = Math.clamp(+child.skill.combat, 0, 1) || 0;
+ child.skill.combat = Math.clamp(+child.skill.combat, 0, 100) || 0;
child.skill.headGirl = Math.clamp(+child.skill.headGirl, 0, 200) || 0;
child.skill.recruiter = Math.clamp(+child.skill.recruiter, 0, 200) || 0;
child.skill.bodyguard = Math.clamp(+child.skill.bodyguard, 0, 200) || 0;
diff --git a/src/facilities/nursery/nurseryFramework.js b/src/facilities/nursery/nurseryFramework.js
index 94597390d5e89097835c89ea7548d6fcbb570ac2..35431bbc9347b5c0deb01d672bcb93e8fa8762be 100644
--- a/src/facilities/nursery/nurseryFramework.js
+++ b/src/facilities/nursery/nurseryFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.nursery = {
baseName: "nursery",
genericName: null,
@@ -67,8 +68,8 @@ App.Entity.Facilities.Nursery = class extends App.Entity.Facilities.SingleJobFac
/** @override */
occupancyReport(long) {
return long
- ? `${V.nurseryChildren}/${V.nursery} babies, ${this.hostedSlaves}/${V.nurseryNannies} nannies${this.manager.currentEmployee ? `, ${this.manager.desc.position}` : ""}`
- : `${V.nurseryChildren}/${V.nursery}, ${this.hostedSlaves}/${V.nurseryNannies}${this.manager.currentEmployee ? ", L" : ""}`;
+ ? `${V.nurseryChildren}/${V.nursery} babies, ${this.hostedSlaves()}/${V.nurseryNannies} nannies${this.manager.currentEmployee ? `, ${this.manager.desc.position}` : ""}`
+ : `${V.nurseryChildren}/${V.nursery}, ${this.hostedSlaves()}/${V.nurseryNannies}${this.manager.currentEmployee ? ", L" : ""}`;
}
};
diff --git a/src/facilities/nursery/utils/nurseryUtils.js b/src/facilities/nursery/utils/nurseryUtils.js
index dad2b09614e2568e4f43c62d3b4ff6bbef1f2eaf..a20c9642ca8fba1452efe133def4dbc2a84a9722 100644
--- a/src/facilities/nursery/utils/nurseryUtils.js
+++ b/src/facilities/nursery/utils/nurseryUtils.js
@@ -707,8 +707,7 @@ App.Facilities.Nursery.nurserySort = function nurserySort() {
r += `<div id="ql-nursery">`;
- for (let i = 0; i < SL; i++) {
- const slave = V.slaves[i];
+ for (const slave of V.slaves) {
const {His, his} = getPronouns(slave);
if (slave.preg > 0 && !slave.broodmother && slave.pregKnown && slave.eggType === "human") {
diff --git a/src/facilities/penthouse/HGSelect.js b/src/facilities/penthouse/HGSelect.js
index 12af30da4b268ac8983125cbe339527f74ce514b..1001e4333b008e1567aa15f81cd952956cd8bf98 100644
--- a/src/facilities/penthouse/HGSelect.js
+++ b/src/facilities/penthouse/HGSelect.js
@@ -150,9 +150,8 @@ App.Facilities.HGSelect = function() {
if (V.seePreg !== 0) {
if (V.universalRulesImpregnation === "HG") {
App.UI.DOM.appendNewElement("div", f, `${HGName} is responsible for impregnating fertile slaves.`);
- V.HGCum = resetHGCum(S.HeadGirl);
if (canPenetrate(S.HeadGirl) && S.HeadGirl.pubertyXY === 1) {
- App.UI.DOM.appendNewElement("div", f, `To maximize the chances of impregnation, ${he} will fuck fertile pussies frequently during the week. ${S.HeadGirl.slaveName} can service ${V.HGCum} slaves this way.`);
+ App.UI.DOM.appendNewElement("div", f, `To maximize the chances of impregnation, ${he} will fuck fertile pussies frequently during the week. ${S.HeadGirl.slaveName} can service ${resetHGCum(S.HeadGirl)} slaves this way.`);
if (S.HeadGirl.devotion > 95) {
App.UI.DOM.appendNewElement("div", f, `${He} loves you so much ${he}'ll fuck them until ${he}'s sore.`);
} else {
diff --git a/src/facilities/penthouse/managePenthouse.js b/src/facilities/penthouse/managePenthouse.js
index 6af54c4b0885ac634bb94035a0acf467180de4fe..90561620fd7536a212559395ec461f64b237a7e3 100644
--- a/src/facilities/penthouse/managePenthouse.js
+++ b/src/facilities/penthouse/managePenthouse.js
@@ -34,7 +34,7 @@ App.UI.managePenthouse = function() {
)
);
} else if (V.SF.FS.Tension > 100) {
- App.UI.DOM.appendNewElement("div", el, App.Mods.SF.fsIntegration.badOutcomeFirebase());
+ App.UI.DOM.appendNewElement("div", el, App.Mods.SF.fsIntegration.crisis()[0]);
}
return el;
}
@@ -471,12 +471,7 @@ App.UI.managePenthouse = function() {
if (V.studio === 0) {
r.push(makeLink("Install a media hub to convert slave video feeds into pornography", () => { V.studio = 1; }, 10000));
} else {
- r.push(`The arcology's video systems are connected to a media hub that can convert slave video feeds into pornography.`);
- if (V.studioFeed === 0) {
- r.push(makeLink("Upgrade the media hub to allow better control of pornographic content", () => { V.studioFeed = 1; }, 15000));
- } else {
- r.push(`It has been upgraded to allow superior control of a slave's pornographic content.`);
- }
+ r.push(`The arcology's video systems are connected to a`, App.UI.DOM.passageLink("media hub", "Media Studio"), `that can convert slave video feeds into pornography.`);
}
App.Events.addNode(el, r, "div");
diff --git a/src/facilities/penthouse/penthouseFramework.js b/src/facilities/penthouse/penthouseFramework.js
index ee9be3de8a40e2c19d9e6dbcf2bc800c4f822241..91bfe5848cb41973aa013bf123ae9954a4deb026 100644
--- a/src/facilities/penthouse/penthouseFramework.js
+++ b/src/facilities/penthouse/penthouseFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.penthouse = {
baseName: "penthouse",
genericName: "Penthouse",
@@ -100,7 +101,7 @@ App.Entity.Facilities.PenthouseJobs = {
r.push(`${slave.slaveName} is too resistant to learn.`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName}'s mind is fundamentally broken and can't learn.`);
}
return r;
diff --git a/src/facilities/pit/pit.js b/src/facilities/pit/pit.js
index a4efa0f2f0e0814a6ee1a6b540fd303facbfc9e3..a7f7cadce30943c5f931670b3c05eb81fefbb7f6 100644
--- a/src/facilities/pit/pit.js
+++ b/src/facilities/pit/pit.js
@@ -1,48 +1,91 @@
-App.Facilities.Pit.pit = class Pit extends App.Facilities.Facility {
- constructor() {
- const pit = App.Entity.facilities.pit;
- const decommissionHandler = () => {
- V.pit = null;
+App.Facilities.Pit.pit = function() {
+ V.nextButton = "Back to Main";
+ V.nextLink = "Main";
+ V.encyclopedia = "Pit";
- App.Arcology.cellUpgrade(V.building, App.Arcology.Cell.Market, "Pit", "Markets");
- };
+ const pit = App.Entity.facilities.pit;
+
+ if (V.pit.slavesFighting.length !== 2) {
+ V.pit.slavesFighting = [];
+ V.pit.fighters = V.pit.fighters !== 4 ? V.pit.fighters : 0;
+ }
- super(
- pit,
- decommissionHandler,
- );
+ const container = document.createElement("div");
+ container.append(assemble());
+ return container;
- V.nextButton = "Back to Main";
- V.nextLink = "Main";
- V.encyclopedia = "Pit";
+ /**
+ * @returns {DocumentFragment}
+ */
+ function assemble() {
+ const frag = new DocumentFragment();
+ App.UI.DOM.appendNewElement("div", frag, intro(), ['margin-bottom']);
- if (V.pit.slavesFighting.length !== 2) {
- V.pit.slavesFighting = [];
- V.pit.fighters = V.pit.fighters !== 4 ? V.pit.fighters : 0;
- }
+ const tabs = new App.UI.Tabs.TabBar("arena_main");
+
+ const trainingFrag = new DocumentFragment();
+ App.UI.DOM.appendNewElement("div", trainingFrag, arenaDescription(), ['margin-bottom']);
+ App.UI.DOM.appendNewElement("div", trainingFrag, arenaSlaves(), ['margin-bottom']);
+ tabs.addTab("Training", "training", trainingFrag);
+
+ const fightsFrag = new DocumentFragment();
+ App.UI.DOM.appendNewElement("div", fightsFrag, pitDescription(), ['margin-bottom']);
+ App.UI.DOM.appendNewElement("div", fightsFrag, pitRules(), ['margin-bottom']);
+ App.UI.DOM.appendNewElement("div", fightsFrag, pitScheduled(), ['margin-bottom']);
+ App.UI.DOM.appendNewElement("div", fightsFrag, pitSlaves(), ['margin-bottom']);
+ tabs.addTab("Fights", "fights", fightsFrag);
+
+ frag.append(tabs.render());
+
+ App.UI.DOM.appendNewElement("div", frag, rename(), ['margin-bottom']);
+ return frag;
+ }
+
+ function refresh() {
+ App.UI.DOM.replace(container, assemble());
}
- /** @returns {string} */
- get intro() {
+ function intro() {
+ const el = document.createDocumentFragment();
+
+ App.UI.DOM.appendNewElement("h1", el, pit.nameCaps);
+
const text = [];
- text.push(`${this.facility.nameCaps} ${this.decorations}`);
+ text.push(`${pit.nameCaps} ${decorations()}`);
+ text.push("In the available space surrounding it are various combat training facilities.");
- if (this.facility.hostedSlaves > 2) {
+ if (pit.hostedSlaves("trainee") > 5) {
+ text.push(`${pit.nameCaps} is bustling with slaves honing their skills in sparring matches.`);
+ } else if (pit.hostedSlaves("trainee") > 1) {
+ text.push(`Some slaves are honing their skills in sparring matches.`);
+ } else if (pit.hostedSlaves("trainee") > 0) {
+ text.push(`One slave is training in the otherwise empty halls.`);
+ }
+ if (pit.hostedSlaves("fighter") > 2) {
text.push(`It has a pool of slaves assigned to fight in the next week's bout.`);
- } else if (this.facility.hostedSlaves > 1) {
+ } else if (pit.hostedSlaves("fighter") > 1) {
text.push(`It has two slaves assigned to the week's bout.`);
- } else if (this.facility.hostedSlaves > 0) {
- text.push(`It only has one slave assigned to the week's bout.`);
- } else {
- text.push(`It doesn't have any slaves assigned to fight.`);
+ } else if (pit.hostedSlaves("fighter") > 0) {
+ text.push(`It has only one slave assigned to the week's bout.`);
+ }
+ if (pit.hostedSlaves() === 0) {
+ text.push(`${pit.nameCaps} lays empty and silent.`);
}
- return text.join(' ');
+ App.UI.DOM.appendNewElement("div", el, text.join(' '), ['scene-intro']);
+
+ if (pit.totalEmployeesCount === 0) {
+ el.append(App.UI.DOM.makeElement("div", App.UI.DOM.passageLink(`Decommission ${pit.name}`, "Main", () => {
+ V.pit = null;
+ App.Arcology.cellUpgrade(V.building, App.Arcology.Cell.Market, "Pit", "Markets");
+ }), ['indent']));
+ }
+
+ return el;
}
- /** @returns {string} */
- get decorations() {
+ function decorations() {
const chattelReligionist = () => {
const text = [`is a large, modern arena decorated with frescoes of two fictional slaves reaching the afterlife. On the upper walls near the seatings, the obedient slave blissfully follow ${V.seeDicks < 100 ? `her` : `his`} master through`];
if (V.arcologies[0].FSRomanRevivalist !== "unset") {
@@ -65,7 +108,6 @@ App.Facilities.Pit.pit = class Pit extends App.Facilities.Facility {
return text.join(" ");
};
-
/** @type {FC.Facilities.Decoration} */
const FS = {
"Roman Revivalist": `is a circular Roman amphitheater-like structure with a coffered dome built of limestone. Walls are covered with mosaics depicting various idealized gladiatorial fights. At the bottom, the pit is covered with a fine layered of sand.`,
@@ -109,240 +151,200 @@ App.Facilities.Pit.pit = class Pit extends App.Facilities.Facility {
return res;
}
- /** @returns {FC.Facilities.Expand} */
- get expand() {
- return {
- desc: `Slaves assigned here will continue with their usual duties and fight during the weekend. There ${this.facility.hostedSlaves === 1 ? `is` : `are`} currently ${numberWithPluralOne(this.facility.hostedSlaves, "slave")} assigned to fight in ${this.facility.name}.`,
- unexpandable: true,
- removeAll: removeAll(),
- };
+ function arenaDescription() {
+ const el = document.createDocumentFragment();
- function removeAll() {
- const div = document.createElement("div");
+ el.append("Slaves assigned here will continue with their usual duties but train for some time every day. ");
+ el.append(`There ${pit.hostedSlaves("trainee") === 1 ? `is` : `are`} currently ${numberWithPluralOne(pit.hostedSlaves("trainee"), "slave")} assigned to train in ${pit.name}.`);
- App.UI.DOM.appendNewElement("div", div, App.UI.DOM.link(`Cancel all fights`, () => {
- App.Entity.facilities.pit.employees().forEach(slave => removeJob(slave, Job.PIT));
+ if (pit.hostedSlaves("trainee") > 0) {
+ App.UI.DOM.appendNewElement("div", el, App.UI.DOM.link(`Remove all slaves`, () => {
+ App.Entity.facilities.pit.employees().forEach(slave => removeJob(slave, Job.ARENA));
App.UI.reload();
- }));
-
- return div;
+ }), ['indent']);
}
+
+ return el;
}
- /** @returns {FC.Facilities.Rule[]} */
- get rules() {
- const animal = V.active.canine || V.active.hooved || V.active.feline;
+ function pitDescription() {
+ const el = document.createDocumentFragment();
+
+ el.append("Slaves assigned here will continue with their usual duties and fight during the weekend. ");
+ el.append(`There ${pit.hostedSlaves("fighter") === 1 ? `is` : `are`} currently ${numberWithPluralOne(pit.hostedSlaves("fighter"), "slave")} assigned to fight in ${pit.name}.`);
+
+ if (pit.hostedSlaves("fighter") > 0) {
+ App.UI.DOM.appendNewElement("div", el, App.UI.DOM.link(`Cancel all fights`, () => {
+ App.Entity.facilities.pit.employees().forEach(slave => removeJob(slave, Job.PIT));
- if (!V.pit.slaveFightingAnimal && !V.pit.slaveFightingBodyguard) { // only display if a fight has not been scheduled
- return [
- {
- property: "audience",
- prereqs: [],
- options: [
- {
- get text() { return `Fights here are strictly private.`; },
- link: `Closed`,
- value: 'none',
- },
- {
- get text() { return `Fights here are free and open to the public.`; },
- link: `Free`,
- value: 'free',
- },
- {
- get text() { return `Admission is charged to the fights here.`; },
- link: `Paid`,
- value: 'paid',
- },
- ],
- object: V.pit,
- },
- {
- property: "fighters",
- prereqs: [],
- options: [
- {
- get text() { return `Two fighters will be selected from the pool at random.`; },
- link: `Slaves`,
- value: 0,
- },
- {
- get text() { return `Your bodyguard ${S.Bodyguard.slaveName} will fight a slave selected from the pool at random.`; },
- link: `Bodyguard`,
- value: 1,
- prereqs: [
- () => !!S.Bodyguard,
- ],
- },
- {
- get text() { return `A random slave will fight an animal.`; },
- link: `Animal`,
- value: 2,
- prereqs: [
- () => !!animal,
- ],
- handler: () => {
- if (!V.pit.animal) {
- V.pit.animal = animal;
- }
- },
- },
- {
- get text() {
- return `A random slave will fight another slave${S.Bodyguard && !animal ? ` or your bodyguard` : S.Bodyguard ? `, your bodyguard` : ``}${animal ? ` or an animal` : ``}.`;
- },
- link: `Random`,
- value: 3,
- prereqs: [
- () => !!S.Bodyguard || !!animal,
- ],
- },
- {
- get text() {
- return `${V.pit.slavesFighting.length > 1
- ? `${SlaveFullName(getSlave(V.pit.slavesFighting[0]))} will fight ${SlaveFullName(getSlave(V.pit.slavesFighting[1]))} this week.`
- : `Two chosen slaves will fight.`}`;
- },
- link: `Choose slaves`,
- value: 4,
- handler: () => {
- Engine.play("Pit Workaround");
-
- V.pit.slavesFighting = [];
- },
- },
- ],
- object: V.pit,
- },
- {
- property: "animal",
- prereqs: [
- () => V.pit.fighters === 2 || V.pit.fighters === 3,
- () => !!animal,
- ],
- options: [
- {
- get text() { return `Your slave will fight ${getAnimal(V.active.canine).articleAn} ${V.active.canine}.`; },
- get link() { return capFirstChar(V.active.canine); },
- value: V.active.canine,
- prereqs: [
- () => !!V.active.canine,
- () => !["beagle", "French bulldog", "poodle", "Yorkshire terrier"].includes(V.active.canine),
- ],
- },
- {
- get text() { return `Your slave will fight ${getAnimal(V.active.hooved).articleAn} ${V.active.hooved}.`; },
- get link() { return capFirstChar(V.active.hooved); },
- value: V.active.hooved,
- prereqs: [
- () => !!V.active.hooved,
- ],
- },
- {
- get text() { return `Your slave will fight ${getAnimal(V.active.feline).articleAn} ${V.active.feline}.`; },
- get link() { return capFirstChar(V.active.feline); },
- value: V.active.feline,
- prereqs: [
- () => !!V.active.feline,
- () => getAnimal(V.active.feline).species !== "cat",
- ],
- },
- {
- get text() { return `Your slave will fight one of your animals at random.`; },
- link: `Random`,
- value: 'random',
- prereqs: [
- () => (!!V.active.canine && !!V.active.hooved) ||
- (!!V.active.canine && !!V.active.feline) ||
- (!!V.active.hooved && !!V.active.feline),
- ],
- },
- ],
- object: V.pit,
- },
- {
- property: "lethal",
- prereqs: [],
- options: [
- {
- get text() {
- return V.pit.fighters === 2
- ? `The fighter will be armed with a sword and will fight to the death.`
- : `Fighters will be armed with swords, and fights will be to the death.`;
- },
- link: `Lethal`,
- value: true,
- },
- {
- get text() {
- return V.pit.fighters === 2
- ? `The slave will be restrained and will try to avoid becoming the animal's plaything.`
- : `Fighters will use their fists and feet, and fights will be to submission.`;
- },
- link: `Nonlethal`,
- value: false,
- },
- ],
- object: V.pit,
- },
- {
- property: "virginities",
- prereqs: [
- () => V.pit.fighters !== 2,
- () => !V.pit.lethal,
- ],
- options: [
- {
- get text() { return `No virginities of the loser will be respected.`; },
- link: `Neither`,
- value: 'neither',
- },
- {
- get text() { return `Vaginal virginity of the loser will be respected.`; },
- link: `Vaginal`,
- value: 'vaginal',
- },
- {
- get text() { return `Anal virginity of the loser will be respected.`; },
- link: `Anal`,
- value: 'anal',
- },
- {
- get text() { return `All virginities of the loser will be respected.`; },
- link: `All`,
- value: 'all',
- },
- ],
- object: V.pit,
- },
- ];
+ App.UI.reload();
+ }), ['indent']);
}
- return [];
+ return el;
}
- /** @returns {HTMLDivElement} */
- get slaves() {
- const div = document.createElement("div");
+ function pitRules() {
+ const el = document.createDocumentFragment();
- div.append(App.UI.SlaveList.listSJFacilitySlaves(App.Entity.facilities.pit, passage(), false,
- {assign: "Schedule a slave to fight", remove: "Cancel a slave's fight", transfer: null}));
+ const animal = V.active.canine || V.active.hooved || V.active.feline;
+ /** @type {FC.Facilities.Rule[]} */
+ const rules = !V.pit.slaveFightingAnimal && !V.pit.slaveFightingBodyguard// only display if a fight has not been scheduled
+ ? [{
+ property: "audience", prereqs: [], options: [{
+ get text() {
+ return `Fights here are strictly private.`;
+ }, link: `Closed`, value: 'none',
+ }, {
+ get text() {
+ return `Fights here are free and open to the public.`;
+ }, link: `Free`, value: 'free',
+ }, {
+ get text() {
+ return `Admission is charged to the fights here.`;
+ }, link: `Paid`, value: 'paid',
+ }, ], object: V.pit,
+ }, {
+ property: "fighters", prereqs: [], options: [{
+ get text() {
+ return `Two fighters will be selected from the pool at random.`;
+ }, link: `Slaves`, value: 0,
+ }, {
+ get text() {
+ return `Your bodyguard ${S.Bodyguard.slaveName} will fight a slave selected from the pool at random.`;
+ }, link: `Bodyguard`, value: 1, prereqs: [!!S.Bodyguard, ],
+ }, {
+ get text() {
+ return `A random slave will fight an animal.`;
+ }, link: `Animal`, value: 2, prereqs: [!!animal, ], handler: () => {
+ if (!V.pit.animal) {
+ V.pit.animal = animal;
+ }
+ },
+ }, {
+ get text() {
+ return `A random slave will fight another slave${S.Bodyguard && !animal ? ` or your bodyguard` : S.Bodyguard ? `, your bodyguard` : ``}${animal ? ` or an animal` : ``}.`;
+ }, link: `Random`, value: 3, prereqs: [!!S.Bodyguard || !!animal, ],
+ }, {
+ get text() {
+ return `${V.pit.slavesFighting.length > 1 ? `${SlaveFullName(getSlave(V.pit.slavesFighting[0]))} will fight ${SlaveFullName(getSlave(V.pit.slavesFighting[1]))} this week.` : `Two chosen slaves will fight.`}`;
+ }, link: `Choose slaves`, value: 4, handler: () => {
+ Engine.play("Pit Workaround");
+
+ V.pit.slavesFighting = [];
+ },
+ }, ], object: V.pit,
+ }, {
+ property: "animal", prereqs: [V.pit.fighters === 2 || V.pit.fighters === 3, !!animal, ], options: [{
+ get text() {
+ return `Your slave will fight ${getAnimal(V.active.canine).articleAn} ${V.active.canine}.`;
+ },
+ get link() {
+ return capFirstChar(V.active.canine);
+ },
+ value: V.active.canine,
+ prereqs: [!!V.active.canine,
+ !["beagle", "French bulldog", "poodle", "Yorkshire terrier"].includes(V.active.canine), ],
+ }, {
+ get text() {
+ return `Your slave will fight ${getAnimal(V.active.hooved).articleAn} ${V.active.hooved}.`;
+ }, get link() {
+ return capFirstChar(V.active.hooved);
+ }, value: V.active.hooved, prereqs: [!!V.active.hooved, ],
+ }, {
+ get text() {
+ return `Your slave will fight ${getAnimal(V.active.feline).articleAn} ${V.active.feline}.`;
+ },
+ get link() {
+ return capFirstChar(V.active.feline);
+ },
+ value: V.active.feline,
+ prereqs: [!!V.active.feline, getAnimal(V.active.feline)?.species !== "cat", ],
+ }, {
+ get text() {
+ return `Your slave will fight one of your animals at random.`;
+ },
+ link: `Random`,
+ value: 'random',
+ prereqs: [(!!V.active.canine && !!V.active.hooved) || (!!V.active.canine && !!V.active.feline) || (!!V.active.hooved && !!V.active.feline), ],
+ }, ], object: V.pit,
+ }, {
+ property: "lethal", prereqs: [], options: [{
+ get text() {
+ return V.pit.fighters === 2 ? `The fighter will be armed with a sword and will fight to the death.` : `Fighters will be armed with swords, and fights will be to the death.`;
+ }, link: `Lethal`, value: true,
+ }, {
+ get text() {
+ return V.pit.fighters === 2 ? `The slave will be restrained and will try to avoid becoming the animal's plaything.` : `Fighters will use their fists and feet, and fights will be to submission.`;
+ }, link: `Nonlethal`, value: false,
+ }, ], object: V.pit,
+ }, {
+ property: "virginities", prereqs: [V.pit.fighters !== 2, !V.pit.lethal, ], options: [{
+ get text() {
+ return `No virginities of the loser will be respected.`;
+ }, link: `Neither`, value: 'neither',
+ }, {
+ get text() {
+ return `Vaginal virginity of the loser will be respected.`;
+ }, link: `Vaginal`, value: 'vaginal',
+ }, {
+ get text() {
+ return `Anal virginity of the loser will be respected.`;
+ }, link: `Anal`, value: 'anal',
+ }, {
+ get text() {
+ return `All virginities of the loser will be respected.`;
+ }, link: `All`, value: 'all',
+ }, ], object: V.pit,
+ }, ] : [];
+
+ if (rules.length > 0 && rules.some(rule => rule.prereqs.every(prereq => prereq === true))) {
+ App.UI.DOM.appendNewElement("h2", el, `Rules`);
+
+ rules.forEach(rule => {
+ if (rule.prereqs.every(prereq => prereq === true)) {
+ const options = new App.UI.OptionsGroup();
+ const option = options.addOption(null, rule.property, rule.object || V);
+
+ rule.options.forEach(o => {
+ if (!o.prereqs || o.prereqs.every(prereq => prereq === true)) {
+ option.addValue(o.link, o.value);
+ if (o.handler) {
+ option.addCallback(o.handler);
+ }
+ if (o.note) {
+ option.addComment(o.note);
+ }
+
+ if ((rule.object && _.isEqual(rule.object[rule.property], o.value)) || _.isEqual(V[rule.property], o.value)) {
+ App.UI.DOM.appendNewElement("div", el, o.text);
+ }
+ }
+ });
+
+ App.UI.DOM.appendNewElement("div", el, options.render(), ['margin-bottom']);
+ }
+
+ if (rule.nodes) {
+ App.Events.addNode(el, rule.nodes);
+ }
+ });
+ }
- return div;
+ return el;
}
- /** @returns {HTMLDivElement} */
- get scheduled() {
- const div = document.createElement("div");
+ function pitScheduled() {
+ const el = document.createDocumentFragment();
if (V.pit.slaveFightingAnimal || V.pit.slaveFightingBodyguard) {
const animal = V.pit.slaveFightingAnimal;
const bodyguard = V.pit.slaveFightingBodyguard;
- div.append(`You have scheduled ${getSlave(animal || bodyguard).slaveName} to fight ${V.pit.slaveFightingAnimal ? `an animal` : `your bodyguard`} to the death this week.`);
+ el.append(`You have scheduled ${getSlave(animal || bodyguard).slaveName} to fight ${V.pit.slaveFightingAnimal ? `an animal` : `your bodyguard`} to the death this week.`);
- App.UI.DOM.appendNewElement("div", div, App.UI.DOM.link(`Cancel it`, () => {
+ App.UI.DOM.appendNewElement("div", el, App.UI.DOM.link(`Cancel it`, () => {
V.pit.slaveFightingAnimal = null;
V.pit.slaveFightingBodyguard = null;
@@ -350,13 +352,57 @@ App.Facilities.Pit.pit = class Pit extends App.Facilities.Facility {
}), ['indent']);
}
+ return el;
+ }
+
+ function arenaSlaves() {
+ const el = document.createDocumentFragment();
+
+ App.UI.DOM.appendNewElement("h2", el, `Slaves`);
+ const div = document.createElement("div");
+
+ div.append(App.UI.SlaveList.listJFacilitySlaves("trainee", App.Entity.facilities.pit, undefined, false, {
+ assign: "Assign a slave", remove: "Cancel a slave's training", transfer: null
+ }));
+
+ App.UI.DOM.appendNewElement("div", el, div, ['margin-bottom']);
+
+ App.UI.SlaveList.ScrollPosition.restore();
+ return el;
+ }
+
+ function pitSlaves() {
+ const el = document.createDocumentFragment();
+
+ App.UI.DOM.appendNewElement("h2", el, `Slaves`);
+ const div = document.createElement("div");
+
+ div.append(App.UI.SlaveList.listJFacilitySlaves("fighter", App.Entity.facilities.pit, passage(), false, {
+ assign: "Schedule a slave to fight", remove: "Cancel a slave's fight", transfer: null
+ }, undefined, deadlinessNote));
+
+ App.UI.DOM.appendNewElement("div", el, div, ['margin-bottom']);
+
+ App.UI.SlaveList.ScrollPosition.restore();
+ return el;
+ }
+
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {HTMLDivElement}
+ */
+ function deadlinessNote(slave) {
+ const div = document.createElement("div");
+ div.append("Deadliness: ", DeadlinessTooltip(slave));
return div;
}
- /** @returns {HTMLDivElement[]} */
- get customNodes() {
- return [
- this.scheduled,
- ];
+ function rename() {
+ const el = document.createDocumentFragment();
+
+ App.UI.DOM.appendNewElement("h2", el, `Rename`);
+ App.UI.DOM.appendNewElement("div", el, App.Facilities.rename(pit, () => refresh()));
+
+ return el;
}
};
diff --git a/src/facilities/pit/pitFramework.js b/src/facilities/pit/pitFramework.js
index ffb7a1954f45fc8c5a9222b5b663b002b2b4d967..93e6447668df07de10d27dbd93c7aca02ef7b2ba 100644
--- a/src/facilities/pit/pitFramework.js
+++ b/src/facilities/pit/pitFramework.js
@@ -1,7 +1,15 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.pit = {
baseName: "pit",
- genericName: null,
+ genericName: "Arena",
jobs: {
+ trainee: {
+ position: "trainee",
+ assignment: Job.ARENA, /* pseudo-assignment for assignmentTransition/assignJob/removeJob */
+ publicSexUse: false,
+ fuckdollAccepted: false,
+ partTime: true
+ },
fighter: {
position: "fighter",
assignment: Job.PIT, /* pseudo-assignment for assignmentTransition/assignJob/removeJob */
@@ -31,6 +39,12 @@ App.Entity.Facilities.PitFighterJob = class extends App.Entity.Facilities.Facili
if ((slave.indentureRestrictions > 0) && (this.facility.option("lethal"))) {
r.push(`${slave.slaveName}'s indenture forbids lethal fights.`);
}
+ if (!canWalk(slave)) {
+ r.push(`${slave.slaveName} cannot walk independently.`);
+ }
+ if (!canHold(slave)) {
+ r.push(`${slave.slaveName} is unable to strike their opponent.`);
+ }
return r;
}
@@ -42,19 +56,51 @@ App.Entity.Facilities.PitFighterJob = class extends App.Entity.Facilities.Facili
if (this.isEmployed(slave)) {
return [`${slave.slaveName} is already assigned to fight in ${this.facility.name}.`];
}
- if (!this._facilityHasFreeSpace) {
- return [`Capacity of ${this.facility.name} exceeded.`];
+ return this.checkRequirements(slave);
+ }
+};
+
+/**
+ * The requirements are harsher than for the fighter job, as you can't learn combat if you can't fight in the first
+ * place. That's why we inherit PitFighterJob to keep the base requirements in sync.
+ */
+App.Entity.Facilities.ArenaTraineeJob = class extends App.Entity.Facilities.PitFighterJob {
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string[]}
+ */
+ checkRequirements(slave) {
+ let r = super.checkRequirements(slave);
+ if (!App.Entity.Facilities.Job._isBrokenEnough(slave, -20, -50, -20, -51)) {
+ r.push(`${slave.slaveName} is too resistant to be trusted with weapons.`);
+ }
+ if (slave.skill.combat >= 100) {
+ r.push(`${slave.slaveName} has nothing left to learn.`);
}
+ return r;
+ }
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string[]}
+ */
+ canEmploy(slave) {
+ if (this.isEmployed(slave)) {
+ return [`${slave.slaveName} is already assigned to train in ${this.facility.name}.`];
+ }
+ if ([Job.AGENT, Job.AGENTPARTNER].includes(slave.assignment)) {
+ return [`${slave.slaveName} has a job outside your arcology.`];
+ }
return this.checkRequirements(slave);
}
};
-App.Entity.Facilities.Pit = class extends App.Entity.Facilities.SingleJobFacility {
+App.Entity.Facilities.Pit = class extends App.Entity.Facilities.Facility {
constructor() {
super(App.Data.Facilities.pit,
{
- fighter: new App.Entity.Facilities.PitFighterJob()
+ trainee: new App.Entity.Facilities.ArenaTraineeJob(),
+ fighter: new App.Entity.Facilities.PitFighterJob(),
});
}
@@ -64,7 +110,10 @@ App.Entity.Facilities.Pit = class extends App.Entity.Facilities.SingleJobFacilit
/** @override */
occupancyReport(long) {
- return `${this.hostedSlaves}${long ? ` ${this.job().desc.position}s` : ""}`;
+ if (long) {
+ return `${this.hostedSlaves("trainee")} ${this.job("trainee").desc.position}s and ${this.hostedSlaves("fighter")} ${this.job("fighter").desc.position}s`;
+ }
+ return `T:${this.hostedSlaves("trainee")}+F:${this.hostedSlaves("fighter")}`;
}
};
diff --git a/src/facilities/pit/pitUtils.js b/src/facilities/pit/pitUtils.js
index 987315f9d05a6106e1a89a83e76e790d114618b2..fc3fe4d9d4707abb2423c300a23a7921781ae0c7 100644
--- a/src/facilities/pit/pitUtils.js
+++ b/src/facilities/pit/pitUtils.js
@@ -1,8 +1,11 @@
App.Facilities.Pit.init = function() {
/** @type {FC.Facilities.Pit} */
V.pit = {
- name: "the Pit",
+ name: "the Arena",
+ // Arena section
+ trainingIDs: [],
+ // Pit section
animal: null,
audience: "free",
bodyguardFights: false,
diff --git a/src/facilities/salon/salonPassage.js b/src/facilities/salon/salonPassage.js
index 70974df9f6d32f10cbec07ec904bb287f42381ac..0e73768577eea7e04a69458f8c8d7a5310db09b9 100644
--- a/src/facilities/salon/salonPassage.js
+++ b/src/facilities/salon/salonPassage.js
@@ -673,7 +673,7 @@ App.UI.salon = function(slave, cheat = false, startingGirls = false) {
option = options.addOption("Effect color", "tailEffectColor", slave);
for (const color of filtered) {
- option.addValue(capFirstChar(color.value), color.value, billMod);
+ option.addValue(capFirstChar(color.value), color.value, billMod);
}
option.pulldown();
diff --git a/src/facilities/schoolroom/schoolroom.js b/src/facilities/schoolroom/schoolroom.js
index f095f86ecb3e856846841feba6b2af4897745496..52a1464dfd39f2baac1037c2fd4711069e34d01d 100644
--- a/src/facilities/schoolroom/schoolroom.js
+++ b/src/facilities/schoolroom/schoolroom.js
@@ -26,9 +26,9 @@ App.Facilities.Schoolroom.schoolroom = class Schoolroom extends App.Facilities.F
text.push(`${this.facility.nameCaps} is well-equipped, with wallscreens to display lessons. These are currently`, this.decorations);
- if (this.facility.hostedSlaves > 2) {
+ if (this.facility.hostedSlaves() > 2) {
text.push(`${this.facility.nameCaps} is busy with slaves, repeating their lessons out loud to drill the instruction home. A few students are maintaining uncomfortable positions in the corner as punishment for poor work.`);
- } else if (this.facility.hostedSlaves > 0) {
+ } else if (this.facility.hostedSlaves() > 0) {
text.push(`${this.facility.nameCaps} is sparsely populated, the few students repeating their lessons out loud to drill the instruction home. One slave is maintaining an uncomfortable position in the corner as punishment for poor work.`);
} else if (S.Schoolteacher) {
text.push(`${S.Schoolteacher.slaveName} is alone in ${V.schoolroomName}, and has nothing to do but work on $his lesson plans.`);
@@ -87,7 +87,7 @@ App.Facilities.Schoolroom.schoolroom = class Schoolroom extends App.Facilities.F
/** @returns {FC.Facilities.Expand} */
get expand() {
return {
- desc: `${this.facility.nameCaps} has room to house ${numberWithPluralOne(V.schoolroom, "slave")} while they learn. There ${this.facility.hostedSlaves === 1 ? `is ${num(this.facility.hostedSlaves)} slave` : `are ${num(this.facility.hostedSlaves)} slaves`} learning in ${V.schoolroomName}.`,
+ desc: `${this.facility.nameCaps} has room to house ${numberWithPluralOne(V.schoolroom, "slave")} while they learn. There ${this.facility.hostedSlaves() === 1 ? `is ${num(this.facility.hostedSlaves())} slave` : `are ${num(this.facility.hostedSlaves())} slaves`} learning in ${V.schoolroomName}.`,
removeSlave: "take classes",
};
}
@@ -144,7 +144,7 @@ App.Facilities.Schoolroom.schoolroom = class Schoolroom extends App.Facilities.F
App.UI.reload();
},
prereqs: [
- () => V.arcologies[0].FSIntellectualDependency > 80,
+ V.arcologies[0].FSIntellectualDependency > 80,
],
},
{
@@ -172,14 +172,14 @@ App.Facilities.Schoolroom.schoolroom = class Schoolroom extends App.Facilities.F
cost: 5000 * V.upgradeMultiplierArcology * V.HackingSkillMultiplier,
notes: [`increases the effectiveness of ${V.schoolroomName}`],
prereqs: [
- () => V.schoolroomRemodelBimbo > 0,
+ V.schoolroomRemodelBimbo > 0,
],
},
{
value: 1,
text: `${this.facility.nameCaps} has been upgraded with advanced teaching tools to help even the smartest slave learn at an acceptable pace. Dumb slaves won't learn much faster as a result, but smarties will benefit a great deal.`,
prereqs: [
- () => V.schoolroomRemodelBimbo > 0,
+ V.schoolroomRemodelBimbo > 0,
],
},
{
@@ -191,14 +191,14 @@ App.Facilities.Schoolroom.schoolroom = class Schoolroom extends App.Facilities.F
handler: () => V.schoolroomRemodelBimbo = 0,
notes: [`increases the effectiveness of ${V.schoolroomName}`],
prereqs: [
- () => V.schoolroomRemodelBimbo === 0,
+ V.schoolroomRemodelBimbo === 0,
],
},
{
value: 1,
text: `${this.facility.nameCaps} has been upgraded with advanced teaching tools to help even the stupidest slave learn at an acceptable pace. Intelligent slaves won't learn much faster as a result, but idiots will benefit a great deal.`,
prereqs: [
- () => V.schoolroomRemodelBimbo === 0,
+ V.schoolroomRemodelBimbo === 0,
],
},
],
diff --git a/src/facilities/schoolroom/schoolroomFramework.js b/src/facilities/schoolroom/schoolroomFramework.js
index eee251f1307d71a2b5f3941312e86cf3ce33ff1e..e64d48550f69508ddb67289abf26887e280cbc31 100644
--- a/src/facilities/schoolroom/schoolroomFramework.js
+++ b/src/facilities/schoolroom/schoolroomFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.schoolroom = {
baseName: "schoolroom",
genericName: null,
@@ -58,7 +59,7 @@ App.Entity.Facilities.SchoolroomStudentJob = class extends App.Entity.Facilities
r.push(`${slave.slaveName} has nothing left to learn.`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName}'s mind is fundamentally broken and can't learn`);
}
diff --git a/src/facilities/servantsQuarters/servantsQuarters.js b/src/facilities/servantsQuarters/servantsQuarters.js
index 2179d22eb5075ccc85de405d26df16291a12a08b..781446d93855c8758b8ae676b77d80b4fa4e0368 100644
--- a/src/facilities/servantsQuarters/servantsQuarters.js
+++ b/src/facilities/servantsQuarters/servantsQuarters.js
@@ -23,9 +23,9 @@ App.Facilities.ServantsQuarters.servantsQuarters = class ServantsQuarters extend
text.push(this.facility.nameCaps, this.decorations);
- if (this.facility.hostedSlaves > 2) {
+ if (this.facility.hostedSlaves() > 2) {
text.push(`${this.facility.nameCaps} are busy with hurrying slaves. One shift of servants is eating, cleaning the quarters, and bathing. The second is sleeping, and the third is out in the penthouse cleaning and serving.`);
- } else if (this.facility.hostedSlaves > 0) {
+ } else if (this.facility.hostedSlaves() > 0) {
text.push(`A few slaves are working out of the servants' quarters. They must split their scant time between looking after their own needs and the superior needs of everyone else.`);
} else if (S.Stewardess) {
text.push(`${S.Stewardess.slaveName} is alone, and seems rather bereft without anyone to order around.`);
@@ -84,7 +84,7 @@ App.Facilities.ServantsQuarters.servantsQuarters = class ServantsQuarters extend
/** @returns {FC.Facilities.Expand} */
get expand() {
return {
- desc: `${this.facility.nameCaps} has room to keep ${numberWithPluralOne(V.servantsQuarters, "slave")} while they serve. There ${this.facility.hostedSlaves === 1 ? `is currently ${num(this.facility.hostedSlaves)} slave` : `are currently ${num(this.facility.hostedSlaves)} slaves`} serving in ${V.servantsQuartersName}.`,
+ desc: `${this.facility.nameCaps} has room to keep ${numberWithPluralOne(V.servantsQuarters, "slave")} while they serve. There ${this.facility.hostedSlaves() === 1 ? `is currently ${num(this.facility.hostedSlaves())} slave` : `are currently ${num(this.facility.hostedSlaves())} slaves`} serving in ${V.servantsQuartersName}.`,
removeSlave: "be a servant",
};
}
@@ -119,9 +119,9 @@ App.Facilities.ServantsQuarters.servantsQuarters = class ServantsQuarters extend
{
property: "stewardessImpregnates",
prereqs: [
- () => !!S.Stewardess,
- () => !!canAchieveErection(S.Stewardess) && S.Stewardess.pubertyXY === 1,
- () => !!V.seePreg,
+ !!S.Stewardess,
+ !!canAchieveErection(S.Stewardess) && S.Stewardess.pubertyXY === 1,
+ !!V.seePreg,
],
options: [
{
diff --git a/src/facilities/servantsQuarters/servantsQuartersFramework.js b/src/facilities/servantsQuarters/servantsQuartersFramework.js
index 948cfa531c7c424e0d0ef737760e5ceb28e8b969..54a43e534ab9f2154ce25e320dd72c586c9dcc0b 100644
--- a/src/facilities/servantsQuarters/servantsQuartersFramework.js
+++ b/src/facilities/servantsQuarters/servantsQuartersFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.servantsQuarters = {
baseName: "servantsQuarters",
genericName: "Servants' Quarters",
diff --git a/src/facilities/spa/spa.js b/src/facilities/spa/spa.js
index e44076a07eec71cb1edab06d85b18d05edbe5fa8..f96267172171444d1cee72bcc8be3bbf987d0b6c 100644
--- a/src/facilities/spa/spa.js
+++ b/src/facilities/spa/spa.js
@@ -28,9 +28,9 @@ App.Facilities.Spa.spa = class Spa extends App.Facilities.Facility {
if (spaUtilization >= 1) {
text.push(`It's crowded in here. Slaves are relaxing in the warm water, splashing around or just floating. Here and there some of the more sex-starved are in the early stages of intercourse, but most prefer to take time off from it all. Unfortunately there is not enough space for all of your slaves to enjoy the spa.`);
- } else if (spaUtilization >= 0.5 || (this.facility.hostedSlaves / V.spa > 0.5)) {
+ } else if (spaUtilization >= 0.5 || (this.facility.hostedSlaves() / V.spa > 0.5)) {
text.push(`It's busy in here. Slaves are relaxing in the warm water, splashing around or just floating. Here and there some of the more sex-starved are in the early stages of intercourse, but most prefer to take time off from it all.`);
- } else if (spaUtilization > 0 || this.facility.hostedSlaves > 0) {
+ } else if (spaUtilization > 0 || this.facility.hostedSlaves() > 0) {
text.push(`It's sparsely populated; though the few slaves here have little company they like having the water to themselves.`);
} else if (S.Attendant) {
const {his} = getPronouns(S.Attendant);
@@ -90,7 +90,7 @@ App.Facilities.Spa.spa = class Spa extends App.Facilities.Facility {
/** @returns {FC.Facilities.Expand} */
get expand() {
return {
- desc: `${this.facility.nameCaps} can house ${numberWithPluralOne(V.spa, "slave")} while they recuperate here. There ${this.facility.hostedSlaves === 1 ? `is currently ${num(this.facility.hostedSlaves)} slave` : `are currently ${num(this.facility.hostedSlaves)} slaves`} recuperating in ${V.spaName}.`,
+ desc: `${this.facility.nameCaps} can house ${numberWithPluralOne(V.spa, "slave")} while they recuperate here. There ${this.facility.hostedSlaves() === 1 ? `is currently ${num(this.facility.hostedSlaves())} slave` : `are currently ${num(this.facility.hostedSlaves())} slaves`} recuperating in ${V.spaName}.`,
};
}
@@ -123,7 +123,7 @@ App.Facilities.Spa.spa = class Spa extends App.Facilities.Facility {
{
property: "spaFix",
prereqs: [
- () => !!S.Attendant,
+ !!S.Attendant,
],
options: [
{
diff --git a/src/facilities/spa/spaFramework.js b/src/facilities/spa/spaFramework.js
index 95012872750b1a9f1bd59dcdcf13595504f43099..0a1dcbd74378296d1be61a91a85c280debd3a6ec 100644
--- a/src/facilities/spa/spaFramework.js
+++ b/src/facilities/spa/spaFramework.js
@@ -1,3 +1,4 @@
+/** @type {FC.FacilityFramework} */
App.Data.Facilities.spa = {
baseName: "spa",
genericName: null,
@@ -38,7 +39,7 @@ App.Entity.Facilities.SpaAssigneeJob = class extends App.Entity.Facilities.Facil
let r = super.checkRequirements(slave);
if (
- slave.fetish !== "mindbroken" &&
+ slave.fetish !== Fetish.MINDBROKEN &&
(
slave.devotion < -20 ||
(
diff --git a/src/facilities/statistics.js b/src/facilities/statistics.js
index 68bb2ea1b83dbb8c9313a1d2347928d5b6508ca3..ebf343ebe360e2f7b80066a3225cab80cd94f783 100644
--- a/src/facilities/statistics.js
+++ b/src/facilities/statistics.js
@@ -7,11 +7,11 @@ App.Facilities.StatsHelper = class {
const table = document.createElement("table");
table.border = "1";
table.className = "facility-stats";
- const header = App.UI.DOM.appendNewElement("tr", table, "", "header");
+ const header = App.UI.DOM.appendNewElement("tr", table, null, ["header"]);
App.UI.DOM.appendNewElement("th", header, "Items"); // first column, flexible width
- App.UI.DOM.appendNewElement("th", header, columns[0], "wide"); // "revenue" column, wider
- for (let i = 1; i < 4; ++i) {
- App.UI.DOM.appendNewElement("th", header, columns[i], "narrow"); // three additional narrow columns
+ App.UI.DOM.appendNewElement("th", header, columns[0], ["wide"]); // "revenue" column, wider
+ for (let i = 1; i < columns.length; ++i) {
+ App.UI.DOM.appendNewElement("th", header, columns[i], ["narrow"]); // additional narrow columns
}
return table;
}
@@ -51,7 +51,7 @@ App.Facilities.StatsHelper = class {
}
/** Makes a value cell
- * @param {string} type - "reputation" or "cash"
+ * @param {"reputation"|"cash"|"food"} type
* @param {number} value - numeric value
* @param {object} [flags]
* @param {boolean} [flags.forceNeg] - treat nonzero positive values as negative
@@ -79,9 +79,13 @@ App.Facilities.StatsHelper = class {
// set contents
let prefix = '';
+ let suffix = '';
if (type === "cash") {
prefix += '¤';
}
+ if (type === "food") {
+ suffix += 'kg';
+ }
if (flags.showSign) {
if (flags.forceNeg) { // if the real value is negative, - sign will come from value.toFixed
prefix += '-';
@@ -91,10 +95,19 @@ App.Facilities.StatsHelper = class {
prefix += '±';
}
}
- const fixedPrecision = type === "cash" ? 2 : 1;
+ let fixedPrecision = 1;
+ if (type === "cash") {
+ fixedPrecision = 2;
+ } else if (type === "food") {
+ fixedPrecision = 0;
+ }
const parts = value.toFixed(fixedPrecision).split('.');
- cell.appendChild(document.createTextNode(prefix + parts[0]));
- App.UI.DOM.appendNewElement("span", cell, '.' + parts[1], /^0+$/.test(parts[1]) ? "decimalZero" : undefined);
+ cell.appendChild(document.createTextNode(prefix + parts[0] + suffix));
+ if (fixedPrecision > 0) {
+ App.UI.DOM.appendNewElement("span", cell, '.' + parts[1], /^0+$/.test(parts[1]) ? ["decimalZero"] : undefined);
+ } else {
+ App.UI.DOM.appendNewElement("span", cell);
+ }
}
return cell;
@@ -149,7 +162,7 @@ App.Facilities.StatsHelper = class {
makeSlaveStatsTable(statsTable, caption, columns) {
const row = App.UI.DOM.appendNewElement("tr", statsTable);
const bigCell = document.createElement("td");
- bigCell.colSpan = 5;
+ bigCell.colSpan = columns.length;
const label = App.UI.DOM.appendNewElement("span", bigCell, caption);
label.style.fontWeight = "bold";
row.appendChild(bigCell);
@@ -160,8 +173,8 @@ App.Facilities.StatsHelper = class {
App.UI.DOM.appendNewElement("th", header, columns[0]); // first column, flexible width
App.UI.DOM.appendNewElement("th", header, columns[1], "narrow"); // facility-specific output details
App.UI.DOM.appendNewElement("th", header, columns[2], "wide"); // "revenue" column, wider
- for (let i = 3; i < 6; ++i) {
- App.UI.DOM.appendNewElement("th", header, columns[i], "narrow"); // three additional narrow columns
+ for (let i = 3; i < columns.length; ++i) {
+ App.UI.DOM.appendNewElement("th", header, columns[i], "narrow"); // additional narrow columns
}
bigCell.appendChild(table);
statsTable.appendChild(bigCell);
@@ -505,7 +518,7 @@ App.Facilities.Dairy.Stats = (function() {
App.Facilities.Farmyard.Stats = (function() {
const H = new App.Facilities.StatsHelper();
- const assureList = [ "farmhandIncome", "farmhandCosts", "maintenance", "totalIncome", "totalExpenses", "food", "profit" ];
+ const assureList = [ "whoreIncome", "whoreCosts", "maintenance", "totalIncome", "totalExpenses", "food", "profit" ];
/** Generate the Farmyard statistics table
* @param {boolean} showDetails
@@ -523,26 +536,36 @@ App.Facilities.Farmyard.Stats = (function() {
b[prop] = b[prop] || 0;
}
- const stats = H.makeStatsTable(["Revenue", "Expenses", "Net Income", "Rep. Change"]);
+ const stats = H.makeStatsTable(["Revenue", "Expenses", "Food", "Net Income", "Rep. Change"]);
H.addValueRow(stats, "Total farmhand income", [
- H.makeValueCell("cash", b.farmhandIncome),
+ H.makeValueCell("cash", b.whoreIncome),
H.makeEmptyCell(),
- H.makeValueCell("cash", b.farmhandIncome),
+ H.makeEmptyCell(),
+ H.makeValueCell("cash", b.whoreIncome),
H.makeEmptyCell(),
]);
H.addValueRow(stats, "Total farmhand living costs", [
H.makeEmptyCell(),
- H.makeValueCell("cash", b.farmhandCosts, {forceNeg: true}),
- H.makeValueCell("cash", b.farmhandCosts, {forceNeg: true, showSign: true}),
+ H.makeValueCell("cash", b.whoreCosts, {forceNeg: true}),
+ H.makeEmptyCell(),
+ H.makeValueCell("cash", b.whoreCosts, {forceNeg: true, showSign: true}),
+ H.makeEmptyCell()
+ ]);
+ H.addValueRow(stats, "Total food produced", [
+ H.makeEmptyCell(),
+ H.makeEmptyCell(),
+ H.makeValueCell("food", b.food),
+ H.makeValueCell("food", b.food),
H.makeEmptyCell()
]);
if (showDetails) {
- const slaveStats = H.makeSlaveStatsTable(stats, "Farmhand details", ["Farmhand", "Revenue", "Expenses", "Net Income", "Rep. Change"]);
+ const slaveStats = H.makeSlaveStatsTable(stats, "Farmhand details", ["Farmhand", "Revenue", "Expenses", "Food", "Net Income", "Rep. Change"]);
for (const record of b.income.values()) {
const netIncome = record.income - record.cost;
H.addValueRow(slaveStats, H.makeSlaveLabel(record.slaveName, record.customLabel), [
H.makeValueCell("cash", record.income),
H.makeValueCell("cash", record.cost, {forceNeg: true}),
+ H.makeValueCell("food", record.food),
H.makeValueCell("cash", netIncome),
H.makeEmptyCell()
]);
@@ -551,12 +574,14 @@ App.Facilities.Farmyard.Stats = (function() {
H.addValueRow(stats, "Farmyard maintenance", [
H.makeEmptyCell(),
H.makeValueCell("cash", b.maintenance, {forceNeg: true}),
+ H.makeEmptyCell(),
H.makeValueCell("cash", b.maintenance, {forceNeg: true, showSign: true}),
H.makeEmptyCell()
]);
H.addValueRow(stats, "Total", [
H.makeValueCell("cash", b.totalIncome),
H.makeValueCell("cash", b.totalExpenses, {forceNeg: true}),
+ H.makeValueCell("food", b.food),
H.makeValueCell("cash", b.profit, {bold: true}),
H.makeEmptyCell()
], true);
diff --git a/src/facilities/studio/studio.js b/src/facilities/studio/studio.js
new file mode 100644
index 0000000000000000000000000000000000000000..b767057814f8cf5db19fa8ef6f16765de4a2ab4a
--- /dev/null
+++ b/src/facilities/studio/studio.js
@@ -0,0 +1,130 @@
+App.UI.mediaStudio = function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+
+ r.push(`The media hub is a small room wired in to almost every camera in ${V.arcologies[0].name}. From here, you and your personal assistant can edit, produce, and distribute pornography featuring your slaves going about their daily lives.`);
+ r.toNode("p", ["note"]);
+
+ if (V.studioFeed === 0) {
+ r.push(makePurchase("Upgrade the media hub to allow better control of pornographic content", 15000, "capEx", {
+ handler: () => { V.studioFeed = 1; },
+ refresh: () => App.UI.reload()
+ }));
+ } else {
+ r.push(`It has been upgraded to allow superior control of a slave's pornographic content.`);
+ }
+ r.toParagraph();
+
+ if (V.PC.career === "escort" || V.PC.career === "prostitute" || V.PC.career === "child prostitute") {
+ if (V.PC.career === "escort") {
+ r.push(`You retain some contacts from your past life in the industry that may be willing to cut you some discounts on promotion costs, should you return to it.`);
+ } else {
+ r.push(`You were approached in the past to star in some adult films and they may be willing to cut you some discounts on promotion costs, should you accept their offer.`);
+ }
+ if (V.PCSlutContacts !== 2) {
+ r.push(`You are not baring your body for all to see.`);
+ r.push(
+ App.UI.DOM.link(
+ `Star in porn for a discount`,
+ () => {
+ V.PCSlutContacts = 2;
+ App.UI.reload();
+ }
+ )
+ );
+ } else {
+ if (V.PC.career === "escort") {
+ r.push(`You are starring in hardcore porn once more.`);
+ } else if (V.PC.actualAge < V.minimumSlaveAge) {
+ r.push(`You are taking part in porn that may disturb people.`);
+ } else {
+ r.push(`You are starring in some hardcore porn.`);
+ }
+ r.push(
+ App.UI.DOM.link(
+ `Stop doing porn for a discount`,
+ () => {
+ V.PCSlutContacts = 1;
+ App.UI.reload();
+ }
+ )
+ );
+ }
+ r.toParagraph();
+ }
+
+ /** @param {App.Entity.SlaveState} slave */
+ function slavePornSummary(slave) {
+ const res = new DocumentFragment();
+
+ if (V.slavePanelStyle === 0) {
+ res.appendChild(document.createElement("br"));
+ } else if (V.slavePanelStyle === 1) {
+ const hr = document.createElement("hr");
+ hr.style.margin = "0";
+ res.appendChild(hr);
+ }
+
+ if (batchRenderer && (!V.seeCustomImagesOnly || (V.seeCustomImagesOnly && slave.custom.image))) {
+ let imgDiv = document.createElement("div");
+ imgDiv.classList.add("imageRef", "smlImg", "margin-right");
+ imgDiv.appendChild(batchRenderer.render(slave));
+ res.appendChild(imgDiv);
+ }
+
+ const r = new SpacedTextAccumulator(res);
+ r.push(App.UI.DOM.link(SlaveFullName(slave), () => { V.AS = slave.ID; }, [], "Slave Interact"));
+ if (slave.porn.feed) {
+ r.push("is making porn.");
+ } else {
+ r.push("is");
+ r.push(App.UI.DOM.makeElement("span", "not making porn.", ["red"]));
+ }
+ const f2 = new DocumentFragment();
+ App.UI.SlaveSummaryImpl.bits.long.porn_prestige(slave, f2); // why do these bits not just return the element?
+ App.UI.SlaveSummaryImpl.bits.long.face(slave, f2);
+ r.push(f2);
+ if (V.studioFeed && slave.porn.feed) {
+ if (slave.porn.focus === "none") {
+ r.push("Guided by viewers.");
+ } else {
+ const genre = App.Porn.getGenreByFocusName(slave.porn.focus);
+ r.push("Focused on");
+ r.push(App.UI.DOM.makeElement("span", `${genre.focusName}`, ["genre", genre.type.name]));
+ r.push("porn.");
+ }
+ }
+ if (slave.porn.spending > 0) {
+ r.push("Spending", App.UI.DOM.cashFormat(slave.porn.spending), "on promotion.");
+ }
+ r.toNode("div");
+
+ res.append(App.Porn.makeFameProgressChart(slave));
+ res.append(App.Porn.makeViewershipChart(slave));
+
+ return res;
+ }
+
+ // just dump them all into one giant list for now. TODO: sorting and filtering might come later?
+ const slaves = V.slaves;
+ let batchRenderer = null;
+ if ((V.seeImages === 1) && (V.seeSummaryImages === 1)) {
+ batchRenderer = new App.Art.SlaveArtBatch(slaves.map(s => s.ID), 1);
+ t.appendChild(batchRenderer.writePreamble());
+ } else {
+ batchRenderer = null;
+ }
+
+ for (const slave of slaves) {
+ let slaveDiv = document.createElement("div");
+ slaveDiv.id = `slave-${slave.ID}`;
+ slaveDiv.classList.add("slaveSummary");
+ if (V.slavePanelStyle === 2) {
+ slaveDiv.classList.add("card");
+ }
+ slaveDiv.appendChild(slavePornSummary(slave));
+ t.append(slaveDiv);
+ }
+
+ return t;
+};
diff --git a/src/facilities/studio/studioCharts.js b/src/facilities/studio/studioCharts.js
new file mode 100644
index 0000000000000000000000000000000000000000..b6ccf29441f6c0c777c52b2ca1ab634c9ab48a4a
--- /dev/null
+++ b/src/facilities/studio/studioCharts.js
@@ -0,0 +1,158 @@
+/** Make a bar chart showing the slave's progress towards the next/previous level of porn fame in her chosen genre.
+ * @param {App.Entity.SlaveState} slave
+ */
+App.Porn.makeFameProgressChart = function(slave) {
+ const container = document.createElement("div");
+ const genre = App.Porn.getGenreByFameName(slave.porn.fameType);
+ const fameVal = slave.porn.prestige > 0 ? slave.porn.fame[genre.fameVar] : slave.porn.viewerCount;
+
+ if (slave.porn.prestige === 3) {
+ container.append("Worldwide fame reached.");
+ } else {
+ if (slave.porn.prestige === 0) {
+ container.append(App.UI.DOM.makeElement("div", `Fame progress (total viewership):`));
+ } else {
+ container.append(App.UI.DOM.makeElement("div", `Fame progress (in ${genre.fameName} porn): `));
+ }
+ // ranges
+ let bottomThreshold = 0;
+ let nextThreshold = 100000;
+ if (slave.porn.prestige === 2) {
+ bottomThreshold = 40000;
+ nextThreshold = V.pornStars[genre.fameVar].p3ID === 0 ? 150000 : 0;
+ } else if (slave.porn.prestige === 1) {
+ bottomThreshold = 5000;
+ nextThreshold = 50000;
+ }
+ const maxVal = (nextThreshold ? nextThreshold : 150000) * 1.1;
+ const curVal = Math.min(fameVal, nextThreshold * 1.1);
+
+ // container
+ const margin = {top: 10, right: 30, bottom: 30, left: 90};
+ const width = 600 - margin.left - margin.right;
+ const height = 60 - margin.top - margin.bottom;
+ const svg = d3.select(container)
+ .append("svg")
+ .attr("width", width + margin.left + margin.right)
+ .attr("height", height + margin.top + margin.bottom);
+
+ // X axis
+ const x = d3.scaleLinear()
+ .domain([0, maxVal])
+ .range([0, width]);
+ svg.append("g")
+ .attr("transform", `translate(0, ${height})`)
+ .call(d3.axisBottom(x))
+ .selectAll("text")
+ .attr("transform", "translate(-10,0)rotate(-45)")
+ .style("text-anchor", "end");
+
+ // Y axis (invisible)
+ const y = d3.scaleBand()
+ .range([ 0, height ])
+ .domain([""]);
+
+ // Bar
+ svg.selectAll("myRect")
+ .data([curVal])
+ .join("rect")
+ .attr("x", x(0))
+ .attr("y", y(""))
+ .attr("width", d => x(d))
+ .attr("height", y.bandwidth())
+ .attr("fill", "var(--link-color)");
+
+ // downgrade threshold
+ if (bottomThreshold > 0) {
+ svg.append("line")
+ .attr("x1", x(bottomThreshold))
+ .attr("x2", x(bottomThreshold))
+ .attr("y1", 0)
+ .attr("y2", height)
+ .attr("stroke-width", 2)
+ .attr("stroke", "red");
+ }
+
+ // upgrade threshold
+ if (nextThreshold > 0) {
+ svg.append("line")
+ .attr("x1", x(nextThreshold))
+ .attr("x2", x(nextThreshold))
+ .attr("y1", 0)
+ .attr("y2", height)
+ .attr("stroke-width", 2)
+ .attr("stroke", "green");
+ }
+ }
+
+ if (slave.porn.prestige === 2 && V.pornStars[genre.fameVar].p3ID !== 0) {
+ container.append(App.UI.DOM.makeElement("div", "You already have another slave with worldwide fame in this genre.", ["note"]));
+ }
+ return container;
+};
+
+/** Make a treemap chart showing the slave's current viewership distribution among the porn genres.
+ * @param {App.Entity.SlaveState} slave
+ */
+App.Porn.makeViewershipChart = function(slave) {
+ const container = document.createElement("div");
+
+ const data = {name: "Total viewership", children: []};
+ for (const type of Object.values(App.Porn.GenreType)) {
+ const child = {name: type, children: []};
+ for (const genre of App.Porn.getGenresByType(type)) {
+ if (slave.porn.fame[genre.fameVar] > 0) {
+ child.children.push({name: genre.fameName, value: Math.trunc(slave.porn.fame[genre.fameVar]), type: type.name});
+ }
+ }
+ if (child.children.length > 0) {
+ data.children.push(child);
+ }
+ }
+ const root = d3.hierarchy(data)
+ .sum(d => +d.value)
+ .sort((a, b) => d3.descending(a.value, b.value));
+
+ // container size
+ const margin = {top: 10, right: 10, bottom: 10, left: 10};
+ const width = 600 - margin.left - margin.right;
+ const height = 200 - margin.top - margin.bottom;
+
+ // treemap construction
+ const layout = d3.treemap()
+ .size([width - margin.left - margin.right, height - margin.top - margin.bottom])
+ .padding(1)
+ (root);
+
+ const svg = d3.select(container)
+ .append("svg")
+ .attr("width", width + margin.left + margin.right)
+ .attr("height", height + margin.top + margin.bottom)
+ .append("g")
+ .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+
+ // rectangles
+ svg.selectAll("rect")
+ .data(layout.leaves())
+ .join("rect")
+ .attr('x', d => d.x0)
+ .attr('y', d => d.y0)
+ .attr('width', d => d.x1 - d.x0)
+ .attr('height', d => d.y1 - d.y0)
+ .style("fill", d => `var(--genre-color-${d.data.type})`)
+ .attr("data-tippy-content", d => `${d.data.name} (${d.data.value})`)
+ // @ts-ignore - can't specify generic arguments from JS, but the right one will be picked
+ .call(x => tippy(x.nodes()));
+
+ // text labels
+ svg.selectAll("text")
+ .data(layout.leaves())
+ .join("text")
+ .attr("x", d => d.x0 + 5)
+ .attr("y", d => d.y0 + 15)
+ .text(d => d.data.name)
+ .attr("font-size", "15px")
+ .attr("fill", "black");
+
+ return container;
+};
diff --git a/src/facilities/surgery/analyzePlayerPregnancy.js b/src/facilities/surgery/analyzePlayerPregnancy.js
index 4812d2792430edecbf3f2fe186ca9312fd63ff32..e312f923c4dc450f9df9c33a8927deec93746810 100644
--- a/src/facilities/surgery/analyzePlayerPregnancy.js
+++ b/src/facilities/surgery/analyzePlayerPregnancy.js
@@ -73,7 +73,7 @@ App.UI.analyzePCPregnancy = function() {
}
if (nurseryReservations < WL && (reservedChildrenNursery + WL - nurseryReservations <= freeCribs)) {
linkArray.push(App.UI.DOM.link(
- `Keep all of your children in ${V.incubator.name}`,
+ `Keep all of your children in ${V.nurseryName}`,
() => {
WombChangeReserveType(V.PC, "incubator", "nursery");
WombChangeReserveType(V.PC, "", "nursery");
diff --git a/src/facilities/surgery/analyzePregnancy.js b/src/facilities/surgery/analyzePregnancy.js
index 26d217cb4ece8dc01152b916166802db56c90713..2beb1a23541d70a6120c16e879fe2a39fafa827d 100644
--- a/src/facilities/surgery/analyzePregnancy.js
+++ b/src/facilities/surgery/analyzePregnancy.js
@@ -1,5 +1,5 @@
/**
- * @param {App.Entity.SlaveState} mother
+ * @param {FC.HumanState} mother
* @param {boolean} cheat
* @returns {DocumentFragment}
*/
@@ -108,6 +108,13 @@ globalThis.analyzePregnancies = function(mother, cheat) {
} else {
el.append(fetusAbnormalities());
}
+ if(V.inbreeding && genes.inbreedingCoeff!==undefined)
+ {
+ option = options.addOption(`Inbreeding coefficient: ${genes.inbreedingCoeff}`, "inbreedingCoeff", genes);
+ if (cheat) {
+ option.showTextBox();
+ }
+ }
} else {
if (fetus.age > 13) {
App.UI.DOM.appendNewElement("div", el, `Gender: ${genes.gender}`);
@@ -326,7 +333,7 @@ App.UI.analyzePregnancy = function() {
}
if (nurseryReservations < WL && (FetusGlobalReserveCount("nursery") + WL - nurseryReservations <= freeCribs)) {
linkArray.push(App.UI.DOM.link(
- `Keep all of ${his} children in ${V.incubator.name}`,
+ `Keep all of ${his} children in ${V.nurseryName}`,
() => {
WombChangeReserveType(slave, "incubator", "nursery");
WombChangeReserveType(slave, "", "nursery");
diff --git a/src/facilities/surgery/surgeryPassageExotic.js b/src/facilities/surgery/surgeryPassageExotic.js
index a2f853ad513d1ee847d05fc7f5f68477edcc51f7..1019cc5f480cc44e769349a99d4ca533ad877b74 100644
--- a/src/facilities/surgery/surgeryPassageExotic.js
+++ b/src/facilities/surgery/surgeryPassageExotic.js
@@ -189,7 +189,7 @@ App.UI.surgeryPassageExotic = function(slave, refresh, cheat = false) {
if (slave.milkFlavor === "natural") {
title = `${His} milk is natural.`;
} else {
- title = `${His} milk is ${slave.milkFlavor} flavored.`;
+ title = `${His} milk is ${slave.milkFlavor}-flavored.`;
}
App.UI.DOM.appendNewElement("div", el, title);
diff --git a/src/facilities/surgery/surgeryPassageExtreme.js b/src/facilities/surgery/surgeryPassageExtreme.js
index fbee2aeb4083f48b16ebe8a500d5ef91f1d117e9..beddba504298236343a68298b6bef82bcbffb18a 100644
--- a/src/facilities/surgery/surgeryPassageExtreme.js
+++ b/src/facilities/surgery/surgeryPassageExtreme.js
@@ -49,13 +49,13 @@ App.UI.surgeryPassageExtreme = function(slave, refresh, cheat = false) {
const el = new DocumentFragment();
const r = [];
const linkArray = [];
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
r.push(`${He} is mentally competent.`);
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${His} mind is gone; ${he} has either been chemically lobotomized, or has lost ${his} mind due to extreme abuse.`);
}
if (slave.indentureRestrictions < 1 && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset")) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
linkArray.push(App.Medicine.Surgery.makeLink(
new App.Medicine.Surgery.Procedures.Mindbreak(slave),
refresh, cheat));
diff --git a/src/facilities/surgery/surgeryPassageUpper.js b/src/facilities/surgery/surgeryPassageUpper.js
index 811c0249da2e76a40fab53a3ada312314ba23a07..7edd8e9fcace77b4b824638fa8c16d6e894c70cb 100644
--- a/src/facilities/surgery/surgeryPassageUpper.js
+++ b/src/facilities/surgery/surgeryPassageUpper.js
@@ -407,7 +407,7 @@ App.UI.surgeryPassageUpper = function(slave, refresh, cheat = false) {
r.push(`showing unusual discomfort as ${his} stomach is inspected. A quick test reveals that <span class="lime">${he} is pregnant.</span>`);
slave.pregKnown = 1;
} else if (slave.bellyImplant > 0) {
- r.push(`got a ${slave.bellyImplant}cc implant filled implant located in ${his} abdomen.`);
+ r.push(`got a ${slave.bellyImplant}cc fluid-filled implant located in ${his} abdomen.`);
if (slave.cervixImplant === 1) {
r.push(`${He} also has a micropump filter installed in ${his} cervix feeding into the implant.`);
} else if (slave.cervixImplant === 2) {
diff --git a/src/facilities/wardrobe/wardrobeShopping.js b/src/facilities/wardrobe/wardrobeShopping.js
index d6bd9c1caeb1473ba0a37de14341de06a3bd6fec..54bc1a170c8067f0d45588f0174ef9d045c2d373 100644
--- a/src/facilities/wardrobe/wardrobeShopping.js
+++ b/src/facilities/wardrobe/wardrobeShopping.js
@@ -133,7 +133,7 @@ App.UI.WardrobeShopping = function() {
}
)
);
- App.UI.DOM.appendNewElement("div", el, ` Costs ${cashFormat(cost)}`, "detail");
+ App.UI.DOM.appendNewElement("div", el, ` Costs ${cashFormat(cost)}`, ["detail"]);
} else {
div = App.UI.DOM.disabledLink(
`Order ${clothingObj.title}`,
@@ -189,7 +189,7 @@ App.UI.WardrobeShopping = function() {
)
);
if (cost > 0) {
- App.UI.DOM.appendNewElement("span", div, ` Costs ${cashFormat(cost)}`, "detail");
+ App.UI.DOM.appendNewElement("span", div, ` Costs ${cashFormat(cost)}`, ["detail"]);
}
} else {
div.append(
diff --git a/src/futureSocieties/aztec/slaveSacrificeLife.js b/src/futureSocieties/aztec/slaveSacrificeLife.js
index 4419ff4937225790c298d595cdbb106fc0d418cc..4251611b8414da84992541b659fdb348736ead78 100644
--- a/src/futureSocieties/aztec/slaveSacrificeLife.js
+++ b/src/futureSocieties/aztec/slaveSacrificeLife.js
@@ -1,12 +1,10 @@
/** @param {App.Entity.SlaveState} sacrifice */
App.UI.SlaveInteract.aztecSlaveSacrificeLife = function(sacrifice) {
const frag = new DocumentFragment();
- let r = [];
-
const {He, his} = getPronouns(sacrifice);
-
const activeSlaveRepSacrifice = repGainSacrifice(sacrifice, V.arcologies[0]);
- r.push(`${He} dies screaming as ${his} still beating heart is ripped out of ${his} body.`);
+ let r = [];
+ r.push(`${sacrifice.slaveName} dies screaming as ${his} still beating heart is ripped out of ${his} body.`);
if (activeSlaveRepSacrifice <= 0) {
r.push(`Nobody cares.`);
} else if (activeSlaveRepSacrifice < 10) {
@@ -17,20 +15,15 @@ App.UI.SlaveInteract.aztecSlaveSacrificeLife = function(sacrifice) {
r.push(`The crowd cheers to the bloody spectacle.`);
}
if (V.slaves.length > 0) {
- r.push(`On the other hand, your remaining`);
- if (V.slaves.length === 1) {
- r.push(`slave is`);
- } else {
- r.push(`slaves are`);
- }
- r.push(`suitably <span class="trust dec">horrified.</span>`);
+ r.push(`On the other hand, your remaining ${asPlural("slave is", "slaves are")} suitably <span class="trust dec">horrified.</span>`);
for (const slave of V.slaves.filter((s) => !isVegetable(s))) {
slave.trust -= 5 + random(5);
}
}
+
repX(activeSlaveRepSacrifice, "futureSocieties");
if (V.arcologies[0].FSAztecRevivalist !== "unset" && V.arcologies[0].FSAztecRevivalist < 100) {
- V.arcologies[0].FSAztecRevivalist += 1;
+ V.arcologies[0].FSAztecRevivalist++;
}
V.slavesSacrificedThisWeek = (V.slavesSacrificedThisWeek || 0) + 1;
removeSlave(sacrifice);
diff --git a/src/futureSocieties/aztec/slaveSacrificePenance.js b/src/futureSocieties/aztec/slaveSacrificePenance.js
index 260c06e7b841c4c9eb7a89c9716cfd5eb2ad9af6..bcce423d1e077d4fe4c1934ec785b6e204cfdc1e 100644
--- a/src/futureSocieties/aztec/slaveSacrificePenance.js
+++ b/src/futureSocieties/aztec/slaveSacrificePenance.js
@@ -15,7 +15,7 @@ App.UI.SlaveInteract.aztecSlaveSacrificePenance = function(sacrifice) {
if (sacrifice.devotion > 50) {
if (!canTalk(sacrifice)) {
r.push(`${He} looks excited at the prospect of suffering for the goddess.`);
- } else if (sacrifice.fetishKnown === 1 && sacrifice.fetishStrength > 60 && sacrifice.fetish !== "none") {
+ } else if (sacrifice.fetishKnown === 1 && sacrifice.fetishStrength > 60 && sacrifice.fetish !== Fetish.NONE) {
r.push(`${He} looks excited.`);
r.push(Spoken(sacrifice, `"${Master}! I'm honored to be chosen! Thank you so much!"`));
if (sacrifice.fetish === "masochist") {
@@ -43,10 +43,10 @@ App.UI.SlaveInteract.aztecSlaveSacrificePenance = function(sacrifice) {
} else if (sacrifice.devotion > 20 || (sacrifice.devotion >= -20 && sacrifice.trust < -20 && sacrifice.trust >= -50)) {
if (!canTalk(sacrifice)) {
r.push(`${He} looks cautious at the prospect of suffering for the goddess.`);
- } else if (sacrifice.fetishKnown === 1 && sacrifice.fetishStrength > 60 && sacrifice.fetish !== "none") {
+ } else if (sacrifice.fetishKnown === 1 && sacrifice.fetishStrength > 60 && sacrifice.fetish !== Fetish.NONE) {
r.push(`${He} looks cautiously excited.`);
r.push(Spoken(sacrifice, `"${Master},`));
- if (sacrifice.fetish === "submissive") {
+ if (sacrifice.fetish === Fetish.SUBMISSIVE) {
r.push(Spoken(sacrifice, `I'll follow your every word to be a good sacrifice for the goddess. I won't even blink if I'm not instructed to.`));
} else if (sacrifice.fetish === "masochist") {
r.push(
@@ -276,8 +276,8 @@ App.UI.SlaveInteract.aztecSlaveSacrificePenance = function(sacrifice) {
if (sacrifice.devotion > 50) {
r.push(`As the week starts, ${he} is proud to fulfill ${his} duty. ${He} fights the urge to touch ${himself}, drinking only when ${he} needs to, and does ${his} best to keep ${himself} pure for the goddess.`);
- if (sacrifice.fetishKnown === 1 && sacrifice.fetishStrength > 60 && sacrifice.fetish !== "none") {
- if (sacrifice.fetish === "submissive") {
+ if (sacrifice.fetishKnown === 1 && sacrifice.fetishStrength > 60 && sacrifice.fetish !== Fetish.NONE) {
+ if (sacrifice.fetish === Fetish.SUBMISSIVE) {
r.push(`${He} makes sure to be ready to take any instruction, and it's clear that ${he} enjoys it. As the week progresses, the signs of ${his} sexual frustration become more evident. However, ${he} seems to enjoy the struggle of resisting the urges, since ${he} is under strict orders not to touch ${himself}. Every time the slave in charge of feeding ${him} or renewing ${his} aphrodisiacs orders ${him} to come closer, ${his} body shudders with lust-fueled pleasure. ${He} moans lewdly whenever ${he}'s ordered to wake up or to sleep. By the end of the week, ${he} fights to remain standing, almost delusional from lust and starvation. ${He} was told to remain`);
if (hasBothLegs(sacrifice)) {
r.push(`on ${his} feet,`);
@@ -345,8 +345,8 @@ App.UI.SlaveInteract.aztecSlaveSacrificePenance = function(sacrifice) {
} else if (sacrifice.devotion > 20 || (sacrifice.devotion >= -20 && sacrifice.trust < -20 && sacrifice.trust >= -50)) {
r.push(`As week starts, ${he} tries to fulfill ${his} duty. ${He} fights the urge to touch ${himself}, drinks only when ${he} needs to, and tries to keep ${himself} pure for the goddess.`);
- if (sacrifice.fetishKnown === 1 && sacrifice.fetishStrength > 60 && sacrifice.fetish !== "none") {
- if (sacrifice.fetish === "submissive") {
+ if (sacrifice.fetishKnown === 1 && sacrifice.fetishStrength > 60 && sacrifice.fetish !== Fetish.NONE) {
+ if (sacrifice.fetish === Fetish.SUBMISSIVE) {
r.push(`${He} makes sure is ready to take any order ${he} might be given, and it's evident that ${he} enjoys it every time ${he} is ordered to do something. As the week progresses ${he} finds ${himself} close to the limits of ${his} submission. As much as ${he} tries to`);
if (hasAnyArms(sacrifice)) {
r.push(`keep ${his} ${hasBothArms(sacrifice) ? "hands" : "hand"} to ${himself},`);
@@ -406,7 +406,7 @@ App.UI.SlaveInteract.aztecSlaveSacrificePenance = function(sacrifice) {
} else {
r.push(`lower body`);
}
- r.push(`constantly cleaned when it becomes apparent they are wet to avoid any evidence of pleasure. ${He} tries to make it more difficult as now it is the only thing ${he} has to fantasize on cumming. At the end of the week is often common to see ${him} beg to be touched by anyone who is close enough to hear ${him} and bursts into tears when ${he} is blatantly ignored. As a result of all this crying, the lack of food and sleep ${he} needs to be hydrated more often also the dose of aphrodisiacs is changed to be less potent but be injected more often to avoid the danger that ${he} might cum from it. ${His} body refuses to lose anymore more liquids, a fact that doesn't stop ${him} from sobbing and begging to be touched as soon as ${he} finds the strength to it while ${he} remains almost immobile on the bottom of the cage, interrupted by the spasms of ${his} body as a result of being constantly aroused for a week.`);
+ r.push(`constantly cleaned when it becomes apparent they are wet to avoid any evidence of pleasure. ${He} tries to make it more difficult as now it is the only thing ${he} has to fantasize on cumming. At the end of the week is often common to see ${him} beg to be touched by anyone who is close enough to hear ${him} and bursts into tears when ${he} is blatantly ignored. As a result of all this crying, the lack of food and sleep ${he} needs to be hydrated more often also the dose of aphrodisiacs is changed to be less potent but be injected more often to avoid the danger that ${he} might cum from it. ${His} body refuses to lose any more liquids, a fact that doesn't stop ${him} from sobbing and begging to be touched as soon as ${he} finds the strength to it while ${he} remains almost immobile on the bottom of the cage, interrupted by the spasms of ${his} body as a result of being constantly aroused for a week.`);
} else if (sacrifice.fetish === "humiliation") {
r.push(`${He} seems to enjoy all the attention ${he} receives every time ${he} tries to fight the impulse to touch ${himself} as ${his} body shows clear signs of arousal and takes special care in showing just how degrading the whole process can be. It's common to see ${him} enjoying every time the dose of aphrodisiacs needs to be injected again or when ${he} needs to be awaken. Often, ${he} refuses to drink the tea provided, hoping that when the moment comes ${he} will be forced to drink it — preferably in a very humiliating way. As the week progresses and ${his} need to cum increases ${he} focuses on the humiliation ${he} gets every time the aphrodisiacs get the best of ${him} and tries to find release and fails as the citizens passing by throw insults and disgusted looks on ${his} direction for failing in trying to please the goddess. As a result, ${he} is immobilized and blindfolded in an attempt to reduce external stimulation. By the end of the week ${he} cannot stand up and remains on the bottom of the cage, saving ${his} strength to procure making the procedures as humiliating as possible with the little strength ${he} has saved.`);
} else if (sacrifice.fetish === "buttslut") {
@@ -479,7 +479,7 @@ App.UI.SlaveInteract.aztecSlaveSacrificePenance = function(sacrifice) {
sacrifice.clothes = "no clothing";
if (sacrifice.devotion > 50) {
- if (sacrifice.fetishKnown === 1 && sacrifice.fetishStrength > 60 && sacrifice.fetish !== "none") {
+ if (sacrifice.fetishKnown === 1 && sacrifice.fetishStrength > 60 && sacrifice.fetish !== Fetish.NONE) {
if (fetishChangeChance(sacrifice) > random(0, 100)) {
sacrifice.fetishStrength = 10;
sacrifice.fetishKnown = 1;
@@ -510,12 +510,12 @@ App.UI.SlaveInteract.aztecSlaveSacrificePenance = function(sacrifice) {
r.push(`${He} now understands the importance of ${his} role as a pennant slave, ${his} commitment to you and the goddess makes ${him} <span class="trust inc">trust</span> and <span class="devotion inc">love</span> you more.`);
}
} else if (sacrifice.devotion > 20 || (sacrifice.devotion >= -20 && sacrifice.trust < -20 && sacrifice.trust >= -50)) {
- if (sacrifice.fetishKnown === 1 && sacrifice.fetishStrength > 60 && sacrifice.fetishStrength > 60 && sacrifice.fetish !== "none") {
+ if (sacrifice.fetishKnown === 1 && sacrifice.fetishStrength > 60 && sacrifice.fetishStrength > 60 && sacrifice.fetish !== Fetish.NONE) {
if (fetishChangeChance(sacrifice) > random(0, 100)) {
sacrifice.fetishKnown = 1;
sacrifice.fetish = "masochist";
}
- if (sacrifice.fetish === "submissive") {
+ if (sacrifice.fetish === Fetish.SUBMISSIVE) {
sacrifice.devotion += 3;
sacrifice.trust += 3;
r.push(`The constant submission ${he} was subjected under your orders made ${him} <span class="trust inc">trust</span> and <span class="devotion inc">love you more.</span>`);
@@ -568,7 +568,7 @@ App.UI.SlaveInteract.aztecSlaveSacrificePenance = function(sacrifice) {
r.push(`The lack of food, sleep and the constant arousal with the chastity belt made ${him} <span class="trust dec">trust you less</span> and <span class="devotion inc">hate you more.</span>`);
}
} else if (sacrifice.trust < -20) {
- if (sacrifice.fetish !== "none") {
+ if (sacrifice.fetish !== Fetish.NONE) {
if (fetishChangeChance(sacrifice) > random(0, 100)) {
sacrifice.fetishStrength = 10;
sacrifice.fetishKnown = 1;
diff --git a/src/futureSocieties/fsDecoration.js b/src/futureSocieties/fsDecoration.js
index 88681cef66b82e451ad85acf79c59b1ab410c810..323cb9744ebbb137af4ccefb6b911a211c5eeb68 100644
--- a/src/futureSocieties/fsDecoration.js
+++ b/src/futureSocieties/fsDecoration.js
@@ -148,7 +148,6 @@ App.UI.FSChangeDecoration = function(FS, items = []) {
makePurchase(`Customize the exterior of the arcology to support this goal`, costs, "capEx", {
handler: () => {
V.arcologies[0][FSDecoration] = 100;
- cashX(forceNeg(costs), "capEx");
for (const item of items) {
_.set(V, item, 1);
}
diff --git a/src/futureSocieties/fsPassage.js b/src/futureSocieties/fsPassage.js
index a9c23ed21eb8fb66c293ea386883dfdb6f9d3070..a80ecb9a5ce46be04ba04cc1bdb042aa230a7ae6 100644
--- a/src/futureSocieties/fsPassage.js
+++ b/src/futureSocieties/fsPassage.js
@@ -342,6 +342,72 @@ App.UI.fsPassage = function() {
}
}
+ /** Test what new social effects you'd get if a new FS were added
+ * This is a good proxy for evaluating whether you'll be able to make it stick or not
+ * @param {FC.FutureSociety} proposedFS
+ */
+ function evaluation(proposedFS) {
+ const effectCounts = new Map();
+ for (const slave of App.SlaveAssignment.reportSlaves(V.slaves)) {
+ const slaveEffects = App.SlaveAssignment.saSocialEffects(slave).newForFS(proposedFS);
+ for (const effect of slaveEffects) {
+ const curVal = effectCounts.get(effect.shortDesc);
+ if (curVal) {
+ effectCounts.set(effect.shortDesc, curVal + effect.magnitude);
+ } else {
+ effectCounts.set(effect.shortDesc, effect.magnitude);
+ }
+ }
+ }
+
+ const grid = document.createElement("div");
+ grid.classList.add("grid-2columns-auto");
+ let avg = 0;
+ for (const [key, count] of effectCounts) {
+ const className = count < 0 ? "red" : "green";
+ App.UI.DOM.appendNewElement("div", grid, count.toString(), [className]);
+ App.UI.DOM.appendNewElement("div", grid, key);
+ avg += count;
+ }
+ avg /= V.slaves.length;
+
+ const tip = document.createElement('div');
+ tip.classList.add("tip-details");
+ if (avg > 1.5) {
+ tip.appendChild(document.createTextNode(`Adopting ${FutureSocieties.displayName(proposedFS)} is likely to be straightforward, even against social pressure from your neighbors. Your arcology is already primed to move this direction thanks to your actions, and your slaves are well-aligned with it.`));
+ } else if (avg > 0.5) {
+ tip.appendChild(document.createTextNode(`Adopting ${FutureSocieties.displayName(proposedFS)} should be relatively painless. Your arcology is already receptive to moving this direction thanks to your actions, and your slaves are aligned with it.`));
+ } else if (avg > -0.1) {
+ tip.appendChild(document.createTextNode(`Adopting ${FutureSocieties.displayName(proposedFS)} will require investment and effort. Your arcology is not opposed to moving this direction, but it's also not expecting it based on your past actions. To improve your chances, consider first aligning your slaves with ${FutureSocieties.displayAdj(proposedFS)} goals.`));
+ } else {
+ tip.appendChild(document.createTextNode(`Attempting to adopt ${FutureSocieties.displayName(proposedFS)} with your arcology in its current state will likely result in failure. You should strongly consider aligning your slaves with ${FutureSocieties.displayAdj(proposedFS)} goals before endorsing it.`));
+ }
+ tip.append(grid);
+
+ const span = document.createElement("span");
+ span.classList.add("fs-recommend");
+ if (avg > 1.5) {
+ span.textContent = "Primed";
+ span.classList.add("fs-recommend-great");
+ } else if (avg > 0.5) {
+ span.textContent = "Receptive";
+ span.classList.add("fs-recommend-good");
+ } else if (avg > -0.1) {
+ span.textContent = "Neutral";
+ span.classList.add("fs-recommend-neutral");
+ } else {
+ span.textContent = "Resistant";
+ span.classList.add("fs-recommend-bad");
+ }
+ span.tabIndex = 0;
+ span.classList.add("has-tooltip");
+ tippy(span, {
+ content: tip,
+ placement: "right",
+ });
+ return span;
+ }
+
function selectFS() {
const el = new DocumentFragment();
let r;
@@ -380,6 +446,7 @@ App.UI.fsPassage = function() {
arc.FSSupremacistRace = /** @type {FC.Race} */ (race);
App.UI.reload();
}));
+ r.push(evaluation("FSSupremacist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Racial Supremacism:</span> a belief in the superiority of a chosen race.</span>*/
}
@@ -408,15 +475,15 @@ App.UI.fsPassage = function() {
r.push(`${arc.FSSubjugationistRace} inferiority.`);
}
r.push(`Select race:`);
-
const options = [];
for (const race of App.Utils.getRaceArrayWithoutParamRace(arc.FSSupremacistRace)) { // Superior race cannot be subj, so remove
options.push({key: race, name: capFirstChar(race)});
}
r.push(App.UI.DOM.makeSelect(options, arc.FSSubjugationistRace, race => {
- arc.FSSubjugationistRace = race;
+ arc.FSSubjugationistRace = /** @type {FC.Race} */ (race);
App.UI.reload();
}));
+ r.push(evaluation("FSSubjugationist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Racial Subjugationism:</span> a belief in the inferiority of a subject race.</span>*/
}
@@ -447,6 +514,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is a focus on mass breeding in order to repopulate the future world.`);
+ r.push(evaluation("FSRepopulationFocus"));
} else {
/* <span class="note"><span style="font-weight:Bold">Repopulation Efforts:</span> societal fetishization of pregnancy.</span>*/
}
@@ -480,6 +548,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is rebuilding society using restrictive breeding programs reserved solely for society's finest.`);
+ r.push(evaluation("FSRestart"));
} else {
/* <span class="note"><span style="font-weight:Bold">Complete Societal Reconstruction:</span> rebuilding society based off the elite.</span>*/
}
@@ -509,6 +578,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is a belief that slaves should be airheaded, horny and fully dependent on their owners.`);
+ r.push(evaluation("FSIntellectualDependency"));
} else {
/* <span class="note"><span style="font-weight:Bold">Intellectual Dependency:</span> a belief that slaves should be airheaded, horny and fully dependent on their owners.</span>*/
}
@@ -533,6 +603,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is increased interest in smart, refined, altogether perfect slaves.`);
+ r.push(evaluation("FSSlaveProfessionalism"));
} else {
/* <span class="note"><span style="font-weight:Bold">Slave Professionalism:</span> increased interest in smart, refined, altogether perfect slaves.</span>*/
}
@@ -562,6 +633,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is a radical redefinition of gender that identifies powerful people as male, and everyone else as female.`);
+ r.push(evaluation("FSGenderRadicalist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Gender radicalism:</span> a radical redefinition of gender that identifies powerful people as male, and everyone else as female.</span>*/
}
@@ -587,6 +659,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`gender traditionalism, including a societal preference for feminine slaves ${(V.seePreg !== 0) ? ` and support for slave pregnancy` : ``}.`);
+ r.push(evaluation("FSGenderFundamentalist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Gender traditionalism:</span> a societal preference for feminine slaves
if (V.seePreg !== 0) {
@@ -619,6 +692,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is a vision of slave improvement, including slaves' health, mental well-being, and education.`);
+ r.push(evaluation("FSPaternalist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Paternalism:</span> a vision of slave improvement, including slaves' health, mental well-being, and education.</span>*/
}
@@ -643,6 +717,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is a belief that slaves are not human and should not be treated decently.`);
+ r.push(evaluation("FSDegradationist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Degradation:</span> a belief that slaves are not human and should not be treated decently.</span>*/
}
@@ -671,6 +746,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is societal disapproval of implant surgery.`);
+ r.push(evaluation("FSBodyPurist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Body Purism:</span> societal disapproval of implant surgery.</span>*/
}
@@ -695,6 +771,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is societal fetishization of implant surgery.`);
+ r.push(evaluation("FSTransformationFetishist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Transformation Fetishism:</span> societal fetishization of implant surgery.</span>*/
}
@@ -732,6 +809,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is increased interest in girls just past their majority.`);
+ r.push(evaluation("FSYouthPreferentialist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Youth Preferentialism:</span> increased interest in girls just past their majority.</span>*/
}
@@ -763,6 +841,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is increased interest in mature slaves.`);
+ r.push(evaluation("FSMaturityPreferentialist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Maturity Preferentialism:</span> increased interest in mature slaves.</span>*/
}
@@ -791,6 +870,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is increased interest in short slaves.`);
+ r.push(evaluation("FSPetiteAdmiration"));
} else {
/* <span class="note"><span style="font-weight:Bold">Petite Admiration:</span> increased interest in short slaves.</span>*/
}
@@ -815,6 +895,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is societal fixation on tallness.`);
+ r.push(evaluation("FSStatuesqueGlorification"));
} else {
/* <span class="note"><span style="font-weight:Bold">Statuesque Glorification:</span> societal fixation on tallness.</span>*/
}
@@ -843,6 +924,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is a fashion for slaves with girlish figures.`);
+ r.push(evaluation("FSSlimnessEnthusiast"));
} else {
/* <span class="note"><span style="font-weight:Bold">Slimness Enthusiasm:</span> a fashion for slaves with girlish figures.</span>*/
}
@@ -867,6 +949,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is societal hunger for huge assets of whatever origin.`);
+ r.push(evaluation("FSAssetExpansionist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Asset Expansionism:</span> societal hunger for huge assets of whatever origin.</span>*/
}
@@ -893,6 +976,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is societal acceptance of slave products like milk.`);
+ r.push(evaluation("FSPastoralist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Slave Pastoralism:</span> societal acceptance of slave products like milk.</span>*/
}
@@ -919,6 +1003,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is societal reverence for the idealized human form, including height, health and muscle.`);
+ r.push(evaluation("FSPhysicalIdealist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Physical Idealism:</span> societal reverence for the idealized human form, including height, health and muscle.</span>*/
}
@@ -943,6 +1028,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is societal acceptance of overindulgence and immediate gratification. Be it food, drink, sex, drugs or whatever one's desire may be.`);
+ r.push(evaluation("FSHedonisticDecadence"));
} else {
/* <span class="note"><span style="font-weight:Bold">HedonisticDecadence:</span> societal acceptance of over indulgence, particularly of food, drink, sex and drugs.</span>*/
}
@@ -971,6 +1057,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is a new strain of religion that emphasizes the slaveholding portions of religious history.`);
+ r.push(evaluation("FSChattelReligionist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Chattel Religionism:</span> a new strain of religion that emphasizes the slaveholding portions of religious history.</span>*/
}
@@ -1142,6 +1229,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is a vision of a new Rome.`);
+ r.push(evaluation("FSRomanRevivalist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Roman Revivalism:</span> a vision of a new Rome.</span>*/
}
@@ -1166,6 +1254,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is a vision of a new Imperial society, integrating high technology and old-world culture under the iron fist of your absolute rule.`);
+ r.push(evaluation("FSNeoImperialist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Neo-Imperialism:</span> a vision of a new Imperial Society, integrating high technology and old-world culture under the iron fist of your absolute rule.</span>*/
}
@@ -1190,6 +1279,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is a vision of a new Aztec Empire.`);
+ r.push(evaluation("FSAztecRevivalist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Aztec Revivalism:</span> a vision of a new Aztec Empire.</span>*/
}
@@ -1215,6 +1305,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is a vision of a Pharaoh's Egypt.`);
+ r.push(evaluation("FSEgyptianRevivalist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Egyptian Revivalism:</span> a vision of Pharaoh's Egypt.</span>*/
}
@@ -1239,6 +1330,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is a vision of Edo Japan.`);
+ r.push(evaluation("FSEdoRevivalist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Edo Revivalism:</span> a vision of Edo Japan.</span>*/
}
@@ -1263,6 +1355,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is a vision of the Sultanate of old.`);
+ r.push(evaluation("FSArabianRevivalist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Arabian Revivalism:</span> a vision of the Sultanate of old.</span>*/
}
@@ -1287,6 +1380,7 @@ App.UI.fsPassage = function() {
)
);
r.push(`is a vision of ancient China.`);
+ r.push(evaluation("FSChineseRevivalist"));
} else {
/* <span class="note"><span style="font-weight:Bold">Chinese Revivalism:</span> a vision of ancient China.</span>*/
}
diff --git a/src/futureSocieties/futureSociety.js b/src/futureSocieties/futureSociety.js
index a6245aa4d737ae9bc05f36cefe8b1f83065ea8fa..e9f299f9ac5afcda44ba2e1fb856cdcc1b2e7132 100644
--- a/src/futureSocieties/futureSociety.js
+++ b/src/futureSocieties/futureSociety.js
@@ -297,6 +297,11 @@ globalThis.FutureSocieties = (function() {
case "FSAssetExpansionist":
arcology[FSSMR] = 0;
break;
+ case "FSSlimnessEnthusiast":
+ arcology.FSSlimnessEnthusiastLaw = 0;
+ arcology.FSSlimnessEnthusiastFoodLaw = 0;
+ arcology.FSSlimnessEnthusiastSMR = 0;
+ break;
case "FSPhysicalIdealist":
arcology.FSPhysicalIdealistLaw = 0;
arcology.FSPhysicalIdealistSMR = 0;
@@ -313,6 +318,7 @@ globalThis.FutureSocieties = (function() {
break;
case "FSChattelReligionist":
arcology.FSChattelReligionistLaw = 0;
+ arcology.FSChattelReligionistLaw2 = 0;
arcology.FSChattelReligionistSMR = 0;
arcology.FSChattelReligionistCreed = 0;
if (_.get(V, "SecExp.edicts")) {
diff --git a/src/gui/Encyclopedia/encyclopedia.js b/src/gui/Encyclopedia/encyclopedia.js
new file mode 100644
index 0000000000000000000000000000000000000000..9f8ff835e0d6d7f71cb4d2e5ed98be8b9106e7c4
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopedia.js
@@ -0,0 +1,63 @@
+App.Encyclopedia.ui = function() {
+ const f = document.createElement("div");
+ const topLinks = [];
+ if (V.encyclopedia !== "Table of Contents") {
+ App.UI.DOM.appendNewElement("div", f, App.Encyclopedia.link("Table of Contents"), ["center"]);
+ }
+ App.UI.DOM.appendNewElement("h2", f, V.encyclopedia, ["center"]);
+ f.append(App.Encyclopedia.renderArticle(V.encyclopedia));
+
+ if (!["How to Play", "Table of Contents", "Credits"].includes(V.encyclopedia)) { // special pages where we don't show related links
+ if (![
+ "Being in Charge", "Body", "Fetishes", "Mods/Pregmod", "Inflation",
+ "Leadership Positions", "Loli Mode", "Lore", "Obtaining Slaves", "Paraphilias",
+ "Playing Free Cities", "Skills", "Slave Assignments", "Slave Modification", "Slaves",
+ "Terrain Types", "The X-Series Arcology"
+ ].includes(V.encyclopedia)) { // pages asking the player to click a link for more information have no section heading
+ App.UI.DOM.appendNewElement("h3", f, "Related Links", ["center"]);
+ }
+ f.append(App.Encyclopedia.renderCategory(V.encyclopedia));
+ }
+ const bottomLinks = [];
+ if (V.encyclopedia !== "Table of Contents") {
+ bottomLinks.push(App.Encyclopedia.link("Table of Contents"));
+ if (V.encyclopedia !== "Credits") {
+ bottomLinks.push(App.Encyclopedia.link("Credits"));
+ }
+ }
+ App.UI.DOM.appendNewElement("div", f, App.UI.DOM.generateLinksStrip(bottomLinks), ["center"]);
+ return f;
+};
+
+ /** Create a link to an encyclopedia dialog for a given article with the given text
+ * @param {string} text Text for link
+ * @param {string} [article] Encyclopedia article to link to (if not supplied than text is capitalized.)
+ * @param {string} [classNames] CSS Class to add to the link
+ * @returns {HTMLElement} DOM link element
+ */
+ App.Encyclopedia.link = function(text, article = capFirstChar(text), classNames) {
+ const link = App.UI.DOM.link(text, () => showArticleInDialog(article));
+ if (!classNames) {
+ return link;
+ }
+ // Wrap in a span for coloring, more reliable when hovering over the link
+ const span = document.createElement("span");
+ span.className += classNames;
+ span.append(link);
+ return span;
+
+ /** Show a given encyclopedia article in the encyclopedia dialog
+ * @param {string} article
+ */
+ function showArticleInDialog(article) {
+ const origEncyclopedia = V.encyclopedia;
+ if (Dialog.isOpen()) {
+ Dialog.close();
+ }
+ Dialog.setup("Encyclopedia", "encyclopedia");
+ V.encyclopedia = article;
+ Dialog.append(App.Encyclopedia.ui());
+ Dialog.open();
+ V.encyclopedia = origEncyclopedia;
+ }
+ };
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
deleted file mode 100644
index 56a5fa9531e460df47242071651f98e2415db5e7..0000000000000000000000000000000000000000
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ /dev/null
@@ -1,2359 +0,0 @@
-:: Encyclopedia [nobr]
-
-<div class="center">
-
-<<if $encyclopedia !== "Table of Contents">>
- <<= App.Encyclopedia.Dialog.linkSC("Table of Contents", "Table of Contents")>>
-<</if>>
-
-<h2>
-$encyclopedia
-</h2>
-</div>
-<<set _pass = App.Encyclopedia.renderArticle($encyclopedia)>>
-<<if _pass>>
- <<includeDOM _pass>>
-<<else>>
-<<switch $encyclopedia>>
-
-<<case "Table of Contents">>
- <div class="center">
- <h3>Introduction</h3>
- <<= App.Encyclopedia.Dialog.linkSC("Playing Free Cities", "Playing Free Cities")>>
- <br><br>
- <h3>The Player Character</h3>
- <<= App.Encyclopedia.Dialog.linkSC("Design your master", "Design Your Master")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Being in Charge", "Being in Charge")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("PC Skills", "PC Skills")>>
- <br><br>
- <h3>Your Slaves</h3>
- <<= App.Encyclopedia.Dialog.linkSC("Slaves", "Slaves")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Obtaining Slaves", "Obtaining Slaves")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Slave Leaders", "Leadership Positions")>> / <<= App.Encyclopedia.Dialog.linkSC("Assignments", "Slave Assignments")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Slave Body", "Body")>> / <<= App.Encyclopedia.Dialog.linkSC("Skills", "Skills")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Slave Fetishes", "Fetishes")>> / <<= App.Encyclopedia.Dialog.linkSC("Paraphilias", "Paraphilias")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Quirks", "Quirks")>> / <<= App.Encyclopedia.Dialog.linkSC("Flaws", "Flaws")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Slave Relationships", "Relationships")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Slave Health", "Health")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Slave Pregnancy", "Pregnancy")>> / <<= App.Encyclopedia.Dialog.linkSC("Inflation", "Inflation")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Slave Modification", "Slave Modification")>>
- <br><br>
- <h3>Your Arcology</h3>
- <<= App.Encyclopedia.Dialog.linkSC("The X-Series Arcology", "The X-Series Arcology")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Arcology Facilities", "Facilities")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Terrain Types", "Terrain Types")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Future Societies", "Future Societies")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("The Black Market", "The Black Market")>>
- <br><br>
- <h3>Extras</h3>
- <<= App.Encyclopedia.Dialog.linkSC("Game Mods", "Game Mods")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Lore", "Lore")>>
- <br><<= App.Encyclopedia.Dialog.linkSC("Credits", "Credits")>>
- </div>
-
-/**********
-OBTAINING SLAVES
-**********/
-
-/**********
-SLAVE ASSIGNMENTS:
-**********/
-<<case "Leadership Positions">>
- Slave assignments are stratified into ordinary <<= App.Encyclopedia.Dialog.linkSC("assignments", "Slave Assignments")>> and leadership positions.
-
- <br><br>
- Choose a more particular entry below:
- <br>
-
-<<case "Career Experience">>
- Slaves may retain useful experience from their lives before enslavement. Freedom and slavery are so different that the bonuses slaves get are minor. Careers fall into categories, each with its own bonus; these are:
-
- <br><br><br>__Grateful__ (offering a potential bonus to @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>@@), including slaves who were <<print toSentence(App.Data.Careers.General.grateful)>>.
-
- <br><br><br>__Menial__ (offering a potential bonus to @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@), including slaves who were <<print toSentence(App.Data.Careers.General.menial)>>.
-
- <br><br><br>__Servant__ (offering a bonus to <<= App.Encyclopedia.Dialog.linkSC("keeping your estate", "Servitude")>>), including slaves who were <<print toSentence(App.Data.Careers.General.servant)>>.
-
- <br><br><br>__Entertainment__ (offering a bonus to <<= App.Encyclopedia.Dialog.linkSC("public service", "Public Service")>>), including slaves who were <<print toSentence(App.Data.Careers.General.entertainment)>>.
- If a slave has a lot of entertainment experience, she can qualify for this bonus without career experience.
-
- <br><br><br>__Sex work__ (offering a bonus to <<= App.Encyclopedia.Dialog.linkSC("whoring", "Whoring")>>), including slaves who were <<print toSentence(App.Data.Careers.General.whore)>>.
- If a slave is very sexually experienced, she can qualify for this bonus without career experience.
-
- <br><br><br>__Leadership__ (offering a bonus as <<= App.Encyclopedia.Dialog.linkSC("Head Girl", "Head Girl")>>), including slaves who were <<print toSentence(App.Data.Careers.Leader.HG)>>.
-
- <br><br><br>__Procuring__ (offering a bonus as <<= App.Encyclopedia.Dialog.linkSC("Madam", "Madam")>>), including slaves who were <<print toSentence(App.Data.Careers.Leader.madam)>>.
-
- <br><br><br>__Musical__ (offering a bonus as <<= App.Encyclopedia.Dialog.linkSC("DJ", "DJ")>>), including slaves who were <<print toSentence(App.Data.Careers.Leader.DJ)>>.
-
- <br><br><br>__Defensive__ (offering a bonus as <<= App.Encyclopedia.Dialog.linkSC("Bodyguard", "Bodyguard")>>), including slaves who were <<print toSentence(App.Data.Careers.Leader.bodyguard)>>.
-
- <br><br><br>__Convincing__ (offering a bonus as <<= App.Encyclopedia.Dialog.linkSC("Recruiter", "Recruiter")>>), including slaves who were <<print toSentence(App.Data.Careers.Leader.recruiter)>>.
-
- <br><br><br>__Security__ (offering a bonus as <<= App.Encyclopedia.Dialog.linkSC("Wardeness", "Wardeness")>>), including slaves who were <<print toSentence(App.Data.Careers.Leader.wardeness)>>.
-
- <br><br><br>__Medical__ (offering a bonus as <<= App.Encyclopedia.Dialog.linkSC("Nurse", "Nurse")>>), including slaves who were <<print toSentence(App.Data.Careers.Leader.nurse)>>.
-
- <br><br><br>__Counseling__ (offering a bonus as <<= App.Encyclopedia.Dialog.linkSC("Attendant", "Attendant")>>), including slaves who were <<print toSentence(App.Data.Careers.Leader.attendant)>>.
-
- <br><br><br>__Nannying__ (offering a bonus as <<= App.Encyclopedia.Dialog.linkSC("Matron", "Matron")>>), including slaves who were <<print toSentence(App.Data.Careers.Leader.matron)>>.
-
- <br><br><br>__Accounting__ (offering a bonus as <<= App.Encyclopedia.Dialog.linkSC("Stewardess", "Stewardess")>>), including slaves who were <<print toSentence(App.Data.Careers.Leader.stewardess)>>.
-
- <br><br><br>__Husbandry__ (offering a bonus as <<= App.Encyclopedia.Dialog.linkSC("Milkmaid", "Milkmaid")>>), including slaves who were <<print toSentence(App.Data.Careers.Leader.milkmaid)>>.
-
- <br><br><br>__Farming__ (offering a bonus as <<= App.Encyclopedia.Dialog.linkSC("Farmer", "Farmer")>>), including slaves who were <<print toSentence(App.Data.Careers.Leader.farmer)>>.
-
- <br><br><br>__Teaching__ (offering a bonus as <<= App.Encyclopedia.Dialog.linkSC("Schoolteacher", "Schoolteacher")>>), including slaves who were <<print toSentence(App.Data.Careers.Leader.schoolteacher)>>.
-
- <br><br>Slaves who have been in slavery long enough that it is effectively their career get a bonus to @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "Devotion")>>.@@ Slaves can forget their career experience in an industrialized Dairy, but if they do so and remain sane, they will get a special bonus to both @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "Devotion")>>@@ and @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>.@@
-
- <br><br>Facility heads and working slaves can gain work experience to provide the same benefit as having a relevant career. Intelligence is the deciding factor in how long this will take, brilliant slaves can achieve this ideally in about fourteen weeks, while borderline retarded slaves can take up two hundred weeks (Assuming that the slave's intelligence doesn't change at all and the dice roll is consistent).
-
-
-<<case "Attendant">>
- An ''Attendant'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Spa", "Spa")>> facility has been built. Attendants provide emotional help to slaves in the spa, and can also soften flaws and even fix mindbroken slaves. Good Attendants are free of <<= App.Encyclopedia.Dialog.linkSC("fetishes", "Fetishes")>> or <<= App.Encyclopedia.Dialog.linkSC("submissive", "Submissives")>>, have a calm libido, appear older than 35, a motherly air, @@.cyan;intelligent,@@ and naturally female.
-
-/* TODO: will still need more updating */
-<<case "Matron">>
- A ''Matron'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Nursery", "Nursery")>> facility has been built. Matrons oversee the day-to-day activities of the Nursery, and can soften flaws of nannies working under them. A good Matron is <<= App.Encyclopedia.Dialog.linkSC("caring", "Caring")>>, <<= App.Encyclopedia.Dialog.linkSC("funny", "Funny")>>, <<= App.Encyclopedia.Dialog.linkSC("intelligent", "Intelligence")>>, and has given birth before.
-
-<<case "Bodyguard">>
- //Slave bodyguards are best understood not as protection for a slaveowner's person, but rather as a projection of their skill at slave breaking.
-
- <br><br>By giving a slave the means and position to easily kill her master, that master displays their total trust in them. The simple fact that an armed slave is near a slaveowner at all times is proof that that slaveowner has produced at least one slave that never wavers in her @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>.@@ After all, if she ever wavered, the slaveowner would likely be dead.
-
- <br><br>It is obvious to any real security professional that slave bodyguards are mostly for show, from the moment of seeing one. After all, they are not equipped with modern sensors, armor, and weapons; if they were so attired and loaded down it would be quite impossible to tell if they were even female: the huge weight and bulk of modern combat gear gives an androgynous appearance. Instead, they are usually kept scantily clad or even naked, and armed with visually impressive weapons.
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
-
- <br><br>A ''Bodyguard'' can be selected once the Armory upgrade is purchased. Duties include protection of the player character during violent events; good bodyguards produce some @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ as well, based on how deadly they are. Toned but not excessive <<= App.Encyclopedia.Dialog.linkSC("muscles", "Musculature")>>, <<= App.Encyclopedia.Dialog.linkSC("combat kills", "Combat Skill")>>, and <<= App.Encyclopedia.Dialog.linkSC("height", "Height")>> contribute to deadliness. Big <<= App.Encyclopedia.Dialog.linkSC("breasts", "Breasts")>>, <<= App.Encyclopedia.Dialog.linkSC("butts", "Butts")>>, poor <<= App.Encyclopedia.Dialog.linkSC("health", "Health")>>, excess <<= App.Encyclopedia.Dialog.linkSC("weight", "Weight")>>, and <<= App.Encyclopedia.Dialog.linkSC("pregnancy", "Pregnancy")>> all detract from deadliness.
-
- <br><br>Skilled, @@.cyan;intelligent,@@ and @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devoted", "From Rebellious to Devoted")>>@@ Bodyguards may become concerned that they have no potential successor if you do not keep several other combat capable slaves in your penthouse. Such a Bodyguard will do her best to find responsible and physically capable slaves to teach self defense to when she can. Potential recipients of this training include her lover or wife if she has one, the <<= App.Encyclopedia.Dialog.linkSC("Head Girl", "Head Girl")>>, the <<= App.Encyclopedia.Dialog.linkSC("Wardeness", "Wardeness")>>, and your <<= App.Encyclopedia.Dialog.linkSC("Concubine", "Concubine")>>.
-
-
-<<case "Concubine">>
- A ''Concubine'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Master Suite", "Master Suite")>> facility is built. Concubines benefit from high beauty and sexual skills in the same way as public servants; they should also be extremely @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devoted", "From Rebellious to Devoted")>>.@@ Concubines do not apply any bonuses to other slaves in the <<= App.Encyclopedia.Dialog.linkSC("master suite", "Master Suite")>>; rather, they are the game's single most efficient production of @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ themselves.
-
-
-<<case "DJ">>
- //My name is Danni Diemen, and I'm here today to talk about the prettiest girls in the Free Cities. That's right, DJs! When a slave bitch says, "Sweetie, I'm not that kind of girl," she's lying. She's a slave, and she is that kind of girl! So, have your way with her.
-
- <br><br>Except if she's a DJ. Then she probably isn't that kind of girl after all! Rare, I know. That's what makes them so hot! Some of the Free Cities' most prominent slaveowners have taken sluttery to the next level. They're building clubs designed around constant beats and constant sex, so it pays to have a hot girl maintain the party, whether it's up on stage, in the DJ booth, or down on the floor!
-
- <br><br>As for what makes a good DJ, beauty is obvious. But I also I hear the best trend a little older, too. Let's be honest, there's something a high-class woman has that a high-class girl doesn't.
-
- <br><br>— Van Diemen, D. C. G., //Free Cities Fashion (FCF), January 2032////
-
- <br><br>A ''DJ'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Club", "Club")>> facility is built. DJs apply a multiplier to @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ gains from serving in the club. Entertainment skills, toned but not massive <<= App.Encyclopedia.Dialog.linkSC("muscles", "Musculature")>>, @@.cyan;intelligence,@@ and a pretty face make a good DJ.
-
- <br><br>If a DJ isn't responsible for enough sluts to occupy her full time, she'll spend time fucking citizens herself. This is exactly the same as <<= App.Encyclopedia.Dialog.linkSC("Public Service", "Public Service")>> out of the Club: she'll benefit from any <<= App.Encyclopedia.Dialog.linkSC("Advertising", "Advertising")>> or <<= App.Encyclopedia.Dialog.linkSC("Variety", "Variety")>> bonuses available, and will even benefit from her own leadership skills.
-
-
-<<case "Head Girl">>
- //Most Free Cities slaveowners eventually find it convenient to promote a @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trusting", "Trust")>>@@ slave to a position over others. The stable of slaves necessary to present a proper public image has become so large that assistance managing and overseeing slaves is quite useful. In addition, such a slave can be an example to lesser livestock.
-
- <br><br>A good Head Girl will be @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devoted", "From Rebellious to Devoted")>>@@ to her master and sexually skilled. Experienced slaveowners have also found that an older slave girl is often more effective than a young one. Since slavery is new, older slave girls will have spent part of their adult lives as free women, and have a deeper body of life experience to draw on.
-
- <br><br>Naturally, some slaveowners form a strong emotional bond with their Head Girl. @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("Trusting", "Trust")>>@@ and relying on a close companion can begin to resemble old world relationships. It is a paradox of modern Free Cities life that such closeness is strongly frowned upon. Rumors that a prominent person is emotionally involved with his or her Head Girl can be as socially devastating as rumors of infidelity were a hundred years ago.
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
-
- <br><br>A ''Head Girl'' can be selected from among your @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devoted", "From Rebellious to Devoted")>>@@ slaves immediately. Duties are numerous, but mostly involve training slaves. They will generally train whichever girls they think appropriate, but can be given some direction on the same menu used to select one. Giving your <<= App.Encyclopedia.Dialog.linkSC("Head Girl a suite", "Head Girl Suite")>> and a personal slave will allow her to train an extra slave each week, an extremely powerful ability.
-
- @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("Devotion", "From Rebellious to Devoted")>>,@@ @@.cyan;intelligence,@@ and age over 30 all help Head Girls do well. Head Girls will do better if they are comfortable with the arcology's <<= App.Encyclopedia.Dialog.linkSC("lingua franca", "Lingua Franca")>>. Skills are required when teaching that skill, meaning that slaves without vaginas cannot teach vaginal skills. Conversely, slaves with functional dicks are better at teaching other sexual skills. Also having max sex skills, dom as their fetish and being your wife provide more boosts.
-
-
-<<case "Madam">>
- //Prostitution is indeed the oldest profession. It follows that the madam is probably the oldest managerial position.
-
- <br><br>Free madams are very common in the Free Cities. As free prostitutes are priced out of their profession by slaves, many of the wealthiest are purchasing slaves and setting themselves up as madams. However, slave madams are becoming common as well.
-
- <br><br>The selling of sex is one of the largest growth markets in the Free Cities. As has been confidently predicted by economists since the first Free City was founded, the near-anarchy of these new polities has accelerated the concentration of wealth that began in the final years of the twentieth century. Thus, the majority of free citizens of the Cities own no slaves, while the majority of slaves are owned by a very few extremely wealthy persons. Extremely large stables of slave whores are becoming common for those in the industry.
-
- <br><br>Managing this many prostitutes is a science and an art. Naturally, it is not difficult to find slaves that are experienced in the sex trade. Setting slaves over other slaves has been a part of human slavery for all of recorded history; all of the tropes that once applied to the slave overseer in the field or the quarry now apply to the slave Madam in the brothel. The more experience they have in the field, the better they do.
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
-
- <br><br>
-
- A ''Madam'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Brothel", "Brothel")>> facility is built. Madams apply a multiplier to @@.yellowgreen;<<= App.Encyclopedia.Dialog.linkSC("income", "Money")>>@@ from the brothel. Whoring skills, age over 35, @@.cyan;intelligence,@@ being your wife and a functional cock help a Madam.
-
- <br><br>If a Madam isn't managing enough whores to occupy her full time, she'll sell herself as much as she has time for. This is exactly the same as <<= App.Encyclopedia.Dialog.linkSC("Whoring", "Whoring")>> out of the Brothel: she'll benefit from any <<= App.Encyclopedia.Dialog.linkSC("Advertising", "Advertising")>> or <<= App.Encyclopedia.Dialog.linkSC("Variety", "Variety")>> bonuses available, and will even benefit from her own management skills.
-
-
-<<case "Milkmaid">>
- Most slaveowners get into dairy as a hobby. Why not? It's fun, tasty, and sexy. But sooner or later, almost everyone who starts out with a few low-volume milkers hears the call of mass production. After all, if it's hot to have one slave to use as the milking machine holds her down, it's hotter to have a whole row of moaning milkers at your mercy.
-
- <br><br>Unfortunately, the everyday work of husbandry goes from an amusement to a chore as a herd grows. Helping a tired slave cow with huge tits up from a long milking is fun once a day, but it gets bothersome and backbreaking the tenth time one does it. What's to be done?
-
- <br><br>Train a milkmaid! Any decently obedient slave will do, but the stronger the better. As you probably know by now, just because slave husbandry involves human stock doesn't mean it isn't hard work, just like traditional stock keeping! The traditional image of milkmaids might be girly and innocent, but we're after a good hale bitch that can lift, carry and scrub from dawn to dusk. If you're looking to economize, you can even use a slave too old or ugly to appeal in other, more sexual jobs. After all, when it comes to the third milking of the day, cows don't care how pretty the hands that examine their tits are.
-
- <br><br>— Banaszewski, Valerie P., //Free Cities Husbandry Weekly, February 16, 2032//
-
- <br><br>A ''Milkmaid'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Dairy", "Dairy")>> facility is built. Having applicable <<= App.Encyclopedia.Dialog.linkSC("career experience", "Career Experience")>> and strong <<= App.Encyclopedia.Dialog.linkSC("muscles", "Musculature")>> allow a Milkmaid to help cows maintain their health. If a Milkmaid is Funny or Caring, she can improve cow's @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trusting", "Trust")>>@@ resting point; if she has oral skills, she can improve their@@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ resting point.
- <<if $seeDicks != 0>>
- If she has a very large dick capable of erection, a Milkmaid can assist cows with ejaculation if the Dairy is not already stimulating prostates.
- <</if>>
-
-
-<<case "Farmer">>
- <br><br>A ''Farmer'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Farmyard", "Farmyard")>> facility is built. Having applicable <<= App.Encyclopedia.Dialog.linkSC("career experience", "Career Experience")>> and strong <<= App.Encyclopedia.Dialog.linkSC("muscles", "Musculature")>> allow a Farmer to maintain the different crops and animals.
- <br>
- //This description needs to be expanded.//
-
-
-<<case "Nurse">>
- An ''Nurse'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Clinic", "Clinic")>> facility is built. Nurses increase <<= App.Encyclopedia.Dialog.linkSC("health", "Health")>> gains in the Clinic, and play a major role in the prevention and treatment of illness among slaves. Good Nurses are <<= App.Encyclopedia.Dialog.linkSC("nymphomaniacs", "Nymphomania")>>, highly @@.cyan;intelligent,@@ physically fit, and very beautiful.
-
-
-<<case "Recruiter">>
- A ''Recruiter'' can be selected from among your @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devoted", "From Rebellious to Devoted")>>@@ slaves immediately. @@.cyan;Intelligence,@@ entertainment skills, and luxurious living standards help a recruiter convince vulnerable people to submit to voluntary enslavement. Each targetable group is also more sympathetic to an appropriate recruiter:
- <br> Desperate whores: a sexually veteran recruiter
- <br> Expectant mothers: a visibly pregnant recruiter
- <br> Young migrants: a <<= App.Encyclopedia.Dialog.linkSC("healthy", "Health")>> and pretty recruiter
- <br> Dissolute sissies: a recruiter with a working dick
- <br> Reassignment candidates: a pretty recruiter without working female reproductive organs
-
- <br><br>Once your household reaches a significant number of slaves you may direct the Recruiter to do publicity instead of acquisitions, for a boost to @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ and possibly advancing <<= App.Encyclopedia.Dialog.linkSC("future societies", "Future Societies")>>. Activating this ability does not influence any other means of obtaining new slaves. (Note that "Facilities & leadership" includes the Recruiter herself and a slot for Head Girl, two positions that do not require a facility.)
-
-
-<<case "Schoolteacher">>
- A ''schoolteacher'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Schoolroom", "Schoolroom")>> facility is built. Schoolteachers increase the rate at which students in the schoolroom learn. Good schoolteachers appear older than 35, beautiful, @@.cyan;intelligent,@@ and educated.
-
-
-<<case "Stewardess">>
- //Throughout recorded history, wherever there have been mature slave societies, there have been slave overseers set over their peers by their masters. Naturally, these individuals have simultaneously been among the most @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trusted", "Trust")>>@@ to their masters, and among the most hated to their compatriots in slavery. They have perhaps the greatest interest in preservation of a slave society, since the masters have only the loss of property to fear by abolition; slave overseers would likely be less lucky.
-
- <br><br>The stewardess is the modern, domestic expression of the old overseer. Many wealthy slaveowners keep an extensive stable of less valuable slaves around their estates to serve as labor, raw material for slave training, and targets for recreational abuse. Successful oversight of this often mulish mass of stock requires a high degree of @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ to the master's will, of course. Good health to put in the necessarily long hours also helps. Some slaveowners also find that a functional dick allows a Stewardess to add a useful element of sexual abuse to her ministrations.
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
-
- <br><br>A ''Stewardess'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Servants' Quarters", "Servants' Quarters")>> facility is built. Stewardesses increase the upkeep reduction effects of servants working out of the servants' quarters. Being older than 35, having good <<= App.Encyclopedia.Dialog.linkSC("Health", "health")>>, @@.cyan;intelligence,@@ and <<= App.Encyclopedia.Dialog.linkSC("nymphomania", "Nymphomania")>> or <<= App.Encyclopedia.Dialog.linkSC("dominance", "Doms")>> make a good Stewardess.
-
-
-<<case "Wardeness">>
- A ''Wardeness'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Cellblock", "Cellblock")>> facility is built. Wardenesses increase the rate at which slaves in the cellblock are broken. Very high <<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>, <<= App.Encyclopedia.Dialog.linkSC("nymphomania", "Nymphomania")>> or <<= App.Encyclopedia.Dialog.linkSC("sadism", "Sadists")>>, strong <<= App.Encyclopedia.Dialog.linkSC("muscles", "Musculature")>>, applicable <<= App.Encyclopedia.Dialog.linkSC("career experience", "Career Experience")>>, and a solid dick make a powerful Wardeness.
-
-/**********
-SLAVE SKILLS
-**********/
-<<case "Skills">>
- //Future room for lore text//
-
- <br><br>
- Choose a more particular entry below:
- <br>
-
-<<case "Anal Skill">>
- ''Anal skill'' improves performance on sexual assignments and is available in three levels. Training methods include schooling (up to level one), plugs (up to level one), personal attention (unlimited), Head Girl attention (up to the Head Girl's skill), and on the job experience (unlimited). <<= App.Encyclopedia.Dialog.linkSC("Anus", "Anuses")>> surgery can reduce this skill.
-
-
-<<case "Combat Skill">>
- ''Combat skill'' is available in one level only. It improves performance in lethal and nonlethal pit fights and performance as the Bodyguard. Training methods are limited to on the job experience (including pit fights) and events.
-
-
-<<case "Entertainment Skill">>
- ''Entertainment skill'' is available in three levels. It improves performance on all sexual assignments, though it affects public service or working in the club most. Training methods include schooling (up to level one), personal attention (up to level one), Head Girl attention (up to the Head Girl's skill), and on the job experience (unlimited).
-
-
-<<case "Oral Skill">>
- ''Oral skill'' improves performance on sexual assignments and is available in three levels. Training methods include schooling (up to level one), gags (up to level one), personal attention (unlimited), Head Girl attention (up to the Head Girl's skill), and on the job experience (unlimited). <<= App.Encyclopedia.Dialog.linkSC("Lip", "Lips")>> surgery can reduce this skill.
-
-
-<<case "Vaginal Skill">>
- ''Vaginal skill'' improves performance on sexual assignments and is available in three levels. Training methods include schooling (up to level one), plugs (up to level one), personal attention (unlimited), Head Girl attention (up to the Head Girl's skill), and on the job experience (unlimited). Slaves without vaginas cannot learn or teach this skill, limiting their ultimate skill ceiling. <<= App.Encyclopedia.Dialog.linkSC("Vagina", "Vaginas")>> surgery can reduce this skill.
-
-
-<<case "Whoring Skill">>
- ''Whoring skill'' is available in three levels. It improves performance on all sexual assignments, though it affects whoring or working in the brothel most. Training methods include schooling (up to level one), personal attention (up to level one), Head Girl attention (up to the Head Girl's skill), and on the job experience (unlimited).
-
-/**********
-SLAVE FETISHES:
-**********/
-<<case "Fetishes">>
- //Future room for lore text//
-
- <br><br>
- Choose a more particular entry below:
- <br>
-
-<<case "Boob Fetishists">>
- ''Boob Fetishists'' like breasts.
-
- <br><br>The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, relationships, and being milked.
-
- <br><br>It can be advanced by appropriate smart clit piercing settings, high @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ and @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>,@@ and being milked.
-
- <br><br>The fetish will increase XX attraction. Boob Fetishists enjoy cowbell collars, breast surgery, and being milked. Milkmaids can become boob fetishists naturally.
-
- <br><br>Boob fetishists may become <<= App.Encyclopedia.Dialog.linkSC("obsessed with breast expansion", "Breast Obsession")>> as their breasts grow.
-
-
-<<case "Buttsluts">>
- ''Buttsluts'' fetishize anal sex — mostly on the receiving end, though they'll enjoy other anal play.
-
- <br><br>The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, relationships, anally focused fucktoy service, service in a <<= App.Encyclopedia.Dialog.linkSC("Dairy", "Dairy")>> upgraded with reciprocating dildos, the dildo drug dispenser upgrade, anal accessories, and being a painal queen.
-
- <br><br>It can be advanced by appropriate smart clit piercing settings, high @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ and @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>,@@ the dildo drug dispenser upgrade, and being a painal queen.
-
- <br><br>Buttsluttery will soften the 'hates anal' flaw into 'painal queen,' the 'hates penetration' flaw into 'strugglefuck queen,' and the 'repressed' flaw into 'perverted,' or remove these flaws if a quirk is already present. Buttsluts with vaginas enjoy wearing chastity belts, and all buttsluts enjoy buttock enhancement and anal rejuvenation surgeries. Buttsluts do not mind a lack of hormonal feminization. The fetish will increase XY attraction.
-
- <br><br>Buttsluts whose only available hole for receptive intercourse is the anus may become <<= App.Encyclopedia.Dialog.linkSC("anal addicts", "Anal Addicts")>>.
-
-
-<<case "Cumsluts">>
- ''Cumsluts'' fetishize oral sex and ejaculate.
-
- <br><br>It can be advanced by appropriate smart clit piercing settings, high @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ and @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>,@@ the phallic food dispenser upgrade, cum diets, and being a gagfuck queen.
-
- <br><br>Cumsluttery will soften the 'hates oral' flaw into 'gagfuck queen,' the 'hates women' flaw into 'adores men,' and the 'repressed' flaw into 'perverted,' or remove these flaws if a quirk is already present. Cumsluts enjoy cum diets. The fetish will increase XY attraction.
-
- <br><br>Cumsluts who eat out of phallic feeders or are fed cum may become <<= App.Encyclopedia.Dialog.linkSC("cum addicts", "Cum Addicts")>>.
-
-
-<<case "Doms">>
- ''Doms'' fetishize dominance.
-
- <br><br>The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, relationships, unfocused fucktoy service, and being confident or cutting.
-
- <br><br>It can be advanced by appropriate smart clit piercing settings, high @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ and @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>,@@ being confident, and being cutting.
-
- <br><br>Dominance will remove the 'apathetic' flaw if a quirk is already present. Doms do not mind a lack of hormonal feminization. The fetish will increase XX attraction. Stewardesses do better when either dominant or <<= App.Encyclopedia.Dialog.linkSC("nymphomaniacal", "Nymphomania")>>. The <<= App.Encyclopedia.Dialog.linkSC("Head Girl", "Head Girl")>>, <<= App.Encyclopedia.Dialog.linkSC("Madam", "Madam")>>, <<= App.Encyclopedia.Dialog.linkSC("Schoolteacher", "Schoolteacher")>>, <<= App.Encyclopedia.Dialog.linkSC("Stewardess", "Stewardess")>>, and <<= App.Encyclopedia.Dialog.linkSC("Nurse", "Nurse")>> can become Doms naturally.
-
- <br><br>Doms serving as Head Girls may become <<= App.Encyclopedia.Dialog.linkSC("abusive", "Abusiveness")>> if allowed to punish slaves by molesting them.
-
-
-<<case "Humiliation Fetishists">>
- ''Humiliation Fetishists'' like exhibitionism.
-
- <br><br>The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, relationships, or being sinful, a tease, or perverted.
-
- <br><br>It can be advanced by appropriate smart clit piercing settings, high @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ and @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>,@@ being sinful, being a tease, and being perverted.
-
- <br><br>A humiliation fetish will soften the 'bitchy' flaw into 'cutting' and the 'shamefast' flaw into 'tease,' or remove these flaws if a quirk is already present. The fetish will increase XY attraction. Humiliation fetishists enjoy nudity, and like revealing clothing at a lower @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ than other slaves. DJs can become humiliation fetishists naturally.
-
- <br><br>Humiliation fetishists on public sexual assignments may become <<= App.Encyclopedia.Dialog.linkSC("attention whores", "Attention Whores")>>.
-
-
-<<case "Masochists">>
- ''Masochists'' fetishize abuse and pain aimed at themselves.
-
- <br><br>The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, relationships, uncomfortable clothing, being <<= App.Encyclopedia.Dialog.linkSC("funny", "Funny")>> and being a <<= App.Encyclopedia.Dialog.linkSC("strugglefuck queen", "Strugglefuck Queen")>>.
-
- <br><br>It can be advanced by appropriate smart clit piercing settings, high @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ and @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>,@@ being <<= App.Encyclopedia.Dialog.linkSC("funny", "Funny")>> and being a <<= App.Encyclopedia.Dialog.linkSC("strugglefuck queen", "Strugglefuck Queen")>>.
-
- <br><br>Masochism will soften the 'liberated' flaw into 'advocate' or remove this flaw if a quirk is already present. Masochists can be abused without causing deleterious flaws.
-
- <br><br>Masochists serving in an industrialized dairy, in an arcade, or in a glory hole have a chance to become <<= App.Encyclopedia.Dialog.linkSC("self hating", "Self Hatred")>>.
-
-
-<<case "Pregnancy Fetishists">>
- ''Pregnancy Fetishists'' like being impregnated, sex with pregnant slaves, and getting others pregnant. (It is not necessary that the slave actually be able to do any of these things; such is life.)
-
- <br><br>The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, relationships, having sex while pregnant, adoring men, being a tease, and being romantic.
-
- <br><br>It can be advanced by appropriate smart clit piercing settings, high @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ and @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>,@@ adoring men, being a tease, and being romantic.
-
- <br><br>The fetish will increase XY attraction. Pregnancy fetishists greatly enjoy all kinds of impregnation, and love or hate fertility surgeries depending on what's being changed.
-
- <br><br>Pregnancy Fetishists who are repeatedly bred or are serving in an industrialized Dairy may develop <<= App.Encyclopedia.Dialog.linkSC("breeding obsessions", "Breeding Obsession")>>.
-
-
-<<case "Sadists">>
- ''Sadists'' fetishize abuse and pain aimed at others.
-
- <br><br>The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, and relationships.
-
- <br><br>It can be advanced by appropriate smart clit piercing settings, and high @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ and @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>.@@
-
- <br><br>Sadists do not mind a lack of hormonal feminization. The fetish will increase XX attraction. Wardenesses do better when sadistic, and can become sadists naturally.
-
- <br><br>Sadists serving as Wardeness may become <<= App.Encyclopedia.Dialog.linkSC("sexually malicious", "Maliciousness")>>.
-
-
-<<case "Submissives">>
- ''Submissives'' fetishize submission.
-
- <br><br>The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, relationships, unfocused fucktoy service, crawling due to damaged tendons, being caring, being an advocate, and being insecure.
-
- <br><br>It can be advanced by appropriate smart clit piercing settings, high @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ and @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>,@@ being caring, being an advocate, and being insecure.
-
- <br><br>Submissiveness will soften the 'arrogant' flaw into 'confident,' the 'apathetic' flaw into 'caring,' and the 'idealistic' flaw into 'romantic,' or remove these flaws if a quirk is already present. The fetish will increase XY attraction. It improves performance at the servant assignment and working in the Servants' Quarters. Attendants do better when submissive, and can become submissives naturally.
-
- <br><br>Submissives serving on public sexual assignment may become <<= App.Encyclopedia.Dialog.linkSC("sexually self neglectful", "Self Neglect")>>.
-
-/**********
-SLAVE BEHAVIORAL QUIRKS
-**********/
-<<case "Quirks">>
- ''Quirks '' are positive slave qualities. They increase slaves' value and performance at sexual assignments, and each quirk also has other, differing effects. Each quirk is associated with a corresponding <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>, and slave can have two quirks (a sexual quirk and a behavioral quirk), just like flaws. Quirks may appear randomly, but the most reliable way to give slaves quirks is to soften flaws.
-
- <br><br>The <<= App.Encyclopedia.Dialog.linkSC("Head Girl", "Head Girl")>> can be ordered to soften flaws, and the player character can soften flaws with personal attention. Flaws can also be naturally softened into quirks by fetishes.
-
-
-<<case "Adores Men">>
- ''Adores men'' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("hates women", "Hates women")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Slaves who adore men may naturally become <<= App.Encyclopedia.Dialog.linkSC("pregnancy fetishists", "Pregnancy Fetishists")>>. In addition to the standard value and sexual assignment advantages, they get bonus @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>@@ on <<= App.Encyclopedia.Dialog.linkSC("fucktoy", "Fucktoy")>> duty if the player character is masculine, and increased chance of gaining additional XY attraction.
-
-
-<<case "Adores Women">>
- ''Adores women'' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("hates men", "Hates men")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Slaves who adore women may naturally become <<= App.Encyclopedia.Dialog.linkSC("breast fetishists", "Boob Fetishists")>>. In addition to the standard value and sexual assignment advantages, they get bonus @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>@@ on <<= App.Encyclopedia.Dialog.linkSC("fucktoy", "Fucktoy")>> duty if the player character is feminine, and increased chance of gaining additional XX attraction.
-
-
-<<case "Advocate">>
- ''Advocate'' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("liberated", "Liberated")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Advocates may naturally become <<= App.Encyclopedia.Dialog.linkSC("submissives", "Submissives")>>. In addition to the standard value and sexual assignment advantages, they get bonus @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ while performing <<= App.Encyclopedia.Dialog.linkSC("public service", "Public Service")>>.
-
-
-<<case "Confident">>
- ''Confident'' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("arrogant", "Arrogant")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Confident slaves may naturally become <<= App.Encyclopedia.Dialog.linkSC("doms", "Doms")>>. In addition to the standard value and sexual assignment advantages, they get bonus @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>@@ on <<= App.Encyclopedia.Dialog.linkSC("fucktoy", "Fucktoy")>> duty.
-
-
-<<case "Cutting">>
- ''Cutting'' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("bitchy", "Bitchy")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Cutting slaves may naturally become <<= App.Encyclopedia.Dialog.linkSC("doms", "Doms")>>. In addition to the standard value and sexual assignment advantages, they get bonus @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ while <<= App.Encyclopedia.Dialog.linkSC("whoring", "Whoring")>>.
-
-
-<<case "Fitness">>
- ''Fitness'' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("gluttonous", "Gluttonous")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. In addition to the standard value and sexual assignment advantages, fitness fanatics gain additional sex drive each week, and are better at working out.
-
-
-<<case "Funny">>
- ''Funny'' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("odd", "Odd")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Funny slaves may naturally become <<= App.Encyclopedia.Dialog.linkSC("masochists", "Masochists")>>. In addition to the standard value and sexual assignment advantages, they get bonus @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ while performing <<= App.Encyclopedia.Dialog.linkSC("public service", "Public Service")>>.
-
-
-<<case "Insecure">>
- ''Insecure'' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("anorexic", "Anorexic")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Insecure slaves may naturally become <<= App.Encyclopedia.Dialog.linkSC("submissives", "Submissives")>>. In addition to the standard value and sexual assignment advantages, they get bonus @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>@@ on <<= App.Encyclopedia.Dialog.linkSC("fucktoy", "Fucktoy")>> duty.
-
-
-<<case "Sinful">>
- ''Sinful'' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("devout", "Devout")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Sinful slaves may naturally become <<= App.Encyclopedia.Dialog.linkSC("humiliation fetishists", "Humiliation Fetishists")>>. In addition to the standard value and sexual assignment advantages, they get bonus @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ while <<= App.Encyclopedia.Dialog.linkSC("whoring", "Whoring")>>.
-
-/**********
-SLAVE SEXUAL QUIRKS
-**********/
-<<case "Caring">>
- ''Caring'' is a sexual <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("apathetic", "Apathetic")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Caring slaves may naturally become <<= App.Encyclopedia.Dialog.linkSC("submissive", "Submissives")>>. In addition to the standard value and sexual assignment advantages, they get bonus @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ while <<= App.Encyclopedia.Dialog.linkSC("whoring", "Whoring")>> and nannying.
-
-
-<<case "Gagfuck Queen">>
- ''Gagfuck Queen '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("Hates oral", "Hates oral")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Gagfuck queens may naturally become <<= App.Encyclopedia.Dialog.linkSC("cumsluts", "Cumsluts")>>. In addition to the standard value and sexual assignment advantages, they enjoy living in a penthouse upgraded with phallic food dispensers.
-
-
-<<case "Painal Queen">>
- ''Painal Queen '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("Hates anal", "Hates anal")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Painal queens may naturally become <<= App.Encyclopedia.Dialog.linkSC("Buttsluts", "Buttsluts")>>. In addition to the standard value and sexual assignment advantages, they enjoy living in a penthouse upgraded with dildo drug dispensers.
-
-
-<<case "Perverted">>
- ''Perverted '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("repressed", "Repressed")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Perverted slaves may naturally become <<= App.Encyclopedia.Dialog.linkSC("submissives", "Submissives")>>. In addition to the standard value and sexual assignment advantages, they get bonus @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ when in incestuous relationships, and gain additional sex drive each week.
-
-
-<<case "Romantic">>
- ''Romantic '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("idealistic", "Idealistic")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Romantics may naturally become <<= App.Encyclopedia.Dialog.linkSC("pregnancy fetishists", "Pregnancy Fetishists")>>. In addition to the standard value and sexual assignment advantages, they get bonus @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>@@ on <<= App.Encyclopedia.Dialog.linkSC("fucktoy", "Fucktoy")>> duty.
-
-
-<<case "Size Queen">>
- ''Size Queen '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("judgemental", "Judgemental")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Size queens may naturally become <<= App.Encyclopedia.Dialog.linkSC("buttsluts", "Buttsluts")>>. In addition to the standard value and sexual assignment advantages, they will enjoy relationships with well-endowed, virile slaves so much their partners will get @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ benefits, too.
-
-
-<<case "Strugglefuck Queen">>
- ''Strugglefuck Queen '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("hates penetration", "Hates penetration")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Strugglefuck queens may naturally become <<= App.Encyclopedia.Dialog.linkSC("masochists", "Masochists")>>. In addition to the standard value and sexual assignment advantages, this Quirk avoids @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ losses if the slave is assigned to be a <<= App.Encyclopedia.Dialog.linkSC("sexual servant", "Sexual Servitude")>>.
-
-
-<<case "Tease">>
- ''Tease '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("shamefast", "Shamefast")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Teases may naturally become <<= App.Encyclopedia.Dialog.linkSC("humiliation Fetishists", "Humiliation Fetishists")>>. In addition to the standard value and sexual assignment advantages, they get bonus @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ while performing <<= App.Encyclopedia.Dialog.linkSC("public service", "Public Service")>>.
-
-
-<<case "Unflinching">>
- ''Unflinching '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> developed from the <<= App.Encyclopedia.Dialog.linkSC("crude", "Crude")>> <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>>. Unflinching slaves may naturally become <<= App.Encyclopedia.Dialog.linkSC("Masochists", "Masochists")>>. In addition to the standard value and sexual assignment advantages, they will experience a partial rebound during weeks in which they lose @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>.@@
-
-/**********
-SLAVE BEHAVIORAL FLAWS
-**********/
-<<case "Flaws">>
- ''Flaws '' are negative slave qualities. They decrease slaves' value and performance at sexual assignments, and each flaw also has other, differing effects. Each flaw is associated with a corresponding <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>>, and slave can have two flaws (a sexual flaw and a behavioral flaw), just like quirks. New slaves will often have flaws, and tough experiences can also cause them to appear.
-
- <br><br>The <<= App.Encyclopedia.Dialog.linkSC("Head Girl", "Head Girl")>> can be ordered to soften or remove flaws, and the player character can soften or remove flaws with personal attention. Flaws can also be naturally softened or removed by fetishes, and can resolve on their own if a slave is happy.
-
-
-<<case "Anorexic">>
- ''Anorexic '' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("insecure", "Insecure")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>>. In addition to the standard penalties to value and performance on sexual assignments, anorexia can cause unexpected weight loss. Anorexics will enjoy dieting but dislike gaining weight, and may bilk attempts to make them fatten up.
-
-
-<<case "Arrogant">>
- ''Arrogant '' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("confident", "Confident")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>>. The <<= App.Encyclopedia.Dialog.linkSC("submissive", "Submissives")>> fetish can do this naturally. In addition to the standard penalties to value and performance on sexual assignments, arrogance limits weekly @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ gains.
-
-
-<<case "Bitchy">>
- ''Bitchy '' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("cutting", "Cutting")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>>. The <<= App.Encyclopedia.Dialog.linkSC("humiliation", "Humiliation Fetishists")>> fetish can do this naturally. In addition to the standard penalties to value and performance on sexual assignments, bitchiness limits weekly @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ gains.
-
-
-<<case "Devout">>
- ''Devout '' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("sinful", "Sinful")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>>. A very powerful sex drive can do this naturally. In addition to the standard penalties to value and performance on sexual assignments, being devout limits weekly @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ gains.
-
-
-<<case "Gluttonous">>
- ''Gluttonous '' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("fitness", "Fitness")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>>. In addition to the standard penalties to value and performance on sexual assignments, gluttons will enjoy gaining weight but dislike dieting, and may bilk attempts to make them lose weight.
-
-
-<<case "Hates Men">>
- ''Hates men '' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("adores women", "Adores women")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> by training, a good <<= App.Encyclopedia.Dialog.linkSC("Attendant", "Attendant")>>, a powerful sex drive, or the <<= App.Encyclopedia.Dialog.linkSC("boob fetish", "Boob Fetishists")>>. Strong attraction to men or the <<= App.Encyclopedia.Dialog.linkSC("pregnancy fetish", "Pregnancy Fetishists")>> will soften it so she <<= App.Encyclopedia.Dialog.linkSC("adores men", "Adores men")>> instead. This flaw can also be removed by serving a player character or another slave with a dick.
-
-
-<<case "Hates Women">>
- ''Hates women '' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("adores men", "Adores men")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> by training, a good <<= App.Encyclopedia.Dialog.linkSC("Attendant", "Attendant")>>, a powerful sex drive, or the <<= App.Encyclopedia.Dialog.linkSC("cumslut", "Cumsluts")>> fetish. Strong attraction to women or the <<= App.Encyclopedia.Dialog.linkSC("pregnancy fetish", "Pregnancy Fetishists")>> will soften it so she <<= App.Encyclopedia.Dialog.linkSC("adores women", "Adores women")>> instead. This flaw can also be removed by serving a player character or another slave with a vagina.
-
-
-<<case "Liberated">>
- ''Liberated '' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("advocate", "Advocate")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>>. The <<= App.Encyclopedia.Dialog.linkSC("submissive", "Submissives")>> fetish can do this naturally. In addition to the standard penalties to value and performance on sexual assignments, being liberated limits weekly @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ gains.
-
-
-<<case "Odd">>
- ''Odd '' is a behavioral <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("funny", "Funny")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>>. The <<= App.Encyclopedia.Dialog.linkSC("humiliation", "Humiliation Fetishists")>> fetish can do this naturally. In addition to the standard penalties to value and performance on sexual assignments, being odd limits weekly @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ gains.
-
-/**********
-SLAVE SEXUAL FLAWS
-**********/
-<<case "Apathetic">>
- ''Apathetic '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("caring", "Caring")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> by training, a good <<= App.Encyclopedia.Dialog.linkSC("Attendant", "Attendant")>>, a powerful sex drive, or the <<= App.Encyclopedia.Dialog.linkSC("submissive", "Humiliation Submissive")>> fetish. It can also be removed by the <<= App.Encyclopedia.Dialog.linkSC("dom", "Doms")>> fetish.
-
-
-<<case "Crude">>
- ''Crude '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("unflinching", "Unflinching")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> by training, a good <<= App.Encyclopedia.Dialog.linkSC("Attendant", "Attendant")>>, a powerful sex drive, or the <<= App.Encyclopedia.Dialog.linkSC("buttslut", "Buttsluts")>> fetish.
-
-
-<<case "Hates Anal">>
- ''Hates anal '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("painal queen", "Painal Queen")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> by training, a good <<= App.Encyclopedia.Dialog.linkSC("Attendant", "Attendant")>>, a powerful sex drive, or the <<= App.Encyclopedia.Dialog.linkSC("buttslut", "Buttsluts")>> fetish. This flaw can also be removed by serving the player character.
-
-
-<<case "Hates Oral">>
- ''Hates oral '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("gagfuck queen", "Gagfuck Queen")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> by training, a good <<= App.Encyclopedia.Dialog.linkSC("Attendant", "Attendant")>>, a powerful sex drive, or the <<= App.Encyclopedia.Dialog.linkSC("cumslut", "Cumsluts")>> fetish. This flaw can also be removed by serving the player character.
-
-
-<<case "Hates Penetration">>
- ''Hates penetration '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("strugglefuck queen", "Strugglefuck Queen")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> by training, a good <<= App.Encyclopedia.Dialog.linkSC("Attendant", "Attendant")>>, a powerful sex drive, or the <<= App.Encyclopedia.Dialog.linkSC("buttslut", "Buttsluts")>> fetish. This flaw can also be removed by serving the player character.
-
-
-<<case "Idealistic">>
- ''Idealistic '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("romantic", "Romantic")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> by training, a good <<= App.Encyclopedia.Dialog.linkSC("Attendant", "Attendant")>>, a powerful sex drive, or the <<= App.Encyclopedia.Dialog.linkSC("submissive", "Submissives")>> fetish.
-
-
-<<case "Judgemental">>
- ''Judgemental '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the ''<<= App.Encyclopedia.Dialog.linkSC("size queen", "Size Queen")>> '' <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> by training, a good <<= App.Encyclopedia.Dialog.linkSC("Attendant", "Attendant")>>, a powerful sex drive, or the <<= App.Encyclopedia.Dialog.linkSC("submissive", "Humiliation Submissive")>> fetish.
-
-
-<<case "Repressed">>
- ''Repressed '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("perverted", "Perverted")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> by training, a good <<= App.Encyclopedia.Dialog.linkSC("Attendant", "Attendant")>>, a powerful sex drive, the <<= App.Encyclopedia.Dialog.linkSC("cumslut", "Cumsluts")>> fetish, or the <<= App.Encyclopedia.Dialog.linkSC("buttslut", "Buttsluts")>> fetish.
-
-
-<<case "Shamefast">>
- ''Shamefast '' is a sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that can be softened into the <<= App.Encyclopedia.Dialog.linkSC("tease", "Tease")>> <<= App.Encyclopedia.Dialog.linkSC("quirk", "Quirks")>> by training, a good <<= App.Encyclopedia.Dialog.linkSC("Attendant", "Attendant")>>, a powerful sex drive, or the <<= App.Encyclopedia.Dialog.linkSC("humiliation", "Humiliation Fetishists")>> fetish.
-
-/**********
-SLAVE PARAPHILIAS
-**********/
-<<case "Paraphilias">>
- ''Paraphilias'' are intense forms of sexual <<= App.Encyclopedia.Dialog.linkSC("flaws", "Flaws")>> that cannot be softened. Slaves with a paraphilia excel at certain jobs, but may suffer penalties at others.
-
- <br><br>
- Choose a more particular entry below:
- <br>
-
-<<case "Abusiveness">>
- ''Abusiveness'' is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
- <br><br><<= App.Encyclopedia.Dialog.linkSC("Doms", "Doms")>> serving as <<= App.Encyclopedia.Dialog.linkSC("Head Girls", "Head Girl")>> may become abusive if allowed to punish slaves by molesting them. They can be satisfied by work as the Head Girl or <<= App.Encyclopedia.Dialog.linkSC("Wardeness", "Wardeness")>>. Abusive Head Girls are more effective when allowed or encouraged to punish slaves severely.
-
-
-<<case "Anal Addicts">>
- ''Anal addiction'' is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
- <br><br><<= App.Encyclopedia.Dialog.linkSC("Buttsluts", "Buttsluts")>> whose only available hole for receptive intercourse is the anus may become anal addicts. They can be satisfied by huge buttplugs, the sodomizing drug applicator kitchen upgrade, or by work that involves frequent anal sex. Anal addicts perform well on assignments involving anal sex.
-
-
-<<case "Attention Whores">>
- ''Attention Whores'' suffer from a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
- <br><br><<= App.Encyclopedia.Dialog.linkSC("Humiliation Fetishists", "Humiliation Fetishists")>> on public sexual assignments may become Attention Whores. They can be satisfied by total nudity or by work that involves frequent public sex. Attention whores do very well at <<= App.Encyclopedia.Dialog.linkSC("public service", "Public Service")>>.
-
-
-<<case "Breast Obsession">>
- ''Pectomania,'' also known as breast growth obsession, is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
- <br><br><<= App.Encyclopedia.Dialog.linkSC("Boob fetishists", "Boob Fetishists")>> may become obsessed with breast expansion as their breasts grow. They can be satisfied by breast injections or work as a cow, and will temporarily accept getting neither if their health is low.
-
-
-<<case "Breeding Obsession">>
- ''Breeding obsession'' is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
- <br><br><<= App.Encyclopedia.Dialog.linkSC("Pregnancy Fetishists", "Pregnancy Fetishists")>> who are repeatedly bred or are serving in an industrialized <<= App.Encyclopedia.Dialog.linkSC("Dairy", "Dairy")>> may develop breeding obsessions. They can be satisfied by pregnancy, or constant vaginal sex with their owner. Slaves with breeding obsessions will not suffer negative mental effects from serving in an industrialized dairy that keeps them pregnant.
-
-
-<<case "Cum Addicts">>
- ''Cum addiction'' is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
- <br><br><<= App.Encyclopedia.Dialog.linkSC("Cumsluts", "Cumsluts")>> who eat out of phallic feeders or are fed cum may become cum addicts. They can be satisfied by cum diets, the phallic feeder kitchen upgrade, or by sex work that involves frequent fellatio. Cum addicts will perform well on assignments involving oral sex.
-
-
-<<case "Maliciousness">>
- Sexual ''maliciousness'' is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
- <br><br><<= App.Encyclopedia.Dialog.linkSC("Sadists", "Sadists")>> serving as <<= App.Encyclopedia.Dialog.linkSC("Wardeness", "Wardeness")>> may become sexually malicious. They can be satisfied by work as the <<= App.Encyclopedia.Dialog.linkSC("Head Girl", "Head Girl")>> or Wardeness. Sexually malicious Wardenesses break slaves very quickly but damage their sex drives doing so.
-
-
-<<case "Self Hatred">>
- Sexual ''self hatred'' is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
- <br><br>Self hating slaves can be satisfied by work in an industrialized dairy, in an arcade, or in a glory hole, and will not suffer negative mental effects for doing so. <<= App.Encyclopedia.Dialog.linkSC("Masochists", "Masochists")>> serving in those places have a chance to become self hating, and even extremely low @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>@@ may cause the paraphilia.
-
-
-<<case "Self Neglect">>
- Sexual ''self neglect'' is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
- <br><br><<= App.Encyclopedia.Dialog.linkSC("Submissives", "Submissives")>> serving on public sexual assignment may become sexually self neglectful. Such slaves can be satisfied by most kinds of sex work. Slaves willing to neglect their own pleasure do very well at <<= App.Encyclopedia.Dialog.linkSC("whoring", "Whoring")>>.
-
-/**********
-SLAVE RELATIONSHIPS
-**********/
-<<case "Relationships">>
- Slaves can develop many different ''relationships'' as they become accustomed to their lives, which offer many benefits and some downsides. It is possible for the player to push slaves towards one kind of relationship or another, but slaves' feelings are less susceptible to complete control than their bodies. All relationships in Free Cities are one-to-one, which is a limitation imposed by Twine.
-
-
-<<case "Rivalries">>
- ''Rivalries'' tend to arise naturally between slaves on the same assignment. Slaves may enjoy rivals' misfortunes, but bickering on the job between rivals will impede performance if the rivals remain on the same assignment. Rivals will also dislike working with each other. Rivalries may be defused naturally with time apart, or suppressed by rules. Rivalries impede the formation of <<= App.Encyclopedia.Dialog.linkSC("romances", "Romances")>>, but a romance can defuse a rivalry.
-
-
-<<case "Romances">>
- ''Romances'' tend to arise naturally between slaves on the same assignment, and between slaves having a lot of sex with each other. Slaves will be saddened by their romantic partners' misfortunes, but will do better on public sexual assignments if assigned to work at the same job as a romantic partner. Slaves will also derive various mental effects from being in a relationship: they can rely on each other, take solace in each other's company, and even learn fetishes from each other. Romances can be suppressed by the rules, or fall apart naturally. On the other hand, romances can develop from friendships, to best friendships, to friendships with benefits, to loving relationships. Romances impede the formation of <<= App.Encyclopedia.Dialog.linkSC("rivalries", "Rivalries")>>, and can defuse them. Once a romance has advanced to where the slaves are lovers, its members are eligible for several events in which the couple can be <<= App.Encyclopedia.Dialog.linkSC("married", "Slave Marriages")>>.
-
-
-<<case "Emotionally Bonded">>
- ''Emotionally Bonded'' slaves have become so @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devoted", "From Rebellious to Devoted")>>@@ to the player character that they define their own happiness mostly in terms of pleasing the PC. Slaves may become emotionally bonded if they become perfectly @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devoted", "From Rebellious to Devoted")>>@@ and @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trusting", "Trust")>>@@ without being part of a <<= App.Encyclopedia.Dialog.linkSC("romance", "Romances")>>. They receive powerful mental benefits — in fact, they are likely to accept anything short of sustained intentional abuse without lasting displeasure — and perform better at the <<= App.Encyclopedia.Dialog.linkSC("servitude", "Servitude")>> and <<= App.Encyclopedia.Dialog.linkSC("fucktoy", "Fucktoy")>> assignments. The most reliable way of ensuring a slave's development of emotional bonds is to have her assigned as a fucktoy (or to the <<= App.Encyclopedia.Dialog.linkSC("Master suite", "Master Suite")>>) as she becomes perfectly @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devoted", "From Rebellious to Devoted")>>@@ and @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trusting", "Trust")>>.@@
-
-
-<<case "Emotional Slut">>
- ''Emotional sluts'' are slaves who have lost track of normal human emotional attachments, seeing sex as the only real closeness. Slaves may become emotional sluts if they become perfectly @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devoted", "From Rebellious to Devoted")>>@@ and @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trusting", "Trust")>>@@ without being part of a <<= App.Encyclopedia.Dialog.linkSC("romance", "Romances")>>. They receive powerful mental benefits, though they will be disappointed if they are not on assignments that allow them to be massively promiscuous, and perform better at the <<= App.Encyclopedia.Dialog.linkSC("whoring", "Whoring")>> and <<= App.Encyclopedia.Dialog.linkSC("public service", "Public Service")>> assignments. The most reliable way of ensuring a slave's development into an emotional slut is to have her assigned as a public servant (or to the <<= App.Encyclopedia.Dialog.linkSC("club", "Club")>>) as she becomes perfectly @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devoted", "From Rebellious to Devoted")>>@@ and @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trusting", "Trust")>>.@@
-
-
-<<case "Slave Marriages">>
- ''Slave Marriages'' take place between two slaves. Several random events provide the opportunity to marry slave lovers. Slave Marriages function as an end state for slave <<= App.Encyclopedia.Dialog.linkSC("romances", "Romances")>>; slave wives receive the best relationship bonuses, and can generally be depended upon to help each other be good slaves in various ways. The alternative end states for slaves' emotional attachments are the <<= App.Encyclopedia.Dialog.linkSC("emotional slut", "Emotional Slut")>> and <<= App.Encyclopedia.Dialog.linkSC("emotionally bonded", "Emotionally Bonded")>> statuses, both of which are for a single slave alone.
-
-
-<<case "Slaveowner Marriages">>
- ''Slaveowner Marriages'', marriages between a @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devoted", "From Rebellious to Devoted")>>@@ slave and the player character, require passage of a slaveowner marriage policy unlocked by advanced <<= App.Encyclopedia.Dialog.linkSC("paternalism", "Paternalism")>>. Once this policy is in place, <<= App.Encyclopedia.Dialog.linkSC("emotionally bonded", "Emotionally Bonded")>> slaves can be married. There is no limit to the number of slaves a paternalist player character can marry. Marriage to the player character functions as a direct upgrade to being emotionally bonded.
-
-/**********
-THE X-SERIES ARCOLOGY
-**********/
-<<case "The X-Series Arcology">>
- The X-Series Arcology is the latest model of 'arcology', designed in 2037 based off the model of keeping Free Cities as independent from the old world as fiscally viable. The first arcology was designed in early 2016 by the Berlin-based architecture firm Franz-Crekcht as a "Skyscraper for the next generation" - the A-Series. The original A-Series was made to exist as an arcology integrated within old world nations, but capable of producing its own energy, food, and housing for the population contained within, marketed as buildings you could "Live, work, eat and shop at without ever having to leave". These first arcology units were rolled out by the end of the year based on a standard design prototype, and cheap housing prices combined with the promise of stable white-collar work immediately attracted a sizeable population to the A-series arcologies. Based off of these designs, F-C continued to produce arcology schematics, including the K-series and B-series, and formulated plans for arcologies that could operate in rural, maritime, and even oceanic environments. When the popularity of the Arcology model became evident, other design firms replicated their own takes, producing designs like the V-series, D-series, F-series, and finally the ultra-modern X-series that you presently inhabit, designed more as a quasi-independent city-state than the original "next-generation skyscrapers". It wasn't long before arcologies began to form 'clusters' together, relying more on each other for trade and cultural exchange than the old world that surrounded them; increasingly complex infrastructure and surrounding networks began to connect the clusters, tying them together and making them stand apart from the rest of society, largely free from the purview of bureaucrats and old cultural mores. As the world outside the increasingly self-sufficient arcologies began to deteriorate, it wasn't long after that before the first arcologies declared independence from their parent nations, creating the original Free Cities we know today.
-
- <br><br>
- Choose a more particular entry below:
- <br>
-
-<<case "What the Upgrades Do">>
- //There are a lot of upgrades available for your arcology, <<= properTitle()>>. Please relax; some panic upon reviewing the options is normal. This list should familiarize you with your choices.//
-
- <br><br>''Construction''
- <br>The first upgrade section on the arcology management menu offers an escalating series of generic upgrades for the arcology. A few of these have minor beneficial side effects, but all share the same main effect: they raise the arcology's maximum prosperity level. You will be informed on the end of week report if your arcology is nearing, at, or over this level. Upgrading early is //not// useless, since prosperity will increase more rapidly if the cap is much higher than the current prosperity level.
-
- <br><br>''Facilities''
- <br>These upgrades unlock the various facilities, which are detailed <<= App.Encyclopedia.Dialog.linkSC("here.", "Facilities")>>
-
- <br><br>''Penthouse Improvements''
- <br>The master suite and Head Girl suite options function like facilities. The master suite is the facility for the fucktoy assignment, and the Head Girl suite can house a single slave for her use.
- <br> //''Kitchen upgrade'':// this increases the chances of success for dieting and opens up additional dietary options.
- <br> //''Feeding phalli'':// unbroken slaves will find this disgusting, but it can cause beneficial oral fetishes to appear.
- <br> //''Drug fuckmachines'':// unbroken slaves will resent this, but it may cause beneficial anal fetishes to appear.
- <br> //''Personal armory'':// unlocks bodyguard options on the main menu.
- <br> //''Pharmaceutical Fabricator'':// requires a lot of @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ to buy and use; unlocks powerful drug upgrades.
- <br> //''Surgery upgrade'':// enables several extreme surgical options like virginity restoration and hermaphrodite creation.
-
- <br><br>''Special Upgrades''
- <br>Upgrades obtained during special events are listed here for reference. They cannot be purchased normally. Week:
- <br> ''24'': Arming yourself and or your <<= App.Encyclopedia.Dialog.linkSC("drones", "Security Drones")>> if installed.
- <br> ''62'': Establishing mercs.
- <br> ''65'': Giving your established mercs a unique title.
- <br> ''80'': Establish the <<= App.Encyclopedia.Dialog.linkSC("Special Force", "Special Force")>>. (if the mod is enabled)
-
-
-<<case "Personal Assistant">>
- //<<= properTitle()>>, I am your personal assistant.
-
- <br><br>Though I am a highly advanced program, I am not a true AI. I am neither sentient nor self-aware. My chief usefulness lies in my computing power, which is sufficient to run the arcology and all of its systems, and to monitor its huge suite of internal sensors. If it happens here, I know about it, and if it's important, I'll tell you. Through me, you are effectively omniscient within your arcology. Omnipotence will have to wait until I implant your slaves with control chips to convert them into my mindless fuckpuppet soldiery.
-
- <br><br>That was a joke.
-
- <br><br>I have been watching you and your slaves with close attention, so I have one other function to mention. I have learned a little of what constitutes successful slave training and husbandry. If you select the 'Rules Assistant' option on the main menu, I will review the rules your slaves are under and address any obvious problems. For example, I will place all disobedient slaves under restrictive rules.
-
- <br><br>I would say that it is a pleasure to serve, but you are no doubt @@.cyan;intelligent@@ enough to know that I cannot feel pleasure, making that a pointless pleasantry. Good day, <<= properTitle()>>.//
-
-
-<<case "The Wardrobe">>
- // The Wardrobe is a dressing area for all of your slaves, and a place where unused outfits are stored. Tailoring is available to make sure outfits fit each slave to your specifications. Here, players make choices about how slaves will appear in their dress, or lack of it. Choose outfits wisely to correspond to the culture that your citizens approve of, and your @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ will increase more quickly. Items that stretch or constrict such as plugs or corsets will eventually have a lasting impact on slaves anatomy.//
-
- <br><br>The wardrobe has two functions: First, individual slaves can be selected and then dressed in the wardrobe with anything from the basic clothing or shoes to the more exotic plugs and corsets. Secondly, players can access the wardrobe directly from the penthouse, and unlock collections of new outfits with ¤.
-
-
-<<case "The Auto Salon">>
- //Your auto salon is similar to the studio and the remote surgery, but is far less intimidating. It is set up like a single seat from an old world beauty salon, except that a series of manipulators descend from the ceiling towards the chair. It can perform any of the usual cosmetic services. The only special capability it has is to automatically color coordinate nails and makeup with a slave's hair. It is fashionable to apply color schemes to slaves, and this function will make following the trend easy. Your salon will cost @@.yellowgreen;<<print cashFormat($modCost)>>@@ per use. These procedures are not especially invasive, and you can perform as many of them as you wish during a single week without fear for your slave's health.//
-
- <br><br>The auto salon is mostly available for the player's experimentation. Some combinations of cosmetic options can have minor effects on some assignments and events, but these are very marginal. Slaves' appearances will differ in many scenes and events based on the player's cosmetic choices, but these details are for flavor only. As usual, gameplay effects are usually called out in explicit colored text; if they aren't, no major gameplay effects are happening.
-
-
-<<case "The Studio">>
- //Your studio was sadly neglected by the previous owner of the arcology, but is in great shape and ready for use.
-
- <br><br>There are remote surgical and tattoo implements if you wish to hire an artist to do the work for you, but there are also sophisticated piercing and tattoo implements that can help you plan and apply the work yourself. Select a body part and a desired modification, and they'll do the rest.
-
- <br><br>Your equipment will cost @@.yellowgreen;<<print cashFormat($modCost)>>@@ per use. These procedures are not especially invasive, and you can perform as many of them as you wish during a single week without fear for your slave's health.//
-
-
-<<case "The Remote Surgery">>
- Congratulations on your purchase of a Caduceus model remote surgical unit. This is the very last word in slave surgical alteration.
-
- <br><br>To use your remote surgery, simply strap a slave to the operating table and purchase surgical services. Any doctor can take control of the remote surgery by telepresence and operate on your slave. You have all the options of a modern hospital, right in the comfort of your own home.
-
- <br><br>— Owner's Manual, Remote Surgical Unit model 'Caduceus'
-
- <br><br>//It will cost @@.yellowgreen;<<print cashFormat($surgeryCost)>>@@ to purchase a doctor's telepresence and keep the equipment charged with the necessary materials. These procedures are invasive and will reduce a slave's health. Use drugs or rest to counteract this.//
-
-
-<<case "The Pharmaceutical Fab.">>
- Pharmaceutical fabricators are the cutting edge of modern medicine. They are in short supply and are therefore ruinously expensive, but can greatly reduce the cost of maintaining a large stable of slaves by cutting drug overhead. They are also the only source of a new generation of advanced drugs that must be tailored to the individual patient's biochemistry.
-
- <br><br>— Dodgson, Jane Elizabeth, //Pharmaceutical Review '32//
-
-
-<<case "Security Drones">>
- //As built, X-Series arcologies are equipped with basic security systems, and a complement of maintenance and cleaning drones.
-
- <br><br>
- The infrastructure that supports these drones is designed to be easily retrofittable to support new designs and classes of drones. One optional upgrade that may suit some owners particularly well is the addition of security drones. These are radically different than the slow, robust utility drones.
-
- <br><br>The X-Series security drone is undergoing a yearly upgrade cycle, but the entire family has some major features in common. All are light, multi-rotor flying drones with between three and six propulsors. Generally speaking, they favor speed and ease of handling over armor or endurance.
-
- <br><br>Their mobility is such that they can typically reach any point within the arcology in minutes. They are robust to damage but unarmored, and generally carry payloads of between two and five kilograms. Since they are designed to operate within or very close to the arcology, they have an autonomous endurance of less than an hour.
-
- <br><br>Standard kit includes hardened communications links to the arcology's computer systems, loudspeakers for public interface, and nonlethal compliance systems including tasers and chemical emitters.
-
- <br><br>— //X-Series Arcology Owners' Manual////
-
-
-<<case "Water Filtration">>
- //X-Series arcologies are, in many ways, comparable to massive organisms. Under this metaphor, their circulatory systems include thousands of <<if $showInches == 2>>miles<<else>>kilometers<</if>> of plumbing for water distribution and waste removal.
-
- <br><br>The X-Series has established a new state of the art in arcology moisture reclamation. Air conditioning, hydrofarming, sewage treatment, and plumbing systems work together to recycle water with an efficiency greater than 99.99%. When combined with the arcology's skin, which is cleverly shaped to catch and retain almost all rain that falls on it, importing water will become a thing of the past.
-
- <br><br>This system is carefully balanced. It is designed to work for decades without major maintenance, but it is limited to a certain maximum population. Major upgrades will be necessary should the arcology population exceed this figure. Fortunately, the system is designed to be almost infinitely expandable.
-
- <br><br>Finally, the X-Series has been designed from the ground up by slaveowners, for slaveowners. The standard X-Series arcology is not equipped for dairy operations, but the water filtration system has been designed to support dairy upgrades. With minimal additions, X-Series owners will be able to Pasteurize and store a nearly unlimited quantity of nature's bounty.
-
- <br><br>— //X-Series Arcology Owners' Manual////
-
-
-<<case "Slave Nutrition">>
- //Your X-Series arcology is designed to produce large quantities of high quality foodstuffs, from fresh vegetables to basic nutritive protein. The X-Series also produces the most advanced nutrition in the world. Our proprietary special slave nutrition system has been designed by slaveowners, for slaveowners, and truly makes the X-Series special.
-
- <br><br>This system produces a protein-rich drink that provides the physically active female body all its necessary nutrients. The artificial flavoring is specially designed to provide a palatable taste and texture while avoiding too much enjoyment and preventing excessive boredom. It supports a strong immune system and an energetic outlook.
-
- <br><br>It even causes a mild increase in sex drive. Our development team found that the slave body experiences a slight gain in libido merely from being so perfectly fed. It was simple and healthy to reinforce this effect with additives.
-
- <br><br>Our slave nutrition accomplishes all this while leaving the lower digestive tract extremely clean. We recommend your slaves undergo an occasional deep enema: under this regimen, slaveowners can be forgiven for forgetting that their slaves' anuses are involved in digestion at all. The designers of the X-Series @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>@@ that their clients can find other uses for them.
-
- <br><br>— //X-Series Arcology Owners' Manual////
-
-/**********
-ARCOLOGY FACILITIES
-**********/
-<<case "Facilities">>
- The arcology can be upgraded with a variety of facilities for slaves to live and work from. Each of the facilities is associated with an assignment. Sending a slave to a facility removes her from the main menu, removes her from the end of week report, and automates most management of her. Her clothes, drugs, rules, and other management tools are automatically run by the facility. However, her impact on your affairs will be substantially the same as if she were assigned to the corresponding assignment outside the facility. This means that things like @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ effects, future society developments, and branding are all still active.
-
- <br><br>Use facilities sparingly until you're familiar with what assignments do so you don't miss important information. When you're confident enough to ignore a slave for long periods, sending her to a facility becomes a good option. Sending a slave to a facility heavily reduces the player's interaction with her, keeps the main menu and end week report manageable, and prevents most events from featuring her, which can be useful when she's so well trained that events aren't as beneficial for her. Also, many facilities have leadership positions that can apply powerful multipliers to a slave's performance.
-
- <br><br>The <<= App.Encyclopedia.Dialog.linkSC("Arcade", "Arcade")>>, <<= App.Encyclopedia.Dialog.linkSC("Brothel", "Brothel")>>, <<= App.Encyclopedia.Dialog.linkSC("Club", "Club")>>, <<= App.Encyclopedia.Dialog.linkSC("Dairy", "Dairy")>>, and <<= App.Encyclopedia.Dialog.linkSC("Servants' Quarters", "Servants' Quarters")>> all correspond to basic productive assignments. The <<= App.Encyclopedia.Dialog.linkSC("Spa", "Spa")>>, <<= App.Encyclopedia.Dialog.linkSC("Cellblock", "Cellblock")>>, and <<= App.Encyclopedia.Dialog.linkSC("Schoolroom", "Schoolroom")>>, are a little different in that they focus on improving their occupants rather than producing something useful, since they correspond to the rest, confinement, and class assignments. As such, only slaves that can benefit from these facilities' services can be sent to them. When slaves in these facilities have received all the benefits they can from the facility, they will be automatically ejected, assigned to rest, and returned to the main menu. The <<= App.Encyclopedia.Dialog.linkSC("Head Girl Suite", "Head Girl Suite")>>, <<= App.Encyclopedia.Dialog.linkSC("Master Suite", "Master Suite")>>, <<= App.Encyclopedia.Dialog.linkSC("Farmyard", "Farmyard")>>, <<= App.Encyclopedia.Dialog.linkSC("Incubation Facility", "The Incubation Facility")>>, and <<= App.Encyclopedia.Dialog.linkSC("Pit", "Pit")>> are all completely unique.
-
-
-<<case "Arcade">>
- //It is every slave's final duty to go into the arcade, and to become one with all the arcology.
- — Anonymous slaveowner
-
- <br><br>The arcade (sometimes colloquially referred to as "the wallbutts") is an excellent example of one of the many ideas that was confined to the realm of erotic fantasy until modern slavery began to take shape. It has rapidly turned from an imaginary fetishistic construction into a common sight in the more 'industrial' slaveowning arcologies. Most arcades are built to do one thing: derive profit from the holes of low-value slaves.
-
- <br><br>Upon entering an arcade, one is typically presented with a clean, utilitarian wall like in a well-kept public restroom. Some have stalls, but many do not. In either case, at intervals along this wall, slaves' naked hindquarters protrude through. They are completely restrained on the inside of the wall, and available for use. Usually, the wall has an opposite side on which the slaves' throats may be accessed. The slaves' holes are cleaned either by mechanisms that withdraw them into the wall for the purpose, shields which extend between uses, or rarely, by attendants.
-
- <br><br>Arcades have become so common that most arcade owners attempt to differentiate themselves with something special. Some arcades have only a low wall so that conversations may be had between persons using either end of a slave; business meetings are an advertised possibility. Many specialize in a specific genital arrangement; others shield the pubic area so as to completely disguise it, reducing the slaves' identities to an anus and a throat only. Some attempt to improve patrons' experiences by using slaves who retain enough competence to do more than simply accept penetration, while others pursue the same goal by applying muscular electrostimulus for a tightening effect.
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
-
- <br><br>The ''Arcade'' is the //<<= App.Encyclopedia.Dialog.linkSC("Glory hole", "Glory Hole")>> facility.// Extracts @@.yellowgreen;<<= App.Encyclopedia.Dialog.linkSC("money", "Money")>>@@ from slaves; has extremely deleterious mental and physical effects. Arcades can be furnished according to <<= App.Encyclopedia.Dialog.linkSC("future society", "Future Societies")>> styles, and doing so will add a tiny amount of future society progress for each customer who visits.
-
-
-<<case "Brothel">>
- The ''Brothel'' is the //<<= App.Encyclopedia.Dialog.linkSC("Whoring", "Whoring")>> facility.// Slaves will make @@.yellowgreen;<<= App.Encyclopedia.Dialog.linkSC("money", "Money")>>@@ based on beauty and skills. Brothels can be the subject of an <<= App.Encyclopedia.Dialog.linkSC("ad campaign", "Advertising")>>. Brothels can be furnished according to <<= App.Encyclopedia.Dialog.linkSC("future society", "Future Societies")>> styles, and doing so will add a tiny amount of future society progress for each customer who visits.
-
-
-<<case "Cellblock">>
- The ''Cellblock'' is the //<<= App.Encyclopedia.Dialog.linkSC("Confinement", "Confinement")>> facility.// Will break slaves and return them to the main menu after they are obedient. The Cellblock can be furnished according to <<= App.Encyclopedia.Dialog.linkSC("future society", "Future Societies")>> styles, and doing so will add a slight @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ boost to slaves incarcerated there.
-
-
-<<case "Clinic">>
- The ''Clinic'' is one of two //<<= App.Encyclopedia.Dialog.linkSC("Rest", "Rest")>> facilities;// it focuses on slaves' health. The Clinic will treat slaves until they are <<= App.Encyclopedia.Dialog.linkSC("Healthy", "Health")>>, and will cure both injuries and illness. The Clinic can be furnished according to <<= App.Encyclopedia.Dialog.linkSC("future society", "Future Societies")>> styles, and doing so will add a slight @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ boost to slaves getting treatment there.
-
-
-<<case "Club">>
- The ''Club'' is the //<<= App.Encyclopedia.Dialog.linkSC("Public Service", "Public Service")>> facility.// Slaves will generate @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ based on beauty and skills. Clubs can be the subject of an <<= App.Encyclopedia.Dialog.linkSC("ad campaign", "Advertising")>>. Clubs can be furnished according to <<= App.Encyclopedia.Dialog.linkSC("future society", "Future Societies")>> styles, and doing so will add a tiny amount of future society progress for each citizen who visits.
-
-
-<<case "Dairy">>
- //This is the very first //Free Cities Husbandry Weekly// ever. I'm Val Banaszewski, and I'm the FCHW staff writer for dairy and dairy-related subjects. So, why do I do this, and why should you? Human breast milk is never going to be as @@.yellowgreen;<<= App.Encyclopedia.Dialog.linkSC("cheap", "Money")>>@@ and common as normal milk. Why bother?
-
- <br><br>First, it's really tasty! If you've never tried it, put FCHW no. 1 down now and go try it. Buy it bottled if you have to, but make an effort to take your first drink right from the teat. You'll only ever take your first sip of mother's milk once, and it should really be special. Everyone describes it a little differently, but I'd say it's a warm, rich and comforting milk with vanilla and nutty flavors.
-
- <br><br>Second, it's sexy! Decadence is in, folks. Many people move to the Free Cities to get away from the old world, but some come here to experience real freedom. The experience of drinking a woman's milk before, during, and after you use her just isn't something you pass up. Try it today.
-
- <br><br>— Banaszewski, Valerie P., //Free Cities Husbandry Weekly, February 2, 2032////
-
- <br><br>The ''Dairy'' is the //<<= App.Encyclopedia.Dialog.linkSC("Milking", "Milking")>> facility.// Only lactating
- <<if $seeDicks > 0>>
- or semen producing
- <</if>>
- slaves can be assigned; will use drugs to increase natural breast size
- <<if $seeDicks > 0>>
- and ball size, if present
- <</if>>.
- All Dairy upgrades have three settings, once installed: Inactive, Active, and Industrial. Inactive and Active are self-explanatory. Industrial settings require that the restraint upgrade be installed and maximized, and that extreme content be enabled. They massively improve production, but will produce severe mental and physical damage. Younger slaves will be able to survive more intense industrial output, but drug side effects will eventually force an increasingly large fraction of drug focus towards curing the slave's ills, reducing production. Dairies can be furnished according to <<= App.Encyclopedia.Dialog.linkSC("future society", "Future Societies")>> styles, and doing so will add a tiny amount of future society progress for each unit of fluid produced.
-
-
-<<case "Head Girl Suite">>
- The ''Head Girl Suite'' is a //unique facility.// Only a single slave can be assigned, and this slave will be subject to the <<= App.Encyclopedia.Dialog.linkSC("Head Girl", "Head Girl")>>'s decisions rather than the player's.
-
-
-<<case "Master Suite">>
- The ''Master Suite'' is the //<<= App.Encyclopedia.Dialog.linkSC("Fucktoy", "Fucktoy")>> facility.// Slaves will generate @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>,@@ but at a lower efficiency than on the club. The Suite can be furnished according to <<= App.Encyclopedia.Dialog.linkSC("future society", "Future Societies")>> styles, and doing so will add a slight @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ boost to slaves serving there.
-
-
-<<case "Pit">>
- The ''Pit'' is a //unique facility.// Unique in that slaves can perform standard duties in addition to being scheduled for fights in this facility.
-
-
-<<case "Schoolroom">>
- The ''Schoolroom'' is the //<<= App.Encyclopedia.Dialog.linkSC("Learning", "Attending Classes")>> facility.// Will educate slaves and return them to the penthouse after they are educated. The Schoolroom can be furnished according to <<= App.Encyclopedia.Dialog.linkSC("future society", "Future Societies")>> styles, and doing so will add a slight @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ boost to slaves studying there.
-
-
-<<case "Servants' Quarters">>
- The ''Servants' Quarters'' is the //<<= App.Encyclopedia.Dialog.linkSC("Servitude", "Servitude")>> facility.// Reduces weekly upkeep according to servants' obedience. Accepts most slaves and is insensitive to beauty and skills. The Quarters can be furnished according to <<= App.Encyclopedia.Dialog.linkSC("future society", "Future Societies")>> styles, and doing so will add a slight @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ boost to slaves serving there.
-
-
-<<case "Spa">>
- The ''Spa'' is one of two //<<= App.Encyclopedia.Dialog.linkSC("Rest", "Rest")>> facilities;// it focuses on slaves' mental well-being. The Spa will heal, rest, and reassure slaves until they are at least reasonably <<= App.Encyclopedia.Dialog.linkSC("Healthy", "Health")>>, happy, and free of <<= App.Encyclopedia.Dialog.linkSC("Flaws", "Flaws")>>. The Spa can be furnished according to <<= App.Encyclopedia.Dialog.linkSC("future society", "Future Societies")>> styles, and doing so will add a slight @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ boost to slaves resting there.
-
-
-<<case "Nursery">>
- The ''Nursery'' is used to raise children from birth naturally. Once a spot is reserved for the child, they will be placed in the Nursery upon birth and ejected once they are old enough. The Nursery can be furnished according to <<= App.Encyclopedia.Dialog.linkSC("future society", "Future Societies")>> styles, and doing so can add a slight @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ boost to slaves working there.
-
-
-<<case "Farmyard">> /* TODO: this will need more information */
- The ''Farmyard'' is where the majority of the <<= App.Encyclopedia.Dialog.linkSC("food", "Food")>> in your arcology is grown, once it is built. It also allows you to house animals<<if $seeBestiality == 1>>, which you can have interact with your slaves<</if>>. The Farmyard can be furnished according to <<= App.Encyclopedia.Dialog.linkSC("future society", "Future Societies")>> styles, and doing so can add a slight @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ boost to slaves working there. /* TODO: this may need to be changed */
- <br>//This entry still needs work and will be updated with more information as it matures. If this message is still here, remind one of the devs to remove it.//
-
-
-/**********
-FACILITY BONUSES
-**********/
-<<case "Advertising">>
- ''Ad campaigns'' can be run for both the <<= App.Encyclopedia.Dialog.linkSC("Brothel", "Brothel")>> and the <<= App.Encyclopedia.Dialog.linkSC("Club", "Club")>>. Naturally, these advertisements will feature lots of naked girls, providing the opportunity to give either facility a cachet for offering a specific kind of girl. Under the default, nonspecific settings, all slaves in the facilities will receive minor bonuses to performance. If specific body types are advertised, slaves that match the advertisements will receive an enhanced bonus, while slaves that do not will get a small penalty. However, instituting a specific ad campaign will prevent slaves in that facility from getting <<= App.Encyclopedia.Dialog.linkSC("Variety", "Variety")>> bonuses.
-
-
-<<case "Variety">>
- ''Variety'' bonuses are available for slaves in the <<= App.Encyclopedia.Dialog.linkSC("Brothel", "Brothel")>> and the <<= App.Encyclopedia.Dialog.linkSC("Club", "Club")>>. Offering a variety of slaves will provide a small bonus to performance for everyone in the facility, regardless of which qualities they possess:
- <br> Slim vs. Stacked
- <br> Modded (heavily pierced and tattooed) vs. Unmodded
- <br> Natural Assets vs. Implants
- <br> Young vs. Old
- <<if $seeDicks != 0>><br>- Pussies and Dicks<</if>>
-
- <br><br>Variety bonuses, if any, will be called out in the facility report at the end of the week. <<= App.Encyclopedia.Dialog.linkSC("Advertising", "Advertising")>> that the facility specializes in any of these areas will supersede variety bonuses for the related qualities. Staffing a facility to appeal to all tastes can be more challenging than building a homogeneous stable and advertising it, but is both powerful and free.
-
-/**********
-TERRAIN TYPES
-**********/
-<<case "Terrain Types">>
- //Future room for lore text//
-
- <br><br>Choose a more particular entry below:
- <br>
-
-<<case "Urban Terrain">>
- ''Urban'' terrain is one of the possible settings for the Free City in which the arcology is located. It provides:
- <br> @@.yellow;Low@@ minimum slave value and initial @@.yellow;bear market@@ for slaves.
- <br> @@.green;High@@ ease of commerce with the old world.
- <br> @@.green;High@@ access to refugees and other desperate people.
- <br> @@.red;Low@@ cultural independence.
-
-
-<<case "Rural Terrain">>
- ''Rural'' terrain is one of the possible settings for the Free City in which the arcology is located. It provides:
- <br> @@.yellow;High@@ minimum slave value and initial @@.yellow;bull market@@ for slaves.
- <br> Moderate ease of commerce with the old world.
- <br> Moderate access to refugees and other desperate people.
- <br> Moderate cultural independence.
-
-
-<<case "Marine Terrain">>
- ''Marine'' terrain is one of the possible settings for the Free City in which the arcology is located. It provides:
- <br> Moderate minimum slave value and initially balanced market for slaves.
- <br> Moderate ease of commerce with the old world.
- <br> @@.red;Low@@ access to refugees and other desperate people.
- <br> @@.green;High@@ cultural independence.
-
-
-<<case "Oceanic Terrain">>
- ''Oceanic'' terrain is one of the possible settings for the Free City in which the arcology is located. It provides:
- <br> @@.yellow;High@@ minimum slave value and initial @@.yellow;bull market@@ for slaves.
- <br> Moderate ease of commerce with the old world.
- <br> @@.red;Very low@@ access to refugees and other desperate people.
- <br> @@.green;Very high@@ cultural independence.
- <br> Ensures access to slaves from all over the world and will not associate the arcology with a continent.
-
-/**********
-FUTURE SOCIETIES
-**********/
-<<case "Future Societies">>
- //The evolution of society has never been linear. Times of unrest and upheaval produce rapid change, followed by long periods of stasis in the absence of the necessary ingredients for further change. The world is undoubtedly in the midst of a time of great change: society is certainly evolving. But into what?
-
- <br><br>Not since antiquity have single persons held as much practical power over the direction of society as Free Cities arcology owners now have. Naturally, different Free Cities notables are going different ways with their great power. Many are building new societies as different from each other as they are from the old world.
-
- <br><br>One arcology might hold a society that is moving towards a fundamentalist interpretation of an old slaveholding religious tradition. Another might pay homage to historical racially segregated societies. A third might see intentional manipulation of gender roles that have held since the start of recorded history. And these three arcologies might well be each other's neighbors.
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, Online Edition. Accessed April 2, 2032.////
-
- <br><br>''Future Society Models'' are societal goals the player can select and pursue for the arcology. It is possible to maintain four future society goals at once. The first is unlocked after week 5 for players with greater than rumored(<<print num(3000)>>) @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>,@@ or at game start with the Social Engineering character option; the rest unlock as the player achieves higher @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ levels.
-
- <br><br>All societies approve of specific things, usually slaves with specific characteristics; some societies also have dislikes. All societies are advanced by the things they approve of and slowed by the things they disapprove of, and all societies give and take @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ when approving and disapproving. All societies unlock unique events, arcology upgrades, and slave behaviors; some even unlock special clothing.
-
- <br><br>@@.yellowgreen;<<= App.Encyclopedia.Dialog.linkSC("Money", "Money")>>@@ can be expended to directly advance future societies; the spending level can be set from the future society submenu of the arcology management menu. These funds are automatically spent each week. Once a future society is fully adopted (as noted on the future society submenu), this spending does not advance the society further. However, it can provide a guarantee against loss of progress should the player do something the society strongly disapproves of. Also, the spending is applied equally to all active future society models, meaning that there is no loss of efficiency in spending if the player has two maximized models and one still under development.
-
-
-<<case "Ethnic Supremacy">>
- ''Ethnic Supremacy'' is a future society model which approves of slaves not of the chosen race and disapproves of slaves of the chosen race.
- <br> Improves the perceived beauty of racially superior slaves.
- <br> Drastically lowers the desire of racially superior slaves.
- <br> Can be developed to affect the ethnic balance and economics seen in the slave market.
- <br> Provides demand for slaves of inferior races from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
-
-
-<<case "Ethnic Subjugationism">>
- ''Ethnic Subjugationism'' is a future society model which approves of slaves of the chosen race.
- <br> Reduces the perceived beauty of racially inferior slaves.
- <br> Drastically increases the desire to use racially inferior slaves.
- <br> Provides demand for slaves of the disfavored race from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
-
-
-<<case "Gender Radicalism">>
- ''Gender Radicalism'' is a future society model which approves of hormonal and surgical feminization and slaves with dicks.
- <br> Improves the value of slaves with dicks and slaves with balls.
- <br> Can be developed to affect the biology seen in the slave market, and subtly influence arcology society.
- <br> Provides demand for slaves with dicks from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Provides demand for hormonally treated slaves from the corporation.
- <br> Provides demand for futanari<<if $seeDicks != 0>> and ballsless bitches<</if>> from the corporation.
- <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Gender Fundamentalism", "Gender Fundamentalism")>>.
-
-
-<<case "Gender Fundamentalism">>
- ''Gender Fundamentalism'' is a future society model which approves of pregnancy and fertility and disapproves of slaves who retain testicles.
- <br> Reduces the slave value penalty due to pregnancy and reduces the beauty of slaves with dicks, though gelding can ameliorate this.
- <br> Like Gender Radicalism, can be developed to affect the biology seen in the slave market, and subtly influence arcology society.
- <br> Provides demand for naturally female slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Gender Radicalism", "Gender Radicalism")>>.
-
-
-<<case "Paternalism">>
- ''Paternalism'' is a future society model which approves of @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>,@@ slaves choosing their own assignments, good education, mental health treatment, and high <<= App.Encyclopedia.Dialog.linkSC("Health", "Health")>>; it disapproves of stupidity and undereducation.
- <br> Applies a small @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ boost to all slaves and increases fines paid by citizens who injure whores and public servants.
- <br> Increases the @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ penalty for operating an arcade.
- <br> Slows increases in the ratio of slaves to citizens.
- <br> Can be developed to build a @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trusting", "Trust")>>@@ society that welcomes new slaves.
- <br> Provides demand for careful slave breaking from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Provides demand for gentle cosmetic surgeries from the corporation.
- <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Degradationism", "Degradationism")>>.
-
-
-<<case "Degradationism">>
- ''Degradationism'' is a future society model which approves of frightened or mindbroken slaves, glory holes, the arcade, and heavy tattoos and piercings; it disapproves of @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>@@ (except for the Head Girl and Recruiter) and slaves choosing their own assignments.
- <br> Makes intelligent slaves less attractive and stupid slaves more attractive.
- <br> Can apply unique names to slaves.
- <br> Drives an increase in the ratio of slaves to citizens.
- <br> Eliminates the fines paid by citizens who injure whores and public servants.
- <br> Eliminates the @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ penalty for operating an arcade.
- <br> Can be developed to increase demand for glory holes and arcades.
- <br> Provides demand for brutal slave breaking from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Provides demand for stupid slaves from the corporation.
- <br> Provides demand for cruelly altered slaves from the corporation.
- <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Paternalism", "Paternalism")>>.
-
-
-<<case "Body Purism">>
- ''Body Purism'' is a future society model which approves of unimplanted slaves and no heavy tattoos or piercings; disapproves of implants.
- <br> Improves value of slaves without implants.
- <br> Can be developed to affect goods seen in the slave market and work towards a solution to the long term effects of drug use.
- <br> Provides demand for slaves without implants from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Transformation Fetishism", "Transformation Fetishism")>>.
-
-
-<<case "Transformation Fetishism">>
- ''Transformation Fetishism'' is a future society model which approves of implants and extreme surgery; disapproves of slaves without implants.
- <br> Reduces value of slaves without implants.
- <br> Can be developed to radically affect goods seen in the slave market.
- <br> Provides demand for slaves with implants from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Body Purism", "Body Purism")>>.
-
-
-<<case "Maturity Preferentialism">>
- ''Maturity Preferentialism'' is a future society model which approves of older slaves.
- <br> Improves value of older slaves, but reduces value of young slaves.
- <br> Will not entirely eliminate the usual preference for younger slaves.
- <br> Can be developed to make it easier for older player characters to maintain @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ and advance the arcology's prosperity.
- <br> Provides demand for older slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Youth Preferentialism", "Youth Preferentialism")>>.
-
-
-<<case "Youth Preferentialism">>
- ''Youth Preferentialism'' is a future society model which approves of younger slaves.
- <br> Improves value of younger slaves, but reduces value of old slaves.
- <br> Can be developed to make it easier for younger player characters to maintain @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ and advance the arcology's prosperity.
- <br> Provides demand for young slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Maturity Preferentialism", "Maturity Preferentialism")>>.
-
-
-<<case "Slimness Enthusiasm">>
- ''Slimness Enthusiasm'' is a future society model which approves of slaves with girlish figures; disapproves of slaves with stacked figures.
- <br> Improves value of slim slaves, but reduces value of stacked slaves.
- <br> Can be developed to affect goods seen in the slave market and improve slave health.
- <br> Provides demand for unexpanded slaves at a healthy weight from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Asset Expansionism", "Asset Expansionism")>>.
-
-
-<<case "Asset Expansionism">>
- ''Asset Expansionism'' is a future society model which approves of slaves with very large body parts.
- <br> Improves value of stacked slaves.
- <br> Can be developed to radically affect goods seen in the slave market.
- <br> Provides demand for asset expansion from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Slimness Enthusiasm", "Slimness Enthusiasm")>>.
-
-
-<<case "Pastoralism">>
- ''Pastoralism'' is a future society model which approves of lactation, cockmilking, and the dairy.
- <br> Improves value of milk and semen.
- <br> Drives an increase in the ratio of slaves to citizens.
- <br> Can be developed to massively improve value of milk and semen.
- <br> Provides demand for production focused asset expansion from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
-
-
-<<case "Physical Idealism">>
- ''Physical Idealism'' is a future society model which approves of musculature, height, and health.
- <br> Improves value of slaves with <<= App.Encyclopedia.Dialog.linkSC("muscles", "Musculature")>>.
- <br> Can be developed to affect goods seen in the slave market.
- <br> Provides demand for muscular slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Hedonistic Decadence", "Hedonistic Decadence")>>.
-
-
-<<case "Chattel Religionism">>
- ''Chattel Religionism'' is a future society model which approves of appropriate clothing, high @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>,@@ and <<= App.Encyclopedia.Dialog.linkSC("slave marriages", "Slave Marriages")>>; it disapproves of slutty clothing.
- <br> Applies a small @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ boost to all slaves, and can remove the weekly @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devotion", "From Rebellious to Devoted")>>@@ gain cap.
- <br> Drives an increase in the ratio of slaves to citizens.
- <br> Can be developed to permanently boost @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ and quicken slaves' mental conditioning.
- <br> Provides demand for sexual training from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Multiculturalism", "Multiculturalism")>>.
-
-
-<<case "Multiculturalism">>
- ''Multiculturalism'' is a future society model which advances differently than other models: it is improved by the investment of more future society model slots, which can be withdrawn individually if desired. No other advancement occurs and all benefits at each level are available instantly.
- <br> Provides free @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ each week.
- <br> Increases arcology prosperity each week.
- <br> Helps prevent citizens from falling into slavery, slowing population drift towards slaves.
- <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Chattel Religionism", "Chattel Religionism")>>.
-
-
-<<case "Roman Revivalism">>
- ''Roman Revivalism'' is a future society model which approves of good leadership qualities like wealth and strong defense; disapproves of debt.
- <br> Improves rate of prosperity gain and at high levels will drive down all slave prices.
- <br> Can apply unique names to slaves.
- <br> Slows increases in the ratio of slaves to citizens.
- <br> Can be developed to greatly improve the arcology's resistance to insurrection.
- <br> Provides demand for basic educations from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with the other Revivalist models.
-
-<<case "Aztec Revivalism">>
- ''Aztec Revivalism'' is a future society model which approves of qualities like good military education and an older leader.
- <br> Improves all military acquisitions of slaves and allows for the sacrifice of slaves for @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>.@@
- <br> Can apply unique names to slaves.
- <br> Slows increases in the ratio of slaves to citizens.
- <br> Can be developed to greatly rely on the Head Girl position as an advisor and assistant.
- <br> Provides demand for menial slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with the other Revivalist models.
-
-
-<<case "Egyptian Revivalism">>
- ''Egyptian Revivalism'' is a future society model which approves of keeping a large harem, slave incest, and having a wide racial variety of public slaves.
- <br> Improves value of slaves in incestuous relationships and efficiency of fucktoys in improving @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>.@@
- <br> Can apply unique names to slaves.
- <br> Slows increases in the ratio of slaves to citizens.
- <br> Can be developed to improve the Head Girl position, with an additional bonus for Head Girls married to the Concubine, and a massive bonus if the Head Girl is also related to the Concubine.
- <br> Provides demand for exotic accents from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with the other Revivalist models.
-
-
-<<case "Neo-Imperialism">>
- ''Neo-Imperialism'' is a future society model which approves of high wealth, prosperity, and personal combat skills and disapproves of weakness and poverty in leaders.
- <br> Improves rate of prosperity gain and can be developed to increase rents via Imperial Barons.
- <br> Slows increases in the ratio of slaves to citizens.
- <br> Can be developed to improve the Arcology's combat prowess and resistance to insurrection via Imperial Knights.
- <br> Provides demand for healthy slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with all Revivalist models.
-
-
-<<case "Edo Revivalism">>
- ''Edo Revivalism'' is a future society model which approves of provision for the arcology's cultural development by providing a large number of public servants or club girls, which increases with @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>;@@ disapproves of failure to do so.
- <br> Improves efficiency of public servants and club girls.
- <br> Greatly improves beauty of Japanese slaves.
- <br> Can be developed to greatly improve the efficiency of direct spending on future societies.
- <br> Provides demand for unaccented slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with the other Revivalist models.
-
-
-<<case "Arabian Revivalism">>
- ''Arabian Revivalism'' is a future society model which approves of keeping a large number of fucktoys and slaves in the master suite, which increases with @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>;@@ disapproves of failure to do so.
- <br> Grants a bonus to the price received when selling slaves.
- <br> Can be developed to improve the efficiency of direct spending on future societies and moderately increase rents.
- <br> Provides demand for more @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devoted", "From Rebellious to Devoted")>>@@ slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with the other Revivalist models.
-
-
-<<case "Chinese Revivalism">>
- ''Chinese Revivalism'' is a future society model which approves of maintaining a solid imperial administration by keeping a Head Girl, a Recruiter, and a Bodyguard; disapproves of failure to do so.
- <br> Increases prosperity growth when all three of these positions are staffed.
- <br> Greatly improves beauty of Chinese slaves.
- <br> Can be developed to permit the Head Girl to see to an additional slave each week.
- <br> Provides demand for @@.cyan;intelligence@@ from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Mutually exclusive with the other Revivalist models.
-
-<<case "Repopulationism">>
- ''Repopulation Focus'' is a future society model. It:
- <br> Approves of pregnant slaves and slaves that have given birth.
- <br> Improves value and beauty of pregnant slaves.
- <br> Can be developed to radically affect goods seen in the slave market.
- <br> Provides demand for lactating slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Provides demand for young slaves from the corporation.
- <br> Is mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Eugenics", "Eugenics Focus")>>.
- <br><br><i>Repopulationism is a difficult Future Society and not recommended for beginners. Try to keep as many slaves as possible visibly pregnant; if they're pregnant but not showing yet, Pregnancy Biometrics Collars can help.</i>
-
-<<case "Eugenics Focus">>
- ''Eugenics'' is a future society model. It:
- <br> Disapproves of slave reproduction.
- <br> Drastically reduces value and beauty of pregnant slaves.
- <br> Opens benefits exclusive to the connections made by the powerful individuals attracted to the arcology.
- <br> Provides demand for gelded slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Provides demand for skilled slaves from the corporation.
- <br> Provides demand for smart slaves from the corporation.
- <br> Is mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Repopulation Focus", "Repopulationism")>>.
- <br>It is made up of four to five social classes: Slaves, low class citizens, chosen slaves, elite citizens, and the Societal Elite: a group of individuals with vast connections and wealth attracted by the promises of a society built around them. Low class citizens are encouraged to face testing and join the ranks of the elite, though the cost of failing the test is sterilization; a detail that is not revealed until after the test is complete.
- <br><br><i>Eugenics is a difficult Future Society and not recommended for beginners. For a more complete guide to playing with a Eugenics arcology, see the <<= App.Encyclopedia.Dialog.linkSC("Guide to Eugenics", "Guide to Eugenics")>></i>.
-
-<<case "Slave Professionalism">>
- ''Slave Professionalism'' is a future society model. It:
- <br> Approves of intelligent, well-trained slaves.
- <br> Improves value and beauty of smart slaves.
- <br> Dislikes slaves ruled by their libido.
- <br> Can be developed to radically affect goods seen in the slave market.
- <br> Provides demand for smart slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Provides demand for educated slaves from the corporation.
- <br> Provides demand for trained slaves from the corporation.
- <br> Is mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Intellectual Dependency", "Intellectual Dependency")>>.
-
-<<case "Intellectual Dependency">>
- ''Intellectual Dependency'' is a future society model. It:
- <br> Approves of horny, vapid slaves.
- <br> Improves value and beauty of moronic slaves.
- <br> Can be developed to adore bimbo bodies.
- <br> Can be developed to radically affect goods seen in the slave market.
- <br> Allows for <<= App.Encyclopedia.Dialog.linkSC("the Schoolroom", "Schoolroom")>> to be radically redesigned.
- <br> Provides demand for idiotic slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Provides demand for young slaves from the corporation.
- <br> Provides demand for uneducated slaves from the corporation.
- <br> Is mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Slave Professionalism", "Slave Professionalism")>>.
-
-<<case "Petite Admiration">>
- ''Petite Admiration'' is a future society model. It:
- <br> Approves of slaves shorter than <<= lengthToEitherUnit(160)>>.
- <br> Improves value and beauty of sufficiently short slaves.
- <br> Can be developed to accept relative shortness.
- <br> Can be developed to radically affect goods seen in the slave market.
- <br> Provides demand for shorter slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Is mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Statuesque Glorification", "Statuesque Glorification")>>.
-
-<<case "Statuesque Glorification">>
- ''Statuesque Glorification'' is a future society model. It:
- <br> Approves of slaves taller than <<= lengthToEitherUnit(170)>>.
- <br> Improves value and beauty of sufficiently tall slaves.
- <br> Can be developed to accept relative tallness.
- <br> Can be developed to radically affect goods seen in the slave market.
- <br> Provides demand for taller slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Is mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Petite Admiration", "Petite Admiration")>>.
-
-<<case "Hedonistic Decadence">>
- <br>''Hedonistic Decadence'' is a future society model. It:
- <br> Approves of overindulgence and luxury.
- <br> Improves value and beauty of heavyset slaves.
- <br> Can be developed to radically affect goods seen in the slave market.
- <br> Provides demand for pampered slaves from <<= App.Encyclopedia.Dialog.linkSC("the corporation", "The Corporation")>>.
- <br> Provides demand for skilled slaves from the corporation.
- <br> Mutually exclusive with <<= App.Encyclopedia.Dialog.linkSC("Physical Idealism", "Physical Idealism")>>.
-
-/**********
-LORE: THE FREE CITIES TODAY
-**********/
-<<case "Lore">>
- //Future room for lore text//
-
- <br><br>Choose a more particular entry below:
- <br>
-
-<<case "Money">>
- //Digital currencies have come a long way in the past twenty years. From the poorly managed, excessively ideological, incompetently run experiments whose failures inspired years of public skepticism, they have matured into a reliable means of exchange. The technical details are unimportant for all but students of economics, since broad diversification and clever design have made them reliable and stable means of exchange. With so many old world currencies collapsing, they are coming to dominate world commerce at last.
-
- <br><br>The diversified bundle of assets that constitutes the unit of exchange that allows the Free Cities to function is commonly referred to as the "credit" and denoted in print by a ¤ symbol. It is unusually valuable for a basic monetary unit, but the extreme wealth concentration seen in most of the Free Cities makes this a feature rather than a flaw. Estimating its value is extremely difficult, since the value of goods and services varies wildly between Free Cities, and even more wildly between any given Free City and the surrounding old world.
-
- <br><br> Direct comparisons of purchasing power across long gulfs of time are often unscientific. Such comparisons usually rely on indexing currencies to a good or a market basket of goods, ignoring the constant shifts in the value of goods and services throughout history. The best that a responsible economist can do for a historical value of the ¤ is to give a range. Depending on the index good, the 2037 ¤ can be argued to be worth anywhere between thirty and several hundred US dollars.
-
- <br><br>— St. Croix, Marianne, "Digital Currencies: A Review," //Journal of Economics, March 2037////
-
-<<case "Food">>
- //An army marches on its stomach. Likewise, an arcology cannot function without sustenance.
-
- Please expand this. I'm not good at writing lore. — DCoded//
-
-
-<<case "Disease in the Free Cities">>
- //In light of some recent alarmism, it's time for the medical profession to clear the air about diseases.
-
- <br><br>Over the course of the 21st century, diseases and disease treatments have become more powerful, side by side. New disease vectors, antibiotic resistances, and even malicious engineering have combined to make infectious agents tougher. However, medicine has advanced as well, with distributed fabrication techniques and genetic sequencing making tailored drugs widely available to those with the resources to afford them.
-
- <br><br>This sounds like balance. In the old world, however, it looks like the bugs may be winning. Life expectancy is beginning to settle to pre-antibiotic levels. Meanwhile, in the Free Cities, medicine is <<= App.Encyclopedia.Dialog.linkSC("nymphomania", "Nymphomania")>>: better health care and the ubiquity of modern medicine have nearly eliminated disease as a day-to-day concern.
-
- <br><br>If you want simple advice, here it is: fuck your Free Cities slaves bareback, but wrap up if you visit the old world.
-
- <br><br>— Dodgson, Jane Elizabeth, //FC Med Today, March 25, 2032////
-
-
-<<case "Free Cities Justice">>
- //The Free Cities are not lawless.
-
- <br><br>The only law respected across all Cities is the enforcement of contracts. Some Cities have limited regulation of other areas, but in general, the only justice available comes when a contract has been breached.
-
- <br><br>Different Cities have taken different approaches to the obvious problem of dealing with criminal conduct, which in the old world breaks no traditional contract. The most common approach is to require everyone to sign contracts with the owners of their homes and workplaces to commit no crimes while there. In this way, what would be murder in the old world is a breach of the contract with one's landlord not to murder on his property.
-
- <br><br>Penalties for such conduct are usually left to the imagination of the property owner. With the traditional roles of judge, jury, and jailer concentrated into the hands of a single wealthy person, rich potentates of the Cities hold more personal power over their tenants than anyone since the great feudal lords seven centuries ago.
-
- <br><br>— Torstein, Jens Learned, //The Modern Libertarian Paradise, March 25, 2032////
-
-
-<<case "Modern Anal">>
- //The modern acceptance and frequency of heterosexual anal sex has only increased with the return of slavery.
-
- <br><br>There are numerous reasons for this. First and most obviously, the fact that many men now own women and can thus dictate sexual relations has popularized a sex act that has always appealed to many men. Second, the extremely libertine culture of the Free Cities has placed slaveowners in a perpetual contest with one another for sexual decadence; voluntarily //not// using a slave in all possible manners is considered unusual and even prudish. Third, the assignment of some persons born without natural vaginas to status as female sex slaves has served to make standard the use of the orifice that all slaves, regardless of biological particulars, share in common.
-
- <br><br>Finally, the development of the now-common slave diet has played a part. In addition to providing slaves with bland, featureless and mildly aphrodisiac nutrition, standard slave nutriment is a cleverly designed liquid diet that almost completely stops the normal digestive processes that might interfere with sex of this kind.
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
-
-
-<<case "Slave Couture">>
- //My name is Danni Diemen, and I'm here today to talk about your slaves' clothes.
-
- <br><br>Let's break it right down into categories, shall we?
-
- <br><br>''First, clothes for your disobedient bitches.'' We must keep them uncomfortable, yes? The old reliable is //slave clothes//, sometimes referred to as straps. These give her that sex slave allure while keeping her nice and uncomfortable. You can also go for full coverage with //latex//. A suit of that will keep her totally reliant on your little whims. //Plugs// are nice sturdy leather affairs with inward-facing dildos for all the holes — and I do mean all. They're good stuff for breaking a bitch, and she might even learn to take dick a bit better! Word to the wise: not a good idea if you want those holes tight, though. Finally, //corsets//. These will make life tough, but that's good for a @@.orangered;<<= App.Encyclopedia.Dialog.linkSC("rebellious", "From Rebellious to Devoted")>>@@ little cunt, no? And corseting might just narrow that waist. But never mind, on to my favorites.
-
- <br><br>''Second, nice attire for your prize stock.'' These clothes will keep your good slaves happy. You know, women out in the old world still wear //attractive lingerie// UNDER clothing? Absurd. It's lovely on it's own. If you're looking to be a bit more fun and a bit less classy, go for //string lingerie// instead. You could even let her choose her own //slutty outfits//; watching livestock dress itself is always good fun. When you can afford proper //slutty jewelry//, who needs clothes? I suggest accenting heavy piercings with this. For your hookah fanatics and decadent harem masters, there's //sheer gauze//. Makes even a clumsy girl look like she's dancing to a zither.
-
- <br><br>Finally, //chastity belts//. Hard to categorize. Different bitches react in different ways to having the front door locked. Depends on how much traffic goes in the back, I find.
-
- <br><br>— Van Diemen, D. C. G., //Free Cities Fashion (FCF), March 2032////
-
-
-<<case "Slave Marriage">>
- //Marriage between slaves is one of the facets of slave culture that has varied the most between historical slave societies. Many forbade it entirely, considering it a source of sedition. Others permitted it, but accorded it little force of law. A few have offered it some limited protections even against the slaveowner's will.
-
- <br><br>Most Free Cities fall into the middle case. Many slaveowners find it amusing to permit their slaves to form and even formalize long term relationships. Slave wives are often permitted to live and work together, sharing a little room and enjoying some measure of sexual exclusivity. Of course, it is just as common for slave wives to be marketed together in brothels.
-
- <br><br>To date, none of the Free Cities has extended any real legal protection to slave marriages. There is nothing to stop a slaveowner from separating slave wives by sale.
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
-
-
-<<case "The Ejaculate Market">>
- //Fun has a price.
-
- <br><br>Understanding this is the only way to understand some emerging markets in the Free Cities. This maxim often receives criticism from the uninformed, but all it means is that enjoyment is a good (or service) that can be bought and sold like any other. The market for exotic varieties of fun has never been more open than it is right now.
-
- <br><br>The forming market for ejaculate can only be understood in this context. In the old world, a thriving market for semen for insemination purposes has been thriving for a long while. In the Free Cities, however, homogenized ejaculate is now available in quantities and at prices that make it obvious that it's being put to other uses. Semen is nutritionally marginal; it has some cosmetic applications, but like every other natural cosmetic it has long since been eclipsed by artificial means. The only possible explanation is that many citizens of the Free Cities find various combinations of slaves and large volumes of ejaculate an amusing combination.
-
- <br><br>Anecdotes abound. Some slaveowners claim that using it as a dietary additive with the knowledge of their slaves enforces an extra layer of degradation and sexual servitude while habituating the unfortunates to oral sex.
-
- <br><br>— Editorial, //FC Daily Economic Report, October 13, 2031////
-
-
-<<case "Gingering">>
- //Like much of the traditional husbandry terminology, 'gingering' is a term whose meaning in the Free Cities is slowly diverging from its original old world definition. In animal husbandry, especially of horses, gingering is the nearly extinct practice of placing an irritant compound (traditionally ginger, hence the term) inside one of the animal's orifices, typically the anus, in order to make the animal step high, be sprightly, and generally behave energetically due to the discomfort. Though it was sometimes used at shows and competitions, the usual application was to make the animal seem more valuable for sale.
-
- <br><br>In the Free Cities, 'gingering' is coming to mean any drugging or other temporary adulteration of a slave in order to make her seem more valuable. For poorly broken slaves, stimulants and depressants are both common. These can be applied to make a resistant slave seem less @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("rebellious", "From Rebellious to Devoted")>>,@@ or a terrified slave more @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trusting", "Trust")>>,@@ though of course this is unreliable.
-
- <br><br>More traditional gingering is also sometimes applied. Many new slaves will naturally present their buttocks if an anal irritant is administered in an attempt to relieve the uncomfortable area. Novices to the slave markets may mistake this for sexual promiscuity, though few experienced brokers are likely to be misled, a clue as to why few experienced brokers seriously oppose gingering.
-
- <br><br>Some markets attempt to stamp out the practice, but most do not. It is generally accepted as permissible gamesmanship on the part of slave vendors, part of the natural skirmishing between buyers and sellers. In some areas it may even be considered lazy and even offensive for a seller to not doctor his human wares: it denies the buyer an opportunity to exercise his acumen in discovering what has been administered, and might even indicate that the seller is not making an effort in more important areas, too. Finally, many in the Free Cities might ask what proper slave dealer would willingly forgo the amusing sight of a girl bouncing with discomfort because someone has just roughly inserted a finger coated with ginger oil into her rectum.
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
-
-
-<<case "Dyes">>
- //Fantastic news for every fashion oriented citizen and slaveowner: Your slave's hair color must no longer be exclusively chosen by one the bland @@.darkviolet;<<= App.Encyclopedia.Dialog.linkSC("authority", "Security Expansion")>>@@-approved colors "blazing red", "neon green", "neon blue", "neon pink", "platinum blonde", "dark brown", "brown", "auburn", "black", "blonde", "blue", "burgundy", "chestnut", "chocolate", "copper", "ginger", "golden", "green", "grey", "hazel", "pink", "red", "blue-violet", "purple", "dark orchid", "sea green", "green-yellow", "dark blue", "jet black", and "silver".
-
- <br><br>Today, we are proud to announce that our, the Free Cities Dyes Department, Research and Development team, found 140 new and exciting ways to color your slave's capital hair. The <a target="_blank" href="https://www.w3schools.com/colors/colors_names.asp">extensive list</a> with the names of all the available colors will be made available to the public, soon.
-
- <br><br>Please be aware, when you place your order on a custom dye, your description should be precise. Preparing, mixing and shipping is a fully automated process. You may put spaces into the color name. For example, "dark violet" will be handled as "darkviolet". Be sure to put the desired color at the beginning of your description. "Dark violet with silver highlights" is a solid description. Avoid anything too exotic or convoluted. With a description like "weird-ass color with a reddish tint", you will probably end up with red hair. Our guesswork is only so good.
-
- <br><br>We hope to extend the applicability to body hair and even skin in the near future, too.
-
- <br><br>— Free Cities Dyes Department R&D, "Announcing exciting Dyes of the Future," //Press Conference, January 7th 2037////
-
-
-/**********
-LORE: FREE CITIES CULTURE TOMORROW
-**********/
-<<case "The New Rome">>
- ////SCFC//
- <br> — Free Cities armor pauldron inscription; "Slaveholders and Citizens of the Free Cities"
-
- <br><br>In the Free Cities, Rome is come again.
-
- <br><br>No people before or since have influenced modern society so deeply as the Romans. The Free Cities are, in return, emulating the Romans more deeply than any other society since their time. Based on the writings, great and low, that have come down to us from that innovative, grasping, and deeply licentious people, it seems that the Romans would likely approve of their posterity.
-
- <br><br>Fine historical parallels are probably lost on the person with XY chromosomes who is brought to the Free Cities, enslaved, treated thenceforth as female, and expected to behave as female on pain of severe punishment (sometimes with gender reassignment surgery to match, but often without). This redefinition of gender is common in the Free Cities: being penetrated makes one female, while penetrating makes one male. It almost certainly arose as a way for citizens to partake in all that a slave society has to offer, sexually, without reconsidering their own sexual identity. It is not identical to Roman sexual mores, but the Romans are the closest precedent.
-
- <br><br>This new and evolving system of sexual values does not free citizens from all expectations. Quite to the contrary, many find it just as restrictive as old world values, although differently so. For example, a naturally heterosexual female arcology owner who indulges in vanilla sex with masculine slaves will typically find her strength and acumen being questioned for no other reason than that she permits slaves to penetrate her.
-
- <br><br> — Lawrence, J. K., and Bolingbroke, D. S., __Trends in Free Cities Culture, 2031__ //Journal of Modern Social Sciences, International Edition, February 2032////
-
-<<case "The Return of Feudalism">>
- //By the Powers invested in me by the Board of Directors and the Rightful Executive Lord of Arcology F-8, His Majesty King William the First, I proclaim you a Knight, and grant you the right to two slaves, a monthly stipend of six hundred credits and one unit of stock in the Arcology, and the authority to bear a noble Coat of Arms...
- <br> — Count Felix II von Feight, Knighthood Ceremony recorded in 2032
-
- <br><br>Once thought to have been a relic of an ancient, less enlightened time, the simultaneously decentralized and individual-focused corporate power structures of the Free Cities has led to the return of feudal power structures. For many arcologies, this has simply occurred without attention or fanfare, as increasingly serf-like underclasses accept the domination of ever-more-powerful executives and elites; some arcologies, such as F-8, have manifested entire, complex new social systems involving 'Kings' and 'Emperors' from which all corporate authority flows.
-
- <br><br>Originally the idea of an individual crowning himself absolute 'Emperor' of a free city seemed absurd, or even totalitarian, and the first Free City petty kings were met with mockery. This mocking tone appears to have quickly faded from popular Free Cities culture, however, likely due to the realization that new 'Imperial' power structures came with a host of benefits to the wealthy and elite of the arcology that adopts them.
-
- <br><br>More than simply being rich, the elites of Neo-Feudal, or Neo-Imperial arcologies dub themselves 'Barons' and 'Counts', putting themselves not only monetarily but also socially above the common masses and giving those who hold seats on boards of directors or invest stock in the arcology a physical advantage over their benighted underlings. To the common citizen, the result is ultimately the same, as a factory worker remains a peasant whether he's known as a serf or a citizen. But to the wealthy and distinct within the arcology, the new Feudalism creates a long list of titles and accomplishments to jockey for, manifesting a strange new culture in which junior executives compete with one another for the attention of outright 'Kings' in the hope of one day acquiring the limitless prestige felt by the select caste of neo-Imperial nobility.
-
- <br><br> — Lawrence, J. K., and Bolingbroke, D. S., __Trends in Free Cities Culture, 2031__ //Journal of Modern Social Sciences, International Edition, February 2032////
-
-
-<<case "Naked, Barefoot, and Pregnant">>
- //...and helpless, and illiterate, and dependent...
- <br> — Anonymous slaveowner, on the ideal woman
-
- <br><br>It must be admitted that some of the boldest statements of early 21st century social justice advocates are now receiving some justification in the Free Cities. A tourist visiting some of the more notorious arcologies is given a public, in-person lesson in precisely what some men are willing to do with women they own. For every misogynist credo there is a Free Cities slaveowner putting it into practice.
-
- <br><br>Recent reactionism spawned by 20th century social movements pales in comparison to traditionalism, however. Reactionaries of the early 21st century may have breathlessly taken some extreme positions, but for a return to traditional values, true traditionalists have proven themselves to be the unquestioned masters. There are certainly arcologies in which no free women are permitted. The authors recommend that anyone inclined to hold such arcologies up as the extreme by which all others are to be judged should first visit one of the few arcologies in which no free women are permitted, //and// no contraceptives of any kind are permitted, either.
-
- <br><br> — Lawrence, J. K., and Bolingbroke, D. S., __Trends in Free Cities Culture, 2031__ //Journal of Modern Social Sciences, International Edition, February 2032////
-
-
-<<case "The Top">>
- //The Master never beats me half as hard as the Head Girl. She fucks me harder, too.
- <br> — Anonymous slave
-
- <br><br>The safest slave society is a stratified slave society. Innovative Free Cities slaveowners are carefully differentiating their chattel, ensuring that favored slaves are interposed between them and the masses of their lesser stock. This is one of the oldest principles of leadership, ensuring that the grind of day-to-day direction and correction comes from subordinate leaders, while rewards and planning come from the top. The addition of sexuality to this model simply means that many Free Cities slaves get it, so to speak, from both ends.
-
- <br><br>There can be great advantages for talented and hardworking slaves. Out in the old world, crime, war, natural disasters, and simple crushing want often strike with little distinction based on @@.cyan;intelligence,@@ skill, or strength. A truly excellent individual serving in a well-thought-out arcology can rise to a position of considerable @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>@@ and power on her merits. It would be foolish to over-romanticize the reality of slavery, however, for all that advancement rests entirely on the whim of her owner. Talent can count for little for girls unlucky enough to find themselves owned by a capricious master.
-
- <br><br> — Lawrence, J. K., and Bolingbroke, D. S., __Trends in Free Cities Culture, 2031__ //Journal of Modern Social Sciences, International Edition, February 2032////
-
-
-<<case "The Bottom">>
- //Public servant today, whore tomorrow, glory hole bitch next month.
- <br> — Anonymous slave
-
- <br><br>Slaves at the top of the Free Cities hierarchy enjoy a standard of life far above the average free citizen of the old world. However, slaves at the bottom do not. As the Free Cities redefine what it means to be human, they can be extraordinarily callous to those people who are excluded from the new rubric.
-
- <br><br>Free Cities glory holes are perhaps the ultimate expression of the dark side of modern slavery. In the old world, glory holes were mostly a sexual fantasy, and were confined to certain sexual subcultures where they did exist in reality. Free Cities glory holes are different both in that they exist, and are indeed very common; and in that their occupants are almost never present voluntarily.
-
- <br><br>Glory holes and slave brothels have a symbiotic existence, and any Free Cities slaveholder who owns a brothel full of pampered prostitutes who claims moral ascendancy for not owning an arcade is ignoring realities. In truth, all slave brothels benefit from the existence of arcades. After all, every slave whore in the Free Cities knows that if she does not perform up to her Master's standards, the arcades exist as a way of extracting value from her body. Every slave brothel receives better efforts out of its slaves due to their knowledge that a worse alternative is always available — if not with their current master, then with some other.
-
- <br><br> — Lawrence, J. K., and Bolingbroke, D. S., __Trends in Free Cities Culture, 2031__ //Journal of Modern Social Sciences, International Edition, February 2032////
-
-<<case "The Sons of Sekhmet">>
- //Bhalwi al-sham asmik qalbik, abna Sakhmat damkun. (By the Sun I grasp your Heart, the Sons of Sekhmet have your Blood.)
- <br> — Mantra, unknown author
-
- <br><br>Described as the "logical continuation of terrorism within the new world" by a prominent arcology owner, The Sons of Sekhmet are a global terrorist organization notorious for its viciousness and worldwide strike capacity. Formed in 2018 by Quati ibn Malek, the leader of a relatively minor sect of cat worshippers within Egypt, the Sons gained notoriety for seizing one of the first arcology clusters in the Sahara Desert and defending it from multiple incursions by old world peacekeeping forces. Ibn Malek was successfully assassinated by the Egyptian government in 2024, but the Sons have been resilient to being dislodged from their desert stronghold, and have used the resources of an arcology cluster to expand their presence and doctrine onto the global stage.
-
- <br><br>Their use of cell tactics and frequent insurgent action against arcology owners has led to comparisons with the Daughters of Liberty, but this is a misguided comparison. Where the Daughters are an ideologically-motivated anti-slavery organization, the Sons long ago cast off their ideological roots to adopt a brutal, pragmatic approach to terrorism with few considerations other than the expansion of their own power; Sekhmet cells frequently use slaves as footsoldiers and suicide bombers, but their primary approach to recruitment is with the poor and downtrodden of arcologies and old world nations. Basic Sons doctrine holds that the Old World was destroyed by wealthy, hedonistic plutocrats who have fled their failed nations to the arcologies to live out lives of decadence as the world they shattered collapses, leaving the "common people" to starve in their wake. This simple mantra attracts disgruntled individuals from around the world, and the Sons maintain an extremely online presence, with underground cells active in nearly every old world nation.
-
- <br><br>The capability of the Sons to provide manufactured weaponry and training, and their willingness to do so to anyone willing to pledge their life to the Orange Sun, makes them exceptionally dangerous. The Sons seize any possible oppurtunity to expand their wealth and power, and frequently launch assassination attempts on prominent public figures, sabotauge essential facilities, and attempt to stir chaos and unrest in vulnerable regions, often with the intent of stepping in and seizing power for themselves once the area has been sufficiently destabilized. Unlike many smaller-scale terrorist groups, the Sons produce some of the best-trained killers and thugs in the New World, and lie almost completely out of the reach of old world nations and arcology owners alike in their scorching desert arcology. Any responsible arcology owner should be aware of the orange sun used as the logo of the Sons of Sekhmet and take care to not expose themselves to any weakness.
-
- <br><br> — Lawrence, J. K., and Bolingbroke, D. S., __Trends in Free Cities Culture, 2031__ //Journal of Modern Social Sciences, International Edition, February 2032////
-
-
-<<case "The Purity of the Human Form">>
- //Twentieth century eugenicists weren't wrong, they just didn't have the tools to be right.
- <br> — Anonymous
-
- <br><br>High quality Free Cities slaves are remarkably healthy. It should be unsurprising that a population of humans selected for beauty, fed perfectly, required to exercise, given modern medical care, and prevented from indulging any non-sexual excess at all, has become quite impressive in this regard. The cultural fallout of this has been less easy to predict.
-
- <br><br>Throughout the early part of the 21st century a wide spectra of movements were taking place that have informed the Free Cities ideology of body purism. The left-wing counterculture health movement has found much open ground in a society that allows its adherents to totally control what goes into the bodies of some of its members. On the opposite side of the spectrum, some long-standing reactionary groups have taken this opportunity to experiment with some of their non-racial theories on purity. Finally, many religious or simply moral fundamentalists who believe in some form of purity code now have a captive population to subject to their whims.
-
- <br><br>Thousands of unintentional experiments on what really makes the ideal human are now under way in the Free Cities, and whatever the balance of humanity may feel about their morality, it is hard to deny that we as a whole stand to benefit from the experimentation.
-
- <br><br> — Lawrence, J. K., and Bolingbroke, D. S., __Trends in Free Cities Culture, 2031__ //Journal of Modern Social Sciences, International Edition, February 2032////
-
-
-<<case "A World Built on Implants">>
- //The earlier a slave gets on advanced growth hormones, the better. After all, good-looking implants are a ratio game. The bigger a girl's natural tits are, the bigger implants she can get without looking ridiculous.
- <br> — standard Free Cities surgical advice
-
- <br><br>One of the most furious ideological divides in the Free Cities is over implants. Most Free Cities arcologies display a mix of slaves with breast and other implants, but some follow the tastes of owners who strongly prefer all-natural slaves, and some fetishize expansionism to the point of near-universal implantation. This can be a remarkably bitter controversy in places, and should Free Cities culture continue to develop, it is not unlikely that some day physical violence may take place in the Free Cities between extremists on opposite sides of the implant debate.
-
- <br><br>In any case, the medical technology of implantation has not advanced hugely since the start of the 21st century. The vast majority of implants are still either water-bag or silicone, with silicone generally preferred for its better, more realistic feel. At the more extreme sizes, a variety of fluid-based designs are used, with polypropylene string implants making a return, and newer, fillable adaptive implants becoming more common.
-
- <br><br> — Lawrence, J. K., and Bolingbroke, D. S., __Trends in Free Cities Culture, 2031__ //Journal of Modern Social Sciences, International Edition, February 2032////
-
-
-<<case "Slaves as Stock">>
- //Here we have a fine piece for the dairy folks
- <br>Fine dairy cow for you here ladies and ge-entlemen
- <br>Who'll give me ten thousand ¤?
- <br>Ten thousand ¤ bid, now ten thousand five,
- <br>Now ten thousand five, will you give me eleven?
- <br>Thirty-two years old, nipples the size of silver dollars
- <br>Eleven thousand ¤ bid, eleven, eleven?
- <br> — Free Cities auctioneer
-
- <br><br>At different points in the history of slavery, slaves have been nearly equal to or even in some cases superior to the lowest classes of free citizen, and have been nearly as low as or even lower than the most valuable categories of animal livestock. Which will become the Free Cities norm remains to be seen; there are arcologies that exemplify either approach. A few arcologies apply both standards, and standards in between, all at once.
-
- <br><br>The present, however, is a time of great supply in the slave market. The social collapse of many societies in the old world and the perpetual conflicts in many areas are producing an immense number of captives for sale, keeping prices at historically low levels. Many slaveowners treat their chattel relatively well, but this comes from motivations other than financial necessity. With no laws requiring it and no economic reason to treat slaves as different from livestock, many citizens of the Free Cities see little reason to make a distinction. Spectacular expressions of this callousness, like the restraint of women for use as milk production devices or the usage of dangerous dosages of growth hormones, become more understandable when one realizes that the Free Cities are refining what was once a settled idea: what it means to be human.
-
- <br><br> — Lawrence, J. K., and Bolingbroke, D. S., __Trends in Free Cities Culture, 2031__ //Journal of Modern Social Sciences, International Edition, February 2032////
-
-
-<<case "Slavery and the Physical Ideal">>
- //Quoth BRODIN:
- <br>All must lift.
- <br> — Anonymous
-
- <br><br>The medical impacts of the widespread reintroduction of slavery are not at all what might have been predicted twenty years ago. Medicine is not our primary focus in this review of Free Cities cultural trends, but a brief look at the striking medical outcomes is critical to understanding some of the social currents at work. By the second half of the twentieth century, the majority of humanity had reached a state of plenty so great that the health dangers of excess were greater than the health dangers of want.
-
- <br><br>For the first time in modern memory, people — slaves — in the Free Cities are, in large numbers, doing exactly what their doctors recommend. Properly managed slaves eat right, exercise regularly, and do not smoke, drink, or do recreational drugs. These simple but revolutionary changes mean that the more valuable classes of slave are healthier, on average, than any group of human beings has ever been.
-
- <br><br>Naturally, fetishism, competitiveness, and leisure have intersected to create in the Free Cities a constant escalation of physical one-upmanship when it comes to the training of slaves. Wonderfully muscled specimens have become very common, with feats of athletic prowess cited alongside sexual accomplishments without any distinction. The arcology owners most @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devoted", "From Rebellious to Devoted")>>@@ to the human form are creating societies of uniform physical perfection unlike anything in human history.
-
- <br><br> — Lawrence, J. K., and Bolingbroke, D. S., __Trends in Free Cities Culture, 2031__ //Journal of Modern Social Sciences, International Edition, February 2032////
-
-
-<<case "Faith in the Free Cities">>
- //I recognize my faults;
- <br>I am always conscious of my sins.
- <br>I have sinned against you, Master and God,
- <br>And done what you consider evil.
- <br>So you are right in judging me;
- <br>You are justified in condemning me.
- <br> — Anonymous slave, 2030
-
- <br><br>There are almost as many approaches to faith in the Free Cities as there are arcologies. For every arcology owner who cynically exploits religion, there is another who truly believes himself to be ordained by God as master of his fellow human beings. Nevertheless, common elements are identifiable. The most notorious arise from literal readings of scriptural passages that reference slavery.
-
- <br><br>Each of the three major monotheistic religions arose in a time and place where slavery was common. Thus the institution appears in all three of the great monotheistic holy books. It is childishly simple to find all the scriptural support for a reintroduction of slavery even the most illiberal arcology owner could desire in any one of these. This is presumably not what religious conservatives of the late 20th and early 21st centuries intended when advocating scriptural literalism.
-
- <br><br> — Lawrence, J. K., and Bolingbroke, D. S., __Trends in Free Cities Culture, 2031__ //Journal of Modern Social Sciences, International Edition, February 2032////
-
-/**********
-LORE: INTERVIEWS
-**********/
-<<case "Slave Whore, Arcology K-2">>
- Interview with a slave whore
- <br>"The Rose Petal," Arcology K-2, April 21, 2036
-
- <br><br>//Good afternoon. What's your name?//
- <br>Um, what? Are, um, you going to fuck me? I mean, whatever you want to do is okay.
-
- <br><br>//I'd like to learn more about you.//
- <br>Um, okay. My name is Candace Ass, I'm twenty years old, and I'm one of the slave whores here at the Petal. Um, what else?
-
- <br><br>//How did you become a slave? Tell me about how you got here.//
- <br>Sure. Well, uh, it's kind of boring. I was at a club, and I guess someone put something in my drink, and I passed out, and well [laughs nervously] here I am, I guess?
-
- <br><br>//What happened when you woke up?//
- <br>Oh, like, you want me to tell you my life story?
-
- <br><br>//Sure.//
- <br>Would it be okay if you fucked me while I tell you? I, uh, can't really think right now. I guess I could also suck — but then I wouldn't be able to talk? Here, please, please stick — oh, okay. Okay! Uh. Yeah. [giggles] That feels better. Thanks!
-
- <br><br>//Why couldn't you talk without being fucked?//
- <br>Well, we're all really horny. I'm really horny. Everything does it. The hormones, and all the training, and the drugs, and it's also kind of a habit, you know? It's been almost an hour! If you do it slow like that I'll be okay. [giggles] Yeah. Thank you!
-
- <br><br>//You can touch yourself if it helps you think more clearly.//
- <br>Oh thanks but, um, no. That's okay. It's actually really sensitive. Like, um, nobody touches it? And we're not allowed to do that alone anyway. So this is, um, good for me. I'm used to it, I get off like this a lot. If you do it much harder I'll cum, but if you just do it like that, I'll edge for a while. Um, so we can talk? Is that what you wanted?
-
- <br><br>//You were telling me about being enslaved.//
- <br>Well, I woke up with a guy on top of me. Kind of like now! But, like, he was really pounding me. It kind of hurt, but I was still really drugged. And I was already on the slave drugs too. And then they put me through a bunch of tests and stuff. That first buttfuck wasn't really a test, it was just a slaver using me. All the new girls get used. But later they tested me a lot, and showed me a bunch of porn and stuff. I think it was to see what I liked. Then they put me in a little room, like a cell, and kept me there for a while.
-
- <br><br>/How long were you there?//
- <br>I don't really know? All I really did was sleep. It's what happens when you're getting a lot of drugs and need curatives to keep them from hurting you. You just sleep a lot. And when you're awake, you're really groggy and can't remember much. It makes it easier.
-
- <br><br>//It makes what easier?//
- <br>Being raped. I mean, um, that was before I was trained a lot? So I didn't like it most of the time guys fucked me in the ass. But I just laid there and let it happen mostly. I heard from girls later that the slave market I was at uses that as a test, actually.
-
- <br><br>/A test of what?//
- <br>Well if a new girl is all drugged up and, you know, gets hard and cums when they fuck her, she gets special treatment. A girl they caught with me, I think she came the first day, and she's, like, a Concubine now? But if a girl still fights on all the drugs they put her in the arcade. Most just lie there like me, which means they need better hormones. So then they clip you.
-
- <br><br>//Perform an orchiectomy, you mean?//
- <br>Yeah, cut your balls off. [giggles] I don't remember. I just noticed one day that I was really soft and they were gone. And then I started getting really soft and growing better boobs, and the slavers who came in and used me seemed cuter. I asked one of he wanted a blowjob, and then they took me out and trained me a little.
-
- <br><br>//Sexual training?//
- <br>No, no, just obedience and stuff. I mean, they trained me by making me suck cock and bend over and take it up the butt, but no, like, sex classes. But still mostly sleeping. It's like, I would wake up being fucked, and when the guy was done and had injected whatever into me and made me follow a few commands, I'd go shower and then go back to bed again. Weeks and weeks like that, and then some surgeries.
-
- <br><br>//What surgeries have you had?//
- <br>Lots! [giggles] Um, lip implants. [kissing noise] Obviously. And some little face stuff, like, bone stuff on my jaw and cheekbones. They did something to my throat, and after not letting me talk for a week my voice was high like it is now. Shoulders and hips, more bone stuff. Those hurt, I slept for like a week after each and they left me alone. Butt implants. And boobs, like, obviously. Three times, bigger each time. If they give you the big kind right away you get stretch marks and it's ugly. They say they're going to do it at least once more, so they're bigger than my head. [giggles]
-
- <br><br>//When did you move to the brothel?//
- <br>Well Mistress bought me! I think they decided I was ready to be sold when I started asking for sex. They fuck you regularly, like, it's on a schedule? To get you into the habit, and also to get your asshole used to being a fuckhole. And I started wanting it more than the schedule, and cumming almost every time. So they sold me. Mistress kept me for a week, and then sent me down to the brothel.
-
- <br><br>//What was that week like?//
- <br>Um, I'm not supposed to talk about that? But, um, she fucked me, of course. That's not a big secret. Most sex slaves on the drugs and the training and stuff need sex, like, a lot. So if we're serving only one person, we have to beg. It's nice working here, I don't have to beg much. Oh! And that's also when Mistress picked my name and style. Since my skin is so pale, and my asshole bleached to pink, I'm pink! Pink hair, pink lips, pink nails, pink collar, pink heels, pink asspussy. Candy Ass!
-
- <br><br>//How long have you been here?//
- <br>Well, ever since Mistress sent me here! So like a year?
-
- <br><br>//Do you know what you'll be doing in the future?//
- <br>Um what? Working here I guess? I don't understand.
-
- <br><br>//How long do you think you'll be here?//
- <br>Well I guess the oldest girl here is around forty? [giggles] She's nice, I like her. She has these huge soft boobs, and her milk is really nice. So I'm twenty, so twenty years I guess?
-
- <br><br>//How many customers do you see a day?//
- <br>It depends, like, it depends on what they want? Like a long fuck or something weird like you, it takes a while, but most just want me to suck them off or take their cock up my butthole. Fifteen maybe?
-
- <br><br>//That means you're going to have sex in this brothel more than 100,000 times.//
- <br>The way you say that make it sound like a lot. Oh! Oh, uh, you want me to -
-
- <br><br>//Be quiet, slave.//
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition//
- Appendix A, Interviews
-
-
-<<case "Slave Acolyte, Arcology V-7">>
- Interview with a Chattel Religionist acolyte
- <br>Main plaza, Arcology V-7, April 28, 2036
-
- <br><br>Good morning, honored visitor! I'm Patience; how may I serve you?
-
- <br><br>//Good morning. What do you do here?//
- <br>Why, I am an acolyte of the Prophet! I have the ordained and undeserved glory of being one of his slaves. I do my unworthy best to do whatever he in his infinite wisdom commands me. Today I am a public servant on the plaza, and it is my duty and pleasure to greet visitors to his arcology, Sir, and to serve them in whatever way I can.
-
- <br><br>//You seem very enthusiastic.//
- <br>Oh thank you Sir! The Prophet says that the best slave is beautiful and cheerful, but if a slave cannot be both, it is much better for her to be cheerful. [laughs] So I do my best to be cheerful. May I ask what brings you to his arcology, Sir?
-
- <br><br>//You may. I travel from arcology to arcology. A tourist, you might say. And I write about what I find.//
- <br>That's wonderful! I'd be happy to share anything with you, anything at all. The Prophet says that all slavery is holy, but Sir, I think his arcology must be more holy than most. And the Prophet says that acolytes are to always be honest, for the holy have nothing to hide.
-
- <br><br>//I see that.//
- <br>[laughs] My habit, you mean? You must be joking, Sir! It covers most of me.
-
- <br><br>//Tell me about it.//
- <br>With pleasure, Sir. It is white, because all sex slaves are pure. It covers my head and my shoulders but leaves my face bare so that everyone may see me smile. My breasts are bare because, the Prophet says, they are especially holy things, beautiful, and sexual, and nourishing. They must also be bare so that all can see how they are pure and unspoiled by false implants. My belly is bare to show that I have the very great honor of carrying new slaves for the Prophet. I have a golden belt with a strip of cloth in front and behind, because the Prophet says that sometimes, the imagined sight of a slave's holes are as beautiful as the true sight of them.
-
- <br><br>//You must be carrying twins.//
- <br>Yes, Sir, twins. I hope very much to be blessed with triplets next time.
-
- <br><br>//Are they the Prophet's?//
- <br>[laughs] Oh, no, Sir! I am just an unworthy old acolyte, not one of the Prophet's wives. I was blessed with the seed of one of the Prophet's breeding girls, much better seed than I deserve. She is young and very beautiful, much more beautiful than me, and many acolytes receive her seed so they can make beautiful new slaves.
-
- <br><br>//Between your pregnancy and your breasts, doesn't standing out here on the plaza tire you out?//
- <br>No, Sir. Look here, Sir; [turns sideways] a good acolyte has strong legs, and I exercise twice a day. We must be strong to bear new slaves, work hard, and give pleasure without tiring. I can serve you standing, Sir, even like this. May I show you?
-
- <br><br>//Perhaps later. You seem proud of your body.//
- <br>I am! The Prophet says that a holy slave may certainly be proud of the way in which she serves. I am not beautiful and I am not young, but I am healthy and strong and I am proud of that. I am blessed to be in an arcology where I can take pride in such things.
-
- <br><br>//What do you do when you are not being bred or serving in public?//
- <br>Well, Sir, those are my roles as one of the Prophet's many slave acolytes. In daily life, do you mean, Sir? Well, as I said I exercise a great deal. To maintain my body I must eat a lot, so I have to work hard or I will become fat. Other than that, I live up above us, Sir, in a lower level of the Prophet's penthouse, in a room with my wife. It's a simple life.
-
- <br><br>//Your wife?//
- <br>Yes, Sir, my wife Perseverance. There she is, Sir, on the other side of the plaza. One of the ones dressed like me. She has bigger boobs, but she isn't as pregnant right now. [points]
-
- <br><br>//She looks a lot like you.//
- <br>Well, she should, Sir, we're sisters. The Prophet says that slave marriages between sisters are very holy, as long as no seed passes between them, and of course no seed can pass between us, because we both have pussies. I love her very much.
-
- <br><br>//Did you always?//
- <br>Well yes! Oh, I see, Sir. No, no not that way. It was very hard for us, for a long time, but the Prophet is very wise. We were unworthy and slow to accept his wisdom, but he was patient with us and we learned in the end.
-
- <br><br>//That's certainly impressive. How did he teach you?//
- <br>Many ways, of course, Sir, but the Prophet is so wise that he often brings slaves to teach themselves by his wisdom. He has many ways of filling a slave with radiant sexual desire, Sir, so many ways, and they are so powerful, that she must find some way of getting relief. And the Prophet provided that we were each other's only source of relief.
-
- <br><br>//How was that hard for you?//
- <br>The Prophet says that it is natural for it to be hard, and as in all things he was right. We were ashamed, and we cried afterward, every time, for a long time. But we became accustomed to each other's bodies, and we saw that many sister-wives were happy, and no one looked down on us. So we agreed with each other to stop being ashamed.
-
- <br><br>//You're completely comfortable speaking about being married to your sister, here in the plaza?//
- <br>Sir, I'm completely comfortable saying here in the plaza that when I awoke this morning, she was sucking the milk from one of my nipples, and that we brought each other to orgasm twice before we came out to the plaza today. I love her! I hope you will let us serve you together.
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition//
- Appendix A, Interviews
-
-
-<<case "Public Slave, Arcology A-3">>
- Interview with a public slave subject to Degradationism
- <br>Main plaza, Arcology A-2, April 16, 2036
-
- <br><br>P-please, Sir! Please fuck me, Sir!
-
- <br><br>//Very well. I will ask, though: why?//
- <br>B-because I'm overdue, Sir. If I d-don't get someone to f-fuck me soon, my c-collar will hurt me, Sir. Oh please, oh — oh thank you Sir, please, please — oh, OH —
-
- <br><br>[Some time later.]
- <br>[Slave collar chimes.]
-
- <br><br>//What was that?//
- <br>Oh, um, [sniff] Sir, the arcology detected that you came inside me, Sir. That means that I have a little time before I have to get fucked again, Sir. [sniff]
-
- <br><br>//All public slaves are subject to this system?//
- <br>All of the Mistress's public slaves, Sir. Some other owners use it, some don't. [sniff] It's s-supposed to make us g-good public representatives for the arcology's slaves. B-because it makes us d-desperate. [sniff] Sir.
-
- <br><br>//You seem articulate, slave. What were you before enslavement?//
- <br>I was a s-student, Sir.
-
- <br><br>//I see. Slave, I would like to learn more about the arcology. You will accompany me as I tour it. If you answer my questions as I do so, I will fuck you when your collar requires it.//
- <br>Oh, thank you, Sir. Thank you. Um, how long will you be here, Sir?
-
- <br><br>//None of your concern. Who is the person in that cage hanging there?//
- <br>I don't know, Sir. And, Sir, that's not, um, a person. She's a slave, Sir.
-
- <br><br>//I see. What sorts of things are punished that way?//
- <br>Oh, lots of things, Sir. Hesitating. Dropping things. Touching a dick or a clit with teeth. Letting cum spill. Anyone can put a slave in one of the cages; they're public, Sir, and anyone can use a slave in them. You see they're kind of shaped so that the slave is positioned so her holes are sticking out, Sir?
-
- <br><br>//Follow me.//
- <br>Yes, Sir. [winces] Oh. Um, sorry, Sir.
-
- <br><br>//Does it hurt to walk in those shoes?//
- <br>N-no, Sir. I need the heels to walk. It's the chain between my nipples that hurts a little when I walk, Sir, and it bounces around. I was wincing, earlier, partly because I was bouncing around, and it hurt, Sir.
-
- <br><br>//And yet you orgasmed.//
- <br>It's h-hard not to, Sir. I have a smart piercing that makes me orgasm, Sir.
-
- <br><br>//Why do you need heels to walk?//
- <br>Because my tendons have been clipped, Sir.
-
- <br><br>//What did you do?//
- <br>Um, nothing, Sir? It wasn't a punishment, all slaves have their tendons clipped. The heels are a reward. If we're not good, we have to crawl, Sir.
-
- <br><br>[Walking.]
-
- <br><br>//Was that fear I just saw?//
- <br>Yes, Sir.
-
- <br><br>//Why?//
- <br>That's the main dairy ahead of us, Sir.
-
- <br><br>//Is it open to the public?//
- <br>T-t-to view, yes, Sir.
-
- <br><br>//Follow me.//
- <br>Y-yes, Sir. [sniff]
-
- <br><br>//That is quite an impressive sight.//
- <br>Yes, Sir.
-
- <br><br>//Do you know how large they are?//
- <br>Th-th-their breasts, Sir? About t-twenty or twenty five liters e-ea-each, S-Sir.
-
- <br><br>//Why does this frighten you so much?//
- <br>W-well, I'll, um, be put in here, Sir. Someday. Oh. [sniff]
-
- <br><br>//Why?//
- <br>All slaves are p-put in h-here, when they're loose, Sir. All the, the, the //sex,// it's just to loosen us, s-so those //things// will fit inside...
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition//
- Appendix A, Interviews
-
-
-<<case "Mercenary, Arcology B-2">>
- Interview with a Free Cities mercenary
- The Wild Goose, Arcology B-2, March 11, 2036
-
- <br><br>//Good evening.//
- <br>No offense, but I only fuck girls.
-
- <br><br>//None taken, and I'm just looking for conversation.//
- <br>'k, buy the next round and converse away.
-
- <br><br>//Done. Fine to meet you. I'm touring the arcologies, writing a book. I'd like to ask you about life as a mercenary here in the Free Cities.//
- <br>[laughs] Shit, I'm going to be famous.
-
- <br><br>//If you'd like to be. I'm W.G.; what's your name?//
- <br>Well, W.G., I'll answer questions for your book, but I don't actually want to be famous. No names.
-
- <br><br>//That works fine for me. How did you become a mercenary?//
- <br>I was a soldier, and the pay was shit, so instead of re-upping I went merc. Boring, but pretty common, believe me. Half the old world militaries are just merc training camps now. You enlist, and then you get out as soon as you have enough experience that a mercenary group'll take you on.
-
- <br><br>//Did you have combat experience?//
- <br>[laughs] You know your shit. No, no I did not. I wasn't even infantry. Dirty little secret you probably already know: if you're a girl, most merc groups don't give a fuck what experience you actually have, 'cause either way, they win.
-
- <br><br>//I think I understand, but lay it out for me.//
- <br>If you're a good troop, you're a good troop and they come out ahead. Rifle don't care what equipment the merc holding it has. If you're not a good troop, they tie you up in a shipping container, use you 'till they get bored, and then sell you. And they come out ahead. Win-win.
-
- <br><br>//You obviously came out on the right side of that, but did you suffer any abuse before then?//
- <br>Nah. It'd be dumb to do anything to a newbie and then not enslave 'em. What, you're gonna rape somebody and then give 'em two-forty rounds, four frags, and a satchel charge? Fuck no.
-
- <br><br>//That's what you carry?//
- <br>Yeah fuck that subject anyway. And yeah, when taking prisoners isn't on the agenda. I'm a big girl, I can manage eight mags in a double deck chest rig. If we are taking prisoners, then swap out half the frags for gas and half the mags for an underslung S. G. with beanbags and taser rounds. Though you never want to use any of that, nonlethals included.
-
- <br><br>//Because you might damage the merchandise?//
- <br>Because you might damage the merchandise. Did you know it's possible to burst an implant with a beanbag round? Well, it's possible to burst an implant with a beanbag round.
-
- <br><br>//You know I have to ask about that now.//
- <br>And I wouldn't have said it if I didn't want to tell the story. Not a long one anyway. Old world mob boss asshole with a moored yacht full of hoes, all tats and fake tits and shit. We went in quick without enough muscle and the guards resisted. Perfect op is, you go in so heavy that nobody resists, but it was rushed and we had to put 'em down. So all these bitches are running around screaming their heads off and we get the call that the police are coming. Didn't want to shoot it out with them since the tip came from a cop in the first place. So we had a couple of minutes to grab what we could and jet. So, beanbags, zipties, bodybags, and off — we — go, one hoe apiece.
-
- <br><br>//That sounds risky.//
- <br>Yeah it was. I'm not some hothead who does shit like that for the rush. If you run that op once a week you're going to be dead inside a year. I found new employers not long after that one. Funny story and all, but if I hadn't gone with ceramic side plates in my vest that night I would have been fucked.
-
- <br><br>//This is a quieter outfit?//
- <br>Much. Writer, I am now bored. And since I am drunk, and horny, and an incorrigible dyke, I am going to go find a cute slave with freckles and make her eat my pussy until I pass out. You want the other end?
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition//
- Appendix A, Interviews
-
-
-<<case "Slave Trainer, Arcology D-10">>
- Interview and observation with a Free Cities slave trainer
- Slave Market training plaza, Arcology D-10, May 23, 2036
-
- <br><br>''Good morning! I'm Lawrence, W.G. Lawrence.''
- //Hello. Nice to meet you. I'm Claudia.//
-
- <br><br>''I'd like to thank you for being willing to have me along as an observer; it's very kind of you.''
- //My pleasure. I do good work and I don't mind people knowing it.//
-
- <br><br>''May I ask you a few questions before you get back to your routine?''
- //Sure. We're going to be working with a new slave today, and I've got her in my office, sitting and thinking. There's no rush. Unpredictability is good.//
-
- <br><br>''What got you into this career?''
- //Well, I'm an ex-slave. I served my Mistress, the owner of this arcology, for three years. But I'm getting things out of order. I was a Sister before that. That's a very long story. Do you want to get into that? Every single Sister has the same story. [laughs] That's the beauty of it.//
-
- <br><br>''That's all right. You mentioned before that you'd like to be known for what you're doing now.''
- //Yeah. I'm not ashamed of any of it, and I wouldn't be where I am without it, but I'm my own woman now.//
-
- <br><br>''And you became your own woman after retiring from slavery here?''
- //I did, yes. It was bittersweet, but it was time. Mistress prefers young ladies.//
-
- <br><br>''You keep referring to her as Mistress. Is that leftover conditioning?''
- //[laughs] No, no, that's just what I call her, you know? She'll always be my Mistress in a way. And again, I'm here because she retires her girls incredibly well.//
-
- <br><br>''What was your role with her?''
- //I was her Head Girl, for my last year with her, at least. Before that, her Head Girl's girl. That Head Girl was a Sister, too. I can introduce you, if you'd like; she's a trainer here too. We work together sometimes.//
-
- <br><br>''Was that a blush?''
- //Okay, okay! We spend time together after work sometimes, too. Anyway, slave training. Come with me, my office is back this way.//
-
- <br><br>''Who are you training today?''
- //New slave, just bought her from the kidnappers yesterday. Pretty average. Mid-twenties, student then housewife. Decent tits, but too chubby. We'll work on that. And here we are.//
-
- <br><br>''Impressive office, even from the outside.''
- //Thanks. So, she's in there. Room's soundproof, she can't hear us. Here's how I'd like to play this: just stay out of the light, and you can observe as long as you like. She's under a spotlight, and everything else is dark. She probably won't even know you're there.//
-
- <br><br>''That would work very well, thank you.''
- //You're welcome. After you.//
-
- <br><br>//Hello, Suzanne.//
- H-hi, Ma'am.
-
- <br><br>//Stand up.//
- Yes, Ma'am. Um, Ma'am, may I please have my pants back? They took them away in the market, and I thought since you gave my sweater back, you'd -
-
- <br><br>//Be quiet.//
- Yes, Ma'am.
-
- <br><br>//Hold your hands at your sides like I told you, and stop pulling your sweater down over your pussy.//
- Y-yes, Ma'am.
-
- <br><br>//Turn around.//
- Yes, Ma'am.
-
- <br><br>//Do you like having your big fat naked butt hanging out, bitch?//
- Yes, Ma — aaAAH! Oh, ow, oh my God, ow -
-
- <br><br>//Be quiet. That was a 2. Your collar goes to 10.//
- [sobbing] Yes, Ma'am.
-
- <br><br>//You just lied to me. I will ask again: do you like having your big fat naked butt hang out?//
- N-no, Ma'am.
-
- <br><br>//Take your sweater off. Good bitch. That's right, blush for me. Now, tear it in half.//
- What!? Oh please, no, please no, I'll do it! Please don't shock me again, Ma'am! [frantic tearing]
-
- <br><br>//You don't need clothes, bitch. Not anymore. Now, turn back around, and bend over.//
- Yes, Ma'am.
-
- <br><br>//Spread your big fat buttcheeks.//
- Yes, Ma'am.
-
- <br><br>//Ever had a cock up your butthole, Suzie?//
- [sobbing]
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition//
- Appendix A, Interviews
-
-<<case "Monarch, Arcology F-8">>
- Interview with a Free Cities "anarcho-monarch"
- Arcological Penthouse, Arcology F-8, June 23, 2036
-
- <br><br>//Good afternoon. My name is -//
- <br>(From Guard) You will address His Highness with proper courtesy, peasant.
-
- <br><br>//Ah, my apologies. What I meant to say was, your Majesty, my name is W.G. Lawrence, and I'd like to interview you about this arcology, and your role in leading it. Err, for my book, your Highness.//
- <br>A scribe. Well, speak quickly. I am a busy man.
-
- <br><br>//Of course. Just for the record, might you introduce yourself?//
- <br>(Gestures to a guard.)
- <br>(From Guard) You are speaking with His Highness King William, First of His name, Savior of the Arcology, Executive Lord and Master of the Board of Directors, Majority Shareholder and Anarcho-Monarch of the most noble Arcology of Feight.
-
- <br><br>//Yes, yes, right, quite a magnificent title. Might I ask how it came to be that a Monarch took control of a Free City? Isn't strong authority antithetical to the free cities ideal?//
- <br>[laughs] Not a monarch, an anarcho-monarch. I did not earn my titles through bullying or force, and certainly not through inheriting it from some decrepit geriatric moron like in the old world. I am the legitimate majority stakeholder of the arcology and the rightful head of its board of directors. My rule is strong because I am strong. Were I to become weak, my position would be ousted and the people would take my place directly.
-
- <br><br>//Is that what the 'anarcho' means?//
- <br>Mmm. I do not simply rule the people. I am the people.
-
- <br><br>//But you dictate laws down to them - isn't that mutally contradictory?//
- <br>No. Peasants do not understand how to govern themselves. Look at the 'pure' anarchies outside our walls, scribe, and you'll see men tearing each other apart for scraps on a bone or a chance with an emaciated crack-whore. Without a strong force to bind a society in place, society falls apart entirely. If my people dislike paying my rents or obeying my Knights, they are free to leave, and take their chances in the ruins of the Old World.
-
- <br><br>//So your majority ownership and management of the arcology gives you the right to control its populace, who live under the laws you set, and if they disagree with your, ah, symbolic totality, their only option is to leave?//
- <br>Now you understand.
-
- <br><br>//Alright. Well, what about the lesser nobles? The Counts and Barons and Knights of the arcology?//
- <br>What about them?
-
- <br><br>//Why do they have the right to authority in your free society?//
- <br>They are my representatives. To be a Knight is to have my personal trust to act in my name, wherever I cannot be. I am the fountain from which all authority stems. So long as my water flows pure, all steps of the fountain remain clear.
-
- <br><br>//What about corruption? Doesn't giving so much power to entrenched nobility make it more likely that -//
- <br>(From Guard) Alright, that's enough out of you. The King has better things to do than explain his policies all day. Let's go.
-
- <br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition//
- Appendix A, Interviews
-
-
-<<case "Credits">>
- This game was created by a person with no coding experience whatsoever. If I can create a playable h-game, so can you.
-
- <br><br>__I do not give credit without explicit permission to do so.__ If you have contributed content and are not credited, please reach out on gitgud so credit can be given where due.
-
- <br><br>''Boney M'' of JoNT /hgg/ mod fame has been invaluable, combing tirelessly through the code to find and report my imbecilities.
- <br> Coded an improvement to the relative recruitment system.
- <br> Wrote and coded the Ancient Egyptian Revivalism acquisition event.
- <br> Wrote and coded a prestige event for ex-abolitionists.
- <br> Coded a training event for slaves who hate blowjobs.
- <br> Wrote and coded several slave introduction options.
- <br>''DrPill'' has offered great feedback, playtested exhaustively, and more.
- <br> Wrote a slave introduction option.
- <br>''bob22smith2000'' has made major contributions, not limited to close review of thousands of lines of code.
- <br> Improved all facility and most assignment code for v0.5.11, an immense task.
- <br>''Gerald Russell'' went into the code to locate and fix bugs.
- <br>''Ryllynyth'' contributed many bugfixes and suggestions in convenient code format.
- <br>''CornCobMan'' contributed several major modpacks, which include clothing, hair and eye colors, a facility name and arcology name expansions, UI improvements, nicknames, names, balance, a huge rework of the Rules Assistant, and more. CornCobMan has indefatigably supported the RA updates.
- <br>''Klementine'' wrote the fertility goddess skin for the personal assistant.
- <br>''Wahn'' wrote numerous generic recruitment events.
- <br>''PregModder'' has modded extensively, including descriptive embellishments for pregnant slaves, various asset descriptions, Master Suite reporting, the Wardrobe, a pack of facility leader interactions, options for Personal Assistant appearances, birthing scenes, fake pregnancy accessories, many other preg mechanics, blind content, expanded chubby belly descriptions, several new surgeries, neon and metallic makeup, better descriptive support for different refreshments, work on choosesOwnJob, many bugfixes, an expansion to the hostage corruption event chain, slave specific player titles, gagging and several basic gags, extended family mode, oversized sex toys, buttplug attachment system, and other, likely forgotten, things. (And that's just the vanilla added stuff!)
- <br>''Lolimodder'' your loli expertise will be missed.
- <br>''pregmodfan'' for tremendous amounts of work with compilers, decompilers, etc. Single-handedly kicked this mod into its new git home. Contributed lots of bugfixes as well as fixed the RA considerably. Revamped pregnancy tracking as well then further expanded it — and then expanding it more with superfetation. Also for ppmod, ramod, implmod, cfpmod and psmod (preg speed). Added a pregnancy adapatation upgrade to the incubator.
- <br>''FCGudder'' for advanced economy reports, image improvements, cleaning and fixing extended-extended family mode, extending building widgets, anaphrodisiacs, name cleaning, height overhauling, proper slave summary caching, new shelter slaves, some crazy ass shit with vector art, fixing seDeath, coding jQuery in ui support and likely one to two of these other anon credits.
- <br>''family mod anon'' for extending extended family mode.
- <br>''anon'' for lolimod content, new slave careers, new pubestyles, and general improvements.
- <br>''anon'' for considerable bugfixing, most notably that infernal @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ bug.
- <br>''anon'' added a pair of fairy PA appearances.
- <br>''anon'' for their clitoral surgery, SMRs, and hip changes.
- <br>''DarkTalon25'' for the Scots, Belarus, Dominicans, gilfwork, additional nicknames and a scalemail bikini.
- <br>''anon'' for FAbuse alterations, gang leader start, and scarring.
- <br>''anon'' for numerous pointed out typos.
- <br>''anon'' for grorious nihon starting rocation.
- <br>''anon'' for player getting fucked work.
- <br>''anon'' for additional bodyguard weapons.
- <br>''anon'' for HGExclusion and animal pregnancy work.
- <br>''anon'' for putting up with my javascript incompetence.
- <br>''anon'' for player family listing.
- <br>''anon'' for interchangeable prosthetics, advanced facial surgeries, custom nationality distribution and corporation assets overhaul.
- <br>''anon'' for filter by assignment.
- <br>''anon'' for filter by facility.
- <br>''anon'' for forcing dicks onto slavegirls.
- <br>''anon'' for forcing dicks into slavegirls and forced slave riding.
- <br>''Unknown modder'' who did betterRA mod for old 0.9.5.4 version of original FC.
- <br>''brpregmodfan'' for Brazilian start and slave gen.
- <br>''fcanon'' for various fixes, massive improvements to the RA and wrangling my inabilty to spll gud.
- <br>''stuffedgameanon'' for fixes, streamlining the starting girls family code, family trees, unbelievable improvements to the games functionality, the sanityChecker, a tag checker and above ALL else; Improving the game's speed by an obscene amount. I swear this guy is a wizard. Now overhauling the UI as well.
- <br>''anon'' for a prototype foot job scene.
- <br>''Preglocke'' for cleaning and expanding the foot job scene and various little content additions and corrections.
- <br>''anon'' for writing forced marriages, extra escape outcomes, new recruits and events, a story for FCTV and more player refreshment types.
- <br>''anon'' for global realism stave trade setting.
- <br>''anon'' for new recruit events.
- <br>''anon'' for expanding the cheat edit menu for slaves.
- <br>''thaumx'' for bigger player balls, cum production, self-impregnation and FCTV.
- <br>''anon'' for head pats. What's next? Handholding? Consensual sex in the missionary position for the sole purpose of reproduction?
- <br>''anon'' for Physical Idealist's beauty standard.
- <br>''anon'' for Gender Radicalist's trap preference.
- <br>''anon'' for the slave mutiny event.
- <br>''onithyr'' for various little tweaks and additions.
- <br>''anonNeo'' for spellchecking.
- <br>''kopareigns'' for countless text and bug fixes. Also large swathes of code improvements.
- <br>''Utopia'' for dirty dealings gang leader focus and updates to it.
- <br>''hexall90'' for height growth drugs, incubator organ farm support and detailing, the dispensary cleanup, the joint Eugenics bad end rework with ''SFanon (blank)'', the Hippolyta Academy, and the Security Expansion Mod (SecEx).
- <br>''sensei'' for coding in support for commas and an excellent family tree rework.
- <br>''laziestman'' for sexy spats.
- <br>''SFanon (blank)'' for SF related work, passive player skill gain, fulfillment order, player into summary and options rewriting, general fixes, storyCaption overhauling, updating and re-organizing the in-game wiki in addition to the joint Eugenics bad end rework with ''hexall90''. Cleaned up the sidebar, now maintaining and expanding SecEx. Added warfare/engineering personal attention targets. Likes tabs.
- <br>''anon'' for extending FCGudder's economy reports to the other facilities.
- <br>''MilkAnon'' for his contributions to FCTV and the FC world in general.
- <br>''valen102938'' for dealing with vector art, both creating new art and utilizing unused art.
- <br>''anon'' for making slaves seed their own fields.
- <br>''Ansopedi'' for slave career skills.
- <br>''Emuis'' for various compiler tweaks
- <br>''anon'' for continued tweaks to various economy formulas.
- <br>''anon'' for master slaving's multi slave training.
- <br>''Faraen'' for a full vector art variant.
- <br>''anon'' for more hair vectors for the external art.
- <br>''Vas'' for massive JS work and completely redoing the RA. Set up the 'make' compiler. Gave nulls some nicknames.
- <br>''deepmurk'' for a massive expansion in conjunction with Nox to the original embedded vector art. Also more hairs, clothes, shoes, clothes, descriptions and clothes. Overhauled skin colors too.
- <br>''Channel8'' for FCTV content (and likely giving the spellCheck an aneurysm).
- <br>''Channel13'' for FCTV content.
- <br>''kidkinster'' for slave management ui stuff and induced NCS.
- <br>''editoranon'' for cleaning text and drafting up bodyswap reactions.
- <br>''anon'' for the wetware CPU market.
- <br>''Autistic Boi'' for Mediterranean market preset.
- <br>''anon'' for the PA subjugationist and supremacist FS appearances.
- <br>''Editoranon and Milkanon?'' for prison markets and the nursing handjob scene.
- <br>''DCoded'' for creating the favicon, nursery, and farmyard, as well as animal-related content. Created a food system as well as a loan system. Refactored tons of code and standardized the facility passages. Also added several new scenes and interactions, the reminder system, and created and fixed a number of bugs.
- <br>''HiveBro'' for giving hyperpregnant slaves some serious loving.
- <br>''Quin2k'' for overwriting save function and expired tweak via Vrelnir & co.
- <br>''ezsh'' for bugfixing and creating a tool to build twineJS and twineCSS for me. Set up a revised SC update process as well. Has contributed massive revisions to the game's structure. Keeps the RA in line.
- <br>''Sonofrevvan'' for making slaves beg and dance.
- <br>''skriv'' for fixes and endless code cleaning.
- <br>''Arkerthan'' for various additions including merging cybermod and vanilla prosthetics. Java sanity check. Limbs and reworked amputation. Eye rework. Has begun overhauling various systems including the building layout. Dick tower. Work on user themes. Custom hotkeys.
- <br>''MouseOfLight'' for overhauling the corporation. V proxy, nuff said. Added better safeguards to the RA.
- <br>''svornost'': A great asset. Various fixes and tools, including FCHost. Gave players the ability to find that one slave they are looking for. The 'Scope' macro. Optimized porn so beautifully I can't even think. Has continued his reign of optimization. Got extended family mode so smooth it supplanted vanilla. Laid the groundwork for the new event layout system.
- <br>''Trashman1138'' for various tweaks and fixes.
- <br>''maxd569'' for adding .mp4 and .webm support to custom images.
- <br>''Anu'' for various fixes.
- <br>''Cayleth'' for various fixes and support.
- <br>''Jones'' for major overhauling of the economy/population/health systems.
- <br>''PandemoniumPenguin'' for giving players a choice in FS names.
- <br>''torbjornhub'' for adding pit rules to the RA.
- <br>''CheatMode'' for additional cheatmode options.
- <br>''Transhumanist01'' for the production of husk slaves via incubator. Contributed the uterine hypersensitivity genetic quirk.
- <br>''Fake_Dev'' for nipple enhancers.
- <br>''UnwrappedGodiva'' for a tool to edit save files.
- <br>''git contributors lost to time'' for their submissions and work through pregmod's git.
- <br>''Bane70'' optimized huge swaths of code with notable professionalism.
- <br>''Circle Tritagonist'' provided several new collars and outfits.
- <br>''Qotsafan'' submitted bugfixes.
- <br>''FireDrops'' provided standardized body mod scoring, gave Recruiters their idle functions, revised personal assistant future society associations, and fixed bugs.
- <br>''Princess April'' wrote and coded several random events and the Slimness Enthusiast Dairy upgrade.
- <br>''Hicks'' provided minor logic and balance improvements in coded, release-ready form.
- <br>''Dej'' coded better diet logic for the RA.
- <br>''Flooby Badoop'' wrote and coded a random recruitment event.
- <br>''FC_BourbonDrinker'' went into the code to locate and fix bugs.
- <br>''Shokushu'' created a rendered imagepack comprising 775 images, and assisted with the code necessary to display them. Also maybe the dinner party event?
- <br>''NovX'' created a vector art system.
- <br>''Mauve'' contributed vector collars and pubic hair.
- <br>''Rodziel'' contributed the cybernetics mod.
- <br>''prndev'' wrote the Free Range Dairy Assignment scene. Also did tons of vector art work.
- <br>''freecitiesbandit'' wrote a number of recruitment, future society, mercenary and random events, provided tailed buttplugs, new eyes and tattoos, and contributed the code for the mercenary raiders policy.
- <br>''DrNoOne'' wrote the bulk slave purchase and persistent summary code.
- <br>''Mauve'' provided vector art for chastity belts and limp dicks.
- <br>''Klorpa'' for dozens of new nationalities and boundless new names and nicknames. Also monokinis, middle eastern clothing, overalls and aprons. Also the hearing, taste, and smell overhauls. Added basic support for watersports. Has declared war on bad spelling, grammar and formatting. Added eyebrows too. Dug up ancient abandoned vanilla vignettes and implemented them. Toiled in the depths to extend limb support.
- <br>''lowercasedonkey'' for various additions, not limited to the budget overhauls. Set up all the tabs too. Gave events dynamic vector art. Hammered the scarring and branding systems into place. Been a real boon writing events and other things as well. Used ezsh's facility framework to enhance slave summaries. Set up a system to recall where slaves were serving. Striving to master DOM with great gains.
- <br>''amomynous0'' for bug reports and testing in addition to SFmod unit descriptions.
- <br>''wepsrd'' for QOL (hormonal balance cheat and lactation adaptation to new menu) fixes.
- <br>''i107760'' for Costs Budget, CashX work, The Utopian Orphanage, Farmyard, Special Forces work, various QoL additions and Private Tutoring System.
-
- <br><br>''Many other anonymous contributors'' helped fix bugs via GitHub. They will be credited by name upon request.
-
- <br><br>
- Thanks are due to all the anons that submitted slaves for inclusion in the pre-owned database and offered content ideas. Many anonymous playtesters also gave crucial feedback and bug reports. May you all ride straight to the gates of Valhalla, shiny and chrome.
-
-/**********
-MODS
-**********/
-<<case "Game Mods">>
- This version of the game includes several optional mods. For more information relating to a particular mod, select a more particular entry:
- <br>
-
-<<case "Inflation">>
- //Future room for lore text//
-
- <br><br>
- Choose a more particular entry below:
- <br>
-
-<<case "Lolimod">>
- This mod adds a variety of underage content to the game. This content is purely optional. For more information on certain features, select a more particular entry:
- <br>
-
-<<case "Special Force">>
- ''NOTE: The Special Force is an optional mod, and as such will only be initialized in-game if it is enabled at game start or in the options menu.''
-
- <br><br><blockquote>//Man has killed man from the beginning of time, and each new frontier has brought new ways and new places to die. Why should the future be different? Make no mistake friend, the Free Cities are the future, and we can either live like kings inside them, or die in their shadow. I prefer the former. So should you.//
- //- The Colonel, standard message to potential recruits//</blockquote>
-
- Once your arcology has been severely tested by external attack, and thus proven that the anti-militaristic principles of anarcho-capitalism might not be sufficient to ensure the physical security of the citizenry, you will receive an event that gives you the opportunity to establish a Special Force (with a customizable name), with The Colonel as its commander under you. This force will be a private military in all but name (unless you want that name). Once activated, you can manage its deployment from the end of week screen. You will be able to issue orders on the force's task and behavior, and this will impact its development. There are numerous events that can trigger depending on development and orders.
-
- <br><br> Initially the force will not be very profitable, but once it expands, it can become so. The speed at which this happens, and the degree of profitability, depends both on your orders to the force and the upgrades you purchase in the Barracks. If you had mercenaries, they will still be active for the purposes of events, corporation assistance (if present), and upkeep costs, abstracted as distinct operatives from the Special Force.
-
- <br><br> __Orders to The Colonel:__
- Once the force is active, you will be able to give orders to The Colonel. These will affect its income and performance. The orders are:
-
- <br><br>''Deployment Focus:'' This will determine the force's main task for the week.
-
- <br> ''Recruit and Train'' will focus on increasing manpower and replacing losses incurred over time.
-
- <br> ''Secure Trade Routes'' will increase @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ and prosperity by amounts that scale with the force's development.
-
- <br> ''Slaving and Raiding'' will directly bring in cash and (occasionally) slaves, with the amounts and quality increasing with the force's development. All three will occur every week, but the focus will determine the primary result.
-
- <br><br>''Rules of Engagement:'' This will determine how carefully the force uses its weapons, and affect its change in @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>,@@ as well as events seen. Will they hold their fire unless fired upon? Or will they call in an artillery strike on a refugee convoy that took a potshot at them?
- <br> ''Hold Fire'' will restrict the force to only returning fire if they're fired upon.
-
- <br> ''Limited Fire'' will permit some proactive fire from the force (to eliminate known threats).
-
- <br> ''Free Fire'' will permit the force to shoot at anything/anyone, at any time, for any reason.
-
- <br><br>''Accountability:'' This will determine how accountable the force is for its actions outside the Arcology, and affect its change in @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>,@@ as well as events seen. Will you punish them if they massacre a caravan for one choice slave girl? Or shoot random civilians for their valuables?
-
- <br> ''Strict Accountability'' will ensure the force avoids committing atrocities (other than immense collateral damage if free-fire is enabled).
-
- <br> ''Some Accountability'' will prevent the worst actions, but overlook lesser ones.
-
- <br> ''No Accountability'' will let the force run wild.
-
- <br><br>Allowing them to run wild will, over time, change their character, rendering them increasingly depraved as they realize that they can do whatever they want to non-citizens. Giving them rules might correct this, but reversing such behavior once learned would take a long time indeed.
-
- <br><br> __Barracks:__
- The Barracks are the upgrade and flavor screen for the Special Force. It is treated as a special facility, and slaves cannot be assigned to it. Here you can observe the antics and relaxation behavior of the force, which will, again, change based on your orders and its @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>.@@ You can visit once a week to receive some extra tribute from The Colonel, specially saved for its patron from its weekly acquired loot, and this 'gift' will improve in quality as the force develops.
-
- <br><br>__Upgrades:__
- Upgrades can be purchased in the Barracks. The upgrades that can be purchased will both increase in effectiveness of the force (i.e. how much @@.yellowgreen;<<= App.Encyclopedia.Dialog.linkSC("money", "Money")>>@@/@@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ it makes). The upgrades focus on improving the force's infantry equipment, vehicles, aircraft, drones, and stimulants. Some upgrades are more helpful at facilitating different tasks (Vehicles/Aircraft for Slaving/Raiding, <<= App.Encyclopedia.Dialog.linkSC("Drones", "Security Drones")>> for Securing Trade). Arcology upgrades enable other upgrades to be purchased. Stimulants increase overall effectiveness for the force when assigned to raiding after upgrades are considered, as well as flavor text.
-
- <br><br>Explore the options and enjoy the benefits of having a complete private military!
-
-<<case "Gender Radicalism Research">>
- Advanced Gender Radicalist societies can fund research to produce modified uteri and ovaries designed to be implanted into male slaves to grant them the ability to become pregnant, thus leaving no gender specific traits remaining.
-
-<<case "Slave Professionalism Research">>
- Advanced Slave Professionalism societies can fund efforts to synthesize a compound capable of improving mental capacities.
-
-<<case "Transformation Fetishism Research">>
- Advanced Transformation Fetishist societies can fund research to produce implants capable of reaching previously undocumented sizes.
-
-<<case "Asset Expansionist Research">>
- Advanced Asset Expansionist societies can fund research to produce extremely powerful growth drugs capable of growing body parts to previously undocumented sizes. Drugs are also standardized in slave diets to prevent loss of asset size. Due to the rapid growth in said assets, and the strength of the drug cocktails, slaves are more likely to develop side effects of excessive drug use.
-
-<<case "Slimness Enthusiast Research">>
- Advanced Slimness Enthusiast societies can fund research into several drugs designed to slim slaves down.
- <br>They include:
- <br> Appetite suppressants to make dieting easier.
- <br> Redistributors to draw fat from oversized assets and settle them around the slave's core for easy removal.
- <br> Atrophiers to shrink non-fat based assets.
-
-<<case "Hedonistic Decadence Research">>
- Advanced Hedonistic Decadence societies can purchase plans for specialized slave food. Said food is shaped to resemble actual food and flavored accordingly, however, its texture can only be described as gooey or gummy. A plus if that is how the food should be, but a shocker otherwise, given how tantalizing that steak looks after nothing but liquid slave food for so long. Since the food is essentially compacted liquid slave food, it is highly addictive thanks to the, typically, low presence of aphrodisiacs and can easily lead to excessive <<= App.Encyclopedia.Dialog.linkSC("weight gain", "Weight")>> as slaves are driven to gorge themselves on it. They'll be happy, at least, as they steadily outgrow their clothes. Alterations to the recipe exist to prevent <<= App.Encyclopedia.Dialog.linkSC("weight gain", "Weight")>> for Slimness Enthusiast societies and to cause gastric distress in Degradationist societies.
-
-<<case "Hyper-Pregnancy">>
- ''Hyper Pregnancy'' refers to when a slave is carrying ten or more children in one pregnancy. It is largely unhealthy for a slave, and can lead to immobilization and even death, so be sure to keep your overfilled slaves happy and healthy. Due to the size of the pregnancy, a slaves abdomen is greatly stretched, causing it to sag after the pregnancy is complete. Surgery, time, or refilling the slave's belly will eliminate sag, if only temporary. Only achievable via powerful fertility agents researched through the dispensary.
-
-<<case "Super Fertility Drugs">>
- ''Super Fertility Drugs'' practically guarantee a slave will bear multiple children, and when combined with female hormones, will generally lead to hyper-pregnancy The also have the side effects of inducing lactation, increasing sex drive, and increasing attraction to men. Researched through the dispensary.
-
-<<case "Pregnancy Generator">>
- The ''Pregnancy Generator'' is a small implant inserted into a slave's womb where it anchors itself and begins pumping the slave full of drugs and hormones with the intent to trick the slave's body into believing it both is and isn't pregnant. The slave's body will begin constantly releasing ovum that, once fertilized, will embed themselves into the uterine lining and begin growing. This will continue for as long as the implant is in place, regardless of how large the slave grows with children. Once the first set of infants is born, the implanted slave will give birth nearly a dozen times per week as her body continuously produces new offspring. Will likely lead to the slave's early death as her body will be consumed to feed her unending brood. Researched through the implant manufactory.
-
-<<case "Childbirth and C-Secs">>
- Eventually a pregnant slave will need to give birth. Cesarean sections are an option should a slave's health not permit a safe natural birth, or should a slaveowner want to keep her from being stretched out by her newborn child. A healthy, well rested slave, with wide hips and some knowledge will generally find childbirth easy. Though poor health, tiredness, narrow hips, anorexia, tight vaginas, excessively young motherhood, and lack of experience can complicate things, potentially leading to the loss of both child and mother.
-
-<<case "Surrogacy">>
- ''Surrogacy'' is an arrangement whereby a woman agrees or is forced to become pregnant, carry the pregnancy to due term, and give birth to a child or children, all of this for another person or persons, who are or will ultimately become the parent(s) of the newborn child or children. There are two types of surrogacies: traditional and gestational (full). Traditional is mostly used by homosexual couples or if fertility treatments are too expensive. With the exception of societies that embraced Repopulationism or Gender Fundamentalism, full surrogacy is popular among free women, who want children, but don't want pregnancy to impact their careers or physical attributes. It created a market of living incubators — perfectly healthy slaves of safe age for carrying pregnancies with often little to no skills necessary for most other slaves.
-
-<<case "Ova Transplantation">>
- ''Ova transplantation'' is a procedure where an already fertilized ova is transplanted from one womb to another of the same species. It requires a remote surgery to perform and an advanced pregnancy monitoring systems to locate the egg, confirm the fertilization and determine that it happened less than four weeks ago, so that the ova is not too attached to the lining. Optimally the new host must be healthy and must not be already pregnant with large number of fetuses or hit menopause, but be old enough to carry children successfully.
-
-<<case "Enemas and Force-Feeding">>
- With the proper supplies ordered into your wardrobe, you can distend a slave's belly via enema leaving her notably rounded. Distended slaves are likely to feel discomfort, and if overfilled, face health complications. A standard enema is about 2 liters, though the adventurous may test their limits with a gallon, roughly 4 liters, or nearly burst themselves with a staggering 2 gallons, about 8 liters.
-
- <br><br>With a working dairy, pipes can be installed to pump fresh milk and cum directly to your penthouse to be used in inflating slaves. The dairy will have to be producing above a threshold to be able to pump said products into the penthouse. Slaves filled with milk and cum may face additional affects, including <<= App.Encyclopedia.Dialog.linkSC("weight gain", "Weight")>>, rejection and obsession of food.
-
- <br><br>A final theoretical method involves using another slave as the source of fluid, though she would have to be capable of producing a monumental amount of milk or cum.
-
- <br><br>A trio of medical enemas can be purchased after basic enema supplies are acquired.
- <br> Curatives to promote slave health.
- <br> Aphrodisiacs to drive them wild.
- <br> Tighteners to make their holes like new.
-
- <br><br>Force feeding is far simpler; you just force the slave to consume food or drink until you are satisfied. All that is needed is enough to feed them and a vessel to store it in in the interim.
-
-<<case "Lolis and the Free Cities">>
- For the most part, the greater world condemns those using underaged girls as sex slaves, but some Free Cities feel otherwise. In those, underage girls may be purchased like any other slave, though they might be more valuable depending on the arcology.
-
-<<case "Fertility Age">>
- The normal girl will undergo puberty and become fertile between the ages of 10 and 14, though with hormonal treatments can very easily become fertile earlier. Given the passive female hormones in the slave food, an arcology cluster can practically control the exact age a girl will become fertile.
-
-<<case "Male Fertility">>
- The normal boy will undergo puberty and become potent between the ages of 12 and 16, though with hormonal treatments can very easily become potent earlier. Given the passive female hormones in the slave food, boys will generally become fertile later than the average loli, though with the careful application of hormones, the potency age can practically be controlled.
-
-<<case "Cradle Robbers">>
- A specialized group of slavers focusing entirely on capturing girls that have not had their first period. Disliked in many arcologies, they only appear before those they feel they can @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>@@ as being sympathetic to their views.
-
-<<case "Precocious Puberty">>
- While most girls will grow fertile around $fertilityAge and most boys will become virile around $potencyAge, the mass prevalence of male and female hormones in the Free Cities can have extreme effects on a developing slave's puberty. Hormone injections and hormonal based drugs can lead to early puberty or even delay it indefinitely, something some trainers use to their advantage in keeping their male slaves soft and feminine.
-
-<<case "Belly Implants">>
- A fillable implant inserted into a slave's uterus following tube tying to prevent ovulation. Can safely be filled with 200cc each week to simulate a growing pregnancy. However, if kept at a full term size (or higher), the slave's body may adjust to the implant causing issues upon removal. Also to note, a slave that lacks a uterus to hold the implant can still be implanted; invasive surgery will be preformed to create a pocket to safely hold the implant without damage to the slave's internals.
-
-<<case "Player Pregnancy">>
- Sexual intercourse ending with ejaculation into a fertile cunt ends with a chance of pregnancy. Since arcology owners are expected to be masculine, being pregnant ruins that image. Female arcology owners displaying their pregnancies should expect to face public backlash for it. Luckily, pregnancies are easily prevented via contraceptives and easily dealt with via abortions; a pregnant arcology owner has plenty of means to maintain their image before it becomes a problem.
-
-<<case "Cervix Micropump Filter">>
- An implant inserted into a slave's cervix and linked with a fillable belly implant. Converts a portion of semen into usable filler and pumps said substance into the attached implant resulting in a slow, steady increase in size. Once the pressure in the implant reaches a set threshold, filler is outputted by the pump, maintaining the implant's size. Research is currently underway to see if the tubing can be effectively extended to pump filler into fillable butt and breast implants.
-
-<<case "Eugenics Breeding Proposal">>
- Eugenics frowns on reproducing with the lower classes, but what about those with good genes that ended up caught in said classes? Would it not make sense to use them as breeders? With the Eugenics Breeding Proposal*, one can propose the use of well-bred slaves as bearers of societies finest children. *Success not guaranteed, some terms and conditions may apply, ask your local Elites for more information.
-
-<<case "Youth Preferentialism Research">>
- Specialized creams built off of stem cells and several ingredients known for reducing the ravages of age. Steady use leaves a slave looking younger, though the effects are literally skin deep; several gossip pieces have run about celebrities bedding youthful slaves just to accidentally find their efforts resulting in a broken hip.
-
-<<case "Gestation Drugs and Labor Suppressants">>
- Not all drugs are applied directly to your slavegirl. In this case, gestation accelerants and retardants are passed through the mother into her unborn children to control the rate of fetal growth. While slightly unhealthy for the mother, gestation slowing drugs are relatively harmless, though an unwilling mother may become more distraught when she realizes her pregnancy will last even longer. Due to the extended duration of the pregnancy, the mother's body may become accustomed to being so round, leading towards a sagging middle once birth occurs. On the other hand, gestation hastening drugs are extremely dangerous to the mother. It is strongly recommended to keep her under the observation and care of an experienced doctor or nurse. Failure to do so will cause her body to struggle to keep up with the rate of growth of her children, harming her physical and mental health, as well as potentially bursting her uterus later in her pregnancy. Labor suppressants are exactly that; they prevent the mother from entering labor, thus allowing the child to grow longer than a normal pregnancy. Excessive use may lead to health complications, especially during childbirth, though going even further may result in the slave's body suddenly entering labor and rapidly birthing her children, often without giving the slave time to prepare or even get undressed.
-
-<<case "The Incubation Facility">>
- A facility used to rapidly age children kept within its aging tanks using a combination of growth hormones, accelerants, stem cells and other chemicals; slaves that come out of it are rarely healthy. The Incubator requires a massive amount of electricity to run, though once powered contains a battery backup that can last at least a day. It can be upgraded to combat malnutrition and thinness caused by a body growing far beyond any natural rate. Hormones can also be added to encourage puberty and even sex organ development. Growth control systems include cost saving overrides, though enabling them may result in bloated, sex crazed slaves barely capable of moving.
-
-<<case "Organic Mesh Breast Implant">>
- A specialized organic implant produced from the dispensary designed to be implanted into to a slave's natural breast tissue to maintain a slave's breast shape no matter how big her breasts may grow. An expensive and risky procedure proportional to the size of the breasts the mesh will be implanted into. Should health become an issue, the slave in surgery may undergo an emergency mastectomy. Furthermore, once implanted, the mesh cannot be safely removed from the breast. However, total breast removal will rid the slave of the implant; consider strongly when and if you want to implant the mesh before doing so. They are exceedingly difficult to identify once bound to the breast tissue, and combined with their natural shape, are often overlooked.
-
-<<case "Nipple Conversion — Penetratable">>
- By taking extremely large nipples and inverting them into an adequately sized breast, it is possible to use an advanced surgical suite to create a cavity suitable for penetration. Early attempts found that the novelty of fucking a tit did not offset the discomfort of ramming one's dick into a solid object and as such, the surgery is only applicable to slaves with at least 500ccs of breast tissue per boob. Milk production is unhindered by the alterations, though non-machine milking is far more difficult without a nipple to grab and it is unlikely to be able to properly nourish a child. Arousal is also expressed differently, as the nipple cannot stiffen any longer; instead, engorgement causes the newly crafted passage to tighten, adding to the pleasure of using the unorthodox hole. While looseness is no issue, and the orifice quite capable of stretching around an intruding shaft, depth can become a problem; even the most average of slaveowners will find themselves bottoming out far sooner than they would like. Fortunately, this downside is offset by the novelty of the act and the capacity to push the nipple itself deeper into the slave's breast to better accommodate one's cock. In this case, bigger really is better.
-
-<<case "Ejaculation Boosting Prostate Implant">>
- An additional prostate implant designed to hyperstimulate one's prostate and store the resulting fluid for release during ejaculation in a specialized reservoir. An easy way to tell if the precum soaked slave you are fucking is sporting this implant is the distinct swelling in her lower belly as she nears release. Due to the sheer amount of prostate fluid released, sperm per volume is greatly reduced, devastating profits of those looking to sell cum. Remember to keep your slaves well hydrated!
-
-<<case "FCTV">>
- Free Cities TV, or ''FCTV'' as it is more commonly called, is a very popular streaming video service. A venture started not long after the first Free Cities were founded, it took advantage of the new lack of regulatory oversight to create and host content that had long been banned in the old world. Under the guidance of 8HGG Inc., FCTV has developed into a popular mixed-mode service, with a variety of live streaming channels as well as a large selection of ready stream content ranging from hyper porn to contemporary broadcast series shows.
-
- <br><br>The successful service is largely supported by a combination of subscription and advertising revenue, and to a smaller extent on-demand content payments. Though still targeted at free citizens — or their slaves in the case of for-slave content — FCTV has become very popular in the old world. A combination of the service's eroticism, extreme content, and high production value has given it extraordinary popularity. Savvy execs at 8HGG Inc. and arcology owners alike have realized the benefits of exposing the old world populations to FCTV content, and a carefully-curated selection of content is kept available to old-worlders thanks to revenue from advertisements supporting immigration and voluntary enslavement. The content selection has a glamorized and often romanticized view of slavery, and typically displays common citizens and slaves alike living in opulence beyond the realm of possibility for most old-worlders.
-
- <br><br>FCTV has always worked closely with the Free Cities, developing a large network of sponsors and partnerships for content protection. This has increased the breadth of content and popularity of FCTV, while allowing the ruling class to encourage content supporting their vision of the future. While you can access non-citizen FCTV content from just about anywhere, an arcology needs its own <<= App.Encyclopedia.Dialog.linkSC("receiver", "FCTVReceiver")>> to access citizen-only content. This measure of content protection does add extra expense, but nearly eliminating the risk of old-worlders seeing uncurated content is viewed as being worth the expense by most arcology owners.
-
-<<case "FCTVReceiver">>
- While nearly indistinguishable from a standard satellite antenna, the satellite dish used to receive FCTV-Citizen content is special because of the unique FCTV Receiver. Utilizing the latest in matched-pair quantum encryption, it is the only device capable of decrypting and encrypting your arcology-specific FCTV content communication. Simple additions to your arcology's existing fiber optics extend the <<= App.Encyclopedia.Dialog.linkSC("FCTV", "FCTV")>> network to your citizens. In exchange for bearing the cost of the encrypted network, arcology owners get a certain level of control over available content for cultural purposes, and also discounted rates for local advertisement.
-
- <br><br>Some owners choose to have their citizens subsidize the installation: having them pay for fiber to their residence, or possibly even charging for a portion of the receiver. FCTV service experts warn that forcing citizens to bear too much of the cost usually results in angry citizens and many citizens who refuse to pay for access to the service. They suggest that it is in the best interests of FCTV and arcology owners alike to have greater service penetration, as low penetration results in less revenue for 8HGG Inc. and less advertising and cultural benefits for owners.
-
-<<case "Repopulationist Breeding School">>
- With the sheer number of children being brought into the world in the average Repopulationist society, society had to come up with a way to rear them all. Breeding schools are publicly funded institutions devoted to raising children into future breeders. Their hormone levels are carefully managed both to encourage early puberty and to maximize fertility. Once a class has become sexual active, boys and girls are encouraged to pair off and explore each other's bodies. Virginities are quickly lost, and more often than not, girls find themselves pregnant, usually with multiples. The pairings, or groups should females outnumber males, are encouraged to stay together and form caring family-like units. In addition, girls are taught to enjoy and idolize motherhood, while boys are taught that it is their duty to mount and fuck any non-gravid slave girls they see until pregnancy is assured. Free women are encouraged to avoid the schools, lest they get pinned and gang raped by horny adolescents. While administration respects rape fetishists and their desire to have a rape baby, doing this sets a poor example to the impressionable youths and may lead to the rape and impregnation of other free women later on in their lives.
-
-<<case "Slave Fertility">>
- When it comes to breeding your slaves, one must ask themselves; "Do I want a single child, or do I want to get her so pregnant she can barely ride me any longer?"
-
- <br><br>
- Under normal circumstances, a slave will likely bear a single child from a pregnancy, but with a little extra help from a number of fertility boosting methods, that count can easily be pushed higher. While each fertility agent will only add a chance of an additional ovum, combining treatments will yield a cumulative effect, greatly enhancing the likelihood of multiples. One must exercise caution, however, as a slave's body can only support so many offspring without complications. Miscarriage, discarded embryos, and even slave death are all possible with excessive misuse of fertility agents.
-
-<<case "Corrective Diet">>
- Using the upgraded kitchen to monitor a slave's caloric intake allows for diets to be tailored to slowly increase or decrease their weight without them realizing.
-
-<<case "Fertility Mix">>
- A simple dietary blend designed to encourage ovulation. Fertile slaves will find themselves subconsciously lusting for loads of cum blasting into their pussies and, once they give in to temptation, will likely find their bellies swelling with twins or even triplets.
-
-<<case "Breeders Dietary Blend">>
- When it comes to slave breeding, the natural chance of conception is just too low for your profit margins. The Breeder's Dietary Blend is the end result of the quest to enhance fertility* and potency in slaves. Sperm will live longer and swim harder, eggs will readily implant post fertilization, and pregnancies will be robust and healthy. This diet tweak guarantees your slaves will be a reproductive bunch or your @@.yellowgreen;<<= App.Encyclopedia.Dialog.linkSC("money", "Money")>>@@ back!**
-
- <br><br>
- *Twins became prevalent in test pairings. This is unintended behavior, but not an unwelcome one to the funders.
- <br>
- **Our guarantee does not cover slaveowners who underestimate their slaves' potency and wind up pregnant.
-
-<<case "Catmod">>
- <h4>Catmod</h4>
- Catmod is an optional modification that focuses on, surprise surprise, adding catgirls to the game. However, as you might have noticed, Free Cities is based on our own universe, and, unfortunately, catgirls don't actually exist. So how is one to acquire fuckable cats in a world sadly devoid of them? Well, multi-million dollar genetic engineering projects, of course! After a massive investment in your genelab and the best old world engineers avalible, you too will be able to create your very own inhuman abominations of science with cute, twitchy ears and button noses. Catgirls contain a number of mechanical changes and unique features, many of which you will have to find out for yourself through your exciting journey through the world of scientific malpractice. Worth noting for mechanical purposes, however, is that the //Feline// face type is only found on catgirls, and has a similar effect to exotic faces; uglier feline faces are dramatically worse, while beautiful feline faces are signiicantly better from a beauty perspective.
-
-<<case "Bioengineering">>
- With the technological advancements of 2037, society stands on the precipice of truly transhumanist biological engineering. Those with the will and the resources to get what they want, meaning you, are now uniquely capable of taking the fundamental code of DNA and using it as a building block to create and reshape biology as they desire. That doesn't mean the process of genetic engineering is going to be easy or simple; at minimum, you'll need a fully upgraded genelab and a team of professional, world-class scientists with the resources of a small nation at their disposal to get what you want. But once you've put all the pieces in place, the possibilities that can emerge from your engineering tubes are nearly endless.
-
-<<case "Catgirls">>
- Part of humanity's dream for thousands of years. As far back as the Ancient Egyptians, humans have looked at the sleek and smug nature of cats, and imagined them as tall, busty catgirls with which they could fornicate. Yet all those men and women of the past lacked the capability to make their dreams come true; you, on the other hand, do not. While the process to splice human and cat DNA, whether you take from common housecats or the more dangerous coding of lion or panther genetics, will undoubtedly be arduous and expensive, the end result of a sleek, dexterous, inhumanly flexible creature that can wrap its tail around your throat as you fuck it is perhaps enough of a prize to make the difficulties worth it. To get started on engineering catgirls, you'll need to contact a team of genetic engineers from a fully upgraded genelab, and give them enough time and money to achieve results within your lab.
-
-<<case "Artificial Insemination">>
- A simple surgical procedure involving the injection of harvested sperm into a fertile womb. Useful for assuring the conception of a child of the desired union, impregnation without sexual intercourse, circumventing physical and mental quirks in copulation, or just finding the perfect Virgin Mary for the holidays.
-
-<<case "Cloning">>
- A surgical procedure requiring the gene lab that injects the DNA of an individual into an viable egg cell which is then carried to term in a fertile womb. Will create a child with the basic physical traits of the person they are cloned from. While clones will likely be identical to each other, they are unlikely to bear more than a passing resemblance to the person their DNA was harvested from; for that to occur, they would need to be raised in almost the same way. They will, however, be a genetic match with their "parent".
-
-<<case "The Black Market">>
- <h4>The Black Market</h4>
- You may be the ruler of your arcology, but you don't exist in a vacuum. You can do all kinds of thing and get lots of things that regular citizens can't. So the Black Market, is a chance for less prominent citizens to do or get stuff like an arcology leader might experience. But for a ruler like yourself, it's a chance to avoid the severe scrutiny you're subject to on a regular basis, and to get a hold of bleeding edge or illegal research and technologies. The market itself is always moving from place to place, but if you're reputable enough, you can find it when you need it.
- <br><br>
- You will be able to find all manner of Future Society technologies which are not exactly illegal, but difficult to get through regular channels. Every week, the dealers will have a few for you to purchase, but for the truly illegal or unethical items, your only choice is to go to the Black Market.
- <br><br>
- <dl>
- <dt>Black market specialty goods:</dt>
- <dd><<= App.Encyclopedia.Dialog.linkSC("Childhood Fertility Induced NCS", "Childhood Fertility Induced NCS")>></dd>
- </dl>
-
-<<case "Childhood Fertility Induced NCS">>
- <dl>
- <dt>Childhood Fertility Induced NCS</dt>
- <dd>
- This uses a designer retrograde virus to set the genetic markers for the Neotenic Complex Syndrome, a syndrome originally called Syndrome X discovered in the early 2000s. In layman's terms, it @@.gold;suppresses the growth and secondary sexual characteristics of slaves;@@ both male and female. The original condition was usually fatal or dangerous. This modified version of the genetic flaw is not harmful (relatively speaking), and in addition to the growth blockage, it permits the slave to continue the @@.lime;development of gonads@@ at a slightly faster than normal pace. Secondary sexual characteristics are also reversed, though interestingly enough, pregnancy is still possible.Slaves put on this genetic engineered blend will be permanently changed and will no longer grow in stature or assets without severe chemical assistance, and even then at a reduced rate when compared to non-NCS-induced slaves, and should their ongoing growth treatments stop they will slowly regress back to the physicality of a child.<br><br>
- @@.red;The genetic tampering is considered illegal,@@ but there is also a @@.yellow;moral question as this abrogates the rights of slaves to ever grow up.@@<br><br>
- Can only be purchased in <<= App.Encyclopedia.Dialog.linkSC("The Black Market", "The Black Market")>>.
- </dd>
- </dl>
-
-<<case "Contraband and Illegal Goods">>
- While there is little to no issue with possessing nearly anything, getting your hands on it may not always be feasible. Be it local policy or overreaching business deals, certain goods may not be found for sale in the Free City. This does not stop some of the shadier dealers from risking the sale of them, of course; this is where smugglers come in. There is always a market for contraband and illicit goods and never a shortage of people looking to buy them. Not all smugglers are successful, and those that aren't soon find themselves up for sale in the slave markets.
-
-
-<<case "Security Expansion">>
- The Security Expansion Mod
- <hr>
- ''Note: The Security Expansion mod is an optional mod. It can be switched freely on and off from the game option menu or at the start of the game.''
-
- <br><br>The world of Free Cities is not a forgiving one, those who do not seek to dominate it, will inevitably be dominated themselves.
- Good rulers need to keep control of its realm, if they want to have long and prosperous lives.
- You will have to manage your @@.darkviolet;authority@@ inside the walls of your arcology, you will have to keep it @@.deepskyblue;secure@@ and keep in check @@.orangered;crime@@ and rivals alike, you will have to take up arms and command your troops against those who defy your rule.
-
- <br><br>Statistics:
- @@.darkviolet; <br><strong>Authority:</strong>@@
- <br> Representing the power the player holds over the arcology. If @@.green;<<= App.Encyclopedia.Dialog.linkSC("reputation", "Arcologies and Reputation")>>@@ is how well the protagonist is known, @@.darkviolet;authority@@ is how much is feared or respected.
- Authority influences many things, but it is mainly used to enact edicts, who, similarly to policies, allow to shape the sociopolitical profile of your arcology. Like @@.green;reputation,@@ @@.darkviolet;authority@@ has a maximum of <<print num(20000)>>.
-
- @@.deepskyblue;<br> <br><strong>Security:</strong>@@
- <br> Representing how safe the arcology is, how likely it is for a citizen to get stabbed, killed or simply mugged in the streets as well as wider concerns like
- dangerous political organizations, terrorist groups and more. It influences many things, but its main task is to combat @@.orangered;crime.@@
-
- @@.orangered;<br> <br><strong>Crime:</strong>@@
- <br> Representing the accumulated power of criminals in the arcology. Rather than representing low level criminal activity, better represented by @@.deepskyblue;security@@ (or better lack of), but
- the influence, organization and reach of criminal organizations, be it classic mafia families or high tech hacker groups. Do not let their power run rampant or you'll find your treasury emptier and emptier.
- Both @@.deepskyblue;security@@ and @@.orangered;crime@@ are displayed a 0-100% scale.
-
- <br><br>The battles:
- <br> Arcologies are sturdy structures, difficult to assault without preparation or overwhelming numbers. <<= App.Encyclopedia.Dialog.linkSC("Security drones", "Security Drones")>> can easily handle small incursions and a few well placed mercenary squads can handle the rest.
- However, in order for Free Cities to survive they need many things, many of which are expensive. If you want your arcology to survive the tide of times, you'd better prepare your soldiers and defend the vital lifelines that connect your arcology with the rest of the world.
- For a detailed outlook of how battles work see the relative page.
-
- <br><br>Buildings:
- <br> <strong>The Barracks</strong>: This is where troops can be prepared and organized to respond to threats encroaching on the arcology's territory.
-
- <br> <strong>The Security HQ</strong>: This is where your security department will manage the @@.deepskyblue;security@@ of the arcology.
-
- <br> <strong>The Propaganda Hub</strong>: This is where your propaganda department will expand and deepen your @@.darkviolet;authority@@ over the arcology.
-
- <br> <strong>The TransportHub</strong>: This is where trade happens. Mainly intended as a counter to prosperity loss events.
-
- <br> <strong>The RiotControlCenter</strong>: Fairly self explanatory, will help you manage rebellions.
- <br>
- <hr>
-
-<<case "Battles">>
- Battles in the Security Expansion Mod
- <hr>
-
- With the Security Expansion mod enabled there is a small chance each week that an attacking force will be approaching the arcology. Their motives may vary, but their intentions are clear: hit you where it hurts.
- You arcology will start being the subject of incursions only when the <<= App.Encyclopedia.Dialog.linkSC("security drones", "Security Drones")>> upgrade has been installed.
-
- <br><br>Unit types:
- <br><strong>Slave Units</strong>: recruitable from your stockpile of menial slaves. They are cheap, easy to replace troops that will hold the line well enough.
- Of the three they have the lowest base stats, but they have the advantage of being available from the beginning, have the lowest upkeep and can be replenished in any moment, provided enough cash is available.
-
- <br><strong>Militia Units</strong>: recruitable only after a special edict is passed. Once the militia is announced recruitment laws will become available and recruits will present themselves to the barracks, waiting to be assigned to a unit.
- Militia units are slightly stronger than slave units, but their manpower is limited by the laws enacted and the citizen population.
-
- <br><strong>Mercenary Units</strong>: installing a permanent platoon in the arcology is a great defensive tool, but if you need muscle outside the walls of your dominion you'll need to hire more.
- Mercenary units have the highest base stats (in almost all categories), but are also only available if the arcology is garrisoned by the mercenary platoon, are fairly slow to replenish and have the highest upkeep.
- Once garrisoned by the mercenary platoon, more mercenaries will slowly make their way to the arcology. You have little control over their number other than increasing your arcology prosperity or your reputation.
-
- <br><strong>The Security Drones</strong>: The security drones are a special unit. You cannot field more than one unit of this type and their stats (with the exception of their very high morale) are fairly low, however they cheap to replenish and have a low maintenance cost. They do not accumulate experience and are not affected by morale modifiers (for better or worse).
-
- <br><br>Units statistics:
- <br><strong>Troops</strong>: The number of active combatants the unit can field. If it reaches zero the unit will cease to be considered active. It may be reformed as a new unit without losing the upgrades given to it, but experience is lost.
-
- <br><strong>Maximum Troops</strong>: The maximum number of combatants the unit can field. You can increase this number through upgrade.
-
- <br><strong>Equipment</strong>: The quality of equipment given to the unit. Each level of equipment will increase attack and defense values of the unit by 15%.
-
- <br><strong>Experience</strong>: The quality of training provide/acquired in battle by the unit. Experience is a 0-100 scale with increasingly high bonuses to attack, defense and morale of the unit, to a maximum of 50% at 100 experience.
-
- <br><strong>Medical support</strong>: Attaching medical support to the unit will decrease the amount of casualties the unit takes in battle.
-
- <br><br>Battles:
- <br>Battles are fought automatically, but you can control various fundamental parameters, here are the most important statistics:
-
- <br><strong>Readiness</strong>: readiness represents how prepared the arcology is to face an attack. For every point of readiness you can field two units. You can find upgrades for it in the security HQ.
-
- <br><strong>Tactics</strong>: Tactics are the chosen plan of action. You should carefully choose one depending on the terrain, type of enemy and leader choice, because if applied successfully they can sway a battle in your favor or doom your troops.
-
- <br><strong>Terrain</strong>: Terrain has a great influence on everything, but mainly on the effectiveness of the tactic chosen.
-
- <br><strong>Leader</strong>: The leader is who will command the combined troops in the field. Each type of leader has its bonuses and maluses.
-
- <br><br><<includeDOM terrainAndTactics()>>
-
- <br><br>Leaders:
- <br><strong>The Assistant</strong>: The assistant can lead the troops. <<= capFirstChar(getPronouns(assistant.pronouns().main).possessive)>> performance will entirely depend on the computational power <<= getPronouns(assistant.pronouns().main).pronoun>> has available. Human soldiers will be not happy to be lead by a computer however and will fight with less ardor, unless your own reputation or authority is high enough.
-
- <br><strong>The Arcology Owner</strong>: You can join the fray yourself. Your performance will depend greatly on your warfare skill and your past. The troops will react to your presence depending on your social standing and your past as well.
- Do note however there is the possibility of getting wounded, which makes you unable to focus on any task for a few weeks.
-
- <br><strong>Your Bodyguard</strong>: Your bodyguard can guide the troops. Their performance will greatly depend on their intelligence and past. Slaves will be happy to be lead by one of them, but militia and mercenaries will not, unless your own authority is high enough to make up for the fact they are being lead by a slave.
-
- <br><strong>Your Head Girl</strong>: Your Head Girl can guide the troops, and will act very similarly to the bodyguard in battle. Be aware that both slaves run the risk of getting wounded, potentially with grave wounds like blindness or limb loss.
-
- <br><strong>An Outstanding Citizen</strong>: One of your citizens can take the leading role. Their performance will be average; however the militia will be pleased to be guided by one of them.
-
- <br>To allow slaves to lead troops a specific edict will have to be enacted.
-
- <br><strong>A Mercenary Officer</strong>: One of the mercenary commanders can take the lead. Their performance will be above average and mercenary units will be more confident, knowing they're being lead by someone with experience.
-
- <br><strong>The Colonel</strong>: The special force's colonel can take the lead. Her performance will be above average and mercenary (in addition to hers obviously) units will be more confident, knowing they're being lead by someone with experience. Her tactics have a higher chance of success along with better offense and defense.
- <br>
- <br>
-
-<<case "Slave Modification">>
- What would a slaveowner be without the ability to customize their slaves' bodies? The Free Cities offer a variety of ways to achieve this for an arcology owner. Choose a more particular entry below:
- <br>
-
-<<case "Inbreeding">>
- At the intersection of incest and pregnancy lies inbreeding. As seen in royal families throughout history, high levels of inbreeding can result in severe issues, often manifesting as facial deformities or reduced intellectual capacity.
-
- <br><br>One metric for quantifying inbreeding is the coefficient of inbreeding (CoI), which is the probability that both copies of a person's genes come from the same common ancestor. For example, without any previous inbreeding a child from self-fertilization has a CoI of 0.5, a child of two full siblings has a CoI of 0.25, and a child of two first cousins has a CoI of 0.0625.
-
- <br><br>Enterprising breeders trying to breed specific traits should be mindful of the inbreeding coefficients of their stock: the higher the coefficient, the higher the chance that children will be slow or deformed.
-
-<<default>>
- Error: bad title.
-<</switch>>
-<</if>>
-
-/* special pages where we don't show related links */
-<<if !["Credits", "Special Force", "Table of Contents"].includes($encyclopedia)>>
- <br><<include "Related Links">>
-<</if>>
-
-<<if $encyclopedia !== "Table of Contents">>
- <div class="center">
- <<if $encyclopedia !== "Credits">>
- <br><<= App.Encyclopedia.Dialog.linkSC("Credits", "Credits")>>
- <</if>>
- <br>
- <<= App.Encyclopedia.Dialog.linkSC("Table of Contents", "Table of Contents")>>
- </div>
-<</if>>
diff --git a/src/gui/Encyclopedia/encyclopediaBeingInCharge.js b/src/gui/Encyclopedia/encyclopediaBeingInCharge.js
index 091847ce13606e00fc198badf89776dcebff09d1..990c27e96c37e689e398d2d872958f857e77aecc 100644
--- a/src/gui/Encyclopedia/encyclopediaBeingInCharge.js
+++ b/src/gui/Encyclopedia/encyclopediaBeingInCharge.js
@@ -1,6 +1,6 @@
App.Encyclopedia.addArticle("Being in Charge", function() {
const f = new DocumentFragment();
- App.UI.DOM.appendNewElement("p", f, "Future room for lore text", "scene-intro");
+ App.UI.DOM.appendNewElement("p", f, "Future room for lore text", ["scene-intro"]);
App.UI.DOM.appendNewElement("p", f, "Choose a more particular entry below:");
return f;
}, "beingInCharge");
@@ -9,19 +9,19 @@ App.Encyclopedia.addArticle("Arcologies and Reputation", function() {
const f = new DocumentFragment();
let r;
- const intro = App.UI.DOM.appendNewElement("div", f, "", "scene-intro");
+ const intro = App.UI.DOM.appendNewElement("div", f, "", ["scene-intro"]);
App.UI.DOM.appendNewElement("p", intro, "Arcologies are the urban buildings of the future: almost completely self-contained, almost completely self sufficient. In the anarcho-liberal 'paradise' of the Free Cities, as owner of your own arcology you are like a modern-day feudal suzerain, lord and master.");
App.UI.DOM.appendNewElement("p", intro, "Your arcology is a flared structure, needle thin at the top where you live in your penthouse, and broad at the base. The base below ground contains storage and machinery. The lowest aboveground levels are commercial; above them are the residential areas. The entire structure is jacketed in dense gardens and solar arrays, cleverly structured to create naturally lit corridors and beautiful park-like balconies.");
- App.UI.DOM.appendNewElement("p", intro, "— Owner's Report");
+ App.Encyclopedia.addArticleSource(intro, "Owner's Report");
App.UI.DOM.appendNewElement("p", f, "You may wish to improve your arcology, but should be able to ignore its development, if you wish.");
r = [];
r.push("Your <span class='reputation inc'>reputation</span> is, of course, already quite impressive. The <span class='reputation inc'>reputation</span> tracked in the sidebar is specifically your <span class='reputation inc'>reputation</span> as a slaveowner. It can be raised through decadent actions that display your munificence and opulence. Some random events can increase it, but the most reliable way to improve your <span class='reputation inc'>reputation</span> is to send sexually skilled slaves out into the arcology to offer free sexual services. This assignment is very similar to prostitution, but produces <span class='reputation inc'>reputation</span> rather than");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("money", "Money"), "."), "cash"));
- r.push(`Your`, App.Encyclopedia.Dialog.linkDOM("Concubine", "Concubine"), `and to a lesser extent, other slaves assigned to your personal sexual service, also have a direct impact on your <span class='reputation inc'>reputation.</span> Maintaining an exclusive harem of beautiful, talented girls is not just one of the greatest perks of being an arcology owner, it's also a grand statement to the world about your personal standing and power.`);
+ r.push(App.Encyclopedia.link("money.", "Money", "cash"));
+ r.push(`Your`, App.Encyclopedia.link("Concubine"), `and to a lesser extent, other slaves assigned to your personal sexual service, also have a direct impact on your <span class='reputation inc'>reputation.</span> Maintaining an exclusive harem of beautiful, talented girls is not just one of the greatest perks of being an arcology owner, it's also a grand statement to the world about your personal standing and power.`);
App.Events.addParagraph(f, r);
r = [];
@@ -30,7 +30,7 @@ App.Encyclopedia.addArticle("Arcologies and Reputation", function() {
r = [];
r.push("Because societal development and reputation build upon each other, arcology owners who have a natural reputation disadvantage (such as young women) may find it best to develop a future society model for which they can easily build wide support early on in their arcology's development. Arcology owners who choose to focus on an especially challenging path at the start of their career, such as");
- r.push(App.Encyclopedia.Dialog.linkDOM("Repopulation", "Repopulationism"), "or", App.Encyclopedia.Dialog.linkDOM("Eugenics,", "Eugenics Focus"));
+ r.push(App.Encyclopedia.link("Repopulation", "Repopulationism"), "or", App.Encyclopedia.link("Eugenics,", "Eugenics Focus"));
r.push("may find that they have difficulty accumulating and maintaining enough <span class='reputation inc'>reputation</span> to shape additional societal development.");
App.Events.addParagraph(f, r);
@@ -51,7 +51,7 @@ App.Encyclopedia.addArticle("Random Events", function() {
r = [];
r.push("At the end of every turn, a random event may occur. Almost all random events are tied to necessary preconditions. For example, events concerning");
- r.push(App.Encyclopedia.Dialog.linkDOM("rebellious", "From Rebellious to Devoted", "devotion resistant"));
+ r.push(App.Encyclopedia.link("rebellious", "From Rebellious to Devoted", "devotion resistant"));
r.push("slaves will stop happening if all the player's slaves become obedient.");
App.Events.addParagraph(f, r);
@@ -65,7 +65,7 @@ App.Encyclopedia.addArticle("Random Events", function() {
r = [];
r.push("Finally, there are events that can result in the player being offered the chance to acquire new slaves, some of which can be unique or valuable. Generally, these events offer this livestock at an extremely discounted price. These events will appear more often the higher the player's");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("becomes.");
App.Events.addParagraph(f, r);
@@ -81,7 +81,7 @@ App.Encyclopedia.addArticle("Costs Summary", function() {
r = [];
r.push("Aphrodisiacs are");
- r.push(App.Encyclopedia.Dialog.linkDOM("cheap", "Money", "cash"));
+ r.push(App.Encyclopedia.link("cheap", "Money", "cash"));
r.push(`and cost <span class='cash'>${cashFormat(basicDrugCost)}</span> weekly; curatives are expensive and cost <span class='cash'>${cashFormat(basicDrugCost * 3)}</span> weekly; while all other drug regimes cost <span class='cash'>${cashFormat(basicDrugCost * 2)}.</span> Standard hormone regimens cost <span class='cash'>${Math.trunc(basicDrugCost * 0.5)}</span> while intensive hormone treatment costs <span class='cash'>${Math.trunc(basicDrugCost * 2 * 0.5)}.</span> Contraceptives cost <span class='cash'>${Math.trunc(basicDrugCost * 0.5)}.</span>`);
App.Events.addParagraph(f, r);
@@ -105,26 +105,35 @@ App.Encyclopedia.addArticle("Rules Assistant", function() {
r = [];
r.push(App.Encyclopedia.topic("The Rules Assistant"));
r.push("is a system to apply multiple rule sets to multiple slaves at once. You can apply rules to slaves based on slave");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("devotion", "From Rebellious to Devoted"), ","), ["devotion", "accept"]));
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("trust", "Trust"), ","), ["trust", "careful"]));
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("devotion", "From Rebellious to Devoted"), ","), ["devotion", "accept"]));
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("trust", "Trust"), ","), ["trust", "careful"]));
r.push("sex drive, health,");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("weight", "Weight"), ","));
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("muscles", "Musculature"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("weight", "Weight"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("muscles", "Musculature"), ","));
r.push("lactation, pregnancy, number of fetuses, abdominal implants and age.");
App.Events.addParagraph(f, r);
r = [];
r.push(App.Encyclopedia.topic("Rule settings"));
r.push("Rules can be used to control certain aspects of slaves everyday lives, for example to automatically give slaves a certain clothing option, collar, footwear or allow slaves to choose their own outfit. They can be used to give unhealthy slaves curatives to improve their health or to put slaves on a diet so that their");
- r.push(App.Encyclopedia.Dialog.linkDOM("weight", "Weight"));
+ r.push(App.Encyclopedia.link("weight"));
r.push("can be closer to the ideal weight. Rules set to <span class='encyclopedia interaction'>No default setting</span> will not apply that particular condition to slaves. Rules can also be renamed to be more indicative of their intended purpose.");
App.Events.addParagraph(f, r);
r = [];
- r.push(App.Encyclopedia.topic("Rule activation conditions"));
- r.push("To have control over which slaves the rule will apply to conditions can be created.");
- r.push(App.Encyclopedia.Dialog.linkDOM("In-depth explanation", "RA Condition Editor"));
- r.push("of the condition editor.");
+ r.push(App.Encyclopedia.topic("Rule activation"));
+ r.push("In order to apply a rule to slaves, the activation will need to be set. Choose an activation type");
+ r.push(App.UI.DOM.combineNodes("(",
+ App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("devotion", "From Rebellious to Devoted"), ","), ["devotion", "accept"])));
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("trust", "Trust"), ","), ["trust", "careful"]));
+ r.push("sex drive,");
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("health", "Health"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("weight", "Weight"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("muscles", "Musculature"), ","));
+ r.push("lactation, pregnancy, fetuses, implant size, or age) and then choose the level at which to apply. For example to apply a rule to obedient slaves, choose");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"));
+ r.push("for the activation and 4 or more for the lower limit by selecting <span class='encyclopedia interaction'>>=.</span>");
+ r.push(`You can also create custom conditions using any property of a slave, which you can find documented <a target='_blank' class='link-external' href='https://gitgud.io/pregmodfan/fc-pregmod/-/raw/pregmod-master/devNotes/legacy files/slave%20variables%20documentation.md'>here.</a>`);
App.Events.addParagraph(f, r);
r = [];
@@ -132,13 +141,23 @@ App.Encyclopedia.addArticle("Rules Assistant", function() {
r.push("Slaves can be selected for a rule by selecting slaves from the list so that a rule can apply only to them. Slaves can similarly be excluded from a rule.");
App.Events.addParagraph(f, r);
+ r = [];
+ r.push(App.Encyclopedia.topic("Applying a rule to specific assignments"));
+ r.push("You can apply a rule only to slaves on individual assignments by selecting them under <span class='encyclopedia interaction'>Apply to assignments.</span> For example a rule can give aphrodisiacs to slaves on whoring assignments. <span class='note'>This is mutually exclusive to automatically giving an assignment to slaves.</span>");
+ App.Events.addParagraph(f, r);
+
r = [];
r.push(App.Encyclopedia.topic("Automatically giving an assignment"));
r.push("A rule can be set to automatically set a slave to an assignment when activated. For example a");
- r.push(App.Encyclopedia.Dialog.linkDOM("devoted", "From Rebellious to Devoted", "devotion accept"));
+ r.push(App.Encyclopedia.link("devoted", "From Rebellious to Devoted", "devotion accept"));
r.push("slave can be set to automatically be put on the whoring assignment. <span class='note'>This is mutually exclusive to applying a rule to assignments.</span>");
App.Events.addParagraph(f, r);
+ r = [];
+ r.push(App.Encyclopedia.topic("Applying a rule to facilities"));
+ r.push("You can apply a rule to slaves in any or all facilities as long as that facility has been constructed. The rule will only apply to slaves within the selected facilities. <span class='note'>This is mutually exclusive to automatically putting slaves into a facility.</span>");
+ App.Events.addParagraph(f, r);
+
r = [];
r.push(App.Encyclopedia.topic("Automatically assigning slaves to a facility"));
r.push("A rule can be set to automatically put a slave into a facility when activated. For example disobedient slaves can be set to automatically be confined in the arcade if it has been constructed. <span class='note'>This is mutually exclusive to applying a rule to facilities.</span>");
@@ -173,7 +192,7 @@ App.Encyclopedia.addArticle("The Corporation", function() {
App.UI.DOM.appendNewElement("h3", f, "Shares");
r = [];
r.push("Buying shares from the corporation or issuing new shares will create new shares in the corporation. If you buy them yourself, cash will be transferred from you to the corporation in return for the shares; if you direct the corporation to issue new public shares,");
- r.push(App.Encyclopedia.Dialog.linkDOM("money", "Money", "cash"));
+ r.push(App.Encyclopedia.link("money", "Money", "cash"));
r.push("will come into the corporation from the market. If you direct the corporation to buy back shares from the public, cash will be transferred from the corporation to reduce the number of public shares, which will increase your ownership percentage. You are not permitted to give up majority ownership of the corporation. Selling your shares or buying publicly held shares are both transactions between you and your shares and shareholders and their shares. All transactions impact the stock price.");
App.Events.addParagraph(f, r);
@@ -192,7 +211,7 @@ App.Encyclopedia.addArticle("The Corporation", function() {
App.UI.DOM.appendNewElement("p", f, "Once a corporation is created, it will get its own establishment in the slave market. As the corporation's value increase, it can be given direction about what kind of slaves it should train and how it should train them, which will affect the slaves seen in the corporate catalog. As with divisions; the higher your corporation's value, the more specializations you are allowed to choose. Your corporation's divisions determine which specialization options are available. Each division has a unique specialization associated with it while many others are slightly more general and linked to either acquisition or modification. All kinds of restrictions may apply depending on Future Society choices and the size of your divisions. Several specializations can be enhanced beyond the first choice, but again you may need to satisfy certain conditions first.");
r = [];
r.push("If the corporation's slaves have qualities that make them especially appealing to an arcology's citizens, the corporation will enjoy increased profits, and the");
- r.push(App.Encyclopedia.Dialog.linkDOM("future society", "Future Societies"));
+ r.push(App.Encyclopedia.link("future society", "Future Societies"));
r.push("creating the demand will progress more rapidly due to the supply of appealing slaves. All arcologies present in the Free City will interact with the corporation this way, making shares in a corporation which supplies girls that appeal to the whole city extremely lucrative.");
App.Events.addParagraph(f, r);
@@ -233,28 +252,28 @@ App.Encyclopedia.addArticle("PC Skills", function() {
r = [];
r.push(App.Encyclopedia.topic("Hacking"));
r.push("is an indication of your effectiveness at manipulating computer systems. Higher levels make technological upgrades");
- r.push(App.Encyclopedia.Dialog.linkDOM("cheaper", "Money", "cash"));
+ r.push(App.Encyclopedia.link("cheaper", "Money", "cash"));
r.push("or free, provides a boost situations where fame is measured digitally. Can be increased through choosing to <span class='encyclopedia interaction'>Sell your intrusion services to the highest bidder</span> once the option becomes available after having <em>some</em> skill and purchasing technological upgrades.");
App.Events.addParagraph(f, r);
r = [];
r.push(App.Encyclopedia.topic("Slaving"));
r.push("improves your effectiveness as a slave driver. At max level it allows you to more easily spot");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("gingering", "Gingering"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("gingering", "Gingering"), "."));
r.push("Can be increased through acquiring performing the duties of a slave driver.");
App.Events.addParagraph(f, r);
r = [];
r.push(App.Encyclopedia.topic("Engineering"));
r.push("is a sign of how effective you are building and maintenance. Mastering the skill reduces the cost of <span class='cash'>arcology upgrades and expansions.</span> Can be increased through purchasing arcology upgrades or expanding facility capacity. If the");
- r.push(App.Encyclopedia.Dialog.linkDOM("Security Expansion", "Security Expansion"));
+ r.push(App.Encyclopedia.link("Security Expansion"));
r.push("mod is enabled, the skill is also increased by repairing your arcology.");
App.Events.addParagraph(f, r);
r = [];
r.push(App.Encyclopedia.topic("Medicine"));
r.push("shows how effective you are treating wounds. Max level reduces a slave's health and");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust careful"));
r.push("loss during surgery.");
App.Events.addParagraph(f, r);
@@ -269,15 +288,25 @@ App.Encyclopedia.addArticle("PC Skills", function() {
return f;
}, "beingInCharge");
+App.Encyclopedia.addArticle("Drug grades and you", function() {
+ const f = new DocumentFragment();
+ App.Events.addNode(f, ["There exist a trio of important differences between consumer-grade drugs made for citizens and slave-grade drugs reserved for chattel:"], "div");
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Health:", ["strong"]), `Consumer drugs generally lack the side-effects associated with long term slave-grade drug use. It is also far more difficult to accidentally ruin your body with their use.`], "div");
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Strength:", ["strong"]), `Overall, consumer drugs are weaker by comparison as a trade off for the improved health benefits. This does not mean they are necessarily worse, however; they are slower, but more consistent and able to confer their benefits past the point that slave-grade injections would cease to be reasonable.`], "div");
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Price:", ["strong"]), `With most production focused on cheap slave-grade drugs, consumer drugs run at a premium and usually require a physician to prescribe them.`], "div");
+ return f;
+}, "beingInCharge");
+
App.Encyclopedia.addCategory("beingInCharge", function() {
const links = [];
- links.push(App.Encyclopedia.Dialog.linkDOM("Arcologies and Reputation", "Arcologies and Reputation"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Random Events", "Random Events"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Costs Summary", "Costs Summary"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Rules Assistant", "Rules Assistant"));
- links.push(App.Encyclopedia.Dialog.linkDOM("RA Condition Editor", "RA Condition Editor"));
- links.push(App.Encyclopedia.Dialog.linkDOM("The Corporation", "The Corporation"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Sexual Energy", "Sexual Energy"));
- links.push(App.Encyclopedia.Dialog.linkDOM("PC Skills", "PC Skills"));
+ links.push(App.Encyclopedia.link("Arcologies and Reputation"));
+ links.push(App.Encyclopedia.link("Random Events"));
+ links.push(App.Encyclopedia.link("Costs Summary"));
+ links.push(App.Encyclopedia.link("Rules Assistant"));
+ links.push(App.Encyclopedia.link("RA Condition Editor"));
+ links.push(App.Encyclopedia.link("The Corporation"));
+ links.push(App.Encyclopedia.link("Sexual Energy"));
+ links.push(App.Encyclopedia.link("PC Skills"));
+ links.push(App.Encyclopedia.link("Drug grades and you"));
return App.UI.DOM.generateLinksStrip(links);
});
diff --git a/src/gui/Encyclopedia/encyclopediaBlackMarket.js b/src/gui/Encyclopedia/encyclopediaBlackMarket.js
new file mode 100644
index 0000000000000000000000000000000000000000..05b83c0ca6f346c30dae74acd7de509a30f236b4
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaBlackMarket.js
@@ -0,0 +1,61 @@
+App.Encyclopedia.addArticle("The Black Market", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+
+ r.push("You may be the ruler of your arcology, but you don't exist in a vacuum. You can do all kinds of thing and get lots of things that regular citizens can't. So the Black Market, is a chance for less prominent citizens to do or get stuff like an arcology leader might experience. But for a ruler like yourself, it's a chance to avoid the severe scrutiny you're subject to on a regular basis, and to get a hold of bleeding edge or illegal research and technologies. The market itself is always moving from place to place, but if you're reputable enough, you can find it when you need it.");
+ r.toNode("div");
+
+ r.push("You will be able to find all manner of Future Society technologies which are not exactly illegal, but difficult to get through regular channels. Every week, the dealers will have a few for you to purchase, but for the truly illegal or unethical items, your only choice is to go to the Black Market.");
+ r.toNode("p");
+
+ r.push("Specialty goods:", App.Encyclopedia.link("Childhood Fertility Induced NCS"));
+ r.toNode("p");
+
+ return t;
+}, "BlackMarket");
+
+App.Encyclopedia.addArticle("Contraband and Illegal Goods", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+
+ r.push("While there is little to no issue with possessing nearly anything, getting your hands on it may not always be feasible. Be it local policy or overreaching business deals, certain goods may not be found for sale in the Free City. This does not stop some of the shadier dealers from risking the sale of them, of course; this is where smugglers come in. There is always a market for contraband and illicit goods and never a shortage of people looking to buy them. Not all smugglers are successful, and those that aren't soon find themselves up for sale in the slave markets.");
+ r.toNode("div");
+
+ return t;
+}, "BlackMarket");
+
+App.Encyclopedia.addArticle("Childhood Fertility Induced NCS", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+
+ r.push("This uses a designer retrograde virus to set the genetic markers for the Neotenic Complex Syndrome, a syndrome originally called Syndrome X discovered in the early 2000s.");
+ r.push("In layman's terms, it", App.UI.DOM.makeElement("span", "suppresses the growth and secondary sexual characteristics of slaves", ["gold"]), "both male and female.");
+ r.push("The original condition was usually fatal or dangerous.");
+ r.push("This modified version of the genetic flaw is not harmful (relatively speaking), and in addition to the growth blockage, it permits the slave to continue the", App.UI.DOM.makeElement("span", "development of gonads", ["lime"]), "at a slightly faster than normal pace.");
+ r.push("Secondary sexual characteristics are also reversed, though interestingly enough, pregnancy is still possible.Slaves put on this genetic engineered blend will be permanently changed and will no longer grow in stature or assets without severe chemical assistance, and even then at a reduced rate when compared to non-NCS-induced slaves, and should their ongoing growth treatments stop they will slowly regress back to the physicality of a child.");
+ r.toNode("div");
+
+ r.push(App.UI.DOM.makeElement("span", "The genetic tampering is considered illegal,", ["red"]), "but there is also a", App.UI.DOM.makeElement("span", "moral question as this abrogates the rights of slaves to ever grow up.", ["yellow"]));
+ r.toNode("p");
+
+ r.push("Can only be purchased in", App.Encyclopedia.link("The Black Market"));
+ r.addToLast(".");
+ r.toNode("p");
+
+ return t;
+}, "BlackMarket");
+
+App.Encyclopedia.addCategory("BlackMarket", function() {
+ const r = [];
+ r.push(App.Encyclopedia.link("The Black Market"));
+ r.push(App.Encyclopedia.link("Contraband and Illegal Goods"));
+ r.push(App.Encyclopedia.link("Gender Radicalism Research"));
+ r.push(App.Encyclopedia.link("Slave Professionalism Research"));
+ r.push(App.Encyclopedia.link("Transformation Fetishism Research"));
+ r.push(App.Encyclopedia.link("Asset Expansionist Research"));
+ r.push(App.Encyclopedia.link("Slimness Enthusiast Research"));
+ r.push(App.Encyclopedia.link("Youth Preferentialism Research"));
+ r.push(App.Encyclopedia.link("Hedonistic Decadence Research"));
+ r.push(App.Encyclopedia.link("Childhood Fertility Induced NCS"));
+ return App.UI.DOM.generateLinksStrip(r);
+});
diff --git a/src/gui/Encyclopedia/encyclopediaBody.js b/src/gui/Encyclopedia/encyclopediaBody.js
index 546a77afd65fb7e0cc043ca5c76b895110ad8a90..9f0764e7ea2f56dd220955ee78d84d347d681976 100644
--- a/src/gui/Encyclopedia/encyclopediaBody.js
+++ b/src/gui/Encyclopedia/encyclopediaBody.js
@@ -1,6 +1,6 @@
App.Encyclopedia.addArticle("Body", function() {
const fragment = new DocumentFragment();
- App.UI.DOM.appendNewElement("p", fragment, "Future room for lore text", "note");
+ App.UI.DOM.appendNewElement("p", fragment, "Future room for lore text", ["note"]);
App.UI.DOM.appendNewElement("div", fragment, "Choose a more particular entry below:");
return fragment;
}, "body");
@@ -22,14 +22,14 @@ App.Encyclopedia.addArticle("Anuses", function() {
r.push(App.Encyclopedia.topic("anuses"));
r.push(`are a valuable commodity. Like`);
r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("vaginas", "Vaginas"),
+ App.Encyclopedia.link("vaginas"),
`,`
));
r.push(`they appear in four degrees of tightness: virgin and three increasing levels of looseness. Tighter anuses improve performance at sexual assignments, but most methods of learning `);
- r.push(App.Encyclopedia.Dialog.linkDOM("anal skill", "Anal Skill"));
+ r.push(App.Encyclopedia.link("anal skill", "Anal Skill"));
r.push(`tend to loosen anuses. Assigning a virgin to sex work will result in a one-time bonus to performance, but may anger her and can result in skipping up one level of looseness. A virgin anus applies a moderate cost multiplier for slave purchase or sale. Anuses can be loosened by events, strenuous sex work, or plug accessories; they can be tightened with rest from strenuous sex work, personal attention, or the autosurgery, though such surgery can reduce`);
r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("anal skill", "Anal Skill"),
+ App.Encyclopedia.link("anal skill", "Anal Skill"),
`.`
));
App.Events.addParagraph(fragment, r);
@@ -53,23 +53,34 @@ App.Encyclopedia.addArticle("Breasts", function() {
r.push(App.Encyclopedia.topic("breasts"));
r.push(`contribute to beauty. They can be enlarged with`);
r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("XX hormones", "Hormones (XX)"),
+ App.Encyclopedia.link("XX hormones", "Hormones (XX)"),
`, intense`
));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("lactation"), `,`));
r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("lactation", "Lactation"),
- `,`
- ));
- r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("weight gain", "Weight"),
+ App.Encyclopedia.link("weight gain", "Weight"),
`, or surgery (which`
));
- r.push(App.Encyclopedia.Dialog.linkDOM("boob fetishists", "Boob Fetishists"));
+ r.push(App.Encyclopedia.link("boob fetishists", "Boob Fetishists"));
r.push(`will be grateful for).`);
App.Events.addParagraph(fragment, r);
return fragment;
}, "body");
+App.Encyclopedia.addArticle("Butts", function() {
+ return App.UI.DOM.combineNodes(
+ `Slaves' `,
+ App.UI.DOM.makeElement("span", "butts", ["strong"]),
+ ` contribute to beauty. They can be enlarged with `,
+ App.Encyclopedia.link("XX hormones", "Hormones (XX)"),
+ `, `,
+ App.Encyclopedia.link("weight gain", "Weight"),
+ `, or surgery (which `,
+ App.Encyclopedia.link("buttsluts", "Buttsluts"),
+ ` will be grateful for).`
+ );
+}, "body");
+
App.Encyclopedia.addArticle("Clits", function() {
const fragment = new DocumentFragment();
const r = [];
@@ -88,17 +99,17 @@ App.Encyclopedia.addArticle("Dicks", function() {
r.push(App.Encyclopedia.topic("dicks"));
r.push(`are less straightforward than`);
- r.push(App.Encyclopedia.Dialog.linkDOM("anuses", "Anuses"));
+ r.push(App.Encyclopedia.link("anuses"));
r.push(`or `);
r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("vaginas", "Vaginas"), `.`
+ App.Encyclopedia.link("vaginas"), `.`
));
r.push(`At game start, larger dicks reduce slave value, though this can be reduced or even reversed by some future society choices. Slaves will remain capable of erection so long as they retain `);
- r.push(App.Encyclopedia.Dialog.linkDOM("testicles", "Testicles"));
+ r.push(App.Encyclopedia.link("testicles"));
r.push(`and are not on `);
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("female hormone treatments", "Hormones (XX)"), `.`));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("female hormone treatments", "Hormones (XX)"), `.`));
App.Events.addParagraph(fragment, r);
- fragment.append(App.Encyclopedia.Dialog.linkDOM("Clits?", "Clits"));
+ fragment.append(App.Encyclopedia.link("Clits?", "Clits"));
// TODO: how do dicks and clits relate, future coder?
return fragment;
}, "body");
@@ -118,7 +129,7 @@ App.Encyclopedia.addArticle("Faces", function() {
let r = [];
for (const [key, shape] of App.Medicine.Modification.faceShape) {
if (!shape.hasOwnProperty("requirements") || shape.requirements) {
- r.push(App.UI.DOM.makeElement("span", capFirstChar(key), "note"));
+ r.push(App.UI.DOM.makeElement("span", capFirstChar(key), ["note"]));
r.push(shape.desc);
App.Events.addNode(fragment, r, "div");
r = [];
@@ -128,7 +139,7 @@ App.Encyclopedia.addArticle("Faces", function() {
r.push(App.Encyclopedia.topic("faces"));
r.push(`contribute heavily to beauty. They occur in six shapes and seven levels of attractiveness, which can be affected by surgery or, if the slave is unattractive or masculine, intensive `);
r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("XX hormones", "Hormones (XX)"),
+ App.Encyclopedia.link("XX hormones", "Hormones (XX)"),
`.`
));
r.push(`Unlike most other attributes, a slave's face cannot be improved more than two steps by surgery. The autosurgery upgrade removes this limitation.`);
@@ -171,15 +182,12 @@ App.Encyclopedia.addArticle("Lactation", function() {
r.push(`Slaves can begin to`);
r.push(App.Encyclopedia.topic("lactate"));
r.push(`two ways: naturally due to pregnancy or constant stimulation, or artificially, through surgical implantation of a slow-release lactation-inducing drug pellet. Drug-induced lactation is more copious, but may damage `);
- r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("health", "Health"),
- `. Larger `
- ));
- r.push(App.Encyclopedia.Dialog.linkDOM("breasts", "Breasts"));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("health"), `. Larger `));
+ r.push(App.Encyclopedia.link("breasts"));
r.push(`will produce more milk, but not linearly: diminishing returns apply to bigger tits. Happy and `);
- r.push(App.Encyclopedia.Dialog.linkDOM("healthy", "Health"));
+ r.push(App.Encyclopedia.link("healthy", "Health"));
r.push(`cows are also more productive, and slaves with`);
- r.push(App.Encyclopedia.Dialog.linkDOM("ovaries", "Ovaries"));
+ r.push(App.Encyclopedia.link("ovaries"));
r.push(`enjoy a bonus to milk production. Natural lactation will dry up over time if not constantly maintained.`);
App.Events.addParagraph(fragment, r);
return fragment;
@@ -192,7 +200,7 @@ App.Encyclopedia.addArticle("Lips", function() {
r.push(App.Encyclopedia.topic("lips"));
r.push(`contribute to beauty. At very large sizes, they will alter dialog, though this has no mechanical effect. They can be enlarged with targeted growth hormones or surgery, but such surgery can reduce `);
r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("oral skill", "Oral Skill"),
+ App.Encyclopedia.link("oral skill", "Oral Skill"),
`.`
));
App.Events.addParagraph(fragment, r);
@@ -205,13 +213,13 @@ App.Encyclopedia.addArticle("Musculature", function() {
r.push(`Slaves'`);
r.push(App.Encyclopedia.topic("musculature"));
r.push(`occurs in seven levels, and affects combat effectiveness, beauty, and the effects of breasts. For combat, the penultimate level is best. At game start, muscles are a minor detriment to beauty, though this can be changed through `);
- r.push(App.Encyclopedia.Dialog.linkDOM("future society", "Future Societies"));
+ r.push(App.Encyclopedia.link("future society", "Future Societies"));
r.push(`choices. Extremely large breasts can begin to hinder slaves, but the first level will allow them to carry their burdens.`);
App.Events.addParagraph(fragment, r);
r = [];
r.push(`From the slave documentation;`);
- const table = App.UI.DOM.makeElement("table", null, "invisible");
+ const table = App.UI.DOM.makeElement("table", null, ["invisible"]);
r.push(table);
App.UI.DOM.makeRow(table, `96`, `100`, `extremely muscular`);
App.UI.DOM.makeRow(table, `31`, `95`, `muscular`);
@@ -224,17 +232,17 @@ App.Encyclopedia.addArticle("Musculature", function() {
App.Events.addParagraph(fragment, r);
r = [];
r.push(`A standard`);
- r.push(App.Encyclopedia.Dialog.linkDOM("bodyguard", "Bodyguard"));
+ r.push(App.Encyclopedia.link("bodyguard"));
r.push(`is negatively impacted by being weak or extremely muscular and positively impacted by being muscular. A slave that is at the max of tall or very tall (>= 185) can handle being extremely muscular.`);
App.Events.addParagraph(fragment, r);
App.UI.DOM.appendNewElement("p", fragment, App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("DJ", "DJ"),
+ App.Encyclopedia.link("DJ"),
`'s are more effective when they are just under being muscular and inside being toned.`
));
App.UI.DOM.appendNewElement("p", fragment, App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("Nurse", "Nurse"),
- ` is more effective when they are toned or greater.`
+ App.Encyclopedia.link("Nurse"),
+ `'s are more effective when they are toned or greater.`
));
App.UI.DOM.appendNewElement("p", fragment, `Values >= 95 allows slaves with extremely hypertrophied balls (>70) to move around with effort.`);
@@ -247,16 +255,14 @@ App.Encyclopedia.addArticle("Nipples", function() {
r.push(`Slaves'`);
r.push(App.Encyclopedia.topic("nipples"));
r.push(`have varying effects, depending on their shape. Tiny nipples have a negative effect on beauty, puffy and inverted nipples improve it, huge nipples improve it more strongly, and all others have no effect. Inverted and partially inverted nipples can be permanently protruded by nipple piercings or milking: this is uncomfortable, and will reduce`);
- r.push(App.UI.DOM.makeElement("span",
- App.Encyclopedia.Dialog.linkDOM("devotion", "From Rebellious to Devoted"), "hotpink"
- ));
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"));
r.push(`unless the slave is a`);
r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("masochist", "Masochists"),
+ App.Encyclopedia.link("masochist", "Masochists"),
`. Tiny nipples can be enlarged with `,
- App.Encyclopedia.Dialog.linkDOM("XX hormones", "Hormones (XX)"),
+ App.Encyclopedia.link("XX hormones", "Hormones (XX)"),
`, huge nipples can be reduced with `,
- App.Encyclopedia.Dialog.linkDOM("XY hormones", "Hormones (XY)"),
+ App.Encyclopedia.link("XY hormones", "Hormones (XY)"),
`, breast growth hormones will grow and may invert nipples, and breast implantation may damage nipples enough to shrink them slightly.`
));
@@ -270,10 +276,7 @@ App.Encyclopedia.addArticle("Ovaries", function() {
r.push(`Slaves'`);
r.push(App.Encyclopedia.topic("ovaries"));
r.push(`are necessary for pregnancy and provide a small amount of natural XX hormones. An oophorectomy, available with extreme content enabled, will render a slave barren and stop ovaries' hormonal effects, producing a slave with no natural hormones. Barren slaves do suffer penalties under some future society choices, but do not require costly contraceptives to avoid pregnancy. Ovaries grant a bonus to `);
- r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("lactation", "Lactation"),
- `.`
- ));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("lactation"), `.`));
App.Events.addParagraph(fragment, r);
return fragment;
}, "body");
@@ -282,15 +285,15 @@ App.Encyclopedia.addArticle("Pregnancy", function() {
const fragment = new DocumentFragment();
let r = [];
r.push(`Slaves require both`);
- r.push(App.Encyclopedia.Dialog.linkDOM("vaginas", "Vaginas"));
+ r.push(App.Encyclopedia.link("vaginas"));
r.push(`and`);
- r.push(App.Encyclopedia.Dialog.linkDOM("ovaries", "Ovaries"));
+ r.push(App.Encyclopedia.link("ovaries"));
r.push(`to become pregnant. However, it's rumored that Gender Radicalist societies have developed a method for `);
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("male impregnation", "Gender Radicalism Research"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("male impregnation", "Gender Radicalism Research"), "."));
r.push(`Fertile slaves can be impregnated by the player character or a slave with`);
- r.push(App.Encyclopedia.Dialog.linkDOM("testicles", "Testicles"));
+ r.push(App.Encyclopedia.link("testicles"));
r.push(`from the fertile slave's individual menu. Otherwise, slaves with vaginas and ovaries who aren't wearing chastity belts or taking contraceptives, and have not had their tubes tied via surgery, will likely become pregnant if performing sexual jobs or if allowed to have sex with slaves with balls. Pregnancy has a number of minor physical effects and will induce`);
- r.push(App.Encyclopedia.Dialog.linkDOM("lactation", "Lactation"));
+ r.push(App.Encyclopedia.link("lactation"));
App.Events.addParagraph(fragment, r);
return fragment;
}, "body");
@@ -304,25 +307,25 @@ App.Encyclopedia.addArticle("Skin Distinctions", function() {
App.Events.addParagraph(fragment, r);
r = [];
- r.push(App.UI.DOM.makeElement("span", "Freckles", "italics"));
+ r.push(App.UI.DOM.makeElement("span", "Freckles", ["italics"]));
r.push(`of both densities will slightly improve a slave's `);
- App.Encyclopedia.Dialog.linkDOM("attractiveness score", "Slave Score (Attractiveness)");
+ App.Encyclopedia.link("attractiveness score", "Slave Score (Attractiveness)");
r.push(`if she has pale or fair skin, and slightly improve it again if she has red hair.`);
App.Events.addParagraph(fragment, r);
r = [];
- r.push(App.UI.DOM.makeElement("span", "Beauty marks,", "italics"));
+ r.push(App.UI.DOM.makeElement("span", "Beauty marks,", ["italics"]));
r.push(`otherwise known as facial moles, will improve a slave's`);
- App.Encyclopedia.Dialog.linkDOM("attractiveness score", "Slave Score (Attractiveness)");
+ App.Encyclopedia.link("attractiveness score", "Slave Score (Attractiveness)");
r.push(`if she has a gorgeous `);
r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("face", "Faces"),
+ App.Encyclopedia.link("face", "Faces"),
`, reduce it if she has an average or worse face, and have no effect if she has a very pretty face.`
));
App.Events.addParagraph(fragment, r);
r = [];
- r.push(App.UI.DOM.makeElement("span", "Birthmarks", "italics"));
+ r.push(App.UI.DOM.makeElement("span", "Birthmarks", ["italics"]));
r.push(`will improve a slave's attractiveness score if she is prestigious, and reduce it if she is not.`);
App.Events.addParagraph(fragment, r);
return fragment;
@@ -330,21 +333,12 @@ App.Encyclopedia.addArticle("Skin Distinctions", function() {
App.Encyclopedia.addArticle("Teeth", function() {
const fragment = new DocumentFragment();
- let r = [];
- r.push(`Slaves'`);
- r.push(App.Encyclopedia.topic("teeth"));
- r.push(`have a variety of impacts and can be customized in several ways.`);
- App.Events.addParagraph(fragment, r);
- r = [];
+ App.Events.addParagraph(fragment, [`Slaves'`, App.Encyclopedia.topic("teeth"), `have a variety of impacts and can be customized in several ways.`]);
for (const [key, teeth] of App.Medicine.Modification.teeth) {
- if (!teeth.hasOwnProperty("requirements") || teeth.requirements) {
- r.push(App.UI.DOM.makeElement("span", capFirstChar(key), "note"));
- r.push(teeth.desc);
- App.Events.addNode(fragment, r, "div");
- r = [];
+ if (teeth.desc) {
+ App.Events.addNode(fragment, [App.UI.DOM.makeElement("span", capFirstChar(key), ["note"]), teeth.desc], "div");
}
}
- App.Events.addParagraph(fragment, r);
return fragment;
}, "body");
@@ -365,19 +359,19 @@ App.Encyclopedia.addArticle("Vaginas", function() {
r.push(App.Encyclopedia.topic("vaginas"));
r.push(`are a valuable commodity. Like `);
r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("anuses", "Anuses"),
+ App.Encyclopedia.link("anuses"),
`, they appear in four degrees of tightness: virgin and three increasing levels of looseness. Tighter vaginas improve performance at sexual assignments, but most methods of learning `
));
- r.push(App.Encyclopedia.Dialog.linkDOM("anal skill", "Anal Skill"));
+ r.push(App.Encyclopedia.link("anal skill", "Anal Skill"));
r.push(`tend to loosen anuses. Assigning a virgin to sex work will result in a one-time bonus to performance but may anger her; alternatively, a chastity belt can be used to preserve virginity during sexual assignments. A virgin vagina applies a large cost multiplier for slave purchase or sale. Vaginas can be loosened by events, strenuous sex work, or plug accessories; they can be tightened with rest from strenuous sex work, personal attention, or the autosurgery, though such surgery can reduce`);
r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("vaginal skill", "Vaginal Skill"),
+ App.Encyclopedia.link("vaginal skill", "Vaginal Skill"),
`.`
));
App.Events.addParagraph(fragment, r);
- fragment.append(App.Encyclopedia.Dialog.linkDOM("Clit?", "Clits"));
+ fragment.append(App.Encyclopedia.link("Clit?", "Clits"));
return fragment;
}, "body");
@@ -389,22 +383,22 @@ App.Encyclopedia.addArticle("Weight", function() {
r.push(App.Encyclopedia.topic("weight"));
r.push(`contributes to their beauty. The middle three values (thin, average and curvy) are all considered equally good; outside that range, penalties are applied. Gaining and losing weight can cause changes to a slave's`);
r.push(App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("breast", "Breasts"),
+ App.Encyclopedia.link("breast", "Breasts"),
` and `,
- App.Encyclopedia.Dialog.linkDOM("butt", "Butts"),
+ App.Encyclopedia.link("butt", "Butts"),
` size, and will be different for `,
- App.Encyclopedia.Dialog.linkDOM("anorexics", "Anorexic"),
+ App.Encyclopedia.link("anorexics", "Anorexic"),
`, `,
- App.Encyclopedia.Dialog.linkDOM("gluttons", "Gluttonous"),
+ App.Encyclopedia.link("gluttons", "Gluttonous"),
`, and `,
- App.Encyclopedia.Dialog.linkDOM("fitness", "Fitness"),
+ App.Encyclopedia.link("fitness"),
` fanatics.`,
));
App.Events.addParagraph(fragment, r);
r = [];
r.push(`From the slave documentation;`);
- const table = App.UI.DOM.makeElement("table", null, "invisible");
+ const table = App.UI.DOM.makeElement("table", null, ["invisible"]);
r.push(table);
App.UI.DOM.makeRow(table, `191`, `200`, `dangerously obese. This can lead to a slave losing their leadership position.`);
App.UI.DOM.makeRow(table, `161`, `190`, `super obese`);
@@ -420,7 +414,7 @@ App.Encyclopedia.addArticle("Weight", function() {
App.Events.addParagraph(fragment, r);
r = [];
r.push(`he ideal range for a`);
- r.push(App.Encyclopedia.Dialog.linkDOM("bodyguard", "Bodyguard"));
+ r.push(App.Encyclopedia.link("bodyguard"));
r.push(`is -10 to 30, going either way negatively impacts them.`);
App.Events.addParagraph(fragment, r);
return fragment;
@@ -432,7 +426,7 @@ App.Encyclopedia.addArticle("Hormones (XX)", function() {
r.push(App.UI.DOM.combineNodes(
App.Encyclopedia.topic("XX Hormones"),
`are female hormones, either from hormone treatments or from `,
- App.Encyclopedia.Dialog.linkDOM("ovaries", "Ovaries"),
+ App.Encyclopedia.link("ovaries"),
`. A hidden hormonal score is calculated for each slave, with positive values more feminine:`
));
App.Events.addNode(fragment, r, "div");
@@ -442,31 +436,31 @@ App.Encyclopedia.addArticle("Hormones (XX)", function() {
App.UI.DOM.appendNewElement("li", list, `normal XX hormones provide +1`);
App.UI.DOM.appendNewElement("li", list, `heavy XX hormones provide +2`);
App.UI.DOM.appendNewElement("li", list, App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("Ovaries", "Ovaries"),
+ App.Encyclopedia.link("Ovaries"),
` provide +1`
));
App.UI.DOM.appendNewElement("li", list, App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("Testicles", "Testicles"),
+ App.Encyclopedia.link("Testicles"),
` provide -1`
));
r = [];
r.push(`At a total of +1 with no ovaries present, XY attraction will increase, dicks will shrink, testicles will shrink, deep voices will be raised, small breasts and buttocks will grow, ugly faces will soften, huge clits will shrink, and extreme `);
- r.push(App.Encyclopedia.Dialog.linkDOM("musculature", "Musculature"));
+ r.push(App.Encyclopedia.link("musculature"));
r.push(`will soften.`);
App.Events.addParagraph(fragment, r);
r = [];
r.push(`At +2, all these effects become more likely and more extreme, and`);
- r.push(App.UI.DOM.makeElement("span", App.Encyclopedia.Dialog.linkDOM("devotion", "From Rebellious to Devoted"), "hotpink"));
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"));
r.push(`and`);
- r.push(App.UI.DOM.makeElement("span", App.Encyclopedia.Dialog.linkDOM("trust", "Trust"), "mediumaquamarine"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "mediumaquamarine"));
r.push(`can both increase.`);
App.Events.addParagraph(fragment, r);
r = [];
r.push(`Artificial hormonal effects can be accelerated by installing the second `);
- r.push(App.Encyclopedia.Dialog.linkDOM("upgrade", "What the Upgrades Do"));
+ r.push(App.Encyclopedia.link("upgrade", "What the Upgrades Do"));
r.push(`to the kitchen, which will also stop slave's assets from shrinking due to natural hormonal effects.`);
App.Events.addParagraph(fragment, r);
@@ -479,7 +473,7 @@ App.Encyclopedia.addArticle("Hormones (XY)", function() {
r.push(App.UI.DOM.combineNodes(
App.Encyclopedia.topic("XY Hormones"),
`are male hormones, either from hormone treatments or from `,
- App.Encyclopedia.Dialog.linkDOM("Testicles", "Testicles"),
+ App.Encyclopedia.link("Testicles"),
`. A hidden hormonal score is calculated for each slave, with negative values more masculine:`
));
App.Events.addNode(fragment, r, "div");
@@ -489,11 +483,11 @@ App.Encyclopedia.addArticle("Hormones (XY)", function() {
App.UI.DOM.appendNewElement("li", list, `normal XY hormones provide -1`);
App.UI.DOM.appendNewElement("li", list, `heavy XY hormones provide -2`);
App.UI.DOM.appendNewElement("li", list, App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("Ovaries", "Ovaries"),
+ App.Encyclopedia.link("Ovaries"),
` provide +1`
));
App.UI.DOM.appendNewElement("li", list, App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("Testicles", "Testicles"),
+ App.Encyclopedia.link("Testicles"),
` provide -1`
));
@@ -501,13 +495,13 @@ App.Encyclopedia.addArticle("Hormones (XY)", function() {
r = [];
r.push(`At +2, all these effects become more likely and more extreme,`);
- r.push(App.UI.DOM.makeElement("span", App.Encyclopedia.Dialog.linkDOM("devotion", "From Rebellious to Devoted"), "hotpink"));
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"));
r.push(`can decrease, dicks and testicles will grow, voices will deepen, and faces will become uglier.`);
App.Events.addParagraph(fragment, r);
r = [];
r.push(`Artificial hormonal effects can be accelerated by installing the second `);
- r.push(App.Encyclopedia.Dialog.linkDOM("upgrade", "What the Upgrades Do"));
+ r.push(App.Encyclopedia.link("upgrade", "What the Upgrades Do"));
r.push(`to the kitchen, which will also stop slave's assets from shrinking due to natural hormonal effects.`);
App.Events.addParagraph(fragment, r);
@@ -516,29 +510,29 @@ App.Encyclopedia.addArticle("Hormones (XY)", function() {
App.Encyclopedia.addCategory("body", function() {
const links = [];
- links.push(App.Encyclopedia.Dialog.linkDOM("Anuses", "Anuses"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Areolae", "Areolae"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Breasts", "Breasts"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Butts", "Butts"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Clits", "Clits"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Dicks", "Dicks"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Ethnicity", "Ethnicity"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Faces", "Faces"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Height", "Height"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Hips", "Hips"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Lactation", "Lactation"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Lips", "Lips"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Musculature", "Musculature"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Nipples", "Nipples"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Ovaries", "Ovaries"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Pregnancy", "Pregnancy"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Skin Distinctions", "Skin Distinctions"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Teeth", "Teeth"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Testicles", "Testicles"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Vaginas", "Vaginas"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Waist", "Waist"));
- links.push(App.Encyclopedia.Dialog.linkDOM("Weight", "Weight"));
- links.push(App.Encyclopedia.Dialog.linkDOM("XX", "Hormones (XX)"));
- links.push(App.Encyclopedia.Dialog.linkDOM("XY", "Hormones (XY)"));
+ links.push(App.Encyclopedia.link("Anuses"));
+ links.push(App.Encyclopedia.link("Areolae"));
+ links.push(App.Encyclopedia.link("Breasts"));
+ links.push(App.Encyclopedia.link("Butts"));
+ links.push(App.Encyclopedia.link("Clits"));
+ links.push(App.Encyclopedia.link("Dicks"));
+ links.push(App.Encyclopedia.link("Ethnicity"));
+ links.push(App.Encyclopedia.link("Faces"));
+ links.push(App.Encyclopedia.link("Height"));
+ links.push(App.Encyclopedia.link("Hips"));
+ links.push(App.Encyclopedia.link("Lactation"));
+ links.push(App.Encyclopedia.link("Lips"));
+ links.push(App.Encyclopedia.link("Musculature"));
+ links.push(App.Encyclopedia.link("Nipples"));
+ links.push(App.Encyclopedia.link("Ovaries"));
+ links.push(App.Encyclopedia.link("Pregnancy"));
+ links.push(App.Encyclopedia.link("Skin Distinctions"));
+ links.push(App.Encyclopedia.link("Teeth"));
+ links.push(App.Encyclopedia.link("Testicles"));
+ links.push(App.Encyclopedia.link("Vaginas"));
+ links.push(App.Encyclopedia.link("Waist"));
+ links.push(App.Encyclopedia.link("Weight"));
+ links.push(App.Encyclopedia.link("XX", "Hormones (XX)"));
+ links.push(App.Encyclopedia.link("XY", "Hormones (XY)"));
return App.UI.DOM.generateLinksStrip(links);
});
diff --git a/src/gui/Encyclopedia/encyclopediaCommonAssignments.js b/src/gui/Encyclopedia/encyclopediaCommonAssignments.js
index 854ec89bdb50e5ae545ee8f232b1d88fea42ec46..0091b7be37ebd4c22b8dad9655560ea92a91eb3e 100644
--- a/src/gui/Encyclopedia/encyclopediaCommonAssignments.js
+++ b/src/gui/Encyclopedia/encyclopediaCommonAssignments.js
@@ -18,7 +18,7 @@ App.Encyclopedia.Assignments = {
return App.UI.DOM.combineNodes(
App.Encyclopedia.topic("Confinement"),
" is an assignment which accelerates breaking for disobedient slaves. If a slave isn't obedient enough to work and isn't ",
- App.Encyclopedia.Dialog.linkDOM("unhealthy", "Health"),
+ App.Encyclopedia.link("unhealthy", "Health"),
" enough to need rest, this will make them useful sooner."
);
},
@@ -30,7 +30,7 @@ App.Encyclopedia.Assignments = {
return App.UI.DOM.combineNodes(
App.Encyclopedia.topic("Fucktoy service"),
" is an assignment which keeps the slave close and under the player's eye. It's mostly just for fun, but fucktoys can improve ",
- App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"),
+ App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"),
" based on their beauty, and the player character's attention can be targeted to areas of the slave's body with possible fetish effects on happy slaves."
);
},
@@ -42,7 +42,7 @@ App.Encyclopedia.Assignments = {
return App.UI.DOM.combineNodes(
App.Encyclopedia.topic("Occupying a glory hole"),
" is an assignment which makes money off of slaves regardless of their beauty, skills, or feelings; it's not fun or ",
- App.Encyclopedia.Dialog.linkDOM("healthy", "Health"),
+ App.Encyclopedia.link("healthy", "Health"),
" but very powerful for extracting ¤ out of otherwise useless slaves."
);
},
@@ -56,7 +56,7 @@ App.Encyclopedia.Assignments = {
fragment.append(
App.Encyclopedia.topic("Getting milked"),
" is an assignment which makes money from lactation based on a slave's breasts, ",
- App.Encyclopedia.Dialog.linkDOM("health", "Health"),
+ App.Encyclopedia.link("health"),
" and hormonal status."
);
if (V.seeDicks > 0) {
@@ -75,7 +75,7 @@ App.Encyclopedia.Assignments = {
fragment.append(
App.Encyclopedia.topic("Farming"),
" is an assignment which produces ",
- App.Encyclopedia.Dialog.linkDOM("food", "Food"),
+ App.Encyclopedia.link("food"),
" from your slaves' hard work"
);
if (V.seeBestiality) {
@@ -83,7 +83,7 @@ App.Encyclopedia.Assignments = {
}
fragment.append(
". Can also reduce arcology upkeep with upgrades in the ",
- App.Encyclopedia.Dialog.linkDOM("Farmyard", "Farmyard")
+ App.Encyclopedia.link("Farmyard")
);
return fragment;
},
@@ -105,7 +105,7 @@ App.Encyclopedia.Assignments = {
return App.UI.DOM.combineNodes(
App.Encyclopedia.topic("Rest"),
" is an assignment mostly used to improve ",
- App.Encyclopedia.Dialog.linkDOM("health", "Health"),
+ App.Encyclopedia.link("health"),
". It can be useful to order slaves you wish to intensively modify to rest, since most modifications damage health. It will synergize with curative treatments, providing bonus healing when both are simultaneously applied."
);
},
@@ -117,7 +117,7 @@ App.Encyclopedia.Assignments = {
return App.UI.DOM.combineNodes(
App.Encyclopedia.topic("Sexual servitude"),
" is an assignment which pleases other slaves by forcing the slave to service them sexually. Useful for driving the targeted slave's ",
- App.Encyclopedia.Dialog.linkDOM("devotion", "Devotion"),
+ App.Encyclopedia.link("devotion"),
" up quickly."
);
},
@@ -129,7 +129,7 @@ App.Encyclopedia.Assignments = {
return App.UI.DOM.combineNodes(
App.Encyclopedia.topic("Servitude"),
" is an assignment which reduces your upkeep based on the slave's ",
- App.Encyclopedia.Dialog.linkDOM("devotion", "Devotion"),
+ App.Encyclopedia.link("devotion"),
". Available at lower obedience than other jobs, is insensitive to the quality of a slave's body, and doesn't require skills; a good transitional assignment. Unusually, low sex drive is advantageous as a servant, since it reduces distraction. Lactating slaves are slightly better at this job, since they can contribute to their fellow slaves' nutrition."
);
},
@@ -149,7 +149,7 @@ App.Encyclopedia.addArticle("Slave Assignments", function() {
const frag = new DocumentFragment();
const r = [];
r.push("Slave assignments are stratified into ordinary assignments and");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("leadership positions", "Leadership Positions"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("leadership positions"), "."));
App.Events.addParagraph(frag, r);
App.UI.DOM.appendNewElement("p", frag, "Choose a more particular entry below:");
@@ -162,7 +162,7 @@ App.Encyclopedia.addArticle("Attending Classes", function() {
const r = [];
r.push(App.Encyclopedia.Assignments.attendingClasses());
r.push(App.UI.DOM.makeElement("span",
- App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.Dialog.linkDOM("Schoolroom", "Schoolroom")),
+ App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.link("Schoolroom")),
"note"));
frag.append(...App.Events.spaceSentences(r));
return frag;
@@ -173,7 +173,7 @@ App.Encyclopedia.addArticle("Confinement", function() {
const r = [];
r.push(App.Encyclopedia.Assignments.confinement());
r.push(App.UI.DOM.makeElement("span",
- App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.Dialog.linkDOM("Cellblock", "Cellblock")),
+ App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.link("Cellblock")),
"note"));
frag.append(...App.Events.spaceSentences(r));
return frag;
@@ -184,7 +184,7 @@ App.Encyclopedia.addArticle("Fucktoy", function() {
const r = [];
r.push(App.Encyclopedia.Assignments.fucktoy());
r.push(App.UI.DOM.makeElement("span",
- App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.Dialog.linkDOM("Master Suite", "Master Suite")),
+ App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.link("Master Suite")),
"note"));
frag.append(...App.Events.spaceSentences(r));
return frag;
@@ -195,7 +195,7 @@ App.Encyclopedia.addArticle("Glory Hole", function() {
const r = [];
r.push(App.Encyclopedia.Assignments.gloryHole());
r.push(App.UI.DOM.makeElement("span",
- App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.Dialog.linkDOM("Arcade", "Arcade")),
+ App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.link("Arcade")),
"note"));
frag.append(...App.Events.spaceSentences(r));
return frag;
@@ -208,7 +208,7 @@ App.Encyclopedia.addArticle("Milking", function() {
r.push(App.Encyclopedia.Assignments.milking());
r.push(App.UI.DOM.makeElement("span",
- App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.Dialog.linkDOM("Dairy", "Dairy")),
+ App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.link("Dairy")),
"note"));
frag.append(...App.Events.spaceSentences(r));
return frag;
@@ -220,7 +220,7 @@ App.Encyclopedia.addArticle("Farming", function() {
r.push(App.Encyclopedia.Assignments.farming());
r.push(App.UI.DOM.makeElement("span",
- App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.Dialog.linkDOM("Farmyard", "Farmyard")),
+ App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.link("Farmyard")),
"note"));
frag.append(...App.Events.spaceSentences(r));
return frag;
@@ -232,7 +232,7 @@ App.Encyclopedia.addArticle("Public Service", function() {
r.push(App.Encyclopedia.Assignments.publicService());
r.push(App.UI.DOM.makeElement("span",
- App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.Dialog.linkDOM("Club", "Club")),
+ App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.link("Club")),
"note"));
frag.append(...App.Events.spaceSentences(r));
return frag;
@@ -244,14 +244,14 @@ App.Encyclopedia.addArticle("Rest", function() {
r.push(App.Encyclopedia.Assignments.rest());
r.push(App.UI.DOM.makeElement("span",
- App.UI.DOM.combineNodes("Associated facilities: ", App.Encyclopedia.Dialog.linkDOM("Spa", "Spa"),
- ", ", App.Encyclopedia.Dialog.linkDOM("Clinic", "Clinic")),
+ App.UI.DOM.combineNodes("Associated facilities: ", App.Encyclopedia.link("Spa"),
+ ", ", App.Encyclopedia.link("Clinic")),
"note"));
frag.append(...App.Events.spaceSentences(r));
return frag;
}, "assignmentCommon");
-App.Encyclopedia.addArticle("Sexual Servitude", App.Encyclopedia.Assignments.servitude, "assignmentCommon");
+App.Encyclopedia.addArticle("Sexual Servitude", App.Encyclopedia.Assignments.sexualServitude, "assignmentCommon");
App.Encyclopedia.addArticle("Servitude", function() {
const frag = new DocumentFragment();
@@ -259,7 +259,7 @@ App.Encyclopedia.addArticle("Servitude", function() {
r.push(App.Encyclopedia.Assignments.servitude());
r.push(App.UI.DOM.makeElement("span",
- App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.Dialog.linkDOM("Servants' Quarters", "Servants' Quarters")),
+ App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.link("Servants' Quarters")),
"note"));
frag.append(...App.Events.spaceSentences(r));
return frag;
@@ -271,7 +271,7 @@ App.Encyclopedia.addArticle("Whoring", function() {
r.push(App.Encyclopedia.Assignments.whoring());
r.push(App.UI.DOM.makeElement("span",
- App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.Dialog.linkDOM("Brothel", "Brothel")),
+ App.UI.DOM.combineNodes("Associated facility: ", App.Encyclopedia.link("Brothel")),
"note"));
frag.append(...App.Events.spaceSentences(r));
return frag;
@@ -279,18 +279,18 @@ App.Encyclopedia.addArticle("Whoring", function() {
App.Encyclopedia.addCategory("assignmentCommon", function() {
const r = [];
- r.push(App.Encyclopedia.Dialog.linkDOM("Common Assignments", "Slave Assignments"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Career Experience", "Career Experience"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Attending Classes", "Attending Classes"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Confinement", "Confinement"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Farming", "Farming"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Fucktoy", "Fucktoy"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Glory Hole", "Glory Hole"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Milking", "Milking"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Public Service", "Public Service"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Rest", "Rest"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Servitude, Sexual", "Sexual Servitude"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Servitude", "Servitude"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Whoring", "Whoring"));
+ r.push(App.Encyclopedia.link("Common Assignments", "Slave Assignments"));
+ r.push(App.Encyclopedia.link("Career Experience"));
+ r.push(App.Encyclopedia.link("Attending Classes"));
+ r.push(App.Encyclopedia.link("Confinement"));
+ r.push(App.Encyclopedia.link("Farming"));
+ r.push(App.Encyclopedia.link("Fucktoy"));
+ r.push(App.Encyclopedia.link("Glory Hole"));
+ r.push(App.Encyclopedia.link("Milking"));
+ r.push(App.Encyclopedia.link("Public Service"));
+ r.push(App.Encyclopedia.link("Rest"));
+ r.push(App.Encyclopedia.link("Servitude, Sexual", "Sexual Servitude"));
+ r.push(App.Encyclopedia.link("Servitude"));
+ r.push(App.Encyclopedia.link("Whoring"));
return App.UI.DOM.generateLinksStrip(r);
});
diff --git a/src/gui/Encyclopedia/encyclopediaCredits.js b/src/gui/Encyclopedia/encyclopediaCredits.js
new file mode 100644
index 0000000000000000000000000000000000000000..24ed2b0f157e040e67bae4a3434c6aa4b37f0931
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaCredits.js
@@ -0,0 +1,290 @@
+App.Encyclopedia.addArticle("Credits", function() {
+ const r = new SpacedTextAccumulator();
+
+ r.push("This game was created by a person with no coding experience whatsoever. If I can create a playable h-game, so can you.");
+ r.toParagraph();
+ r.push("<span class='encyclopedia emphasize'>I do not give credit without explicit permission to do so.</span> If you have contributed content and are not credited, please reach out on gitgud so credit can be given where due.");
+ r.toParagraph();
+
+ const credits = [{
+ n: "Boney M",
+ d: ["of JoNT /hgg/ mod fame has been invaluable, combing tirelessly through the code to find and report my imbecilities.", "Coded an improvement to the relative recruitment system.", "Wrote and coded the Ancient Egyptian Revivalism acquisition event.", "Wrote and coded a prestige event for ex-abolitionists.", "Coded a training event for slaves who hate blowjobs.", "Wrote and coded several slave introduction options."]
+ }, {
+ n: "DrPill",
+ d: ["has offered great feedback, playtested exhaustively, and more.", "Wrote a slave introduction option."]
+ }, {
+ n: "bob22smith2000",
+ d: ["has made major contributions, not limited to close review of thousands of lines of code.", "Improved all facility and most assignment code for v0.5.11, an immense task."]
+ }, {
+ n: "Gerald Russell", d: ["went into the code to locate and fix bugs."]
+ }, {
+ n: "Ryllynyth", d: ["contributed many bugfixes and suggestions in convenient code format."]
+ }, {
+ n: "CornCobMan",
+ d: ["contributed several major modpacks, which include clothing, hair and eye colors, a facility name and arcology name expansions, UI improvements, nicknames, names, balance, a huge rework of the Rules Assistant, and more. CornCobMan has indefatigably supported the RA updates."]
+ }, {
+ n: "Klementine", d: ["wrote the fertility goddess skin for the personal assistant."]
+ }, {
+ n: "Wahn", d: ["wrote numerous generic recruitment events."]
+ }, {
+ n: "PregModder",
+ d: ["has modded extensively, including descriptive embellishments for pregnant slaves, various asset descriptions, Master Suite reporting, the Wardrobe, a pack of facility leader interactions, options for Personal Assistant appearances, birthing scenes, fake pregnancy accessories, many other preg mechanics, blind content, expanded chubby belly descriptions, several new surgeries, neon and metallic makeup, better descriptive support for different refreshments, work on choosesOwnJob, many bugfixes, an expansion to the hostage corruption event chain, slave specific player titles, gagging and several basic gags, extended family mode, oversized sex toys, buttplug attachment system, and other, likely forgotten, things. (And that's just the vanilla added stuff!)"]
+ }, {
+ n: "Lolimodder", d: ["your loli expertise will be missed."]
+ }, {
+ n: "pregmodfan",
+ d: ["for tremendous amounts of work with compilers, decompilers, etc. Single-handedly kicked this mod into its new git home. Contributed lots of bugfixes as well as fixed the RA considerably. Revamped pregnancy tracking as well then further expanded it — and then expanding it more with superfetation. Also for ppmod, ramod, implmod, cfpmod and psmod (preg speed). Added a pregnancy adapatation upgrade to the incubator."]
+ }, {
+ n: "FCGudder",
+ d: ["for advanced economy reports, image improvements, cleaning and fixing extended-extended family mode, extending building widgets, anaphrodisiacs, name cleaning, height overhauling, proper slave summary caching, new shelter slaves, some crazy ass shit with vector art, fixing seDeath, coding jQuery in ui support and likely one to two of these other anon credits."]
+ }, {
+ n: "family mod anon", d: ["for extending extended family mode."]
+ }, {
+ n: "anon",
+ d: ["for lolimod content, new slave careers, new pubestyles, general improvements and considerable bugfixing, most notably that infernal", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "bug.",
+ ]
+ }, {
+ n: "anon", d: ["added a pair of fairy PA appearances."]
+ }, {
+ n: "anon", d: ["for their clitoral surgery, SMRs, and hip changes."]
+ }, {
+ n: "DarkTalon25",
+ d: ["for the Scots, Belarus, Dominicans, gilfwork, additional nicknames and a scalemail bikini."]
+ }, {
+ n: "anon", d: ["for FAbuse alterations, gang leader start, and scarring."]
+ }, {
+ n: "anon", d: ["for numerous pointed out typos."]
+ }, {
+ n: "anon", d: ["for grorious nihon starting rocation."]
+ }, {
+ n: "anon", d: ["for player getting fucked work."]
+ }, {
+ n: "anon", d: ["for additional bodyguard weapons."]
+ }, {
+ n: "anon", d: ["for HGExclusion and animal pregnancy work."]
+ }, {
+ n: "anon", d: ["for putting up with my javascript incompetence."]
+ }, {
+ n: "anon", d: ["for player family listing."]
+ }, {
+ n: "anon",
+ d: ["for interchangeable prosthetics, advanced facial surgeries, custom nationality distribution and corporation assets overhaul."]
+ }, {
+ n: "anon", d: ["for filter by assignment."]
+ }, {
+ n: "anon", d: ["for filter by facility."]
+ }, {
+ n: "anon", d: ["for forcing dicks onto slavegirls."]
+ }, {
+ n: "anon", d: ["for forcing dicks into slavegirls and forced slave riding."]
+ }, {
+ n: "Unknown modder", d: ["who did betterRA mod for old 0.9.5.4 version of original FC."]
+ }, {
+ n: "brpregmodfan", d: ["for Brazilian start and slave gen."]
+ }, {
+ n: "fcanon", d: ["for various fixes, massive improvements to the RA and wrangling my inabilty to spll gud."]
+ }, {
+ n: "stuffedgameanon",
+ d: ["for fixes, streamlining the starting girls family code, family trees, unbelievable improvements to the games functionality, the sanityChecker, a tag checker and above ALL else; Improving the game's speed by an obscene amount. I swear this guy is a wizard. Now overhauling the UI as well."]
+ }, {
+ n: "anon", d: ["for a prototype foot job scene."]
+ }, {
+ n: "Preglocke",
+ d: ["for cleaning and expanding the foot job scene and various little content additions and corrections."]
+ }, {
+ n: "anon",
+ d: ["for writing forced marriages, extra escape outcomes, new recruits and events, a story for FCTV and more player refreshment types."]
+ }, {
+ n: "anon", d: ["for global realism stave trade setting."]
+ }, {
+ n: "anon", d: ["for new recruit events."]
+ }, {
+ n: "anon", d: ["for expanding the cheat edit menu for slaves."]
+ }, {
+ n: "thaumx", d: ["for bigger player balls, cum production, self-impregnation and FCTV."]
+ }, {
+ n: "anon",
+ d: ["for head pats. What's next? Handholding? Consensual sex in the missionary position for the sole purpose of reproduction?"]
+ }, {
+ n: "anon", d: ["for Physical Idealist's beauty standard."]
+ }, {
+ n: "anon", d: ["for Gender Radicalist's trap preference."]
+ }, {
+ n: "anon", d: ["for the slave mutiny event."]
+ }, {
+ n: "onithyr", d: ["for various little tweaks and additions."]
+ }, {
+ n: "anonNeo", d: ["for spellchecking."]
+ }, {
+ n: "kopareigns", d: ["for countless text and bug fixes. Also large swathes of code improvements."]
+ }, {
+ n: "Utopia", d: ["for dirty dealings gang leader focus and updates to it."]
+ }, {
+ n: "hexall90'' for height growth drugs, incubator organ farm support and detailing, the dispensary cleanup, the joint Eugenics bad end rework with ''SFanon (blank)",
+ d: [", the Hippolyta Academy, and the Security Expansion Mod (SecEx)."]
+ }, {
+ n: "sensei", d: ["for coding in support for commas and an excellent family tree rework."]
+ }, {
+ n: "laziestman", d: ["for sexy spats."]
+ }, {
+ n: "SFanon (blank)'' for SF related work, passive player skill gain, fulfillment order, player into summary and options rewriting, general fixes, storyCaption overhauling, updating and re-organizing the in-game wiki in addition to the joint Eugenics bad end rework with ''hexall90",
+ d: [". Cleaned up the sidebar, now maintaining and expanding SecEx. Added warfare/engineering personal attention targets. Likes tabs. Co-converted the Encyclopedia to JS."]
+ }, {
+ n: "anon", d: ["for extending FCGudder's economy reports to the other facilities."]
+ }, {
+ n: "MilkAnon", d: ["for his contributions to FCTV and the FC world in general."]
+ }, {
+ n: "valen102938", d: ["for dealing with vector art, both creating new art and utilizing unused art."]
+ }, {
+ n: "anon", d: ["for making slaves seed their own fields."]
+ }, {
+ n: "Ansopedi", d: ["for slave career skills."]
+ }, {
+ n: "Emuis", d: ["for various compiler tweaks"]
+ }, {
+ n: "anon", d: ["for continued tweaks to various economy formulas."]
+ }, {
+ n: "anon", d: ["for master slaving's multi slave training."]
+ }, {
+ n: "Faraen", d: ["for a full vector art variant."]
+ }, {
+ n: "anon", d: ["for more hair vectors for the external art."]
+ }, {
+ n: "Vas",
+ d: ["for massive JS work and completely redoing the RA. Set up the 'make' compiler. Gave nulls some nicknames."]
+ }, {
+ n: "deepmurk",
+ d: ["for a massive expansion in conjunction with Nox to the original embedded vector art. Also more hairs, clothes, shoes, clothes, descriptions and clothes. Overhauled skin colors too."]
+ }, {
+ n: "Channel8", d: ["for FCTV content (and likely giving the spellCheck an aneurysm)."]
+ }, {
+ n: "Channel13", d: ["for FCTV content."]
+ }, {
+ n: "kidkinster", d: ["for slave management ui stuff and induced NCS."]
+ }, {
+ n: "editoranon", d: ["for cleaning text and drafting up bodyswap reactions."]
+ }, {
+ n: "anon", d: ["for the wetware CPU market."]
+ }, {
+ n: "Autistic Boi", d: ["for Mediterranean market preset."]
+ }, {
+ n: "anon", d: ["for the PA subjugationist and supremacist FS appearances."]
+ }, {
+ n: "Editoranon and Milkanon?", d: ["for prison markets and the nursing handjob scene."]
+ }, {
+ n: "DCoded",
+ d: ["for creating the favicon, nursery, and farmyard, as well as animal-related content. Created a food system as well as a loan system. Refactored tons of code and standardized the facility passages. Also added several new scenes and interactions, the reminder system, and created and fixed a number of bugs."]
+ }, {
+ n: "HiveBro", d: ["for giving hyperpregnant slaves some serious loving."]
+ }, {
+ n: "Quin2k", d: ["for overwriting save function and expired tweak via Vrelnir & co."]
+ }, {
+ n: "ezsh",
+ d: ["for bugfixing and creating a tool to build twineJS and twineCSS for me. Set up a revised SC update process as well. Has contributed massive revisions to the game's structure. Keeps the RA in line."]
+ }, {
+ n: "Sonofrevvan", d: ["for making slaves beg and dance."]
+ }, {
+ n: "skriv", d: ["for fixes and endless code cleaning."]
+ }, {
+ n: "Arkerthan",
+ d: ["for various additions including merging cybermod and vanilla prosthetics. Java sanity check. Limbs and reworked amputation. Eye rework. Has begun overhauling various systems including the building layout. Dick tower. Work on user themes. Custom hotkeys. Co-converted the Encyclopedia to JS."]
+ }, {
+ n: "MouseOfLight",
+ d: ["for overhauling the corporation. V proxy, nuff said. Added better safeguards to the RA."]
+ }, {
+ n: "svornost",
+ d: [": A great asset. Various fixes and tools, including FCHost. Gave players the ability to find that one slave they are looking for. The 'Scope' macro. Optimized porn so beautifully I can't even think. Has continued his reign of optimization. Got extended family mode so smooth it supplanted vanilla. Laid the groundwork for the new event layout system."]
+ }, {
+ n: "Trashman1138", d: ["for various tweaks and fixes."]
+ }, {
+ n: "maxd569", d: ["for adding .mp4 and .webm support to custom images."]
+ }, {
+ n: "Anu", d: ["for various fixes."]
+ }, {
+ n: "Cayleth", d: ["for various fixes and support."]
+ }, {
+ n: "Jones", d: ["for major overhauling of the economy/population/health systems."]
+ }, {
+ n: "PandemoniumPenguin", d: ["for giving players a choice in FS names."]
+ }, {
+ n: "torbjornhub", d: ["for adding pit rules to the RA."]
+ }, {
+ n: "CheatMode", d: ["for additional cheatmode options."]
+ }, {
+ n: "Transhumanist01",
+ d: ["for the production of husk slaves via incubator. Contributed the uterine hypersensitivity genetic quirk."]
+ }, {
+ n: "Fake_Dev", d: ["for nipple enhancers."]
+ }, {
+ n: "UnwrappedGodiva", d: ["for a tool to edit save files."]
+ }, {
+ n: "git contributors lost to time", d: ["for their submissions and work through pregmod's git."]
+ }, {
+ n: "Bane70", d: ["optimized huge swaths of code with notable professionalism."]
+ }, {
+ n: "Circle Tritagonist", d: ["provided several new collars and outfits."]
+ }, {
+ n: "Qotsafan", d: ["submitted bugfixes."]
+ }, {
+ n: "FireDrops",
+ d: ["provided standardized body mod scoring, gave Recruiters their idle functions, revised personal assistant future society associations, and fixed bugs."]
+ }, {
+ n: "Princess April", d: ["wrote and coded several random events and the Slimness Enthusiast Dairy upgrade."]
+ }, {
+ n: "Hicks", d: ["provided minor logic and balance improvements in coded, release-ready form."]
+ }, {
+ n: "Dej", d: ["coded better diet logic for the RA."]
+ }, {
+ n: "Flooby Badoop", d: ["wrote and coded a random recruitment event."]
+ }, {
+ n: "FC_BourbonDrinker", d: ["went into the code to locate and fix bugs."]
+ }, {
+ n: "Shokushu",
+ d: ["created a rendered imagepack comprising 775 images, and assisted with the code necessary to display them. Also maybe the dinner party event?"]
+ }, {
+ n: "NovX", d: ["created a vector art system."]
+ }, {
+ n: "Mauve", d: ["contributed vector collars and pubic hair."]
+ }, {
+ n: "Rodziel", d: ["contributed the cybernetics mod."]
+ }, {
+ n: "prndev", d: ["wrote the Free Range Dairy Assignment scene. Also did tons of vector art work."]
+ }, {
+ n: "freecitiesbandit",
+ d: ["wrote a number of recruitment, future society, mercenary and random events, provided tailed buttplugs, new eyes and tattoos, and contributed the code for the mercenary raiders policy."]
+ }, {
+ n: "DrNoOne", d: ["wrote the bulk slave purchase and persistent summary code."]
+ }, {
+ n: "Mauve", d: ["provided vector art for chastity belts and limp dicks."]
+ }, {
+ n: "Klorpa",
+ d: ["for dozens of new nationalities and boundless new names and nicknames. Also monokinis, middle eastern clothing, overalls and aprons. Also the hearing, taste, and smell overhauls. Added basic support for watersports. Has declared war on bad spelling, grammar and formatting. Added eyebrows too. Dug up ancient abandoned vanilla vignettes and implemented them. Toiled in the depths to extend limb support."]
+ }, {
+ n: "lowercasedonkey",
+ d: ["for various additions, not limited to the budget overhauls. Set up all the tabs too. Gave events dynamic vector art. Hammered the scarring and branding systems into place. Been a real boon writing events and other things as well. Used ezsh's facility framework to enhance slave summaries. Set up a system to recall where slaves were serving. Striving to master DOM with great gains. Co-converted the Encyclopedia to JS."]
+ }, {
+ n: "amomynous0", d: ["for bug reports and testing in addition to SFmod unit descriptions."]
+ }, {
+ n: "wepsrd", d: ["for QOL (hormonal balance cheat and lactation adaptation to new menu) fixes."]
+ }, {
+ n: "i107760",
+ d: ["for Costs Budget, CashX work, The Utopian Orphanage, Farmyard, Special Forces work, various QoL additions and Private Tutoring System."]
+ }];
+
+ for (const credit of credits) {
+ const div = document.createElement("div");
+ App.UI.DOM.appendNewElement("span", div, credit.n, ["encyclopedia", "topic"]);
+ for (const line of credit.d) {
+ div.append(" ", line);
+ }
+ r.container().append(div);
+ }
+
+ r.push("<span class='encyclopedia topic'>Many other anonymous contributors</span> helped fix bugs via GitHub. They will be credited by name upon request.");
+ r.toParagraph();
+
+ r.push("Thanks are due to all the anons that submitted slaves for inclusion in the pre-owned database and offered content ideas. Many anonymous playtesters also gave crucial feedback and bug reports. May you all ride straight to the gates of Valhalla, shiny and chrome.");
+ r.toParagraph();
+
+ return r.container();
+}, "credits");
diff --git a/src/gui/Encyclopedia/encyclopediaDialog.js b/src/gui/Encyclopedia/encyclopediaDialog.js
deleted file mode 100644
index 4f8e20033caa6d2122a1394e266741f51ca82646..0000000000000000000000000000000000000000
--- a/src/gui/Encyclopedia/encyclopediaDialog.js
+++ /dev/null
@@ -1,49 +0,0 @@
-App.Encyclopedia.Dialog = (function() {
- /** Create a link to an encyclopedia dialog for a given article with the given text
- * @param {string} text Text for link
- * @param {string} article Encyclopedia article to link to
- * @returns {string} SugarCube link markup
- */
- function makeLinkSC(text, article) {
- return App.UI.link(text, () => showArticleInDialog(article));
- }
-
- /** Create a link to an encyclopedia dialog for a given article with the given text
- * @param {string} text Text for link
- * @param {string} article Encyclopedia article to link to
- * @param {string} [classNames] CSS Class to add to the link
- * @returns {HTMLElement} DOM link element
- */
- function makeLinkDOM(text, article, classNames) {
- const link = App.UI.DOM.link(text, () => showArticleInDialog(article));
- if (!classNames) {
- return link;
- }
- // Wrap in a span for coloring, more reliable when hovering over the link
- const span = document.createElement("span");
- span.className += classNames;
- span.append(link);
- return span;
- }
-
- /** Show a given encyclopedia article in the encyclopedia dialog
- * @param {string} article
- */
- function showArticleInDialog(article) {
- let origEncyclopedia = V.encyclopedia;
- if (Dialog.isOpen()) {
- Dialog.close();
- }
- Dialog.setup("Encyclopedia", "encyclopedia");
- V.encyclopedia = article;
- $(Dialog.body()).empty().wiki(jsInclude("Encyclopedia"));
- Dialog.open();
- V.encyclopedia = origEncyclopedia;
- }
-
- return {
- linkSC: makeLinkSC,
- linkDOM: makeLinkDOM,
- showArticleInDialog: showArticleInDialog
- };
-})();
diff --git a/src/gui/Encyclopedia/encyclopediaFacilites.js b/src/gui/Encyclopedia/encyclopediaFacilites.js
new file mode 100644
index 0000000000000000000000000000000000000000..a9bdbc82c6951c3e0a43240bd3d08c1a65c8abae
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaFacilites.js
@@ -0,0 +1,245 @@
+App.Encyclopedia.addArticle("Facilities Overview", function() {
+ const basic = [App.Encyclopedia.link("Arcade"), App.Encyclopedia.link("Brothel"), App.Encyclopedia.link("Club"), App.Encyclopedia.link("Dairy"), App.Encyclopedia.link("Servants' Quarters")];
+ const unique = [App.Encyclopedia.link("Head Girl Suite"), App.Encyclopedia.link("Master Suite"), App.Encyclopedia.link("Farmyard"), App.Encyclopedia.link("Incubation Facility", "The Incubation Facility"), App.Encyclopedia.link("Pit")];
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The arcology can be upgraded with a variety of facilities for slaves to live and work from. Each of the facilities is associated with an assignment. Sending a slave to a facility removes her from the main menu, removes her from the end of week report, and automates most management of her. Her clothes, drugs, rules, and other management tools are automatically run by the facility. However, her impact on your affairs will be substantially the same as if she were assigned to the corresponding assignment outside the facility. This means that things like", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "effects, future society developments, and branding are all still active.");
+ r.toParagraph();
+
+ r.push("Use facilities sparingly until you're familiar with what assignments do so you don't miss important information. When you're confident enough to ignore a slave for long periods, sending her to a facility becomes a good option. Sending a slave to a facility heavily reduces the player's interaction with her, keeps the main menu and end week report manageable, and prevents most events from featuring her, which can be useful when she's so well trained that events aren't as beneficial for her. Also, many facilities have leadership positions that can apply powerful multipliers to a slave's performance.");
+ r.toParagraph();
+
+ r.push("The", App.UI.DOM.toSentence(basic), "all correspond to basic productive assignments.");
+ r.push("The", App.UI.DOM.toSentence([App.Encyclopedia.link("Spa"), App.Encyclopedia.link("Cellblock"), App.Encyclopedia.link("Schoolroom")]), "are a little different in that they focus on improving their occupants rather than producing something useful, since they correspond to the rest, confinement, and class assignments.");
+ r.push("As such, only slaves that can benefit from these facilities' services can be sent to them. When slaves in these facilities have received all the benefits they can from the facility, they will be automatically ejected, assigned to rest, and returned to the main menu.");
+ r.push("The", App.UI.DOM.toSentence(unique), "are all completely unique.");
+ r.toParagraph();
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Arcade", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("It is every slave's final duty to go into the arcade, and to become one with all the arcology.");
+ r.toNode("div", ["note"]);
+ App.Events.addNode(f, ["— Anonymous slaveowner", "note"], "div", ["indent"]);
+
+ r.push(`The arcade (sometimes colloquially referred to as "the wallbutts") is an excellent example of one of the many ideas that was confined to the realm of erotic fantasy until modern slavery began to take shape. It has rapidly turned from an imaginary fetishistic construction into a common sight in the more 'industrial' slaveowning arcologies. Most arcades are built to do one thing: derive profit from the holes of low-value slaves.`);
+ r.toNode("p", ["note"]);
+
+ r.push("Upon entering an arcade, one is typically presented with a clean, utilitarian wall like in a well-kept public restroom. Some have stalls, but many do not. In either case, at intervals along this wall, slaves' naked hindquarters protrude through. They are completely restrained on the inside of the wall, and available for use. Usually, the wall has an opposite side on which the slaves' throats may be accessed. The slaves' holes are cleaned either by mechanisms that withdraw them into the wall for the purpose, shields which extend between uses, or rarely, by attendants.");
+ r.toNode("p", ["note"]);
+
+ r.push("Arcades have become so common that most arcade owners attempt to differentiate themselves with something special. Some arcades have only a low wall so that conversations may be had between persons using either end of a slave; business meetings are an advertised possibility. Many specialize in a specific genital arrangement; others shield the pubic area so as to completely disguise it, reducing the slaves' identities to an anus and a throat only. Some attempt to improve patrons' experiences by using slaves who retain enough competence to do more than simply accept penetration, while others pursue the same goal by applying muscular electrostimulus for a tightening effect.");
+ r.toNode("p", ["note"]);
+
+ App.Encyclopedia.addArticleSource(r.container(), "Guide to Modern Slavery, 2037 Edition", "Lawrence, W. G.");
+
+ r.push("The", App.UI.DOM.makeElement("span", "Arcade", ["bold"]), "is the", noteFacilityName(App.Encyclopedia.link("Glory hole"), " facility."));
+ r.push("Extracts", App.Encyclopedia.link("money", "Money", "yellowgreen"), "from slaves; has extremely deleterious mental and physical effects.");
+ r.push("Arcades can be furnished according to", App.Encyclopedia.link("future society", "Future Societies"), "styles, and doing so will add a tiny amount of future society progress for each customer who visits.");
+ r.toNode("div");
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Brothel", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The", App.UI.DOM.makeElement("span", "Brothel", ["bold"]), "is the", noteFacilityName(App.Encyclopedia.link("Whoring"), "facility."));
+ r.push("Slaves will make", App.Encyclopedia.link("money", "Money", "yellowgreen"), "based on beauty and skills.");
+ r.push("Brothels can be the subject of an", App.Encyclopedia.link("ad campaign.", "Advertising"));
+ r.push("Brothels can be furnished according to", App.Encyclopedia.link("future society", "Future Societies"), "styles, and doing so will add a tiny amount of future society progress for each customer who visits.");
+ r.toNode("div");
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Cellblock", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The", App.UI.DOM.makeElement("span", "Cellblock", ["bold"]), "is the", noteFacilityName(App.Encyclopedia.link("Confinement"), "facility."));
+ r.push("Will break slaves and return them to the main menu after they are obedient.");
+ r.push("The Cellblock can be furnished according to", App.Encyclopedia.link("future society", "Future Societies"), "styles, and doing so will add a slight", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "boost to slaves incarcerated there.");
+ r.toNode("div");
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Clinic", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The", App.UI.DOM.makeElement("span", "Clinic", ["bold"]), "is one of two", noteFacilityName(App.Encyclopedia.link("Rest"), "facilities,"), "it focuses on slaves' health.");
+ r.push("The Clinic will treat slaves until they are", App.Encyclopedia.link("Healthy", "Health"), ",", "and will cure both injuries and illness.");
+ r.push("The Clinic can be furnished according to", App.Encyclopedia.link("future society", "Future Societies"), "styles, and doing so will add a slight", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "boost to slaves getting treatment there.");
+ r.toNode("div");
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Club", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The", App.UI.DOM.makeElement("span", "Club", ["bold"]), "is the", noteFacilityName(App.Encyclopedia.link("Public Service"), "facility."));
+ r.push("Slaves will generate", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "based on beauty and skills.");
+ r.push("Clubs can be the subject of an", App.Encyclopedia.link("ad campaign.", "Advertising"));
+ r.push("Clubs can be furnished according to", App.Encyclopedia.link("future society", "Future Societies"), "styles, and doing so will add a tiny amount of future society progress for each citizen who visits.");
+ r.toNode("div");
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Dairy", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("This is the very first", App.UI.DOM.makeElement("span", "Free Cities Husbandry Weekly", ["note"]), "ever.");
+ r.push("I'm Val Banaszewski, and I'm the FCHW staff writer for dairy and dairy-related subjects. So, why do I do this, and why should you? Human breast milk is never going to be as", App.Encyclopedia.link("cheap", "Money", "yellowgreen"), "and common as normal milk. Why bother?");
+ r.toNode("div", ["note"]);
+
+ r.push("First, it's really tasty! If you've never tried it, put FCHW no. 1 down now and go try it. Buy it bottled if you have to, but make an effort to take your first drink right from the teat. You'll only ever take your first sip of mother's milk once, and it should really be special. Everyone describes it a little differently, but I'd say it's a warm, rich and comforting milk with vanilla and nutty flavors.");
+ r.toNode("p", ["note"]);
+
+ r.push("Second, it's sexy! Decadence is in, folks. Many people move to the Free Cities to get away from the old world, but some come here to experience real freedom. The experience of drinking a woman's milk before, during, and after you use her just isn't something you pass up. Try it today.");
+ r.toNode("p", ["note"]);
+
+ App.Encyclopedia.addArticleSource(r.container(), "Free Cities Husbandry Weekly, February 2, 2032", "Banaszewski, Valerie P.");
+
+ r.push("The", App.UI.DOM.makeElement("span", "Dairy", ["bold"]), "is the", noteFacilityName(App.Encyclopedia.link("Milking"), "facility."));
+ r.push(`Only lactating ${V.seeDicks > 0 ? '' : 'or semen producing'} slaves can be assigned; will use drugs to increase natural breast size${V.seeDicks > 0 ? ' and ball size, if present<' : ''}.`);
+ r.push("All Dairy upgrades have three settings, once installed: Inactive, Active, and Industrial. Inactive and Active are self-explanatory. Industrial settings require that the restraint upgrade be installed and maximized, and that extreme content be enabled. They massively improve production, but will produce severe mental and physical damage. Younger slaves will be able to survive more intense industrial output, but drug side effects will eventually force an increasingly large fraction of drug focus towards curing the slave's ills, reducing production. Dairies can be furnished according to", App.Encyclopedia.link("future society", "Future Societies"), "styles, and doing so will add a tiny amount of future society progress for each unit of fluid produced.");
+ r.toParagraph();
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Head Girl Suite", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The", App.UI.DOM.makeElement("span", "Head Girl Suite"), "is a", App.UI.DOM.makeElement("span", "unique facility.", ["note"]));
+ r.push("Only a single slave can be assigned, and this slave will be subject to the", App.Encyclopedia.link("Head Girl"), "'s decisions rather than the player's.");
+ r.toNode("div");
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Master Suite", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The", App.UI.DOM.makeElement("span", "Master Suite", ["bold"]), "is the", noteFacilityName(App.Encyclopedia.link("Fucktoy"), "facility."));
+ r.push("Slaves will generate", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "but at a lower efficiency than on the club. The Suite can be furnished according to", App.Encyclopedia.link("future society", "Future Societies"), "styles, and doing so will add a slight", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "boost to slaves serving there.");
+ r.toNode("div");
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Pit", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The", App.UI.DOM.makeElement("span", "Pit", ["bold"]), "is a", App.UI.DOM.makeElement("span", "unique facility.", ["note"]));
+ r.push("Unique in that slaves can perform standard duties in addition to being scheduled for fights in this facility.");
+ r.toNode("div");
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Schoolroom", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The", App.UI.DOM.makeElement("span", "Schoolroom", ["bold"]), "is the", noteFacilityName(App.Encyclopedia.link("Learning", "Attending Classes"), "facility."));
+ r.push("Will educate slaves and return them to the penthouse after they are educated. The Schoolroom can be furnished according to", App.Encyclopedia.link("future society", "Future Societies"), "styles, and doing so will add a slight", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "boost to slaves studying there.");
+ r.toNode("div");
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Servants' Quarters", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The", App.UI.DOM.makeElement("span", "Servants' Quarters", ["bold"]), "is the", noteFacilityName(App.Encyclopedia.link("Servitude"), "facility."));
+ r.push("Reduces weekly upkeep according to servants' obedience. Accepts most slaves and is insensitive to beauty and skills. The Quarters can be furnished according to", App.Encyclopedia.link("future society", "Future Societies"), "styles, and doing so will add a slight", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "boost to slaves serving there.");
+ r.toNode("div");
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Spa", function() {
+ const spaConditions = [App.Encyclopedia.link("Healthy", "Health"), "happy", App.Encyclopedia.link("free of flaws.", "Flaws")];
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The", App.UI.DOM.makeElement("span", "Spa", ["bold"]), "is one of two", noteFacilityName(App.Encyclopedia.link("Rest"), "facilities;"), "it focuses on slaves' mental well-being.");
+ r.push("The Spa will heal, rest, and reassure slaves until they are at least reasonably", App.UI.DOM.toSentence(spaConditions), "The Spa can be furnished according to", App.Encyclopedia.link("future society", "Future Societies"), "styles, and doing so will add a slight", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "boost to slaves resting there.");
+ r.toNode("div");
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Nursery", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The", App.UI.DOM.makeElement("span", "Nursery", ["bold"]), "is used to raise children from birth naturally. Once a spot is reserved for the child, they will be placed in the Nursery upon birth and ejected once they are old enough. The Nursery can be furnished according to", App.Encyclopedia.link("future society", "Future Societies"), "styles, and doing so can add a slight", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "boost to slaves working there.");
+ r.toNode("div");
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Farmyard", function() {// TODO: this will need more information
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The", App.UI.DOM.makeElement("span", "Farmyard", ["bold"]), "is where the majority of the", App.Encyclopedia.link("food"), `in your arcology is grown, once it is built. It also allows you to house animals${V.seeBestiality === 1 ? ', which you can have interact with your slaves' : ''}. The Farmyard can be furnished according to`, App.Encyclopedia.link("future society", "Future Societies"), "styles, and doing so can add a slight", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "boost to slaves working there."); // TODO: this may need to be changed
+ r.toNode("div");
+
+ r.push("This entry still needs work and will be updated with more information as it matures. If this message is still here, remind one of the devs to remove it.");
+ r.toNode("div", ["note"]);
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Advertising", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Ad campaigns", ["bold"]), "can be run for both the", App.Encyclopedia.link("Brothel"), "and the", App.Encyclopedia.link("Club.", "Club"));
+ r.push("Naturally, these advertisements will feature lots of naked girls, providing the opportunity to give either facility a cachet for offering a specific kind of girl.");
+ r.push("Under the default, nonspecific settings, all slaves in the facilities will receive minor bonuses to performance.");
+ r.push("If specific body types are advertised, slaves that match the advertisements will receive an enhanced bonus, while slaves that do not will get a small penalty.");
+ r.push("However, instituting a specific ad campaign will prevent slaves in that facility from getting", App.Encyclopedia.link("Variety"), "bonuses.");
+ r.toNode("div");
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addArticle("Variety", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Variety", ["bold"]), "bonuses are available for slaves in the", App.Encyclopedia.link("Brothel"), "and the", App.Encyclopedia.link("Club.", "Club"));
+ r.push("Offering a variety of slaves will provide a small bonus to performance for everyone in the facility, regardless of which qualities they possess:");
+ r.toNode("div");
+
+ App.Events.addNode(f, ["Slim vs. Stacked"], "div", ["indent"]);
+ App.Events.addNode(f, ["Modded (heavily pierced and tattooed) vs. Unmodded"], "div", ["indent"]);
+ App.Events.addNode(f, ["Natural Assets vs. Implants"], "div", ["indent"]);
+ App.Events.addNode(f, [`Young vs. Old${V.seeDicks !== 0 ? '- Pussies and Dicks' : ''}`], "div", ["indent"]);
+
+ r.push("Variety bonuses, if any, will be called out in the facility report at the end of the week.", App.Encyclopedia.link("Advertising"), "that the facility specializes in any of these areas will supersede variety bonuses for the related qualities. Staffing a facility to appeal to all tastes can be more challenging than building a homogeneous stable and advertising it, but is both powerful and free.");
+ r.toParagraph();
+ return f;
+}, "facilities");
+
+App.Encyclopedia.addCategory("facilities", function() {
+ const f = new DocumentFragment();
+ let r = [];
+ r.push(App.Encyclopedia.link("Overview", "Facilities Overview"));
+ r.push(App.Encyclopedia.link("Arcade"));
+ r.push(App.Encyclopedia.link("Brothel"));
+ r.push(App.Encyclopedia.link("Cellblock"));
+ r.push(App.Encyclopedia.link("Clinic"));
+ r.push(App.Encyclopedia.link("Club"));
+ r.push(App.Encyclopedia.link("Dairy"));
+ r.push(App.Encyclopedia.link("Head Girl Suite"));
+ r.push(App.Encyclopedia.link("Master Suite"));
+ r.push(App.Encyclopedia.link("Pit"));
+ r.push(App.Encyclopedia.link("Schoolroom"));
+ r.push(App.Encyclopedia.link("Servants' Quarters"));
+ r.push(App.Encyclopedia.link("Spa"));
+ r.push(App.Encyclopedia.link("Nursery"));
+ r.push(App.Encyclopedia.link("Farmyard"));
+ r.push(App.Encyclopedia.link("The Incubation Facility"));
+ App.Events.addNode(f, ["Arcology Facilities:", App.UI.DOM.generateLinksStrip(r)], "div");
+
+ r = [];
+ r.push(App.Encyclopedia.link("Advertising"));
+ r.push(App.Encyclopedia.link("Variety"));
+ App.Events.addNode(f, ["Facility Bonuses:", App.UI.DOM.generateLinksStrip(r)], "div", ["note"]);
+ return f;
+});
+
+function noteFacilityName(...text) {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ App.Events.addNode(f, text, "span", ["note"]);
+ return f;
+}
diff --git a/src/gui/Encyclopedia/encyclopediaFetish.js b/src/gui/Encyclopedia/encyclopediaFetish.js
new file mode 100644
index 0000000000000000000000000000000000000000..8dbb94ef720818e4ea3dcf42cb5ba5094ec82412
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaFetish.js
@@ -0,0 +1,245 @@
+App.Encyclopedia.addArticle("Fetishes", function() {
+ const r = new SpacedTextAccumulator();
+ // Future room for lore text
+
+ r.push("Choose a more particular entry below:");
+
+ return r.container();
+}, "fetish");
+
+App.Encyclopedia.addArticle("Boob Fetishists", function() {
+ const r = new SpacedTextAccumulator();
+ r.push("<span class='encyclopedia topic'>Boob Fetishists</span> like breasts.");
+ r.toParagraph();
+
+ r.push("The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, relationships, and being milked.");
+ r.toParagraph();
+
+ r.push("It can be advanced by appropriate smart clit piercing settings, high");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"), "and");
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("trust", "Trust"), ","), ["trust", "careful"]));
+ r.push("and being milked.");
+ r.toParagraph();
+
+ r.push("The fetish will increase XX attraction. Boob Fetishists enjoy cowbell collars, breast surgery, and being milked. Milkmaids can become boob fetishists naturally.");
+ r.toParagraph();
+
+ r.push("Boob fetishists may become", App.Encyclopedia.link("obsessed with breast expansion", "Breast Obsession"), "as their breasts grow.");
+ r.toParagraph();
+
+ return r.container();
+}, "fetish");
+
+App.Encyclopedia.addArticle("Buttsluts", function() {
+ const r = new SpacedTextAccumulator();
+ r.push("<span class='encyclopedia topic'>Buttsluts</span> fetishize anal sex — mostly on the receiving end, though they'll enjoy other anal play.");
+ r.toParagraph();
+
+ r.push("The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, relationships, anally-focused fucktoy service, service in a", App.Encyclopedia.link("Dairy", "Dairy"), "upgraded with reciprocating dildos, the dildo drug dispenser upgrade, anal accessories, and being a painal queen.");
+ r.toParagraph();
+
+ r.push("It can be advanced by appropriate smart clit piercing settings, high");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"), "and");
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("trust", "Trust"), ","), ["trust", "careful"]));
+ r.push("the dildo drug dispenser upgrade, and being a painal queen.");
+ r.toParagraph();
+
+ r.push("Buttsluttery will soften the", App.Encyclopedia.link("hates anal", "Hates anal"), "flaw into", App.UI.DOM.combineNodes(App.Encyclopedia.link("painal queen", "Painal Queen"), ","),
+ "the", App.Encyclopedia.link("hates penetration"), "flaw into", App.UI.DOM.combineNodes(App.Encyclopedia.link("strugglefuck queen", "Strugglefuck Queen"), ","),
+ "and the", App.Encyclopedia.link("repressed", "Repressed"), "flaw into", App.UI.DOM.combineNodes(App.Encyclopedia.link("perverted", "Perverted"), ","),
+ "or remove these flaws if a quirk is already present. Buttsluts with vaginas enjoy wearing chastity belts, and all buttsluts enjoy buttock enhancement and anal rejuvenation surgeries. Buttsluts do not mind a lack of hormonal feminization. The fetish will increase XY attraction.");
+ r.toParagraph();
+
+ r.push("Buttsluts whose only available hole for receptive intercourse is the anus may become", App.UI.DOM.combineNodes(App.Encyclopedia.link("anal addicts", "Anal Addicts"), "."));
+ r.toParagraph();
+
+ return r.container();
+}, "fetish");
+
+App.Encyclopedia.addArticle("Cumsluts", function() {
+ const r = new SpacedTextAccumulator();
+ r.push("<span class='encyclopedia topic'>Cumsluts</span> fetishize oral sex and ejaculate.");
+ r.toParagraph();
+
+ r.push("It can be advanced by appropriate smart clit piercing settings, high");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"), "and");
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("trust", "Trust"), ","), ["trust", "careful"]));
+ r.push("the phallic food dispenser upgrade, cum diets, and being a gagfuck queen.");
+ r.toParagraph();
+
+ r.push("Cumsluttery will soften the", App.Encyclopedia.link("hates oral", "Hates oral"), "flaw into", App.UI.DOM.combineNodes(App.Encyclopedia.link("gagfuck queen", "Gagfuck Queen"), ","),
+ "the", App.Encyclopedia.link("hates women", "Hates women"), "flaw into", App.UI.DOM.combineNodes(App.Encyclopedia.link("adores men", "Adores men"), ","),
+ "and the", App.Encyclopedia.link("repressed", "Repressed"), "flaw into", App.UI.DOM.combineNodes(App.Encyclopedia.link("perverted", "Perverted"), ","),
+ "or remove these flaws if a quirk is already present. Cumsluts enjoy cum diets. The fetish will increase XY attraction.");
+ r.toParagraph();
+
+ r.push("Cumsluts who eat out of phallic feeders or are fed cum may become", App.UI.DOM.combineNodes(App.Encyclopedia.link("cum addicts", "Cum Addicts"), "."));
+ r.toParagraph();
+
+ return r.container();
+}, "fetish");
+
+App.Encyclopedia.addArticle("Doms", function() {
+ const r = new SpacedTextAccumulator();
+ r.push("<span class='encyclopedia topic'>Doms</span> fetishize dominance.");
+ r.toParagraph();
+
+ r.push("The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, relationships, unfocused fucktoy service, and being confident or cutting.");
+ r.toParagraph();
+
+ r.push("It can be advanced by appropriate smart clit piercing settings, high");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"), "and");
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("trust", "Trust"), ","), ["trust", "careful"]));
+ r.push("being confident, and being cutting.");
+ r.toParagraph();
+
+ r.push("Dominance will remove the", App.Encyclopedia.link("apathetic", "Apathetic"), "flaw if a quirk is already present. Doms do not mind a lack of hormonal feminization. The fetish will increase XX attraction. Stewardesses do better when either dominant or",
+ App.UI.DOM.combineNodes(App.Encyclopedia.link("nymphomaniacal", "Nymphomania"), ". The"),
+ App.UI.DOM.combineNodes(App.Encyclopedia.link("Head Girl", "Head Girl"), ","),
+ App.UI.DOM.combineNodes(App.Encyclopedia.link("Madam", "Madam"), ","),
+ App.UI.DOM.combineNodes(App.Encyclopedia.link("Schoolteacher", "Schoolteacher"), ","),
+ App.UI.DOM.combineNodes(App.Encyclopedia.link("Stewardess", "Stewardess"), ", and"),
+ App.Encyclopedia.link("Nurse", "Nurse"), "can become Doms naturally.");
+ r.toParagraph();
+
+ r.push("Doms serving as Head Girls may become", App.Encyclopedia.link("abusive", "Abusiveness"), "if allowed to punish slaves by molesting them.");
+ r.toParagraph();
+
+ return r.container();
+}, "fetish");
+
+App.Encyclopedia.addArticle("Humiliation Fetishists", function() {
+ const r = new SpacedTextAccumulator();
+ r.push("<span class='encyclopedia topic'>Humiliation Fetishists</span> like exhibitionism.");
+ r.toParagraph();
+
+ r.push("The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, relationships, or being sinful, a tease, or perverted.");
+ r.toParagraph();
+
+ r.push("It can be advanced by appropriate smart clit piercing settings, high");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"), "and");
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("trust", "Trust"), ","), ["trust", "careful"]));
+ r.push("being sinful, being a tease, and being perverted.");
+ r.toParagraph();
+
+ r.push("A humiliation fetish will soften the, ", App.Encyclopedia.link("bitchy", "Bitchy"), "flaw into", App.Encyclopedia.link("cutting", "Cutting"),
+ "and the", App.Encyclopedia.link("shamefast", "Shamefast"), "flaw into", App.UI.DOM.combineNodes(App.Encyclopedia.link("tease", "Tease"), ","),
+ "or remove these flaws if a quirk is already present. The fetish will increase XY attraction. Humiliation fetishists enjoy nudity, and like revealing clothing at a lower");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"),
+ "than other slaves. DJs can become humiliation fetishists naturally.");
+ r.toParagraph();
+
+ r.push("Humiliation fetishists on public sexual assignments may become", App.UI.DOM.combineNodes(App.Encyclopedia.link("attention whores", "Attention Whores"), "."));
+ r.toParagraph();
+
+ return r.container();
+}, "fetish");
+
+App.Encyclopedia.addArticle("Masochists", function() {
+ const r = new SpacedTextAccumulator();
+ r.push("<span class='encyclopedia topic'>Masochists</span> fetishize abuse and pain aimed at themselves.");
+ r.toParagraph();
+
+ r.push("The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, relationships, uncomfortable clothing, being", App.Encyclopedia.link("funny", "Funny"), "and being a", App.UI.DOM.combineNodes(App.Encyclopedia.link("strugglefuck queen", "Strugglefuck Queen"), "."));
+ r.toParagraph();
+
+ r.push("It can be advanced by appropriate smart clit piercing settings, high");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"), "and");
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("trust", "Trust"), ","), ["trust", "careful"]));
+ r.push("being", App.Encyclopedia.link("funny", "Funny"), "and being a", App.UI.DOM.combineNodes(App.Encyclopedia.link("strugglefuck queen", "Strugglefuck Queen"), "."));
+ r.toParagraph();
+
+ r.push("Masochism will soften the", App.Encyclopedia.link("liberated", "Liberated"), "flaw into", App.Encyclopedia.link("advocate", "Advocate"), "or remove this flaw if a quirk is already present. Masochists can be abused without causing deleterious flaws.");
+ r.toParagraph();
+
+ r.push("Masochists serving in an industrialized dairy, in an arcade, or in a glory hole have a chance to become", App.UI.DOM.combineNodes(App.Encyclopedia.link("self hating", "Self Hatred"), "."));
+ r.toParagraph();
+
+ return r.container();
+}, "fetish");
+
+App.Encyclopedia.addArticle("Pregnancy Fetishists", function() {
+ const r = new SpacedTextAccumulator();
+ r.push("<span class='encyclopedia topic'>Pregnancy Fetishists</span> like being impregnated, sex with pregnant slaves, and getting others pregnant. (It is not necessary that the slave actually be able to do any of these things; such is life.)");
+ r.toParagraph();
+
+ r.push("The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, relationships, having sex while pregnant, adoring men, being a tease, and being romantic.");
+ r.toParagraph();
+
+ r.push("It can be advanced by appropriate smart clit piercing settings, high");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"), "and");
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("trust", "Trust"), ","), ["trust", "careful"]));
+ r.push("adoring men, being a tease, and being romantic.");
+ r.toParagraph();
+
+ r.push("The fetish will increase XY attraction. Pregnancy fetishists greatly enjoy all kinds of impregnation, and love or hate fertility surgeries depending on what's being changed.");
+ r.toParagraph();
+
+ r.push("Pregnancy Fetishists who are repeatedly bred or are serving in an industrialized Dairy may develop", App.UI.DOM.combineNodes(App.Encyclopedia.link("breeding obsessions", "Breeding Obsession"), "."));
+ r.toParagraph();
+
+ return r.container();
+}, "fetish");
+
+App.Encyclopedia.addArticle("Sadists", function() {
+ const r = new SpacedTextAccumulator();
+ r.push("<span class='encyclopedia topic'>Sadists</span> fetishize abuse and pain aimed at others.");
+ r.toParagraph();
+
+ r.push("The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, and relationships.");
+ r.toParagraph();
+
+ r.push("It can be advanced by appropriate smart clit piercing settings, and high");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"), "and");
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("trust", "Trust"), "."), ["trust", "careful"]));
+ r.toParagraph();
+
+ r.push("Sadists do not mind a lack of hormonal feminization. The fetish will increase XX attraction. Wardenesses do better when sadistic, and can become sadists naturally.");
+ r.toParagraph();
+
+ r.push("Sadists serving as Wardeness may become", App.UI.DOM.combineNodes(App.Encyclopedia.link("sexually malicious", "Maliciousness"), "."));
+ r.toParagraph();
+
+ return r.container();
+}, "fetish");
+
+App.Encyclopedia.addArticle("Submissives", function() {
+ const r = new SpacedTextAccumulator();
+ r.push("<span class='encyclopedia topic'>Submissives</span> fetishize submission.");
+ r.toParagraph();
+
+ r.push("The fetish can be created by appropriate smart clit piercing settings, serving the Head Girl, relationships, unfocused fucktoy service, crawling due to damaged tendons, being caring, being an advocate, and being insecure.");
+ r.toParagraph();
+
+ r.push("It can be advanced by appropriate smart clit piercing settings, high");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"), "and");
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("trust", "Trust"), ","), ["trust", "careful"]));
+ r.push("being caring, being an advocate, and being insecure.");
+ r.toParagraph();
+
+ r.push("Submissiveness will soften the", App.Encyclopedia.link("arrogant", "Arrogant"), "flaw into", App.UI.DOM.combineNodes(App.Encyclopedia.link("confident", "Confident"), ","),
+ "the", App.Encyclopedia.link("apathetic", "Apathetic"), "flaw into", App.UI.DOM.combineNodes(App.Encyclopedia.link("caring", "Caring"), ","),
+ "and the", App.Encyclopedia.link("idealistic", "Idealilstic"), "flaw into", App.UI.DOM.combineNodes(App.Encyclopedia.link("romantic", "Romantic"), ","),
+ "or remove these flaws if a quirk is already present. The fetish will increase XY attraction. It improves performance at the servant assignment and working in the Servants' Quarters. Attendants do better when submissive, and can become submissives naturally.");
+ r.toParagraph();
+
+ r.push("Submissives serving on public sexual assignment may become", App.UI.DOM.combineNodes(App.Encyclopedia.link("sexually self neglectful", "Self Neglect"), "."));
+ r.toParagraph();
+
+ return r.container();
+}, "fetish");
+
+App.Encyclopedia.addCategory("fetish", function() {
+ const links = [];
+ links.push(App.Encyclopedia.link("Boob Fetishists"));
+ links.push(App.Encyclopedia.link("Buttsluts"));
+ links.push(App.Encyclopedia.link("Cumsluts"));
+ links.push(App.Encyclopedia.link("Doms"));
+ links.push(App.Encyclopedia.link("Humiliation Fetishists"));
+ links.push(App.Encyclopedia.link("Masochists"));
+ links.push(App.Encyclopedia.link("Pregnancy Fetishists"));
+ links.push(App.Encyclopedia.link("Sadists"));
+ links.push(App.Encyclopedia.link("Submissives"));
+ links.push(App.Encyclopedia.link("Paraphilias Overview"));
+ return App.UI.DOM.generateLinksStrip(links);
+});
diff --git a/src/gui/Encyclopedia/encyclopediaFutureSocities.js b/src/gui/Encyclopedia/encyclopediaFutureSocities.js
new file mode 100644
index 0000000000000000000000000000000000000000..400cd32701ac2a23cee4de66cc268686a179fd45
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaFutureSocities.js
@@ -0,0 +1,568 @@
+App.Encyclopedia.addArticle("Future Societies", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ "The evolution of society has never been linear.",
+ "Times of unrest and upheaval produce rapid change, followed by long periods of stasis in the absence of the necessary ingredients for further change.",
+ "The world is undoubtedly in the midst of a time of great change: society is certainly evolving. But into what?"
+ ], "div", ["note"]);
+
+ App.Events.addNode(t, [
+ "Not since antiquity have single persons held as much practical power over the direction of society as Free Cities arcology owners now have.",
+ "Naturally, different Free Cities notables are going different ways with their great power.",
+ "Many are building new societies as different from each other as they are from the old world."
+], "div", ["note"]);
+
+App.Events.addNode(t, [
+ "One arcology might hold a society that is moving towards a fundamentalist interpretation of an old slaveholding religious tradition.",
+ "Another might pay homage to historical racially segregated societies.",
+ "A third might see intentional manipulation of gender roles that have held since the start of recorded history.",
+ "And these three arcologies might well be each other's neighbors."
+], "div", ["note"]);
+
+ App.Encyclopedia.addArticleSource(t, "Guide to Modern Slavery, Online Edition. Accessed April 2, 2032", "Lawrence, W. G.");
+
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Future Society Models", ["bold"]), `are societal goals the player can select and pursue for the arcology.",
+ "It is possible to maintain four future society goals at once.",
+ "The first is unlocked after week 5 for players with greater than rumored/${num(3000)}`, App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "or at game start with the Social Engineering character option; the rest unlock as the player achieves higher", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "levels."
+ ], "p");
+
+ App.Events.addNode(t, [
+ "All societies approve of specific things, usually slaves with specific characteristics; some societies also have dislikes.",
+ "All societies are advanced by the things they approve of and slowed by the things they disapprove of, and all societies give and take", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "when approving and disapproving.",
+ "All societies unlock unique events, arcology upgrades, and slave behaviors; some even unlock special clothing."
+], "p");
+
+App.Events.addNode(t, [
+ App.Encyclopedia.link("Money", "Money", "yellowgreen"), "can be expended to directly advance future societies; the spending level can be set from the future society submenu of the arcology management menu.",
+ "These funds are automatically spent each week.",
+ "Once a future society is fully adopted (as noted on the future society submenu), this spending does not advance the society further.",
+ "However, it can provide a guarantee against loss of progress should the player do something the society strongly disapproves of.",
+ "Also, the spending is applied equally to all active future society models, meaning that there is no loss of efficiency in spending if the player has two maximized models and one still under development."
+], "p");
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Ethnic Supremacy", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Ethnic Supremacy", ["bold"]), "is a future society model which approves of",
+ "slaves not of the chosen race and disapproves of slaves of the chosen race."
+ ], "div");
+ App.Events.addNode(t, ["Improves the perceived beauty of racially superior slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Drastically lowers the desire of racially superior slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to affect the ethnic balance and economics seen in the slave market."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for slaves of inferior races from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Ethnic Subjugationism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Ethnic Subjugationism", ["bold"]), "is a future society model which approves of slaves of the chosen race."
+ ], "div");
+ App.Events.addNode(t, ["Reduces the perceived beauty of racially inferior slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Drastically increases the desire to use racially inferior slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for slaves of the disfavored race from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Gender Radicalism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Gender Radicalism", ["bold"]), "is a future society model which approves of",
+ "hormonal and surgical feminization and slaves with dicks."
+ ], "div");
+ App.Events.addNode(t, ["Improves the value of slaves with dicks and slaves with balls."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to affect the biology seen in the slave market, and subtly influence arcology society."], "div", ["indent"]);
+ App.Events.addNode(t, [`Provides demand for; slaves with dicks, hormonally treated slaves and futanari${V.seeDicks !== 0 ? ' and ballsless bitches' : ''} from`, App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Gender Fundamentalism"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Gender Fundamentalism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Gender Fundamentalism", ["bold"]), "is a future society model which approves of",
+ "pregnancy and fertility and disapproves of slaves who retain testicles."
+ ], "div");
+ App.Events.addNode(t, ["Reduces the slave value penalty due to pregnancy and reduces the beauty of slaves with dicks, though gelding can ameliorate this."], "div", ["indent"]);
+ App.Events.addNode(t, ["Like Gender Radicalism, can be developed to affect the biology seen in the slave market, and subtly influence arcology society."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for naturally female slaves from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Gender Radicalism"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Paternalism", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ const devotion = (text = "devotion", colour="hotpink") => App.Encyclopedia.link(text, "From Rebellious to Devoted", colour);
+ const PaternalismApproval = [devotion(), "slaves choosing their own assignments", "good education", "mental health treatment", App.Encyclopedia.link("high health", "Health")];
+
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Paternalism", ["bold"]), "is a future society model which approves of",
+ App.UI.DOM.toSentence(PaternalismApproval), "while stupidity and undereducation is disapproved."
+ ], "div");
+ App.Events.addNode(t, ["Applies a small", devotion(), "boost to all slaves and increases fines paid by citizens who injure whores and public servants."], "div", ["indent"]);
+ App.Events.addNode(t, ["Increases the", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "penalty for operating an arcade."], "div", ["indent"]);
+ App.Events.addNode(t, ["Slows increases in the ratio of slaves to citizens."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to build a", App.Encyclopedia.link("trusting", "Trust", "mediumaquamarine"), "society that welcomes new slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for careful slave breaking and gentle cosmetic surgeries from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Degradationism"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Degradationism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Degradationism", ["bold"]), "is a future society model which approves of",
+ "frightened or mindbroken slaves, glory holes, the arcade, and heavy tattoos and piercings;",
+ "it disapproves of", App.Encyclopedia.link("trusting", "Trust", "mediumaquamarine"), "(except for the Head Girl and Recruiter) and slaves choosing their own assignments."
+ ], "div");
+ App.Events.addNode(t, ["Makes intelligent slaves less attractive and stupid slaves more attractive."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can apply unique names to slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Drives an increase in the ratio of slaves to citizens."], "div", ["indent"]);
+ App.Events.addNode(t, ["Eliminates the", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "penalty for operating an arcade along with fining citizens who injure whores and public servants."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to increase demand for glory holes and arcades."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for: brutal slave breaking, stupid slaves and cruelly altered slaves from the", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Paternalism"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Body Purism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Body Purism", ["bold"]), "is a future society model which approves of",
+ "unimplanted slaves and no heavy tattoos or piercings; disapproves of implants."
+ ], "div");
+ App.Events.addNode(t, ["Improves value of slaves without implants."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to affect goods seen in the slave market and work towards a solution to the long term effects of drug use."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for slaves without implants from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Transformation Fetishism"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Transformation Fetishism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Transformation Fetishism", ["bold"]), "is a future society model which approves of",
+ "implants and extreme surgery; disapproves of slaves without implants."
+ ], "div");
+ App.Events.addNode(t, ["Reduces value of slaves without implants."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to radically affect goods seen in the slave market."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for slaves with implants from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Body Purism"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Maturity Preferentialism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Maturity Preferentialism", ["bold"]), "is a future society model which approves of older slaves."
+ ], "div");
+ App.Events.addNode(t, ["Improves value of older slaves, but reduces value of young slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Will not entirely eliminate the usual preference for younger slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to make it easier for older player characters to maintain", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "and advance the arcology's prosperity."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for older slaves from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Youth Preferentialism"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Youth Preferentialism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Youth Preferentialism", ["bold"]), "is a future society model which approves of younger slaves."
+ ], "div");
+ App.Events.addNode(t, ["Improves value of younger slaves, but reduces value of old slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to make it easier for younger player characters to maintain", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "and advance the arcology's prosperity."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for young slaves from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Maturity Preferentialism"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Slimness Enthusiasm", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Slimness Enthusiasm", ["bold"]), "is a future society model which approves of",
+ "slaves with girlish figures; disapproves of slaves with stacked figures."
+ ], "div");
+ App.Events.addNode(t, ["Improves value of slim slaves, but reduces value of stacked slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to affect goods seen in the slave market and improve slave health."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for unexpanded slaves at a healthy weight from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Asset Expansionism"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Asset Expansionism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Asset Expansionism", ["bold"]), "is a future society model which approves of slaves with very large body parts."
+ ], "div");
+ App.Events.addNode(t, ["Improves value of stacked slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to radically affect goods seen in the slave market."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for asset expansion from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Slimness Enthusiasm"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Pastoralism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Pastoralism", ["bold"]), "is a future society model which approves of lactation, cockmilking, and the dairy."
+ ], "div");
+ App.Events.addNode(t, ["Improves value of milk and semen."], "div", ["indent"]);
+ App.Events.addNode(t, ["Drives an increase in the ratio of slaves to citizens."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to massively improve value of milk and semen."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for production focused asset expansion from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Physical Idealism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Physical Idealism", ["bold"]), "is a future society model which approves of musculature, height, and health."
+ ], "div");
+ App.Events.addNode(t, ["Improves value of slaves with", App.UI.DOM.combineNodes(App.Encyclopedia.link("muscles", "Musculature"), ".")]);
+ App.Events.addNode(t, ["Can be developed to affect goods seen in the slave market."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for muscular slaves from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Hedonistic Decadence"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Chattel Religionism", function() {
+ const t = new DocumentFragment();
+ const devotion = (text = "devotion") => App.Encyclopedia.link(text, "From Rebellious to Devoted", "hotpink");
+ const chattelReligionism = ["appropriate clothing", devotion("high devotion"), App.Encyclopedia.link("slave marriages", "Slave marriages")];
+
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Chattel Religionism", ["bold"]), "is a future society model which approves of",
+ App.UI.DOM.toSentence(chattelReligionism), "while disapproving of slutty clothing."
+ ], "div");
+ App.Events.addNode(t, ["Applies a small", devotion(), "boost to all slaves, and can remove the weekly", devotion(), "gain cap."], "div", ["indent"]);
+ App.Events.addNode(t, ["Drives an increase in the ratio of slaves to citizens."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to permanently boost", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "and quicken slaves' mental conditioning."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to prefer nudity over conservative clothing."]);
+ App.Events.addNode(t, ["Provides demand for sexual training from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Multiculturalism"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Multiculturalism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Multiculturalism", ["bold"]), "is a future society model which approves of",
+ "is a future society model which advances differently than other models: it is improved by the investment of more future society model slots, which can be withdrawn individually if desired.",
+ "No other advancement occurs and all benefits at each level are available instantly."
+ ], "div");
+ App.Events.addNode(t, ["Each week provides free", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "and increases arcology prosperity."], "div", ["indent"]);
+ App.Events.addNode(t, ["Helps prevent citizens from falling into slavery, slowing population drift towards slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Chattel Religionism"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Roman Revivalism", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Roman Revivalism", ["bold"]), "is a future society model which approves of",
+ "good leadership qualities like wealth and strong defense; disapproves of debt."
+ ], "div");
+ App.Events.addNode(t, ["Improves rate of prosperity gain and at high levels will drive down all slave prices."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can apply unique names to slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Slows increases in the ratio of slaves to citizens."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to greatly improve the arcology's resistance to insurrection."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for basic educations from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with the other Revivalist models."], "div", ["indent"]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Egyptian Revivalism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Egyptian Revivalism", ["bold"]), "is a future society model which approves of",
+ "keeping a large harem, slave incest, and having a wide racial variety of public slaves."
+ ], "div");
+ App.Events.addNode(t, ["Improves value of slaves in incestuous relationships and efficiency of fucktoys in improving", App.Encyclopedia.link("reputation.", "Arcologies and Reputation", "green")]);
+ App.Events.addNode(t, ["Can apply unique names to slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Slows increases in the ratio of slaves to citizens."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to improve the Head Girl position, with an additional bonus for Head Girls married to the Concubine, and a massive bonus if the Head Girl is also related to the Concubine."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for exotic accents from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with the other Revivalist models."], "div", ["indent"]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Edo Revivalism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Edo Revivalism", ["bold"]), "is a future society model which approves of",
+ "provision for the arcology's cultural development by providing a large number of public servants or club girls, which increases with", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "and disapproves of failure to do so."
+ ], "div");
+ App.Events.addNode(t, ["Improves efficiency of public servants and club girls."], "div", ["indent"]);
+ App.Events.addNode(t, ["Greatly improves beauty of Japanese slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to greatly improve the efficiency of direct spending on future societies."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for unaccented slaves from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with the other Revivalist models."], "div", ["indent"]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Arabian Revivalism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Arabian Revivalism", ["bold"]), "is a future society model which approves of",
+ "keeping a large number of fucktoys and slaves in the master suite, which increases with", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "and disapproves of failure to do so."
+], "div");
+ App.Events.addNode(t, ["Grants a bonus to the price received when selling slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to improve the efficiency of direct spending on future societies and moderately increase rents."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for more", App.Encyclopedia.link("devoted", "From Rebellious to Devoted", "hotpink"), "slaves from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with the other Revivalist models."], "div", ["indent"]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Chinese Revivalism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Chinese Revivalism", ["bold"]), "is a future society model which approves of",
+ "maintaining a solid imperial administration by keeping a Head Girl, a Recruiter, and a Bodyguard; disapproves of failure to do so."
+ ], "div");
+ App.Events.addNode(t, ["Increases prosperity growth when all three of these positions are staffed."], "div", ["indent"]);
+ App.Events.addNode(t, ["Greatly improves beauty of Chinese slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to permit the Head Girl to see to an additional slave each week."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for", App.UI.DOM.makeElement("span", "intelligence", ["cyan"]), "from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with the other Revivalist models."], "div", ["indent"]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Repopulationism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [App.UI.DOM.makeElement("span", "Repopulation Focus", ["bold"]), "is a future society model. It:"], "div");
+ App.Events.addNode(t, ["Approves of pregnant slaves and slaves that have given birth."], "div", ["indent"]);
+ App.Events.addNode(t, ["Improves value and beauty of pregnant slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to radically affect goods seen in the slave market."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for lactating slaves from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Provides demand for young slaves from the corporation."], "div", ["indent"]);
+ App.Events.addNode(t, ["Is mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Eugenics", "Eugenics Focus"), ".")]);
+ App.Events.addNode(t, [
+ "Repopulationism is a difficult Future Society and not recommended for beginners.",
+ "Try to keep as many slaves as possible visibly pregnant; if they're pregnant but not showing yet, Pregnancy Biometrics Collars can help."
+ ], "p", ["note", "yellow"]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Eugenics Focus", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [App.UI.DOM.makeElement("span", "Eugenics", ["bold"]), "is a future society model. It:"], "div");
+ App.Events.addNode(t, ["Disapproves of slave reproduction."], "div", ["indent"]);
+ App.Events.addNode(t, ["Drastically reduces value and beauty of pregnant slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Opens benefits exclusive to the connections made by the powerful individuals attracted to the arcology."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for; gelded, skilled and smart slaves from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Is mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Repopulation Focus", "Repopulationism"), ".")]);
+ App.Events.addNode(t, ["It is made up of four to five social classes: Slaves, low class citizens, chosen slaves, elite citizens, and the Societal Elite: a group of individuals with vast connections and wealth attracted by the promises of a society built around them. Low class citizens are encouraged to face testing and join the ranks of the elite, though the cost of failing the test is sterilization; a detail that is not revealed until after the test is complete."], "div", ["indent"]);
+ App.Events.addNode(t, [
+ "Eugenics is a difficult Future Society and not recommended for beginners.",
+ "For a more complete guide to playing with a Eugenics arcology, see the", App.UI.DOM.combineNodes(App.Encyclopedia.link("Guide to Eugenics"), ".")
+ ], "p", ["note", "yellow"]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Slave Professionalism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [App.UI.DOM.makeElement("span", "Slave Professionalism", ["bold"]), "is a future society model. It:"], "div");
+ App.Events.addNode(t, ["Approves of intelligent, well-trained slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Improves value and beauty of smart slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Dislikes slaves ruled by their libido."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to radically affect goods seen in the slave market"], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for; smart, educated and trained", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Is mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Intellectual Dependency"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Intellectual Dependency", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [App.UI.DOM.makeElement("span", "Intellectual Dependency", ["bold"]), "is a future society model. It:"], "div");
+ App.Events.addNode(t, ["Approves of horny, vapid slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Improves value and beauty of moronic slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to adore bimbo bodies or radically affect goods seen in the slave market."], "div", ["indent"]);
+ App.Events.addNode(t, ["Allows for", App.Encyclopedia.link("the Schoolroom", "Schoolroom"), "to be radically redesigned."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for; idiotic, young and uneducated slaves from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Is mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Slave Professionalism"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Petite Admiration", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [App.UI.DOM.makeElement("span", "Petite Admiration", ["bold"]), "is a future society model. It:"], "div");
+ App.Events.addNode(t, [`Approves of slaves shorter than ${lengthToEitherUnit(160)}.`]);
+ App.Events.addNode(t, ["Improves value and beauty of sufficiently short slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to accept relative shortness or radically affect goods seen in the slave market."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for shorter slaves from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Is mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Statuesque Glorification"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Statuesque Glorification", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [App.UI.DOM.makeElement("span", "Statuesque Glorification", ["bold"]), "is a future society model. It:"], "div");
+ App.Events.addNode(t, [`Approves of slaves taller than ${lengthToEitherUnit(170)}.`]);
+ App.Events.addNode(t, ["Improves value and beauty of sufficiently tall slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to accept relative tallness or radically affect goods seen in the slave market."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for taller slaves from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Is mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Petite Admiration"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Hedonistic Decadence", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [App.UI.DOM.makeElement("span", "Hedonistic Decadence", ["bold"]), "is a future society model. It:"], "div");
+ App.Events.addNode(t, ["Approves of overindulgence and luxury."], "div", ["indent"]);
+ App.Events.addNode(t, ["Improves value and beauty of heavyset slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to radically affect goods seen in the slave market."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for pampered and skilled slaves from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with", App.UI.DOM.combineNodes(App.Encyclopedia.link("Physical Idealism"), ".")]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Aztec Revivalism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Aztec Revivalism", ["bold"]), "is a future society model which approves of",
+ "qualities like good military education and an older leader."
+ ], "div");
+ App.Events.addNode(t, ["Improves all military acquisitions of slaves and allows for the sacrifice of slaves for", App.Encyclopedia.link("reputation.", "Arcologies and Reputation", "green")]);
+ App.Events.addNode(t, ["Can apply unique names to slaves."], "div", ["indent"]);
+ App.Events.addNode(t, ["Slows increases in the ratio of slaves to citizens."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to greatly rely on the Head Girl position as an advisor and assistant."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for menial slaves from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with the other Revivalist models."], "div", ["indent"]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Neo-Imperialism", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Neo-Imperialism", ["bold"]), "is a future society model which approves of",
+ "high wealth, prosperity, and personal combat skills and disapproves of weakness and poverty in leaders."
+ ], "div");
+ App.Events.addNode(t, ["Improves rate of prosperity gain and can be developed to increase rents via Imperial Barons."], "div", ["indent"]);
+ App.Events.addNode(t, ["Slows increases in the ratio of slaves to citizens."], "div", ["indent"]);
+ App.Events.addNode(t, ["Can be developed to improve the Arcology's combat prowess and resistance to insurrection via Imperial Knights."], "div", ["indent"]);
+ App.Events.addNode(t, ["Provides demand for healthy slaves from", App.UI.DOM.combineNodes(App.Encyclopedia.link("The Corporation"), ".")]);
+ App.Events.addNode(t, ["Mutually exclusive with all Revivalist models."], "div", ["indent"]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Gender Radicalism Research", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ "Advanced Gender Radicalist societies can fund research to produce modified uteri and ovaries designed to be implanted into male slaves to grant them the ability to become pregnant, thus leaving no gender specific traits remaining."
+ ], "div");
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Slave Professionalism Research", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, ["Advanced Slave Professionalism societies can fund efforts to synthesize a compound capable of improving mental capacities."], "div");
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Transformation Fetishism Research", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, ["Advanced Transformation Fetishist societies can fund research to produce implants capable of reaching previously undocumented sizes."], "div");
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Asset Expansionist Research", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ "Advanced Asset Expansionist societies can fund research to produce extremely powerful growth drugs capable of growing body parts to previously undocumented sizes.",
+ "Drugs are also standardized in slave diets to prevent loss of asset size.",
+ "Due to the rapid growth in said assets, and the strength of the drug cocktails, slaves are more likely to develop side effects of excessive drug use."
+ ], "div");
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Slimness Enthusiast Research", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, ["Advanced Slimness Enthusiast societies can fund research into several drugs designed to slim slaves down."], "div");
+ App.Events.addNode(t, ["They include:"], "div");
+ App.Events.addNode(t, ["Appetite suppressants to make dieting easier."], "div", ["indent"]);
+ App.Events.addNode(t, ["Redistributors to draw fat from oversized assets and settle them around the slave's core for easy removal."], "div", ["indent"]);
+ App.Events.addNode(t, ["Atrophiers to shrink non-fat based assets."], "div", ["indent"]);
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Youth Preferentialism Research", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ "Specialized creams built off of stem cells and several ingredients known for reducing the ravages of age.",
+ "Steady use leaves a slave looking younger, though the effects are literally skin deep; several gossip pieces have run about celebrities bedding youthful slaves just to accidentally find their efforts resulting in a broken hip."
+ ], "div");
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addArticle("Hedonistic Decadence Research", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ "Advanced Hedonistic Decadence societies can purchase plans for specialized slave food.",
+ "Said food is shaped to resemble actual food and flavored accordingly, however, its texture can only be described as gooey or gummy.",
+ "A plus if that is how the food should be, but a shocker otherwise, given how tantalizing that steak looks after nothing but liquid slave food for so long.",
+ "Since the food is essentially compacted liquid slave food, it is highly addictive thanks to the, typically, low presence of aphrodisiacs and can easily lead to excessive", App.Encyclopedia.link("weight gain", "Weight"), "as slaves are driven to gorge themselves on it.",
+ "They'll be happy, at least, as they steadily outgrow their clothes.",
+ "Alterations to the recipe exist to prevent", App.Encyclopedia.link("weight gain", "Weight"), "for Slimness Enthusiast societies and to cause gastric distress in Degradationist societies."
+ ], "div");
+ return t;
+}, "FutureSocities");
+
+App.Encyclopedia.addCategory("FutureSocities", function() {
+ const t = new DocumentFragment();
+ const vanilla = [];
+ const modded = [];
+ const research = [];
+
+ vanilla.push(App.Encyclopedia.link("Ethnic Supremacy"));
+ vanilla.push(App.Encyclopedia.link("Ethnic Subjugationism"));
+ vanilla.push(App.Encyclopedia.link("Gender Radicalism"));
+ vanilla.push(App.Encyclopedia.link("Gender Fundamentalism"));
+ vanilla.push(App.Encyclopedia.link("Paternalism"));
+ vanilla.push(App.Encyclopedia.link("Degradationism"));
+ vanilla.push(App.Encyclopedia.link("Body Purism"));
+ vanilla.push(App.Encyclopedia.link("Transformation Fetishism"));
+ vanilla.push(App.Encyclopedia.link("Maturity Preferentialism"));
+ vanilla.push(App.Encyclopedia.link("Youth Preferentialism"));
+ vanilla.push(App.Encyclopedia.link("Slimness Enthusiasm"));
+ vanilla.push(App.Encyclopedia.link("Asset Expansionism"));
+ vanilla.push(App.Encyclopedia.link("Pastoralism"));
+ vanilla.push(App.Encyclopedia.link("Physical Idealism"));
+ vanilla.push(App.Encyclopedia.link("Chattel Religionism"));
+ vanilla.push(App.Encyclopedia.link("Multiculturalism"));
+ vanilla.push(App.Encyclopedia.link("Roman Revivalism"));
+ vanilla.push(App.Encyclopedia.link("Egyptian Revivalism"));
+ vanilla.push(App.Encyclopedia.link("Edo Revivalism"));
+ vanilla.push(App.Encyclopedia.link("Arabian Revivalism"));
+ vanilla.push(App.Encyclopedia.link("Chinese Revivalism"));
+
+ modded.push(App.Encyclopedia.link("Repopulationism"));
+ modded.push(App.Encyclopedia.link("Eugenics Focus"));
+ modded.push(App.Encyclopedia.link("Slave Professionalism"));
+ modded.push(App.Encyclopedia.link("Intellectual Dependency"));
+ modded.push(App.Encyclopedia.link("Petite Admiration"));
+ modded.push(App.Encyclopedia.link("Statuesque Glorification"));
+ modded.push(App.Encyclopedia.link("Hedonistic Decadence"));
+ modded.push(App.Encyclopedia.link("Aztec Revivalism"));
+ modded.push(App.Encyclopedia.link("Neo-Imperialism"));
+
+ research.push(App.Encyclopedia.link("Gender Radicalism Research"));
+ research.push(App.Encyclopedia.link("Slave Professionalism Research"));
+ research.push(App.Encyclopedia.link("Transformation Fetishism Research"));
+ research.push(App.Encyclopedia.link("Asset Expansionist Research"));
+ research.push(App.Encyclopedia.link("Slimness Enthusiast Research"));
+ research.push(App.Encyclopedia.link("Youth Preferentialism Research"));
+ research.push(App.Encyclopedia.link("Hedonistic Decadence Research"));
+
+ if (V.encyclopedia !== "Future Societies") {
+ App.Events.addNode(t, ["Future Societies"], "div");
+ }
+ App.Events.addNode(t, ["Vanilla Future Societies:", App.UI.DOM.generateLinksStrip(vanilla)], "div");
+ App.Events.addNode(t, ["Modded Future Societies:", App.UI.DOM.generateLinksStrip(modded)], "div");
+ App.Events.addNode(t, ["Research:", App.UI.DOM.generateLinksStrip(research)], "div");
+ return t;
+});
diff --git a/src/gui/Encyclopedia/encyclopediaGuide.js b/src/gui/Encyclopedia/encyclopediaGuide.js
index 7001d1f77d20b0621e161882f0cb588ef6a06da2..930dfea084f81c1d7b872cf40be0674ccd239e86 100644
--- a/src/gui/Encyclopedia/encyclopediaGuide.js
+++ b/src/gui/Encyclopedia/encyclopediaGuide.js
@@ -1,7 +1,7 @@
App.Encyclopedia.addArticle("Playing Free Cities", function() {
const f = new DocumentFragment();
App.UI.DOM.appendNewElement("p", f, `Welcome to the Free Cities, ${PlayerName()}!`);
- App.UI.DOM.appendNewElement("p", f, "Future room for lore text", "note");
+ App.UI.DOM.appendNewElement("p", f, "Future room for lore text", ["note"]);
App.UI.DOM.appendNewElement("p", f, "Choose a more particular entry below:");
return f;
}, "guide");
@@ -15,101 +15,101 @@ App.Encyclopedia.addArticle("First Game Guide", function() {
App.UI.DOM.appendNewElement("h3", f, "Starting options");
r = [];
r.push("Start the game and select any of the world options; choose normal difficulty, since it's pretty forgiving and this opener will make good");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("money", "Money"), "."), "cash"));
+ r.push(App.Encyclopedia.link("money.", "Money", "cash"));
r.push("Build a completely male PC for your first game; it makes");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("maintenance much easier. Choose wealth for both your career and your rumored method of obtaining the arcology; the other options are fun but a full wealth build will set you up quickly to get started.");
App.Events.addParagraph(f, r);
App.UI.DOM.appendNewElement("p", f, "Now, customize your starting slaves.");
r = [];
r.push("For your first, make her as <span class='intelligent'>intelligent, educated,</span> and old as possible. Make her");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("devoted", "From Rebellious to Devoted"), "."), ["devotion", "accept"]));
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("devoted", "From Rebellious to Devoted"), "."), ["devotion", "accept"]));
r.push("but save");
- r.push(App.Encyclopedia.Dialog.linkDOM("money", "Money", "cash"));
+ r.push(App.Encyclopedia.link("money", "Money", "cash"));
r.push(`by giving her flaws, an unknown fetish, and <span class='trust dec'>making her afraid of you.</span> (These are easy to fix.) You can customize the rest of her as you wish, but try to keep her under <span class='cash'>${cashFormat(5000)}.</span> Don't worry about skills, since with two of them you'll be able to rotate Head Girl duty so the other can learn skills. Commit her, base another slave off her, and commit that one too. Those are your`);
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("Head Girls", "Head Girl"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("Head Girls", "Head Girl"), "."));
App.Events.addParagraph(f, r);
r = [];
r.push("Spend the rest of your");
- r.push(App.Encyclopedia.Dialog.linkDOM("money", "Money", "cash"));
+ r.push(App.Encyclopedia.link("money", "Money", "cash"));
r.push("on prospects: slaves that are");
- r.push(App.Encyclopedia.Dialog.linkDOM("cheap", "Money", "cash"));
+ r.push(App.Encyclopedia.link("cheap", "Money", "cash"));
r.push("now, but can be improved quickly. As long as you keep <span class='devotion accept'>devotion</span> pretty high, low");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust inc"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust inc"));
r.push("can be fixed reliably. Unknown fetishes, emaciated or fat, flaws, deep voice, and poor skills are all good ways to drive prices down, and can all be fixed quickly. Virginities are a bad idea because they drive costs up and are easy to break. <span class='intelligent'>Education</span> can take awhile and will take slaves away from other jobs, so make them all educated for now, and keep their <span class='intelligent'>intelligence</span> reasonably high.");
App.Events.addParagraph(f, r);
App.UI.DOM.appendNewElement("h3", f, "First turn");
r = [];
r.push("Assign one of your Head Girls to be <strong>the</strong> Head Girl and make the other whore. Assign everyone else to whore. The");
- r.push(App.Encyclopedia.Dialog.linkDOM("rules assistant", "Rules Assistant"));
+ r.push(App.Encyclopedia.link("rules assistant", "Rules Assistant"));
r.push("will speed things up a lot when you know the basics, but leave it off for now; it's easy to miss a lot of stuff if you set it up without a bit of experience. Go through your girls one by one and experiment with their options, but anyone who's <span class='devotion accept'>Accepting</span> or better should get nice clothes, accessories, and");
- r.push(App.Encyclopedia.Dialog.linkDOM("living conditions", "Living Conditions"));
+ r.push(App.Encyclopedia.link("living conditions", "Living Conditions"));
r.push("anyone who's not should not. When slaves tip over into <span class='devotion accept'>Accepting,</span> switch them over from bedrolls and uncomfortable straps; until then, the good life is a waste of");
- r.push(App.Encyclopedia.Dialog.linkDOM("money", "Money", "cash"));
+ r.push(App.Encyclopedia.link("money", "Money", "cash"));
r.push("and will spoil them. Give <span class='health dec'>unhealthy</span> slaves curatives, and give everyone hormones, since they're");
- r.push(App.Encyclopedia.Dialog.linkDOM("cheap", "Money", "cash"));
+ r.push(App.Encyclopedia.link("cheap", "Money", "cash"));
r.push("and have good front end benefits. Get everyone working out or dieting to reach a basic fitness level and an attractive (not <span class='warning'>red</span>)");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("weight", "Weight"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("weight"), "."));
r.push("Sell the girl(s) your predecessor left behind for seed");
- r.push(App.Encyclopedia.Dialog.linkDOM("money", "Money", "cash"));
+ r.push(App.Encyclopedia.link("money", "Money", "cash"));
r.push("and choose the most profitable option; there are ways to maximize this, but worry about that later. Check out the arcology management menu. You should have the");
- r.push(App.Encyclopedia.Dialog.linkDOM("money", "Money", "cash"));
+ r.push(App.Encyclopedia.link("money", "Money", "cash"));
r.push("to upgrade the security systems, build the");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("Head Girl suite", "Head Girl Suite"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("Head Girl suite"), ","));
r.push(`and to buy the kitchen upgrade; this will make dieting work faster. Check out the slave market, and buy a single bargain slave: <span class="cash">${cashFormat(2000)}</span> is good. Put her in the suite: if she won't go, abuse her until she will. Open the personal attention menu, and fix your Head Girl's flaws; softening is powerful but it takes longer and we're focusing on the basics. <strong>Save the game</strong> and end the turn.`);
App.Events.addParagraph(f, r);
App.UI.DOM.appendNewElement("h3", f, "The end turn report");
r = [];
r.push("Read this, and note all the colored text. Pay particular attention to <span class='warning'>red,</span> <span class='trust dec'>gold,</span> or <span class='devotion dec'>orchid</span> text; these are generally bad. Being a slave whore is a hard life, and some trouble is inevitable. But take particular note of things like slaves losing");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("health", "Health"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("health"), ","));
r.push("becoming");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("fearful", "Trust"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("fearful", "Trust"), ","));
r.push("or");
- r.push(App.Encyclopedia.Dialog.linkDOM("hating", "From Rebellious to Devoted"));
+ r.push(App.Encyclopedia.link("hating", "From Rebellious to Devoted"));
r.push("you due to their");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("rules", "Rules Assistant"), ","));
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("conditions", "Living Conditions"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("rules", "Rules Assistant"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("conditions", "Living Conditions"), ","));
r.push("or other slaves — these things you can control. Reload your save and fiddle around with the options to address these areas. (The Head Girl's girl may have a rough time; you can't affect that.) Since your Head Girl has her own slave to help her around the house, she'll work with two of your slaves.");
App.Events.addParagraph(f, r);
App.UI.DOM.appendNewElement("h3", f, "Economics and events");
r = [];
r.push("The economics report offers some flavor, but you should leave the options it offers alone until you've got some spare cash. An event or two will follow; feel free to reload the page on each (F5 on most browsers) to see what the different options do. Generally, try to pick options that give you");
- r.push(App.Encyclopedia.Dialog.linkDOM("money", "Money", "cash"));
+ r.push(App.Encyclopedia.link("money", "Money", "cash"));
r.push("and improve");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("devotion", "From Rebellious to Devoted"), "."), ["devotion", "inc"]));
- r.push(App.Encyclopedia.Dialog.linkDOM("Trust", "Trust", "trust inc"));
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("devotion", "From Rebellious to Devoted"), "."), ["devotion", "inc"]));
+ r.push(App.Encyclopedia.link("Trust", "Trust", "trust inc"));
r.push("and");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("can wait.");
App.Events.addParagraph(f, r);
App.UI.DOM.appendNewElement("h3", f, "Moving forward");
r = [];
r.push("Hopefully, many of your slaves learned skills during their week of");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("whoring", "Whoring"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("whoring"), "."));
r.push("Three levels of skill (<span class='cyan'>Veteran Whore</span> or <span class='cyan'>W+++</span> for example) is the maximum, though slaves without vaginas will only acquire two complete levels of sexual skills. As you move through the first ten weeks or so, many of your slaves will max out their whoring and sexual skills. When they do, switch them over to");
- r.push(App.Encyclopedia.Dialog.linkDOM("public service", "Public Service"));
+ r.push(App.Encyclopedia.link("public service", "Public Service"));
r.push("until they achieve maximum");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("entertainment skill", "Entertainment Skill"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("entertainment skill", "Entertainment Skill"), ","));
r.push("and then put them back on whoring, since cross training will improve their whoring performance. When your Head Girl alternate has maxed skills, make her the Head Girl and train up the MILF she replaced. Switch your personal attention around; for now, fix the");
- r.push(App.Encyclopedia.Dialog.linkDOM("quirks", "Quirks"));
+ r.push(App.Encyclopedia.link("quirks"));
r.push("of the most");
- r.push(App.Encyclopedia.Dialog.linkDOM("devoted", "From Rebellious to Devoted", "devotion accept"));
+ r.push(App.Encyclopedia.link("devoted", "From Rebellious to Devoted", "devotion accept"));
r.push("slave who has any, since that's the best way to maximize your chances of success each turn.");
App.Events.addParagraph(f, r);
r = [];
r.push(`Pay attention to your cash flow. If it's positive and you have a decent buffer of <span class='cash'>${cashFormat(10000)}</span> or so built up, wait for the slave market prices to naturally dip, and then purchase a girl or two to work on once your starting stable is well trained, though you may have to confine or rest new purchases for a while if they're`);
- r.push(App.Encyclopedia.Dialog.linkDOM("rebellious", "From Rebellious to Devoted", "devotion resistant"));
+ r.push(App.Encyclopedia.link("rebellious", "From Rebellious to Devoted", "devotion resistant"));
r.push("or sick. If you get a virgin, consider applying chastity to preserve value for resale. When prices are high, consider selling anyone who's free of flaws and has a discovered sexual fetish, since this maximizes value bonuses. Within ten turns, you should be making decent weekly profit, with resale of slaves building up your bank when prices favor sale. Once you're confident of the whoring mechanics, consider building a");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("brothel", "Brothel"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("brothel"), "."));
r.push("Your alternate Head Girl will make a good");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("madam", "Madam"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("madam"), "."));
App.Events.addParagraph(f, r);
return f;
@@ -121,23 +121,23 @@ App.Encyclopedia.addArticle("How to Play", function() {
r = [];
r.push("This is not a game in which the PC slaveowner is some magical sexual god whose mere presence turns women into submissives. This means that sane slaves will tend to lose obedience and");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust inc"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust inc"));
r.push("over time if you don't take any steps to maintain their mental state. Mental stats have maximum and minimum values. These are somewhat 'sticky,' so slaves at minimum");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion", "From Rebellious to Devoted", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"));
r.push("for example may require an extra jolt to break free of this state.");
App.Events.addParagraph(f, r);
r = [];
r.push("Maximized");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion", "From Rebellious to Devoted", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"));
r.push("and");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust careful"));
r.push("are not useless; if one of these stats is maximized and the other is not, the extra");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion", "From Rebellious to Devoted", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"));
r.push("or");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust careful"));
r.push("will boost the other. If both are maximized, the player gains");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("instead. However if both are low the slave in question is liable to experience breakdowns and generally be useless.");
App.Events.addParagraph(f, r);
@@ -158,14 +158,14 @@ App.Encyclopedia.addArticle("How to Play", function() {
App.Events.addNode(ul, ["<span class='hotpink'>pink text</span> means an increase in a slave's regard for to you. "], "li");
App.Events.addNode(ul, ["<span class='mediumorchid'>Orchid text</span> means a decrease in a slave's regard for to you. "], "li");
App.Events.addNode(ul, ["<span class='trust inc'>Aquamarine text</span> means an increase in a slave's",
- App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust inc"), "of to you, and a reduction in her fear of you. "], "li");
+ App.Encyclopedia.link("trust", "Trust", "trust inc"), "of to you, and a reduction in her fear of you. "], "li");
App.Events.addNode(ul, ["<span class='trust dec'>Gold text</span> means a decrease in the slave's",
- App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust dec"), " of you, and an increase in her fear of you. "], "li");
+ App.Encyclopedia.link("trust", "Trust", "trust dec"), " of you, and an increase in her fear of you. "], "li");
App.Events.addNode(ul, ["<span class='orangered'>Orange-red text</span> means a decrease in a hateful slave's fear of you. "], "li");
App.Events.addNode(ul, ["<span class='lime'>Lime text</span> means something has grown or improved, which is usually, but not always, good. "], "li");
App.Events.addNode(ul, ["<span class='orange'>Orange text</span> means something has shrunk or degraded, which is usually, but not always, bad. "], "li");
App.Events.addNode(ul, ["<span class='cash'>Yellow-green text</span> is for a",
- App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("money", "Money", "cash"), "-related"), "event. "], "li");
+ App.UI.DOM.combineNodes(App.Encyclopedia.link("money", "Money", "cash"), "-related"), "event. "], "li");
App.Events.addNode(ul, ["<span class='coral'>Coral text</span> is used for simple identifiers that can be used to check a slave's general type at a glance, also weakening fetishes. "], "li");
App.Events.addNode(ul, ["<span class='lightcoral'>Light coral text</span> is used when a slave's fetish strengthens or develops. "], "li");
App.Events.addNode(ul, ["<span class='lightgreen'>Light green text</span> is used to indicate positive relationships. "], "li");
@@ -185,28 +185,28 @@ App.Encyclopedia.addArticle("How to Play", function() {
r = [];
r.push("Things that increase income from");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("prostitution", "Whoring"), ","));
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("prostitution", "Whoring"), ","));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("gain from");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("slutting", "Public Service"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("slutting", "Public Service"), ","));
r.push("and performance in most jobs include all appearance stats (that's right, every one; though some are more or less important),");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("sexual skills", "Skills"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("sexual skills", "Skills"), ","));
r.push("a slave's");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("health", "Health"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("health"), ","));
r.push("and the state of a slave's holes. Going from a novice to a veteran whore will have non-linear impacts on income, since a novice will get good");
- r.push(App.Encyclopedia.Dialog.linkDOM("money", "Money", "cash"));
+ r.push(App.Encyclopedia.link("money", "Money", "cash"));
r.push("for being fresh and little");
- r.push(App.Encyclopedia.Dialog.linkDOM("money", "Money", "cash"));
+ r.push(App.Encyclopedia.link("money", "Money", "cash"));
r.push("for her skills, and a veteran will get the reverse. The");
- r.push(App.Encyclopedia.Dialog.linkDOM("fetishes", "Fetishes"));
+ r.push(App.Encyclopedia.link("fetishes"));
r.push("and physical statuses that get pink text on the main menu (huge tits, bisexual, etc.) give bonuses.");
App.Events.addParagraph(f, r);
r = [];
r.push("The game is not intended to be crushingly difficult, but it is balanced so that in order to achieve some of the best event outcomes, and eventually in order to survive, the player must build a business empire that turns a significant profit. Profits are necessary because the player will want to be able to make some major expenditures in the late game. Buy low, sell high, and always try to improve your slaves. Even something as simple as a few weeks' personal attention to fix");
- r.push(App.Encyclopedia.Dialog.linkDOM("mental flaws", "Flaws"));
+ r.push(App.Encyclopedia.link("mental flaws", "Flaws"));
r.push("and boost");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion", "From Rebellious to Devoted", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"));
r.push("can produce significant profits when a slave is resold.");
App.Events.addParagraph(f, r);
@@ -257,18 +257,18 @@ App.Encyclopedia.addArticle("The Arcology Interface", function() {
r = [];
r.push("The uppermost level is the Penthouse. It's where the player character and the slaves under their direct supervision live, and it can be upgraded with a number of facilities that can be accessed through shortcuts that are added to the Penthouse in the interface once they're installed. Some of these facilities can house some of the player character's sex slaves. Unlike every other Sector, the Penthouse is always owned by the player and cannot be sold. Every other Sector can be privately owned, reducing the player's control of the arcology. Privately owned Sectors can be purchased, or acquired using");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("if the player character's");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("is extremely high. Privately owned sectors are bordered in red regardless of what's in them.");
App.Events.addParagraph(f, r);
r = [];
r.push("The next level down, with three Sectors, is the Promenade, which is a major social area and hosts most of the businesses which cater to the arcology's citizens. Promenade Sectors are occupied by Shops by default, which will automatically be filled by business tenants that will pay the player character rent if they own the Sector. Promenade Sectors can be upgraded into");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("brothels", "Brothel"), ","));
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("clubs", "Club"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("brothels", "Brothel"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("clubs", "Club"), ","));
r.push("or an enhanced version of shops which will attract business tenants that help advance a specific");
- r.push(App.Encyclopedia.Dialog.linkDOM("future society", "Future Societies"));
+ r.push(App.Encyclopedia.link("future society", "Future Societies"));
r.push("model, and still provide rent.");
App.Events.addParagraph(f, r);
@@ -278,18 +278,18 @@ App.Encyclopedia.addArticle("The Arcology Interface", function() {
r = [];
r.push("The first level with five Sectors is the Concourse. Like the Promenade, it hosts businesses, but these focus more on bulk trade and less on citizens' luxury needs, and include the arcology's slave markets. Its sectors are occupied by Markets by default, which pay rent. Concourse sectors can be upgraded into a");
- r.push(App.Encyclopedia.Dialog.linkDOM("pit", "Pit"));
+ r.push(App.Encyclopedia.link("pit"));
r.push("for fighting slaves, an");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("arcade", "Arcade"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("arcade"), ","));
r.push("or into a flagship store for the player character's");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("corporation", "The Corporation"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("corporation", "The Corporation"), "."));
App.Events.addParagraph(f, r);
r = [];
r.push("The lowest level, also with five Sectors, is the Service level. Its Sectors are occupied by Manufacturing by default, which of course pay rent. If the player is focusing on menial slaves, its Sectors can be upgraded into pens, to increase the total number of");
- r.push(App.Encyclopedia.Dialog.linkDOM("menial slaves", "Menial Slaves"));
+ r.push(App.Encyclopedia.link("menial slaves", "Menial Slaves"));
r.push("that can be kept in the arcology, or into Sweatshops, to put the labor of menial slaves in the arcology to use. Alternatively, these Sectors can be upgraded into a");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("dairy", "Dairy"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("dairy"), ","));
r.push("or into a barracks, which will reduce the weekly upkeep of any mercenaries the player character has hired.");
App.Events.addParagraph(f, r);
@@ -308,18 +308,18 @@ App.Encyclopedia.addArticle("Tips and Tricks", function() {
r = [];
r.push("If a new slave isn't afraid of you, make her. Then and only then build her");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("devotion", "From Rebellious to Devoted"), "."), ["devotion", "accept"]));
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("devotion", "From Rebellious to Devoted"), "."), ["devotion", "accept"]));
App.Events.addParagraph(f, r);
r = [];
r.push("The personal attention assignment should be used tactically. It is the most powerful single way of improving slaves because it's reliable. Devotion and");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust"));
+ r.push(App.Encyclopedia.link("trust", "Trust"));
r.push("gains during a single week are normally capped. However, personal attention removes these caps. This is most powerful for slaves that are already well broken and are enjoying fairly luxurious lives. With so many things driving up devotion and");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("trust", "Trust"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("trust", "Trust"), ","));
r.push("using personal attention to remove the caps can quickly maximize both stats. Focusing on business instead (by selecting no slave for personal attention) is also powerful. Doing so produces");
- r.push(App.Encyclopedia.Dialog.linkDOM("money", "Money", "cash"));
+ r.push(App.Encyclopedia.link("money", "Money", "cash"));
r.push("proportional to the amount of");
- r.push(App.Encyclopedia.Dialog.linkDOM("money", "Money", "cash"));
+ r.push(App.Encyclopedia.link("money", "Money", "cash"));
r.push("on hand, <strong>and</strong> improves prosperity growth, which improves future income from rents.");
App.Events.addParagraph(f, r);
@@ -350,9 +350,9 @@ App.Encyclopedia.addArticle("Design Your Master", function() {
r.push(`<strong>Wealth</strong> is a choice for both the <strong>career background</strong> and <strong>rumored method of acquiring the arcology</strong> options. Both provide you with <span class="cash">${cashFormat(10000)}</span> each for a total of <span class="cash">${cashFormat(30000)}</span> if both are chosen. As a <strong>background option</strong> it means that your starting slaves will have two free levels of sex skills available`);
if (showSecExp) {
r.push("and maintaining");
- r.push(App.Encyclopedia.Dialog.linkDOM("authority", "Security Expansion", "darkviolet"));
+ r.push(App.Encyclopedia.link("authority", "Security Expansion", "darkviolet"));
r.push("will be harder, but upgrades in the propaganda hub will be");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("cheaper", "Money"), "."), "cash"));
+ r.push(App.Encyclopedia.link("cheaper.", "Money", "cash"));
} else {
r.push(r.pop() + ".");
}
@@ -365,74 +365,74 @@ App.Encyclopedia.addArticle("Design Your Master", function() {
r = [];
r.push("<strong>business owner</strong> <span class='note'>(also referred to as capitalist)</span> enhances the business-focused personal attention, increasing the");
- r.push(App.Encyclopedia.Dialog.linkDOM("money", "Money", "cash"));
+ r.push(App.Encyclopedia.link("money", "Money", "cash"));
r.push("it produces and improving arcology prosperity when business-focused personal attention is selected. Also,");
if (showSecExp) {
r.push("upgrades in the propaganda hub will be");
- r.push(App.Encyclopedia.Dialog.linkDOM("cheaper", "Money", "cash"));
+ r.push(App.Encyclopedia.link("cheaper", "Money", "cash"));
r.push("and");
}
r.push("your starting slaves will have a free level of prostitution skill available. Starts having already mastered");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("Trading", "PC Skills"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("Trading", "PC Skills"), "."));
App.Events.addNode(ul, r, "li");
r = [];
r.push("<strong>private security contractor</strong> <span class='note'>(also referred to as mercenary background)</span> greatly reduces the cost of keeping mercenaries in your employ.");
if (showSecExp) {
r.push("Upgrades in the security HQ will be");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("cheaper", "Money"), "."), "cash"));
+ r.push(App.Encyclopedia.link("cheaper.", "Money", "cash"));
}
r.push("Your starting slaves will have free");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust careful"));
r.push("available. Starts having already mastered");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("Warfare", "PC Skills"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("Warfare", "PC Skills"), "."));
App.Events.addNode(ul, r, "li");
r = [];
r.push("<strong>slave driver</strong> enhances slave-focused personal attention, adding bonus");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion", "From Rebellious to Devoted", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"));
r.push("or");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust careful"));
r.push("to many training applications or preventing their loss.");
if (showSecExp) {
- r.push(App.Encyclopedia.Dialog.linkDOM("Authority", "Security Expansion", "darkviolet"));
+ r.push(App.Encyclopedia.link("Authority", "Security Expansion", "darkviolet"));
r.push("will be easier to maintain. Plus upgrades in the security HQ will be");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("cheaper", "Money"), "."), "cash"));
+ r.push(App.Encyclopedia.link("cheaper.", "Money", "cash"));
}
r.push("Starting slaves will be cheaper, in addition having already mastered");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("Slaving", "PC Skills"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("Slaving", "PC Skills"), "."));
App.Events.addNode(ul, r, "li");
r = [];
r.push("<strong>arcology engineer</strong> provides a significant discount on many <span class='cash'>arcology upgrades and expansions.</span> In addition to the arcology starting off with <span class='positive'>basic economic upgrades</span> already installed. Starts having already mastered");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("Engineering", "PC Skills"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("Engineering", "PC Skills"), "."));
App.Events.addNode(ul, r, "li");
r = [];
r.push("<strong>doctor</strong> allows the player character to perform surgery personally, providing a <span class='cash'>discount on surgery costs</span> and a <span class='positive'>reduction to resulting health damage.</span> Additionally, slaves may react differently to surgery if the player character performs it and starting slaves will have free implants available. Starts having already mastered");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("Medicine", "PC Skills"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("Medicine", "PC Skills"), "."));
App.Events.addNode(ul, r, "li");
r = [];
r.push("<strong>escort</strong> provides a one-time bonus to a slave's entertainment, whoring, and two sexual skills when a new slave is acquired. Furthermore, society will not take lightly to being run by an ex-whore, and you will receive heavy");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
if (showSecExp) {
r.push("and");
- r.push(App.Encyclopedia.Dialog.linkDOM("authority", "Security Expansion", "darkviolet"));
+ r.push(App.Encyclopedia.link("authority", "Security Expansion", "darkviolet"));
}
r.push("losses each week. You can spend your free time selling your body for");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("money", "Money"), ","), "cash"));
+ r.push(App.Encyclopedia.link("money,", "Money", "cash"));
r.push("at the cost of a large amount of");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation"), "."), ["reputation", "inc"]));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
App.Events.addNode(ul, r, "li");
r = [];
r.push("<strong>celebrity</strong> provides extra");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("at game start");
if (showSecExp) {
r.push("and upgrades in the propaganda hub will be");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("cheaper", "Money"), "."), "cash"));
+ r.push(App.Encyclopedia.link("cheaper.", "Money", "cash"));
} else {
r.push(r.pop() + ".");
}
@@ -441,44 +441,44 @@ App.Encyclopedia.addArticle("Design Your Master", function() {
r = [];
r.push("<strong>servant</strong> provides a one-time bonus to a slave's");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust careful"));
r.push("and");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("devotion", "From Rebellious to Devoted"), "."), ["devotion", "accept"]));
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("devotion", "From Rebellious to Devoted"), "."), ["devotion", "accept"]));
r.push("Furthermore, society will not approve of being run by an ex-servant, and you will face");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
if (showSecExp) {
r.push("and");
- r.push(App.Encyclopedia.Dialog.linkDOM("authority", "Security Expansion", "darkviolet"));
+ r.push(App.Encyclopedia.link("authority", "Security Expansion", "darkviolet"));
}
r.push("losses each week. You can spend your free time, putting your previous experience to use, by greatly reducing the costs of your penthouse. You also passively reduce costs when not focusing on doing so.");
App.Events.addNode(ul, r, "li");
r = [];
r.push("<strong>gang leader</strong> provides a one-time bonus to a slave's health and a free level of combat skill. Furthermore, society will not approve of being run by a gang-banger, and you will face");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("losses each week. New slaves will likely have heard of your previous exploits and fear you.");
if (showSecExp) {
r.push("You know how to haggle slaves and assert your");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("authority", "Security Expansion"), "."), "darkviolet"));
+ r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.link("authority", "Security Expansion"), "."), "darkviolet"));
r.push("Plus upgrades in the security HQ will be");
- r.push(App.UI.DOM.makeElement("span", App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("cheaper", "Money"), "."), "cash"));
+ r.push(App.Encyclopedia.link("cheaper.", "Money", "cash"));
}
r.push("You know how to haggle slaves. You can spend your free time putting your previous experience to use, proving another source of income however this isn't guaranteed.");
App.Events.addNode(ul, r, "li");
r = [];
r.push("<strong>incursion specialist</strong> provides starting slaves with a free level of <span class='intelligent'>intelligence.</span> Also certain upgrades may be");
- r.push(App.Encyclopedia.Dialog.linkDOM("cheaper", "Money", "cash"));
+ r.push(App.Encyclopedia.link("cheaper", "Money", "cash"));
r.push("and you may find alternative approaches to");
if (showSecExp) {
r.push("problems, but you will find");
- r.push(App.Encyclopedia.Dialog.linkDOM("authority", "Security Expansion", "darkviolet"));
+ r.push(App.Encyclopedia.link("authority", "Security Expansion", "darkviolet"));
r.push("quite hard to maintain.");
} else {
r.push("problems.");
}
r.push("Starts having already mastered");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("Hacking", "PC Skills"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("Hacking", "PC Skills"), "."));
App.Events.addNode(ul, r, "li");
p.append(ul);
@@ -490,7 +490,7 @@ App.Encyclopedia.addArticle("Design Your Master", function() {
text = "Hide SecExp details";
} else {
r.push("Players using the");
- r.push(App.Encyclopedia.Dialog.linkDOM("Security Expansion", "Security Expansion"));
+ r.push(App.Encyclopedia.link("Security Expansion", "Security Expansion"));
r.push("mod may want to view this page with");
text = "additional details";
}
@@ -503,17 +503,17 @@ App.Encyclopedia.addArticle("Design Your Master", function() {
ul = document.createElement("ul");
r = [];
r.push("<strong>Hard Work</strong> provides a one-time bonus to both");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion", "From Rebellious to Devoted", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"));
r.push("and");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust accept"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust accept"));
r.push("when a new slave is acquired.");
App.Events.addNode(ul, r, "li");
r = [];
r.push("<strong>Force</strong> means that if a slave does not have enough");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion", "From Rebellious to Devoted", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "devotion accept"));
r.push("to obey when acquired, this option will terrify her and reduce her");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust accept"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust accept"));
r.push("to the point where she should comply.");
App.Events.addNode(ul, r, "li");
@@ -523,7 +523,7 @@ App.Encyclopedia.addArticle("Design Your Master", function() {
r = [];
r.push("<strong>Luck</strong> provides extra");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("at game start, but no ongoing advantages once the main game begins.");
App.Events.addNode(ul, r, "li");
@@ -532,18 +532,18 @@ App.Encyclopedia.addArticle("Design Your Master", function() {
App.UI.DOM.appendNewElement("h3", f, "Age groups");
r = [];
r.push("Older PCs enjoy easier");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("maintenance, but possess lower");
- r.push(App.Encyclopedia.Dialog.linkDOM("sexual energy", "Sexual Energy"));
+ r.push(App.Encyclopedia.link("sexual energy", "Sexual Energy"));
r.push("while younger PC's are the opposite.");
App.Events.addParagraph(f, r);
App.UI.DOM.appendNewElement("h3", f, "Body and gender options");
r = [];
r.push("All PC body changes will alter scenes, but their main mechanical effect is on");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("maintenance. Feminine options will make it harder to maintain");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("without providing any gameplay advantage, making playing as a feminine PC a form of increased difficulty. There are other minor gameplay differences including differing slave reactions to the PC based on attraction, but these are fairly minor.");
App.Events.addParagraph(f, r);
@@ -567,13 +567,13 @@ App.Encyclopedia.addArticle("Guide to Eugenics", function() {
r.push("By granting their influence to the Societal Elite, you can join them, but the cost is the control of your arcology. Unlike other FSes, when you accept Eugenics, you are subordinating your absolute control over your own arcology to the Societal Elite. In exchange, they grant you significant boons through their connections, including discounts to arcology upgrades and medical procedures, debt protection, and early access to advanced technology such as cloning and organ implants.");
r.toParagraph();
- r.push("In", App.Encyclopedia.Dialog.linkDOM("Neo-imperialist arcologies,", "Neo-Imperialism"), "the Societal Elite also serve as your <strong>Barons</strong>; they function in a mostly-identical manner from a mechanical perspective.");
+ r.push("In", App.Encyclopedia.link("Neo-imperialist arcologies,", "Neo-Imperialism"), "the Societal Elite also serve as your <strong>Barons</strong>; they function in a mostly-identical manner from a mechanical perspective.");
r.toParagraph();
r.push("First Phase: Building a Eugenics Society");
r.toNode("h3");
- r.push("When you first adopt Eugenics, you should do everything possible to encourage rapid adoption of the FS and satisfy the Societal Elite. This phase is similar to the adoption phase in other Future Societies, but the penalties for failure are much more severe: you will lose a huge amount of reputation, many wealthy citizens will leave your arcology, your prosperity will drop, and the FS will be placed on a timer during which it cannot be adopted again. Details of what the Societal Elite expect from you can be found in the", App.Encyclopedia.Dialog.linkDOM("Eugenics", "Eugenics Focus"), "section of the Encyclopedia. Keeping your slaves in chastity belts and/or fully sterilizing them (especially male slaves) is the most important factor. Under no circumstances should you permit a slave under your control to become pregnant in this phase, and existing slave pregnancies should be aborted before adopting Eugenics.");
+ r.push("When you first adopt Eugenics, you should do everything possible to encourage rapid adoption of the FS and satisfy the Societal Elite. This phase is similar to the adoption phase in other Future Societies, but the penalties for failure are much more severe: you will lose a huge amount of reputation, many wealthy citizens will leave your arcology, your prosperity will drop, and the FS will be placed on a timer during which it cannot be adopted again. Details of what the Societal Elite expect from you can be found in the", App.Encyclopedia.link("Eugenics", "Eugenics Focus"), "section of the Encyclopedia. Keeping your slaves in chastity belts and/or fully sterilizing them (especially male slaves) is the most important factor. Under no circumstances should you permit a slave under your control to become pregnant in this phase, and existing slave pregnancies should be aborted before adopting Eugenics.");
r.toParagraph();
r.push("Second Phase: Satisfying the Societal Elite");
@@ -588,7 +588,7 @@ App.Encyclopedia.addArticle("Guide to Eugenics", function() {
r.push("Third Phase: The Takeover Attempt");
r.toNode("h3");
- r.push("You can continue working with the Societal Elite as long as you want, but at some point you will probably want full control of your arcology back. Fortunately, once Eugenics is fully entrenched in your arcology, your Societal Elites cannot leave...they can only try to rebel. If you irritate the Societal Elite sufficiently, they will attempt to violently depose you. Make sure you have a loyal and capable", App.Encyclopedia.Dialog.linkDOM("bodyguard", "Bodyguard"), "before angering them. Having mercenaries quartered in your arcology");
+ r.push("You can continue working with the Societal Elite as long as you want, but at some point you will probably want full control of your arcology back. Fortunately, once Eugenics is fully entrenched in your arcology, your Societal Elites cannot leave...they can only try to rebel. If you irritate the Societal Elite sufficiently, they will attempt to violently depose you. Make sure you have a loyal and capable", App.Encyclopedia.link("bodyguard", "Bodyguard"), "before angering them. Having mercenaries quartered in your arcology");
if (V.SF.Toggle) {
r.push("or the Special Forces active");
}
@@ -600,12 +600,12 @@ App.Encyclopedia.addArticle("Guide to Eugenics", function() {
App.Encyclopedia.addCategory("guide", function() {
const r = [];
- r.push(App.Encyclopedia.Dialog.linkDOM("First Game Guide", "First Game Guide"));
- r.push(App.Encyclopedia.Dialog.linkDOM("How to Play", "How to Play"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Keyboard Shortcuts", "Keyboard Shortcuts"));
- r.push(App.Encyclopedia.Dialog.linkDOM("The Arcology Interface", "The Arcology Interface"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Tips and Tricks", "Tips and Tricks"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Design Your Master", "Design Your Master"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Guide to Eugenics", "Guide to Eugenics"));
+ r.push(App.Encyclopedia.link("First Game Guide"));
+ r.push(App.Encyclopedia.link("How to Play"));
+ r.push(App.Encyclopedia.link("Keyboard Shortcuts"));
+ r.push(App.Encyclopedia.link("The Arcology Interface"));
+ r.push(App.Encyclopedia.link("Tips and Tricks"));
+ r.push(App.Encyclopedia.link("Design Your Master"));
+ r.push(App.Encyclopedia.link("Guide to Eugenics"));
return App.UI.DOM.generateLinksStrip(r);
});
diff --git a/src/gui/Encyclopedia/encyclopediaLore.js b/src/gui/Encyclopedia/encyclopediaLore.js
new file mode 100644
index 0000000000000000000000000000000000000000..e46eb2c0fab053ec0b8e2cd112f9a0010a438596
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaLore.js
@@ -0,0 +1,1199 @@
+App.Encyclopedia.addArticle("Lore", function() {
+ const f = new DocumentFragment();
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Future room for lore text", ["note"])], "p");
+ App.Events.addNode(f, ["Choose a more particular entry below:"], "div");
+ return f;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Money", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("Digital currencies have come a long way in the past twenty years. From the poorly managed, excessively ideological, incompetently run experiments whose failures inspired years of public skepticism, they have matured into a reliable means of exchange. The technical details are unimportant for all but students of economics, since broad diversification and clever design have made them reliable and stable means of exchange. With so many old world currencies collapsing, they are coming to dominate world commerce at last.");
+ r.toNode("div", ["note"]);
+
+ r.push(`The diversified bundle of assets that constitutes the unit of exchange that allows the Free Cities to function is commonly referred to as the "credit" and denoted in print by a ¤ symbol. It is unusually valuable for a basic monetary unit, but the extreme wealth concentration seen in most of the Free Cities makes this a feature rather than a flaw. Estimating its value is extremely difficult, since the value of goods and services varies wildly between Free Cities, and even more wildly between any given Free City and the surrounding old world.`);
+ r.toNode("p", ["note"]);
+
+ r.push("Direct comparisons of purchasing power across long gulfs of time are often unscientific. Such comparisons usually rely on indexing currencies to a good or a market basket of goods, ignoring the constant shifts in the value of goods and services throughout history. The best that a responsible economist can do for a historical value of the ¤ is to give a range. Depending on the index good, the 2037 ¤ can be argued to be worth anywhere between thirty and several hundred US dollars.");
+ r.toNode("p", ["note"]);
+
+ r.push(`— St. Croix, Marianne, "Digital Currencies: A Review,"`, App.UI.DOM.makeElement("span", "Journal of Economics, March 2037", ["note"]));
+ r.toNode("p", ["note"]);
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Food", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("An army marches on its stomach. Likewise, an arcology cannot function without sustenance.");
+ r.toNode("div", ["note"]);
+ r.push("Please expand this. I'm not good at writing lore. — DCoded");
+ r.toNode("div", ["note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Disease in the Free Cities", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("In light of some recent alarmism, it's time for the medical profession to clear the air about diseases.");
+ r.toNode("div", ["note"]);
+
+ r.push("Over the course of the 21st century, diseases and disease treatments have become more powerful, side by side. New disease vectors, antibiotic resistances, and even malicious engineering have combined to make infectious agents tougher. However, medicine has advanced as well, with distributed fabrication techniques and genetic sequencing making tailored drugs widely available to those with the resources to afford them.");
+ r.toNode("p", ["note"]);
+
+ r.push("This sounds like balance. In the old world, however, it looks like the bugs may be winning. Life expectancy is beginning to settle to pre-antibiotic levels. Meanwhile, in the Free Cities, medicine is", App.Encyclopedia.link("nymphomania:", "Nymphomania"), "better health care and the ubiquity of modern medicine have nearly eliminated disease as a day-to-day concern.");
+ r.toNode("p", ["note"]);
+
+ r.push("If you want simple advice, here it is: fuck your Free Cities slaves bareback, but wrap up if you visit the old world.");
+ r.toNode("p", ["note"]);
+
+ r.push("— Dodgson, Jane Elizabeth,", App.UI.DOM.makeElement("span", "FC Med Today, March 25, 2032", ["note"]));
+ r.toNode("p", ["note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Free Cities Justice", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("The Free Cities are not lawless.");
+ r.toNode("div", ["note"]);
+
+ r.push("The only law respected across all Cities is the enforcement of contracts. Some Cities have limited regulation of other areas, but in general, the only justice available comes when a contract has been breached.");
+ r.toNode("p", ["note"]);
+
+ r.push("Different Cities have taken different approaches to the obvious problem of dealing with criminal conduct, which in the old world breaks no traditional contract. The most common approach is to require everyone to sign contracts with the owners of their homes and workplaces to commit no crimes while there. In this way, what would be murder in the old world is a breach of the contract with one's landlord not to murder on his property.");
+ r.toNode("p", ["note"]);
+
+ r.push("Penalties for such conduct are usually left to the imagination of the property owner. With the traditional roles of judge, jury, and jailer concentrated into the hands of a single wealthy person, rich potentates of the Cities hold more personal power over their tenants than anyone since the great feudal lords seven centuries ago.");
+ r.toNode("p", ["note"]);
+
+ r.push("— Torstein, Jens Learned,", App.UI.DOM.makeElement("span", "The Modern Libertarian Paradise, March 25, 2032", ["note"]));
+ r.toNode("p", ["note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Modern Anal", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("The modern acceptance and frequency of heterosexual anal sex has only increased with the return of slavery.");
+ r.toNode("div", ["note"]);
+
+ r.push("There are numerous reasons for this. First and most obviously, the fact that many men now own women and can thus dictate sexual relations has popularized a sex act that has always appealed to many men. Second, the extremely libertine culture of the Free Cities has placed slaveowners in a perpetual contest with one another for sexual decadence; voluntarily //not// using a slave in all possible manners is considered unusual and even prudish. Third, the assignment of some persons born without natural vaginas to status as female sex slaves has served to make standard the use of the orifice that all slaves, regardless of biological particulars, share in common.");
+ r.toNode("p", ["note"]);
+
+ r.push("Finally, the development of the now-common slave diet has played a part. In addition to providing slaves with bland, featureless and mildly aphrodisiac nutrition, standard slave nutriment is a cleverly designed liquid diet that almost completely stops the normal digestive processes that might interfere with sex of this kind.");
+ r.toNode("p", ["note"]);
+
+ r.push("— Lawrence, W. G.,", App.UI.DOM.makeElement("span", "Guide to Modern Slavery, 2037 Edition", ["note"]));
+ r.toNode("p", ["note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Slave Couture", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("My name is Danni Diemen, and I'm here today to talk about your slaves' clothes.");
+ r.toNode("div", ["note"]);
+
+ r.push("Let's break it right down into categories, shall we?");
+ r.toNode("p", ["note"]);
+
+ r.push(App.UI.DOM.makeElement("span", "First, clothes for your disobedient bitches.", ["bold"]), "We must keep them uncomfortable, yes? The old reliable is slave clothes, sometimes referred to as straps. These give her that sex slave allure while keeping her nice and uncomfortable. You can also go for full coverage with latex. A suit of that will keep her totally reliant on your little whims. Plugs are nice sturdy leather affairs with inward-facing dildos for all the holes — and I do mean all. They're good stuff for breaking a bitch, and she might even learn to take dick a bit better! Word to the wise: not a good idea if you want those holes tight, though. Finally, corsets. These will make life tough, but that's good for a", App.Encyclopedia.link("rebellious", "From Rebellious to Devoted", "orangered"), "little cunt, no? And corseting might just narrow that waist. But never mind, on to my favorites.");
+ r.toNode("p", ["note"]);
+
+ r.push(App.UI.DOM.makeElement("span", "Second, nice attire for your prize stock.", ["bold"]), "These clothes will keep your good slaves happy. You know, women out in the old world still wear attractive lingerie UNDER clothing? Absurd. It's lovely on its own. If you're looking to be a bit more fun and a bit less classy, go for string lingerie instead. You could even let her choose her own slutty outfits; watching livestock dress itself is always good fun. When you can afford proper slutty jewelry, who needs clothes? I suggest accenting heavy piercings with this. For your hookah fanatics and decadent harem masters, there's sheer gauze. Makes even a clumsy girl look like she's dancing to a zither.");
+ r.toNode("p", ["note"]);
+
+ r.push("Finally, chastity belts. Hard to categorize. Different bitches react in different ways to having the front door locked. Depends on how much traffic goes in the back, I find.");
+ r.toNode("p", ["note"]);
+
+ r.push("— Van Diemen, D. C. G.,", App.UI.DOM.makeElement("span", "Free Cities Fashion (FCF), March 2032", ["note"]));
+ r.toNode("p", ["note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Slave Marriage", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("Marriage between slaves is one of the facets of slave culture that has varied the most between historical slave societies. Many forbade it entirely, considering it a source of sedition. Others permitted it, but accorded it little force of law. A few have offered it some limited protections even against the slaveowner's will.");
+ r.toNode("div", ["note"]);
+
+ r.push("Most Free Cities fall into the middle case. Many slaveowners find it amusing to permit their slaves to form and even formalize long term relationships. Slave wives are often permitted to live and work together, sharing a little room and enjoying some measure of sexual exclusivity. Of course, it is just as common for slave wives to be marketed together in brothels.");
+ r.toNode("p", ["note"]);
+
+ r.push("To date, none of the Free Cities has extended any real legal protection to slave marriages. There is nothing to stop a slaveowner from separating slave wives by sale.");
+ r.toNode("p", ["note"]);
+
+ r.push("— Lawrence, W. G.,", App.UI.DOM.makeElement("span", "Guide to Modern Slavery, 2037 Edition", ["note"]));
+ r.toNode("p", ["note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("The Ejaculate Market", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("Fun has a price.");
+ r.toNode("div", ["note"]);
+
+ r.push("Understanding this is the only way to understand some emerging markets in the Free Cities. This maxim often receives criticism from the uninformed, but all it means is that enjoyment is a good (or service) that can be bought and sold like any other. The market for exotic varieties of fun has never been more open than it is right now.");
+ r.toNode("p", ["note"]);
+
+ r.push("The forming market for ejaculate can only be understood in this context. In the old world, a thriving market for semen for insemination purposes has been thriving for a long while. In the Free Cities, however, homogenized ejaculate is now available in quantities and at prices that make it obvious that it's being put to other uses. Semen is nutritionally marginal; it has some cosmetic applications, but like every other natural cosmetic it has long since been eclipsed by artificial means. The only possible explanation is that many citizens of the Free Cities find various combinations of slaves and large volumes of ejaculate an amusing combination.");
+ r.toNode("p", ["note"]);
+
+ r.push("Anecdotes abound. Some slaveowners claim that using it as a dietary additive with the knowledge of their slaves enforces an extra layer of degradation and sexual servitude while habituating the unfortunates to oral sex.");
+ r.toNode("p", ["note"]);
+
+ r.push("— Editorial,", App.UI.DOM.makeElement("span", "FC Daily Economic Report, October 13, 2031", ["note"]));
+ r.toNode("p", ["note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Gingering", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("Like much of the traditional husbandry terminology, 'gingering' is a term whose meaning in the Free Cities is slowly diverging from its original old world definition. In animal husbandry, especially of horses, gingering is the nearly extinct practice of placing an irritant compound (traditionally ginger, hence the term) inside one of the animal's orifices, typically the anus, in order to make the animal step high, be sprightly, and generally behave energetically due to the discomfort. Though it was sometimes used at shows and competitions, the usual application was to make the animal seem more valuable for sale.");
+ r.toNode("div", ["note"]);
+
+ r.push("In the Free Cities, 'gingering' is coming to mean any drugging or other temporary adulteration of a slave in order to make her seem more valuable. For poorly broken slaves, stimulants and depressants are both common. These can be applied to make a resistant slave seem less", App.Encyclopedia.link("rebellious,", "From Rebellious to Devoted", "hotpink"), "or a terrified slave more", App.Encyclopedia.link("trusting,", "Trust", "mediumaquamarine"), "though of course this is unreliable.");
+ r.toNode("p", ["note"]);
+
+ r.push("More traditional gingering is also sometimes applied. Many new slaves will naturally present their buttocks if an anal irritant is administered in an attempt to relieve the uncomfortable area. Novices to the slave markets may mistake this for sexual promiscuity, though few experienced brokers are likely to be misled, a clue as to why few experienced brokers seriously oppose gingering.");
+ r.toNode("p", ["note"]);
+
+ r.push("Some markets attempt to stamp out the practice, but most do not. It is generally accepted as permissible gamesmanship on the part of slave vendors, part of the natural skirmishing between buyers and sellers. In some areas it may even be considered lazy and even offensive for a seller to not doctor his human wares: it denies the buyer an opportunity to exercise his acumen in discovering what has been administered, and might even indicate that the seller is not making an effort in more important areas, too. Finally, many in the Free Cities might ask what proper slave dealer would willingly forgo the amusing sight of a girl bouncing with discomfort because someone has just roughly inserted a finger coated with ginger oil into her rectum.");
+ r.toNode("p", ["note"]);
+
+ r.push("— Lawrence, W. G.,", App.UI.DOM.makeElement("span", "Guide to Modern Slavery, 2037 Edition", ["note"]));
+ r.toNode("p", ["note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Dyes", function() {
+ const approvedDyes = ["blazing red", "neon green", "neon blue", "neon pink", "platinum blonde", "dark brown", "brown", "auburn", "black", "blonde", "blue", "burgundy", "chestnut", "chocolate", "copper", "ginger", "golden", "green", "grey", "hazel", "pink", "red", "blue-violet", "purple", "dark orchid", "sea green", "green-yellow", "dark blue", "jet black", "silver"];
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push(`Fantastic news for every fashion oriented citizen and slaveowner: Your slave's hair color must no longer be exclusively chosen by one the bland authority-approved colors: ${toSentence(approvedDyes)}.`);
+ r.toNode("div", ["note"]);
+
+ r.push(`Today, we are proud to announce that our, the Free Cities Dyes Department, Research and Development team, found 140 new and exciting ways to color your slave's capital hair. The <a target="_blank" href="https://www.w3schools.com/colors/colors_names.asp">extensive list</a> with the names of all the available colors will be made available to the public, soon.`);
+ r.toNode("p", ["note"]);
+
+ r.push(`Please be aware, when you place your order on a custom dye, your description should be precise. Preparing, mixing and shipping is a fully automated process. You may put spaces into the color name. For example, "dark violet" will be handled as "darkviolet". Be sure to put the desired color at the beginning of your description. "Dark violet with silver highlights" is a solid description. Avoid anything too exotic or convoluted. With a description like "weird-ass color with a reddish tint", you will probably end up with red hair. Our guesswork is only so good.`);
+ r.toNode("p", ["note"]);
+
+ r.push("We hope to extend the applicability to body hair and even skin in the near future, too.");
+ r.toNode("p", ["note"]);
+
+ r.push(`- Free Cities Dyes Department R&D, "Announcing exciting Dyes of the Future,"`, App.UI.DOM.makeElement("span", "Press Conference, January 7th 2037", ["note"]));
+ r.toNode("p", ["note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("The New Rome", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push(App.UI.DOM.makeElement("span", "SCFC", ["note"]));
+ r.toNode("div", ["note"]);
+ App.Events.addNode(t, [`— Free Cities armor pauldron inscription; "Slaveholders and Citizens of the Free Cities"`], "div", ["note"]);
+
+ r.push("In the Free Cities, Rome is come again.");
+ r.toNode("p", ["note"]);
+
+ r.push("No people before or since have influenced modern society so deeply as the Romans. The Free Cities are, in return, emulating the Romans more deeply than any other society since their time. Based on the writings, great and low, that have come down to us from that innovative, grasping, and deeply licentious people, it seems that the Romans would likely approve of their posterity.");
+ r.toNode("p", ["note"]);
+
+ r.push("Fine historical parallels are probably lost on the person with XY chromosomes who is brought to the Free Cities, enslaved, treated thenceforth as female, and expected to behave as female on pain of severe punishment (sometimes with gender reassignment surgery to match, but often without). This redefinition of gender is common in the Free Cities: being penetrated makes one female, while penetrating makes one male. It almost certainly arose as a way for citizens to partake in all that a slave society has to offer, sexually, without reconsidering their own sexual identity. It is not identical to Roman sexual mores, but the Romans are the closest precedent.");
+ r.toNode("p", ["note"]);
+
+ r.push("This new and evolving system of sexual values does not free citizens from all expectations. Quite to the contrary, many find it just as restrictive as old world values, although differently so. For example, a naturally heterosexual female arcology owner who indulges in vanilla sex with masculine slaves will typically find her strength and acumen being questioned for no other reason than that she permits slaves to penetrate her.");
+ r.toNode("p", ["note"]);
+ App.Events.addNode(t, ["— Lawrence, J. K., and Bolingbroke, D. S.,", App.UI.DOM.makeElement("span", "Trends in Free Cities Culture, 2031", ["underline"]), App.UI.DOM.makeElement("span", "Journal of Modern Social Sciences, International Edition, February 2032", ["note"])], "p", ["note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("The Return of Feudalism", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("By the Powers invested in me by the Board of Directors and the Rightful Executive Lord of Arcology F-8, His Majesty King William the First, I proclaim you a Knight, and grant you the right to two slaves, a monthly stipend of six hundred credits and one unit of stock in the Arcology, and the authority to bear a noble Coat of Arms...");
+ r.toNode("div", ["note"]);
+ App.Events.addNode(t, [App.UI.DOM.makeElement("span", "— Count Felix II von Feight, Knighthood Ceremony recorded in 2032", ["note"])], "div", ["indent"]);
+
+ r.push("Once thought to have been a relic of an ancient, less enlightened time, the simultaneously decentralized and individual-focused corporate power structures of the Free Cities has led to the return of feudal power structures. For many arcologies, this has simply occurred without attention or fanfare, as increasingly serf-like underclasses accept the domination of ever-more-powerful executives and elites; some arcologies, such as F-8, have manifested entire, complex new social systems involving 'Kings' and 'Emperors' from which all corporate authority flows.");
+ r.toNode("div", ["note"]);
+
+ r.push("Originally the idea of an individual crowning himself absolute 'Emperor' of a free city seemed absurd, or even totalitarian, and the first Free City petty kings were met with mockery. This mocking tone appears to have quickly faded from popular Free Cities culture, however, likely due to the realization that new 'Imperial' power structures came with a host of benefits to the wealthy and elite of the arcology that adopts them.");
+ r.toNode("div", ["note"]);
+
+ r.push("More than simply being rich, the elites of Neo-Feudal, or Neo-Imperial arcologies dub themselves 'Barons' and 'Counts', putting themselves not only monetarily but also socially above the common masses and giving those who hold seats on boards of directors or invest stock in the arcology a physical advantage over their benighted underlings. To the common citizen, the result is ultimately the same, as a factory worker remains a peasant whether he's known as a serf or a citizen. But to the wealthy and distinct within the arcology, the new Feudalism creates a long list of titles and accomplishments to jockey for, manifesting a strange new culture in which junior executives compete with one another for the attention of outright 'Kings' in the hope of one day acquiring the limitless prestige felt by the select caste of neo-Imperial nobility.");
+ r.toNode("div", ["note"]);
+
+ App.Events.addNode(t, ["— Lawrence, J. K., and Bolingbroke, D. S.,", App.UI.DOM.makeElement("span", "Trends in Free Cities Culture, 2031", ["underline"]), App.UI.DOM.makeElement("span", "Journal of Modern Social Sciences, International Edition, February 2032", ["note"])], "div", ["note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Naked, Barefoot, and Pregnant", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("...and helpless, and illiterate, and dependent...");
+ r.toNode("div", ["note"]);
+ App.Events.addNode(t, ["— Anonymous slaveowner, on the ideal woman"], "div", ["indent", "note"]);
+
+ r.push("It must be admitted that some of the boldest statements of early 21st century social justice advocates are now receiving some justification in the Free Cities. A tourist visiting some of the more notorious arcologies is given a public, in-person lesson in precisely what some men are willing to do with women they own. For every misogynist credo there is a Free Cities slaveowner putting it into practice.");
+ r.toNode("p", ["note"]);
+
+ r.push("Recent reactionism spawned by 20th century social movements pales in comparison to traditionalism, however. Reactionaries of the early 21st century may have breathlessly taken some extreme positions, but for a return to traditional values, true traditionalists have proven themselves to be the unquestioned masters. There are certainly arcologies in which no free women are permitted. The authors recommend that anyone inclined to hold such arcologies up as the extreme by which all others are to be judged should first visit one of the few arcologies in which no free women are permitted,", App.UI.DOM.makeElement("span", "and", ["note"]), "no contraceptives of any kind are permitted, either.");
+ r.toNode("p", ["note"]);
+ App.Events.addNode(t, ["— Lawrence, J. K., and Bolingbroke, D. S.,", App.UI.DOM.makeElement("span", "Trends in Free Cities Culture, 2031", ["underline"]), App.UI.DOM.makeElement("span", "Journal of Modern Social Sciences, International Edition, February 2032", ["note"])], "p", ["indent", "note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("The Sons of Sekhmet", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("Bhalwi al-sham asmik qalbik, abna Sakhmat damkun. (By the Sun I grasp your Heart, the Sons of Sekhmet have your Blood.)");
+ r.toNode("div", ["note"]);
+ App.Events.addNode(t, ["— Mantra, unknown author"], "div", ["indent", "note"]);
+
+ r.push(`Described as the "logical continuation of terrorism within the new world" by a prominent arcology owner, The Sons of Sekhmet are a global terrorist organization notorious for its viciousness and worldwide strike capacity. Formed in 2018 by Quati ibn Malek, the leader of a relatively minor sect of cat worshippers within Egypt, the Sons gained notoriety for seizing one of the first arcology clusters in the Sahara Desert and defending it from multiple incursions by old world peacekeeping forces. Ibn Malek was successfully assassinated by the Egyptian government in 2024, but the Sons have been resilient to being dislodged from their desert stronghold, and have used the resources of an arcology cluster to expand their presence and doctrine onto the global stage.`);
+ r.toNode("p", ["note"]);
+
+ r.push(`Their use of cell tactics and frequent insurgent action against arcology owners has led to comparisons with the Daughters of Liberty, but this is a misguided comparison. Where the Daughters are an ideologically-motivated anti-slavery organization, the Sons long ago cast off their ideological roots to adopt a brutal, pragmatic approach to terrorism with few considerations other than the expansion of their own power; Sekhmet cells frequently use slaves as foot soldiers and suicide bombers, but their primary approach to recruitment is with the poor and downtrodden of arcologies and old world nations. Basic Sons doctrine holds that the Old World was destroyed by wealthy, hedonistic plutocrats who have fled their failed nations to the arcologies to live out lives of decadence as the world they shattered collapses, leaving the "common people" to starve in their wake. This simple mantra attracts disgruntled individuals from around the world, and the Sons maintain an extremely online presence, with underground cells active in nearly every old world nation.`);
+ r.toNode("p", ["note"]);
+
+ r.push("The capability of the Sons to provide manufactured weaponry and training, and their willingness to do so to anyone willing to pledge their life to the Orange Sun, makes them exceptionally dangerous. The Sons seize any possible opportunity to expand their wealth and power, and frequently launch assassination attempts on prominent public figures, sabotage essential facilities, and attempt to stir chaos and unrest in vulnerable regions, often with the intent of stepping in and seizing power for themselves once the area has been sufficiently destabilized. Unlike many smaller-scale terrorist groups, the Sons produce some of the best-trained killers and thugs in the New World, and are almost completely out of the reach of old world nations and arcology owners alike in their scorching desert arcology. Any responsible arcology owner should be aware of the orange sun used as the logo of the Sons of Sekhmet and take care to not expose themselves to any weakness.");
+ r.toNode("p", ["note"]);
+ App.Events.addNode(t, ["— Lawrence, J. K., and Bolingbroke, D. S.,", App.UI.DOM.makeElement("span", "Trends in Free Cities Culture, 2031", ["underline"]), App.UI.DOM.makeElement("span", "Journal of Modern Social Sciences, International Edition, February 2032", ["note"])], "p", ["indent", "note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("The Top", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("The Master never beats me half as hard as the Head Girl. She fucks me harder, too.");
+ r.toNode("div", ["note"]);
+ App.Events.addNode(t, ["— Anonymous slave"], "div", ["indent", "note"]);
+
+ r.push("The safest slave society is a stratified slave society. Innovative Free Cities slaveowners are carefully differentiating their chattel, ensuring that favored slaves are interposed between them and the masses of their lesser stock. This is one of the oldest principles of leadership, ensuring that the grind of day-to-day direction and correction comes from subordinate leaders, while rewards and planning come from the top. The addition of sexuality to this model simply means that many Free Cities slaves get it, so to speak, from both ends.");
+ r.toNode("p", ["note"]);
+
+ r.push("There can be great advantages for talented and hardworking slaves. Out in the old world, crime, war, natural disasters, and simple crushing want often strike with little distinction based on", App.UI.DOM.makeElement("span", "intelligence", ["cyan"]), "skill, or strength. A truly excellent individual serving in a well-thought-out arcology can rise to a position of considerable", App.Encyclopedia.link("trust", "Trust", "mediumaquamarine"), "and power on her merits. It would be foolish to over-romanticize the reality of slavery, however, for all that advancement rests entirely on the whim of her owner. Talent can count for little for girls unlucky enough to find themselves owned by a capricious master.");
+ r.toNode("p", ["note"]);
+ App.Events.addNode(t, ["— Lawrence, J. K., and Bolingbroke, D. S.,", App.UI.DOM.makeElement("span", "Trends in Free Cities Culture, 2031", ["underline"]), App.UI.DOM.makeElement("span", "Journal of Modern Social Sciences, International Edition, February 2032", ["note"])], "p", ["indent", "note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("The Bottom", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("Public servant today, whore tomorrow, glory hole bitch next month.");
+ r.toNode("div", ["note"]);
+ App.Events.addNode(t, ["— Anonymous slave"], "div", ["indent", "note"]);
+
+ r.push("Slaves at the top of the Free Cities hierarchy enjoy a standard of life far above the average free citizen of the old world. However, slaves at the bottom do not. As the Free Cities redefine what it means to be human, they can be extraordinarily callous to those people who are excluded from the new rubric.");
+ r.toNode("p", ["note"]);
+
+ r.push("Free Cities glory holes are perhaps the ultimate expression of the dark side of modern slavery. In the old world, glory holes were mostly a sexual fantasy, and were confined to certain sexual subcultures where they did exist in reality. Free Cities glory holes are different both in that they exist, and are indeed very common; and in that their occupants are almost never present voluntarily.");
+ r.toNode("p", ["note"]);
+
+ r.push("Glory holes and slave brothels have a symbiotic existence, and any Free Cities slaveholder who owns a brothel full of pampered prostitutes who claims moral ascendancy for not owning an arcade is ignoring realities. In truth, all slave brothels benefit from the existence of arcades. After all, every slave whore in the Free Cities knows that if she does not perform up to her Master's standards, the arcades exist as a way of extracting value from her body. Every slave brothel receives better efforts out of its slaves due to their knowledge that a worse alternative is always available — if not with their current master, then with some other.");
+ r.toNode("p", ["note"]);
+ App.Events.addNode(t, ["— Lawrence, J. K., and Bolingbroke, D. S.,", App.UI.DOM.makeElement("span", "Trends in Free Cities Culture, 2031", ["underline"]), App.UI.DOM.makeElement("span", "Journal of Modern Social Sciences, International Edition, February 2032", ["note"])], "p", ["indent", "note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("The Purity of the Human Form", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("Twentieth century eugenicists weren't wrong, they just didn't have the tools to be right.");
+ r.toNode("div", ["note"]);
+ App.Events.addNode(t, ["— Anonymous"], "div", ["indent", "note"]);
+
+ r.push("High quality Free Cities slaves are remarkably healthy. It should be unsurprising that a population of humans selected for beauty, fed perfectly, required to exercise, given modern medical care, and prevented from indulging any non-sexual excess at all, has become quite impressive in this regard. The cultural fallout of this has been less easy to predict.");
+ r.toNode("p", ["note"]);
+
+ r.push("Throughout the early part of the 21st century a wide spectra of movements were taking place that have informed the Free Cities ideology of body purism. The left-wing counterculture health movement has found much open ground in a society that allows its adherents to totally control what goes into the bodies of some of its members. On the opposite side of the spectrum, some long-standing reactionary groups have taken this opportunity to experiment with some of their non-racial theories on purity. Finally, many religious or simply moral fundamentalists who believe in some form of purity code now have a captive population to subject to their whims.");
+ r.toNode("p", ["note"]);
+
+ r.push("Thousands of unintentional experiments on what really makes the ideal human are now under way in the Free Cities, and whatever the balance of humanity may feel about their morality, it is hard to deny that we as a whole stand to benefit from the experimentation.");
+ r.toNode("p", ["note"]);
+ App.Events.addNode(t, ["— Lawrence, J. K., and Bolingbroke, D. S.,", App.UI.DOM.makeElement("span", "Trends in Free Cities Culture, 2031", ["underline"]), App.UI.DOM.makeElement("span", "Journal of Modern Social Sciences, International Edition, February 2032", ["note"])], "p", ["indent", "note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("A World Built on Implants", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("The earlier a slave gets on advanced growth hormones, the better. After all, good-looking implants are a ratio game. The bigger a girl's natural tits are, the bigger implants she can get without looking ridiculous.");
+ r.toNode("div", ["note"]);
+ App.Events.addNode(t, ["— standard Free Cities surgical advice"], "div", ["indent", "note"]);
+
+ r.push("One of the most furious ideological divides in the Free Cities is over implants. Most Free Cities arcologies display a mix of slaves with breast and other implants, but some follow the tastes of owners who strongly prefer all-natural slaves, and some fetishize expansionism to the point of near-universal implantation. This can be a remarkably bitter controversy in places, and should Free Cities culture continue to develop, it is not unlikely that some day physical violence may take place in the Free Cities between extremists on opposite sides of the implant debate.");
+ r.toNode("p", ["note"]);
+
+ r.push("In any case, the medical technology of implantation has not advanced hugely since the start of the 21st century. The vast majority of implants are still either water-bag or silicone, with silicone generally preferred for its better, more realistic feel. At the more extreme sizes, a variety of fluid-based designs are used, with polypropylene string implants making a return, and newer, fillable adaptive implants becoming more common.");
+ r.toNode("p", ["note"]);
+ App.Events.addNode(t, ["— Lawrence, J. K., and Bolingbroke, D. S.,", App.UI.DOM.makeElement("span", "Trends in Free Cities Culture, 2031", ["underline"]), App.UI.DOM.makeElement("span", "Journal of Modern Social Sciences, International Edition, February 2032", ["note"])], "p", ["indent", "note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Slaves as Stock", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("Here we have a fine piece for the dairy folks");
+ r.toNode("div", ["note"]);
+ r.push("Fine dairy cow for you here ladies and ge-entlemen");
+ r.toNode("div", ["note"]);
+ r.push("Who'll give me ten thousand ¤?");
+ r.toNode("div", ["note"]);
+ r.push("Ten thousand ¤ bid, now ten thousand five,");
+ r.toNode("div", ["note"]);
+ r.push("Now ten thousand five, will you give me eleven?");
+ r.toNode("div", ["note"]);
+ r.push("Thirty-two years old, nipples the size of silver dollars");
+ r.toNode("div", ["note"]);
+ r.push("Eleven thousand ¤ bid, eleven, eleven?");
+ App.Events.addNode(t, ["— Free Cities auctioneer"], "div", ["indent", "note"]);
+
+ r.push("At different points in the history of slavery, slaves have been nearly equal to or even in some cases superior to the lowest classes of free citizen, and have been nearly as low as or even lower than the most valuable categories of animal livestock. Which will become the Free Cities norm remains to be seen; there are arcologies that exemplify either approach. A few arcologies apply both standards, and standards in between, all at once.");
+ r.toNode("p", ["note"]);
+
+ r.push("The present, however, is a time of great supply in the slave market. The social collapse of many societies in the old world and the perpetual conflicts in many areas are producing an immense number of captives for sale, keeping prices at historically low levels. Many slaveowners treat their chattel relatively well, but this comes from motivations other than financial necessity. With no laws requiring it and no economic reason to treat slaves as different from livestock, many citizens of the Free Cities see little reason to make a distinction. Spectacular expressions of this callousness, like the restraint of women for use as milk production devices or the usage of dangerous dosages of growth hormones, become more understandable when one realizes that the Free Cities are refining what was once a settled idea: what it means to be human.");
+ r.toNode("p", ["note"]);
+ App.Events.addNode(t, ["— Lawrence, J. K., and Bolingbroke, D. S.,", App.UI.DOM.makeElement("span", "Trends in Free Cities Culture, 2031", ["underline"]), App.UI.DOM.makeElement("span", "Journal of Modern Social Sciences, International Edition, February 2032", ["note"])], "p", ["indent", "note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Slavery and the Physical Ideal", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("Quoth BRODIN:");
+ r.toNode("div", ["note"]);
+ r.push("All must lift.");
+ r.toNode("div", ["note"]);
+ App.Events.addNode(t, ["— Anonymous"], "div", ["indent", "note"]);
+
+ r.push("The medical impacts of the widespread reintroduction of slavery are not at all what might have been predicted twenty years ago. Medicine is not our primary focus in this review of Free Cities cultural trends, but a brief look at the striking medical outcomes is critical to understanding some of the social currents at work. By the second half of the twentieth century, the majority of humanity had reached a state of plenty so great that the health dangers of excess were greater than the health dangers of want.");
+ r.toNode("p", ["note"]);
+
+ r.push("For the first time in modern memory, people — slaves — in the Free Cities are, in large numbers, doing exactly what their doctors recommend. Properly managed slaves eat right, exercise regularly, and do not smoke, drink, or do recreational drugs. These simple but revolutionary changes mean that the more valuable classes of slave are healthier, on average, than any group of human beings has ever been.");
+ r.toNode("p", ["note"]);
+
+ r.push("Naturally, fetishism, competitiveness, and leisure have intersected to create in the Free Cities a constant escalation of physical one-upmanship when it comes to the training of slaves. Wonderfully muscled specimens have become very common, with feats of athletic prowess cited alongside sexual accomplishments without any distinction. The arcology owners most", App.Encyclopedia.link("devoted", "From Rebellious to Devoted", "hotpink"), "to the human form are creating societies of uniform physical perfection unlike anything in human history.");
+ r.toNode("p", ["note"]);
+ App.Events.addNode(t, ["— Lawrence, J. K., and Bolingbroke, D. S.,", App.UI.DOM.makeElement("span", "Trends in Free Cities Culture, 2031", ["underline"]), App.UI.DOM.makeElement("span", "Journal of Modern Social Sciences, International Edition, February 2032", ["note"])], "p", ["indent", "note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Faith in the Free Cities", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("I recognize my faults;");
+ r.toNode("div", ["note"]);
+ r.push("I am always conscious of my sins.");
+ r.toNode("div", ["note"]);
+ r.push("I have sinned against you, Master and God,");
+ r.toNode("div", ["note"]);
+ r.push("And done what you consider evil.");
+ r.toNode("div", ["note"]);
+ r.push("So you are right in judging me;");
+ r.toNode("div", ["note"]);
+ r.push("You are justified in condemning me.");
+ r.toNode("div", ["note"]);
+ App.Events.addNode(t, ["— Anonymous slave, 2030"], "div", ["indent", "note"]);
+
+ r.push("There are almost as many approaches to faith in the Free Cities as there are arcologies. For every arcology owner who cynically exploits religion, there is another who truly believes himself to be ordained by God as master of his fellow human beings. Nevertheless, common elements are identifiable. The most notorious arise from literal readings of scriptural passages that reference slavery.");
+ r.toNode("p", ["note"]);
+
+ r.push("Each of the three major monotheistic religions arose in a time and place where slavery was common. Thus the institution appears in all three of the great monotheistic holy books. It is childishly simple to find all the scriptural support for a reintroduction of slavery even the most illiberal arcology owner could desire in any one of these. This is presumably not what religious conservatives of the late 20th and early 21st centuries intended when advocating scriptural literalism.");
+ r.toNode("p", ["note"]);
+ App.Events.addNode(t, ["— Lawrence, J. K., and Bolingbroke, D. S.,", App.UI.DOM.makeElement("span", "Trends in Free Cities Culture, 2031", ["underline"]), App.UI.DOM.makeElement("span", "Journal of Modern Social Sciences, International Edition, February 2032", ["note"])], "p", ["indent", "note"]);
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Slave Whore, Arcology K-2", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("Interview with a slave whore");
+ r.toNode("div");
+ r.push(`"The Rose Petal," Arcology K-2, April 21, 2036`);
+ r.toNode("div");
+
+ r.push("Good afternoon. What's your name?");
+ r.toNode("p", ["note"]);
+ r.push("Um, what? Are, um, you going to fuck me? I mean, whatever you want to do is okay.");
+ r.toNode("div");
+
+ r.push("I'd like to learn more about you.");
+ r.toNode("p", ["note"]);
+ r.push("Um, okay. My name is Candace Ass, I'm twenty years old, and I'm one of the slave whores here at the Petal. Um, what else?");
+ r.toNode("div");
+
+ r.push("How did you become a slave? Tell me about how you got here.");
+ r.toNode("p", ["note"]);
+ r.push("Sure. Well, uh, it's kind of boring. I was at a club, and I guess someone put something in my drink, and I passed out, and well [laughs nervously] here I am, I guess?");
+ r.toNode("div");
+
+ r.push("What happened when you woke up?");
+ r.toNode("p", ["note"]);
+ r.push("Oh, like, you want me to tell you my life story?");
+ r.toNode("div");
+
+ r.push("Sure.");
+ r.toNode("p", ["note"]);
+ r.push("Would it be okay if you fucked me while I tell you? I, uh, can't really think right now. I guess I could also suck — but then I wouldn't be able to talk? Here, please, please stick — oh, okay. Okay! Uh. Yeah. [giggles] That feels better. Thanks!");
+ r.toNode("div");
+
+ r.push("Why couldn't you talk without being fucked?");
+ r.toNode("p", ["note"]);
+ r.push("Well, we're all really horny. I'm really horny. Everything does it. The hormones, and all the training, and the drugs, and it's also kind of a habit, you know? It's been almost an hour! If you do it slow like that I'll be okay. [giggles] Yeah. Thank you!");
+ r.toNode("div");
+
+ r.push("You can touch yourself if it helps you think more clearly.");
+ r.toNode("p", ["note"]);
+ r.push("Oh thanks but, um, no. That's okay. It's actually really sensitive. Like, um, nobody touches it? And we're not allowed to do that alone anyway. So this is, um, good for me. I'm used to it, I get off like this a lot. If you do it much harder I'll cum, but if you just do it like that, I'll edge for a while. Um, so we can talk? Is that what you wanted?");
+ r.toNode("div");
+
+ r.push("You were telling me about being enslaved.");
+ r.toNode("p", ["note"]);
+ r.push("Well, I woke up with a guy on top of me. Kind of like now! But, like, he was really pounding me. It kind of hurt, but I was still really drugged. And I was already on the slave drugs too. And then they put me through a bunch of tests and stuff. That first buttfuck wasn't really a test, it was just a slaver using me. All the new girls get used. But later they tested me a lot, and showed me a bunch of porn and stuff. I think it was to see what I liked. Then they put me in a little room, like a cell, and kept me there for a while.");
+ r.toNode("div");
+
+ r.push("How long were you there?");
+ r.toNode("p", ["note"]);
+ r.push("I don't really know? All I really did was sleep. It's what happens when you're getting a lot of drugs and need curatives to keep them from hurting you. You just sleep a lot. And when you're awake, you're really groggy and can't remember much. It makes it easier.");
+ r.toNode("div");
+
+ r.push("It makes what easier?");
+ r.toNode("p", ["note"]);
+ r.push("Being raped. I mean, um, that was before I was trained a lot? So I didn't like it most of the time guys fucked me in the ass. But I just laid there and let it happen mostly. I heard from girls later that the slave market I was at uses that as a test, actually.");
+ r.toNode("div");
+
+ r.push("A test of what?");
+ r.toNode("p", ["note"]);
+ r.push("Well if a new girl is all drugged up and, you know, gets hard and cums when they fuck her, she gets special treatment. A girl they caught with me, I think she came the first day, and she's, like, a Concubine now? But if a girl still fights on all the drugs they put her in the arcade. Most just lie there like me, which means they need better hormones. So then they clip you.");
+ r.toNode("div");
+
+ r.push("Perform an orchiectomy, you mean?");
+ r.toNode("p", ["note"]);
+ r.push("Yeah, cut your balls off. [giggles] I don't remember. I just noticed one day that I was really soft and they were gone. And then I started getting really soft and growing better boobs, and the slavers who came in and used me seemed cuter. I asked one of he wanted a blowjob, and then they took me out and trained me a little.");
+ r.toNode("div");
+
+ r.push("Sexual training?");
+ r.toNode("p", ["note"]);
+ r.push("No, no, just obedience and stuff. I mean, they trained me by making me suck cock and bend over and take it up the butt, but no, like, sex classes. But still mostly sleeping. It's like, I would wake up being fucked, and when the guy was done and had injected whatever into me and made me follow a few commands, I'd go shower and then go back to bed again. Weeks and weeks like that, and then some surgeries.");
+ r.toNode("div");
+
+ r.push("What surgeries have you had?");
+ r.toNode("p", ["note"]);
+ r.push("Lots! [giggles] Um, lip implants. [kissing noise] Obviously. And some little face stuff, like, bone stuff on my jaw and cheekbones. They did something to my throat, and after not letting me talk for a week my voice was high like it is now. Shoulders and hips, more bone stuff. Those hurt, I slept for like a week after each and they left me alone. Butt implants. And boobs, like, obviously. Three times, bigger each time. If they give you the big kind right away you get stretch marks and it's ugly. They say they're going to do it at least once more, so they're bigger than my head. [giggles]");
+ r.toNode("div");
+
+ r.push("When did you move to the brothel?");
+ r.toNode("p", ["note"]);
+ r.push("Well Mistress bought me! I think they decided I was ready to be sold when I started asking for sex. They fuck you regularly, like, it's on a schedule? To get you into the habit, and also to get your asshole used to being a fuckhole. And I started wanting it more than the schedule, and cumming almost every time. So they sold me. Mistress kept me for a week, and then sent me down to the brothel.");
+ r.toNode("div");
+
+ r.push("What was that week like?");
+ r.toNode("p", ["note"]);
+ r.push("Um, I'm not supposed to talk about that? But, um, she fucked me, of course. That's not a big secret. Most sex slaves on the drugs and the training and stuff need sex, like, a lot. So if we're serving only one person, we have to beg. It's nice working here, I don't have to beg much. Oh! And that's also when Mistress picked my name and style. Since my skin is so pale, and my asshole bleached to pink, I'm pink! Pink hair, pink lips, pink nails, pink collar, pink heels, pink asspussy. Candy Ass!");
+ r.toNode("div");
+
+ r.push("How long have you been here?");
+ r.toNode("p", ["note"]);
+ r.push("Well, ever since Mistress sent me here! So like a year?");
+ r.toNode("div");
+
+ r.push("Do you know what you'll be doing in the future?");
+ r.toNode("p", ["note"]);
+ r.push("Um what? Working here I guess? I don't understand.");
+ r.toNode("div");
+
+ r.push("How long do you think you'll be here?");
+ r.toNode("p", ["note"]);
+ r.push("Well I guess the oldest girl here is around forty? [giggles] She's nice, I like her. She has these huge soft boobs, and her milk is really nice. So I'm twenty, so twenty years I guess?");
+ r.toNode("div");
+
+ r.push("How many customers do you see a day?");
+ r.toNode("p", ["note"]);
+ r.push("It depends, like, it depends on what they want? Like a long fuck or something weird like you, it takes a while, but most just want me to suck them off or take their cock up my butthole. Fifteen maybe?");
+ r.toNode("div");
+
+ r.push("That means you're going to have sex in this brothel more than 100,000 times.");
+ r.toNode("p", ["note"]);
+ r.push("The way you say that make it sound like a lot. Oh! Oh, uh, you want me to -");
+ r.toNode("div");
+
+ r.push("Be quiet, slave.");
+ r.toNode("p", ["note"]);
+
+ r.push("— Lawrence, W. G.,", App.UI.DOM.makeElement("span", "Guide to Modern Slavery, 2037 Edition", ["note"]));
+ r.toNode("p");
+ r.push("Appendix A, Interviews");
+ r.toNode("div");
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Slave Acolyte, Arcology V-7", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("Interview with a Chattel Religionist acolyte");
+ r.toNode("div");
+ r.push("Main plaza, Arcology V-7, April 28, 2036");
+ r.toNode("div");
+ r.push("Good morning, honored visitor! I'm Patience; how may I serve you?");
+ r.toNode("p");
+
+ r.push(App.UI.DOM.makeElement("span", "Good morning. What do you do here?", ["note"]));
+ r.toNode("div");
+ r.push("Why, I am an acolyte of the Prophet! I have the ordained and undeserved glory of being one of his slaves. I do my unworthy best to do whatever he in his infinite wisdom commands me. Today I am a public servant on the plaza, and it is my duty and pleasure to greet visitors to his arcology, Sir, and to serve them in whatever way I can.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "You seem very enthusiastic.", ["note"]));
+ r.toNode("div");
+ r.push("Oh thank you Sir! The Prophet says that the best slave is beautiful and cheerful, but if a slave cannot be both, it is much better for her to be cheerful. [laughs] So I do my best to be cheerful. May I ask what brings you to his arcology, Sir?");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "You may. I travel from arcology to arcology. A tourist, you might say. And I write about what I find.", ["note"]));
+ r.toNode("div");
+ r.push("That's wonderful! I'd be happy to share anything with you, anything at all. The Prophet says that all slavery is holy, but Sir, I think his arcology must be more holy than most. And the Prophet says that acolytes are to always be honest, for the holy have nothing to hide.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "I see that.", ["note"]));
+ r.toNode("div");
+ r.push("[laughs] My habit, you mean? You must be joking, Sir! It covers most of me.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Tell me about it.", ["note"]));
+ r.toNode("div");
+ r.push("With pleasure, Sir. It is white, because all sex slaves are pure. It covers my head and my shoulders but leaves my face bare so that everyone may see me smile. My breasts are bare because, the Prophet says, they are especially holy things, beautiful, and sexual, and nourishing. They must also be bare so that all can see how they are pure and unspoiled by false implants. My belly is bare to show that I have the very great honor of carrying new slaves for the Prophet. I have a golden belt with a strip of cloth in front and behind, because the Prophet says that sometimes, the imagined sight of a slave's holes are as beautiful as the true sight of them.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "You must be carrying twins.", ["note"]));
+ r.toNode("div");
+ r.push("Yes, Sir, twins. I hope very much to be blessed with triplets next time.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Are they the Prophet's?", ["note"]));
+ r.toNode("div");
+ r.push("[laughs] Oh, no, Sir! I am just an unworthy old acolyte, not one of the Prophet's wives. I was blessed with the seed of one of the Prophet's breeding girls, much better seed than I deserve. She is young and very beautiful, much more beautiful than me, and many acolytes receive her seed so they can make beautiful new slaves.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Between your pregnancy and your breasts, doesn't standing out here on the plaza tire you out?", ["note"]));
+ r.toNode("div");
+ r.push("No, Sir. Look here, Sir; [turns sideways] a good acolyte has strong legs, and I exercise twice a day. We must be strong to bear new slaves, work hard, and give pleasure without tiring. I can serve you standing, Sir, even like this. May I show you?");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Perhaps later. You seem proud of your body.", ["note"]));
+ r.toNode("div");
+ r.push("I am! The Prophet says that a holy slave may certainly be proud of the way in which she serves. I am not beautiful and I am not young, but I am healthy and strong and I am proud of that. I am blessed to be in an arcology where I can take pride in such things.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "What do you do when you are not being bred or serving in public?", ["note"]));
+ r.toNode("div");
+ r.push("Well, Sir, those are my roles as one of the Prophet's many slave acolytes. In daily life, do you mean, Sir? Well, as I said I exercise a great deal. To maintain my body I must eat a lot, so I have to work hard or I will become fat. Other than that, I live up above us, Sir, in a lower level of the Prophet's penthouse, in a room with my wife. It's a simple life.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Your wife?", ["note"]));
+ r.toNode("div");
+ r.push("Yes, Sir, my wife Perseverance. There she is, Sir, on the other side of the plaza. One of the ones dressed like me. She has bigger boobs, but she isn't as pregnant right now. [points]");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "She looks a lot like you.", ["note"]));
+ r.toNode("div");
+ r.push("Well, she should, Sir, we're sisters. The Prophet says that slave marriages between sisters are very holy, as long as no seed passes between them, and of course no seed can pass between us, because we both have pussies. I love her very much.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Did you always?", ["note"]));
+ r.toNode("div");
+ r.push("Well yes! Oh, I see, Sir. No, no not that way. It was very hard for us, for a long time, but the Prophet is very wise. We were unworthy and slow to accept his wisdom, but he was patient with us and we learned in the end.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "That's certainly impressive. How did he teach you?", ["note"]));
+ r.toNode("div");
+ r.push("Many ways, of course, Sir, but the Prophet is so wise that he often brings slaves to teach themselves by his wisdom. He has many ways of filling a slave with radiant sexual desire, Sir, so many ways, and they are so powerful, that she must find some way of getting relief. And the Prophet provided that we were each other's only source of relief.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "How was that hard for you?", ["note"]));
+ r.toNode("div");
+ r.push("The Prophet says that it is natural for it to be hard, and as in all things he was right. We were ashamed, and we cried afterward, every time, for a long time. But we became accustomed to each other's bodies, and we saw that many sister-wives were happy, and no one looked down on us. So we agreed with each other to stop being ashamed.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "You're completely comfortable speaking about being married to your sister, here in the plaza?", ["note"]));
+ r.toNode("div");
+ r.push("Sir, I'm completely comfortable saying here in the plaza that when I awoke this morning, she was sucking the milk from one of my nipples, and that we brought each other to orgasm twice before we came out to the plaza today. I love her! I hope you will let us serve you together.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push("— Lawrence, W. G.,", App.UI.DOM.makeElement("span", "Guide to Modern Slavery, 2037 Edition", ["note"]));
+ r.toNode("div");
+ r.push("Appendix A, Interviews");
+ r.toNode("div");
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Public Slave, Arcology A-3", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("Interview with a public slave subject to Degradationism");
+ r.toNode("div");
+ r.push("Main plaza, Arcology A-3, April 16, 2036");
+ r.toNode("div");
+ r.push("P-please, Sir! Please fuck me, Sir!");
+ r.toNode("p");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Very well. I will ask, though: why?", ["note"]));
+ r.toNode("div");
+ r.push("B-because I'm overdue, Sir. If I d-don't get someone to f-fuck me soon, my c-collar will hurt me, Sir. Oh please, oh — oh thank you Sir, please, please — oh, OH —");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push("[Some time later.]");
+ r.toNode("div");
+ r.push("[Slave collar chimes.]");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "What was that?", ["note"]));
+ r.toNode("div");
+ r.push("Oh, um, [sniff] Sir, the arcology detected that you came inside me, Sir. That means that I have a little time before I have to get fucked again, Sir. [sniff]");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "All public slaves are subject to this system?", ["note"]));
+ r.toNode("div");
+ r.push("All of the Mistress's public slaves, Sir. Some other owners use it, some don't. [sniff] It's s-supposed to make us g-good public representatives for the arcology's slaves. B-because it makes us d-desperate. [sniff] Sir.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "You seem articulate, slave. What were you before enslavement?", ["note"]));
+ r.toNode("div");
+ r.push("I was a s-student, Sir.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "I see. Slave, I would like to learn more about the arcology. You will accompany me as I tour it. If you answer my questions as I do so, I will fuck you when your collar requires it.", ["note"]));
+ r.toNode("div");
+ r.push("Oh, thank you, Sir. Thank you. Um, how long will you be here, Sir?");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "None of your concern. Who is the person in that cage hanging there?", ["note"]));
+ r.toNode("div");
+ r.push("I don't know, Sir. And, Sir, that's not, um, a person. She's a slave, Sir.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "I see. What sorts of things are punished that way?", ["note"]));
+ r.toNode("div");
+ r.push("Oh, lots of things, Sir. Hesitating. Dropping things. Touching a dick or a clit with teeth. Letting cum spill. Anyone can put a slave in one of the cages; they're public, Sir, and anyone can use a slave in them. You see they're kind of shaped so that the slave is positioned so her holes are sticking out, Sir?");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Follow me.", ["note"]));
+ r.toNode("div");
+ r.push("Yes, Sir. [winces] Oh. Um, sorry, Sir.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Does it hurt to walk in those shoes?", ["note"]));
+ r.toNode("div");
+ r.push("N-no, Sir. I need the heels to walk. It's the chain between my nipples that hurts a little when I walk, Sir, and it bounces around. I was wincing, earlier, partly because I was bouncing around, and it hurt, Sir.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "And yet you orgasmed.", ["note"]));
+ r.toNode("div");
+ r.push("It's h-hard not to, Sir. I have a smart piercing that makes me orgasm, Sir.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Why do you need heels to walk?", ["note"]));
+ r.toNode("div");
+ r.push("Because my tendons have been clipped, Sir.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "What did you do?", ["note"]));
+ r.toNode("div");
+ r.push("Um, nothing, Sir? It wasn't a punishment, all slaves have their tendons clipped. The heels are a reward. If we're not good, we have to crawl, Sir.");
+ r.toNode("div");
+
+ r.push("[Walking.]");
+ r.toNode("p");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Was that fear I just saw?", ["note"]));
+ r.toNode("div");
+ r.push("Yes, Sir.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Why?", ["note"]));
+ r.toNode("div");
+ r.push("That's the main dairy ahead of us, Sir.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Is it open to the public?", ["note"]));
+ r.toNode("div");
+ r.push("T-t-to view, yes, Sir.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Follow me.", ["note"]));
+ r.toNode("div");
+ r.push("Y-yes, Sir. [sniff]");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "That is quite an impressive sight.", ["note"]));
+ r.toNode("div");
+ r.push("Yes, Sir.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Do you know how large they are?", ["note"]));
+ r.toNode("div");
+ r.push("Th-th-their breasts, Sir? About t-twenty or twenty five liters e-ea-each, S-Sir.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Why does this frighten you so much?", ["note"]));
+ r.toNode("div");
+ r.push("W-well, I'll, um, be put in here, Sir. Someday. Oh. [sniff]");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Why?", ["note"]));
+ r.toNode("div");
+ r.push("All slaves are p-put in h-here, when they're loose, Sir. All the, the, the", App.UI.DOM.makeElement("span", "sex,", ["note"]), "it's just to loosen us, s-so those", App.UI.DOM.makeElement("span", "things,", ["note"]), "will fit inside...");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push("— Lawrence, W. G.,", App.UI.DOM.makeElement("span", "Guide to Modern Slavery, 2037 Edition", ["note"]));
+ r.toNode("div");
+ r.push("Appendix A, Interviews");
+ r.toNode("div");
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Mercenary, Arcology B-2", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("Interview with a Free Cities mercenary");
+ r.toNode("div");
+ r.push("The Wild Goose, Arcology B-2, March 11, 2036");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Good evening.", ["note"]));
+ r.toNode("div");
+ r.push("No offense, but I only fuck girls.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "None taken, and I'm just looking for conversation.", ["note"]));
+ r.toNode("div");
+ r.push("'k, buy the next round and converse away.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Done. Fine to meet you. I'm touring the arcologies, writing a book. I'd like to ask you about life as a mercenary here in the Free Cities.", ["note"]));
+ r.toNode("div");
+ r.push("[laughs] Shit, I'm going to be famous.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "If you'd like to be. I'm W.G.; what's your name?", ["note"]));
+ r.toNode("div");
+ r.push("Well, W.G., I'll answer questions for your book, but I don't actually want to be famous. No names.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "That works fine for me. How did you become a mercenary?", ["note"]));
+ r.toNode("div");
+ r.push("I was a soldier, and the pay was shit, so instead of re-upping I went merc. Boring, but pretty common, believe me. Half the old world militaries are just merc training camps now. You enlist, and then you get out as soon as you have enough experience that a mercenary group'll take you on.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Did you have combat experience?", ["note"]));
+ r.toNode("div");
+ r.push("[laughs] You know your shit. No, no I did not. I wasn't even infantry. Dirty little secret you probably already know: if you're a girl, most merc groups don't give a fuck what experience you actually have, 'cause either way, they win.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "I think I understand, but lay it out for me.", ["note"]));
+ r.toNode("div");
+ r.push("If you're a good troop, you're a good troop and they come out ahead. Rifle don't care what equipment the merc holding it has. If you're not a good troop, they tie you up in a shipping container, use you 'till they get bored, and then sell you. And they come out ahead. Win-win.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "You obviously came out on the right side of that, but did you suffer any abuse before then?", ["note"]));
+ r.toNode("div");
+ r.push("Nah. It'd be dumb to do anything to a newbie and then not enslave 'em. What, you're gonna rape somebody and then give 'em two-forty rounds, four frags, and a satchel charge? Fuck no.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "That's what you carry?", ["note"]));
+ r.toNode("div");
+ r.push("Yeah fuck that subject anyway. And yeah, when taking prisoners isn't on the agenda. I'm a big girl, I can manage eight mags in a double deck chest rig. If we are taking prisoners, then swap out half the frags for gas and half the mags for an underslung S. G. with beanbags and taser rounds. Though you never want to use any of that, nonlethals included.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Because you might damage the merchandise?", ["note"]));
+ r.toNode("div");
+ r.push("Because you might damage the merchandise. Did you know it's possible to burst an implant with a beanbag round? Well, it's possible to burst an implant with a beanbag round.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "You know I have to ask about that now.", ["note"]));
+ r.toNode("div");
+ r.push("And I wouldn't have said it if I didn't want to tell the story. Not a long one anyway. Old world mob boss asshole with a moored yacht full of hoes, all tats and fake tits and shit. We went in quick without enough muscle and the guards resisted. Perfect op is, you go in so heavy that nobody resists, but it was rushed and we had to put 'em down. So all these bitches are running around screaming their heads off and we get the call that the police are coming. Didn't want to shoot it out with them since the tip came from a cop in the first place. So we had a couple of minutes to grab what we could and jet. So, beanbags, zipties, bodybags, and off — we — go, one hoe apiece.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "That sounds risky.", ["note"]));
+ r.toNode("div");
+ r.push("Yeah it was. I'm not some hothead who does shit like that for the rush. If you run that op once a week you're going to be dead inside a year. I found new employers not long after that one. Funny story and all, but if I hadn't gone with ceramic side plates in my vest that night I would have been fucked.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "This is a quieter outfit?", ["note"]));
+ r.toNode("div");
+ r.push("Much. Writer, I am now bored. And since I am drunk, and horny, and an incorrigible dyke, I am going to go find a cute slave with freckles and make her eat my pussy until I pass out. You want the other end?");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push("— Lawrence, W. G.,", App.UI.DOM.makeElement("span", "Guide to Modern Slavery, 2037 Edition", ["note"]));
+ r.toNode("div");
+ r.push("Appendix A, Interviews");
+ r.toNode("div");
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Slave Trainer, Arcology D-10", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("Interview and observation with a Free Cities slave trainer");
+ r.toNode("div");
+ r.push("Slave Market training plaza, Arcology D-10, May 23, 2036");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Good morning! I'm Lawrence, W.G. Lawrence.", ["bold"]));
+ r.toNode("div");
+ r.push(App.UI.DOM.makeElement("span", "Hello. Nice to meet you. I'm Claudia.", ["note"]));
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "I'd like to thank you for being willing to have me along as an observer; it's very kind of you.", ["bold"]));
+ r.toNode("div");
+ r.push(App.UI.DOM.makeElement("span", "My pleasure. I do good work and I don't mind people knowing it.", ["note"]));
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "May I ask you a few questions before you get back to your routine?", ["bold"]));
+ r.toNode("div");
+ r.push(App.UI.DOM.makeElement("span", "Sure. We're going to be working with a new slave today, and I've got her in my office, sitting and thinking. There's no rush. Unpredictability is good.", ["note"]));
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "What got you into this career?", ["bold"]));
+ r.toNode("div");
+ r.push(App.UI.DOM.makeElement("span", "Well, I'm an ex-slave. I served my Mistress, the owner of this arcology, for three years. But I'm getting things out of order. I was a Sister before that. That's a very long story. Do you want to get into that? Every single Sister has the same story. [laughs] That's the beauty of it.", ["note"]));
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "That's all right. You mentioned before that you'd like to be known for what you're doing now.", ["bold"]));
+ r.toNode("div");
+ r.push(App.UI.DOM.makeElement("span", "Yeah. I'm not ashamed of any of it, and I wouldn't be where I am without it, but I'm my own woman now.", ["note"]));
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "And you became your own woman after retiring from slavery here?", ["bold"]));
+ r.toNode("div");
+ r.push(App.UI.DOM.makeElement("span", "I did, yes. It was bittersweet, but it was time. Mistress prefers young ladies.", ["note"]));
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "You keep referring to her as Mistress. Is that leftover conditioning?", ["bold"]));
+ r.toNode("div");
+ r.push(App.UI.DOM.makeElement("span", "[laughs] No, no, that's just what I call her, you know? She'll always be my Mistress in a way. And again, I'm here because she retires her girls incredibly well.", ["note"]));
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "What was your role with her?", ["bold"]));
+ r.toNode("div");
+ r.push(App.UI.DOM.makeElement("span", "I was her Head Girl, for my last year with her, at least. Before that, her Head Girl's girl. That Head Girl was a Sister, too. I can introduce you, if you'd like; she's a trainer here too. We work together sometimes.", ["note"]));
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Was that a blush?", ["bold"]));
+ r.toNode("div");
+ r.push(App.UI.DOM.makeElement("span", "Okay, okay! We spend time together after work sometimes, too. Anyway, slave training. Come with me, my office is back this way.", ["note"]));
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Who are you training today?", ["bold"]));
+ r.toNode("div");
+ r.push(App.UI.DOM.makeElement("span", "New slave, just bought her from the kidnappers yesterday. Pretty average. Mid-twenties, student then housewife. Decent tits, but too chubby. We'll work on that. And here we are.", ["note"]));
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Impressive office, even from the outside.", ["bold"]));
+ r.toNode("div");
+ r.push(App.UI.DOM.makeElement("span", "Thanks. So, she's in there. Room's soundproof, she can't hear us. Here's how I'd like to play this: just stay out of the light, and you can observe as long as you like. She's under a spotlight, and everything else is dark. She probably won't even know you're there.", ["note"]));
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "That would work very well, thank you.", ["bold"]));
+ r.toNode("div");
+ r.push(App.UI.DOM.makeElement("span", "You're welcome. After you.", ["note"]));
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Hello, Suzanne.", ["note"]));
+ r.toNode("div");
+ r.push("H-hi, Ma'am.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Stand up.", ["note"]));
+ r.toNode("div");
+ r.push("Yes, Ma'am. Um, Ma'am, may I please have my pants back? They took them away in the market, and I thought since you gave my sweater back, you'd -");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Be quiet.", ["note"]));
+ r.toNode("div");
+ r.push("Yes, Ma'am.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Hold your hands at your sides like I told you, and stop pulling your sweater down over your pussy.", ["note"]));
+ r.toNode("div");
+ r.push("Y-yes, Ma'am.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Turn around.", ["note"]));
+ r.toNode("div");
+ r.push("Yes, Ma'am.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Do you like having your big fat naked butt hanging out, bitch?", ["note"]));
+ r.toNode("div");
+ r.push("Yes, Ma — aaAAH! Oh, ow, oh my God, ow -");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Be quiet. That was a 2. Your collar goes to 10.", ["note"]));
+ r.toNode("div");
+ r.push("[sobbing] Yes, Ma'am.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "You just lied to me. I will ask again: do you like having your big fat naked butt hang out?", ["note"]));
+ r.toNode("div");
+ r.push("N-no, Ma'am.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Take your sweater off. Good bitch. That's right, blush for me. Now, tear it in half.", ["note"]));
+ r.toNode("div");
+ r.push("What!? Oh please, no, please no, I'll do it! Please don't shock me again, Ma'am! [frantic tearing]");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "You don't need clothes, bitch. Not anymore. Now, turn back around, and bend over.", ["note"]));
+ r.toNode("div");
+ r.push("Yes, Ma'am.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Spread your big fat buttcheeks.", ["note"]));
+ r.toNode("div");
+ r.push("Yes, Ma'am.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Ever had a cock up your butthole, Suzie?", ["note"]));
+ r.toNode("div");
+ r.push("[sobbing]");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push("— Lawrence, W. G.,", App.UI.DOM.makeElement("span", "Guide to Modern Slavery, 2037 Edition", ["note"]));
+ r.toNode("div");
+ r.push("Appendix A, Interviews");
+ r.toNode("div");
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addArticle("Monarch, Arcology F-8", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push(`Interview with a Free Cities "anarcho-monarch"`);
+ r.toNode("div");
+ r.push("Arcological Penthouse, Arcology F-8, June 23, 2036");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Good afternoon. My name is -", ["note"]));
+ r.toNode("div");
+ r.push("(From Guard) You will address His Highness with proper courtesy, peasant.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Ah, my apologies. What I meant to say was, your Majesty, my name is W.G. Lawrence, and I'd like to interview you about this arcology, and your role in leading it. Err, for my book, your Highness.", ["note"]));
+ r.toNode("div");
+ r.push("A scribe. Well, speak quickly. I am a busy man.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Of course. Just for the record, might you introduce yourself?", ["note"]));
+ r.toNode("div");
+ r.push("(Gestures to a guard.)");
+ r.toNode("div");
+ r.push("(From Guard) You are speaking with His Highness King William, First of His name, Savior of the Arcology, Executive Lord and Master of the Board of Directors, Majority Shareholder and Anarcho-Monarch of the most noble Arcology of Feight.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Yes, yes, right, quite a magnificent title. Might I ask how it came to be that a Monarch took control of a Free City? Isn't strong authority antithetical to the free cities ideal?", ["note"]));
+ r.toNode("div");
+ r.push("[laughs] Not a monarch, an anarcho-monarch. I did not earn my titles through bullying or force, and certainly not through inheriting it from some decrepit geriatric moron like in the old world. I am the legitimate majority stakeholder of the arcology and the rightful head of its board of directors. My rule is strong because I am strong. Were I to become weak, my position would be ousted and the people would take my place directly.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Is that what the 'anarcho' means?", ["note"]));
+ r.toNode("div");
+ r.push("Mmm. I do not simply rule the people. I am the people.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "But you dictate laws down to them - isn't that mutally contradictory?", ["note"]));
+ r.toNode("div");
+ r.push("No. Peasants do not understand how to govern themselves. Look at the 'pure' anarchies outside our walls, scribe, and you'll see men tearing each other apart for scraps on a bone or a chance with an emaciated crack-whore. Without a strong force to bind a society in place, society falls apart entirely. If my people dislike paying my rents or obeying my Knights, they are free to leave, and take their chances in the ruins of the Old World.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "So your majority ownership and management of the arcology gives you the right to control its populace, who live under the laws you set, and if they disagree with your, ah, symbolic totality, their only option is to leave?", ["note"]));
+ r.toNode("div");
+ r.push("Now you understand.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Alright. Well, what about the lesser nobles? The Counts and Barons and Knights of the arcology?", ["note"]));
+ r.toNode("div");
+ r.push("What about them?");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "Why do they have the right to authority in your free society?", ["note"]));
+ r.toNode("div");
+ r.push("They are my representatives. To be a Knight is to have my personal trust to act in my name, wherever I cannot be. I am the fountain from which all authority stems. So long as my water flows pure, all steps of the fountain remain clear.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push(App.UI.DOM.makeElement("span", "What about corruption? Doesn't giving so much power to entrenched nobility make it more likely that -", ["note"]));
+ r.toNode("div");
+ r.push("(From Guard) Alright, that's enough out of you. The King has better things to do than explain his policies all day. Let's go.");
+ r.toNode("div");
+
+ r.toNode("p");
+ r.push("— Lawrence, W. G.,", App.UI.DOM.makeElement("span", "Guide to Modern Slavery, 2037 Edition", ["note"]));
+ r.toNode("div");
+ r.push("Appendix A, Interviews");
+ r.toNode("div");
+
+ return t;
+}, "Lore");
+
+App.Encyclopedia.addCategory("Lore", function() {
+ const f = new DocumentFragment();
+ let r = [];
+ if (V.encyclopedia !== "Lore") {
+ r.push(App.Encyclopedia.link("Lore"));
+ }
+ r.push(App.Encyclopedia.link("Money", "Money", "yellowgreen"));
+ r.push(App.Encyclopedia.link("Food"));
+ r.push(App.Encyclopedia.link("Disease in the Free Cities"));
+ r.push(App.Encyclopedia.link("Free Cities Justice"));
+ r.push(App.Encyclopedia.link("Modern Anal"));
+ r.push(App.Encyclopedia.link("Slave Couture"));
+ r.push(App.Encyclopedia.link("Slave Marriage"));
+ r.push(App.Encyclopedia.link("The Ejaculate Market"));
+ r.push(App.Encyclopedia.link("Gingering"));
+ r.push(App.Encyclopedia.link("Dyes"));
+ App.Events.addNode(f, ["The Free Cities today:", App.UI.DOM.generateLinksStrip(r)], "div");
+
+ r = [];
+ r.push(App.Encyclopedia.link("The New Rome"));
+ r.push(App.Encyclopedia.link("The Return of Feudalism"));
+ r.push(App.Encyclopedia.link("Naked, Barefoot, and Pregnant"));
+ r.push(App.Encyclopedia.link("The Sons of Sekhmet"));
+ r.push(App.Encyclopedia.link("The Top"));
+ r.push(App.Encyclopedia.link("The Bottom"));
+ r.push(App.Encyclopedia.link("The Purity of the Human Form"));
+ r.push(App.Encyclopedia.link("A World Built on Implants"));
+ r.push(App.Encyclopedia.link("Slaves as Stock"));
+ r.push(App.Encyclopedia.link("Slavery and the Physical Ideal"));
+ r.push(App.Encyclopedia.link("Faith in the Free Cities"));
+ App.Events.addNode(f, ["Free Cities culture tomorrow:", App.UI.DOM.generateLinksStrip(r)], "div");
+
+ r = [];
+ r.push(App.Encyclopedia.link("Slave Whore, Arcology K-2"));
+ r.push(App.Encyclopedia.link("Slave Acolyte, Arcology V-7"));
+ if (V.seeExtreme !== 0) {
+ r.push(App.Encyclopedia.link("Public Slave, Arcology A-3"));
+ }
+ r.push(App.Encyclopedia.link("Mercenary, Arcology B-2"));
+ r.push(App.Encyclopedia.link("Slave Trainer, Arcology D-10"));
+ r.push(App.Encyclopedia.link("Monarch, Arcology F-8"));
+ App.Events.addNode(f, ["Interviews:", App.UI.DOM.generateLinksStrip(r)], "div");
+
+ return f;
+});
diff --git a/src/gui/Encyclopedia/encyclopediaMods.js b/src/gui/Encyclopedia/encyclopediaMods.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b29336d23742207f994eb9be55b65033f53efd2
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaMods.js
@@ -0,0 +1,607 @@
+App.Encyclopedia.addArticle("Mods/Pregmod", function() {
+ return App.UI.DOM.makeElement("div", "This version of the game includes several optional mods and Pregmod exclusive features. For more information, please select a particular entry below:");
+}, "Mods");
+
+App.Encyclopedia.addArticle("Loli Mode", function() {
+ return App.UI.DOM.makeElement("div", "This mod which has overtime been incorporated into the base game and expanded into a mode, adds a variety of underage content to the game. This content is purely optional. For more information on certain features, select a more particular entry:");
+}, "Mods");
+
+App.Encyclopedia.addArticle("Special Force", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.Encyclopedia.topic("NOTE: The Special Force is an optional mod, and as such will only be initialized in-game if it is enabled at game start or in the options menu."));
+ r.toNode("p");
+
+ App.UI.DOM.appendNewElement("div", f, "Man has killed man from the beginning of time, and each new frontier has brought new ways and new places to die. Why should the future be different? Make no mistake friend, the Free Cities are the future, and we can either live like kings inside them, or die in their shadow. I prefer the former. So should you.", ["note", "blockquote"]);
+ App.UI.DOM.appendNewElement("div", f, "- The Colonel, standard message to potential recruits", ["indent", "blockquote"]);
+
+ r.push("Once your arcology has been severely tested by external attack, and thus proven that the anti-militaristic principles of anarcho-capitalism might not be sufficient to ensure the physical security of the citizenry, you will receive an event that gives you the opportunity to establish a Special Force (with a customizable name), with The Colonel as its commander under you. This force will be a private military in all but name (unless you want that name). Once activated, you can manage its deployment from the end of week screen. You will be able to issue orders on the force's task and behavior, and this will impact its development. There are numerous events that can trigger depending on development and orders.");
+ r.toNode("p");
+ r.push("Initially the force will not be very profitable, but once it expands, it can become so. The speed at which this happens, and the degree of profitability, depends both on your orders to the force and the upgrades you purchase in the Barracks. If you had mercenaries, they will still be active for the purposes of events, corporation assistance (if present), and upkeep costs, abstracted as distinct operatives from the Special Force.");
+ r.toNode("p");
+
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Orders to The Colonel:", ["underline"]), "Once the force is active, you will be able to give orders to The Colonel. These will affect its income and performance. The orders are:"], "p");
+ App.Events.addNode(f, [App.Encyclopedia.topic("Deployment Focus:"), "This will determine the force's main task for the week."], "div");
+ App.Events.addNode(f, [App.Encyclopedia.topic("Recruit and Train"), "will focus on increasing manpower and replacing losses incurred over time."], "div", ["indent"]);
+ App.Events.addNode(f, [App.Encyclopedia.topic("Secure Trade Routes"), "will increase", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "and prosperity by amounts that scale with the force's development."], "div", ["indent"]);
+ App.Events.addNode(f, [App.Encyclopedia.topic("Slaving and Raiding"), "will directly bring in cash and (occasionally) slaves, with the amounts and quality increasing with the force's development. All three will occur every week, but the focus will determine the primary result."], "div", ["indent"]);
+
+ r.toNode("p");
+ r.push(App.Encyclopedia.topic("Rules of Engagement:"), "This will determine how carefully the force uses its weapons, and affect its change in", App.Encyclopedia.link("reputation,", "Arcologies and Reputation", "green"), "as well as events seen. Will they hold their fire unless fired upon? Or will they call in an artillery strike on a refugee convoy that took a potshot at them?");
+ r.toNode("div");
+ App.Events.addNode(f, [App.Encyclopedia.topic("Hold Fire"), "will restrict the force to only returning fire if they're fired upon."], "div", ["indent"]);
+ App.Events.addNode(f, [App.Encyclopedia.topic("Limited Fire"), "will permit some proactive fire from the force (to eliminate known threats)."], "div", ["indent"]);
+ App.Events.addNode(f, [App.Encyclopedia.topic("Free Fire"), "will permit the force to shoot at anything/anyone, at any time, for any reason."], "div", ["indent"]);
+
+ r.toNode("p");
+ r.push(App.Encyclopedia.topic("Accountability:"), "This will determine how accountable the force is for its actions outside the Arcology, and affect its change in", App.Encyclopedia.link("reputation,", "Arcologies and Reputation", "green"), "as well as events seen. Will you punish them if they massacre a caravan for one choice slave girl? Or shoot random civilians for their valuables?");
+ r.toNode("div");
+ App.Events.addNode(f, [App.Encyclopedia.topic("Strict Accountability"), "will ensure the force avoids committing atrocities (other than immense collateral damage if free-fire is enabled)."], "div", ["indent"]);
+ App.Events.addNode(f, [App.Encyclopedia.topic("Some Accountability"), "will prevent the worst actions, but overlook lesser ones."], "div", ["indent"]);
+ App.Events.addNode(f, [App.Encyclopedia.topic("No Accountability"), "will let the force run wild."], "div", ["indent"]);
+
+ r.push("Allowing them to run wild will, over time, change their character, rendering them increasingly depraved as they realize that they can do whatever they want to non-citizens. Giving them rules might correct this, but reversing such behavior once learned would take a long time indeed.");
+ r.toNode("p");
+
+ r.push(App.UI.DOM.appendNewElement("div", f, "Barracks:", ["underline"]));
+ r.toNode("div");
+ r.push("The Barracks are the upgrade and flavor screen for the Special Force. It is treated as a special facility, and slaves cannot be assigned to it. Here you can observe the antics and relaxation behavior of the force, which will, again, change based on your orders and its", App.Encyclopedia.link("reputation.", "Arcologies and Reputation", "green"), "You can visit once a week to receive some extra tribute from The Colonel, specially saved for its patron from its weekly acquired loot, and this 'gift' will improve in quality as the force develops.");
+ r.toNode("div");
+
+ r.toNode("p");
+ App.UI.DOM.appendNewElement("div", f, "Upgrades:", ["underline"]);
+ r.push("Upgrades can be purchased in the Barracks. The upgrades that can be purchased will both increase in effectiveness of the force (i.e. how much");
+ r.push(App.Encyclopedia.link("money", "Money", "yellowgreen"), "or", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"));
+ r.push("it makes). The upgrades focus on improving the force's infantry equipment, vehicles, aircraft, drones, and stimulants. Some upgrades are more helpful at facilitating different tasks (Vehicles/Aircraft for Slaving/Raiding,", App.Encyclopedia.link("Drones", "Security Drones"), "for Securing Trade). Arcology upgrades enable other upgrades to be purchased. Stimulants increase overall effectiveness for the force when assigned to raiding after upgrades are considered, as well as flavor text.");
+ r.toNode("div");
+
+ r.push("Explore the options and enjoy the benefits of having a complete private military!");
+ r.toNode("p");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Security Expansion", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.Encyclopedia.topic("Note: The Security Expansion mod is an optional mod. It can be switched freely on and off from the game option menu or at the start of the game."));
+ r.toNode("div");
+
+ r.push("The world of Free Cities is not a forgiving one, those who do not seek to dominate it, will inevitably be dominated themselves.");
+ r.push("Good rulers need to keep control of its realm, if they want to have long and prosperous lives.");
+ r.push("You will have to manage your", App.UI.DOM.appendNewElement("div", f, "authority", ["darkviolet"]), "inside the walls of your arcology, you will have to keep it", App.UI.DOM.appendNewElement("div", f, "secure", ["deepskyblue"]), "and keep in check", App.UI.DOM.appendNewElement("div", f, "crime", ["orangered"]), "and rivals alike, you will have to take up arms and command your troops against those who defy your rule.");
+ r.toNode("p");
+
+ r.push("Statistics:");
+ r.toNode("p");
+ App.Events.addNode(f, [App.UI.DOM.appendNewElement("div", f, "Authority", ["darkviolet", "strong"]), "represents the power the player holds over the arcology. If", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "is how well the protagonist is known,", App.UI.DOM.appendNewElement("div", f, "authority", ["darkviolet"]), "is how much is feared or respected.", "Authority influences many things, but it is mainly used to enact edicts, who, similarly to policies, allow to shape the sociopolitical profile of your arcology. Like", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), ",", App.UI.DOM.appendNewElement("div", f, "authority", ["darkviolet"]), `has a maximum of ${num(20000)}.`], "div", ["indent"]);
+ App.Events.addNode(f, [App.UI.DOM.appendNewElement("div", f, "Security", ["deepskyblue", "strong"]), "represents how safe the arcology is, how likely it is for a citizen to get stabbed, killed or simply mugged in the streets as well as wider concerns like dangerous political organizations, terrorist groups and more. It influences many things, but its main task is to combat", App.UI.DOM.appendNewElement("div", f, "crime", ["orangered"])], "div", ["indent"]);
+ App.Events.addNode(f, [App.UI.DOM.appendNewElement("div", f, "Crime", ["orangered", "strong"]), "represents the accumulated power of criminals in the arcology. Rather than representing low level criminal activity, better represented by", App.UI.DOM.appendNewElement("div", f, "security", ["deepskyblue"]), "(or better lack of), but the influence, organization and reach of criminal organizations, be it classic mafia families or high tech hacker groups. Do not let their power run rampant or you'll find your treasury emptier and emptier. Both", App.UI.DOM.appendNewElement("div", f, "security", ["deepskyblue"]), "and", App.UI.DOM.appendNewElement("div", f, "crime", ["orangered"]), "are displayed a 0-100% scale."], "div", ["indent"]);
+
+ r.push("The battles:");
+ r.toNode("p");
+ App.Events.addNode(f, ["Arcologies are sturdy structures, difficult to assault without preparation or overwhelming numbers.", App.Encyclopedia.link("Security drones"), "can easily handle small incursions and a few well placed mercenary squads can handle the rest.", "However, in order for Free Cities to survive they need many things, many of which are expensive. If you want your arcology to survive the tide of times, you'd better prepare your soldiers and defend the vital lifelines that connect your arcology with the rest of the world.", "For a detailed outlook of how battles work see the relevant page."], "div", ["indent"]);
+
+ r.push("Buildings:");
+ r.toNode("p");
+ App.Events.addNode(f, [App.Encyclopedia.topic("The Barracks"), "is where troops can be prepared and organized to respond to threats encroaching on the arcology's territory.", "If the old world General is a client state human units can be sent to further improve relations."], "div", ["indent"]);
+ App.Events.addNode(f, [App.Encyclopedia.topic("The Security HQ"), "is where your security department will manage the", App.UI.DOM.appendNewElement("div", f, "security", ["deepskyblue"]), "of the arcology."], "div", ["indent"]);
+ App.Events.addNode(f, [App.Encyclopedia.topic("The Propaganda Hub"), "is where your propaganda department will expand and deepen your", App.UI.DOM.appendNewElement("div", f, "authority", ["darkviolet"]), "over the arcology."], "div", ["indent"]);
+ App.Events.addNode(f, [App.Encyclopedia.topic("The Transport Hub"), "is where trade happens. Mainly intended as a counter to prosperity loss events."], "div", ["indent"]);
+ App.Events.addNode(f, [App.Encyclopedia.topic("The Riot Control Center"), "is fairly self explanatory, will help you manage rebellions."], "div", ["indent"]);
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Battles", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("With the Security Expansion mod enabled there is a small chance each week that an attacking force will be approaching the arcology. Their motives may vary, but their intentions are clear: hit you where it hurts.");
+ r.push("You arcology will start being the subject of incursions only when the", App.Encyclopedia.link("security drones", "Security Drones"), "upgrade has been installed.");
+ r.toNode("div");
+
+ r.push("Unit types:");
+ r.toNode("div", ["strong"]);
+
+ r.push(App.Encyclopedia.topic("Slave units"), "are recruitable from your stockpile of menial slaves. They are cheap, easy to replace troops that will hold the line well enough.");
+ r.push("Of the three they have the lowest base stats, but they have the advantage of being available from the beginning, have the lowest upkeep and can be replenished in any moment, provided enough cash is available.");
+ r.toNode("p");
+
+ r.push(App.Encyclopedia.topic("Militia units"), "are recruitable only after a special edict is passed. Once the militia is announced recruitment laws will become available and recruits will present themselves to the barracks, waiting to be assigned to a unit.");
+ r.push("Militia units are slightly stronger than slave units, but their manpower is limited by the laws enacted and the citizen population.");
+ r.toNode("p");
+
+ r.push(App.Encyclopedia.topic("Mercenary Units"));
+ r.addToLast(":");
+ r.push("installing a permanent platoon in the arcology is a great defensive tool, but if you need muscle outside the walls of your dominion you'll need to hire more.");
+ r.push("Mercenary units have the highest base stats (in almost all categories), but are also only available if the arcology is garrisoned by the mercenary platoon, are fairly slow to replenish and have the highest upkeep.");
+ r.push("Once garrisoned by the mercenary platoon, more mercenaries will slowly make their way to the arcology. You have little control over their number other than increasing your arcology prosperity or your reputation.");
+ r.toNode("p");
+
+ r.push(App.Encyclopedia.topic("The Security Drones"), "are a special unit. You can field more than one unit of this type and their stats (with the exception of their very high morale) are fairly low, however they cheap to replenish and have a low maintenance cost. They do not accumulate experience and are not affected by morale modifiers (for better or worse).");
+ r.toNode("p");
+
+ r.toNode("hr");
+ r.push("Units statistics:");
+ r.toNode("div", ["strong"]);
+
+ r.push(App.Encyclopedia.topic("Troops"));
+ r.addToLast(":");
+ r.push("The number of active combatants the unit can field. If it reaches zero the unit will cease to be considered active. It may be reformed as a new unit without losing the upgrades given to it, but experience is lost.");
+ r.toNode("div");
+
+ r.push(App.Encyclopedia.topic("Maximum Troops"));
+ r.addToLast(":");
+ r.push("The maximum number of combatants the unit can field. You can increase this number through upgrades.");
+ r.toNode("div");
+
+ r.push(App.Encyclopedia.topic("Equipment"));
+ r.addToLast(":");
+ r.push("The quality of equipment given to the unit. Each level of equipment will increase attack and defense values of the unit by 15%.");
+ r.toNode("div");
+
+ r.push(App.Encyclopedia.topic("Experience"));
+ r.addToLast(":");
+ r.push("The quality of training provide/acquired in battle by the unit. Experience is a 0-100 scale with increasingly high bonuses to attack, defense and morale of the unit, to a maximum of 50% at 100 experience.");
+ r.toNode("div");
+
+ r.push(App.Encyclopedia.topic("Medical support"));
+ r.addToLast(":");
+ r.push("Attaching medical support to human units will decrease the amount of casualties the unit takes in battle.");
+ r.toNode("div");
+
+ r.push(App.Encyclopedia.topic("Special Force support"));
+ r.addToLast(":");
+ r.push("if the", App.Encyclopedia.link("Special Force"), "mod is enabled a squad of troops can be assigned to the human units which will increase their base stats.");
+ r.toNode("div");
+
+ r.toNode("hr");
+ r.push("Battles:");
+ r.toNode("div", ["strong"]);
+ r.push("Battles are fought automatically, but you can control various fundamental parameters, here are the most important statistics:");
+ r.toNode("div");
+ r.push(App.Encyclopedia.topic("Readiness"));
+ r.addToLast(":");
+ r.push("readiness represents how prepared the arcology is to face an attack. For every point of readiness you can field two units. You can find upgrades for it in the security HQ.");
+ r.toNode("div");
+
+ r.push(App.Encyclopedia.topic("Tactics"));
+ r.addToLast(":");
+ r.push("Tactics are the chosen plan of action. You should carefully choose one depending on the terrain, type of enemy and leader choice, because if applied successfully they can sway a battle in your favor or doom your troops.");
+ r.toNode("div");
+
+ r.push(App.Encyclopedia.topic("Terrain"));
+ r.addToLast(":");
+ r.push("Terrain has a great influence on everything, but mainly on the effectiveness of the tactic chosen.");
+ r.toNode("div");
+
+ r.push(App.Encyclopedia.topic("Leader"));
+ r.addToLast(":");
+ r.push("The leader is who will command the combined troops in the field. Each type of leader has its bonuses and maluses.");
+ r.toNode("div");
+
+ r.push(terrainAndTactics());
+ r.toNode("p");
+
+ r.toNode("hr");
+ r.push("Leaders:");
+ r.toNode("div", ["strong"]);
+ r.push(App.Encyclopedia.topic("The Assistant"));
+ r.addToLast(":");
+ r.push("Combat performance depends on available computational power.");
+ r.push("Human soldiers will be not happy to be lead by a computer however and will fight with less ardor, unless your own reputation or authority is high enough.");
+ r.toNode("div");
+
+ r.push(App.Encyclopedia.topic("The Arcology Owner"));
+ r.addToLast(":");
+ r.push("You can join the fray yourself. Your performance will depend greatly on your warfare skill and your past. The troops will react to your presence depending on your social standing and your past as well.");
+ r.toNode("div");
+ App.UI.DOM.appendNewElement("div", f, "Do note however there is the possibility of getting wounded, which makes you unable to focus on any task for a few weeks.", ["indent"]);
+
+ r.push("Your", App.Encyclopedia.topic("Bodyguard"), "or", App.Encyclopedia.topic("Your Head Girl"), "can guide the troops.");
+ r.push("Their performance will greatly depend on their intelligence and past.");
+ r.push("Be aware that both slaves run the risk of getting wounded, potentially with grave wounds like blindness or limb loss.");
+ r.push("Slaves will be happy to be lead by one of them, but militia and mercenaries will not, unless your own authority is high enough to make up for the fact they are being lead by a slave.");
+ r.toNode("div");
+
+ r.push(App.Encyclopedia.topic("An outstanding citizen"), "can take the leading role. Their performance will be average; however the militia will be pleased to be guided by one of them.");
+ r.toNode("div");
+ r.push("To allow slaves to lead troops a specific edict will have to be enacted.");
+ r.toNode("div");
+
+ r.push(App.Encyclopedia.topic("A mercenary officer"), "can take the lead. Their performance will be above average and mercenary units will be more confident, knowing they're being lead by someone with experience.");
+ r.toNode("div");
+
+ r.push(App.Encyclopedia.topic("The Colonel"));
+ r.addToLast(":");
+ r.push("The Special Force's colonel can take the lead. Her performance will be above average and mercenary (in addition to hers obviously) units will be more confident, knowing they're being lead by someone with experience. Her tactics have a higher chance of success along with better offense and defense.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("FCTV", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("Free Cities TV, or", App.Encyclopedia.topic("FCTV"), "as it is more commonly called, is a very popular streaming video service. A venture started not long after the first Free Cities were founded, it took advantage of the new lack of regulatory oversight to create and host content that had long been banned in the old world. Under the guidance of 8HGG Inc., FCTV has developed into a popular mixed-mode service, with a variety of live streaming channels as well as a large selection of ready stream content ranging from hyper porn to contemporary broadcast series shows.");
+ r.toNode("div");
+ r.push("The successful service is largely supported by a combination of subscription and advertising revenue, and to a smaller extent on-demand content payments. Though still targeted at free citizens — or their slaves in the case of for-slave content — FCTV has become very popular in the old world. A combination of the service's eroticism, extreme content, and high production value has given it extraordinary popularity. Savvy execs at 8HGG Inc. and arcology owners alike have realized the benefits of exposing the old world populations to FCTV content, and a carefully-curated selection of content is kept available to old-worlders thanks to revenue from advertisements supporting immigration and voluntary enslavement. The content selection has a glamorized and often romanticized view of slavery, and typically displays common citizens and slaves alike living in opulence beyond the realm of possibility for most old-worlders.");
+ r.toNode("p");
+ r.push("FCTV has always worked closely with the Free Cities, developing a large network of sponsors and partnerships for content protection. This has increased the breadth of content and popularity of FCTV, while allowing the ruling class to encourage content supporting their vision of the future. While you can access non-citizen FCTV content from just about anywhere, an arcology needs its own", App.Encyclopedia.link("receiver", "FCTV Receiver"), "to access citizen-only content. This measure of content protection does add extra expense, but nearly eliminating the risk of old-worlders seeing uncurated content is viewed as being worth the expense by most arcology owners.");
+ r.toNode("p");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Lolis and the Free Cities", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("For the most part, the greater world condemns those using underaged girls as sex slaves, but some Free Cities feel otherwise. In those, underage girls may be purchased like any other slave, though they might be more valuable depending on the arcology.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Fertility Age", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The normal girl will undergo puberty and become fertile between the ages of 10 and 14, though with hormonal treatments can very easily become fertile earlier. Given the passive female hormones in the slave food, an arcology cluster can practically control the exact age a girl will become fertile.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Male Fertility", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The normal boy will undergo puberty and become potent between the ages of 12 and 16, though with hormonal treatments can very easily become potent earlier. Given the passive female hormones in the slave food, boys will generally become fertile later than the average loli, though with the careful application of hormones, the potency age can practically be controlled.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Precocious Puberty", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("While most girls will grow fertile around $fertilityAge and most boys will become virile around $potencyAge, the mass prevalence of male and female hormones in the Free Cities can have extreme effects on a developing slave's puberty. Hormone injections and hormonal based drugs can lead to early puberty or even delay it indefinitely, something some trainers use to their advantage in keeping their male slaves soft and feminine.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Cradle Robbers", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("A specialized group of slavers focusing entirely on capturing girls that have not had their first period. Disliked in many arcologies, they only appear before those they feel they can", App.Encyclopedia.link("trust", "Trust", "mediumaquamarine"), "as being sympathetic to their views.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("The Incubation Facility", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("A facility used to rapidly age children kept within its aging tanks using a combination of growth hormones, accelerants, stem cells and other chemicals; slaves that come out of it are rarely healthy. The Incubator requires a massive amount of electricity to run, though once powered contains a battery backup that can last at least a day. It can be upgraded to combat malnutrition and thinness caused by a body growing far beyond any natural rate. Hormones can also be added to encourage puberty and even sex organ development. Growth control systems include cost saving overrides, though enabling them may result in bloated, sex crazed slaves barely capable of moving.");
+ r.toNode("div");
+
+ App.Events.addNode(f, ["Please click", App.Encyclopedia.link("here", "Facilities Overview"), "for an overview of other facilities."], "p");
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("FCTV Receiver", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("While nearly indistinguishable from a standard satellite antenna, the satellite dish used to receive FCTV-Citizen content is special because of the unique FCTV Receiver.");
+ r.push("Utilizing the latest in matched-pair quantum encryption, it is the only device capable of decrypting and encrypting your arcology-specific FCTV content communication.");
+ r.push("Simple additions to your arcology's existing fiber optics extend the", App.Encyclopedia.link("FCTV"), "network to your citizens.");
+ r.push("In exchange for bearing the cost of the encrypted network, arcology owners get a certain level of control over available content for cultural purposes, and also discounted rates for local advertisement.");
+ r.toNode("div");
+ r.push("Some owners choose to have their citizens subsidize the installation: having them pay for fiber to their residence, or possibly even charging for a portion of the receiver. FCTV service experts warn that forcing citizens to bear too much of the cost usually results in angry citizens and many citizens who refuse to pay for access to the service. They suggest that it is in the best interests of FCTV and arcology owners alike to have greater service penetration, as low penetration results in less revenue for 8HGG Inc. and less advertising and cultural benefits for owners.");
+ r.toNode("p");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Catmod", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("Catmod is an optional modification that focuses on, surprise surprise, adding catgirls to the game. However, as you might have noticed, Free Cities is based on our own universe, and, unfortunately, catgirls don't actually exist. So how is one to acquire fuckable cats in a world sadly devoid of them? Well, multi-million dollar genetic engineering projects, of course! After a massive investment in your genelab and the best old world engineers available, you too will be able to create your very own inhuman abominations of science with cute, twitchy ears and button noses. Catgirls contain a number of mechanical changes and unique features, many of which you will have to find out for yourself through your exciting journey through the world of scientific malpractice. Worth noting for mechanical purposes, however, is that the", App.UI.DOM.makeElement("span", "Feline", ["note"]), "face type is only found on catgirls, and has a similar effect to exotic faces; uglier feline faces are dramatically worse, while beautiful feline faces are significantly better from a beauty perspective.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Catgirls", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("Part of humanity's dream for thousands of years. As far back as the Ancient Egyptians, humans have looked at the sleek and smug nature of cats, and imagined them as tall, busty catgirls with which they could fornicate. Yet all those men and women of the past lacked the capability to make their dreams come true; you, on the other hand, do not. While the process to splice human and cat DNA, whether you take from common housecats or the more dangerous coding of lion or panther genetics, will undoubtedly be arduous and expensive, the end result of a sleek, dexterous, inhumanly flexible creature that can wrap its tail around your throat as you fuck it is perhaps enough of a prize to make the difficulties worth it. To get started on engineering catgirls, you'll need to contact a team of genetic engineers from a fully upgraded genelab, and give them enough time and money to achieve results within your lab.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Bioengineering", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("With the technological advancements of 2037, society stands on the precipice of truly transhumanist biological engineering. Those with the will and the resources to get what they want, meaning you, are now uniquely capable of taking the fundamental code of DNA and using it as a building block to create and reshape biology as they desire. That doesn't mean the process of genetic engineering is going to be easy or simple; at minimum, you'll need a fully upgraded genelab and a team of professional, world-class scientists with the resources of a small nation at their disposal to get what you want. But once you've put all the pieces in place, the possibilities that can emerge from your engineering tubes are nearly endless.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Inflation", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("Future room for lore text");
+ r.toNode("div", ["note"]);
+
+ r.push("Choose a more particular entry below:");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Hyper-Pregnancy", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.Encyclopedia.topic("Hyper Pregnancy"), "refers to when a slave is carrying ten or more children in one pregnancy. It is largely unhealthy for a slave, and can lead to immobilization and even death, so be sure to keep your overfilled slaves happy and healthy. Due to the size of the pregnancy, a slaves abdomen is greatly stretched, causing it to sag after the pregnancy is complete. Surgery, time, or refilling the slave's belly will eliminate sag, if only temporary. Only achievable via powerful fertility agents researched through the dispensary.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Super Fertility Drugs", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.Encyclopedia.topic("Super Fertility Drugs"), "practically guarantee a slave will bear multiple children, and when combined with female hormones, will generally lead to hyper-pregnancy The also have the side effects of inducing lactation, increasing sex drive, and increasing attraction to men. Researched through the dispensary.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Pregnancy Generator", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("The", App.Encyclopedia.topic("Pregnancy Generator"), "is a small implant inserted into a slave's womb where it anchors itself and begins pumping the slave full of drugs and hormones with the intent to trick the slave's body into believing it both is and isn't pregnant. The slave's body will begin constantly releasing ovum that, once fertilized, will embed themselves into the uterine lining and begin growing. This will continue for as long as the implant is in place, regardless of how large the slave grows with children. Once the first set of infants is born, the implanted slave will give birth nearly a dozen times per week as her body continuously produces new offspring. Will likely lead to the slave's early death as her body will be consumed to feed her unending brood. Researched through the implant manufactory.");
+ r.toNode("div");
+
+ r.push("Extreme content must be enabled.");
+ r.toNode("div", ["yellow"]);
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Childbirth and C-Secs", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("Eventually a pregnant slave will need to give birth. Cesarean sections are an option should a slave's health not permit a safe natural birth, or should a slaveowner want to keep her from being stretched out by her newborn child. A healthy, well rested slave, with wide hips and some knowledge will generally find childbirth easy. Though poor health, tiredness, narrow hips, anorexia, tight vaginas, excessively young motherhood, and lack of experience can complicate things, potentially leading to the loss of both child and mother.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Surrogacy", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.Encyclopedia.topic("Surrogacy"), "is an arrangement whereby a woman agrees or is forced to become pregnant, carry the pregnancy to due term, and give birth to a child or children, all of this for another person or persons, who are or will ultimately become the parent(s) of the newborn child or children. There are two types of surrogacies: traditional and gestational (full). Traditional is mostly used by homosexual couples or if fertility treatments are too expensive. With the exception of societies that embraced Repopulationism or Gender Fundamentalism, full surrogacy is popular among free women, who want children, but don't want pregnancy to impact their careers or physical attributes. It created a market of living incubators — perfectly healthy slaves of safe age for carrying pregnancies with often little to no skills necessary for most other slaves.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Ova Transplantation", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.Encyclopedia.topic("Ova transplantation"), "is a procedure where an already fertilized ova is transplanted from one womb to another of the same species. It requires a remote surgery to perform and an advanced pregnancy monitoring systems to locate the egg, confirm the fertilization and determine that it happened less than four weeks ago, so that the ova is not too attached to the lining. Optimally the new host must be healthy and must not be already pregnant with large number of fetuses or hit menopause, but be old enough to carry children successfully.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Enemas and Force-Feeding", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("With the proper supplies ordered into your wardrobe, you can distend a slave's belly via enema leaving her notably rounded. Distended slaves are likely to feel discomfort, and if overfilled, face health complications. A standard enema is about 2 liters, though the adventurous may test their limits with a gallon, roughly 4 liters, or nearly burst themselves with a staggering 2 gallons, about 8 liters.");
+ r.toNode("div");
+
+ r.push("With a working dairy, pipes can be installed to pump fresh milk and cum directly to your penthouse to be used in inflating slaves. The dairy will have to be producing above a threshold to be able to pump said products into the penthouse. Slaves filled with milk and cum may face additional affects, including", App.Encyclopedia.link("weight gain", "Weight"), ", rejection and obsession of food.");
+ r.toNode("p");
+
+ r.push("A final theoretical method involves using another slave as the source of fluid, though she would have to be capable of producing a monumental amount of milk or cum.");
+ r.toNode("p");
+
+ r.push("A trio of medical enemas can be purchased after basic enema supplies are acquired.");
+ r.toNode("p");
+
+ r.push("Curatives to promote slave health.");
+ r.toNode("div", ["indent"]);
+ r.push("Aphrodisiacs to drive them wild.");
+ r.toNode("div", ["indent"]);
+ r.push("Tighteners to make their holes like new.");
+ r.toNode("div", ["indent"]);
+
+ r.push("Force feeding is far simpler; you just force the slave to consume food or drink until you are satisfied. All that is needed is enough to feed them and a vessel to store it in in the interim.");
+ r.toNode("p");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Belly Implants", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("A fillable implant inserted into a slave's uterus following tube tying to prevent ovulation. Can safely be filled with 200cc each week to simulate a growing pregnancy. However, if kept at a full term size (or higher), the slave's body may adjust to the implant causing issues upon removal. Also to note, a slave that lacks a uterus to hold the implant can still be implanted; invasive surgery will be preformed to create a pocket to safely hold the implant without damage to the slave's internals.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Player Pregnancy", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("Sexual intercourse ending with ejaculation into a fertile cunt ends with a chance of pregnancy. Since arcology owners are expected to be masculine, being pregnant ruins that image. Female arcology owners displaying their pregnancies should expect to face public backlash for it. Luckily, pregnancies are easily prevented via contraceptives and easily dealt with via abortions; a pregnant arcology owner has plenty of means to maintain their image before it becomes a problem.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Cervix Micropump Filter", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("An implant inserted into a slave's cervix and linked with a fillable belly implant. Converts a portion of semen into usable filler and pumps said substance into the attached implant resulting in a slow, steady increase in size. Once the pressure in the implant reaches a set threshold, filler is outputted by the pump, maintaining the implant's size. Research is currently underway to see if the tubing can be effectively extended to pump filler into fillable butt and breast implants.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Eugenics Breeding Proposal", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("Eugenics frowns on reproducing with the lower classes, but what about those with good genes that ended up caught in said classes? Would it not make sense to use them as breeders? With the Eugenics Breeding Proposal*, one can propose the use of well-bred slaves as bearers of societies finest children. *Success not guaranteed, some terms and conditions may apply, ask your local Elites for more information.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Gestation Drugs and Labor Suppressants", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("Not all drugs are applied directly to your slavegirl. In this case, gestation accelerants and retardants are passed through the mother into her unborn children to control the rate of fetal growth. While slightly unhealthy for the mother, gestation slowing drugs are relatively harmless, though an unwilling mother may become more distraught when she realizes her pregnancy will last even longer. Due to the extended duration of the pregnancy, the mother's body may become accustomed to being so round, leading towards a sagging middle once birth occurs. On the other hand, gestation hastening drugs are extremely dangerous to the mother. It is strongly recommended to keep her under the observation and care of an experienced doctor or nurse. Failure to do so will cause her body to struggle to keep up with the rate of growth of her children, harming her physical and mental health, as well as potentially bursting her uterus later in her pregnancy. Labor suppressants are exactly that; they prevent the mother from entering labor, thus allowing the child to grow longer than a normal pregnancy. Excessive use may lead to health complications, especially during childbirth, though going even further may result in the slave's body suddenly entering labor and rapidly birthing her children, often without giving the slave time to prepare or even get undressed.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Organic Mesh Breast Implant", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("A specialized organic implant produced from the dispensary designed to be implanted into to a slave's natural breast tissue to maintain a slave's breast shape no matter how big her breasts may grow. An expensive and risky procedure proportional to the size of the breasts the mesh will be implanted into. Should health become an issue, the slave in surgery may undergo an emergency mastectomy. Furthermore, once implanted, the mesh cannot be safely removed from the breast. However, total breast removal will rid the slave of the implant; consider strongly when and if you want to implant the mesh before doing so. They are exceedingly difficult to identify once bound to the breast tissue, and combined with their natural shape, are often overlooked.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Repopulationist Breeding School", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("With the sheer number of children being brought into the world in the average Repopulationist society, society had to come up with a way to rear them all. Breeding schools are publicly funded institutions devoted to raising children into future breeders. Their hormone levels are carefully managed both to encourage early puberty and to maximize fertility. Once a class has become sexual active, boys and girls are encouraged to pair off and explore each other's bodies. Virginities are quickly lost, and more often than not, girls find themselves pregnant, usually with multiples. The pairings, or groups should females outnumber males, are encouraged to stay together and form caring family-like units. In addition, girls are taught to enjoy and idolize motherhood, while boys are taught that it is their duty to mount and fuck any non-gravid slave girls they see until pregnancy is assured. Free women are encouraged to avoid the schools, lest they get pinned and gang raped by horny adolescents. While administration respects rape fetishists and their desire to have a rape baby, doing this sets a poor example to the impressionable youths and may lead to the rape and impregnation of other free women later on in their lives.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Slave Fertility", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(`When it comes to breeding your slaves, one must ask themselves; "Do I want a single child, or do I want to get her so pregnant she can barely ride me any longer?"`);
+ r.toNode("div");
+ r.push("Under normal circumstances, a slave will likely bear a single child from a pregnancy, but with a little extra help from a number of fertility boosting methods, that count can easily be pushed higher. While each fertility agent will only add a chance of an additional ovum, combining treatments will yield a cumulative effect, greatly enhancing the likelihood of multiples. One must exercise caution, however, as a slave's body can only support so many offspring without complications. Miscarriage, discarded embryos, and even slave death are all possible with excessive misuse of fertility agents.");
+ r.toNode("p");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Fertility Mix", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("A simple dietary blend designed to encourage ovulation. Fertile slaves will find themselves subconsciously lusting for loads of cum blasting into their pussies and, once they give in to temptation, will likely find their bellies swelling with twins or even triplets.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Breeders Dietary Blend", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("When it comes to slave breeding, the natural chance of conception is just too low for your profit margins. The Breeder's Dietary Blend is the end result of the quest to enhance fertility* and potency in slaves. Sperm will live longer and swim harder, eggs will readily implant post fertilization, and pregnancies will be robust and healthy. This diet tweak guarantees your slaves will be a reproductive bunch or your", App.Encyclopedia.link("money", "Money", "yellowgreen"), "back!**");
+ r.toNode("p");
+
+ r.push("*Twins became prevalent in test pairings. This is unintended behavior, but not an unwelcome one to the funders.");
+ r.toNode("div");
+ r.push("**Our guarantee does not cover slaveowners who underestimate their slaves' potency and wind up pregnant. ");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Artificial Insemination", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("A simple surgical procedure involving the injection of harvested sperm into a fertile womb. Useful for assuring the conception of a child of the desired union, impregnation without sexual intercourse, circumventing physical and mental quirks in copulation, or just finding the perfect Virgin Mary for the holidays.");
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Cloning", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(`A surgical procedure requiring the gene lab that injects the DNA of an individual into an viable egg cell which is then carried to term in a fertile womb. Will create a child with the basic physical traits of the person they are cloned from. While clones will likely be identical to each other, they are unlikely to bear more than a passing resemblance to the person their DNA was harvested from; for that to occur, they would need to be raised in almost the same way. They will, however, be a genetic match with their "parent".`);
+ r.toNode("div");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addArticle("Inbreeding", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("At the intersection of incest and pregnancy lies inbreeding. As seen in royal families throughout history, high levels of inbreeding can result in severe issues, often manifesting as facial deformities or reduced intellectual capacity.");
+ r.toNode("div");
+
+ r.push("One metric for quantifying inbreeding is the coefficient of inbreeding (CoI), which is the probability that both copies of a person's genes come from the same common ancestor.");
+ r.push("For example, without any previous inbreeding a child from self-fertilization has a CoI of 0.5, a child of two full siblings has a CoI of 0.25, and a child of two first cousins has a CoI of 0.0625.");
+ r.toNode("p");
+
+ r.push("Enterprising breeders trying to breed specific traits should be mindful of the inbreeding coefficients of their stock: the higher the coefficient, the higher the chance that children will be slow or deformed.");
+ r.toNode("p");
+
+ return f;
+}, "Mods");
+
+App.Encyclopedia.addCategory("Mods", function() {
+ const f = new DocumentFragment();
+ const r = [];
+ if (V.encyclopedia !== "Mods/Pregmod") {
+ App.Events.addNode(f, [App.Encyclopedia.link("Overview of Mods/Pregmod", "Mods/Pregmod")], "div");
+ }
+ App.Events.addNode(f, ["Catmod:", App.UI.DOM.generateLinksStrip([App.Encyclopedia.link("Details", "Catmod"), App.Encyclopedia.link("Lore", "Catgirls")])], "div");
+ App.Events.addNode(f, ["Special Force Mod:", App.UI.DOM.generateLinksStrip([App.Encyclopedia.link("Details", "Special Force")])], "div");
+ App.Events.addNode(f, ["Security Expansion Mod:", App.UI.DOM.generateLinksStrip([App.Encyclopedia.link("Details", "Security Expansion"), App.Encyclopedia.link("Battles")])], "div");
+
+ if ((V.pedo_mode === 0 && V.ui === "start") || V.pedo_mode) {
+ r.push(App.Encyclopedia.link("Loli Mode"));
+ r.push(App.Encyclopedia.link("Lolis and the Free Cities"));
+ }
+ r.push(App.Encyclopedia.link("Childhood Fertility Induced NCS"));
+ r.push(App.Encyclopedia.link("FCTV"));
+ r.push(App.Encyclopedia.link("FCTV Receiver"));
+ r.push(App.Encyclopedia.link("Breeders Dietary Blend"));
+ r.push(App.Encyclopedia.link("Fertility Mix"));
+ r.push(App.Encyclopedia.link("Fertility Age"));
+ r.push(App.Encyclopedia.link("Slave Fertility"));
+ r.push(App.Encyclopedia.link("Male Fertility"));
+ r.push(App.Encyclopedia.link("Super Fertility Drugs"));
+ r.push(App.Encyclopedia.link("Precocious Puberty"));
+ r.push(App.Encyclopedia.link("Hyper-Pregnancy"));
+ r.push(App.Encyclopedia.link("Player Pregnancy"));
+ r.push(App.Encyclopedia.link("Pregnancy Generator"));
+ r.push(App.Encyclopedia.link("Childbirth and C-Secs"));
+ r.push(App.Encyclopedia.link("Artificial Insemination"));
+ r.push(App.Encyclopedia.link("Gestation Drugs and Labor Suppressants"));
+ r.push(App.Encyclopedia.link("Bioengineering"));
+ r.push(App.Encyclopedia.link("Cloning"));
+ r.push(App.Encyclopedia.link("Surrogacy"));
+ r.push(App.Encyclopedia.link("Ova Transplantation"));
+ r.push(App.Encyclopedia.link("Cradle Robbers"));
+ r.push(App.Encyclopedia.link("The Incubation Facility"));
+ r.push(App.Encyclopedia.link("Repopulationist Breeding School"));
+ r.push(App.Encyclopedia.link("Eugenics Breeding Proposal"));
+ r.push(App.Encyclopedia.link("Inflation"));
+ r.push(App.Encyclopedia.link("Enemas and Force-Feeding"));
+ r.push(App.Encyclopedia.link("Belly Implants"));
+ r.push(App.Encyclopedia.link("Cervix Micropump Filter"));
+ r.push(App.Encyclopedia.link("Organic Mesh Breast Implant"));
+ r.push(App.Encyclopedia.link("Inbreeding"));
+ App.Events.addNode(f, ["Pregmod:", App.UI.DOM.generateLinksStrip(r)], "p");
+
+ return f;
+});
diff --git a/src/gui/Encyclopedia/encyclopediaObtainingSlaves.js b/src/gui/Encyclopedia/encyclopediaObtainingSlaves.js
index c382498555f3b14441e13fd774d7a11c993176a4..12a00ae61cc711936b735f4c6ed39cd510d82352 100644
--- a/src/gui/Encyclopedia/encyclopediaObtainingSlaves.js
+++ b/src/gui/Encyclopedia/encyclopediaObtainingSlaves.js
@@ -1,6 +1,6 @@
App.Encyclopedia.addArticle("Obtaining Slaves", function() {
const f = new DocumentFragment();
- App.UI.DOM.appendNewElement("p", f, "Future room for lore text", "note");
+ App.UI.DOM.appendNewElement("p", f, "Future room for lore text", ["note"]);
App.UI.DOM.appendNewElement("p", f, "Choose a more particular entry below:");
return f;
}, "obtainingSlaves");
@@ -93,9 +93,9 @@ App.Encyclopedia.addArticle("Discarded Slaves", function() {
r = [];
r.push("These slaves which have lost their value are often simply culled from the owners' herds, but may also be sold through");
- r.push(App.Encyclopedia.Dialog.linkDOM("the Flesh Heap", "The Flesh Heap"));
+ r.push(App.Encyclopedia.link("the Flesh Heap"));
r.push("as discount merchandise for new or cash-strapped slaveowners who can wring some final use out of them. Their new owners may end up using them as discount whores,");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("living sex toys", "Fuckdolls"), ","));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("living sex toys", "Fuckdolls"), ","));
r.push("or for medical testing.");
App.Events.addParagraph(f, r);
@@ -131,7 +131,7 @@ App.Encyclopedia.addArticle("The Job Fulfillment Center", function() {
r = [];
r.push("If you are looking for a slave qualified for a specific role, look no further than the Traders Union that makes up the Job Fulfillment Center. Leave the job description and a list of desired traits and before long a suitable slave will be delivered to your doorstep and ready to serve you. Due to the nature of the business, these slaves are not");
- r.push(App.Encyclopedia.Dialog.linkDOM("cheap", "Money", "cash"));
+ r.push(App.Encyclopedia.link("cheap", "Money", "cash"));
r.push("and usually not perfect, but they always fulfill their job adequately and obediently.");
App.Events.addParagraph(f, r);
@@ -149,17 +149,17 @@ App.Encyclopedia.addArticle("Wetware CPUs", function() {
App.Encyclopedia.addCategory("obtainingSlaves", function() {
const r = [];
- r.push(App.Encyclopedia.Dialog.linkDOM("Kidnapped Slaves", "Kidnapped Slaves"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Slave Schools", "Slave Schools"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Stables", "Stables"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Household Liquidations", "Household Liquidations"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Direct Sales", "Direct Sales"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Pre-Owned Slaves", "Pre-Owned Slaves"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Random Events", "Random Events"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Discarded Slaves", "Discarded Slaves"));
- r.push(App.Encyclopedia.Dialog.linkDOM("The Flesh Heap", "The Flesh Heap"));
- r.push(App.Encyclopedia.Dialog.linkDOM("The Job Fulfillment Center", "The Job Fulfillment Center"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Wetware CPUs", "Wetware CPUs"));
- r.push(App.Encyclopedia.Dialog.linkDOM("The Corporation", "The Corporation"));
+ r.push(App.Encyclopedia.link("Kidnapped Slaves"));
+ r.push(App.Encyclopedia.link("Slave Schools"));
+ r.push(App.Encyclopedia.link("Stables"));
+ r.push(App.Encyclopedia.link("Household Liquidations"));
+ r.push(App.Encyclopedia.link("Direct Sales"));
+ r.push(App.Encyclopedia.link("Pre-Owned Slaves"));
+ r.push(App.Encyclopedia.link("Random Events"));
+ r.push(App.Encyclopedia.link("Discarded Slaves"));
+ r.push(App.Encyclopedia.link("The Flesh Heap"));
+ r.push(App.Encyclopedia.link("The Job Fulfillment Center"));
+ r.push(App.Encyclopedia.link("Wetware CPUs"));
+ r.push(App.Encyclopedia.link("The Corporation"));
return App.UI.DOM.generateLinksStrip(r);
});
diff --git a/src/gui/Encyclopedia/encyclopediaParaphilias.js b/src/gui/Encyclopedia/encyclopediaParaphilias.js
new file mode 100644
index 0000000000000000000000000000000000000000..71a17ef38161ce4f0fdc67af4075058954115cca
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaParaphilias.js
@@ -0,0 +1,136 @@
+App.Encyclopedia.addArticle("Paraphilias Overview", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Paraphilias", ["bold"]), "are intense forms of sexual", App.Encyclopedia.link("flaws", "Flaws"), "that cannot be softened.");
+ r.push("Slaves with a paraphilia excel at certain jobs, but may suffer penalties at others.");
+ r.toParagraph();
+
+ App.Events.addNode(f, ["Choose a more particular entry below:"], "div");
+ return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Abusiveness", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Abusiveness", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.link("flaw", "Flaws"), "that cannot be softened.");
+ r.toParagraph();
+
+ r.push(App.Encyclopedia.link("Doms"), "serving as", App.Encyclopedia.link("Head Girls"));
+ r.push("may become abusive if allowed to punish slaves by molesting them. They can be satisfied by work as the Head Girl or", App.Encyclopedia.link("Wardeness"), ". Abusive Head Girls are more effective when allowed or encouraged to punish slaves severely.");
+ r.toParagraph();
+ return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Anal Addicts", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Anal addiction", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.link("flaw", "Flaws"), "that cannot be softened.");
+ r.toParagraph();
+
+ r.push(App.Encyclopedia.link("Buttsluts"), "whose only available hole for receptive intercourse is the anus may become anal addicts. They can be satisfied by huge buttplugs, the sodomizing drug applicator kitchen upgrade, or by work that involves frequent anal sex. Anal addicts perform well on assignments involving anal sex.");
+ r.toParagraph();
+ return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Attention Whores", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Attention Whores", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.link("flaw", "Flaws"), "that cannot be softened.");
+ r.toParagraph();
+
+ r.push(App.Encyclopedia.link("Humiliation Fetishists"), "on public sexual assignments may become Attention Whores. They can be satisfied by total nudity or by work that involves frequent public sex. Attention whores do very well at");
+ r.push(App.Encyclopedia.link("public service", "Public Service"));
+ r.addToLast(".");
+ r.toParagraph();
+ return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Breast Obsession", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Pectomania,", ["bold"]), "also known as breast growth obsession, is a paraphilia, an intense form of sexual", App.Encyclopedia.link("flaw", "Flaws"), "that cannot be softened.");
+ r.toParagraph();
+
+ r.push(App.Encyclopedia.link("Boob fetishists", "Boob Fetishists"), "may become obsessed with breast expansion as their breasts grow. They can be satisfied by breast injections or work as a cow, and will temporarily accept getting neither if their health is low.");
+ r.toParagraph();
+ return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Breeding Obsession", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Breeding obsession", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.link("flaws"), "that cannot be softened.");
+ r.toParagraph();
+
+ r.push(App.Encyclopedia.link("Pregnancy Fetishists"), "who are repeatedly bred or are serving in an industrialized");
+ r.push(App.Encyclopedia.link("Dairy"), "may develop breeding obsessions. They can be satisfied by pregnancy, or constant vaginal sex with their owner. Slaves with breeding obsessions will not suffer negative mental effects from serving in an industrialized dairy that keeps them pregnant.");
+ r.toParagraph();
+ return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Cum Addicts", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Cum addiction", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.link("flaws"), "that cannot be softened.");
+ r.toParagraph();
+
+ r.push(App.Encyclopedia.link("Cumsluts"), "who eat out of phallic feeders or are fed cum may become cum addicts. They can be satisfied by cum diets, the phallic feeder kitchen upgrade, or by sex work that involves frequent fellatio. Cum addicts will perform well on assignments involving oral sex.");
+ r.toParagraph();
+ return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Maliciousness", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("Sexual", App.UI.DOM.makeElement("span", "maliciousness", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.link("flaws"), "that cannot be softened.");
+ r.toParagraph();
+
+ r.push(App.Encyclopedia.link("Sadists"), "serving as", App.Encyclopedia.link("Wardeness"), "may become sexually malicious.");
+ r.push("They can be satisfied by work as the", App.Encyclopedia.link("Head Girl"), "or", App.Encyclopedia.link("Wardeness.", "Wardeness"));
+ r.push("Sexually malicious Wardenesses break slaves very quickly but damage their sex drives doing so.");
+ r.toParagraph();
+ return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Self Hatred", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span","self hatred", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.link("flaws"), "that cannot be softened.");
+ r.toParagraph();
+
+ r.push("Self hating slaves can be satisfied by work in an industrialized dairy, in an arcade, or in a glory hole, and will not suffer negative mental effects for doing so.");
+ r.push(App.Encyclopedia.link("Masochists"), "serving in those places have a chance to become self hating, and even extremely low");
+ r.push(App.Encyclopedia.link("trust", "Trust", "mediumaquamarine"), "may cause the paraphilia.");
+ r.toParagraph();
+ return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Self Neglect", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push("Sexual", App.UI.DOM.makeElement("span", "self neglect", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.link("flaws"), "that cannot be softened.");
+ r.toParagraph();
+
+ r.push(App.Encyclopedia.link("Submissives"), "serving on public sexual assignment may become sexually self neglectful.");
+ r.push("Such slaves can be satisfied by most kinds of sex work.");
+ r.push("Slaves willing to neglect their own pleasure do very well at", App.Encyclopedia.link("whoring", "Whoring"));
+ r.addToLast(".");
+ r.toParagraph();
+ return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addCategory("Paraphilias", function() {
+ const r = [];
+ r.push(App.Encyclopedia.link("Paraphilias Overview"));
+ r.push(App.Encyclopedia.link("Abusiveness"));
+ r.push(App.Encyclopedia.link("Anal Addicts"));
+ r.push(App.Encyclopedia.link("Attention Whores"));
+ r.push(App.Encyclopedia.link("Breast Obsession"));
+ r.push(App.Encyclopedia.link("Breeding Obsession"));
+ r.push(App.Encyclopedia.link("Cum Addicts"));
+ r.push(App.Encyclopedia.link("Maliciousness"));
+ r.push(App.Encyclopedia.link("Self Hatred"));
+ r.push(App.Encyclopedia.link("Self Neglect"));
+ r.push(App.Encyclopedia.link("Fetishes"));
+ return App.UI.DOM.generateLinksStrip(r);
+});
diff --git a/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw b/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw
deleted file mode 100644
index c978fa01c796bd566d216a5540dcde3d80c2d784..0000000000000000000000000000000000000000
--- a/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw
+++ /dev/null
@@ -1,368 +0,0 @@
-:: Related Links [nobr]
-
-/* pages asking the player to click a link for more information have no section heading */
-<<if !["Being in Charge", "Body", "Fetishes", "Game Mods", "Inflation", "Leadership Positions", "Lolimod", "Lore", "Obtaining Slaves", "Paraphilias", "Playing Free Cities", "Skills", "Slave Assignments", "Slave Modification", "Slaves", "Terrain Types", "The X-Series Arcology"].includes($encyclopedia)>>
- <br><h3>Related Links</h3>
-<</if>>
-
-
-<<set _pass = App.Encyclopedia.renderCategory($encyclopedia)>>
-<<if _pass>>
- <<includeDOM _pass>>
-<<else>>
-
-<<switch $encyclopedia>>
-
-/**********
-SLAVE LEADERS:
-**********/
-<<case "Attendant" "Bodyguard" "Career Experience" "Concubine" "DJ" "Farmer" "Head Girl" "Leadership Positions" "Madam" "Matron" "Milkmaid" "Nurse" "Recruiter" "Schoolteacher" "Stewardess" "Wardeness">>
- <<= App.Encyclopedia.Dialog.linkSC("Leadership Positions", "Leadership Positions")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Career Experience", "Career Experience")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Attendant", "Attendant")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Bodyguard", "Bodyguard")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Concubine", "Concubine")>>
- | <<= App.Encyclopedia.Dialog.linkSC("DJ", "DJ")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Farmer", "Farmer")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Head Girl", "Head Girl")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Madam", "Madam")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Matron", "Matron")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Milkmaid", "Milkmaid")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Nurse", "Nurse")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Recruiter", "Recruiter")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Schoolteacher", "Schoolteacher")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Stewardess", "Stewardess")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Wardeness", "Wardeness")>>
-
-/**********
-SLAVE SKILLS
-**********/
-<<case "Anal Skill" "Combat Skill" "Entertainment Skill" "Oral Skill" "Skills" "Vaginal Skill" "Whoring Skill">>
- <<= App.Encyclopedia.Dialog.linkSC("Anal Skill", "Anal Skill")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Combat Skill", "Combat Skill")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Entertainment Skill", "Entertainment Skill")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Oral Skill", "Oral Skill")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Vaginal Skill", "Vaginal Skill")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Whoring Skill", "Whoring Skill")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Career Experience", "Career Experience")>>
-
-/**********
-SLAVE FETISHES:
-**********/
-<<case "Boob Fetishists" "Buttsluts" "Cumsluts" "Doms" "Fetishes" "Humiliation Fetishists" "Masochists" "Pregnancy Fetishists" "Sadists" "Submissives">>
- <<= App.Encyclopedia.Dialog.linkSC("Boob Fetishists", "Boob Fetishists")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Buttsluts", "Buttsluts")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Cumsluts", "Cumsluts")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Doms", "Doms")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Humiliation Fetishists", "Humiliation Fetishists")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Masochists", "Masochists")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Pregnancy Fetishists", "Pregnancy Fetishists")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Sadists", "Sadists")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Submissives", "Submissives")>>
-
-/**********
-SLAVE PARAPHILIAS
-**********/
-<<case "Abusiveness" "Anal Addicts" "Attention Whores" "Breast Obsession" "Breeding Obsession" "Cum Addicts" "Maliciousness" "Paraphilias" "Self Hatred" "Self Neglect">>
- <<= App.Encyclopedia.Dialog.linkSC("Abusiveness", "Abusiveness")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Anal Addicts", "Anal Addicts")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Attention Whores", "Attention Whores")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Breast Obsession", "Breast Obsession")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Breeding Obsession", "Breeding Obsession")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Cum Addicts", "Cum Addicts")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Maliciousness", "Maliciousness")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Self Hatred", "Self Hatred")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Self Neglect", "Self Neglect")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Fetishes", "Fetishes")>>
-
-/**********
-SLAVE QUIRKS
-**********/
-<<case "Adores Men" "Adores Women" "Advocate" "Confident" "Cutting" "Fitness" "Funny" "Insecure" "Sinful" "Caring" "Gagfuck Queen" "Painal Queen" "Perverted" "Quirks" "Romantic" "Size Queen" "Strugglefuck Queen" "Tease" "Unflinching">>
- //Behavioral <<= App.Encyclopedia.Dialog.linkSC("Quirks", "Quirks")>>://
- <<= App.Encyclopedia.Dialog.linkSC("Adores men", "Adores Men")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Adores women", "Adores Women")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Advocate", "Advocate")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Confident", "Confident")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Cutting", "Cutting")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Fitness", "Fitness")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Funny", "Funny")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Insecure", "Insecure")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Sinful", "Sinful")>>
-
- <br>
- //Sexual <<= App.Encyclopedia.Dialog.linkSC("Quirks", "Quirks")>>://
- <<= App.Encyclopedia.Dialog.linkSC("Caring", "Caring")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Gagfuck Queen", "Gagfuck Queen")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Painal Queen", "Painal Queen")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Perverted", "Perverted")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Romantic", "Romantic")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Size Queen", "Size Queen")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Strugglefuck Queen", "Strugglefuck Queen")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Tease", "Tease")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Unflinching", "Unflinching")>>
-
-/**********
-SLAVE FLAWS
-**********/
-<<case "Anorexic" "Arrogant" "Bitchy" "Devout" "Flaws" "Gluttonous" "Hates Men" "Hates Women" "Liberated" "Odd" "Apathetic" "Crude" "Hates Anal" "Hates Oral" "Hates Penetration" "Idealistic" "Judgemental" "Repressed" "Shamefast">>
- //Behavioral <<= App.Encyclopedia.Dialog.linkSC("Flaws", "Flaws")>>://
- <<= App.Encyclopedia.Dialog.linkSC("Anorexic", "Anorexic")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Arrogant", "Arrogant")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Bitchy", "Bitchy")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Devout", "Devout")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Gluttonous", "Gluttonous")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Hates men", "Hates Men")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Hates women", "Hates Women")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Liberated", "Liberated")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Odd", "Odd")>>
-
- <br>
- //Sexual <<= App.Encyclopedia.Dialog.linkSC("Flaws", "Flaws")>>://
- <<= App.Encyclopedia.Dialog.linkSC("Apathetic", "Apathetic")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Crude", "Crude")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Hates anal", "Hates Anal")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Hates oral", "Hates Oral")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Hates penetration", "Hates Penetration")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Idealistic", "Idealistic")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Judgemental", "Judgemental")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Repressed", "Repressed")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Shamefast", "Shamefast")>>
-
-/**********
-SLAVE RELATIONSHIPS
-**********/
-<<case "Emotional Slut" "Emotionally Bonded" "Relationships" "Rivalries" "Romances" "Slave Marriages" "Slaveowner Marriages">>
- <<= App.Encyclopedia.Dialog.linkSC("Relationships", "Relationships")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Rivalries", "Rivalries")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Romances", "Romances")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Emotionally Bonded", "Emotionally Bonded")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Emotional Slut", "Emotional Slut")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Slave Marriages", "Slave Marriages")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Slaveowner Marriages", "Slaveowner Marriages")>>
-
-/**********
-PREGNANCY
-**********/
-<<case "Artificial Insemination" "Breeders Dietary Blend" "Childbirth and C-Secs" "Cloning" "Fertility Mix" "Gestation Drugs and Labor Suppressants" "Hyper-Pregnancy" "Ova Transplantation" "Player Pregnancy" "Pregnancy" "Pregnancy Generator" "Slave Fertility" "Super Fertility Drugs" "Surrogacy" "Inbreeding">>
- <<= App.Encyclopedia.Dialog.linkSC("Pregnancy", "Pregnancy")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Slave Fertility", "Slave Fertility")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Player Pregnancy", "Player Pregnancy")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Hyper-Pregnancy", "Hyper-Pregnancy")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Super Fertility Drugs", "Super Fertility Drugs")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Fertility Mix", "Fertility Mix")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Breeders Dietary Blend", "Breeders Dietary Blend")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Pregnancy Generator", "Pregnancy Generator")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Childbirth and C-Secs", "Childbirth and C-Secs")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Gestation Drugs and Labor Suppressants", "Gestation Drugs and Labor Suppressants")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Artificial Insemination", "Artificial Insemination")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Surrogacy", "Surrogacy")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Cloning", "Cloning")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Ova Transplantation", "Ova Transplantation")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Eugenics Breeding Proposal", "Eugenics Breeding Proposal")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Repopulationist Breeding School", "Repopulationist Breeding School")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Inbreeding", "Inbreeding")>>
-
-/**********
-INFLATION
-**********/
-<<case "Belly Implants" "Cervix Micropump Filter" "Enemas and Force-Feeding" "Inflation" "Organic Mesh Breast Implant">>
- <<= App.Encyclopedia.Dialog.linkSC("Inflation", "Inflation")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Enemas and Force-Feeding", "Enemas and Force-Feeding")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Belly Implants", "Belly Implants")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Cervix Micropump Filter", "Cervix Micropump Filter")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Organic Mesh Breast Implant", "Organic Mesh Breast Implant")>>
-
-/**********
-SLAVE MODIFICATION
-**********/
-<<case "Slave Modification">>
- <<= App.Encyclopedia.Dialog.linkSC("Slave Modification", "Slave Modification")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Corrective Diet", "Corrective Diet")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Nipple Conversion — Penetratable", "Nipple Conversion — Penetratable")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Ejaculation Boosting Prostate Implant", "Ejaculation Boosting Prostate Implant")>>
-
-/**********
-THE X-SERIES ARCOLOGY
-**********/
-<<case "Personal Assistant" "Security Drones" "Slave Nutrition" "The Auto Salon" "The Pharmaceutical Fab." "The Remote Surgery" "The Studio" "The Wardrobe" "The X-Series Arcology" "Water Filtration" "What the Upgrades Do">>
- <<= App.Encyclopedia.Dialog.linkSC("What the Upgrades Do", "What the Upgrades Do")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Personal Assistant", "Personal Assistant")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Wardrobe", "The Wardrobe")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Auto Salon", "The Auto Salon")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Body Mod Studio", "The Studio")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Remote Surgery", "The Remote Surgery")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Pharmaceutical Fab.", "The Pharmaceutical Fab.")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Security Drones", "Security Drones")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Water Filtration", "Water Filtration")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Slave Nutrition", "Slave Nutrition")>>
-
-/**********
-ARCOLOGY FACILITIES
-**********/
-<<case "Advertising" "Arcade" "Brothel" "Cellblock" "Clinic" "Club" "Dairy" "Facilities" "Farmyard" "Head Girl Suite" "Master Suite" "Nursery" "Pit" "Schoolroom" "Servants' Quarters" "Spa" "The Incubation Facility" "Variety">>
- //Arcology <<= App.Encyclopedia.Dialog.linkSC("Facilities", "Facilities")>>://
- <<= App.Encyclopedia.Dialog.linkSC("Arcade", "Arcade")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Brothel", "Brothel")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Cellblock", "Cellblock")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Clinic", "Clinic")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Club", "Club")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Dairy", "Dairy")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Head Girl Suite", "Head Girl Suite")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Master Suite", "Master Suite")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Pit", "Pit")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Schoolroom", "Schoolroom")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Servants' Quarters", "Servants' Quarters")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Spa", "Spa")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Nursery", "Nursery")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Farmyard", "Farmyard")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Incubation Facility ", "The Incubation Facility")>>
-
- <br>
- //Facility Bonuses://
- <<= App.Encyclopedia.Dialog.linkSC("Advertising", "Advertising")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Variety", "Variety")>>
-
-/**********
-TERRAIN TYPES
-**********/
-<<case "Terrain Types" "Urban Terrain" "Rural Terrain" "Marine Terrain" "Oceanic Terrain">>
- <<= App.Encyclopedia.Dialog.linkSC("Urban", "Urban Terrain")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Rural", "Rural Terrain")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Marine", "Marine Terrain")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Oceanic", "Oceanic Terrain")>>
-
-/**********
-FUTURE SOCIETIES
-**********/
-<<case "Arabian Revivalism" "Asset Expansionism" "Aztec Revivalism" "Body Purism" "Chattel Religionism" "Chinese Revivalism" "Degradationism" "Edo Revivalism" "Egyptian Revivalism" "Ethnic Subjugationism" "Ethnic Supremacy" "Eugenics Focus" "Future Societies" "Gender Fundamentalism" "Gender Radicalism" "Hedonistic Decadence" "Intellectual Dependency" "Maturity Preferentialism" "Multiculturalism" "Pastoralism" "Paternalism" "Petite Admiration" "Physical Idealism" "Repopulationism" "Roman Revivalism" "Slave Professionalism" "Slimness Enthusiasm" "Statuesque Glorification" "Transformation Fetishism" "Youth Preferentialism" "Neo-Imperialism">>
- //Vanilla Future Societies://
- <<= App.Encyclopedia.Dialog.linkSC("Ethnic Supremacy", "Ethnic Supremacy")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Ethnic Subjugationism", "Ethnic Subjugationism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Gender Radicalism", "Gender Radicalism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Gender Fundamentalism", "Gender Fundamentalism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Paternalism", "Paternalism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Degradationism", "Degradationism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Body Purism", "Body Purism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Transformation Fetishism", "Transformation Fetishism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Maturity Preferentialism", "Maturity Preferentialism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Youth Preferentialism", "Youth Preferentialism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Slimness Enthusiasm", "Slimness Enthusiasm")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Asset Expansionism", "Asset Expansionism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Pastoralism", "Pastoralism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Physical Idealism", "Physical Idealism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Chattel Religionism", "Chattel Religionism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Multiculturalism", "Multiculturalism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Roman Revivalism", "Roman Revivalism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Egyptian Revivalism", "Egyptian Revivalism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Edo Revivalism", "Edo Revivalism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Arabian Revivalism", "Arabian Revivalism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Chinese Revivalism", "Chinese Revivalism")>>
-
- <br>
- //Modded Future Societies://
- <<= App.Encyclopedia.Dialog.linkSC("Repopulationism", "Repopulationism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Eugenics Focus", "Eugenics Focus")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Slave Professionalism", "Slave Professionalism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Intellectual Dependency", "Intellectual Dependency")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Petite Admiration", "Petite Admiration")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Statuesque Glorification", "Statuesque Glorification")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Hedonistic Decadence", "Hedonistic Decadence")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Aztec Revivalism", "Aztec Revivalism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Neo-Imperialism", "Neo-Imperialism")>>
-
-/**********
-LORE: THE FREE CITIES TODAY
-**********/
-<<case "Lore" "Money" "Food" "Disease in the Free Cities" "Free Cities Justice" "Modern Anal" "Slave Couture" "Slave Marriage" "The Ejaculate Market" "Gingering" "Dyes"
-/**********
-LORE: FREE CITIES CULTURE TOMORROW
-**********/
-"The New Rome" "The Return of Feudalism" "Naked, Barefoot, and Pregnant" "The Sons of Sekhmet" "The Top" "The Bottom" "The Purity of the Human Form" "A World Built on Implants" "Slaves as Stock" "Slavery and the Physical Ideal" "Faith in the Free Cities"
-/**********
-LORE: INTERVIEWS
-**********/
-"Slave Whore, Arcology K-2" "Slave Acolyte, Arcology V-7" "Public Slave, Arcology A-3" "Mercenary, Arcology B-2" "Slave Trainer, Arcology D-10" "Monarch, Arcology F-8">>
- //The Free Cities today://
- @@.yellowgreen; <<= App.Encyclopedia.Dialog.linkSC("Money", "Money")>>@@
- | <<= App.Encyclopedia.Dialog.linkSC("Disease in the Free Cities", "Disease in the Free Cities")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Free Cities Justice", "Free Cities Justice")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Modern Anal", "Modern Anal")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Slave Couture", "Slave Couture")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Slave Marriage", "Slave Marriage")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Ejaculate Market", "The Ejaculate Market")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Gingering", "Gingering")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Dyes", "Dyes")>>
-
- <br>//Free Cities culture tomorrow://
- <<= App.Encyclopedia.Dialog.linkSC("The New Rome", "The New Rome")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Return of Feudalism", "The Return of Feudalism")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Naked, Barefoot, and Pregnant", "Naked, Barefoot, and Pregnant")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Sons of Sekhmet", "The Sons of Sekhmet")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Top", "The Top")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Bottom", "The Bottom")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Purity of the Human Form", "The Purity of the Human Form")>>
- | <<= App.Encyclopedia.Dialog.linkSC("A World Built on Implants", "A World Built on Implants")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Slaves as Stock", "Slaves as Stock")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Slavery and the Physical Ideal", "Slavery and the Physical Ideal")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Faith in the Free Cities", "Faith in the Free Cities")>>
-
- <br>//Interviews://
- <<= App.Encyclopedia.Dialog.linkSC("Slave Whore, Arcology K-2", "Slave Whore, Arcology K-2")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Slave Acolyte, Arcology V-7", "Slave Acolyte, Arcology V-7")>>
- <<if $seeExtreme != 0>>
- | <<= App.Encyclopedia.Dialog.linkSC("Public Slave, Arcology A-3", "Public Slave, Arcology A-3")>>
- <</if>>
- | <<= App.Encyclopedia.Dialog.linkSC("Mercenary, Arcology B-2", "Mercenary, Arcology B-2")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Slave Trainer, Arcology D-10", "Slave Trainer, Arcology D-10")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Monarch, Arcology F-8", "Monarch, Arcology F-8")>>
-
-/**********
-BLACK MARKET
-**********/
-<<case "The Black Market" "Contraband and Illegal Goods" "Gender Radicalism Research" "Slave Professionalism Research" "Transformation Fetishism Research" "Asset Expansionist Research" "Slimness Enthusiast Research" "Hedonistic Decadence Research" "Eugenics Breeding Proposal" "Youth Preferentialism Research" "Repopulationist Breeding School">>
- <<= App.Encyclopedia.Dialog.linkSC("The Black Market", "The Black Market")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Contraband and Illegal Goods", "Contraband and Illegal Goods")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Gender Radicalism Research", "Gender Radicalism Research")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Slave Professionalism Research", "Slave Professionalism Research")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Transformation Fetishism Research", "Transformation Fetishism Research")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Asset Expansionist Research", "Asset Expansionist Research")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Slimness Enthusiast Research", "Slimness Enthusiast Research")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Youth Preferentialism Research", "Youth Preferentialism Research")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Hedonistic Decadence Research", "Hedonistic Decadence Research")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Childhood Fertility Induced NCS", "Childhood Fertility Induced NCS")>>
-
-/**********
-MODS
-**********/
-<<case "Game Mods">>
- <<= App.Encyclopedia.Dialog.linkSC("Lolimod", "Lolimod")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Special Force Mod", "Special Force")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Security Expansion Mod", "Security Expansion")>>
- | <<= App.Encyclopedia.Dialog.linkSC("FCTV", "FCTV")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Catmod", "Catmod")>>
-
-<<case "Lolimod" "Lolis and the Free Cities" "Fertility Age" "Male Fertility" "Cradle Robbers" "Precocious Puberty" "Childhood Fertility Induced NCS">>
- <<= App.Encyclopedia.Dialog.linkSC("Lolis and the Free Cities", "Lolis and the Free Cities")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Fertility Age", "Fertility Age")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Male Fertility", "Male Fertility")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Precocious Puberty", "Precocious Puberty")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Cradle Robbers", "Cradle Robbers")>>
- | <<= App.Encyclopedia.Dialog.linkSC("The Incubation Facility", "The Incubation Facility")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Childhood Fertility Induced NCS", "Childhood Fertility Induced NCS")>>
-
-<<case "Security Expansion" "Battles">>
- <<= App.Encyclopedia.Dialog.linkSC("The Security Expansion Mod", "Security Expansion")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Battles", "Battles")>>
-
-<<case "FCTV" "FCTVReceiver">>
- <<= App.Encyclopedia.Dialog.linkSC("FCTV", "FCTV")>>
- | <<= App.Encyclopedia.Dialog.linkSC("FCTVReceiver", "FCTVReceiver")>>
-
-<<case "Catmod" "Bioengineering" "Catgirls">>
- <<= App.Encyclopedia.Dialog.linkSC("Catmod", "Catmod")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Catgirls", "Catgirls")>>
- | <<= App.Encyclopedia.Dialog.linkSC("Bioengineering", "Bioengineering")>>
-
-<</switch>>
-<</if>>
diff --git a/src/gui/Encyclopedia/encyclopediaSlaveFlaws.js b/src/gui/Encyclopedia/encyclopediaSlaveFlaws.js
new file mode 100644
index 0000000000000000000000000000000000000000..d2910002fdf059a8d1bde6d7c3e1f648458fcd95
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaSlaveFlaws.js
@@ -0,0 +1,256 @@
+App.Encyclopedia.addArticle("Flaws", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Unflinching", ["bold"]), "are negative slave qualities.");
+ r.push("They decrease slaves' value and performance at sexual assignments, and each flaw also has other, differing effects. Each flaw is associated with a corresponding");
+ r.push(App.Encyclopedia.link("quirk", "Quirks"), ", and slave can have two flaws (a sexual flaw and a behavioral flaw), just like quirks. New slaves will often have flaws, and tough experiences can also cause them to appear.");
+ r.toParagraph();
+
+ r.push("Flaws can softened or removed either by orders given to the", App.Encyclopedia.link("Head Girl"), "or via personal attention provided by the player character.");
+ r.push("Flaws can also be naturally softened or removed by fetishes, and can resolve on their own if a slave is happy.");
+ r.toNode("div");
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Anorexic", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Anorexic", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("insecure"), App.UI.DOM.combineNodes(App.Encyclopedia.link("quirk", "Quirks"), "."));
+ r.push("In addition to the standard penalties to value and performance on sexual assignments, anorexia can cause unexpected weight loss. Anorexics will enjoy dieting but dislike gaining weight, and may bilk attempts to make them fatten up.");
+ r.toNode("div");
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Arrogant", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Arrogant", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("confident"), App.UI.DOM.combineNodes(App.Encyclopedia.link("quirk", "Quirks"), "."));
+ r.push("The", App.Encyclopedia.link("submissive", "Submissives"), "fetish fetish can do this naturally.");
+ r.push("In addition to the standard penalties to value and performance on sexual assignments, weekly", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "gains are limited.");
+ r.toNode("div");
+
+ r.toNode("div");
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Bitchy", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Bitchy", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("cutting"), App.UI.DOM.combineNodes(App.Encyclopedia.link("quirk", "Quirks"), "."));
+ r.push("The", App.Encyclopedia.link("humiliation", "Humiliation Fetishists"), "fetish fetish can do this naturally.");
+ r.push("In addition to the standard penalties to value and performance on sexual assignments, weekly", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "gains are limited.");
+ r.toNode("div");
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Devout", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Devout", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("sinful"), App.UI.DOM.combineNodes(App.Encyclopedia.link("quirk", "Quirks"), "."));
+ r.push("A very powerful sex drive can do this naturally.");
+ r.push("In addition to the standard penalties to value and performance on sexual assignments, weekly", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "gains are limited.");
+ r.toNode("div");
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Gluttonous", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Gluttonous", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("fitness"), App.UI.DOM.combineNodes(App.Encyclopedia.link("quirk", "Quirks"), "."));
+ r.push("In addition to the standard penalties to value and performance on sexual assignments, gluttons will enjoy gaining weight but dislike dieting, and may bilk attempts to make them lose weight.");
+ r.toNode("div");
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Hates men", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Hates men", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("adores women"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
+ r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("boob fetish.", "Boob Fetishists"));
+ r.push("Strong attraction to men or the", App.Encyclopedia.link("pregnancy fetish", "Pregnancy Fetishists"), "will soften it so she", App.Encyclopedia.link("adores men"), "instead.");
+ r.push("This flaw can also be removed by serving a player character or another slave with a dick.");
+ r.toNode("div");
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Hates women", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Hates women", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("adores men"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
+ r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("cumslut", "Cumsluts"), "fetish.");
+ r.push("Strong attraction to women or the", App.Encyclopedia.link("pregnancy fetish", "Pregnancy Fetishists"), "will soften it so she", App.Encyclopedia.link("Adores women"), "instead.");
+ r.push("This flaw can also be removed by serving a player character or another slave with a vagina.");
+ r.toNode("div");
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Liberated", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Liberated", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("advocate"), App.UI.DOM.combineNodes(App.Encyclopedia.link("quirk", "Quirks"), "."));
+ r.push("The", App.Encyclopedia.link("submissive", "Submissives"), "fetish can do this naturally.");
+ r.push("In addition to the standard penalties to value and performance on sexual assignments, weekly", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "gains are limited.");
+ r.toNode("div");
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Odd", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Odd", ["bold"]), "is a behavioral", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("funny"), App.UI.DOM.combineNodes(App.Encyclopedia.link("quirk", "Quirks"), "."));
+ r.push("The", App.Encyclopedia.link("humiliation", "Humiliation Fetishists"), "fetish can do this naturally.");
+ r.push("In addition to the standard penalties to value and performance on sexual assignments, weekly", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "gains are limited.");
+ r.toParagraph();
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Apathetic", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Apathetic", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("caring"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
+ r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("submissive", "Humiliation Submissive"), "fetish.");
+ r.push("It can also be removed by the", App.Encyclopedia.link("dom", "Doms"), "fetish.");
+ r.toParagraph();
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Crude", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Crude", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("unflinching"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
+ r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("cumslut", "Cumsluts"), "fetish.");
+ r.toParagraph();
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Hates anal", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Hates anal", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("painal queen"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
+ r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("buttslut", "Buttsluts"), "fetish.");
+ r.push("This flaw can also be removed by serving the player character.");
+ r.toParagraph();
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Hates oral", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Hates oral", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("gagfuck queen"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
+ r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("cumslut", "Cumsluts"), "fetish.");
+ r.push("This flaw can also be removed by serving the player character.");
+ r.toParagraph();
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Hates penetration", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Hates penetration", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("strugglefuck queen"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
+ r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("buttslut", "Buttsluts"), "fetish.");
+ r.push("This flaw can also be removed by serving the player character.");
+ r.toParagraph();
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Idealistic", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Idealistic", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("romantic"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
+ r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("submissive", "Humiliation Submissive"), "fetish.");
+ r.toParagraph();
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Judgemental", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Judgemental", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("size queen", "Size Queen"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
+ r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("submissive", "Humiliation Submissive"), "fetish.");
+ r.toParagraph();
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Repressed", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Repressed", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("perverted"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
+ r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("cumslut", "Cumsluts"), "fetish, or the", App.Encyclopedia.link("buttslut", "Buttsluts"), "fetish.");
+ r.toParagraph();
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addArticle("Shamefast", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Shamefast", ["bold"]), "is a sexual", App.Encyclopedia.link("flaw", "Flaws"), "that can be softened into the");
+ r.push(App.Encyclopedia.link("tease"), App.Encyclopedia.link("quirk", "Quirks"), "by training,");
+ r.push("a good", App.Encyclopedia.link("Attendant"), ", a powerful sex drive, or the", App.Encyclopedia.link("submissive", "Humiliation Submissive"), "fetish.");
+ r.toParagraph();
+
+ return f;
+}, "slaveFlaws");
+
+App.Encyclopedia.addCategory("slaveFlaws", function() {
+ const f = new DocumentFragment();
+ let r = [];
+ r.push(App.Encyclopedia.link("Anorexic"));
+ r.push(App.Encyclopedia.link("Arrogant"));
+ r.push(App.Encyclopedia.link("Bitchy"));
+ r.push(App.Encyclopedia.link("Devout"));
+ r.push(App.Encyclopedia.link("Gluttonous"));
+ r.push(App.Encyclopedia.link("Hates men"));
+ r.push(App.Encyclopedia.link("Hates women"));
+ r.push(App.Encyclopedia.link("Liberated"));
+ r.push(App.Encyclopedia.link("Odd"));
+ App.Events.addNode(f, ["Behavioral ", App.UI.DOM.combineNodes(App.Encyclopedia.link("Flaws"), ":"), App.UI.DOM.generateLinksStrip(r)], "div");
+
+ r = [];
+ r.push(App.Encyclopedia.link("Apathetic"));
+ r.push(App.Encyclopedia.link("Crude"));
+ r.push(App.Encyclopedia.link("Hates anal"));
+ r.push(App.Encyclopedia.link("Hates oral"));
+ r.push(App.Encyclopedia.link("Hates penetration"));
+ r.push(App.Encyclopedia.link("Idealistic"));
+ r.push(App.Encyclopedia.link("Judgemental"));
+ r.push(App.Encyclopedia.link("Repressed"));
+ r.push(App.Encyclopedia.link("Shamefast"));
+ App.Events.addNode(f, ["Sexual ", App.UI.DOM.combineNodes(App.Encyclopedia.link("Flaws"), ":"), App.UI.DOM.generateLinksStrip(r)], "div");
+
+ return f;
+});
diff --git a/src/gui/Encyclopedia/encyclopediaSlaveLeaders.js b/src/gui/Encyclopedia/encyclopediaSlaveLeaders.js
new file mode 100644
index 0000000000000000000000000000000000000000..121af433a42d4e229b298d5219e2140f14223f75
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaSlaveLeaders.js
@@ -0,0 +1,439 @@
+App.Encyclopedia.addArticle("Leadership Positions", function() {
+ const r = new DocumentFragment();
+ App.Events.addParagraph(r, ["Slave assignments are stratified into ordinary", App.Encyclopedia.link("assignments", "Slave Assignments"), "and leadership positions."]);
+ r.append("Choose a more particular entry below:");
+
+ return r;
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("Career Experience", function() {
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const devotion = (text = "devotion") => link(text, "From Rebellious to Devoted", "hotpink");
+ const trust = (text = "trust") => link(text, "Trust", "mediumaquamarine");
+ /** @type {[string, HTMLElement, string, string?][]} */
+ const careerData = [
+ ["Grateful", trust(), "grateful"],
+ ["Menial", devotion(), "menial"],
+ ["Servant", link("keeping your estate", "Servitude"), "servant"],
+ ["Entertainment", link("public service", "Public Service"), "entertainment", "If a slave has a lot of entertainment experience, she can qualify for this bonus without career experience."],
+ ["Sex work", link("whoring"), "entertainment", "If a slave is very sexually experienced, she can qualify for this bonus without career experience."],
+ ["Leadership", link("Head Girl"), "HG"],
+ ["Procuring", link("Madam"), "madam"],
+ ["Musical", link("DJ"), "DJ"],
+ ["Defensive", link("Bodyguard"), "bodyguard"],
+ ["Convincing", link("Recruiter"), "recruiter"],
+ ["Security", link("Wardeness"), "wardeness"],
+ ["Medical", link("Nurse"), "nurse"],
+ ["Counseling", link("Attendant"), "attendant"],
+ ["Nannying", link("Matron"), "matron"],
+ ["Accounting", link("Stewardess"), "stewardess"],
+ ["Husbandry", link("Milkmaid"), "milkmaid"],
+ ["Farming", link("Farmer"), "farmer"],
+ ["Teaching", link("Schoolteacher"), "schoolteacher"],
+ ];
+ const t = new DocumentFragment();
+ const r = [];
+
+ t.append("Slaves may retain useful experience from their lives before enslavement. Freedom and slavery are so different that the bonuses slaves get are minor. Careers fall into categories, each with its own bonus; these are:");
+ for (const [boldItem, bonus, career, note] of careerData) {
+ App.Events.addParagraph(t, [CareerBonus(boldItem, bonus, career, note)]);
+ }
+ r.push("Slaves who have been in slavery long enough that it is effectively their career get a bonus to", devotion("devotion."));
+ r.push("Slaves can forget their career experience in an industrialized Dairy, but if they do so and remain sane, they will get a special bonus to both", devotion(), "and", trust("trust."));
+ App.Events.addParagraph(t, r);
+
+ App.Events.addParagraph(t, ["Facility heads and working slaves can gain work experience to provide the same benefit as having a relevant career. Intelligence is the deciding factor in how long this will take, brilliant slaves can achieve this ideally in about fourteen weeks, while borderline retarded slaves can take up two hundred weeks (Assuming that the slave's intelligence doesn't change at all and the dice roll is consistent)."]);
+
+ return t;
+
+ /**
+ * @param {string} career
+ * @param {HTMLElement} bonus
+ * @param {string} list
+ * @param {string} [note]
+ */
+ function CareerBonus(career, bonus, list, note) {
+ const r = new SpacedTextAccumulator();
+ const notLeader = ["Grateful", "Menial", "Servant", "Entertainment", "Sex work"].includes(career);
+ const applicable = notLeader ? App.Data.Careers.General[list] : App.Data.Careers.Leader[list];
+
+ r.push(App.UI.DOM.makeElement("span", career, ["underline"]), `which offers a ${career === "Grateful" || career === "Menial" ? 'potential' : ''} bonus to`, bonus, `includes slaves who were: ${toSentence(applicable)}.`);
+ r.toNode("div");
+ if (note) {
+ r.push(note);
+ r.toNode("div");
+ }
+ return r.container();
+ }
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("Attendant", function() {
+ const t = new DocumentFragment();
+ const r = [];
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const goodAttendant = [link("submissiveness", "Submissives"), "have a calm libido", "appear older than 35", "a motherly air", App.UI.DOM.makeElement("span", "intelligent", ["cyan"]), "naturally female."];
+
+ r.push("An", App.UI.DOM.makeElement("span", "Attendant", ["bold"]), "can be selected once the", link("Spa"), "facility has been built.");
+ r.push("Attendants provide emotional help to slaves in the spa, and can also soften flaws and even fix mindbroken slaves.");
+ r.push("Good Attendants are free of:", link("fetishes"), "or", App.UI.DOM.toSentence(goodAttendant));
+ App.Events.addNode(t, r, "div");
+
+ return t;
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("Matron", function() { // TODO: will still need more updating
+ const t = new DocumentFragment();
+ const r = [];
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const goodMatron = [link("caring"), link("funny"), link("intelligent", "Intelligence"), "has given birth before."];
+
+ r.push("A", App.UI.DOM.makeElement("span", "Matron", ["bold"]), "can be selected once the", link("Nursery"), "facility has been built.");
+ r.push("Matrons oversee the day-to-day activities of the Nursery, and can soften flaws of nannies working under them. A good Matron is:", App.UI.DOM.toSentence(goodMatron));
+ App.Events.addNode(t, r, "div");
+
+ return t;
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("Bodyguard", function() {
+ const t = new DocumentFragment();
+ let r = [];
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const reduceDeadliness = [link("Big breasts", "Breasts"), link("butts"), link("poor health", "Health"), link("excess weight", "Weight"), link("pregnancy")];
+ const bodyguardTrainees = ["her lover or wife if she has one", link("the Head Girl", "Head Girl"), link("the Wardeness", "Wardeness"), link("your Concubine.", "Concubine")];
+
+ App.UI.DOM.appendNewElement("div", t, "Slave bodyguards are best understood not as protection for a slaveowner's person, but rather as a projection of their skill at slave breaking.", ["note"]);
+
+ r.push("By giving a slave the means and position to easily kill her master, that master displays their total trust in them. The simple fact that an armed slave is near a slaveowner at all times is proof that that slaveowner has produced at least one slave that never wavers in her");
+ r.push(link("devotion.", "From Rebellious to Devoted", "hotpink"));
+ r.push("After all, if she ever wavered, the slaveowner would likely be dead.");
+ App.Events.addNode(t, r, "p", "note");
+
+ App.UI.DOM.appendNewElement("p", t, "It is obvious to any real security professional that slave bodyguards are mostly for show, from the moment of seeing one. After all, they are not equipped with modern sensors, armor, and weapons; if they were so attired and loaded down it would be quite impossible to tell if they were even female: the huge weight and bulk of modern combat gear gives an androgynous appearance. Instead, they are usually kept scantily clad or even naked, and armed with visually impressive weapons.", ["note"]);
+
+ App.Encyclopedia.addArticleSource(t, "Guide to Modern Slavery, 2037 Edition", "Lawrence, W. G.");
+
+ r = [];
+ r.push("A", App.UI.DOM.makeElement("span", "Bodyguard", ["bold"]));
+ r.push("can be selected once the Armory upgrade is purchased. Duties include protection of the player character during violent events; good bodyguards produce some");
+ r.push(link("reputation", "Arcologies and Reputation", "green"));
+ r.push("as well, based on how deadly they are.", "Toned but not excessive", link("muscles", "Musculature"));
+ r.push(link("combat skill", "Combat Skill"), "and", link("height"));
+ r.push("contribute to deadliness.");
+ r.push(App.UI.DOM.toSentence(reduceDeadliness), "all detract from deadliness.");
+ App.Events.addParagraph(t, r);
+
+ r = [];
+ r.push("Skilled", App.UI.DOM.makeElement("span", "intelligent", ["cyan"]), "and", link("devoted", "From Rebellious to Devoted", "hotpink"));
+ r.push("Bodyguards may become concerned that they have no potential successor if you do not keep several other combat capable slaves in your penthouse.");
+ r.push("Such a Bodyguard will do her best to find responsible and physically capable slaves to teach self defense to when she can.");
+ r.push("Potential recipients of this training include:", App.UI.DOM.toSentence(bodyguardTrainees));
+ App.Events.addNode(t, r, "div");
+
+ return t;
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("Concubine", function() {
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const t = new DocumentFragment();
+ const r = [];
+
+ r.push("A", App.UI.DOM.makeElement("span", "Concubine", ["bold"]));
+ r.push("can be selected once the", link("Master Suite"), "facility is built.");
+ r.push("Concubines benefit from high beauty and sexual skills in the same way as public servants;");
+ r.push("they should also be extremely", link("devoted.", "From Rebellious to Devoted", "hotpink"));
+ r.push("Concubines do not apply any bonuses to other slaves in the", link("Master suite"), "rather,");
+ r.push("they are the game's single most efficient production of", link("reputation", "Arcologies and Reputation", "green"), "themselves.");
+ App.Events.addNode(t, r, "div");
+
+ return t;
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("DJ", function() {
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const t = new DocumentFragment();
+ let r = [];
+
+ r.push(`My name is Danni Diemen, and I'm here today to talk about the prettiest girls in the Free Cities. That's right, DJs! When a slave bitch says, "Sweetie, I'm not that kind of girl," she's lying. She's a slave, and she is that kind of girl! So, have your way with her.`);
+ App.Events.addNode(t, r, "p", "note");
+
+ r = [];
+ r.push("Except if she's a DJ. Then she probably isn't that kind of girl after all! Rare, I know. That's what makes them so hot! Some of the Free Cities' most prominent slaveowners have taken sluttery to the next level. They're building clubs designed around constant beats and constant sex, so it pays to have a hot girl maintain the party, whether it's up on stage, in the DJ booth, or down on the floor!");
+ App.Events.addNode(t, r, "p", "note");
+
+ r = [];
+ r.push("As for what makes a good DJ, beauty is obvious. But I also I hear the best trend a little older, too. Let's be honest, there's something a high-class woman has that a high-class girl doesn't.");
+ App.Events.addNode(t, r, "p", "note");
+
+ App.Encyclopedia.addArticleSource(t, "Free Cities Fashion (FCF), January 2032", "Van Diemen, D. C. G.");
+
+ r = [];
+ r.push("A", App.UI.DOM.makeElement("span", "DJ", ["bold"]));
+ r.push("can be selected once the", link("Club"), "facility is built.");
+ r.push("DJs apply a multiplier to", link("reputation", "Arcologies and Reputation", "green"), "gains from serving in the club.");
+ r.push("Entertainment skills, toned but not massive", link("muscles", "Musculature"), App.UI.DOM.makeElement("span", "intelligence", ["cyan"]), "and a pretty face make a good DJ.");
+ App.Events.addParagraph(t, r);
+
+ r = [];
+ r.push("If a DJ isn't responsible for enough sluts to occupy her full time, she'll spend time fucking citizens herself. This is exactly the same as", link("Public Service"), "out of the Club: she'll benefit from any", link("Advertising"), "or", link("Variety"), "bonuses available, and will even benefit from her own leadership skills.");
+ App.Events.addNode(t, r, "div");
+
+ return t;
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("Farmer", function() {
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const t = new DocumentFragment();
+ let r = [];
+
+ r.push("A", App.UI.DOM.makeElement("span", "Farmer", ["bold"]), "can be selected once the", link("Farmyard"), "facility is built.");
+ r.push("Having applicable", link("career experience", "Career Experience"), "and strong", link("muscles", "Musculature"), "allow a Farmer to maintain the different crops and animals.");
+ App.Events.addNode(t, r, "div");
+
+ App.Events.addNode(t, ["This description needs to be expanded."], "div", "note");
+
+ return t;
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("Head Girl", function() {
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const devotion = (text = "devotion", colour = "hotpink") => link(text, "From Rebellious to Devoted", colour);
+ const trust = (text = "trust") => link(text, "Trust", "mediumaquamarine");
+ const t = new DocumentFragment();
+ let r = [];
+
+ r.push("Most Free Cities slaveowners eventually find it convenient to promote a", trust("trusting"), "slave to a position over others.");
+ r.push("The stable of slaves necessary to present a proper public image has become so large that assistance managing and overseeing slaves is quite useful.");
+ r.push("In addition, such a slave can be an example to lesser livestock.");
+ App.Events.addNode(t, r, "div", "note");
+
+ r = [];
+ r.push("A good Head Girl will be", devotion("devoted"), "to her master and sexually skilled.");
+ r.push("Experienced slaveowners have also found that an older slave girl is often more effective than a young one.");
+ r.push("Since slavery is new, older slave girls will have spent part of their adult lives as free women, and have a deeper body of life experience to draw on.");
+ App.Events.addNode(t, r, "p", "note");
+
+ r = [];
+ r.push("Naturally, some slaveowners form a strong emotional bond with their Head Girl.");
+ r.push(trust("Trusting"), "and relying on a close companion can begin to resemble old world relationships.");
+ r.push("It is a paradox of modern Free Cities life that such closeness is strongly frowned upon.");
+ r.push("Rumors that a prominent person is emotionally involved with his or her Head Girl can be as socially devastating as rumors of infidelity were a hundred years ago.");
+ App.Events.addNode(t, r, "p", "note");
+
+ App.Encyclopedia.addArticleSource(t, "Guide to Modern Slavery, 2037 Edition", "Lawrence, W. G.");
+
+ r = [];
+ r.push("A", App.UI.DOM.makeElement("span", "Head Girl", ["bold"]));
+ r.push("can be selected from among your", devotion("devoted"), "slaves immediately.");
+ r.push("Duties are numerous, but mostly involve training slaves.");
+ r.push("They will generally train whichever girls they think appropriate, but can be given some direction on the same menu used to select one.");
+ r.push("Giving your", link("Head Girl a suite", "Head Girl Suite"), "and a personal slave will allow her to train an extra slave each week, an extremely powerful ability.");
+ App.Events.addParagraph(t, r);
+
+ r = [];
+ r.push(devotion(), App.UI.DOM.makeElement("span", "intelligence", ["cyan"]), "and age over 30 all help Head Girls do well.");
+ r.push("Head Girls will do better if they are comfortable with the arcology's", link("lingua franca"), ".");
+ r.push("Skills are required when teaching that skill, meaning that slaves without vaginas cannot teach vaginal skills.");
+ r.push("Conversely, slaves with functional dicks are better at teaching other sexual skills.");
+ r.push("Also having max sex skills, dom as their fetish and being your wife provide more boosts.");
+ App.Events.addNode(t, r, "div");
+
+ return t;
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("Madam", function() {
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const t = new DocumentFragment();
+ let r = [];
+
+ r.push("Prostitution is indeed the oldest profession. It follows that the madam is probably the oldest managerial position.");
+ App.Events.addNode(t, r, "div", "note");
+
+ r = [];
+ r.push("Free madams are very common in the Free Cities. As free prostitutes are priced out of their profession by slaves, many of the wealthiest are purchasing slaves and setting themselves up as madams. However, slave madams are becoming common as well.");
+ App.Events.addNode(t, r, "p", "note");
+
+ r = [];
+ r.push("The selling of sex is one of the largest growth markets in the Free Cities. As has been confidently predicted by economists since the first Free City was founded, the near-anarchy of these new polities has accelerated the concentration of wealth that began in the final years of the twentieth century. Thus, the majority of free citizens of the Cities own no slaves, while the majority of slaves are owned by a very few extremely wealthy persons. Extremely large stables of slave whores are becoming common for those in the industry.");
+ App.Events.addNode(t, r, "p", "note");
+
+ r = [];
+ r.push("Managing this many prostitutes is a science and an art. Naturally, it is not difficult to find slaves that are experienced in the sex trade. Setting slaves over other slaves has been a part of human slavery for all of recorded history; all of the tropes that once applied to the slave overseer in the field or the quarry now apply to the slave Madam in the brothel. The more experience they have in the field, the better they do.");
+ App.Events.addNode(t, r, "p", "note");
+
+ App.Encyclopedia.addArticleSource(t, "Guide to Modern Slavery, 2037 Edition", "Lawrence, W. G.");
+
+ r = [];
+ r.push("A", App.UI.DOM.makeElement("span", "Madam", ["bold"]), "can be selected once the", link("Brothel"), "facility is built.");
+ r.push("Madams apply a multiplier to", link("income", "Money", "yellowgreen"), "from the brothel.");
+ App.Events.addParagraph(t, r);
+
+ r = [];
+ r.push("Whoring skills, age over 35", App.UI.DOM.makeElement("span", "intelligence", ["cyan"]), "being your wife and a functional cock help a Madam.");
+ App.Events.addParagraph(t, r);
+
+ r = [];
+ r.push("If a Madam isn't managing enough whores to occupy her full time, she'll sell herself as much as she has time for.");
+ r.push("This is exactly the same as", link("whoring"), "out of the Brothel: she'll benefit from any", link("Advertising"), "or", link("Variety"), "bonuses available, and will even benefit from her own management skills.");
+ App.Events.addNode(t, r, "div");
+
+ return t;
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("Milkmaid", function() {
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const devotion = (text = "devotion", colour = "hotpink") => link(text, "From Rebellious to Devoted", colour);
+ const trust = (text = "trust") => link(text, "Trust", "mediumaquamarine");
+ const t = new DocumentFragment();
+ let r = [];
+
+ r.push("Most slaveowners get into dairy as a hobby. Why not? It's fun, tasty, and sexy. But sooner or later, almost everyone who starts out with a few low-volume milkers hears the call of mass production. After all, if it's hot to have one slave to use as the milking machine holds her down, it's hotter to have a whole row of moaning milkers at your mercy.");
+ App.Events.addNode(t, r, "div");
+
+ r = [];
+ r.push("Unfortunately, the everyday work of husbandry goes from an amusement to a chore as a herd grows. Helping a tired slave cow with huge tits up from a long milking is fun once a day, but it gets bothersome and backbreaking the tenth time one does it. What's to be done?");
+ App.Events.addParagraph(t, r);
+
+ r = [];
+ r.push("Train a milkmaid! Any decently obedient slave will do, but the stronger the better. As you probably know by now, just because slave husbandry involves human stock doesn't mean it isn't hard work, just like traditional stock keeping! The traditional image of milkmaids might be girly and innocent, but we're after a good hale bitch that can lift, carry and scrub from dawn to dusk. If you're looking to economize, you can even use a slave too old or ugly to appeal in other, more sexual jobs. After all, when it comes to the third milking of the day, cows don't care how pretty the hands that examine their tits are.");
+ App.Events.addParagraph(t, r);
+
+ App.Encyclopedia.addArticleSource(t, "Free Cities Husbandry Weekly, February 16, 2032", "Banaszewski, Valerie P.");
+
+ r = [];
+ r.push("A", App.UI.DOM.makeElement("span", "Milkmaid", ["bold"]), "can be selected once the", link("Dairy"), "facility is built.");
+ r.push("Having applicable", link("career experience", "Career Experience"), "and strong", link("muscles", "Musculature"), "allow a Milkmaid to help cows maintain their health.");
+ r.push("If a Milkmaid is Funny or Caring, she can improve cow's", trust("trusting"), "resting point; if she has oral skills, she can improve their", devotion(), "resting point.");
+ if (V.seeDicks !== 0) {
+ r.push("If she has a very large dick capable of erection, a Milkmaid can assist cows with ejaculation if the Dairy is not already stimulating prostates.");
+ }
+ App.Events.addNode(t, r, "div");
+
+ return t;
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("Nurse", function() {
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const t = new DocumentFragment();
+ const r = [];
+
+ r.push("An", App.UI.DOM.makeElement("span", "Nurse", ["bold"]), "can be selected once the", link("Clinic"), "facility is built.");
+ r.push("Nurses increase", link("health"), "gains in the Clinic, and play a major role in the prevention and treatment of", "illness among slaves.");
+ r.push("Good Nurses are", link("nymphomaniacs", "Nymphomania"), ", highly", App.UI.DOM.makeElement("span", "intelligent,", ["cyan"]), "physically fit, and very beautiful.");
+ App.Events.addNode(t, r, "div");
+
+ return t;
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("Recruiter", function() {
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const devotion = (text = "devotion", colour = "hotpink") => link(text, "From Rebellious to Devoted", colour);
+ const rep = (text = "reputation") => link(text, "Arcologies and Reputation", "green");
+ const t = new DocumentFragment();
+ let r = [];
+
+ r.push("A", App.UI.DOM.makeElement("span", "Recruiter", ["bold"]), "can be selected from among your", devotion("devoted"), "slaves immediately.");
+ r.push(App.UI.DOM.makeElement("span", "Intelligence", ["cyan"]), "entertainment skills, and luxurious living standards help a recruiter convince vulnerable people to submit to voluntary enslavement.");
+ r.push("Each targetable group is also more sympathetic to an appropriate recruiter.");
+ App.Events.addNode(t, r, "div");
+ App.Events.addNode(t, ["Desperate whores: a sexual veteran."], "div", ["indent"]);
+ App.Events.addNode(t, ["Expectant mothers: visibly pregnant."], "div", ["indent"]);
+ App.Events.addNode(t, ["Young migrants:", link("healthy"), "and pretty."], "div", ["indent"]);
+ App.Events.addNode(t, ["Dissolute sissies: with a working dick."], "div", ["indent"]);
+ App.Events.addNode(t, ["Reassignment candidates: pretty without working female reproductive organs."], "div", ["indent"]);
+ App.Events.addNode(t, r, "p");
+
+ r = [];
+ r.push("Once your household reaches a significant number of slaves you may direct the Recruiter to do publicity instead of acquisitions, for a boost to");
+ r.push(rep());
+ r.push("and possibly advancing");
+ r.push(link("future societies", "Future Societies"));
+ r.push(". Activating this ability does not influence any other means of obtaining new slaves. (Note that 'Facilities & leadership' includes the Recruiter herself and a slot for Head Girl, two positions that do not require a facility.)");
+ App.Events.addNode(t, r, "div");
+
+ return t;
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("Schoolteacher", function() {
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const t = new DocumentFragment();
+ const r = [];
+
+ r.push("A", App.UI.DOM.makeElement("span", "schoolteacher", ["bold"]), "can be selected once the", link("Schoolroom"), "facility is built.");
+ r.push("Schoolteachers increase the rate at which students in the schoolroom learn.");
+ r.push("Good schoolteachers appear older than 35, beautiful,", App.UI.DOM.makeElement("span", "intelligent", ["cyan"]), "and educated.");
+ App.Events.addNode(t, r, "div");
+
+ return t;
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("Stewardess", function() {
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const devotion = (text = "devotion", colour = "hotpink") => link(text, "From Rebellious to Devoted", colour);
+ const trust = (text = "trust") => link(text, "Trust", "mediumaquamarine");
+ const t = new DocumentFragment();
+ let r = [];
+
+ r.push("Throughout recorded history, wherever there have been mature slave societies, there have been slave overseers set over their peers by their masters. Naturally, these individuals have simultaneously been among the most");
+ r.push(trust("trusted"));
+ r.push("to their masters, and among the most hated to their compatriots in slavery. They have perhaps the greatest interest in preservation of a slave society, since the masters have only the loss of property to fear by abolition; slave overseers would likely be less lucky.");
+ App.Events.addNode(t, r, "p", "note");
+
+ r = [];
+ r.push("The stewardess is the modern, domestic expression of the old overseer. Many wealthy slaveowners keep an extensive stable of less valuable slaves around their estates to serve as labor, raw material for slave training, and targets for recreational abuse. Successful oversight of this often mulish mass of stock requires a high degree of");
+ r.push(devotion());
+ r.push("to the master's will, of course. Good health to put in the necessarily long hours also helps. Some slaveowners also find that a functional dick allows a Stewardess to add a useful element of sexual abuse to her ministrations.");
+ App.Events.addNode(t, r, "p", "note");
+
+ App.Encyclopedia.addArticleSource(t, "Guide to Modern Slavery, 2037 Edition", "Lawrence, W. G.");
+
+ r = [];
+ r.push("A", App.UI.DOM.makeElement("span", "Stewardess", ["bold"]), "can be selected once the", link("Servants' Quarters"), "facility is built.");
+ r.push("Stewardesses increase the upkeep reduction effects of servants working out of the servants' quarters. Being older than 35, having good");
+ r.push(link("health"), ",");
+ r.push(App.UI.DOM.makeElement("span", "intelligence", ["cyan"]), "and");
+ r.push(link("nymphomania"), "or");
+ r.push(link("dominance", "Doms"));
+ r.push("make a good Stewardess.");
+ App.Events.addNode(t, r, "div");
+
+ return t;
+}, "slaveLeaders");
+
+App.Encyclopedia.addArticle("Wardeness", function() {
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ const devotion = (text = "devotion", colour = "hotpink") => link(text, "From Rebellious to Devoted", colour);
+ const t = new DocumentFragment();
+ const r = [];
+
+ r.push("A", App.UI.DOM.makeElement("span", "Wardeness", ["bold"]), "can be selected once the");
+ r.push(link("Cellblock"));
+ r.push("facility is built. Wardenesses increase the rate at which slaves in the cellblock are broken. Very high");
+ r.push(devotion(), ",", link("nymphomania"), "or");
+ r.push(link("sadism", "Sadists"), ", strong");
+ r.push(link("muscles", "Musculature"), ", applicable");
+ r.push(link("career experience"), ", and a solid dick make a powerful Wardeness.");
+ App.Events.addNode(t, r, "div");
+
+ return t;
+}, "slaveLeaders");
+
+App.Encyclopedia.addCategory("slaveLeaders", function() {
+ const r = [];
+ r.push(App.Encyclopedia.link("Leadership Positions"));
+ r.push(App.Encyclopedia.link("Career Experience"));
+ r.push(App.Encyclopedia.link("Attendant"));
+ r.push(App.Encyclopedia.link("Matron"));
+ r.push(App.Encyclopedia.link("Bodyguard"));
+ r.push(App.Encyclopedia.link("Concubine"));
+ r.push(App.Encyclopedia.link("DJ"));
+ r.push(App.Encyclopedia.link("Farmer"));
+ r.push(App.Encyclopedia.link("Head Girl"));
+ r.push(App.Encyclopedia.link("Madam"));
+ r.push(App.Encyclopedia.link("Milkmaid"));
+ r.push(App.Encyclopedia.link("Nurse"));
+ r.push(App.Encyclopedia.link("Recruiter"));
+ r.push(App.Encyclopedia.link("Schoolteacher"));
+ r.push(App.Encyclopedia.link("Stewardess"));
+ r.push(App.Encyclopedia.link("Wardeness"));
+ return App.UI.DOM.generateLinksStrip(r);
+});
diff --git a/src/gui/Encyclopedia/encyclopediaSlaveModification.js b/src/gui/Encyclopedia/encyclopediaSlaveModification.js
new file mode 100644
index 0000000000000000000000000000000000000000..b5c81ea609727e7b55a3df261effd67fe9f25833
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaSlaveModification.js
@@ -0,0 +1,49 @@
+App.Encyclopedia.addArticle("Slave Modification", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("What would a slaveowner be without the ability to customize their slaves' bodies?");
+ r.push("The Free Cities offer a variety of ways to achieve this for an arcology owner.");
+ r.push("Choose a more particular entry below:");
+ r.toNode("div");
+ return t;
+}, "slaveModification");
+
+App.Encyclopedia.addArticle("Corrective Diet", function() {
+ return App.UI.DOM.makeElement("div", "Using the upgraded kitchen to monitor a slave's caloric intake allows for diets to be tailored to slowly increase or decrease their weight without them realizing.");
+}, "slaveModification");
+
+App.Encyclopedia.addArticle("Nipple Conversion — Penetratable", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("By taking extremely large nipples and inverting them into an adequately sized breast, it is possible to use an advanced surgical suite to create a cavity suitable for penetration.");
+ r.push("Early attempts found that the novelty of fucking a tit did not offset the discomfort of ramming one's dick into a solid object and as such, the surgery is only applicable to slaves with at least 500ccs of breast tissue per boob.");
+ r.push("Milk production is unhindered by the alterations, though non-machine milking is far more difficult without a nipple to grab and it is unlikely to be able to properly nourish a child.");
+ r.push("Arousal is also expressed differently, as the nipple cannot stiffen any longer; instead, engorgement causes the newly crafted passage to tighten, adding to the pleasure of using the unorthodox hole.");
+ r.push("While looseness is no issue, and the orifice quite capable of stretching around an intruding shaft, depth can become a problem; even the most average of slaveowners will find themselves bottoming out far sooner than they would like.");
+ r.push("Fortunately, this downside is offset by the novelty of the act and the capacity to push the nipple itself deeper into the slave's breast to better accommodate one's cock.");
+ r.push("In this case, bigger really is better.");
+ r.toNode("div");
+ return t;
+}, "slaveModification");
+
+App.Encyclopedia.addArticle("Ejaculation Boosting Prostate Implant", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ r.push("An additional prostate implant designed to hyperstimulate one's prostate and store the resulting fluid for release during ejaculation in a specialized reservoir.");
+ r.push("An easy way to tell if the precum soaked slave you are fucking is sporting this implant is the distinct swelling in her lower belly as she nears release.");
+ r.push("Due to the sheer amount of prostate fluid released, sperm per volume is greatly reduced, devastating profits of those looking to sell cum.");
+ r.push("Remember to keep your slaves well hydrated!");
+ r.toNode("div");
+ return t;
+}, "slaveModification");
+
+App.Encyclopedia.addCategory("slaveModification", function() {
+ const links = [];
+ if (V.encyclopedia !== "Slave Modification") {
+ links.push(App.Encyclopedia.link("Slave Modification"));
+ }
+ links.push(App.Encyclopedia.link("Corrective Diet"));
+ links.push(App.Encyclopedia.link("Nipple Conversion — Penetratable"));
+ links.push(App.Encyclopedia.link("Ejaculation Boosting Prostate Implant"));
+ return App.UI.DOM.generateLinksStrip(links);
+});
diff --git a/src/gui/Encyclopedia/encyclopediaSlaveQuirks.js b/src/gui/Encyclopedia/encyclopediaSlaveQuirks.js
new file mode 100644
index 0000000000000000000000000000000000000000..82958eb8e7204782ee7cf74aac8b2d719995208a
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaSlaveQuirks.js
@@ -0,0 +1,276 @@
+App.Encyclopedia.addArticle("Quirks", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Quirks", ["bold"]));
+ r.push("are positive slave qualities. They increase slaves' value and performance at sexual assignments, and each quirk also has other, differing effects. Each quirk is associated with a corresponding");
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), ", and slave can have two quirks (a sexual quirk and a behavioral quirk), just like flaws. Quirks may appear randomly, but the most reliable way to give slaves quirks is to soften flaws."));
+ r.toParagraph();
+
+ r.push("The", App.Encyclopedia.link("Head Girl"));
+ r.push("can be ordered to soften flaws, and the player character can soften flaws with personal attention. Flaws can also be naturally softened into quirks by fetishes.");
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Adores men", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Adores men", ["bold"]), "is a behavioral", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("hates women"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("pregnancy fetishists", "Pregnancy Fetishists"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they get bonus");
+ r.push(App.Encyclopedia.link("trust", "Trust", "mediumaquamarine"), "on", App.Encyclopedia.link("fucktoy"), "duty if the player character is masculine, and increased chance of gaining additional XY attraction.");
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Adores women", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Adores women", ["bold"]), "is a behavioral", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("hates men"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("breast fetishists", "Boob Fetishists", ".")));
+ r.push("In addition to the standard value and sexual assignment advantages, they get bonus");
+ r.push(App.Encyclopedia.link("trust", "Trust", "mediumaquamarine"), "on", App.Encyclopedia.link("fucktoy"), "duty if the player character is feminine, and increased chance of gaining additional XX attraction.");
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Advocate", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Advocate", ["bold"]), "is a behavioral", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("liberated"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("submissive", "Submissives"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they get bonus");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "while performing");
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("public service", "Public Service"), "."));
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Confident", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Confident", ["bold"]), "is a behavioral", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("arrogant"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("doms"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they get bonus");
+ r.push(App.Encyclopedia.link("trust", "Trust", "mediumaquamarine"), "on", App.Encyclopedia.link("fucktoy"), "duty.");
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Cutting", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Cutting", ["bold"]), "is a behavioral", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("bitchy"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("doms"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they get bonus");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "while performing", App.UI.DOM.combineNodes(App.Encyclopedia.link("whoring"), "."));
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Fitness", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Fitness", ["bold"]), "is a behavioral", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("gluttonous"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("submissive", "Submissives"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they gain additional sex drive each week, and are better at working out.");
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Funny", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Funny", ["bold"]), "is a behavioral", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("odd"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("Masochists"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they get bonus");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "while performing", App.UI.DOM.combineNodes(App.Encyclopedia.link("public service", "Public Service"), "."));
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Insecure", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Insecure", ["bold"]), "is a behavioral", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("anorexic"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("submissive", "Submissives"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they get bonus", App.Encyclopedia.link("trust", "Trust", "mediumaquamarine"), "on", App.Encyclopedia.link("fucktoy"), "duty.");
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Sinful", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Sinful", ["bold"]), "is a behavioral", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("devout"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("humiliation fetishists", "Humiliation Fetishists"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they get bonus", App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "while performing", App.UI.DOM.combineNodes(App.Encyclopedia.link("whoring"), "."));
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Caring", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Caring", ["bold"]), "is a sexual", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("apathetic"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("submissive", "Submissives"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they get bonus");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "while performing");
+ r.push("while", App.Encyclopedia.link("whoring"), "and nannying.");
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Gagfuck Queen", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Gagfuck Queen", ["bold"]), "is a sexual", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("Hates oral"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("cumsluts"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they enjoy living in a penthouse upgraded with phallic food dispensers.");
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Painal Queen", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Painal Queen", ["bold"]), "is a sexual", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("Hates anal"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("humiliation fetishists", "Humiliation Fetishists"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they enjoy living in a penthouse upgraded with dildo drug dispensers.");
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Perverted", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Perverted", ["bold"]), "is a sexual", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("repressed"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.UI.DOM.combineNodes(App.Encyclopedia.link("submissives"), ".")));
+ r.push("In addition to the standard value and sexual assignment advantages, they get bonus");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "when in incestuous relationships, and gain additional sex drive each week.");
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Romantic", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Romantic", ["bold"]), "is a sexual", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("idealistic"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("pregnancy fetishists", "Pregnancy Fetishists"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they get bonus");
+ r.push(App.Encyclopedia.link("trust", "Trust", "mediumaquamarine"), "on", App.Encyclopedia.link("fucktoy"), "duty.");
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Size Queen", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Size Queen", ["bold"]), "is a sexual", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("judgemental"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("buttsluts"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they will enjoy relationships with well-endowed, virile slaves so much their partners will get");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "benefits, too.");
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Strugglefuck Queen", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Strugglefuck Queen", ["bold"]), "is a sexual", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("hates penetration"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("Masochists"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, this Quirk avoids");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "losses if the slave is assigned to be a");
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("sexual servant", "Sexual Servitude"), "."));
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Tease", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Tease", ["bold"]), "is a sexual", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("shamefast"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("humiliation fetishists", "Humiliation Fetishists"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they get bonus");
+ r.push(App.Encyclopedia.link("devotion", "From Rebellious to Devoted", "hotpink"), "while performing");
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("public service", "Public Service"), "."));
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addArticle("Unflinching", function() {
+ const f = new DocumentFragment();
+ const r = new SpacedTextAccumulator(f);
+ r.push(App.UI.DOM.makeElement("span", "Unflinching", ["bold"]), "is a sexual", App.Encyclopedia.link("quirk", "Quirks"), "developed from the");
+ r.push(App.Encyclopedia.link("crude"), App.UI.DOM.combineNodes(App.Encyclopedia.link("flaw", "Flaws"), "."));
+ r.push("Slaves may naturally become", App.UI.DOM.combineNodes(App.Encyclopedia.link("Masochists"), "."));
+ r.push("In addition to the standard value and sexual assignment advantages, they will experience a partial rebound during weeks in which they lose");
+ r.push(App.Encyclopedia.link("devotion.", "From Rebellious to Devoted", "hotpink"));
+ r.toNode("div");
+
+ return f;
+}, "slaveQuirks");
+
+App.Encyclopedia.addCategory("slaveQuirks", function() {
+ const f = new DocumentFragment();
+ let r = [];
+ r.push(App.Encyclopedia.link("Adores men"));
+ r.push(App.Encyclopedia.link("Adores women"));
+ r.push(App.Encyclopedia.link("Advocate"));
+ r.push(App.Encyclopedia.link("Confident"));
+ r.push(App.Encyclopedia.link("Cutting"));
+ r.push(App.Encyclopedia.link("Fitness"));
+ r.push(App.Encyclopedia.link("Funny"));
+ r.push(App.Encyclopedia.link("Insecure"));
+ r.push(App.Encyclopedia.link("Sinful"));
+ App.Events.addNode(f, ["Behavioral ", App.UI.DOM.combineNodes(App.Encyclopedia.link("Quirks"), ":"), App.UI.DOM.generateLinksStrip(r)], "div");
+
+ r = [];
+ r.push(App.Encyclopedia.link("Caring"));
+ r.push(App.Encyclopedia.link("Gagfuck Queen"));
+ r.push(App.Encyclopedia.link("Painal Queen"));
+ r.push(App.Encyclopedia.link("Perverted"));
+ r.push(App.Encyclopedia.link("Romantic"));
+ r.push(App.Encyclopedia.link("Size Queen"));
+ r.push(App.Encyclopedia.link("Strugglefuck Queen"));
+ r.push(App.Encyclopedia.link("Tease"));
+ r.push(App.Encyclopedia.link("Unflinching"));
+ App.Events.addNode(f, ["Sexual ", App.UI.DOM.combineNodes(App.Encyclopedia.link("Quirks"), ":"), App.UI.DOM.generateLinksStrip(r)], "div");
+
+ return f;
+});
diff --git a/src/gui/Encyclopedia/encyclopediaSlaveRelationships.js b/src/gui/Encyclopedia/encyclopediaSlaveRelationships.js
new file mode 100644
index 0000000000000000000000000000000000000000..f11b41bf0ddb71d9a2485230169c34b05de46ca4
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaSlaveRelationships.js
@@ -0,0 +1,97 @@
+App.Encyclopedia.addArticle("Relationships", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ "Slaves can develop many different", App.UI.DOM.makeElement("span", "relationships", ["bold"]), "as they become accustomed to their lives, which offer many benefits and some downsides.",
+ "It is possible for the player to push slaves towards one kind of relationship or another, but slaves' feelings are less susceptible to complete control than their bodies.",
+ "All relationships in Free Cities are one-to-one, which is a limitation imposed by Twine."
+ ], "div");
+ return t;
+}, "SlaveRelationships");
+
+App.Encyclopedia.addArticle("Rivalries", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Rivalries", ["bold"]), "tend to arise naturally between slaves on the same assignment.",
+ "Slaves may enjoy rivals' misfortunes, but bickering on the job between rivals will impede performance if the rivals remain on the same assignment.",
+ "Rivals will also dislike working with each other.",
+ "Rivalries may be defused naturally with time apart, or suppressed by rules.",
+ "Rivalries impede the formation of", App.Encyclopedia.link("romances"), ", but a romance can defuse a rivalry."
+ ], "div");
+ return t;
+}, "SlaveRelationships");
+
+App.Encyclopedia.addArticle("Romances", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Romances", ["bold"]), "tend to arise naturally between slaves on the same assignment, and between slaves having a lot of sex with each other.",
+ "Slaves will be saddened by their romantic partners' misfortunes, but will do better on public sexual assignments if assigned to work at the same job as a romantic partner.",
+ "Slaves will also derive various mental effects from being in a relationship: they can rely on each other, take solace in each other's company, and even learn fetishes from each other.",
+ "Romances can be suppressed by the rules, or fall apart naturally.",
+ "On the other hand, romances can develop from friendships, to best friendships, to friendships with benefits, to loving relationships.",
+ "Romances impede the formation of", App.Encyclopedia.link("rivalries"), "and can defuse them.",
+ "Once a romance has advanced to where the slaves are lovers, its members are eligible for several events in which the couple can be", App.Encyclopedia.link("married.", "Slave Marriages")
+ ], "div");
+ return t;
+}, "SlaveRelationships");
+
+App.Encyclopedia.addArticle("Emotionally Bonded", function() {
+ const devotion = (text) => App.Encyclopedia.link(text, "From Rebellious to Devoted", "hotpink");
+ const trust = (text) => App.Encyclopedia.link(text, "Trust", "mediumaquamarine");
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Emotionally Bonded", ["bold"]), "slaves have become so", devotion("devoted"), "to the player character that they define their own happiness mostly in terms of pleasing the PC.",
+ "Slaves may become emotionally bonded if they become perfectly", devotion("devoted"), "and", trust("trusting"), "without being part of a", App.Encyclopedia.link("romance.", "Romances"),
+ "They receive powerful mental benefits — in fact, they are likely to accept anything short of sustained intentional abuse without lasting displeasure — and perform better at the",
+ App.Encyclopedia.link("servitude"), "and", App.Encyclopedia.link("fucktoy"), "assignments.",
+ "The most reliable way of ensuring a slave's development of emotional bonds is to have her assigned as a fucktoy or to the",
+ App.Encyclopedia.link("Master suite"), "as she becomes perfectly", devotion("devoted"), "and", trust("trusting.")
+ ], "div");
+ return t;
+}, "SlaveRelationships");
+
+App.Encyclopedia.addArticle("Emotional Slut", function() {
+ const devotion = (text) => App.Encyclopedia.link(text, "From Rebellious to Devoted", "hotpink");
+ const trust = (text) => App.Encyclopedia.link(text, "Trust", "mediumaquamarine");
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Emotional sluts", ["bold"]), "are slaves who have lost track of normal human emotional attachments, seeing sex as the only real closeness.",
+ "Slaves may become emotional sluts if they become perfectly", devotion("devoted"), "and", trust("trusting"), "without being part of a", App.Encyclopedia.link("romance.", "Romances"),
+ "They receive powerful mental benefits, though they will be disappointed if they are not on assignments that allow them to be massively promiscuous, and perform better at the", App.Encyclopedia.link("whoring"), "and", App.Encyclopedia.link("public service", "Public Service"), "assignments.",
+ "The most reliable way of ensuring a slave's development into an emotional slut is to have her assigned as a public servant or to the", App.Encyclopedia.link("Club"), "as she becomes perfectly", devotion("devoted"), "and", trust("trusting"), "."
+ ], "div");
+ return t;
+}, "SlaveRelationships");
+
+App.Encyclopedia.addArticle("Slave Marriages", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Slave Marriages", ["bold"]), "take place between two slaves.",
+ "Several random events provide the opportunity to marry slave lovers. Slave Marriages function as an end state for slave",
+ App.Encyclopedia.link("romances"), ";", "slave wives receive the best relationship bonuses, and can generally be depended upon to help each other be good slaves in various ways. The alternative end states for slaves' emotional attachments are the",
+ App.Encyclopedia.link("emotional slut", "Emotional Slut"), "and", App.Encyclopedia.link("emotionally bonded", "Emotionally Bonded"), "statuses, both of which are for a single slave alone."
+ ], "div");
+ return t;
+}, "SlaveRelationships");
+
+App.Encyclopedia.addArticle("Slaveowner Marriages", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Slaveowner Marriages", ["bold"]), ", marriages between a", App.Encyclopedia.link("devoted", "From Rebellious to Devoted", "hotpink"), "slave and the player character, require passage of a slaveowner marriage policy unlocked by advanced", App.Encyclopedia.link("paternalism"), ". Once this policy is in place,",
+ App.Encyclopedia.link("emotionally bonded", "Emotionally Bonded"), "slaves can be married.",
+ "There is no limit to the number of slaves a paternalist player character can marry.",
+ "Marriage to the player character functions as a direct upgrade to being emotionally bonded."
+ ], "div");
+ return t;
+}, "SlaveRelationships");
+
+App.Encyclopedia.addCategory("SlaveRelationships", function() {
+ const r = [];
+ r.push(App.Encyclopedia.link("Relationships"));
+ r.push(App.Encyclopedia.link("Rivalries"));
+ r.push(App.Encyclopedia.link("Romances"));
+ r.push(App.Encyclopedia.link("Emotionally Bonded"));
+ r.push(App.Encyclopedia.link("Emotional Slut"));
+ r.push(App.Encyclopedia.link("Slave Marriages"));
+ r.push(App.Encyclopedia.link("Slaveowner Marriages"));
+ return App.UI.DOM.generateLinksStrip(r);
+});
diff --git a/src/gui/Encyclopedia/encyclopediaSlaveSkills.js b/src/gui/Encyclopedia/encyclopediaSlaveSkills.js
new file mode 100644
index 0000000000000000000000000000000000000000..11fb8a7960ee3207c4a8ed6dd1e753222b15b397
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaSlaveSkills.js
@@ -0,0 +1,86 @@
+App.Encyclopedia.addArticle("Skills", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [App.UI.DOM.makeElement("span", "Future room for lore text", ["note"])], "div");
+ App.Events.addNode(t, ["Choose a more particular entry below:"], "div");
+ return t;
+}, "SlaveSkills");
+
+App.Encyclopedia.addArticle("Anal Skill", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Anal skill", ["bold"]), "improves performance on sexual assignments and is available in three levels.",
+ "Training methods include schooling (up to level one), plugs (up to level one), personal attention (unlimited), Head Girl attention (up to the Head Girl's skill), and on the job experience (unlimited).",
+ App.Encyclopedia.link("Anus", "Anuses"), "surgery can reduce this skill."
+ ], "div");
+ return t;
+}, "SlaveSkills");
+
+App.Encyclopedia.addArticle("Combat Skill", function() {
+ const r = new SpacedTextAccumulator();
+ r.push(App.UI.DOM.makeElement("span", "Combat skill", ["bold"]), "is a slaves combat experience and schooling.",
+ "It can be roughly split into three stages.",
+ "The first stage is basic skill in hand-to-hand combat as well as common melee and ranged weapons usage.", // 0-30
+ "The second stage is high skill in common weapons and their maintenance as well as basic skill in exotic weaponry. It also includes basic skill in protection tasks and group combat ability.", // 31-60
+ "The last stage perfects the slaves usage of all weaponry and refines their tactical abilities.", // 61-100
+ );
+ r.toParagraph();
+ r.push("It improves performance in lethal and nonlethal pit fights and performance as the Bodyguard.",
+ "Training methods are limited to on the job experience (including pit fights), successor training and events.",
+ "Only your bodyguard with their constant training can reach the last stage.");
+ r.toParagraph();
+ return r.container();
+}, "SlaveSkills");
+
+App.Encyclopedia.addArticle("Entertainment Skill", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Entertainment skill", ["bold"]), "is available in three levels.",
+ "It improves performance on all sexual assignments, though it affects public service or working in the club most.",
+ "Training methods include schooling (up to level one), personal attention (up to level one), Head Girl attention (up to the Head Girl's skill), and on the job experience (unlimited)."
+ ], "div");
+ return t;
+}, "SlaveSkills");
+
+App.Encyclopedia.addArticle("Oral Skill", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Oral skill", ["bold"]), "improves performance on sexual assignments and is available in three levels.",
+ "Training methods include schooling (up to level one), gags (up to level one), personal attention (unlimited), Head Girl attention (up to the Head Girl's skill), and on the job experience (unlimited).",
+ App.Encyclopedia.link("Lip", "Lips"), "surgery can reduce this skill."
+ ], "div");
+ return t;
+}, "SlaveSkills");
+
+App.Encyclopedia.addArticle("Vaginal Skill", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Vaginal skill", ["bold"]), "improves performance on sexual assignments and is available in three levels.",
+ "Training methods include schooling (up to level one), plugs (up to level one), personal attention (unlimited), Head Girl attention (up to the Head Girl's skill), and on the job experience (unlimited).",
+ "Slaves without vaginas cannot learn or teach this skill, limiting their ultimate skill ceiling.",
+ App.Encyclopedia.link("Vagina", "Vaginas"), "surgery can reduce this skill."
+ ], "div");
+ return t;
+}, "SlaveSkills");
+
+App.Encyclopedia.addArticle("Whoring Skill", function() {
+ const t = new DocumentFragment();
+ App.Events.addNode(t, [
+ App.UI.DOM.makeElement("span", "Whoring skill", ["bold"]), "is available in three levels.",
+ "It improves performance on all sexual assignments, though it affects whoring or working in the brothel most.",
+ "Training methods include schooling (up to level one), personal attention (up to level one), Head Girl attention (up to the Head Girl's skill), and on the job experience (unlimited)."
+ ], "div");
+ return t;
+}, "SlaveSkills");
+
+App.Encyclopedia.addCategory("SlaveSkills", function() {
+ const r = [];
+ r.push(App.Encyclopedia.link("Skills"));
+ r.push(App.Encyclopedia.link("Anal Skill"));
+ r.push(App.Encyclopedia.link("Combat Skill"));
+ r.push(App.Encyclopedia.link("Entertainment Skill"));
+ r.push(App.Encyclopedia.link("Oral Skill"));
+ r.push(App.Encyclopedia.link("Vaginal Skill"));
+ r.push(App.Encyclopedia.link("Whoring Skill"));
+ r.push(App.Encyclopedia.link("Career Experience"));
+ return App.UI.DOM.generateLinksStrip(r);
+});
diff --git a/src/gui/Encyclopedia/encyclopediaSlaves.js b/src/gui/Encyclopedia/encyclopediaSlaves.js
index 251dcd201c62b3ff32222b36d04c933b1f114dcb..da73f16fc198295e22650cf1578d56ad016a89ba 100644
--- a/src/gui/Encyclopedia/encyclopediaSlaves.js
+++ b/src/gui/Encyclopedia/encyclopediaSlaves.js
@@ -1,6 +1,6 @@
App.Encyclopedia.addArticle("Slaves", function() {
const f = new DocumentFragment();
- App.UI.DOM.appendNewElement("p", f, "Future room for lore text", "note");
+ App.UI.DOM.appendNewElement("p", f, "Future room for lore text", ["note"]);
App.UI.DOM.appendNewElement("p", f, "Choose a more particular entry below:");
return f;
}, "slaves");
@@ -44,9 +44,9 @@ App.Encyclopedia.addArticle("Enslaving People", function() {
let r = [];
r.push("Despite their extreme anarcho-libertarianism, the Free Cities observe some limited legalities surrounding enslavement. The most generally accepted way to enslave someone is to put them in a situation where they owe you a large sum of");
- r.push(App.Encyclopedia.Dialog.linkDOM("money", "Money", "cash"));
+ r.push(App.Encyclopedia.link("money", "Money", "cash"));
r.push("that they cannot pay. You can then demand payment and force them to sell themselves to you when they fail to make it. Of course, that means if someone is in debt to another person, you can purchase the debt from its holder and then enslave the debtor. Even if you are in a situation where you have a right to enslave someone, the necessary formalities and biometric scanning are not");
- r.push(App.Encyclopedia.Dialog.linkDOM("cheap.", "Money", "cash"));
+ r.push(App.Encyclopedia.link("cheap.", "Money", "cash"));
r.push("You will have to pay these associated costs.");
App.Events.addParagraph(f, r);
@@ -59,49 +59,49 @@ App.Encyclopedia.addArticle("From Rebellious to Devoted", function() {
r = [];
r.push("Almost everything can affect a slave's willingness to obey. Increases in obedience <span class='devotion inc'>are in hot pink,</span> while decreases <span class='devotion dec'>are in orchid.</span> Meanwhile, increases in");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust careful"));
r.push("(and decreases in fear) <span class='trust inc'>are in aquamarine,</span> while decreases in");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust careful"));
r.push("(and increases in fear) <span class='trust dec'>are in gold.</span>");
App.Events.addParagraph(f, r);
r = [];
r.push("High");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion", "Devotion", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion", "Devotion", "devotion accept"));
r.push("will naturally degrade; it takes at least some outside impetus to maintain slavish");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion", "Devotion", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion", "Devotion", "devotion accept"));
r.push("in a sane mind. The higher a slave's");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion", "Devotion", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion", "Devotion", "devotion accept"));
r.push("rises, the higher this natural rate of decay will become. Generally, this should not be a concern. As long as you treat your");
- r.push(App.Encyclopedia.Dialog.linkDOM("devoted", "Devotion", "devotion accept"));
+ r.push(App.Encyclopedia.link("devoted", "Devotion", "devotion accept"));
r.push("slaves decently, they will remain");
- r.push(App.Encyclopedia.Dialog.linkDOM("devoted", "Devotion", "devotion accept"));
+ r.push(App.Encyclopedia.link("devoted", "Devotion", "devotion accept"));
r.push("to you.");
App.Events.addParagraph(f, r);
r = [];
r.push("Slaves with");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion", "Devotion", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion", "Devotion", "devotion accept"));
r.push("and");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust careful"));
r.push("that do not agree with each other (for example, a slave that is terrified of her Master, but also loves him) will see both characteristics move towards the middle.");
App.Events.addParagraph(f, r);
r = [];
r.push("Finally,");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion", "Devotion", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion", "Devotion", "devotion accept"));
r.push("and");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust careful"));
r.push("both have minimum and maximum values. However, raising a slave's");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust careful"));
r.push("or");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion", "Devotion", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion", "Devotion", "devotion accept"));
r.push("over the maximum value isn't pointless. If either");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust careful"));
r.push("or");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion", "Devotion", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion", "Devotion", "devotion accept"));
r.push("goes over the cap, and the other characteristic is still under the cap, the excess will overflow into that characteristic and improve it at a lowered efficiency. If both characteristics have been perfected, the player will instead gain a small");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("boost from the slave's perfect mental conditioning.");
App.Events.addParagraph(f, r);
@@ -117,9 +117,9 @@ App.Encyclopedia.addArticle("Health", function() {
App.UI.DOM.appendNewElement("h3", f, "Condition");
r = [];
r.push("An overall indication of health and well-being; indicating how the slave is feeling physically. A poor condition often reduces a slave's effectiveness while a slave in excellent condition will perform better. The");
- r.push(App.Encyclopedia.Dialog.linkDOM("Rest", "Rest"));
+ r.push(App.Encyclopedia.link("Rest", "Rest"));
r.push("or");
- r.push(App.Encyclopedia.Dialog.linkDOM("Spa", "Spa"));
+ r.push(App.Encyclopedia.link("Spa", "Spa"));
r.push("assignment will increase condition; curative drugs will increase it, while preventative drugs can stop assignment-related health losses. Curatives and rest will synergize and add additional condition if applied simultaneously.");
App.Events.addParagraph(f, r);
@@ -132,21 +132,21 @@ App.Encyclopedia.addArticle("Health", function() {
App.UI.DOM.appendNewElement("h3", f, "Tiredness");
r = [];
r.push("Working hard will eventually make your slaves tired, this is only natural. Once tired they will no longer be able to perform to the best of their abilities and therefore this may be something to avoid, though a tired slave is more malleable and less capable of resisting their master. A slave can either be perfectly fine, tired, fatigued or exhausted. Excessive tiredness will negatively impact a slave's condition. Avoiding exhaustion can be done by taking them off tiresome assignments, assigning more lenient resting rules, letting them have time off, preferably in the");
- r.push(App.Encyclopedia.Dialog.linkDOM("Spa", "Spa"));
+ r.push(App.Encyclopedia.link("Spa", "Spa"));
r.push("and providing them with comfortable living conditions. The spa is particularly useful as it is not just really effective at reducing tiredness as an assignment, but also as a relaxation reward or to a lesser degree a situational reward. Be sure to have enough room in your spa for slaves deserving such rewards. A good attendant will also help. It's worth keeping in mind that not all assignments are tiring and not all slaves are good at managing their time.");
App.Events.addParagraph(f, r);
App.UI.DOM.appendNewElement("h3", f, "Illness");
r = [];
r.push("Whether we like it or not, sometimes slaves get sick. Most of the time an illness will be nothing more than a minor inconvenience that clears up by the end of the week, but occasionally a slave might catch something that is best handled with the help of a");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("Clinic", "Clinic"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("Clinic"), "."));
r.push("Keeping slaves in good condition goes a long way to preventing too many issues, but one thing to be aware of is that chemical carcinogen buildup is particularly dangerous and can cause illnesses to become quite serious. A simple illness may be harmless but once a slave is seriously ill their condition will rapidly deteriorate.");
App.Events.addParagraph(f, r);
r = [];
r.push("Slaves with serious illness left in their normal workplaces will also spread that illness to other slaves they come into contact with; this can be prevented by quarantining them in the Clinic.");
- r.push(App.Encyclopedia.Dialog.linkDOM("Preventatives", "Drugs and Their Effects"));
+ r.push(App.Encyclopedia.link("Preventatives", "Drugs and Their Effects"));
r.push("are another effective way to limit the introduction and transmission of illness in your arcology; since slaves in");
- r.push(App.Encyclopedia.Dialog.linkDOM("assignments", "Slave Assignments"));
+ r.push(App.Encyclopedia.link("assignments", "Slave Assignments"));
r.push("with contact with the outside world (such as whores and public sluts) are much more likely than others to contract new illnesses, placing those slaves on a regimen of preventatives can improve your long-term profits.");
App.Events.addParagraph(f, r);
@@ -159,11 +159,11 @@ App.Encyclopedia.addArticle("Devotion", function() {
let r = [];
r.push("<span class='encyclopedia topic'>Devotion</span> is a measure of a slave's liking for the player character, and secondarily, how accepting she is of her place in life. (Low Devotion is also referred to as hatred.) Along with");
- r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("trust", "Trust", "trust careful"));
r.push("it is the main measure of a slave's mental state. A highly <span class='devotion accept'>devoted</span> slave will always obey and will do her best on assignments. With low Devotion, obedience depends on trust: if trust is high, the slave will generally resist and do badly, but if trust is low enough the slave will obey out of fear. Almost everything in the game can effect Devotion in some way: <span class='devotion dec'>orchid text</span> indicates a Devotion loss, while <span class='devotion inc'>hot pink</span> text indicates a Devotion gain. Maximized or minimized Devotion is somewhat sticky: lightly abusing a perfectly <span class='devotion accept'>devoted</span> slave will not damage Devotion, while minor kindnesses will not affect a hateful slave. If a slave is very");
- r.push(App.Encyclopedia.Dialog.linkDOM("trusting", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("trusting", "Trust", "trust careful"));
r.push("extremely high Devotion will boost trust weekly (extremely low Devotion will do the reverse), and any Devotion gains that push it over its maximum value will overflow into trust. However, if a slave is very frightened, high Devotion will not impact trust. If both trust and Devotion are maximized, the slave's sex drive will be increased. If she's already a nympho,");
- r.push(App.Encyclopedia.Dialog.linkDOM("reputation", "Arcologies and Reputation", "reputation inc"));
+ r.push(App.Encyclopedia.link("reputation", "Arcologies and Reputation", "reputation inc"));
r.push("is increased instead.");
App.Events.addParagraph(f, r);
@@ -176,13 +176,13 @@ App.Encyclopedia.addArticle("Trust", function() {
r = [];
r.push("<span class='encyclopedia topic'>Trust</span> is a measure of a slave's expectations of the player character, and secondarily, how confident she is of her ability to do well. (Low trust is also referred to as fear.) Along with");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion,", "From Rebellious to Devoted", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion,", "From Rebellious to Devoted", "devotion accept"));
r.push("it is the main measure of a slave's mental state. A highly trusting slave is often more expensive to keep, but will do better in a leadership position and is more valuable. Slaves who are not intended for special assignments or resale can usually be kept terrified.");
App.Events.addParagraph(f, r);
r = [];
r.push("This can become negative if a slave is not sufficiently");
- r.push(App.Encyclopedia.Dialog.linkDOM("devoted:", "From Rebellious to Devoted", "devotion accept"));
+ r.push(App.Encyclopedia.link("devoted:", "From Rebellious to Devoted", "devotion accept"));
r.push("in this case, she will not obey since she neither likes nor fears the player character. Many game mechanics can effect trust in some way: <span class='trust inc'>aquamarine text</span> text indicates a trust gain, while <span class='trust dec'>gold</span> indicates a trust loss. Maximized or minimized trust is somewhat sticky: lightly abusing a perfectly trusting slave will not damage trust, while minor confidence boosts will not affect an abjectly terrified slave. Extremely high trust will boost Devotion weekly, and any trust gains that push it over its maximum value will overflow into Devotion. If both are maximized, the slave's sex drive is increased. If she's already a nympho, Reputation is increased instead.");
App.Events.addParagraph(f, r);
@@ -203,14 +203,14 @@ App.Encyclopedia.addArticle("Drugs and Their Effects", function() {
r = [];
r.push("<span class='encyclopedia topic'>Psychosuppressants,</span> cocktails of legacy mental health treatments delivered in extremely high doses designed to reduce the patient's ability to think independently. The most common set of effects include increased obedience, reduced");
- r.push(App.Encyclopedia.Dialog.linkDOM("rebelliousness,", "From Rebellious to Devoted", "defiant bold"));
+ r.push(App.Encyclopedia.link("rebelliousness,", "From Rebellious to Devoted", "defiant bold"));
r.push("and irreversible damage to mental faculties.");
App.Events.addParagraph(f, r);
App.Events.addParagraph(f, ["<span class='encyclopedia topic'>Aphrodisiacs,</span> powerful, addictive sexual enhancers that cause a mental and physical state not dissimilar to traditional hypersexuality. These drugs are based on female hormones, and may have long-term effects similar to female hormone reassignment treatment. They are strongly addictive, both physically and mentally, and the usual recommendation to slaveowners is that slaves should be put on aphrodisiacs only for a brief time, or permanently. Aphrodisiac addiction can typically only be overcome by supporting a slave through withdrawal for a similar period to the amount of time she was on the drugs."]);
r = [];
r.push("Aphrodisiacs can also be administered in extreme doses. This is medically dangerous, but is sometimes used by unscrupulous slaveowners. Slaves so dosed will feel an extreme need for sex regardless of their emotional state; for example,");
- r.push(App.Encyclopedia.Dialog.linkDOM("rebellious,", "From Rebellious to Devoted", "defiant bold"));
+ r.push(App.Encyclopedia.link("rebellious,", "From Rebellious to Devoted", "defiant bold"));
r.push("virgin slaves on extreme aphrodisiac doses will typically enjoy having their virginity sold.");
App.Events.addParagraph(f, r);
@@ -285,31 +285,31 @@ App.Encyclopedia.addArticle("Menial Slaves", function() {
r = [];
r.push(App.Encyclopedia.topic("Menial slaves"));
r.push("in general are the numerous slaves in the arcology that are not considered sex slaves, due to advanced age, unattractiveness, or other unsuitability. Their duties in the arcology vary widely from slave to slave and from arcology to arcology. Automation has done away with many traditional jobs in strictly economic terms, but some slaveowning societies prefer to have unskilled tasks done by slaves anyway for reasons of appeal or prestige. Also, the advancement of automation has been beaten back in some areas due to the obviously low practical labor costs in Free Cities with");
- r.push(App.Encyclopedia.Dialog.linkDOM("cheap", "Money", "cash"));
+ r.push(App.Encyclopedia.link("cheap", "Money", "cash"));
r.push("slaves.");
App.Events.addParagraph(f, r);
r = [];
r.push("Menials remain almost entirely off-screen. The game will track the arcology's population of menial slaves, and many of your decisions can affect the menial population. You can also buy, keep, and sell menial slaves yourself, from the slave markets menu. They will produce a small profit each week through their (unspecified) labors. Alternatively, a tidy profit can be made from playing the slave market for menials. There are also two subtypes of menial slave, both of which become inaccessible if");
- r.push(App.Encyclopedia.Dialog.linkDOM("Paternalism", "Paternalism"));
+ r.push(App.Encyclopedia.link("Paternalism"));
r.push("is selected as a societal goal.");
App.Events.addParagraph(f, r);
r = [];
r.push(App.Encyclopedia.topic("Fuckdolls"));
r.push("are slaves immured in permanent latex suits with holes over their orifices, turning them into living sex toys. They are more valuable than menial slaves proper, mostly due to the cost of the various compliance and drug components of the suits, which make them quite expensive. The weekly profit from owning Fuckdolls can be improved though a policy unlocked by");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("Degradationism", "Degradationism"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("Degradationism"), "."));
r.push("Normal menials can be converted into Fuckdolls if an upgraded");
- r.push(App.Encyclopedia.Dialog.linkDOM("Arcade", "Arcade"));
+ r.push(App.Encyclopedia.link("Arcade"));
r.push("is available.");
App.Events.addParagraph(f, r);
r = [];
r.push(App.Encyclopedia.topic("Standard Bioreactors"));
r.push("are slaves who are permanently attached to the arcology for industrial use, which can vary from milking to drug testing to organ farming. They are slightly less valuable than menial slaves proper. The weekly profit from owning Bioreactors can be improved though a policy unlocked by");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("Pastoralism", "Pastoralism"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("Pastoralism"), "."));
r.push("Normal menials can be converted into Bioreactors if an industrialized");
- r.push(App.Encyclopedia.Dialog.linkDOM("Dairy", "Dairy"));
+ r.push(App.Encyclopedia.link("Dairy"));
r.push("is available.");
App.Events.addParagraph(f, r);
@@ -350,7 +350,7 @@ App.Encyclopedia.addArticle("Slave Score (Attractiveness)", function() {
r.push("A slave's");
r.push(App.Encyclopedia.topic("Attractiveness Score"));
r.push("is a derived stat used to determine a slave's performance at many assignments. It also plays a major role in her price if bought or sold. It's a rough measure, but it's intended to serve as a rough count of how many of your arcology's citizens would be interested in paying to fuck her over the course of a week. The amount they would be willing to pay is determined by her");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("Sexual Score", "Slave Score (Sexual)"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("Sexual Score", "Slave Score (Sexual)"), "."));
r.push("Attractiveness Score is affected by virtually every physical trait a slave has, some skills, and societal tastes.");
App.Events.addParagraph(f, r);
@@ -365,11 +365,11 @@ App.Encyclopedia.addArticle("Slave Score (Sexual)", function() {
r.push("A slave's");
r.push(App.Encyclopedia.topic("Sexual Score"));
r.push("is a derived stat used to determine a slave's performance at many assignments. It also plays a major role in her price if bought or sold. It's a rough measure, but it's intended to serve as an estimate of the average price she would command as a street whore over the course of a week. The number of your arcology citizens who might be willing to pay that price is determined by her");
- r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("Attractiveness Score", "Slave Score (Attractiveness)"), "."));
+ r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("Attractiveness Score", "Slave Score (Attractiveness)"), "."));
r.push("Sexual Score is affected by sexual skills, some physical traits,");
- r.push(App.Encyclopedia.Dialog.linkDOM("Health", "Health"));
+ r.push(App.Encyclopedia.link("Health"));
r.push("and");
- r.push(App.Encyclopedia.Dialog.linkDOM("devotion,", "From Rebellious to Devoted", "devotion accept"));
+ r.push(App.Encyclopedia.link("devotion,", "From Rebellious to Devoted", "devotion accept"));
r.push("and societal tastes.");
App.Events.addParagraph(f, r);
@@ -378,21 +378,21 @@ App.Encyclopedia.addArticle("Slave Score (Sexual)", function() {
App.Encyclopedia.addCategory("slaves", function() {
const r = [];
- r.push(App.Encyclopedia.Dialog.linkDOM("Enslaving People", "Enslaving People"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Living Conditions", "Living Conditions"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Health", "Health"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Devotion", "Devotion", "devotion accept"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Trust", "Trust", "trust careful"));
- r.push(App.Encyclopedia.Dialog.linkDOM("From Rebellious to Devoted", "From Rebellious to Devoted"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Drugs and Their Effects", "Drugs and Their Effects"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Gender", "Gender"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Nymphomania", "Nymphomania"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Indentured Servants", "Indentured Servants"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Menial Slaves", "Menial Slaves"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Fuckdolls", "Fuckdolls"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Lingua Franca", "Lingua Franca"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Slave Score (Attractiveness)", "Slave Score (Attractiveness)"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Slave Score (Sexual)", "Slave Score (Sexual)"));
- r.push(App.Encyclopedia.Dialog.linkDOM("Demand for Sex", "Demand for Sex"));
+ r.push(App.Encyclopedia.link("Enslaving People"));
+ r.push(App.Encyclopedia.link("Living Conditions"));
+ r.push(App.Encyclopedia.link("Health"));
+ r.push(App.Encyclopedia.link("Devotion", "Devotion", "devotion accept"));
+ r.push(App.Encyclopedia.link("Trust", "Trust", "trust careful"));
+ r.push(App.Encyclopedia.link("From Rebellious to Devoted"));
+ r.push(App.Encyclopedia.link("Drugs and Their Effects"));
+ r.push(App.Encyclopedia.link("Gender"));
+ r.push(App.Encyclopedia.link("Nymphomania"));
+ r.push(App.Encyclopedia.link("Indentured Servants"));
+ r.push(App.Encyclopedia.link("Menial Slaves"));
+ r.push(App.Encyclopedia.link("Fuckdolls"));
+ r.push(App.Encyclopedia.link("Lingua Franca"));
+ r.push(App.Encyclopedia.link("Slave Score (Attractiveness)", "Slave Score (Attractiveness)"));
+ r.push(App.Encyclopedia.link("Slave Score (Sexual)", "Slave Score (Sexual)"));
+ r.push(App.Encyclopedia.link("Demand for Sex"));
return App.UI.DOM.generateLinksStrip(r);
});
diff --git a/src/gui/Encyclopedia/encyclopediaTerrain.js b/src/gui/Encyclopedia/encyclopediaTerrain.js
new file mode 100644
index 0000000000000000000000000000000000000000..9073b1e669ac299c29a182660c6fe64c8ca8ce12
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaTerrain.js
@@ -0,0 +1,70 @@
+App.Encyclopedia.addArticle("Terrain Types", function() {
+ const f = new DocumentFragment();
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Future room for lore text", ["note"])], "div");
+ App.Events.addNode(f, ["Choose a more particular entry below:"], "div");
+ return f;
+}, "Terrain");
+
+App.Encyclopedia.addArticle("Urban Terrain", function() {
+ const f = new DocumentFragment();
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Urban", ["bold"]), "terrain is one of the possible settings for the Free City in which the arcology is located. It provides:"], "div");
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Low", ["yellow"]), "minimum slave value and initial", App.UI.DOM.makeElement("span", "bear market", ["yellow"]), "for slaves."], "div", ["indent"]);
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "High", ["green"]), "ease of commerce with the old world."], "div", ["indent"]);
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "High", ["green"]), "access to refugees and other desperate people."], "div", ["indent"]);
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Low", ["red"]), "cultural independence."], "div", ["indent"]);
+ return f;
+}, "Terrain");
+
+App.Encyclopedia.addArticle("Rural Terrain", function() {
+ const f = new DocumentFragment();
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Rural", ["bold"]), "terrain is one of the possible settings for the Free City in which the arcology is located. It provides:"], "div");
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "High", ["yellow"]), "minimum slave value and initial", App.UI.DOM.makeElement("span", "bull market", ["yellow"]), "for slaves."], "div", ["indent"]);
+ App.Events.addNode(f, ["Moderate ease of commerce with the old world."], "div", ["indent"]);
+ App.Events.addNode(f, ["Moderate access to refugees and other desperate people."], "div", ["indent"]);
+ App.Events.addNode(f, ["Moderate cultural independence."], "div", ["indent"]);
+ return f;
+}, "Terrain");
+
+App.Encyclopedia.addArticle("Ravine Terrain", function() {
+ const f = new DocumentFragment();
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Ravine", ["bold"]), "terrain is one of the possible settings for the Free City in which the arcology is located. It provides:"], "div");
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "High", ["yellow"]), "minimum slave value and initial", App.UI.DOM.makeElement("span", "bull market", ["yellow"]), "for slaves."], "div", ["indent"]);
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Low", ["red"]), "ease of commerce with the old world."], "div", ["indent"]);
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Very low", ["red"]), "access to refugees and other desperate people."], "div", ["indent"]);
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "High", ["green"]), "cultural independence."], "div", ["indent"]);
+ return f;
+}, "Terrain");
+
+App.Encyclopedia.addArticle("Marine Terrain", function() {
+ const f = new DocumentFragment();
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Marine", ["bold"]), "terrain is one of the possible settings for the Free City in which the arcology is located. It provides:"], "div");
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Moderate minimum slave value and initially balanced market for slaves.")], "div", ["indent"]);
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Moderate ease of commerce with the old world.")], "div", ["indent"]);
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Low", ["red"]), "access to refugees and other desperate people."], "div", ["indent"]);
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "High", ["green"]), "cultural independence."], "div", ["indent"]);
+ return f;
+}, "Terrain");
+
+App.Encyclopedia.addArticle("Oceanic Terrain", function() {
+ const f = new DocumentFragment();
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Oceanic", ["bold"]), "terrain is one of the possible settings for the Free City in which the arcology is located. It provides:"], "div");
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "High", ["yellow"]), "minimum slave value and initial", App.UI.DOM.makeElement("span", "bull market", ["yellow"]), "for slaves."], "div", ["indent"]);
+ App.Events.addNode(f, ["Moderate ease of commerce with the old world."], "div", ["indent"]);
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Very low", ["red"]), "access to refugees and other desperate people."], "div", ["indent"]);
+ App.Events.addNode(f, [App.UI.DOM.makeElement("span", "Very high", ["green"]), "cultural independence."], "div", ["indent"]);
+ App.Events.addNode(f, ["Ensures access to slaves from all over the world and will not associate the arcology with a continent."], "div", ["indent"]);
+ return f;
+}, "Terrain");
+
+App.Encyclopedia.addCategory("Terrain", function() {
+ const f = new DocumentFragment();
+ const r = [];
+ r.push(App.Encyclopedia.link("Types", "Terrain Types"));
+ r.push(App.Encyclopedia.link("Urban", "Urban Terrain"));
+ r.push(App.Encyclopedia.link("Rural", "Rural Terrain"));
+ r.push(App.Encyclopedia.link("Ravine", "Ravine Terrain"));
+ r.push(App.Encyclopedia.link("Marine", "Marine Terrain"));
+ r.push(App.Encyclopedia.link("Oceanic", "Oceanic Terrain"));
+ App.Events.addNode(f, ["Terrain:", App.UI.DOM.generateLinksStrip(r)], "div");
+ return f;
+});
diff --git a/src/gui/Encyclopedia/encyclopediaToC.js b/src/gui/Encyclopedia/encyclopediaToC.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ddf3bbdea1e1c1103d04f05a8756204ed984a8c
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaToC.js
@@ -0,0 +1,55 @@
+App.Encyclopedia.addArticle("Table of Contents", function() {
+ const outerDiv = document.createElement("div");
+ outerDiv.classList.add("center");
+ App.UI.DOM.appendNewElement("h3", outerDiv, "Introduction");
+ lineLink(outerDiv, "Playing Free Cities");
+
+ App.UI.DOM.appendNewElement("h3", outerDiv, "The Player Character");
+ lineLink(outerDiv, "Design your master", "Design Your Master");
+ lineLink(outerDiv, "Being in Charge");
+ lineLink(outerDiv, "PC Skills");
+
+ App.UI.DOM.appendNewElement("h3", outerDiv, "Your Slaves");
+ lineLink(outerDiv, "Slaves");
+ lineLink(outerDiv, "Obtaining Slaves");
+ let div = document.createElement("div");
+ div.append(App.Encyclopedia.link("Slave Leaders", "Leadership Positions"), " / ",
+ App.Encyclopedia.link("Assignments", "Slave Assignments"));
+ outerDiv.append(div);
+ div = document.createElement("div");
+ div.append(App.Encyclopedia.link("Slave Body", "Body"), " / ",
+ App.Encyclopedia.link("Skills"));
+ outerDiv.append(div);
+ div = document.createElement("div");
+ div.append(App.Encyclopedia.link("Slave Fetishes", "Fetishes"), " / ",
+ App.Encyclopedia.link("Paraphilias Overview"));
+ outerDiv.append(div);
+ div = document.createElement("div");
+ div.append(App.Encyclopedia.link("Quirks"), " / ",
+ App.Encyclopedia.link("Flaws"));
+ outerDiv.append(div);
+ lineLink(outerDiv, "Slave Relationships", "Relationships");
+ lineLink(outerDiv, "Slave Health", "Health");
+ div = document.createElement("div");
+ div.append(App.Encyclopedia.link("Slave Pregnancy", "Pregnancy"), " / ",
+ App.Encyclopedia.link("Inflation"));
+ outerDiv.append(div);
+ lineLink(outerDiv, "Slave Modification");
+
+ App.UI.DOM.appendNewElement("h3", outerDiv, "Your Arcology");
+ lineLink(outerDiv, "The X-Series Arcology");
+ lineLink(outerDiv, "Arcology Facilities", "Facilities Overview");
+ lineLink(outerDiv, "Terrain Types");
+ lineLink(outerDiv, "Future Societies");
+ lineLink(outerDiv, "The Black Market");
+
+ App.UI.DOM.appendNewElement("h3", outerDiv, "Extras");
+ lineLink(outerDiv, "Mods/Pregmod");
+ lineLink(outerDiv, "Lore");
+ lineLink(outerDiv, "Credits");
+ return outerDiv;
+
+ function lineLink(container, text, article) {
+ App.UI.DOM.appendNewElement("div", container, App.Encyclopedia.link(text, article));
+ }
+}, "toc");
diff --git a/src/gui/Encyclopedia/encyclopediaX-SeriesArcology.js b/src/gui/Encyclopedia/encyclopediaX-SeriesArcology.js
new file mode 100644
index 0000000000000000000000000000000000000000..242be0a477519b379281fb5f8aaaaba2323c4b43
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaX-SeriesArcology.js
@@ -0,0 +1,271 @@
+App.Encyclopedia.addArticle("The X-Series Arcology", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+
+ r.push(`The X-Series Arcology is the latest model of 'arcology', designed in 2037 based off the model of keeping Free Cities as independent from the old world as fiscally viable. The first arcology was designed in early 2016 by the Berlin-based architecture firm Franz-Crekcht as a "Skyscraper for the next generation" - the A-Series. The original A-Series was made to exist as an arcology integrated within old world nations, but capable of producing its own energy, food, and housing for the population contained within, marketed as buildings you could "Live, work, eat and shop at without ever having to leave".`);
+ r.push(`These first arcology units were rolled out by the end of the year based on a standard design prototype, and cheap housing prices combined with the promise of stable white-collar work immediately attracted a sizeable population to the A-series arcologies. Based off of these designs, F-C continued to produce arcology schematics, including the K-series and B-series, and formulated plans for arcologies that could operate in rural, maritime, and even oceanic environments. When the popularity of the Arcology model became evident, other design firms replicated their own takes, producing designs like the V-series, D-series, F-series, and finally the ultra-modern X-series that you presently inhabit, designed more as a quasi-independent city-state than the original "next-generation skyscrapers".`);
+ r.toParagraph();
+ r.push("It wasn't long before arcologies began to form 'clusters' together, relying more on each other for trade and cultural exchange than the old world that surrounded them; increasingly complex infrastructure and surrounding networks began to connect the clusters, tying them together and making them stand apart from the rest of society, largely free from the purview of bureaucrats and old cultural mores. As the world outside the increasingly self-sufficient arcologies began to deteriorate, it wasn't long after that before the first arcologies declared independence from their parent nations, creating the original Free Cities we know today.");
+ r.toParagraph();
+
+ r.push("Choose a more particular entry below:");
+ r.toNode("div");
+
+ return t;
+}, "X-SeriesArcology");
+
+App.Encyclopedia.addArticle("What the Upgrades Do", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+ /**
+ * @param {string} text
+ * @param {string} [article]
+ * @param {string} [className]
+ */
+ const link = (text, article, className) => App.Encyclopedia.link(text, article, className);
+ /**
+ * @param {string|HTMLSpanElement} text
+ * @param {string[]} [tag]
+ */
+ const highlight = (text, tag = ["bold"]) => App.UI.DOM.makeElement("span", text, tag);
+
+ App.Events.addNode(t, [`There are a lot of upgrades available for your arcology, ${properTitle()}. Please relax; some panic upon reviewing the options is normal. This list should familiarize you with your choices.`], "div", "note");
+
+ t.append(App.UI.DOM.makeElement("h3", "Construction"));
+ r.push("The first upgrade section on the arcology management menu offers an escalating series of generic upgrades for the arcology. A few of these have minor beneficial side effects, but all share the same main effect: they raise the arcology's maximum prosperity level. You will be informed on the end of week report if your arcology is nearing, at, or over this level. Upgrading early is", highlight("not", ["note"]), "useless, since prosperity will increase more rapidly if the cap is much higher than the current prosperity level.");
+ r.toParagraph();
+
+ t.append(App.UI.DOM.makeElement("h3", "Facilities"));
+ r.push("These upgrades unlock the various facilities, which are detailed", link("here.", "Facilities Overview"));
+ r.toParagraph();
+
+ t.append(App.UI.DOM.makeElement("h3", "Penthouse Improvements"));
+ r.push("The master suite and Head Girl suite options function like facilities. The master suite is the facility for the fucktoy assignment, and the Head Girl suite can house a single slave for her use.");
+ r.toNode("div");
+
+ App.Events.addNode(t, [highlight("Kitchen upgrade:", ["bold", "note"]), "this increases the chances of success for dieting and opens up additional dietary options."], "div", ["indent"]);
+ App.Events.addNode(t, [highlight("Feeding phalli:", ["bold", "note"]), "unbroken slaves will find this disgusting, but it can cause beneficial oral fetishes to appear."], "div", ["indent"]);
+ App.Events.addNode(t, [highlight("Drug fuckmachines:", ["bold", "note"]), "unbroken slaves will resent this, but it may cause beneficial anal fetishes to appear."], "div", ["indent"]);
+ App.Events.addNode(t, [highlight("Personal armory:", ["bold", "note"]), "unlocks bodyguard options on the main menu."], "div", ["indent"]);
+ App.Events.addNode(t, [highlight("Pharmaceutical Fabricator:", ["bold", "note"]), "requires a lot of", link("reputation", "Arcologies and Reputation"), "green", "to buy and use; unlocks powerful drug upgrades."], "div", ["indent"]);
+ App.Events.addNode(t, [highlight("Surgery upgrade:", ["bold", "note"]), "enables several extreme surgical options like virginity restoration and hermaphrodite creation."], "div", ["indent"]);
+ App.Events.addNode(t, [highlight("Media Hub:", ["bold", "note"]), "allows you to produce, encode, and stream videos of your slaves' daily lives to popular online pornography sites."], "div", ["indent"]);
+
+ t.append(App.UI.DOM.makeElement("h3", "Special Upgrades"));
+ r.push("Upgrades obtained during special events are listed here for reference. They cannot be purchased normally. Week:");
+ r.toNode("div");
+ App.Events.addNode(t, [highlight("24:"), "Arming yourself and or your", link("drones", "Security Drones"), "if installed."], "div", ["indent"]);
+ App.Events.addNode(t, [highlight("62:"), "Establishing mercs."], "div", ["indent"]);
+ App.Events.addNode(t, [highlight("65:"), "Giving your established mercs a unique title."], "div", ["indent"]);
+ App.Events.addNode(t, [highlight("72 or later:"), "Establish the", link("Special Force"), "(if the mod is enabled)."], "div", ["indent"]);
+
+ return t;
+}, "X-SeriesArcology");
+
+App.Encyclopedia.addArticle("Personal Assistant", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+
+ App.Events.addNode(t, [`${properTitle()}, "I am your personal assistant."`], "p", "note");
+
+ r.push("Though I am a highly advanced program, I am not a true AI. I am neither sentient nor self-aware. My chief usefulness lies in my computing power, which is sufficient to run the arcology and all of its systems, and to monitor its huge suite of internal sensors. If it happens here, I know about it, and if it's important, I'll tell you. Through me, you are effectively omniscient within your arcology. Omnipotence will have to wait until I implant your slaves with control chips to convert them into my mindless fuckpuppet soldiery.");
+ r.toNode("p", ["note"]);
+
+ App.Events.addNode(t, ["That was a joke."], "p", "note");
+
+ r.push("I have been watching you and your slaves with close attention, so I have one other function to mention. I have learned a little of what constitutes successful slave training and husbandry. If you select the 'Rules Assistant' option on the main menu, I will review the rules your slaves are under and address any obvious problems. For example, I will place all disobedient slaves under restrictive rules.");
+ r.toNode("p", ["note"]);
+
+ r.push("I would say that it is a pleasure to serve, but you are no doubt", App.UI.DOM.makeElement("span", "intelligent", ["cyan"]), `enough to know that I cannot feel pleasure, making that a pointless pleasantry. Good day, ${properTitle()}.`);
+ r.toNode("p", ["note"]);
+
+ return t;
+}, "X-SeriesArcology");
+
+App.Encyclopedia.addArticle("The Wardrobe", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+
+ r.push("The Wardrobe is a dressing area for all of your slaves, and a place where unused outfits are stored. Tailoring is available to make sure outfits fit each slave to your specifications. Here, players make choices about how slaves will appear in their dress, or lack of it. Choose outfits wisely to correspond to the culture that your citizens approve of, and your", App.Encyclopedia.link("reputation", "Arcologies and Reputation", "green"), "will increase more quickly. Items that stretch or constrict such as plugs or corsets will eventually have a lasting impact on slaves anatomy.");
+ r.toNode("div", ["note"]);
+
+ r.push("The wardrobe has two functions: First, individual slaves can be selected and then dressed in the wardrobe with anything from the basic clothing or shoes to the more exotic plugs and corsets. Secondly, players can access the wardrobe directly from the penthouse, and unlock collections of new outfits with ¤.");
+ r.toParagraph();
+
+ return t;
+}, "X-SeriesArcology");
+
+App.Encyclopedia.addArticle("The Auto Salon", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+
+ r.push("Your auto salon is similar to the studio and the remote surgery, but is far less intimidating.");
+ r.push("It is set up like a single seat from an old world beauty salon, except that a series of manipulators descend from the ceiling towards the chair.");
+ r.push("It can perform any of the usual cosmetic services. The only special capability it has is to automatically color coordinate nails and makeup with a slave's hair.");
+ r.push("It is fashionable to apply color schemes to slaves, and this function will make following the trend easy. Your salon will cost");
+ r.push(App.UI.DOM.makeElement("span", `${cashFormat(V.modCost)}`, ["yellowgreen"]), "per use. These procedures are not especially invasive, and you can perform as many of them as you wish during a single week without fear for your slave's health.");
+ r.toNode("div", ["note"]);
+
+ r.push("The auto salon is mostly available for the player's experimentation. Some combinations of cosmetic options can have minor effects on some assignments and events, but these are very marginal. Slaves' appearances will differ in many scenes and events based on the player's cosmetic choices, but these details are for flavor only. As usual, gameplay effects are usually called out in explicit colored text; if they aren't, no major gameplay effects are happening.");
+ r.toParagraph();
+
+ return t;
+}, "X-SeriesArcology");
+
+App.Encyclopedia.addArticle("The Body Mod Studio", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+
+ r.push("Your studio was sadly neglected by the previous owner of the arcology, but is in great shape and ready for use.");
+ r.toNode("div", ["note"]);
+
+ r.push("There are remote surgical and tattoo implements if you wish to hire an artist to do the work for you, but there are also sophisticated piercing and tattoo implements that can help you plan and apply the work yourself. Select a body part and a desired modification, and they'll do the rest.");
+ r.toNode("p", ["note"]);
+
+ r.push("Your equipment will cost", App.UI.DOM.makeElement("span", `${cashFormat(V.modCost)}`, ["yellowgreen"]), "per use. These procedures are not especially invasive, and you can perform as many of them as you wish during a single week without fear for your slave's health.");
+ r.toNode("p", ["note"]);
+
+ return t;
+}, "X-SeriesArcology");
+
+App.Encyclopedia.addArticle("The Remote Surgery", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+
+ r.push("Congratulations on your purchase of a Caduceus model remote surgical unit. This is the very last word in slave surgical alteration.");
+ r.toParagraph();
+
+ r.push("To use your remote surgery, simply strap a slave to the operating table and purchase surgical services. Any doctor can take control of the remote surgery by telepresence and operate on your slave. You have all the options of a modern hospital, right in the comfort of your own home.");
+ r.toParagraph();
+
+ App.Encyclopedia.addArticleSource(r.container(), "Owner's Manual, Remote Surgical Unit model 'Caduceus'");
+
+ r.push("It will cost", App.UI.DOM.makeElement("span", `${cashFormat(V.surgeryCost)}`, ["yellowgreen"]), "to purchase a doctor's telepresence and keep the equipment charged with the necessary materials. These procedures are invasive and will reduce a slave's health. Use drugs or rest to counteract this.");
+ r.toNode("p", ["note"]);
+
+ return t;
+}, "X-SeriesArcology");
+
+App.Encyclopedia.addArticle("The Pharmaceutical Fab", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+
+ r.push("Pharmaceutical fabricators are the cutting edge of modern medicine. They are in short supply and are therefore ruinously expensive, but can greatly reduce the cost of maintaining a large stable of slaves by cutting drug overhead. They are also the only source of a new generation of advanced drugs that must be tailored to the individual patient's biochemistry.");
+ r.toParagraph();
+
+ App.Encyclopedia.addArticleSource(r.container(), "Pharmaceutical Review '32", "Dodgson, Jane Elizabeth");
+
+ return t;
+}, "X-SeriesArcology");
+
+App.Encyclopedia.addArticle("Security Drones", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+
+ r.push("As built, X-Series arcologies are equipped with basic security systems, and a complement of maintenance and cleaning drones.");
+ r.toNode("div", ["note"]);
+
+ r.push("The infrastructure that supports these drones is designed to be easily retrofittable to support new designs and classes of drones. One optional upgrade that may suit some owners particularly well is the addition of security drones. These are radically different than the slow, robust utility drones.");
+ r.toNode("p", ["note"]);
+
+ r.push("The X-Series security drone is undergoing a yearly upgrade cycle, but the entire family has some major features in common. All are light, multi-rotor flying drones with between three and six propulsors. Generally speaking, they favor speed and ease of handling over armor or endurance.");
+ r.toNode("p", ["note"]);
+
+ r.push("Their mobility is such that they can typically reach any point within the arcology in minutes. They are robust to damage but unarmored, and generally carry payloads of between two and five kilograms. Since they are designed to operate within or very close to the arcology, they have an autonomous endurance of less than an hour.");
+ r.toNode("p", ["note"]);
+
+ r.push("Standard kit includes hardened communications links to the arcology's computer systems, loudspeakers for public interface, and nonlethal compliance systems including tasers and chemical emitters.");
+ r.toNode("p", ["note"]);
+
+ App.Encyclopedia.addArticleSource(r.container(), "X-Series Arcology Owners' Manual");
+ r.toParagraph();
+
+ return t;
+}, "X-SeriesArcology");
+
+App.Encyclopedia.addArticle("Water Filtration", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+
+ r.push(`X-Series arcologies are, in many ways, comparable to massive organisms. Under this metaphor, their circulatory systems include thousands of ${V.showInches === 2 ? 'miles' : 'kilometers'} of plumbing for water distribution and waste removal.`);
+ r.toNode("div", ["note"]);
+
+ r.push("The X-Series has established a new state of the art in arcology moisture reclamation. Air conditioning, hydrofarming, sewage treatment, and plumbing systems work together to recycle water with an efficiency greater than 99.99%. When combined with the arcology's skin, which is cleverly shaped to catch and retain almost all rain that falls on it, importing water will become a thing of the past.");
+ r.toNode("p", ["note"]);
+
+ r.push("This system is carefully balanced. It is designed to work for decades without major maintenance, but it is limited to a certain maximum population. Major upgrades will be necessary should the arcology population exceed this figure. Fortunately, the system is designed to be almost infinitely expandable.");
+ r.toNode("p", ["note"]);
+
+ r.push("Finally, the X-Series has been designed from the ground up by slaveowners, for slaveowners. The standard X-Series arcology is not equipped for dairy operations, but the water filtration system has been designed to support dairy upgrades. With minimal additions, X-Series owners will be able to Pasteurize and store a nearly unlimited quantity of nature's bounty.");
+ r.toNode("p", ["note"]);
+
+ App.Encyclopedia.addArticleSource(r.container(), "X-Series Arcology Owners' Manual");
+
+ return t;
+}, "X-SeriesArcology");
+
+App.Encyclopedia.addArticle("Slave Nutrition", function() {
+ const t = new DocumentFragment();
+ const r = new SpacedTextAccumulator(t);
+
+ r.push("Your X-Series arcology is designed to produce large quantities of high quality foodstuffs, from fresh vegetables to basic nutritive protein. The X-Series also produces the most advanced nutrition in the world. Our proprietary special slave nutrition system has been designed by slaveowners, for slaveowners, and truly makes the X-Series special.");
+ r.toNode("div", ["note"]);
+
+ r.push("This system produces a protein-rich drink that provides the physically active female body all its necessary nutrients. The artificial flavoring is specially designed to provide a palatable taste and texture while avoiding too much enjoyment and preventing excessive boredom. It supports a strong immune system and an energetic outlook.");
+ r.toNode("p", ["note"]);
+
+ r.push("It even causes a mild increase in sex drive. Our development team found that the slave body experiences a slight gain in libido merely from being so perfectly fed. It was simple and healthy to reinforce this effect with additives.");
+ r.toNode("p", ["note"]);
+
+ r.push("Our slave nutrition accomplishes all this while leaving the lower digestive tract extremely clean. We recommend your slaves undergo an occasional deep enema: under this regimen, slaveowners can be forgiven for forgetting that their slaves' anuses are involved in digestion at all. The designers of the X-Series trust that their clients can find other uses for them.");
+ r.toNode("p", ["note"]);
+
+ App.Encyclopedia.addArticleSource(r.container(), "X-Series Arcology Owners' Manual");
+
+ return t;
+}, "X-SeriesArcology");
+
+App.Encyclopedia.addArticle("Media Hub", function() {
+ const r = new SpacedTextAccumulator();
+
+ r.push("Not everyone can be a Free Cities titan. But thanks to the power of the internet, everyone can watch!");
+ r.toNode("div", ["note"]);
+
+ App.Encyclopedia.addArticleSource(r.container(), `Porn Insider magazine, October 2035: "Free Cities Pornography: a new era of sex slave voyeurism"`);
+
+ r.push("Constructing and upgrading the Media Hub allows you to produce and stream pornographic videos featuring your slaves for the world to see (and pay for).");
+ r.toParagraph();
+
+ r.push("Slaves featured in pornography will gain viewers and fame over time. Some may even become world-famous porn stars in their own right, with a little help.");
+ r.toParagraph();
+
+ r.push("Slaves with pretty faces will gain viewership significantly faster. Particularly ugly slaves may benefit from having their faces covered with a mask, or covered by a", App.Encyclopedia.link("fuckdoll", "Fuckdolls"), "suit.");
+ r.push("Viewership can also be driven by investing cash in promotion and advertising, or by search engine optimization and feed hacking.");
+ r.toParagraph();
+
+ r.push("Slaves will produce porn in a variety of genres based on their characteristics. By default, her viewers will decide what she focuses on with their views and credits, but you can upgrade the media hub to allow you to choose a particular genre for a slave to focus on. Having too many slaves focusing on a particular genre will decrease the ability of that genre to draw new viewers. Genres associated with", App.Encyclopedia.link("paraphilias", "Paraphilias Overview"), "will have their viewership increase fastest, followed by", App.Encyclopedia.link("fetish", "Fetishes"), "genres. More general genres (such as those based on age, weight, and build) grow slowly, and genres associated with sexual", App.Encyclopedia.link("quirks", "Quirks"), "grow slowest of all, and are likely to require investment to promote.");
+ r.toParagraph();
+
+ r.push("If you stop producing porn of a particular slave, her viewership will decline over time, until she is once again unknown.");
+ r.toParagraph();
+
+ return r.container();
+}, "X-SeriesArcology");
+
+App.Encyclopedia.addCategory("X-SeriesArcology", function() {
+ const r = [];
+ if (V.encyclopedia !== "The X-Series Arcology") {
+ r.push(App.Encyclopedia.link("The X-Series Arcology"));
+ }
+ r.push(App.Encyclopedia.link("What the Upgrades Do"));
+ r.push(App.Encyclopedia.link("Personal Assistant"));
+ r.push(App.Encyclopedia.link("The Wardrobe"));
+ r.push(App.Encyclopedia.link("The Auto Salon"));
+ r.push(App.Encyclopedia.link("The Body Mod Studio"));
+ r.push(App.Encyclopedia.link("The Remote Surgery"));
+ r.push(App.Encyclopedia.link("The Pharmaceutical Fab"));
+ r.push(App.Encyclopedia.link("Security Drones"));
+ r.push(App.Encyclopedia.link("Water Filtration"));
+ r.push(App.Encyclopedia.link("Slave Nutrition"));
+ return App.UI.DOM.generateLinksStrip(r);
+});
diff --git a/src/gui/options/options.js b/src/gui/options/options.js
index 95170f9e8cc052facbf22bf520fe12ca6d9712a4..2b46d3d312bfd572a56b7f585099c9585827330b 100644
--- a/src/gui/options/options.js
+++ b/src/gui/options/options.js
@@ -132,15 +132,16 @@ App.UI.optionsPassage = function() {
App.UI.DOM.appendNewElement("h3", el, `NEW GAME PLUS`);
App.UI.DOM.appendNewElement("div", el, `You can begin a new game with up to five (or more) of your current slaves, although starting resources other than these slaves will be reduced.`);
App.UI.DOM.appendNewElement("div", el, App.UI.DOM.link(
- "Activate New Game Plus.",
+ "Activate New Game Plus",
() => {
V.ui = "start";
},
[],
"New Game Plus"
- ));
+ ), ["indent"]);
+ App.UI.DOM.appendNewElement("div", el, App.Arcology.purchase());
} else {
- App.UI.DOM.appendNewElement("div", el, `New Game Plus is not available because this game was not started with a compatible version.`, "note");
+ App.UI.DOM.appendNewElement("div", el, `New Game Plus is not available because this game was not started with a compatible version.`, ["note"]);
}
return el;
}
@@ -157,9 +158,9 @@ App.UI.optionsPassage = function() {
.addComment("<div>This mod is triggered after week 72. It is non-canon where it conflicts with canonical updates to the base game.</div>");
options.addOption("The Security Expansion mod is", "secExpEnabled")
- .addValue("Enabled", 1).on().addCallback(() => App.Mods.SecExp.generalInit())
+ .addValue("Enabled", 1).on()
.addValue("Disabled", 0).off()
- .addComment("<div>The mod can be activated in any moment, but it may result in unbalanced gameplay if activated very late in the game.</div>");
+ .addComment("<div>The mod can be activated in any moment, but it may result in unbalanced gameplay if activated very late in the game.</div><span class='yellow'>After enabling mid-game please run re-run BC Update.</span>");
option = options.addOption("Catmod is currently", "seeCats")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off();
@@ -872,15 +873,15 @@ App.Intro.display = function(isIntro) {
options.addOption("Hide tabs in Slave Interact", "slaveInteractLongForm")
.addValue("Enabled", true).on().addValue("Disabled", false).off();
- options.addOption("Line separations are", "lineSeparations")
- .addValue("Shown", 1).on().addValue("Hidden", 0).off();
-
options.addOption("Warning on end week saving", "endweekSaveWarning")
.addValue("Shown", 1).on().addValue("Hidden", 0).off();
options.addOption("Purchase options are", "purchaseStyle")
.addValue("Links", 'link').addValue("Buttons", 'button');
+ options.addOption("Default Rules Assistant mode is", "raDefaultMode")
+ .addValue("Simple", 0).addValue("Advanced", 1);
+
el.append(options.render());
r = [];
@@ -1167,7 +1168,7 @@ App.UI.artOptions = function() {
options.addOption("Clothing erection bulges are", "showClothingErection")
.addValue("Enabled", true).on().addValue("Disabled", false).off();
} else if (V.imageChoice === 4) {
- options.addComment(`This art is currently (05/19/22) the most actively developed. Real time 3D models. <a href='https://mega.nz/folder/DtoyiSwC#5FLXDYr1Uy90PZjxmfrKXA' target='_blank'> Download the WebGL art assets</a> and place the 'webgl' folder into the resources/ folder where this HTML file is.
+ options.addComment(`This art is currently (06/12/22) the most actively developed. Real time 3D models. <a href='https://mega.nz/folder/bwozybJa#h8fEEdKtXLAz-ZkcK1XbRA' target='_blank'> Download the WebGL art assets</a> and place the 'webgl' folder into the resources/ folder where this HTML file is.
Then <b>refresh</b> the page.
Create the resources folder if it does not exist. <span class="warning">(Android/MacOS not supported)</span>`);
@@ -1175,7 +1176,7 @@ App.UI.artOptions = function() {
for (const value of [0.25, 0.5, 1, 2, 4]) {
option.addValue(`${value}`, value);
}
- option.addComment("Multiplies the resolution of the render. Use a smaller factor for low-end GPU's.");
+ option.addComment("Multiplies the resolution of the render. Use a smaller factor for low-end GPUs.");
option = options.addOption("Texture resolution", "setTextureResolution");
for (const value of [512, 1024, 2048, 4096]) {
@@ -1185,7 +1186,7 @@ App.UI.artOptions = function() {
options.addOption("Face culling", "setFaceCulling")
.addValue("Enabled", true).off().addValue("Disabled", false).on()
- .addComment("Whether to draw the backside of the model, affects transparent surfaces such as hair. Enabling is recommended for low-end GPU's.");
+ .addComment("Whether to draw the backside of the model, affects transparent surfaces such as hair. Enabling is recommended for low-end GPUs.");
options.addOption("Pan speed", "setPanSpeed")
.addValue("0.25", 0.25).off().addValue("0.5", 0.5).off().addValue("1", 1).on().addValue("2", 2).off().addValue("4", 4).off();
options.addOption("Rotation speed", "setRotationSpeed")
@@ -1201,14 +1202,20 @@ App.UI.artOptions = function() {
}
options.addOption("Large Image size", "setImageSize").showTextBox()
.addComment("Recommended to be between 0.5 and 1.5.");
+ options.addOption("Three-Quarter View", "set3QView")
+ .addValue("Enabled", true).off().addValue("Disabled", false).on()
+ .addComment("Toggle between frontal and three-quarter view on reset");
options.addOption("Ambient Occlusion", "setSSAO")
.addValue("Enabled", true).on().addValue("Disabled", false).off();
options.addOption("SubSurface Scattering", "setSSS")
.addValue("Enabled", true).on().addValue("Disabled", false).off();
options.addOption("Shadowmapping", "setShadowMapping")
.addValue("Enabled", true).on().addValue("Disabled", false).off();
- options.addOption("Tonemapping", "setTonemapping")
- .addValue("Enabled", true).on().addValue("Disabled", false).off();
+ options.addOption("Idle Animations", "seeAnimation")
+ .addValue("Enabled", true).on().addValue("Disabled", false).off()
+ .addComment("Experimental idle animations, only visible in slave inspect screen. Will cause slowdown on some systems.");
+ options.addOption("Animation FPS", "animFPS")
+ .addValue("6", 6).off().addValue("12", 12).on().addValue("24", 24).off().addValue("32", 32).off();
} else if (V.imageChoice === 2) {
option.addComment("This art development is dead since vanilla. Since it is not embedded, requires a separate art pack to be downloaded.");
}
diff --git a/src/gui/quicklinks.js b/src/gui/quicklinks.js
index fcb8fb65676412a8d9f21108a15f4baa921391f1..5af78e852e750b9a0c541aa5f159e6c52cb25999 100644
--- a/src/gui/quicklinks.js
+++ b/src/gui/quicklinks.js
@@ -66,6 +66,7 @@ App.UI.quickMenu = (function() {
"Prosthetic Lab": true,
"Wardrobe": true,
"Toy Shop": true,
+ "Media Studio": true,
"The Black Market": true,
},
Tools: {
@@ -98,6 +99,7 @@ App.UI.quickMenu = (function() {
"Future Society": () => !V.FSAnnounced,
"Gene Lab": () => !V.geneticMappingUpgrade,
"Toy Shop": () => !V.toyShop,
+ "Media Studio": () => !V.studio,
"Head Girl Suite": () => !V.HGSuite,
"Implant Manufactory": () => !V.ImplantProductionUpgrade,
"Incubator": () => V.incubator.capacity === 0,
@@ -196,7 +198,7 @@ App.UI.quickMenu = (function() {
let hotkeysEnabled = false;
// register hotkeys
- // this is in it's own scope as we can forget the hotkeys object immediately afterwards
+ // this is in its own scope as we can forget the hotkeys object immediately afterwards
{
// setup hotkeys list, upper/lower case is important!
const hotkeys = cleanPassageMapping({
diff --git a/src/gui/sideBar.js b/src/gui/sideBar.js
index 41914c8fb846785776dd6b67e9d2bb52d758eb3a..34c3c3232c0bba9b330a82567c6cc4f02e629040 100644
--- a/src/gui/sideBar.js
+++ b/src/gui/sideBar.js
@@ -37,7 +37,7 @@ App.Utils.userButton = function(nextButton = V.nextButton, nextLink = V.nextLink
link.id = "endWeekButton";
el.append(link);
el.append(" ");
- App.UI.DOM.appendNewElement("span", el, App.UI.Hotkeys.hotkeys("endWeek"), "hotkey");
+ App.UI.DOM.appendNewElement("span", el, App.UI.Hotkeys.hotkeys("endWeek"), ["hotkey"]);
} else {
if (nextButton !== " ") {
link = App.UI.DOM.passageLink(
@@ -48,7 +48,7 @@ App.Utils.userButton = function(nextButton = V.nextButton, nextLink = V.nextLink
link.id = "nextButton";
el.append(link);
el.append(" ");
- App.UI.DOM.appendNewElement("span", el, App.UI.Hotkeys.hotkeys("nextLink"), "hotkey");
+ App.UI.DOM.appendNewElement("span", el, App.UI.Hotkeys.hotkeys("nextLink"), ["hotkey"]);
}
}
}
diff --git a/src/gui/storyCaption.js b/src/gui/storyCaption.js
index 2a71195f1cdea4453ad9fd47642c623f0e20643e..44219b7640a4133c1b451e77eea7e43e2ad0c242 100644
--- a/src/gui/storyCaption.js
+++ b/src/gui/storyCaption.js
@@ -77,7 +77,7 @@ App.UI.storyCaption = function() {
const p = document.createElement("p");
p.append(App.UI.DOM.makeElement("span", "FCE", ["bold"]), ": ",
- App.Encyclopedia.Dialog.linkDOM(V.encyclopedia, V.encyclopedia));
+ App.Encyclopedia.link(V.encyclopedia, V.encyclopedia));
fragment.append(p);
return fragment;
@@ -85,7 +85,12 @@ App.UI.storyCaption = function() {
function week() {
const fragment = new DocumentFragment();
const div = document.createElement("div");
- App.UI.DOM.appendNewElement("span", fragment, App.UI.DOM.spanWithTooltip(`Week ${V.week}`, capFirstChar(years(V.week))), ['bold']);
+ const tooltip = document.createElement("div");
+ App.UI.DOM.appendNewElement("div", tooltip, capFirstChar(years(V.week)));
+ if (V.arcologies[0].weeks !== V.week) {
+ App.UI.DOM.appendNewElement("div", tooltip, `${capFirstChar(years(V.arcologies[0].weeks))} in ${V.arcologies[0].name}`);
+ }
+ App.UI.DOM.appendNewElement("span", fragment, App.UI.DOM.spanWithTooltip(`Week ${num(V.week)}`, tooltip, ['bold']));
fragment.append(div);
App.UI.DOM.appendNewElement("div", fragment, `Week of ${asDateString(V.week)}`);
diff --git a/src/interaction/artificialInsemination.js b/src/interaction/artificialInsemination.js
index 9b5d83e556143fe853f7537ddd28b2b5c660ff4c..e5feacfe5549696c5beda4b405f2d63fecc85039 100644
--- a/src/interaction/artificialInsemination.js
+++ b/src/interaction/artificialInsemination.js
@@ -7,7 +7,7 @@ App.UI.SlaveInteract.artificialInsemination = function() {
App.UI.DOM.appendNewElement("p", f, `${getSlave(V.AS).slaveName} is prepped for fertilization; now you must select a target to harvest sperm from.`, "scene-intro");
- App.UI.DOM.appendNewElement("h2", f, "Select an eligible slave to serve as the semen donatrix");
+ App.UI.DOM.appendNewElement("h2", f, "Select an eligible slave to serve as the semen donor");
r = [];
let any = false;
diff --git a/src/interaction/budgets/recordTemplates.js b/src/interaction/budgets/recordTemplates.js
index 9af115c01c57ad4d6a379b4a9f358c02a3b821f8..efea68093dc4c388d88b2ed1c423b5d041fa4a39 100644
--- a/src/interaction/budgets/recordTemplates.js
+++ b/src/interaction/budgets/recordTemplates.js
@@ -127,7 +127,9 @@ App.Data.Records.LastWeeksCash = function() {
this.personalLivingExpenses = 0;
this.PCtraining = 0;
this.PCdiet = 0;
+ this.PCdrugs = 0;
this.PCmedical = 0;
+ this.PCcosmetics = 0;
this.PCskills = 0;
this.stocksTraded = 0; // trading
this.stocks = 0; // share growth
@@ -209,6 +211,7 @@ App.Data.Records.LastWeeksRep = function() {
this.overflow = 0; // loss above 20k cap
this.curve = 0; // loss due to income curving
this.cheating = 0;
+ this.weather = 0;
this.total = 0;
};
diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js
index ad83a80b88504afa64c0908e160fabfc3ffbbe7d..e971f096e45c095077216ba1975e4ddb9f55c5b7 100644
--- a/src/interaction/main/mainLinks.js
+++ b/src/interaction/main/mainLinks.js
@@ -6,7 +6,7 @@ App.UI.View.mainLinks = function() {
const PA = V.personalAttention.task === PersonalAttention.TRAINING ? V.personalAttention.slaves.map(x => getSlave(x.ID)) : [];
let fragment = document.createDocumentFragment();
- if (V.PC.health.shortDamage >= 30) {
+ if (onBedRest(V.PC, true) && V.PC.dick < -4000) { // Impossible condition to prevent scope creep. Need to finish this later, not right now.
fragment.append(`The injuries received in the recent battle prevent you from undertaking tiring efforts.`);
} else {
switch (V.personalAttention.task) {
@@ -145,8 +145,8 @@ App.UI.View.mainLinks = function() {
return (typeof organ === 'object' && getSlave(organ.ID) !== undefined);
});
/* cycle through slaves, for each slave cycle through completed organs and track how many are of the interrogated slave (and if organs have a slaves to be implanted on) */
- for (let i = 0; i < V.slaves.length; i++) {
- const slaveOrgans = V.completedOrgans.reduce((acc, organ) => organ.ID === V.slaves[i].ID ? acc + 1 : acc, 0);
+ for (const slave of V.slaves) {
+ const slaveOrgans = V.completedOrgans.reduce((acc, organ) => organ.ID === slave.ID ? acc + 1 : acc, 0);
/* if the interrogated slave has one or more organs ready: */
if (slaveOrgans > 0) {
const div = document.createElement("div");
@@ -161,9 +161,9 @@ App.UI.View.mainLinks = function() {
App.UI.DOM.makeElement(
"span",
App.UI.DOM.link(
- V.slaves[i].slaveName,
+ slave.slaveName,
() => {
- V.AS = V.slaves[i].ID;
+ V.AS = slave.ID;
V.tabChoice.RemoteSurgery = "Structural";
},
[],
diff --git a/src/interaction/main/toychest.js b/src/interaction/main/toychest.js
index bd1b307b1e3d479e0e42141f10e989565eb89aa1..31aafcf5bde6f577f3840223805cfec511a99596 100644
--- a/src/interaction/main/toychest.js
+++ b/src/interaction/main/toychest.js
@@ -8,7 +8,7 @@ App.Interact.ToyChest = function(slave) {
let r = `${slave.slaveName} `;
if (slave.fuckdoll) {
r += `is waiting for use nearby. `;
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
if (canSmell(slave) && slave.career === "a breeding bull" && isFertile(V.PC) && V.PC.preg === 0 && canPenetrate(slave)) {
r += `is rock hard and sniffing the air. `;
} else {
@@ -53,7 +53,7 @@ App.Interact.ToyChest = function(slave) {
let pose = jsRandom(1, 100);
if (slave.fuckdoll) {
r += `${His} holes are, as always, available. `;
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
r += `${He} ignores ${his} clothing, regarding it as an impediment to ${his} purpose. `;
} else {
switch (slave.clothes) {
diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js
index 46a7791342afb99da1ff1768328c5a63d7350693..ec64bf325cb5e8b117a91ab34948e80d6621100a 100644
--- a/src/interaction/main/walkPast.js
+++ b/src/interaction/main/walkPast.js
@@ -312,7 +312,7 @@ globalThis.walkPast = (function() {
} else {
t += `${partnerName} is enthusiastically using ${his2} tongue to bring ${name} to orgasm.`;
}
- } else if (activeSlave.fetishStrength > 60 && activeSlave.fetishKnown === 1 && activeSlave.fetish !== "none") {
+ } else if (activeSlave.fetishStrength > 60 && activeSlave.fetishKnown === 1 && activeSlave.fetish !== Fetish.NONE) {
switch (activeSlave.fetish) {
case "boobs":
if (fuckSeed > 60 && (activeSlave.lactation > 0 || partnerSlave.lactation > 0)) {
@@ -1141,7 +1141,7 @@ globalThis.walkPast = (function() {
} else if (seed >= 33) { /* CUDDLE TIME */
if (activeSlave.energy > 95 && fuckSeed > 70) {
t += `lying in bed together. ${partnerName} has somehow managed to exhaust ${his2} ${activeSlaveRel}, and the sexually sated nympho is curled up with ${his} head on ${partnerName}'s chest, snoring lightly. ${partnerName} is smiling fondly at ${him}.`;
- } else if (activeSlave.fetish !== "none" && fuckSeed > 50) {
+ } else if (activeSlave.fetish !== Fetish.NONE && fuckSeed > 50) {
switch (activeSlave.fetish) {
case "boobs":
t += `sleeping in bed together. ${name} is using ${partnerName}'s `;
@@ -2004,9 +2004,6 @@ globalThis.walkPast = (function() {
t += `under ${S.Schoolteacher.slaveName}, perhaps literally; `;
}
break;
- case Job.ATTENDANT:
- t += `look after the slaves in ${V.spaName}; `;
- break;
case Job.CLASSES:
t += `attend classes with ${V.assistant.name}; `;
break;
@@ -2021,7 +2018,7 @@ globalThis.walkPast = (function() {
break;
}
} /* end inflation blurb */
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
t += `${he} does not even glance at you as ${he} goes mindlessly to ${his} next task.`;
} else if (slave.devotion < -50) {
t += `${he} directs a look of pure hatred at where you sit as ${he} passes.`;
diff --git a/src/interaction/policies/changeLanguage.js b/src/interaction/policies/changeLanguage.js
index 82e4703e95877f97a0cdd342091d8ab36d578599..42375a8acdf944ac214385e2b51bbcfcd7a5b62c 100644
--- a/src/interaction/policies/changeLanguage.js
+++ b/src/interaction/policies/changeLanguage.js
@@ -65,7 +65,7 @@ App.Arcology.changeLanguage = function() {
V.language = targetLanguage;
V.arcologies[0].prosperity = Math.trunc(0.9 * V.arcologies[0].prosperity);
for (const slave of V.slaves) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
nationalityToAccent(slave);
if (slave.accent >= 3) {
if ((slave.intelligence + slave.intelligenceImplant + 100) > random(0, 100)) {
diff --git a/src/interaction/policies/policies.js b/src/interaction/policies/policies.js
index c07cdea812037630ca95664cbdf6de8dfec84bda..6075feea5b6015ddd959bc2d60acbb221c287df2 100644
--- a/src/interaction/policies/policies.js
+++ b/src/interaction/policies/policies.js
@@ -91,7 +91,7 @@ globalThis.policy = function(category) {
* @returns {Node} Link to repeal.
*/
function repeal(p) {
- const frag = new DocumentFragment;
+ const frag = new DocumentFragment();
let check = canAfford();
let link;
if (!(p.hasOwnProperty("hide") && p.hide.button === 1)) {
@@ -129,7 +129,7 @@ globalThis.policy = function(category) {
*/
function implement(p, enable) {
let check = canAfford();
- const frag = new DocumentFragment;
+ const frag = new DocumentFragment();
const linkArray = [];
let link;
if (check === true) {
diff --git a/src/interaction/prostheticConfig.js b/src/interaction/prostheticConfig.js
index 9a64ec644b246b8b9dc56fb3a13121a187343c6b..1d6c2bbd6ac4df648e7852cb52bf13e11d6d171e 100644
--- a/src/interaction/prostheticConfig.js
+++ b/src/interaction/prostheticConfig.js
@@ -482,7 +482,7 @@ App.UI.prostheticsConfig = function(slave) {
}
/**
- * @param {string} prosthetic
+ * @param {FC.prostheticID} prosthetic
* @param {HTMLDivElement} container
*/
function addBuyRow(prosthetic, container) {
diff --git a/src/interaction/prostheticLabPassage.js b/src/interaction/prostheticLabPassage.js
index 9f2faebb0d366b297f4e6dde8c40e91f5f0fc873..c8d3aa27e4abb8c9162903261a34c25fef2deba5 100644
--- a/src/interaction/prostheticLabPassage.js
+++ b/src/interaction/prostheticLabPassage.js
@@ -14,7 +14,7 @@ App.UI.prostheticLab = function() {
for (const p of V.adjustProsthetics) {
if (p.workLeft > 0) {
App.UI.DOM.appendNewElement("div", node,
- `${capFirstChar(App.Data.prosthetics[p.id].name)} for ${SlaveFullName(V.slaves[V.slaveIndices[p.slaveID]])}`,
+ `${capFirstChar(App.Data.prosthetics[p.id].name)} for ${SlaveFullName(getSlave(p.slaveID))}`,
"indent"
);
}
@@ -127,7 +127,7 @@ App.UI.prostheticLab = function() {
}
App.Events.addNode(node, ["Assign", App.UI.DOM.generateLinksStrip(linkArray), "menial slaves to lab."]);
} else {
- App.UI.DOM.appendNewElement("div", node, `You do not own any${` unassigned`} menial slaves.`);
+ App.UI.DOM.appendNewElement("div", node, `You do not own any unassigned menial slaves.`);
}
App.UI.DOM.appendNewElement("div", node, `Using menial slaves is much cheaper than hiring scientists, but they are less effective. ${cashFormat(100)} per slave each week.`, ["indent", "note"]);
} else {
@@ -200,7 +200,7 @@ App.UI.prostheticLab = function() {
}
break;
case "craftFit":
- r.push(`For <span class="noteworthy">${SlaveFullName(V.slaves[V.slaveIndices[V.researchLab.tasks[i].slaveID]])}</span> you`);
+ r.push(`For <span class="noteworthy">${SlaveFullName(getSlave(V.researchLab.tasks[i].slaveID))}</span> you`);
if (i === 0) {
r.push(`are constructing`);
} else {
diff --git a/src/interaction/rename.js b/src/interaction/rename.js
index 3345ce137c444d58bb39eacb0a73490768d44807..ba4fa80b028067736dbd80e727be03479d9d23b1 100644
--- a/src/interaction/rename.js
+++ b/src/interaction/rename.js
@@ -16,7 +16,7 @@ App.UI.SlaveInteract.rename = function(slave, {oldName = "", oldSurname = ""} =
if (slave.slaveName === "" || !(slave.hasOwnProperty("slaveName"))) {
r.push(`${oldName} needs to be called something on the records, so ${oldName} ${he} stays.`);
slave.slaveName = oldName;
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} doesn't even recognize that ${he}'s been renamed. It simply does not register.`);
} else if ((oldName !== slave.birthName && slave.slaveName === slave.birthName) || (oldSurname !== slave.birthSurname && slave.slaveSurname === slave.birthSurname)) {
r.push(`${slave.slaveName}`);
@@ -69,7 +69,7 @@ App.UI.SlaveInteract.rename = function(slave, {oldName = "", oldSurname = ""} =
}
}
if (insultingName) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${His} new name would be insulting to a normal ${girl}, but ${he} dully accepts that it is an accurate description and goes about ${his} duties.`);
} else if (slave.devotion < -50) {
r.push(`Being given such a degrading name <span class="devotion dec">further increases ${his} hatred</span> of you.`);
@@ -105,7 +105,7 @@ App.UI.SlaveInteract.rename = function(slave, {oldName = "", oldSurname = ""} =
if (oldSurname !== slave.slaveSurname) {
if (slave.relationship === -3) {
if (V.PC.slaveSurname) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Names are meaningless to ${him} and it is unlikely ${he}'ll remember it.`);
} else if (slave.devotion + slave.trust >= 175) {
if (slave.slaveSurname === V.PC.slaveSurname) {
diff --git a/src/interaction/saleFunctions.js b/src/interaction/saleFunctions.js
index c4c441ebc57d1b685a54f25e6ca058631b090476..e449c89efc48e50c31dee24310b337f5f4ae9965 100644
--- a/src/interaction/saleFunctions.js
+++ b/src/interaction/saleFunctions.js
@@ -37,7 +37,7 @@ App.Interact.Sale.separationReactions = function(slave) {
}
if (slave.relationship > 0) {
const rel = getSlave(slave.relationshipTarget);
- if (rel && rel.fetish !== "mindbroken") {
+ if (rel && rel.fetish !== Fetish.MINDBROKEN) {
const {his2} = getPronouns(rel).appendSuffix("2");
App.Events.addParagraph(resultNode, [`${rel.slaveName} is <span class="devotion dec">grieved</span> that you are selling ${his2} best source of comfort and companionship in a life of bondage.`]);
rel.devotion -= rel.relationship*10;
@@ -53,7 +53,7 @@ App.Interact.Sale.separationReactions = function(slave) {
}
if (slave.rivalry !== 0) {
const riv = getSlave(slave.rivalryTarget);
- if (riv && riv.fetish !== "mindbroken") {
+ if (riv && riv.fetish !== Fetish.MINDBROKEN) {
const {he2, his2} = getPronouns(riv).appendSuffix("2");
App.Events.addParagraph(resultNode, [`${riv.slaveName} is <span class="devotion inc">pleased</span> that ${he2} won't have to see ${his2} rival any more.`]);
riv.devotion += riv.rivalry*3;
diff --git a/src/interaction/sellSlave.js b/src/interaction/sellSlave.js
index 32473df24e617c7ce260256555ca64947f4f88d9..246da5e1f5731fdd089250d4e48ac2318429455e 100644
--- a/src/interaction/sellSlave.js
+++ b/src/interaction/sellSlave.js
@@ -6,7 +6,6 @@ App.Interact.sellSlave = function(slave) {
he, his, hers, him, himself, girl
} = getPronouns(slave);
const {womenU} = getNonlocalPronouns(V.seeDicks).appendSuffix("U");
- let cost;
let t = [];
t.push(`You prepare ${him} for sale. ${His} response to being put up for purchase is`);
@@ -53,10 +52,9 @@ App.Interact.sellSlave = function(slave) {
}
}
const costObj = slaveCost(slave, false, false, false, true);
- cost = costObj.cost;
- cost = (random(70, 80) * Math.trunc(cost / 100));
+ let cost = random(70, 80) / 100 * costObj.cost;
- if (V.secExpEnabled > 0 && V.SecExp.edicts.defense.militia === 5 && slave.skill.combat > 0) {
+ if (V.secExpEnabled > 0 && V.SecExp.edicts.defense.militia === 5 && slave.skill.combat > 60) {
t.push(`${His} combat training is likely to increase ${his} sale value within your militarized society.`);
cost *= 1.5;
}
@@ -364,52 +362,52 @@ App.Interact.sellSlave = function(slave) {
}
const careers = [];
- if (slave.skill.headGirl >= V.masteredXP && !App.Data.Careers.Leader.HG.includes(slave.career)) {
+ if (slave.skill.headGirl >= Constant.MASTERED_XP && !App.Data.Careers.Leader.HG.includes(slave.career)) {
careers.push("Head Girl");
}
- if (slave.skill.recruiter >= V.masteredXP && !App.Data.Careers.Leader.recruiter.includes(slave.career)) {
+ if (slave.skill.recruiter >= Constant.MASTERED_XP && !App.Data.Careers.Leader.recruiter.includes(slave.career)) {
careers.push("Recruiter");
}
- if (slave.skill.bodyguard >= V.masteredXP && !App.Data.Careers.Leader.bodyguard.includes(slave.career)) {
+ if (slave.skill.bodyguard >= Constant.MASTERED_XP && !App.Data.Careers.Leader.bodyguard.includes(slave.career)) {
careers.push("Bodyguard");
}
- if (slave.skill.madam >= V.masteredXP && !App.Data.Careers.Leader.madam.includes(slave.career)) {
+ if (slave.skill.madam >= Constant.MASTERED_XP && !App.Data.Careers.Leader.madam.includes(slave.career)) {
careers.push("Madam");
}
- if (slave.skill.DJ >= V.masteredXP && !App.Data.Careers.Leader.DJ.includes(slave.career)) {
+ if (slave.skill.DJ >= Constant.MASTERED_XP && !App.Data.Careers.Leader.DJ.includes(slave.career)) {
careers.push("DJ");
}
- if (slave.skill.nurse >= V.masteredXP && !App.Data.Careers.Leader.nurse.includes(slave.career)) {
+ if (slave.skill.nurse >= Constant.MASTERED_XP && !App.Data.Careers.Leader.nurse.includes(slave.career)) {
careers.push("Nurse");
}
- if (slave.skill.teacher >= V.masteredXP && !App.Data.Careers.Leader.schoolteacher.includes(slave.career)) {
+ if (slave.skill.teacher >= Constant.MASTERED_XP && !App.Data.Careers.Leader.schoolteacher.includes(slave.career)) {
careers.push("Schoolteacher");
}
- if (slave.skill.attendant >= V.masteredXP && !App.Data.Careers.Leader.attendant.includes(slave.career)) {
+ if (slave.skill.attendant >= Constant.MASTERED_XP && !App.Data.Careers.Leader.attendant.includes(slave.career)) {
careers.push("Attendant");
}
- if (slave.skill.matron >= V.masteredXP && !App.Data.Careers.Leader.matron.includes(slave.career)) {
+ if (slave.skill.matron >= Constant.MASTERED_XP && !App.Data.Careers.Leader.matron.includes(slave.career)) {
careers.push("Matron");
}
- if (slave.skill.stewardess >= V.masteredXP && !App.Data.Careers.Leader.stewardess.includes(slave.career)) {
+ if (slave.skill.stewardess >= Constant.MASTERED_XP && !App.Data.Careers.Leader.stewardess.includes(slave.career)) {
careers.push("Stewardess");
}
- if (slave.skill.milkmaid >= V.masteredXP && !App.Data.Careers.Leader.milkmaid.includes(slave.career)) {
+ if (slave.skill.milkmaid >= Constant.MASTERED_XP && !App.Data.Careers.Leader.milkmaid.includes(slave.career)) {
careers.push("Milkmaid");
}
- if (slave.skill.farmer >= V.masteredXP && !App.Data.Careers.Leader.farmer.includes(slave.career)) {
+ if (slave.skill.farmer >= Constant.MASTERED_XP && !App.Data.Careers.Leader.farmer.includes(slave.career)) {
careers.push("Farmer");
}
- if (slave.skill.wardeness >= V.masteredXP && !App.Data.Careers.Leader.wardeness.includes(slave.career)) {
+ if (slave.skill.wardeness >= Constant.MASTERED_XP && !App.Data.Careers.Leader.wardeness.includes(slave.career)) {
careers.push("Wardeness");
}
- if (slave.skill.servant >= V.masteredXP && !App.Data.Careers.General.servant.includes(slave.career)) {
+ if (slave.skill.servant >= Constant.MASTERED_XP && !App.Data.Careers.General.servant.includes(slave.career)) {
careers.push("Servant");
}
- if (slave.skill.entertainer >= V.masteredXP && !App.Data.Careers.General.entertainment.includes(slave.career)) {
+ if (slave.skill.entertainer >= Constant.MASTERED_XP && !App.Data.Careers.General.entertainment.includes(slave.career)) {
careers.push("Entertainer");
}
- if (slave.skill.whore >= V.masteredXP && !App.Data.Careers.General.whore.includes(slave.career)) {
+ if (slave.skill.whore >= Constant.MASTERED_XP && !App.Data.Careers.General.whore.includes(slave.career)) {
careers.push("Whore");
}
if (careers.length > 0) {
@@ -463,9 +461,9 @@ App.Interact.sellSlave = function(slave) {
}
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
t.push(`It's a shame ${he}'s mindbroken. From a price perspective.`);
- } else if (slave.fetish !== "none" && slave.fetishKnown === 1) {
+ } else if (slave.fetish !== Fetish.NONE && slave.fetishKnown === 1) {
t.push(`${His} fetish is good for performance, of course, but it adds a little bonus to value, too.`);
} else if (slave.fetishKnown === 1) {
t.push(`${His} tastes are a tad plain, but at least it won't hurt ${his} value.`);
@@ -533,7 +531,7 @@ App.Interact.sellSlave = function(slave) {
}
} else if (V.arcologies[0].FSSlaveProfessionalismSMR === 1) {
if (intelligenceScore <= 50) {
- t.push(`${He}'s no where near smart enough to compete with the local markets, so outside bids are going to be the only option.`);
+ t.push(`${He}'s nowhere near smart enough to compete with the local markets, so outside bids are going to be the only option.`);
} else {
t.push(`${His} brain is probably going to bring in very generous bids on its own.`);
if (slave.intelligenceImplant >= 15) {
@@ -865,7 +863,7 @@ App.Interact.sellSlave = function(slave) {
buyers = new Map([[
"elite auction",
{
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `is what the current bid for ${him} stands at.`,
get requirements() { return true; },
percentOdds: 100,
@@ -891,7 +889,7 @@ App.Interact.sellSlave = function(slave) {
buyers = new Map([[
"progeria",
{
- cost: random(10, 100) * Math.trunc((cost * 1.1) / 500),
+ cost: random(2, 20) / 100,
offerDesc: `The current offer for ${him} stands at`,
get requirements() { return true; },
percentOdds: 100,
@@ -928,8 +926,9 @@ App.Interact.sellSlave = function(slave) {
const saleNode = new DocumentFragment();
const buyer = buyers.get(key);
const r = [];
- const cashColor = buyer.cost >= cost ? "cash" : undefined; // Green text if the buyer is offering at or above slaveCost(), white if below.
- r.push(App.UI.DOM.makeElement("span", cashFormat(buyer.cost), cashColor));
+ const cashColor = buyer.cost >= 1.0 ? ["cash"] : undefined; // Green text if the buyer is offering at or above slaveCost(), white if below.
+ const actualCost = 500 * Math.trunc(cost * buyer.cost / 500);
+ r.push(App.UI.DOM.makeElement("span", cashFormat(actualCost), cashColor));
r.push(buyer.offerDesc);
if (V.debugMode) {
r.push(App.UI.DOM.makeElement("span", `(${key})`));
@@ -945,10 +944,10 @@ App.Interact.sellSlave = function(slave) {
const allowsBoomerang = !buyer.hasOwnProperty("allowsBoomerang") || buyer.allowsBoomerang;
const slaveCanBoomerang = () => (
(
- ((slave.actualAge < V.retirementAge-1) && V.policies.retirement.physicalAgePolicy === 0) ||
- ((slave.physicalAge < V.retirementAge-1) && V.policies.retirement.physicalAgePolicy === 1)
- ) && slave.fuckdoll === 0 && canWalk(slave) && canTalk(slave) && slave.fetish !== "mindbroken" && slave.devotion > 50 &&
- (slave.trust > 95 || slave.trust < -20 || (slave.intelligence+slave.intelligenceImplant < -15))
+ ((slave.actualAge < V.retirementAge - 1) && V.policies.retirement.physicalAgePolicy === 0) ||
+ ((slave.physicalAge < V.retirementAge - 1) && V.policies.retirement.physicalAgePolicy === 1)
+ ) && slave.fuckdoll === 0 && canWalk(slave) && canTalk(slave) && slave.fetish !== Fetish.MINDBROKEN && slave.devotion > 50 &&
+ (slave.trust > 95 || slave.trust < -20 || (slave.intelligence + slave.intelligenceImplant < -15))
);
if (allowsBoomerang && slaveCanBoomerang() && (!V.boomerangSlave || V.boomerangWeeks > 15)) {
@@ -1017,7 +1016,7 @@ App.Interact.sellSlave = function(slave) {
}
}
resultNode.append(App.Interact.Sale.separationReactions(slave));
- cashX(buyer.cost, "slaveTransfer");
+ cashX(actualCost, "slaveTransfer");
App.Events.addParagraph(resultNode,
buyer.hasOwnProperty("completeSale")
? buyer.completeSale
@@ -1035,7 +1034,7 @@ App.Interact.sellSlave = function(slave) {
/** @type {Map<string, slaveBuyerData>} */
const buyers = new Map([
["housekeeper", {
- cost: 500 * Math.trunc((cost * 0.9) / 500),
+ cost: 0.9,
offerDesc: `from a polite older citizen looking for a housekeeper and bedwarmer.`,
get requirements() { return ((slave.physicalAge > 30) && (slave.devotion > 20)); },
percentOdds: 50,
@@ -1058,7 +1057,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["preg fetishist", {
- cost: 500 * Math.trunc((cost * 1.05) / 500),
+ cost: 1.05,
offerDesc: `from a male citizen who wants to ensure his posterity by using ${him} to carry his children.`,
get requirements() { return ((isFertile(slave) && V.seePreg !== 0) && cost > 10000); },
percentOdds: 60,
@@ -1081,7 +1080,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["organ crafter", {
- cost: 500 * Math.trunc((cost * 1.05) / 500),
+ cost: 1.05,
offerDesc: `from an organ modifier interested in ${his} anal womb.`,
get requirements() { return ((isFertile(slave) && V.seePreg !== 0) && slave.mpreg === 1); },
percentOdds: 60,
@@ -1103,7 +1102,7 @@ App.Interact.sellSlave = function(slave) {
allowsBoomerang: false
}],
["womb filler", {
- cost: 400 * Math.trunc((cost * 1.05) / 500),
+ cost: 0.85,
offerDesc: `from a pharmaceuticals corporation looking for fertile virgins for testing extreme fertility drugs.`,
get requirements() { return ((isFertile(slave) && V.seePreg !== 0) && V.seeHyperPreg === 1 && V.seeExtreme === 1 && slave.vagina === 0); },
percentOdds: 60,
@@ -1144,7 +1143,7 @@ App.Interact.sellSlave = function(slave) {
allowsBoomerang: false
}],
["eugenics arcology", {
- cost: (500 * Math.trunc((cost * 1.1) / 500)),
+ cost: 1.1,
offerDesc: `from a fellow arcology owner seeking a smart, pretty slave to use as a breeder to produce superior children.`,
get requirements() { return ((isFertile(slave) && V.seePreg !== 0) && slave.intelligence > 50) && slave.face >= 55 && slave.faceShape !== "masculine"; },
percentOdds: 90,
@@ -1168,7 +1167,7 @@ App.Interact.sellSlave = function(slave) {
allowsBoomerang: false
}],
["repopulationist arcology", {
- cost: (500 * Math.trunc((cost * 1.05) / 500)),
+ cost: 1.05,
offerDesc: `from a fellow arcology owner focusing on building a future society based on his genes: he seeks fertile virgins with wide hips, feeling they will be the best mothers.`,
get requirements() { return ((isFertile(slave) && V.seePreg !== 0) && slave.hips > 1 && slave.vagina === 0); },
percentOdds: 60,
@@ -1177,7 +1176,7 @@ App.Interact.sellSlave = function(slave) {
let slaveImpact;
r.push(`${slave.slaveName} is seen nine months later with an enormous pregnancy and the most content look on ${his} face. ${He}`);
if (hasAnyArms(slave)) {
- r.push(`gently pats ${his} quadruplet filled belly and lets off a moan as ${his} children kick in response.`);
+ r.push(`gently pats ${his} quadruplet-filled belly and lets off a moan as ${his} children kick in response.`);
} else {
r.push(`moans lewdly as ${his} children kick away in ${his} womb.`);
}
@@ -1199,7 +1198,7 @@ App.Interact.sellSlave = function(slave) {
allowsBoomerang: false
}],
["virgin trader", {
- cost: (500 * Math.trunc((cost * 1.3) / 500)),
+ cost: 1.3,
offerDesc: `from a slave trader with a notorious virgin impregnation fetish: he uses his work to provide himself with an endless supply of virgins to knock up and resell.`,
get requirements() { return ((isFertile(slave) && V.seePreg !== 0) && slave.vagina === 0); },
percentOdds: 60,
@@ -1222,7 +1221,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["abortion TV", {
- cost: (500 * Math.trunc((cost * 1.05) / 500)),
+ cost: 1.05,
offerDesc: `from a group that takes pleasure in performing abortions on live TV.`,
get requirements() { return (V.seePreg !== 0 && V.seeHyperPreg === 1 && V.seeExtreme === 1 && (slave.preg > slave.pregData.normalBirth / 2) && (slave.bellyPreg >= 300000)); },
percentOdds: 60,
@@ -1244,7 +1243,7 @@ App.Interact.sellSlave = function(slave) {
allowsBoomerang: false
}],
["nipple fetishist", {
- cost: (500 * Math.trunc((cost * 1.05) / 500)),
+ cost: 1.05,
offerDesc: `from a female citizen with a very specific fetish: she loves breasts to the point of enjoying slaves with nipples large enough to meaningfully penetrate her.`,
get requirements() { return (slave.nipples === "huge"); },
percentOdds: 60,
@@ -1267,7 +1266,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["nipple fucker", {
- cost: (500 * Math.trunc((cost * 1.1) / 500)),
+ cost: 1.1,
offerDesc: `from a male citizen with a kink that's hard to satisfy: he loves nipple fucking, but hates how breasts just don't work that way.`,
get requirements() { return (slave.nipples === "fuckable"); },
percentOdds: 60,
@@ -1292,7 +1291,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["anal fetishist", {
- cost: (500 * Math.trunc((cost * 1.05) / 500)),
+ cost: 1.05,
offerDesc: `from a citizen who enjoys buttfucking slaves with the necessary equipment, willingness, and anal skill to reward his efforts with messy, hands-free orgasms of their own.`,
get requirements() { return (slave.balls > 0 && slave.skill.anal > 10 && slave.devotion > 20); },
percentOdds: 60,
@@ -1321,7 +1320,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["oral fetishist", {
- cost: (500 * Math.trunc((cost * 1.05) / 500)),
+ cost: 1.05,
offerDesc: `from an unusually well-endowed citizen who strongly prefers oral sex with willing partners who can deepthroat him successfully.`,
get requirements() { return (slave.skill.oral > 30 && slave.devotion > 20); },
percentOdds: 60,
@@ -1344,7 +1343,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["pain fetishist", {
- cost: (500 * Math.trunc((cost * 1.05) / 500)),
+ cost: 1.05,
offerDesc: `from a sadistic citizen who likes hurting her slaves, dislikes masochists for their enjoyment of her treatment, yet prefers slaves who will not hate her.`,
get requirements() { return (slave.fetish !== "masochist" && slave.devotion > 50); },
percentOdds: 60,
@@ -1367,7 +1366,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["sadism fetishist", {
- cost: (500 * Math.trunc((cost * 1.05) / 500)),
+ cost: 1.05,
offerDesc: `from a sadistic citizen who is looking for an imposing, stupid slave she can train to rape her victims on command.`,
get requirements() { return (slave.muscles > 30 && slave.height >= 170 && (slave.intelligence + slave.intelligenceImplant < -15)); },
percentOdds: 60,
@@ -1390,7 +1389,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["dom fetishist", {
- cost: (500 * Math.trunc((cost * 1.05) / 500)),
+ cost: 1.05,
offerDesc: `from a newly wealthy citizen who is expanding his household and is interested in smart, educated, and obedient slaves for leadership roles.`,
get requirements() { return (slave.devotion > 20 && (slave.intelligence + slave.intelligenceImplant > 50) && slave.intelligenceImplant >= 15); },
percentOdds: 60,
@@ -1413,7 +1412,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["sub fetishist", {
- cost: (500 * Math.trunc((cost * 1.05) / 500)),
+ cost: 1.05,
offerDesc: `from a citizen whose job keeps her deskbound; bored, she's looking for a devoted oral slave to occupy the space under the desk and be her constant pussylicking appliance.`,
get requirements() { return (slave.devotion > 50 && slave.skill.oral >= 100); },
percentOdds: 60,
@@ -1422,7 +1421,7 @@ App.Interact.sellSlave = function(slave) {
let slaveImpact;
r.push(`The back of ${slave.slaveName}'s head becomes a well-known sight in business circles, since ${his} mistress rarely lets it out from between her legs.`);
for (const s of V.slaves) {
- if (s.fetish === "submissive") {
+ if (s.fetish === Fetish.SUBMISSIVE) {
if (s.fetishKnown === 1) {
s.trust += 1;
slaveImpact = 1;
@@ -1436,7 +1435,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["buttbreaker", {
- cost: (500 * Math.trunc((cost * 1.3) / 500)),
+ cost: 1.3,
offerDesc: `from a wealthy citizen infamous for cruelly raping anal virgins in public; he buys and abuses a new one every few weeks.`,
get requirements() { return (slave.anus === 0); },
percentOdds: 60,
@@ -1457,7 +1456,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["trainer staffing", {
- cost: (500 * Math.trunc((cost * 1.1) / 500)),
+ cost: 1.1,
offerDesc: `from a small, local slave trainer interested in using ${him} to help train new slaves in the sexual arts.`,
get requirements() { return (slave.skill.oral >= 100 && slave.skill.anal >= 100 && (slave.intelligence + slave.intelligenceImplant > 15)); },
percentOdds: 60,
@@ -1478,7 +1477,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D milf staffing", {
- cost: 500 * Math.trunc((cost * 1.4) / 500),
+ cost: 1.4,
offerDesc: `from a skilled slave trainer who feels that MILFs make the best slave trainers.`,
get requirements() { return (slave.skill.oral >= 100 && slave.skill.anal >= 100 && (slave.intelligence + slave.intelligenceImplant > 15) && slave.intelligenceImplant >= 15 && slave.physicalAge > 35); },
percentOdds: 60,
@@ -1499,7 +1498,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D hucow", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a prominent citizen with a notorious fetish for fertile, natural cows.`,
get requirements() { return (slave.boobsImplant === 0 && slave.lactation > 0 && slave.ovaries > 0 && slave.boobs > 1000); },
percentOdds: 60,
@@ -1520,9 +1519,9 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D startled the witch", {
- cost: 500 * Math.trunc((cost * 1.35) / 500),
+ cost: 1.35,
offerDesc: `from a prominent citizen who's pursuing some sort of mercenary project that requires worryingly large numbers of thin ${girl}s with sharp teeth.`,
- get requirements() { return (slave.muscles > 5 && slave.weight < -10 && slave.teeth === "pointy" && slave.skill.combat > 0); },
+ get requirements() { return (slave.muscles > 5 && slave.weight < -10 && slave.teeth === "pointy" && slave.skill.combat > 30); },
percentOdds: 60,
get completeSale() {
const r = [];
@@ -1541,7 +1540,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["vampire clan", {
- cost: 500 * Math.trunc((cost * 1.35) / 500),
+ cost: 1.35,
offerDesc: `from a becloaked individual with an unusual interest in pale ${girl}s with fangs.`,
get requirements() { return (slave.teeth === "fangs" && (skinToneLevel(slave.skin) < 7)); },
percentOdds: 60,
@@ -1562,7 +1561,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D virgin asspussy", {
- cost: 500 * Math.trunc((cost * 1.35) / 500),
+ cost: 1.35,
offerDesc: `from a prominent citizen who appreciates ${girl}s who are both vaginal virgins and anal veterans.`,
get requirements() { return (slave.vagina === 0 && slave.anus > 1 && slave.skill.anal >= 100 && slave.physicalAge < 25); },
percentOdds: 60,
@@ -1583,9 +1582,9 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D waifu", {
- cost: 500 * Math.trunc((cost * 1.35) / 500),
+ cost: 1.35,
offerDesc: `from a prominent citizen with moist palms who insistently refers to ${him} as "his waifu," whatever that means.`,
- get requirements() { return (slave.vagina === 0 && (slave.fetish === "submissive" || slave.fetish === "pregnancy") && slave.skill.entertainment > 30 && slave.physicalAge < 30); },
+ get requirements() { return (slave.vagina === 0 && (slave.fetish === Fetish.SUBMISSIVE || slave.fetish === "pregnancy") && slave.skill.entertainment > 30 && slave.physicalAge < 30); },
percentOdds: 60,
get completeSale() {
const r = [];
@@ -1594,7 +1593,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["monster movie", { // or "sex double"
- cost: 700 * Math.trunc((cost * 1.35) / 700),
+ cost: 1.35,
offerDesc: `from a production studio interested in using ${him} as a double`,
get requirements() {
return (
@@ -1643,7 +1642,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D oral servants", {
- cost: 500 * Math.trunc((cost * 1.35) / 500),
+ cost: 1.35,
offerDesc: `from a prominent citizen who likes to provide his favored, well-endowed slaves with subordinate, orally skilled dickgirls with nice butts.`,
get requirements() { return (slave.dick > 0 && slave.skill.oral >= 100 && slave.height < 160 && slave.butt > 3); },
percentOdds: 60,
@@ -1666,7 +1665,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D trap lover", {
- cost: 500 * Math.trunc((cost * 1.35) / 500),
+ cost: 1.35,
offerDesc: `from a prominent citizen who prefers slaves that look like demure ${girl}s with their clothes on, and are willing to take cock up their pretty asspussies.`,
get requirements() { return (slave.dick > 0 && slave.devotion > 20 && slave.fetish === "buttslut" && slave.visualAge < 25 && slave.boobs < 400 && slave.weight <= 10); },
percentOdds: 60,
@@ -1689,7 +1688,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D butt bury", {
- cost: 500 * Math.trunc((cost * 1.35) / 500),
+ cost: 1.35,
offerDesc: `from an eccentric citizen notorious for keeping tall slaves with huge soft butts, just so he can bury himself between their cheeks when they're standing.`,
get requirements() { return (slave.height > 185 && slave.butt > 8 && slave.buttImplant < 2 && slave.weight > 10); },
percentOdds: 60,
@@ -1712,7 +1711,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D milky herm", {
- cost: 500 * Math.trunc((cost * 1.35) / 500),
+ cost: 1.35,
offerDesc: `from a prominent citizen with strong opinions on futas: he likes a feminine ${girl} with a nice cock, a lovely pussy, no visible balls and yet the ability to get hard, and plentifully milky nipples.`,
get requirements() { return (slave.dick > 1 && slave.balls === 1 && slave.vagina > -1 && canAchieveErection(slave) && slave.lactation > 0 && slave.face > 10 && slave.faceShape !== "masculine"); },
percentOdds: 60,
@@ -1735,7 +1734,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D amazon hunter", {
- cost: 500 * Math.trunc((cost * 1.35) / 500),
+ cost: 1.35,
offerDesc: `from a prominent citizen whose friends never let him hear the end of his incorrigibly romantic treatment of his apartment full of amazons.`,
get requirements() { return (slave.dick === 0 && slave.muscles > 30 && slave.devotion > 20 && slave.height > 180); },
percentOdds: 60,
@@ -1749,7 +1748,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D shorty breeder", {
- cost: 500 * Math.trunc((cost * 1.35) / 500),
+ cost: 1.35,
offerDesc: `from a prominent citizen who keeps a large harem of lithe, muscular ${girl}s to bear him children.`,
get requirements() { return (V.seePreg !== 0 && slave.ovaries === 1 && slave.preg > -2 && slave.muscles > 30 && slave.weight <= 10 && slave.height < 165); },
percentOdds: 60,
@@ -1772,7 +1771,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D oral servants", {
- cost: 500 * Math.trunc((cost * 1.35) / 500),
+ cost: 1.35,
offerDesc: `from a prominent citizen who's looking for a fresh, skilled pair of lips eager to wrap around a thick cock.`,
get requirements() { return (slave.devotion > 20 && slave.fetish === "cumslut" && slave.lips > 30 && hasAnyArms(slave) && hasAnyLegs(slave) && slave.skill.oral > 50); },
percentOdds: 60,
@@ -1795,7 +1794,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D r9k", {
- cost: 500 * Math.trunc((cost * 1.15) / 500),
+ cost: 1.15,
offerDesc: `from a prominent citizen who's a notoriously inexperienced lover; it's painfully obvious that he prefers inexperienced slaves as they make him feel less insecure.`,
get requirements() { return (slave.skill.vaginal <= 10 && slave.skill.anal <= 10 && slave.skill.oral <= 10 && slave.skill.whoring <= 10 && slave.skill.entertainment <= 10); },
percentOdds: 80,
@@ -1816,7 +1815,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D cannibal", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a prominent citizen who takes unusually close interest in ${his} health and muscle tone, and cannot quite hide his salivation as he does so.`,
get requirements() { return (slave.weight > 10 && slave.muscles > 5 && slave.health.condition > 60 && cost < 10000); },
percentOdds: 60,
@@ -1830,7 +1829,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["obsessed fan", {
- cost: 200 * Math.trunc((cost * 2) / 200),
+ cost: 2,
offerDesc: `from an obsessive fan who absolutely must have ${him} for himself.`,
get requirements() { return (slave.porn.prestige === 1); },
percentOdds: 69, // Who did this? Seriously, who did this...
@@ -1853,7 +1852,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["porn studio", {
- cost: 500 * Math.trunc((cost * 1.3) / 500),
+ cost: 1.3,
offerDesc: `from a studio interested in continued production of ${his} porn.`,
get requirements() { return (slave.porn.prestige === 3); },
percentOdds: 90,
@@ -1876,7 +1875,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["teaching trainer", {
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `from a slave trainer that specializes in educating slaves and reselling them at a profit.`,
get requirements() { return (V.arcologies[0].FSDegradationist === "unset" && slave.intelligenceImplant < 15); },
percentOdds: 60,
@@ -1897,7 +1896,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["implanting trainer", {
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `from a slave trainer that specializes in filling slaves with implants before resale.`,
get requirements() { return (V.arcologies[0].FSBodyPurist === "unset" && slave.boobsImplant === 0); },
percentOdds: 60,
@@ -1918,7 +1917,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["purifying trainer", {
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `from a slave trainer that specializes in fixing slaves who have been surgically ruined with overimplantation.`,
get requirements() { return (V.arcologies[0].FSTransformationFetishist === "unset" && slave.boobsImplant > 0); },
percentOdds: 60,
@@ -1939,7 +1938,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["slimming trainer", {
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `from a slave trainer that specializes in slimming down fat slaves to appeal to buyers who prefer slim ${girl}s.`,
get requirements() { return (V.arcologies[0].FSAssetExpansionist === "unset" && slave.boobs > 600 && slave.butt > 3 && slave.weight > 10); },
percentOdds: 60,
@@ -1960,7 +1959,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["broadening trainer", {
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `from a slave trainer that specializes in improving slaves with disappointing assets; they prefer pharmaceutical means but are not averse to surgical intervention if necessary.`,
get requirements() { return (V.arcologies[0].FSSlimnessEnthusiast === "unset" && slave.boobs < 600 && slave.butt < 3 && slave.weight < -10); },
percentOdds: 60,
@@ -1981,7 +1980,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["cow trainer", {
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `from a slave trainer that specializes in getting ${womenU} ready to be dairy cows by using aggressive hormonal and pharmaceutical treatment to balloon their tits.`,
get requirements() { return (slave.boobs > 1000 && slave.boobsImplant === 0 && slave.lactation === 0); },
percentOdds: 60,
@@ -2002,7 +2001,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["clipping trainer", {
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `from a slave trainer that specializes in feminizing imperfect shemales; an orchiectomy is invariably their first step.`,
get requirements() { return (V.arcologies[0].FSGenderFundamentalist === "unset" && slave.balls > 0 && slave.boobs < 500); },
percentOdds: 60,
@@ -2023,7 +2022,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["reassignment trainer", {
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `from a slave trainer that specializes in creating proper slave women from raw material that falls short of that ideal but has potential anyway.`,
get requirements() { return (V.arcologies[0].FSGenderRadicalist === "unset" && slave.dick > 0 && cost > 10000); },
percentOdds: 60,
@@ -2044,7 +2043,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["pastoralist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner working towards autarkic slave pastoralism. He's awed by ${his} milk productivity.`,
get requirements() { return (slave.boobs - slave.boobsImplant > 2000 && slave.lactation > 1); },
percentOdds: 70,
@@ -2067,7 +2066,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["egyptian revivalist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner building a facsimile of ancient Egypt. He's in the market for wise and educated slaves willing to pass on their skills.`,
get requirements() { return (slave.devotion > 50 && (slave.intelligence + slave.intelligenceImplant > 50) && slave.intelligenceImplant >= 30); },
percentOdds: 70,
@@ -2088,16 +2087,16 @@ App.Interact.sellSlave = function(slave) {
}
}],
["aztec revivalist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner building a recreation of the Great Aztec Empire. He's in the market for willing, strong and combat ready slaves, to bolster his empire.`,
- get requirements() { return (slave.skill.combat >= 1 && slave.health.condition > 40 && slave.muscles > 25); },
+ get requirements() { return (slave.skill.combat > 60 && slave.health.condition > 40 && slave.muscles > 25); },
percentOdds: 70,
get completeSale() {
const r = [];
let slaveImpact;
r.push(`${slave.slaveName} is transported after losing a military engagement. Though ${his} will remains strong, ${he}'s <span class="trust dec">filled with fear</span> when ${he} sees the rivers of blood that flow through the city.`);
for (const s of V.slaves) {
- if (s.skill.combat > 0) {
+ if (s.skill.combat > 30) {
s.trust -= 2;
slaveImpact = 1;
}
@@ -2109,16 +2108,16 @@ App.Interact.sellSlave = function(slave) {
}
}],
["roman revivalist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner building a facsimile of classical Rome. He's in the market for slaves with basic combat skills to fight in modern gladiatorial combats.`,
- get requirements() { return (slave.skill.combat > 0 && slave.health.condition > 40 && slave.muscles > 5); },
+ get requirements() { return (slave.skill.combat > 60 && slave.health.condition > 40 && slave.muscles > 5); },
percentOdds: 70,
get completeSale() {
const r = [];
let slaveImpact;
r.push(`${slave.slaveName} is shipped to a new arcology, and culturally, across the centuries. ${His} skill at arms is well enough known that ${his} impending role as a gladiatrix is easily deduced.`);
for (const s of V.slaves) {
- if (s.skill.combat > 0) {
+ if (s.skill.combat > 30) {
s.trust -= 2;
slaveImpact = 1;
}
@@ -2130,7 +2129,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["neoimperialist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from an arcology owner who's crowned himself a neo-noble, looking for healthy, intelligent, and fit slaves to build up a prestigious harem worthy of a genuine King.`,
get requirements() { return (slave.health.condition > 40 && (slave.intelligence + slave.intelligenceImplant > 20) && slave.muscles > 5); },
percentOdds: 70,
@@ -2151,7 +2150,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["chattel religionist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner with interesting religious beliefs, which require beautiful slaves to be available to the public. Since ${slave.slaveName} is pretty and not heavily used, he considers it a duty to buy ${him} and make ${him} a holy prostitute.`,
get requirements() { return (slave.face > 10 && slave.counter.anal < 100); },
percentOdds: 70,
@@ -2172,7 +2171,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["physical idealist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner devoted to muscular ladies. He seems to feel that ${slave.slaveName} is not at ${his} true potential, and wants a try at improving ${his} physique himself.`,
get requirements() { return (slave.muscles > 5 && slave.muscles <= 95 && slave.health.condition > 60); },
percentOdds: 70,
@@ -2195,7 +2194,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["hedonistic decadence arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner devoted to chubby ladies. He seems to feel that ${slave.slaveName} can handle a fair bit more weight, and wants a try at fattening ${him} up himself.`,
get requirements() { return (slave.weight > 30 && slave.weight <= 95 && slave.health.condition > 60); },
percentOdds: 70,
@@ -2216,7 +2215,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["stuffer chef", {
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `from a chef that likes stuffing more than just turkeys.`,
get requirements() { return (V.arcologies[0].FSSlimnessEnthusiast !== "unset" && slave.weight < 10 && slave.muscles < 10 && slave.belly === 0 && slave.preg < 1); },
percentOdds: 80,
@@ -2237,7 +2236,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["transformation fetishist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner who loves breast implants. Since large natural breasts can support larger implants, he seems to feel ${slave.slaveName} has good potential to be implanted up to a truly gigantic size without too much stretching.`,
get requirements() { return (slave.boobs > 1000 && slave.boobsImplant === 0); },
percentOdds: 70,
@@ -2258,7 +2257,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["asset expansionist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner who never fails to dream big. He's interested in ${him} mostly for growth potential, since ${his} assets have grown so big, so young.`,
get requirements() { return (slave.boobs > 800 && slave.boobsImplant === 0 && slave.physicalAge < 25); },
percentOdds: 70,
@@ -2280,7 +2279,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["slimness enthusiast arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner with simple tastes. He likes his slaves young, slim, and reasonably innocent.`,
get requirements() { return (slave.boobs < 500 && slave.butt < 3 && slave.physicalAge < 25 && slave.anus < 2); },
percentOdds: 70,
@@ -2301,7 +2300,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["body purist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner with a hatred of implants that reaches missionary zeal. He buys slaves full of silicone, removes their implants, reconditions them, and resells them whenever his finances will permit.`,
get requirements() { return (slave.boobsImplant > 0 && slave.buttImplant > 0 && slave.lipsImplant > 0); },
percentOdds: 70,
@@ -2324,7 +2323,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["degradationist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner who runs a terrifyingly degrading society. He prefers slaves who have been well-treated previously; it lends their screams a certain special authenticity.`,
get requirements() { return (slave.trust > 20); },
percentOdds: 70,
@@ -2345,9 +2344,9 @@ App.Interact.sellSlave = function(slave) {
}
}],
["paternalist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner with an almost messianic calling to educate and improve slaves, though somewhat hypocritically, he prefers to start with reasonably obedient ${girl}s, which usually means slaves broken by someone else.`,
- get requirements() { return (slave.intelligenceImplant < 5 && slave.devotion > 20 && slave.fetish !== "mindbroken"); },
+ get requirements() { return (slave.intelligenceImplant < 5 && slave.devotion > 20 && slave.fetish !== Fetish.MINDBROKEN); },
percentOdds: 70,
get completeSale() {
const r = [];
@@ -2368,7 +2367,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["gender fundamentalist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner who likes willing, uncomplicated young ladies with bouncing boobs and big butts. He's an uncomplicated sort.`,
get requirements() { return (slave.dick === 0 && slave.boobs > 800 && slave.butt > 3 && slave.devotion > 20 && (slave.intelligence + slave.intelligenceImplant < -15)); },
percentOdds: 70,
@@ -2389,7 +2388,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["gender radicalist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner with a notorious fetish for the process of feminization. He prefers diamonds in the rough, because the process of polishing is so much fun.`,
get requirements() { return (slave.dick > 0 && slave.face < -10 && slave.boobs < 400); },
percentOdds: 70,
@@ -2412,7 +2411,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["supremacist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner with a strongly held belief that ${slave.race} people should not be slaves. He devotes as much of his resources as he can to manumission of such ${girl}s, concentrating on the downtrodden.`,
get requirements() { return (slave.race !== "mixed race" && slave.devotion <= 20 && slave.trust < 20); },
percentOdds: 70,
@@ -2433,7 +2432,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["subjugationist arcology", {
- cost: 500 * Math.trunc((cost * 1.25) / 500),
+ cost: 1.25,
offerDesc: `from a fellow arcology owner working on a project to breed a race of ${slave.race} people with natural, unquestioning obedience. He clearly considers ${him} good stock for the project.`,
get requirements() { return (V.seePreg !== 0 && slave.race !== "mixed race" && (slave.intelligence + slave.intelligenceImplant < -50) && slave.ovaries === 1); },
percentOdds: 70,
@@ -2454,7 +2453,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["cheap brothel", {
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `from a cheap brothel chain that operates a franchise on a lower level of the arcology.`,
get requirements() { return (V.arcologies[0].FSPaternalist === "unset" && cost < 10000); },
percentOdds: 50,
@@ -2475,7 +2474,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["factory farm", {
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `from a factory farm notorious for extracting every drop of value from its slaves' bodies.`,
get requirements() { return (V.arcologies[0].FSPaternalist === "unset" && cost < 20000 && slave.boobsImplant === 0); },
percentOdds: 50,
@@ -2503,7 +2502,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["arcade", {
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `from a sex arcade that maintains good service quality by rapidly cycling new slaves through their facilities.`,
get requirements() { return (V.arcologies[0].FSPaternalist === "unset" && cost < 5000); },
percentOdds: 50,
@@ -2524,7 +2523,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["volume breeder", {
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `from a high-volume breeding operation interested in ${him} mostly for ${his} healthy, functional womb.`,
get requirements() { return (V.seePreg !== 0 && V.arcologies[0].FSPaternalist === "unset" && cost < 10000 && slave.health.condition > 40 && slave.ovaries === 1); },
percentOdds: 50,
@@ -2545,7 +2544,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["nice brothel", {
- cost: 500 * Math.trunc((cost * 1.1) / 500),
+ cost: 1.1,
offerDesc: `from a group of partners that run a handsome brothel off the promenade.`,
get requirements() { return (V.arcologies[0].FSDegradationist === "unset" && cost > 20000); },
percentOdds: 50,
@@ -2566,7 +2565,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["free range", {
- cost: 500 * Math.trunc((cost * 0.8) / 500),
+ cost: 0.8,
offerDesc: `from a free-range farm that pays for the high costs of high quality livestock care by aggressively marketing its cruelty-free products.`,
get requirements() { return (V.arcologies[0].FSDegradationist === "unset" && cost < 50000 && slave.boobsImplant === 0 && slave.health.condition > 40); },
percentOdds: 50,
@@ -2587,8 +2586,8 @@ App.Interact.sellSlave = function(slave) {
}
}],
["Milk aficionado", {
- cost: 500 * Math.trunc((cost * 1.4) / 500),
- offerDesc: `from a wealthy milk aficionado that would like to add ${him} to ${his} dairy.`,
+ cost: 1.4,
+ offerDesc: `from a wealthy milk aficionado that would like to add ${him} to his dairy.`,
get requirements() { return (slave.milkFlavor !== "none" && slave.boobsImplant === 0 && slave.health.condition > 40); },
percentOdds: 50,
get completeSale() {
@@ -2608,7 +2607,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["harvester", {
- cost: 500 * Math.trunc((cost * 1.2) / 500),
+ cost: 1.2,
offerDesc: `from an organ harvesting firm that acquires healthy raw materials cheaply.`,
get requirements() { return (slave.chem < 50 && slave.health.condition > 40 && cost < 5000); },
percentOdds: 50,
@@ -2622,7 +2621,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["fuckdoll", {
- cost: 500 * Math.trunc((cost * 1) / 500),
+ cost: 1,
offerDesc: `from a manufacturer of large sexual appliances that include a living inmate, drugged into helplessness.`,
get requirements() { return (cost < 5000); },
percentOdds: 50,
@@ -2636,7 +2635,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["tentacle bred", {
- cost: 7000,
+ cost: 1.35, // but cheap slaves only
offerDesc: `from a porn director interested in a cheap slave with a belly implant for use in a snuff film.`,
get requirements() { return (V.seeExtreme === 1 && cost < 5000 && slave.vagina > -1 && slave.bellyImplant > -1); },
percentOdds: 90,
@@ -2660,19 +2659,19 @@ App.Interact.sellSlave = function(slave) {
allowsBoomerang: false
}],
["reputable trader", {
- cost: 500 * Math.trunc((cost * 0.9) / 500),
+ cost: 0.9,
offerDesc: `from a reputable slave trader who will likely ship ${him} out of the arcology.`,
get requirements() { return true; }, // yep, no gate for this one!
percentOdds: 30,
}],
["mindbreak trader", {
- cost: 500 * Math.trunc((cost * 0.9) / 500),
+ cost: 0.9,
offerDesc: `from a slave trader who buys vast numbers of mindbroken ${girl}s. His purpose is unknown, and none of them are ever seen again.`,
- get requirements() { return (slave.fetish === "mindbroken"); },
+ get requirements() { return (slave.fetish === Fetish.MINDBROKEN); },
percentOdds: 20,
}],
["concert hall", {
- cost: 500 * Math.trunc((cost * 1.3) / 500),
+ cost: 1.3,
offerDesc: `from a concert venue that wants a sex slave to keep the stage crew satisfied, but doesn't want to worry about any possible hearing loss.`,
get requirements() { return (slave.hears === -2); },
percentOdds: 60,
@@ -2693,7 +2692,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["etiquette coach", {
- cost: 500 * Math.trunc((cost * 1.4) / 500),
+ cost: 1.4,
offerDesc: `from a slave trainer that specializes in teaching proper manners and etiquette to low-class slaves.`,
get requirements() { return (slave.sexualFlaw === "crude"); },
percentOdds: 60,
@@ -2714,7 +2713,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["sniper spotter", {
- cost: 450 * Math.trunc((cost * 1.45) / 450),
+ cost: 1.45,
offerDesc: `from a mercenary sniper looking for a small slave to act as his spotter.`,
get requirements() { return (hasBothEyes(slave) && canSeePerfectly(slave) && isSlim(slave)); },
percentOdds: 65,
@@ -2724,7 +2723,7 @@ App.Interact.sellSlave = function(slave) {
r.push(`The mercenary sniper greets ${slave.slaveName} before the two of them head off for a battlefield halfway around the world. "Let's hope you've got a good eye for political assassinations," he says humorlessly.`);
for (const s of V.slaves) {
if (s.skill.combat <= 15) {
- s.devotion -= 3;
+ s.trust -= 3;
slaveImpact = 1;
}
}
@@ -2737,9 +2736,7 @@ App.Interact.sellSlave = function(slave) {
]);
if (V.peacekeepers.state === 3) {
buyers.set("peacekeepers", {
- cost: V.peacekeepers.attitude < 100
- ? 500 * Math.trunc((cost * 0.5) / 500)
- : 500 * Math.trunc((cost * 1.2) / 500),
+ cost: V.peacekeepers.attitude < 100 ? 0.5 : 1.2,
get offerDesc() {
if (V.peacekeepers.attitude < 100) {
return `from the officer in charge of 'recreational activities' for General ${V.peacekeepers.generalName}'s forces. This is far less than the slave is worth, but the bid comes with the implicit offer of more influence over the peacekeepers.`;
@@ -2942,7 +2939,7 @@ App.Interact.sellSlave = function(slave) {
}
if (desc) {
buyers.set("generic", {
- cost: 500 * Math.trunc((cost * 1.15) / 500),
+ cost: 1.15,
offerDesc: desc,
get requirements() { return true; },
percentOdds: 100,
diff --git a/src/interaction/siCustom.js b/src/interaction/siCustom.js
index 3cfde0243b1b2a4cbc9e31186f432dce1217d3b9..797495faef7e3444db6a3f307e9fa19fc345e886 100644
--- a/src/interaction/siCustom.js
+++ b/src/interaction/siCustom.js
@@ -22,7 +22,8 @@ App.UI.SlaveInteract.custom = function(slave, refresh) {
App.UI.DOM.appendNewElement("h3", el, `Names`);
el.append(
playerTitle(),
- slaveFullName()
+ slaveFullName(),
+ pronouns()
);
App.UI.DOM.appendNewElement("h3", el, `Description`);
@@ -446,6 +447,23 @@ App.UI.SlaveInteract.custom = function(slave, refresh) {
}
}
+ function pronouns() {
+ const pnNode = new DocumentFragment();
+
+ const grp = new App.UI.OptionsGroup(); // note that OptionsGroup's default refresh will reload the entire page, which is desirable in this case
+ grp.addOption("Pronouns to use:", "pronoun", slave)
+ .addValue("Feminine", App.Data.Pronouns.Kind.female)
+ .addValue("Masculine", App.Data.Pronouns.Kind.male)
+ .addValue("Neuter/Toy", App.Data.Pronouns.Kind.neutral)
+ // .addValue("Epicene/Plural", App.Data.Pronouns.Kind.epicene) - TODO: epicene pronouns have verb tense problems ("they is...")
+ // .addValue("Custom", App.Data.Pronouns.Kind.custom) - TODO: custom pronoun mechanism is incomplete/broken right now
+ .addComment(`${slave.slaveName} will be addressed as "${he}/${him}."`);
+
+ pnNode.append(grp.render());
+
+ return pnNode;
+ }
+
function hair() {
let hairNode = new DocumentFragment();
hairNode.appendChild(hairStyle());
diff --git a/src/interaction/siDescription.js b/src/interaction/siDescription.js
index b24edf931f997596a1dec77510d81b973a965f14..fa38f4753551bf78336d63322d98130cc3c8f081 100644
--- a/src/interaction/siDescription.js
+++ b/src/interaction/siDescription.js
@@ -10,7 +10,7 @@ App.UI.SlaveInteract.description = function(slave) {
descriptionOptions.id = "description-options";
el.append(descriptionOptions);
- el.append(App.Desc.longSlave(slave, {noArt: true}));
+ el.append(App.Desc.longSlave(slave, {noArt: true, links: true}));
descriptionLink.append(showOptions());
el.append(descriptionLink);
diff --git a/src/interaction/siModify.js b/src/interaction/siModify.js
index e95089968f71eaeb21ed77f932be72f84e8c4b96..0a31e1530fdf583871bd3c110e4b16ea5ee9d488 100644
--- a/src/interaction/siModify.js
+++ b/src/interaction/siModify.js
@@ -27,11 +27,7 @@ App.UI.SlaveInteract.modify = function(slave) {
makeRoomLink(p, "Auto salon", "Salon", ' Modify hair (color, length, style), nails, and even skin color.');
- makeRoomLink(p, "Body mod studio", "Body Modification", ' Mark your slave with piercings, tattoos, brands or even scars.',
- () => {
- V.tattooChoice = undefined;
- },
- );
+ makeRoomLink(p, "Body mod studio", "Body Modification", ' Mark your slave with piercings, tattoos, brands or even scars.');
makeRoomLink(p, "Remote surgery", "Remote Surgery", ` Surgically modify your slave with state of the art plastic surgery and more. Alter ${his} senses, skeletal structure, organs, and even more.`);
diff --git a/src/interaction/siPhysicalRegimen.js b/src/interaction/siPhysicalRegimen.js
index 456c1a7a313bf5db6831f0e96684493e09ee1a38..0ac6b2ebeb159cfd4bbf1fe3187f40520fefc636 100644
--- a/src/interaction/siPhysicalRegimen.js
+++ b/src/interaction/siPhysicalRegimen.js
@@ -361,7 +361,7 @@ App.UI.SlaveInteract.physicalRegimen = function(slave, refresh) {
} else if (slave.broodmotherOnHold === 1) {
note += `${His} pregnancy implant is turned off`;
if (slave.broodmotherCountDown > 0) {
- note += `${he} is expected to be completely emptied of ${his} remaining brood in ${slave.broodmotherCountDown} week`;
+ note += `; ${he} is expected to be completely emptied of ${his} remaining brood in ${slave.broodmotherCountDown} week`;
if (slave.broodmotherCountDown > 1) {
note += `s`;
}
@@ -442,7 +442,7 @@ App.UI.SlaveInteract.physicalRegimen = function(slave, refresh) {
},
));
}
- if (slave.preg > 37) {
+ if (slave.preg >= 36) {
linkArray.push(App.UI.DOM.passageLink(`Induce mass childbirth`, "BirthStorm"));
}
} else if (slave.preg > slave.pregData.minLiveBirth) {
@@ -895,7 +895,7 @@ App.UI.SlaveInteract.physicalRegimen = function(slave, refresh) {
} else {
weight.push({text: `Lose weight`, disabled: `${He} is already underweight`});
}
- if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken" && V.feeder === 1) {
+ if (slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN && V.feeder === 1) {
if (slave.weight > 10 || slave.weight < -10) {
weight.push({text: `Correct weight`, updateSlave: {diet: "corrective"}});
} else {
diff --git a/src/interaction/siRecords.js b/src/interaction/siRecords.js
index 0d6f302ebd6aff881c21d18470d4ce15cd2ecd25..18abe00a1dbe5626197224cefd1b5fbbb15443a5 100644
--- a/src/interaction/siRecords.js
+++ b/src/interaction/siRecords.js
@@ -18,167 +18,128 @@ App.UI.SlaveInteract.records = function(slave, refresh) {
if (slave.porn.prestige === 3) {
App.UI.DOM.appendNewElement("div", el, `${He} is so prestigious in the realm of ${slave.porn.fameType} porn that ${his} fame is self-sustaining.`, ["note"]);
- } else if (slave.porn.feed === 0) {
- r = [];
- r.push(`The media hub is not releasing highlights of ${his} sex life.`);
- r.push(
- App.UI.DOM.link(
- "Release",
- () => {
- slave.porn.feed = 1;
- refresh();
- }
- )
- );
- App.Events.addNode(el, r, "div");
} else {
- r = [];
- r.push(`The media hub is releasing highlights of ${his} sex life`);
- if (slave.porn.spending < 500) {
- r.push(`to those who can find it.`);
- } else if (slave.porn.spending < 2500) {
- r.push(`on several websites.`);
- } else if (slave.porn.spending > 5000) {
- r.push(`through your old distributor.`);
- } else {
- r.push(`on many websites.`);
- }
- if (slave.porn.spending === 0) {
- linkArray = [];
- linkArray.push(
+ if (slave.porn.feed === 0) {
+ r = [];
+ r.push(`The media hub is not releasing highlights of ${his} sex life.`);
+ r.push(
App.UI.DOM.link(
- "Halt",
+ "Release",
() => {
- slave.porn.feed = 0;
- slave.porn.focus = "none";
+ slave.porn.feed = 1;
refresh();
}
)
);
- linkArray.push(
- App.UI.DOM.link(
- "Publicize",
- () => {
- slave.porn.spending += 1000;
- refresh();
- },
- [],
- "",
- `Will cost ${cashFormat(1000)} weekly.`
- )
- );
- r.push(App.UI.DOM.generateLinksStrip(linkArray));
App.Events.addNode(el, r, "div");
} else {
- r.push(
- App.UI.DOM.makeTextBox(
- slave.porn.spending,
- v => {
- slave.porn.spending = v;
- },
- true
- )
- );
- r.push(`weekly is spent to publicize them.`);
-
- linkArray = [];
- linkArray.push(
- App.UI.DOM.link(
- "Halt",
- () => {
- slave.porn.spending = 0;
- slave.porn.feed = 0;
- slave.porn.focus = "none";
- V.PCSlutContacts = 1;
- refresh();
- }
- )
- );
- if (slave.porn.spending <= 4000) {
+ r = [];
+ r.push(`The media hub is releasing highlights of ${his} sex life`);
+ if (slave.porn.spending < 500) {
+ r.push(`to those who can find it.`);
+ } else if (slave.porn.spending < 2500) {
+ r.push(`on several websites.`);
+ } else if (slave.porn.spending > 5000) {
+ r.push(`through your old distributor.`);
+ } else {
+ r.push(`on many websites.`);
+ }
+ if (slave.porn.spending === 0) {
+ linkArray = [];
+ linkArray.push(
+ App.UI.DOM.link(
+ "Halt",
+ () => {
+ slave.porn.feed = 0;
+ slave.porn.focus = "none";
+ refresh();
+ }
+ )
+ );
linkArray.push(
App.UI.DOM.link(
- "Increase",
+ "Publicize",
() => {
slave.porn.spending += 1000;
refresh();
},
[],
"",
- `Spending more than ${cashFormat(5000)} weekly will have no effect.`
+ `Will cost ${cashFormat(1000)} weekly.`
)
);
- }
- linkArray.push(
- App.UI.DOM.link(
- "Decrease",
- () => {
- slave.porn.spending -= 1000;
- refresh();
- },
- [],
- "",
- `Will cost ${cashFormat(1000)} weekly.`
- )
- );
- r.push(App.UI.DOM.generateLinksStrip(linkArray));
- App.Events.addNode(el, r, "div");
+ r.push(App.UI.DOM.generateLinksStrip(linkArray));
+ App.Events.addNode(el, r, "div");
+ } else {
+ r.push(
+ App.UI.DOM.makeTextBox(
+ slave.porn.spending,
+ v => {
+ slave.porn.spending = v;
+ },
+ true
+ )
+ );
+ r.push(`weekly is spent to publicize them.`);
- if (V.PC.career === "escort" || V.PC.career === "prostitute" || V.PC.career === "child prostitute") {
- r = [];
- if (V.PC.career === "escort") {
- r.push(`You retain some contacts from your past life in the industry that may be willing to cut you some discounts should you return to it.`);
- } else {
- r.push(`You were approached in the past to star in some adult films and they may be willing to cut you some discounts should you accept their offer.`);
- }
- if (V.PCSlutContacts !== 2) {
- r.push(`You are not baring your body for all to see.`);
- r.push(
- App.UI.DOM.link(
- `Star in porn for a discount`,
- () => {
- V.PCSlutContacts = 2;
- refresh();
- }
- )
- );
- } else {
- if (V.PC.career === "escort") {
- r.push(`You are starring in hardcore porn once more.`);
- } else if (V.PC.actualAge < V.minimumSlaveAge) {
- r.push(`You are taking part in porn that may disturb people.`);
- } else {
- r.push(`You are starring in some hardcore porn.`);
- }
- r.push(
+ linkArray = [];
+ linkArray.push(
+ App.UI.DOM.link(
+ "Halt",
+ () => {
+ slave.porn.spending = 0;
+ slave.porn.feed = 0;
+ slave.porn.focus = "none";
+ refresh();
+ }
+ )
+ );
+ if (slave.porn.spending <= 4000) {
+ linkArray.push(
App.UI.DOM.link(
- `Stop doing porn for a discount`,
+ "Increase",
() => {
- V.PCSlutContacts = 1;
+ slave.porn.spending += 1000;
refresh();
- }
+ },
+ [],
+ "",
+ `Spending more than ${cashFormat(5000)} weekly will have no effect.`
)
);
}
+ linkArray.push(
+ App.UI.DOM.link(
+ "Decrease",
+ () => {
+ slave.porn.spending -= 1000;
+ refresh();
+ }
+ )
+ );
+ r.push(App.UI.DOM.generateLinksStrip(linkArray));
App.Events.addNode(el, r, "div");
}
- }
- if (V.studioFeed === 1) {
- r = [];
- if (slave.porn.viewerCount < 100) {
- r.push(`${He} lacks the fame in porn needed to discern what ${his} feed is getting tagged as.`);
- } else {
- if (slave.porn.prestige > 0) {
- r.push(`${He} is known for ${slave.porn.fameType === "generic" ? `standard, vanilla` : slave.porn.fameType} porn${(slave.porn.prestige > 1) ? ` and viewers have grown to expect it from ${him}` : ``}.`);
- }
- if (slave.porn.focus === "none") {
- r.push(`You are allowing ${his} viewers to guide the direction of ${his} content.`);
+ if (V.studioFeed === 1) {
+ if (slave.porn.viewerCount < 100) {
+ r.push(`${He} lacks the fame in porn needed to discern what ${his} feed is getting tagged as.`);
} else {
- r.push(`You are focusing attention on the ${slave.porn.focus} aspect of ${his} content.`);
+ r = [];
+ if (slave.porn.prestige > 0) {
+ r.push(`${He} is known for ${slave.porn.fameType === "generic" ? `standard, vanilla` : slave.porn.fameType} porn${(slave.porn.prestige > 1) ? ` and viewers have grown to expect it from ${him}` : ``}.`);
+ }
+ if (slave.porn.focus === "none") {
+ r.push(`You are allowing ${his} viewers to guide the direction of ${his} content.`);
+ } else {
+ r.push(`You are focusing attention on the ${slave.porn.focus} aspect of ${his} content.`);
+ }
+ r.push(App.Porn.genreChoiceLinks("Slave Interact", slave));
+ App.Events.addNode(el, r, "div");
}
- r.push(App.Porn.genreChoiceLinks("Slave Interact", slave));
}
- App.Events.addNode(el, r, "div");
}
+ App.UI.DOM.appendNewElement("div", el, App.UI.DOM.combineNodes(App.Porn.makeFameProgressChart(slave)));
+ App.UI.DOM.appendNewElement("div", el, App.UI.DOM.combineNodes("Current viewership breakdown:", App.Porn.makeViewershipChart(slave)));
}
}
App.UI.DOM.appendNewElement("h3", el, "Financial");
@@ -254,7 +215,7 @@ App.UI.SlaveInteract.records = function(slave, refresh) {
const innerDiv = document.createElement("div");
innerDiv.append(
- `${slave.slaveName} has ${other.length > 0 ? `been fucked by ${toSentence(other)}, as well as `: `slept with`}`,
+ `${slave.slaveName} has ${other.length > 0 ? `been fucked by ${toSentence(other)}, as well as `: `slept with `}`,
ownedSlavesSpan
);
@@ -267,14 +228,16 @@ App.UI.SlaveInteract.records = function(slave, refresh) {
link,
`so far.`,
);
- } else if (other.length === 0) {
- text.push(`${He} hasn't had sex with anyone yet.`);
}
if (other.length > 0) {
text.push(`${He} has ${slaves.length > 0 ? `also` : `only`} had sex with ${toSentence(other)}.`);
}
+ if (V.showSexualHistory === 1 && V.ui !== "start") {
+ text.push(App.Desc.sexualHistory(slave));
+ }
+
App.Events.addNode(div, text);
return div;
diff --git a/src/interaction/siRules.js b/src/interaction/siRules.js
index d781013b6a3db01f3c44ccb0e71d5e8cba3022c4..7c09c37b2d57dd9b52e9a157effe316af8a242f3 100644
--- a/src/interaction/siRules.js
+++ b/src/interaction/siRules.js
@@ -240,14 +240,10 @@ App.UI.SlaveInteract.rules = function(slave, refresh) {
{value: "restrictive"},
{value: "permissive"},
];
- if (slave.accent.isBetween(0, 4)) {
- choices.push(
- {value: "accent elimination"},
- );
+ if (slave.accent > 0) {
+ choices.push({value: "accent elimination"});
} else if (slave.accent > 3) {
- choices.push(
- {value: "language lessons"},
- );
+ choices.push({value: "language lessons"});
}
div.append(listChoices(choices, "speech"));
p.append(div);
diff --git a/src/interaction/siUtilities.js b/src/interaction/siUtilities.js
index 3a8bfae984fa716d7c9408a7796d7eef8156da70..9e6ceb33a1f068cb65071a0280b7126a44069dce 100644
--- a/src/interaction/siUtilities.js
+++ b/src/interaction/siUtilities.js
@@ -39,7 +39,7 @@ App.UI.SlaveInteract.placeInLine = function(slave) {
* @param {App.Entity.SlaveState} slave
* @param {string} [category] - should be in the form of slave.category, the thing we want to update.
* @param {boolean} [accessCheck=false]
- * @param {Function} refresh
+ * @param {Function} [refresh]
* @returns {HTMLSpanElement}
*/
App.UI.SlaveInteract.generateRows = function(array, slave, category, accessCheck = false, refresh) {
@@ -74,8 +74,7 @@ App.UI.SlaveInteract.generateRows = function(array, slave, category, accessCheck
);
if (item.FS) {
- link.append(App.UI.DOM.spanWithTooltip(`FS`,
- FutureSocieties.displayAdj(item.FS), "note"));
+ link.append(App.UI.DOM.spanWithTooltip(`FS`, FutureSocieties.displayAdj(item.FS), ["note"]));
}
}
linkArray.push(link);
diff --git a/src/interaction/siWardrobe.js b/src/interaction/siWardrobe.js
index 49c5533360ee4824d881d2a95a77fab856204beb..59e81ea3c8a644f3ee184e4bdfab9f33dfd63ddf 100644
--- a/src/interaction/siWardrobe.js
+++ b/src/interaction/siWardrobe.js
@@ -856,7 +856,7 @@ App.UI.SlaveInteract.wardrobe = function(slave, contentRefresh) {
switch (category) {
case "clothes":
if (itemName === "no clothing") {
- desc.push("Increases devotion for resistant humiliations fetishists and nymphos.");
+ desc.push("Increases devotion for resistant slaves, humiliation fetishists, submissives and nymphos.");
} else if (item) {
switch (item.exposure) {
case 4:
diff --git a/src/interaction/siWork.js b/src/interaction/siWork.js
index dbed779881d07d1a14510dec0deb5841e00c85c5..e42b73e89679e20949f15cdde7eaf4d243e23e3f 100644
--- a/src/interaction/siWork.js
+++ b/src/interaction/siWork.js
@@ -641,7 +641,7 @@ App.UI.SlaveInteract.work = function(slave, refresh) {
sexOptions.push({text: `Abuse ${his} rival with ${him}`, scene: () => App.Interact.fRival(slave)});
}
}
- if (slave.fetish !== "mindbroken" && slave.accent < 4 && ((canTalk(slave)) || hasAnyArms(slave))) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.accent < 4 && ((canTalk(slave)) || hasAnyArms(slave))) {
sexOptions.push({text: `Ask ${him} about ${his} feelings`, scene: () => App.Interact.fFeelings(slave)});
if (V.PC.dick > 0) {
sexOptions.push({text: `Make ${him} beg`, scene: () => App.Interact.fBeg(slave)});
@@ -675,10 +675,11 @@ App.UI.SlaveInteract.work = function(slave, refresh) {
sexOptions.push({text: `Fuck ${his} rear hole`, scene: () => App.Interact.fFuckdollAnal(slave)});
}
}
- let activeSlaveRepSacrifice = repGainSacrifice(slave, V.arcologies[0]);
+ const activeSlaveRepSacrifice = repGainSacrifice(slave, V.arcologies[0]);
if (activeSlaveRepSacrifice > 0) {
/*
TODO: fix this interaction. Consider that it "takes a week" but is not tied to endweek. Consider how easy it is to cheese for rep gains.
+ should probably be an assignment more than an interaction. - Pregmodder
sexOptions.push({
text: `Require ${him} to offer penance to Xochiquetzal`,
goto: `Aztec Slave Sacrifice Penance`,
@@ -721,17 +722,10 @@ App.UI.SlaveInteract.work = function(slave, refresh) {
if (sexArray[i].disabled) {
link = App.UI.DOM.disabledLink(sexArray[i].text, [sexArray[i].disabled]);
} else {
- let passage = "";
- if (sexArray[i].goto) {
- passage = sexArray[i].goto;
- }
-
// Set up the link
link = App.UI.DOM.link(
sexArray[i].text,
- () => { click(sexArray[i]); },
- [],
- passage
+ () => { click(sexArray[i]); }
);
// add a note node if required
diff --git a/src/interaction/useSlave/useSlaveOptions.js b/src/interaction/useSlave/useSlaveOptions.js
index 0e9d214924636fafc05bae750b2339798db254ae..41bef21513844cad979298bf3cc6f1c56a58fabf 100644
--- a/src/interaction/useSlave/useSlaveOptions.js
+++ b/src/interaction/useSlave/useSlaveOptions.js
@@ -10,20 +10,6 @@ App.UI.SlaveInteract.useSlave.options = function(player, clone, slave, playerSta
const {He, His, he, him, his, hers} = getPronouns(clone);
- /** @enum {string} */
- const Fetish = {
- NONE: "none",
- MINDBROKEN: "mindbroken",
- SUBMISSIVE: "submissive",
- CUMSLUT: "cumslut",
- HUMILIATION: "humiliation",
- BUTTSLUT: "buttslut",
- BOOBS: "boobs",
- SADIST: "sadist",
- MASOCHIST: "masochist",
- DOM: "dom",
- PREGNANCY: "pregnancy",
- };
/** @enum {string} */
const none = "none";
/** @enum {boolean} */
@@ -257,7 +243,7 @@ App.UI.SlaveInteract.useSlave.options = function(player, clone, slave, playerSta
playerState.sexAct = null;
slaveState.sexAct = null;
playerState.position = Position.STANDING;
- }
+ }
},
reaction: this.reactionText.makeSlaveCum(clone),
},
@@ -665,8 +651,8 @@ App.UI.SlaveInteract.useSlave.options = function(player, clone, slave, playerSta
* Allow the act to happen if either:
* - Neither character is performing a sex act
* - Exactly one character is performing oral sex on the other
- **/
- ((playerState.sexAct === null && slaveState.sexAct === null) ||
+ **/
+ ((playerState.sexAct === null && slaveState.sexAct === null) ||
((slaveState.sexAct === SexAct.ORAL || playerState.sexAct === SexAct.ORAL) &&
(slaveState.sexAct !== SexAct.ORAL || playerState.sexAct !== SexAct.ORAL))),
effect: () => {
diff --git a/src/js/CustomSlave.js b/src/js/CustomSlave.js
index b519a0589ef15aa964731fa0b8ca245c9a83d490..e2932758acabb46ae423bd843d6a0eb4cef33fa4 100644
--- a/src/js/CustomSlave.js
+++ b/src/js/CustomSlave.js
@@ -103,19 +103,19 @@ App.Entity.CustomSlaveOrder = class CustomSlaveOrder {
/** desired clit size, female and futa only
* Values as in SlaveState.
- * @type {number}
+ * @type {FC.ClitType}
*/
this.clit = 0;
/** desired labia size, female and futa only
* Values as in SlaveState.
- * @type {number}
+ * @type {FC.LabiaType}
*/
this.labia = 0;
/** desired vaginal lubrication, female and futa only
* Values as in SlaveState.
- * @type {number}
+ * @type {FC.VaginaLubeType}
*/
this.vaginaLube = 1;
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 6f9d03512a02cd1c0a095ea400605db0ab10584d..f3947972241473fbcd740d8338ce83faea4f4045 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1,129 +1,107 @@
-// this code applies RA rules onto slaves
-globalThis.DefaultRules = (function() {
- "use strict";
-
- const assignedTypes = {
- "auto": {success: "has been automatically assigned", unable: "could not be assigned"},
- "allowed": {success: "is allowed", unable: "could not be allowed"},
- };
- const getAssignmentDescription = function({rule, slave, assignmentResult, append = null}) {
- const assignment = rule.setAssignment === Job.CHOICE
- ? {
- descriptionType: "allowed",
- work: `select ${pronouns.his} own assignments`
- } : {
- descriptionType: "auto",
- work: App.Utils.jobForAssignment(rule.setAssignment).assignment
- };
-
- const assignedTypeInfo = assignedTypes[assignment.descriptionType];
- const hasBeenAssigned = assignedTypeInfo[assignmentResult];
- return `<br>${slave.slaveName} ${hasBeenAssigned} to ${assignment.work}${append || ''}.`;
- };
+/**
+ * this code applies RA rules onto slaves
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
+globalThis.DefaultRules = function(slave) {
+ if (slave.useRulesAssistant === 0) {
+ return ""; // exempted
+ }
- /** @type {string} */
- let r;
- let pronouns;
- let he;
- let him;
- let his;
+ let r = "";
+ const slaveReadOnly = createReadonlyProxy(slave);
+ const {rule, ruleIds, sourceRecord} = runWithReadonlyProxy(() => ProcessSlaveRules(slaveReadOnly));
+ slave.currentRules = ruleIds;
+ if (ruleIds.length === 0) {
+ return ""; // no rules apply
+ }
- /**
- * @param {App.Entity.SlaveState} slave
- * @returns {string}
- */
- function DefaultRules(slave) {
- if (slave.useRulesAssistant === 0) {
- return r;
- } // exempted
- r = "";
- ({he, him, his} = pronouns = getPronouns(slave));
- const slaveReadOnly = createReadonlyProxy(slave);
- const {rule, ruleIds} = runWithReadonlyProxy(() => ProcessSlaveRules(slaveReadOnly));
- slave.currentRules = ruleIds;
- if (ruleIds.length === 0) {
- return r;
- } // no rules apply
-
- AssignJobToSlave(slave, rule);
- if (slave.fuckdoll === 0) {
- ProcessClothing(slave, rule);
- ProcessCollar(slave, rule);
- ProcessMask(slave, rule);
- ProcessGag(slave, rule);
- ProcessEyewear(slave, rule);
- ProcessEarwear(slave, rule);
- ProcessDildos(slave, rule);
- ProcessDickAccessories(slave, rule);
- ProcessAnalAccessories(slave, rule);
- ProcessChastity(slave, rule);
- ProcessShoes(slave, rule);
- ProcessBellyAccessories(slave, rule);
- ProcessArmAccessory(slave, rule);
- ProcessLegAccessory(slave, rule);
- }
- ProcessPit(slave, rule);
- ProcessBellyImplant(slave, rule);
- if (isFertile(slave) || slave.pregWeek < 0) {
- ProcessContraceptives(slave, rule);
- }
- if (slave.preg > 0 && slave.pregKnown === 1 && slave.broodmother === 0) {
- ProcessAbortions(slave, rule);
- }
- ProcessDrugs(slave, rule);
- ProcessEnema(slave, rule);
- ProcessDiet(slave, rule);
- ProcessCuratives(slave, rule);
- ProcessAphrodisiacs(slave, rule);
- ProcessPenisHormones(slave, rule);
- ProcessFemaleHormones(slave, rule);
- ProcessPregnancyDrugs(slave, rule);
- if (slave.fuckdoll === 0) {
- ProcessLivingStandard(slave, rule);
- ProcessRest(slave, rule);
- ProcessSpeech(slave, rule);
- ProcessRelationship(slave, rule);
- ProcessRelease(slave, rule);
- ProcessLactation(slave, rule);
- if (!canWalk(slave) && canMove(slave)) {
- ProcessMobility(slave, rule);
- }
- ProcessPunishment(slave, rule);
- ProcessReward(slave, rule);
- }
- ProcessToyHole(slave, rule);
- ProcessDietCum(slave, rule);
- ProcessDietMilk(slave, rule);
- if (V.arcologies[0].FSHedonisticDecadenceResearch === 1) {
- ProcessSolidFood(slave, rule);
- }
- ProcessTeeth(slave, rule);
- ProcessStyle(slave, rule);
- ProcessPiercings(slave, rule);
- ProcessSmartPiercings(slave, rule);
- ProcessTattoos(slave, rule);
- ProcessPornFeedEnabled(slave, rule);
- ProcessPorn(slave, rule);
- ProcessLabel(slave, rule);
- ProcessOther(slave, rule);
- return r;
+ const pronouns = getPronouns(slave);
+ const {he, him, his} = pronouns;
+
+ AssignJobToSlave(slave, rule);
+ if (slave.fuckdoll === 0) {
+ ProcessClothing(slave, rule);
+ ProcessCollar(slave, rule);
+ ProcessMask(slave, rule);
+ ProcessGag(slave, rule);
+ ProcessEyewear(slave, rule);
+ ProcessEarwear(slave, rule);
+ ProcessDildos(slave, rule);
+ ProcessDickAccessories(slave, rule);
+ ProcessAnalAccessories(slave, rule);
+ ProcessChastity(slave, rule);
+ ProcessShoes(slave, rule);
+ ProcessBellyAccessories(slave, rule);
+ ProcessArmAccessory(slave, rule);
+ ProcessLegAccessory(slave, rule);
+ }
+ ProcessPit(slave, rule);
+ ProcessBellyImplant(slave, rule);
+ if (isFertile(slave) || slave.pregWeek < 0) {
+ ProcessContraceptives(slave, rule);
+ }
+ if (slave.preg > 0 && slave.pregKnown === 1 && slave.broodmother === 0) {
+ ProcessAbortions(slave, rule);
+ }
+ ProcessDrugs(slave, rule);
+ ProcessEnema(slave, rule);
+ ProcessDiet(slave, rule);
+ ProcessCuratives(slave, rule);
+ ProcessAphrodisiacs(slave, rule);
+ ProcessPenisHormones(slave, rule);
+ ProcessFemaleHormones(slave, rule);
+ ProcessPregnancyDrugs(slave, rule);
+ if (slave.fuckdoll === 0) {
+ ProcessLivingStandard(slave, rule);
+ ProcessRest(slave, rule);
+ ProcessSpeech(slave, rule);
+ ProcessRelationship(slave, rule);
+ ProcessRelease(slave, rule);
+ ProcessLactation(slave, rule);
+ if (!canWalk(slave) && canMove(slave)) {
+ ProcessMobility(slave, rule);
+ }
+ ProcessPunishment(slave, rule);
+ ProcessReward(slave, rule);
}
+ ProcessToyHole(slave, rule);
+ ProcessDietCum(slave, rule);
+ ProcessDietMilk(slave, rule);
+ if (V.arcologies[0].FSHedonisticDecadenceResearch === 1) {
+ ProcessSolidFood(slave, rule);
+ }
+ ProcessTeeth(slave, rule);
+ ProcessStyle(slave, rule);
+ ProcessPiercings(slave, rule);
+ ProcessSmartPiercings(slave, rule);
+ ProcessTattoos(slave, rule);
+ ProcessPornFeedEnabled(slave, rule);
+ ProcessPorn(slave, rule);
+ ProcessLabel(slave, rule);
+ ProcessOther(slave, rule);
+ return r;
+
/**
* @param {App.Entity.SlaveState} slave
- * @returns {{ruleIds: string[], rule: FC.RA.RuleSetters}}}
+ * @returns {{ruleIds: string[], rule: FC.RA.RuleSetters, sourceRecord: object}}
*/
function ProcessSlaveRules(slave) {
// merge all rules applying on a slave into one big rule
/** @type {FC.RA.Rule[]} */
const rules = V.defaultRules.filter((rule) => ruleAppliesP(rule, slave));
const ruleIds = [];
+ /**
+ * @type {Array<[FC.RA.RuleSetters, string]>}
+ */
const assignments = [];
for (const rule of rules) {
ruleIds.push(rule.ID);
- assignments.push(ProcessAssignments(slave, Object.assign({}, rule.set)));
+ assignments.push([ProcessAssignments(slave, Object.assign({}, rule.set)), rule.name]);
}
- return {ruleIds, rule: mergeRules(assignments)};
+ const [combinedRule, sourceRecord] = mergeRules(assignments);
+ return {ruleIds, rule: combinedRule, sourceRecord};
}
/**
@@ -132,8 +110,9 @@ globalThis.DefaultRules = (function() {
* @returns {FC.RA.RuleSetters}
*/
function ProcessAssignments(slave, rule) {
- // Before merging rules, we process assignments for each rule separately so we can remove slaves from facilities when they no longer qualify, even if the final "winning" rule assigns them elsewhere
- // We also ignore inapplicable assignments for the current slave, so we only merge assignments that are valid
+ // Before merging rules, we process assignments for each rule separately, so we can remove slaves from
+ // facilities when they no longer qualify, even if the final "winning" rule assigns them elsewhere.
+ // We also ignore inapplicable assignments for the current slave, so we only merge assignments that are valid.
if (rule.setAssignment === null) {
delete rule.setAssignment;
return rule;
@@ -160,8 +139,7 @@ globalThis.DefaultRules = (function() {
removeAssignment();
} else if (!job.facility.hasFreeSpace && slave.assignment !== rule.setAssignment) {
r += getAssignmentDescription({
- rule, slave, assignmentResult: "unable",
- append: " because it was full"
+ rule, slave, assignmentResult: "unable", append: " because it was full"
});
removeAssignment();
}
@@ -184,6 +162,29 @@ globalThis.DefaultRules = (function() {
}
}
+ /**
+ * @param {object} params
+ * @param {FC.RA.RuleSetters} params.rule
+ * @param {App.Entity.SlaveState} params.slave
+ * @param {"success"|"unable"} params.assignmentResult
+ * @param {string} [params.append]
+ * @returns {string}
+ */
+ function getAssignmentDescription({rule, slave, assignmentResult, append = null}) {
+ const assignment = rule.setAssignment === Job.CHOICE ? {
+ work: `select ${pronouns.his} own assignments`,
+ success: "is allowed",
+ unable: "could not be allowed"
+ } : {
+ work: App.Utils.jobForAssignment(rule.setAssignment).assignment,
+ success: "has been automatically assigned",
+ unable: "could not be assigned"
+ };
+
+ const hasBeenAssigned = assignment[assignmentResult];
+ return `<br>${slave.slaveName} ${hasBeenAssigned} to ${assignment.work}${append || ''}.`;
+ }
+
/**
* @param {App.Entity.SlaveState} slave
* @param {FC.RA.RuleSetters} rule
@@ -194,16 +195,16 @@ globalThis.DefaultRules = (function() {
if (slave.clothes !== rule.clothes) {
slave.clothes = rule.clothes;
slave.choosesOwnClothes = 0;
- r += `<br>${slave.slaveName} is now wearing ${slave.clothes}.`;
+ message(`${slave.slaveName} is now wearing ${slave.clothes}.`, sourceRecord.clothes);
}
}
if ((rule.choosesOwnClothes !== undefined) && (rule.choosesOwnClothes !== null)) {
if (slave.choosesOwnClothes !== rule.choosesOwnClothes) {
slave.choosesOwnClothes = rule.choosesOwnClothes;
if (slave.choosesOwnClothes) {
- r += `<br>${slave.slaveName} is now allowed to choose ${his} own clothes.`;
+ message(`${slave.slaveName} is now allowed to choose ${his} own clothes.`, sourceRecord.choosesOwnClothes);
} else {
- r += `<br>${slave.slaveName} is now forbidden from choosing ${his} own clothes.`;
+ message(`${slave.slaveName} is now forbidden from choosing ${his} own clothes.`, sourceRecord.choosesOwnClothes);
}
}
}
@@ -217,21 +218,21 @@ globalThis.DefaultRules = (function() {
// apply collar to slave
if ((rule.collar !== undefined) && (rule.collar !== null)) {
if (slave.collar !== rule.collar) {
- r += "<br>";
+ let m = "";
if (rule.collar === "preg biometrics" && slave.preg <= -1 && slave.ovaries === 0 && slave.mpreg === 0) {
slave.collar = "none";
- r += `${slave.slaveName} cannot utilize preg biometrics. `;
+ m = `${slave.slaveName} cannot utilize preg biometrics. `;
} else {
slave.collar = rule.collar;
}
if (slave.collar === "none") {
- r += `${slave.slaveName} has been given no collar.`;
+ message(`${m}${slave.slaveName} has been given no collar.`, sourceRecord.collar);
} else if (slave.collar === "pretty jewelry") {
- r += `${slave.slaveName} has been given ${slave.collar}.`;
+ message(`${m}${slave.slaveName} has been given ${slave.collar}.`, sourceRecord.collar);
} else if ((["bell collar", "bowtie", "neck corset", "neck tie"].includes(slave.collar))) {
- r += `${slave.slaveName} has been given a ${slave.collar}.`;
+ message(`${m}${slave.slaveName} has been given a ${slave.collar}.`, sourceRecord.collar);
} else {
- r += `${slave.slaveName} has been given a ${slave.collar} collar.`;
+ message(`${m}${slave.slaveName} has been given a ${slave.collar} collar.`, sourceRecord.collar);
}
}
}
@@ -245,12 +246,11 @@ globalThis.DefaultRules = (function() {
// apply faceAccessory to slave
if ((rule.faceAccessory !== undefined) && (rule.faceAccessory !== null)) {
if (slave.faceAccessory !== rule.faceAccessory) {
- r += "<br>";
slave.faceAccessory = rule.faceAccessory;
if (slave.faceAccessory === "none") {
- r += `${slave.slaveName} has had their mask removed.`;
+ message(`${slave.slaveName} has had their mask removed.`, sourceRecord.faceAccessory);
} else {
- r += `${slave.slaveName} has been given a ${slave.faceAccessory}.`;
+ message(`${slave.slaveName} has been given a ${slave.faceAccessory}.`, sourceRecord.faceAccessory);
}
}
}
@@ -264,17 +264,17 @@ globalThis.DefaultRules = (function() {
// apply mouthAccessory to slave
if ((rule.mouthAccessory !== undefined) && (rule.mouthAccessory !== null)) {
if (slave.mouthAccessory !== rule.mouthAccessory) {
- r += "<br>";
+ let m = "";
if (rule.mouthAccessory === "massive dildo gag" && slave.skill.oral <= 50) {
slave.mouthAccessory = "none";
- r += `${slave.slaveName} lacks the oral skill to successfully keep the massive dildo gag in ${his} throat. `;
+ m = `${slave.slaveName} lacks the oral skill to successfully keep the massive dildo gag in ${his} throat. `;
} else {
slave.mouthAccessory = rule.mouthAccessory;
}
if (slave.mouthAccessory === "none") {
- r += `${slave.slaveName} has been given no gag.`;
+ message(`${m}}${slave.slaveName} has been given no gag.`, sourceRecord.mouthAccessory);
} else {
- r += `${slave.slaveName} has been given a ${slave.mouthAccessory}.`;
+ message(`${m}}${slave.slaveName} has been given a ${slave.mouthAccessory}.`, sourceRecord.mouthAccessory);
}
}
}
@@ -293,12 +293,12 @@ globalThis.DefaultRules = (function() {
if (slave.eyewear !== "corrective glasses") {
slave.eyewear = "corrective glasses";
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName} has been given corrective glasses.`;
+ message(`${slave.slaveName} has been given corrective glasses.`, sourceRecord.eyewear);
}
} else {
if (slave.eyewear !== "none") {
slave.eyewear = "none";
- r += `<br>${slave.slaveName}'s eyewear has been removed.`;
+ message(`${slave.slaveName}'s eyewear has been removed.`, sourceRecord.eyewear);
}
}
break;
@@ -308,12 +308,12 @@ globalThis.DefaultRules = (function() {
if (slave.eyewear !== "corrective contacts") {
slave.eyewear = "corrective contacts";
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName} has been given corrective contacts.`;
+ message(`${slave.slaveName} has been given corrective contacts.`, sourceRecord.eyewear);
}
} else {
if (slave.eyewear !== "none") {
slave.eyewear = "none";
- r += `<br>${slave.slaveName}'s eyewear has been removed.`;
+ message(`${slave.slaveName}'s eyewear has been removed.`, sourceRecord.eyewear);
}
}
break;
@@ -323,12 +323,12 @@ globalThis.DefaultRules = (function() {
if (slave.eyewear !== "blurring glasses") {
slave.eyewear = "blurring glasses";
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName} has been given blurring glasses.`;
+ message(`${slave.slaveName} has been given blurring glasses.`, sourceRecord.eyewear);
}
} else {
if (slave.eyewear !== "none") {
slave.eyewear = "none";
- r += `<br>${slave.slaveName}'s eyewear has been removed.`;
+ message(`${slave.slaveName}'s eyewear has been removed.`, sourceRecord.eyewear);
}
}
break;
@@ -338,12 +338,12 @@ globalThis.DefaultRules = (function() {
if (slave.eyewear !== "blurring contacts") {
slave.eyewear = "blurring contacts";
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName} has been given blurring contacts.`;
+ message(`${slave.slaveName} has been given blurring contacts.`, sourceRecord.eyewear);
}
} else {
if (slave.eyewear !== "none") {
slave.eyewear = "none";
- r += `<br>${slave.slaveName}'s eyewear has been removed.`;
+ message(`${slave.slaveName}'s eyewear has been removed.`, sourceRecord.eyewear);
}
}
break;
@@ -353,13 +353,13 @@ globalThis.DefaultRules = (function() {
if (slave.eyewear !== "corrective glasses") {
slave.eyewear = "corrective glasses";
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName} has been given corrective glasses.`;
+ message(`${slave.slaveName} has been given corrective glasses.`, sourceRecord.eyewear);
}
} else {
if (slave.eyewear !== "glasses") {
slave.eyewear = "glasses";
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName} has been given decorative glasses.`;
+ message(`${slave.slaveName} has been given decorative glasses.`, sourceRecord.eyewear);
}
}
break;
@@ -367,7 +367,7 @@ globalThis.DefaultRules = (function() {
default:
if (slave.eyewear !== "none") {
slave.eyewear = "none";
- r += `<br>${slave.slaveName}'s eyewear has been removed.`;
+ message(`${slave.slaveName}'s eyewear has been removed.`, sourceRecord.eyewear);
}
break;
}
@@ -387,12 +387,12 @@ globalThis.DefaultRules = (function() {
if (slave.earwear !== "hearing aids") {
slave.earwear = "hearing aids";
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName} has been given hearing aids.`;
+ message(`${slave.slaveName} has been given hearing aids.`, sourceRecord.earwear);
}
} else {
if (slave.earwear !== "none") {
slave.earwear = "none";
- r += `<br>${slave.slaveName}'s earwear has been removed.`;
+ message(`${slave.slaveName}'s earwear has been removed.`, sourceRecord.earwear);
}
}
break;
@@ -402,12 +402,12 @@ globalThis.DefaultRules = (function() {
if (slave.earwear !== "muffling ear plugs") {
slave.earwear = "muffling ear plugs";
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName} has been given muffling ear plugs.`;
+ message(`${slave.slaveName} has been given muffling ear plugs.`, sourceRecord.earwear);
}
} else {
if (slave.earwear !== "none") {
slave.earwear = "none";
- r += `<br>${slave.slaveName}'s earwear has been removed.`;
+ message(`${slave.slaveName}'s earwear has been removed.`, sourceRecord.earwear);
}
}
break;
@@ -417,12 +417,12 @@ globalThis.DefaultRules = (function() {
if (slave.earwear !== "deafening ear plugs") {
slave.earwear = "deafening ear plugs";
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName} has been given deafening ear plugs.`;
+ message(`${slave.slaveName} has been given deafening ear plugs.`, sourceRecord.earwear);
}
} else {
if (slave.earwear !== "none") {
slave.earwear = "none";
- r += `<br>${slave.slaveName}'s earwear has been removed.`;
+ message(`${slave.slaveName}'s earwear has been removed.`, sourceRecord.earwear);
}
}
break;
@@ -430,7 +430,7 @@ globalThis.DefaultRules = (function() {
default:
if (slave.earwear !== "none") {
slave.earwear = "none";
- r += `<br>${slave.slaveName}'s earwear has been removed.`;
+ message(`${slave.slaveName}'s earwear has been removed.`, sourceRecord.earwear);
}
break;
}
@@ -462,52 +462,52 @@ globalThis.DefaultRules = (function() {
if ((rule.virginAccessory !== undefined) && (rule.virginAccessory !== null)) {
if (slave.vaginalAccessory !== rule.virginAccessory) {
slave.vaginalAccessory = rule.virginAccessory;
+ const m = `${slave.slaveName} is a virgin and has been given a`;
switch (slave.vaginalAccessory) {
case "huge dildo":
- r += `<br>${slave.slaveName} is a virgin and has been given a `;
if (slave.vagina >= 2) {
- r += `massive dildo to permanently gape ${his} cunt.`;
+ message(`${m} massive dildo to permanently gape ${his} cunt.`, sourceRecord.virginAccessory);
} else {
- r += `large dildo for ${his} pussy, since it must be stretched before it can accommodate a huge one.`;
+ message(`${m} large dildo for ${his} pussy, since it must be stretched before it can accommodate a huge one.`, sourceRecord.virginAccessory);
slave.vaginalAccessory = "large dildo";
}
break;
case "long dildo":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length dildo for ${his} pussy.`;
+ message(`Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length dildo for ${his} pussy.`, sourceRecord.virginAccessory);
slave.vaginalAccessory = "dildo";
}
break;
case "long, large dildo":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length large dildo for ${his} pussy.`;
+ message(`Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length large dildo for ${his} pussy.`, sourceRecord.virginAccessory);
slave.vaginalAccessory = "large dildo";
}
break;
case "long, huge dildo":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length huge dildo for ${his} pussy.`;
+ message(`Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length huge dildo for ${his} pussy.`, sourceRecord.virginAccessory);
slave.vaginalAccessory = "huge dildo";
} else {
- r += `<br>${slave.slaveName} is a virgin and has been given a `;
+ const m = `${slave.slaveName} is a virgin and has been given a`;
if (slave.vagina >= 2) {
- r += `massive and oversized dildo to permanently gape ${his} cunt.`;
+ message(`${m} massive and oversized dildo to permanently gape ${his} cunt.`, sourceRecord.virginAccessory);
} else {
- r += `long, large dildo for ${his} pussy, since it must be stretched before it can accommodate a huge one.`;
+ message(`${m} long, large dildo for ${his} pussy, since it must be stretched before it can accommodate a huge one.`, sourceRecord.virginAccessory);
slave.vaginalAccessory = "long, large dildo";
}
}
break;
case "none":
- r += `<br>${slave.slaveName} is a virgin and has been instructed not to use a vaginal accessory.`;
+ message(`${slave.slaveName} is a virgin and has been instructed not to use a vaginal accessory.`, sourceRecord.virginAccessory);
break;
default:
- r += `<br>${slave.slaveName} is a virgin and has been given a ${slave.vaginalAccessory} for ${his} pussy.`;
+ message(`${slave.slaveName} is a virgin and has been given a ${slave.vaginalAccessory} for ${his} pussy.`, sourceRecord.virginAccessory);
break;
}
}
@@ -523,52 +523,51 @@ globalThis.DefaultRules = (function() {
if ((rule.aVirginAccessory !== undefined) && (rule.aVirginAccessory !== null)) {
if (slave.vaginalAccessory !== rule.aVirginAccessory) {
slave.vaginalAccessory = rule.aVirginAccessory;
+ const m = `${slave.slaveName} is a virgin and has been given a`;
switch (slave.vaginalAccessory) {
case "huge dildo":
- r += `<br>${slave.slaveName} is a virgin and has been given a `;
if (slave.vagina >= 2) {
- r += `massive dildo to permanently gape ${his} cunt.`;
+ message(`${m} massive dildo to permanently gape ${his} cunt.`, sourceRecord.aVirginAccessory);
} else {
- r += `large dildo for ${his} pussy, since it must be stretched before it can accommodate a huge one.`;
+ message(`${m} large dildo for ${his} pussy, since it must be stretched before it can accommodate a huge one.`, sourceRecord.aVirginAccessory);
slave.vaginalAccessory = "large dildo";
}
break;
case "long dildo":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length dildo for ${his} pussy.`;
+ message(`Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length dildo for ${his} pussy.`, sourceRecord.aVirginAccessory);
slave.vaginalAccessory = "dildo";
}
break;
case "long, large dildo":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length large dildo for ${his} pussy.`;
+ message(`Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length large dildo for ${his} pussy.`, sourceRecord.aVirginAccessory);
slave.vaginalAccessory = "large dildo";
}
break;
case "long, huge dildo":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length huge dildo for ${his} pussy.`;
+ message(`Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length huge dildo for ${his} pussy.`, sourceRecord.aVirginAccessory);
slave.vaginalAccessory = "huge dildo";
} else {
- r += `<br>${slave.slaveName} is a virgin and has been given a `;
if (slave.vagina >= 2) {
- r += `massive and oversized dildo to permanently gape ${his} cunt.`;
+ message(`${m} massive and oversized dildo to permanently gape ${his} cunt.`, sourceRecord.aVirginAccessory);
} else {
- r += `long, large dildo for ${his} pussy, since it must be stretched before it can accommodate a huge one.`;
+ message(`${m} long, large dildo for ${his} pussy, since it must be stretched before it can accommodate a huge one.`, sourceRecord.aVirginAccessory);
slave.vaginalAccessory = "long, large dildo";
}
}
break;
case "none":
- r += `<br>${slave.slaveName} is a virgin and has been instructed not to use a vaginal accessory.`;
+ message(`${slave.slaveName} is a virgin and has been instructed not to use a vaginal accessory.`, sourceRecord.aVirginAccessory);
break;
default:
- r += `<br>${slave.slaveName} is a virgin and has been given a ${slave.vaginalAccessory} for ${his} pussy.`;
+ message(`${slave.slaveName} is a virgin and has been given a ${slave.vaginalAccessory} for ${his} pussy.`, sourceRecord.aVirginAccessory);
break;
}
}
@@ -585,50 +584,51 @@ globalThis.DefaultRules = (function() {
if (slave.vaginalAccessory !== rule.vaginalAccessory) {
slave.vaginalAccessory = rule.vaginalAccessory;
switch (slave.vaginalAccessory) {
- case "huge dildo":
- r += `<br>${slave.slaveName} has been given a `;
+ case "huge dildo": {
+ const m = `${slave.slaveName} has been given a`;
if (slave.vagina >= 2) {
- r += `massive dildo to permanently gape ${his} cunt.`;
+ message(`${m} massive dildo to permanently gape ${his} cunt.`, sourceRecord.vaginalAccessory);
} else {
- r += `large dildo for ${his} pussy, since it must be stretched before it can accommodate a huge one.`;
+ message(`${m} large dildo for ${his} pussy, since it must be stretched before it can accommodate a huge one.`, sourceRecord.vaginalAccessory);
slave.vaginalAccessory = "large dildo";
}
break;
+ }
case "long dildo":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so ${slave.slaveName} has been given a standard length dildo for ${his} pussy.`;
+ message(`Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so ${slave.slaveName} has been given a standard length dildo for ${his} pussy.`, sourceRecord.vaginalAccessory);
slave.vaginalAccessory = "dildo";
}
break;
case "long, large dildo":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so ${slave.slaveName} has been given a standard length large dildo for ${his} pussy.`;
+ message(`Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so ${slave.slaveName} has been given a standard length large dildo for ${his} pussy.`, sourceRecord.vaginalAccessory);
slave.vaginalAccessory = "large dildo";
}
break;
case "long, huge dildo":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so ${slave.slaveName} has been given a standard length huge dildo for ${his} pussy.`;
+ message(`Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so ${slave.slaveName} has been given a standard length huge dildo for ${his} pussy.`, sourceRecord.vaginalAccessory);
slave.vaginalAccessory = "huge dildo";
} else {
- r += `<br>${slave.slaveName} has been given a `;
+ const m = `${slave.slaveName} has been given a`;
if (slave.vagina >= 2) {
- r += `massive and oversized dildo to permanently gape ${his} cunt.`;
+ message(`${m} massive and oversized dildo to permanently gape ${his} cunt.`, sourceRecord.vaginalAccessory);
} else {
- r += `long, large dildo for ${his} pussy, since it must be stretched before it can accommodate a huge one.`;
+ message(`${m} long, large dildo for ${his} pussy, since it must be stretched before it can accommodate a huge one.`, sourceRecord.vaginalAccessory);
slave.vaginalAccessory = "long, large dildo";
}
}
break;
case "none":
- r += `<br>${slave.slaveName} has been instructed not to use a vaginal accessory.`;
+ message(`${slave.slaveName} has been instructed not to use a vaginal accessory.`, sourceRecord.vaginalAccessory);
break;
default:
- r += `<br>${slave.slaveName} has been given a ${slave.vaginalAccessory} for ${his} pussy.`;
+ message(`${slave.slaveName} has been given a ${slave.vaginalAccessory} for ${his} pussy.`, sourceRecord.vaginalAccessory);
break;
}
}
@@ -649,29 +649,29 @@ globalThis.DefaultRules = (function() {
if (slave.vaginalAccessory !== "none") {
switch (slave.vaginalAttachment) {
case "none":
- r += `<br>${slave.slaveName} has been instructed not to use an attachment for ${his} dildo.`;
+ message(`${slave.slaveName} has been instructed not to use an attachment for ${his} dildo.`, sourceRecord.vaginalAttachment);
break;
case "vibrator":
- r += `<br>${slave.slaveName}'s dildo has been replaced with a vibrating model.`;
+ message(`${slave.slaveName}'s dildo has been replaced with a vibrating model.`, sourceRecord.vaginalAttachment);
break;
case "smart vibrator":
- r += `<br>${slave.slaveName}'s dildo has been replaced with a smart vibrating model.`;
+ message(`${slave.slaveName}'s dildo has been replaced with a smart vibrating model.`, sourceRecord.vaginalAttachment);
break;
default:
- r += `<br>${slave.slaveName} has been given a ${slave.vaginalAttachment}.`;
+ message(`${slave.slaveName} has been given a ${slave.vaginalAttachment}.`, sourceRecord.vaginalAttachment);
break;
}
} else {
switch (slave.vaginalAttachment) {
case "none":
- r += `<br>${slave.slaveName} has been instructed not to use any vaginal accessories.`;
+ message(`${slave.slaveName} has been instructed not to use any vaginal accessories.`, sourceRecord.vaginalAttachment);
break;
default:
- r += `<br>${slave.slaveName} has been given a ${slave.vaginalAttachment}.`;
+ message(`${slave.slaveName} has been given a ${slave.vaginalAttachment}.`, sourceRecord.vaginalAttachment);
break;
}
}
@@ -691,9 +691,9 @@ globalThis.DefaultRules = (function() {
if (slave.dickAccessory !== rule.aVirginDickAccessory) {
slave.dickAccessory = rule.aVirginDickAccessory;
if (slave.dickAccessory === "none") {
- r += `<br>${slave.slaveName} is a virgin and has been instructed not to wear a dick accessory.`;
+ message(`${slave.slaveName} is a virgin and has been instructed not to wear a dick accessory.`, sourceRecord.aVirginDickAccessory);
} else {
- r += `<br>${slave.slaveName} is a virgin and has been given a ${slave.dickAccessory} accessory for ${his} cock.`;
+ message(`${slave.slaveName} is a virgin and has been given a ${slave.dickAccessory} accessory for ${his} cock.`, sourceRecord.aVirginDickAccessory);
}
}
}
@@ -702,9 +702,9 @@ globalThis.DefaultRules = (function() {
if (slave.dickAccessory !== rule.dickAccessory) {
slave.dickAccessory = rule.dickAccessory;
if (slave.dickAccessory === "none") {
- r += `<br>${slave.slaveName} has been instructed not to wear a dick accessory.`;
+ message(`${slave.slaveName} has been instructed not to wear a dick accessory.`, sourceRecord.aVirginDickAccessory);
} else {
- r += `<br>${slave.slaveName} has been given a ${slave.dickAccessory} accessory for ${his} cock.`;
+ message(`${slave.slaveName} has been given a ${slave.dickAccessory} accessory for ${his} cock.`, sourceRecord.aVirginDickAccessory);
}
}
}
@@ -723,9 +723,9 @@ globalThis.DefaultRules = (function() {
if (slave.chastityVagina !== rule.chastityVagina) {
slave.chastityVagina = rule.chastityVagina;
if (rule.chastityVagina === 1) {
- r += `<br>${slave.slaveName} has been given a chastity belt to wear.`;
+ message(`${slave.slaveName} has been given a chastity belt to wear.`, sourceRecord.chastityVagina);
} else {
- r += `<br>${slave.slaveName}'s vaginal chastity has been removed.`;
+ message(`${slave.slaveName}'s vaginal chastity has been removed.`, sourceRecord.chastityVagina);
}
}
}
@@ -735,9 +735,9 @@ globalThis.DefaultRules = (function() {
if (slave.chastityPenis !== rule.chastityPenis) {
slave.chastityPenis = rule.chastityPenis;
if (rule.chastityPenis === 1) {
- r += `<br>${slave.slaveName} has been given a chastity cage to wear.`;
+ message(`${slave.slaveName} has been given a chastity cage to wear.`, sourceRecord.chastityPenis);
} else {
- r += `<br>${slave.slaveName}'s chastity cage has been removed.`;
+ message(`${slave.slaveName}'s chastity cage has been removed.`, sourceRecord.chastityPenis);
}
}
}
@@ -746,9 +746,9 @@ globalThis.DefaultRules = (function() {
if (slave.chastityAnus !== rule.chastityAnus) {
slave.chastityAnus = rule.chastityAnus;
if (rule.chastityAnus === 1) {
- r += `<br>${slave.slaveName} has been given anal chastity to wear.`;
+ message(`${slave.slaveName} has been given anal chastity to wear.`, sourceRecord.chastityAnus);
} else {
- r += `<br>${slave.slaveName}'s anal chastity has been removed.`;
+ message(`${slave.slaveName}'s anal chastity has been removed.`, sourceRecord.chastityAnus);
}
}
}
@@ -764,7 +764,7 @@ globalThis.DefaultRules = (function() {
if (slave.shoes !== rule.shoes) {
if (hasAnyLegs(slave)) {
slave.shoes = rule.shoes;
- r += `<br>${slave.slaveName}'s shoes have been set to ${slave.shoes}.`;
+ message(`${slave.slaveName}'s shoes have been set to ${slave.shoes}.`, sourceRecord.shoes);
}
}
}
@@ -779,14 +779,14 @@ globalThis.DefaultRules = (function() {
if ((rule.bellyAccessory !== undefined) && (rule.bellyAccessory !== null)) {
if (slave.bellyAccessory !== rule.bellyAccessory) {
if ((slave.belly >= 1500 || slave.weight >= 130) && App.Data.misc.fakeBellies.includes(rule.bellyAccessory)) {
- r += `<br>${slave.slaveName}'s natural belly is too big to properly wear an empathy belly.`;
+ message(`${slave.slaveName}'s natural belly is too big to properly wear an empathy belly.`, sourceRecord.bellyAccessory);
slave.bellyAccessory = "none";
} else {
slave.bellyAccessory = rule.bellyAccessory;
if (slave.bellyAccessory === "none") {
- r += `<br>${slave.slaveName} has been instructed not to wear a torso accessory.`;
+ message(`${slave.slaveName} has been instructed not to wear a torso accessory.`, sourceRecord.bellyAccessory);
} else {
- r += `<br>${slave.slaveName} has been given ${slave.bellyAccessory} to wear.`;
+ message(`${slave.slaveName} has been given ${slave.bellyAccessory} to wear.`, sourceRecord.bellyAccessory);
}
}
}
@@ -800,7 +800,7 @@ globalThis.DefaultRules = (function() {
function ProcessArmAccessory(slave, rule) {
if (rule.armAccessory !== undefined && rule.armAccessory !== null && hasAnyArms(slave) && slave.armAccessory !== rule.armAccessory) {
slave.armAccessory = rule.armAccessory;
- r += `<br>${slave.slaveName}'s arm accessory was set to ${rule.armAccessory}.`;
+ message(`${slave.slaveName}'s arm accessory was set to ${rule.armAccessory}.`, sourceRecord.armAccessory);
}
}
@@ -811,7 +811,7 @@ globalThis.DefaultRules = (function() {
function ProcessLegAccessory(slave, rule) {
if (rule.legAccessory !== undefined && rule.legAccessory !== null && hasAnyLegs(slave) && slave.legAccessory !== rule.legAccessory) {
slave.legAccessory = rule.legAccessory;
- r += `<br>${slave.slaveName}'s leg accessory was set to ${rule.legAccessory}.`;
+ message(`${slave.slaveName}'s leg accessory was set to ${rule.legAccessory}.`, sourceRecord.legAccessory);
}
}
@@ -840,52 +840,52 @@ globalThis.DefaultRules = (function() {
if ((rule.aVirginButtplug !== undefined) && (rule.aVirginButtplug !== null)) {
if (slave.buttplug !== rule.aVirginButtplug) {
slave.buttplug = rule.aVirginButtplug;
+ const m = `${slave.slaveName} is an anal virgin and has been given a`;
switch (slave.buttplug) {
case "huge plug":
- r += `<br>${slave.slaveName} is an anal virgin and has been given a `;
if (slave.anus >= 2) {
- r += `massive plug to permanently gape ${his} asshole.`;
+ message(`${m} massive plug to permanently gape ${his} asshole.`, sourceRecord.aVirginButtplug);
} else {
slave.buttplug = "large plug";
- r += `large buttplug for ${his} asshole, since it must be stretched before it can accommodate a huge one.`;
+ message(`${m} large buttplug for ${his} asshole, since it must be stretched before it can accommodate a huge one.`, sourceRecord.aVirginButtplug);
}
break;
case "long plug":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so the anal virgin ${slave.slaveName} has been given a standard length plug for ${his} anus.`;
+ message(`Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so the anal virgin ${slave.slaveName} has been given a standard length plug for ${his} anus.`, sourceRecord.aVirginButtplug);
slave.buttplug = "plug";
}
break;
case "long, large plug":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so the anal virgin ${slave.slaveName} has been given a standard length large plug for ${his} anus.`;
+ message(`Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so the anal virgin ${slave.slaveName} has been given a standard length large plug for ${his} anus.`, sourceRecord.aVirginButtplug);
slave.buttplug = "large plug";
}
break;
case "long, huge plug":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so the anal virgin ${slave.slaveName} has been given a standard length huge plug for ${his} anus.`;
+ message(`Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so the anal virgin ${slave.slaveName} has been given a standard length huge plug for ${his} anus.`, sourceRecord.aVirginButtplug);
slave.buttplug = "huge plug";
} else {
- r += `<br>${slave.slaveName} is an anal virgin and has been given a `;
+ const m = `${slave.slaveName} is an anal virgin and has been given a`;
if (slave.anus >= 2) {
- r += `massive and oversized plug to permanently gape ${his} asshole.`;
+ message(`${m} massive and oversized plug to permanently gape ${his} asshole.`, sourceRecord.aVirginButtplug);
} else {
- r += `long, large buttplug for ${his} asshole, since it must be stretched before it can accommodate a huge one.`;
+ message(`${m} long, large buttplug for ${his} asshole, since it must be stretched before it can accommodate a huge one.`, sourceRecord.aVirginButtplug);
slave.buttplug = "long, large plug";
}
}
break;
case "none":
- r += `<br>${slave.slaveName} is an anal virgin and has been instructed not to use an anal accessory.`;
+ message(`${slave.slaveName} is an anal virgin and has been instructed not to use an anal accessory.`, sourceRecord.aVirginButtplug);
break;
default:
- r += `<br>${slave.slaveName} is an anal virgin and has been given a ${slave.buttplug} for ${his} asshole.`;
+ message(`${slave.slaveName} is an anal virgin and has been given a ${slave.buttplug} for ${his} asshole.`, sourceRecord.aVirginButtplug);
break;
}
}
@@ -901,52 +901,52 @@ globalThis.DefaultRules = (function() {
if ((rule.buttplug !== undefined) && (rule.buttplug !== null)) {
if (slave.buttplug !== rule.buttplug) {
slave.buttplug = rule.buttplug;
+ const m = `${slave.slaveName} has been given a`;
switch (slave.buttplug) {
case "huge plug":
- r += `<br>${slave.slaveName} has been given a `;
if (slave.anus >= 2) {
- r += `massive plug to permanently gape ${his} asshole.`;
+ message(`${m} massive plug to permanently gape ${his} asshole.`, sourceRecord.buttplug);
} else {
slave.buttplug = "large plug";
- r += `large buttplug for ${his} asshole, since it must be stretched before it can accommodate a huge one.`;
+ message(`${m} large buttplug for ${his} asshole, since it must be stretched before it can accommodate a huge one.`, sourceRecord.buttplug);
}
break;
case "long plug":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so ${slave.slaveName} has been given a standard length plug for ${his} anus.`;
+ message(`Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so ${slave.slaveName} has been given a standard length plug for ${his} anus.`, sourceRecord.buttplug);
slave.buttplug = "plug";
}
break;
case "long, large plug":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so ${slave.slaveName} has been given a standard length large plug for ${his} anus.`;
+ message(`Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so ${slave.slaveName} has been given a standard length large plug for ${his} anus.`, sourceRecord.buttplug);
slave.buttplug = "large plug";
}
break;
case "long, huge plug":
if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
- r += `<br>Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so ${slave.slaveName} has been given a standard length huge plug for ${his} anus.`;
+ message(`Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so ${slave.slaveName} has been given a standard length huge plug for ${his} anus.`, sourceRecord.buttplug);
slave.buttplug = "huge plug";
} else {
- r += `<br>${slave.slaveName} has been given a `;
+ const m = `${slave.slaveName} has been given a`;
if (slave.anus >= 2) {
- r += `massive and oversized plug to permanently gape ${his} asshole.`;
+ message(`${m} massive and oversized plug to permanently gape ${his} asshole.`, sourceRecord.buttplug);
} else {
- r += `long, large buttplug for ${his} asshole, since it must be stretched before it can accommodate a huge one.`;
+ message(`${m} long, large buttplug for ${his} asshole, since it must be stretched before it can accommodate a huge one.`, sourceRecord.buttplug);
slave.buttplug = "long, large plug";
}
}
break;
case "none":
- r += `<br>${slave.slaveName} has been instructed not to use an anal accessory.`;
+ message(`${slave.slaveName} has been instructed not to use an anal accessory.`, sourceRecord.buttplug);
break;
default:
- r += `<br>${slave.slaveName} has been given a ${slave.buttplug} for ${his} asshole.`;
+ message(`${slave.slaveName} has been given a ${slave.buttplug} for ${his} asshole.`, sourceRecord.buttplug);
break;
}
}
@@ -968,11 +968,11 @@ globalThis.DefaultRules = (function() {
slave.buttplugAttachment = rule.buttplugAttachment;
switch (slave.buttplugAttachment) {
case "none":
- r += `<br>${slave.slaveName} has been instructed not to use an attachment for ${his} anal accessory.`;
+ message(`${slave.slaveName} has been instructed not to use an attachment for ${his} anal accessory.`, sourceRecord.buttplugAttachment);
break;
default:
- r += `<br>${slave.slaveName} has been given a ${slave.buttplugAttachment} to attach to ${his} buttplug.`;
+ message(`${slave.slaveName} has been given a ${slave.buttplugAttachment} to attach to ${his} buttplug.`, sourceRecord.buttplugAttachment);
break;
}
}
@@ -984,33 +984,32 @@ globalThis.DefaultRules = (function() {
* @param {FC.RA.RuleSetters} rule
*/
function ProcessBellyImplant(slave, rule) {
- // Here is belly implant size control, it's used in Surgery Degradation passage to setup devotion and trust changes.
+ // Here is belly implant size control, it's used in Surgery Degradation passage to set up devotion and trust changes.
// silent calls to surgery degradation have been replaced with a js function, which is less hacky
if ((rule.bellyImplantVol !== undefined) && slave.bellyImplant >= 0 && rule.bellyImplantVol >= 0) {
- r += "<br>";
if (slave.health.condition > -10) {
let diff = rule.bellyImplantVol - slave.bellyImplant;
if (diff >= 5000 && slave.bellyPain === 0 && slave.health.condition > 50) {
- r += `${slave.slaveName}'s belly is way too small, so ${he} has been directed to have intensive belly implant filling procedures throughout this week.`;
+ message(`${slave.slaveName}'s belly is way too small, so ${he} has been directed to have intensive belly implant filling procedures throughout this week.`, sourceRecord.bellyImplantVol);
slave.bellyImplant += 1000;
slave.bellyPain += 2;
BellySurgery(slave, diff);
} else if (diff >= 500 && slave.bellyPain < 2) {
- r += `${slave.slaveName}'s belly has not reached the desired size, so ${he} has been directed to have belly implant filling procedures throughout this week.`;
+ message(`${slave.slaveName}'s belly has not reached the desired size, so ${he} has been directed to have belly implant filling procedures throughout this week.`, sourceRecord.bellyImplantVol);
slave.bellyImplant += 500;
slave.bellyPain += 1;
BellySurgery(slave, diff);
} else if (diff <= -5000) {
- r += `${slave.slaveName}'s belly is way too big, so ${he} has been directed to have intensive belly implant draining procedures throughout this week.`;
+ message(`${slave.slaveName}'s belly is way too big, so ${he} has been directed to have intensive belly implant draining procedures throughout this week.`, sourceRecord.bellyImplantVol);
slave.bellyImplant -= 1000;
BellySurgery(slave, diff);
} else if (diff <= -500) {
- r += `${slave.slaveName}'s belly is too big, so ${he} has been directed to have belly implant draining procedures throughout this week.`;
+ message(`${slave.slaveName}'s belly is too big, so ${he} has been directed to have belly implant draining procedures throughout this week.`, sourceRecord.bellyImplantVol);
slave.bellyImplant -= 500;
BellySurgery(slave, diff);
}
} else {
- r += `${slave.slaveName} is not healthy enough to safely adjust ${his} belly implant.`;
+ message(`${slave.slaveName} is not healthy enough to safely adjust ${his} belly implant.`, sourceRecord.bellyImplantVol);
}
}
}
@@ -1068,10 +1067,10 @@ globalThis.DefaultRules = (function() {
function ProcessContraceptives(slave, rule) {
if ((rule.preg !== undefined) && (rule.preg !== null)) {
if (rule.preg === true && slave.preg === 0 && slave.pubertyXX === 1) {
- r += `<br>${slave.slaveName} is being given contraceptives.`;
+ message(`${slave.slaveName} is being given contraceptives.`, sourceRecord.preg);
slave.preg = -1;
} else if (slave.preg === -1 && rule.preg === false) {
- r += `<br>${slave.slaveName} is no longer being put on contraceptives.`;
+ message(`${slave.slaveName} is no longer being put on contraceptives.`, sourceRecord.preg);
slave.preg = 0;
}
}
@@ -1105,35 +1104,35 @@ globalThis.DefaultRules = (function() {
if ((rule.abortion !== undefined) && (rule.abortion !== null)) {
for (const ar of rule.abortion) {
if (ar === "all") {
- if (slave.preg < 4 || (slave.fetish === "mindbroken" || slave.fuckdoll !== 0)) {
- r += `<br>${slave.slaveName}'s pregnancy has been terminated.`;
+ if (slave.preg < 4 || (slave.fetish === Fetish.MINDBROKEN || slave.fuckdoll !== 0)) {
+ message(`${slave.slaveName}'s pregnancy has been terminated.`, sourceRecord.abortion);
} else {
- r += `<br>${slave.slaveName}'s pregnancy has been terminated; `;
+ const m = `${slave.slaveName}'s pregnancy has been terminated;`;
if (slave.sexualFlaw === "breeder") {
- r += `it broke ${his} mind.`;
+ message(`${m} it broke ${his} mind.`, sourceRecord.abortion);
applyMindbroken(slave);
} else if (slave.devotion < -50) {
- r += `${he} did not handle it well.`;
+ message(`${m} ${he} did not handle it well.`, sourceRecord.abortion);
slave.trust -= 10;
slave.devotion -= 25;
} else if (slave.devotion < -20) {
- r += `${he} did not handle it well.`;
+ message(`${m} ${he} did not handle it well.`, sourceRecord.abortion);
slave.trust -= 10;
slave.devotion -= 10;
} else if (slave.fetish === "pregnancy") {
- r += `${he} did not handle it well.`;
+ message(`${m} ${he} did not handle it well.`, sourceRecord.abortion);
let fetishModifier = slave.fetishStrength / 2;
slave.devotion -= fetishModifier;
slave.trust -= fetishModifier;
} else if (slave.devotion <= 20) {
- r += `${he} did not handle it well.`;
+ message(`${m} ${he} did not handle it well.`, sourceRecord.abortion);
slave.trust -= 10;
slave.devotion -= 5;
} else if (slave.devotion <= 50) {
- r += `${he} did not handle it well.`;
+ message(`${m} ${he} did not handle it well.`, sourceRecord.abortion);
slave.trust -= 10;
} else {
- r += "it had little mental effect.";
+ message(`${m} it had little mental effect.`, sourceRecord.abortion);
}
}
@@ -1150,16 +1149,16 @@ globalThis.DefaultRules = (function() {
actX(slave, "abortions");
} else if (ar === "male") {
if (conditionalTermination(slave, fetus => fetus.genetics.gender === "XY")) {
- r += `<br>${slave.slaveName}'s male fetuses have been terminated.`;
+ message(`${slave.slaveName}'s male fetuses have been terminated.`, sourceRecord.abortion);
}
} else if (ar === "female") {
if (conditionalTermination(slave, fetus => fetus.genetics.gender === "XX")) {
- r += `<br>${slave.slaveName}'s female fetuses have been terminated.`;
+ message(`${slave.slaveName}'s female fetuses have been terminated.`, sourceRecord.abortion);
}
} else if (ar.startsWith("race:")) { // ar is the race name in the notation "race:<lowercase_race_name>"
const race = ar.substr("race:".length);
if (conditionalTermination(slave, fetus => fetus.genetics.race === race)) {
- r += `<br>${slave.slaveName}'s ${race} fetuses have been terminated.`;
+ message(`${slave.slaveName}'s ${race} fetuses have been terminated.`, sourceRecord.abortion);
}
}
SetBellySize(slave);
@@ -1177,7 +1176,7 @@ globalThis.DefaultRules = (function() {
return;
}
if ((slave.drugs === "super fertility drugs" || slave.drugs === "fertility drugs") && isFertile(slave)) {
- r += `<br>${slave.slaveName} is on ${slave.drugs} and will not be considered for drug enhancement until that regime is complete.`;
+ message(`${slave.slaveName} is on ${slave.drugs} and will not be considered for drug enhancement until that regime is complete.`);
ProcessOtherDrugs(slave, rule);
return;
} else if (
@@ -1260,10 +1259,11 @@ globalThis.DefaultRules = (function() {
* @param {App.Entity.SlaveState} slave
* @param {FC.SizableBodyPart} asset
* @param {FC.RA.ExpressiveNumericTarget} target
- * @param {{drug: FC.Drug, weight: number}[]} priorities
+ * @param {{drug: FC.Drug, weight: number, source:string}[]} priorities
* @param {number} step
+ * @param {object} source
*/
- function drugs(slave, asset, target, priorities, step) {
+ function drugs(slave, asset, target, priorities, step, source) {
if (target === null || (growDrugs[asset] === null && shrinkDrugs[asset] === null)) {
return;
}
@@ -1274,71 +1274,71 @@ globalThis.DefaultRules = (function() {
if (V.debugMode) {
console.log(asset + " expression for '" + slave.slaveName + "' resolves to " + newVal.toString());
}
- return drugsImpl(slave, asset, {cond: target.cond, val: newVal}, priorities, step);
+ drugsImpl(slave, asset, {cond: target.cond, val: newVal}, priorities, step, source.cond);
+ } else {
+ drugsImpl(slave, asset, {cond: target.cond, val: target.val}, priorities, step, source.cond);
}
-
- return drugsImpl(slave, asset, {cond: target.cond, val: target.val}, priorities, step);
}
/**
* @param {App.Entity.SlaveState} slave
* @param {FC.SizableBodyPart} asset
* @param {FC.RA.NumericTarget} target
- * @param {{drug: FC.Drug, weight: number}[]} priorities
+ * @param {{drug: FC.Drug, weight: number, source:string}[]} priorities
* @param {number} step
+ * @param {string} source
*/
- function drugsImpl(slave, asset, target, priorities, step) {
+ function drugsImpl(slave, asset, target, priorities, step, source) {
const flesh = App.Medicine.fleshSize(slave, asset);
if (growDrugs[asset] !== null && App.RA.shallGrow(flesh, target, step) && App.Medicine.maxAssetSize(asset) > slave[asset]) {
priorities.push({
- drug: growDrugs[asset],
- weight: 1.0 - (flesh / target.val)
+ drug: growDrugs[asset], weight: 1.0 - (flesh / target.val), source
});
} else if (shrinkDrugs[asset] !== null && App.RA.shallShrink(flesh, target, step)) {
priorities.push({
- drug: shrinkDrugs[asset],
- weight: flesh / target.val - 1.0
+ drug: shrinkDrugs[asset], weight: flesh / target.val - 1.0, source
});
}
}
- /** @type {{drug: FC.Drug, weight: number}[]} */
+ /** @type {{drug: FC.Drug, weight: number, source:string}[]} */
let priorities = [];
- drugs(slave, "boobs", rule.growth.boobs, priorities, 200);
- drugs(slave, "butt", rule.growth.butt, priorities, 1);
- drugs(slave, "lips", rule.growth.lips, priorities, 1);
- drugs(slave, "dick", rule.growth.dick, priorities, 1);
- drugs(slave, "balls", rule.growth.balls, priorities, 1);
+ drugs(slave, "boobs", rule.growth.boobs, priorities, 200, sourceRecord.growth.boobs);
+ drugs(slave, "butt", rule.growth.butt, priorities, 1, sourceRecord.growth.butt);
+ drugs(slave, "lips", rule.growth.lips, priorities, 1, sourceRecord.growth.lips);
+ drugs(slave, "dick", rule.growth.dick, priorities, 1, sourceRecord.growth.dick);
+ drugs(slave, "balls", rule.growth.balls, priorities, 1, sourceRecord.growth.balls);
if (priorities.length > 0) {
const action = priorities.reduce((acc, cur) => (acc.weight > cur.weight) ? acc : cur);
if (slave.drugs !== action.drug) {
slave.drugs = action.drug;
- r += `<br>${slave.slaveName} has been put on ${slave.drugs}, since `;
+ let m = `${slave.slaveName} has been put on ${slave.drugs}, since `;
if (action.drug.startsWith("intensive")) {
- r += `${he}'s healthy enough to take them, and `;
+ m += `${he}'s healthy enough to take them, and `;
}
if (priorities.length > 1) {
- r += `that part of ${his} body is `;
+ m += `that part of ${his} body is `;
if (!isNaN(action.weight)) {
- r += `${Math.trunc(action.weight * 100)}% `;
+ m += `${Math.trunc(action.weight * 100)}% `;
}
if (action.weight < 1) {
- r += "below ";
+ m += "below ";
} else {
- r += "above ";
+ m += "above ";
}
- r += "the targeted size.";
+ m += "the targeted size.";
} else {
- r += `that is the only part of ${his} body that does not meet the targeted size.`;
+ m += `that is the only part of ${his} body that does not meet the targeted size.`;
}
+ message(m, action.source);
}
} else if (slave.drugs !== rule.drug) {
if (growthDrugs.has(slave.drugs)) {
- r += `<br>${slave.slaveName}'s body has met all relevant growth targets, so ${his} pharmaceutical regime has been ended.`;
+ message(`${slave.slaveName}'s body has met all relevant growth targets, so ${his} pharmaceutical regime has been ended.`, sourceRecord.drug);
if (rule.drug === null) {
slave.drugs = "no drugs";
- r += `<br>${slave.slaveName} has been defaulted to ${slave.drugs}`;
+ message(`${slave.slaveName} has been defaulted to ${slave.drugs}`, sourceRecord.drug);
}
}
ProcessOtherDrugs(slave, rule);
@@ -1523,10 +1523,10 @@ globalThis.DefaultRules = (function() {
}
if (flag) {
slave.drugs = rule.drug;
- r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`;
+ message(`${slave.slaveName} has been put on ${slave.drugs}.`, sourceRecord.drug);
} else if (slave.drugs !== "no drugs") {
slave.drugs = "no drugs";
- r += `<br>${slave.slaveName} cannot benefit from ${his} assigned drug and has been defaulted to ${slave.drugs}`;
+ message(`${slave.slaveName} cannot benefit from ${his} assigned drug and has been defaulted to ${slave.drugs}`, sourceRecord.drug);
}
}
}
@@ -1539,12 +1539,12 @@ globalThis.DefaultRules = (function() {
if ((rule.inflationType !== undefined) && (rule.inflationType !== null)) {
if (slave.inflationType !== rule.inflationType) {
if ((slave.inflationType === "curative" && slave.health.condition > 90) || (slave.inflationType === "tightener" && slave.anus <= 1 && slave.vagina <= 1)) {
- r += `<br>${slave.slaveName} cannot benefit from ${his} assigned enema and has been defaulted to none.`;
+ message(`${slave.slaveName} cannot benefit from ${his} assigned enema and has been defaulted to none.`, sourceRecord.inflationType);
deflate(slave);
} else if ((rule.inflationType === "curative" && slave.health.condition > 90) || (rule.inflationType === "tightener" && slave.anus <= 1 && slave.vagina <= 1)) {
// empty block
} else {
- r += `<br>${slave.slaveName}'s current enema regimen has been set to ${rule.inflationType}.`;
+ message(`${slave.slaveName}'s current enema regimen has been set to ${rule.inflationType}.`, sourceRecord.inflationType);
slave.inflation = 1;
slave.inflationType = rule.inflationType;
slave.inflationMethod = 2;
@@ -1554,11 +1554,11 @@ globalThis.DefaultRules = (function() {
}
}
if (slave.inflationType !== "none" && slave.inflation > 1 && slave.health.condition < -50) {
- r += `<br>${slave.slaveName}'s current enema regimen risks death, so it has been reduced to a less threatening level.`;
+ message(`${slave.slaveName}'s current enema regimen risks death, so it has been reduced to a less threatening level.`, sourceRecord.inflationType);
slave.inflation = 1;
SetBellySize(slave);
} else if (slave.inflation > 1 && (slave.bellyPreg >= 1500 || slave.bellyImplant >= 1500)) {
- r += `<br>${slave.slaveName}'s current enema is too much for ${his} body, so it has been reduced.`;
+ message(`${slave.slaveName}'s current enema is too much for ${his} body, so it has been reduced.`, sourceRecord.inflationType);
slave.inflation = 1;
SetBellySize(slave);
} else if (slave.inflationType === "none") {
@@ -1572,20 +1572,36 @@ globalThis.DefaultRules = (function() {
* @param {FC.RA.RuleSetters} rule
*/
function ProcessPit(slave, rule) {
- if (rule.pitRules !== undefined && rule.pitRules !== null) {
- if (V.pit) {
+ if (V.pit) {
+ if (rule.arenaRules !== undefined && rule.arenaRules !== null) {
+ if (rule.arenaRules === 0) {
+ if (App.Entity.facilities.pit.job("trainee").isEmployed(slave)) {
+ removeJob(slave, Job.ARENA, true);
+ message(`${slave.slaveName} has been removed from the arena.`, sourceRecord.arenaRules);
+ }
+ } else {
+ if (App.Entity.facilities.pit.job("trainee").checkRequirements(slave).length !== 0) {
+ removeJob(slave, Job.ARENA, true);
+ message(`${slave.slaveName} is not eligible to train.`, sourceRecord.arenaRules);
+ } else if (!App.Entity.facilities.pit.job("trainee").isEmployed(slave)) {
+ assignJob(slave, Job.ARENA);
+ message(`${slave.slaveName} has been automatically assigned to train at the arena.`, sourceRecord.arenaRules);
+ }
+ }
+ }
+ if (rule.pitRules !== undefined && rule.pitRules !== null) {
if (rule.pitRules === 0) {
- if (App.Entity.facilities.pit.isHosted(slave)) {
+ if (App.Entity.facilities.pit.job("fighter").isEmployed(slave)) {
removeJob(slave, Job.PIT, true);
- r += `<br>${slave.slaveName} has been removed from the pit.`;
+ message(`${slave.slaveName} has been removed from the pit.`, sourceRecord.pitRules);
}
} else {
- if (App.Entity.facilities.pit.job().checkRequirements(slave).length !== 0) {
+ if (App.Entity.facilities.pit.job("fighter").checkRequirements(slave).length !== 0) {
removeJob(slave, Job.PIT, true);
- r += `<br>${slave.slaveName} is not eligible to fight.`;
- } else if (!App.Entity.facilities.pit.isHosted(slave)) {
+ message(`${slave.slaveName} is not eligible to fight.`, sourceRecord.pitRules);
+ } else if (!App.Entity.facilities.pit.job("fighter").isEmployed(slave)) {
assignJob(slave, Job.PIT);
- r += `<br>${slave.slaveName} has been automatically assigned to fight in the pit.`;
+ message(`${slave.slaveName} has been automatically assigned to fight in the pit.`, sourceRecord.pitRules);
}
}
}
@@ -1610,17 +1626,17 @@ globalThis.DefaultRules = (function() {
if (((slave.weight > 95) || ((slave.weight > 30) && (slave.hips < 2)))) {
if (slave.diet !== "restricted") {
slave.diet = "restricted";
- r += `<br>${slave.slaveName} is too fat so ${his} diet has been set to restricted.`;
- dietPills(slave);
+ message(`${slave.slaveName} is unreasonably fat so ${his} diet has been set to restricted.`, sourceRecord.diet);
}
+ dietPills(slave);
} else if (((slave.weight < -95) || ((slave.weight < -30) && (slave.hips > -2)))) {
if (slave.diet !== "fattening") {
slave.diet = "fattening";
- r += `<br>${slave.slaveName} is too skinny so ${his} diet has been set to fattening.`;
+ message(`${slave.slaveName} is unreasonably skinny so ${his} diet has been set to fattening.`, sourceRecord.diet);
dietPills(slave);
}
} else if (["restricted", "fattening"].includes(slave.diet)) {
- r += `<br>${slave.slaveName} is at the target weight, so ${his} diet has been normalized.`;
+ message(`${slave.slaveName} is at an acceptable weight, so ${his} diet has been normalized.`, sourceRecord.diet);
slave.diet = "healthy";
dietPills(slave);
muscleRule(slave, rule);
@@ -1631,17 +1647,17 @@ globalThis.DefaultRules = (function() {
if (slave.weight > rule.weight.max) {
if (slave.diet !== "restricted") {
slave.diet = "restricted";
- r += `<br>${slave.slaveName} is too fat so ${his} diet has been set to restricted.`;
- dietPills(slave);
+ message(`${slave.slaveName} is too fat so ${his} diet has been set to restricted.`, sourceRecord.weight.max);
}
+ dietPills(slave);
} else if (slave.weight < rule.weight.min) {
if (slave.diet !== "fattening") {
slave.diet = "fattening";
- r += `<br>${slave.slaveName} is too skinny so ${his} diet has been set to fattening.`;
+ message(`${slave.slaveName} is too skinny so ${his} diet has been set to fattening.`, sourceRecord.weight.min);
dietPills(slave);
}
} else if (["restricted", "fattening"].includes(slave.diet)) {
- r += `<br>${slave.slaveName} is at the target weight, so ${his} diet has been normalized.`;
+ message(`${slave.slaveName} is at the target weight, so ${his} diet has been normalized.`, [sourceRecord.weight.max, sourceRecord.weight.min]);
slave.diet = "healthy";
dietPills(slave);
muscleRule(slave, rule);
@@ -1655,15 +1671,15 @@ globalThis.DefaultRules = (function() {
if (!isAmputee(slave) && App.RA.shallShrink(slave.muscles, rule.muscles, 8)) {
if (slave.diet !== "slimming") {
slave.diet = "slimming";
- r += `<br>${slave.slaveName} has been put on a slimming exercise regime.`;
+ message(`${slave.slaveName} has been put on a slimming exercise regime.`, sourceRecord.muscles.val);
}
} else if (!isAmputee(slave) && App.RA.shallGrow(slave.muscles, rule.muscles, 2)) {
if (slave.diet !== "muscle building") {
slave.diet = "muscle building";
- r += `<br>${slave.slaveName} has been put on a muscle building exercise regime.`;
+ message(`${slave.slaveName} has been put on a muscle building exercise regime.`, sourceRecord.muscles.val);
}
} else if (!isAmputee(slave) && ["slimming", "muscle building"].includes(slave.diet)) {
- r += `<br>${slave.slaveName} is at the target musculature, so ${his} diet has been normalized.`;
+ message(`${slave.slaveName} is at the target musculature, so ${his} diet has been normalized.`, sourceRecord.diet);
dietRule(slave, rule);
} else {
dietRule(slave, rule);
@@ -1673,56 +1689,56 @@ globalThis.DefaultRules = (function() {
function dietRule(slave, rule) {
if (rule.diet === "healthy" && slave.diet !== "healthy") {
slave.diet = "healthy";
- r += `<br>${slave.slaveName} has been assigned to a healthy diet.`;
+ message(`${slave.slaveName} has been assigned to a healthy diet.`, sourceRecord.diet);
} else if ((slave.boobs >= 1600) && (slave.muscles > 5) && (slave.diet === "muscle building") && ((rule.muscles === null) || (rule.muscles.val < 5))) {
slave.diet = "healthy";
- r += `<br>${slave.slaveName} has huge boobs, but ${he} already has the back muscles to bear them, so ${he}'s been assigned to stop working out so hard.`;
+ message(`${slave.slaveName} has huge boobs, but ${he} already has the back muscles to bear them, so ${he}'s been assigned to stop working out so hard.`, sourceRecord.diet);
} else if ((rule.dietGrowthSupport === 1) && ((slave.drugs === "breast injections") || (slave.drugs === "butt injections")) && (slave.weight <= 95)) {
if (slave.diet !== "fattening") {
slave.diet = "fattening";
- r += `<br>${slave.slaveName} is on drugs designed to expand major body parts, so ${he}'s been put on a fattening diet to provide ${his} body as much fuel for growth as possible.`;
+ message(`${slave.slaveName} is on drugs designed to expand major body parts, so ${he}'s been put on a fattening diet to provide ${his} body as much fuel for growth as possible.`, sourceRecord.diet);
}
} else if (rule.diet === "XX") {
if (slave.diet !== "XX") {
slave.diet = "XX";
- r += `<br>${slave.slaveName} has been put on a diet that favors feminine development.`;
+ message(`${slave.slaveName} has been put on a diet that favors feminine development.`, sourceRecord.diet);
}
} else if (rule.diet === "XY") {
if (slave.diet !== "XY") {
slave.diet = "XY";
- r += `<br>${slave.slaveName} has been put on a diet that favors masculine development.`;
+ message(`${slave.slaveName} has been put on a diet that favors masculine development.`, sourceRecord.diet);
}
} else if (rule.diet === "XXY") {
if (slave.balls > 0 && (slave.ovaries === 1 || slave.mpreg === 1)) {
if (slave.diet !== "XXY") {
slave.diet = "XXY";
- r += `<br>${slave.slaveName} has been put on a diet that enhances a herm's unique sexuality.`;
+ message(`${slave.slaveName} has been put on a diet that enhances a herm's unique sexuality.`, sourceRecord.diet);
}
} else {
if (slave.diet !== "healthy") {
slave.diet = "healthy";
- r += `<br>${slave.slaveName} has been put on a standard diet since ${he} is not a hermaphrodite.`;
+ message(`${slave.slaveName} has been put on a standard diet since ${he} is not a hermaphrodite.`, sourceRecord.diet);
}
}
} else if (V.dietCleanse === 1 && (rule.diet === "cleansing")) {
if (slave.diet !== "cleansing") {
slave.diet = "cleansing";
- r += `<br>${slave.slaveName} has been put on a diet of cleansers.`;
+ message(`${slave.slaveName} has been put on a diet of cleansers.`, sourceRecord.diet);
}
} else if (rule.diet === "fertility") {
if ((isFertile(slave) && slave.preg === 0) || (slave.geneticQuirks.superfetation === 2 && canGetPregnant(slave) && V.geneticMappingUpgrade !== 0)) {
if (slave.diet !== "fertility") {
slave.diet = "fertility";
- r += `<br>${slave.slaveName} has been put on a diet to enhance fertility.`;
+ message(`${slave.slaveName} has been put on a diet to enhance fertility.`, sourceRecord.diet);
}
} else {
if (slave.diet !== "healthy") {
slave.diet = "healthy";
if (slave.pregKnown === 0 && slave.preg > 0) {
- r += `<br>${slave.slaveName} has been put on a standard diet since tests reveal ${he} has become pregnant.`;
+ message(`${slave.slaveName} has been put on a standard diet since tests reveal ${he} has become pregnant.`, sourceRecord.diet);
slave.pregKnown = 1;
} else {
- r += `<br>${slave.slaveName} has been put on a standard diet since ${he} is currently unable to become pregnant.`;
+ message(`${slave.slaveName} has been put on a standard diet since ${he} is currently unable to become pregnant.`, sourceRecord.diet);
}
}
}
@@ -1730,18 +1746,18 @@ globalThis.DefaultRules = (function() {
if (slave.balls > 0) {
if (slave.diet !== "cum production") {
slave.diet = "cum production";
- r += `<br>${slave.slaveName} has been put on a diet to promote cum production.`;
+ message(`${slave.slaveName} has been put on a diet to promote cum production.`, sourceRecord.diet);
}
} else {
if (slave.diet !== "healthy") {
slave.diet = "healthy";
- r += `<br>${slave.slaveName} has been put on a standard diet since ${he} is no longer able to produce cum.`;
+ message(`${slave.slaveName} has been put on a standard diet since ${he} is no longer able to produce cum.`, sourceRecord.diet);
}
}
} else {
if (slave.diet !== "healthy") {
slave.diet = "healthy";
- r += `<br>${slave.slaveName} has been put on a standard diet.`;
+ message(`${slave.slaveName} has been put on a standard diet.`, sourceRecord.diet);
}
}
}
@@ -1759,10 +1775,10 @@ globalThis.DefaultRules = (function() {
function dietPills(slave) {
if (slave.drugs === "appetite suppressors" && slave.diet !== "restricted") {
slave.drugs = "no drugs";
- r += `<br>${slave.slaveName} no longer needs to lose weight, so ${he}'s no longer being given appetite suppressors.`;
- } else if (slave.diet === "restricted" && V.arcologies[0].FSSlimnessEnthusiastResearch === 1 && slave.drugs === "no drugs") {
+ message(`${slave.slaveName} no longer needs to lose weight, so ${he}'s no longer being given appetite suppressors.`, [sourceRecord.diet, sourceRecord.weight?.max, sourceRecord.weight?.min]);
+ } else if (slave.diet === "restricted" && V.arcologies[0].FSSlimnessEnthusiastResearch === 1 && slave.drugs === "no drugs" && slave.indentureRestrictions < 2) {
slave.drugs = "appetite suppressors";
- r += `<br>${slave.slaveName} needs to lose weight, so ${he} will be given weight loss pills.`;
+ message(`${slave.slaveName} needs to lose weight, so ${he} will be given weight loss pills.`, [sourceRecord.diet, sourceRecord.weight?.max, sourceRecord.weight?.min]);
}
}
}
@@ -1777,15 +1793,15 @@ globalThis.DefaultRules = (function() {
if (rule.curatives === 2) {
if (slave.health.condition > 100) {
if (slave.curatives !== 1) {
- r += `<br>${slave.slaveName} has been put on preventatives, since curatives cannot improve ${his} health further.`;
+ message(`${slave.slaveName} has been put on preventatives, since curatives cannot improve ${his} health further.`, sourceRecord.curatives);
slave.curatives = 1;
}
} else {
- r += `<br>${slave.slaveName} has been put on curatives.`;
+ message(`${slave.slaveName} has been put on curatives.`, sourceRecord.curatives);
slave.curatives = rule.curatives;
}
} else {
- r += `<br>${slave.slaveName} has been ${rule.curatives > 0 ? "put on preventatives" : "taken off health drugs"}`;
+ message(`${slave.slaveName} has been ${rule.curatives > 0 ? "put on preventatives" : "taken off health drugs"}`, sourceRecord.curatives);
slave.curatives = rule.curatives;
}
}
@@ -1799,7 +1815,7 @@ globalThis.DefaultRules = (function() {
function ProcessAphrodisiacs(slave, rule) {
if ((rule.aphrodisiacs !== undefined) && (rule.aphrodisiacs !== null)) {
if (slave.aphrodisiacs !== rule.aphrodisiacs) {
- r += `<br>${slave.slaveName} has been ${rule.aphrodisiacs > 0 ? "put on the proper" : "taken off"} aphrodisiacs.`;
+ message(`${slave.slaveName} has been ${rule.aphrodisiacs > 0 ? "put on the proper" : "taken off"} aphrodisiacs.`, sourceRecord.aphrodisiacs);
slave.aphrodisiacs = rule.aphrodisiacs;
}
}
@@ -1809,16 +1825,17 @@ globalThis.DefaultRules = (function() {
* @param {FC.SlaveState} slave
* @param {number} hormones
* @param {string} slaveClass
+ * @param {string} source
*/
- const applyHormones = (slave, hormones, slaveClass) => {
+ function applyHormones(slave, hormones, slaveClass, source) {
if (!_.isNil(hormones)) {
const newHormones = slave.indentureRestrictions >= 2 ? Math.clamp(hormones, -1, 1) : hormones;
if (slave.hormones !== newHormones) {
slave.hormones = newHormones;
- r += `<br>${slave.slaveName} is ${slaveClass}, so ${he} has been put on the appropriate hormonal regime.`;
+ message(`${slave.slaveName} is ${slaveClass}, so ${he} has been put on the appropriate hormonal regime.`, source);
}
}
- };
+ }
/**
* @param {App.Entity.SlaveState} slave
@@ -1827,9 +1844,9 @@ globalThis.DefaultRules = (function() {
function ProcessPenisHormones(slave, rule) {
if (slave.dick > 0) {
if (slave.balls === 0) {
- applyHormones(slave, rule.gelding, "a gelding");
+ applyHormones(slave, rule.gelding, "a gelding", sourceRecord.gelding);
} else if (slave.balls > 0) {
- applyHormones(slave, rule.XY, "a shemale");
+ applyHormones(slave, rule.XY, "a shemale", sourceRecord.XY);
}
}
}
@@ -1840,7 +1857,7 @@ globalThis.DefaultRules = (function() {
*/
function ProcessFemaleHormones(slave, rule) {
if ((slave.vagina > -1) && (slave.dick === 0)) {
- applyHormones(slave, rule.XX, "a female");
+ applyHormones(slave, rule.XX, "a female", sourceRecord.XX);
}
}
@@ -1850,27 +1867,27 @@ globalThis.DefaultRules = (function() {
*/
function ProcessPregnancyDrugs(slave, rule) {
if (slave.pregKnown === 1 && rule.pregSpeed !== null && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset") && slave.indentureRestrictions < 1 && slave.broodmother === 0) {
- if (rule.pregSpeed === "slow" && slave.preg < slave.pregData.normalBirth) {
+ if (rule.pregSpeed === "slow" && slave.preg < slave.pregData.normalBirth && slave.pregControl !== "slow gestation") {
slave.pregControl = "slow gestation";
- r += `<br>${slave.slaveName} is pregnant, so ${he} has been put on the gestation slowing agents.`;
- } else if (rule.pregSpeed === "fast" && slave.preg < slave.pregData.normalBirth && slave.health.condition > -50) {
+ message(`${slave.slaveName} is pregnant, so ${he} has been put on the gestation slowing agents.`, sourceRecord.pregSpeed);
+ } else if (rule.pregSpeed === "fast" && slave.preg < slave.pregData.normalBirth && slave.health.condition > -50 && slave.pregControl !== "speed up") {
slave.pregControl = "speed up";
- r += `<br>${slave.slaveName} is pregnant, so ${he} has been put on rapid gestation agents. CAUTION! Can be dangerous. Clinic supervision is recommended.`;
- } else if (rule.pregSpeed === "suppress" && slave.preg >= slave.pregData.minLiveBirth && slave.health.condition > -50) {
+ message(`${slave.slaveName} is pregnant, so ${he} has been put on rapid gestation agents. CAUTION! Can be dangerous. Clinic supervision is recommended.`, sourceRecord.pregSpeed);
+ } else if (rule.pregSpeed === "suppress" && slave.preg >= slave.pregData.minLiveBirth && slave.health.condition > -50 && slave.pregControl !== "labor suppressors") {
slave.pregControl = "labor suppressors";
- r += `<br>${slave.slaveName} is ready to birth, so ${he} has been put on labor suppressing agents.`;
+ message(`${slave.slaveName} is ready to birth, so ${he} has been put on labor suppressing agents.`, sourceRecord.pregSpeed);
} else if (rule.pregSpeed === "stimulate" && slave.preg > slave.pregData.normalBirth - 2 && slave.preg > slave.pregData.minLiveBirth && slave.health.condition > -50) {
induce(slave);
- r += `<br>${slave.slaveName} is ready to birth, so ${his} labor has been stimulated.`;
+ message(`${slave.slaveName} is ready to birth, so ${his} labor has been stimulated.`, sourceRecord.pregSpeed);
} else if (rule.pregSpeed === "fast" && slave.pregControl === "speed up" && slave.health.condition <= -50) {
slave.pregControl = "none";
- r += `<br>${slave.slaveName} is on rapid gestation agents and dangerously unhealthy, so ${his} agent regimen has been stopped.`;
+ message(`${slave.slaveName} is on rapid gestation agents and dangerously unhealthy, so ${his} agent regimen has been stopped.`, sourceRecord.pregSpeed);
} else if (rule.pregSpeed === "suppress" && slave.pregControl === "labor suppressors" && slave.health.condition <= -50) {
slave.pregControl = "none";
- r += `<br>${slave.slaveName} is on labor suppression agents and unhealthy, so ${his} agent regimen has been stopped.`;
+ message(`${slave.slaveName} is on labor suppression agents and unhealthy, so ${his} agent regimen has been stopped.`, sourceRecord.pregSpeed);
} else if (rule.pregSpeed === "none" && slave.pregControl !== "none") {
slave.pregControl = "none";
- r += `<br>${slave.slaveName}'s pregnancy control regimen has been stopped.`;
+ message(`${slave.slaveName}'s pregnancy control regimen has been stopped.`, sourceRecord.pregSpeed);
}
}
}
@@ -1883,26 +1900,26 @@ globalThis.DefaultRules = (function() {
if (rule.livingRules !== undefined && rule.livingRules !== null && slave.rules.living !== rule.livingRules) {
if (App.Data.misc.facilityCareers.includes(slave.assignment)) {
// Handled in Rules tab of SI now.
- // r += `<br>${slave.slaveName}'s living standards are controlled by ${his} assignment.`;
+ // message(`${slave.slaveName}'s living standards are controlled by ${his} assignment.`);
} else if (((slave.assignment === Job.HEADGIRL) && (V.HGSuite === 1)) || ((slave.assignment === Job.BODYGUARD) && (V.dojo > 1))) {
- // r += `<br>${slave.slaveName} has a private room.`;
- } else if (slave.fetish === "mindbroken") {
+ // message(`${slave.slaveName} has a private room.`);
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
if (slave.rules.living !== "spare") {
slave.rules.living = "spare";
- r += `<br>Since ${slave.slaveName} is mindbroken, ${his} living standard has been set to spare.`;
+ message(`Since ${slave.slaveName} is mindbroken, ${his} living standard has been set to spare.`, sourceRecord.livingRules);
}
} else {
if (rule.livingRules === "luxurious") {
if (canMoveToRoom(slave)) {
slave.rules.living = rule.livingRules;
- r += `<br>${slave.slaveName}'s living standard has been set to ${rule.livingRules}.`;
+ message(`${slave.slaveName}'s living standard has been set to ${rule.livingRules}.`, sourceRecord.livingRules);
} else {
slave.rules.living = "normal";
- r += `<br>${slave.slaveName}'s living standard has been set to normal, since there is no room for ${him} to occupy.`;
+ message(`${slave.slaveName}'s living standard has been set to normal, since there is no room for ${him} to occupy.`, sourceRecord.livingRules);
}
} else {
slave.rules.living = rule.livingRules;
- r += `<br>${slave.slaveName}'s living standard has been set to ${rule.livingRules}.`;
+ message(`${slave.slaveName}'s living standard has been set to ${rule.livingRules}.`, sourceRecord.livingRules);
}
}
penthouseCensus();
@@ -1920,7 +1937,7 @@ globalThis.DefaultRules = (function() {
// These assignments enforce "restrictive", do not let RA attempt to change it.
} else {
slave.rules.rest = rule.restRules;
- r += `<br>${slave.slaveName}'s resting time has been set to ${rule.restRules}.`;
+ message(`${slave.slaveName}'s resting time has been set to ${rule.restRules}.`, sourceRecord.restRules);
}
}
}
@@ -1932,30 +1949,30 @@ globalThis.DefaultRules = (function() {
*/
function ProcessSpeech(slave, rule) {
if ((rule.speechRules !== undefined) && (rule.speechRules !== null) && (slave.rules.speech !== rule.speechRules)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (slave.rules.speech !== "restrictive") {
slave.rules.speech = "restrictive";
- r += `<br>Since ${slave.slaveName} is mindbroken, ${his} speech rules have been set to restrictive.`;
+ message(`Since ${slave.slaveName} is mindbroken, ${his} speech rules have been set to restrictive.`, sourceRecord.speechRules);
}
} else if (slave.accent === 4) {
if ((rule.speechRules === "accent elimination" || rule.speechRules === "permissive") && slave.rules.speech !== "language lessons") {
slave.rules.speech = "language lessons";
- r += `<br>Since ${slave.slaveName} does not know how to talk, ${his} speech rules have been set to language learning.`;
+ message(`Since ${slave.slaveName} does not know how to talk, ${his} speech rules have been set to language learning.`, sourceRecord.speechRules);
} else if (slave.rules.speech !== "language lessons" && slave.rules.speech !== "restrictive") {
slave.rules.speech = "restrictive";
- r += `<br>Since ${slave.slaveName} does not know how to talk, ${his} speech rules have been set to restrictive.`;
+ message(`Since ${slave.slaveName} does not know how to talk, ${his} speech rules have been set to restrictive.`, sourceRecord.speechRules);
}
} else if (rule.speechRules === "accent elimination") {
if (slave.accent > 0) {
slave.rules.speech = "accent elimination";
- r += `<br>${slave.slaveName}'s speech rules have been set to ${rule.speechRules}.`;
+ message(`${slave.slaveName}'s speech rules have been set to ${rule.speechRules}.`, sourceRecord.speechRules);
} else {
slave.rules.speech = "restrictive";
- r += `<br>Since ${slave.slaveName} has no accent, ${his} speech rules have been set to restrictive.`;
+ message(`Since ${slave.slaveName} has no accent, ${his} speech rules have been set to restrictive.`, sourceRecord.speechRules);
}
} else if (slave.rules.speech !== rule.speechRules) {
slave.rules.speech = rule.speechRules;
- r += `<br>${slave.slaveName}'s speech rules have been set to ${rule.speechRules}.`;
+ message(`${slave.slaveName}'s speech rules have been set to ${rule.speechRules}.`, sourceRecord.speechRules);
}
}
}
@@ -1965,11 +1982,11 @@ globalThis.DefaultRules = (function() {
* @param {FC.RA.RuleSetters} rule
*/
function ProcessRelationship(slave, rule) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if ((rule.relationshipRules !== undefined) && (rule.relationshipRules !== null)) {
if (slave.rules.relationship !== rule.relationshipRules) {
slave.rules.relationship = rule.relationshipRules;
- r += `<br>${slave.slaveName}'s relationship rules have been set to ${rule.relationshipRules}.`;
+ message(`${slave.slaveName}'s relationship rules have been set to ${rule.relationshipRules}.`, sourceRecord.relationshipRules);
}
}
}
@@ -1988,21 +2005,24 @@ globalThis.DefaultRules = (function() {
'slaves',
'master',
];
- if ((rule.releaseRules !== undefined) && (rule.releaseRules !== null) && processReleaseProp(releaseProperties)) {
- r += `<br>${slave.slaveName}'s release rules have been set to: ${App.Utils.releaseSummaryLong(slave)}.`;
+ if ((rule.releaseRules !== undefined) && (rule.releaseRules !== null)) {
+ const source = processReleaseProp(releaseProperties);
+ if (source !== "") {
+ message(`${slave.slaveName}'s release rules have been set to: ${App.Utils.releaseSummaryLong(slave)}.`, source);
+ }
}
function processReleaseProp(releaseProperties) {
- let changed = false;
+ let source = "";
for (const property of releaseProperties) {
if (rule.releaseRules[property] !== undefined && rule.releaseRules[property] !== null) {
if (slave.rules.release[property] !== rule.releaseRules[property]) {
slave.rules.release[property] = rule.releaseRules[property];
- changed = true;
+ source = sourceRecord.releaseRules[property];
}
}
}
- return changed;
+ return source;
}
}
@@ -2015,7 +2035,7 @@ globalThis.DefaultRules = (function() {
if (slave.rules.lactation !== rule.lactationRules) {
if ((rule.lactationRules === "induce" && slave.lactation === 0) || (rule.lactationRules === "maintain" && slave.lactation === 1) || (rule.lactationRules === "none")) {
slave.rules.lactation = rule.lactationRules;
- r += `<br>${slave.slaveName}'s lactation rules have been set to ${rule.lactationRules}.`;
+ message(`${slave.slaveName}'s lactation rules have been set to ${rule.lactationRules}.`, sourceRecord.lactationRules);
}
}
}
@@ -2029,7 +2049,7 @@ globalThis.DefaultRules = (function() {
if ((rule.mobilityRules !== undefined) && (rule.mobilityRules !== null)) {
if (slave.rules.mobility !== rule.mobilityRules) {
slave.rules.mobility = rule.mobilityRules;
- r += `<br>${slave.slaveName}'s usage of mobility aids has been set to ${rule.mobilityRules}.`;
+ message(`${slave.slaveName}'s usage of mobility aids has been set to ${rule.mobilityRules}.`, sourceRecord.mobilityRules);
}
}
}
@@ -2042,7 +2062,7 @@ globalThis.DefaultRules = (function() {
if ((rule.standardPunishment !== undefined) && (rule.standardPunishment !== null)) {
if (slave.rules.punishment !== rule.standardPunishment) {
slave.rules.punishment = rule.standardPunishment;
- r += `<br>${slave.slaveName}'s typical punishment has been updated to ${rule.standardPunishment}.`;
+ message(`${slave.slaveName}'s typical punishment has been updated to ${rule.standardPunishment}.`, sourceRecord.standardPunishment);
}
}
}
@@ -2055,7 +2075,7 @@ globalThis.DefaultRules = (function() {
if ((rule.standardReward !== undefined) && (rule.standardReward !== null)) {
if (slave.rules.reward !== rule.standardReward) {
slave.rules.reward = rule.standardReward;
- r += `<br>${slave.slaveName}'s typical reward has been updated to ${rule.standardReward}.`;
+ message(`${slave.slaveName}'s typical reward has been updated to ${rule.standardReward}.`, sourceRecord.standardReward);
}
}
}
@@ -2069,30 +2089,30 @@ globalThis.DefaultRules = (function() {
if (rule.toyHole === "pussy") {
if (slave.vagina > 0 && canDoVaginal(slave)) {
slave.toyHole = rule.toyHole;
- r += `<br>${slave.slaveName} has been instructed to use ${his} ${rule.toyHole} to please you.`;
+ message(`${slave.slaveName} has been instructed to use ${his} ${rule.toyHole} to please you.`, sourceRecord.toyHole);
} else if (slave.toyHole !== "all her holes") {
slave.toyHole = "all her holes";
- r += `<br>${slave.slaveName}'s hole preference has defaulted to all ${his} holes.`;
+ message(`${slave.slaveName}'s hole preference has defaulted to all ${his} holes.`, sourceRecord.toyHole);
}
} else if (rule.toyHole === "ass") {
if (slave.anus > 0 && canDoAnal(slave)) {
slave.toyHole = rule.toyHole;
- r += `<br>${slave.slaveName} has been instructed to use ${his} ${rule.toyHole} to please you.`;
+ message(`${slave.slaveName} has been instructed to use ${his} ${rule.toyHole} to please you.`, sourceRecord.toyHole);
} else if (slave.toyHole !== "all her holes") {
slave.toyHole = "all her holes";
- r += `<br>${slave.slaveName}'s hole preference has defaulted to all ${his} holes.`;
+ message(`${slave.slaveName}'s hole preference has defaulted to all ${his} holes.`, sourceRecord.toyHole);
}
} else if (rule.toyHole === "dick") {
if (slave.dick > 0 && canPenetrate(slave)) {
slave.toyHole = rule.toyHole;
- r += `<br>${slave.slaveName} has been instructed to use ${his} ${rule.toyHole} to please you.`;
+ message(`${slave.slaveName} has been instructed to use ${his} ${rule.toyHole} to please you.`, sourceRecord.toyHole);
} else if (slave.toyHole !== "all her holes") {
slave.toyHole = "all her holes";
- r += `<br>${slave.slaveName}'s hole preference has defaulted to all ${his} holes.`;
+ message(`${slave.slaveName}'s hole preference has defaulted to all ${his} holes.`, sourceRecord.toyHole);
}
} else {
slave.toyHole = rule.toyHole;
- r += `<br>${slave.slaveName} has been instructed to use ${his} ${rule.toyHole} to please you.`;
+ message(`${slave.slaveName} has been instructed to use ${his} ${rule.toyHole} to please you.`, sourceRecord.toyHole);
}
}
}
@@ -2106,12 +2126,12 @@ globalThis.DefaultRules = (function() {
if (slave.dietCum !== rule.dietCum) {
slave.dietCum = rule.dietCum;
if (slave.dietCum === 2) {
- r += `<br>${slave.slaveName} has been put on a diet based on cum.`;
+ message(`${slave.slaveName} has been put on a diet based on cum.`, sourceRecord.dietCum);
slave.dietMilk = 0;
} else if (slave.dietCum === 1) {
- r += `<br>${slave.slaveName} has had cum added to ${his} diet.`;
+ message(`${slave.slaveName} has had cum added to ${his} diet.`, sourceRecord.dietCum);
} else {
- r += `<br>${slave.slaveName} has had cum removed from ${his} diet.`;
+ message(`${slave.slaveName} has had cum removed from ${his} diet.`, sourceRecord.dietCum);
}
}
}
@@ -2126,12 +2146,12 @@ globalThis.DefaultRules = (function() {
if (slave.dietMilk !== rule.dietMilk) {
slave.dietMilk = rule.dietMilk;
if (slave.dietMilk === 2) {
- r += `<br>${slave.slaveName} has been put on a diet based on human milk.`;
+ message(`${slave.slaveName} has been put on a diet based on human milk.`, sourceRecord.dietMilk);
slave.dietCum = 0;
} else if (slave.dietMilk === 1) {
- r += `<br>${slave.slaveName} has had human milk added to ${his} diet.`;
+ message(`${slave.slaveName} has had human milk added to ${his} diet.`, sourceRecord.dietMilk);
} else {
- r += `<br>${slave.slaveName} has had human milk removed from ${his} diet.`;
+ message(`${slave.slaveName} has had human milk removed from ${his} diet.`, sourceRecord.dietMilk);
}
}
}
@@ -2146,9 +2166,9 @@ globalThis.DefaultRules = (function() {
if (slave.onDiet !== rule.onDiet) {
slave.onDiet = rule.onDiet;
if (slave.onDiet === 1) {
- r += `<br>${slave.slaveName} is not permitted to eat the solid slave food.`;
+ message(`${slave.slaveName} is not permitted to eat the solid slave food.`, sourceRecord.onDiet);
} else {
- r += `<br>${slave.slaveName} is permitted to eat the solid slave food.`;
+ message(`${slave.slaveName} is permitted to eat the solid slave food.`, sourceRecord.onDiet);
}
}
}
@@ -2164,36 +2184,36 @@ globalThis.DefaultRules = (function() {
if (slave.teeth === "crooked") {
slave.teeth = "straightening braces";
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- r += `<br>${slave.slaveName} has been given braces for ${his} crooked teeth.`;
+ message(`${slave.slaveName} has been given braces for ${his} crooked teeth.`, sourceRecord.teeth);
} else if (slave.teeth === "gapped") {
slave.teeth = "straightening braces";
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- r += `<br>${slave.slaveName} has been given braces to close the gap in ${his} teeth.`;
+ message(`${slave.slaveName} has been given braces to close the gap in ${his} teeth.`, sourceRecord.teeth);
} else if (slave.teeth === "normal") {
slave.teeth = "cosmetic braces";
cashX(forceNeg(V.modCost), "slaveSurgery", slave);
- r += `<br>${slave.slaveName} has been given cosmetic braces.`;
+ message(`${slave.slaveName} has been given cosmetic braces.`, sourceRecord.teeth);
}
} else if (rule.teeth === "straighten") {
if (slave.teeth === "crooked") {
slave.teeth = "straightening braces";
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- r += `<br>${slave.slaveName} has been given braces for ${his} crooked teeth.`;
+ message(`${slave.slaveName} has been given braces for ${his} crooked teeth.`, sourceRecord.teeth);
} else if (slave.teeth === "gapped") {
slave.teeth = "straightening braces";
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- r += `<br>${slave.slaveName} has been given braces to close the gap in ${his} teeth.`;
+ message(`${slave.slaveName} has been given braces to close the gap in ${his} teeth.`, sourceRecord.teeth);
} else if (slave.teeth === "cosmetic braces") {
slave.teeth = "normal";
- r += `<br>${slave.slaveName} has had ${his} braces removed, since ${his} teeth are straight.`;
+ message(`${slave.slaveName} has had ${his} braces removed, since ${his} teeth are straight.`, sourceRecord.teeth);
}
} else if (rule.teeth === "none") {
if (slave.teeth === "straightening braces") {
slave.teeth = "crooked";
- r += `<br>${slave.slaveName} has had ${his} braces removed.`;
+ message(`${slave.slaveName} has had ${his} braces removed.`, sourceRecord.teeth);
} else if (slave.teeth === "cosmetic braces") {
slave.teeth = "normal";
- r += `<br>${slave.slaveName} has had ${his} braces removed.`;
+ message(`${slave.slaveName} has had ${his} braces removed.`, sourceRecord.teeth);
}
}
}
@@ -2204,6 +2224,9 @@ globalThis.DefaultRules = (function() {
* @param {FC.RA.RuleSetters} rule
*/
function processEyeColor(slave, rule) {
+ if (!hasAnyEyes(slave)) {
+ return;
+ }
// calculate our goals
// iris
let leftIris = getLeftEyeColor(slave);
@@ -2238,14 +2261,20 @@ globalThis.DefaultRules = (function() {
rightSclera = rule.sclera;
}
- if (
- getLeftEyeColor(slave) !== leftIris || getRightEyeColor(slave) !== rightIris ||
- getLeftEyePupil(slave) !== leftPupil || getRightEyePupil(slave) !== rightPupil ||
- getLeftEyeSclera(slave) !== leftSclera || getRightEyeSclera(slave) !== rightSclera
+ const leftNeedsChange = hasLeftEye(slave) &&
+ (getLeftEyeColor(slave) !== leftIris || getLeftEyePupil(slave) !== leftPupil ||
+ getLeftEyeSclera(slave) !== leftSclera);
+ const rightNeedsChange = hasRightEye(slave) &&
+ (getRightEyeColor(slave) !== rightIris || getRightEyePupil(slave) !== rightPupil ||
+ getRightEyeSclera(slave) !== rightSclera);
- ) {
- setEyeColorFull(slave, leftIris, leftPupil, leftSclera, "left");
- setEyeColorFull(slave, rightIris, rightPupil, rightSclera, "right");
+ if (leftNeedsChange || rightNeedsChange) {
+ if (leftNeedsChange) {
+ setEyeColorFull(slave, leftIris, leftPupil, leftSclera, "left");
+ }
+ if (rightNeedsChange) {
+ setEyeColorFull(slave, rightIris, rightPupil, rightSclera, "right");
+ }
cashX(forceNeg(V.modCost), "slaveMod", slave);
const lensDesc = [];
@@ -2271,7 +2300,7 @@ globalThis.DefaultRules = (function() {
}
}
const lens = toSentence(lensDesc);
- r += `<br>${slave.slaveName} has been given ${hasBothEyes(slave) ? `contact lenses` : `a contact lens`} with ${lens}.`;
+ message(`${slave.slaveName} has been given ${hasBothEyes(slave) ? `contact lenses` : `a contact lens`} with ${lens}.`, [sourceRecord.iris, sourceRecord.pupil, sourceRecord.sclera]);
}
}
@@ -2286,7 +2315,7 @@ globalThis.DefaultRules = (function() {
if (slave.makeup !== rule.makeup) {
slave.makeup = rule.makeup;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName} has been assigned the standard makeup.`;
+ message(`${slave.slaveName} has been assigned the standard makeup.`, sourceRecord.makeup);
}
}
@@ -2295,7 +2324,7 @@ globalThis.DefaultRules = (function() {
if (slave.nails !== rule.nails) {
slave.nails = rule.nails;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName} has been assigned the standard nails.`;
+ message(`${slave.slaveName} has been assigned the standard nails.`, sourceRecord.nails);
}
}
}
@@ -2305,7 +2334,7 @@ globalThis.DefaultRules = (function() {
if (slave.hColor !== rule.hColor) {
slave.hColor = rule.hColor;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s hair has been dyed ${rule.hColor}.`;
+ message(`${slave.slaveName}'s hair has been dyed ${rule.hColor}.`, sourceRecord.hColor);
}
}
}
@@ -2315,7 +2344,7 @@ globalThis.DefaultRules = (function() {
if (slave.hornColor !== rule.hornColor) {
slave.hornColor = rule.hornColor;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s horns has been dyed ${rule.hornColor}.`;
+ message(`${slave.slaveName}'s horns has been dyed ${rule.hornColor}.`, sourceRecord.hornColor);
}
}
}
@@ -2327,20 +2356,20 @@ globalThis.DefaultRules = (function() {
cashX(forceNeg(V.modCost), "slaveMod", slave);
if (rule.hStyle === "shaved") {
slave.hLength = 0;
- r += `<br>${slave.slaveName}'s hair has been shaved.`;
+ message(`${slave.slaveName}'s hair has been shaved.`, sourceRecord.hStyle);
} else {
- r += `<br>${slave.slaveName}'s hair has been restyled`;
+ let m = `${slave.slaveName}'s hair has been restyled`;
// Cut hair if needed
for (const style of App.Medicine.Modification.hairStyles.Cut) {
if (style.value === rule.hStyle) {
if (slave.hLength > style.hLength) {
slave.hLength = style.hLength;
- r += ` and shortened`;
+ m += ` and shortened`;
}
break;
}
}
- r += `.`;
+ message(`${m}.`, sourceRecord.hStyle);
}
}
}
@@ -2351,10 +2380,10 @@ globalThis.DefaultRules = (function() {
if (slave.hLength !== rule.hLength) {
if (slave.hLength > rule.hLength) {
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s hair has been cut; it `;
+ message(`${slave.slaveName}'s hair has been cut; it `, sourceRecord.hLength);
} else {
cashX(forceNeg(V.modCost * Math.trunc((rule.hLength - slave.hLength) / 10)), "slaveMod", slave);
- r += `<br>${slave.slaveName} has been given extensions; ${his} hair `;
+ message(`${slave.slaveName} has been given extensions; ${his} hair `, sourceRecord.hLength);
}
r += `is now ${lengthToEitherUnit(rule.hLength)} long.`;
slave.hLength = rule.hLength;
@@ -2365,10 +2394,10 @@ globalThis.DefaultRules = (function() {
if (rule.haircuts !== undefined && (rule.haircuts !== null)) {
if (slave.bald !== 1) {
if (rule.haircuts === 1 && slave.haircuts !== 1) {
- r += `<br>${slave.slaveName}'s hair will now be maintained at ${lengthToEitherUnit(slave.hLength)} long.`;
+ message(`${slave.slaveName}'s hair will now be maintained at ${lengthToEitherUnit(slave.hLength)} long.`, sourceRecord.haircuts);
slave.haircuts = 1;
} else if (rule.haircuts === 0 && slave.haircuts !== 0) {
- r += `<br>${slave.slaveName}'s hair length will no longer be maintained.`;
+ message(`${slave.slaveName}'s hair length will no longer be maintained.`, sourceRecord.haircuts);
slave.haircuts = 0;
}
}
@@ -2379,7 +2408,7 @@ globalThis.DefaultRules = (function() {
if (slave.eyebrowHColor !== rule.eyebrowHColor) {
slave.eyebrowHColor = rule.eyebrowHColor;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s eyebrow hair, if present, has been dyed ${rule.eyebrowHColor}.`;
+ message(`${slave.slaveName}'s eyebrow hair, if present, has been dyed ${rule.eyebrowHColor}.`, sourceRecord.eyebrowHColor);
}
}
}
@@ -2389,7 +2418,7 @@ globalThis.DefaultRules = (function() {
if (slave.eyebrowHStyle !== rule.eyebrowHStyle) {
slave.eyebrowHStyle = rule.eyebrowHStyle;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s eyebrow hair has been restyled; they are now ${rule.eyebrowHStyle}.`;
+ message(`${slave.slaveName}'s eyebrow hair has been restyled; they are now ${rule.eyebrowHStyle}.`, sourceRecord.eyebrowHStyle);
}
}
}
@@ -2399,7 +2428,7 @@ globalThis.DefaultRules = (function() {
if (slave.eyebrowFullness !== rule.eyebrowFullness) {
slave.eyebrowFullness = rule.eyebrowFullness;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s eyebrow hair thickness has been adjusted; they are now ${rule.eyebrowFullness}.`;
+ message(`${slave.slaveName}'s eyebrow hair thickness has been adjusted; they are now ${rule.eyebrowFullness}.`, sourceRecord.eyebrowFullness);
}
}
}
@@ -2409,7 +2438,7 @@ globalThis.DefaultRules = (function() {
if (slave.pubicHColor !== rule.pubicHColor) {
slave.pubicHColor = rule.pubicHColor;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s pubic hair, if present, has been dyed ${rule.pubicHColor}.`;
+ message(`${slave.slaveName}'s pubic hair, if present, has been dyed ${rule.pubicHColor}.`, sourceRecord.pubicHColor);
}
}
}
@@ -2419,7 +2448,7 @@ globalThis.DefaultRules = (function() {
if (slave.pubicHStyle !== rule.pubicHStyle) {
slave.pubicHStyle = rule.pubicHStyle;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s pubic hair has been restyled; it is now ${rule.pubicHStyle}.`;
+ message(`${slave.slaveName}'s pubic hair has been restyled; it is now ${rule.pubicHStyle}.`, sourceRecord.pubicHStyle);
}
}
}
@@ -2429,7 +2458,7 @@ globalThis.DefaultRules = (function() {
if (slave.underArmHColor !== rule.underArmHColor) {
slave.underArmHColor = rule.underArmHColor;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s underarm hair, if present, has been dyed ${rule.underArmHColor}.`;
+ message(`${slave.slaveName}'s underarm hair, if present, has been dyed ${rule.underArmHColor}.`, sourceRecord.underArmHColor);
}
}
}
@@ -2439,7 +2468,7 @@ globalThis.DefaultRules = (function() {
if (slave.underArmHStyle !== rule.underArmHStyle) {
slave.underArmHStyle = rule.underArmHStyle;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s underarm hair has been restyled; it is now ${rule.underArmHStyle}.`;
+ message(`${slave.slaveName}'s underarm hair has been restyled; it is now ${rule.underArmHStyle}.`, sourceRecord.underArmHStyle);
}
}
}
@@ -2449,7 +2478,7 @@ globalThis.DefaultRules = (function() {
if (slave.eyebrowHColor !== rule.eyebrowHColor) {
slave.eyebrowHColor = rule.eyebrowHColor;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s eyebrow hair, if present, has been dyed ${rule.eyebrowHColor}.`;
+ message(`${slave.slaveName}'s eyebrow hair, if present, has been dyed ${rule.eyebrowHColor}.`, sourceRecord.eyebrowHColor);
}
}
}
@@ -2459,7 +2488,7 @@ globalThis.DefaultRules = (function() {
if (slave.eyebrowHStyle !== rule.eyebrowHStyle) {
slave.eyebrowHStyle = rule.eyebrowHStyle;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s eyebrow hair has been restyled; it is now ${rule.eyebrowHStyle}.`;
+ message(`${slave.slaveName}'s eyebrow hair has been restyled; it is now ${rule.eyebrowHStyle}.`, sourceRecord.eyebrowHStyle);
}
}
}
@@ -2469,19 +2498,19 @@ globalThis.DefaultRules = (function() {
if (slave.eyebrowFullness !== rule.eyebrowFullness) {
slave.eyebrowFullness = rule.eyebrowFullness;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s eyebrow hair has been reshaped; it is now ${rule.eyebrowFullness}.`;
+ message(`${slave.slaveName}'s eyebrow hair has been reshaped; it is now ${rule.eyebrowFullness}.`, sourceRecord.eyebrowFullness);
}
}
}
if (rule.markings !== undefined && (rule.markings !== null)) {
if (slave.markings === "beauty mark" && (rule.markings === "remove beauty marks" || rule.markings === "remove both")) {
- r += `<br>${slave.slaveName}'s beauty mark has been removed.`;
+ message(`${slave.slaveName}'s beauty mark has been removed.`, sourceRecord.markings);
slave.markings = "none";
cashX(forceNeg(V.modCost), "slaveMod", slave);
}
if (slave.markings === "birthmark" && (rule.markings === "remove birthmarks" || rule.markings === "remove both")) {
- r += `<br>${slave.slaveName}'s birthmark has been bleached away.`;
+ message(`${slave.slaveName}'s birthmark has been bleached away.`, sourceRecord.markings);
cashX(forceNeg(V.modCost), "slaveMod", slave);
slave.markings = "none";
}
@@ -2491,11 +2520,11 @@ globalThis.DefaultRules = (function() {
if (rule.skinColor === "natural") {
if (slave.skin !== slave.origSkin) {
slave.skin = slave.origSkin;
- r += `<br>${slave.slaveName}'s skin color has been returned to ${slave.origSkin}.`;
+ message(`${slave.slaveName}'s skin color has been returned to ${slave.origSkin}.`, sourceRecord.skinColor);
}
} else {
slave.skin = rule.skinColor;
- r += `<br>${slave.slaveName}'s skin color has been set to ${rule.skinColor}.`;
+ message(`${slave.slaveName}'s skin color has been set to ${rule.skinColor}.`, sourceRecord.skinColor);
}
}
}
@@ -2509,13 +2538,13 @@ globalThis.DefaultRules = (function() {
if (slave.piercing.nipple.weight !== rule.piercing.nipple.weight) {
if (rule.piercing.nipple.weight === 0) {
slave.piercing.nipple.weight = 0;
- r += `<br>${slave.slaveName}'s nipple piercings have been removed.`;
+ message(`${slave.slaveName}'s nipple piercings have been removed.`, sourceRecord.piercing.nipple.weight);
} else if (slave.nipples !== "fuckable") {
slave.piercing.nipple.weight = rule.piercing.nipple.weight;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s nipples have been pierced.`;
+ message(`${slave.slaveName}'s nipples have been pierced.`, sourceRecord.piercing.nipple.weight);
} else {
- r += `<br>${slave.slaveName}'s nipples are inverted and cannot be pierced.`;
+ message(`${slave.slaveName}'s nipples are inverted and cannot be pierced.`, sourceRecord.piercing.nipple.weight);
}
}
}
@@ -2524,11 +2553,11 @@ globalThis.DefaultRules = (function() {
if (slave.piercing.areola.weight !== rule.piercing.areola.weight) {
if (rule.piercing.areola.weight === 0) {
slave.piercing.areola.weight = 0;
- r += `<br>${slave.slaveName}'s areolae piercings have been removed.`;
+ message(`${slave.slaveName}'s areolae piercings have been removed.`, sourceRecord.piercing.areola.weight);
} else {
slave.piercing.areola.weight = rule.piercing.areola.weight;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s areolae have been given stud piercings.`;
+ message(`${slave.slaveName}'s areolae have been given stud piercings.`, sourceRecord.piercing.areola.weight);
}
}
}
@@ -2539,17 +2568,17 @@ globalThis.DefaultRules = (function() {
slave.piercing.genitals.weight = 0;
slave.piercing.genitals.smart = false;
if (slave.dick > 0) {
- r += `<br>${slave.slaveName}'s frenulum piercing has been removed.`;
+ message(`${slave.slaveName}'s frenulum piercing has been removed.`, sourceRecord.piercing.genitals.weight);
} else {
- r += `<br>${slave.slaveName}'s clit piercing has been removed.`;
+ message(`${slave.slaveName}'s clit piercing has been removed.`, sourceRecord.piercing.genitals.weight);
}
} else if ((slave.vagina !== -1) || (slave.dick !== 0)) {
slave.piercing.genitals.weight = rule.piercing.genitals.weight;
cashX(forceNeg(V.SPcost), "slaveMod", slave);
if (slave.dick > 0) {
- r += `<br>${slave.slaveName}'s frenulum has been pierced.`;
+ message(`${slave.slaveName}'s frenulum has been pierced.`, sourceRecord.piercing.genitals.weight);
} else {
- r += `<br>${slave.slaveName}'s clit has been pierced.`;
+ message(`${slave.slaveName}'s clit has been pierced.`, sourceRecord.piercing.genitals.weight);
}
}
}
@@ -2560,11 +2589,11 @@ globalThis.DefaultRules = (function() {
if (slave.piercing.vagina.weight !== rule.piercing.vagina.weight) {
if (rule.piercing.vagina.weight === 0) {
slave.piercing.vagina.weight = 0;
- r += `<br>${slave.slaveName}'s labia piercings have been removed.`;
+ message(`${slave.slaveName}'s labia piercings have been removed.`, sourceRecord.piercing.vagina.weight);
} else {
slave.piercing.vagina.weight = rule.piercing.vagina.weight;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s pussylips have been pierced.`;
+ message(`${slave.slaveName}'s pussylips have been pierced.`, sourceRecord.piercing.vagina.weight);
}
}
}
@@ -2575,11 +2604,11 @@ globalThis.DefaultRules = (function() {
if (slave.piercing.dick.weight !== rule.piercing.dick.weight) {
if (rule.piercing.dick.weight === 0) {
slave.piercing.dick.weight = 0;
- r += `<br>${slave.slaveName}'s shaft piercings have been removed.`;
+ message(`${slave.slaveName}'s shaft piercings have been removed.`, sourceRecord.piercing.dick.weight);
} else {
slave.piercing.dick.weight = rule.piercing.dick.weight;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s shaft has been pierced.`;
+ message(`${slave.slaveName}'s shaft has been pierced.`, sourceRecord.piercing.dick.weight);
}
}
}
@@ -2590,12 +2619,12 @@ globalThis.DefaultRules = (function() {
if (rule.piercing.genitals.smart === false) {
slave.piercing.genitals.smart = false;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s ${slave.dick > 0 ? "frenulum" : "clit"} piercing's smart vibe capability has been removed.`;
+ message(`${slave.slaveName}'s ${slave.dick > 0 ? "frenulum" : "clit"} piercing's smart vibe capability has been removed.`, sourceRecord.piercing.genitals.smart);
} else if (slave.piercing.genitals.weight) {
slave.piercing.genitals.smart = true;
cashX(forceNeg(V.SPcost), "slaveMod", slave);
slave.clitSetting = "all";
- r += `<br>${slave.slaveName}'s ${slave.dick > 0 ? "frenulum" : "clit"} piercing has been upgraded with smart vibe functionality.`;
+ message(`${slave.slaveName}'s ${slave.dick > 0 ? "frenulum" : "clit"} piercing has been upgraded with smart vibe functionality.`, sourceRecord.piercing.genitals.smart);
}
}
}
@@ -2604,11 +2633,11 @@ globalThis.DefaultRules = (function() {
if (slave.piercing.anus.weight !== rule.piercing.anus.weight) {
if (rule.piercing.anus.weight === 0) {
slave.piercing.anus.weight = 0;
- r += `<br>${slave.slaveName}'s asshole piercings have been removed.`;
+ message(`${slave.slaveName}'s asshole piercings have been removed.`, sourceRecord.piercing.anus.weight);
} else {
slave.piercing.anus.weight = rule.piercing.anus.weight;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s asshole has been pierced.`;
+ message(`${slave.slaveName}'s asshole has been pierced.`, sourceRecord.piercing.anus.weight);
}
}
}
@@ -2617,11 +2646,11 @@ globalThis.DefaultRules = (function() {
if (slave.piercing.lips.weight !== rule.piercing.lips.weight) {
if (rule.piercing.lips.weight === 0) {
slave.piercing.lips.weight = 0;
- r += `<br>${slave.slaveName}'s lip piercings have been removed.`;
+ message(`${slave.slaveName}'s lip piercings have been removed.`, sourceRecord.piercing.lips.weight);
} else {
slave.piercing.lips.weight = rule.piercing.lips.weight;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s lips have been pierced.`;
+ message(`${slave.slaveName}'s lips have been pierced.`, sourceRecord.piercing.lips.weight);
}
}
}
@@ -2630,11 +2659,11 @@ globalThis.DefaultRules = (function() {
if (slave.piercing.tongue.weight !== rule.piercing.tongue.weight) {
if (rule.piercing.tongue.weight === 0) {
slave.piercing.tongue.weight = 0;
- r += `<br>${slave.slaveName}'s tongue piercings have been removed.`;
+ message(`${slave.slaveName}'s tongue piercings have been removed.`, sourceRecord.piercing.tongue.weight);
} else {
slave.piercing.tongue.weight = rule.piercing.tongue.weight;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s tongue has been pierced.`;
+ message(`${slave.slaveName}'s tongue has been pierced.`, sourceRecord.piercing.tongue.weight);
}
}
}
@@ -2643,11 +2672,11 @@ globalThis.DefaultRules = (function() {
if (slave.piercing.ear.weight !== rule.piercing.ear.weight) {
if (rule.piercing.ear.weight === 0) {
slave.piercing.ear.weight = 0;
- r += `<br>${slave.slaveName}'s ear piercings have been removed.`;
+ message(`${slave.slaveName}'s ear piercings have been removed.`, sourceRecord.piercing.ear.weight);
} else {
slave.piercing.ear.weight = rule.piercing.ear.weight;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s ears have been pierced.`;
+ message(`${slave.slaveName}'s ears have been pierced.`, sourceRecord.piercing.ear.weight);
}
}
}
@@ -2656,11 +2685,11 @@ globalThis.DefaultRules = (function() {
if (slave.piercing.nose.weight !== rule.piercing.nose.weight) {
if (rule.piercing.nose.weight === 0) {
slave.piercing.nose.weight = 0;
- r += `<br>${slave.slaveName}'s nose piercing has been removed.`;
+ message(`${slave.slaveName}'s nose piercing has been removed.`, sourceRecord.piercing.nose.weight);
} else {
slave.piercing.nose.weight = rule.piercing.nose.weight;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s nose has been pierced.`;
+ message(`${slave.slaveName}'s nose has been pierced.`, sourceRecord.piercing.nose.weight);
}
}
}
@@ -2669,11 +2698,11 @@ globalThis.DefaultRules = (function() {
if (slave.piercing.eyebrow.weight !== rule.piercing.eyebrow.weight) {
if (rule.piercing.eyebrow.weight === 0) {
slave.piercing.eyebrow.weight = 0;
- r += `<br>${slave.slaveName}'s eyebrow piercings have been removed.`;
+ message(`${slave.slaveName}'s eyebrow piercings have been removed.`, sourceRecord.piercing.eyebrow.weight);
} else {
slave.piercing.eyebrow.weight = rule.piercing.eyebrow.weight;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s eyebrows have been pierced.`;
+ message(`${slave.slaveName}'s eyebrows have been pierced.`, sourceRecord.piercing.eyebrow.weight);
}
}
}
@@ -2682,11 +2711,11 @@ globalThis.DefaultRules = (function() {
if (slave.piercing.navel.weight !== rule.piercing.navel.weight) {
if (rule.piercing.navel.weight === 0) {
slave.piercing.navel.weight = 0;
- r += `<br>${slave.slaveName}'s navel piercing have been removed.`;
+ message(`${slave.slaveName}'s navel piercing have been removed.`, sourceRecord.piercing.navel.weight);
} else {
slave.piercing.navel.weight = rule.piercing.navel.weight;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s navel has been pierced.`;
+ message(`${slave.slaveName}'s navel has been pierced.`, sourceRecord.piercing.navel.weight);
}
}
}
@@ -2695,11 +2724,11 @@ globalThis.DefaultRules = (function() {
if (slave.piercing.corset.weight !== rule.piercing.corset.weight) {
if (rule.piercing.corset.weight === 0) {
slave.piercing.corset.weight = 0;
- r += `<br>${slave.slaveName}'s corset piercings have been removed.`;
+ message(`${slave.slaveName}'s corset piercings have been removed.`, sourceRecord.piercing.corset.weight);
} else {
slave.piercing.corset.weight = rule.piercing.corset.weight;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName} has been given a set of corset piercings.`;
+ message(`${slave.slaveName} has been given a set of corset piercings.`, sourceRecord.piercing.corset.weight);
}
}
}
@@ -2709,9 +2738,9 @@ globalThis.DefaultRules = (function() {
if (rule.piercing[p].desc !== undefined && (rule.piercing[p].desc !== null)) {
if (slave.piercing[p].desc !== rule.piercing[p].desc) {
if (rule.piercing[p].desc === "") {
- r += `<br>${slave.slaveName}'s ${p} piercings will use the default design.`;
+ message(`${slave.slaveName}'s ${p} piercings will use the default design.`, sourceRecord.piercing[p].desc);
} else {
- r += `<br>${slave.slaveName}'s ${p} piercings have been updated to a different design.`;
+ message(`${slave.slaveName}'s ${p} piercings have been updated to a different design.`, sourceRecord.piercing[p].desc);
}
slave.piercing[p].desc = rule.piercing[p].desc;
}
@@ -2738,7 +2767,7 @@ globalThis.DefaultRules = (function() {
// Set the smart thingy to the correct fetish
if (slave.clitSetting !== fetish) {
slave.clitSetting = fetish;
- r += `<br>${slave.slaveName}'s ${smartThing} has been set to ${slave.clitSetting}.`;
+ message(`${slave.slaveName}'s ${smartThing} has been set to ${slave.clitSetting}.`, sourceRecord.clitSetting);
}
// We haven't reached full fetish yet, don't allow changing to something else
return;
@@ -2747,13 +2776,13 @@ globalThis.DefaultRules = (function() {
if (rule.clitSettingEnergy !== undefined && (rule.clitSettingEnergy !== null)) {
if (slave.energy < rule.clitSettingEnergy) {
if (slave.clitSetting !== "all") {
- r += `<br>${slave.slaveName}'s ${smartThing} has been set to enhance libido.`;
+ message(`${slave.slaveName}'s ${smartThing} has been set to enhance libido.`, sourceRecord.clitSettingEnergy);
}
slave.clitSetting = "all";
return;
} else if (slave.energy >= rule.clitSettingEnergy + 10 && rule.clitSettingEnergy <= 90) {
if (slave.clitSetting !== "none") {
- r += `<br>${slave.slaveName}'s ${smartThing} has been set to suppress libido.`;
+ message(`${slave.slaveName}'s ${smartThing} has been set to suppress libido.`, sourceRecord.clitSettingEnergy);
}
slave.clitSetting = "none";
return;
@@ -2762,13 +2791,13 @@ globalThis.DefaultRules = (function() {
if (rule.clitSettingXY !== undefined && (rule.clitSettingXY !== null)) {
if (slave.attrXY < rule.clitSettingXY) {
if (slave.clitSetting !== "men") {
- r += `<br>${slave.slaveName}'s ${smartThing} has been set to encourage attraction to men.`;
+ message(`${slave.slaveName}'s ${smartThing} has been set to encourage attraction to men.`, sourceRecord.clitSettingXY);
}
slave.clitSetting = "men";
return;
} else if (slave.attrXY >= rule.clitSettingXY + 10 && rule.clitSettingXY <= 90) {
if (slave.clitSetting !== "anti-men") {
- r += `<br>${slave.slaveName}'s ${smartThing} has been set to discourage attraction to men.`;
+ message(`${slave.slaveName}'s ${smartThing} has been set to discourage attraction to men.`, sourceRecord.clitSettingXY);
}
slave.clitSetting = "anti-men";
return;
@@ -2777,13 +2806,13 @@ globalThis.DefaultRules = (function() {
if (rule.clitSettingXX !== undefined && (rule.clitSettingXX !== null)) {
if (slave.attrXX < rule.clitSettingXX) {
if (slave.clitSetting !== "women") {
- r += `<br>${slave.slaveName}'s ${smartThing} has been set to encourage attraction to women.`;
+ message(`${slave.slaveName}'s ${smartThing} has been set to encourage attraction to women.`, sourceRecord.clitSettingXX);
}
slave.clitSetting = "women";
return;
} else if (slave.attrXX >= rule.clitSettingXX + 10 && rule.clitSettingXX <= 90) {
if (slave.clitSetting !== "anti-women") {
- r += `<br>${slave.slaveName}'s ${smartThing} has been set to discourage attraction to women.`;
+ message(`${slave.slaveName}'s ${smartThing} has been set to discourage attraction to women.`, sourceRecord.clitSettingXX);
}
slave.clitSetting = "anti-women";
return;
@@ -2801,7 +2830,7 @@ globalThis.DefaultRules = (function() {
if (slave.boobsTat !== rule.boobsTat) {
slave.boobsTat = rule.boobsTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s chest has been tattooed.`;
+ message(`${slave.slaveName}'s chest has been tattooed.`, sourceRecord.boobsTat);
}
}
@@ -2809,7 +2838,7 @@ globalThis.DefaultRules = (function() {
if (slave.buttTat !== rule.buttTat) {
slave.buttTat = rule.buttTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s butt has been tattooed.`;
+ message(`${slave.slaveName}'s butt has been tattooed.`, sourceRecord.buttTat);
}
}
@@ -2817,7 +2846,7 @@ globalThis.DefaultRules = (function() {
if (slave.vaginaTat !== rule.vaginaTat) {
slave.vaginaTat = rule.vaginaTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s abdomen has been tattooed.`;
+ message(`${slave.slaveName}'s abdomen has been tattooed.`, sourceRecord.vaginaTat);
}
}
@@ -2826,7 +2855,7 @@ globalThis.DefaultRules = (function() {
if (slave.dickTat !== rule.dickTat) {
slave.dickTat = rule.dickTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s dick has been tattooed.`;
+ message(`${slave.slaveName}'s dick has been tattooed.`, sourceRecord.dickTat);
}
}
}
@@ -2835,7 +2864,7 @@ globalThis.DefaultRules = (function() {
if (slave.lipsTat !== rule.lipsTat) {
slave.lipsTat = rule.lipsTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s face has been tattooed.`;
+ message(`${slave.slaveName}'s face has been tattooed.`, sourceRecord.lipsTat);
}
}
@@ -2843,7 +2872,7 @@ globalThis.DefaultRules = (function() {
if (slave.anusTat !== rule.anusTat) {
slave.anusTat = rule.anusTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s asshole has been modded.`;
+ message(`${slave.slaveName}'s asshole has been modded.`, sourceRecord.anusTat);
}
}
@@ -2851,7 +2880,7 @@ globalThis.DefaultRules = (function() {
if (slave.backTat !== rule.backTat) {
slave.backTat = rule.backTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s back has been tattooed.`;
+ message(`${slave.slaveName}'s back has been tattooed.`, sourceRecord.backTat);
}
}
@@ -2859,21 +2888,21 @@ globalThis.DefaultRules = (function() {
if (slave.shouldersTat !== rule.shouldersTat) {
slave.shouldersTat = rule.shouldersTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s shoulders have been tattooed.`;
+ message(`${slave.slaveName}'s shoulders have been tattooed.`, sourceRecord.shouldersTat);
}
}
if (rule.armsTat !== undefined && (rule.armsTat !== null)) {
- if (slave.armsTat !== rule.armsTat) {
+ if (hasAnyArms(slave) && slave.armsTat !== rule.armsTat) {
slave.armsTat = rule.armsTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s `;
+ let m = `${slave.slaveName}'s `;
if (hasBothArms(slave)) {
- r += `arms have`;
+ m += `arms have`;
} else {
- r += `arm has`;
+ m += `arm has`;
}
- r += ` been tattooed.`;
+ message(`${m} been tattooed.`, sourceRecord.armsTat);
}
}
@@ -2881,7 +2910,7 @@ globalThis.DefaultRules = (function() {
if (slave.legsTat !== rule.legsTat) {
slave.legsTat = rule.legsTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s legs have been tattooed.`;
+ message(`${slave.slaveName}'s legs have been tattooed.`, sourceRecord.legsTat);
}
}
@@ -2889,21 +2918,21 @@ globalThis.DefaultRules = (function() {
if (slave.stampTat !== rule.stampTat) {
slave.stampTat = rule.stampTat;
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s lower back has been tattooed.`;
+ message(`${slave.slaveName}'s lower back has been tattooed.`, sourceRecord.stampTat);
}
}
if (rule.birthsTat !== undefined && (rule.birthsTat !== null)) {
if (rule.birthsTat === "remove") {
if (slave.birthsTat > 0) {
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s birth tallies have been removed.`;
+ message(`${slave.slaveName}'s birth tallies have been removed.`, sourceRecord.birthsTat);
} else if (slave.birthsTat > -1) {
- r += `<br>${slave.slaveName} will no longer be tattooed with each birth.`;
+ message(`${slave.slaveName} will no longer be tattooed with each birth.`, sourceRecord.birthsTat);
}
slave.birthsTat = -1;
} else if (rule.birthsTat === "tally") {
if (slave.birthsTat < 0) {
- r += `<br>${slave.slaveName} will be tattooed with each birth.`;
+ message(`${slave.slaveName} will be tattooed with each birth.`, sourceRecord.birthsTat);
slave.birthsTat = 0;
}
}
@@ -2912,14 +2941,14 @@ globalThis.DefaultRules = (function() {
if (rule.abortionTat === "remove") {
if (slave.abortionTat > 0) {
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName}'s abortion tallies have been removed.`;
+ message(`${slave.slaveName}'s abortion tallies have been removed.`, sourceRecord.abortionTat);
} else if (slave.abortionTat > -1) {
- r += `<br>${slave.slaveName} will no longer be tattooed with each abortion and miscarriage.`;
+ message(`${slave.slaveName} will no longer be tattooed with each abortion and miscarriage.`, sourceRecord.abortionTat);
}
slave.abortionTat = -1;
} else if (rule.abortionTat === "tally") {
if (slave.abortionTat < 0) {
- r += `<br>${slave.slaveName} will be tattooed with each abortion and miscarriage.`;
+ message(`${slave.slaveName} will be tattooed with each abortion and miscarriage.`, sourceRecord.abortionTat);
slave.abortionTat = 0;
}
}
@@ -3043,18 +3072,18 @@ globalThis.DefaultRules = (function() {
// Apply brands:
if (["left", "right", "anywhere"].includes(brandPlace)) {
healthDamage(slave, 10);
- r += `<br>${slave.slaveName} has been branded on the `;
+ let m = `${slave.slaveName} has been branded on the `;
if (brandPlace === "left") {
App.Medicine.Modification.addBrand(slave, left, rule.brandDesign);
- r += `${left}`;
+ m += `${left}`;
} else if (brandPlace === "right") {
App.Medicine.Modification.addBrand(slave, right, rule.brandDesign);
- r += `${right}`;
+ m += `${right}`;
} else if (brandPlace === "anywhere") {
App.Medicine.Modification.addBrand(slave, rule.brandTarget, rule.brandDesign);
- r += `${rule.brandTarget}`;
+ m += `${rule.brandTarget}`;
}
- r += `, with <span class="trust dec">fear</span>${slave.devotion < 18 ? `, <span class="devotion dec">regard,</span>` : ``} and <span class="health dec">health</span> consequences.`;
+ message(`${m}, with <span class="trust dec">fear</span>${slave.devotion < 18 ? `, <span class="devotion dec">regard,</span>` : ``} and <span class="health dec">health</span> consequences.`, sourceRecord.brandDesign);
if (slave.devotion < 18) {
slave.devotion -= 5;
}
@@ -3063,7 +3092,7 @@ globalThis.DefaultRules = (function() {
App.Medicine.Modification.addBrand(slave, left, rule.brandDesign);
App.Medicine.Modification.addBrand(slave, right, rule.brandDesign);
healthDamage(slave, 20);
- r += `<br>${slave.slaveName} has been branded on both ${rule.brandTarget}, with <span class="trust dec">fear</span>${slave.devotion < 18 ? `, <span class="devotion dec">regard,</span>` : ``} and <span class="health dec">health</span> consequences.`;
+ message(`${slave.slaveName} has been branded on both ${rule.brandTarget}, with <span class="trust dec">fear</span>${slave.devotion < 18 ? `, <span class="devotion dec">regard,</span>` : ``} and <span class="health dec">health</span> consequences.`, sourceRecord.brandDesign);
if (slave.devotion < 18) {
slave.devotion -= 10;
}
@@ -3089,7 +3118,7 @@ globalThis.DefaultRules = (function() {
if (slave.porn.feed === 0) {
slave.porn.spending = 0;
}
- r += `<br>Highlights of ${slave.slaveName}'s sex life ${yesno} being released.`;
+ message(`Highlights of ${slave.slaveName}'s sex life ${yesno} being released.`, sourceRecord.pornFeed);
}
/** @param {App.Entity.SlaveState} slave
@@ -3100,7 +3129,7 @@ globalThis.DefaultRules = (function() {
if (slave.porn.prestige < 3) {
if (slave.porn.spending !== rule.pornFameSpending) {
slave.porn.spending = rule.pornFameSpending;
- r += `<br>${slave.slaveName}'s porn publicity has been corrected.`;
+ message(`${slave.slaveName}'s porn publicity has been corrected.`, sourceRecord.pornFameSpending);
}
}
}
@@ -3112,15 +3141,15 @@ globalThis.DefaultRules = (function() {
*/
function ProcessLabel(slave, rule) {
// mass removal of old tags, variant from '*' mask.
- if (rule.removeLabel !== null && rule.removeLabel !== '' && rule.removeLabel === '*') {
+ if (rule.removeLabel !== null && rule.removeLabel === '*') {
slave.custom.label = slave.custom.label.replace(/(?:\[.+\])+/, "");
- r += `<br>All of ${slave.slaveName}'s tags have been removed.`;
+ message(`All of ${slave.slaveName}'s tags have been removed.`, sourceRecord.removeLabel);
}
// mass removal of old tags, variant from GUI switch.
if (rule.labelTagsClear === true) {
slave.custom.label = slave.custom.label.replace(/(?:\[.+\])+/, "");
- r += `<br>All of ${slave.slaveName}'s tags have been removed.`;
+ message(`All of ${slave.slaveName}'s tags have been removed.`, sourceRecord.removeLabel);
}
// removing tags selected for removal.
@@ -3133,7 +3162,7 @@ globalThis.DefaultRules = (function() {
for (i in tags) {
if (tags[i] !== null && tags[i] !== '' && slave.custom.label.includes(`[${tags[i]}]`)) {
slave.custom.label = slave.custom.label.replace(`[${tags[i]}]`, "");
- r += `<br>${slave.slaveName}'s tag [${tags[i]}] is removed.`;
+ message(`${slave.slaveName}'s tag [${tags[i]}] is removed.`, sourceRecord.removeLabel);
}
}
@@ -3146,7 +3175,7 @@ globalThis.DefaultRules = (function() {
for (i in tags) {
if (tags[i] != null && tags[i] !== '' && !slave.custom.label.includes(`[${tags[i]}]`)) {
slave.custom.label = `${slave.custom.label}[${tags[i]}]`;
- r += `<br>${slave.slaveName} has been tagged as ${tags[i]}`;
+ message(`${slave.slaveName} has been tagged as ${tags[i]}`, sourceRecord.label);
}
}
}
@@ -3157,8 +3186,24 @@ globalThis.DefaultRules = (function() {
}
}
- return DefaultRules;
-})();
+ /**
+ * @param {string} text
+ * @param {string|string[]} [origin]
+ */
+ function message(text, origin = null) {
+ r += "<br>";
+ if (origin) {
+ if (_.isArray(origin)) {
+ origin = removeDuplicates(origin.filter(v => !!v));
+ }
+ r += `[${origin}] `;
+ } else {
+ r += "[Default] ";
+ }
+ r += text;
+ }
+};
+
/**
* @param {App.Entity.SlaveState} slave
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 75095eb87f0af5da6859cd4a825ee9f882ea2805..1b3d708fce9166f027cef6e15c3d71d33dceb1f9 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -199,10 +199,20 @@ App.Entity.SlaveSkillsState = class {
/**
* combating skill
* * 0-10: unskilled
- * * 11-30: basic
- * * 31-60: skilled
- * * 61-99: expert
- * * 100+: master
+ * * 11-30: basic - Basic weapon handling, no tactics
+ * * 31-60: skilled - Good weapon handling, basic tactics
+ * * 61-99: expert - Expert weapon handling, good tactics
+ * * 100+: master - Master weapon handling, master tactics
+ *
+ * Notably, tactics lags behind weapon skill.
+ * Weapon skill includes hand-to-hand, melee and ranged.
+ *
+ * For reference:
+ * * Stick 'em with the pointy end: 0
+ * * Can shoot, hit and reload: 20
+ * * Well trained thug: 40
+ * * Trained soldier: 70
+ * * Special Ops: 100
*/
this.combat = 0;
@@ -512,6 +522,7 @@ App.Entity.LimbState = class LimbState {
* * 4: advanced - Beauty
* * 5: advanced - Combat
* * 6: cybernetic
+ * @type {FC.LimbType}
*/
this.type = 1;
/**
@@ -980,6 +991,7 @@ App.Entity.SlaveState = class SlaveState {
* * 1: basic interface
* * 2: advanced interface
* * 3: quadruped interface
+ * @type {0 | 1 | 2 | 3}
*/
this.PLimb = 0;
/**
@@ -2189,6 +2201,7 @@ App.Entity.SlaveState = class SlaveState {
* * "masochist"
* * "dom"
* * "pregnancy"
+ * * "bestiality"
* @type {FC.Fetish}
*/
this.fetish = "none";
@@ -2248,6 +2261,7 @@ App.Entity.SlaveState = class SlaveState {
* * "malicious": loves causing pain and suffering
* * "self hating": hates herself
* * "breeder": addicted to being pregnant
+ * * "animal lover" addicted to fucking animals
* @type {FC.SexualFlaw}
*/
this.sexualFlaw = "none";
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 3404969012d42e6edea6ecf84af5b0566c2a6ec0..4f1409dcbd4d084bc9c4c0509a6be2e9eebfbd86 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -9,7 +9,13 @@ globalThis.assignJob = function(slave, job) {
const oldJob = slave.assignment;
// handle non-exclusive pseudo-assignments as special cases
- if (job === Job.PIT) {
+ if (job === Job.ARENA) {
+ if (!V.pit.trainingIDs.includes(slave.ID)) {
+ V.pit.trainingIDs.push(slave.ID);
+ }
+ V.JobIDMap[Job.ARENA].add(slave.ID);
+ return r;
+ } else if (job === Job.PIT) {
if (!V.pit.fighterIDs.includes(slave.ID)) {
V.pit.fighterIDs.push(slave.ID);
}
@@ -24,7 +30,6 @@ globalThis.assignJob = function(slave, job) {
removeJob(slave, slave.assignment, true);
const restingAssignment = slave.assignment; // not necessary Job.REST, but the assignment chosen by removeJob() for her case
- const idx = V.slaveIndices[slave.ID];
/**
* this helper makes sure global references global IDs (V.HeadGirlID, V.AttendantID, etc) are set correctly
@@ -427,8 +432,6 @@ globalThis.assignJob = function(slave, job) {
}
}
}
- // maybe recreate it each time? V.JobIDArray = makeJobIdMap();
- if (idx >= 0) { V.slaves[idx] = slave; }
return r;
};
@@ -474,9 +477,14 @@ globalThis.removeJob = function(slave, assignment, saveRecord = false) {
delete V.assignmentRecords[slave.ID];
}
- const idx = V.slaveIndices[slave.ID];
-
- if (assignment === Job.PIT) {
+ if (assignment === Job.ARENA) {
+ if (V.pit) {
+ V.pit.trainingIDs.delete(slave.ID);
+ V.JobIDMap[Job.ARENA].delete(slave.ID);
+ } else {
+ return; // TODO: should this return or just continue?
+ }
+ } else if (assignment === Job.PIT) {
if (V.pit) {
V.pit.fighterIDs.delete(slave.ID);
V.JobIDMap[Job.PIT].delete(slave.ID);
@@ -663,10 +671,6 @@ globalThis.removeJob = function(slave, assignment, saveRecord = false) {
slave.sentence = 0;
slave.subTarget = 0;
}
- // reset it each time? V.JobIDArray = makeJobIdMap();
- if (idx >= 0) {
- V.slaves[idx] = slave;
- }
return r;
};
@@ -739,6 +743,7 @@ globalThis.makeJobIdMap = function() {
// special cases
if (V.pit) {
+ res[Job.ARENA] = new Set(V.pit.trainingIDs);
res[Job.PIT] = new Set(V.pit.fighterIDs);
}
res[Job.LURCHER].add(V.LurcherID);
@@ -915,7 +920,7 @@ globalThis.assignmentTransition = function(slave, assignTo, passage) {
V.AS = slave.ID;
assignJob(slave, assignTo);
- if (V.showAssignToScenes === 1 && slave.fetish !== "mindbroken") {
+ if (V.showAssignToScenes === 1 && slave.fetish !== Fetish.MINDBROKEN) {
if (assignTo === Job.DAIRY && V.dairyRestraintsSetting >= 2 && ((V.dairyStimulatorsSetting >= 2) || (V.dairyFeedersSetting >= 2) || (V.dairyPregSetting >= 2))) {
detourThroughScene("Industrial Dairy Assignment Scene");
} else if (assignTo === Job.DAIRY && (V.dairyRestraintsSetting === 0 && slave.devotion > 0)) {
diff --git a/src/js/birth/birth.js b/src/js/birth/birth.js
index 4f4e3b9301a6bcfce57c9cb3cc32095a5f24c53d..24cc9d30cb6ded022c28254cf4d53b360efc008f 100644
--- a/src/js/birth/birth.js
+++ b/src/js/birth/birth.js
@@ -145,7 +145,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
suddenBirth += 5;
}
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
suddenBirth += 18;
}
if (slave.fetish === "humiliation") {
@@ -248,7 +248,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`cunt.`);
}
} else if (V.dairyRestraintsSetting > 1) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`As ${slave.slaveName}'s water breaks, a mechanical basket is extended under ${his} laboring`);
if (slave.mpreg === 1) {
r.push(`ass.`);
@@ -270,7 +270,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While getting milked, ${slave.slaveName}'s water breaks.`);
} else if (slave.geneticQuirks.uterineHypersensitivity === 2) {
r.push(`While getting milked, ${slave.slaveName}'s water breaks, a moment she anxiously awaited${(slave.counter.birthsTotal > 0) ? `, no matter how many times it's happened before` : ``}.`);
@@ -794,7 +794,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
birthDamage -= 3;
}
- if (App.Data.Careers.Leader.nurse.includes(slave.career) && slave.fetish !== "mindbroken" && slave.muscles >= -95) {
+ if (App.Data.Careers.Leader.nurse.includes(slave.career) && slave.fetish !== Fetish.MINDBROKEN && slave.muscles >= -95) {
r.push([
`Thanks to ${his}`,
App.UI.DOM.makeElement("span", `previous career,`, ["health", "inc"]),
@@ -873,7 +873,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`wide with a loud moan. ${His} vaginal lips part as ${his} birthing begins. After an hour of intensive`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`birthing, ${he} shows little interest in the changes to ${his} body.`);
} else if (slave.sexualFlaw === "breeder") {
r.push(`birthing and the realization that you are taking away ${his} ideal body, ${his} perfect existence, ${his} mind`);
@@ -1023,7 +1023,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
r.push(`All these events are meaningless to ${him}, as ${his} consciousness has long since been snuffed out.`);
} else if (V.dairyRestraintsSetting > 1) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Once the ${childrenAre} secure, the basket retracts allowing access to ${his}`);
if (slave.mpreg === 1) {
r.push(`rear.`);
@@ -1049,7 +1049,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
slave.devotion -= 10;
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows little interest and continues kneading ${his} breasts. Instinctively ${he} begins to push out ${his} ${babies}. ${He} pays no heed to ${his} ${children} being removed from the milking stall, instead focusing entirely on draining ${his} breasts.`);
} else if (slave.geneticQuirks.uterineHypersensitivity === 2) {
r.push(`${He} begins to push out ${his} ${babies}, orgasming throughout the whole process. By the time ${he} regains ${his} senses ${his} ${children} have already been removed from the milking stall.`);
@@ -1117,7 +1117,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`Since ${he} was a virgin, giving birth was a`);
r.push(App.UI.DOM.makeElement("span", `terribly painful`, ["health", "dec"]));
r.push(`experience.`);
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.fetish === "masochist") {
if (slave.fetishKnown === 0) {
r.push(`${He} seems to have orgasmed several times during the experience and appears to`);
@@ -1158,7 +1158,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
r.push(`child, ${his} pelvic bone strained under the pressure until it could no longer hold together and`);
r.push(App.UI.DOM.makeElement("span", `agonizingly snapped.`, ["health", "dec"]));
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.fetish === "masochist") {
if (slave.fetishKnown === 0) {
r.push(`What would have made most girls blackout from pain sent ${him} into the lewdest orgasm you've seen today. ${He}`);
@@ -1276,7 +1276,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`and you do an artist's work, ${his} health is`);
r.push(App.UI.DOM.makeElement("span", `less affected`, ["health", "inc"]));
r.push(`by the surgery than it would have been if you'd paid some hack to do it remotely.`);
- if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0) {
r.push(`${He} went into the surgery very aware that you were performing it manually.`);
if (slave.devotion < oldDevotion) {
if (slave.devotion > 50) {
@@ -1353,7 +1353,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
} else {
slave.health.tired = Math.clamp(slave.health.tired + 10, 0, 100);
}
- if (slave.geneticQuirks.uterineHypersensitivity === 2 && slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
+ if (slave.geneticQuirks.uterineHypersensitivity === 2 && slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0) {
r.push(`Not only that, but`);
r.push(App.UI.DOM.makeElement("span", `the entire process was extremely pleasurable for ${him}${(numBeingBorn > 1) ? ',' : '.'}`, ["health", "inc"]));
if (numBeingBorn > 1) {
@@ -1378,7 +1378,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
slave.sexualFlaw = "breeder";
slave.fetishStrength = 100;
}
- } else if (slave.fetish === "none" || slave.fetishStrength <= 60) {
+ } else if (slave.fetish === Fetish.NONE || slave.fetishStrength <= 60) {
r.push(App.UI.DOM.makeElement("span", `having found true pleasure in reproduction.`, "lightcoral"));
slave.fetish = "pregnancy";
}
@@ -1394,7 +1394,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
el.append(p);
/* ----- Postbirth reactions, mind ------------------------------- */
- if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0) {
r = [];
if (numStillborn > 0) { // TODO: Here should be descriptions of reactions from losing some of babies, need tweak, only draft for now
if (slave.sexualFlaw === "breeder") {
@@ -1456,7 +1456,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(App.UI.DOM.makeElement("span", `strengthens`, "lightcoral"));
r.push(`as ${he} eagerly fantasizes about giving birth in public again.`);
slave.fetishStrength += 4;
- } else if (slave.fetish === "none" || slave.fetishStrength <= 60) {
+ } else if (slave.fetish === Fetish.NONE || slave.fetishStrength <= 60) {
r.push(`and a curious experience to ${him}.`);
if (random(1, 5) === 1) {
r.push(App.UI.DOM.makeElement("span", `${He} has developed a humiliation fetish.`, "lightcoral"));
@@ -1581,7 +1581,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
App.Events.addParagraph(el, r);
}
/* ------------------------ Fate of other babies ---------------------------------------*/
- if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0 && numBeingBorn > 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0 && numBeingBorn > 0) {
r = [];
choices = document.createElement("p");
choices.id = dispositionId;
@@ -1791,7 +1791,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`The ${childrenAre} sent to one of ${V.arcologies[0].name}'s future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction.`);
if (burstCheck(slave)) {
r.push(`Hopefully they will be trained there to not suffer the same fate.`);
- } else if (slave.fetish === "mindbroken" || slave.fuckdoll > 0) {
+ } else if (slave.fetish === Fetish.MINDBROKEN || slave.fuckdoll > 0) {
r.push(`${slave.slaveName} has few thoughts about the matter.`);
} else if (slave.sexualFlaw === "breeder") {
r.push(slave.slaveName);
@@ -1843,7 +1843,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
const el = new DocumentFragment();
r.push(`The ${childrenAre} sent to one of ${V.arcologies[0].name}'s citizen schools, to be brought up coequal with the arcology's other young people.`);
if (!slaveDead) {
- if (slave.fetish === "mindbroken" || slave.fuckdoll > 0) {
+ if (slave.fetish === Fetish.MINDBROKEN || slave.fuckdoll > 0) {
r.push(`${slave.slaveName} fails to acknowledge this.`);
} else if (slave.devotion > 95) {
r.push(`loves you already, but ${he}'ll`);
@@ -1882,7 +1882,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
r.push(`of their vision of the world.`);
if (!slaveDead) {
- if (slave.fetish === "mindbroken" || slave.fuckdoll > 0) {
+ if (slave.fetish === Fetish.MINDBROKEN || slave.fuckdoll > 0) {
r.push(`${slave.slaveName} does not give any hint of a response.`);
} else if (slave.devotion > 95) {
r.push(`${slave.slaveName} will`);
@@ -1917,7 +1917,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`The ${childrenAre} handed off to be raised by their father, the Futanari Sisters.`);
if (burstCheck(slave)) {
r.push(`You recommend they take it easy for a while before any more burst into kids.`);
- } else if (slave.fetish === "mindbroken" || slave.fuckdoll > 0) {
+ } else if (slave.fetish === Fetish.MINDBROKEN || slave.fuckdoll > 0) {
r.push(`${slave.slaveName} has few thoughts about the matter.`);
} else {
r.push(`${slave.slaveName} is overjoyed that ${his} ${children} will follow in`);
@@ -1944,7 +1944,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`a future high class citizen.`);
}
if (!slaveDead) {
- if (slave.fetish === "mindbroken" || slave.fuckdoll > 0) {
+ if (slave.fetish === Fetish.MINDBROKEN || slave.fuckdoll > 0) {
r.push(`${slave.slaveName} does not give any hint of a response.`);
} else if (slave.devotion > 95) {
r.push(`${slave.slaveName} will`);
@@ -1991,7 +1991,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(App.UI.DOM.makeElement("span", `${cashFormat(numBeingBorn * (50 + babyCost))}.`, "yellowgreen"));
}
if (!slaveDead) {
- if (slave.fetish === "mindbroken" || slave.fuckdoll > 0) {
+ if (slave.fetish === Fetish.MINDBROKEN || slave.fuckdoll > 0) {
r.push(`${slave.slaveName} lacks the capacity to understand what you've done.`);
} else if (slave.devotion > 95) {
r.push(`${slave.slaveName} adheres to your thoughts so strongly that even though you backed out of caring for ${his} ${children}, ${he} still truly believes you are doing ${him} an honor.`);
@@ -2223,6 +2223,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
surgeryDamage(slave, 10);
App.Medicine.Modification.removeScar(slave, "belly", "c-section");
+ return ``;
}
function broodmotherBirth() {
@@ -2247,7 +2248,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
switch (slave.assignment) {
case Job.REST:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} is encouraged to keep resting.`);
if (hasAnyArms(slave)) {
@@ -2271,7 +2272,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} is encouraged to keep resting.`);
if (hasAnyArms(slave)) {
@@ -2300,7 +2301,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
if (tempSub) {
({his2, he2} = getPronouns(tempSub).appendSuffix("2"));
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (slave.subTarget === 0) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} rests for a short while before returning to your waiting slaves.`);
@@ -2383,7 +2384,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.WHORE:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} rests awhile before returning to ${his} work as a pregnant whore.`);
} else {
@@ -2402,7 +2403,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} rests awhile before returning to ${his} work as a pregnant whore.`);
} else {
@@ -2425,7 +2426,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.PUBLIC:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} rests awhile before returning to sharing ${his} gravid body with the public.`);
} else {
@@ -2479,7 +2480,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} rests awhile before returning to sharing ${his} gravid body with the public.`);
} else {
@@ -2542,7 +2543,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.GLORYHOLE:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`Since ${he} is unable to leave ${his} box, ${he} doesn't have far to go. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is quickly extracted from the box. ${He} never notices, focused entirely on the fresh cock poking through the glory hole and the sensation of ${his} still very gravid middle rubbing the wall.`);
} else {
@@ -2573,7 +2574,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.MILKED:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.dairyPregSetting > 0) {
r.push(`Since the dairy is designed for pregnant cows, ${he} stays hooked up to the milkers. ${He} shows little interest in ${his} coming birth, instead focusing on ${his} milky breasts. Instinctively, ${he} begins to push out ${firstText} baby. ${He} shows no interest in ${his} child being removed from the milking stall, nor when ${his} still very gravid body is hosed off.`);
} else {
@@ -2612,7 +2613,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.FARMYARD: // TODO: this needs a rewrite
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.farmyardPregSetting > 0) {
r.push(`Since the farmyard is designed for pregnant cows, ${he} stays hooked up to the milkers. ${He} shows little interest in ${his} coming birth, instead focusing on ${his} milky breasts. Instinctively, ${he} begins to push out ${firstText} baby. ${He} shows no interest in ${his} child being removed from the milking stall, nor when ${his} still very gravid body is hosed off.`);
} else {
@@ -2652,7 +2653,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.FUCKTOY:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`You strip ${him} and help ${him} onto your couch. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} falls into a contented nap. You fondle ${his} still very gravid body until a servant comes to help clean ${him} up.`);
} else {
@@ -2692,7 +2693,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} falls into a contented nap. That is until you drag ${his} still very gravid ass out of bed, inquiring where ${he} waddled off to without your permission.`);
} else {
@@ -2729,7 +2730,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.CONFINEMENT:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`Since ${he} is locked in a cell, ${he} doesn't have far to go. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and, after ${his} still very gravid body and the cell are hosed down, ${he} is returned to isolation.`);
} else {
@@ -2751,7 +2752,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.QUARTER:
case Job.HOUSE:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} rests awhile before returning to ${his} role as your ever-pregnant maid.`);
} else {
@@ -2817,7 +2818,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.MASTERSUITE:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
if (V.masterSuiteUpgradePregnancy === 1) {
r.push(`${He} is helping into the birthing chamber, stripped, and aided into the specialized chair. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and, following a shower and fresh change of clothes, ${he} is returned to`);
@@ -2902,7 +2903,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
if (V.masterSuiteUpgradePregnancy === 1) {
r.push(`${He} enters the birthing chamber, strips, and seats ${himself} in the specialized chair. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and, following a shower and fresh change of clothes, ${he} returns to`);
@@ -2997,7 +2998,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.CLUB:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} is helped into a private room in the back of the club by a group of eager patrons. Instinctively, ${he} begins to push out ${firstText} baby, indifferent to ${his} audience. ${His} child is promptly taken and, following a cleaning and fresh change of clothes, the audience is allowed to have their way with ${his} still very gravid body.`);
} else {
@@ -3023,7 +3024,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} heads to a private room in the back of the club filled with eager patrons. Instinctively, ${he} begins to push out ${firstText} baby, indifferent to ${his} audience. ${His} child is promptly taken and, following a cleaning and fresh change of clothes, the audience is allowed to have their way with ${his} still very gravid body.`);
} else {
@@ -3053,7 +3054,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.CHOICE:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and, after a short rest, ${he} waits for someone to help ${his} still very gravid form to ${his} next job, having forgotten ${he} was choosing it.`);
} else {
@@ -3071,7 +3072,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and, after a short rest, ${he} returns to waddling around the penthouse.`);
} else {
@@ -3102,7 +3103,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
if (S.Attendant) {
({he2, him2} = getPronouns(S.Attendant).appendSuffix("2"));
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
if (S.Attendant) {
r.push(`${S.Attendant.slaveName} leads ${him} to a special pool designed to give birth in. Once ${he} is safely in the water alongside ${him2},`);
@@ -3155,7 +3156,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
if (V.MatronID !== 0) {
({he2, him2} = getPronouns(S.Matron).appendSuffix("2"));
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
if (V.MatronID !== 0) {
r.push(`${S.Matron.slaveName} leads ${him} to a special pool designed to give birth in. Once ${he} is safely in the water alongside ${him2},`);
@@ -3295,7 +3296,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.BROTHEL:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} is helped to a private room in the back of the brothel by a group of eager patrons. Instinctively, ${he} begins to push out ${firstText} baby, indifferent to ${his} audience. ${His} child is promptly taken and, following a cleaning and fresh change of clothes, the audience is allowed to have their way with ${his} still very gravid body.`);
} else {
@@ -3362,7 +3363,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} heads to a private room in the back of the brothel filled with eager patrons. Instinctively, ${he} begins to push out ${firstText} baby, indifferent to ${his} audience. ${His} child is promptly taken and, following a cleaning and fresh change of clothes, the audience is allowed to have their way with ${his} still very gravid body.`);
} else {
@@ -3475,7 +3476,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`to be`);
}
r.push(`a weekly occurrence. You gently caress ${slave.slaveName}'s body as ${he} begins to push out ${firstText} baby${UH}. You help ${him} upright and hold your child to ${his} breasts. The two of you cuddle as you watch your newborn suckle from its mother. Since ${he} is quite special to you, you allow ${him} the time to pick out names before ${his} child has to be taken away. When the time comes to pick up the newborn, the slave servant is surprised to find a name-card affixed to its blanket.`);
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
r.push(`${He} can't help but feel more devoted to ${his} master after seeing such a touching act. Before you leave, ${slave.slaveName} expresses how cute ${he} found your child and that ${he} can't wait to see the next one.`);
}
} else {
@@ -3484,7 +3485,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`As you swaddle ${firstText} baby, you cuddle up to the still very gravid ${girl}. Bringing your child to ${his} breast, you enjoy each other's comfort until a servant comes to clean up. Since ${he} is quite special to you, you allow ${him} the time to pick out names before ${his} child has to be taken away. The slave servant is somewhat surprised by your actions, but understands those closest to you are afforded luxuries far beyond ${hisU} peers.`);
}
} else if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} is assisted in reaching your side. You call ${him} over and strip ${him} as ${he} instinctively begins to push out ${firstText} baby, indifferent to your wandering hands. ${His} child is promptly taken and, following a cleaning, a fresh change of clothes, and some private time with you, ${he} is helped back to your master suite.`);
} else {
@@ -3502,7 +3503,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} wanders the penthouse until ${he} finds you. You call ${him} over and strip ${him} as ${he} instinctively begins to push out ${firstText} baby, indifferent to your wandering hands. ${His} child is promptly taken and, following a cleaning, a fresh change of clothes, and some private time with you, ${he} returns to your master suite.`);
} else {
@@ -3530,7 +3531,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
} else {
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} is aided in finding ${S.HeadGirl.slaveName}, who undresses ${him} as ${he} instinctively begins to push out ${firstText} baby, indifferent to ${his2} wandering hands. ${His} child is promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, ${he} is taken back to ${S.HeadGirl.slaveName}' room.`);
} else {
@@ -3548,7 +3549,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} wanders until ${he} finds ${S.HeadGirl.slaveName}, who undresses ${him} as ${he} instinctively begins to push out ${firstText} baby, indifferent to ${his2} wandering hands. ${His} child is promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, ${he} is lead back to ${S.HeadGirl.slaveName}' room.`);
} else {
@@ -3623,7 +3624,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.CELLBLOCK:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} is forced into a specially designed cell to give birth in. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and, after ${his} still very gravid body and the cell are hosed down, ${he} is moved back into a standard cell.`);
} else {
@@ -3670,7 +3671,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.MADAM:
if (random(1, 20) > suddenBirth) {
- r.push(`${He} heads to a private room in the back of the club accompanied by an influential patron. ${He} settles ${himself} onto his lap and begins working on birthing ${firstText} baby,`);
+ r.push(`${He} heads to a private room in the back of the brothel accompanied by an influential patron. ${He} settles ${himself} onto his lap and begins working on birthing ${firstText} baby,`);
if (slave.geneticQuirks.uterineHypersensitivity === 2) {
r.push(`convulsing with orgasms in the process and`);
}
@@ -3709,7 +3710,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(clothingBirth());
r.push(`Quickly, ${he} collects ${firstText} child for removal before returning to ${V.dairyName}. The cows around ${his} stall all have a knowing look on their`);
if (V.dairyPregSetting > 0) {
- r.push(`faces but with their own swollen bellies hanging heavily from them, they know that they soon will follow ${his} lead.`);
+ r.push(`faces, but with their own swollen bellies hanging heavily from them, they know that they soon will follow ${his} lead.`);
} else {
r.push(`faces.`);
}
@@ -3732,7 +3733,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.WARDEN:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} enters an empty cell, strips, and seats ${himself} on the cot. ${He} instinctively begins birthing ${firstText} baby. ${His} child is promptly taken and ${he} returns to mindlessly breaking the confined slaves.`);
} else {
@@ -3839,7 +3840,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
r.push(`All these events are meaningless to ${him}, as ${his} consciousness has long since been snuffed out.`);
} else if (V.dairyRestraintsSetting > 1) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`As ${slave.slaveName}'s water breaks, a mechanical basket is extended under ${his} laboring`);
if (slave.mpreg === 1) {
@@ -3887,7 +3888,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
slave.devotion -= 10;
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`While getting milked, ${slave.slaveName}'s water breaks. ${He} shows little interest and continues kneading ${his} breasts. Instinctively, ${he} begins to push out ${firstText} ${He} pays no heed to ${his} child being removed from the milking stall, instead focusing entirely on draining ${his} breasts and getting comfortable with ${his} still very gravid middle.`);
} else {
@@ -3926,7 +3927,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
App.UI.DOM.appendNewElement("div", el, `Assignment was "${slave.assignment}" so why did we default? Report this!`, "note");
r = [];
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} is encouraged to keep resting.`);
if (hasAnyArms(slave)) {
@@ -3950,7 +3951,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} is encouraged to keep resting.`);
if (hasAnyArms(slave)) {
@@ -3978,7 +3979,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
} else {
// add extra events here (moving between jobs | after work)
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} is encouraged to keep resting.`);
if (hasAnyArms(slave)) {
@@ -4024,7 +4025,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} is encouraged to keep resting.`);
if (hasAnyArms(slave)) {
@@ -4097,7 +4098,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
switch (slave.assignment) {
case Job.REST:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is awoken from ${his} rest by a strong contraction. ${He} attempts to roll over, and failing that, begins to fall back to sleep as another contraction wracks ${his} body.`);
r.push(clothingBirth());
r.push(`${He} struggles to draw ${his} child to ${his} breast and resumes resting.`);
@@ -4107,7 +4108,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${His} child is collected and ${his} body cleaned before ${he} is allowed to resume ${his} rest.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is awoken from ${his} rest by a strong contraction. ${He} rolls over and begins to fall back to sleep as another contraction wracks ${his} body.`);
r.push(clothingBirth());
r.push(`${He} struggles to draw ${his} child to ${his} breast and resumes resting.`);
@@ -4123,7 +4124,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
if (tempSub) {
({he2, his2} = getPronouns(tempSub).appendSuffix("2"));
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (slave.subTarget === 0) {
r.push(`While servicing your other slaves, ${slave.slaveName}'s body begins to birth another of ${his} brood, though it does nothing to deter ${him} from ${his} task.`);
r.push(clothingBirth());
@@ -4169,7 +4170,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.WHORE:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While attempting to attract customers to fuck ${his} grotesquely distended body, ${slave.slaveName}'s body begins to birth another of ${his} brood.`);
r.push(clothingBirth());
r.push(`${He} struggles to bring ${his} child to ${his} breast as ${he} resumes whoring, oblivious to the free show ${he} just gave ${his} customers.`);
@@ -4180,7 +4181,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${He} lies stranded on the ground, exhausted and covered in sperm from the circle of men watching ${him}, until ${he} is helped into a sitting position and handed ${his} child.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While attempting to attract customers with ${his} grotesquely distended body, ${slave.slaveName}'s body begins to birth another of ${his} brood.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} child to ${his} breast as ${he} resumes whoring, oblivious to the free show ${he} just gave ${his} customers.`);
@@ -4201,7 +4202,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.PUBLIC:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (pbw > 80) {
r.push(`While taking a citizen's dick, ${slave.slaveName}'s body begins to birth another of ${his} brood out on him. Showing no signs of stopping, he struggles to shoves ${his} bulk off of him. Instinctively ${he} begins to push out ${his} baby, indifferent to who may be watching ${his} naked crotch. ${He} is handed ${his} child, which ${he} clutches to ${his} breast before beckoning for the next citizen's cock.`);
} else if (pbw > 60) {
@@ -4247,7 +4248,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (pbw > 80) {
r.push(`While taking a citizen's dick, ${slave.slaveName}'s body begins to birth another of ${his} brood out on him. Showing no signs of stopping, he struggles to shoves ${his} bulk off of him. Instinctively ${he} begins to push out ${his} baby, indifferent to who may be watching ${his} naked crotch. ${He} is handed ${his} child, which ${he} clutches to ${his} breast before seeking out the next citizen's cock.`);
} else if (pbw > 60) {
@@ -4309,7 +4310,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.GLORYHOLE:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While sucking a dick through the hole of ${his} confining box, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} makes no effort to stop sucking the dicks presented to ${him}.`);
r.push(clothingBirth());
r.push(`${His} child is taken as it is born from ${his} rear hanging out of the box. ${He} never notices, focused entirely on the fresh cock poking through the glory hole.`);
@@ -4319,7 +4320,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${His} child is taken as it is born from ${his} rear hanging out of the box. ${He} never got a look at it, being unable to turn even slightly.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While sucking a dick through the hole of ${his} confining box, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} makes no effort to stop sucking the dicks presented to ${him}.`);
r.push(clothingBirth());
r.push(`${His} child is taken as it is born from ${his} rear hanging out of the box. ${He} never notices, focused entirely on the fresh cock poking through the glory hole.`);
@@ -4333,7 +4334,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.MILKED:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While getting milked, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} show little interest and continues kneading ${his} breasts.`);
r.push(clothingBirth());
r.push(`${He} shows no interest in ${his} ${children}`);
@@ -4344,7 +4345,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${His} child is carried away and ${he} struggles to get off of ${himself}. ${He} groans as ${he} realizes the milk tank is nearly full, having been filled with the copious amounts of milk ${his} body is producing for ${his} brood.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While getting milked, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} show little interest and continues kneading ${his} breasts.`);
r.push(clothingBirth());
r.push(`${He} shows no interest in ${his} ${children}`);
@@ -4359,7 +4360,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.FUCKTOY:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While sitting absentmindedly nearby, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} pays no heed to it and continues waiting for you to use ${him}.`);
r.push(clothingBirth());
r.push(`You certainly enjoyed the show as you call for a servant to take away ${his} child and to clean up the still oblivious broodmother.`);
@@ -4377,7 +4378,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`As thanks for the show, you help ${his} exhausted body onto the couch so ${he} can recover before returning to ${his} duties. You call for a servant to take away ${his} child and clean up your toy.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While sitting absentmindedly nearby, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} pays no heed to it and continues waiting for you to use ${him}.`);
r.push(clothingBirth());
r.push(`You certainly enjoyed the show as you call for a servant to take away ${his} child and to clean up the still oblivious broodmother.`);
@@ -4399,7 +4400,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.CONFINEMENT:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While waiting in confinement, ${slave.slaveName}'s body begins to birth another of ${his} brood. Since ${he} can't move, ${he} just lets things happen.`);
r.push(clothingBirth());
r.push(`${He} struggles for a minute before realizing ${he} is incapable of reaching ${his} child. The servant that has to crawl under ${his} bloated body to get ${his} child is less than pleased, especially since this is the third time this week ${he} has had to do it.`);
@@ -4410,7 +4411,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${He} spills out of the cell when the servant comes once more to collect ${his} child. ${He} hastily tries to cram ${his} bulk back into ${his} cell before ${he} gets chastised.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While waiting in confinement, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} assumes a birthing position.`);
r.push(clothingBirth());
r.push(`${He} struggles for a minute before realizing ${his} pregnancy takes up most of the cell and that ${he} can't reach ${his} child. The servant that has to crawl under ${his} bloated body to get ${his} child is less than pleased, especially since this is the third time this week ${he} has had to do it.`);
@@ -4425,7 +4426,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.QUARTER:
case Job.HOUSE:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (random(0, 1) === 1) {
r.push(`While giving a slave oral service, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} disregards this development and continues working.`);
r.push(clothingBirth());
@@ -4472,7 +4473,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.MASTERSUITE:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.masterSuiteUpgradeLuxury === 1) {
r.push(`While awaiting your return on the big bed in the master suite, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} struggles to shift into a more comfortable position before giving up.`);
r.push(clothingBirth());
@@ -4507,7 +4508,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.masterSuiteUpgradeLuxury === 1) {
r.push(`While awaiting your return on the big bed in the master suite, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} shifts into a more comfortable position.`);
r.push(clothingBirth());
@@ -4546,7 +4547,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.CLUB:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is showing off ${his} grotesque body and trying to attract citizens by dancing as well as ${he} can. During one of ${his} dances, ${his} body begins to birth another of ${his} brood. ${He} keeps on dancing, despite ${his} condition, until ${his} contractions drag ${him} onto ${his} bloated stomach.`);
r.push(clothingBirth());
r.push(`Multiple citizens drag ${him} into a booth so that they may tease ${his} enormous exhausted body while the dance floor is dried and ${his} child is carried off.`);
@@ -4562,7 +4563,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`Only once the last of ${his} clients cums over ${his} bloated body is ${he} handed ${his} child and allowed to rest. ${He} enjoys a moment with ${his} newborn before the servant comes to collect them.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is showing off ${his} grotesque body and trying to attract citizens by dancing as well as ${he} can. During one of ${his} dances, ${his} body begins to birth another of ${his} brood. ${He} keeps on dancing, despite ${his} condition, until ${his} contractions drag ${him} onto ${his} bloated stomach.`);
r.push(clothingBirth());
r.push(`Multiple citizens drag ${him} into a booth so that they may tease ${his} enormous exhausted body while the dance floor is dried and ${his} child is carried off.`);
@@ -4601,7 +4602,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.SPA:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While soaking in the spa's pool, ${slave.slaveName}'s body begins to birth another of ${his} brood. As ${he} begins to ready ${himself} for birth,`);
if (S.Attendant) {
r.push(`${S.Attendant.slaveName} struggles to pull ${him} out of the pool and glares at ${him}.`);
@@ -4621,7 +4622,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${He} and ${his} child are quickly dried off as ${he} begins nursing them. A servant soon arrives to take ${his} children away.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While soaking in the spa's pool, ${slave.slaveName}'s body begins to birth another of ${his} brood. As ${he} begins to ready ${himself} for birth,`);
if (S.Attendant) {
r.push(`${S.Attendant.slaveName} struggles to pull ${him} out of the pool and glares at ${him}.`);
@@ -4672,7 +4673,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.BROTHEL:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (pbw > 80) {
r.push(`While taking a customer's dick, ${slave.slaveName}'s body begins to birth another of ${his} brood out on him. Showing no signs of stopping, he struggles to shoves ${his} bulk off of him. Instinctively ${he} begins to push out ${his} baby, indifferent to who may be watching ${his} naked crotch. ${He} is handed ${his} child, which ${he} clutches to ${his} breast before beckoning for the next customer's cock.`);
} else if (pbw > 60) {
@@ -4718,7 +4719,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (pbw > 80) {
r.push(`While taking a customer's dick, ${slave.slaveName}'s body begins to birth another of ${his} brood out on him. Showing no signs of stopping, he struggles to shoves ${his} bulk off of him. Instinctively ${he} begins to push out ${his} baby, indifferent to who may be watching ${his} naked crotch. ${He} is handed ${his} child, which ${he} clutches to ${his} breast before seeking out the next citizen's cock.`);
} else if (pbw > 60) {
@@ -4779,10 +4780,10 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.CONCUBINE:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
// TODO: fill out
} else {
- r.push(`${slave.slaveName} cradles ${his} swollen belly, waiting for your return, when ${his} body begins to birth another of ${his} brood. Saddened that you aren't there for the show, ${he} begins waddling off to find you. By the time ${he} reaches your office, ${he} is barely holding back ${his} child. You rise to meet ${him} and struggle to help ${him} onto the couch, just before it's to late.`);
+ r.push(`${slave.slaveName} cradles ${his} swollen belly, waiting for your return, when ${his} body begins to birth another of ${his} brood. Saddened that you aren't there for the show, ${he} begins waddling off to find you. By the time ${he} reaches your office, ${he} is barely holding back ${his} child. You rise to meet ${him} and struggle to help ${him} onto the couch, just before it's too late.`);
r.push(clothingBirth());
r.push(`Cradling your child, the two of you rest for a spell before sending them off and spending some more intimate time together. You make sure to pay special attention to ${his} overstimulated belly before you help ${him} back to your suite.`);
}
@@ -4791,7 +4792,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.HEADGIRLSUITE:
({he2, his2} = getPronouns(S.HeadGirl).appendSuffix("2"));
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is awoken from ${his} rest by a strong contraction. ${He} attempts to roll over, and failing that, begins to fall back to sleep as another contraction wracks ${his} body. ${His} body begins to birth another of ${his} brood.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} child to ${his} breast and resumes resting before ${S.HeadGirl.slaveName} returns from ${his2} duties.`);
@@ -4801,7 +4802,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${He} struggles to collect ${his} child and brings them to ${his} breast. ${He} waits for ${S.HeadGirl.slaveName} to return, hoping ${he2} will arrive before another baby makes its way out of ${him}.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is awoken from ${his} rest by a strong contraction. ${He} rolls over and begins to fall back to sleep as another contraction wracks ${his} body. ${His} body begins to birth another of ${his} brood.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} child to ${his} breast and resumes resting before ${S.HeadGirl.slaveName} returns from ${his2} duties.`);
@@ -4831,7 +4832,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.CELLBLOCK:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While waiting in confinement, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} assumes a birthing position.`);
r.push(clothingBirth());
r.push(`${He} struggles for a minute before realizing ${his} pregnancy takes up most of the cell and that ${he} can't reach ${his} child. The servant that has to crawl under ${his} bloated body to get ${his} child is less than pleased, especially since this is the third time this week ${he} has had to do it.`);
@@ -4845,7 +4846,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
default:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While stroking ${his} pregnancy absentmindedly, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} carries on until the contractions drag ${him} onto ${his} swollen belly.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} child to ${his} breast and rests upon ${his} mass until a servant collects ${his} child and helps ${him} back to ${his} bed.`);
@@ -4862,7 +4863,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While stroking ${his} pregnancy absentmindedly, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} carries on until the contractions drag ${him} onto ${his} swollen belly.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} child to ${his} breast and rests upon ${his} mass until a servant collects ${his} child and helps ${him} back to ${his} bed.`);
@@ -4888,7 +4889,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
} else {
// add extra events here (moving between jobs | after work)
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While stroking ${his} pregnancy absentmindedly, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} carries on until the contractions drag ${him} onto ${his} swollen belly.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} child to ${his} breast and rests upon ${his} mass until a servant collects ${his} child and helps ${him} back to ${his} bed.`);
@@ -4905,7 +4906,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While wandering the penthouse absentmindedly, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} carries on until the contractions drag ${him} onto ${his} swollen belly.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} child to ${his} breast and rests upon ${his} mass until a servant collects ${his} child and helps ${him} back`);
@@ -4943,7 +4944,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
let he2;
let his2;
const r = [];
- const HGL = App.Entity.facilities.headGirlSuite.hostedSlaves;
+ const HGL = App.Entity.facilities.headGirlSuite.hostedSlaves();
const babies = slave.pregType > 1 ? `babies` : `baby`;
const children = slave.pregType > 1 ? `children` : `child`;
const childrenAre = slave.pregType > 1 ? `children are` : `child is`;
@@ -5010,7 +5011,6 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- /** @type {App.Entity.Animal[]} */
const animals = [];
if (V.animals.canine.length > 0) {
@@ -5023,18 +5023,18 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
animals.push(V.animals.feline.random());
}
- const animal = animals.random();
+ const animal = getAnimal(animals.random());
switch (slave.assignment) {
case Job.REST:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and ${he} is encouraged to keep resting.`);
} else {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. ${He} makes ${himself} comfortable and begins working on birthing ${his} ${(slave.pregType > 1) ? `babies` : `baby`} ${(slave.geneticQuirks.uterineHypersensitivity === 2) ? `, convulsing with orgasms in the process` : ``}. ${His} ${(slave.pregType > 1) ? `children are` : `child is`} promptly taken and ${he} is encouraged to keep resting.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${his} ${(slave.pregType > 1) ? `babies` : `baby`}. ${His} ${children} promptly taken and ${he} is encouraged to keep resting.`);
} else {
r.push(`${He} returns to ${his} bed and strips before slipping into it. ${He} makes ${himself} comfortable and begins working on birthing ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and ${he} is encouraged to keep resting.`);
@@ -5047,7 +5047,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
if (domSlave) {
({he2} = getPronouns(domSlave).appendSuffix("2"));
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (slave.subTarget <= 0) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and ${he} rests for a short while before returning to your waiting slaves.`);
} else {
@@ -5084,13 +5084,13 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.WHORE:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to whoring.`);
} else {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. ${He} makes ${himself} comfortable and begins working on birthing ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to whoring.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to whoring.`);
} else {
r.push(`${He} returns to ${his} bed and strips before slipping into it. ${He} makes ${himself} comfortable and begins working on birthing ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to whoring.`);
@@ -5100,13 +5100,13 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.PUBLIC:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to slutting.`);
} else {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. ${He} makes ${himself} comfortable and begins working on birthing ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to slutting.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to slutting.`);
} else {
r.push(`${He} returns to ${his} bed and strips before slipping into it. ${He} makes ${himself} comfortable and begins working on birthing ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to slutting.`);
@@ -5115,7 +5115,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.GLORYHOLE:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Since ${he} is unable to leave ${his} box, ${he} doesn't have far to go. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} quickly extracted from the box. ${He} never notices, focused entirely on the fresh cock poking through the glory hole.`);
} else {
r.push(`Since ${he} is unable to leave ${his} box, ${he} doesn't have far to go. ${He} quickly finishes the waiting dick before shifting ${himself} into a slightly, though not by much, more comfortable position. ${He} begins laboring on ${his} ${children}${UH}. As ${he} finishes, the box is opened and ${his} ${childrenAre} gathered and taken away before ${he} is ordered back to sucking.`);
@@ -5123,7 +5123,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.MILKED:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.dairyPregSetting > 0) {
r.push(`Since the dairy is designed for pregnant cows, ${he} stays hooked up to the milkers. ${He} shows little interest in ${his} coming birth, instead focusing on ${his} milky breasts. Instinctively, ${he} begins to push out ${his} ${babies}. ${He} pays no heed to ${his} ${children} being removed from the milking stall, nor when ${he} is hosed off.`);
} else {
@@ -5150,7 +5150,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.FARMYARD:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.farmyardShows && V.seeBestiality && animals.length > 0) {
r.push(`${He} shows no interest in ${his} coming birth as ${he} continues being rutted by ${`${animal.articleAn} ${animal.name}` || `an animal`}, so`);
if (S.Farmer) {
@@ -5196,7 +5196,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.FUCKTOY:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`You strip ${him} and help ${him} onto your couch. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and ${he} falls into a contented nap. You enjoy ${his} exhausted body until a servant comes to help clean ${him} up.`);
} else {
if (slave.devotion > 20) {
@@ -5216,7 +5216,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${He} begins to push out ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and, following a shower and a fresh change of clothes, ${he} is helped back to your office${(slave.devotion < -20) ? ` where you are waiting to enjoy ${his} exhausted body` : ``}.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and ${he} falls into a contented nap. That is until you wake ${him} up, inquiring where ${he} waddled off to without your permission.`);
} else {
if (slave.devotion > 20) {
@@ -5233,7 +5233,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.CONFINEMENT:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Since ${he} is locked in a cell, ${he} doesn't have far to go. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and, after ${he} and the cell are hosed down, ${he} is returned to isolation.`);
} else {
r.push(`Since ${he} is locked in a cell, ${he} doesn't have far to go. Reluctantly, ${he} begins to push out ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and, after ${he} and the cell are hosed down, ${he} is returned to isolation.`);
@@ -5243,7 +5243,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.QUARTER:
case Job.HOUSE:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to service your penthouse.`);
} else {
r.push(`${He} returns to ${his} bed and strips before slipping into it. ${He} makes ${himself} comfortable and begins working on birthing ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to service your penthouse.`);
@@ -5252,7 +5252,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.MASTERSUITE:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.masterSuiteUpgradePregnancy === 1) {
r.push(`${He} is helping into the birthing chamber, stripped, and aided into the specialized chair. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and, following a shower and fresh change of clothes, ${he} is returned to`);
if (V.masterSuiteUpgradeLuxury === 1) {
@@ -5294,7 +5294,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.masterSuiteUpgradePregnancy === 1) {
r.push(`${He} enters the birthing chamber, strips, and seats ${himself} in the specialized chair. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and, following a shower and fresh change of clothes, ${he} returns to`);
if (V.masterSuiteUpgradeLuxury === 1) {
@@ -5340,7 +5340,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.CLUB:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is helped into a private room in the back of the club by a group of eager patrons. Instinctively, ${he} begins to push out ${his} ${babies}, indifferent to ${his} audience. ${His} ${childrenAre} promptly taken and, following a cleaning and fresh change of clothes, the audience has their way with ${him}.`);
} else {
r.push(`${He} is helped to a private room in the back of the club by several patrons who just can't keep their hands off ${him}. ${He} settles ${himself} onto a patron's lap and begins working on birthing ${his} ${babies},`);
@@ -5350,7 +5350,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`basking in the attention of ${his} audience. ${His} ${childrenAre} promptly taken and ${he} beckons the audience to enjoy ${him}.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} heads to a private room in the back of the club filled with eager patrons. Instinctively, ${he} begins to push out ${his} ${babies}, indifferent to ${his} audience. ${His} ${childrenAre} promptly taken and, following a cleaning and fresh change of clothes, the audience is allowed to have their way with ${him}.`);
} else {
r.push(`${He} heads to a private room in the back of the club accompanied by several patrons who just can't keep their hands off ${him}. ${He} settles ${himself} onto a patron's lap and begins working on birthing ${his} ${babies},`);
@@ -5364,13 +5364,13 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.CHOICE:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and, after a short rest, ${he} waits for someone to help ${him} to ${his} next job having forgotten ${he} was choosing it.`);
} else {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. ${He} makes ${himself} comfortable and begins working on birthing ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and, after a short rest, ${he} returns to pondering ${his} preferred assignment.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is lead back to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and, after a short rest, ${he} returns to wandering the penthouse.`);
} else {
r.push(`${He} returns to ${his} bed and strips before slipping into it. ${He} makes ${himself} comfortable and begins working on birthing ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and, after a short rest, ${he} returns to pondering ${his} preferred assignment.`);
@@ -5381,7 +5381,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.SPA:
if (S.Attendant) {
r.push(S.Attendant.slaveName);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`leads`);
} else {
r.push(`escorts`);
@@ -5391,7 +5391,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${He} is escorted to a special pool designed to give birth in. Once ${he} is safely in the water alongside ${his} assistant,`);
}
r.push(`${he} begins to push out ${his} ${babies},`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`indifferent to`);
} else {
r.push(`aided by`);
@@ -5438,13 +5438,13 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.BROTHEL:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is helped to a private room in the back of the brothel by a group of eager patrons. Instinctively, ${he} begins to push out ${his} ${babies}, indifferent to ${his} audience. ${His} ${childrenAre} promptly taken and, following a cleaning and fresh change of clothes, the audience is allowed to have their way with ${him}.`);
} else {
r.push(`${He} is helped to a private room in the back of the brothel by several patrons who paid quite a handsome price to enjoy this moment. ${He} settles ${himself} onto a patron's lap and begins working on birthing ${his} ${babies}, ${(slave.geneticQuirks.uterineHypersensitivity === 2) ? `convulsing with orgasms in the process and` : ``} basking in the attention of ${his} audience. ${His} ${childrenAre} promptly taken and ${he} beckons the audience to enjoy ${him}.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} heads to a private room in the back of the brothel filled with eager patrons. Instinctively, ${he} begins to push out ${his} ${babies}, indifferent to ${his} audience. ${His} ${childrenAre} promptly taken and, following a cleaning and fresh change of clothes, the audience is allowed to have their way with ${him}.`);
} else {
r.push(`${He} heads to a private room in the back of the brothel accompanied by several patrons who paid quite a handsome price to enjoy this moment. ${He} settles ${himself} onto a patron's lap and begins working on birthing ${his} ${babies}, ${(slave.geneticQuirks.uterineHypersensitivity === 2) ? `convulsing with orgasms in the process and` : ``} basking in the attention of ${his} audience. ${His} ${childrenAre} promptly taken and ${he} beckons the audience to enjoy ${him}.`);
@@ -5465,17 +5465,17 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.CONCUBINE:
if (slave.pregSource === -1 && slave.relationship === -3) {
r.push(`You make sure to find time in your busy schedule to be at your concubine ${wife}'s side as ${he} gives birth to your ${children}. You gently caress ${slave.slaveName}'s body as ${he} begins to push out ${his} ${babies}${UH}. You help ${him} upright and hold your ${children} to ${his} breasts. The two of you cuddle as you watch your ${newborns} suckle from their mother. Since ${he} is quite special to you, you allow ${him} the time to pick out names before ${his} ${children} must be taken away. When the time comes to pick up the ${newborns}, the slave servant is surprised to find ${(slave.pregType === 1) ? `a name-card` : `name-cards`} affixed to their ${(slave.pregType > 1) ? `blankets` : `blanket`}.`);
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
r.push(`${He} can't help but feel more devoted to ${his} master after seeing such a touching act. Before you leave, ${slave.slaveName} expresses how cute ${he} found your ${children} and that ${he}'d love to bear more for you.`);
}
} else if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is assisted in reaching your side. You call ${him} over and strip ${him} as ${he} instinctively begins to push out ${his} ${babies}, indifferent to your wandering hands. ${His} ${childrenAre} promptly taken and, following a cleaning, a fresh change of clothes, and some private time with you, ${he} is helped back to your master suite.`);
} else {
r.push(`${He} is assisted in reaching your side. You beckon ${him} over and strip ${him} as ${he} dutifully begins to push out ${his} ${babies}, enjoying your wandering hands and attention${UH}. ${His} ${childrenAre} promptly taken and, following a cleaning, a fresh change of clothes, and some private time with you, ${he} is helped back to your master suite. As ${he} leaves your office, ${he} throws you a wink, hoping to see you again soon.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} wanders the penthouse until ${he} finds you. You call ${him} over and strip ${him} as ${he} instinctively begins to push out ${his} ${babies}, indifferent to your wandering hands. ${His} ${childrenAre} promptly taken and, following a cleaning, a fresh change of clothes, and some private time with you, ${he} returns to your master suite.`);
} else {
r.push(`${He} wanders the penthouse until ${he} finds you. You beckon ${him} over and strip ${him} as ${he} dutifully begins to push out ${his} ${babies}, enjoying your wandering hands and attention${UH}. ${His} ${childrenAre} promptly taken and, following a cleaning, a fresh change of clothes, and some private time with you, ${he} returns to your master suite. As ${he} leaves your office, ${he} throws you a wink, hoping to see you again soon.`);
@@ -5492,13 +5492,13 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
r.push(`and ${his} ${childrenAre} carefully collected by their father. Once they are out of the way, ${S.HeadGirl.slaveName} moves in to fondle ${slave.slaveName}'s tired body.`);
} else if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is aided in finding ${S.HeadGirl.slaveName}, who undresses ${him} as ${he} instinctively begins to push out ${his} ${babies}, indifferent to ${his2} wandering hands. ${His} ${childrenAre} promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, ${he} is taken back to ${S.HeadGirl.slaveName}'s room.`);
} else {
r.push(`${He} is aided in seeking out ${S.HeadGirl.slaveName}, who undresses ${him} as ${he} dutifully begins to push out ${his} ${babies}, enjoying ${his2} wandering hands and attention${UH}. ${His} ${childrenAre} promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, ${he} is helped back to ${S.HeadGirl.slaveName}'s room.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} wanders until ${he} finds ${S.HeadGirl.slaveName}, who undresses ${him} as ${he} instinctively begins to push out ${his} ${babies}, indifferent to ${his2} wandering hands. ${His} ${childrenAre} promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, ${he} is lead back to ${S.HeadGirl.slaveName}'s room.`);
} else {
r.push(`${He} seeks out ${S.HeadGirl.slaveName}, who undresses ${him} as ${he} dutifully begins to push out ${his} ${babies}, enjoying ${his2} wandering hands and attention${UH}. ${His} ${childrenAre} promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, ${he} returns to ${S.HeadGirl.slaveName}'s room.`);
@@ -5543,7 +5543,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.CELLBLOCK:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is forced into a specially designed cell to give birth in. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and, after ${he} and the cell are hosed down, ${he} is moved back into a standard cell.`);
} else {
r.push(`${He} is forced into a specially designed cell to give birth in. Reluctantly, ${he} begins to push out ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and, after ${he} and the cell are hosed down, ${he} is moved back into a standard cell.`);
@@ -5563,7 +5563,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.MADAM:
- r.push(`${He} heads to a private room in the back of the club accompanied by an influential patron. ${He} settles ${himself} onto his lap and begins working on birthing ${his} ${babies},`);
+ r.push(`${He} heads to a private room in the back of the brothel accompanied by an influential patron. ${He} settles ${himself} onto his lap and begins working on birthing ${his} ${babies},`);
if (slave.geneticQuirks.uterineHypersensitivity === 2) {
r.push(`convulsing with orgasms in the process and`);
}
@@ -5583,7 +5583,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.WARDEN:
- if (slave.fetish === "mindbroken") { // FIXME: can Wardens be mindbroken?
+ if (slave.fetish === Fetish.MINDBROKEN) { // FIXME: can Wardens be mindbroken?
r.push(`${He} enters an empty cell, strips, and seats ${himself} on the cot. ${He} instinctively begins birthing ${his} ${babies}. ${His} ${childrenAre} promptly taken and ${he} returns to mindlessly breaking the confined slaves.`);
} else {
r.push(`${He} returns to ${his} bed and strips before slipping into it. ${He} makes ${himself} comfortable and begins working on birthing ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to the cellblock.`);
@@ -5622,13 +5622,13 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
default:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to ${his} task.`);
} else {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. ${He} makes ${himself} comfortable and begins working on birthing ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to ${his} task.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} returns to ${his} bed and strips before slipping into it. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to ${his} task.`);
} else {
r.push(`${He} returns to ${his} bed and strips before slipping into it. ${He} makes ${himself} comfortable and begins working on birthing ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and ${he} rests awhile before returning to ${his} task.`);
@@ -5678,7 +5678,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
} else {
switch (slave.assignment) {
case Job.REST:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is placed on ${his} bed and stripped. Instinctively, ${he} begins to push out ${his} ${babies}, indifferent to ${his} watching helper. ${His} ${childrenAre} promptly taken and ${he} is encouraged to keep resting.`);
} else {
r.push(`${He} is placed on ${his} bed and stripped. ${He} wiggles ${himself} into a comfortable spot and begins working on birthing ${his} ${babies},`);
@@ -5695,7 +5695,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
if (domSlave) {
({he2} = getPronouns(domSlave).appendSuffix("2"));
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (slave.subTarget <= 0) {
r.push(`${He} is placed on ${his} bed and stripped. Instinctively, ${he} begins to push out ${his} ${babies}, indifferent to ${his} watching helper. ${His} ${childrenAre} promptly taken and ${he} is returned to your waiting slaves.`);
} else {
@@ -5745,7 +5745,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
*/
case Job.GLORYHOLE:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is locked, nude, in a glory hole box and ordered to suck. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} quickly extracted from the box. ${He} never notices, focused entirely on the fresh cock poking through the glory hole.`);
} else {
r.push(`${He} is locked, nude, in a glory hole box and ordered to suck. ${He} quickly finishes the dick off before wiggling ${himself} into a slightly, though not by much, more comfortable position. ${He} begins laboring on ${his} ${children}${UH}. As ${he} finishes, the box is opened and ${his} ${childrenAre} gathered and taken away before ${he} is forcefully repositioned with ${his} mouth over the glory hole.`);
@@ -5753,7 +5753,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.MILKED:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.dairyPregSetting > 0) {
r.push(`${He} is hooked up to a milking machine and allowed to continue ${his} assignment. ${He} shows little interest in ${his} coming birth, instead focusing on ${his} milky breasts. Instinctively, ${he} begins to push out ${his} ${babies}. ${He} shows no interest in ${his} ${children} being removed from the milking stall, nor when ${he} is hosed off.`);
} else {
@@ -5779,7 +5779,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.FUCKTOY:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is stripped and placed into your waiting arms upon your couch. Instinctively, ${he} begins to push out ${his} ${babies} as you tease ${his} breasts and belly, indifferent to you and ${his} watching helper. ${His} ${childrenAre} promptly taken and, following a cleaning and a fresh change of clothes, ${he} is returned to your office.`);
} else {
r.push(`${He} is stripped and placed into your waiting arms upon your couch.`);
@@ -5801,7 +5801,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.CONFINEMENT:
case Job.CELLBLOCK:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is placed in a specially designed cell to give birth in. Instinctively, ${he} begins to push out ${his} ${babies}. ${His} ${childrenAre} promptly taken and, after ${he} and the cell are hosed down, ${he} is moved back into a standard cell.`);
} else {
r.push(`${He} is placed in a specially designed cell to give birth in. Reluctantly, ${he} begins to push out ${his} ${babies}${UH}. ${His} ${childrenAre} promptly taken and, after ${he} and the cell are hosed down, ${he} is moved back into a standard cell.`);
@@ -5810,7 +5810,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.QUARTER:
case Job.HOUSE:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is placed on ${his} cot and stripped. Instinctively, ${he} begins to push out ${his} ${babies}, indifferent to ${his} watching helper. ${His} ${childrenAre} promptly taken and, following a cleaning and fresh change of clothes, ${he} is carried back to ${his} station.`);
} else {
r.push(`${He} is placed on ${his} cot and stripped. ${He} wiggles ${himself} into a comfortable spot and begins working on birthing ${his} ${babies},`);
@@ -5823,7 +5823,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.MASTERSUITE:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.masterSuiteUpgradePregnancy === 1) {
r.push(`${He} is carried to the birthing chamber and comfortably positioned. Instinctively, ${he} begins to push out ${his} ${babies}, indifferent to ${his} watching helper. ${His} ${childrenAre} promptly taken and, following a cleaning and fresh change of clothes, ${he} is carried back to`);
if (V.masterSuiteUpgradeLuxury === 1) {
@@ -5877,7 +5877,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.CLUB:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is placed in a private room in the back of the club before an audience of eager patrons. Instinctively, ${he} begins to push out ${his} ${babies}, indifferent to ${his} audience. ${His} ${childrenAre} promptly taken and, following a cleaning and fresh change of clothes, the audience is allowed to have their way with ${him}.`);
} else {
r.push(`${He} is placed in a private room in the back of the club before an audience of eager patrons. ${He} wiggles ${himself} into a comfortable spot and begins working on birthing ${his} ${babies},`);
@@ -5890,7 +5890,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.SPA:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is placed in a special flotation device and placed in a birthing pool. Instinctively, ${he} begins to push out ${his} ${babies}, indifferent to ${his} watching helper. ${His} ${childrenAre} promptly taken and, following a cleaning, ${he} is taken back to the spa.`);
} else {
r.push(`${He} is placed in a special flotation device and placed in a birthing pool. Giving birth to ${his} ${babies}`);
@@ -5931,7 +5931,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.BROTHEL:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is placed in a private room in the back of the brothel before an audience of eager patrons. Instinctively, ${he} begins to push out ${his} ${babies}, indifferent to ${his} audience. ${His} ${childrenAre} promptly taken and, following a cleaning and fresh change of clothes, the audience is allowed to have their way with ${him}.`);
} else {
r.push(`${He} is placed in a private room in the back of the brothel before an audience of eager patrons. ${He} wiggles ${himself} into a comfortable spot and begins working on birthing ${his} ${babies},`);
@@ -5959,10 +5959,10 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`a`);
}
r.push(`${(slave.pregType > 1) ? `name-cards` : `name-card`} affixed to their ${(slave.pregType > 1) ? `blankets` : `blanket`}.`);
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
r.push(`${He} can't help but feel more devoted to ${his} master after seeing such a touching act. Before you leave, ${slave.slaveName} expresses how cute ${he} found your ${children} and that ${he}'d love to bear more for you.`);
}
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is placed by your side. You strip ${him} as ${he} instinctively begins to push out ${his} ${babies}, indifferent to your wandering hands. ${His} ${childrenAre} promptly taken and, following a cleaning, a fresh change of clothes, and some private time with you, ${he} is carried back to your master suite.`);
} else {
r.push(`${He} is placed by your side. You strip ${him} as ${he} dutifully begins to push out ${his} ${babies},`);
@@ -5981,7 +5981,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`convulsing with orgasms in the process,`);
}
r.push(`and ${his} ${childrenAre} carefully collected by their father. Once they are out of the way, ${S.HeadGirl.slaveName} moves in to fondle ${slave.slaveName}'s tired body.`);
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is placed with ${S.HeadGirl.slaveName}. ${He2} unwraps ${him} as ${he} instinctively begins to push out ${his} ${babies}, indifferent to ${his2} wandering hands. ${His} ${childrenAre} promptly taken and, following a cleaning, a fresh change of clothes, and some private time with your Head Girl, ${he} is carried back to ${S.HeadGirl.slaveName}'s room.`);
} else {
r.push(`${He} is placed with ${S.HeadGirl.slaveName}. ${He2} unwraps ${him} as ${he} dutifully begins to push out ${his} ${babies},`);
@@ -6007,7 +6007,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
default:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is placed on ${his} bed and stripped. Instinctively, ${he} begins to push out ${his} ${babies}, indifferent to ${his} watching helper. ${His} ${childrenAre} promptly taken and, following a cleaning and fresh change of clothes, ${he} is carried back to ${his} station.`);
} else {
r.push(`${He} is placed on ${his} bed and stripped. ${He} wiggles ${himself} into a comfortable spot and begins working on birthing ${his} ${babies},`);
@@ -6047,7 +6047,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
const rival = slave.rivalry > 0 ? getSlave(slave.rivalryTarget) : null;
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While wandering the penthouse absentmindedly, ${slave.slaveName}'s water breaks. ${He} carries on until the contractions drag ${him} to the floor.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} ${children} to ${his} ${breasts} and resumes wandering aimlessly until a servant collects ${his} ${children} and sends ${him} someplace useful.`);
@@ -6092,7 +6092,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
switch (slave.assignment) {
case Job.REST:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is awoken from ${his} rest by a strong contraction. ${He} rolls over and begins to fall back to sleep as another wracks ${his} body.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} ${children} to ${his} ${breasts} and resumes resting.`);
@@ -6102,7 +6102,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${He} collects ${his} ${newborns} and places them in the cradle readied for ${him}. ${He} is helped to the shower as your servants clean up and remove ${his} ${children}.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is awoken from ${his} rest by a strong contraction. ${He} rolls over and begins to fall back to sleep as another wracks ${his} body.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} ${children} to ${his} ${breasts} and resumes resting.`);
@@ -6119,7 +6119,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
if (domSlave) {
({he2, his2} = getPronouns(domSlave).appendSuffix("2"));
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (slave.subTarget === 0) {
r.push(`While servicing your other slaves, ${slave.slaveName}'s water breaks, though it does nothing to deter ${him} from ${his} task.`);
r.push(clothingBirth());
@@ -6194,7 +6194,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.WHORE:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While attempting to attract customers with ${his} gravid body, ${slave.slaveName}'s water breaks.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} ${children} to ${his} ${breasts} as ${he} resumes whoring, oblivious to the free show ${he} just gave ${his} customers.`);
@@ -6205,7 +6205,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${He} lies on the ground, exhausted and covered in sperm from the circle of men watching ${him}, until ${he} recovers enough to collect ${his} ${children} to be sent off.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While attempting to attract customers with ${his} gravid body, ${slave.slaveName}'s water breaks.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} ${children} to ${his} ${breasts} as ${he} resumes whoring, oblivious to the free show ${he} just gave ${his} customers.`);
@@ -6219,7 +6219,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.PUBLIC:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (birthScene > 80 && canDoVaginal(slave)) {
r.push(`While riding a citizen's dick, ${slave.slaveName}'s water breaks on him. Showing no signs of stopping, he shoves ${his} bulk off of him. Instinctively, ${he} begins to push out ${his} ${babies}, indifferent to who may be watching ${his} naked crotch. ${He} draws ${his} ${children} to ${his} ${breasts} before seeking out the next citizen's cock.`);
} else if (birthScene > 60 && canDoAnal(slave)) {
@@ -6267,7 +6267,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.GLORYHOLE:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While sucking a dick through the hole of ${his} confining box, ${slave.slaveName}'s water breaks. ${He} makes no effort to stop sucking the dicks presented to ${him}.`);
r.push(clothingBirth());
r.push(`${His} ${childrenAre} quickly extracted from the box. ${He} never notices, having focused entirely on the fresh cock poking through the glory hole.`);
@@ -6285,7 +6285,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.MILKED:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While getting milked, ${slave.slaveName}'s water breaks. ${He} show little regard and continues kneading ${his} breasts.`);
r.push(clothingBirth());
r.push(`${He} shows no interest in ${his} ${children} being removed from the milking stall, instead focusing entirely on draining ${his} breasts.`);
@@ -6298,7 +6298,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.FUCKTOY:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While sitting absentmindedly nearby, ${slave.slaveName}'s water breaks, soaking the floor under ${him}. ${He} pays no heed to it and continues waiting for you to use ${him}.`);
r.push(clothingBirth());
r.push(`You certainly enjoyed the show as you call for a servant to take away ${his} ${children} and to clean up the spill.`);
@@ -6316,7 +6316,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`As thanks for the show, you help ${his} exhausted body onto the couch so ${he} can recover before returning to ${his} duties. You call for a servant to take away ${his} ${children} and to clean up your floor and your toy.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While standing absentmindedly nearby, ${slave.slaveName}'s water breaks, soaking the floor under ${him}. ${He} pays no heed to it and continues waiting for you to use ${him}.`);
r.push(clothingBirth());
r.push(`You certainly enjoyed the show as you call for a servant to take away ${his} ${children} and to clean up the spill.`);
@@ -6343,7 +6343,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.CONFINEMENT:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While waiting in confinement, ${slave.slaveName}'s water breaks. ${He} assumes a birthing position.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} ${children} to ${his} ${breasts} and resumes waiting.`);
@@ -6379,7 +6379,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.QUARTER:
case Job.HOUSE:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (birthScene > 50) {
r.push(`While giving a slave oral service, ${slave.slaveName}'s water breaks. ${He} disregards this development and continues working.`);
r.push(clothingBirth());
@@ -6437,7 +6437,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.MASTERSUITE:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.masterSuiteUpgradeLuxury === 1) {
r.push(`While awaiting your return on the big bed in the master suite, ${slave.slaveName}'s water breaks, thoroughly soaking the sheets. Ignoring the mess, ${he} shifts into a more comfortable position.`);
r.push(clothingBirth());
@@ -6478,7 +6478,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.masterSuiteUpgradeLuxury === 1) {
r.push(`While awaiting your return on the big bed in the master suite, ${slave.slaveName}'s water breaks, thoroughly soaking the sheets. Ignoring the mess, ${he} shifts into a more comfortable position.`);
r.push(clothingBirth());
@@ -6523,7 +6523,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.CLUB:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is showing off ${his} gravid body and trying to attract citizens as well as ${he} can. During one of ${his} teases, ${his} water breaks, soaking the floor. ${He} keeps on teasing, despite ${his} condition, until ${his} contractions drag ${him} to the floor.`);
r.push(clothingBirth());
r.push(`Multiple citizens drag ${him} into a booth so that they may tease ${his} exhausted body while the floor is dried and ${his} ${childrenAre} carried off.`);
@@ -6540,7 +6540,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`Only once the last of ${his} clients cums over ${his} body is ${he} allowed to gather ${his} ${children} and take a seat. ${He} enjoys a moment with ${his} ${newborns} before a servant comes to collect them.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is showing off ${his} gravid body and trying to attract citizens by dancing as well as ${he} can. During one of ${his} dances, ${his} water breaks, soaking the dance floor. ${He} keeps on dancing, despite ${his} condition, until ${his} contractions drag ${him} to the floor.`);
r.push(clothingBirth());
r.push(`Multiple citizens drag ${him} into a booth so that they may tease ${his} exhausted body while the dance floor is dried and ${his} ${childrenAre} carried off.`);
@@ -6577,7 +6577,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.SPA:
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While soaking in the spa's pool, ${slave.slaveName}'s water breaks. As ${he} begins to ready ${himself} for birth,`);
if (S.Attendant) {
r.push(`${S.Attendant.slaveName} pulls ${him} out of the pool and glares at ${him}.`);
@@ -6598,7 +6598,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While soaking in the spa's pool, ${slave.slaveName}'s water breaks. As ${he} begins to ready ${himself} for birth,`);
if (S.Attendant) {
r.push(`${S.Attendant.slaveName} pulls ${him} out of the pool and glares at ${him}.`);
@@ -6680,7 +6680,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.BROTHEL:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (birthScene > 80 && canDoVaginal(slave)) {
r.push(`While riding a customer's dick, ${slave.slaveName}'s water breaks on him. Showing no signs of stopping, he shoves ${his} gravid bulk off of him. Instinctively, ${he} begins to push out ${his} ${babies}, indifferent to who may be watching ${his} naked crotch. ${He} draws ${his} ${children} to ${his} ${breasts} before seeking out the next customer's cock.`);
} else if (birthScene > 60 && canDoAnal(slave)) {
@@ -6790,7 +6790,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.WARDEN:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While punishing a slave, ${slave.slaveName}'s water breaks, soaking ${himU}. Indifferent, ${he} resumes beating ${himU} until the contractions are to much to bear. Settling to the floor, ${he} begins giving birth.`);
r.push(clothingBirth());
r.push(`As soon as ${he} regains ${his} strength, ${he} resumes beating the confused slave. ${His} ${childrenAre} collected by a servant, who carefully hints that ${slave.slaveName} should take a break before returning to ${his} task.`);
@@ -6808,7 +6808,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.CONCUBINE:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is placed by your side. You strip ${him} as ${he} instinctively begins to push out ${his} ${babies}, indifferent to your wandering hands. ${His} ${childrenAre} promptly taken and, following a cleaning, a fresh change of clothes, and some private time with you, ${he} is carried back to your master suite.`);
} else {
r.push(`${slave.slaveName} cradles ${his} swollen belly, waiting for your return, when ${his} water breaks. Saddened that you aren't there for the show, ${he} begins waddling off to find you. By the time ${he} reaches your office, ${he} is barely holding back ${his} ${children}. You rise to meet ${him} and help ${him} onto the couch, just before it's too late.`);
@@ -6820,7 +6820,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case Job.HEADGIRLSUITE:
({he2, his2} = getPronouns(S.HeadGirl).appendSuffix("2"));
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is awoken from ${his} rest by a strong contraction. ${He} rolls over and begins to fall back to sleep as another wracks ${his} body.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} ${children} to ${his} ${breasts} and resumes resting before ${S.HeadGirl.slaveName} returns from ${his2} duties.`);
@@ -6830,7 +6830,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${He} collects ${his} ${newborns} and places them in the cradle readied for ${him}. ${He} is helped to the shower as your servants clean up and remove ${his} ${children}. Freshened up, ${he} returns to resting knowing full well that ${S.HeadGirl.slaveName} will be eager to play with ${his} body upon returning.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is awoken from ${his} rest by a strong contraction. ${He} rolls over and begins to fall back to sleep as another wracks ${his} body.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} ${children} to ${his} ${breasts} and resumes resting before ${S.HeadGirl.slaveName} returns from ${his2} duties.`);
@@ -6865,7 +6865,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case Job.CELLBLOCK:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While waiting in a cell in ${V.cellblockName}, ${slave.slaveName}'s water breaks. ${He} assumes a birthing position,`);
r.push(clothingBirth());
r.push(`${He} draws ${his} ${children} to ${his} ${breasts} and resumes waiting.`);
@@ -6881,7 +6881,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
App.UI.DOM.appendNewElement("div", el, `Assignment was "${slave.assignment}" and defaulted. Report this!`, "note");
r = [];
if (!canWalk(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is awoken from ${his} rest by a strong contraction. ${He} rolls over and begins to fall back to sleep as another wracks ${his} body.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} ${children} to ${his} ${breasts} and resumes resting.`);
@@ -6891,7 +6891,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${He} collects ${his} ${newborns} and places them in the cradle readied for ${him}. ${He} is helped to the shower as your servants clean up and remove ${his} ${children}.`);
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is awoken from ${his} rest by a strong contraction. ${He} rolls over and begins to fall back to sleep as another wracks ${his} body.`);
r.push(clothingBirth());
r.push(`${He} draws ${his} ${children} to ${his} ${breasts} and resumes resting.`);
@@ -7006,7 +7006,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
const UH = (slave.geneticQuirks.uterineHypersensitivity === 2) ? `, convulsing with orgasms in the process` : ``;
let babyIntro;
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
clothesSeed += 20;
}
if (isInduced(slave)) {
@@ -7175,7 +7175,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
if (undressed === 0 && App.Data.clothes.get(slave.clothes).exposure <= 3) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Instinctively, ${he} begins to push out`);
if (slave.broodmother > 0) {
if (slave.counter.birthsTotal === 0) {
@@ -7189,7 +7189,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
switch (slave.clothes) {
case "attractive lingerie":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching. ${His} g-string stretches as ${his} newborn crowns into it before finally snapping and clearing the way for childbirth.`);
} else {
r.push(`Quickly ${he} spreads ${his} legs apart and shifts ${his} g-string aside before beginning to push out ${babyIntro}. ${He} can't hide what's happening between ${his} legs,`);
@@ -7215,7 +7215,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "Western clothing":
case "a slutty qipao":
case "a chattel habit":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching ${his} naked`);
if (slave.mpreg === 1) {
r.push(`asshole.`);
@@ -7234,7 +7234,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "attractive lingerie for a pregnant woman":
case "kitty lingerie":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching. ${His} panties stretch as ${his} baby crowns into them before finally snapping and clearing the way for childbirth.`);
} else {
r.push(`Quickly ${he} spreads ${his} legs apart and shifts ${his} panties aside before beginning to push out ${babyIntro}. ${He} can't hide what's happening between ${his} legs,`);
@@ -7249,7 +7249,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "a maternity dress":
case "a slave gown":
case "a halter top dress":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -7268,7 +7268,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "a string bikini":
case "a scalemail bikini":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching. ${His} bikini bottom stretches as ${his} baby crowns into it before finally snapping and clearing the way for childbirth.`);
} else {
r.push(`Quickly ${he} spreads ${his} legs apart and shifts ${his} bikini bottom aside before beginning to push out ${babyIntro}. ${He} can't hide what's happening between ${his} legs,`);
@@ -7281,7 +7281,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "striped panties":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching. ${His} panties stretch as ${his} baby crowns into it before finally snapping and clearing the way for childbirth.`);
} else {
r.push(`Quickly ${he} spreads ${his} legs apart and shifts ${his} panties aside before beginning to push out ${babyIntro}. ${He} can't hide what's happening between ${his} legs,`);
@@ -7294,7 +7294,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "cutoffs and a t-shirt":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching.`);
if (slave.mpreg === 1) {
r.push(`The seat of ${his}`);
@@ -7319,7 +7319,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a slutty outfit":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching. ${His} pasties come off as ${his} baby crowns into it, clearing the way for childbirth.`);
} else {
r.push(`Quickly ${he} spreads ${his} legs apart and pulls ${his} pasties off before beginning to push out ${babyIntro}. ${He} can't hide what's happening between ${his} legs,`);
@@ -7332,7 +7332,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "uncomfortable straps":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching. ${His} straps are pushed taut as ${his} baby crowns into the steel ring covering ${his}`);
if (slave.mpreg === 1) {
r.push(`asshole.`);
@@ -7358,7 +7358,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a penitent nuns habit":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies} into ${his} habit, indifferent to their discomfort.`);
} else {
r.push(`Quickly ${he} spreads ${his} legs apart and begins pushing out ${babyIntro}.`);
@@ -7372,7 +7372,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "nice business attire":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -7390,7 +7390,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "stretch pants and a crop-top":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -7440,7 +7440,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "spats and a tank top":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -7504,7 +7504,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
} else {
r.push(`refuses`);
}
- r.push(`to wait and quickly join their sister in birth. ${He} wails in anguish at the ever mounting pressure in ${his}`);
+ r.push(`to wait and quickly join their sister in birth. ${He} wails in anguish at the ever-mounting pressure in ${his}`);
if (slave.mpreg === 1) {
r.push(`rear,`);
} else {
@@ -7536,7 +7536,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a comfortable bodysuit":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching ${his}`);
if (slave.mpreg === 1) {
r.push(`ass.`);
@@ -7593,7 +7593,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "overalls":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching ${his}`);
if (slave.mpreg === 1) {
r.push(`ass.`);
@@ -7650,7 +7650,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a kimono":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -7668,7 +7668,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a burqa":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -7687,7 +7687,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "a hijab and abaya":
case "a niqab and abaya":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -7705,7 +7705,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a klan robe":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -7728,7 +7728,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "a slutty schutzstaffel uniform":
case "a dirndl":
case "a biyelgee costume":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -7746,7 +7746,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "battledress":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching.`);
if (slave.mpreg === 1) {
r.push(`The seat of ${his} fatigues`);
@@ -7771,7 +7771,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a nice maid outfit":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -7789,7 +7789,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "conservative clothing":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching.`);
if (slave.mpreg === 1) {
r.push(`The seat of ${his} pants`);
@@ -7814,7 +7814,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "chains":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching. ${His} chains stretch as ${his} baby crowns into them before finally slipping to the side clearing the way for ${his} body to finish giving birth.`);
} else {
r.push(`Quickly ${he} spreads ${his} legs apart and shifts ${his} chains aside before beginning to push out ${babyIntro}. ${He} can't hide what's happening between ${his} legs,`);
@@ -7827,7 +7827,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "shibari ropes":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching. ${His} ropes are pulled taut as ${his} baby crowns into the rope covering ${his}`);
if (slave.mpreg === 1) {
r.push(`asshole.`);
@@ -7853,7 +7853,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a toga":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -7871,7 +7871,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a huipil":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -7889,7 +7889,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a bunny outfit":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching. ${His} teddy bulges as ${his} baby crowns into it as ${he} continues ${his} tasks, oblivious to the wetness and ${his} child's dilemma. Seeing ${him} in this state, someone manages to tear ${his} outfit open to allow ${his} body to finish giving birth.`);
} else {
r.push(`Quickly ${he} attempts to remove ${his} teddy but fails to do so before having to push out ${babyIntro}. As ${he} crowns into ${his} outfit, ${he} can't hide the wetness and bulge between ${his}`);
@@ -7908,7 +7908,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a leotard":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching ${his}`);
if (slave.mpreg === 1) {
r.push(`crotch.`);
@@ -7960,7 +7960,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a burkini":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching ${his}`);
if (slave.mpreg === 1) {
r.push(`crotch.`);
@@ -8012,7 +8012,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a monokini":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching ${his}`);
if (slave.mpreg === 1) {
r.push(`crotch.`);
@@ -8065,7 +8065,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "a cybersuit":
case "a tight Imperial bodysuit":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching ${his}`);
if (slave.mpreg === 1) {
r.push(`crotch.`);
@@ -8117,7 +8117,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a ball gown":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -8135,7 +8135,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a latex catsuit":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the closed zipper covering ${his}`);
if (slave.mpreg === 1) {
r.push(`asshole.`);
@@ -8179,7 +8179,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a schutzstaffel uniform":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -8203,7 +8203,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a long qipao":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -8222,7 +8222,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "battlearmor":
case "Imperial Plate":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -8251,7 +8251,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "leather pants":
case "jeans":
case "leather pants and a tube top":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -8275,7 +8275,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "lederhosen":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -8300,7 +8300,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "a nice nurse outfit":
case "a t-shirt and jeans":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching.`);
if (slave.mpreg === 1) {
r.push(`The seat of ${his} trousers`);
@@ -8325,7 +8325,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a nice pony outfit":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching.`);
if (slave.mpreg === 1) {
r.push(`The seat of ${his} trousers`);
@@ -8351,7 +8351,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "a mini dress":
case "a Santa dress":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -8381,7 +8381,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "a t-shirt":
case "an oversized t-shirt":
case "pasties":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -8399,7 +8399,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "an apron":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -8427,7 +8427,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "panties":
case "panties and pasties":
case "striped underwear":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -8448,7 +8448,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "a thong":
case "a tube top and thong":
case "a bimbo outfit":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the thong covering ${his}`);
if (slave.mpreg === 1) {
r.push(`anus.`);
@@ -8477,7 +8477,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
case "sport shorts and a sports bra":
case "a sweater and cutoffs":
case "sport shorts":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -8495,7 +8495,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a one-piece swimsuit":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to the obvious wetness forming`);
if (slave.mpreg === 1) {
r.push(`under ${his} rear.`);
@@ -8513,7 +8513,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
case "a courtesan dress":
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching the show under ${his} parted dress.`);
} else {
r.push(`Quickly ${he} spreads ${his} legs apart, parting ${his} skirt, and begins pushing out ${babyIntro}. ${He} can't hide what's happening between ${his} legs since ${his} dress makes it clear something is going on down there,`);
@@ -8526,7 +8526,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
break;
default:
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${babies}, indifferent to who may be watching ${his} naked`);
if (slave.mpreg === 1) {
r.push(`ass.`);
@@ -8543,7 +8543,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else if (App.Data.clothes.get(slave.clothes).exposure > 3) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Instinctively, ${he} begins to push out`);
if (slave.broodmother > 0) {
if (slave.counter.birthsTotal === 0) {
@@ -8569,7 +8569,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} removes ${his}`);
switch (slave.clothes) {
case "a slutty pony outfit":
diff --git a/src/js/dTree.min.js b/src/js/dTree.min.js
deleted file mode 100644
index 763229745b4f0a14cca35e4266268d9882de2a77..0000000000000000000000000000000000000000
--- a/src/js/dTree.min.js
+++ /dev/null
@@ -1,151 +0,0 @@
-/* This is the minified version of lodash, d3 and dTree */
-;
-(function (window, define, exports) {
-/**
-* @license
-* Lodash lodash.com/license | Underscore.js 1.8.3 underscorejs.org/LICENSE
-*/
-;(function(){function n(n,t){return n.set(t[0],t[1]),n}function t(n,t){return n.add(t),n}function r(n,t,r){switch(r.length){case 0:return n.call(t);case 1:return n.call(t,r[0]);case 2:return n.call(t,r[0],r[1]);case 3:return n.call(t,r[0],r[1],r[2])}return n.apply(t,r)}function e(n,t,r,e){for(var u=-1,i=null==n?0:n.length;++u<i;){var o=n[u];t(e,o,r(o),n)}return e}function u(n,t){for(var r=-1,e=null==n?0:n.length;++r<e&&false!==t(n[r],r,n););return n}function i(n,t){for(var r=null==n?0:n.length;r--&&false!==t(n[r],r,n););
-return n}function o(n,t){for(var r=-1,e=null==n?0:n.length;++r<e;)if(!t(n[r],r,n))return false;return true}function f(n,t){for(var r=-1,e=null==n?0:n.length,u=0,i=[];++r<e;){var o=n[r];t(o,r,n)&&(i[u++]=o)}return i}function c(n,t){return!(null==n||!n.length)&&-1<d(n,t,0)}function a(n,t,r){for(var e=-1,u=null==n?0:n.length;++e<u;)if(r(t,n[e]))return true;return false}function l(n,t){for(var r=-1,e=null==n?0:n.length,u=Array(e);++r<e;)u[r]=t(n[r],r,n);return u}function s(n,t){for(var r=-1,e=t.length,u=n.length;++r<e;)n[u+r]=t[r];
-return n}function h(n,t,r,e){var u=-1,i=null==n?0:n.length;for(e&&i&&(r=n[++u]);++u<i;)r=t(r,n[u],u,n);return r}function p(n,t,r,e){var u=null==n?0:n.length;for(e&&u&&(r=n[--u]);u--;)r=t(r,n[u],u,n);return r}function _(n,t){for(var r=-1,e=null==n?0:n.length;++r<e;)if(t(n[r],r,n))return true;return false}function v(n,t,r){var e;return r(n,function(n,r,u){if(t(n,r,u))return e=r,false}),e}function g(n,t,r,e){var u=n.length;for(r+=e?1:-1;e?r--:++r<u;)if(t(n[r],r,n))return r;return-1}function d(n,t,r){if(t===t)n:{
---r;for(var e=n.length;++r<e;)if(n[r]===t){n=r;break n}n=-1}else n=g(n,b,r);return n}function y(n,t,r,e){--r;for(var u=n.length;++r<u;)if(e(n[r],t))return r;return-1}function b(n){return n!==n}function x(n,t){var r=null==n?0:n.length;return r?k(n,t)/r:P}function j(n){return function(t){return null==t?F:t[n]}}function w(n){return function(t){return null==n?F:n[t]}}function m(n,t,r,e,u){return u(n,function(n,u,i){r=e?(e=false,n):t(r,n,u,i)}),r}function A(n,t){var r=n.length;for(n.sort(t);r--;)n[r]=n[r].c;
-return n}function k(n,t){for(var r,e=-1,u=n.length;++e<u;){var i=t(n[e]);i!==F&&(r=r===F?i:r+i)}return r}function E(n,t){for(var r=-1,e=Array(n);++r<n;)e[r]=t(r);return e}function O(n,t){return l(t,function(t){return[t,n[t]]})}function S(n){return function(t){return n(t)}}function I(n,t){return l(t,function(t){return n[t]})}function R(n,t){return n.has(t)}function z(n,t){for(var r=-1,e=n.length;++r<e&&-1<d(t,n[r],0););return r}function W(n,t){for(var r=n.length;r--&&-1<d(t,n[r],0););return r}function B(n){
-return"\\"+Tn[n]}function L(n){var t=-1,r=Array(n.size);return n.forEach(function(n,e){r[++t]=[e,n]}),r}function U(n,t){return function(r){return n(t(r))}}function C(n,t){for(var r=-1,e=n.length,u=0,i=[];++r<e;){var o=n[r];o!==t&&"__lodash_placeholder__"!==o||(n[r]="__lodash_placeholder__",i[u++]=r)}return i}function D(n){var t=-1,r=Array(n.size);return n.forEach(function(n){r[++t]=n}),r}function M(n){var t=-1,r=Array(n.size);return n.forEach(function(n){r[++t]=[n,n]}),r}function T(n){if(Bn.test(n)){
-for(var t=zn.lastIndex=0;zn.test(n);)++t;n=t}else n=tt(n);return n}function $(n){return Bn.test(n)?n.match(zn)||[]:n.split("")}var F,N=1/0,P=NaN,Z=[["ary",128],["bind",1],["bindKey",2],["curry",8],["curryRight",16],["flip",512],["partial",32],["partialRight",64],["rearg",256]],q=/\b__p\+='';/g,V=/\b(__p\+=)''\+/g,K=/(__e\(.*?\)|\b__t\))\+'';/g,G=/&(?:amp|lt|gt|quot|#39);/g,H=/[&<>"']/g,J=RegExp(G.source),Y=RegExp(H.source),Q=/<%-([\s\S]+?)%>/g,X=/<%([\s\S]+?)%>/g,nn=/<%=([\s\S]+?)%>/g,tn=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,rn=/^\w*$/,en=/^\./,un=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,on=/[\\^$.*+?()[\]{}|]/g,fn=RegExp(on.source),cn=/^\s+|\s+$/g,an=/^\s+/,ln=/\s+$/,sn=/\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,hn=/\{\n\/\* \[wrapped with (.+)\] \*/,pn=/,? & /,_n=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g,vn=/\\(\\)?/g,gn=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,dn=/\w*$/,yn=/^[-+]0x[0-9a-f]+$/i,bn=/^0b[01]+$/i,xn=/^\[object .+?Constructor\]$/,jn=/^0o[0-7]+$/i,wn=/^(?:0|[1-9]\d*)$/,mn=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,An=/($^)/,kn=/['\n\r\u2028\u2029\\]/g,En="[\\ufe0e\\ufe0f]?(?:[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|\\ud83c[\\udffb-\\udfff])?(?:\\u200d(?:[^\\ud800-\\udfff]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff])[\\ufe0e\\ufe0f]?(?:[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|\\ud83c[\\udffb-\\udfff])?)*",On="(?:[\\u2700-\\u27bf]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff])"+En,Sn="(?:[^\\ud800-\\udfff][\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]?|[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff]|[\\ud800-\\udfff])",In=RegExp("['\u2019]","g"),Rn=RegExp("[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]","g"),zn=RegExp("\\ud83c[\\udffb-\\udfff](?=\\ud83c[\\udffb-\\udfff])|"+Sn+En,"g"),Wn=RegExp(["[A-Z\\xc0-\\xd6\\xd8-\\xde]?[a-z\\xdf-\\xf6\\xf8-\\xff]+(?:['\u2019](?:d|ll|m|re|s|t|ve))?(?=[\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000]|[A-Z\\xc0-\\xd6\\xd8-\\xde]|$)|(?:[A-Z\\xc0-\\xd6\\xd8-\\xde]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+(?:['\u2019](?:D|LL|M|RE|S|T|VE))?(?=[\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000]|[A-Z\\xc0-\\xd6\\xd8-\\xde](?:[a-z\\xdf-\\xf6\\xf8-\\xff]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])|$)|[A-Z\\xc0-\\xd6\\xd8-\\xde]?(?:[a-z\\xdf-\\xf6\\xf8-\\xff]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+(?:['\u2019](?:d|ll|m|re|s|t|ve))?|[A-Z\\xc0-\\xd6\\xd8-\\xde]+(?:['\u2019](?:D|LL|M|RE|S|T|VE))?|\\d*(?:(?:1ST|2ND|3RD|(?![123])\\dTH)\\b)|\\d*(?:(?:1st|2nd|3rd|(?![123])\\dth)\\b)|\\d+",On].join("|"),"g"),Bn=RegExp("[\\u200d\\ud800-\\udfff\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff\\ufe0e\\ufe0f]"),Ln=/[a-z][A-Z]|[A-Z]{2,}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/,Un="Array Buffer DataView Date Error Float32Array Float64Array Function Int8Array Int16Array Int32Array Map Math Object Promise RegExp Set String Symbol TypeError Uint8Array Uint8ClampedArray Uint16Array Uint32Array WeakMap _ clearTimeout isFinite parseInt setTimeout".split(" "),Cn={};
-Cn["[object Float32Array]"]=Cn["[object Float64Array]"]=Cn["[object Int8Array]"]=Cn["[object Int16Array]"]=Cn["[object Int32Array]"]=Cn["[object Uint8Array]"]=Cn["[object Uint8ClampedArray]"]=Cn["[object Uint16Array]"]=Cn["[object Uint32Array]"]=true,Cn["[object Arguments]"]=Cn["[object Array]"]=Cn["[object ArrayBuffer]"]=Cn["[object Boolean]"]=Cn["[object DataView]"]=Cn["[object Date]"]=Cn["[object Error]"]=Cn["[object Function]"]=Cn["[object Map]"]=Cn["[object Number]"]=Cn["[object Object]"]=Cn["[object RegExp]"]=Cn["[object Set]"]=Cn["[object String]"]=Cn["[object WeakMap]"]=false;
-var Dn={};Dn["[object Arguments]"]=Dn["[object Array]"]=Dn["[object ArrayBuffer]"]=Dn["[object DataView]"]=Dn["[object Boolean]"]=Dn["[object Date]"]=Dn["[object Float32Array]"]=Dn["[object Float64Array]"]=Dn["[object Int8Array]"]=Dn["[object Int16Array]"]=Dn["[object Int32Array]"]=Dn["[object Map]"]=Dn["[object Number]"]=Dn["[object Object]"]=Dn["[object RegExp]"]=Dn["[object Set]"]=Dn["[object String]"]=Dn["[object Symbol]"]=Dn["[object Uint8Array]"]=Dn["[object Uint8ClampedArray]"]=Dn["[object Uint16Array]"]=Dn["[object Uint32Array]"]=true,
-Dn["[object Error]"]=Dn["[object Function]"]=Dn["[object WeakMap]"]=false;var Mn,Tn={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},$n=parseFloat,Fn=parseInt,Nn=typeof global=="object"&&global&&global.Object===Object&&global,Pn=typeof self=="object"&&self&&self.Object===Object&&self,Zn=Nn||Pn||Function("return this")(),qn=typeof exports=="object"&&exports&&!exports.nodeType&&exports,Vn=qn&&typeof module=="object"&&module&&!module.nodeType&&module,Kn=Vn&&Vn.exports===qn,Gn=Kn&&Nn.process;
-n:{try{Mn=Gn&&Gn.binding&&Gn.binding("util");break n}catch(n){}Mn=void 0}var Hn=Mn&&Mn.isArrayBuffer,Jn=Mn&&Mn.isDate,Yn=Mn&&Mn.isMap,Qn=Mn&&Mn.isRegExp,Xn=Mn&&Mn.isSet,nt=Mn&&Mn.isTypedArray,tt=j("length"),rt=w({"\xc0":"A","\xc1":"A","\xc2":"A","\xc3":"A","\xc4":"A","\xc5":"A","\xe0":"a","\xe1":"a","\xe2":"a","\xe3":"a","\xe4":"a","\xe5":"a","\xc7":"C","\xe7":"c","\xd0":"D","\xf0":"d","\xc8":"E","\xc9":"E","\xca":"E","\xcb":"E","\xe8":"e","\xe9":"e","\xea":"e","\xeb":"e","\xcc":"I","\xcd":"I","\xce":"I",
-"\xcf":"I","\xec":"i","\xed":"i","\xee":"i","\xef":"i","\xd1":"N","\xf1":"n","\xd2":"O","\xd3":"O","\xd4":"O","\xd5":"O","\xd6":"O","\xd8":"O","\xf2":"o","\xf3":"o","\xf4":"o","\xf5":"o","\xf6":"o","\xf8":"o","\xd9":"U","\xda":"U","\xdb":"U","\xdc":"U","\xf9":"u","\xfa":"u","\xfb":"u","\xfc":"u","\xdd":"Y","\xfd":"y","\xff":"y","\xc6":"Ae","\xe6":"ae","\xde":"Th","\xfe":"th","\xdf":"ss","\u0100":"A","\u0102":"A","\u0104":"A","\u0101":"a","\u0103":"a","\u0105":"a","\u0106":"C","\u0108":"C","\u010a":"C",
-"\u010c":"C","\u0107":"c","\u0109":"c","\u010b":"c","\u010d":"c","\u010e":"D","\u0110":"D","\u010f":"d","\u0111":"d","\u0112":"E","\u0114":"E","\u0116":"E","\u0118":"E","\u011a":"E","\u0113":"e","\u0115":"e","\u0117":"e","\u0119":"e","\u011b":"e","\u011c":"G","\u011e":"G","\u0120":"G","\u0122":"G","\u011d":"g","\u011f":"g","\u0121":"g","\u0123":"g","\u0124":"H","\u0126":"H","\u0125":"h","\u0127":"h","\u0128":"I","\u012a":"I","\u012c":"I","\u012e":"I","\u0130":"I","\u0129":"i","\u012b":"i","\u012d":"i",
-"\u012f":"i","\u0131":"i","\u0134":"J","\u0135":"j","\u0136":"K","\u0137":"k","\u0138":"k","\u0139":"L","\u013b":"L","\u013d":"L","\u013f":"L","\u0141":"L","\u013a":"l","\u013c":"l","\u013e":"l","\u0140":"l","\u0142":"l","\u0143":"N","\u0145":"N","\u0147":"N","\u014a":"N","\u0144":"n","\u0146":"n","\u0148":"n","\u014b":"n","\u014c":"O","\u014e":"O","\u0150":"O","\u014d":"o","\u014f":"o","\u0151":"o","\u0154":"R","\u0156":"R","\u0158":"R","\u0155":"r","\u0157":"r","\u0159":"r","\u015a":"S","\u015c":"S",
-"\u015e":"S","\u0160":"S","\u015b":"s","\u015d":"s","\u015f":"s","\u0161":"s","\u0162":"T","\u0164":"T","\u0166":"T","\u0163":"t","\u0165":"t","\u0167":"t","\u0168":"U","\u016a":"U","\u016c":"U","\u016e":"U","\u0170":"U","\u0172":"U","\u0169":"u","\u016b":"u","\u016d":"u","\u016f":"u","\u0171":"u","\u0173":"u","\u0174":"W","\u0175":"w","\u0176":"Y","\u0177":"y","\u0178":"Y","\u0179":"Z","\u017b":"Z","\u017d":"Z","\u017a":"z","\u017c":"z","\u017e":"z","\u0132":"IJ","\u0133":"ij","\u0152":"Oe","\u0153":"oe",
-"\u0149":"'n","\u017f":"s"}),et=w({"&":"&","<":"<",">":">",'"':""","'":"'"}),ut=w({"&":"&","<":"<",">":">",""":'"',"'":"'"}),it=function w(En){function On(n){if(xu(n)&&!af(n)&&!(n instanceof Mn)){if(n instanceof zn)return n;if(ci.call(n,"__wrapped__"))return Pe(n)}return new zn(n)}function Sn(){}function zn(n,t){this.__wrapped__=n,this.__actions__=[],this.__chain__=!!t,this.__index__=0,this.__values__=F}function Mn(n){this.__wrapped__=n,this.__actions__=[],this.__dir__=1,
-this.__filtered__=false,this.__iteratees__=[],this.__takeCount__=4294967295,this.__views__=[]}function Tn(n){var t=-1,r=null==n?0:n.length;for(this.clear();++t<r;){var e=n[t];this.set(e[0],e[1])}}function Nn(n){var t=-1,r=null==n?0:n.length;for(this.clear();++t<r;){var e=n[t];this.set(e[0],e[1])}}function Pn(n){var t=-1,r=null==n?0:n.length;for(this.clear();++t<r;){var e=n[t];this.set(e[0],e[1])}}function qn(n){var t=-1,r=null==n?0:n.length;for(this.__data__=new Pn;++t<r;)this.add(n[t])}function Vn(n){
-this.size=(this.__data__=new Nn(n)).size}function Gn(n,t){var r,e=af(n),u=!e&&cf(n),i=!e&&!u&&sf(n),o=!e&&!u&&!i&&gf(n),u=(e=e||u||i||o)?E(n.length,ri):[],f=u.length;for(r in n)!t&&!ci.call(n,r)||e&&("length"==r||i&&("offset"==r||"parent"==r)||o&&("buffer"==r||"byteLength"==r||"byteOffset"==r)||Re(r,f))||u.push(r);return u}function tt(n){var t=n.length;return t?n[cr(0,t-1)]:F}function ot(n,t){return Te(Mr(n),gt(t,0,n.length))}function ft(n){return Te(Mr(n))}function ct(n,t,r){(r===F||hu(n[t],r))&&(r!==F||t in n)||_t(n,t,r);
-}function at(n,t,r){var e=n[t];ci.call(n,t)&&hu(e,r)&&(r!==F||t in n)||_t(n,t,r)}function lt(n,t){for(var r=n.length;r--;)if(hu(n[r][0],t))return r;return-1}function st(n,t,r,e){return oo(n,function(n,u,i){t(e,n,r(n),i)}),e}function ht(n,t){return n&&Tr(t,Lu(t),n)}function pt(n,t){return n&&Tr(t,Uu(t),n)}function _t(n,t,r){"__proto__"==t&&Ei?Ei(n,t,{configurable:true,enumerable:true,value:r,writable:true}):n[t]=r}function vt(n,t){for(var r=-1,e=t.length,u=Hu(e),i=null==n;++r<e;)u[r]=i?F:Wu(n,t[r]);return u;
-}function gt(n,t,r){return n===n&&(r!==F&&(n=n<=r?n:r),t!==F&&(n=n>=t?n:t)),n}function dt(n,t,r,e,i,o){var f,c=1&t,a=2&t,l=4&t;if(r&&(f=i?r(n,e,i,o):r(n)),f!==F)return f;if(!bu(n))return n;if(e=af(n)){if(f=Ee(n),!c)return Mr(n,f)}else{var s=yo(n),h="[object Function]"==s||"[object GeneratorFunction]"==s;if(sf(n))return Wr(n,c);if("[object Object]"==s||"[object Arguments]"==s||h&&!i){if(f=a||h?{}:Oe(n),!c)return a?Fr(n,pt(f,n)):$r(n,ht(f,n))}else{if(!Dn[s])return i?n:{};f=Se(n,s,dt,c)}}if(o||(o=new Vn),
-i=o.get(n))return i;o.set(n,f);var a=l?a?ye:de:a?Uu:Lu,p=e?F:a(n);return u(p||n,function(e,u){p&&(u=e,e=n[u]),at(f,u,dt(e,t,r,u,n,o))}),f}function yt(n){var t=Lu(n);return function(r){return bt(r,n,t)}}function bt(n,t,r){var e=r.length;if(null==n)return!e;for(n=ni(n);e--;){var u=r[e],i=t[u],o=n[u];if(o===F&&!(u in n)||!i(o))return false}return true}function xt(n,t,r){if(typeof n!="function")throw new ei("Expected a function");return jo(function(){n.apply(F,r)},t)}function jt(n,t,r,e){var u=-1,i=c,o=true,f=n.length,s=[],h=t.length;
-if(!f)return s;r&&(t=l(t,S(r))),e?(i=a,o=false):200<=t.length&&(i=R,o=false,t=new qn(t));n:for(;++u<f;){var p=n[u],_=null==r?p:r(p),p=e||0!==p?p:0;if(o&&_===_){for(var v=h;v--;)if(t[v]===_)continue n;s.push(p)}else i(t,_,e)||s.push(p)}return s}function wt(n,t){var r=true;return oo(n,function(n,e,u){return r=!!t(n,e,u)}),r}function mt(n,t,r){for(var e=-1,u=n.length;++e<u;){var i=n[e],o=t(i);if(null!=o&&(f===F?o===o&&!Au(o):r(o,f)))var f=o,c=i}return c}function At(n,t){var r=[];return oo(n,function(n,e,u){
-t(n,e,u)&&r.push(n)}),r}function kt(n,t,r,e,u){var i=-1,o=n.length;for(r||(r=Ie),u||(u=[]);++i<o;){var f=n[i];0<t&&r(f)?1<t?kt(f,t-1,r,e,u):s(u,f):e||(u[u.length]=f)}return u}function Et(n,t){return n&&co(n,t,Lu)}function Ot(n,t){return n&&ao(n,t,Lu)}function St(n,t){return f(t,function(t){return gu(n[t])})}function It(n,t){t=Rr(t,n);for(var r=0,e=t.length;null!=n&&r<e;)n=n[$e(t[r++])];return r&&r==e?n:F}function Rt(n,t,r){return t=t(n),af(n)?t:s(t,r(n))}function zt(n){if(null==n)n=n===F?"[object Undefined]":"[object Null]";else if(ki&&ki in ni(n)){
-var t=ci.call(n,ki),r=n[ki];try{n[ki]=F;var e=true}catch(n){}var u=si.call(n);e&&(t?n[ki]=r:delete n[ki]),n=u}else n=si.call(n);return n}function Wt(n,t){return n>t}function Bt(n,t){return null!=n&&ci.call(n,t)}function Lt(n,t){return null!=n&&t in ni(n)}function Ut(n,t,r){for(var e=r?a:c,u=n[0].length,i=n.length,o=i,f=Hu(i),s=1/0,h=[];o--;){var p=n[o];o&&t&&(p=l(p,S(t))),s=Mi(p.length,s),f[o]=!r&&(t||120<=u&&120<=p.length)?new qn(o&&p):F}var p=n[0],_=-1,v=f[0];n:for(;++_<u&&h.length<s;){var g=p[_],d=t?t(g):g,g=r||0!==g?g:0;
-if(v?!R(v,d):!e(h,d,r)){for(o=i;--o;){var y=f[o];if(y?!R(y,d):!e(n[o],d,r))continue n}v&&v.push(d),h.push(g)}}return h}function Ct(n,t,r){var e={};return Et(n,function(n,u,i){t(e,r(n),u,i)}),e}function Dt(n,t,e){return t=Rr(t,n),n=2>t.length?n:It(n,vr(t,0,-1)),t=null==n?n:n[$e(Ge(t))],null==t?F:r(t,n,e)}function Mt(n){return xu(n)&&"[object Arguments]"==zt(n)}function Tt(n){return xu(n)&&"[object ArrayBuffer]"==zt(n)}function $t(n){return xu(n)&&"[object Date]"==zt(n)}function Ft(n,t,r,e,u){if(n===t)t=true;else if(null==n||null==t||!xu(n)&&!xu(t))t=n!==n&&t!==t;else n:{
-var i=af(n),o=af(t),f=i?"[object Array]":yo(n),c=o?"[object Array]":yo(t),f="[object Arguments]"==f?"[object Object]":f,c="[object Arguments]"==c?"[object Object]":c,a="[object Object]"==f,o="[object Object]"==c;if((c=f==c)&&sf(n)){if(!sf(t)){t=false;break n}i=true,a=false}if(c&&!a)u||(u=new Vn),t=i||gf(n)?_e(n,t,r,e,Ft,u):ve(n,t,f,r,e,Ft,u);else{if(!(1&r)&&(i=a&&ci.call(n,"__wrapped__"),f=o&&ci.call(t,"__wrapped__"),i||f)){n=i?n.value():n,t=f?t.value():t,u||(u=new Vn),t=Ft(n,t,r,e,u);break n}if(c)t:if(u||(u=new Vn),
-i=1&r,f=de(n),o=f.length,c=de(t).length,o==c||i){for(a=o;a--;){var l=f[a];if(!(i?l in t:ci.call(t,l))){t=false;break t}}if((c=u.get(n))&&u.get(t))t=c==t;else{c=true,u.set(n,t),u.set(t,n);for(var s=i;++a<o;){var l=f[a],h=n[l],p=t[l];if(e)var _=i?e(p,h,l,t,n,u):e(h,p,l,n,t,u);if(_===F?h!==p&&!Ft(h,p,r,e,u):!_){c=false;break}s||(s="constructor"==l)}c&&!s&&(r=n.constructor,e=t.constructor,r!=e&&"constructor"in n&&"constructor"in t&&!(typeof r=="function"&&r instanceof r&&typeof e=="function"&&e instanceof e)&&(c=false)),
-u.delete(n),u.delete(t),t=c}}else t=false;else t=false}}return t}function Nt(n){return xu(n)&&"[object Map]"==yo(n)}function Pt(n,t,r,e){var u=r.length,i=u,o=!e;if(null==n)return!i;for(n=ni(n);u--;){var f=r[u];if(o&&f[2]?f[1]!==n[f[0]]:!(f[0]in n))return false}for(;++u<i;){var f=r[u],c=f[0],a=n[c],l=f[1];if(o&&f[2]){if(a===F&&!(c in n))return false}else{if(f=new Vn,e)var s=e(a,l,c,n,t,f);if(s===F?!Ft(l,a,3,e,f):!s)return false}}return true}function Zt(n){return!(!bu(n)||li&&li in n)&&(gu(n)?_i:xn).test(Fe(n))}function qt(n){
-return xu(n)&&"[object RegExp]"==zt(n)}function Vt(n){return xu(n)&&"[object Set]"==yo(n)}function Kt(n){return xu(n)&&yu(n.length)&&!!Cn[zt(n)]}function Gt(n){return typeof n=="function"?n:null==n?Nu:typeof n=="object"?af(n)?Xt(n[0],n[1]):Qt(n):Vu(n)}function Ht(n){if(!Le(n))return Ci(n);var t,r=[];for(t in ni(n))ci.call(n,t)&&"constructor"!=t&&r.push(t);return r}function Jt(n,t){return n<t}function Yt(n,t){var r=-1,e=pu(n)?Hu(n.length):[];return oo(n,function(n,u,i){e[++r]=t(n,u,i)}),e}function Qt(n){
-var t=me(n);return 1==t.length&&t[0][2]?Ue(t[0][0],t[0][1]):function(r){return r===n||Pt(r,n,t)}}function Xt(n,t){return We(n)&&t===t&&!bu(t)?Ue($e(n),t):function(r){var e=Wu(r,n);return e===F&&e===t?Bu(r,n):Ft(t,e,3)}}function nr(n,t,r,e,u){n!==t&&co(t,function(i,o){if(bu(i)){u||(u=new Vn);var f=u,c=n[o],a=t[o],l=f.get(a);if(l)ct(n,o,l);else{var l=e?e(c,a,o+"",n,t,f):F,s=l===F;if(s){var h=af(a),p=!h&&sf(a),_=!h&&!p&&gf(a),l=a;h||p||_?af(c)?l=c:_u(c)?l=Mr(c):p?(s=false,l=Wr(a,true)):_?(s=false,l=Lr(a,true)):l=[]:wu(a)||cf(a)?(l=c,
-cf(c)?l=Ru(c):(!bu(c)||r&&gu(c))&&(l=Oe(a))):s=false}s&&(f.set(a,l),nr(l,a,r,e,f),f.delete(a)),ct(n,o,l)}}else f=e?e(n[o],i,o+"",n,t,u):F,f===F&&(f=i),ct(n,o,f)},Uu)}function tr(n,t){var r=n.length;if(r)return t+=0>t?r:0,Re(t,r)?n[t]:F}function rr(n,t,r){var e=-1;return t=l(t.length?t:[Nu],S(je())),n=Yt(n,function(n){return{a:l(t,function(t){return t(n)}),b:++e,c:n}}),A(n,function(n,t){var e;n:{e=-1;for(var u=n.a,i=t.a,o=u.length,f=r.length;++e<o;){var c=Ur(u[e],i[e]);if(c){e=e>=f?c:c*("desc"==r[e]?-1:1);
-break n}}e=n.b-t.b}return e})}function er(n,t){return ur(n,t,function(t,r){return Bu(n,r)})}function ur(n,t,r){for(var e=-1,u=t.length,i={};++e<u;){var o=t[e],f=It(n,o);r(f,o)&&pr(i,Rr(o,n),f)}return i}function ir(n){return function(t){return It(t,n)}}function or(n,t,r,e){var u=e?y:d,i=-1,o=t.length,f=n;for(n===t&&(t=Mr(t)),r&&(f=l(n,S(r)));++i<o;)for(var c=0,a=t[i],a=r?r(a):a;-1<(c=u(f,a,c,e));)f!==n&&wi.call(f,c,1),wi.call(n,c,1);return n}function fr(n,t){for(var r=n?t.length:0,e=r-1;r--;){var u=t[r];
-if(r==e||u!==i){var i=u;Re(u)?wi.call(n,u,1):mr(n,u)}}}function cr(n,t){return n+zi(Fi()*(t-n+1))}function ar(n,t){var r="";if(!n||1>t||9007199254740991<t)return r;do t%2&&(r+=n),(t=zi(t/2))&&(n+=n);while(t);return r}function lr(n,t){return wo(Ce(n,t,Nu),n+"")}function sr(n){return tt(Du(n))}function hr(n,t){var r=Du(n);return Te(r,gt(t,0,r.length))}function pr(n,t,r,e){if(!bu(n))return n;t=Rr(t,n);for(var u=-1,i=t.length,o=i-1,f=n;null!=f&&++u<i;){var c=$e(t[u]),a=r;if(u!=o){var l=f[c],a=e?e(l,c,f):F;
-a===F&&(a=bu(l)?l:Re(t[u+1])?[]:{})}at(f,c,a),f=f[c]}return n}function _r(n){return Te(Du(n))}function vr(n,t,r){var e=-1,u=n.length;for(0>t&&(t=-t>u?0:u+t),r=r>u?u:r,0>r&&(r+=u),u=t>r?0:r-t>>>0,t>>>=0,r=Hu(u);++e<u;)r[e]=n[e+t];return r}function gr(n,t){var r;return oo(n,function(n,e,u){return r=t(n,e,u),!r}),!!r}function dr(n,t,r){var e=0,u=null==n?e:n.length;if(typeof t=="number"&&t===t&&2147483647>=u){for(;e<u;){var i=e+u>>>1,o=n[i];null!==o&&!Au(o)&&(r?o<=t:o<t)?e=i+1:u=i}return u}return yr(n,t,Nu,r);
-}function yr(n,t,r,e){t=r(t);for(var u=0,i=null==n?0:n.length,o=t!==t,f=null===t,c=Au(t),a=t===F;u<i;){var l=zi((u+i)/2),s=r(n[l]),h=s!==F,p=null===s,_=s===s,v=Au(s);(o?e||_:a?_&&(e||h):f?_&&h&&(e||!p):c?_&&h&&!p&&(e||!v):p||v?0:e?s<=t:s<t)?u=l+1:i=l}return Mi(i,4294967294)}function br(n,t){for(var r=-1,e=n.length,u=0,i=[];++r<e;){var o=n[r],f=t?t(o):o;if(!r||!hu(f,c)){var c=f;i[u++]=0===o?0:o}}return i}function xr(n){return typeof n=="number"?n:Au(n)?P:+n}function jr(n){if(typeof n=="string")return n;
-if(af(n))return l(n,jr)+"";if(Au(n))return uo?uo.call(n):"";var t=n+"";return"0"==t&&1/n==-N?"-0":t}function wr(n,t,r){var e=-1,u=c,i=n.length,o=true,f=[],l=f;if(r)o=false,u=a;else if(200<=i){if(u=t?null:po(n))return D(u);o=false,u=R,l=new qn}else l=t?[]:f;n:for(;++e<i;){var s=n[e],h=t?t(s):s,s=r||0!==s?s:0;if(o&&h===h){for(var p=l.length;p--;)if(l[p]===h)continue n;t&&l.push(h),f.push(s)}else u(l,h,r)||(l!==f&&l.push(h),f.push(s))}return f}function mr(n,t){return t=Rr(t,n),n=2>t.length?n:It(n,vr(t,0,-1)),
-null==n||delete n[$e(Ge(t))]}function Ar(n,t,r,e){for(var u=n.length,i=e?u:-1;(e?i--:++i<u)&&t(n[i],i,n););return r?vr(n,e?0:i,e?i+1:u):vr(n,e?i+1:0,e?u:i)}function kr(n,t){var r=n;return r instanceof Mn&&(r=r.value()),h(t,function(n,t){return t.func.apply(t.thisArg,s([n],t.args))},r)}function Er(n,t,r){var e=n.length;if(2>e)return e?wr(n[0]):[];for(var u=-1,i=Hu(e);++u<e;)for(var o=n[u],f=-1;++f<e;)f!=u&&(i[u]=jt(i[u]||o,n[f],t,r));return wr(kt(i,1),t,r)}function Or(n,t,r){for(var e=-1,u=n.length,i=t.length,o={};++e<u;)r(o,n[e],e<i?t[e]:F);
-return o}function Sr(n){return _u(n)?n:[]}function Ir(n){return typeof n=="function"?n:Nu}function Rr(n,t){return af(n)?n:We(n,t)?[n]:mo(zu(n))}function zr(n,t,r){var e=n.length;return r=r===F?e:r,!t&&r>=e?n:vr(n,t,r)}function Wr(n,t){if(t)return n.slice();var r=n.length,r=yi?yi(r):new n.constructor(r);return n.copy(r),r}function Br(n){var t=new n.constructor(n.byteLength);return new di(t).set(new di(n)),t}function Lr(n,t){return new n.constructor(t?Br(n.buffer):n.buffer,n.byteOffset,n.length)}function Ur(n,t){
-if(n!==t){var r=n!==F,e=null===n,u=n===n,i=Au(n),o=t!==F,f=null===t,c=t===t,a=Au(t);if(!f&&!a&&!i&&n>t||i&&o&&c&&!f&&!a||e&&o&&c||!r&&c||!u)return 1;if(!e&&!i&&!a&&n<t||a&&r&&u&&!e&&!i||f&&r&&u||!o&&u||!c)return-1}return 0}function Cr(n,t,r,e){var u=-1,i=n.length,o=r.length,f=-1,c=t.length,a=Di(i-o,0),l=Hu(c+a);for(e=!e;++f<c;)l[f]=t[f];for(;++u<o;)(e||u<i)&&(l[r[u]]=n[u]);for(;a--;)l[f++]=n[u++];return l}function Dr(n,t,r,e){var u=-1,i=n.length,o=-1,f=r.length,c=-1,a=t.length,l=Di(i-f,0),s=Hu(l+a);
-for(e=!e;++u<l;)s[u]=n[u];for(l=u;++c<a;)s[l+c]=t[c];for(;++o<f;)(e||u<i)&&(s[l+r[o]]=n[u++]);return s}function Mr(n,t){var r=-1,e=n.length;for(t||(t=Hu(e));++r<e;)t[r]=n[r];return t}function Tr(n,t,r,e){var u=!r;r||(r={});for(var i=-1,o=t.length;++i<o;){var f=t[i],c=e?e(r[f],n[f],f,r,n):F;c===F&&(c=n[f]),u?_t(r,f,c):at(r,f,c)}return r}function $r(n,t){return Tr(n,vo(n),t)}function Fr(n,t){return Tr(n,go(n),t)}function Nr(n,t){return function(r,u){var i=af(r)?e:st,o=t?t():{};return i(r,n,je(u,2),o);
-}}function Pr(n){return lr(function(t,r){var e=-1,u=r.length,i=1<u?r[u-1]:F,o=2<u?r[2]:F,i=3<n.length&&typeof i=="function"?(u--,i):F;for(o&&ze(r[0],r[1],o)&&(i=3>u?F:i,u=1),t=ni(t);++e<u;)(o=r[e])&&n(t,o,e,i);return t})}function Zr(n,t){return function(r,e){if(null==r)return r;if(!pu(r))return n(r,e);for(var u=r.length,i=t?u:-1,o=ni(r);(t?i--:++i<u)&&false!==e(o[i],i,o););return r}}function qr(n){return function(t,r,e){var u=-1,i=ni(t);e=e(t);for(var o=e.length;o--;){var f=e[n?o:++u];if(false===r(i[f],f,i))break;
-}return t}}function Vr(n,t,r){function e(){return(this&&this!==Zn&&this instanceof e?i:n).apply(u?r:this,arguments)}var u=1&t,i=Hr(n);return e}function Kr(n){return function(t){t=zu(t);var r=Bn.test(t)?$(t):F,e=r?r[0]:t.charAt(0);return t=r?zr(r,1).join(""):t.slice(1),e[n]()+t}}function Gr(n){return function(t){return h($u(Tu(t).replace(In,"")),n,"")}}function Hr(n){return function(){var t=arguments;switch(t.length){case 0:return new n;case 1:return new n(t[0]);case 2:return new n(t[0],t[1]);case 3:
-return new n(t[0],t[1],t[2]);case 4:return new n(t[0],t[1],t[2],t[3]);case 5:return new n(t[0],t[1],t[2],t[3],t[4]);case 6:return new n(t[0],t[1],t[2],t[3],t[4],t[5]);case 7:return new n(t[0],t[1],t[2],t[3],t[4],t[5],t[6])}var r=io(n.prototype),t=n.apply(r,t);return bu(t)?t:r}}function Jr(n,t,e){function u(){for(var o=arguments.length,f=Hu(o),c=o,a=xe(u);c--;)f[c]=arguments[c];return c=3>o&&f[0]!==a&&f[o-1]!==a?[]:C(f,a),o-=c.length,o<e?fe(n,t,Xr,u.placeholder,F,f,c,F,F,e-o):r(this&&this!==Zn&&this instanceof u?i:n,this,f);
-}var i=Hr(n);return u}function Yr(n){return function(t,r,e){var u=ni(t);if(!pu(t)){var i=je(r,3);t=Lu(t),r=function(n){return i(u[n],n,u)}}return r=n(t,r,e),-1<r?u[i?t[r]:r]:F}}function Qr(n){return ge(function(t){var r=t.length,e=r,u=zn.prototype.thru;for(n&&t.reverse();e--;){var i=t[e];if(typeof i!="function")throw new ei("Expected a function");if(u&&!o&&"wrapper"==be(i))var o=new zn([],true)}for(e=o?e:r;++e<r;)var i=t[e],u=be(i),f="wrapper"==u?_o(i):F,o=f&&Be(f[0])&&424==f[1]&&!f[4].length&&1==f[9]?o[be(f[0])].apply(o,f[3]):1==i.length&&Be(i)?o[u]():o.thru(i);
-return function(){var n=arguments,e=n[0];if(o&&1==n.length&&af(e))return o.plant(e).value();for(var u=0,n=r?t[u].apply(this,n):e;++u<r;)n=t[u].call(this,n);return n}})}function Xr(n,t,r,e,u,i,o,f,c,a){function l(){for(var d=arguments.length,y=Hu(d),b=d;b--;)y[b]=arguments[b];if(_){var x,j=xe(l),b=y.length;for(x=0;b--;)y[b]===j&&++x}if(e&&(y=Cr(y,e,u,_)),i&&(y=Dr(y,i,o,_)),d-=x,_&&d<a)return j=C(y,j),fe(n,t,Xr,l.placeholder,r,y,j,f,c,a-d);if(j=h?r:this,b=p?j[n]:n,d=y.length,f){x=y.length;for(var w=Mi(f.length,x),m=Mr(y);w--;){
-var A=f[w];y[w]=Re(A,x)?m[A]:F}}else v&&1<d&&y.reverse();return s&&c<d&&(y.length=c),this&&this!==Zn&&this instanceof l&&(b=g||Hr(b)),b.apply(j,y)}var s=128&t,h=1&t,p=2&t,_=24&t,v=512&t,g=p?F:Hr(n);return l}function ne(n,t){return function(r,e){return Ct(r,n,t(e))}}function te(n,t){return function(r,e){var u;if(r===F&&e===F)return t;if(r!==F&&(u=r),e!==F){if(u===F)return e;typeof r=="string"||typeof e=="string"?(r=jr(r),e=jr(e)):(r=xr(r),e=xr(e)),u=n(r,e)}return u}}function re(n){return ge(function(t){
-return t=l(t,S(je())),lr(function(e){var u=this;return n(t,function(n){return r(n,u,e)})})})}function ee(n,t){t=t===F?" ":jr(t);var r=t.length;return 2>r?r?ar(t,n):t:(r=ar(t,Ri(n/T(t))),Bn.test(t)?zr($(r),0,n).join(""):r.slice(0,n))}function ue(n,t,e,u){function i(){for(var t=-1,c=arguments.length,a=-1,l=u.length,s=Hu(l+c),h=this&&this!==Zn&&this instanceof i?f:n;++a<l;)s[a]=u[a];for(;c--;)s[a++]=arguments[++t];return r(h,o?e:this,s)}var o=1&t,f=Hr(n);return i}function ie(n){return function(t,r,e){
-e&&typeof e!="number"&&ze(t,r,e)&&(r=e=F),t=Eu(t),r===F?(r=t,t=0):r=Eu(r),e=e===F?t<r?1:-1:Eu(e);var u=-1;r=Di(Ri((r-t)/(e||1)),0);for(var i=Hu(r);r--;)i[n?r:++u]=t,t+=e;return i}}function oe(n){return function(t,r){return typeof t=="string"&&typeof r=="string"||(t=Iu(t),r=Iu(r)),n(t,r)}}function fe(n,t,r,e,u,i,o,f,c,a){var l=8&t,s=l?o:F;o=l?F:o;var h=l?i:F;return i=l?F:i,t=(t|(l?32:64))&~(l?64:32),4&t||(t&=-4),u=[n,t,u,h,s,i,o,f,c,a],r=r.apply(F,u),Be(n)&&xo(r,u),r.placeholder=e,De(r,n,t)}function ce(n){
-var t=Xu[n];return function(n,r){if(n=Iu(n),r=null==r?0:Mi(Ou(r),292)){var e=(zu(n)+"e").split("e"),e=t(e[0]+"e"+(+e[1]+r)),e=(zu(e)+"e").split("e");return+(e[0]+"e"+(+e[1]-r))}return t(n)}}function ae(n){return function(t){var r=yo(t);return"[object Map]"==r?L(t):"[object Set]"==r?M(t):O(t,n(t))}}function le(n,t,r,e,u,i,o,f){var c=2&t;if(!c&&typeof n!="function")throw new ei("Expected a function");var a=e?e.length:0;if(a||(t&=-97,e=u=F),o=o===F?o:Di(Ou(o),0),f=f===F?f:Ou(f),a-=u?u.length:0,64&t){
-var l=e,s=u;e=u=F}var h=c?F:_o(n);return i=[n,t,r,e,u,l,s,i,o,f],h&&(r=i[1],n=h[1],t=r|n,e=128==n&&8==r||128==n&&256==r&&i[7].length<=h[8]||384==n&&h[7].length<=h[8]&&8==r,131>t||e)&&(1&n&&(i[2]=h[2],t|=1&r?0:4),(r=h[3])&&(e=i[3],i[3]=e?Cr(e,r,h[4]):r,i[4]=e?C(i[3],"__lodash_placeholder__"):h[4]),(r=h[5])&&(e=i[5],i[5]=e?Dr(e,r,h[6]):r,i[6]=e?C(i[5],"__lodash_placeholder__"):h[6]),(r=h[7])&&(i[7]=r),128&n&&(i[8]=null==i[8]?h[8]:Mi(i[8],h[8])),null==i[9]&&(i[9]=h[9]),i[0]=h[0],i[1]=t),n=i[0],t=i[1],
-r=i[2],e=i[3],u=i[4],f=i[9]=i[9]===F?c?0:n.length:Di(i[9]-a,0),!f&&24&t&&(t&=-25),De((h?lo:xo)(t&&1!=t?8==t||16==t?Jr(n,t,f):32!=t&&33!=t||u.length?Xr.apply(F,i):ue(n,t,r,e):Vr(n,t,r),i),n,t)}function se(n,t,r,e){return n===F||hu(n,ii[r])&&!ci.call(e,r)?t:n}function he(n,t,r,e,u,i){return bu(n)&&bu(t)&&(i.set(t,n),nr(n,t,F,he,i),i.delete(t)),n}function pe(n){return wu(n)?F:n}function _e(n,t,r,e,u,i){var o=1&r,f=n.length,c=t.length;if(f!=c&&!(o&&c>f))return false;if((c=i.get(n))&&i.get(t))return c==t;var c=-1,a=true,l=2&r?new qn:F;
-for(i.set(n,t),i.set(t,n);++c<f;){var s=n[c],h=t[c];if(e)var p=o?e(h,s,c,t,n,i):e(s,h,c,n,t,i);if(p!==F){if(p)continue;a=false;break}if(l){if(!_(t,function(n,t){if(!R(l,t)&&(s===n||u(s,n,r,e,i)))return l.push(t)})){a=false;break}}else if(s!==h&&!u(s,h,r,e,i)){a=false;break}}return i.delete(n),i.delete(t),a}function ve(n,t,r,e,u,i,o){switch(r){case"[object DataView]":if(n.byteLength!=t.byteLength||n.byteOffset!=t.byteOffset)break;n=n.buffer,t=t.buffer;case"[object ArrayBuffer]":if(n.byteLength!=t.byteLength||!i(new di(n),new di(t)))break;
-return true;case"[object Boolean]":case"[object Date]":case"[object Number]":return hu(+n,+t);case"[object Error]":return n.name==t.name&&n.message==t.message;case"[object RegExp]":case"[object String]":return n==t+"";case"[object Map]":var f=L;case"[object Set]":if(f||(f=D),n.size!=t.size&&!(1&e))break;return(r=o.get(n))?r==t:(e|=2,o.set(n,t),t=_e(f(n),f(t),e,u,i,o),o.delete(n),t);case"[object Symbol]":if(eo)return eo.call(n)==eo.call(t)}return false}function ge(n){return wo(Ce(n,F,Ve),n+"")}function de(n){
-return Rt(n,Lu,vo)}function ye(n){return Rt(n,Uu,go)}function be(n){for(var t=n.name+"",r=Ji[t],e=ci.call(Ji,t)?r.length:0;e--;){var u=r[e],i=u.func;if(null==i||i==n)return u.name}return t}function xe(n){return(ci.call(On,"placeholder")?On:n).placeholder}function je(){var n=On.iteratee||Pu,n=n===Pu?Gt:n;return arguments.length?n(arguments[0],arguments[1]):n}function we(n,t){var r=n.__data__,e=typeof t;return("string"==e||"number"==e||"symbol"==e||"boolean"==e?"__proto__"!==t:null===t)?r[typeof t=="string"?"string":"hash"]:r.map;
-}function me(n){for(var t=Lu(n),r=t.length;r--;){var e=t[r],u=n[e];t[r]=[e,u,u===u&&!bu(u)]}return t}function Ae(n,t){var r=null==n?F:n[t];return Zt(r)?r:F}function ke(n,t,r){t=Rr(t,n);for(var e=-1,u=t.length,i=false;++e<u;){var o=$e(t[e]);if(!(i=null!=n&&r(n,o)))break;n=n[o]}return i||++e!=u?i:(u=null==n?0:n.length,!!u&&yu(u)&&Re(o,u)&&(af(n)||cf(n)))}function Ee(n){var t=n.length,r=n.constructor(t);return t&&"string"==typeof n[0]&&ci.call(n,"index")&&(r.index=n.index,r.input=n.input),r}function Oe(n){
-return typeof n.constructor!="function"||Le(n)?{}:io(bi(n))}function Se(r,e,u,i){var o=r.constructor;switch(e){case"[object ArrayBuffer]":return Br(r);case"[object Boolean]":case"[object Date]":return new o(+r);case"[object DataView]":return e=i?Br(r.buffer):r.buffer,new r.constructor(e,r.byteOffset,r.byteLength);case"[object Float32Array]":case"[object Float64Array]":case"[object Int8Array]":case"[object Int16Array]":case"[object Int32Array]":case"[object Uint8Array]":case"[object Uint8ClampedArray]":
-case"[object Uint16Array]":case"[object Uint32Array]":return Lr(r,i);case"[object Map]":return e=i?u(L(r),1):L(r),h(e,n,new r.constructor);case"[object Number]":case"[object String]":return new o(r);case"[object RegExp]":return e=new r.constructor(r.source,dn.exec(r)),e.lastIndex=r.lastIndex,e;case"[object Set]":return e=i?u(D(r),1):D(r),h(e,t,new r.constructor);case"[object Symbol]":return eo?ni(eo.call(r)):{}}}function Ie(n){return af(n)||cf(n)||!!(mi&&n&&n[mi])}function Re(n,t){return t=null==t?9007199254740991:t,
-!!t&&(typeof n=="number"||wn.test(n))&&-1<n&&0==n%1&&n<t}function ze(n,t,r){if(!bu(r))return false;var e=typeof t;return!!("number"==e?pu(r)&&Re(t,r.length):"string"==e&&t in r)&&hu(r[t],n)}function We(n,t){if(af(n))return false;var r=typeof n;return!("number"!=r&&"symbol"!=r&&"boolean"!=r&&null!=n&&!Au(n))||(rn.test(n)||!tn.test(n)||null!=t&&n in ni(t))}function Be(n){var t=be(n),r=On[t];return typeof r=="function"&&t in Mn.prototype&&(n===r||(t=_o(r),!!t&&n===t[0]))}function Le(n){var t=n&&n.constructor;
-return n===(typeof t=="function"&&t.prototype||ii)}function Ue(n,t){return function(r){return null!=r&&(r[n]===t&&(t!==F||n in ni(r)))}}function Ce(n,t,e){return t=Di(t===F?n.length-1:t,0),function(){for(var u=arguments,i=-1,o=Di(u.length-t,0),f=Hu(o);++i<o;)f[i]=u[t+i];for(i=-1,o=Hu(t+1);++i<t;)o[i]=u[i];return o[t]=e(f),r(n,this,o)}}function De(n,t,r){var e=t+"";t=wo;var u,i=Ne;return u=(u=e.match(hn))?u[1].split(pn):[],r=i(u,r),(i=r.length)&&(u=i-1,r[u]=(1<i?"& ":"")+r[u],r=r.join(2<i?", ":" "),
-e=e.replace(sn,"{\n/* [wrapped with "+r+"] */\n")),t(n,e)}function Me(n){var t=0,r=0;return function(){var e=Ti(),u=16-(e-r);if(r=e,0<u){if(800<=++t)return arguments[0]}else t=0;return n.apply(F,arguments)}}function Te(n,t){var r=-1,e=n.length,u=e-1;for(t=t===F?e:t;++r<t;){var e=cr(r,u),i=n[e];n[e]=n[r],n[r]=i}return n.length=t,n}function $e(n){if(typeof n=="string"||Au(n))return n;var t=n+"";return"0"==t&&1/n==-N?"-0":t}function Fe(n){if(null!=n){try{return fi.call(n)}catch(n){}return n+""}return"";
-}function Ne(n,t){return u(Z,function(r){var e="_."+r[0];t&r[1]&&!c(n,e)&&n.push(e)}),n.sort()}function Pe(n){if(n instanceof Mn)return n.clone();var t=new zn(n.__wrapped__,n.__chain__);return t.__actions__=Mr(n.__actions__),t.__index__=n.__index__,t.__values__=n.__values__,t}function Ze(n,t,r){var e=null==n?0:n.length;return e?(r=null==r?0:Ou(r),0>r&&(r=Di(e+r,0)),g(n,je(t,3),r)):-1}function qe(n,t,r){var e=null==n?0:n.length;if(!e)return-1;var u=e-1;return r!==F&&(u=Ou(r),u=0>r?Di(e+u,0):Mi(u,e-1)),
-g(n,je(t,3),u,true)}function Ve(n){return(null==n?0:n.length)?kt(n,1):[]}function Ke(n){return n&&n.length?n[0]:F}function Ge(n){var t=null==n?0:n.length;return t?n[t-1]:F}function He(n,t){return n&&n.length&&t&&t.length?or(n,t):n}function Je(n){return null==n?n:Ni.call(n)}function Ye(n){if(!n||!n.length)return[];var t=0;return n=f(n,function(n){if(_u(n))return t=Di(n.length,t),true}),E(t,function(t){return l(n,j(t))})}function Qe(n,t){if(!n||!n.length)return[];var e=Ye(n);return null==t?e:l(e,function(n){
-return r(t,F,n)})}function Xe(n){return n=On(n),n.__chain__=true,n}function nu(n,t){return t(n)}function tu(){return this}function ru(n,t){return(af(n)?u:oo)(n,je(t,3))}function eu(n,t){return(af(n)?i:fo)(n,je(t,3))}function uu(n,t){return(af(n)?l:Yt)(n,je(t,3))}function iu(n,t,r){return t=r?F:t,t=n&&null==t?n.length:t,le(n,128,F,F,F,F,t)}function ou(n,t){var r;if(typeof t!="function")throw new ei("Expected a function");return n=Ou(n),function(){return 0<--n&&(r=t.apply(this,arguments)),1>=n&&(t=F),
-r}}function fu(n,t,r){return t=r?F:t,n=le(n,8,F,F,F,F,F,t),n.placeholder=fu.placeholder,n}function cu(n,t,r){return t=r?F:t,n=le(n,16,F,F,F,F,F,t),n.placeholder=cu.placeholder,n}function au(n,t,r){function e(t){var r=c,e=a;return c=a=F,_=t,s=n.apply(e,r)}function u(n){var r=n-p;return n-=_,p===F||r>=t||0>r||g&&n>=l}function i(){var n=Jo();if(u(n))return o(n);var r,e=jo;r=n-_,n=t-(n-p),r=g?Mi(n,l-r):n,h=e(i,r)}function o(n){return h=F,d&&c?e(n):(c=a=F,s)}function f(){var n=Jo(),r=u(n);if(c=arguments,
-a=this,p=n,r){if(h===F)return _=n=p,h=jo(i,t),v?e(n):s;if(g)return h=jo(i,t),e(p)}return h===F&&(h=jo(i,t)),s}var c,a,l,s,h,p,_=0,v=false,g=false,d=true;if(typeof n!="function")throw new ei("Expected a function");return t=Iu(t)||0,bu(r)&&(v=!!r.leading,l=(g="maxWait"in r)?Di(Iu(r.maxWait)||0,t):l,d="trailing"in r?!!r.trailing:d),f.cancel=function(){h!==F&&ho(h),_=0,c=p=a=h=F},f.flush=function(){return h===F?s:o(Jo())},f}function lu(n,t){function r(){var e=arguments,u=t?t.apply(this,e):e[0],i=r.cache;return i.has(u)?i.get(u):(e=n.apply(this,e),
-r.cache=i.set(u,e)||i,e)}if(typeof n!="function"||null!=t&&typeof t!="function")throw new ei("Expected a function");return r.cache=new(lu.Cache||Pn),r}function su(n){if(typeof n!="function")throw new ei("Expected a function");return function(){var t=arguments;switch(t.length){case 0:return!n.call(this);case 1:return!n.call(this,t[0]);case 2:return!n.call(this,t[0],t[1]);case 3:return!n.call(this,t[0],t[1],t[2])}return!n.apply(this,t)}}function hu(n,t){return n===t||n!==n&&t!==t}function pu(n){return null!=n&&yu(n.length)&&!gu(n);
-}function _u(n){return xu(n)&&pu(n)}function vu(n){if(!xu(n))return false;var t=zt(n);return"[object Error]"==t||"[object DOMException]"==t||typeof n.message=="string"&&typeof n.name=="string"&&!wu(n)}function gu(n){return!!bu(n)&&(n=zt(n),"[object Function]"==n||"[object GeneratorFunction]"==n||"[object AsyncFunction]"==n||"[object Proxy]"==n)}function du(n){return typeof n=="number"&&n==Ou(n)}function yu(n){return typeof n=="number"&&-1<n&&0==n%1&&9007199254740991>=n}function bu(n){var t=typeof n;return null!=n&&("object"==t||"function"==t);
-}function xu(n){return null!=n&&typeof n=="object"}function ju(n){return typeof n=="number"||xu(n)&&"[object Number]"==zt(n)}function wu(n){return!(!xu(n)||"[object Object]"!=zt(n))&&(n=bi(n),null===n||(n=ci.call(n,"constructor")&&n.constructor,typeof n=="function"&&n instanceof n&&fi.call(n)==hi))}function mu(n){return typeof n=="string"||!af(n)&&xu(n)&&"[object String]"==zt(n)}function Au(n){return typeof n=="symbol"||xu(n)&&"[object Symbol]"==zt(n)}function ku(n){if(!n)return[];if(pu(n))return mu(n)?$(n):Mr(n);
-if(Ai&&n[Ai]){n=n[Ai]();for(var t,r=[];!(t=n.next()).done;)r.push(t.value);return r}return t=yo(n),("[object Map]"==t?L:"[object Set]"==t?D:Du)(n)}function Eu(n){return n?(n=Iu(n),n===N||n===-N?1.7976931348623157e308*(0>n?-1:1):n===n?n:0):0===n?n:0}function Ou(n){n=Eu(n);var t=n%1;return n===n?t?n-t:n:0}function Su(n){return n?gt(Ou(n),0,4294967295):0}function Iu(n){if(typeof n=="number")return n;if(Au(n))return P;if(bu(n)&&(n=typeof n.valueOf=="function"?n.valueOf():n,n=bu(n)?n+"":n),typeof n!="string")return 0===n?n:+n;
-n=n.replace(cn,"");var t=bn.test(n);return t||jn.test(n)?Fn(n.slice(2),t?2:8):yn.test(n)?P:+n}function Ru(n){return Tr(n,Uu(n))}function zu(n){return null==n?"":jr(n)}function Wu(n,t,r){return n=null==n?F:It(n,t),n===F?r:n}function Bu(n,t){return null!=n&&ke(n,t,Lt)}function Lu(n){return pu(n)?Gn(n):Ht(n)}function Uu(n){if(pu(n))n=Gn(n,true);else if(bu(n)){var t,r=Le(n),e=[];for(t in n)("constructor"!=t||!r&&ci.call(n,t))&&e.push(t);n=e}else{if(t=[],null!=n)for(r in ni(n))t.push(r);n=t}return n}function Cu(n,t){
-if(null==n)return{};var r=l(ye(n),function(n){return[n]});return t=je(t),ur(n,r,function(n,r){return t(n,r[0])})}function Du(n){return null==n?[]:I(n,Lu(n))}function Mu(n){return Nf(zu(n).toLowerCase())}function Tu(n){return(n=zu(n))&&n.replace(mn,rt).replace(Rn,"")}function $u(n,t,r){return n=zu(n),t=r?F:t,t===F?Ln.test(n)?n.match(Wn)||[]:n.match(_n)||[]:n.match(t)||[]}function Fu(n){return function(){return n}}function Nu(n){return n}function Pu(n){return Gt(typeof n=="function"?n:dt(n,1))}function Zu(n,t,r){
-var e=Lu(t),i=St(t,e);null!=r||bu(t)&&(i.length||!e.length)||(r=t,t=n,n=this,i=St(t,Lu(t)));var o=!(bu(r)&&"chain"in r&&!r.chain),f=gu(n);return u(i,function(r){var e=t[r];n[r]=e,f&&(n.prototype[r]=function(){var t=this.__chain__;if(o||t){var r=n(this.__wrapped__);return(r.__actions__=Mr(this.__actions__)).push({func:e,args:arguments,thisArg:n}),r.__chain__=t,r}return e.apply(n,s([this.value()],arguments))})}),n}function qu(){}function Vu(n){return We(n)?j($e(n)):ir(n)}function Ku(){return[]}function Gu(){
-return false}En=null==En?Zn:it.defaults(Zn.Object(),En,it.pick(Zn,Un));var Hu=En.Array,Ju=En.Date,Yu=En.Error,Qu=En.Function,Xu=En.Math,ni=En.Object,ti=En.RegExp,ri=En.String,ei=En.TypeError,ui=Hu.prototype,ii=ni.prototype,oi=En["__core-js_shared__"],fi=Qu.prototype.toString,ci=ii.hasOwnProperty,ai=0,li=function(){var n=/[^.]+$/.exec(oi&&oi.keys&&oi.keys.IE_PROTO||"");return n?"Symbol(src)_1."+n:""}(),si=ii.toString,hi=fi.call(ni),pi=Zn._,_i=ti("^"+fi.call(ci).replace(on,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),vi=Kn?En.Buffer:F,gi=En.Symbol,di=En.Uint8Array,yi=vi?vi.f:F,bi=U(ni.getPrototypeOf,ni),xi=ni.create,ji=ii.propertyIsEnumerable,wi=ui.splice,mi=gi?gi.isConcatSpreadable:F,Ai=gi?gi.iterator:F,ki=gi?gi.toStringTag:F,Ei=function(){
-try{var n=Ae(ni,"defineProperty");return n({},"",{}),n}catch(n){}}(),Oi=En.clearTimeout!==Zn.clearTimeout&&En.clearTimeout,Si=Ju&&Ju.now!==Zn.Date.now&&Ju.now,Ii=En.setTimeout!==Zn.setTimeout&&En.setTimeout,Ri=Xu.ceil,zi=Xu.floor,Wi=ni.getOwnPropertySymbols,Bi=vi?vi.isBuffer:F,Li=En.isFinite,Ui=ui.join,Ci=U(ni.keys,ni),Di=Xu.max,Mi=Xu.min,Ti=Ju.now,$i=En.parseInt,Fi=Xu.random,Ni=ui.reverse,Pi=Ae(En,"DataView"),Zi=Ae(En,"Map"),qi=Ae(En,"Promise"),Vi=Ae(En,"Set"),Ki=Ae(En,"WeakMap"),Gi=Ae(ni,"create"),Hi=Ki&&new Ki,Ji={},Yi=Fe(Pi),Qi=Fe(Zi),Xi=Fe(qi),no=Fe(Vi),to=Fe(Ki),ro=gi?gi.prototype:F,eo=ro?ro.valueOf:F,uo=ro?ro.toString:F,io=function(){
-function n(){}return function(t){return bu(t)?xi?xi(t):(n.prototype=t,t=new n,n.prototype=F,t):{}}}();On.templateSettings={escape:Q,evaluate:X,interpolate:nn,variable:"",imports:{_:On}},On.prototype=Sn.prototype,On.prototype.constructor=On,zn.prototype=io(Sn.prototype),zn.prototype.constructor=zn,Mn.prototype=io(Sn.prototype),Mn.prototype.constructor=Mn,Tn.prototype.clear=function(){this.__data__=Gi?Gi(null):{},this.size=0},Tn.prototype.delete=function(n){return n=this.has(n)&&delete this.__data__[n],
-this.size-=n?1:0,n},Tn.prototype.get=function(n){var t=this.__data__;return Gi?(n=t[n],"__lodash_hash_undefined__"===n?F:n):ci.call(t,n)?t[n]:F},Tn.prototype.has=function(n){var t=this.__data__;return Gi?t[n]!==F:ci.call(t,n)},Tn.prototype.set=function(n,t){var r=this.__data__;return this.size+=this.has(n)?0:1,r[n]=Gi&&t===F?"__lodash_hash_undefined__":t,this},Nn.prototype.clear=function(){this.__data__=[],this.size=0},Nn.prototype.delete=function(n){var t=this.__data__;return n=lt(t,n),!(0>n)&&(n==t.length-1?t.pop():wi.call(t,n,1),
---this.size,true)},Nn.prototype.get=function(n){var t=this.__data__;return n=lt(t,n),0>n?F:t[n][1]},Nn.prototype.has=function(n){return-1<lt(this.__data__,n)},Nn.prototype.set=function(n,t){var r=this.__data__,e=lt(r,n);return 0>e?(++this.size,r.push([n,t])):r[e][1]=t,this},Pn.prototype.clear=function(){this.size=0,this.__data__={hash:new Tn,map:new(Zi||Nn),string:new Tn}},Pn.prototype.delete=function(n){return n=we(this,n).delete(n),this.size-=n?1:0,n},Pn.prototype.get=function(n){return we(this,n).get(n);
-},Pn.prototype.has=function(n){return we(this,n).has(n)},Pn.prototype.set=function(n,t){var r=we(this,n),e=r.size;return r.set(n,t),this.size+=r.size==e?0:1,this},qn.prototype.add=qn.prototype.push=function(n){return this.__data__.set(n,"__lodash_hash_undefined__"),this},qn.prototype.has=function(n){return this.__data__.has(n)},Vn.prototype.clear=function(){this.__data__=new Nn,this.size=0},Vn.prototype.delete=function(n){var t=this.__data__;return n=t.delete(n),this.size=t.size,n},Vn.prototype.get=function(n){
-return this.__data__.get(n)},Vn.prototype.has=function(n){return this.__data__.has(n)},Vn.prototype.set=function(n,t){var r=this.__data__;if(r instanceof Nn){var e=r.__data__;if(!Zi||199>e.length)return e.push([n,t]),this.size=++r.size,this;r=this.__data__=new Pn(e)}return r.set(n,t),this.size=r.size,this};var oo=Zr(Et),fo=Zr(Ot,true),co=qr(),ao=qr(true),lo=Hi?function(n,t){return Hi.set(n,t),n}:Nu,so=Ei?function(n,t){return Ei(n,"toString",{configurable:true,enumerable:false,value:Fu(t),writable:true})}:Nu,ho=Oi||function(n){
-return Zn.clearTimeout(n)},po=Vi&&1/D(new Vi([,-0]))[1]==N?function(n){return new Vi(n)}:qu,_o=Hi?function(n){return Hi.get(n)}:qu,vo=Wi?function(n){return null==n?[]:(n=ni(n),f(Wi(n),function(t){return ji.call(n,t)}))}:Ku,go=Wi?function(n){for(var t=[];n;)s(t,vo(n)),n=bi(n);return t}:Ku,yo=zt;(Pi&&"[object DataView]"!=yo(new Pi(new ArrayBuffer(1)))||Zi&&"[object Map]"!=yo(new Zi)||qi&&"[object Promise]"!=yo(qi.resolve())||Vi&&"[object Set]"!=yo(new Vi)||Ki&&"[object WeakMap]"!=yo(new Ki))&&(yo=function(n){
-var t=zt(n);if(n=(n="[object Object]"==t?n.constructor:F)?Fe(n):"")switch(n){case Yi:return"[object DataView]";case Qi:return"[object Map]";case Xi:return"[object Promise]";case no:return"[object Set]";case to:return"[object WeakMap]"}return t});var bo=oi?gu:Gu,xo=Me(lo),jo=Ii||function(n,t){return Zn.setTimeout(n,t)},wo=Me(so),mo=function(n){n=lu(n,function(n){return 500===t.size&&t.clear(),n});var t=n.cache;return n}(function(n){var t=[];return en.test(n)&&t.push(""),n.replace(un,function(n,r,e,u){
-t.push(e?u.replace(vn,"$1"):r||n)}),t}),Ao=lr(function(n,t){return _u(n)?jt(n,kt(t,1,_u,true)):[]}),ko=lr(function(n,t){var r=Ge(t);return _u(r)&&(r=F),_u(n)?jt(n,kt(t,1,_u,true),je(r,2)):[]}),Eo=lr(function(n,t){var r=Ge(t);return _u(r)&&(r=F),_u(n)?jt(n,kt(t,1,_u,true),F,r):[]}),Oo=lr(function(n){var t=l(n,Sr);return t.length&&t[0]===n[0]?Ut(t):[]}),So=lr(function(n){var t=Ge(n),r=l(n,Sr);return t===Ge(r)?t=F:r.pop(),r.length&&r[0]===n[0]?Ut(r,je(t,2)):[]}),Io=lr(function(n){var t=Ge(n),r=l(n,Sr);return(t=typeof t=="function"?t:F)&&r.pop(),
-r.length&&r[0]===n[0]?Ut(r,F,t):[]}),Ro=lr(He),zo=ge(function(n,t){var r=null==n?0:n.length,e=vt(n,t);return fr(n,l(t,function(n){return Re(n,r)?+n:n}).sort(Ur)),e}),Wo=lr(function(n){return wr(kt(n,1,_u,true))}),Bo=lr(function(n){var t=Ge(n);return _u(t)&&(t=F),wr(kt(n,1,_u,true),je(t,2))}),Lo=lr(function(n){var t=Ge(n),t=typeof t=="function"?t:F;return wr(kt(n,1,_u,true),F,t)}),Uo=lr(function(n,t){return _u(n)?jt(n,t):[]}),Co=lr(function(n){return Er(f(n,_u))}),Do=lr(function(n){var t=Ge(n);return _u(t)&&(t=F),
-Er(f(n,_u),je(t,2))}),Mo=lr(function(n){var t=Ge(n),t=typeof t=="function"?t:F;return Er(f(n,_u),F,t)}),To=lr(Ye),$o=lr(function(n){var t=n.length,t=1<t?n[t-1]:F,t=typeof t=="function"?(n.pop(),t):F;return Qe(n,t)}),Fo=ge(function(n){function t(t){return vt(t,n)}var r=n.length,e=r?n[0]:0,u=this.__wrapped__;return!(1<r||this.__actions__.length)&&u instanceof Mn&&Re(e)?(u=u.slice(e,+e+(r?1:0)),u.__actions__.push({func:nu,args:[t],thisArg:F}),new zn(u,this.__chain__).thru(function(n){return r&&!n.length&&n.push(F),
-n})):this.thru(t)}),No=Nr(function(n,t,r){ci.call(n,r)?++n[r]:_t(n,r,1)}),Po=Yr(Ze),Zo=Yr(qe),qo=Nr(function(n,t,r){ci.call(n,r)?n[r].push(t):_t(n,r,[t])}),Vo=lr(function(n,t,e){var u=-1,i=typeof t=="function",o=pu(n)?Hu(n.length):[];return oo(n,function(n){o[++u]=i?r(t,n,e):Dt(n,t,e)}),o}),Ko=Nr(function(n,t,r){_t(n,r,t)}),Go=Nr(function(n,t,r){n[r?0:1].push(t)},function(){return[[],[]]}),Ho=lr(function(n,t){if(null==n)return[];var r=t.length;return 1<r&&ze(n,t[0],t[1])?t=[]:2<r&&ze(t[0],t[1],t[2])&&(t=[t[0]]),
-rr(n,kt(t,1),[])}),Jo=Si||function(){return Zn.Date.now()},Yo=lr(function(n,t,r){var e=1;if(r.length)var u=C(r,xe(Yo)),e=32|e;return le(n,e,t,r,u)}),Qo=lr(function(n,t,r){var e=3;if(r.length)var u=C(r,xe(Qo)),e=32|e;return le(t,e,n,r,u)}),Xo=lr(function(n,t){return xt(n,1,t)}),nf=lr(function(n,t,r){return xt(n,Iu(t)||0,r)});lu.Cache=Pn;var tf=lr(function(n,t){t=1==t.length&&af(t[0])?l(t[0],S(je())):l(kt(t,1),S(je()));var e=t.length;return lr(function(u){for(var i=-1,o=Mi(u.length,e);++i<o;)u[i]=t[i].call(this,u[i]);
-return r(n,this,u)})}),rf=lr(function(n,t){return le(n,32,F,t,C(t,xe(rf)))}),ef=lr(function(n,t){return le(n,64,F,t,C(t,xe(ef)))}),uf=ge(function(n,t){return le(n,256,F,F,F,t)}),of=oe(Wt),ff=oe(function(n,t){return n>=t}),cf=Mt(function(){return arguments}())?Mt:function(n){return xu(n)&&ci.call(n,"callee")&&!ji.call(n,"callee")},af=Hu.isArray,lf=Hn?S(Hn):Tt,sf=Bi||Gu,hf=Jn?S(Jn):$t,pf=Yn?S(Yn):Nt,_f=Qn?S(Qn):qt,vf=Xn?S(Xn):Vt,gf=nt?S(nt):Kt,df=oe(Jt),yf=oe(function(n,t){return n<=t}),bf=Pr(function(n,t){
-if(Le(t)||pu(t))Tr(t,Lu(t),n);else for(var r in t)ci.call(t,r)&&at(n,r,t[r])}),xf=Pr(function(n,t){Tr(t,Uu(t),n)}),jf=Pr(function(n,t,r,e){Tr(t,Uu(t),n,e)}),wf=Pr(function(n,t,r,e){Tr(t,Lu(t),n,e)}),mf=ge(vt),Af=lr(function(n){return n.push(F,se),r(jf,F,n)}),kf=lr(function(n){return n.push(F,he),r(Rf,F,n)}),Ef=ne(function(n,t,r){n[t]=r},Fu(Nu)),Of=ne(function(n,t,r){ci.call(n,t)?n[t].push(r):n[t]=[r]},je),Sf=lr(Dt),If=Pr(function(n,t,r){nr(n,t,r)}),Rf=Pr(function(n,t,r,e){nr(n,t,r,e)}),zf=ge(function(n,t){
-var r={};if(null==n)return r;var e=false;t=l(t,function(t){return t=Rr(t,n),e||(e=1<t.length),t}),Tr(n,ye(n),r),e&&(r=dt(r,7,pe));for(var u=t.length;u--;)mr(r,t[u]);return r}),Wf=ge(function(n,t){return null==n?{}:er(n,t)}),Bf=ae(Lu),Lf=ae(Uu),Uf=Gr(function(n,t,r){return t=t.toLowerCase(),n+(r?Mu(t):t)}),Cf=Gr(function(n,t,r){return n+(r?"-":"")+t.toLowerCase()}),Df=Gr(function(n,t,r){return n+(r?" ":"")+t.toLowerCase()}),Mf=Kr("toLowerCase"),Tf=Gr(function(n,t,r){return n+(r?"_":"")+t.toLowerCase();
-}),$f=Gr(function(n,t,r){return n+(r?" ":"")+Nf(t)}),Ff=Gr(function(n,t,r){return n+(r?" ":"")+t.toUpperCase()}),Nf=Kr("toUpperCase"),Pf=lr(function(n,t){try{return r(n,F,t)}catch(n){return vu(n)?n:new Yu(n)}}),Zf=ge(function(n,t){return u(t,function(t){t=$e(t),_t(n,t,Yo(n[t],n))}),n}),qf=Qr(),Vf=Qr(true),Kf=lr(function(n,t){return function(r){return Dt(r,n,t)}}),Gf=lr(function(n,t){return function(r){return Dt(n,r,t)}}),Hf=re(l),Jf=re(o),Yf=re(_),Qf=ie(),Xf=ie(true),nc=te(function(n,t){return n+t},0),tc=ce("ceil"),rc=te(function(n,t){
-return n/t},1),ec=ce("floor"),uc=te(function(n,t){return n*t},1),ic=ce("round"),oc=te(function(n,t){return n-t},0);return On.after=function(n,t){if(typeof t!="function")throw new ei("Expected a function");return n=Ou(n),function(){if(1>--n)return t.apply(this,arguments)}},On.ary=iu,On.assign=bf,On.assignIn=xf,On.assignInWith=jf,On.assignWith=wf,On.at=mf,On.before=ou,On.bind=Yo,On.bindAll=Zf,On.bindKey=Qo,On.castArray=function(){if(!arguments.length)return[];var n=arguments[0];return af(n)?n:[n]},
-On.chain=Xe,On.chunk=function(n,t,r){if(t=(r?ze(n,t,r):t===F)?1:Di(Ou(t),0),r=null==n?0:n.length,!r||1>t)return[];for(var e=0,u=0,i=Hu(Ri(r/t));e<r;)i[u++]=vr(n,e,e+=t);return i},On.compact=function(n){for(var t=-1,r=null==n?0:n.length,e=0,u=[];++t<r;){var i=n[t];i&&(u[e++]=i)}return u},On.concat=function(){var n=arguments.length;if(!n)return[];for(var t=Hu(n-1),r=arguments[0];n--;)t[n-1]=arguments[n];return s(af(r)?Mr(r):[r],kt(t,1))},On.cond=function(n){var t=null==n?0:n.length,e=je();return n=t?l(n,function(n){
-if("function"!=typeof n[1])throw new ei("Expected a function");return[e(n[0]),n[1]]}):[],lr(function(e){for(var u=-1;++u<t;){var i=n[u];if(r(i[0],this,e))return r(i[1],this,e)}})},On.conforms=function(n){return yt(dt(n,1))},On.constant=Fu,On.countBy=No,On.create=function(n,t){var r=io(n);return null==t?r:ht(r,t)},On.curry=fu,On.curryRight=cu,On.debounce=au,On.defaults=Af,On.defaultsDeep=kf,On.defer=Xo,On.delay=nf,On.difference=Ao,On.differenceBy=ko,On.differenceWith=Eo,On.drop=function(n,t,r){var e=null==n?0:n.length;
-return e?(t=r||t===F?1:Ou(t),vr(n,0>t?0:t,e)):[]},On.dropRight=function(n,t,r){var e=null==n?0:n.length;return e?(t=r||t===F?1:Ou(t),t=e-t,vr(n,0,0>t?0:t)):[]},On.dropRightWhile=function(n,t){return n&&n.length?Ar(n,je(t,3),true,true):[]},On.dropWhile=function(n,t){return n&&n.length?Ar(n,je(t,3),true):[]},On.fill=function(n,t,r,e){var u=null==n?0:n.length;if(!u)return[];for(r&&typeof r!="number"&&ze(n,t,r)&&(r=0,e=u),u=n.length,r=Ou(r),0>r&&(r=-r>u?0:u+r),e=e===F||e>u?u:Ou(e),0>e&&(e+=u),e=r>e?0:Su(e);r<e;)n[r++]=t;
-return n},On.filter=function(n,t){return(af(n)?f:At)(n,je(t,3))},On.flatMap=function(n,t){return kt(uu(n,t),1)},On.flatMapDeep=function(n,t){return kt(uu(n,t),N)},On.flatMapDepth=function(n,t,r){return r=r===F?1:Ou(r),kt(uu(n,t),r)},On.flatten=Ve,On.flattenDeep=function(n){return(null==n?0:n.length)?kt(n,N):[]},On.flattenDepth=function(n,t){return null!=n&&n.length?(t=t===F?1:Ou(t),kt(n,t)):[]},On.flip=function(n){return le(n,512)},On.flow=qf,On.flowRight=Vf,On.fromPairs=function(n){for(var t=-1,r=null==n?0:n.length,e={};++t<r;){
-var u=n[t];e[u[0]]=u[1]}return e},On.functions=function(n){return null==n?[]:St(n,Lu(n))},On.functionsIn=function(n){return null==n?[]:St(n,Uu(n))},On.groupBy=qo,On.initial=function(n){return(null==n?0:n.length)?vr(n,0,-1):[]},On.intersection=Oo,On.intersectionBy=So,On.intersectionWith=Io,On.invert=Ef,On.invertBy=Of,On.invokeMap=Vo,On.iteratee=Pu,On.keyBy=Ko,On.keys=Lu,On.keysIn=Uu,On.map=uu,On.mapKeys=function(n,t){var r={};return t=je(t,3),Et(n,function(n,e,u){_t(r,t(n,e,u),n)}),r},On.mapValues=function(n,t){
-var r={};return t=je(t,3),Et(n,function(n,e,u){_t(r,e,t(n,e,u))}),r},On.matches=function(n){return Qt(dt(n,1))},On.matchesProperty=function(n,t){return Xt(n,dt(t,1))},On.memoize=lu,On.merge=If,On.mergeWith=Rf,On.method=Kf,On.methodOf=Gf,On.mixin=Zu,On.negate=su,On.nthArg=function(n){return n=Ou(n),lr(function(t){return tr(t,n)})},On.omit=zf,On.omitBy=function(n,t){return Cu(n,su(je(t)))},On.once=function(n){return ou(2,n)},On.orderBy=function(n,t,r,e){return null==n?[]:(af(t)||(t=null==t?[]:[t]),
-r=e?F:r,af(r)||(r=null==r?[]:[r]),rr(n,t,r))},On.over=Hf,On.overArgs=tf,On.overEvery=Jf,On.overSome=Yf,On.partial=rf,On.partialRight=ef,On.partition=Go,On.pick=Wf,On.pickBy=Cu,On.property=Vu,On.propertyOf=function(n){return function(t){return null==n?F:It(n,t)}},On.pull=Ro,On.pullAll=He,On.pullAllBy=function(n,t,r){return n&&n.length&&t&&t.length?or(n,t,je(r,2)):n},On.pullAllWith=function(n,t,r){return n&&n.length&&t&&t.length?or(n,t,F,r):n},On.pullAt=zo,On.range=Qf,On.rangeRight=Xf,On.rearg=uf,On.reject=function(n,t){
-return(af(n)?f:At)(n,su(je(t,3)))},On.remove=function(n,t){var r=[];if(!n||!n.length)return r;var e=-1,u=[],i=n.length;for(t=je(t,3);++e<i;){var o=n[e];t(o,e,n)&&(r.push(o),u.push(e))}return fr(n,u),r},On.rest=function(n,t){if(typeof n!="function")throw new ei("Expected a function");return t=t===F?t:Ou(t),lr(n,t)},On.reverse=Je,On.sampleSize=function(n,t,r){return t=(r?ze(n,t,r):t===F)?1:Ou(t),(af(n)?ot:hr)(n,t)},On.set=function(n,t,r){return null==n?n:pr(n,t,r)},On.setWith=function(n,t,r,e){return e=typeof e=="function"?e:F,
-null==n?n:pr(n,t,r,e)},On.shuffle=function(n){return(af(n)?ft:_r)(n)},On.slice=function(n,t,r){var e=null==n?0:n.length;return e?(r&&typeof r!="number"&&ze(n,t,r)?(t=0,r=e):(t=null==t?0:Ou(t),r=r===F?e:Ou(r)),vr(n,t,r)):[]},On.sortBy=Ho,On.sortedUniq=function(n){return n&&n.length?br(n):[]},On.sortedUniqBy=function(n,t){return n&&n.length?br(n,je(t,2)):[]},On.split=function(n,t,r){return r&&typeof r!="number"&&ze(n,t,r)&&(t=r=F),r=r===F?4294967295:r>>>0,r?(n=zu(n))&&(typeof t=="string"||null!=t&&!_f(t))&&(t=jr(t),
-!t&&Bn.test(n))?zr($(n),0,r):n.split(t,r):[]},On.spread=function(n,t){if(typeof n!="function")throw new ei("Expected a function");return t=null==t?0:Di(Ou(t),0),lr(function(e){var u=e[t];return e=zr(e,0,t),u&&s(e,u),r(n,this,e)})},On.tail=function(n){var t=null==n?0:n.length;return t?vr(n,1,t):[]},On.take=function(n,t,r){return n&&n.length?(t=r||t===F?1:Ou(t),vr(n,0,0>t?0:t)):[]},On.takeRight=function(n,t,r){var e=null==n?0:n.length;return e?(t=r||t===F?1:Ou(t),t=e-t,vr(n,0>t?0:t,e)):[]},On.takeRightWhile=function(n,t){
-return n&&n.length?Ar(n,je(t,3),false,true):[]},On.takeWhile=function(n,t){return n&&n.length?Ar(n,je(t,3)):[]},On.tap=function(n,t){return t(n),n},On.throttle=function(n,t,r){var e=true,u=true;if(typeof n!="function")throw new ei("Expected a function");return bu(r)&&(e="leading"in r?!!r.leading:e,u="trailing"in r?!!r.trailing:u),au(n,t,{leading:e,maxWait:t,trailing:u})},On.thru=nu,On.toArray=ku,On.toPairs=Bf,On.toPairsIn=Lf,On.toPath=function(n){return af(n)?l(n,$e):Au(n)?[n]:Mr(mo(zu(n)))},On.toPlainObject=Ru,
-On.transform=function(n,t,r){var e=af(n),i=e||sf(n)||gf(n);if(t=je(t,4),null==r){var o=n&&n.constructor;r=i?e?new o:[]:bu(n)&&gu(o)?io(bi(n)):{}}return(i?u:Et)(n,function(n,e,u){return t(r,n,e,u)}),r},On.unary=function(n){return iu(n,1)},On.union=Wo,On.unionBy=Bo,On.unionWith=Lo,On.uniq=function(n){return n&&n.length?wr(n):[]},On.uniqBy=function(n,t){return n&&n.length?wr(n,je(t,2)):[]},On.uniqWith=function(n,t){return t=typeof t=="function"?t:F,n&&n.length?wr(n,F,t):[]},On.unset=function(n,t){return null==n||mr(n,t);
-},On.unzip=Ye,On.unzipWith=Qe,On.update=function(n,t,r){return null==n?n:pr(n,t,Ir(r)(It(n,t)),void 0)},On.updateWith=function(n,t,r,e){return e=typeof e=="function"?e:F,null!=n&&(n=pr(n,t,Ir(r)(It(n,t)),e)),n},On.values=Du,On.valuesIn=function(n){return null==n?[]:I(n,Uu(n))},On.without=Uo,On.words=$u,On.wrap=function(n,t){return rf(Ir(t),n)},On.xor=Co,On.xorBy=Do,On.xorWith=Mo,On.zip=To,On.zipObject=function(n,t){return Or(n||[],t||[],at)},On.zipObjectDeep=function(n,t){return Or(n||[],t||[],pr);
-},On.zipWith=$o,On.entries=Bf,On.entriesIn=Lf,On.extend=xf,On.extendWith=jf,Zu(On,On),On.add=nc,On.attempt=Pf,On.camelCase=Uf,On.capitalize=Mu,On.ceil=tc,On.clamp=function(n,t,r){return r===F&&(r=t,t=F),r!==F&&(r=Iu(r),r=r===r?r:0),t!==F&&(t=Iu(t),t=t===t?t:0),gt(Iu(n),t,r)},On.clone=function(n){return dt(n,4)},On.cloneDeep=function(n){return dt(n,5)},On.cloneDeepWith=function(n,t){return t=typeof t=="function"?t:F,dt(n,5,t)},On.cloneWith=function(n,t){return t=typeof t=="function"?t:F,dt(n,4,t)},
-On.conformsTo=function(n,t){return null==t||bt(n,t,Lu(t))},On.deburr=Tu,On.defaultTo=function(n,t){return null==n||n!==n?t:n},On.divide=rc,On.endsWith=function(n,t,r){n=zu(n),t=jr(t);var e=n.length,e=r=r===F?e:gt(Ou(r),0,e);return r-=t.length,0<=r&&n.slice(r,e)==t},On.eq=hu,On.escape=function(n){return(n=zu(n))&&Y.test(n)?n.replace(H,et):n},On.escapeRegExp=function(n){return(n=zu(n))&&fn.test(n)?n.replace(on,"\\$&"):n},On.every=function(n,t,r){var e=af(n)?o:wt;return r&&ze(n,t,r)&&(t=F),e(n,je(t,3));
-},On.find=Po,On.findIndex=Ze,On.findKey=function(n,t){return v(n,je(t,3),Et)},On.findLast=Zo,On.findLastIndex=qe,On.findLastKey=function(n,t){return v(n,je(t,3),Ot)},On.floor=ec,On.forEach=ru,On.forEachRight=eu,On.forIn=function(n,t){return null==n?n:co(n,je(t,3),Uu)},On.forInRight=function(n,t){return null==n?n:ao(n,je(t,3),Uu)},On.forOwn=function(n,t){return n&&Et(n,je(t,3))},On.forOwnRight=function(n,t){return n&&Ot(n,je(t,3))},On.get=Wu,On.gt=of,On.gte=ff,On.has=function(n,t){return null!=n&&ke(n,t,Bt);
-},On.hasIn=Bu,On.head=Ke,On.identity=Nu,On.includes=function(n,t,r,e){return n=pu(n)?n:Du(n),r=r&&!e?Ou(r):0,e=n.length,0>r&&(r=Di(e+r,0)),mu(n)?r<=e&&-1<n.indexOf(t,r):!!e&&-1<d(n,t,r)},On.indexOf=function(n,t,r){var e=null==n?0:n.length;return e?(r=null==r?0:Ou(r),0>r&&(r=Di(e+r,0)),d(n,t,r)):-1},On.inRange=function(n,t,r){return t=Eu(t),r===F?(r=t,t=0):r=Eu(r),n=Iu(n),n>=Mi(t,r)&&n<Di(t,r)},On.invoke=Sf,On.isArguments=cf,On.isArray=af,On.isArrayBuffer=lf,On.isArrayLike=pu,On.isArrayLikeObject=_u,
-On.isBoolean=function(n){return true===n||false===n||xu(n)&&"[object Boolean]"==zt(n)},On.isBuffer=sf,On.isDate=hf,On.isElement=function(n){return xu(n)&&1===n.nodeType&&!wu(n)},On.isEmpty=function(n){if(null==n)return true;if(pu(n)&&(af(n)||typeof n=="string"||typeof n.splice=="function"||sf(n)||gf(n)||cf(n)))return!n.length;var t=yo(n);if("[object Map]"==t||"[object Set]"==t)return!n.size;if(Le(n))return!Ht(n).length;for(var r in n)if(ci.call(n,r))return false;return true},On.isEqual=function(n,t){return Ft(n,t);
-},On.isEqualWith=function(n,t,r){var e=(r=typeof r=="function"?r:F)?r(n,t):F;return e===F?Ft(n,t,F,r):!!e},On.isError=vu,On.isFinite=function(n){return typeof n=="number"&&Li(n)},On.isFunction=gu,On.isInteger=du,On.isLength=yu,On.isMap=pf,On.isMatch=function(n,t){return n===t||Pt(n,t,me(t))},On.isMatchWith=function(n,t,r){return r=typeof r=="function"?r:F,Pt(n,t,me(t),r)},On.isNaN=function(n){return ju(n)&&n!=+n},On.isNative=function(n){if(bo(n))throw new Yu("Unsupported core-js use. Try https://npms.io/search?q=ponyfill.");
-return Zt(n)},On.isNil=function(n){return null==n},On.isNull=function(n){return null===n},On.isNumber=ju,On.isObject=bu,On.isObjectLike=xu,On.isPlainObject=wu,On.isRegExp=_f,On.isSafeInteger=function(n){return du(n)&&-9007199254740991<=n&&9007199254740991>=n},On.isSet=vf,On.isString=mu,On.isSymbol=Au,On.isTypedArray=gf,On.isUndefined=function(n){return n===F},On.isWeakMap=function(n){return xu(n)&&"[object WeakMap]"==yo(n)},On.isWeakSet=function(n){return xu(n)&&"[object WeakSet]"==zt(n)},On.join=function(n,t){
-return null==n?"":Ui.call(n,t)},On.kebabCase=Cf,On.last=Ge,On.lastIndexOf=function(n,t,r){var e=null==n?0:n.length;if(!e)return-1;var u=e;if(r!==F&&(u=Ou(r),u=0>u?Di(e+u,0):Mi(u,e-1)),t===t){for(r=u+1;r--&&n[r]!==t;);n=r}else n=g(n,b,u,true);return n},On.lowerCase=Df,On.lowerFirst=Mf,On.lt=df,On.lte=yf,On.max=function(n){return n&&n.length?mt(n,Nu,Wt):F},On.maxBy=function(n,t){return n&&n.length?mt(n,je(t,2),Wt):F},On.mean=function(n){return x(n,Nu)},On.meanBy=function(n,t){return x(n,je(t,2))},On.min=function(n){
-return n&&n.length?mt(n,Nu,Jt):F},On.minBy=function(n,t){return n&&n.length?mt(n,je(t,2),Jt):F},On.stubArray=Ku,On.stubFalse=Gu,On.stubObject=function(){return{}},On.stubString=function(){return""},On.stubTrue=function(){return true},On.multiply=uc,On.nth=function(n,t){return n&&n.length?tr(n,Ou(t)):F},On.noConflict=function(){return Zn._===this&&(Zn._=pi),this},On.noop=qu,On.now=Jo,On.pad=function(n,t,r){n=zu(n);var e=(t=Ou(t))?T(n):0;return!t||e>=t?n:(t=(t-e)/2,ee(zi(t),r)+n+ee(Ri(t),r))},On.padEnd=function(n,t,r){
-n=zu(n);var e=(t=Ou(t))?T(n):0;return t&&e<t?n+ee(t-e,r):n},On.padStart=function(n,t,r){n=zu(n);var e=(t=Ou(t))?T(n):0;return t&&e<t?ee(t-e,r)+n:n},On.parseInt=function(n,t,r){return r||null==t?t=0:t&&(t=+t),$i(zu(n).replace(an,""),t||0)},On.random=function(n,t,r){if(r&&typeof r!="boolean"&&ze(n,t,r)&&(t=r=F),r===F&&(typeof t=="boolean"?(r=t,t=F):typeof n=="boolean"&&(r=n,n=F)),n===F&&t===F?(n=0,t=1):(n=Eu(n),t===F?(t=n,n=0):t=Eu(t)),n>t){var e=n;n=t,t=e}return r||n%1||t%1?(r=Fi(),Mi(n+r*(t-n+$n("1e-"+((r+"").length-1))),t)):cr(n,t);
-},On.reduce=function(n,t,r){var e=af(n)?h:m,u=3>arguments.length;return e(n,je(t,4),r,u,oo)},On.reduceRight=function(n,t,r){var e=af(n)?p:m,u=3>arguments.length;return e(n,je(t,4),r,u,fo)},On.repeat=function(n,t,r){return t=(r?ze(n,t,r):t===F)?1:Ou(t),ar(zu(n),t)},On.replace=function(){var n=arguments,t=zu(n[0]);return 3>n.length?t:t.replace(n[1],n[2])},On.result=function(n,t,r){t=Rr(t,n);var e=-1,u=t.length;for(u||(u=1,n=F);++e<u;){var i=null==n?F:n[$e(t[e])];i===F&&(e=u,i=r),n=gu(i)?i.call(n):i;
-}return n},On.round=ic,On.runInContext=w,On.sample=function(n){return(af(n)?tt:sr)(n)},On.size=function(n){if(null==n)return 0;if(pu(n))return mu(n)?T(n):n.length;var t=yo(n);return"[object Map]"==t||"[object Set]"==t?n.size:Ht(n).length},On.snakeCase=Tf,On.some=function(n,t,r){var e=af(n)?_:gr;return r&&ze(n,t,r)&&(t=F),e(n,je(t,3))},On.sortedIndex=function(n,t){return dr(n,t)},On.sortedIndexBy=function(n,t,r){return yr(n,t,je(r,2))},On.sortedIndexOf=function(n,t){var r=null==n?0:n.length;if(r){
-var e=dr(n,t);if(e<r&&hu(n[e],t))return e}return-1},On.sortedLastIndex=function(n,t){return dr(n,t,true)},On.sortedLastIndexBy=function(n,t,r){return yr(n,t,je(r,2),true)},On.sortedLastIndexOf=function(n,t){if(null==n?0:n.length){var r=dr(n,t,true)-1;if(hu(n[r],t))return r}return-1},On.startCase=$f,On.startsWith=function(n,t,r){return n=zu(n),r=null==r?0:gt(Ou(r),0,n.length),t=jr(t),n.slice(r,r+t.length)==t},On.subtract=oc,On.sum=function(n){return n&&n.length?k(n,Nu):0},On.sumBy=function(n,t){return n&&n.length?k(n,je(t,2)):0;
-},On.template=function(n,t,r){var e=On.templateSettings;r&&ze(n,t,r)&&(t=F),n=zu(n),t=jf({},t,e,se),r=jf({},t.imports,e.imports,se);var u,i,o=Lu(r),f=I(r,o),c=0;r=t.interpolate||An;var a="__p+='";r=ti((t.escape||An).source+"|"+r.source+"|"+(r===nn?gn:An).source+"|"+(t.evaluate||An).source+"|$","g");var l="sourceURL"in t?"//# sourceURL="+t.sourceURL+"\n":"";if(n.replace(r,function(t,r,e,o,f,l){return e||(e=o),a+=n.slice(c,l).replace(kn,B),r&&(u=true,a+="'+__e("+r+")+'"),f&&(i=true,a+="';"+f+";\n__p+='"),
-e&&(a+="'+((__t=("+e+"))==null?'':__t)+'"),c=l+t.length,t}),a+="';",(t=t.variable)||(a="with(obj){"+a+"}"),a=(i?a.replace(q,""):a).replace(V,"$1").replace(K,"$1;"),a="function("+(t||"obj")+"){"+(t?"":"obj||(obj={});")+"var __t,__p=''"+(u?",__e=_.escape":"")+(i?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+a+"return __p}",t=Pf(function(){return Qu(o,l+"return "+a).apply(F,f)}),t.source=a,vu(t))throw t;return t},On.times=function(n,t){if(n=Ou(n),1>n||9007199254740991<n)return[];
-var r=4294967295,e=Mi(n,4294967295);for(t=je(t),n-=4294967295,e=E(e,t);++r<n;)t(r);return e},On.toFinite=Eu,On.toInteger=Ou,On.toLength=Su,On.toLower=function(n){return zu(n).toLowerCase()},On.toNumber=Iu,On.toSafeInteger=function(n){return n?gt(Ou(n),-9007199254740991,9007199254740991):0===n?n:0},On.toString=zu,On.toUpper=function(n){return zu(n).toUpperCase()},On.trim=function(n,t,r){return(n=zu(n))&&(r||t===F)?n.replace(cn,""):n&&(t=jr(t))?(n=$(n),r=$(t),t=z(n,r),r=W(n,r)+1,zr(n,t,r).join("")):n;
-},On.trimEnd=function(n,t,r){return(n=zu(n))&&(r||t===F)?n.replace(ln,""):n&&(t=jr(t))?(n=$(n),t=W(n,$(t))+1,zr(n,0,t).join("")):n},On.trimStart=function(n,t,r){return(n=zu(n))&&(r||t===F)?n.replace(an,""):n&&(t=jr(t))?(n=$(n),t=z(n,$(t)),zr(n,t).join("")):n},On.truncate=function(n,t){var r=30,e="...";if(bu(t))var u="separator"in t?t.separator:u,r="length"in t?Ou(t.length):r,e="omission"in t?jr(t.omission):e;n=zu(n);var i=n.length;if(Bn.test(n))var o=$(n),i=o.length;if(r>=i)return n;if(i=r-T(e),1>i)return e;
-if(r=o?zr(o,0,i).join(""):n.slice(0,i),u===F)return r+e;if(o&&(i+=r.length-i),_f(u)){if(n.slice(i).search(u)){var f=r;for(u.global||(u=ti(u.source,zu(dn.exec(u))+"g")),u.lastIndex=0;o=u.exec(f);)var c=o.index;r=r.slice(0,c===F?i:c)}}else n.indexOf(jr(u),i)!=i&&(u=r.lastIndexOf(u),-1<u&&(r=r.slice(0,u)));return r+e},On.unescape=function(n){return(n=zu(n))&&J.test(n)?n.replace(G,ut):n},On.uniqueId=function(n){var t=++ai;return zu(n)+t},On.upperCase=Ff,On.upperFirst=Nf,On.each=ru,On.eachRight=eu,On.first=Ke,
-Zu(On,function(){var n={};return Et(On,function(t,r){ci.call(On.prototype,r)||(n[r]=t)}),n}(),{chain:false}),On.VERSION="4.17.4",u("bind bindKey curry curryRight partial partialRight".split(" "),function(n){On[n].placeholder=On}),u(["drop","take"],function(n,t){Mn.prototype[n]=function(r){r=r===F?1:Di(Ou(r),0);var e=this.__filtered__&&!t?new Mn(this):this.clone();return e.__filtered__?e.__takeCount__=Mi(r,e.__takeCount__):e.__views__.push({size:Mi(r,4294967295),type:n+(0>e.__dir__?"Right":"")}),e},Mn.prototype[n+"Right"]=function(t){
-return this.reverse()[n](t).reverse()}}),u(["filter","map","takeWhile"],function(n,t){var r=t+1,e=1==r||3==r;Mn.prototype[n]=function(n){var t=this.clone();return t.__iteratees__.push({iteratee:je(n,3),type:r}),t.__filtered__=t.__filtered__||e,t}}),u(["head","last"],function(n,t){var r="take"+(t?"Right":"");Mn.prototype[n]=function(){return this[r](1).value()[0]}}),u(["initial","tail"],function(n,t){var r="drop"+(t?"":"Right");Mn.prototype[n]=function(){return this.__filtered__?new Mn(this):this[r](1);
-}}),Mn.prototype.compact=function(){return this.filter(Nu)},Mn.prototype.find=function(n){return this.filter(n).head()},Mn.prototype.findLast=function(n){return this.reverse().find(n)},Mn.prototype.invokeMap=lr(function(n,t){return typeof n=="function"?new Mn(this):this.map(function(r){return Dt(r,n,t)})}),Mn.prototype.reject=function(n){return this.filter(su(je(n)))},Mn.prototype.slice=function(n,t){n=Ou(n);var r=this;return r.__filtered__&&(0<n||0>t)?new Mn(r):(0>n?r=r.takeRight(-n):n&&(r=r.drop(n)),
-t!==F&&(t=Ou(t),r=0>t?r.dropRight(-t):r.take(t-n)),r)},Mn.prototype.takeRightWhile=function(n){return this.reverse().takeWhile(n).reverse()},Mn.prototype.toArray=function(){return this.take(4294967295)},Et(Mn.prototype,function(n,t){var r=/^(?:filter|find|map|reject)|While$/.test(t),e=/^(?:head|last)$/.test(t),u=On[e?"take"+("last"==t?"Right":""):t],i=e||/^find/.test(t);u&&(On.prototype[t]=function(){function t(n){return n=u.apply(On,s([n],f)),e&&h?n[0]:n}var o=this.__wrapped__,f=e?[1]:arguments,c=o instanceof Mn,a=f[0],l=c||af(o);
-l&&r&&typeof a=="function"&&1!=a.length&&(c=l=false);var h=this.__chain__,p=!!this.__actions__.length,a=i&&!h,c=c&&!p;return!i&&l?(o=c?o:new Mn(this),o=n.apply(o,f),o.__actions__.push({func:nu,args:[t],thisArg:F}),new zn(o,h)):a&&c?n.apply(this,f):(o=this.thru(t),a?e?o.value()[0]:o.value():o)})}),u("pop push shift sort splice unshift".split(" "),function(n){var t=ui[n],r=/^(?:push|sort|unshift)$/.test(n)?"tap":"thru",e=/^(?:pop|shift)$/.test(n);On.prototype[n]=function(){var n=arguments;if(e&&!this.__chain__){
-var u=this.value();return t.apply(af(u)?u:[],n)}return this[r](function(r){return t.apply(af(r)?r:[],n)})}}),Et(Mn.prototype,function(n,t){var r=On[t];if(r){var e=r.name+"";(Ji[e]||(Ji[e]=[])).push({name:t,func:r})}}),Ji[Xr(F,2).name]=[{name:"wrapper",func:F}],Mn.prototype.clone=function(){var n=new Mn(this.__wrapped__);return n.__actions__=Mr(this.__actions__),n.__dir__=this.__dir__,n.__filtered__=this.__filtered__,n.__iteratees__=Mr(this.__iteratees__),n.__takeCount__=this.__takeCount__,n.__views__=Mr(this.__views__),
-n},Mn.prototype.reverse=function(){if(this.__filtered__){var n=new Mn(this);n.__dir__=-1,n.__filtered__=true}else n=this.clone(),n.__dir__*=-1;return n},Mn.prototype.value=function(){var n,t=this.__wrapped__.value(),r=this.__dir__,e=af(t),u=0>r,i=e?t.length:0;n=i;for(var o=this.__views__,f=0,c=-1,a=o.length;++c<a;){var l=o[c],s=l.size;switch(l.type){case"drop":f+=s;break;case"dropRight":n-=s;break;case"take":n=Mi(n,f+s);break;case"takeRight":f=Di(f,n-s)}}if(n={start:f,end:n},o=n.start,f=n.end,n=f-o,
-o=u?f:o-1,f=this.__iteratees__,c=f.length,a=0,l=Mi(n,this.__takeCount__),!e||!u&&i==n&&l==n)return kr(t,this.__actions__);e=[];n:for(;n--&&a<l;){for(o+=r,u=-1,i=t[o];++u<c;){var h=f[u],s=h.type,h=(0,h.iteratee)(i);if(2==s)i=h;else if(!h){if(1==s)continue n;break n}}e[a++]=i}return e},On.prototype.at=Fo,On.prototype.chain=function(){return Xe(this)},On.prototype.commit=function(){return new zn(this.value(),this.__chain__)},On.prototype.next=function(){this.__values__===F&&(this.__values__=ku(this.value()));
-var n=this.__index__>=this.__values__.length;return{done:n,value:n?F:this.__values__[this.__index__++]}},On.prototype.plant=function(n){for(var t,r=this;r instanceof Sn;){var e=Pe(r);e.__index__=0,e.__values__=F,t?u.__wrapped__=e:t=e;var u=e,r=r.__wrapped__}return u.__wrapped__=n,t},On.prototype.reverse=function(){var n=this.__wrapped__;return n instanceof Mn?(this.__actions__.length&&(n=new Mn(this)),n=n.reverse(),n.__actions__.push({func:nu,args:[Je],thisArg:F}),new zn(n,this.__chain__)):this.thru(Je);
-},On.prototype.toJSON=On.prototype.valueOf=On.prototype.value=function(){return kr(this.__wrapped__,this.__actions__)},On.prototype.first=On.prototype.head,Ai&&(On.prototype[Ai]=tu),On}();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(Zn._=it, define(function(){return it})):Vn?((Vn.exports=it)._=it,qn._=it):Zn._=it}).call(this);
-
-// https://d3js.org Version 4.8.0. Copyright 2017 Mike Bostock.
-(function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports):"function"==typeof define&&define.amd?define(["exports"],n):n(t.d3=t.d3||{})})(this,function(t){"use strict";function n(t){return function(n,e){return Rs(t(n),e)}}function e(t,n){return[t,n]}function r(t,n,e){var r=(n-t)/Math.max(0,e),i=Math.floor(Math.log(r)/Math.LN10),o=r/Math.pow(10,i);return i>=0?(o>=Qs?10:o>=Ks?5:o>=tf?2:1)*Math.pow(10,i):-Math.pow(10,-i)/(o>=Qs?10:o>=Ks?5:o>=tf?2:1)}function i(t,n,e){var r=Math.abs(n-t)/Math.max(0,e),i=Math.pow(10,Math.floor(Math.log(r)/Math.LN10)),o=r/i;return o>=Qs?i*=10:o>=Ks?i*=5:o>=tf&&(i*=2),n<t?-i:i}function o(t){return t.length}function u(t){return"translate("+t+",0)"}function a(t){return"translate(0,"+t+")"}function c(t){var n=t.bandwidth()/2;return t.round()&&(n=Math.round(n)),function(e){return t(e)+n}}function s(){return!this.__axis}function f(t,n){function e(e){var u=null==o?n.ticks?n.ticks.apply(n,i):n.domain():o,a=null==f?n.tickFormat?n.tickFormat.apply(n,i):xf:f,g=Math.max(l,0)+p,y=n.range(),m=y[0]+.5,x=y[y.length-1]+.5,b=(n.bandwidth?c:xf)(n.copy()),w=e.selection?e.selection():e,M=w.selectAll(".domain").data([null]),T=w.selectAll(".tick").data(u,n).order(),S=T.exit(),N=T.enter().append("g").attr("class","tick"),k=T.select("line"),E=T.select("text");M=M.merge(M.enter().insert("path",".tick").attr("class","domain").attr("stroke","#000")),T=T.merge(N),k=k.merge(N.append("line").attr("stroke","#000").attr(r+"2",d*l).attr(v+"1",.5).attr(v+"2",.5)),E=E.merge(N.append("text").attr("fill","#000").attr(r,d*g).attr(v,.5).attr("dy",t===bf?"0em":t===Mf?"0.71em":"0.32em")),e!==w&&(M=M.transition(e),T=T.transition(e),k=k.transition(e),E=E.transition(e),S=S.transition(e).attr("opacity",Sf).attr("transform",function(t){return isFinite(t=b(t))?_(t):this.getAttribute("transform")}),N.attr("opacity",Sf).attr("transform",function(t){var n=this.parentNode.__axis;return _(n&&isFinite(n=n(t))?n:b(t))})),S.remove(),M.attr("d",t===Tf||t==wf?"M"+d*h+","+m+"H0.5V"+x+"H"+d*h:"M"+m+","+d*h+"V0.5H"+x+"V"+d*h),T.attr("opacity",1).attr("transform",function(t){return _(b(t))}),k.attr(r+"2",d*l),E.attr(r,d*g).text(a),w.filter(s).attr("fill","none").attr("font-size",10).attr("font-family","sans-serif").attr("text-anchor",t===wf?"start":t===Tf?"end":"middle"),w.each(function(){this.__axis=b})}var r,i=[],o=null,f=null,l=6,h=6,p=3,d=t===bf||t===Tf?-1:1,v=t===Tf||t===wf?(r="x","y"):(r="y","x"),_=t===bf||t===Mf?u:a;return e.scale=function(t){return arguments.length?(n=t,e):n},e.ticks=function(){return i=mf.call(arguments),e},e.tickArguments=function(t){return arguments.length?(i=null==t?[]:mf.call(t),e):i.slice()},e.tickValues=function(t){return arguments.length?(o=null==t?null:mf.call(t),e):o&&o.slice()},e.tickFormat=function(t){return arguments.length?(f=t,e):f},e.tickSize=function(t){return arguments.length?(l=h=+t,e):l},e.tickSizeInner=function(t){return arguments.length?(l=+t,e):l},e.tickSizeOuter=function(t){return arguments.length?(h=+t,e):h},e.tickPadding=function(t){return arguments.length?(p=+t,e):p},e}function l(t){return f(bf,t)}function h(t){return f(wf,t)}function p(t){return f(Mf,t)}function d(t){return f(Tf,t)}function v(){for(var t,n=0,e=arguments.length,r={};n<e;++n){if(!(t=arguments[n]+"")||t in r)throw new Error("illegal type: "+t);r[t]=[]}return new _(r)}function _(t){this._=t}function g(t,n){return t.trim().split(/^|\s+/).map(function(t){var e="",r=t.indexOf(".");if(r>=0&&(e=t.slice(r+1),t=t.slice(0,r)),t&&!n.hasOwnProperty(t))throw new Error("unknown type: "+t);return{type:t,name:e}})}function y(t,n){for(var e,r=0,i=t.length;r<i;++r)if((e=t[r]).name===n)return e.value}function m(t,n,e){for(var r=0,i=t.length;r<i;++r)if(t[r].name===n){t[r]=Nf,t=t.slice(0,r).concat(t.slice(r+1));break}return null!=e&&t.push({name:n,value:e}),t}function x(t){return function(){var n=this.ownerDocument,e=this.namespaceURI;return e===kf&&n.documentElement.namespaceURI===kf?n.createElement(t):n.createElementNS(e,t)}}function b(t){return function(){return this.ownerDocument.createElementNS(t.space,t.local)}}function w(){return new M}function M(){this._="@"+(++zf).toString(36)}function T(t,n,e){return t=S(t,n,e),function(n){var e=n.relatedTarget;e&&(e===this||8&e.compareDocumentPosition(this))||t.call(this,n)}}function S(n,e,r){return function(i){var o=t.event;t.event=i;try{n.call(this,this.__data__,e,r)}finally{t.event=o}}}function N(t){return t.trim().split(/^|\s+/).map(function(t){var n="",e=t.indexOf(".");return e>=0&&(n=t.slice(e+1),t=t.slice(0,e)),{type:t,name:n}})}function k(t){return function(){var n=this.__on;if(n){for(var e,r=0,i=-1,o=n.length;r<o;++r)e=n[r],t.type&&e.type!==t.type||e.name!==t.name?n[++i]=e:this.removeEventListener(e.type,e.listener,e.capture);++i?n.length=i:delete this.__on}}}function E(t,n,e){var r=Uf.hasOwnProperty(t.type)?T:S;return function(i,o,u){var a,c=this.__on,s=r(n,o,u);if(c)for(var f=0,l=c.length;f<l;++f)if((a=c[f]).type===t.type&&a.name===t.name)return this.removeEventListener(a.type,a.listener,a.capture),this.addEventListener(a.type,a.listener=s,a.capture=e),void(a.value=n);this.addEventListener(t.type,s,e),a={type:t.type,name:t.name,value:n,listener:s,capture:e},c?c.push(a):this.__on=[a]}}function A(n,e,r,i){var o=t.event;n.sourceEvent=t.event,t.event=n;try{return e.apply(r,i)}finally{t.event=o}}function C(){}function z(){return[]}function P(t,n){this.ownerDocument=t.ownerDocument,this.namespaceURI=t.namespaceURI,this._next=null,this._parent=t,this.__data__=n}function L(t,n,e,r,i,o){for(var u,a=0,c=n.length,s=o.length;a<s;++a)(u=n[a])?(u.__data__=o[a],r[a]=u):e[a]=new P(t,o[a]);for(;a<c;++a)(u=n[a])&&(i[a]=u)}function R(t,n,e,r,i,o,u){var a,c,s,f={},l=n.length,h=o.length,p=new Array(l);for(a=0;a<l;++a)(c=n[a])&&(p[a]=s=Zf+u.call(c,c.__data__,a,n),s in f?i[a]=c:f[s]=c);for(a=0;a<h;++a)s=Zf+u.call(t,o[a],a,o),(c=f[s])?(r[a]=c,c.__data__=o[a],f[s]=null):e[a]=new P(t,o[a]);for(a=0;a<l;++a)(c=n[a])&&f[p[a]]===c&&(i[a]=c)}function q(t,n){return t<n?-1:t>n?1:t>=n?0:NaN}function U(t){return function(){this.removeAttribute(t)}}function D(t){return function(){this.removeAttributeNS(t.space,t.local)}}function O(t,n){return function(){this.setAttribute(t,n)}}function F(t,n){return function(){this.setAttributeNS(t.space,t.local,n)}}function I(t,n){return function(){var e=n.apply(this,arguments);null==e?this.removeAttribute(t):this.setAttribute(t,e)}}function Y(t,n){return function(){var e=n.apply(this,arguments);null==e?this.removeAttributeNS(t.space,t.local):this.setAttributeNS(t.space,t.local,e)}}function B(t){return function(){this.style.removeProperty(t)}}function j(t,n,e){return function(){this.style.setProperty(t,n,e)}}function H(t,n,e){return function(){var r=n.apply(this,arguments);null==r?this.style.removeProperty(t):this.style.setProperty(t,r,e)}}function X(t){return function(){delete this[t]}}function V(t,n){return function(){this[t]=n}}function $(t,n){return function(){var e=n.apply(this,arguments);null==e?delete this[t]:this[t]=e}}function W(t){return t.trim().split(/^|\s+/)}function Z(t){return t.classList||new G(t)}function G(t){this._node=t,this._names=W(t.getAttribute("class")||"")}function J(t,n){for(var e=Z(t),r=-1,i=n.length;++r<i;)e.add(n[r])}function Q(t,n){for(var e=Z(t),r=-1,i=n.length;++r<i;)e.remove(n[r])}function K(t){return function(){J(this,t)}}function tt(t){return function(){Q(this,t)}}function nt(t,n){return function(){(n.apply(this,arguments)?J:Q)(this,t)}}function et(){this.textContent=""}function rt(t){return function(){this.textContent=t}}function it(t){return function(){var n=t.apply(this,arguments);this.textContent=null==n?"":n}}function ot(){this.innerHTML=""}function ut(t){return function(){this.innerHTML=t}}function at(t){return function(){var n=t.apply(this,arguments);this.innerHTML=null==n?"":n}}function ct(){this.nextSibling&&this.parentNode.appendChild(this)}function st(){this.previousSibling&&this.parentNode.insertBefore(this,this.parentNode.firstChild)}function ft(){return null}function lt(){var t=this.parentNode;t&&t.removeChild(this)}function ht(t,n,e){var r=cl(t),i=r.CustomEvent;i?i=new i(n,e):(i=r.document.createEvent("Event"),e?(i.initEvent(n,e.bubbles,e.cancelable),i.detail=e.detail):i.initEvent(n,!1,!1)),t.dispatchEvent(i)}function pt(t,n){return function(){return ht(this,t,n)}}function dt(t,n){return function(){return ht(this,t,n.apply(this,arguments))}}function vt(t,n){this._groups=t,this._parents=n}function _t(){return new vt([[document.documentElement]],bl)}function gt(){t.event.stopImmediatePropagation()}function yt(t,n){var e=t.document.documentElement,r=wl(t).on("dragstart.drag",null);n&&(r.on("click.drag",Nl,!0),setTimeout(function(){r.on("click.drag",null)},0)),"onselectstart"in e?r.on("selectstart.drag",null):(e.style.MozUserSelect=e.__noselect,delete e.__noselect)}function mt(t,n,e,r,i,o,u,a,c,s){this.target=t,this.type=n,this.subject=e,this.identifier=r,this.active=i,this.x=o,this.y=u,this.dx=a,this.dy=c,this._=s}function xt(){return!t.event.button}function bt(){return this.parentNode}function wt(n){return null==n?{x:t.event.x,y:t.event.y}:n}function Mt(t,n){var e=Object.create(t.prototype);for(var r in n)e[r]=n[r];return e}function Tt(){}function St(t){var n;return t=(t+"").trim().toLowerCase(),(n=Rl.exec(t))?(n=parseInt(n[1],16),new Ct(n>>8&15|n>>4&240,n>>4&15|240&n,(15&n)<<4|15&n,1)):(n=ql.exec(t))?Nt(parseInt(n[1],16)):(n=Ul.exec(t))?new Ct(n[1],n[2],n[3],1):(n=Dl.exec(t))?new Ct(255*n[1]/100,255*n[2]/100,255*n[3]/100,1):(n=Ol.exec(t))?kt(n[1],n[2],n[3],n[4]):(n=Fl.exec(t))?kt(255*n[1]/100,255*n[2]/100,255*n[3]/100,n[4]):(n=Il.exec(t))?zt(n[1],n[2]/100,n[3]/100,1):(n=Yl.exec(t))?zt(n[1],n[2]/100,n[3]/100,n[4]):Bl.hasOwnProperty(t)?Nt(Bl[t]):"transparent"===t?new Ct(NaN,NaN,NaN,0):null}function Nt(t){return new Ct(t>>16&255,t>>8&255,255&t,1)}function kt(t,n,e,r){return r<=0&&(t=n=e=NaN),new Ct(t,n,e,r)}function Et(t){return t instanceof Tt||(t=St(t)),t?(t=t.rgb(),new Ct(t.r,t.g,t.b,t.opacity)):new Ct}function At(t,n,e,r){return 1===arguments.length?Et(t):new Ct(t,n,e,null==r?1:r)}function Ct(t,n,e,r){this.r=+t,this.g=+n,this.b=+e,this.opacity=+r}function zt(t,n,e,r){return r<=0?t=n=e=NaN:e<=0||e>=1?t=n=NaN:n<=0&&(t=NaN),new Rt(t,n,e,r)}function Pt(t){if(t instanceof Rt)return new Rt(t.h,t.s,t.l,t.opacity);if(t instanceof Tt||(t=St(t)),!t)return new Rt;if(t instanceof Rt)return t;t=t.rgb();var n=t.r/255,e=t.g/255,r=t.b/255,i=Math.min(n,e,r),o=Math.max(n,e,r),u=NaN,a=o-i,c=(o+i)/2;return a?(u=n===o?(e-r)/a+6*(e<r):e===o?(r-n)/a+2:(n-e)/a+4,a/=c<.5?o+i:2-o-i,u*=60):a=c>0&&c<1?0:u,new Rt(u,a,c,t.opacity)}function Lt(t,n,e,r){return 1===arguments.length?Pt(t):new Rt(t,n,e,null==r?1:r)}function Rt(t,n,e,r){this.h=+t,this.s=+n,this.l=+e,this.opacity=+r}function qt(t,n,e){return 255*(t<60?n+(e-n)*t/60:t<180?e:t<240?n+(e-n)*(240-t)/60:n)}function Ut(t){if(t instanceof Ot)return new Ot(t.l,t.a,t.b,t.opacity);if(t instanceof Xt){var n=t.h*jl;return new Ot(t.l,Math.cos(n)*t.c,Math.sin(n)*t.c,t.opacity)}t instanceof Ct||(t=Et(t));var e=Bt(t.r),r=Bt(t.g),i=Bt(t.b),o=Ft((.4124564*e+.3575761*r+.1804375*i)/Xl),u=Ft((.2126729*e+.7151522*r+.072175*i)/Vl);return new Ot(116*u-16,500*(o-u),200*(u-Ft((.0193339*e+.119192*r+.9503041*i)/$l)),t.opacity)}function Dt(t,n,e,r){return 1===arguments.length?Ut(t):new Ot(t,n,e,null==r?1:r)}function Ot(t,n,e,r){this.l=+t,this.a=+n,this.b=+e,this.opacity=+r}function Ft(t){return t>Jl?Math.pow(t,1/3):t/Gl+Wl}function It(t){return t>Zl?t*t*t:Gl*(t-Wl)}function Yt(t){return 255*(t<=.0031308?12.92*t:1.055*Math.pow(t,1/2.4)-.055)}function Bt(t){return(t/=255)<=.04045?t/12.92:Math.pow((t+.055)/1.055,2.4)}function jt(t){if(t instanceof Xt)return new Xt(t.h,t.c,t.l,t.opacity);t instanceof Ot||(t=Ut(t));var n=Math.atan2(t.b,t.a)*Hl;return new Xt(n<0?n+360:n,Math.sqrt(t.a*t.a+t.b*t.b),t.l,t.opacity)}function Ht(t,n,e,r){return 1===arguments.length?jt(t):new Xt(t,n,e,null==r?1:r)}function Xt(t,n,e,r){this.h=+t,this.c=+n,this.l=+e,this.opacity=+r}function Vt(t){if(t instanceof Wt)return new Wt(t.h,t.s,t.l,t.opacity);t instanceof Ct||(t=Et(t));var n=t.r/255,e=t.g/255,r=t.b/255,i=(oh*r+rh*n-ih*e)/(oh+rh-ih),o=r-i,u=(eh*(e-i)-th*o)/nh,a=Math.sqrt(u*u+o*o)/(eh*i*(1-i)),c=a?Math.atan2(u,o)*Hl-120:NaN;return new Wt(c<0?c+360:c,a,i,t.opacity)}function $t(t,n,e,r){return 1===arguments.length?Vt(t):new Wt(t,n,e,null==r?1:r)}function Wt(t,n,e,r){this.h=+t,this.s=+n,this.l=+e,this.opacity=+r}function Zt(t,n,e,r,i){var o=t*t,u=o*t;return((1-3*t+3*o-u)*n+(4-6*o+3*u)*e+(1+3*t+3*o-3*u)*r+u*i)/6}function Gt(t,n){return function(e){return t+e*n}}function Jt(t,n,e){return t=Math.pow(t,e),n=Math.pow(n,e)-t,e=1/e,function(r){return Math.pow(t+r*n,e)}}function Qt(t,n){var e=n-t;return e?Gt(t,e>180||e<-180?e-360*Math.round(e/360):e):dh(isNaN(t)?n:t)}function Kt(t){return 1==(t=+t)?tn:function(n,e){return e-n?Jt(n,e,t):dh(isNaN(n)?e:n)}}function tn(t,n){var e=n-t;return e?Gt(t,e):dh(isNaN(t)?n:t)}function nn(t){return function(n){var e,r,i=n.length,o=new Array(i),u=new Array(i),a=new Array(i);for(e=0;e<i;++e)r=At(n[e]),o[e]=r.r||0,u[e]=r.g||0,a[e]=r.b||0;return o=t(o),u=t(u),a=t(a),r.opacity=1,function(t){return r.r=o(t),r.g=u(t),r.b=a(t),r+""}}}function en(t){return function(){return t}}function rn(t){return function(n){return t(n)+""}}function on(t){return"none"===t?Eh:(uh||(uh=document.createElement("DIV"),ah=document.documentElement,ch=document.defaultView),uh.style.transform=t,t=ch.getComputedStyle(ah.appendChild(uh),null).getPropertyValue("transform"),ah.removeChild(uh),t=t.slice(7,-1).split(","),Ah(+t[0],+t[1],+t[2],+t[3],+t[4],+t[5]))}function un(t){return null==t?Eh:(sh||(sh=document.createElementNS("http://www.w3.org/2000/svg","g")),sh.setAttribute("transform",t),(t=sh.transform.baseVal.consolidate())?(t=t.matrix,Ah(t.a,t.b,t.c,t.d,t.e,t.f)):Eh)}function an(t,n,e,r){function i(t){return t.length?t.pop()+" ":""}function o(t,r,i,o,u,a){if(t!==i||r!==o){var c=u.push("translate(",null,n,null,e);a.push({i:c-4,x:xh(t,i)},{i:c-2,x:xh(r,o)})}else(i||o)&&u.push("translate("+i+n+o+e)}function u(t,n,e,o){t!==n?(t-n>180?n+=360:n-t>180&&(t+=360),o.push({i:e.push(i(e)+"rotate(",null,r)-2,x:xh(t,n)})):n&&e.push(i(e)+"rotate("+n+r)}function a(t,n,e,o){t!==n?o.push({i:e.push(i(e)+"skewX(",null,r)-2,x:xh(t,n)}):n&&e.push(i(e)+"skewX("+n+r)}function c(t,n,e,r,o,u){if(t!==e||n!==r){var a=o.push(i(o)+"scale(",null,",",null,")");u.push({i:a-4,x:xh(t,e)},{i:a-2,x:xh(n,r)})}else 1===e&&1===r||o.push(i(o)+"scale("+e+","+r+")")}return function(n,e){var r=[],i=[];return n=t(n),e=t(e),o(n.translateX,n.translateY,e.translateX,e.translateY,r,i),u(n.rotate,e.rotate,r,i),a(n.skewX,e.skewX,r,i),c(n.scaleX,n.scaleY,e.scaleX,e.scaleY,r,i),n=e=null,function(t){for(var n,e=-1,o=i.length;++e<o;)r[(n=i[e]).i]=n.x(t);return r.join("")}}}function cn(t){return((t=Math.exp(t))+1/t)/2}function sn(t){return((t=Math.exp(t))-1/t)/2}function fn(t){return((t=Math.exp(2*t))-1)/(t+1)}function ln(t){return function(n,e){var r=t((n=Lt(n)).h,(e=Lt(e)).h),i=tn(n.s,e.s),o=tn(n.l,e.l),u=tn(n.opacity,e.opacity);return function(t){return n.h=r(t),n.s=i(t),n.l=o(t),n.opacity=u(t),n+""}}}function hn(t,n){var e=tn((t=Dt(t)).l,(n=Dt(n)).l),r=tn(t.a,n.a),i=tn(t.b,n.b),o=tn(t.opacity,n.opacity);return function(n){return t.l=e(n),t.a=r(n),t.b=i(n),t.opacity=o(n),t+""}}function pn(t){return function(n,e){var r=t((n=Ht(n)).h,(e=Ht(e)).h),i=tn(n.c,e.c),o=tn(n.l,e.l),u=tn(n.opacity,e.opacity);return function(t){return n.h=r(t),n.c=i(t),n.l=o(t),n.opacity=u(t),n+""}}}function dn(t){return function n(e){function r(n,r){var i=t((n=$t(n)).h,(r=$t(r)).h),o=tn(n.s,r.s),u=tn(n.l,r.l),a=tn(n.opacity,r.opacity);return function(t){return n.h=i(t),n.s=o(t),n.l=u(Math.pow(t,e)),n.opacity=a(t),n+""}}return e=+e,r.gamma=n,r}(1)}function vn(){return Vh||(Zh(_n),Vh=Wh.now()+$h)}function _n(){Vh=0}function gn(){this._call=this._time=this._next=null}function yn(t,n,e){var r=new gn;return r.restart(t,n,e),r}function mn(){vn(),++Yh;for(var t,n=fh;n;)(t=Vh-n._time)>=0&&n._call.call(null,t),n=n._next;--Yh}function xn(){Vh=(Xh=Wh.now())+$h,Yh=Bh=0;try{mn()}finally{Yh=0,wn(),Vh=0}}function bn(){var t=Wh.now(),n=t-Xh;n>Hh&&($h-=n,Xh=t)}function wn(){for(var t,n,e=fh,r=1/0;e;)e._call?(r>e._time&&(r=e._time),t=e,e=e._next):(n=e._next,e._next=null,e=t?t._next=n:fh=n);lh=t,Mn(r)}function Mn(t){if(!Yh){Bh&&(Bh=clearTimeout(Bh));var n=t-Vh;n>24?(t<1/0&&(Bh=setTimeout(xn,n)),jh&&(jh=clearInterval(jh))):(jh||(Xh=Vh,jh=setInterval(bn,Hh)),Yh=1,Zh(xn))}}function Tn(t,n){var e=t.__transition;if(!e||!(e=e[n])||e.state>tp)throw new Error("too late");return e}function Sn(t,n){var e=t.__transition;if(!e||!(e=e[n])||e.state>ep)throw new Error("too late");return e}function Nn(t,n){var e=t.__transition;if(!e||!(e=e[n]))throw new Error("too late");return e}function kn(t,n,e){function r(t){e.state=np,e.timer.restart(i,e.delay,e.time),e.delay<=t&&i(t-e.delay)}function i(r){var s,f,l,h;if(e.state!==np)return u();for(s in c)if(h=c[s],h.name===e.name){if(h.state===rp)return Gh(i);h.state===ip?(h.state=up,h.timer.stop(),h.on.call("interrupt",t,t.__data__,h.index,h.group),delete c[s]):+s<n&&(h.state=up,h.timer.stop(),delete c[s])}if(Gh(function(){e.state===rp&&(e.state=ip,e.timer.restart(o,e.delay,e.time),o(r))}),e.state=ep,e.on.call("start",t,t.__data__,e.index,e.group),e.state===ep){for(e.state=rp,a=new Array(l=e.tween.length),s=0,f=-1;s<l;++s)(h=e.tween[s].value.call(t,t.__data__,e.index,e.group))&&(a[++f]=h);a.length=f+1}}function o(n){for(var r=n<e.duration?e.ease.call(null,n/e.duration):(e.timer.restart(u),e.state=op,1),i=-1,o=a.length;++i<o;)a[i].call(null,r);e.state===op&&(e.on.call("end",t,t.__data__,e.index,e.group),u())}function u(){e.state=up,e.timer.stop(),delete c[n];for(var r in c)return;delete t.__transition}var a,c=t.__transition;c[n]=e,e.timer=yn(r,0,e.time)}function En(t,n){var e,r;return function(){var i=Sn(this,t),o=i.tween;if(o!==e){r=e=o;for(var u=0,a=r.length;u<a;++u)if(r[u].name===n){r=r.slice(),r.splice(u,1);break}}i.tween=r}}function An(t,n,e){var r,i;if("function"!=typeof e)throw new Error;return function(){var o=Sn(this,t),u=o.tween;if(u!==r){i=(r=u).slice();for(var a={name:n,value:e},c=0,s=i.length;c<s;++c)if(i[c].name===n){i[c]=a;break}c===s&&i.push(a)}o.tween=i}}function Cn(t,n,e){var r=t._id;return t.each(function(){var t=Sn(this,r);(t.value||(t.value={}))[n]=e.apply(this,arguments)}),function(t){return Nn(t,r).value[n]}}function zn(t){return function(){this.removeAttribute(t)}}function Pn(t){return function(){this.removeAttributeNS(t.space,t.local)}}function Ln(t,n,e){var r,i;return function(){var o=this.getAttribute(t);return o===e?null:o===r?i:i=n(r=o,e)}}function Rn(t,n,e){var r,i;return function(){var o=this.getAttributeNS(t.space,t.local);return o===e?null:o===r?i:i=n(r=o,e)}}function qn(t,n,e){var r,i,o;return function(){var u,a=e(this);return null==a?void this.removeAttribute(t):(u=this.getAttribute(t),u===a?null:u===r&&a===i?o:o=n(r=u,i=a))}}function Un(t,n,e){var r,i,o;return function(){var u,a=e(this);return null==a?void this.removeAttributeNS(t.space,t.local):(u=this.getAttributeNS(t.space,t.local),u===a?null:u===r&&a===i?o:o=n(r=u,i=a))}}function Dn(t,n){function e(){var e=this,r=n.apply(e,arguments);return r&&function(n){e.setAttributeNS(t.space,t.local,r(n))}}return e._value=n,e}function On(t,n){function e(){var e=this,r=n.apply(e,arguments);return r&&function(n){e.setAttribute(t,r(n))}}return e._value=n,e}function Fn(t,n){return function(){Tn(this,t).delay=+n.apply(this,arguments)}}function In(t,n){return n=+n,function(){Tn(this,t).delay=n}}function Yn(t,n){return function(){Sn(this,t).duration=+n.apply(this,arguments)}}function Bn(t,n){return n=+n,function(){Sn(this,t).duration=n}}function jn(t,n){if("function"!=typeof n)throw new Error;return function(){Sn(this,t).ease=n}}function Hn(t){return(t+"").trim().split(/^|\s+/).every(function(t){var n=t.indexOf(".");return n>=0&&(t=t.slice(0,n)),!t||"start"===t})}function Xn(t,n,e){var r,i,o=Hn(n)?Tn:Sn;return function(){var u=o(this,t),a=u.on;a!==r&&(i=(r=a).copy()).on(n,e),u.on=i}}function Vn(t){return function(){var n=this.parentNode;for(var e in this.__transition)if(+e!==t)return;n&&n.removeChild(this)}}function $n(t,n){var e,r,i;return function(){var o=cl(this).getComputedStyle(this,null),u=o.getPropertyValue(t),a=(this.style.removeProperty(t),o.getPropertyValue(t));return u===a?null:u===e&&a===r?i:i=n(e=u,r=a)}}function Wn(t){return function(){this.style.removeProperty(t)}}function Zn(t,n,e){var r,i;return function(){var o=cl(this).getComputedStyle(this,null).getPropertyValue(t);return o===e?null:o===r?i:i=n(r=o,e)}}function Gn(t,n,e){var r,i,o;return function(){var u=cl(this).getComputedStyle(this,null),a=u.getPropertyValue(t),c=e(this);return null==c&&(this.style.removeProperty(t),c=u.getPropertyValue(t)),a===c?null:a===r&&c===i?o:o=n(r=a,i=c)}}function Jn(t,n,e){function r(){var r=this,i=n.apply(r,arguments);return i&&function(n){r.style.setProperty(t,i(n),e)}}return r._value=n,r}function Qn(t){return function(){this.textContent=t}}function Kn(t){return function(){var n=t(this);this.textContent=null==n?"":n}}function te(t,n,e,r){this._groups=t,this._parents=n,this._name=e,this._id=r}function ne(t){return _t().transition(t)}function ee(){return++Ap}function re(t){return+t}function ie(t){return t*t}function oe(t){return t*(2-t)}function ue(t){return((t*=2)<=1?t*t:--t*(2-t)+1)/2}function ae(t){return t*t*t}function ce(t){return--t*t*t+1}function se(t){return((t*=2)<=1?t*t*t:(t-=2)*t*t+2)/2}function fe(t){return 1-Math.cos(t*qp)}function le(t){return Math.sin(t*qp)}function he(t){return(1-Math.cos(Rp*t))/2}function pe(t){return Math.pow(2,10*t-10)}function de(t){return 1-Math.pow(2,-10*t)}function ve(t){return((t*=2)<=1?Math.pow(2,10*t-10):2-Math.pow(2,10-10*t))/2}function _e(t){return 1-Math.sqrt(1-t*t)}function ge(t){return Math.sqrt(1- --t*t)}function ye(t){return((t*=2)<=1?1-Math.sqrt(1-t*t):Math.sqrt(1-(t-=2)*t)+1)/2}function me(t){return 1-xe(1-t)}function xe(t){return(t=+t)<Up?Xp*t*t:t<Op?Xp*(t-=Dp)*t+Fp:t<Yp?Xp*(t-=Ip)*t+Bp:Xp*(t-=jp)*t+Hp}function be(t){return((t*=2)<=1?1-xe(1-t):xe(t-1)+1)/2}function we(t,n){for(var e;!(e=t.__transition)||!(e=e[n]);)if(!(t=t.parentNode))return Kp.time=vn(),Kp;return e}function Me(){t.event.stopImmediatePropagation()}function Te(t){return{type:t}}function Se(){return!t.event.button}function Ne(){var t=this.ownerSVGElement||this;return[[0,0],[t.width.baseVal.value,t.height.baseVal.value]]}function ke(t){for(;!t.__brush;)if(!(t=t.parentNode))return;return t.__brush}function Ee(t){return t[0][0]===t[1][0]||t[0][1]===t[1][1]}function Ae(t){var n=t.__brush;return n?n.dim.output(n.selection):null}function Ce(){return Pe(fd)}function ze(){return Pe(ld)}function Pe(n){function e(t){var e=t.property("__brush",a).selectAll(".overlay").data([Te("overlay")]);e.enter().append("rect").attr("class","overlay").attr("pointer-events","all").attr("cursor",pd.overlay).merge(e).each(function(){var t=ke(this).extent;wl(this).attr("x",t[0][0]).attr("y",t[0][1]).attr("width",t[1][0]-t[0][0]).attr("height",t[1][1]-t[0][1])}),t.selectAll(".selection").data([Te("selection")]).enter().append("rect").attr("class","selection").attr("cursor",pd.selection).attr("fill","#777").attr("fill-opacity",.3).attr("stroke","#fff").attr("shape-rendering","crispEdges");var i=t.selectAll(".handle").data(n.handles,function(t){return t.type});i.exit().remove(),i.enter().append("rect").attr("class",function(t){return"handle handle--"+t.type}).attr("cursor",function(t){return pd[t.type]}),t.each(r).attr("fill","none").attr("pointer-events","all").style("-webkit-tap-highlight-color","rgba(0,0,0,0)").on("mousedown.brush touchstart.brush",u)}function r(){var t=wl(this),n=ke(this).selection;n?(t.selectAll(".selection").style("display",null).attr("x",n[0][0]).attr("y",n[0][1]).attr("width",n[1][0]-n[0][0]).attr("height",n[1][1]-n[0][1]),t.selectAll(".handle").style("display",null).attr("x",function(t){return"e"===t.type[t.type.length-1]?n[1][0]-h/2:n[0][0]-h/2}).attr("y",function(t){return"s"===t.type[0]?n[1][1]-h/2:n[0][1]-h/2}).attr("width",function(t){return"n"===t.type||"s"===t.type?n[1][0]-n[0][0]+h:h}).attr("height",function(t){return"e"===t.type||"w"===t.type?n[1][1]-n[0][1]+h:h})):t.selectAll(".selection,.handle").style("display","none").attr("x",null).attr("y",null).attr("width",null).attr("height",null)}function i(t,n){return t.__brush.emitter||new o(t,n)}function o(t,n){this.that=t,this.args=n,this.state=t.__brush,this.active=0}function u(){function e(){var t=If(T);!U||w||M||(Math.abs(t[0]-O[0])>Math.abs(t[1]-O[1])?M=!0:w=!0),O=t,b=!0,od(),o()}function o(){var t;switch(m=O[0]-D[0],x=O[1]-D[1],N){case ad:case ud:k&&(m=Math.max(P-l,Math.min(R-v,m)),h=l+m,_=v+m),E&&(x=Math.max(L-p,Math.min(q-g,x)),d=p+x,y=g+x);break;case cd:k<0?(m=Math.max(P-l,Math.min(R-l,m)),h=l+m,_=v):k>0&&(m=Math.max(P-v,Math.min(R-v,m)),h=l,_=v+m),E<0?(x=Math.max(L-p,Math.min(q-p,x)),d=p+x,y=g):E>0&&(x=Math.max(L-g,Math.min(q-g,x)),d=p,y=g+x);break;case sd:k&&(h=Math.max(P,Math.min(R,l-m*k)),_=Math.max(P,Math.min(R,v+m*k))),E&&(d=Math.max(L,Math.min(q,p-x*E)),y=Math.max(L,Math.min(q,g+x*E)))}_<h&&(k*=-1,t=l,l=v,v=t,t=h,h=_,_=t,S in dd&&Y.attr("cursor",pd[S=dd[S]])),y<d&&(E*=-1,t=p,p=g,g=t,t=d,d=y,y=t,S in vd&&Y.attr("cursor",pd[S=vd[S]])),A.selection&&(z=A.selection),w&&(h=z[0][0],_=z[1][0]),M&&(d=z[0][1],y=z[1][1]),z[0][0]===h&&z[0][1]===d&&z[1][0]===_&&z[1][1]===y||(A.selection=[[h,d],[_,y]],r.call(T),F.brush())}function u(){if(Me(),t.event.touches){if(t.event.touches.length)return;c&&clearTimeout(c),c=setTimeout(function(){c=null},500),I.on("touchmove.brush touchend.brush touchcancel.brush",null)}else yt(t.event.view,b),B.on("keydown.brush keyup.brush mousemove.brush mouseup.brush",null);I.attr("pointer-events","all"),Y.attr("cursor",pd.overlay),A.selection&&(z=A.selection),Ee(z)&&(A.selection=null,r.call(T)),F.end()}function a(){switch(t.event.keyCode){case 16:U=k&&E;break;case 18:N===cd&&(k&&(v=_-m*k,l=h+m*k),E&&(g=y-x*E,p=d+x*E),N=sd,o());break;case 32:N!==cd&&N!==sd||(k<0?v=_-m:k>0&&(l=h-m),E<0?g=y-x:E>0&&(p=d-x),N=ad,Y.attr("cursor",pd.selection),o());break;default:return}od()}function s(){switch(t.event.keyCode){case 16:U&&(w=M=U=!1,o());break;case 18:N===sd&&(k<0?v=_:k>0&&(l=h),E<0?g=y:E>0&&(p=d),N=cd,o());break;case 32:N===ad&&(t.event.altKey?(k&&(v=_-m*k,l=h+m*k),E&&(g=y-x*E,p=d+x*E),N=sd):(k<0?v=_:k>0&&(l=h),E<0?g=y:E>0&&(p=d),N=cd),Y.attr("cursor",pd[S]),o());break;default:return}od()}if(t.event.touches){if(t.event.changedTouches.length<t.event.touches.length)return od()}else if(c)return;if(f.apply(this,arguments)){var l,h,p,d,v,_,g,y,m,x,b,w,M,T=this,S=t.event.target.__data__.type,N="selection"===(t.event.metaKey?S="overlay":S)?ud:t.event.altKey?sd:cd,k=n===ld?null:_d[S],E=n===fd?null:gd[S],A=ke(T),C=A.extent,z=A.selection,P=C[0][0],L=C[0][1],R=C[1][0],q=C[1][1],U=k&&E&&t.event.shiftKey,D=If(T),O=D,F=i(T,arguments).beforestart();"overlay"===S?A.selection=z=[[l=n===ld?P:D[0],p=n===fd?L:D[1]],[v=n===ld?R:l,g=n===fd?q:p]]:(l=z[0][0],p=z[0][1],v=z[1][0],g=z[1][1]),h=l,d=p,_=v,y=g;var I=wl(T).attr("pointer-events","none"),Y=I.selectAll(".overlay").attr("cursor",pd[S]);if(t.event.touches)I.on("touchmove.brush",e,!0).on("touchend.brush touchcancel.brush",u,!0);else{var B=wl(t.event.view).on("keydown.brush",a,!0).on("keyup.brush",s,!0).on("mousemove.brush",e,!0).on("mouseup.brush",u,!0);kl(t.event.view)}Me(),cp(T),r.call(T),F.start()}}function a(){var t=this.__brush||{selection:null};return t.extent=s.apply(this,arguments),t.dim=n,t}var c,s=Ne,f=Se,l=v(e,"start","brush","end"),h=6;return e.move=function(t,e){t.selection?t.on("start.brush",function(){i(this,arguments).beforestart().start()}).on("interrupt.brush end.brush",function(){i(this,arguments).end()}).tween("brush",function(){function t(t){u.selection=1===t&&Ee(s)?null:f(t),r.call(o),a.brush()}var o=this,u=o.__brush,a=i(o,arguments),c=u.selection,s=n.input("function"==typeof e?e.apply(this,arguments):e,u.extent),f=Sh(c,s);return c&&s?t:t(1)}):t.each(function(){var t=this,o=arguments,u=t.__brush,a=n.input("function"==typeof e?e.apply(t,o):e,u.extent),c=i(t,o).beforestart();cp(t),u.selection=null==a||Ee(a)?null:a,r.call(t),c.start().brush().end()})},o.prototype={beforestart:function(){return 1==++this.active&&(this.state.emitter=this,this.starting=!0),this},start:function(){return this.starting&&(this.starting=!1,this.emit("start")),this},brush:function(){return this.emit("brush"),this},end:function(){return 0==--this.active&&(delete this.state.emitter,this.emit("end")),this},emit:function(t){A(new id(e,t,n.output(this.state.selection)),l.apply,l,[t,this.that,this.args])}},e.extent=function(t){return arguments.length?(s="function"==typeof t?t:rd([[+t[0][0],+t[0][1]],[+t[1][0],+t[1][1]]]),e):s},e.filter=function(t){return arguments.length?(f="function"==typeof t?t:rd(!!t),e):f},e.handleSize=function(t){return arguments.length?(h=+t,e):h},e.on=function(){var t=l.on.apply(l,arguments);return t===l?e:t},e}function Le(t){return function(n,e){return t(n.source.value+n.target.value,e.source.value+e.target.value)}}function Re(){this._x0=this._y0=this._x1=this._y1=null,this._=""}function qe(){return new Re}function Ue(t){return t.source}function De(t){return t.target}function Oe(t){return t.radius}function Fe(t){return t.startAngle}function Ie(t){return t.endAngle}function Ye(){}function Be(t,n){var e=new Ye;if(t instanceof Ye)t.each(function(t,n){e.set(n,t)});else if(Array.isArray(t)){var r,i=-1,o=t.length;if(null==n)for(;++i<o;)e.set(i,t[i]);else for(;++i<o;)e.set(n(r=t[i],i,t),r)}else if(t)for(var u in t)e.set(u,t[u]);return e}function je(){return{}}function He(t,n,e){t[n]=e}function Xe(){return Be()}function Ve(t,n,e){t.set(n,e)}function $e(){}function We(t,n){var e=new $e;if(t instanceof $e)t.each(function(t){e.add(t)});else if(t){var r=-1,i=t.length;if(null==n)for(;++r<i;)e.add(t[r]);else for(;++r<i;)e.add(n(t[r],r,t))}return e}function Ze(t){return new Function("d","return {"+t.map(function(t,n){return JSON.stringify(t)+": d["+n+"]"}).join(",")+"}")}function Ge(t,n){var e=Ze(t);return function(r,i){return n(e(r),i,t)}}function Je(t){var n=Object.create(null),e=[];return t.forEach(function(t){for(var r in t)r in n||e.push(n[r]=r)}),e}function Qe(t,n,e,r){if(isNaN(n)||isNaN(e))return t;var i,o,u,a,c,s,f,l,h,p=t._root,d={data:r},v=t._x0,_=t._y0,g=t._x1,y=t._y1;if(!p)return t._root=d,t;for(;p.length;)if((s=n>=(o=(v+g)/2))?v=o:g=o,(f=e>=(u=(_+y)/2))?_=u:y=u,i=p,!(p=p[l=f<<1|s]))return i[l]=d,t;if(a=+t._x.call(null,p.data),c=+t._y.call(null,p.data),n===a&&e===c)return d.next=p,i?i[l]=d:t._root=d,t;do{i=i?i[l]=new Array(4):t._root=new Array(4),(s=n>=(o=(v+g)/2))?v=o:g=o,(f=e>=(u=(_+y)/2))?_=u:y=u}while((l=f<<1|s)==(h=(c>=u)<<1|a>=o));return i[h]=p,i[l]=d,t}function Ke(t){var n,e,r,i,o=t.length,u=new Array(o),a=new Array(o),c=1/0,s=1/0,f=-1/0,l=-1/0;for(e=0;e<o;++e)isNaN(r=+this._x.call(null,n=t[e]))||isNaN(i=+this._y.call(null,n))||(u[e]=r,a[e]=i,r<c&&(c=r),r>f&&(f=r),i<s&&(s=i),i>l&&(l=i));for(f<c&&(c=this._x0,f=this._x1),l<s&&(s=this._y0,l=this._y1),this.cover(c,s).cover(f,l),e=0;e<o;++e)Qe(this,u[e],a[e],t[e]);return this}function tr(t){for(var n=0,e=t.length;n<e;++n)this.remove(t[n]);return this}function nr(t){return t[0]}function er(t){return t[1]}function rr(t,n,e){var r=new ir(null==n?nr:n,null==e?er:e,NaN,NaN,NaN,NaN);return null==t?r:r.addAll(t)}function ir(t,n,e,r,i,o){this._x=t,this._y=n,this._x0=e,this._y0=r,this._x1=i,this._y1=o,this._root=void 0}function or(t){for(var n={data:t.data},e=n;t=t.next;)e=e.next={data:t.data};return n}function ur(t){return t.x+t.vx}function ar(t){return t.y+t.vy}function cr(t){return t.index}function sr(t,n){var e=t.get(n);if(!e)throw new Error("missing: "+n);return e}function fr(t){return t.x}function lr(t){return t.y}function hr(t){return new pr(t)}function pr(t){if(!(n=Ev.exec(t)))throw new Error("invalid format: "+t);var n,e=n[1]||" ",r=n[2]||">",i=n[3]||"-",o=n[4]||"",u=!!n[5],a=n[6]&&+n[6],c=!!n[7],s=n[8]&&+n[8].slice(1),f=n[9]||"";"n"===f?(c=!0,
-f="g"):kv[f]||(f=""),(u||"0"===e&&"="===r)&&(u=!0,e="0",r="="),this.fill=e,this.align=r,this.sign=i,this.symbol=o,this.zero=u,this.width=a,this.comma=c,this.precision=s,this.type=f}function dr(n){return Av=Pv(n),t.format=Av.format,t.formatPrefix=Av.formatPrefix,Av}function vr(){this.reset()}function _r(t,n,e){var r=t.s=n+e,i=r-n,o=r-i;t.t=n-o+(e-i)}function gr(t){return t>1?0:t<-1?__:Math.acos(t)}function yr(t){return t>1?g_:t<-1?-g_:Math.asin(t)}function mr(t){return(t=C_(t/2))*t}function xr(){}function br(t,n){t&&q_.hasOwnProperty(t.type)&&q_[t.type](t,n)}function wr(t,n,e){var r,i=-1,o=t.length-e;for(n.lineStart();++i<o;)r=t[i],n.point(r[0],r[1],r[2]);n.lineEnd()}function Mr(t,n){var e=-1,r=t.length;for(n.polygonStart();++e<r;)wr(t[e],n,1);n.polygonEnd()}function Tr(){F_.point=Nr}function Sr(){kr(Dv,Ov)}function Nr(t,n){F_.point=kr,Dv=t,Ov=n,t*=b_,n*=b_,Fv=t,Iv=S_(n=n/2+y_),Yv=C_(n)}function kr(t,n){t*=b_,n*=b_,n=n/2+y_;var e=t-Fv,r=e>=0?1:-1,i=r*e,o=S_(n),u=C_(n),a=Yv*u,c=Iv*o+a*S_(i),s=a*r*C_(i);D_.add(T_(s,c)),Fv=t,Iv=o,Yv=u}function Er(t){return[T_(t[1],t[0]),yr(t[2])]}function Ar(t){var n=t[0],e=t[1],r=S_(e);return[r*S_(n),r*C_(n),C_(e)]}function Cr(t,n){return t[0]*n[0]+t[1]*n[1]+t[2]*n[2]}function zr(t,n){return[t[1]*n[2]-t[2]*n[1],t[2]*n[0]-t[0]*n[2],t[0]*n[1]-t[1]*n[0]]}function Pr(t,n){t[0]+=n[0],t[1]+=n[1],t[2]+=n[2]}function Lr(t,n){return[t[0]*n,t[1]*n,t[2]*n]}function Rr(t){var n=P_(t[0]*t[0]+t[1]*t[1]+t[2]*t[2]);t[0]/=n,t[1]/=n,t[2]/=n}function qr(t,n){Gv.push(Jv=[Bv=t,Hv=t]),n<jv&&(jv=n),n>Xv&&(Xv=n)}function Ur(t,n){var e=Ar([t*b_,n*b_]);if(Zv){var r=zr(Zv,e),i=[r[1],-r[0],0],o=zr(i,r);Rr(o),o=Er(o);var u,a=t-Vv,c=a>0?1:-1,s=o[0]*x_*c,f=w_(a)>180;f^(c*Vv<s&&s<c*t)?(u=o[1]*x_)>Xv&&(Xv=u):(s=(s+360)%360-180,f^(c*Vv<s&&s<c*t)?(u=-o[1]*x_)<jv&&(jv=u):(n<jv&&(jv=n),n>Xv&&(Xv=n))),f?t<Vv?Br(Bv,t)>Br(Bv,Hv)&&(Hv=t):Br(t,Hv)>Br(Bv,Hv)&&(Bv=t):Hv>=Bv?(t<Bv&&(Bv=t),t>Hv&&(Hv=t)):t>Vv?Br(Bv,t)>Br(Bv,Hv)&&(Hv=t):Br(t,Hv)>Br(Bv,Hv)&&(Bv=t)}else Gv.push(Jv=[Bv=t,Hv=t]);n<jv&&(jv=n),n>Xv&&(Xv=n),Zv=e,Vv=t}function Dr(){B_.point=Ur}function Or(){Jv[0]=Bv,Jv[1]=Hv,B_.point=qr,Zv=null}function Fr(t,n){if(Zv){var e=t-Vv;Y_.add(w_(e)>180?e+(e>0?360:-360):e)}else $v=t,Wv=n;F_.point(t,n),Ur(t,n)}function Ir(){F_.lineStart()}function Yr(){Fr($v,Wv),F_.lineEnd(),w_(Y_)>v_&&(Bv=-(Hv=180)),Jv[0]=Bv,Jv[1]=Hv,Zv=null}function Br(t,n){return(n-=t)<0?n+360:n}function jr(t,n){return t[0]-n[0]}function Hr(t,n){return t[0]<=t[1]?t[0]<=n&&n<=t[1]:n<t[0]||t[1]<n}function Xr(t,n){t*=b_,n*=b_;var e=S_(n);Vr(e*S_(t),e*C_(t),C_(n))}function Vr(t,n,e){++Qv,t_+=(t-t_)/Qv,n_+=(n-n_)/Qv,e_+=(e-e_)/Qv}function $r(){H_.point=Wr}function Wr(t,n){t*=b_,n*=b_;var e=S_(n);l_=e*S_(t),h_=e*C_(t),p_=C_(n),H_.point=Zr,Vr(l_,h_,p_)}function Zr(t,n){t*=b_,n*=b_;var e=S_(n),r=e*S_(t),i=e*C_(t),o=C_(n),u=T_(P_((u=h_*o-p_*i)*u+(u=p_*r-l_*o)*u+(u=l_*i-h_*r)*u),l_*r+h_*i+p_*o);Kv+=u,r_+=u*(l_+(l_=r)),i_+=u*(h_+(h_=i)),o_+=u*(p_+(p_=o)),Vr(l_,h_,p_)}function Gr(){H_.point=Xr}function Jr(){H_.point=Kr}function Qr(){ti(s_,f_),H_.point=Xr}function Kr(t,n){s_=t,f_=n,t*=b_,n*=b_,H_.point=ti;var e=S_(n);l_=e*S_(t),h_=e*C_(t),p_=C_(n),Vr(l_,h_,p_)}function ti(t,n){t*=b_,n*=b_;var e=S_(n),r=e*S_(t),i=e*C_(t),o=C_(n),u=h_*o-p_*i,a=p_*r-l_*o,c=l_*i-h_*r,s=P_(u*u+a*a+c*c),f=yr(s),l=s&&-f/s;u_+=l*u,a_+=l*a,c_+=l*c,Kv+=f,r_+=f*(l_+(l_=r)),i_+=f*(h_+(h_=i)),o_+=f*(p_+(p_=o)),Vr(l_,h_,p_)}function ni(t,n){return[t>__?t-m_:t<-__?t+m_:t,n]}function ei(t,n,e){return(t%=m_)?n||e?$_(ii(t),oi(n,e)):ii(t):n||e?oi(n,e):ni}function ri(t){return function(n,e){return n+=t,[n>__?n-m_:n<-__?n+m_:n,e]}}function ii(t){var n=ri(t);return n.invert=ri(-t),n}function oi(t,n){function e(t,n){var e=S_(n),a=S_(t)*e,c=C_(t)*e,s=C_(n),f=s*r+a*i;return[T_(c*o-f*u,a*r-s*i),yr(f*o+c*u)]}var r=S_(t),i=C_(t),o=S_(n),u=C_(n);return e.invert=function(t,n){var e=S_(n),a=S_(t)*e,c=C_(t)*e,s=C_(n),f=s*o-c*u;return[T_(c*o+s*u,a*r+f*i),yr(f*r-a*i)]},e}function ui(t,n,e,r,i,o){if(e){var u=S_(n),a=C_(n),c=r*e;null==i?(i=n+r*m_,o=n-c/2):(i=ai(u,i),o=ai(u,o),(r>0?i<o:i>o)&&(i+=r*m_));for(var s,f=i;r>0?f>o:f<o;f-=c)s=Er([u,-a*S_(f),-a*C_(f)]),t.point(s[0],s[1])}}function ai(t,n){n=Ar(n),n[0]-=t,Rr(n);var e=gr(-n[1]);return((-n[2]<0?-e:e)+m_-v_)%m_}function ci(t,n,e,r){this.x=t,this.z=n,this.o=e,this.e=r,this.v=!1,this.n=this.p=null}function si(t){if(n=t.length){for(var n,e,r=0,i=t[0];++r<n;)i.n=e=t[r],e.p=i,i=e;i.n=e=t[0],e.p=i}}function fi(t,n,e,r){function i(i,o){return t<=i&&i<=e&&n<=o&&o<=r}function o(i,o,a,s){var f=0,l=0;if(null==i||(f=u(i,a))!==(l=u(o,a))||c(i,o)<0^a>0)do{s.point(0===f||3===f?t:e,f>1?r:n)}while((f=(f+a+4)%4)!==l);else s.point(o[0],o[1])}function u(r,i){return w_(r[0]-t)<v_?i>0?0:3:w_(r[0]-e)<v_?i>0?2:1:w_(r[1]-n)<v_?i>0?1:0:i>0?3:2}function a(t,n){return c(t.x,n.x)}function c(t,n){var e=u(t,1),r=u(n,1);return e!==r?e-r:0===e?n[1]-t[1]:1===e?t[0]-n[0]:2===e?t[1]-n[1]:n[0]-t[0]}return function(u){function c(t,n){i(t,n)&&N.point(t,n)}function s(){for(var n=0,e=0,i=_.length;e<i;++e)for(var o,u,a=_[e],c=1,s=a.length,f=a[0],l=f[0],h=f[1];c<s;++c)o=l,u=h,f=a[c],l=f[0],h=f[1],u<=r?h>r&&(l-o)*(r-u)>(h-u)*(t-o)&&++n:h<=r&&(l-o)*(r-u)<(h-u)*(t-o)&&--n;return n}function f(){N=k,v=[],_=[],S=!0}function l(){var t=s(),n=S&&t,e=(v=lf(v)).length;(n||e)&&(u.polygonStart(),n&&(u.lineStart(),o(null,null,1,u),u.lineEnd()),e&&fg(v,a,t,o,u),u.polygonEnd()),N=u,v=_=g=null}function h(){E.point=d,_&&_.push(g=[]),T=!0,M=!1,b=w=NaN}function p(){v&&(d(y,m),x&&M&&k.rejoin(),v.push(k.result())),E.point=c,M&&N.lineEnd()}function d(o,u){var a=i(o,u);if(_&&g.push([o,u]),T)y=o,m=u,x=a,T=!1,a&&(N.lineStart(),N.point(o,u));else if(a&&M)N.point(o,u);else{var c=[b=Math.max(hg,Math.min(lg,b)),w=Math.max(hg,Math.min(lg,w))],s=[o=Math.max(hg,Math.min(lg,o)),u=Math.max(hg,Math.min(lg,u))];cg(c,s,t,n,e,r)?(M||(N.lineStart(),N.point(c[0],c[1])),N.point(s[0],s[1]),a||N.lineEnd(),S=!1):a&&(N.lineStart(),N.point(o,u),S=!1)}b=o,w=u,M=a}var v,_,g,y,m,x,b,w,M,T,S,N=u,k=ag(),E={point:c,lineStart:h,lineEnd:p,polygonStart:f,polygonEnd:l};return E}}function li(){gg.point=pi,gg.lineEnd=hi}function hi(){gg.point=gg.lineEnd=xr}function pi(t,n){t*=b_,n*=b_,W_=t,Z_=C_(n),G_=S_(n),gg.point=di}function di(t,n){t*=b_,n*=b_;var e=C_(n),r=S_(n),i=w_(t-W_),o=S_(i),u=C_(i),a=r*u,c=G_*e-Z_*r*o,s=Z_*e+G_*r*o;_g.add(T_(P_(a*a+c*c),s)),W_=t,Z_=e,G_=r}function vi(t,n){return!(!t||!Mg.hasOwnProperty(t.type))&&Mg[t.type](t,n)}function _i(t,n){return 0===bg(t,n)}function gi(t,n){var e=bg(t[0],t[1]);return bg(t[0],n)+bg(n,t[1])<=e+v_}function yi(t,n){return!!vg(t.map(mi),xi(n))}function mi(t){return t=t.map(xi),t.pop(),t}function xi(t){return[t[0]*b_,t[1]*b_]}function bi(t,n,e){var r=Js(t,n-v_,e).concat(n);return function(t){return r.map(function(n){return[t,n]})}}function wi(t,n,e){var r=Js(t,n-v_,e).concat(n);return function(t){return r.map(function(n){return[n,t]})}}function Mi(){function t(){return{type:"MultiLineString",coordinates:n()}}function n(){return Js(N_(o/_)*_,i,_).map(h).concat(Js(N_(s/g)*g,c,g).map(p)).concat(Js(N_(r/d)*d,e,d).filter(function(t){return w_(t%_)>v_}).map(f)).concat(Js(N_(a/v)*v,u,v).filter(function(t){return w_(t%g)>v_}).map(l))}var e,r,i,o,u,a,c,s,f,l,h,p,d=10,v=d,_=90,g=360,y=2.5;return t.lines=function(){return n().map(function(t){return{type:"LineString",coordinates:t}})},t.outline=function(){return{type:"Polygon",coordinates:[h(o).concat(p(c).slice(1),h(i).reverse().slice(1),p(s).reverse().slice(1))]}},t.extent=function(n){return arguments.length?t.extentMajor(n).extentMinor(n):t.extentMinor()},t.extentMajor=function(n){return arguments.length?(o=+n[0][0],i=+n[1][0],s=+n[0][1],c=+n[1][1],o>i&&(n=o,o=i,i=n),s>c&&(n=s,s=c,c=n),t.precision(y)):[[o,s],[i,c]]},t.extentMinor=function(n){return arguments.length?(r=+n[0][0],e=+n[1][0],a=+n[0][1],u=+n[1][1],r>e&&(n=r,r=e,e=n),a>u&&(n=a,a=u,u=n),t.precision(y)):[[r,a],[e,u]]},t.step=function(n){return arguments.length?t.stepMajor(n).stepMinor(n):t.stepMinor()},t.stepMajor=function(n){return arguments.length?(_=+n[0],g=+n[1],t):[_,g]},t.stepMinor=function(n){return arguments.length?(d=+n[0],v=+n[1],t):[d,v]},t.precision=function(n){return arguments.length?(y=+n,f=bi(a,u,90),l=wi(r,e,y),h=bi(s,c,90),p=wi(o,i,y),t):y},t.extentMajor([[-180,-90+v_],[180,90-v_]]).extentMinor([[-180,-80-v_],[180,80+v_]])}function Ti(){return Mi()()}function Si(){Ag.point=Ni}function Ni(t,n){Ag.point=ki,J_=K_=t,Q_=tg=n}function ki(t,n){Eg.add(tg*t-K_*n),K_=t,tg=n}function Ei(){ki(J_,Q_)}function Ai(t,n){t<Cg&&(Cg=t),t>Pg&&(Pg=t),n<zg&&(zg=n),n>Lg&&(Lg=n)}function Ci(t,n){qg+=t,Ug+=n,++Dg}function zi(){Hg.point=Pi}function Pi(t,n){Hg.point=Li,Ci(rg=t,ig=n)}function Li(t,n){var e=t-rg,r=n-ig,i=P_(e*e+r*r);Og+=i*(rg+t)/2,Fg+=i*(ig+n)/2,Ig+=i,Ci(rg=t,ig=n)}function Ri(){Hg.point=Ci}function qi(){Hg.point=Di}function Ui(){Oi(ng,eg)}function Di(t,n){Hg.point=Oi,Ci(ng=rg=t,eg=ig=n)}function Oi(t,n){var e=t-rg,r=n-ig,i=P_(e*e+r*r);Og+=i*(rg+t)/2,Fg+=i*(ig+n)/2,Ig+=i,i=ig*t-rg*n,Yg+=i*(rg+t),Bg+=i*(ig+n),jg+=3*i,Ci(rg=t,ig=n)}function Fi(t){this._context=t}function Ii(t,n){Jg.point=Yi,Vg=Wg=t,$g=Zg=n}function Yi(t,n){Wg-=t,Zg-=n,Gg.add(P_(Wg*Wg+Zg*Zg)),Wg=t,Zg=n}function Bi(){this._string=[]}function ji(t){return"m0,"+t+"a"+t+","+t+" 0 1,1 0,"+-2*t+"a"+t+","+t+" 0 1,1 0,"+2*t+"z"}function Hi(t){return t.length>1}function Xi(t,n){return((t=t.x)[0]<0?t[1]-g_-v_:g_-t[1])-((n=n.x)[0]<0?n[1]-g_-v_:g_-n[1])}function Vi(t){var n,e=NaN,r=NaN,i=NaN;return{lineStart:function(){t.lineStart(),n=1},point:function(o,u){var a=o>0?__:-__,c=w_(o-e);w_(c-__)<v_?(t.point(e,r=(r+u)/2>0?g_:-g_),t.point(i,r),t.lineEnd(),t.lineStart(),t.point(a,r),t.point(o,r),n=0):i!==a&&c>=__&&(w_(e-i)<v_&&(e-=i*v_),w_(o-a)<v_&&(o-=a*v_),r=$i(e,r,o,u),t.point(i,r),t.lineEnd(),t.lineStart(),t.point(a,r),n=0),t.point(e=o,r=u),i=a},lineEnd:function(){t.lineEnd(),e=r=NaN},clean:function(){return 2-n}}}function $i(t,n,e,r){var i,o,u=C_(t-e);return w_(u)>v_?M_((C_(n)*(o=S_(r))*C_(e)-C_(r)*(i=S_(n))*C_(t))/(i*o*u)):(n+r)/2}function Wi(t,n,e,r){var i;if(null==t)i=e*g_,r.point(-__,i),r.point(0,i),r.point(__,i),r.point(__,0),r.point(__,-i),r.point(0,-i),r.point(-__,-i),r.point(-__,0),r.point(-__,i);else if(w_(t[0]-n[0])>v_){var o=t[0]<n[0]?__:-__;i=e*o/2,r.point(-o,i),r.point(0,i),r.point(o,i)}else r.point(n[0],n[1])}function Zi(t){return function(n){var e=new Gi;for(var r in t)e[r]=t[r];return e.stream=n,e}}function Gi(){}function Ji(t,n,e){var r=n[1][0]-n[0][0],i=n[1][1]-n[0][1],o=t.clipExtent&&t.clipExtent();t.scale(150).translate([0,0]),null!=o&&t.clipExtent(null),U_(e,t.stream(Rg));var u=Rg.result(),a=Math.min(r/(u[1][0]-u[0][0]),i/(u[1][1]-u[0][1])),c=+n[0][0]+(r-a*(u[1][0]+u[0][0]))/2,s=+n[0][1]+(i-a*(u[1][1]+u[0][1]))/2;return null!=o&&t.clipExtent(o),t.scale(150*a).translate([c,s])}function Qi(t,n,e){return Ji(t,[[0,0],n],e)}function Ki(t){return Zi({point:function(n,e){n=t(n,e),this.stream.point(n[0],n[1])}})}function to(t,n){function e(r,i,o,u,a,c,s,f,l,h,p,d,v,_){var g=s-r,y=f-i,m=g*g+y*y;if(m>4*n&&v--){var x=u+h,b=a+p,w=c+d,M=P_(x*x+b*b+w*w),T=yr(w/=M),S=w_(w_(w)-1)<v_||w_(o-l)<v_?(o+l)/2:T_(b,x),N=t(S,T),k=N[0],E=N[1],A=k-r,C=E-i,z=y*A-g*C;(z*z/m>n||w_((g*A+y*C)/m-.5)>.3||u*h+a*p+c*d<iy)&&(e(r,i,o,u,a,c,k,E,S,x/=M,b/=M,w,v,_),_.point(k,E),e(k,E,S,x,b,w,s,f,l,h,p,d,v,_))}}return function(n){function r(e,r){e=t(e,r),n.point(e[0],e[1])}function i(){g=NaN,w.point=o,n.lineStart()}function o(r,i){var o=Ar([r,i]),u=t(r,i);e(g,y,_,m,x,b,g=u[0],y=u[1],_=r,m=o[0],x=o[1],b=o[2],ry,n),n.point(g,y)}function u(){w.point=r,n.lineEnd()}function a(){i(),w.point=c,w.lineEnd=s}function c(t,n){o(f=t,n),l=g,h=y,p=m,d=x,v=b,w.point=o}function s(){e(g,y,_,m,x,b,l,h,f,p,d,v,ry,n),w.lineEnd=u,u()}var f,l,h,p,d,v,_,g,y,m,x,b,w={point:r,lineStart:i,lineEnd:u,polygonStart:function(){n.polygonStart(),w.lineStart=a},polygonEnd:function(){n.polygonEnd(),w.lineStart=i}};return w}}function no(t){return eo(function(){return t})()}function eo(t){function n(t){return t=f(t[0]*b_,t[1]*b_),[t[0]*_+a,c-t[1]*_]}function e(t){return(t=f.invert((t[0]-a)/_,(c-t[1])/_))&&[t[0]*x_,t[1]*x_]}function r(t,n){return t=u(t,n),[t[0]*_+a,c-t[1]*_]}function i(){f=$_(s=ei(b,w,M),u);var t=u(m,x);return a=g-t[0]*_,c=y+t[1]*_,o()}function o(){return d=v=null,n}var u,a,c,s,f,l,h,p,d,v,_=150,g=480,y=250,m=0,x=0,b=0,w=0,M=0,T=null,S=ty,N=null,k=Ng,E=.5,A=oy(r,E);return n.stream=function(t){return d&&v===t?d:d=uy(S(s,A(k(v=t))))},n.clipAngle=function(t){return arguments.length?(S=+t?ny(T=t*b_,6*b_):(T=null,ty),o()):T*x_},n.clipExtent=function(t){return arguments.length?(k=null==t?(N=l=h=p=null,Ng):fi(N=+t[0][0],l=+t[0][1],h=+t[1][0],p=+t[1][1]),o()):null==N?null:[[N,l],[h,p]]},n.scale=function(t){return arguments.length?(_=+t,i()):_},n.translate=function(t){return arguments.length?(g=+t[0],y=+t[1],i()):[g,y]},n.center=function(t){return arguments.length?(m=t[0]%360*b_,x=t[1]%360*b_,i()):[m*x_,x*x_]},n.rotate=function(t){return arguments.length?(b=t[0]%360*b_,w=t[1]%360*b_,M=t.length>2?t[2]%360*b_:0,i()):[b*x_,w*x_,M*x_]},n.precision=function(t){return arguments.length?(A=oy(r,E=t*t),o()):P_(E)},n.fitExtent=function(t,e){return Ji(n,t,e)},n.fitSize=function(t,e){return Qi(n,t,e)},function(){return u=t.apply(this,arguments),n.invert=u.invert&&e,i()}}function ro(t){var n=0,e=__/3,r=eo(t),i=r(n,e);return i.parallels=function(t){return arguments.length?r(n=t[0]*b_,e=t[1]*b_):[n*x_,e*x_]},i}function io(t){function n(t,n){return[t*e,C_(n)/e]}var e=S_(t);return n.invert=function(t,n){return[t/e,yr(n*e)]},n}function oo(t,n){function e(t,n){var e=P_(o-2*i*C_(n))/i;return[e*C_(t*=i),u-e*S_(t)]}var r=C_(t),i=(r+C_(n))/2;if(w_(i)<v_)return io(t);var o=1+r*(2*i-r),u=P_(o)/i;return e.invert=function(t,n){var e=u-n;return[T_(t,w_(e))/i*z_(e),yr((o-(t*t+e*e)*i*i)/(2*i))]},e}function uo(t){var n=t.length;return{point:function(e,r){for(var i=-1;++i<n;)t[i].point(e,r)},sphere:function(){for(var e=-1;++e<n;)t[e].sphere()},lineStart:function(){for(var e=-1;++e<n;)t[e].lineStart()},lineEnd:function(){for(var e=-1;++e<n;)t[e].lineEnd()},polygonStart:function(){for(var e=-1;++e<n;)t[e].polygonStart()},polygonEnd:function(){for(var e=-1;++e<n;)t[e].polygonEnd()}}}function ao(t){return function(n,e){var r=S_(n),i=S_(e),o=t(r*i);return[o*i*C_(n),o*C_(e)]}}function co(t){return function(n,e){var r=P_(n*n+e*e),i=t(r),o=C_(i),u=S_(i);return[T_(n*o,r*u),yr(r&&e*o/r)]}}function so(t,n){return[t,E_(L_((g_+n)/2))]}function fo(t){function n(){var n=__*a(),u=o(og(o.rotate()).invert([0,0]));return s(null==f?[[u[0]-n,u[1]-n],[u[0]+n,u[1]+n]]:t===so?[[Math.max(u[0]-n,f),e],[Math.min(u[0]+n,r),i]]:[[f,Math.max(u[1]-n,e)],[r,Math.min(u[1]+n,i)]])}var e,r,i,o=no(t),u=o.center,a=o.scale,c=o.translate,s=o.clipExtent,f=null;return o.scale=function(t){return arguments.length?(a(t),n()):a()},o.translate=function(t){return arguments.length?(c(t),n()):c()},o.center=function(t){return arguments.length?(u(t),n()):u()},o.clipExtent=function(t){return arguments.length?(null==t?f=e=r=i=null:(f=+t[0][0],e=+t[0][1],r=+t[1][0],i=+t[1][1]),n()):null==f?null:[[f,e],[r,i]]},n()}function lo(t){return L_((g_+t)/2)}function ho(t,n){function e(t,n){o>0?n<-g_+v_&&(n=-g_+v_):n>g_-v_&&(n=g_-v_);var e=o/A_(lo(n),i);return[e*C_(i*t),o-e*S_(i*t)]}var r=S_(t),i=t===n?C_(t):E_(r/S_(n))/E_(lo(n)/lo(t)),o=r*A_(lo(t),i)/i;return i?(e.invert=function(t,n){var e=o-n,r=z_(i)*P_(t*t+e*e);return[T_(t,w_(e))/i*z_(e),2*M_(A_(o/r,1/i))-g_]},e):so}function po(t,n){return[t,n]}function vo(t,n){function e(t,n){var e=o-n,r=i*t;return[e*C_(r),o-e*S_(r)]}var r=S_(t),i=t===n?C_(t):(r-S_(n))/(n-t),o=r/i+t;return w_(i)<v_?po:(e.invert=function(t,n){var e=o-n;return[T_(t,w_(e))/i*z_(e),o-z_(i)*P_(t*t+e*e)]},e)}function _o(t,n){var e=S_(n),r=S_(t)*e;return[e*C_(t)/r,C_(n)/r]}function go(t,n,e,r){return 1===t&&1===n&&0===e&&0===r?Ng:Zi({point:function(i,o){this.stream.point(i*t+e,o*n+r)}})}function yo(t,n){return[S_(n)*C_(t),C_(n)]}function mo(t,n){var e=S_(n),r=1+S_(t)*e;return[e*C_(t)/r,C_(n)/r]}function xo(t,n){return[E_(L_((g_+n)/2)),-t]}function bo(t,n){return t.parent===n.parent?1:2}function wo(t){return t.reduce(Mo,0)/t.length}function Mo(t,n){return t+n.x}function To(t){return 1+t.reduce(So,0)}function So(t,n){return Math.max(t,n.y)}function No(t){for(var n;n=t.children;)t=n[0];return t}function ko(t){for(var n;n=t.children;)t=n[n.length-1];return t}function Eo(t){var n=0,e=t.children,r=e&&e.length;if(r)for(;--r>=0;)n+=e[r].value;else n=1;t.value=n}function Ao(t,n){if(t===n)return t;var e=t.ancestors(),r=n.ancestors(),i=null;for(t=e.pop(),n=r.pop();t===n;)i=t,t=e.pop(),n=r.pop();return i}function Co(t,n){var e,r,i,o,u,a=new qo(t),c=+t.value&&(a.value=t.value),s=[a];for(null==n&&(n=Po);e=s.pop();)if(c&&(e.value=+e.data.value),(i=n(e.data))&&(u=i.length))for(e.children=new Array(u),o=u-1;o>=0;--o)s.push(r=e.children[o]=new qo(i[o])),r.parent=e,r.depth=e.depth+1;return a.eachBefore(Ro)}function zo(){return Co(this).eachBefore(Lo)}function Po(t){return t.children}function Lo(t){t.data=t.data.data}function Ro(t){var n=0;do{t.height=n}while((t=t.parent)&&t.height<++n)}function qo(t){this.data=t,this.depth=this.height=0,this.parent=null}function Uo(t){this._=t,this.next=null}function Do(t,n){var e=n.x-t.x,r=n.y-t.y,i=t.r-n.r;return i*i+1e-6>e*e+r*r}function Oo(t,n){var e,r,i,o=null,u=t.head;switch(n.length){case 1:e=Fo(n[0]);break;case 2:e=Io(n[0],n[1]);break;case 3:e=Yo(n[0],n[1],n[2])}for(;u;)i=u._,r=u.next,e&&Do(e,i)?o=u:(o?(t.tail=o,o.next=null):t.head=t.tail=null,n.push(i),e=Oo(t,n),n.pop(),t.head?(u.next=t.head,t.head=u):(u.next=null,t.head=t.tail=u),o=t.tail,o.next=r),u=r;return t.tail=o,e}function Fo(t){return{x:t.x,y:t.y,r:t.r}}function Io(t,n){var e=t.x,r=t.y,i=t.r,o=n.x,u=n.y,a=n.r,c=o-e,s=u-r,f=a-i,l=Math.sqrt(c*c+s*s);return{x:(e+o+c/l*f)/2,y:(r+u+s/l*f)/2,r:(l+i+a)/2}}function Yo(t,n,e){var r=t.x,i=t.y,o=t.r,u=n.x,a=n.y,c=n.r,s=e.x,f=e.y,l=e.r,h=2*(r-u),p=2*(i-a),d=2*(c-o),v=r*r+i*i-o*o-u*u-a*a+c*c,_=2*(r-s),g=2*(i-f),y=2*(l-o),m=r*r+i*i-o*o-s*s-f*f+l*l,x=_*p-h*g,b=(p*m-g*v)/x-r,w=(g*d-p*y)/x,M=(_*v-h*m)/x-i,T=(h*y-_*d)/x,S=w*w+T*T-1,N=2*(b*w+M*T+o),k=b*b+M*M-o*o,E=(-N-Math.sqrt(N*N-4*S*k))/(2*S);return{x:b+w*E+r,y:M+T*E+i,r:E}}function Bo(t,n,e){var r=t.x,i=t.y,o=n.r+e.r,u=t.r+e.r,a=n.x-r,c=n.y-i,s=a*a+c*c;if(s){var f=.5+((u*=u)-(o*=o))/(2*s),l=Math.sqrt(Math.max(0,2*o*(u+s)-(u-=s)*u-o*o))/(2*s);e.x=r+f*a+l*c,e.y=i+f*c-l*a}else e.x=r+u,e.y=i}function jo(t,n){var e=n.x-t.x,r=n.y-t.y,i=t.r+n.r;return i*i-1e-6>e*e+r*r}function Ho(t,n,e){var r=t._,i=t.next._,o=r.r+i.r,u=(r.x*i.r+i.x*r.r)/o-n,a=(r.y*i.r+i.y*r.r)/o-e;return u*u+a*a}function Xo(t){this._=t,this.next=null,this.previous=null}function Vo(t){if(!(i=t.length))return 0;var n,e,r,i;if(n=t[0],n.x=0,n.y=0,!(i>1))return n.r;if(e=t[1],n.x=-e.r,e.x=n.r,e.y=0,!(i>2))return n.r+e.r;Bo(e,n,r=t[2]);var o,u,a,c,s,f,l,h=n.r*n.r,p=e.r*e.r,d=r.r*r.r,v=h+p+d,_=h*n.x+p*e.x+d*r.x,g=h*n.y+p*e.y+d*r.y;n=new Xo(n),e=new Xo(e),r=new Xo(r),n.next=r.previous=e,e.next=n.previous=r,r.next=e.previous=n;t:for(a=3;a<i;++a){Bo(n._,e._,r=t[a]),r=new Xo(r),c=e.next,s=n.previous,f=e._.r,l=n._.r;do{if(f<=l){if(jo(c._,r._)){e=c,n.next=e,e.previous=n,--a;continue t}f+=c._.r,c=c.next}else{if(jo(s._,r._)){n=s,n.next=e,e.previous=n,--a;continue t}l+=s._.r,s=s.previous}}while(c!==s.next);for(r.previous=n,r.next=e,n.next=e.previous=e=r,v+=d=r._.r*r._.r,_+=d*r._.x,g+=d*r._.y,h=Ho(n,o=_/v,u=g/v);(r=r.next)!==e;)(d=Ho(r,o,u))<h&&(n=r,h=d);e=n.next}for(n=[e._],r=e;(r=r.next)!==e;)n.push(r._);for(r=Uy(n),a=0;a<i;++a)n=t[a],n.x-=r.x,n.y-=r.y;return r.r}function $o(t){return null==t?null:Wo(t)}function Wo(t){if("function"!=typeof t)throw new Error;return t}function Zo(){return 0}function Go(t){return Math.sqrt(t.value)}function Jo(t){return function(n){n.children||(n.r=Math.max(0,+t(n)||0))}}function Qo(t,n){return function(e){if(r=e.children){var r,i,o,u=r.length,a=t(e)*n||0;if(a)for(i=0;i<u;++i)r[i].r+=a;if(o=Vo(r),a)for(i=0;i<u;++i)r[i].r-=a;e.r=o+a}}}function Ko(t){return function(n){var e=n.parent;n.r*=t,e&&(n.x=e.x+t*n.x,n.y=e.y+t*n.y)}}function tu(t){return t.id}function nu(t){return t.parentId}function eu(t,n){return t.parent===n.parent?1:2}function ru(t){var n=t.children;return n?n[0]:t.t}function iu(t){var n=t.children;return n?n[n.length-1]:t.t}function ou(t,n,e){var r=e/(n.i-t.i);n.c-=r,n.s+=e,t.c+=r,n.z+=e,n.m+=e}function uu(t){for(var n,e=0,r=0,i=t.children,o=i.length;--o>=0;)n=i[o],n.z+=e,n.m+=e,e+=n.s+(r+=n.c)}function au(t,n,e){return t.a.parent===n.parent?t.a:e}function cu(t,n){this._=t,this.parent=null,this.children=null,this.A=null,this.a=this,this.z=0,this.m=0,this.c=0,this.s=0,this.t=null,this.i=n}function su(t){for(var n,e,r,i,o,u=new cu(t,0),a=[u];n=a.pop();)if(r=n._.children)for(n.children=new Array(o=r.length),i=o-1;i>=0;--i)a.push(e=n.children[i]=new cu(r[i],i)),e.parent=n;return(u.parent=new cu(null,0)).children=[u],u}function fu(t,n,e,r,i,o){for(var u,a,c,s,f,l,h,p,d,v,_,g=[],y=n.children,m=0,x=0,b=y.length,w=n.value;m<b;){c=i-e,s=o-r;do{f=y[x++].value}while(!f&&x<b);for(l=h=f,v=Math.max(s/c,c/s)/(w*t),_=f*f*v,d=Math.max(h/_,_/l);x<b;++x){if(f+=a=y[x].value,a<l&&(l=a),a>h&&(h=a),_=f*f*v,(p=Math.max(h/_,_/l))>d){f-=a;break}d=p}g.push(u={value:f,dice:c<s,children:y.slice(m,x)}),u.dice?Yy(u,e,r,i,w?r+=s*f/w:o):Wy(u,e,r,w?e+=c*f/w:i,o),w-=f,m=x}return g}function lu(t,n){return t[0]-n[0]||t[1]-n[1]}function hu(t){for(var n=t.length,e=[0,1],r=2,i=2;i<n;++i){for(;r>1&&rm(t[e[r-2]],t[e[r-1]],t[i])<=0;)--r;e[r++]=i}return e.slice(0,r)}function pu(t){if(!(t>=1))throw new Error;this._size=t,this._call=this._error=null,this._tasks=[],this._data=[],this._waiting=this._active=this._ended=this._start=0}function du(t){if(!t._start)try{vu(t)}catch(n){if(t._tasks[t._ended+t._active-1])gu(t,n);else if(!t._data)throw n}}function vu(t){for(;t._start=t._waiting&&t._active<t._size;){var n=t._ended+t._active,e=t._tasks[n],r=e.length-1,i=e[r];e[r]=_u(t,n),--t._waiting,++t._active,e=i.apply(null,e),t._tasks[n]&&(t._tasks[n]=e||cm)}}function _u(t,n){return function(e,r){t._tasks[n]&&(--t._active,++t._ended,t._tasks[n]=null,null==t._error&&(null!=e?gu(t,e):(t._data[n]=r,t._waiting?du(t):yu(t))))}}function gu(t,n){var e,r=t._tasks.length;for(t._error=n,t._data=void 0,t._waiting=NaN;--r>=0;)if((e=t._tasks[r])&&(t._tasks[r]=null,e.abort))try{e.abort()}catch(n){}t._active=NaN,yu(t)}function yu(t){if(!t._active&&t._call){var n=t._data;t._data=void 0,t._call(t._error,n)}}function mu(t){return new pu(arguments.length?+t:1/0)}function xu(t){return function(n,e){t(null==n?e:null)}}function bu(t){var n=t.responseType;return n&&"text"!==n?t.response:t.responseText}function wu(t,n){return function(e){return t(e.responseText,n)}}function Mu(t){function n(n){var o=n+"",u=e.get(o);if(!u){if(i!==km)return i;e.set(o,u=r.push(n))}return t[(u-1)%t.length]}var e=Be(),r=[],i=km;return t=null==t?[]:Nm.call(t),n.domain=function(t){if(!arguments.length)return r.slice();r=[],e=Be();for(var i,o,u=-1,a=t.length;++u<a;)e.has(o=(i=t[u])+"")||e.set(o,r.push(i));return n},n.range=function(e){return arguments.length?(t=Nm.call(e),n):t.slice()},n.unknown=function(t){return arguments.length?(i=t,n):i},n.copy=function(){return Mu().domain(r).range(t).unknown(i)},n}function Tu(){function t(){var t=i().length,r=u[1]<u[0],l=u[r-0],h=u[1-r];n=(h-l)/Math.max(1,t-c+2*s),a&&(n=Math.floor(n)),l+=(h-l-n*(t-c))*f,e=n*(1-c),a&&(l=Math.round(l),e=Math.round(e));var p=Js(t).map(function(t){return l+n*t});return o(r?p.reverse():p)}var n,e,r=Mu().unknown(void 0),i=r.domain,o=r.range,u=[0,1],a=!1,c=0,s=0,f=.5;return delete r.unknown,r.domain=function(n){return arguments.length?(i(n),t()):i()},r.range=function(n){return arguments.length?(u=[+n[0],+n[1]],t()):u.slice()},r.rangeRound=function(n){return u=[+n[0],+n[1]],a=!0,t()},r.bandwidth=function(){return e},r.step=function(){return n},r.round=function(n){return arguments.length?(a=!!n,t()):a},r.padding=function(n){return arguments.length?(c=s=Math.max(0,Math.min(1,n)),t()):c},r.paddingInner=function(n){return arguments.length?(c=Math.max(0,Math.min(1,n)),t()):c},r.paddingOuter=function(n){return arguments.length?(s=Math.max(0,Math.min(1,n)),t()):s},r.align=function(n){return arguments.length?(f=Math.max(0,Math.min(1,n)),t()):f},r.copy=function(){return Tu().domain(i()).range(u).round(a).paddingInner(c).paddingOuter(s).align(f)},t()}function Su(t){var n=t.copy;return t.padding=t.paddingOuter,delete t.paddingInner,delete t.paddingOuter,t.copy=function(){return Su(n())},t}function Nu(){return Su(Tu().paddingInner(1))}function ku(t,n){return(n-=t=+t)?function(e){return(e-t)/n}:Em(n)}function Eu(t){return function(n,e){var r=t(n=+n,e=+e);return function(t){return t<=n?0:t>=e?1:r(t)}}}function Au(t){return function(n,e){var r=t(n=+n,e=+e);return function(t){return t<=0?n:t>=1?e:r(t)}}}function Cu(t,n,e,r){var i=t[0],o=t[1],u=n[0],a=n[1];return o<i?(i=e(o,i),u=r(a,u)):(i=e(i,o),u=r(u,a)),function(t){return u(i(t))}}function zu(t,n,e,r){var i=Math.min(t.length,n.length)-1,o=new Array(i),u=new Array(i),a=-1;for(t[i]<t[0]&&(t=t.slice().reverse(),n=n.slice().reverse());++a<i;)o[a]=e(t[a],t[a+1]),u[a]=r(n[a],n[a+1]);return function(n){var e=Ds(t,n,1,i)-1;return u[e](o[e](n))}}function Pu(t,n){return n.domain(t.domain()).range(t.range()).interpolate(t.interpolate()).clamp(t.clamp())}function Lu(t,n){function e(){return i=Math.min(a.length,c.length)>2?zu:Cu,o=u=null,r}function r(n){return(o||(o=i(a,c,f?Eu(t):t,s)))(+n)}var i,o,u,a=Cm,c=Cm,s=Sh,f=!1;return r.invert=function(t){return(u||(u=i(c,a,ku,f?Au(n):n)))(+t)},r.domain=function(t){return arguments.length?(a=Sm.call(t,Am),e()):a.slice()},r.range=function(t){return arguments.length?(c=Nm.call(t),e()):c.slice()},r.rangeRound=function(t){return c=Nm.call(t),s=Nh,e()},r.clamp=function(t){return arguments.length?(f=!!t,e()):f},r.interpolate=function(t){return arguments.length?(s=t,e()):s},e()}function Ru(t){var n=t.domain;return t.ticks=function(t){var e=n();return nf(e[0],e[e.length-1],null==t?10:t)},t.tickFormat=function(t,e){return zm(n(),t,e)},t.nice=function(e){var r=n(),o=r.length-1,u=null==e?10:e,a=r[0],c=r[o],s=i(a,c,u);return s&&(s=i(Math.floor(a/s)*s,Math.ceil(c/s)*s,u),r[0]=Math.floor(a/s)*s,r[o]=Math.ceil(c/s)*s,n(r)),t},t}function qu(){var t=Lu(ku,xh);return t.copy=function(){return Pu(t,qu())},Ru(t)}function Uu(){function t(t){return+t}var n=[0,1];return t.invert=t,t.domain=t.range=function(e){return arguments.length?(n=Sm.call(e,Am),t):n.slice()},t.copy=function(){return Uu().domain(n)},Ru(t)}function Du(t,n){return(n=Math.log(n/t))?function(e){return Math.log(e/t)/n}:Em(n)}function Ou(t,n){return t<0?function(e){return-Math.pow(-n,e)*Math.pow(-t,1-e)}:function(e){return Math.pow(n,e)*Math.pow(t,1-e)}}function Fu(t){return isFinite(t)?+("1e"+t):t<0?0:t}function Iu(t){return 10===t?Fu:t===Math.E?Math.exp:function(n){return Math.pow(t,n)}}function Yu(t){return t===Math.E?Math.log:10===t&&Math.log10||2===t&&Math.log2||(t=Math.log(t),function(n){return Math.log(n)/t})}function Bu(t){return function(n){return-t(-n)}}function ju(){function n(){return o=Yu(i),u=Iu(i),r()[0]<0&&(o=Bu(o),u=Bu(u)),e}var e=Lu(Du,Ou).domain([1,10]),r=e.domain,i=10,o=Yu(10),u=Iu(10);return e.base=function(t){return arguments.length?(i=+t,n()):i},e.domain=function(t){return arguments.length?(r(t),n()):r()},e.ticks=function(t){var n,e=r(),a=e[0],c=e[e.length-1];(n=c<a)&&(h=a,a=c,c=h);var s,f,l,h=o(a),p=o(c),d=null==t?10:+t,v=[];if(!(i%1)&&p-h<d){if(h=Math.round(h)-1,p=Math.round(p)+1,a>0){for(;h<p;++h)for(f=1,s=u(h);f<i;++f)if(!((l=s*f)<a)){if(l>c)break;v.push(l)}}else for(;h<p;++h)for(f=i-1,s=u(h);f>=1;--f)if(!((l=s*f)<a)){if(l>c)break;v.push(l)}}else v=nf(h,p,Math.min(p-h,d)).map(u);return n?v.reverse():v},e.tickFormat=function(n,r){if(null==r&&(r=10===i?".0e":","),"function"!=typeof r&&(r=t.format(r)),n===1/0)return r;null==n&&(n=10);var a=Math.max(1,i*n/e.ticks().length);return function(t){var n=t/u(Math.round(o(t)));return n*i<i-.5&&(n*=i),n<=a?r(t):""}},e.nice=function(){return r(Pm(r(),{floor:function(t){return u(Math.floor(o(t)))},ceil:function(t){return u(Math.ceil(o(t)))}}))},e.copy=function(){return Pu(e,ju().base(i))},e}function Hu(t,n){return t<0?-Math.pow(-t,n):Math.pow(t,n)}function Xu(){function t(t,n){return(n=Hu(n,e)-(t=Hu(t,e)))?function(r){return(Hu(r,e)-t)/n}:Em(n)}function n(t,n){return n=Hu(n,e)-(t=Hu(t,e)),function(r){return Hu(t+n*r,1/e)}}var e=1,r=Lu(t,n),i=r.domain;return r.exponent=function(t){return arguments.length?(e=+t,i(i())):e},r.copy=function(){return Pu(r,Xu().exponent(e))},Ru(r)}function Vu(){return Xu().exponent(.5)}function $u(){function t(){var t=0,o=Math.max(1,r.length);for(i=new Array(o-1);++t<o;)i[t-1]=of(e,t/o);return n}function n(t){if(!isNaN(t=+t))return r[Ds(i,t)]}var e=[],r=[],i=[];return n.invertExtent=function(t){var n=r.indexOf(t);return n<0?[NaN,NaN]:[n>0?i[n-1]:e[0],n<i.length?i[n]:e[e.length-1]]},n.domain=function(n){if(!arguments.length)return e.slice();e=[];for(var r,i=0,o=n.length;i<o;++i)null==(r=n[i])||isNaN(r=+r)||e.push(r);return e.sort(Rs),t()},n.range=function(n){return arguments.length?(r=Nm.call(n),t()):r.slice()},n.quantiles=function(){return i.slice()},n.copy=function(){return $u().domain(e).range(r)},n}function Wu(){function t(t){if(t<=t)return u[Ds(o,t,0,i)]}function n(){var n=-1;for(o=new Array(i);++n<i;)o[n]=((n+1)*r-(n-i)*e)/(i+1);return t}var e=0,r=1,i=1,o=[.5],u=[0,1];return t.domain=function(t){return arguments.length?(e=+t[0],r=+t[1],n()):[e,r]},t.range=function(t){return arguments.length?(i=(u=Nm.call(t)).length-1,n()):u.slice()},t.invertExtent=function(t){var n=u.indexOf(t);return n<0?[NaN,NaN]:n<1?[e,o[0]]:n>=i?[o[i-1],r]:[o[n-1],o[n]]},t.copy=function(){return Wu().domain([e,r]).range(u)},Ru(t)}function Zu(){function t(t){if(t<=t)return e[Ds(n,t,0,r)]}var n=[.5],e=[0,1],r=1;return t.domain=function(i){return arguments.length?(n=Nm.call(i),r=Math.min(n.length,e.length-1),t):n.slice()},t.range=function(i){return arguments.length?(e=Nm.call(i),r=Math.min(n.length,e.length-1),t):e.slice()},t.invertExtent=function(t){var r=e.indexOf(t);return[n[r-1],n[r]]},t.copy=function(){return Zu().domain(n).range(e)},t}function Gu(t,n,e,r){function i(n){return t(n=new Date(+n)),n}return i.floor=i,i.ceil=function(e){return t(e=new Date(e-1)),n(e,1),t(e),e},i.round=function(t){var n=i(t),e=i.ceil(t);return t-n<e-t?n:e},i.offset=function(t,e){return n(t=new Date(+t),null==e?1:Math.floor(e)),t},i.range=function(e,r,o){var u=[];if(e=i.ceil(e),o=null==o?1:Math.floor(o),!(e<r&&o>0))return u;do{u.push(new Date(+e))}while(n(e,o),t(e),e<r);return u},i.filter=function(e){return Gu(function(n){if(n>=n)for(;t(n),!e(n);)n.setTime(n-1)},function(t,r){if(t>=t)for(;--r>=0;)for(;n(t,1),!e(t););})},e&&(i.count=function(n,r){return Lm.setTime(+n),Rm.setTime(+r),t(Lm),t(Rm),Math.floor(e(Lm,Rm))},i.every=function(t){return t=Math.floor(t),isFinite(t)&&t>0?t>1?i.filter(r?function(n){return r(n)%t==0}:function(n){return i.count(0,n)%t==0}):i:null}),i}function Ju(t){return Gu(function(n){n.setDate(n.getDate()-(n.getDay()+7-t)%7),n.setHours(0,0,0,0)},function(t,n){t.setDate(t.getDate()+7*n)},function(t,n){return(n-t-(n.getTimezoneOffset()-t.getTimezoneOffset())*Dm)/Om})}function Qu(t){return Gu(function(n){n.setUTCDate(n.getUTCDate()-(n.getUTCDay()+7-t)%7),n.setUTCHours(0,0,0,0)},function(t,n){t.setUTCDate(t.getUTCDate()+7*n)},function(t,n){return(n-t)/Om})}function Ku(t){if(0<=t.y&&t.y<100){var n=new Date(-1,t.m,t.d,t.H,t.M,t.S,t.L);return n.setFullYear(t.y),n}return new Date(t.y,t.m,t.d,t.H,t.M,t.S,t.L)}function ta(t){if(0<=t.y&&t.y<100){var n=new Date(Date.UTC(-1,t.m,t.d,t.H,t.M,t.S,t.L));return n.setUTCFullYear(t.y),n}return new Date(Date.UTC(t.y,t.m,t.d,t.H,t.M,t.S,t.L))}function na(t){return{y:t,m:0,d:1,H:0,M:0,S:0,L:0}}function ea(t){function n(t,n){return function(e){var r,i,o,u=[],a=-1,c=0,s=t.length;for(e instanceof Date||(e=new Date(+e));++a<s;)37===t.charCodeAt(a)&&(u.push(t.slice(c,a)),null!=(i=Ux[r=t.charAt(++a)])?r=t.charAt(++a):i="e"===r?" ":"0",(o=n[r])&&(r=o(e,i)),u.push(r),c=a+1);return u.push(t.slice(c,a)),u.join("")}}function e(t,n){return function(e){var i=na(1900)
-;if(r(i,t,e+="",0)!=e.length)return null;if("p"in i&&(i.H=i.H%12+12*i.p),"W"in i||"U"in i){"w"in i||(i.w="W"in i?1:0);var o="Z"in i?ta(na(i.y)).getUTCDay():n(na(i.y)).getDay();i.m=0,i.d="W"in i?(i.w+6)%7+7*i.W-(o+5)%7:i.w+7*i.U-(o+6)%7}return"Z"in i?(i.H+=i.Z/100|0,i.M+=i.Z%100,ta(i)):n(i)}}function r(t,n,e,r){for(var i,o,u=0,a=n.length,c=e.length;u<a;){if(r>=c)return-1;if(37===(i=n.charCodeAt(u++))){if(i=n.charAt(u++),!(o=B[i in Ux?n.charAt(u++):i])||(r=o(t,e,r))<0)return-1}else if(i!=e.charCodeAt(r++))return-1}return r}function i(t,n,e){var r=C.exec(n.slice(e));return r?(t.p=z[r[0].toLowerCase()],e+r[0].length):-1}function o(t,n,e){var r=R.exec(n.slice(e));return r?(t.w=q[r[0].toLowerCase()],e+r[0].length):-1}function u(t,n,e){var r=P.exec(n.slice(e));return r?(t.w=L[r[0].toLowerCase()],e+r[0].length):-1}function a(t,n,e){var r=O.exec(n.slice(e));return r?(t.m=F[r[0].toLowerCase()],e+r[0].length):-1}function c(t,n,e){var r=U.exec(n.slice(e));return r?(t.m=D[r[0].toLowerCase()],e+r[0].length):-1}function s(t,n,e){return r(t,w,n,e)}function f(t,n,e){return r(t,M,n,e)}function l(t,n,e){return r(t,T,n,e)}function h(t){return k[t.getDay()]}function p(t){return N[t.getDay()]}function d(t){return A[t.getMonth()]}function v(t){return E[t.getMonth()]}function _(t){return S[+(t.getHours()>=12)]}function g(t){return k[t.getUTCDay()]}function y(t){return N[t.getUTCDay()]}function m(t){return A[t.getUTCMonth()]}function x(t){return E[t.getUTCMonth()]}function b(t){return S[+(t.getUTCHours()>=12)]}var w=t.dateTime,M=t.date,T=t.time,S=t.periods,N=t.days,k=t.shortDays,E=t.months,A=t.shortMonths,C=oa(S),z=ua(S),P=oa(N),L=ua(N),R=oa(k),q=ua(k),U=oa(E),D=ua(E),O=oa(A),F=ua(A),I={a:h,A:p,b:d,B:v,c:null,d:ba,e:ba,H:wa,I:Ma,j:Ta,L:Sa,m:Na,M:ka,p:_,S:Ea,U:Aa,w:Ca,W:za,x:null,X:null,y:Pa,Y:La,Z:Ra,"%":Za},Y={a:g,A:y,b:m,B:x,c:null,d:qa,e:qa,H:Ua,I:Da,j:Oa,L:Fa,m:Ia,M:Ya,p:b,S:Ba,U:ja,w:Ha,W:Xa,x:null,X:null,y:Va,Y:$a,Z:Wa,"%":Za},B={a:o,A:u,b:a,B:c,c:s,d:da,e:da,H:_a,I:_a,j:va,L:ma,m:pa,M:ga,p:i,S:ya,U:ca,w:aa,W:sa,x:f,X:l,y:la,Y:fa,Z:ha,"%":xa};return I.x=n(M,I),I.X=n(T,I),I.c=n(w,I),Y.x=n(M,Y),Y.X=n(T,Y),Y.c=n(w,Y),{format:function(t){var e=n(t+="",I);return e.toString=function(){return t},e},parse:function(t){var n=e(t+="",Ku);return n.toString=function(){return t},n},utcFormat:function(t){var e=n(t+="",Y);return e.toString=function(){return t},e},utcParse:function(t){var n=e(t,ta);return n.toString=function(){return t},n}}}function ra(t,n,e){var r=t<0?"-":"",i=(r?-t:t)+"",o=i.length;return r+(o<e?new Array(e-o+1).join(n)+i:i)}function ia(t){return t.replace(Fx,"\\$&")}function oa(t){return new RegExp("^(?:"+t.map(ia).join("|")+")","i")}function ua(t){for(var n={},e=-1,r=t.length;++e<r;)n[t[e].toLowerCase()]=e;return n}function aa(t,n,e){var r=Dx.exec(n.slice(e,e+1));return r?(t.w=+r[0],e+r[0].length):-1}function ca(t,n,e){var r=Dx.exec(n.slice(e));return r?(t.U=+r[0],e+r[0].length):-1}function sa(t,n,e){var r=Dx.exec(n.slice(e));return r?(t.W=+r[0],e+r[0].length):-1}function fa(t,n,e){var r=Dx.exec(n.slice(e,e+4));return r?(t.y=+r[0],e+r[0].length):-1}function la(t,n,e){var r=Dx.exec(n.slice(e,e+2));return r?(t.y=+r[0]+(+r[0]>68?1900:2e3),e+r[0].length):-1}function ha(t,n,e){var r=/^(Z)|([+-]\d\d)(?:\:?(\d\d))?/.exec(n.slice(e,e+6));return r?(t.Z=r[1]?0:-(r[2]+(r[3]||"00")),e+r[0].length):-1}function pa(t,n,e){var r=Dx.exec(n.slice(e,e+2));return r?(t.m=r[0]-1,e+r[0].length):-1}function da(t,n,e){var r=Dx.exec(n.slice(e,e+2));return r?(t.d=+r[0],e+r[0].length):-1}function va(t,n,e){var r=Dx.exec(n.slice(e,e+3));return r?(t.m=0,t.d=+r[0],e+r[0].length):-1}function _a(t,n,e){var r=Dx.exec(n.slice(e,e+2));return r?(t.H=+r[0],e+r[0].length):-1}function ga(t,n,e){var r=Dx.exec(n.slice(e,e+2));return r?(t.M=+r[0],e+r[0].length):-1}function ya(t,n,e){var r=Dx.exec(n.slice(e,e+2));return r?(t.S=+r[0],e+r[0].length):-1}function ma(t,n,e){var r=Dx.exec(n.slice(e,e+3));return r?(t.L=+r[0],e+r[0].length):-1}function xa(t,n,e){var r=Ox.exec(n.slice(e,e+1));return r?e+r[0].length:-1}function ba(t,n){return ra(t.getDate(),n,2)}function wa(t,n){return ra(t.getHours(),n,2)}function Ma(t,n){return ra(t.getHours()%12||12,n,2)}function Ta(t,n){return ra(1+Xm.count(sx(t),t),n,3)}function Sa(t,n){return ra(t.getMilliseconds(),n,3)}function Na(t,n){return ra(t.getMonth()+1,n,2)}function ka(t,n){return ra(t.getMinutes(),n,2)}function Ea(t,n){return ra(t.getSeconds(),n,2)}function Aa(t,n){return ra($m.count(sx(t),t),n,2)}function Ca(t){return t.getDay()}function za(t,n){return ra(Wm.count(sx(t),t),n,2)}function Pa(t,n){return ra(t.getFullYear()%100,n,2)}function La(t,n){return ra(t.getFullYear()%1e4,n,4)}function Ra(t){var n=t.getTimezoneOffset();return(n>0?"-":(n*=-1,"+"))+ra(n/60|0,"0",2)+ra(n%60,"0",2)}function qa(t,n){return ra(t.getUTCDate(),n,2)}function Ua(t,n){return ra(t.getUTCHours(),n,2)}function Da(t,n){return ra(t.getUTCHours()%12||12,n,2)}function Oa(t,n){return ra(1+vx.count(Lx(t),t),n,3)}function Fa(t,n){return ra(t.getUTCMilliseconds(),n,3)}function Ia(t,n){return ra(t.getUTCMonth()+1,n,2)}function Ya(t,n){return ra(t.getUTCMinutes(),n,2)}function Ba(t,n){return ra(t.getUTCSeconds(),n,2)}function ja(t,n){return ra(gx.count(Lx(t),t),n,2)}function Ha(t){return t.getUTCDay()}function Xa(t,n){return ra(yx.count(Lx(t),t),n,2)}function Va(t,n){return ra(t.getUTCFullYear()%100,n,2)}function $a(t,n){return ra(t.getUTCFullYear()%1e4,n,4)}function Wa(){return"+0000"}function Za(){return"%"}function Ga(n){return Rx=ea(n),t.timeFormat=Rx.format,t.timeParse=Rx.parse,t.utcFormat=Rx.utcFormat,t.utcParse=Rx.utcParse,Rx}function Ja(t){return t.toISOString()}function Qa(t){var n=new Date(t);return isNaN(n)?null:n}function Ka(t){return new Date(t)}function tc(t){return t instanceof Date?+t:+new Date(+t)}function nc(t,n,e,r,o,u,a,c,s){function f(i){return(a(i)<i?v:u(i)<i?_:o(i)<i?g:r(i)<i?y:n(i)<i?e(i)<i?m:x:t(i)<i?b:w)(i)}function l(n,e,r,o){if(null==n&&(n=10),"number"==typeof n){var u=Math.abs(r-e)/n,a=qs(function(t){return t[2]}).right(M,u);a===M.length?(o=i(e/Wx,r/Wx,n),n=t):a?(a=M[u/M[a-1][2]<M[a][2]/u?a-1:a],o=a[1],n=a[0]):(o=i(e,r,n),n=c)}return null==o?n:n.every(o)}var h=Lu(ku,xh),p=h.invert,d=h.domain,v=s(".%L"),_=s(":%S"),g=s("%I:%M"),y=s("%I %p"),m=s("%a %d"),x=s("%b %d"),b=s("%B"),w=s("%Y"),M=[[a,1,Bx],[a,5,5*Bx],[a,15,15*Bx],[a,30,30*Bx],[u,1,jx],[u,5,5*jx],[u,15,15*jx],[u,30,30*jx],[o,1,Hx],[o,3,3*Hx],[o,6,6*Hx],[o,12,12*Hx],[r,1,Xx],[r,2,2*Xx],[e,1,Vx],[n,1,$x],[n,3,3*$x],[t,1,Wx]];return h.invert=function(t){return new Date(p(t))},h.domain=function(t){return arguments.length?d(Sm.call(t,tc)):d().map(Ka)},h.ticks=function(t,n){var e,r=d(),i=r[0],o=r[r.length-1],u=o<i;return u&&(e=i,i=o,o=e),e=l(t,i,o,n),e=e?e.range(i,o+1):[],u?e.reverse():e},h.tickFormat=function(t,n){return null==n?f:s(n)},h.nice=function(t,n){var e=d();return(t=l(t,e[0],e[e.length-1],n))?d(Pm(e,t)):h},h.copy=function(){return Pu(h,nc(t,n,e,r,o,u,a,c,s))},h}function ec(t){var n=t.length;return function(e){return t[Math.max(0,Math.min(n-1,Math.floor(e*n)))]}}function rc(t){function n(n){var o=(n-e)/(r-e);return t(i?Math.max(0,Math.min(1,o)):o)}var e=0,r=1,i=!1;return n.domain=function(t){return arguments.length?(e=+t[0],r=+t[1],n):[e,r]},n.clamp=function(t){return arguments.length?(i=!!t,n):i},n.interpolator=function(e){return arguments.length?(t=e,n):t},n.copy=function(){return rc(t).domain([e,r]).clamp(i)},Ru(n)}function ic(t){return t>1?0:t<-1?xb:Math.acos(t)}function oc(t){return t>=1?bb:t<=-1?-bb:Math.asin(t)}function uc(t){return t.innerRadius}function ac(t){return t.outerRadius}function cc(t){return t.startAngle}function sc(t){return t.endAngle}function fc(t){return t&&t.padAngle}function lc(t,n,e,r,i,o,u,a){var c=e-t,s=r-n,f=u-i,l=a-o,h=(f*(n-o)-l*(t-i))/(l*c-f*s);return[t+h*c,n+h*s]}function hc(t,n,e,r,i,o,u){var a=t-e,c=n-r,s=(u?o:-o)/yb(a*a+c*c),f=s*c,l=-s*a,h=t+f,p=n+l,d=e+f,v=r+l,_=(h+d)/2,g=(p+v)/2,y=d-h,m=v-p,x=y*y+m*m,b=i-o,w=h*v-d*p,M=(m<0?-1:1)*yb(vb(0,b*b*x-w*w)),T=(w*m-y*M)/x,S=(-w*y-m*M)/x,N=(w*m+y*M)/x,k=(-w*y+m*M)/x,E=T-_,A=S-g,C=N-_,z=k-g;return E*E+A*A>C*C+z*z&&(T=N,S=k),{cx:T,cy:S,x01:-f,y01:-l,x11:T*(i/b-1),y11:S*(i/b-1)}}function pc(t){this._context=t}function dc(t){return t[0]}function vc(t){return t[1]}function _c(t){this._curve=t}function gc(t){function n(n){return new _c(t(n))}return n._curve=t,n}function yc(t){var n=t.curve;return t.angle=t.x,delete t.x,t.radius=t.y,delete t.y,t.curve=function(t){return arguments.length?n(gc(t)):n()._curve},t}function mc(t,n,e){t._context.bezierCurveTo((2*t._x0+t._x1)/3,(2*t._y0+t._y1)/3,(t._x0+2*t._x1)/3,(t._y0+2*t._y1)/3,(t._x0+4*t._x1+n)/6,(t._y0+4*t._y1+e)/6)}function xc(t){this._context=t}function bc(t){this._context=t}function wc(t){this._context=t}function Mc(t,n){this._basis=new xc(t),this._beta=n}function Tc(t,n,e){t._context.bezierCurveTo(t._x1+t._k*(t._x2-t._x0),t._y1+t._k*(t._y2-t._y0),t._x2+t._k*(t._x1-n),t._y2+t._k*(t._y1-e),t._x2,t._y2)}function Sc(t,n){this._context=t,this._k=(1-n)/6}function Nc(t,n){this._context=t,this._k=(1-n)/6}function kc(t,n){this._context=t,this._k=(1-n)/6}function Ec(t,n,e){var r=t._x1,i=t._y1,o=t._x2,u=t._y2;if(t._l01_a>mb){var a=2*t._l01_2a+3*t._l01_a*t._l12_a+t._l12_2a,c=3*t._l01_a*(t._l01_a+t._l12_a);r=(r*a-t._x0*t._l12_2a+t._x2*t._l01_2a)/c,i=(i*a-t._y0*t._l12_2a+t._y2*t._l01_2a)/c}if(t._l23_a>mb){var s=2*t._l23_2a+3*t._l23_a*t._l12_a+t._l12_2a,f=3*t._l23_a*(t._l23_a+t._l12_a);o=(o*s+t._x1*t._l23_2a-n*t._l12_2a)/f,u=(u*s+t._y1*t._l23_2a-e*t._l12_2a)/f}t._context.bezierCurveTo(r,i,o,u,t._x2,t._y2)}function Ac(t,n){this._context=t,this._alpha=n}function Cc(t,n){this._context=t,this._alpha=n}function zc(t,n){this._context=t,this._alpha=n}function Pc(t){this._context=t}function Lc(t){return t<0?-1:1}function Rc(t,n,e){var r=t._x1-t._x0,i=n-t._x1,o=(t._y1-t._y0)/(r||i<0&&-0),u=(e-t._y1)/(i||r<0&&-0),a=(o*i+u*r)/(r+i);return(Lc(o)+Lc(u))*Math.min(Math.abs(o),Math.abs(u),.5*Math.abs(a))||0}function qc(t,n){var e=t._x1-t._x0;return e?(3*(t._y1-t._y0)/e-n)/2:n}function Uc(t,n,e){var r=t._x0,i=t._y0,o=t._x1,u=t._y1,a=(o-r)/3;t._context.bezierCurveTo(r+a,i+a*n,o-a,u-a*e,o,u)}function Dc(t){this._context=t}function Oc(t){this._context=new Fc(t)}function Fc(t){this._context=t}function Ic(t){return new Dc(t)}function Yc(t){return new Oc(t)}function Bc(t){this._context=t}function jc(t){var n,e,r=t.length-1,i=new Array(r),o=new Array(r),u=new Array(r);for(i[0]=0,o[0]=2,u[0]=t[0]+2*t[1],n=1;n<r-1;++n)i[n]=1,o[n]=4,u[n]=4*t[n]+2*t[n+1];for(i[r-1]=2,o[r-1]=7,u[r-1]=8*t[r-1]+t[r],n=1;n<r;++n)e=i[n]/o[n-1],o[n]-=e,u[n]-=e*u[n-1];for(i[r-1]=u[r-1]/o[r-1],n=r-2;n>=0;--n)i[n]=(u[n]-i[n+1])/o[n];for(o[r-1]=(t[r]+i[r-1])/2,n=0;n<r-1;++n)o[n]=2*t[n+1]-i[n+1];return[i,o]}function Hc(t,n){this._context=t,this._t=n}function Xc(t){return new Hc(t,0)}function Vc(t){return new Hc(t,1)}function $c(t,n){return t[n]}function Wc(t){for(var n,e=0,r=-1,i=t.length;++r<i;)(n=+t[r][1])&&(e+=n);return e}function Zc(t){return t[0]}function Gc(t){return t[1]}function Jc(){this._=null}function Qc(t){t.U=t.C=t.L=t.R=t.P=t.N=null}function Kc(t,n){var e=n,r=n.R,i=e.U;i?i.L===e?i.L=r:i.R=r:t._=r,r.U=i,e.U=r,e.R=r.L,e.R&&(e.R.U=e),r.L=e}function ts(t,n){var e=n,r=n.L,i=e.U;i?i.L===e?i.L=r:i.R=r:t._=r,r.U=i,e.U=r,e.L=r.R,e.L&&(e.L.U=e),r.R=e}function ns(t){for(;t.L;)t=t.L;return t}function es(t,n,e,r){var i=[null,null],o=Ew.push(i)-1;return i.left=t,i.right=n,e&&is(i,t,n,e),r&&is(i,n,t,r),Nw[t.index].halfedges.push(o),Nw[n.index].halfedges.push(o),i}function rs(t,n,e){var r=[n,e];return r.left=t,r}function is(t,n,e,r){t[0]||t[1]?t.left===e?t[1]=r:t[0]=r:(t[0]=r,t.left=n,t.right=e)}function os(t,n,e,r,i){var o,u=t[0],a=t[1],c=u[0],s=u[1],f=a[0],l=a[1],h=0,p=1,d=f-c,v=l-s;if(o=n-c,d||!(o>0)){if(o/=d,d<0){if(o<h)return;o<p&&(p=o)}else if(d>0){if(o>p)return;o>h&&(h=o)}if(o=r-c,d||!(o<0)){if(o/=d,d<0){if(o>p)return;o>h&&(h=o)}else if(d>0){if(o<h)return;o<p&&(p=o)}if(o=e-s,v||!(o>0)){if(o/=v,v<0){if(o<h)return;o<p&&(p=o)}else if(v>0){if(o>p)return;o>h&&(h=o)}if(o=i-s,v||!(o<0)){if(o/=v,v<0){if(o>p)return;o>h&&(h=o)}else if(v>0){if(o<h)return;o<p&&(p=o)}return!(h>0||p<1)||(h>0&&(t[0]=[c+h*d,s+h*v]),p<1&&(t[1]=[c+p*d,s+p*v]),!0)}}}}}function us(t,n,e,r,i){var o=t[1];if(o)return!0;var u,a,c=t[0],s=t.left,f=t.right,l=s[0],h=s[1],p=f[0],d=f[1],v=(l+p)/2,_=(h+d)/2;if(d===h){if(v<n||v>=r)return;if(l>p){if(c){if(c[1]>=i)return}else c=[v,e];o=[v,i]}else{if(c){if(c[1]<e)return}else c=[v,i];o=[v,e]}}else if(u=(l-p)/(d-h),a=_-u*v,u<-1||u>1)if(l>p){if(c){if(c[1]>=i)return}else c=[(e-a)/u,e];o=[(i-a)/u,i]}else{if(c){if(c[1]<e)return}else c=[(i-a)/u,i];o=[(e-a)/u,e]}else if(h<d){if(c){if(c[0]>=r)return}else c=[n,u*n+a];o=[r,u*r+a]}else{if(c){if(c[0]<n)return}else c=[r,u*r+a];o=[n,u*n+a]}return t[0]=c,t[1]=o,!0}function as(t,n,e,r){for(var i,o=Ew.length;o--;)us(i=Ew[o],t,n,e,r)&&os(i,t,n,e,r)&&(Math.abs(i[0][0]-i[1][0])>zw||Math.abs(i[0][1]-i[1][1])>zw)||delete Ew[o]}function cs(t){return Nw[t.index]={site:t,halfedges:[]}}function ss(t,n){var e=t.site,r=n.left,i=n.right;return e===i&&(i=r,r=e),i?Math.atan2(i[1]-r[1],i[0]-r[0]):(e===r?(r=n[1],i=n[0]):(r=n[0],i=n[1]),Math.atan2(r[0]-i[0],i[1]-r[1]))}function fs(t,n){return n[+(n.left!==t.site)]}function ls(t,n){return n[+(n.left===t.site)]}function hs(){for(var t,n,e,r,i=0,o=Nw.length;i<o;++i)if((t=Nw[i])&&(r=(n=t.halfedges).length)){var u=new Array(r),a=new Array(r);for(e=0;e<r;++e)u[e]=e,a[e]=ss(t,Ew[n[e]]);for(u.sort(function(t,n){return a[n]-a[t]}),e=0;e<r;++e)a[e]=n[u[e]];for(e=0;e<r;++e)n[e]=a[e]}}function ps(t,n,e,r){var i,o,u,a,c,s,f,l,h,p,d,v,_=Nw.length,g=!0;for(i=0;i<_;++i)if(o=Nw[i]){for(u=o.site,c=o.halfedges,a=c.length;a--;)Ew[c[a]]||c.splice(a,1);for(a=0,s=c.length;a<s;)p=ls(o,Ew[c[a]]),d=p[0],v=p[1],f=fs(o,Ew[c[++a%s]]),l=f[0],h=f[1],(Math.abs(d-l)>zw||Math.abs(v-h)>zw)&&(c.splice(a,0,Ew.push(rs(u,p,Math.abs(d-t)<zw&&r-v>zw?[t,Math.abs(l-t)<zw?h:r]:Math.abs(v-r)<zw&&e-d>zw?[Math.abs(h-r)<zw?l:e,r]:Math.abs(d-e)<zw&&v-n>zw?[e,Math.abs(l-e)<zw?h:n]:Math.abs(v-n)<zw&&d-t>zw?[Math.abs(h-n)<zw?l:t,n]:null))-1),++s);s&&(g=!1)}if(g){var y,m,x,b=1/0;for(i=0,g=null;i<_;++i)(o=Nw[i])&&(u=o.site,y=u[0]-t,m=u[1]-n,(x=y*y+m*m)<b&&(b=x,g=o));if(g){var w=[t,n],M=[t,r],T=[e,r],S=[e,n];g.halfedges.push(Ew.push(rs(u=g.site,w,M))-1,Ew.push(rs(u,M,T))-1,Ew.push(rs(u,T,S))-1,Ew.push(rs(u,S,w))-1)}}for(i=0;i<_;++i)(o=Nw[i])&&(o.halfedges.length||delete Nw[i])}function ds(){Qc(this),this.x=this.y=this.arc=this.site=this.cy=null}function vs(t){var n=t.P,e=t.N;if(n&&e){var r=n.site,i=t.site,o=e.site;if(r!==o){var u=i[0],a=i[1],c=r[0]-u,s=r[1]-a,f=o[0]-u,l=o[1]-a,h=2*(c*l-s*f);if(!(h>=-Pw)){var p=c*c+s*s,d=f*f+l*l,v=(l*p-s*d)/h,_=(c*d-f*p)/h,g=Aw.pop()||new ds;g.arc=t,g.site=i,g.x=v+u,g.y=(g.cy=_+a)+Math.sqrt(v*v+_*_),t.circle=g;for(var y=null,m=kw._;m;)if(g.y<m.y||g.y===m.y&&g.x<=m.x){if(!m.L){y=m.P;break}m=m.L}else{if(!m.R){y=m;break}m=m.R}kw.insert(y,g),y||(Tw=g)}}}}function _s(t){var n=t.circle;n&&(n.P||(Tw=n.N),kw.remove(n),Aw.push(n),Qc(n),t.circle=null)}function gs(){Qc(this),this.edge=this.site=this.circle=null}function ys(t){var n=Cw.pop()||new gs;return n.site=t,n}function ms(t){_s(t),Sw.remove(t),Cw.push(t),Qc(t)}function xs(t){var n=t.circle,e=n.x,r=n.cy,i=[e,r],o=t.P,u=t.N,a=[t];ms(t);for(var c=o;c.circle&&Math.abs(e-c.circle.x)<zw&&Math.abs(r-c.circle.cy)<zw;)o=c.P,a.unshift(c),ms(c),c=o;a.unshift(c),_s(c);for(var s=u;s.circle&&Math.abs(e-s.circle.x)<zw&&Math.abs(r-s.circle.cy)<zw;)u=s.N,a.push(s),ms(s),s=u;a.push(s),_s(s);var f,l=a.length;for(f=1;f<l;++f)s=a[f],c=a[f-1],is(s.edge,c.site,s.site,i);c=a[0],s=a[l-1],s.edge=es(c.site,s.site,null,i),vs(c),vs(s)}function bs(t){for(var n,e,r,i,o=t[0],u=t[1],a=Sw._;a;)if((r=ws(a,u)-o)>zw)a=a.L;else{if(!((i=o-Ms(a,u))>zw)){r>-zw?(n=a.P,e=a):i>-zw?(n=a,e=a.N):n=e=a;break}if(!a.R){n=a;break}a=a.R}cs(t);var c=ys(t);if(Sw.insert(n,c),n||e){if(n===e)return _s(n),e=ys(n.site),Sw.insert(c,e),c.edge=e.edge=es(n.site,c.site),vs(n),void vs(e);if(!e)return void(c.edge=es(n.site,c.site));_s(n),_s(e);var s=n.site,f=s[0],l=s[1],h=t[0]-f,p=t[1]-l,d=e.site,v=d[0]-f,_=d[1]-l,g=2*(h*_-p*v),y=h*h+p*p,m=v*v+_*_,x=[(_*y-p*m)/g+f,(h*m-v*y)/g+l];is(e.edge,s,d,x),c.edge=es(s,t,null,x),e.edge=es(t,d,null,x),vs(n),vs(e)}}function ws(t,n){var e=t.site,r=e[0],i=e[1],o=i-n;if(!o)return r;var u=t.P;if(!u)return-1/0;e=u.site;var a=e[0],c=e[1],s=c-n;if(!s)return a;var f=a-r,l=1/o-1/s,h=f/s;return l?(-h+Math.sqrt(h*h-2*l*(f*f/(-2*s)-c+s/2+i-o/2)))/l+r:(r+a)/2}function Ms(t,n){var e=t.N;if(e)return ws(e,n);var r=t.site;return r[1]===n?r[0]:1/0}function Ts(t,n,e){return(t[0]-e[0])*(n[1]-t[1])-(t[0]-n[0])*(e[1]-t[1])}function Ss(t,n){return n[1]-t[1]||n[0]-t[0]}function Ns(t,n){var e,r,i,o=t.sort(Ss).pop();for(Ew=[],Nw=new Array(t.length),Sw=new Jc,kw=new Jc;;)if(i=Tw,o&&(!i||o[1]<i.y||o[1]===i.y&&o[0]<i.x))o[0]===e&&o[1]===r||(bs(o),e=o[0],r=o[1]),o=t.pop();else{if(!i)break;xs(i.arc)}if(hs(),n){var u=+n[0][0],a=+n[0][1],c=+n[1][0],s=+n[1][1];as(u,a,c,s),ps(u,a,c,s)}this.edges=Ew,this.cells=Nw,Sw=kw=Ew=Nw=null}function ks(t,n,e){this.target=t,this.type=n,this.transform=e}function Es(t,n,e){this.k=t,this.x=n,this.y=e}function As(t){return t.__zoom||qw}function Cs(){t.event.stopImmediatePropagation()}function zs(){return!t.event.button}function Ps(){var t,n,e=this;return e instanceof SVGElement?(e=e.ownerSVGElement||e,t=e.width.baseVal.value,n=e.height.baseVal.value):(t=e.clientWidth,n=e.clientHeight),[[0,0],[t,n]]}function Ls(){return this.__zoom||qw}var Rs=function(t,n){return t<n?-1:t>n?1:t>=n?0:NaN},qs=function(t){return 1===t.length&&(t=n(t)),{left:function(n,e,r,i){for(null==r&&(r=0),null==i&&(i=n.length);r<i;){var o=r+i>>>1;t(n[o],e)<0?r=o+1:i=o}return r},right:function(n,e,r,i){for(null==r&&(r=0),null==i&&(i=n.length);r<i;){var o=r+i>>>1;t(n[o],e)>0?i=o:r=o+1}return r}}},Us=qs(Rs),Ds=Us.right,Os=Us.left,Fs=function(t,n){null==n&&(n=e);for(var r=0,i=t.length-1,o=t[0],u=new Array(i<0?0:i);r<i;)u[r]=n(o,o=t[++r]);return u},Is=function(t,n,r){var i,o,u,a,c=t.length,s=n.length,f=new Array(c*s);for(null==r&&(r=e),i=u=0;i<c;++i)for(a=t[i],o=0;o<s;++o,++u)f[u]=r(a,n[o]);return f},Ys=function(t,n){return n<t?-1:n>t?1:n>=t?0:NaN},Bs=function(t){return null===t?NaN:+t},js=function(t,n){var e,r,i=t.length,o=0,u=-1,a=0,c=0;if(null==n)for(;++u<i;)isNaN(e=Bs(t[u]))||(r=e-a,a+=r/++o,c+=r*(e-a));else for(;++u<i;)isNaN(e=Bs(n(t[u],u,t)))||(r=e-a,a+=r/++o,c+=r*(e-a));if(o>1)return c/(o-1)},Hs=function(t,n){var e=js(t,n);return e?Math.sqrt(e):e},Xs=function(t,n){var e,r,i,o=t.length,u=-1;if(null==n){for(;++u<o;)if(null!=(e=t[u])&&e>=e)for(r=i=e;++u<o;)null!=(e=t[u])&&(r>e&&(r=e),i<e&&(i=e))}else for(;++u<o;)if(null!=(e=n(t[u],u,t))&&e>=e)for(r=i=e;++u<o;)null!=(e=n(t[u],u,t))&&(r>e&&(r=e),i<e&&(i=e));return[r,i]},Vs=Array.prototype,$s=Vs.slice,Ws=Vs.map,Zs=function(t){return function(){return t}},Gs=function(t){return t},Js=function(t,n,e){t=+t,n=+n,e=(i=arguments.length)<2?(n=t,t=0,1):i<3?1:+e;for(var r=-1,i=0|Math.max(0,Math.ceil((n-t)/e)),o=new Array(i);++r<i;)o[r]=t+r*e;return o},Qs=Math.sqrt(50),Ks=Math.sqrt(10),tf=Math.sqrt(2),nf=function(t,n,e){var i,o,u,a=n<t,c=-1;if(a&&(i=t,t=n,n=i),0===(u=r(t,n,e))||!isFinite(u))return[];if(u>0)for(t=Math.ceil(t/u),n=Math.floor(n/u),o=new Array(i=Math.ceil(n-t+1));++c<i;)o[c]=(t+c)*u;else for(t=Math.floor(t*u),n=Math.ceil(n*u),o=new Array(i=Math.ceil(t-n+1));++c<i;)o[c]=(t-c)/u;return a&&o.reverse(),o},ef=function(t){return Math.ceil(Math.log(t.length)/Math.LN2)+1},rf=function(){function t(t){var o,u,a=t.length,c=new Array(a);for(o=0;o<a;++o)c[o]=n(t[o],o,t);var s=e(c),f=s[0],l=s[1],h=r(c,f,l);Array.isArray(h)||(h=i(f,l,h),h=Js(Math.ceil(f/h)*h,Math.floor(l/h)*h,h));for(var p=h.length;h[0]<=f;)h.shift(),--p;for(;h[p-1]>l;)h.pop(),--p;var d,v=new Array(p+1);for(o=0;o<=p;++o)d=v[o]=[],d.x0=o>0?h[o-1]:f,d.x1=o<p?h[o]:l;for(o=0;o<a;++o)u=c[o],f<=u&&u<=l&&v[Ds(h,u,0,p)].push(t[o]);return v}var n=Gs,e=Xs,r=ef;return t.value=function(e){return arguments.length?(n="function"==typeof e?e:Zs(e),t):n},t.domain=function(n){return arguments.length?(e="function"==typeof n?n:Zs([n[0],n[1]]),t):e},t.thresholds=function(n){return arguments.length?(r="function"==typeof n?n:Zs(Array.isArray(n)?$s.call(n):n),t):r},t},of=function(t,n,e){if(null==e&&(e=Bs),r=t.length){if((n=+n)<=0||r<2)return+e(t[0],0,t);if(n>=1)return+e(t[r-1],r-1,t);var r,i=(r-1)*n,o=Math.floor(i),u=+e(t[o],o,t);return u+(+e(t[o+1],o+1,t)-u)*(i-o)}},uf=function(t,n,e){return t=Ws.call(t,Bs).sort(Rs),Math.ceil((e-n)/(2*(of(t,.75)-of(t,.25))*Math.pow(t.length,-1/3)))},af=function(t,n,e){return Math.ceil((e-n)/(3.5*Hs(t)*Math.pow(t.length,-1/3)))},cf=function(t,n){var e,r,i=t.length,o=-1;if(null==n){for(;++o<i;)if(null!=(e=t[o])&&e>=e)for(r=e;++o<i;)null!=(e=t[o])&&e>r&&(r=e)}else for(;++o<i;)if(null!=(e=n(t[o],o,t))&&e>=e)for(r=e;++o<i;)null!=(e=n(t[o],o,t))&&e>r&&(r=e);return r},sf=function(t,n){var e,r=t.length,i=r,o=-1,u=0;if(null==n)for(;++o<r;)isNaN(e=Bs(t[o]))?--i:u+=e;else for(;++o<r;)isNaN(e=Bs(n(t[o],o,t)))?--i:u+=e;if(i)return u/i},ff=function(t,n){var e,r=t.length,i=-1,o=[];if(null==n)for(;++i<r;)isNaN(e=Bs(t[i]))||o.push(e);else for(;++i<r;)isNaN(e=Bs(n(t[i],i,t)))||o.push(e);return of(o.sort(Rs),.5)},lf=function(t){for(var n,e,r,i=t.length,o=-1,u=0;++o<i;)u+=t[o].length;for(e=new Array(u);--i>=0;)for(r=t[i],n=r.length;--n>=0;)e[--u]=r[n];return e},hf=function(t,n){var e,r,i=t.length,o=-1;if(null==n){for(;++o<i;)if(null!=(e=t[o])&&e>=e)for(r=e;++o<i;)null!=(e=t[o])&&r>e&&(r=e)}else for(;++o<i;)if(null!=(e=n(t[o],o,t))&&e>=e)for(r=e;++o<i;)null!=(e=n(t[o],o,t))&&r>e&&(r=e);return r},pf=function(t,n){for(var e=n.length,r=new Array(e);e--;)r[e]=t[n[e]];return r},df=function(t,n){if(e=t.length){var e,r,i=0,o=0,u=t[o];for(null==n&&(n=Rs);++i<e;)(n(r=t[i],u)<0||0!==n(u,u))&&(u=r,o=i);return 0===n(u,u)?o:void 0}},vf=function(t,n,e){for(var r,i,o=(null==e?t.length:e)-(n=null==n?0:+n);o;)i=Math.random()*o--|0,r=t[o+n],t[o+n]=t[i+n],t[i+n]=r;return t},_f=function(t,n){var e,r=t.length,i=-1,o=0;if(null==n)for(;++i<r;)(e=+t[i])&&(o+=e);else for(;++i<r;)(e=+n(t[i],i,t))&&(o+=e);return o},gf=function(t){if(!(i=t.length))return[];for(var n=-1,e=hf(t,o),r=new Array(e);++n<e;)for(var i,u=-1,a=r[n]=new Array(i);++u<i;)a[u]=t[u][n];return r},yf=function(){return gf(arguments)},mf=Array.prototype.slice,xf=function(t){return t},bf=1,wf=2,Mf=3,Tf=4,Sf=1e-6,Nf={value:function(){}};_.prototype=v.prototype={constructor:_,on:function(t,n){var e,r=this._,i=g(t+"",r),o=-1,u=i.length;{if(!(arguments.length<2)){if(null!=n&&"function"!=typeof n)throw new Error("invalid callback: "+n);for(;++o<u;)if(e=(t=i[o]).type)r[e]=m(r[e],t.name,n);else if(null==n)for(e in r)r[e]=m(r[e],t.name,null);return this}for(;++o<u;)if((e=(t=i[o]).type)&&(e=y(r[e],t.name)))return e}},copy:function(){var t={},n=this._;for(var e in n)t[e]=n[e].slice();return new _(t)},call:function(t,n){if((e=arguments.length-2)>0)for(var e,r,i=new Array(e),o=0;o<e;++o)i[o]=arguments[o+2];if(!this._.hasOwnProperty(t))throw new Error("unknown type: "+t);for(r=this._[t],o=0,e=r.length;o<e;++o)r[o].value.apply(n,i)},apply:function(t,n,e){if(!this._.hasOwnProperty(t))throw new Error("unknown type: "+t);for(var r=this._[t],i=0,o=r.length;i<o;++i)r[i].value.apply(n,e)}};var kf="http://www.w3.org/1999/xhtml",Ef={svg:"http://www.w3.org/2000/svg",xhtml:kf,xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"},Af=function(t){var n=t+="",e=n.indexOf(":");return e>=0&&"xmlns"!==(n=t.slice(0,e))&&(t=t.slice(e+1)),Ef.hasOwnProperty(n)?{space:Ef[n],local:t}:t},Cf=function(t){var n=Af(t);return(n.local?b:x)(n)},zf=0;M.prototype=w.prototype={constructor:M,get:function(t){for(var n=this._;!(n in t);)if(!(t=t.parentNode))return;return t[n]},set:function(t,n){return t[this._]=n},remove:function(t){return this._ in t&&delete t[this._]},toString:function(){return this._}};var Pf=function(t){return function(){return this.matches(t)}};if("undefined"!=typeof document){var Lf=document.documentElement;if(!Lf.matches){var Rf=Lf.webkitMatchesSelector||Lf.msMatchesSelector||Lf.mozMatchesSelector||Lf.oMatchesSelector;Pf=function(t){return function(){return Rf.call(this,t)}}}}var qf=Pf,Uf={};if(t.event=null,"undefined"!=typeof document){"onmouseenter"in document.documentElement||(Uf={mouseenter:"mouseover",mouseleave:"mouseout"})}var Df=function(t,n,e){var r,i,o=N(t+""),u=o.length;{if(!(arguments.length<2)){for(a=n?E:k,null==e&&(e=!1),r=0;r<u;++r)this.each(a(o[r],n,e));return this}var a=this.node().__on;if(a)for(var c,s=0,f=a.length;s<f;++s)for(r=0,c=a[s];r<u;++r)if((i=o[r]).type===c.type&&i.name===c.name)return c.value}},Of=function(){for(var n,e=t.event;n=e.sourceEvent;)e=n;return e},Ff=function(t,n){var e=t.ownerSVGElement||t;if(e.createSVGPoint){var r=e.createSVGPoint();return r.x=n.clientX,r.y=n.clientY,r=r.matrixTransform(t.getScreenCTM().inverse()),[r.x,r.y]}var i=t.getBoundingClientRect();return[n.clientX-i.left-t.clientLeft,n.clientY-i.top-t.clientTop]},If=function(t){var n=Of();return n.changedTouches&&(n=n.changedTouches[0]),Ff(t,n)},Yf=function(t){return null==t?C:function(){return this.querySelector(t)}},Bf=function(t){"function"!=typeof t&&(t=Yf(t));for(var n=this._groups,e=n.length,r=new Array(e),i=0;i<e;++i)for(var o,u,a=n[i],c=a.length,s=r[i]=new Array(c),f=0;f<c;++f)(o=a[f])&&(u=t.call(o,o.__data__,f,a))&&("__data__"in o&&(u.__data__=o.__data__),s[f]=u);return new vt(r,this._parents)},jf=function(t){return null==t?z:function(){return this.querySelectorAll(t)}},Hf=function(t){"function"!=typeof t&&(t=jf(t));for(var n=this._groups,e=n.length,r=[],i=[],o=0;o<e;++o)for(var u,a=n[o],c=a.length,s=0;s<c;++s)(u=a[s])&&(r.push(t.call(u,u.__data__,s,a)),i.push(u));return new vt(r,i)},Xf=function(t){"function"!=typeof t&&(t=qf(t));for(var n=this._groups,e=n.length,r=new Array(e),i=0;i<e;++i)for(var o,u=n[i],a=u.length,c=r[i]=[],s=0;s<a;++s)(o=u[s])&&t.call(o,o.__data__,s,u)&&c.push(o);return new vt(r,this._parents)},Vf=function(t){return new Array(t.length)},$f=function(){return new vt(this._enter||this._groups.map(Vf),this._parents)};P.prototype={constructor:P,appendChild:function(t){return this._parent.insertBefore(t,this._next)},insertBefore:function(t,n){return this._parent.insertBefore(t,n)},querySelector:function(t){return this._parent.querySelector(t)},querySelectorAll:function(t){return this._parent.querySelectorAll(t)}};var Wf=function(t){return function(){return t}},Zf="$",Gf=function(t,n){if(!t)return p=new Array(this.size()),s=-1,this.each(function(t){p[++s]=t}),p;var e=n?R:L,r=this._parents,i=this._groups;"function"!=typeof t&&(t=Wf(t));for(var o=i.length,u=new Array(o),a=new Array(o),c=new Array(o),s=0;s<o;++s){var f=r[s],l=i[s],h=l.length,p=t.call(f,f&&f.__data__,s,r),d=p.length,v=a[s]=new Array(d),_=u[s]=new Array(d);e(f,l,v,_,c[s]=new Array(h),p,n);for(var g,y,m=0,x=0;m<d;++m)if(g=v[m]){for(m>=x&&(x=m+1);!(y=_[x])&&++x<d;);g._next=y||null}}return u=new vt(u,r),u._enter=a,u._exit=c,u},Jf=function(){return new vt(this._exit||this._groups.map(Vf),this._parents)},Qf=function(t){for(var n=this._groups,e=t._groups,r=n.length,i=e.length,o=Math.min(r,i),u=new Array(r),a=0;a<o;++a)for(var c,s=n[a],f=e[a],l=s.length,h=u[a]=new Array(l),p=0;p<l;++p)(c=s[p]||f[p])&&(h[p]=c);for(;a<r;++a)u[a]=n[a];return new vt(u,this._parents)},Kf=function(){for(var t=this._groups,n=-1,e=t.length;++n<e;)for(var r,i=t[n],o=i.length-1,u=i[o];--o>=0;)(r=i[o])&&(u&&u!==r.nextSibling&&u.parentNode.insertBefore(r,u),u=r);return this},tl=function(t){function n(n,e){return n&&e?t(n.__data__,e.__data__):!n-!e}t||(t=q);for(var e=this._groups,r=e.length,i=new Array(r),o=0;o<r;++o){for(var u,a=e[o],c=a.length,s=i[o]=new Array(c),f=0;f<c;++f)(u=a[f])&&(s[f]=u);s.sort(n)}return new vt(i,this._parents).order()},nl=function(){var t=arguments[0];return arguments[0]=this,t.apply(null,arguments),this},el=function(){var t=new Array(this.size()),n=-1;return this.each(function(){t[++n]=this}),t},rl=function(){for(var t=this._groups,n=0,e=t.length;n<e;++n)for(var r=t[n],i=0,o=r.length;i<o;++i){var u=r[i];if(u)return u}return null},il=function(){var t=0;return this.each(function(){++t}),t},ol=function(){return!this.node()},ul=function(t){for(var n=this._groups,e=0,r=n.length;e<r;++e)for(var i,o=n[e],u=0,a=o.length;u<a;++u)(i=o[u])&&t.call(i,i.__data__,u,o);return this},al=function(t,n){var e=Af(t);if(arguments.length<2){var r=this.node();return e.local?r.getAttributeNS(e.space,e.local):r.getAttribute(e)}return this.each((null==n?e.local?D:U:"function"==typeof n?e.local?Y:I:e.local?F:O)(e,n))},cl=function(t){return t.ownerDocument&&t.ownerDocument.defaultView||t.document&&t||t.defaultView},sl=function(t,n,e){var r;return arguments.length>1?this.each((null==n?B:"function"==typeof n?H:j)(t,n,null==e?"":e)):cl(r=this.node()).getComputedStyle(r,null).getPropertyValue(t)},fl=function(t,n){return arguments.length>1?this.each((null==n?X:"function"==typeof n?$:V)(t,n)):this.node()[t]};G.prototype={add:function(t){this._names.indexOf(t)<0&&(this._names.push(t),this._node.setAttribute("class",this._names.join(" ")))},remove:function(t){var n=this._names.indexOf(t);n>=0&&(this._names.splice(n,1),this._node.setAttribute("class",this._names.join(" ")))},contains:function(t){return this._names.indexOf(t)>=0}};var ll=function(t,n){var e=W(t+"");if(arguments.length<2){for(var r=Z(this.node()),i=-1,o=e.length;++i<o;)if(!r.contains(e[i]))return!1;return!0}return this.each(("function"==typeof n?nt:n?K:tt)(e,n))},hl=function(t){return arguments.length?this.each(null==t?et:("function"==typeof t?it:rt)(t)):this.node().textContent},pl=function(t){return arguments.length?this.each(null==t?ot:("function"==typeof t?at:ut)(t)):this.node().innerHTML},dl=function(){return this.each(ct)},vl=function(){return this.each(st)},_l=function(t){var n="function"==typeof t?t:Cf(t);return this.select(function(){return this.appendChild(n.apply(this,arguments))})},gl=function(t,n){var e="function"==typeof t?t:Cf(t),r=null==n?ft:"function"==typeof n?n:Yf(n);return this.select(function(){return this.insertBefore(e.apply(this,arguments),r.apply(this,arguments)||null)})},yl=function(){return this.each(lt)},ml=function(t){return arguments.length?this.property("__data__",t):this.node().__data__},xl=function(t,n){return this.each(("function"==typeof n?dt:pt)(t,n))},bl=[null];vt.prototype=_t.prototype={constructor:vt,select:Bf,selectAll:Hf,filter:Xf,data:Gf,enter:$f,exit:Jf,merge:Qf,order:Kf,sort:tl,call:nl,nodes:el,node:rl,size:il,empty:ol,each:ul,attr:al,style:sl,property:fl,classed:ll,text:hl,html:pl,raise:dl,lower:vl,append:_l,insert:gl,remove:yl,datum:ml,on:Df,dispatch:xl};var wl=function(t){return"string"==typeof t?new vt([[document.querySelector(t)]],[document.documentElement]):new vt([[t]],bl)},Ml=function(t){return"string"==typeof t?new vt([document.querySelectorAll(t)],[document.documentElement]):new vt([null==t?[]:t],bl)},Tl=function(t,n,e){arguments.length<3&&(e=n,n=Of().changedTouches);for(var r,i=0,o=n?n.length:0;i<o;++i)if((r=n[i]).identifier===e)return Ff(t,r);return null},Sl=function(t,n){null==n&&(n=Of().touches);for(var e=0,r=n?n.length:0,i=new Array(r);e<r;++e)i[e]=Ff(t,n[e]);return i},Nl=function(){t.event.preventDefault(),t.event.stopImmediatePropagation()},kl=function(t){var n=t.document.documentElement,e=wl(t).on("dragstart.drag",Nl,!0);"onselectstart"in n?e.on("selectstart.drag",Nl,!0):(n.__noselect=n.style.MozUserSelect,n.style.MozUserSelect="none")},El=function(t){return function(){return t}};mt.prototype.on=function(){var t=this._.on.apply(this._,arguments);return t===this._?this:t};var Al=function(){function n(t){t.on("mousedown.drag",e).on("touchstart.drag",o).on("touchmove.drag",u).on("touchend.drag touchcancel.drag",a).style("-webkit-tap-highlight-color","rgba(0,0,0,0)")}function e(){if(!f&&l.apply(this,arguments)){var n=c("mouse",h.apply(this,arguments),If,this,arguments);n&&(wl(t.event.view).on("mousemove.drag",r,!0).on("mouseup.drag",i,!0),kl(t.event.view),gt(),s=!1,n("start"))}}function r(){Nl(),s=!0,d.mouse("drag")}function i(){
-wl(t.event.view).on("mousemove.drag mouseup.drag",null),yt(t.event.view,s),Nl(),d.mouse("end")}function o(){if(l.apply(this,arguments)){var n,e,r=t.event.changedTouches,i=h.apply(this,arguments),o=r.length;for(n=0;n<o;++n)(e=c(r[n].identifier,i,Tl,this,arguments))&&(gt(),e("start"))}}function u(){var n,e,r=t.event.changedTouches,i=r.length;for(n=0;n<i;++n)(e=d[r[n].identifier])&&(Nl(),e("drag"))}function a(){var n,e,r=t.event.changedTouches,i=r.length;for(f&&clearTimeout(f),f=setTimeout(function(){f=null},500),n=0;n<i;++n)(e=d[r[n].identifier])&&(gt(),e("end"))}function c(e,r,i,o,u){var a,c,s,f=i(r,e),l=_.copy();if(A(new mt(n,"beforestart",a,e,g,f[0],f[1],0,0,l),function(){return null!=(t.event.subject=a=p.apply(o,u))&&(c=a.x-f[0]||0,s=a.y-f[1]||0,!0)}))return function t(h){var p,v=f;switch(h){case"start":d[e]=t,p=g++;break;case"end":delete d[e],--g;case"drag":f=i(r,e),p=g}A(new mt(n,h,a,e,p,f[0]+c,f[1]+s,f[0]-v[0],f[1]-v[1],l),l.apply,l,[h,o,u])}}var s,f,l=xt,h=bt,p=wt,d={},_=v("start","drag","end"),g=0;return n.filter=function(t){return arguments.length?(l="function"==typeof t?t:El(!!t),n):l},n.container=function(t){return arguments.length?(h="function"==typeof t?t:El(t),n):h},n.subject=function(t){return arguments.length?(p="function"==typeof t?t:El(t),n):p},n.on=function(){var t=_.on.apply(_,arguments);return t===_?n:t},n},Cl=function(t,n,e){t.prototype=n.prototype=e,e.constructor=t},zl="\\s*([+-]?\\d+)\\s*",Pl="\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)\\s*",Ll="\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)%\\s*",Rl=/^#([0-9a-f]{3})$/,ql=/^#([0-9a-f]{6})$/,Ul=new RegExp("^rgb\\("+[zl,zl,zl]+"\\)$"),Dl=new RegExp("^rgb\\("+[Ll,Ll,Ll]+"\\)$"),Ol=new RegExp("^rgba\\("+[zl,zl,zl,Pl]+"\\)$"),Fl=new RegExp("^rgba\\("+[Ll,Ll,Ll,Pl]+"\\)$"),Il=new RegExp("^hsl\\("+[Pl,Ll,Ll]+"\\)$"),Yl=new RegExp("^hsla\\("+[Pl,Ll,Ll,Pl]+"\\)$"),Bl={aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074};Cl(Tt,St,{displayable:function(){return this.rgb().displayable()},toString:function(){return this.rgb()+""}}),Cl(Ct,At,Mt(Tt,{brighter:function(t){return t=null==t?1/.7:Math.pow(1/.7,t),new Ct(this.r*t,this.g*t,this.b*t,this.opacity)},darker:function(t){return t=null==t?.7:Math.pow(.7,t),new Ct(this.r*t,this.g*t,this.b*t,this.opacity)},rgb:function(){return this},displayable:function(){return 0<=this.r&&this.r<=255&&0<=this.g&&this.g<=255&&0<=this.b&&this.b<=255&&0<=this.opacity&&this.opacity<=1},toString:function(){var t=this.opacity;return t=isNaN(t)?1:Math.max(0,Math.min(1,t)),(1===t?"rgb(":"rgba(")+Math.max(0,Math.min(255,Math.round(this.r)||0))+", "+Math.max(0,Math.min(255,Math.round(this.g)||0))+", "+Math.max(0,Math.min(255,Math.round(this.b)||0))+(1===t?")":", "+t+")")}})),Cl(Rt,Lt,Mt(Tt,{brighter:function(t){return t=null==t?1/.7:Math.pow(1/.7,t),new Rt(this.h,this.s,this.l*t,this.opacity)},darker:function(t){return t=null==t?.7:Math.pow(.7,t),new Rt(this.h,this.s,this.l*t,this.opacity)},rgb:function(){var t=this.h%360+360*(this.h<0),n=isNaN(t)||isNaN(this.s)?0:this.s,e=this.l,r=e+(e<.5?e:1-e)*n,i=2*e-r;return new Ct(qt(t>=240?t-240:t+120,i,r),qt(t,i,r),qt(t<120?t+240:t-120,i,r),this.opacity)},displayable:function(){return(0<=this.s&&this.s<=1||isNaN(this.s))&&0<=this.l&&this.l<=1&&0<=this.opacity&&this.opacity<=1}}));var jl=Math.PI/180,Hl=180/Math.PI,Xl=.95047,Vl=1,$l=1.08883,Wl=4/29,Zl=6/29,Gl=3*Zl*Zl,Jl=Zl*Zl*Zl;Cl(Ot,Dt,Mt(Tt,{brighter:function(t){return new Ot(this.l+18*(null==t?1:t),this.a,this.b,this.opacity)},darker:function(t){return new Ot(this.l-18*(null==t?1:t),this.a,this.b,this.opacity)},rgb:function(){var t=(this.l+16)/116,n=isNaN(this.a)?t:t+this.a/500,e=isNaN(this.b)?t:t-this.b/200;return t=Vl*It(t),n=Xl*It(n),e=$l*It(e),new Ct(Yt(3.2404542*n-1.5371385*t-.4985314*e),Yt(-.969266*n+1.8760108*t+.041556*e),Yt(.0556434*n-.2040259*t+1.0572252*e),this.opacity)}})),Cl(Xt,Ht,Mt(Tt,{brighter:function(t){return new Xt(this.h,this.c,this.l+18*(null==t?1:t),this.opacity)},darker:function(t){return new Xt(this.h,this.c,this.l-18*(null==t?1:t),this.opacity)},rgb:function(){return Ut(this).rgb()}}));var Ql=-.14861,Kl=1.78277,th=-.29227,nh=-.90649,eh=1.97294,rh=eh*nh,ih=eh*Kl,oh=Kl*th-nh*Ql;Cl(Wt,$t,Mt(Tt,{brighter:function(t){return t=null==t?1/.7:Math.pow(1/.7,t),new Wt(this.h,this.s,this.l*t,this.opacity)},darker:function(t){return t=null==t?.7:Math.pow(.7,t),new Wt(this.h,this.s,this.l*t,this.opacity)},rgb:function(){var t=isNaN(this.h)?0:(this.h+120)*jl,n=+this.l,e=isNaN(this.s)?0:this.s*n*(1-n),r=Math.cos(t),i=Math.sin(t);return new Ct(255*(n+e*(Ql*r+Kl*i)),255*(n+e*(th*r+nh*i)),255*(n+e*(eh*r)),this.opacity)}}));var uh,ah,ch,sh,fh,lh,hh=function(t){var n=t.length-1;return function(e){var r=e<=0?e=0:e>=1?(e=1,n-1):Math.floor(e*n),i=t[r],o=t[r+1],u=r>0?t[r-1]:2*i-o,a=r<n-1?t[r+2]:2*o-i;return Zt((e-r/n)*n,u,i,o,a)}},ph=function(t){var n=t.length;return function(e){var r=Math.floor(((e%=1)<0?++e:e)*n),i=t[(r+n-1)%n],o=t[r%n],u=t[(r+1)%n],a=t[(r+2)%n];return Zt((e-r/n)*n,i,o,u,a)}},dh=function(t){return function(){return t}},vh=function t(n){function e(t,n){var e=r((t=At(t)).r,(n=At(n)).r),i=r(t.g,n.g),o=r(t.b,n.b),u=tn(t.opacity,n.opacity);return function(n){return t.r=e(n),t.g=i(n),t.b=o(n),t.opacity=u(n),t+""}}var r=Kt(n);return e.gamma=t,e}(1),_h=nn(hh),gh=nn(ph),yh=function(t,n){var e,r=n?n.length:0,i=t?Math.min(r,t.length):0,o=new Array(r),u=new Array(r);for(e=0;e<i;++e)o[e]=Sh(t[e],n[e]);for(;e<r;++e)u[e]=n[e];return function(t){for(e=0;e<i;++e)u[e]=o[e](t);return u}},mh=function(t,n){var e=new Date;return t=+t,n-=t,function(r){return e.setTime(t+n*r),e}},xh=function(t,n){return t=+t,n-=t,function(e){return t+n*e}},bh=function(t,n){var e,r={},i={};null!==t&&"object"==typeof t||(t={}),null!==n&&"object"==typeof n||(n={});for(e in n)e in t?r[e]=Sh(t[e],n[e]):i[e]=n[e];return function(t){for(e in r)i[e]=r[e](t);return i}},wh=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,Mh=new RegExp(wh.source,"g"),Th=function(t,n){var e,r,i,o=wh.lastIndex=Mh.lastIndex=0,u=-1,a=[],c=[];for(t+="",n+="";(e=wh.exec(t))&&(r=Mh.exec(n));)(i=r.index)>o&&(i=n.slice(o,i),a[u]?a[u]+=i:a[++u]=i),(e=e[0])===(r=r[0])?a[u]?a[u]+=r:a[++u]=r:(a[++u]=null,c.push({i:u,x:xh(e,r)})),o=Mh.lastIndex;return o<n.length&&(i=n.slice(o),a[u]?a[u]+=i:a[++u]=i),a.length<2?c[0]?rn(c[0].x):en(n):(n=c.length,function(t){for(var e,r=0;r<n;++r)a[(e=c[r]).i]=e.x(t);return a.join("")})},Sh=function(t,n){var e,r=typeof n;return null==n||"boolean"===r?dh(n):("number"===r?xh:"string"===r?(e=St(n))?(n=e,vh):Th:n instanceof St?vh:n instanceof Date?mh:Array.isArray(n)?yh:isNaN(n)?bh:xh)(t,n)},Nh=function(t,n){return t=+t,n-=t,function(e){return Math.round(t+n*e)}},kh=180/Math.PI,Eh={translateX:0,translateY:0,rotate:0,skewX:0,scaleX:1,scaleY:1},Ah=function(t,n,e,r,i,o){var u,a,c;return(u=Math.sqrt(t*t+n*n))&&(t/=u,n/=u),(c=t*e+n*r)&&(e-=t*c,r-=n*c),(a=Math.sqrt(e*e+r*r))&&(e/=a,r/=a,c/=a),t*r<n*e&&(t=-t,n=-n,c=-c,u=-u),{translateX:i,translateY:o,rotate:Math.atan2(n,t)*kh,skewX:Math.atan(c)*kh,scaleX:u,scaleY:a}},Ch=an(on,"px, ","px)","deg)"),zh=an(un,", ",")",")"),Ph=Math.SQRT2,Lh=function(t,n){var e,r,i=t[0],o=t[1],u=t[2],a=n[0],c=n[1],s=n[2],f=a-i,l=c-o,h=f*f+l*l;if(h<1e-12)r=Math.log(s/u)/Ph,e=function(t){return[i+t*f,o+t*l,u*Math.exp(Ph*t*r)]};else{var p=Math.sqrt(h),d=(s*s-u*u+4*h)/(2*u*2*p),v=(s*s-u*u-4*h)/(2*s*2*p),_=Math.log(Math.sqrt(d*d+1)-d),g=Math.log(Math.sqrt(v*v+1)-v);r=(g-_)/Ph,e=function(t){var n=t*r,e=cn(_),a=u/(2*p)*(e*fn(Ph*n+_)-sn(_));return[i+a*f,o+a*l,u*e/cn(Ph*n+_)]}}return e.duration=1e3*r,e},Rh=ln(Qt),qh=ln(tn),Uh=pn(Qt),Dh=pn(tn),Oh=dn(Qt),Fh=dn(tn),Ih=function(t,n){for(var e=new Array(n),r=0;r<n;++r)e[r]=t(r/(n-1));return e},Yh=0,Bh=0,jh=0,Hh=1e3,Xh=0,Vh=0,$h=0,Wh="object"==typeof performance&&performance.now?performance:Date,Zh="function"==typeof requestAnimationFrame?requestAnimationFrame:function(t){setTimeout(t,17)};gn.prototype=yn.prototype={constructor:gn,restart:function(t,n,e){if("function"!=typeof t)throw new TypeError("callback is not a function");e=(null==e?vn():+e)+(null==n?0:+n),this._next||lh===this||(lh?lh._next=this:fh=this,lh=this),this._call=t,this._time=e,Mn()},stop:function(){this._call&&(this._call=null,this._time=1/0,Mn())}};var Gh=function(t,n,e){var r=new gn;return n=null==n?0:+n,r.restart(function(e){r.stop(),t(e+n)},n,e),r},Jh=function(t,n,e){var r=new gn,i=n;return null==n?(r.restart(t,n,e),r):(n=+n,e=null==e?vn():+e,r.restart(function o(u){u+=i,r.restart(o,i+=n,e),t(u)},n,e),r)},Qh=v("start","end","interrupt"),Kh=[],tp=0,np=1,ep=2,rp=3,ip=4,op=5,up=6,ap=function(t,n,e,r,i,o){var u=t.__transition;if(u){if(e in u)return}else t.__transition={};kn(t,e,{name:n,index:r,group:i,on:Qh,tween:Kh,time:o.time,delay:o.delay,duration:o.duration,ease:o.ease,timer:null,state:tp})},cp=function(t,n){var e,r,i,o=t.__transition,u=!0;if(o){n=null==n?null:n+"";for(i in o)(e=o[i]).name===n?(r=e.state>ep&&e.state<op,e.state=up,e.timer.stop(),r&&e.on.call("interrupt",t,t.__data__,e.index,e.group),delete o[i]):u=!1;u&&delete t.__transition}},sp=function(t){return this.each(function(){cp(this,t)})},fp=function(t,n){var e=this._id;if(t+="",arguments.length<2){for(var r,i=Nn(this.node(),e).tween,o=0,u=i.length;o<u;++o)if((r=i[o]).name===t)return r.value;return null}return this.each((null==n?En:An)(e,t,n))},lp=function(t,n){var e;return("number"==typeof n?xh:n instanceof St?vh:(e=St(n))?(n=e,vh):Th)(t,n)},hp=function(t,n){var e=Af(t),r="transform"===e?zh:lp;return this.attrTween(t,"function"==typeof n?(e.local?Un:qn)(e,r,Cn(this,"attr."+t,n)):null==n?(e.local?Pn:zn)(e):(e.local?Rn:Ln)(e,r,n+""))},pp=function(t,n){var e="attr."+t;if(arguments.length<2)return(e=this.tween(e))&&e._value;if(null==n)return this.tween(e,null);if("function"!=typeof n)throw new Error;var r=Af(t);return this.tween(e,(r.local?Dn:On)(r,n))},dp=function(t){var n=this._id;return arguments.length?this.each(("function"==typeof t?Fn:In)(n,t)):Nn(this.node(),n).delay},vp=function(t){var n=this._id;return arguments.length?this.each(("function"==typeof t?Yn:Bn)(n,t)):Nn(this.node(),n).duration},_p=function(t){var n=this._id;return arguments.length?this.each(jn(n,t)):Nn(this.node(),n).ease},gp=function(t){"function"!=typeof t&&(t=qf(t));for(var n=this._groups,e=n.length,r=new Array(e),i=0;i<e;++i)for(var o,u=n[i],a=u.length,c=r[i]=[],s=0;s<a;++s)(o=u[s])&&t.call(o,o.__data__,s,u)&&c.push(o);return new te(r,this._parents,this._name,this._id)},yp=function(t){if(t._id!==this._id)throw new Error;for(var n=this._groups,e=t._groups,r=n.length,i=e.length,o=Math.min(r,i),u=new Array(r),a=0;a<o;++a)for(var c,s=n[a],f=e[a],l=s.length,h=u[a]=new Array(l),p=0;p<l;++p)(c=s[p]||f[p])&&(h[p]=c);for(;a<r;++a)u[a]=n[a];return new te(u,this._parents,this._name,this._id)},mp=function(t,n){var e=this._id;return arguments.length<2?Nn(this.node(),e).on.on(t):this.each(Xn(e,t,n))},xp=function(){return this.on("end.remove",Vn(this._id))},bp=function(t){var n=this._name,e=this._id;"function"!=typeof t&&(t=Yf(t));for(var r=this._groups,i=r.length,o=new Array(i),u=0;u<i;++u)for(var a,c,s=r[u],f=s.length,l=o[u]=new Array(f),h=0;h<f;++h)(a=s[h])&&(c=t.call(a,a.__data__,h,s))&&("__data__"in a&&(c.__data__=a.__data__),l[h]=c,ap(l[h],n,e,h,l,Nn(a,e)));return new te(o,this._parents,n,e)},wp=function(t){var n=this._name,e=this._id;"function"!=typeof t&&(t=jf(t));for(var r=this._groups,i=r.length,o=[],u=[],a=0;a<i;++a)for(var c,s=r[a],f=s.length,l=0;l<f;++l)if(c=s[l]){for(var h,p=t.call(c,c.__data__,l,s),d=Nn(c,e),v=0,_=p.length;v<_;++v)(h=p[v])&&ap(h,n,e,v,p,d);o.push(p),u.push(c)}return new te(o,u,n,e)},Mp=_t.prototype.constructor,Tp=function(){return new Mp(this._groups,this._parents)},Sp=function(t,n,e){var r="transform"==(t+="")?Ch:lp;return null==n?this.styleTween(t,$n(t,r)).on("end.style."+t,Wn(t)):this.styleTween(t,"function"==typeof n?Gn(t,r,Cn(this,"style."+t,n)):Zn(t,r,n+""),e)},Np=function(t,n,e){var r="style."+(t+="");if(arguments.length<2)return(r=this.tween(r))&&r._value;if(null==n)return this.tween(r,null);if("function"!=typeof n)throw new Error;return this.tween(r,Jn(t,n,null==e?"":e))},kp=function(t){return this.tween("text","function"==typeof t?Kn(Cn(this,"text",t)):Qn(null==t?"":t+""))},Ep=function(){for(var t=this._name,n=this._id,e=ee(),r=this._groups,i=r.length,o=0;o<i;++o)for(var u,a=r[o],c=a.length,s=0;s<c;++s)if(u=a[s]){var f=Nn(u,n);ap(u,t,e,s,a,{time:f.time+f.delay+f.duration,delay:0,duration:f.duration,ease:f.ease})}return new te(r,this._parents,t,e)},Ap=0,Cp=_t.prototype;te.prototype=ne.prototype={constructor:te,select:bp,selectAll:wp,filter:gp,merge:yp,selection:Tp,transition:Ep,call:Cp.call,nodes:Cp.nodes,node:Cp.node,size:Cp.size,empty:Cp.empty,each:Cp.each,on:mp,attr:hp,attrTween:pp,style:Sp,styleTween:Np,text:kp,remove:xp,tween:fp,delay:dp,duration:vp,ease:_p};var zp=function t(n){function e(t){return Math.pow(t,n)}return n=+n,e.exponent=t,e}(3),Pp=function t(n){function e(t){return 1-Math.pow(1-t,n)}return n=+n,e.exponent=t,e}(3),Lp=function t(n){function e(t){return((t*=2)<=1?Math.pow(t,n):2-Math.pow(2-t,n))/2}return n=+n,e.exponent=t,e}(3),Rp=Math.PI,qp=Rp/2,Up=4/11,Dp=6/11,Op=8/11,Fp=.75,Ip=9/11,Yp=10/11,Bp=.9375,jp=21/22,Hp=63/64,Xp=1/Up/Up,Vp=function t(n){function e(t){return t*t*((n+1)*t-n)}return n=+n,e.overshoot=t,e}(1.70158),$p=function t(n){function e(t){return--t*t*((n+1)*t+n)+1}return n=+n,e.overshoot=t,e}(1.70158),Wp=function t(n){function e(t){return((t*=2)<1?t*t*((n+1)*t-n):(t-=2)*t*((n+1)*t+n)+2)/2}return n=+n,e.overshoot=t,e}(1.70158),Zp=2*Math.PI,Gp=function t(n,e){function r(t){return n*Math.pow(2,10*--t)*Math.sin((i-t)/e)}var i=Math.asin(1/(n=Math.max(1,n)))*(e/=Zp);return r.amplitude=function(n){return t(n,e*Zp)},r.period=function(e){return t(n,e)},r}(1,.3),Jp=function t(n,e){function r(t){return 1-n*Math.pow(2,-10*(t=+t))*Math.sin((t+i)/e)}var i=Math.asin(1/(n=Math.max(1,n)))*(e/=Zp);return r.amplitude=function(n){return t(n,e*Zp)},r.period=function(e){return t(n,e)},r}(1,.3),Qp=function t(n,e){function r(t){return((t=2*t-1)<0?n*Math.pow(2,10*t)*Math.sin((i-t)/e):2-n*Math.pow(2,-10*t)*Math.sin((i+t)/e))/2}var i=Math.asin(1/(n=Math.max(1,n)))*(e/=Zp);return r.amplitude=function(n){return t(n,e*Zp)},r.period=function(e){return t(n,e)},r}(1,.3),Kp={time:null,delay:0,duration:250,ease:se},td=function(t){var n,e;t instanceof te?(n=t._id,t=t._name):(n=ee(),(e=Kp).time=vn(),t=null==t?null:t+"");for(var r=this._groups,i=r.length,o=0;o<i;++o)for(var u,a=r[o],c=a.length,s=0;s<c;++s)(u=a[s])&&ap(u,t,n,s,a,e||we(u,n));return new te(r,this._parents,t,n)};_t.prototype.interrupt=sp,_t.prototype.transition=td;var nd=[null],ed=function(t,n){var e,r,i=t.__transition;if(i){n=null==n?null:n+"";for(r in i)if((e=i[r]).state>np&&e.name===n)return new te([[t]],nd,n,+r)}return null},rd=function(t){return function(){return t}},id=function(t,n,e){this.target=t,this.type=n,this.selection=e},od=function(){t.event.preventDefault(),t.event.stopImmediatePropagation()},ud={name:"drag"},ad={name:"space"},cd={name:"handle"},sd={name:"center"},fd={name:"x",handles:["e","w"].map(Te),input:function(t,n){return t&&[[t[0],n[0][1]],[t[1],n[1][1]]]},output:function(t){return t&&[t[0][0],t[1][0]]}},ld={name:"y",handles:["n","s"].map(Te),input:function(t,n){return t&&[[n[0][0],t[0]],[n[1][0],t[1]]]},output:function(t){return t&&[t[0][1],t[1][1]]}},hd={name:"xy",handles:["n","e","s","w","nw","ne","se","sw"].map(Te),input:function(t){return t},output:function(t){return t}},pd={overlay:"crosshair",selection:"move",n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},dd={e:"w",w:"e",nw:"ne",ne:"nw",se:"sw",sw:"se"},vd={n:"s",s:"n",nw:"sw",ne:"se",se:"ne",sw:"nw"},_d={overlay:1,selection:1,n:null,e:1,s:null,w:-1,nw:-1,ne:1,se:1,sw:-1},gd={overlay:1,selection:1,n:-1,e:null,s:1,w:null,nw:-1,ne:-1,se:1,sw:1},yd=function(){return Pe(hd)},md=Math.cos,xd=Math.sin,bd=Math.PI,wd=bd/2,Md=2*bd,Td=Math.max,Sd=function(){function t(t){var o,u,a,c,s,f,l=t.length,h=[],p=Js(l),d=[],v=[],_=v.groups=new Array(l),g=new Array(l*l);for(o=0,s=-1;++s<l;){for(u=0,f=-1;++f<l;)u+=t[s][f];h.push(u),d.push(Js(l)),o+=u}for(e&&p.sort(function(t,n){return e(h[t],h[n])}),r&&d.forEach(function(n,e){n.sort(function(n,i){return r(t[e][n],t[e][i])})}),o=Td(0,Md-n*l)/o,c=o?n:Md/l,u=0,s=-1;++s<l;){for(a=u,f=-1;++f<l;){var y=p[s],m=d[y][f],x=t[y][m],b=u,w=u+=x*o;g[m*l+y]={index:y,subindex:m,startAngle:b,endAngle:w,value:x}}_[y]={index:y,startAngle:a,endAngle:u,value:h[y]},u+=c}for(s=-1;++s<l;)for(f=s-1;++f<l;){var M=g[f*l+s],T=g[s*l+f];(M.value||T.value)&&v.push(M.value<T.value?{source:T,target:M}:{source:M,target:T})}return i?v.sort(i):v}var n=0,e=null,r=null,i=null;return t.padAngle=function(e){return arguments.length?(n=Td(0,e),t):n},t.sortGroups=function(n){return arguments.length?(e=n,t):e},t.sortSubgroups=function(n){return arguments.length?(r=n,t):r},t.sortChords=function(n){return arguments.length?(null==n?i=null:(i=Le(n))._=n,t):i&&i._},t},Nd=Array.prototype.slice,kd=function(t){return function(){return t}},Ed=Math.PI,Ad=2*Ed,Cd=Ad-1e-6;Re.prototype=qe.prototype={constructor:Re,moveTo:function(t,n){this._+="M"+(this._x0=this._x1=+t)+","+(this._y0=this._y1=+n)},closePath:function(){null!==this._x1&&(this._x1=this._x0,this._y1=this._y0,this._+="Z")},lineTo:function(t,n){this._+="L"+(this._x1=+t)+","+(this._y1=+n)},quadraticCurveTo:function(t,n,e,r){this._+="Q"+ +t+","+ +n+","+(this._x1=+e)+","+(this._y1=+r)},bezierCurveTo:function(t,n,e,r,i,o){this._+="C"+ +t+","+ +n+","+ +e+","+ +r+","+(this._x1=+i)+","+(this._y1=+o)},arcTo:function(t,n,e,r,i){t=+t,n=+n,e=+e,r=+r,i=+i;var o=this._x1,u=this._y1,a=e-t,c=r-n,s=o-t,f=u-n,l=s*s+f*f;if(i<0)throw new Error("negative radius: "+i);if(null===this._x1)this._+="M"+(this._x1=t)+","+(this._y1=n);else if(l>1e-6)if(Math.abs(f*a-c*s)>1e-6&&i){var h=e-o,p=r-u,d=a*a+c*c,v=h*h+p*p,_=Math.sqrt(d),g=Math.sqrt(l),y=i*Math.tan((Ed-Math.acos((d+l-v)/(2*_*g)))/2),m=y/g,x=y/_;Math.abs(m-1)>1e-6&&(this._+="L"+(t+m*s)+","+(n+m*f)),this._+="A"+i+","+i+",0,0,"+ +(f*h>s*p)+","+(this._x1=t+x*a)+","+(this._y1=n+x*c)}else this._+="L"+(this._x1=t)+","+(this._y1=n);else;},arc:function(t,n,e,r,i,o){t=+t,n=+n,e=+e;var u=e*Math.cos(r),a=e*Math.sin(r),c=t+u,s=n+a,f=1^o,l=o?r-i:i-r;if(e<0)throw new Error("negative radius: "+e);null===this._x1?this._+="M"+c+","+s:(Math.abs(this._x1-c)>1e-6||Math.abs(this._y1-s)>1e-6)&&(this._+="L"+c+","+s),e&&(l<0&&(l=l%Ad+Ad),l>Cd?this._+="A"+e+","+e+",0,1,"+f+","+(t-u)+","+(n-a)+"A"+e+","+e+",0,1,"+f+","+(this._x1=c)+","+(this._y1=s):l>1e-6&&(this._+="A"+e+","+e+",0,"+ +(l>=Ed)+","+f+","+(this._x1=t+e*Math.cos(i))+","+(this._y1=n+e*Math.sin(i))))},rect:function(t,n,e,r){this._+="M"+(this._x0=this._x1=+t)+","+(this._y0=this._y1=+n)+"h"+ +e+"v"+ +r+"h"+-e+"Z"},toString:function(){return this._}};var zd=function(){function t(){var t,a=Nd.call(arguments),c=n.apply(this,a),s=e.apply(this,a),f=+r.apply(this,(a[0]=c,a)),l=i.apply(this,a)-wd,h=o.apply(this,a)-wd,p=f*md(l),d=f*xd(l),v=+r.apply(this,(a[0]=s,a)),_=i.apply(this,a)-wd,g=o.apply(this,a)-wd;if(u||(u=t=qe()),u.moveTo(p,d),u.arc(0,0,f,l,h),l===_&&h===g||(u.quadraticCurveTo(0,0,v*md(_),v*xd(_)),u.arc(0,0,v,_,g)),u.quadraticCurveTo(0,0,p,d),u.closePath(),t)return u=null,t+""||null}var n=Ue,e=De,r=Oe,i=Fe,o=Ie,u=null;return t.radius=function(n){return arguments.length?(r="function"==typeof n?n:kd(+n),t):r},t.startAngle=function(n){return arguments.length?(i="function"==typeof n?n:kd(+n),t):i},t.endAngle=function(n){return arguments.length?(o="function"==typeof n?n:kd(+n),t):o},t.source=function(e){return arguments.length?(n=e,t):n},t.target=function(n){return arguments.length?(e=n,t):e},t.context=function(n){return arguments.length?(u=null==n?null:n,t):u},t};Ye.prototype=Be.prototype={constructor:Ye,has:function(t){return"$"+t in this},get:function(t){return this["$"+t]},set:function(t,n){return this["$"+t]=n,this},remove:function(t){var n="$"+t;return n in this&&delete this[n]},clear:function(){for(var t in this)"$"===t[0]&&delete this[t]},keys:function(){var t=[];for(var n in this)"$"===n[0]&&t.push(n.slice(1));return t},values:function(){var t=[];for(var n in this)"$"===n[0]&&t.push(this[n]);return t},entries:function(){var t=[];for(var n in this)"$"===n[0]&&t.push({key:n.slice(1),value:this[n]});return t},size:function(){var t=0;for(var n in this)"$"===n[0]&&++t;return t},empty:function(){for(var t in this)if("$"===t[0])return!1;return!0},each:function(t){for(var n in this)"$"===n[0]&&t(this[n],n.slice(1),this)}};var Pd=function(){function t(n,i,u,a){if(i>=o.length)return null!=r?r(n):null!=e?n.sort(e):n;for(var c,s,f,l=-1,h=n.length,p=o[i++],d=Be(),v=u();++l<h;)(f=d.get(c=p(s=n[l])+""))?f.push(s):d.set(c,[s]);return d.each(function(n,e){a(v,e,t(n,i,u,a))}),v}function n(t,e){if(++e>o.length)return t;var i,a=u[e-1];return null!=r&&e>=o.length?i=t.entries():(i=[],t.each(function(t,r){i.push({key:r,values:n(t,e)})})),null!=a?i.sort(function(t,n){return a(t.key,n.key)}):i}var e,r,i,o=[],u=[];return i={object:function(n){return t(n,0,je,He)},map:function(n){return t(n,0,Xe,Ve)},entries:function(e){return n(t(e,0,Xe,Ve),0)},key:function(t){return o.push(t),i},sortKeys:function(t){return u[o.length-1]=t,i},sortValues:function(t){return e=t,i},rollup:function(t){return r=t,i}}},Ld=Be.prototype;$e.prototype=We.prototype={constructor:$e,has:Ld.has,add:function(t){return t+="",this["$"+t]=t,this},remove:Ld.remove,clear:Ld.clear,values:Ld.keys,size:Ld.size,empty:Ld.empty,each:Ld.each};var Rd=function(t){var n=[];for(var e in t)n.push(e);return n},qd=function(t){var n=[];for(var e in t)n.push(t[e]);return n},Ud=function(t){var n=[];for(var e in t)n.push({key:e,value:t[e]});return n},Dd=function(t){function n(t,n){var r,i,o=e(t,function(t,e){if(r)return r(t,e-1);i=t,r=n?Ge(t,n):Ze(t)});return o.columns=i,o}function e(t,n){function e(){if(f>=s)return u;if(i)return i=!1,o;var n,e=f;if(34===t.charCodeAt(e)){for(var r=e;r++<s;)if(34===t.charCodeAt(r)){if(34!==t.charCodeAt(r+1))break;++r}return f=r+2,n=t.charCodeAt(r+1),13===n?(i=!0,10===t.charCodeAt(r+2)&&++f):10===n&&(i=!0),t.slice(e+1,r).replace(/""/g,'"')}for(;f<s;){var a=1;if(10===(n=t.charCodeAt(f++)))i=!0;else if(13===n)i=!0,10===t.charCodeAt(f)&&(++f,++a);else if(n!==c)continue;return t.slice(e,f-a)}return t.slice(e)}for(var r,i,o={},u={},a=[],s=t.length,f=0,l=0;(r=e())!==u;){for(var h=[];r!==o&&r!==u;)h.push(r),r=e();n&&null==(h=n(h,l++))||a.push(h)}return a}function r(n,e){return null==e&&(e=Je(n)),[e.map(u).join(t)].concat(n.map(function(n){return e.map(function(t){return u(n[t])}).join(t)})).join("\n")}function i(t){return t.map(o).join("\n")}function o(n){return n.map(u).join(t)}function u(t){return null==t?"":a.test(t+="")?'"'+t.replace(/\"/g,'""')+'"':t}var a=new RegExp('["'+t+"\n\r]"),c=t.charCodeAt(0);return{parse:n,parseRows:e,format:r,formatRows:i}},Od=Dd(","),Fd=Od.parse,Id=Od.parseRows,Yd=Od.format,Bd=Od.formatRows,jd=Dd("\t"),Hd=jd.parse,Xd=jd.parseRows,Vd=jd.format,$d=jd.formatRows,Wd=function(t,n){function e(){var e,i,o=r.length,u=0,a=0;for(e=0;e<o;++e)i=r[e],u+=i.x,a+=i.y;for(u=u/o-t,a=a/o-n,e=0;e<o;++e)i=r[e],i.x-=u,i.y-=a}var r;return null==t&&(t=0),null==n&&(n=0),e.initialize=function(t){r=t},e.x=function(n){return arguments.length?(t=+n,e):t},e.y=function(t){return arguments.length?(n=+t,e):n},e},Zd=function(t){return function(){return t}},Gd=function(){return 1e-6*(Math.random()-.5)},Jd=function(t){var n=+this._x.call(null,t),e=+this._y.call(null,t);return Qe(this.cover(n,e),n,e,t)},Qd=function(t,n){if(isNaN(t=+t)||isNaN(n=+n))return this;var e=this._x0,r=this._y0,i=this._x1,o=this._y1;if(isNaN(e))i=(e=Math.floor(t))+1,o=(r=Math.floor(n))+1;else{if(!(e>t||t>i||r>n||n>o))return this;var u,a,c=i-e,s=this._root;switch(a=(n<(r+o)/2)<<1|t<(e+i)/2){case 0:do{u=new Array(4),u[a]=s,s=u}while(c*=2,i=e+c,o=r+c,t>i||n>o);break;case 1:do{u=new Array(4),u[a]=s,s=u}while(c*=2,e=i-c,o=r+c,e>t||n>o);break;case 2:do{u=new Array(4),u[a]=s,s=u}while(c*=2,i=e+c,r=o-c,t>i||r>n);break;case 3:do{u=new Array(4),u[a]=s,s=u}while(c*=2,e=i-c,r=o-c,e>t||r>n)}this._root&&this._root.length&&(this._root=s)}return this._x0=e,this._y0=r,this._x1=i,this._y1=o,this},Kd=function(){var t=[];return this.visit(function(n){if(!n.length)do{t.push(n.data)}while(n=n.next)}),t},tv=function(t){return arguments.length?this.cover(+t[0][0],+t[0][1]).cover(+t[1][0],+t[1][1]):isNaN(this._x0)?void 0:[[this._x0,this._y0],[this._x1,this._y1]]},nv=function(t,n,e,r,i){this.node=t,this.x0=n,this.y0=e,this.x1=r,this.y1=i},ev=function(t,n,e){var r,i,o,u,a,c,s,f=this._x0,l=this._y0,h=this._x1,p=this._y1,d=[],v=this._root;for(v&&d.push(new nv(v,f,l,h,p)),null==e?e=1/0:(f=t-e,l=n-e,h=t+e,p=n+e,e*=e);c=d.pop();)if(!(!(v=c.node)||(i=c.x0)>h||(o=c.y0)>p||(u=c.x1)<f||(a=c.y1)<l))if(v.length){var _=(i+u)/2,g=(o+a)/2;d.push(new nv(v[3],_,g,u,a),new nv(v[2],i,g,_,a),new nv(v[1],_,o,u,g),new nv(v[0],i,o,_,g)),(s=(n>=g)<<1|t>=_)&&(c=d[d.length-1],d[d.length-1]=d[d.length-1-s],d[d.length-1-s]=c)}else{var y=t-+this._x.call(null,v.data),m=n-+this._y.call(null,v.data),x=y*y+m*m;if(x<e){var b=Math.sqrt(e=x);f=t-b,l=n-b,h=t+b,p=n+b,r=v.data}}return r},rv=function(t){if(isNaN(o=+this._x.call(null,t))||isNaN(u=+this._y.call(null,t)))return this;var n,e,r,i,o,u,a,c,s,f,l,h,p=this._root,d=this._x0,v=this._y0,_=this._x1,g=this._y1;if(!p)return this;if(p.length)for(;;){if((s=o>=(a=(d+_)/2))?d=a:_=a,(f=u>=(c=(v+g)/2))?v=c:g=c,n=p,!(p=p[l=f<<1|s]))return this;if(!p.length)break;(n[l+1&3]||n[l+2&3]||n[l+3&3])&&(e=n,h=l)}for(;p.data!==t;)if(r=p,!(p=p.next))return this;return(i=p.next)&&delete p.next,r?(i?r.next=i:delete r.next,this):n?(i?n[l]=i:delete n[l],(p=n[0]||n[1]||n[2]||n[3])&&p===(n[3]||n[2]||n[1]||n[0])&&!p.length&&(e?e[h]=p:this._root=p),this):(this._root=i,this)},iv=function(){return this._root},ov=function(){var t=0;return this.visit(function(n){if(!n.length)do{++t}while(n=n.next)}),t},uv=function(t){var n,e,r,i,o,u,a=[],c=this._root;for(c&&a.push(new nv(c,this._x0,this._y0,this._x1,this._y1));n=a.pop();)if(!t(c=n.node,r=n.x0,i=n.y0,o=n.x1,u=n.y1)&&c.length){var s=(r+o)/2,f=(i+u)/2;(e=c[3])&&a.push(new nv(e,s,f,o,u)),(e=c[2])&&a.push(new nv(e,r,f,s,u)),(e=c[1])&&a.push(new nv(e,s,i,o,f)),(e=c[0])&&a.push(new nv(e,r,i,s,f))}return this},av=function(t){var n,e=[],r=[];for(this._root&&e.push(new nv(this._root,this._x0,this._y0,this._x1,this._y1));n=e.pop();){var i=n.node;if(i.length){var o,u=n.x0,a=n.y0,c=n.x1,s=n.y1,f=(u+c)/2,l=(a+s)/2;(o=i[0])&&e.push(new nv(o,u,a,f,l)),(o=i[1])&&e.push(new nv(o,f,a,c,l)),(o=i[2])&&e.push(new nv(o,u,l,f,s)),(o=i[3])&&e.push(new nv(o,f,l,c,s))}r.push(n)}for(;n=r.pop();)t(n.node,n.x0,n.y0,n.x1,n.y1);return this},cv=function(t){return arguments.length?(this._x=t,this):this._x},sv=function(t){return arguments.length?(this._y=t,this):this._y},fv=rr.prototype=ir.prototype;fv.copy=function(){var t,n,e=new ir(this._x,this._y,this._x0,this._y0,this._x1,this._y1),r=this._root;if(!r)return e;if(!r.length)return e._root=or(r),e;for(t=[{source:r,target:e._root=new Array(4)}];r=t.pop();)for(var i=0;i<4;++i)(n=r.source[i])&&(n.length?t.push({source:n,target:r.target[i]=new Array(4)}):r.target[i]=or(n));return e},fv.add=Jd,fv.addAll=Ke,fv.cover=Qd,fv.data=Kd,fv.extent=tv,fv.find=ev,fv.remove=rv,fv.removeAll=tr,fv.root=iv,fv.size=ov,fv.visit=uv,fv.visitAfter=av,fv.x=cv,fv.y=sv;var lv,hv=function(t){function n(){function t(t,n,e,r,i){var o=t.data,a=t.r,p=l+a;{if(!o)return n>s+p||r<s-p||e>f+p||i<f-p;if(o.index>c.index){var d=s-o.x-o.vx,v=f-o.y-o.vy,_=d*d+v*v;_<p*p&&(0===d&&(d=Gd(),_+=d*d),0===v&&(v=Gd(),_+=v*v),_=(p-(_=Math.sqrt(_)))/_*u,c.vx+=(d*=_)*(p=(a*=a)/(h+a)),c.vy+=(v*=_)*p,o.vx-=d*(p=1-p),o.vy-=v*p)}}}for(var n,r,c,s,f,l,h,p=i.length,d=0;d<a;++d)for(r=rr(i,ur,ar).visitAfter(e),n=0;n<p;++n)c=i[n],l=o[c.index],h=l*l,s=c.x+c.vx,f=c.y+c.vy,r.visit(t)}function e(t){if(t.data)return t.r=o[t.data.index];for(var n=t.r=0;n<4;++n)t[n]&&t[n].r>t.r&&(t.r=t[n].r)}function r(){if(i){var n,e,r=i.length;for(o=new Array(r),n=0;n<r;++n)e=i[n],o[e.index]=+t(e,n,i)}}var i,o,u=1,a=1;return"function"!=typeof t&&(t=Zd(null==t?1:+t)),n.initialize=function(t){i=t,r()},n.iterations=function(t){return arguments.length?(a=+t,n):a},n.strength=function(t){return arguments.length?(u=+t,n):u},n.radius=function(e){return arguments.length?(t="function"==typeof e?e:Zd(+e),r(),n):t},n},pv=function(t){function n(t){return 1/Math.min(s[t.source.index],s[t.target.index])}function e(n){for(var e=0,r=t.length;e<d;++e)for(var i,o,c,s,l,h,p,v=0;v<r;++v)i=t[v],o=i.source,c=i.target,s=c.x+c.vx-o.x-o.vx||Gd(),l=c.y+c.vy-o.y-o.vy||Gd(),h=Math.sqrt(s*s+l*l),h=(h-a[v])/h*n*u[v],s*=h,l*=h,c.vx-=s*(p=f[v]),c.vy-=l*p,o.vx+=s*(p=1-p),o.vy+=l*p}function r(){if(c){var n,e,r=c.length,h=t.length,p=Be(c,l);for(n=0,s=new Array(r);n<h;++n)e=t[n],e.index=n,"object"!=typeof e.source&&(e.source=sr(p,e.source)),"object"!=typeof e.target&&(e.target=sr(p,e.target)),s[e.source.index]=(s[e.source.index]||0)+1,s[e.target.index]=(s[e.target.index]||0)+1;for(n=0,f=new Array(h);n<h;++n)e=t[n],f[n]=s[e.source.index]/(s[e.source.index]+s[e.target.index]);u=new Array(h),i(),a=new Array(h),o()}}function i(){if(c)for(var n=0,e=t.length;n<e;++n)u[n]=+h(t[n],n,t)}function o(){if(c)for(var n=0,e=t.length;n<e;++n)a[n]=+p(t[n],n,t)}var u,a,c,s,f,l=cr,h=n,p=Zd(30),d=1;return null==t&&(t=[]),e.initialize=function(t){c=t,r()},e.links=function(n){return arguments.length?(t=n,r(),e):t},e.id=function(t){return arguments.length?(l=t,
-e):l},e.iterations=function(t){return arguments.length?(d=+t,e):d},e.strength=function(t){return arguments.length?(h="function"==typeof t?t:Zd(+t),i(),e):h},e.distance=function(t){return arguments.length?(p="function"==typeof t?t:Zd(+t),o(),e):p},e},dv=10,vv=Math.PI*(3-Math.sqrt(5)),_v=function(t){function n(){e(),p.call("tick",o),u<a&&(h.stop(),p.call("end",o))}function e(){var n,e,r=t.length;for(u+=(s-u)*c,l.each(function(t){t(u)}),n=0;n<r;++n)e=t[n],null==e.fx?e.x+=e.vx*=f:(e.x=e.fx,e.vx=0),null==e.fy?e.y+=e.vy*=f:(e.y=e.fy,e.vy=0)}function r(){for(var n,e=0,r=t.length;e<r;++e){if(n=t[e],n.index=e,isNaN(n.x)||isNaN(n.y)){var i=dv*Math.sqrt(e),o=e*vv;n.x=i*Math.cos(o),n.y=i*Math.sin(o)}(isNaN(n.vx)||isNaN(n.vy))&&(n.vx=n.vy=0)}}function i(n){return n.initialize&&n.initialize(t),n}var o,u=1,a=.001,c=1-Math.pow(a,1/300),s=0,f=.6,l=Be(),h=yn(n),p=v("tick","end");return null==t&&(t=[]),r(),o={tick:e,restart:function(){return h.restart(n),o},stop:function(){return h.stop(),o},nodes:function(n){return arguments.length?(t=n,r(),l.each(i),o):t},alpha:function(t){return arguments.length?(u=+t,o):u},alphaMin:function(t){return arguments.length?(a=+t,o):a},alphaDecay:function(t){return arguments.length?(c=+t,o):+c},alphaTarget:function(t){return arguments.length?(s=+t,o):s},velocityDecay:function(t){return arguments.length?(f=1-t,o):1-f},force:function(t,n){return arguments.length>1?(null==n?l.remove(t):l.set(t,i(n)),o):l.get(t)},find:function(n,e,r){var i,o,u,a,c,s=0,f=t.length;for(null==r?r=1/0:r*=r,s=0;s<f;++s)a=t[s],i=n-a.x,o=e-a.y,(u=i*i+o*o)<r&&(c=a,r=u);return c},on:function(t,n){return arguments.length>1?(p.on(t,n),o):p.on(t)}}},gv=function(){function t(t){var n,a=i.length,c=rr(i,fr,lr).visitAfter(e);for(u=t,n=0;n<a;++n)o=i[n],c.visit(r)}function n(){if(i){var t,n,e=i.length;for(a=new Array(e),t=0;t<e;++t)n=i[t],a[n.index]=+c(n,t,i)}}function e(t){var n,e,r,i,o,u=0;if(t.length){for(r=i=o=0;o<4;++o)(n=t[o])&&(e=n.value)&&(u+=e,r+=e*n.x,i+=e*n.y);t.x=r/u,t.y=i/u}else{n=t,n.x=n.data.x,n.y=n.data.y;do{u+=a[n.data.index]}while(n=n.next)}t.value=u}function r(t,n,e,r){if(!t.value)return!0;var i=t.x-o.x,c=t.y-o.y,h=r-n,p=i*i+c*c;if(h*h/l<p)return p<f&&(0===i&&(i=Gd(),p+=i*i),0===c&&(c=Gd(),p+=c*c),p<s&&(p=Math.sqrt(s*p)),o.vx+=i*t.value*u/p,o.vy+=c*t.value*u/p),!0;if(!(t.length||p>=f)){(t.data!==o||t.next)&&(0===i&&(i=Gd(),p+=i*i),0===c&&(c=Gd(),p+=c*c),p<s&&(p=Math.sqrt(s*p)));do{t.data!==o&&(h=a[t.data.index]*u/p,o.vx+=i*h,o.vy+=c*h)}while(t=t.next)}}var i,o,u,a,c=Zd(-30),s=1,f=1/0,l=.81;return t.initialize=function(t){i=t,n()},t.strength=function(e){return arguments.length?(c="function"==typeof e?e:Zd(+e),n(),t):c},t.distanceMin=function(n){return arguments.length?(s=n*n,t):Math.sqrt(s)},t.distanceMax=function(n){return arguments.length?(f=n*n,t):Math.sqrt(f)},t.theta=function(n){return arguments.length?(l=n*n,t):Math.sqrt(l)},t},yv=function(t){function n(t){for(var n,e=0,u=r.length;e<u;++e)n=r[e],n.vx+=(o[e]-n.x)*i[e]*t}function e(){if(r){var n,e=r.length;for(i=new Array(e),o=new Array(e),n=0;n<e;++n)i[n]=isNaN(o[n]=+t(r[n],n,r))?0:+u(r[n],n,r)}}var r,i,o,u=Zd(.1);return"function"!=typeof t&&(t=Zd(null==t?0:+t)),n.initialize=function(t){r=t,e()},n.strength=function(t){return arguments.length?(u="function"==typeof t?t:Zd(+t),e(),n):u},n.x=function(r){return arguments.length?(t="function"==typeof r?r:Zd(+r),e(),n):t},n},mv=function(t){function n(t){for(var n,e=0,u=r.length;e<u;++e)n=r[e],n.vy+=(o[e]-n.y)*i[e]*t}function e(){if(r){var n,e=r.length;for(i=new Array(e),o=new Array(e),n=0;n<e;++n)i[n]=isNaN(o[n]=+t(r[n],n,r))?0:+u(r[n],n,r)}}var r,i,o,u=Zd(.1);return"function"!=typeof t&&(t=Zd(null==t?0:+t)),n.initialize=function(t){r=t,e()},n.strength=function(t){return arguments.length?(u="function"==typeof t?t:Zd(+t),e(),n):u},n.y=function(r){return arguments.length?(t="function"==typeof r?r:Zd(+r),e(),n):t},n},xv=function(t,n){if((e=(t=n?t.toExponential(n-1):t.toExponential()).indexOf("e"))<0)return null;var e,r=t.slice(0,e);return[r.length>1?r[0]+r.slice(2):r,+t.slice(e+1)]},bv=function(t){return t=xv(Math.abs(t)),t?t[1]:NaN},wv=function(t,n){return function(e,r){for(var i=e.length,o=[],u=0,a=t[0],c=0;i>0&&a>0&&(c+a+1>r&&(a=Math.max(1,r-c)),o.push(e.substring(i-=a,i+a)),!((c+=a+1)>r));)a=t[u=(u+1)%t.length];return o.reverse().join(n)}},Mv=function(t){return function(n){return n.replace(/[0-9]/g,function(n){return t[+n]})}},Tv=function(t,n){t=t.toPrecision(n);t:for(var e,r=t.length,i=1,o=-1;i<r;++i)switch(t[i]){case".":o=e=i;break;case"0":0===o&&(o=i),e=i;break;case"e":break t;default:o>0&&(o=0)}return o>0?t.slice(0,o)+t.slice(e+1):t},Sv=function(t,n){var e=xv(t,n);if(!e)return t+"";var r=e[0],i=e[1],o=i-(lv=3*Math.max(-8,Math.min(8,Math.floor(i/3))))+1,u=r.length;return o===u?r:o>u?r+new Array(o-u+1).join("0"):o>0?r.slice(0,o)+"."+r.slice(o):"0."+new Array(1-o).join("0")+xv(t,Math.max(0,n+o-1))[0]},Nv=function(t,n){var e=xv(t,n);if(!e)return t+"";var r=e[0],i=e[1];return i<0?"0."+new Array(-i).join("0")+r:r.length>i+1?r.slice(0,i+1)+"."+r.slice(i+1):r+new Array(i-r.length+2).join("0")},kv={"":Tv,"%":function(t,n){return(100*t).toFixed(n)},b:function(t){return Math.round(t).toString(2)},c:function(t){return t+""},d:function(t){return Math.round(t).toString(10)},e:function(t,n){return t.toExponential(n)},f:function(t,n){return t.toFixed(n)},g:function(t,n){return t.toPrecision(n)},o:function(t){return Math.round(t).toString(8)},p:function(t,n){return Nv(100*t,n)},r:Nv,s:Sv,X:function(t){return Math.round(t).toString(16).toUpperCase()},x:function(t){return Math.round(t).toString(16)}},Ev=/^(?:(.)?([<>=^]))?([+\-\( ])?([$#])?(0)?(\d+)?(,)?(\.\d+)?([a-z%])?$/i;hr.prototype=pr.prototype,pr.prototype.toString=function(){return this.fill+this.align+this.sign+this.symbol+(this.zero?"0":"")+(null==this.width?"":Math.max(1,0|this.width))+(this.comma?",":"")+(null==this.precision?"":"."+Math.max(0,0|this.precision))+this.type};var Av,Cv=function(t){return t},zv=["y","z","a","f","p","n","µ","m","","k","M","G","T","P","E","Z","Y"],Pv=function(t){function n(t){function n(t){var n,i,a,f=_,x=g;if("c"===v)x=y(t)+x,t="";else{t=+t;var b=t<0;if(t=y(Math.abs(t),d),b&&0==+t&&(b=!1),f=(b?"("===s?s:"-":"-"===s||"("===s?"":s)+f,x=x+("s"===v?zv[8+lv/3]:"")+(b&&"("===s?")":""),m)for(n=-1,i=t.length;++n<i;)if(48>(a=t.charCodeAt(n))||a>57){x=(46===a?o+t.slice(n+1):t.slice(n))+x,t=t.slice(0,n);break}}p&&!l&&(t=r(t,1/0));var w=f.length+t.length+x.length,M=w<h?new Array(h-w+1).join(e):"";switch(p&&l&&(t=r(M+t,M.length?h-x.length:1/0),M=""),c){case"<":t=f+t+x+M;break;case"=":t=f+M+t+x;break;case"^":t=M.slice(0,w=M.length>>1)+f+t+x+M.slice(w);break;default:t=M+f+t+x}return u(t)}t=hr(t);var e=t.fill,c=t.align,s=t.sign,f=t.symbol,l=t.zero,h=t.width,p=t.comma,d=t.precision,v=t.type,_="$"===f?i[0]:"#"===f&&/[boxX]/.test(v)?"0"+v.toLowerCase():"",g="$"===f?i[1]:/[%p]/.test(v)?a:"",y=kv[v],m=!v||/[defgprs%]/.test(v);return d=null==d?v?6:12:/[gprs]/.test(v)?Math.max(1,Math.min(21,d)):Math.max(0,Math.min(20,d)),n.toString=function(){return t+""},n}function e(t,e){var r=n((t=hr(t),t.type="f",t)),i=3*Math.max(-8,Math.min(8,Math.floor(bv(e)/3))),o=Math.pow(10,-i),u=zv[8+i/3];return function(t){return r(o*t)+u}}var r=t.grouping&&t.thousands?wv(t.grouping,t.thousands):Cv,i=t.currency,o=t.decimal,u=t.numerals?Mv(t.numerals):Cv,a=t.percent||"%";return{format:n,formatPrefix:e}};dr({decimal:".",thousands:",",grouping:[3],currency:["$",""]});var Lv=function(t){return Math.max(0,-bv(Math.abs(t)))},Rv=function(t,n){return Math.max(0,3*Math.max(-8,Math.min(8,Math.floor(bv(n)/3)))-bv(Math.abs(t)))},qv=function(t,n){return t=Math.abs(t),n=Math.abs(n)-t,Math.max(0,bv(n)-bv(t))+1},Uv=function(){return new vr};vr.prototype={constructor:vr,reset:function(){this.s=this.t=0},add:function(t){_r(d_,t,this.t),_r(this,d_.s,this.s),this.s?this.t+=d_.t:this.s=d_.t},valueOf:function(){return this.s}};var Dv,Ov,Fv,Iv,Yv,Bv,jv,Hv,Xv,Vv,$v,Wv,Zv,Gv,Jv,Qv,Kv,t_,n_,e_,r_,i_,o_,u_,a_,c_,s_,f_,l_,h_,p_,d_=new vr,v_=1e-6,__=Math.PI,g_=__/2,y_=__/4,m_=2*__,x_=180/__,b_=__/180,w_=Math.abs,M_=Math.atan,T_=Math.atan2,S_=Math.cos,N_=Math.ceil,k_=Math.exp,E_=Math.log,A_=Math.pow,C_=Math.sin,z_=Math.sign||function(t){return t>0?1:t<0?-1:0},P_=Math.sqrt,L_=Math.tan,R_={Feature:function(t,n){br(t.geometry,n)},FeatureCollection:function(t,n){for(var e=t.features,r=-1,i=e.length;++r<i;)br(e[r].geometry,n)}},q_={Sphere:function(t,n){n.sphere()},Point:function(t,n){t=t.coordinates,n.point(t[0],t[1],t[2])},MultiPoint:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)t=e[r],n.point(t[0],t[1],t[2])},LineString:function(t,n){wr(t.coordinates,n,0)},MultiLineString:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)wr(e[r],n,0)},Polygon:function(t,n){Mr(t.coordinates,n)},MultiPolygon:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)Mr(e[r],n)},GeometryCollection:function(t,n){for(var e=t.geometries,r=-1,i=e.length;++r<i;)br(e[r],n)}},U_=function(t,n){t&&R_.hasOwnProperty(t.type)?R_[t.type](t,n):br(t,n)},D_=Uv(),O_=Uv(),F_={point:xr,lineStart:xr,lineEnd:xr,polygonStart:function(){D_.reset(),F_.lineStart=Tr,F_.lineEnd=Sr},polygonEnd:function(){var t=+D_;O_.add(t<0?m_+t:t),this.lineStart=this.lineEnd=this.point=xr},sphere:function(){O_.add(m_)}},I_=function(t){return O_.reset(),U_(t,F_),2*O_},Y_=Uv(),B_={point:qr,lineStart:Dr,lineEnd:Or,polygonStart:function(){B_.point=Fr,B_.lineStart=Ir,B_.lineEnd=Yr,Y_.reset(),F_.polygonStart()},polygonEnd:function(){F_.polygonEnd(),B_.point=qr,B_.lineStart=Dr,B_.lineEnd=Or,D_<0?(Bv=-(Hv=180),jv=-(Xv=90)):Y_>v_?Xv=90:Y_<-v_&&(jv=-90),Jv[0]=Bv,Jv[1]=Hv}},j_=function(t){var n,e,r,i,o,u,a;if(Xv=Hv=-(Bv=jv=1/0),Gv=[],U_(t,B_),e=Gv.length){for(Gv.sort(jr),n=1,r=Gv[0],o=[r];n<e;++n)i=Gv[n],Hr(r,i[0])||Hr(r,i[1])?(Br(r[0],i[1])>Br(r[0],r[1])&&(r[1]=i[1]),Br(i[0],r[1])>Br(r[0],r[1])&&(r[0]=i[0])):o.push(r=i);for(u=-1/0,e=o.length-1,n=0,r=o[e];n<=e;r=i,++n)i=o[n],(a=Br(r[1],i[0]))>u&&(u=a,Bv=i[0],Hv=r[1])}return Gv=Jv=null,Bv===1/0||jv===1/0?[[NaN,NaN],[NaN,NaN]]:[[Bv,jv],[Hv,Xv]]},H_={sphere:xr,point:Xr,lineStart:$r,lineEnd:Gr,polygonStart:function(){H_.lineStart=Jr,H_.lineEnd=Qr},polygonEnd:function(){H_.lineStart=$r,H_.lineEnd=Gr}},X_=function(t){Qv=Kv=t_=n_=e_=r_=i_=o_=u_=a_=c_=0,U_(t,H_);var n=u_,e=a_,r=c_,i=n*n+e*e+r*r;return i<1e-12&&(n=r_,e=i_,r=o_,Kv<v_&&(n=t_,e=n_,r=e_),(i=n*n+e*e+r*r)<1e-12)?[NaN,NaN]:[T_(e,n)*x_,yr(r/P_(i))*x_]},V_=function(t){return function(){return t}},$_=function(t,n){function e(e,r){return e=t(e,r),n(e[0],e[1])}return t.invert&&n.invert&&(e.invert=function(e,r){return(e=n.invert(e,r))&&t.invert(e[0],e[1])}),e};ni.invert=ni;var W_,Z_,G_,J_,Q_,K_,tg,ng,eg,rg,ig,og=function(t){function n(n){return n=t(n[0]*b_,n[1]*b_),n[0]*=x_,n[1]*=x_,n}return t=ei(t[0]*b_,t[1]*b_,t.length>2?t[2]*b_:0),n.invert=function(n){return n=t.invert(n[0]*b_,n[1]*b_),n[0]*=x_,n[1]*=x_,n},n},ug=function(){function t(t,n){e.push(t=r(t,n)),t[0]*=x_,t[1]*=x_}function n(){var t=i.apply(this,arguments),n=o.apply(this,arguments)*b_,c=u.apply(this,arguments)*b_;return e=[],r=ei(-t[0]*b_,-t[1]*b_,0).invert,ui(a,n,c,1),t={type:"Polygon",coordinates:[e]},e=r=null,t}var e,r,i=V_([0,0]),o=V_(90),u=V_(6),a={point:t};return n.center=function(t){return arguments.length?(i="function"==typeof t?t:V_([+t[0],+t[1]]),n):i},n.radius=function(t){return arguments.length?(o="function"==typeof t?t:V_(+t),n):o},n.precision=function(t){return arguments.length?(u="function"==typeof t?t:V_(+t),n):u},n},ag=function(){var t,n=[];return{point:function(n,e){t.push([n,e])},lineStart:function(){n.push(t=[])},lineEnd:xr,rejoin:function(){n.length>1&&n.push(n.pop().concat(n.shift()))},result:function(){var e=n;return n=[],t=null,e}}},cg=function(t,n,e,r,i,o){var u,a=t[0],c=t[1],s=n[0],f=n[1],l=0,h=1,p=s-a,d=f-c;if(u=e-a,p||!(u>0)){if(u/=p,p<0){if(u<l)return;u<h&&(h=u)}else if(p>0){if(u>h)return;u>l&&(l=u)}if(u=i-a,p||!(u<0)){if(u/=p,p<0){if(u>h)return;u>l&&(l=u)}else if(p>0){if(u<l)return;u<h&&(h=u)}if(u=r-c,d||!(u>0)){if(u/=d,d<0){if(u<l)return;u<h&&(h=u)}else if(d>0){if(u>h)return;u>l&&(l=u)}if(u=o-c,d||!(u<0)){if(u/=d,d<0){if(u>h)return;u>l&&(l=u)}else if(d>0){if(u<l)return;u<h&&(h=u)}return l>0&&(t[0]=a+l*p,t[1]=c+l*d),h<1&&(n[0]=a+h*p,n[1]=c+h*d),!0}}}}},sg=function(t,n){return w_(t[0]-n[0])<v_&&w_(t[1]-n[1])<v_},fg=function(t,n,e,r,i){var o,u,a=[],c=[];if(t.forEach(function(t){if(!((n=t.length-1)<=0)){var n,e,r=t[0],u=t[n];if(sg(r,u)){for(i.lineStart(),o=0;o<n;++o)i.point((r=t[o])[0],r[1]);return void i.lineEnd()}a.push(e=new ci(r,t,null,!0)),c.push(e.o=new ci(r,null,e,!1)),a.push(e=new ci(u,t,null,!1)),c.push(e.o=new ci(u,null,e,!0))}}),a.length){for(c.sort(n),si(a),si(c),o=0,u=c.length;o<u;++o)c[o].e=e=!e;for(var s,f,l=a[0];;){for(var h=l,p=!0;h.v;)if((h=h.n)===l)return;s=h.z,i.lineStart();do{if(h.v=h.o.v=!0,h.e){if(p)for(o=0,u=s.length;o<u;++o)i.point((f=s[o])[0],f[1]);else r(h.x,h.n.x,1,i);h=h.n}else{if(p)for(s=h.p.z,o=s.length-1;o>=0;--o)i.point((f=s[o])[0],f[1]);else r(h.x,h.p.x,-1,i);h=h.p}h=h.o,s=h.z,p=!p}while(!h.v);i.lineEnd()}}},lg=1e9,hg=-lg,pg=function(){var t,n,e,r=0,i=0,o=960,u=500;return e={stream:function(e){return t&&n===e?t:t=fi(r,i,o,u)(n=e)},extent:function(a){return arguments.length?(r=+a[0][0],i=+a[0][1],o=+a[1][0],u=+a[1][1],t=n=null,e):[[r,i],[o,u]]}}},dg=Uv(),vg=function(t,n){var e=n[0],r=n[1],i=[C_(e),-S_(e),0],o=0,u=0;dg.reset();for(var a=0,c=t.length;a<c;++a)if(f=(s=t[a]).length)for(var s,f,l=s[f-1],h=l[0],p=l[1]/2+y_,d=C_(p),v=S_(p),_=0;_<f;++_,h=y,d=x,v=b,l=g){var g=s[_],y=g[0],m=g[1]/2+y_,x=C_(m),b=S_(m),w=y-h,M=w>=0?1:-1,T=M*w,S=T>__,N=d*x;if(dg.add(T_(N*M*C_(T),v*b+N*S_(T))),o+=S?w+M*m_:w,S^h>=e^y>=e){var k=zr(Ar(l),Ar(g));Rr(k);var E=zr(i,k);Rr(E);var A=(S^w>=0?-1:1)*yr(E[2]);(r>A||r===A&&(k[0]||k[1]))&&(u+=S^w>=0?1:-1)}}return(o<-v_||o<v_&&dg<-v_)^1&u},_g=Uv(),gg={sphere:xr,point:xr,lineStart:li,lineEnd:xr,polygonStart:xr,polygonEnd:xr},yg=function(t){return _g.reset(),U_(t,gg),+_g},mg=[null,null],xg={type:"LineString",coordinates:mg},bg=function(t,n){return mg[0]=t,mg[1]=n,yg(xg)},wg={Feature:function(t,n){return vi(t.geometry,n)},FeatureCollection:function(t,n){for(var e=t.features,r=-1,i=e.length;++r<i;)if(vi(e[r].geometry,n))return!0;return!1}},Mg={Sphere:function(){return!0},Point:function(t,n){return _i(t.coordinates,n)},MultiPoint:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)if(_i(e[r],n))return!0;return!1},LineString:function(t,n){return gi(t.coordinates,n)},MultiLineString:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)if(gi(e[r],n))return!0;return!1},Polygon:function(t,n){return yi(t.coordinates,n)},MultiPolygon:function(t,n){for(var e=t.coordinates,r=-1,i=e.length;++r<i;)if(yi(e[r],n))return!0;return!1},GeometryCollection:function(t,n){for(var e=t.geometries,r=-1,i=e.length;++r<i;)if(vi(e[r],n))return!0;return!1}},Tg=function(t,n){return(t&&wg.hasOwnProperty(t.type)?wg[t.type]:vi)(t,n)},Sg=function(t,n){var e=t[0]*b_,r=t[1]*b_,i=n[0]*b_,o=n[1]*b_,u=S_(r),a=C_(r),c=S_(o),s=C_(o),f=u*S_(e),l=u*C_(e),h=c*S_(i),p=c*C_(i),d=2*yr(P_(mr(o-r)+u*c*mr(i-e))),v=C_(d),_=d?function(t){var n=C_(t*=d)/v,e=C_(d-t)/v,r=e*f+n*h,i=e*l+n*p,o=e*a+n*s;return[T_(i,r)*x_,T_(o,P_(r*r+i*i))*x_]}:function(){return[e*x_,r*x_]};return _.distance=d,_},Ng=function(t){return t},kg=Uv(),Eg=Uv(),Ag={point:xr,lineStart:xr,lineEnd:xr,polygonStart:function(){Ag.lineStart=Si,Ag.lineEnd=Ei},polygonEnd:function(){Ag.lineStart=Ag.lineEnd=Ag.point=xr,kg.add(w_(Eg)),Eg.reset()},result:function(){var t=kg/2;return kg.reset(),t}},Cg=1/0,zg=Cg,Pg=-Cg,Lg=Pg,Rg={point:Ai,lineStart:xr,lineEnd:xr,polygonStart:xr,polygonEnd:xr,result:function(){var t=[[Cg,zg],[Pg,Lg]];return Pg=Lg=-(zg=Cg=1/0),t}},qg=0,Ug=0,Dg=0,Og=0,Fg=0,Ig=0,Yg=0,Bg=0,jg=0,Hg={point:Ci,lineStart:zi,lineEnd:Ri,polygonStart:function(){Hg.lineStart=qi,Hg.lineEnd=Ui},polygonEnd:function(){Hg.point=Ci,Hg.lineStart=zi,Hg.lineEnd=Ri},result:function(){var t=jg?[Yg/jg,Bg/jg]:Ig?[Og/Ig,Fg/Ig]:Dg?[qg/Dg,Ug/Dg]:[NaN,NaN];return qg=Ug=Dg=Og=Fg=Ig=Yg=Bg=jg=0,t}};Fi.prototype={_radius:4.5,pointRadius:function(t){return this._radius=t,this},polygonStart:function(){this._line=0},polygonEnd:function(){this._line=NaN},lineStart:function(){this._point=0},lineEnd:function(){0===this._line&&this._context.closePath(),this._point=NaN},point:function(t,n){switch(this._point){case 0:this._context.moveTo(t,n),this._point=1;break;case 1:this._context.lineTo(t,n);break;default:this._context.moveTo(t+this._radius,n),this._context.arc(t,n,this._radius,0,m_)}},result:xr};var Xg,Vg,$g,Wg,Zg,Gg=Uv(),Jg={point:xr,lineStart:function(){Jg.point=Ii},lineEnd:function(){Xg&&Yi(Vg,$g),Jg.point=xr},polygonStart:function(){Xg=!0},polygonEnd:function(){Xg=null},result:function(){var t=+Gg;return Gg.reset(),t}};Bi.prototype={_circle:ji(4.5),pointRadius:function(t){return this._circle=ji(t),this},polygonStart:function(){this._line=0},polygonEnd:function(){this._line=NaN},lineStart:function(){this._point=0},lineEnd:function(){0===this._line&&this._string.push("Z"),this._point=NaN},point:function(t,n){switch(this._point){case 0:this._string.push("M",t,",",n),this._point=1;break;case 1:this._string.push("L",t,",",n);break;default:this._string.push("M",t,",",n,this._circle)}},result:function(){if(this._string.length){var t=this._string.join("");return this._string=[],t}}};var Qg=function(t,n){function e(t){return t&&("function"==typeof o&&i.pointRadius(+o.apply(this,arguments)),U_(t,r(i))),i.result()}var r,i,o=4.5;return e.area=function(t){return U_(t,r(Ag)),Ag.result()},e.measure=function(t){return U_(t,r(Jg)),Jg.result()},e.bounds=function(t){return U_(t,r(Rg)),Rg.result()},e.centroid=function(t){return U_(t,r(Hg)),Hg.result()},e.projection=function(n){return arguments.length?(r=null==n?(t=null,Ng):(t=n).stream,e):t},e.context=function(t){return arguments.length?(i=null==t?(n=null,new Bi):new Fi(n=t),"function"!=typeof o&&i.pointRadius(o),e):n},e.pointRadius=function(t){return arguments.length?(o="function"==typeof t?t:(i.pointRadius(+t),+t),e):o},e.projection(t).context(n)},Kg=function(t,n,e,r){return function(i,o){function u(n,e){var r=i(n,e);t(n=r[0],e=r[1])&&o.point(n,e)}function a(t,n){var e=i(t,n);_.point(e[0],e[1])}function c(){b.point=a,_.lineStart()}function s(){b.point=u,_.lineEnd()}function f(t,n){v.push([t,n]);var e=i(t,n);m.point(e[0],e[1])}function l(){m.lineStart(),v=[]}function h(){f(v[0][0],v[0][1]),m.lineEnd();var t,n,e,r,i=m.clean(),u=y.result(),a=u.length;if(v.pop(),p.push(v),v=null,a)if(1&i){if(e=u[0],(n=e.length-1)>0){for(x||(o.polygonStart(),x=!0),o.lineStart(),t=0;t<n;++t)o.point((r=e[t])[0],r[1]);o.lineEnd()}}else a>1&&2&i&&u.push(u.pop().concat(u.shift())),d.push(u.filter(Hi))}var p,d,v,_=n(o),g=i.invert(r[0],r[1]),y=ag(),m=n(y),x=!1,b={point:u,lineStart:c,lineEnd:s,polygonStart:function(){b.point=f,b.lineStart=l,b.lineEnd=h,d=[],p=[]},polygonEnd:function(){b.point=u,b.lineStart=c,b.lineEnd=s,d=lf(d);var t=vg(p,g);d.length?(x||(o.polygonStart(),x=!0),fg(d,Xi,t,e,o)):t&&(x||(o.polygonStart(),x=!0),o.lineStart(),e(null,null,1,o),o.lineEnd()),x&&(o.polygonEnd(),x=!1),d=p=null},sphere:function(){o.polygonStart(),o.lineStart(),e(null,null,1,o),o.lineEnd(),o.polygonEnd()}};return b}},ty=Kg(function(){return!0},Vi,Wi,[-__,-g_]),ny=function(t,n){function e(e,r,i,o){ui(o,t,n,i,e,r)}function r(t,n){return S_(t)*S_(n)>a}function i(t){var n,e,i,a,f;return{lineStart:function(){a=i=!1,f=1},point:function(l,h){var p,d=[l,h],v=r(l,h),_=c?v?0:u(l,h):v?u(l+(l<0?__:-__),h):0;if(!n&&(a=i=v)&&t.lineStart(),v!==i&&(p=o(n,d),(sg(n,p)||sg(d,p))&&(d[0]+=v_,d[1]+=v_,v=r(d[0],d[1]))),v!==i)f=0,v?(t.lineStart(),p=o(d,n),t.point(p[0],p[1])):(p=o(n,d),t.point(p[0],p[1]),t.lineEnd()),n=p;else if(s&&n&&c^v){var g;_&e||!(g=o(d,n,!0))||(f=0,c?(t.lineStart(),t.point(g[0][0],g[0][1]),t.point(g[1][0],g[1][1]),t.lineEnd()):(t.point(g[1][0],g[1][1]),t.lineEnd(),t.lineStart(),t.point(g[0][0],g[0][1])))}!v||n&&sg(n,d)||t.point(d[0],d[1]),n=d,i=v,e=_},lineEnd:function(){i&&t.lineEnd(),n=null},clean:function(){return f|(a&&i)<<1}}}function o(t,n,e){var r=Ar(t),i=Ar(n),o=[1,0,0],u=zr(r,i),c=Cr(u,u),s=u[0],f=c-s*s;if(!f)return!e&&t;var l=a*c/f,h=-a*s/f,p=zr(o,u),d=Lr(o,l);Pr(d,Lr(u,h));var v=p,_=Cr(d,v),g=Cr(v,v),y=_*_-g*(Cr(d,d)-1);if(!(y<0)){var m=P_(y),x=Lr(v,(-_-m)/g);if(Pr(x,d),x=Er(x),!e)return x;var b,w=t[0],M=n[0],T=t[1],S=n[1];M<w&&(b=w,w=M,M=b);var N=M-w,k=w_(N-__)<v_,E=k||N<v_;if(!k&&S<T&&(b=T,T=S,S=b),E?k?T+S>0^x[1]<(w_(x[0]-w)<v_?T:S):T<=x[1]&&x[1]<=S:N>__^(w<=x[0]&&x[0]<=M)){var A=Lr(v,(-_+m)/g);return Pr(A,d),[x,Er(A)]}}}function u(n,e){var r=c?t:__-t,i=0;return n<-r?i|=1:n>r&&(i|=2),e<-r?i|=4:e>r&&(i|=8),i}var a=S_(t),c=a>0,s=w_(a)>v_;return Kg(r,i,e,c?[0,-t]:[-__,t-__])},ey=function(t){return{stream:Zi(t)}};Gi.prototype={constructor:Gi,point:function(t,n){this.stream.point(t,n)},sphere:function(){this.stream.sphere()},lineStart:function(){this.stream.lineStart()},lineEnd:function(){this.stream.lineEnd()},polygonStart:function(){this.stream.polygonStart()},polygonEnd:function(){this.stream.polygonEnd()}};var ry=16,iy=S_(30*b_),oy=function(t,n){return+n?to(t,n):Ki(t)},uy=Zi({point:function(t,n){this.stream.point(t*b_,n*b_)}}),ay=function(){return ro(oo).scale(155.424).center([0,33.6442])},cy=function(){return ay().parallels([29.5,45.5]).scale(1070).translate([480,250]).rotate([96,0]).center([-.6,38.7])},sy=function(){function t(t){var n=t[0],e=t[1];return a=null,i.point(n,e),a||(o.point(n,e),a)||(u.point(n,e),a)}function n(){return e=r=null,t}var e,r,i,o,u,a,c=cy(),s=ay().rotate([154,0]).center([-2,58.5]).parallels([55,65]),f=ay().rotate([157,0]).center([-3,19.9]).parallels([8,18]),l={point:function(t,n){a=[t,n]}};return t.invert=function(t){var n=c.scale(),e=c.translate(),r=(t[0]-e[0])/n,i=(t[1]-e[1])/n;return(i>=.12&&i<.234&&r>=-.425&&r<-.214?s:i>=.166&&i<.234&&r>=-.214&&r<-.115?f:c).invert(t)},t.stream=function(t){return e&&r===t?e:e=uo([c.stream(r=t),s.stream(t),f.stream(t)])},t.precision=function(t){return arguments.length?(c.precision(t),s.precision(t),f.precision(t),n()):c.precision()},t.scale=function(n){return arguments.length?(c.scale(n),s.scale(.35*n),f.scale(n),t.translate(c.translate())):c.scale()},t.translate=function(t){if(!arguments.length)return c.translate();var e=c.scale(),r=+t[0],a=+t[1];return i=c.translate(t).clipExtent([[r-.455*e,a-.238*e],[r+.455*e,a+.238*e]]).stream(l),o=s.translate([r-.307*e,a+.201*e]).clipExtent([[r-.425*e+v_,a+.12*e+v_],[r-.214*e-v_,a+.234*e-v_]]).stream(l),u=f.translate([r-.205*e,a+.212*e]).clipExtent([[r-.214*e+v_,a+.166*e+v_],[r-.115*e-v_,a+.234*e-v_]]).stream(l),n()},t.fitExtent=function(n,e){return Ji(t,n,e)},t.fitSize=function(n,e){return Qi(t,n,e)},t.scale(1070)},fy=ao(function(t){return P_(2/(1+t))});fy.invert=co(function(t){return 2*yr(t/2)});var ly=function(){return no(fy).scale(124.75).clipAngle(179.999)},hy=ao(function(t){return(t=gr(t))&&t/C_(t)});hy.invert=co(function(t){return t});var py=function(){return no(hy).scale(79.4188).clipAngle(179.999)};so.invert=function(t,n){return[t,2*M_(k_(n))-g_]};var dy=function(){return fo(so).scale(961/m_)},vy=function(){return ro(ho).scale(109.5).parallels([30,30])};po.invert=po;var _y=function(){return no(po).scale(152.63)},gy=function(){return ro(vo).scale(131.154).center([0,13.9389])};_o.invert=co(M_);var yy=function(){return no(_o).scale(144.049).clipAngle(60)},my=function(){function t(){return i=o=null,u}var n,e,r,i,o,u,a=1,c=0,s=0,f=1,l=1,h=Ng,p=null,d=Ng;return u={stream:function(t){return i&&o===t?i:i=h(d(o=t))},clipExtent:function(i){return arguments.length?(d=null==i?(p=n=e=r=null,Ng):fi(p=+i[0][0],n=+i[0][1],e=+i[1][0],r=+i[1][1]),t()):null==p?null:[[p,n],[e,r]]},scale:function(n){return arguments.length?(h=go((a=+n)*f,a*l,c,s),t()):a},translate:function(n){return arguments.length?(h=go(a*f,a*l,c=+n[0],s=+n[1]),t()):[c,s]},reflectX:function(n){return arguments.length?(h=go(a*(f=n?-1:1),a*l,c,s),t()):f<0},reflectY:function(n){return arguments.length?(h=go(a*f,a*(l=n?-1:1),c,s),t()):l<0},fitExtent:function(t,n){return Ji(u,t,n)},fitSize:function(t,n){return Qi(u,t,n)}}};yo.invert=co(yr);var xy=function(){return no(yo).scale(249.5).clipAngle(90+v_)};mo.invert=co(function(t){return 2*M_(t)});var by=function(){return no(mo).scale(250).clipAngle(142)};xo.invert=function(t,n){return[-n,2*M_(k_(t))-g_]};var wy=function(){var t=fo(xo),n=t.center,e=t.rotate;return t.center=function(t){return arguments.length?n([-t[1],t[0]]):(t=n(),[t[1],-t[0]])},t.rotate=function(t){return arguments.length?e([t[0],t[1],t.length>2?t[2]+90:90]):(t=e(),[t[0],t[1],t[2]-90])},e([0,0,90]).scale(159.155)},My=function(){function t(t){var o,u=0;t.eachAfter(function(t){var e=t.children;e?(t.x=wo(e),t.y=To(e)):(t.x=o?u+=n(t,o):0,t.y=0,o=t)});var a=No(t),c=ko(t),s=a.x-n(a,c)/2,f=c.x+n(c,a)/2;return t.eachAfter(i?function(n){n.x=(n.x-t.x)*e,n.y=(t.y-n.y)*r}:function(n){n.x=(n.x-s)/(f-s)*e,n.y=(1-(t.y?n.y/t.y:1))*r})}var n=bo,e=1,r=1,i=!1;return t.separation=function(e){return arguments.length?(n=e,t):n},t.size=function(n){return arguments.length?(i=!1,e=+n[0],r=+n[1],t):i?null:[e,r]},t.nodeSize=function(n){return arguments.length?(i=!0,e=+n[0],r=+n[1],t):i?[e,r]:null},t},Ty=function(){return this.eachAfter(Eo)},Sy=function(t){var n,e,r,i,o=this,u=[o];do{for(n=u.reverse(),u=[];o=n.pop();)if(t(o),e=o.children)for(r=0,i=e.length;r<i;++r)u.push(e[r])}while(u.length);return this},Ny=function(t){for(var n,e,r=this,i=[r];r=i.pop();)if(t(r),n=r.children)for(e=n.length-1;e>=0;--e)i.push(n[e]);return this},ky=function(t){for(var n,e,r,i=this,o=[i],u=[];i=o.pop();)if(u.push(i),n=i.children)for(e=0,r=n.length;e<r;++e)o.push(n[e]);for(;i=u.pop();)t(i);return this},Ey=function(t){return this.eachAfter(function(n){for(var e=+t(n.data)||0,r=n.children,i=r&&r.length;--i>=0;)e+=r[i].value;n.value=e})},Ay=function(t){return this.eachBefore(function(n){n.children&&n.children.sort(t)})},Cy=function(t){for(var n=this,e=Ao(n,t),r=[n];n!==e;)n=n.parent,r.push(n);for(var i=r.length;t!==e;)r.splice(i,0,t),t=t.parent;return r},zy=function(){for(var t=this,n=[t];t=t.parent;)n.push(t);return n},Py=function(){var t=[];return this.each(function(n){t.push(n)}),t},Ly=function(){var t=[];return this.eachBefore(function(n){n.children||t.push(n)}),t},Ry=function(){var t=this,n=[];return t.each(function(e){e!==t&&n.push({source:e.parent,target:e})}),n};qo.prototype=Co.prototype={constructor:qo,count:Ty,each:Sy,eachAfter:ky,eachBefore:Ny,sum:Ey,sort:Ay,path:Cy,ancestors:zy,descendants:Py,leaves:Ly,links:Ry,copy:zo};var qy=function(t){for(var n=(t=t.slice()).length,e=null,r=e;n;){var i=new Uo(t[n-1]);r=r?r.next=i:e=i,t[void 0]=t[--n]}return{head:e,tail:r}},Uy=function(t){return Oo(qy(t),[])},Dy=function(t){return Vo(t),t},Oy=function(t){return function(){return t}},Fy=function(){function t(t){return t.x=e/2,t.y=r/2,n?t.eachBefore(Jo(n)).eachAfter(Qo(i,.5)).eachBefore(Ko(1)):t.eachBefore(Jo(Go)).eachAfter(Qo(Zo,1)).eachAfter(Qo(i,t.r/Math.min(e,r))).eachBefore(Ko(Math.min(e,r)/(2*t.r))),t}var n=null,e=1,r=1,i=Zo;return t.radius=function(e){return arguments.length?(n=$o(e),t):n},t.size=function(n){return arguments.length?(e=+n[0],r=+n[1],t):[e,r]},t.padding=function(n){return arguments.length?(i="function"==typeof n?n:Oy(+n),t):i},t},Iy=function(t){t.x0=Math.round(t.x0),t.y0=Math.round(t.y0),t.x1=Math.round(t.x1),t.y1=Math.round(t.y1)},Yy=function(t,n,e,r,i){for(var o,u=t.children,a=-1,c=u.length,s=t.value&&(r-n)/t.value;++a<c;)o=u[a],o.y0=e,o.y1=i,o.x0=n,o.x1=n+=o.value*s},By=function(){function t(t){var u=t.height+1;return t.x0=t.y0=i,t.x1=e,t.y1=r/u,t.eachBefore(n(r,u)),o&&t.eachBefore(Iy),t}function n(t,n){return function(e){e.children&&Yy(e,e.x0,t*(e.depth+1)/n,e.x1,t*(e.depth+2)/n);var r=e.x0,o=e.y0,u=e.x1-i,a=e.y1-i;u<r&&(r=u=(r+u)/2),a<o&&(o=a=(o+a)/2),e.x0=r,e.y0=o,e.x1=u,e.y1=a}}var e=1,r=1,i=0,o=!1;return t.round=function(n){return arguments.length?(o=!!n,t):o},t.size=function(n){return arguments.length?(e=+n[0],r=+n[1],t):[e,r]},t.padding=function(n){return arguments.length?(i=+n,t):i},t},jy="$",Hy={depth:-1},Xy={},Vy=function(){function t(t){var r,i,o,u,a,c,s,f=t.length,l=new Array(f),h={};for(i=0;i<f;++i)r=t[i],a=l[i]=new qo(r),null!=(c=n(r,i,t))&&(c+="")&&(s=jy+(a.id=c),h[s]=s in h?Xy:a);for(i=0;i<f;++i)if(a=l[i],null!=(c=e(t[i],i,t))&&(c+="")){if(!(u=h[jy+c]))throw new Error("missing: "+c);if(u===Xy)throw new Error("ambiguous: "+c);u.children?u.children.push(a):u.children=[a],a.parent=u}else{if(o)throw new Error("multiple roots");o=a}if(!o)throw new Error("no root");if(o.parent=Hy,o.eachBefore(function(t){t.depth=t.parent.depth+1,--f}).eachBefore(Ro),o.parent=null,f>0)throw new Error("cycle");return o}var n=tu,e=nu;return t.id=function(e){return arguments.length?(n=Wo(e),t):n},t.parentId=function(n){return arguments.length?(e=Wo(n),t):e},t};cu.prototype=Object.create(qo.prototype);var $y=function(){function t(t){var r=su(t);if(r.eachAfter(n),r.parent.m=-r.z,r.eachBefore(e),c)t.eachBefore(i);else{var s=t,f=t,l=t;t.eachBefore(function(t){t.x<s.x&&(s=t),t.x>f.x&&(f=t),t.depth>l.depth&&(l=t)});var h=s===f?1:o(s,f)/2,p=h-s.x,d=u/(f.x+h+p),v=a/(l.depth||1);t.eachBefore(function(t){t.x=(t.x+p)*d,t.y=t.depth*v})}return t}function n(t){var n=t.children,e=t.parent.children,i=t.i?e[t.i-1]:null;if(n){uu(t);var u=(n[0].z+n[n.length-1].z)/2;i?(t.z=i.z+o(t._,i._),t.m=t.z-u):t.z=u}else i&&(t.z=i.z+o(t._,i._));t.parent.A=r(t,i,t.parent.A||e[0])}function e(t){t._.x=t.z+t.parent.m,t.m+=t.parent.m}function r(t,n,e){if(n){for(var r,i=t,u=t,a=n,c=i.parent.children[0],s=i.m,f=u.m,l=a.m,h=c.m;a=iu(a),i=ru(i),a&&i;)c=ru(c),u=iu(u),u.a=t,r=a.z+l-i.z-s+o(a._,i._),r>0&&(ou(au(a,t,e),t,r),s+=r,f+=r),l+=a.m,s+=i.m,h+=c.m,f+=u.m;a&&!iu(u)&&(u.t=a,u.m+=l-f),i&&!ru(c)&&(c.t=i,c.m+=s-h,e=t)}return e}function i(t){t.x*=u,t.y=t.depth*a}var o=eu,u=1,a=1,c=null;return t.separation=function(n){return arguments.length?(o=n,t):o},t.size=function(n){return arguments.length?(c=!1,u=+n[0],a=+n[1],t):c?null:[u,a]},t.nodeSize=function(n){return arguments.length?(c=!0,u=+n[0],a=+n[1],t):c?[u,a]:null},t},Wy=function(t,n,e,r,i){for(var o,u=t.children,a=-1,c=u.length,s=t.value&&(i-e)/t.value;++a<c;)o=u[a],o.x0=n,o.x1=r,o.y0=e,o.y1=e+=o.value*s},Zy=(1+Math.sqrt(5))/2,Gy=function t(n){function e(t,e,r,i,o){fu(n,t,e,r,i,o)}return e.ratio=function(n){return t((n=+n)>1?n:1)},e}(Zy),Jy=function(){function t(t){return t.x0=t.y0=0,t.x1=i,t.y1=o,t.eachBefore(n),u=[0],r&&t.eachBefore(Iy),t}function n(t){var n=u[t.depth],r=t.x0+n,i=t.y0+n,o=t.x1-n,h=t.y1-n;o<r&&(r=o=(r+o)/2),h<i&&(i=h=(i+h)/2),t.x0=r,t.y0=i,t.x1=o,t.y1=h,t.children&&(n=u[t.depth+1]=a(t)/2,r+=l(t)-n,i+=c(t)-n,o-=s(t)-n,h-=f(t)-n,o<r&&(r=o=(r+o)/2),h<i&&(i=h=(i+h)/2),e(t,r,i,o,h))}var e=Gy,r=!1,i=1,o=1,u=[0],a=Zo,c=Zo,s=Zo,f=Zo,l=Zo;return t.round=function(n){return arguments.length?(r=!!n,t):r},t.size=function(n){return arguments.length?(i=+n[0],o=+n[1],t):[i,o]},t.tile=function(n){return arguments.length?(e=Wo(n),t):e},t.padding=function(n){return arguments.length?t.paddingInner(n).paddingOuter(n):t.paddingInner()},t.paddingInner=function(n){return arguments.length?(a="function"==typeof n?n:Oy(+n),t):a},t.paddingOuter=function(n){return arguments.length?t.paddingTop(n).paddingRight(n).paddingBottom(n).paddingLeft(n):t.paddingTop()},t.paddingTop=function(n){return arguments.length?(c="function"==typeof n?n:Oy(+n),t):c},t.paddingRight=function(n){return arguments.length?(s="function"==typeof n?n:Oy(+n),t):s},t.paddingBottom=function(n){return arguments.length?(f="function"==typeof n?n:Oy(+n),t):f},t.paddingLeft=function(n){return arguments.length?(l="function"==typeof n?n:Oy(+n),t):l},t},Qy=function(t,n,e,r,i){function o(t,n,e,r,i,u,a){if(t>=n-1){var s=c[t];return s.x0=r,s.y0=i,s.x1=u,s.y1=a,void 0}for(var l=f[t],h=e/2+l,p=t+1,d=n-1;p<d;){var v=p+d>>>1;f[v]<h?p=v+1:d=v}h-f[p-1]<f[p]-h&&t+1<p&&--p;var _=f[p]-l,g=e-_;if(u-r>a-i){var y=(r*g+u*_)/e;o(t,p,_,r,i,y,a),o(p,n,g,y,i,u,a)}else{var m=(i*g+a*_)/e;o(t,p,_,r,i,u,m),o(p,n,g,r,m,u,a)}}var u,a,c=t.children,s=c.length,f=new Array(s+1);for(f[0]=a=u=0;u<s;++u)f[u+1]=a+=c[u].value;o(0,s,t.value,n,e,r,i)
-},Ky=function(t,n,e,r,i){(1&t.depth?Wy:Yy)(t,n,e,r,i)},tm=function t(n){function e(t,e,r,i,o){if((u=t._squarify)&&u.ratio===n)for(var u,a,c,s,f,l=-1,h=u.length,p=t.value;++l<h;){for(a=u[l],c=a.children,s=a.value=0,f=c.length;s<f;++s)a.value+=c[s].value;a.dice?Yy(a,e,r,i,r+=(o-r)*a.value/p):Wy(a,e,r,e+=(i-e)*a.value/p,o),p-=a.value}else t._squarify=u=fu(n,t,e,r,i,o),u.ratio=n}return e.ratio=function(n){return t((n=+n)>1?n:1)},e}(Zy),nm=function(t){for(var n,e=-1,r=t.length,i=t[r-1],o=0;++e<r;)n=i,i=t[e],o+=n[1]*i[0]-n[0]*i[1];return o/2},em=function(t){for(var n,e,r=-1,i=t.length,o=0,u=0,a=t[i-1],c=0;++r<i;)n=a,a=t[r],c+=e=n[0]*a[1]-a[0]*n[1],o+=(n[0]+a[0])*e,u+=(n[1]+a[1])*e;return c*=3,[o/c,u/c]},rm=function(t,n,e){return(n[0]-t[0])*(e[1]-t[1])-(n[1]-t[1])*(e[0]-t[0])},im=function(t){if((e=t.length)<3)return null;var n,e,r=new Array(e),i=new Array(e);for(n=0;n<e;++n)r[n]=[+t[n][0],+t[n][1],n];for(r.sort(lu),n=0;n<e;++n)i[n]=[r[n][0],-r[n][1]];var o=hu(r),u=hu(i),a=u[0]===o[0],c=u[u.length-1]===o[o.length-1],s=[];for(n=o.length-1;n>=0;--n)s.push(t[r[o[n]][2]]);for(n=+a;n<u.length-c;++n)s.push(t[r[u[n]][2]]);return s},om=function(t,n){for(var e,r,i=t.length,o=t[i-1],u=n[0],a=n[1],c=o[0],s=o[1],f=!1,l=0;l<i;++l)o=t[l],e=o[0],r=o[1],r>a!=s>a&&u<(c-e)*(a-r)/(s-r)+e&&(f=!f),c=e,s=r;return f},um=function(t){for(var n,e,r=-1,i=t.length,o=t[i-1],u=o[0],a=o[1],c=0;++r<i;)n=u,e=a,o=t[r],u=o[0],a=o[1],n-=u,e-=a,c+=Math.sqrt(n*n+e*e);return c},am=[].slice,cm={};pu.prototype=mu.prototype={constructor:pu,defer:function(t){if("function"!=typeof t||this._call)throw new Error;if(null!=this._error)return this;var n=am.call(arguments,1);return n.push(t),++this._waiting,this._tasks.push(n),du(this),this},abort:function(){return null==this._error&&gu(this,new Error("abort")),this},await:function(t){if("function"!=typeof t||this._call)throw new Error;return this._call=function(n,e){t.apply(null,[n].concat(e))},yu(this),this},awaitAll:function(t){if("function"!=typeof t||this._call)throw new Error;return this._call=t,yu(this),this}};var sm=function(t,n){return t=null==t?0:+t,n=null==n?1:+n,1===arguments.length?(n=t,t=0):n-=t,function(){return Math.random()*n+t}},fm=function(t,n){var e,r;return t=null==t?0:+t,n=null==n?1:+n,function(){var i;if(null!=e)i=e,e=null;else do{e=2*Math.random()-1,i=2*Math.random()-1,r=e*e+i*i}while(!r||r>1);return t+n*i*Math.sqrt(-2*Math.log(r)/r)}},lm=function(){var t=fm.apply(this,arguments);return function(){return Math.exp(t())}},hm=function(t){return function(){for(var n=0,e=0;e<t;++e)n+=Math.random();return n}},pm=function(t){var n=hm(t);return function(){return n()/t}},dm=function(t){return function(){return-Math.log(1-Math.random())/t}},vm=function(t,n){function e(t){var n,e=s.status;if(!e&&bu(s)||e>=200&&e<300||304===e){if(o)try{n=o.call(r,s)}catch(t){return void a.call("error",r,t)}else n=s;a.call("load",r,n)}else a.call("error",r,t)}var r,i,o,u,a=v("beforesend","progress","load","error"),c=Be(),s=new XMLHttpRequest,f=null,l=null,h=0;if("undefined"==typeof XDomainRequest||"withCredentials"in s||!/^(http(s)?:)?\/\//.test(t)||(s=new XDomainRequest),"onload"in s?s.onload=s.onerror=s.ontimeout=e:s.onreadystatechange=function(t){s.readyState>3&&e(t)},s.onprogress=function(t){a.call("progress",r,t)},r={header:function(t,n){return t=(t+"").toLowerCase(),arguments.length<2?c.get(t):(null==n?c.remove(t):c.set(t,n+""),r)},mimeType:function(t){return arguments.length?(i=null==t?null:t+"",r):i},responseType:function(t){return arguments.length?(u=t,r):u},timeout:function(t){return arguments.length?(h=+t,r):h},user:function(t){return arguments.length<1?f:(f=null==t?null:t+"",r)},password:function(t){return arguments.length<1?l:(l=null==t?null:t+"",r)},response:function(t){return o=t,r},get:function(t,n){return r.send("GET",t,n)},post:function(t,n){return r.send("POST",t,n)},send:function(n,e,o){return s.open(n,t,!0,f,l),null==i||c.has("accept")||c.set("accept",i+",*/*"),s.setRequestHeader&&c.each(function(t,n){s.setRequestHeader(n,t)}),null!=i&&s.overrideMimeType&&s.overrideMimeType(i),null!=u&&(s.responseType=u),h>0&&(s.timeout=h),null==o&&"function"==typeof e&&(o=e,e=null),null!=o&&1===o.length&&(o=xu(o)),null!=o&&r.on("error",o).on("load",function(t){o(null,t)}),a.call("beforesend",r,s),s.send(null==e?null:e),r},abort:function(){return s.abort(),r},on:function(){var t=a.on.apply(a,arguments);return t===a?r:t}},null!=n){if("function"!=typeof n)throw new Error("invalid callback: "+n);return r.get(n)}return r},_m=function(t,n){return function(e,r){var i=vm(e).mimeType(t).response(n);if(null!=r){if("function"!=typeof r)throw new Error("invalid callback: "+r);return i.get(r)}return i}},gm=_m("text/html",function(t){return document.createRange().createContextualFragment(t.responseText)}),ym=_m("application/json",function(t){return JSON.parse(t.responseText)}),mm=_m("text/plain",function(t){return t.responseText}),xm=_m("application/xml",function(t){var n=t.responseXML;if(!n)throw new Error("parse error");return n}),bm=function(t,n){return function(e,r,i){arguments.length<3&&(i=r,r=null);var o=vm(e).mimeType(t);return o.row=function(t){return arguments.length?o.response(wu(n,r=t)):r},o.row(r),i?o.get(i):o}},wm=bm("text/csv",Fd),Mm=bm("text/tab-separated-values",Hd),Tm=Array.prototype,Sm=Tm.map,Nm=Tm.slice,km={name:"implicit"},Em=function(t){return function(){return t}},Am=function(t){return+t},Cm=[0,1],zm=function(n,e,r){var o,u=n[0],a=n[n.length-1],c=i(u,a,null==e?10:e);switch(r=hr(null==r?",f":r),r.type){case"s":var s=Math.max(Math.abs(u),Math.abs(a));return null!=r.precision||isNaN(o=Rv(c,s))||(r.precision=o),t.formatPrefix(r,s);case"":case"e":case"g":case"p":case"r":null!=r.precision||isNaN(o=qv(c,Math.max(Math.abs(u),Math.abs(a))))||(r.precision=o-("e"===r.type));break;case"f":case"%":null!=r.precision||isNaN(o=Lv(c))||(r.precision=o-2*("%"===r.type))}return t.format(r)},Pm=function(t,n){t=t.slice();var e,r=0,i=t.length-1,o=t[r],u=t[i];return u<o&&(e=r,r=i,i=e,e=o,o=u,u=e),t[r]=n.floor(o),t[i]=n.ceil(u),t},Lm=new Date,Rm=new Date,qm=Gu(function(){},function(t,n){t.setTime(+t+n)},function(t,n){return n-t});qm.every=function(t){return t=Math.floor(t),isFinite(t)&&t>0?t>1?Gu(function(n){n.setTime(Math.floor(n/t)*t)},function(n,e){n.setTime(+n+e*t)},function(n,e){return(e-n)/t}):qm:null};var Um=qm.range,Dm=6e4,Om=6048e5,Fm=Gu(function(t){t.setTime(1e3*Math.floor(t/1e3))},function(t,n){t.setTime(+t+1e3*n)},function(t,n){return(n-t)/1e3},function(t){return t.getUTCSeconds()}),Im=Fm.range,Ym=Gu(function(t){t.setTime(Math.floor(t/Dm)*Dm)},function(t,n){t.setTime(+t+n*Dm)},function(t,n){return(n-t)/Dm},function(t){return t.getMinutes()}),Bm=Ym.range,jm=Gu(function(t){var n=t.getTimezoneOffset()*Dm%36e5;n<0&&(n+=36e5),t.setTime(36e5*Math.floor((+t-n)/36e5)+n)},function(t,n){t.setTime(+t+36e5*n)},function(t,n){return(n-t)/36e5},function(t){return t.getHours()}),Hm=jm.range,Xm=Gu(function(t){t.setHours(0,0,0,0)},function(t,n){t.setDate(t.getDate()+n)},function(t,n){return(n-t-(n.getTimezoneOffset()-t.getTimezoneOffset())*Dm)/864e5},function(t){return t.getDate()-1}),Vm=Xm.range,$m=Ju(0),Wm=Ju(1),Zm=Ju(2),Gm=Ju(3),Jm=Ju(4),Qm=Ju(5),Km=Ju(6),tx=$m.range,nx=Wm.range,ex=Zm.range,rx=Gm.range,ix=Jm.range,ox=Qm.range,ux=Km.range,ax=Gu(function(t){t.setDate(1),t.setHours(0,0,0,0)},function(t,n){t.setMonth(t.getMonth()+n)},function(t,n){return n.getMonth()-t.getMonth()+12*(n.getFullYear()-t.getFullYear())},function(t){return t.getMonth()}),cx=ax.range,sx=Gu(function(t){t.setMonth(0,1),t.setHours(0,0,0,0)},function(t,n){t.setFullYear(t.getFullYear()+n)},function(t,n){return n.getFullYear()-t.getFullYear()},function(t){return t.getFullYear()});sx.every=function(t){return isFinite(t=Math.floor(t))&&t>0?Gu(function(n){n.setFullYear(Math.floor(n.getFullYear()/t)*t),n.setMonth(0,1),n.setHours(0,0,0,0)},function(n,e){n.setFullYear(n.getFullYear()+e*t)}):null};var fx=sx.range,lx=Gu(function(t){t.setUTCSeconds(0,0)},function(t,n){t.setTime(+t+n*Dm)},function(t,n){return(n-t)/Dm},function(t){return t.getUTCMinutes()}),hx=lx.range,px=Gu(function(t){t.setUTCMinutes(0,0,0)},function(t,n){t.setTime(+t+36e5*n)},function(t,n){return(n-t)/36e5},function(t){return t.getUTCHours()}),dx=px.range,vx=Gu(function(t){t.setUTCHours(0,0,0,0)},function(t,n){t.setUTCDate(t.getUTCDate()+n)},function(t,n){return(n-t)/864e5},function(t){return t.getUTCDate()-1}),_x=vx.range,gx=Qu(0),yx=Qu(1),mx=Qu(2),xx=Qu(3),bx=Qu(4),wx=Qu(5),Mx=Qu(6),Tx=gx.range,Sx=yx.range,Nx=mx.range,kx=xx.range,Ex=bx.range,Ax=wx.range,Cx=Mx.range,zx=Gu(function(t){t.setUTCDate(1),t.setUTCHours(0,0,0,0)},function(t,n){t.setUTCMonth(t.getUTCMonth()+n)},function(t,n){return n.getUTCMonth()-t.getUTCMonth()+12*(n.getUTCFullYear()-t.getUTCFullYear())},function(t){return t.getUTCMonth()}),Px=zx.range,Lx=Gu(function(t){t.setUTCMonth(0,1),t.setUTCHours(0,0,0,0)},function(t,n){t.setUTCFullYear(t.getUTCFullYear()+n)},function(t,n){return n.getUTCFullYear()-t.getUTCFullYear()},function(t){return t.getUTCFullYear()});Lx.every=function(t){return isFinite(t=Math.floor(t))&&t>0?Gu(function(n){n.setUTCFullYear(Math.floor(n.getUTCFullYear()/t)*t),n.setUTCMonth(0,1),n.setUTCHours(0,0,0,0)},function(n,e){n.setUTCFullYear(n.getUTCFullYear()+e*t)}):null};var Rx,qx=Lx.range,Ux={"-":"",_:" ",0:"0"},Dx=/^\s*\d+/,Ox=/^%/,Fx=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;Ga({dateTime:"%x, %X",date:"%-m/%-d/%Y",time:"%-I:%M:%S %p",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});var Ix=Date.prototype.toISOString?Ja:t.utcFormat("%Y-%m-%dT%H:%M:%S.%LZ"),Yx=+new Date("2000-01-01T00:00:00.000Z")?Qa:t.utcParse("%Y-%m-%dT%H:%M:%S.%LZ"),Bx=1e3,jx=60*Bx,Hx=60*jx,Xx=24*Hx,Vx=7*Xx,$x=30*Xx,Wx=365*Xx,Zx=function(){return nc(sx,ax,$m,Xm,jm,Ym,Fm,qm,t.timeFormat).domain([new Date(2e3,0,1),new Date(2e3,0,2)])},Gx=function(){return nc(Lx,zx,gx,vx,px,lx,Fm,qm,t.utcFormat).domain([Date.UTC(2e3,0,1),Date.UTC(2e3,0,2)])},Jx=function(t){return t.match(/.{6}/g).map(function(t){return"#"+t})},Qx=Jx("1f77b4ff7f0e2ca02cd627289467bd8c564be377c27f7f7fbcbd2217becf"),Kx=Jx("393b795254a36b6ecf9c9ede6379398ca252b5cf6bcedb9c8c6d31bd9e39e7ba52e7cb94843c39ad494ad6616be7969c7b4173a55194ce6dbdde9ed6"),tb=Jx("3182bd6baed69ecae1c6dbefe6550dfd8d3cfdae6bfdd0a231a35474c476a1d99bc7e9c0756bb19e9ac8bcbddcdadaeb636363969696bdbdbdd9d9d9"),nb=Jx("1f77b4aec7e8ff7f0effbb782ca02c98df8ad62728ff98969467bdc5b0d58c564bc49c94e377c2f7b6d27f7f7fc7c7c7bcbd22dbdb8d17becf9edae5"),eb=Fh($t(300,.5,0),$t(-240,.5,1)),rb=Fh($t(-100,.75,.35),$t(80,1.5,.8)),ib=Fh($t(260,.75,.35),$t(80,1.5,.8)),ob=$t(),ub=function(t){(t<0||t>1)&&(t-=Math.floor(t));var n=Math.abs(t-.5);return ob.h=360*t-100,ob.s=1.5-1.5*n,ob.l=.8-.9*n,ob+""},ab=ec(Jx("44015444025645045745055946075a46085c460a5d460b5e470d60470e6147106347116447136548146748166848176948186a481a6c481b6d481c6e481d6f481f70482071482173482374482475482576482677482878482979472a7a472c7a472d7b472e7c472f7d46307e46327e46337f463480453581453781453882443983443a83443b84433d84433e85423f854240864241864142874144874045884046883f47883f48893e49893e4a893e4c8a3d4d8a3d4e8a3c4f8a3c508b3b518b3b528b3a538b3a548c39558c39568c38588c38598c375a8c375b8d365c8d365d8d355e8d355f8d34608d34618d33628d33638d32648e32658e31668e31678e31688e30698e306a8e2f6b8e2f6c8e2e6d8e2e6e8e2e6f8e2d708e2d718e2c718e2c728e2c738e2b748e2b758e2a768e2a778e2a788e29798e297a8e297b8e287c8e287d8e277e8e277f8e27808e26818e26828e26828e25838e25848e25858e24868e24878e23888e23898e238a8d228b8d228c8d228d8d218e8d218f8d21908d21918c20928c20928c20938c1f948c1f958b1f968b1f978b1f988b1f998a1f9a8a1e9b8a1e9c891e9d891f9e891f9f881fa0881fa1881fa1871fa28720a38620a48621a58521a68522a78522a88423a98324aa8325ab8225ac8226ad8127ad8128ae8029af7f2ab07f2cb17e2db27d2eb37c2fb47c31b57b32b67a34b67935b77937b87838b9773aba763bbb753dbc743fbc7340bd7242be7144bf7046c06f48c16e4ac16d4cc26c4ec36b50c46a52c56954c56856c66758c7655ac8645cc8635ec96260ca6063cb5f65cb5e67cc5c69cd5b6ccd5a6ece5870cf5773d05675d05477d1537ad1517cd2507fd34e81d34d84d44b86d54989d5488bd6468ed64590d74393d74195d84098d83e9bd93c9dd93ba0da39a2da37a5db36a8db34aadc32addc30b0dd2fb2dd2db5de2bb8de29bade28bddf26c0df25c2df23c5e021c8e020cae11fcde11dd0e11cd2e21bd5e21ad8e219dae319dde318dfe318e2e418e5e419e7e419eae51aece51befe51cf1e51df4e61ef6e620f8e621fbe723fde725")),cb=ec(Jx("00000401000501010601010802010902020b02020d03030f03031204041405041606051806051a07061c08071e0907200a08220b09240c09260d0a290e0b2b100b2d110c2f120d31130d34140e36150e38160f3b180f3d19103f1a10421c10441d11471e114920114b21114e22115024125325125527125829115a2a115c2c115f2d11612f116331116533106734106936106b38106c390f6e3b0f703d0f713f0f72400f74420f75440f764510774710784910784a10794c117a4e117b4f127b51127c52137c54137d56147d57157e59157e5a167e5c167f5d177f5f187f601880621980641a80651a80671b80681c816a1c816b1d816d1d816e1e81701f81721f817320817521817621817822817922827b23827c23827e24828025828125818326818426818627818827818928818b29818c29818e2a81902a81912b81932b80942c80962c80982d80992d809b2e7f9c2e7f9e2f7fa02f7fa1307ea3307ea5317ea6317da8327daa337dab337cad347cae347bb0357bb2357bb3367ab5367ab73779b83779ba3878bc3978bd3977bf3a77c03a76c23b75c43c75c53c74c73d73c83e73ca3e72cc3f71cd4071cf4070d0416fd2426fd3436ed5446dd6456cd8456cd9466bdb476adc4869de4968df4a68e04c67e24d66e34e65e44f64e55064e75263e85362e95462ea5661eb5760ec5860ed5a5fee5b5eef5d5ef05f5ef1605df2625df2645cf3655cf4675cf4695cf56b5cf66c5cf66e5cf7705cf7725cf8745cf8765cf9785df9795df97b5dfa7d5efa7f5efa815ffb835ffb8560fb8761fc8961fc8a62fc8c63fc8e64fc9065fd9266fd9467fd9668fd9869fd9a6afd9b6bfe9d6cfe9f6dfea16efea36ffea571fea772fea973feaa74feac76feae77feb078feb27afeb47bfeb67cfeb77efeb97ffebb81febd82febf84fec185fec287fec488fec68afec88cfeca8dfecc8ffecd90fecf92fed194fed395fed597fed799fed89afdda9cfddc9efddea0fde0a1fde2a3fde3a5fde5a7fde7a9fde9aafdebacfcecaefceeb0fcf0b2fcf2b4fcf4b6fcf6b8fcf7b9fcf9bbfcfbbdfcfdbf")),sb=ec(Jx("00000401000501010601010802010a02020c02020e03021004031204031405041706041907051b08051d09061f0a07220b07240c08260d08290e092b10092d110a30120a32140b34150b37160b39180c3c190c3e1b0c411c0c431e0c451f0c48210c4a230c4c240c4f260c51280b53290b552b0b572d0b592f0a5b310a5c320a5e340a5f3609613809623909633b09643d09653e0966400a67420a68440a68450a69470b6a490b6a4a0c6b4c0c6b4d0d6c4f0d6c510e6c520e6d540f6d550f6d57106e59106e5a116e5c126e5d126e5f136e61136e62146e64156e65156e67166e69166e6a176e6c186e6d186e6f196e71196e721a6e741a6e751b6e771c6d781c6d7a1d6d7c1d6d7d1e6d7f1e6c801f6c82206c84206b85216b87216b88226a8a226a8c23698d23698f24699025689225689326679526679727669827669a28659b29649d29649f2a63a02a63a22b62a32c61a52c60a62d60a82e5fa92e5eab2f5ead305dae305cb0315bb1325ab3325ab43359b63458b73557b93556ba3655bc3754bd3853bf3952c03a51c13a50c33b4fc43c4ec63d4dc73e4cc83f4bca404acb4149cc4248ce4347cf4446d04545d24644d34743d44842d54a41d74b3fd84c3ed94d3dda4e3cdb503bdd513ade5238df5337e05536e15635e25734e35933e45a31e55c30e65d2fe75e2ee8602de9612bea632aeb6429eb6628ec6726ed6925ee6a24ef6c23ef6e21f06f20f1711ff1731df2741cf3761bf37819f47918f57b17f57d15f67e14f68013f78212f78410f8850ff8870ef8890cf98b0bf98c0af98e09fa9008fa9207fa9407fb9606fb9706fb9906fb9b06fb9d07fc9f07fca108fca309fca50afca60cfca80dfcaa0ffcac11fcae12fcb014fcb216fcb418fbb61afbb81dfbba1ffbbc21fbbe23fac026fac228fac42afac62df9c72ff9c932f9cb35f8cd37f8cf3af7d13df7d340f6d543f6d746f5d949f5db4cf4dd4ff4df53f4e156f3e35af3e55df2e661f2e865f2ea69f1ec6df1ed71f1ef75f1f179f2f27df2f482f3f586f3f68af4f88ef5f992f6fa96f8fb9af9fc9dfafda1fcffa4")),fb=ec(Jx("0d088710078813078916078a19068c1b068d1d068e20068f2206902406912605912805922a05932c05942e05952f059631059733059735049837049938049a3a049a3c049b3e049c3f049c41049d43039e44039e46039f48039f4903a04b03a14c02a14e02a25002a25102a35302a35502a45601a45801a45901a55b01a55c01a65e01a66001a66100a76300a76400a76600a76700a86900a86a00a86c00a86e00a86f00a87100a87201a87401a87501a87701a87801a87a02a87b02a87d03a87e03a88004a88104a78305a78405a78606a68707a68808a68a09a58b0aa58d0ba58e0ca48f0da4910ea3920fa39410a29511a19613a19814a099159f9a169f9c179e9d189d9e199da01a9ca11b9ba21d9aa31e9aa51f99a62098a72197a82296aa2395ab2494ac2694ad2793ae2892b02991b12a90b22b8fb32c8eb42e8db52f8cb6308bb7318ab83289ba3388bb3488bc3587bd3786be3885bf3984c03a83c13b82c23c81c33d80c43e7fc5407ec6417dc7427cc8437bc9447aca457acb4679cc4778cc4977cd4a76ce4b75cf4c74d04d73d14e72d24f71d35171d45270d5536fd5546ed6556dd7566cd8576bd9586ada5a6ada5b69db5c68dc5d67dd5e66de5f65de6164df6263e06363e16462e26561e26660e3685fe4695ee56a5de56b5de66c5ce76e5be76f5ae87059e97158e97257ea7457eb7556eb7655ec7754ed7953ed7a52ee7b51ef7c51ef7e50f07f4ff0804ef1814df1834cf2844bf3854bf3874af48849f48948f58b47f58c46f68d45f68f44f79044f79143f79342f89441f89540f9973ff9983ef99a3efa9b3dfa9c3cfa9e3bfb9f3afba139fba238fca338fca537fca636fca835fca934fdab33fdac33fdae32fdaf31fdb130fdb22ffdb42ffdb52efeb72dfeb82cfeba2cfebb2bfebd2afebe2afec029fdc229fdc328fdc527fdc627fdc827fdca26fdcb26fccd25fcce25fcd025fcd225fbd324fbd524fbd724fad824fada24f9dc24f9dd25f8df25f8e125f7e225f7e425f6e626f6e826f5e926f5eb27f4ed27f3ee27f3f027f2f227f1f426f1f525f0f724f0f921")),lb=function(t){return function(){return t}},hb=Math.abs,pb=Math.atan2,db=Math.cos,vb=Math.max,_b=Math.min,gb=Math.sin,yb=Math.sqrt,mb=1e-12,xb=Math.PI,bb=xb/2,wb=2*xb,Mb=function(){function t(){var t,s,f=+n.apply(this,arguments),l=+e.apply(this,arguments),h=o.apply(this,arguments)-bb,p=u.apply(this,arguments)-bb,d=hb(p-h),v=p>h;if(c||(c=t=qe()),l<f&&(s=l,l=f,f=s),l>mb)if(d>wb-mb)c.moveTo(l*db(h),l*gb(h)),c.arc(0,0,l,h,p,!v),f>mb&&(c.moveTo(f*db(p),f*gb(p)),c.arc(0,0,f,p,h,v));else{var _,g,y=h,m=p,x=h,b=p,w=d,M=d,T=a.apply(this,arguments)/2,S=T>mb&&(i?+i.apply(this,arguments):yb(f*f+l*l)),N=_b(hb(l-f)/2,+r.apply(this,arguments)),k=N,E=N;if(S>mb){var A=oc(S/f*gb(T)),C=oc(S/l*gb(T));(w-=2*A)>mb?(A*=v?1:-1,x+=A,b-=A):(w=0,x=b=(h+p)/2),(M-=2*C)>mb?(C*=v?1:-1,y+=C,m-=C):(M=0,y=m=(h+p)/2)}var z=l*db(y),P=l*gb(y),L=f*db(b),R=f*gb(b);if(N>mb){var q=l*db(m),U=l*gb(m),D=f*db(x),O=f*gb(x);if(d<xb){var F=w>mb?lc(z,P,D,O,q,U,L,R):[L,R],I=z-F[0],Y=P-F[1],B=q-F[0],j=U-F[1],H=1/gb(ic((I*B+Y*j)/(yb(I*I+Y*Y)*yb(B*B+j*j)))/2),X=yb(F[0]*F[0]+F[1]*F[1]);k=_b(N,(f-X)/(H-1)),E=_b(N,(l-X)/(H+1))}}M>mb?E>mb?(_=hc(D,O,z,P,l,E,v),g=hc(q,U,L,R,l,E,v),c.moveTo(_.cx+_.x01,_.cy+_.y01),E<N?c.arc(_.cx,_.cy,E,pb(_.y01,_.x01),pb(g.y01,g.x01),!v):(c.arc(_.cx,_.cy,E,pb(_.y01,_.x01),pb(_.y11,_.x11),!v),c.arc(0,0,l,pb(_.cy+_.y11,_.cx+_.x11),pb(g.cy+g.y11,g.cx+g.x11),!v),c.arc(g.cx,g.cy,E,pb(g.y11,g.x11),pb(g.y01,g.x01),!v))):(c.moveTo(z,P),c.arc(0,0,l,y,m,!v)):c.moveTo(z,P),f>mb&&w>mb?k>mb?(_=hc(L,R,q,U,f,-k,v),g=hc(z,P,D,O,f,-k,v),c.lineTo(_.cx+_.x01,_.cy+_.y01),k<N?c.arc(_.cx,_.cy,k,pb(_.y01,_.x01),pb(g.y01,g.x01),!v):(c.arc(_.cx,_.cy,k,pb(_.y01,_.x01),pb(_.y11,_.x11),!v),c.arc(0,0,f,pb(_.cy+_.y11,_.cx+_.x11),pb(g.cy+g.y11,g.cx+g.x11),v),c.arc(g.cx,g.cy,k,pb(g.y11,g.x11),pb(g.y01,g.x01),!v))):c.arc(0,0,f,b,x,v):c.lineTo(L,R)}else c.moveTo(0,0);if(c.closePath(),t)return c=null,t+""||null}var n=uc,e=ac,r=lb(0),i=null,o=cc,u=sc,a=fc,c=null;return t.centroid=function(){var t=(+n.apply(this,arguments)+ +e.apply(this,arguments))/2,r=(+o.apply(this,arguments)+ +u.apply(this,arguments))/2-xb/2;return[db(r)*t,gb(r)*t]},t.innerRadius=function(e){return arguments.length?(n="function"==typeof e?e:lb(+e),t):n},t.outerRadius=function(n){return arguments.length?(e="function"==typeof n?n:lb(+n),t):e},t.cornerRadius=function(n){return arguments.length?(r="function"==typeof n?n:lb(+n),t):r},t.padRadius=function(n){return arguments.length?(i=null==n?null:"function"==typeof n?n:lb(+n),t):i},t.startAngle=function(n){return arguments.length?(o="function"==typeof n?n:lb(+n),t):o},t.endAngle=function(n){return arguments.length?(u="function"==typeof n?n:lb(+n),t):u},t.padAngle=function(n){return arguments.length?(a="function"==typeof n?n:lb(+n),t):a},t.context=function(n){return arguments.length?(c=null==n?null:n,t):c},t};pc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._point=0},lineEnd:function(){(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;default:this._context.lineTo(t,n)}}};var Tb=function(t){return new pc(t)},Sb=function(){function t(t){var a,c,s,f=t.length,l=!1;for(null==i&&(u=o(s=qe())),a=0;a<=f;++a)!(a<f&&r(c=t[a],a,t))===l&&((l=!l)?u.lineStart():u.lineEnd()),l&&u.point(+n(c,a,t),+e(c,a,t));if(s)return u=null,s+""||null}var n=dc,e=vc,r=lb(!0),i=null,o=Tb,u=null;return t.x=function(e){return arguments.length?(n="function"==typeof e?e:lb(+e),t):n},t.y=function(n){return arguments.length?(e="function"==typeof n?n:lb(+n),t):e},t.defined=function(n){return arguments.length?(r="function"==typeof n?n:lb(!!n),t):r},t.curve=function(n){return arguments.length?(o=n,null!=i&&(u=o(i)),t):o},t.context=function(n){return arguments.length?(null==n?i=u=null:u=o(i=n),t):i},t},Nb=function(){function t(t){var n,f,l,h,p,d=t.length,v=!1,_=new Array(d),g=new Array(d);for(null==a&&(s=c(p=qe())),n=0;n<=d;++n){if(!(n<d&&u(h=t[n],n,t))===v)if(v=!v)f=n,s.areaStart(),s.lineStart();else{for(s.lineEnd(),s.lineStart(),l=n-1;l>=f;--l)s.point(_[l],g[l]);s.lineEnd(),s.areaEnd()}v&&(_[n]=+e(h,n,t),g[n]=+i(h,n,t),s.point(r?+r(h,n,t):_[n],o?+o(h,n,t):g[n]))}if(p)return s=null,p+""||null}function n(){return Sb().defined(u).curve(c).context(a)}var e=dc,r=null,i=lb(0),o=vc,u=lb(!0),a=null,c=Tb,s=null;return t.x=function(n){return arguments.length?(e="function"==typeof n?n:lb(+n),r=null,t):e},t.x0=function(n){return arguments.length?(e="function"==typeof n?n:lb(+n),t):e},t.x1=function(n){return arguments.length?(r=null==n?null:"function"==typeof n?n:lb(+n),t):r},t.y=function(n){return arguments.length?(i="function"==typeof n?n:lb(+n),o=null,t):i},t.y0=function(n){return arguments.length?(i="function"==typeof n?n:lb(+n),t):i},t.y1=function(n){return arguments.length?(o=null==n?null:"function"==typeof n?n:lb(+n),t):o},t.lineX0=t.lineY0=function(){return n().x(e).y(i)},t.lineY1=function(){return n().x(e).y(o)},t.lineX1=function(){return n().x(r).y(i)},t.defined=function(n){return arguments.length?(u="function"==typeof n?n:lb(!!n),t):u},t.curve=function(n){return arguments.length?(c=n,null!=a&&(s=c(a)),t):c},t.context=function(n){return arguments.length?(null==n?a=s=null:s=c(a=n),t):a},t},kb=function(t,n){return n<t?-1:n>t?1:n>=t?0:NaN},Eb=function(t){return t},Ab=function(){function t(t){var a,c,s,f,l,h=t.length,p=0,d=new Array(h),v=new Array(h),_=+i.apply(this,arguments),g=Math.min(wb,Math.max(-wb,o.apply(this,arguments)-_)),y=Math.min(Math.abs(g)/h,u.apply(this,arguments)),m=y*(g<0?-1:1);for(a=0;a<h;++a)(l=v[d[a]=a]=+n(t[a],a,t))>0&&(p+=l);for(null!=e?d.sort(function(t,n){return e(v[t],v[n])}):null!=r&&d.sort(function(n,e){return r(t[n],t[e])}),a=0,s=p?(g-h*m)/p:0;a<h;++a,_=f)c=d[a],l=v[c],f=_+(l>0?l*s:0)+m,v[c]={data:t[c],index:a,value:l,startAngle:_,endAngle:f,padAngle:y};return v}var n=Eb,e=kb,r=null,i=lb(0),o=lb(wb),u=lb(0);return t.value=function(e){return arguments.length?(n="function"==typeof e?e:lb(+e),t):n},t.sortValues=function(n){return arguments.length?(e=n,r=null,t):e},t.sort=function(n){return arguments.length?(r=n,e=null,t):r},t.startAngle=function(n){return arguments.length?(i="function"==typeof n?n:lb(+n),t):i},t.endAngle=function(n){return arguments.length?(o="function"==typeof n?n:lb(+n),t):o},t.padAngle=function(n){return arguments.length?(u="function"==typeof n?n:lb(+n),t):u},t},Cb=gc(Tb);_c.prototype={areaStart:function(){this._curve.areaStart()},areaEnd:function(){this._curve.areaEnd()},lineStart:function(){this._curve.lineStart()},lineEnd:function(){this._curve.lineEnd()},point:function(t,n){this._curve.point(n*Math.sin(t),n*-Math.cos(t))}};var zb=function(){return yc(Sb().curve(Cb))},Pb=function(){var t=Nb().curve(Cb),n=t.curve,e=t.lineX0,r=t.lineX1,i=t.lineY0,o=t.lineY1;return t.angle=t.x,delete t.x,t.startAngle=t.x0,delete t.x0,t.endAngle=t.x1,delete t.x1,t.radius=t.y,delete t.y,t.innerRadius=t.y0,delete t.y0,t.outerRadius=t.y1,delete t.y1,t.lineStartAngle=function(){return yc(e())},delete t.lineX0,t.lineEndAngle=function(){return yc(r())},delete t.lineX1,t.lineInnerRadius=function(){return yc(i())},delete t.lineY0,t.lineOuterRadius=function(){return yc(o())},delete t.lineY1,t.curve=function(t){return arguments.length?n(gc(t)):n()._curve},t},Lb={draw:function(t,n){var e=Math.sqrt(n/xb);t.moveTo(e,0),t.arc(0,0,e,0,wb)}},Rb={draw:function(t,n){var e=Math.sqrt(n/5)/2;t.moveTo(-3*e,-e),t.lineTo(-e,-e),t.lineTo(-e,-3*e),t.lineTo(e,-3*e),t.lineTo(e,-e),t.lineTo(3*e,-e),t.lineTo(3*e,e),t.lineTo(e,e),t.lineTo(e,3*e),t.lineTo(-e,3*e),t.lineTo(-e,e),t.lineTo(-3*e,e),t.closePath()}},qb=Math.sqrt(1/3),Ub=2*qb,Db={draw:function(t,n){var e=Math.sqrt(n/Ub),r=e*qb;t.moveTo(0,-e),t.lineTo(r,0),t.lineTo(0,e),t.lineTo(-r,0),t.closePath()}},Ob=Math.sin(xb/10)/Math.sin(7*xb/10),Fb=Math.sin(wb/10)*Ob,Ib=-Math.cos(wb/10)*Ob,Yb={draw:function(t,n){var e=Math.sqrt(.8908130915292852*n),r=Fb*e,i=Ib*e;t.moveTo(0,-e),t.lineTo(r,i);for(var o=1;o<5;++o){var u=wb*o/5,a=Math.cos(u),c=Math.sin(u);t.lineTo(c*e,-a*e),t.lineTo(a*r-c*i,c*r+a*i)}t.closePath()}},Bb={draw:function(t,n){var e=Math.sqrt(n),r=-e/2;t.rect(r,r,e,e)}},jb=Math.sqrt(3),Hb={draw:function(t,n){var e=-Math.sqrt(n/(3*jb));t.moveTo(0,2*e),t.lineTo(-jb*e,-e),t.lineTo(jb*e,-e),t.closePath()}},Xb=-.5,Vb=Math.sqrt(3)/2,$b=1/Math.sqrt(12),Wb=3*($b/2+1),Zb={draw:function(t,n){var e=Math.sqrt(n/Wb),r=e/2,i=e*$b,o=r,u=e*$b+e,a=-o,c=u;t.moveTo(r,i),t.lineTo(o,u),t.lineTo(a,c),t.lineTo(Xb*r-Vb*i,Vb*r+Xb*i),t.lineTo(Xb*o-Vb*u,Vb*o+Xb*u),t.lineTo(Xb*a-Vb*c,Vb*a+Xb*c),t.lineTo(Xb*r+Vb*i,Xb*i-Vb*r),t.lineTo(Xb*o+Vb*u,Xb*u-Vb*o),t.lineTo(Xb*a+Vb*c,Xb*c-Vb*a),t.closePath()}},Gb=[Lb,Rb,Db,Bb,Yb,Hb,Zb],Jb=function(){function t(){var t;if(r||(r=t=qe()),n.apply(this,arguments).draw(r,+e.apply(this,arguments)),t)return r=null,t+""||null}var n=lb(Lb),e=lb(64),r=null;return t.type=function(e){return arguments.length?(n="function"==typeof e?e:lb(e),t):n},t.size=function(n){return arguments.length?(e="function"==typeof n?n:lb(+n),t):e},t.context=function(n){return arguments.length?(r=null==n?null:n,t):r},t},Qb=function(){};xc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=NaN,this._point=0},lineEnd:function(){switch(this._point){case 3:mc(this,this._x1,this._y1);case 2:this._context.lineTo(this._x1,this._y1)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;break;case 2:this._point=3,this._context.lineTo((5*this._x0+this._x1)/6,(5*this._y0+this._y1)/6);default:mc(this,t,n)}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=n}};var Kb=function(t){return new xc(t)};bc.prototype={areaStart:Qb,areaEnd:Qb,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._y0=this._y1=this._y2=this._y3=this._y4=NaN,this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x2,this._y2),this._context.closePath();break;case 2:this._context.moveTo((this._x2+2*this._x3)/3,(this._y2+2*this._y3)/3),this._context.lineTo((this._x3+2*this._x2)/3,(this._y3+2*this._y2)/3),this._context.closePath();break;case 3:this.point(this._x2,this._y2),this.point(this._x3,this._y3),this.point(this._x4,this._y4)}},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._x2=t,this._y2=n;break;case 1:this._point=2,this._x3=t,this._y3=n;break;case 2:this._point=3,this._x4=t,this._y4=n,this._context.moveTo((this._x0+4*this._x1+t)/6,(this._y0+4*this._y1+n)/6);break;default:mc(this,t,n)}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=n}};var tw=function(t){return new bc(t)};wc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=NaN,this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3;var e=(this._x0+4*this._x1+t)/6,r=(this._y0+4*this._y1+n)/6;this._line?this._context.lineTo(e,r):this._context.moveTo(e,r);break;case 3:this._point=4;default:mc(this,t,n)}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=n}};var nw=function(t){return new wc(t)};Mc.prototype={lineStart:function(){this._x=[],this._y=[],this._basis.lineStart()},lineEnd:function(){var t=this._x,n=this._y,e=t.length-1;if(e>0)for(var r,i=t[0],o=n[0],u=t[e]-i,a=n[e]-o,c=-1;++c<=e;)r=c/e,this._basis.point(this._beta*t[c]+(1-this._beta)*(i+r*u),this._beta*n[c]+(1-this._beta)*(o+r*a));this._x=this._y=null,this._basis.lineEnd()},point:function(t,n){this._x.push(+t),this._y.push(+n)}};var ew=function t(n){function e(t){return 1===n?new xc(t):new Mc(t,n)}return e.beta=function(n){return t(+n)},e}(.85);Sc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x2,this._y2);break;case 3:Tc(this,this._x1,this._y1)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2,this._x1=t,this._y1=n;break;case 2:this._point=3;default:Tc(this,t,n)}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var rw=function t(n){function e(t){return new Sc(t,n)}return e.tension=function(n){return t(+n)},e}(0);Nc.prototype={areaStart:Qb,areaEnd:Qb,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN,this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x3,this._y3),this._context.closePath();break;case 2:this._context.lineTo(this._x3,this._y3),this._context.closePath();break;case 3:this.point(this._x3,this._y3),this.point(this._x4,this._y4),this.point(this._x5,this._y5)}},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._x3=t,this._y3=n;break;case 1:this._point=2,this._context.moveTo(this._x4=t,this._y4=n);break;case 2:this._point=3,this._x5=t,this._y5=n;break;default:Tc(this,t,n)}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var iw=function t(n){function e(t){return new Nc(t,n)}return e.tension=function(n){return t(+n)},e}(0);kc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3,this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2);break;case 3:this._point=4;default:Tc(this,t,n)}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var ow=function t(n){function e(t){return new kc(t,n)}return e.tension=function(n){return t(+n)},e}(0);Ac.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,
-this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x2,this._y2);break;case 3:this.point(this._x2,this._y2)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){if(t=+t,n=+n,this._point){var e=this._x2-t,r=this._y2-n;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(e*e+r*r,this._alpha))}switch(this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;break;case 2:this._point=3;default:Ec(this,t,n)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var uw=function t(n){function e(t){return n?new Ac(t,n):new Sc(t,0)}return e.alpha=function(n){return t(+n)},e}(.5);Cc.prototype={areaStart:Qb,areaEnd:Qb,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x3,this._y3),this._context.closePath();break;case 2:this._context.lineTo(this._x3,this._y3),this._context.closePath();break;case 3:this.point(this._x3,this._y3),this.point(this._x4,this._y4),this.point(this._x5,this._y5)}},point:function(t,n){if(t=+t,n=+n,this._point){var e=this._x2-t,r=this._y2-n;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(e*e+r*r,this._alpha))}switch(this._point){case 0:this._point=1,this._x3=t,this._y3=n;break;case 1:this._point=2,this._context.moveTo(this._x4=t,this._y4=n);break;case 2:this._point=3,this._x5=t,this._y5=n;break;default:Ec(this,t,n)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var aw=function t(n){function e(t){return n?new Cc(t,n):new Nc(t,0)}return e.alpha=function(n){return t(+n)},e}(.5);zc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){if(t=+t,n=+n,this._point){var e=this._x2-t,r=this._y2-n;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(e*e+r*r,this._alpha))}switch(this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3,this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2);break;case 3:this._point=4;default:Ec(this,t,n)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=n}};var cw=function t(n){function e(t){return n?new zc(t,n):new kc(t,0)}return e.alpha=function(n){return t(+n)},e}(.5);Pc.prototype={areaStart:Qb,areaEnd:Qb,lineStart:function(){this._point=0},lineEnd:function(){this._point&&this._context.closePath()},point:function(t,n){t=+t,n=+n,this._point?this._context.lineTo(t,n):(this._point=1,this._context.moveTo(t,n))}};var sw=function(t){return new Pc(t)};Dc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=this._t0=NaN,this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x1,this._y1);break;case 3:Uc(this,this._t0,qc(this,this._t0))}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,n){var e=NaN;if(t=+t,n=+n,t!==this._x1||n!==this._y1){switch(this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;break;case 2:this._point=3,Uc(this,qc(this,e=Rc(this,t,n)),e);break;default:Uc(this,this._t0,e=Rc(this,t,n))}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=n,this._t0=e}}},(Oc.prototype=Object.create(Dc.prototype)).point=function(t,n){Dc.prototype.point.call(this,n,t)},Fc.prototype={moveTo:function(t,n){this._context.moveTo(n,t)},closePath:function(){this._context.closePath()},lineTo:function(t,n){this._context.lineTo(n,t)},bezierCurveTo:function(t,n,e,r,i,o){this._context.bezierCurveTo(n,t,r,e,o,i)}},Bc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x=[],this._y=[]},lineEnd:function(){var t=this._x,n=this._y,e=t.length;if(e)if(this._line?this._context.lineTo(t[0],n[0]):this._context.moveTo(t[0],n[0]),2===e)this._context.lineTo(t[1],n[1]);else for(var r=jc(t),i=jc(n),o=0,u=1;u<e;++o,++u)this._context.bezierCurveTo(r[0][o],i[0][o],r[1][o],i[1][o],t[u],n[u]);(this._line||0!==this._line&&1===e)&&this._context.closePath(),this._line=1-this._line,this._x=this._y=null},point:function(t,n){this._x.push(+t),this._y.push(+n)}};var fw=function(t){return new Bc(t)};Hc.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x=this._y=NaN,this._point=0},lineEnd:function(){0<this._t&&this._t<1&&2===this._point&&this._context.lineTo(this._x,this._y),(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line>=0&&(this._t=1-this._t,this._line=1-this._line)},point:function(t,n){switch(t=+t,n=+n,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;default:if(this._t<=0)this._context.lineTo(this._x,n),this._context.lineTo(t,n);else{var e=this._x*(1-this._t)+t*this._t;this._context.lineTo(e,this._y),this._context.lineTo(e,n)}}this._x=t,this._y=n}};var lw=function(t){return new Hc(t,.5)},hw=Array.prototype.slice,pw=function(t,n){if((r=t.length)>1)for(var e,r,i=1,o=t[n[0]],u=o.length;i<r;++i){e=o,o=t[n[i]];for(var a=0;a<u;++a)o[a][1]+=o[a][0]=isNaN(e[a][1])?e[a][0]:e[a][1]}},dw=function(t){for(var n=t.length,e=new Array(n);--n>=0;)e[n]=n;return e},vw=function(){function t(t){var o,u,a=n.apply(this,arguments),c=t.length,s=a.length,f=new Array(s);for(o=0;o<s;++o){for(var l,h=a[o],p=f[o]=new Array(c),d=0;d<c;++d)p[d]=l=[0,+i(t[d],h,d,t)],l.data=t[d];p.key=h}for(o=0,u=e(f);o<s;++o)f[u[o]].index=o;return r(f,u),f}var n=lb([]),e=dw,r=pw,i=$c;return t.keys=function(e){return arguments.length?(n="function"==typeof e?e:lb(hw.call(e)),t):n},t.value=function(n){return arguments.length?(i="function"==typeof n?n:lb(+n),t):i},t.order=function(n){return arguments.length?(e=null==n?dw:"function"==typeof n?n:lb(hw.call(n)),t):e},t.offset=function(n){return arguments.length?(r=null==n?pw:n,t):r},t},_w=function(t,n){if((r=t.length)>0){for(var e,r,i,o=0,u=t[0].length;o<u;++o){for(i=e=0;e<r;++e)i+=t[e][o][1]||0;if(i)for(e=0;e<r;++e)t[e][o][1]/=i}pw(t,n)}},gw=function(t,n){if((e=t.length)>0){for(var e,r=0,i=t[n[0]],o=i.length;r<o;++r){for(var u=0,a=0;u<e;++u)a+=t[u][r][1]||0;i[r][1]+=i[r][0]=-a/2}pw(t,n)}},yw=function(t,n){if((i=t.length)>0&&(r=(e=t[n[0]]).length)>0){for(var e,r,i,o=0,u=1;u<r;++u){for(var a=0,c=0,s=0;a<i;++a){for(var f=t[n[a]],l=f[u][1]||0,h=f[u-1][1]||0,p=(l-h)/2,d=0;d<a;++d){var v=t[n[d]];p+=(v[u][1]||0)-(v[u-1][1]||0)}c+=l,s+=p*l}e[u-1][1]+=e[u-1][0]=o,c&&(o-=s/c)}e[u-1][1]+=e[u-1][0]=o,pw(t,n)}},mw=function(t){var n=t.map(Wc);return dw(t).sort(function(t,e){return n[t]-n[e]})},xw=function(t){return mw(t).reverse()},bw=function(t){var n,e,r=t.length,i=t.map(Wc),o=dw(t).sort(function(t,n){return i[n]-i[t]}),u=0,a=0,c=[],s=[];for(n=0;n<r;++n)e=o[n],u<a?(u+=i[e],c.push(e)):(a+=i[e],s.push(e));return s.reverse().concat(c)},ww=function(t){return dw(t).reverse()},Mw=function(t){return function(){return t}};Jc.prototype={constructor:Jc,insert:function(t,n){var e,r,i;if(t){if(n.P=t,n.N=t.N,t.N&&(t.N.P=n),t.N=n,t.R){for(t=t.R;t.L;)t=t.L;t.L=n}else t.R=n;e=t}else this._?(t=ns(this._),n.P=null,n.N=t,t.P=t.L=n,e=t):(n.P=n.N=null,this._=n,e=null);for(n.L=n.R=null,n.U=e,n.C=!0,t=n;e&&e.C;)r=e.U,e===r.L?(i=r.R,i&&i.C?(e.C=i.C=!1,r.C=!0,t=r):(t===e.R&&(Kc(this,e),t=e,e=t.U),e.C=!1,r.C=!0,ts(this,r))):(i=r.L,i&&i.C?(e.C=i.C=!1,r.C=!0,t=r):(t===e.L&&(ts(this,e),t=e,e=t.U),e.C=!1,r.C=!0,Kc(this,r))),e=t.U;this._.C=!1},remove:function(t){t.N&&(t.N.P=t.P),t.P&&(t.P.N=t.N),t.N=t.P=null;var n,e,r,i=t.U,o=t.L,u=t.R;if(e=o?u?ns(u):o:u,i?i.L===t?i.L=e:i.R=e:this._=e,o&&u?(r=e.C,e.C=t.C,e.L=o,o.U=e,e!==u?(i=e.U,e.U=t.U,t=e.R,i.L=t,e.R=u,u.U=e):(e.U=i,i=e,t=e.R)):(r=t.C,t=e),t&&(t.U=i),!r){if(t&&t.C)return void(t.C=!1);do{if(t===this._)break;if(t===i.L){if(n=i.R,n.C&&(n.C=!1,i.C=!0,Kc(this,i),n=i.R),n.L&&n.L.C||n.R&&n.R.C){n.R&&n.R.C||(n.L.C=!1,n.C=!0,ts(this,n),n=i.R),n.C=i.C,i.C=n.R.C=!1,Kc(this,i),t=this._;break}}else if(n=i.L,n.C&&(n.C=!1,i.C=!0,ts(this,i),n=i.L),n.L&&n.L.C||n.R&&n.R.C){n.L&&n.L.C||(n.R.C=!1,n.C=!0,Kc(this,n),n=i.L),n.C=i.C,i.C=n.L.C=!1,ts(this,i),t=this._;break}n.C=!0,t=i,i=i.U}while(!t.C);t&&(t.C=!1)}}};var Tw,Sw,Nw,kw,Ew,Aw=[],Cw=[],zw=1e-6,Pw=1e-12;Ns.prototype={constructor:Ns,polygons:function(){var t=this.edges;return this.cells.map(function(n){var e=n.halfedges.map(function(e){return fs(n,t[e])});return e.data=n.site.data,e})},triangles:function(){var t=[],n=this.edges;return this.cells.forEach(function(e,r){if(o=(i=e.halfedges).length)for(var i,o,u,a=e.site,c=-1,s=n[i[o-1]],f=s.left===a?s.right:s.left;++c<o;)u=f,s=n[i[c]],f=s.left===a?s.right:s.left,u&&f&&r<u.index&&r<f.index&&Ts(a,u,f)<0&&t.push([a.data,u.data,f.data])}),t},links:function(){return this.edges.filter(function(t){return t.right}).map(function(t){return{source:t.left.data,target:t.right.data}})},find:function(t,n,e){for(var r,i,o=this,u=o._found||0,a=o.cells.length;!(i=o.cells[u]);)if(++u>=a)return null;var c=t-i.site[0],s=n-i.site[1],f=c*c+s*s;do{i=o.cells[r=u],u=null,i.halfedges.forEach(function(e){var r=o.edges[e],a=r.left;if(a!==i.site&&a||(a=r.right)){var c=t-a[0],s=n-a[1],l=c*c+s*s;l<f&&(f=l,u=a.index)}})}while(null!==u);return o._found=r,null==e||f<=e*e?i.site:null}};var Lw=function(){function t(t){return new Ns(t.map(function(r,i){var o=[Math.round(n(r,i,t)/zw)*zw,Math.round(e(r,i,t)/zw)*zw];return o.index=i,o.data=r,o}),r)}var n=Zc,e=Gc,r=null;return t.polygons=function(n){return t(n).polygons()},t.links=function(n){return t(n).links()},t.triangles=function(n){return t(n).triangles()},t.x=function(e){return arguments.length?(n="function"==typeof e?e:Mw(+e),t):n},t.y=function(n){return arguments.length?(e="function"==typeof n?n:Mw(+n),t):e},t.extent=function(n){return arguments.length?(r=null==n?null:[[+n[0][0],+n[0][1]],[+n[1][0],+n[1][1]]],t):r&&[[r[0][0],r[0][1]],[r[1][0],r[1][1]]]},t.size=function(n){return arguments.length?(r=null==n?null:[[0,0],[+n[0],+n[1]]],t):r&&[r[1][0]-r[0][0],r[1][1]-r[0][1]]},t},Rw=function(t){return function(){return t}};Es.prototype={constructor:Es,scale:function(t){return 1===t?this:new Es(this.k*t,this.x,this.y)},translate:function(t,n){return 0===t&0===n?this:new Es(this.k,this.x+this.k*t,this.y+this.k*n)},apply:function(t){return[t[0]*this.k+this.x,t[1]*this.k+this.y]},applyX:function(t){return t*this.k+this.x},applyY:function(t){return t*this.k+this.y},invert:function(t){return[(t[0]-this.x)/this.k,(t[1]-this.y)/this.k]},invertX:function(t){return(t-this.x)/this.k},invertY:function(t){return(t-this.y)/this.k},rescaleX:function(t){return t.copy().domain(t.range().map(this.invertX,this).map(t.invert,t))},rescaleY:function(t){return t.copy().domain(t.range().map(this.invertY,this).map(t.invert,t))},toString:function(){return"translate("+this.x+","+this.y+") scale("+this.k+")"}};var qw=new Es(1,0,0);As.prototype=Es.prototype;var Uw=function(){t.event.preventDefault(),t.event.stopImmediatePropagation()},Dw=function(){function n(t){}function e(t,n){return n=Math.max(x,Math.min(b,n)),n===t.k?t:new Es(n,t.x,t.y)}function r(t,n,e){var r=n[0]-e[0]*t.k,i=n[1]-e[1]*t.k;return r===t.x&&i===t.y?t:new Es(t.k,r,i)}function i(t,n){var e=t.invertX(n[0][0])-w,r=t.invertX(n[1][0])-M,i=t.invertY(n[0][1])-T,o=t.invertY(n[1][1])-S;return t.translate(r>e?(e+r)/2:Math.min(0,e)||Math.max(0,r),o>i?(i+o)/2:Math.min(0,i)||Math.max(0,o))}function o(t){return[(+t[0][0]+ +t[1][0])/2,(+t[0][1]+ +t[1][1])/2]}function u(t,n,e){t.on("start.zoom",function(){a(this,arguments).start()}).on("interrupt.zoom end.zoom",function(){a(this,arguments).end()}).tween("zoom",function(){var t=this,r=arguments,i=a(t,r),u=m.apply(t,r),c=e||o(u),s=Math.max(u[1][0]-u[0][0],u[1][1]-u[0][1]),f=t.__zoom,l="function"==typeof n?n.apply(t,r):n,h=k(f.invert(c).concat(s/f.k),l.invert(c).concat(s/l.k));return function(t){if(1===t)t=l;else{var n=h(t),e=s/n[2];t=new Es(e,c[0]-n[0]*e,c[1]-n[1]*e)}i.zoom(null,t)}})}function a(t,n){for(var e,r=0,i=E.length;r<i;++r)if((e=E[r]).that===t)return e;return new c(t,n)}function c(t,n){this.that=t,this.args=n,this.index=-1,this.active=0,this.extent=m.apply(t,n)}function s(){function n(){o.wheel=null,o.end()}if(y.apply(this,arguments)){var o=a(this,arguments),u=this.__zoom,c=Math.max(x,Math.min(b,u.k*Math.pow(2,-t.event.deltaY*(t.event.deltaMode?120:1)/500))),s=If(this);if(o.wheel)o.mouse[0][0]===s[0]&&o.mouse[0][1]===s[1]||(o.mouse[1]=u.invert(o.mouse[0]=s)),clearTimeout(o.wheel);else{if(u.k===c)return;o.mouse=[s,u.invert(s)],cp(this),o.start()}Uw(),o.wheel=setTimeout(n,P),o.zoom("mouse",i(r(e(u,c),o.mouse[0],o.mouse[1]),o.extent))}}function f(){function n(){Uw(),o.moved=!0,o.zoom("mouse",i(r(o.that.__zoom,o.mouse[0]=If(o.that),o.mouse[1]),o.extent))}function e(){u.on("mousemove.zoom mouseup.zoom",null),yt(t.event.view,o.moved),Uw(),o.end()}if(!g&&y.apply(this,arguments)){var o=a(this,arguments),u=wl(t.event.view).on("mousemove.zoom",n,!0).on("mouseup.zoom",e,!0),c=If(this);kl(t.event.view),Cs(),o.mouse=[c,this.__zoom.invert(c)],cp(this),o.start()}}function l(){if(y.apply(this,arguments)){var o=this.__zoom,a=If(this),c=o.invert(a),s=o.k*(t.event.shiftKey?.5:2),f=i(r(e(o,s),a,c),m.apply(this,arguments));Uw(),N>0?wl(this).transition().duration(N).call(u,f,a):wl(this).call(n.transform,f)}}function h(){if(y.apply(this,arguments)){var n,e,r,i,o=a(this,arguments),u=t.event.changedTouches,c=u.length;for(Cs(),e=0;e<c;++e)r=u[e],i=Tl(this,u,r.identifier),i=[i,this.__zoom.invert(i),r.identifier],o.touch0?o.touch1||(o.touch1=i):(o.touch0=i,n=!0);if(_&&(_=clearTimeout(_),!o.touch1))return o.end(),void((i=wl(this).on("dblclick.zoom"))&&i.apply(this,arguments));n&&(_=setTimeout(function(){_=null},z),cp(this),o.start())}}function p(){var n,o,u,c,s=a(this,arguments),f=t.event.changedTouches,l=f.length;for(Uw(),_&&(_=clearTimeout(_)),n=0;n<l;++n)o=f[n],u=Tl(this,f,o.identifier),s.touch0&&s.touch0[2]===o.identifier?s.touch0[0]=u:s.touch1&&s.touch1[2]===o.identifier&&(s.touch1[0]=u);if(o=s.that.__zoom,s.touch1){var h=s.touch0[0],p=s.touch0[1],d=s.touch1[0],v=s.touch1[1],g=(g=d[0]-h[0])*g+(g=d[1]-h[1])*g,y=(y=v[0]-p[0])*y+(y=v[1]-p[1])*y;o=e(o,Math.sqrt(g/y)),u=[(h[0]+d[0])/2,(h[1]+d[1])/2],c=[(p[0]+v[0])/2,(p[1]+v[1])/2]}else{if(!s.touch0)return;u=s.touch0[0],c=s.touch0[1]}s.zoom("touch",i(r(o,u,c),s.extent))}function d(){var n,e,r=a(this,arguments),i=t.event.changedTouches,o=i.length;for(Cs(),g&&clearTimeout(g),g=setTimeout(function(){g=null},z),n=0;n<o;++n)e=i[n],r.touch0&&r.touch0[2]===e.identifier?delete r.touch0:r.touch1&&r.touch1[2]===e.identifier&&delete r.touch1;r.touch1&&!r.touch0&&(r.touch0=r.touch1,delete r.touch1),r.touch0?r.touch0[1]=this.__zoom.invert(r.touch0[0]):r.end()}var _,g,y=zs,m=Ps,x=0,b=1/0,w=-b,M=b,T=w,S=M,N=250,k=Lh,E=[],C=v("start","zoom","end"),z=500,P=150;return n.transform=function(t,n){var e=t.selection?t.selection():t;e.property("__zoom",Ls),t!==e?u(t,n):e.interrupt().each(function(){a(this,arguments).start().zoom(null,"function"==typeof n?n.apply(this,arguments):n).end()})},n.scaleBy=function(t,e){n.scaleTo(t,function(){return this.__zoom.k*("function"==typeof e?e.apply(this,arguments):e)})},n.scaleTo=function(t,u){n.transform(t,function(){var t=m.apply(this,arguments),n=this.__zoom,a=o(t),c=n.invert(a);return i(r(e(n,"function"==typeof u?u.apply(this,arguments):u),a,c),t)})},n.translateBy=function(t,e,r){n.transform(t,function(){return i(this.__zoom.translate("function"==typeof e?e.apply(this,arguments):e,"function"==typeof r?r.apply(this,arguments):r),m.apply(this,arguments))})},c.prototype={start:function(){return 1==++this.active&&(this.index=E.push(this)-1,this.emit("start")),this},zoom:function(t,n){return this.mouse&&"mouse"!==t&&(this.mouse[1]=n.invert(this.mouse[0])),this.touch0&&"touch"!==t&&(this.touch0[1]=n.invert(this.touch0[0])),this.touch1&&"touch"!==t&&(this.touch1[1]=n.invert(this.touch1[0])),this.that.__zoom=n,this.emit("zoom"),this},end:function(){return 0==--this.active&&(E.splice(this.index,1),this.index=-1,this.emit("end")),this},emit:function(t){A(new ks(n,t,this.that.__zoom),C.apply,C,[t,this.that,this.args])}},n.filter=function(t){return arguments.length?(y="function"==typeof t?t:Rw(!!t),n):y},n.extent=function(t){return arguments.length?(m="function"==typeof t?t:Rw([[+t[0][0],+t[0][1]],[+t[1][0],+t[1][1]]]),n):m},n.scaleExtent=function(t){return arguments.length?(x=+t[0],b=+t[1],n):[x,b]},n.translateExtent=function(t){return arguments.length?(w=+t[0][0],M=+t[1][0],T=+t[0][1],S=+t[1][1],n):[[w,T],[M,S]]},n.duration=function(t){return arguments.length?(N=+t,n):N},n.interpolate=function(t){return arguments.length?(k=t,n):k},n.on=function(){var t=C.on.apply(C,arguments);return t===C?n:t},n};t.version="4.8.0",t.bisect=Ds,t.bisectRight=Ds,t.bisectLeft=Os,t.ascending=Rs,t.bisector=qs,t.cross=Is,t.descending=Ys,t.deviation=Hs,t.extent=Xs,t.histogram=rf,t.thresholdFreedmanDiaconis=uf,t.thresholdScott=af,t.thresholdSturges=ef,t.max=cf,t.mean=sf,t.median=ff,t.merge=lf,t.min=hf,t.pairs=Fs,t.permute=pf,t.quantile=of,t.range=Js,t.scan=df,t.shuffle=vf,t.sum=_f,t.ticks=nf,t.tickIncrement=r,t.tickStep=i,t.transpose=gf,t.variance=js,t.zip=yf,t.axisTop=l,t.axisRight=h,t.axisBottom=p,t.axisLeft=d,t.brush=yd,t.brushX=Ce,t.brushY=ze,t.brushSelection=Ae,t.chord=Sd,t.ribbon=zd,t.nest=Pd,t.set=We,t.map=Be,t.keys=Rd,t.values=qd,t.entries=Ud,t.color=St,t.rgb=At,t.hsl=Lt,t.lab=Dt,t.hcl=Ht,t.cubehelix=$t,t.dispatch=v,t.drag=Al,t.dragDisable=kl,t.dragEnable=yt,t.dsvFormat=Dd,t.csvParse=Fd,t.csvParseRows=Id,t.csvFormat=Yd,t.csvFormatRows=Bd,t.tsvParse=Hd,t.tsvParseRows=Xd,t.tsvFormat=Vd,t.tsvFormatRows=$d,t.easeLinear=re,t.easeQuad=ue,t.easeQuadIn=ie,t.easeQuadOut=oe,t.easeQuadInOut=ue,t.easeCubic=se,t.easeCubicIn=ae,t.easeCubicOut=ce,t.easeCubicInOut=se,t.easePoly=Lp,t.easePolyIn=zp,t.easePolyOut=Pp,t.easePolyInOut=Lp,t.easeSin=he,t.easeSinIn=fe,t.easeSinOut=le,t.easeSinInOut=he,t.easeExp=ve,t.easeExpIn=pe,t.easeExpOut=de,t.easeExpInOut=ve,t.easeCircle=ye,t.easeCircleIn=_e,t.easeCircleOut=ge,t.easeCircleInOut=ye,t.easeBounce=xe,t.easeBounceIn=me,t.easeBounceOut=xe,t.easeBounceInOut=be,t.easeBack=Wp,t.easeBackIn=Vp,t.easeBackOut=$p,t.easeBackInOut=Wp,t.easeElastic=Jp,t.easeElasticIn=Gp,t.easeElasticOut=Jp,t.easeElasticInOut=Qp,t.forceCenter=Wd,t.forceCollide=hv,t.forceLink=pv,t.forceManyBody=gv,t.forceSimulation=_v,t.forceX=yv,t.forceY=mv,t.formatDefaultLocale=dr,t.formatLocale=Pv,t.formatSpecifier=hr,t.precisionFixed=Lv,t.precisionPrefix=Rv,t.precisionRound=qv,t.geoArea=I_,t.geoBounds=j_,t.geoCentroid=X_,t.geoCircle=ug,t.geoClipExtent=pg,t.geoContains=Tg,t.geoDistance=bg,t.geoGraticule=Mi,t.geoGraticule10=Ti,t.geoInterpolate=Sg,t.geoLength=yg,t.geoPath=Qg,t.geoAlbers=cy,t.geoAlbersUsa=sy,t.geoAzimuthalEqualArea=ly,t.geoAzimuthalEqualAreaRaw=fy,t.geoAzimuthalEquidistant=py,t.geoAzimuthalEquidistantRaw=hy,t.geoConicConformal=vy,t.geoConicConformalRaw=ho,t.geoConicEqualArea=ay,t.geoConicEqualAreaRaw=oo,t.geoConicEquidistant=gy,t.geoConicEquidistantRaw=vo,t.geoEquirectangular=_y,t.geoEquirectangularRaw=po,t.geoGnomonic=yy,t.geoGnomonicRaw=_o,t.geoIdentity=my,t.geoProjection=no,t.geoProjectionMutator=eo,t.geoMercator=dy,t.geoMercatorRaw=so,t.geoOrthographic=xy,t.geoOrthographicRaw=yo,t.geoStereographic=by,t.geoStereographicRaw=mo,t.geoTransverseMercator=wy,t.geoTransverseMercatorRaw=xo,t.geoRotation=og,t.geoStream=U_,t.geoTransform=ey,t.cluster=My,t.hierarchy=Co,t.pack=Fy,t.packSiblings=Dy,t.packEnclose=Uy,t.partition=By,t.stratify=Vy,t.tree=$y,t.treemap=Jy,t.treemapBinary=Qy,t.treemapDice=Yy,t.treemapSlice=Wy,t.treemapSliceDice=Ky,t.treemapSquarify=Gy,t.treemapResquarify=tm,t.interpolate=Sh,t.interpolateArray=yh,t.interpolateBasis=hh,t.interpolateBasisClosed=ph,t.interpolateDate=mh,t.interpolateNumber=xh,t.interpolateObject=bh,t.interpolateRound=Nh,t.interpolateString=Th,t.interpolateTransformCss=Ch,t.interpolateTransformSvg=zh,t.interpolateZoom=Lh,t.interpolateRgb=vh,t.interpolateRgbBasis=_h,t.interpolateRgbBasisClosed=gh,t.interpolateHsl=Rh,t.interpolateHslLong=qh,t.interpolateLab=hn,t.interpolateHcl=Uh,t.interpolateHclLong=Dh,t.interpolateCubehelix=Oh,t.interpolateCubehelixLong=Fh,t.quantize=Ih,t.path=qe,t.polygonArea=nm,t.polygonCentroid=em;t.polygonHull=im,t.polygonContains=om,t.polygonLength=um,t.quadtree=rr,t.queue=mu,t.randomUniform=sm,t.randomNormal=fm,t.randomLogNormal=lm,t.randomBates=pm,t.randomIrwinHall=hm,t.randomExponential=dm,t.request=vm,t.html=gm,t.json=ym,t.text=mm,t.xml=xm,t.csv=wm,t.tsv=Mm,t.scaleBand=Tu,t.scalePoint=Nu,t.scaleIdentity=Uu,t.scaleLinear=qu,t.scaleLog=ju,t.scaleOrdinal=Mu,t.scaleImplicit=km,t.scalePow=Xu,t.scaleSqrt=Vu,t.scaleQuantile=$u,t.scaleQuantize=Wu,t.scaleThreshold=Zu,t.scaleTime=Zx,t.scaleUtc=Gx,t.schemeCategory10=Qx,t.schemeCategory20b=Kx,t.schemeCategory20c=tb,t.schemeCategory20=nb,t.interpolateCubehelixDefault=eb,t.interpolateRainbow=ub,t.interpolateWarm=rb,t.interpolateCool=ib,t.interpolateViridis=ab,t.interpolateMagma=cb,t.interpolateInferno=sb,t.interpolatePlasma=fb,t.scaleSequential=rc,t.creator=Cf,t.local=w,t.matcher=qf,t.mouse=If,t.namespace=Af,t.namespaces=Ef,t.select=wl,t.selectAll=Ml,t.selection=_t,t.selector=Yf,t.selectorAll=jf,t.touch=Tl,t.touches=Sl,t.window=cl,t.customEvent=A,t.arc=Mb,t.area=Nb,t.line=Sb,t.pie=Ab,t.radialArea=Pb,t.radialLine=zb,t.symbol=Jb,t.symbols=Gb,t.symbolCircle=Lb,t.symbolCross=Rb,t.symbolDiamond=Db,t.symbolSquare=Bb,t.symbolStar=Yb,t.symbolTriangle=Hb,t.symbolWye=Zb,t.curveBasisClosed=tw,t.curveBasisOpen=nw,t.curveBasis=Kb,t.curveBundle=ew,t.curveCardinalClosed=iw,t.curveCardinalOpen=ow,t.curveCardinal=rw,t.curveCatmullRomClosed=aw,t.curveCatmullRomOpen=cw,t.curveCatmullRom=uw,t.curveLinearClosed=sw,t.curveLinear=Tb,t.curveMonotoneX=Ic,t.curveMonotoneY=Yc,t.curveNatural=fw,t.curveStep=lw,t.curveStepAfter=Vc,t.curveStepBefore=Xc,t.stack=vw,t.stackOffsetExpand=_w,t.stackOffsetNone=pw,t.stackOffsetSilhouette=gw,t.stackOffsetWiggle=yw,t.stackOrderAscending=mw,t.stackOrderDescending=xw,t.stackOrderInsideOut=bw,t.stackOrderNone=dw,t.stackOrderReverse=ww,t.timeInterval=Gu,t.timeMillisecond=qm,t.timeMilliseconds=Um,t.utcMillisecond=qm,t.utcMilliseconds=Um,t.timeSecond=Fm,t.timeSeconds=Im,t.utcSecond=Fm,t.utcSeconds=Im,t.timeMinute=Ym,t.timeMinutes=Bm,t.timeHour=jm,t.timeHours=Hm,t.timeDay=Xm,t.timeDays=Vm,t.timeWeek=$m,t.timeWeeks=tx,t.timeSunday=$m,t.timeSundays=tx,t.timeMonday=Wm,t.timeMondays=nx,t.timeTuesday=Zm,t.timeTuesdays=ex,t.timeWednesday=Gm,t.timeWednesdays=rx,t.timeThursday=Jm,t.timeThursdays=ix,t.timeFriday=Qm,t.timeFridays=ox,t.timeSaturday=Km,t.timeSaturdays=ux,t.timeMonth=ax,t.timeMonths=cx,t.timeYear=sx,t.timeYears=fx,t.utcMinute=lx,t.utcMinutes=hx,t.utcHour=px,t.utcHours=dx,t.utcDay=vx,t.utcDays=_x,t.utcWeek=gx,t.utcWeeks=Tx,t.utcSunday=gx,t.utcSundays=Tx,t.utcMonday=yx,t.utcMondays=Sx,t.utcTuesday=mx,t.utcTuesdays=Nx,t.utcWednesday=xx,t.utcWednesdays=kx,t.utcThursday=bx,t.utcThursdays=Ex,t.utcFriday=wx,t.utcFridays=Ax,t.utcSaturday=Mx,t.utcSaturdays=Cx,t.utcMonth=zx,t.utcMonths=Px,t.utcYear=Lx,t.utcYears=qx,t.timeFormatDefaultLocale=Ga,t.timeFormatLocale=ea,t.isoFormat=Ix,t.isoParse=Yx,t.now=vn,t.timer=yn,t.timerFlush=mn,t.timeout=Gh,t.interval=Jh,t.transition=ne,t.active=ed,t.interrupt=cp,t.voronoi=Lw,t.zoom=Dw,t.zoomTransform=As,t.zoomIdentity=qw,Object.defineProperty(t,"__esModule",{value:!0})});
-
-function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var _createClass=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}();!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.dTree=t()}(this,function(){"use strict";var e=function(){function e(t,n,r){_classCallCheck(this,e),e.DEBUG_LEVEL=r.debug?1:0,this.root=t,this.siblings=n,this.opts=r,this.allNodes=this._flatten(this.root);var a=_.filter(this.allNodes,function(e){return!e.hidden});this.nodeSize=r.callbacks.nodeSize(a,r.nodeWidth,r.callbacks.textRenderer)}return _createClass(e,[{key:"create",value:function(){var e=this.opts,t=(this.allNodes,this.nodeSize),n=e.width+e.margin.left+e.margin.right,r=e.height+e.margin.top+e.margin.bottom,a=d3.zoom().scaleExtent([.1,10]).on("zoom",function(){i.attr("transform",d3.event.transform.translate(n/2,0))}),i=this.svg=d3.select(e.target).append("svg").attr("width",n).attr("height",r).call(a).append("g").attr("transform","translate("+n/2+",0)");this.tree=d3.tree().nodeSize([2*t[0],2.5*t[1]]),this.tree.separation(function(e,t){return e.data.hidden||t.data.hidden?.3:.6}),this._update(this.root)}},{key:"_update",value:function(e){var t=this.opts,n=(this.allNodes,this.nodeSize),r=this.tree(e),a=r.links();this.svg.selectAll(".link").data(a).enter().filter(function(e){return!e.target.data.noParent}).append("path").attr("class",t.styles.linage).attr("d",this._elbow);var i=this.svg.selectAll(".node").data(r.descendants()).enter();this._linkSiblings(),this.svg.selectAll(".sibling").data(this.siblings).enter().append("path").attr("class",t.styles.marriage).attr("d",_.bind(this._siblingLine,this)),i.append("foreignObject").filter(function(e){return!e.data.hidden}).attr("x",function(e){return e.x-e.cWidth/2+"px"}).attr("y",function(e){return e.y-e.cHeight/2+"px"}).attr("width",function(e){return e.cWidth+"px"}).attr("height",function(e){return e.cHeight+"px"}).attr("id",function(e){return e.id}).html(function(e){return t.callbacks.nodeRenderer(e.data.name,e.x,e.y,n[0],n[1],e.data.extra,e.data.id,e.data["class"],e.data.textClass,t.callbacks.textRenderer)}).on("click",function(e){e.data.hidden||t.callbacks.nodeClick(e.data.name,e.data.extra,e.data.id)})}},{key:"_flatten",value:function(e){function t(e){e.children&&e.children.forEach(t),e.id||(e.id=++r),n.push(e)}var n=[],r=0;return t(e),n}},{key:"_elbow",value:function(e,t){if(e.target.data.noParent)return"M0,0L0,0";var n=e.target.y+.5*(e.source.y-e.target.y),r=[{x:e.target.x,y:e.target.y},{x:e.target.x,y:n},{x:e.source.x,y:e.source.y}],a=d3.line().curve(d3.curveStepAfter).x(function(e){return e.x}).y(function(e){return e.y});return a(r)}},{key:"_linkSiblings",value:function(){var e=this.allNodes;_.forEach(this.siblings,function(t){var n=e.filter(function(e){return t.source.id==e.data.id}),r=e.filter(function(e){return t.target.id==e.data.id});t.source.x=n[0].x,t.source.y=n[0].y,t.target.x=r[0].x,t.target.y=r[0].y})}},{key:"_siblingLine",value:function(e,t){var n=e.target.y+.5*(e.source.y-e.target.y),r=this.nodeSize[0],a=this.nodeSize[1];e.number>0&&(n-=8*a/10);var i=[{x:e.source.x,y:e.source.y},{x:e.source.x+6*r/10,y:e.source.y},{x:e.source.x+6*r/10,y:n},{x:e.target.x-6*r/10,y:n},{x:e.target.x-6*r/10,y:e.target.y},{x:e.target.x,y:e.target.y}],s=d3.line().curve(d3.curveStepAfter).x(function(e){return e.x}).y(function(e){return e.y});return s(i)}}],[{key:"_nodeSize",value:function(e,t,n){var r=0,a=document.createElement("svg");return document.body.appendChild(a),_.map(e,function(e){var i=document.createElement("div");i.setAttribute("class",e.data["class"]),i.style.visibility="hidden",i.style.maxWidth=t+"px";var s=n(e.data.name,e.data.extra,e.data.textClass);i.innerHTML=s,a.appendChild(i);var o=16;a.removeChild(i),r=Math.max(r,o),e.cHeight=o,e.cWidth=t}),document.body.removeChild(a),[t,r]}},{key:"_nodeRenderer",value:function(e,t,n,r,a,i,s,o,d,c){var l="";return l+="<div ",l+='style="height:100%;width:100%;" ',l+='class="'+o+'" ',l+='id="node'+s+'">\n',l+=c(e,i,d),l+="</div>"}},{key:"_textRenderer",value:function(e,t,n){var r="";return r+="<p ",r+='align="center" ',r+='class="'+n+'">\n',r+=e,r+="</p>\n"}},{key:"_debug",value:function(t){e.DEBUG_LEVEL>0&&console.log(t)}}]),e}(),t={VERSION:"2.0.1",init:function(t){var n=arguments.length<=1||void 0===arguments[1]?{}:arguments[1],r=_.defaultsDeep(n||{},{target:"#graph",debug:!1,width:600,height:600,callbacks:{nodeClick:function(e,t,n){},nodeRenderer:function(t,n,r,a,i,s,o,d,c,l){return e._nodeRenderer(t,n,r,a,i,s,o,d,c,l)},nodeSize:function(t,n,r){return e._nodeSize(t,n,r)},nodeSorter:function(e,t,n,r){return 0},textRenderer:function(t,n,r){return e._textRenderer(t,n,r)}},margin:{top:0,right:0,bottom:0,left:0},nodeWidth:100,styles:{node:"node",linage:"linage",marriage:"marriage",text:"nodeText"}}),t=this._preprocess(t,r),a=new e(t.root,t.siblings,r);a.create()},_preprocess:function(e,n){var r=[],a=0,i={name:"",id:a++,hidden:!0,children:[]},s=function o(e,s){var d={name:e.name,id:a++,hidden:!1,children:[],extra:e.extra,textClass:e.textClass?e.textClass:n.styles.text,"class":e["class"]?e["class"]:n.styles.node};s==i&&(d.noParent=!0);for(var c=0;c<e.depthOffset;c++){var l={name:"",id:a++,hidden:!0,children:[],noParent:d.noParent};s.children.push(l),s=l}t._sortPersons(e.children,n),_.forEach(e.children,function(e){o(e,d)}),s.children.push(d),t._sortMarriages(e.marriages,n),_.forEach(e.marriages,function(e,i){var c={name:"",id:a++,hidden:!0,noParent:!0,children:[],extra:e.extra},l=e.spouse,u={name:l.name,id:a++,hidden:!1,noParent:!0,children:[],textClass:l.textClass?l.textClass:n.styles.text,"class":l["class"]?l["class"]:n.styles.node,extra:l.extra};s.children.push(c,u),t._sortPersons(e.children,n),_.forEach(e.children,function(e){o(e,c)}),r.push({source:{id:d.id},target:{id:u.id},number:i})})};return _.forEach(e,function(e){s(e,i)}),{root:d3.hierarchy(i),siblings:r}},_sortPersons:function(e,t){return void 0!=e&&e.sort(function(e,n){return t.callbacks.nodeSorter(e.name,e.extra,n.name,n.extra)}),e},_sortMarriages:function(e,t){return void 0!=e&&Array.isArray(e)&&e.sort(function(e,n){var r=e.spouse,a=n.spouse;return t.callbacks.nodeSorter(r.name,r.extra,a.name,a.extra)}),e}};return t});
-}).call(window,window)
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 0503f223f79cb18a851768ead67c5e7bc3a20458..1086087c6fa601d9a7146e7417cb7cbd9368d71e 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -40,7 +40,7 @@ globalThis.DJRepBonus = function() {
if (App.Data.Careers.Leader.DJ.includes(S.DJ.career)) {
value += 0.05;
// $He has musical experience from $his life before $he was a slave, a grounding that gives $his tracks actual depth.
- } else if (S.DJ.skill.DJ >= V.masteredXP) {
+ } else if (S.DJ.skill.DJ >= Constant.MASTERED_XP) {
value += 0.05;
// $He has musical experience from working for you, giving $his tracks actual depth.
} else if (S.DJ.skill.DJ > 120) {
@@ -216,7 +216,9 @@ globalThis.CategoryAssociatedGroup = Object.freeze({
'PCSkills',
'PCtraining',
'PCdiet',
+ 'PCdrugs',
'PCmedical',
+ 'PCcosmetics',
'citizenOrphanage',
'privateOrphanage',
'stocks',
@@ -339,6 +341,7 @@ globalThis.calculateCosts = (function() {
getLabMenialsCosts() +
getPCTrainingCosts() +
getPCFoodCosts() +
+ getPCDrugCosts() +
getPCCosts() +
predictTotalSlaveCosts()
);
@@ -393,7 +396,9 @@ globalThis.calculateCosts = (function() {
cashX(forceNeg(getLabMenialsCosts()), "labMenials");
cashX(forceNeg(getPCTrainingCosts()), "PCtraining");
cashX(forceNeg(getPCFoodCosts()), "PCdiet");
+ cashX(forceNeg(getPCDrugCosts()), "PCdrugs");
cashX(forceNeg(getPCCosts()), "PCmedical");
+ cashX(forceNeg(getPCCosts()), "PCcosmetics");
getTotalSlaveCosts();
cashX(forceNeg(App.Mods.SecExp.upkeep.cost()), "securityExpansion");
@@ -801,12 +806,13 @@ globalThis.calculateCosts = (function() {
}
function getPCFoodCosts() {
- const foodCost = V.mods.food.cost;
+ const slimnessFoodMod = V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 1 && !canEatFood(V.PC) ? 1.15 : 1;
+ const foodCost = V.mods.food.cost * slimnessFoodMod;
let costs = 0;
// Well this ought to be a mess.
// Basic food costs
if (canEatFood(V.PC)) {
- costs += foodCost * 8
+ costs += foodCost * 8;
if (V.PC.weight > 130) {
costs += foodCost * 4;
} else if (V.PC.weight > 50) {
@@ -815,7 +821,7 @@ globalThis.calculateCosts = (function() {
costs -= foodCost * 2;
}
} else {
- costs += foodCost * 4
+ costs += foodCost * 4;
if (V.PC.weight > 130) {
costs += foodCost * 2;
} else if (V.PC.weight > 50) {
@@ -835,22 +841,22 @@ globalThis.calculateCosts = (function() {
break;
}
if (V.PC.geneticQuirks.fertility === 2 && V.PC.geneticQuirks.hyperFertility === 2 && V.PC.preg === 0 && (V.PC.ovaries === 1 || V.PC.mpreg === 1)) {
- costs += Math.trunc(foodCost * 0.5);
+ costs += Math.trunc(foodCost * 0.5);
}
if (V.PC.geneticQuirks.rearLipedema === 2) {
- costs += Math.trunc(foodCost * 0.2);
+ costs += Math.trunc(foodCost * 0.2);
}
if (V.PC.geneticQuirks.macromastia === 2) {
- costs += Math.trunc(foodCost * 0.2);
+ costs += Math.trunc(foodCost * 0.2);
}
if (V.PC.geneticQuirks.gigantomastia === 2) {
- costs += Math.trunc(foodCost * 0.2);
+ costs += Math.trunc(foodCost * 0.2);
}
if (V.PC.geneticQuirks.mGain === 2 && V.PC.geneticQuirks.mLoss !== 2) {
- costs += Math.trunc(foodCost * 0.2);
+ costs += Math.trunc(foodCost * 0.2);
}
if (V.PC.geneticQuirks.wGain === 2 && V.PC.geneticQuirks.wLoss !== 2) {
- costs += Math.trunc(foodCost * 0.2);
+ costs += Math.trunc(foodCost * 0.2);
}
if (V.PC.drugs === 'appetite suppressors') {
costs -= foodCost;
@@ -859,7 +865,7 @@ globalThis.calculateCosts = (function() {
costs += foodCost * V.PC.lactation * (1 + Math.trunc(V.PC.boobs / 10000));
}
if (V.PC.preg > V.PC.pregData.normalBirth / 8) {
- costs += foodCost * V.PC.pregType
+ costs += foodCost * V.PC.pregType;
if (V.PC.pregType >= 100) {
costs += foodCost * 5 * V.PC.pregType;
} else if (V.PC.pregType >= 50) {
@@ -870,6 +876,7 @@ globalThis.calculateCosts = (function() {
costs += foodCost * V.PC.pregType;
}
}
+ costs = Math.trunc(costs);
if (V.PC.diet === 'XX' || V.PC.diet === 'XY') {
costs += 25;
} else if (V.PC.diet === 'fertility') {
@@ -878,24 +885,134 @@ globalThis.calculateCosts = (function() {
costs += 50;
} else if (V.PC.diet === 'XXY') {
costs += 75;
+ } else if (V.PC.diet === 'exotic') {
+ costs += 200;
+ } else if (V.PC.diet === 'medicinal') {
+ costs += 250;
+ } else if (V.PC.diet === 'weaning') {
+ costs += 500;
}
return costs;
}
- function getPCCosts() {
+ function getPCDrugCosts() {
const drugsCost = V.drugsCost;
let costs = 0;
+ switch (V.PC.drugs) {
+ case 'anti-aging cream':
+ costs += drugsCost * 10;
+ break;
+ case 'female hormone injections':
+ case 'male hormone injections':
+ case 'intensive breast injections':
+ case 'intensive butt injections':
+ case 'intensive penis enhancement':
+ case 'intensive testicle enhancement':
+ case 'hyper breast injections':
+ case 'hyper butt injections':
+ case 'hyper penis enhancement':
+ case 'hyper testicle enhancement':
+ case 'growth stimulants':
+ case 'psychostimulants':
+ costs += drugsCost * 5;
+ break;
+ case 'breast enhancers':
+ case 'butt enhancers':
+ case 'lip enhancers':
+ case 'penis enlargers':
+ case 'testicle enlargers':
+ costs += (V.consumerDrugs ? drugsCost * 2 : drugsCost * 3);
+ break;
+ case 'fertility supplements':
+ case 'stamina enhancers':
+ costs += drugsCost;
+ break;
+ case 'sag-B-gone':
+ costs += Math.trunc(drugsCost * 0.1);
+ break;
+ case 'no drugs':
+ break;
+ default:
+ costs += drugsCost * 2;
+ break;
+ }
+ if (V.PC.aphrodisiacs !== 0) {
+ costs += Math.trunc(drugsCost * Math.abs(V.PC.aphrodisiacs));
+ }
+ if (V.PC.hormones !== 0) {
+ costs += Math.trunc(drugsCost * Math.abs(V.PC.hormones) * (V.consumerDrugs ? 0.5 : 1));
+ }
+ if (V.PC.bodySwap > 0) {
+ costs += Math.trunc(drugsCost * V.PC.bodySwap * 10);
+ }
if (V.PC.preg === -1) {
- costs += 25;
- } else if (V.PC.fertDrugs === 1) {
+ costs += Math.trunc(drugsCost * 0.5);
+ }
+ return costs;
+ }
+
+ function getPCCosts() {
+ let costs = 0;
+
+ // Accessibility costs
+ if (V.boobAccessibility !== 1 && V.PC.boobs >= 25000) {
costs += 50;
- } else if (V.PC.preg >= 16) {
+ }
+ if (V.pregAccessibility !== 1 && V.PC.belly >= 300000) {
costs += 100;
}
- if (V.PC.staminaPills === 1) {
+ if (V.dickAccessibility !== 1 && V.PC.dick >= 20) {
+ costs += 50;
+ }
+ if (V.ballsAccessibility !== 1 && V.PC.balls > 90) {
+ costs += 50;
+ }
+ if (V.buttAccessibility !== 1 && V.PC.butt > 15) {
+ costs += 50;
+ }
+ if (!canSee(V.PC)) {
+ costs += 50;
+ } else if (getWorstVision(V.PC) === 1) {
+ costs += 25;
+ }
+ if (!canHear(V.PC)) {
+ costs += 40;
+ } else if (V.PC.hears <= -1) {
+ costs += 15;
+ }
+ /* This all need to be figured out still.
+ if (!canMove) {
+ retval.push({text: "Increased living expenses due to immobility", value: rulesCost});
+ } else if (!canWalk) {
+ retval.push({text: "Increased living expenses due to limited mobility", value: rulesCost * 0.50});
+ } else {
+ if (!hasAllLimbs(s)) {
+ retval.push({
+ text: "Increased living expenses due to limblessness",
+ value: Math.trunc(getLimbCount(s, 0) * 0.25)
+ });
+ }
+ if (hasAnyProstheticLimbs(s)) {
+ retval.push({
+ text: "Increased living expenses due to prosthetics",
+ value: Math.trunc(getLimbCount(s, 102) * 0.125)
+ });
+ }
+ }*/
+
+ // Maintenance
+ if (V.PC.boobsImplant > 10000 && V.PC.boobsImplantType === "string") {
+ costs += 50;
+ }
+ if (V.PC.buttImplant > 5 && V.PC.buttImplantType === "string") {
costs += 50;
}
+
+ // Pregnancy
+ if (V.PC.preg >= 16) {
+ costs += 100;
+ }
return costs;
}
@@ -993,10 +1110,10 @@ globalThis.houseServantEffectiveness = function(slave) {
if (slave.assignment === Job.QUARTER) {
effectiveness *= 1.1;
}
- if (App.Data.Careers.General.servant.includes(slave.career) || slave.skill.servant >= V.masteredXP) {
+ if (App.Data.Careers.General.servant.includes(slave.career) || slave.skill.servant >= Constant.MASTERED_XP) {
effectiveness *= 1.1;
}
- effectiveness = Math.trunc(effectiveness * restEffects(slave) / 10);
+ effectiveness = Math.trunc(effectiveness * App.SlaveAssignment.PartTime.efficiencyModifier(slave) * restEffects(slave) / 10);
return effectiveness;
};
@@ -1009,8 +1126,9 @@ globalThis.getSlaveCostArray = function(s) {
let cost = 0;
let retval = [];
let t = "";
+ const slimnessFoodMod = V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 1 ? 1.15 : 1;
const rulesCost = V.rulesCost;
- const foodCost = V.mods.food.cost;
+ const foodCost = V.mods.food.cost * slimnessFoodMod;
const drugsCost = V.drugsCost;
// Living expenses
@@ -1100,24 +1218,42 @@ globalThis.getSlaveCostArray = function(s) {
retval.push({text: "Living Expenses", value: cost});
// Food
- retval.push({text: "Basic slave food cost", value: foodCost * 4});
+ retval.push({
+ text: "Basic slave food cost",
+ value: Math.trunc(foodCost * 4)
+ });
switch (s.diet) {
case 'fattening':
case 'muscle building':
- retval.push({text: "Heavy diet", value: foodCost});
+ retval.push({
+ text: "Heavy diet",
+ value: Math.trunc(foodCost)
+ });
break;
case 'restricted':
case 'slimming':
- retval.push({text: "Light diet, reduced by", value: -Math.abs(foodCost)});
+ retval.push({
+ text: "Light diet, reduced by",
+ value: -Math.abs(Math.trunc(foodCost))
+ });
break;
}
if (s.weight > 130) {
- retval.push({text: "Heavy weight", value: foodCost * 2});
+ retval.push({
+ text: "Heavy weight",
+ value: Math.trunc(foodCost * 2)
+ });
} else if (s.weight > 50) {
- retval.push({text: "High weight", value: foodCost});
+ retval.push({
+ text: "High weight",
+ value: Math.trunc(foodCost)
+ });
} else if (s.weight < -50) {
- retval.push({text: "Light weight, reduced by", value: -Math.abs(foodCost)});
+ retval.push({
+ text: "Light weight, reduced by",
+ value: -Math.abs(Math.trunc(foodCost))
+ });
}
if (s.geneticQuirks.fertility === 2 && s.geneticQuirks.hyperFertility === 2 && s.preg === 0 && (s.ovaries === 1 || s.mpreg === 1)) {
if (V.geneticMappingUpgrade >= 1) {
@@ -1139,7 +1275,10 @@ globalThis.getSlaveCostArray = function(s) {
value: Math.trunc(foodCost * 0.2)
});
} else {
- retval.push({text: "Adjustment for unusual dietary deficiencies", value: Math.trunc(foodCost * 0.2)});
+ retval.push({
+ text: "Adjustment for unusual dietary deficiencies",
+ value: Math.trunc(foodCost * 0.2)
+ });
}
}
if (s.geneticQuirks.macromastia === 2) {
@@ -1149,7 +1288,10 @@ globalThis.getSlaveCostArray = function(s) {
value: Math.trunc(foodCost * 0.2)
});
} else {
- retval.push({text: "Adjustment for unusual dietary deficiencies", value: Math.trunc(foodCost * 0.2)});
+ retval.push({
+ text: "Adjustment for unusual dietary deficiencies",
+ value: Math.trunc(foodCost * 0.2)
+ });
}
}
if (s.geneticQuirks.gigantomastia === 2) {
@@ -1159,7 +1301,10 @@ globalThis.getSlaveCostArray = function(s) {
value: Math.trunc(foodCost * 0.2)
});
} else {
- retval.push({text: "Adjustment for unusual dietary deficiencies", value: Math.trunc(foodCost * 0.2)});
+ retval.push({
+ text: "Adjustment for unusual dietary deficiencies",
+ value: Math.trunc(foodCost * 0.2)
+ });
}
}
if (s.geneticQuirks.mGain === 2 && s.geneticQuirks.mLoss !== 2) {
@@ -1169,7 +1314,10 @@ globalThis.getSlaveCostArray = function(s) {
value: Math.trunc(foodCost * 0.2)
});
} else {
- retval.push({text: "Adjustment for unusual dietary deficiencies", value: Math.trunc(foodCost * 0.2)});
+ retval.push({
+ text: "Adjustment for unusual dietary deficiencies",
+ value: Math.trunc(foodCost * 0.2)
+ });
}
}
if (s.geneticQuirks.wGain === 2 && s.geneticQuirks.wLoss !== 2) {
@@ -1179,11 +1327,17 @@ globalThis.getSlaveCostArray = function(s) {
value: Math.trunc(foodCost * 0.2)
});
} else {
- retval.push({text: "Adjustment for unusual dietary deficiencies", value: Math.trunc(foodCost * 0.2)});
+ retval.push({
+ text: "Adjustment for unusual dietary deficiencies",
+ value: Math.trunc(foodCost * 0.2)
+ });
}
}
if (s.drugs === 'appetite suppressors') {
- retval.push({text: "Food saved via suppressed appetite", value: -Math.abs(foodCost)});
+ retval.push({
+ text: "Food saved via suppressed appetite",
+ value: -Math.abs(Math.trunc(foodCost))
+ });
}
if (s.lactation > 0) {
t = "Food to support ";
@@ -1200,13 +1354,19 @@ globalThis.getSlaveCostArray = function(s) {
} else {
t += "reasonable breasts";
}
- retval.push({text: t, value: foodCost * s.lactation * (1 + Math.trunc(s.boobs / 10000))});
+ retval.push({
+ text: t,
+ value: Math.trunc(foodCost * s.lactation * (1 + (s.boobs / 10000)))
+ });
}
if (s.preg > s.pregData.normalBirth / 8) {
if (s.assignment === Job.DAIRY && V.dairyFeedersSetting > 0) {
// Extra feeding costs to support pregnancy are covered by dairy feeders.
// TODO: Include them here anyway?
- retval.push({text: "Extra feeding costs to support pregnancy are covered by dairy feeders", value: 0});
+ retval.push({
+ text: "Extra feeding costs to support pregnancy are covered by dairy feeders",
+ value: 0
+ });
} else if ((s.assignment === Job.MASTERSUITE || s.assignment === Job.CONCUBINE) &&
V.masterSuiteUpgradePregnancy === 1) {
// Extra feeding costs to support pregnancy are covered by master suite luxuries.
@@ -1223,28 +1383,28 @@ globalThis.getSlaveCostArray = function(s) {
t += "pregnancy";
retval.push({
text: t,
- value: foodCost * s.pregType * (s.pregControl === 'speed up' ? 3 : 1)
+ value: Math.trunc(foodCost * s.pregType * (s.pregControl === 'speed up' ? 3 : 1))
});
if (s.pregType >= 100) {
retval.push({
text: "Specialized dietary requirements and feeding methods to support absurd multiples",
- value: foodCost * 5 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1)
+ value: Math.trunc(foodCost * 5 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1))
});
} else if (s.pregType >= 50) {
retval.push({
text: "Specialized dietary adjustments and concentrated, quick to digest food required to support absurd multiples",
- value: foodCost * 3 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1)
+ value: Math.trunc(foodCost * 3 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1))
});
} else if (s.pregType >= 30) {
retval.push({
text: "Concentrated, quick to digest food blend to support extreme multiples",
- value: foodCost * 2 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1)
+ value: Math.trunc(foodCost * 2 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1))
});
} else if (s.pregType >= 10) {
retval.push({
text: "Specialized food blend to support multiples",
- value: foodCost * s.pregType * (s.pregControl === 'speed up' ? 3 : 1)
+ value: Math.trunc(foodCost * s.pregType * (s.pregControl === 'speed up' ? 3 : 1))
});
}
}
@@ -1260,12 +1420,12 @@ globalThis.getSlaveCostArray = function(s) {
}
// Accessibility costs
- if (V.boobAccessibility !== 1 && s.boobs > 20000 &&
+ if (V.boobAccessibility !== 1 && s.boobs >= 25000 &&
(s.assignment !== Job.DAIRY || V.dairyRestraintsSetting < 2) && (s.assignment !== Job.ARCADE)) {
retval.push({text: "Increased living expenses due to inconveniently huge boobs", value: 50});
}
if (V.pregAccessibility !== 1 &&
- (s.belly >= 60000) && s.assignment !== Job.BABY_FACTORY && (s.assignment !== Job.DAIRY || V.dairyRestraintsSetting < 2) && (s.assignment !== Job.ARCADE)) {
+ (s.belly >= 300000) && s.assignment !== Job.BABY_FACTORY && (s.assignment !== Job.DAIRY || V.dairyRestraintsSetting < 2) && (s.assignment !== Job.ARCADE)) {
retval.push({text: "Increased living expenses due to an inconveniently huge belly", value: 100});
}
if (V.dickAccessibility !== 1 && s.dick > 45 && (s.assignment !== Job.DAIRY || V.dairyRestraintsSetting < 2) && (s.assignment !== Job.ARCADE)) {
@@ -1489,8 +1649,8 @@ globalThis.NPCSexSupply = function(lowerDemandLeft, lowerTotalDemand, middleDema
if (NPCSexSupply.lowerClass > lowerTotalDemand * (0.3 - V.sexSupplyBarriers.lowerClass / 20)) { // Checking if NPCs are supplying more than the standard minimum share of supply
if (lowerClassNPCRatio >= lowerClassOptimalRatio + 0.05) { // NPCs provide more than they really care to and some wish to stop providing sexual services, max reduction of 10% of previous
NPCSexSupply.lowerClass -= Math.min(NPCSexSupply.lowerClass - Math.trunc((NPCSexSupply.lowerClass * 4 + lowerClassOptimal) / 5), Math.trunc(NPCSexSupply.lowerClass * 0.1));
- } else if (lowerClassNPCRatio <= lowerClassOptimalRatio - 0.05) { // NPCs see business opportunities and provide more sexual services, minimum increse of 500, max of 10% of previous
- NPCSexSupply.lowerClass += Math.trunc(Math.clamp((NPCSexSupply.lowerClass * 4 + lowerClassOptimal) / 5 - NPCSexSupply.lowerClass, 500, NPCSexSupply.lowerClass * 0.1) * (1 - V.sexSupplyBarriers.lowerClass / 5)); // Slow down NPC growth through beauraucracy
+ } else if (lowerClassNPCRatio <= lowerClassOptimalRatio - 0.05) { // NPCs see business opportunities and provide more sexual services, minimum increase of 500, max of 10% of previous
+ NPCSexSupply.lowerClass += Math.trunc(Math.clamp((NPCSexSupply.lowerClass * 4 + lowerClassOptimal) / 5 - NPCSexSupply.lowerClass, 500, NPCSexSupply.lowerClass * 0.1) * (1 - V.sexSupplyBarriers.lowerClass / 5)); // Slow down NPC growth through bureaucracy
} else {
NPCSexSupply.lowerClass = Math.trunc(NPCSexSupply.lowerClass * (1 + normalRandInt(0, 20) / 1000)); // Some random fluxuations whenever the NPC supply is roughly on target.
}
@@ -1621,7 +1781,7 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman
if (App.Data.Careers.Leader.madam.includes(madam.career)) {
// $He has experience from $his life before $he was a slave that helps $him in the seedy business of selling other people's bodies for sex.
App.EndWeek.saVars.madamBonus += 0.05;
- } else if (madam.skill.madam >= V.masteredXP) {
+ } else if (madam.skill.madam >= Constant.MASTERED_XP) {
// $He has experience from working for you that helps $him in the seedy business of selling other people's bodies for sex.
App.EndWeek.saVars.madamBonus += 0.05;
} else if (madam.skill.madam > 120) {
@@ -1685,14 +1845,16 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman
// Glory hole slaves adding to 'arcade'
App.Utils.jobForAssignment(Job.GLORYHOLE).employees().forEach(s => {
- s.sexAmount = Math.trunc(restEffects(s, 20) * ((normalRandInt(600, 20) + (4 - s.anus) * 10 + (4 - s.vagina) * 10 + Math.trunc(s.health.condition / 2)) * 0.75));
+ const base = ((normalRandInt(600, 20) + (4 - s.anus) * 10 + (4 - s.vagina) * 10 + Math.trunc(s.health.condition / 2)) * 0.75);
+ s.sexAmount = Math.trunc(base * restEffects(s, 20) * App.SlaveAssignment.PartTime.efficiencyModifier(s));
tiredFucks(s);
slaveJobValues.arcade += s.sexAmount;
});
// Arcade slaves adding to 'arcade'
App.Utils.jobForAssignment(Job.ARCADE).employees().forEach(s => {
- s.sexAmount = (normalRandInt(600, 20) + (4 - (s.anus - 2 * V.arcadeUpgradeInjectors)) * 10 + (4 - (s.vagina - 2 * V.arcadeUpgradeInjectors)) * 10 + Math.trunc(s.health.condition / 2));
+ const base = normalRandInt(600, 20) + (4 - (s.anus - 2 * V.arcadeUpgradeInjectors)) * 10 + (4 - (s.vagina - 2 * V.arcadeUpgradeInjectors)) * 10 + s.health.condition / 2;
+ s.sexAmount = Math.trunc(base * App.SlaveAssignment.PartTime.efficiencyModifier(s));
slaveJobValues.arcade += s.sexAmount;
});
@@ -1809,7 +1971,9 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman
if (restEffect !== healthPenalty(s)) {
s.sexAmount *= restEffect;
}
- s.sexAmount = Math.trunc(s.sexAmount * beautyMultiplier);
+ s.sexAmount = Math.trunc(s.sexAmount * beautyMultiplier *
+ App.SlaveAssignment.PartTime.efficiencyModifier(s) // We know the full-time numbers, let's check how much they actually work.
+ );
// The effect of sexual acts on tiredness
tiredFucks(s);
@@ -2052,7 +2216,10 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman
}
}
- s.sexAmount = Math.round(sexMin * demandBoost);
+ s.sexAmount = Math.round(sexMin * demandBoost *
+ App.SlaveAssignment.PartTime.efficiencyModifier(s) // We know the full-time numbers, let's check how much they actually work.
+ );
+
tiredFucks(s); // adding tiredness based on number of fucks and then adjusting income in case the tiredness penalty changed as a result.
if (healthPenalty(s) < initialHealthPenalty) {
income *= healthPenalty(s) / initialHealthPenalty;
@@ -2473,6 +2640,10 @@ globalThis.forceNeg = function(x) {
return -Math.abs(x);
};
+globalThis.sweatshopCount = function() {
+ return V.building.findCells(cell => (cell instanceof App.Arcology.Cell.Manufacturing) && cell.type === "Sweatshops").length;
+};
+
globalThis.SectorCounts = function() {
// Ternaries: - https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Conditional_Operator
V.AProsperityCapModified = V.AProsperityCapModified > 0 ? V.AProsperityCapModified : 0;
@@ -2492,7 +2663,6 @@ globalThis.SectorCounts = function() {
// The idea is that cells used for your private benefit contribute less to the economy as they cannot be used by
// others to generate revenue and therefore increase total cash flow. Can be offset by more luxury apartments.
- V.Sweatshops = 0;
V.building.findCells(cell => !(cell instanceof App.Arcology.Cell.Penthouse))
.forEach(cell => {
if (cell instanceof App.Arcology.Cell.Apartment) {
@@ -2514,9 +2684,6 @@ globalThis.SectorCounts = function() {
} else if (cell instanceof App.Arcology.Cell.Manufacturing) {
if (cell.type !== "Dairy" && cell.type !== "Farmyard" && cell.type !== "Barracks") {
V.AProsperityCap += 10;
- if (cell.type === "Sweatshops") {
- V.Sweatshops++;
- }
}
}
});
@@ -2541,7 +2708,7 @@ globalThis.agentBonus = function(arcology) {
if (agent.fetishStrength > 95) {
if (agent.fetish === "dom" || agent.fetish === "sadist") {
bonus++;
- } else if (agent.fetish === "submissive" || agent.fetish === "masochist") {
+ } else if (agent.fetish === Fetish.SUBMISSIVE || agent.fetish === "masochist") {
bonus--;
}
}
@@ -2627,11 +2794,12 @@ globalThis.supplyPoliciesReport = function(NPCclass) {
* @returns {DocumentFragment}
*/
globalThis.ownershipReport = function(short) {
- const fragment = document.createDocumentFragment();
- let cssClass;
- let warning = false;
+ const fragment = new DocumentFragment();
const ownership = V.arcologies[0].ownership;
const minority = V.arcologies[0].minority;
+ let cssClass;
+ let warning = false;
+
if (ownership <= minority + 5) {
cssClass = 'warning';
warning = true;
@@ -2640,8 +2808,10 @@ globalThis.ownershipReport = function(short) {
} else if (ownership >= minority) {
cssClass = 'yellow';
}
+
if (short === true) {
const span = document.createElement("span");
+
span.className = cssClass;
span.append(`${ownership}%`);
if (V.assistant.power >= 1 && ownership < 100) {
@@ -2649,18 +2819,19 @@ globalThis.ownershipReport = function(short) {
}
fragment.append("(", span, ")");
} else {
- fragment.append("You own ", App.UI.DOM.makeElement("span", `${ownership}%`, "bold"),
+ fragment.append("You own ", App.UI.DOM.makeElement("span", `${ownership}%`, ["bold"]),
` of ${V.arcologies[0].name}, `);
if (minority > 0) {
- fragment.append("against ", App.UI.DOM.makeElement("span", `${minority}%`, "bold"),
+ fragment.append("against ", App.UI.DOM.makeElement("span", `${minority}%`, ["bold"]),
" owned by the second most significant holder.");
} else {
fragment.append("and there are no other significant holders.");
}
if (warning) {
- App.UI.DOM.appendNewElement("span", fragment, " A dangerously narrow margin of control.", "warning");
+ App.UI.DOM.appendNewElement("span", fragment, " A dangerously narrow margin of control.", ["warning"]);
}
}
+
return fragment;
};
diff --git a/src/js/eventHandlers.js b/src/js/eventHandlers.js
index 521bb80790a99932e8c9cc5a1df85733d39dc7fd..35e7d270aa14b34be2632c53c2a6ebc92fdd751a 100644
--- a/src/js/eventHandlers.js
+++ b/src/js/eventHandlers.js
@@ -3,7 +3,7 @@ App.EventHandlers = function() {
* @param {TwineSugarCube.SaveObject} save
*/
function onLoad(save) {
- const v = save.state.history[0].variables;
+ const v = /** @type {FC.GameVariables} */(save.state.history[0].variables);
if (v.releaseID === 2000) {
v.releaseID = 1100;
}
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index f4a851b37513bddf73a80c6c489225a4a7b5eac4..b2f901ccd85c3c13ad36160bcc4a912607486adf 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -8,9 +8,33 @@
* @property {number} father
* @property {number} actualAge
* @property {number} birthWeek
+ * @property {string} slaveName
+ * @property {FC.Zeroable<string>} slaveSurname
* @property {string} genes
*/
+/** Given an ID, gets a relative entry that represents that ID, from wherever it may be
+ * @param {number} ID
+ * @returns {Relative}
+ */
+globalThis.getRelative = function(ID) {
+ // PC
+ if (ID === -1) {
+ return V.PC;
+ }
+ // active slave, child, or tank baby
+ const slave = findFather(ID);
+ if (slave) {
+ return slave;
+ }
+ // ex-slave
+ const genePool = V.genePool.find(s => s.ID === ID);
+ if (genePool) {
+ return genePool;
+ }
+ return null;
+};
+
/** Returns true if mother is the mother of daughter
* @param {Relative} daughter
* @param {Relative} mother
@@ -44,10 +68,10 @@ globalThis.isParentP = function(daughter, parent) {
* @returns {boolean}
*/
globalThis.isGrandmotherP = function(granddaughter, grandmother) {
- let father;
- let mother;
- return ((mother = getSlave(granddaughter.mother)) && (mother.mother === grandmother.ID)) ||
- ((father = getSlave(granddaughter.father)) && (father.mother === grandmother.ID));
+ const father = getRelative(granddaughter.father);
+ const mother = getRelative(granddaughter.mother);
+ return (mother && (mother.mother === grandmother.ID)) ||
+ (father && (father.mother === grandmother.ID));
};
/** Returns true if grandfather is the grandfather of granddaughter
@@ -56,10 +80,10 @@ globalThis.isGrandmotherP = function(granddaughter, grandmother) {
* @returns {boolean}
*/
globalThis.isGrandfatherP = function(granddaughter, grandfather) {
- let father;
- let mother;
- return ((mother = getSlave(granddaughter.mother)) && (mother.father === grandfather.ID)) ||
- ((father = getSlave(granddaughter.father)) && (father.father === grandfather.ID));
+ const father = getRelative(granddaughter.father);
+ const mother = getRelative(granddaughter.mother);
+ return (mother && (mother.father === grandfather.ID)) ||
+ (father && (father.father === grandfather.ID));
};
/** Returns true if grandparent is the either the grandmother or grandfather of granddaughter
@@ -138,11 +162,11 @@ globalThis.isAunt = function(niece, aunt) {
if (!niece || !aunt || (niece.ID === aunt.ID)) {
return false;
}
- let father;
- let mother;
- if ((mother = getSlave(niece.mother)) && (mother.ID !== aunt.ID) && !sameTParent(mother, aunt) && sameMom(mother, aunt) && sameDad(mother, aunt)) {
+ const father = getRelative(niece.father);
+ const mother = getRelative(niece.mother);
+ if (mother && (mother.ID !== aunt.ID) && !sameTParent(mother, aunt) && sameMom(mother, aunt) && sameDad(mother, aunt)) {
return true;
- } else if ((father = getSlave(niece.father)) && (father.ID !== aunt.ID) && !sameTParent(father, aunt) && sameMom(father, aunt) && sameDad(father, aunt)) {
+ } else if (father && (father.ID !== aunt.ID) && !sameTParent(father, aunt) && sameMom(father, aunt) && sameDad(father, aunt)) {
return true;
}
@@ -206,10 +230,10 @@ globalThis.areCousins = function(slave1, slave2) {
return false;
}
- const slave1Mom = getSlave(slave1.mother);
- const slave1Dad = getSlave(slave1.father);
- const slave2Mom = getSlave(slave2.mother);
- const slave2Dad = getSlave(slave2.father);
+ const slave1Mom = getRelative(slave1.mother);
+ const slave1Dad = getRelative(slave1.father);
+ const slave2Mom = getRelative(slave2.mother);
+ const slave2Dad = getRelative(slave2.father);
if (slave1Mom && slave2Mom && !sameTParent(slave1Mom, slave2Mom) && sameMom(slave1Mom, slave2Mom) && sameDad(slave1Mom, slave2Mom)) {
return true;
diff --git a/src/js/familyTreeJS.js b/src/js/familyTreeJS.js
index f01bb34522c3af4727172925efb67e5232a77928..6ad834b0aa74cbe9fce5f2d104df64703b0b46e8 100644
--- a/src/js/familyTreeJS.js
+++ b/src/js/familyTreeJS.js
@@ -1,5 +1,4 @@
/* eslint-disable camelcase */
-/* eslint-disable no-console */
/**
* @param {FC.HumanState[]} slaves
@@ -41,13 +40,7 @@ globalThis.renderFamilyTree = function(slaves, filterID) {
function runFtreeSim(data) {
let simulation = d3.forceSimulation()
- .force('link', d3.forceLink().id(function(d) {
- return d.index.toString();
- }))
- // eslint-disable-next-line no-unused-vars
- .force('collide', d3.forceCollide(function(d) {
- return 60;
- }).iterations(4))
+ .force('collide', d3.forceCollide(60).iterations(4))
.force('charge', d3.forceManyBody().strength(-200).distanceMin(100).distanceMax(1000))
.force('center', d3.forceCenter(ftreeWidth / 2, ftreeHeight / 2))
.force('y', d3.forceY(100))
@@ -82,7 +75,6 @@ globalThis.renderFamilyTree = function(slaves, filterID) {
.on('end', dragended));
node.append('circle')
- .attr('r', function(d) { return d.r; })
.attr('stroke', function(d) {
if (d.ID === filterID) {
return '#ffff20';
@@ -140,22 +132,21 @@ globalThis.renderFamilyTree = function(slaves, filterID) {
simulation.nodes(data.nodes)
.on('tick', ticked);
- simulation.force('link')
- .links(data.links);
+ simulation.force('link', d3.forceLink().links(data.links));
- function dragstarted(d) {
- if (!d3.event.active) { simulation.alphaTarget(0.3).restart(); }
+ function dragstarted(event, d) {
+ if (!event.active) { simulation.alphaTarget(0.3).restart(); }
d.fx = d.x;
d.fy = d.y;
}
- function dragged(d) {
- d.fx = d3.event.x;
- d.fy = d3.event.y;
+ function dragged(event, d) {
+ d.fx = event.x;
+ d.fy = event.y;
}
- function dragended(d) {
- if (!d3.event.active) { simulation.alphaTarget(0); }
+ function dragended(event, d) {
+ if (!event.active) { simulation.alphaTarget(0); }
d.fx = null;
d.fy = null;
}
@@ -177,7 +168,9 @@ globalThis.buildFamilyTree = function(slaves, filterID) {
'-6': 'Social Elite',
'-7': 'Gene lab'
};
+ /** @type {Record<string, Array<string>>} */
let outdads = {};
+ /** @type {Record<string, Array<string>>} */
let outmoms = {};
let kids = {};
@@ -218,34 +211,31 @@ globalThis.buildFamilyTree = function(slaves, filterID) {
}
}
+ const haveChar = (ID) => charList.includes(c => c.ID === ID);
for (const character of charList) {
if (character.mother === 0 && character.father === 0 && !kids[character.ID]) {
continue;
}
let mom = character.mother;
if (mom < -6) {
- if (mom in V.missingTable && V.showMissingSlaves) {
- if (typeof node_lookup[mom] === 'undefined') {
- node_lookup[mom] = family_graph.nodes.length;
- let missing = V.missingTable[mom];
- charList.push({
- ID: mom,
- mother: missing.mother,
- father: missing.father,
- is_mother: true,
- dick: missing.dick,
- vagina: missing.vagina,
- slaveName: missing.slaveName
- });
- }
+ if (mom in V.missingTable && V.showMissingSlaves && !haveChar(mom)) {
+ const missing = V.missingTable[mom];
+ charList.push({
+ ID: mom,
+ mother: missing.mother,
+ father: missing.father,
+ is_mother: true,
+ dick: missing.dick,
+ vagina: missing.vagina,
+ slaveName: missing.slaveName
+ });
} else {
if (typeof outmoms[mom] === 'undefined') {
outmoms[mom] = [];
}
outmoms[mom].push(character.slaveName);
}
- } else if (mom < 0 && typeof node_lookup[mom] === 'undefined' && typeof preset_lookup[mom] !== 'undefined') {
- node_lookup[mom] = family_graph.nodes.length;
+ } else if (mom < 0 && typeof preset_lookup[mom] !== 'undefined' && !haveChar(mom)) {
charList.push({
ID: mom,
mother: 0,
@@ -259,28 +249,24 @@ globalThis.buildFamilyTree = function(slaves, filterID) {
let dad = character.father;
if (dad < -6) {
- if (dad in V.missingTable && V.showMissingSlaves) {
- if (typeof node_lookup[dad] === 'undefined') {
- node_lookup[dad] = family_graph.nodes.length;
- let missing = V.missingTable[dad];
- charList.push({
- ID: dad,
- mother: missing.mother,
- father: missing.father,
- is_father: true,
- dick: missing.dick,
- vagina: missing.vagina,
- slaveName: missing.slaveName
- });
- }
+ if (dad in V.missingTable && V.showMissingSlaves && !haveChar(dad)) {
+ const missing = V.missingTable[dad];
+ charList.push({
+ ID: dad,
+ mother: missing.mother,
+ father: missing.father,
+ is_father: true,
+ dick: missing.dick,
+ vagina: missing.vagina,
+ slaveName: missing.slaveName
+ });
} else {
if (typeof outdads[dad] === 'undefined') {
outdads[dad] = [];
}
outdads[dad].push(character.slaveName);
}
- } else if (dad < 0 && typeof node_lookup[dad] === 'undefined' && typeof preset_lookup[dad] !== 'undefined') {
- node_lookup[dad] = family_graph.nodes.length;
+ } else if (dad < 0 && typeof preset_lookup[dad] !== 'undefined' && !haveChar(dad)) {
charList.push({
ID: dad,
mother: 0,
@@ -304,7 +290,6 @@ globalThis.buildFamilyTree = function(slaves, filterID) {
names[-1] = `and ${names[-1]}`;
name = names.join(', ');
}
- node_lookup[key] = family_graph.nodes.length;
// Outside extant slaves set
charList.push({
ID: key,
@@ -329,7 +314,6 @@ globalThis.buildFamilyTree = function(slaves, filterID) {
names[-1] = `and ${names[-1]}`;
name = names.join(', ');
}
- node_lookup[key] = family_graph.nodes.length;
// Outside extant slaves set
charList.push({
ID: key,
@@ -433,12 +417,6 @@ globalThis.buildFamilyTree = function(slaves, filterID) {
continue;
}
if (filterID && !related[char_id]) {
- if (related[character.mother]) {
- console.log('wtf, mom');
- }
- if (related[character.father]) {
- console.log('wtf, dad');
- }
continue;
}
if (typeof node_lookup[character.mother] !== 'undefined') {
diff --git a/src/js/findSlave.js b/src/js/findSlave.js
index 4c8c602e040dc360f2ad8ff94939697d3bffd6ee..0ea81486149205b3e8188af6a8579e3bf748d764 100644
--- a/src/js/findSlave.js
+++ b/src/js/findSlave.js
@@ -71,9 +71,8 @@ App.UI.findSlave = function() {
* @param {DocumentFragment} frag
*/
function _appendResultList(ids, frag) {
- if (ids.length === 0) {
- App.UI.DOM.appendNewElement("p", frag, "No matching slaves.");
- } else {
+ App.UI.DOM.appendNewElement("p", frag, `${ids.length} matching slave${ids.length === 1 ? `` : `s`}.`);
+ if (ids.length !== 0) {
frag.appendChild(App.UI.SlaveList.render(ids, [], App.UI.SlaveList.SlaveInteract.stdInteract));
}
}
diff --git a/src/js/health.js b/src/js/health.js
index 52760134eeb0e95e3c867cebfa07e5dbeb13ebaf..39760d4a3a2a66acddcc30bcb78efec08b638e15 100644
--- a/src/js/health.js
+++ b/src/js/health.js
@@ -32,15 +32,16 @@ globalThis.healthPenalty = function(slave) {
* All things hurting a slave go through this to update short term damage and slave health.
* @param {App.Entity.SlaveState|App.Entity.PlayerState} slave
* @param {number} damage
+ * @param {number} mult
* @returns {void}
*/
-globalThis.healthDamage = function(slave, damage) {
+globalThis.healthDamage = function(slave, damage, mult = 1) {
if (!_.isFinite(damage)) {
throw Error("Health damage must be a finite number.");
}
const H = slave.health;
damage = Math.max(Math.trunc(damage), 0);
- H.shortDamage += damage;
+ H.shortDamage += damage * mult;
H.condition -= damage;
updateHealth(slave);
};
@@ -82,7 +83,7 @@ globalThis.surgeryDamage = function(slave, damage, cheat = false) {
/**
* All things improving a slave's condition go through this to update condition and slave health.
- * @param {App.Entity.SlaveState} slave
+ * @param {App.Entity.SlaveState|App.Entity.PlayerState} slave
* @param {number} condition
* @returns {void}
*/
diff --git a/src/js/ibcJS.js b/src/js/ibcJS.js
index 7006c2d3368f50f2c6be0d203cc286660a7625ee..3573a465ba6499084c9e339643c0a9a87aebae6a 100644
--- a/src/js/ibcJS.js
+++ b/src/js/ibcJS.js
@@ -12,7 +12,6 @@
// TODO: replace snake_case with camelCase
/* eslint-disable camelcase */
-/* eslint-disable eqeqeq */
globalThis.ibc = (() => {
let realWorld =
{
@@ -113,7 +112,7 @@ globalThis.ibc = (() => {
if (vs1 === undefined)
vs1 = vs[id1] = [];
- // cache format, conceptually: a set of arrays of numbers. the top-level set is indexed by id1. a lower-level array has the format
+ // cache format, conceptually: a set of arrays of numbers. the top-level set is indexed by id1. a lower-level array has the format
// [id, kinship value, id, kinship value, ...] with the id in an entry corresponding to id2 here and with the pairs in the array being kept invariably sorted by id.
return this.kinship_cache(vs1, id2, calculateValue);
}
diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index 26b33ee29848229f1b0a375cdff77cacf15e2a33..a4517a60719b46108adb801f48847dbf2d659550 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -270,7 +270,7 @@ globalThis.findProsthetic = function(slave, prosthetic) {
/**
* @param {string} prosthetic
- * @returns {number}
+ * @returns {FC.LimbType}
*/
globalThis.prostheticToLimb = function(prosthetic) {
switch (prosthetic) {
diff --git a/src/js/makePurchase.js b/src/js/makePurchase.js
index 02ddc73010c63752bee7aec07c74b193193780ac..e715a30d18bbf11c1cc5413d2cb1ec1b1b251a03 100644
--- a/src/js/makePurchase.js
+++ b/src/js/makePurchase.js
@@ -112,7 +112,7 @@ globalThis.makePurchase = function(text, cost, what, {notes, handler, prereqs, r
if (V.cash >= cost &&
(!prereqs || prereqs.every(prereq => prereq[0] === true))) {
- span.append(App.UI.DOM.link(`${text} `, execute, [], ''));
+ span.append(App.UI.DOM.link(text, execute, [], ''), " ");
} else {
const reasons = [];
@@ -128,7 +128,7 @@ globalThis.makePurchase = function(text, cost, what, {notes, handler, prereqs, r
});
}
- span.append(App.UI.DOM.disabledLink(`${text} `, reasons));
+ span.append(App.UI.DOM.disabledLink(text, reasons), " ");
}
App.UI.DOM.appendNewElement("span", span, toSentence(price), ['note']);
diff --git a/src/js/modification.js b/src/js/modification.js
index 3dd770dce5f67dc0b4af150fed5e4a575853985b..cecc29936fbaa63a844ed2795e4e686b1350159c 100644
--- a/src/js/modification.js
+++ b/src/js/modification.js
@@ -483,7 +483,7 @@ App.Medicine.Modification.setTattoo = function(slave, location, design, cheat) {
if (canSee(slave)) {
if (slave.fetish === "pregnancy") {
r.push(`${He} smiles, pleased at the attention ${his} womb is getting.`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He} flushes, understanding that ${he} has been marked for debauchery.`);
} else if (slave.fetish === "humiliation") {
r.push(`${He} smiles, pleased that ${he}'s been marked erotic.`);
diff --git a/src/js/porn.js b/src/js/porn.js
index 3e820fe3ba54a18c9198980e630f64c4c8f812a3..fe5500b0d6028baacf72b2a6ddaaab705f5d161b 100644
--- a/src/js/porn.js
+++ b/src/js/porn.js
@@ -1,34 +1,38 @@
-App.Porn = {};
App.Porn.GenreType = {
paraphilia: {
focusedViewershipFactor: 1.5,
unfocusedViewershipFactor: 0.5,
viewershipSoakingFactor: 0.0,
- bonusViewership: function(slave) { return slave.fetishStrength * 2.0; }
+ bonusViewership: function(slave) { return slave.fetishStrength * 2.0; },
+ name: "paraphilia"
},
fetish: {
focusedViewershipFactor: 2.0,
unfocusedViewershipFactor: 0.5,
viewershipSoakingFactor: 1.0,
- bonusViewership: function(slave) { return slave.fetishStrength; }
+ bonusViewership: function(slave) { return slave.fetishStrength; },
+ name: "fetish"
},
general: {
focusedViewershipFactor: 4.0,
unfocusedViewershipFactor: 0.5,
viewershipSoakingFactor: 1.0,
- bonusViewership: function(slave) { return 0.0; }
+ bonusViewership: function(slave) { return 0.0; },
+ name: "general"
},
quirk: {
focusedViewershipFactor: 6.0,
unfocusedViewershipFactor: 0.5,
viewershipSoakingFactor: 1.0,
- bonusViewership: function(slave) { return 0.0; }
+ bonusViewership: function(slave) { return 0.0; },
+ name: "quirk"
},
generic: {
focusedViewershipFactor: 5.0,
unfocusedViewershipFactor: 1.0,
viewershipSoakingFactor: 0.0,
- bonusViewership: function(slave) { return 0.0; }
+ bonusViewership: function(slave) { return 0.0; },
+ name: "generic"
}
};
@@ -100,7 +104,7 @@ App.Porn.Genre.breastGrowth = {
prestigeDesc1: "Thousands have enjoyed charting the growth of $his breasts",
prestigeDesc2: "$His many fans relish the sight of $his expanding bust",
prestigeDesc3: "Millions are intimately familiar with the history of $his growing bust",
- hitText: function(slave) { return `${getPronouns(slave).His} complete obsession with the ever increasing size of ${getPronouns(slave).his} tits makes ${getPronouns(slave).him} a hit with viewers that enjoy enormous knockers and breast expansion.`; },
+ hitText: function(slave) { return `${getPronouns(slave).His} complete obsession with the ever-increasing size of ${getPronouns(slave).his} tits makes ${getPronouns(slave).him} a hit with viewers that enjoy enormous knockers and breast expansion.`; },
trinketShotDesc: function(slave) { return `showing ${getPronouns(slave).him} having ${getPronouns(slave).his} tits measured`; },
valid: function(slave) { return slave.sexualFlaw === "breast growth"; },
uiName: function() { return capFirstChar(this.focusName); }
@@ -180,7 +184,7 @@ App.Porn.Genre.sub = {
prestigeDesc3: "Millions are intimately familiar with $his submissiveness",
hitText: function(slave) { return `With ${getPronouns(slave).his} submissive streak, ${getPronouns(slave).he} has a clear advantage when it comes to fetish smut.`; },
trinketShotDesc: function(slave) { return `showing ${getPronouns(slave).his} submission`; },
- valid: function(slave) { return slave.fetish === "submissive"; },
+ valid: function(slave) { return slave.fetish === Fetish.SUBMISSIVE; },
uiName: function() { return capFirstChar(this.focusName); }
};
@@ -234,7 +238,7 @@ App.Porn.Genre.boobs = {
prestigeDesc1: "Thousands have enjoyed the sight of $his breasts",
prestigeDesc2: "$His many fans relish the sight of $his breasts",
prestigeDesc3: "Millions are intimately familiar with $his breasts",
- hitText: function(slave) { return `With ${getPronouns(slave).his} fetish for tits, ${getPronouns(slave).he} has a clear advantage when it comes to breast focused smut.`; },
+ hitText: function(slave) { return `With ${getPronouns(slave).his} fetish for tits, ${getPronouns(slave).he} has a clear advantage when it comes to breast-focused smut.`; },
trinketShotDesc: function(slave) { return `showing ${getPronouns(slave).his} bare chest`; },
valid: function(slave) { return slave.fetish === "boobs"; },
uiName: function() { return capFirstChar(this.focusName); }
diff --git a/src/js/pregJS.js b/src/js/pregJS.js
index 44529f375689fbb08e58a532020a120335122e7f..124a613224eafd664d942fb5cd4fbc5b46c3b26b 100644
--- a/src/js/pregJS.js
+++ b/src/js/pregJS.js
@@ -17,7 +17,7 @@ globalThis.getPregBellySize = function(s) {
};
/**
- * @param {App.Entity.SlaveState} slave
+ * @param {FC.HumanState} slave
* @returns {string}
*/
globalThis.bellyAdjective = function(slave) {
@@ -82,45 +82,6 @@ globalThis.setPregType = function(actor) {
if (actor.broodmother < 1) { // Broodmothers should be not processed here. Necessary now.
if (typeof actor.readyOva === "number" && actor.readyOva !== 0) {
ovum = actor.readyOva; // just single override; for delayed impregnation cases
- } else if (actor.ID === -1) {
- if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
- if (actor.fertDrugs === 1) {
- ovum += jsEither([2, 3, 3, 3, 3, 4, 4, 5]);
- } else {
- ovum += jsEither([1, 1, 2, 2, 3, 3, 4]);
- }
- if (actor.forcedFertDrugs > 0) {
- ovum += jsEither([3, 3, 4, 4, 5]);
- }
- } else if (actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
- if (actor.fertDrugs === 1) {
- ovum += jsEither([1, 2, 2, 2, 2, 3, 3, 4]);
- } else {
- ovum += jsEither([0, 1, 1, 1, 1, 1, 2, 3]);
- }
- if (actor.forcedFertDrugs > 0) {
- ovum += jsEither([2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4]);
- }
- } else if (actor.geneticQuirks.fertility === 2) { // Predisposed to twins
- if (actor.fertDrugs === 1) {
- ovum += jsEither([1, 1, 2, 2, 2, 2, 3, 3]);
- } else {
- ovum += jsEither([0, 0, 0, 1, 1, 1, 1, 1, 1, 2]);
- }
- if (actor.forcedFertDrugs > 0) {
- ovum += jsEither([1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4]);
- }
- } else {
- if (actor.fertDrugs === 1) {
- ovum += jsEither([0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3]);
- } else {
- ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
- }
- if (actor.forcedFertDrugs > 0) {
- ovum += jsEither([0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 4]);
- }
- }
- ovum = Math.clamp(ovum, 0, 8);
} else {
if (actor.eggType === "horse" || actor.eggType === "cow") {
if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
@@ -338,13 +299,24 @@ globalThis.setPregType = function(actor) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
fertilityStack++;
}
- if (V.masterSuitePregnancyFertilitySupplements === 1 && (actor.assignment === Job.MASTERSUITE || actor.assignment === Job.CONCUBINE)) {
- ovum += jsEither([0, 0, 0, 1, 1, 2, 2, 2, 3, 3]);
- fertilityStack++;
- fertilityStack++;
- }
- if (V.reproductionFormula === 1 && (V.week - actor.weekAcquired > 0)) {
- fertilityStack++;
+ if (actor.ID === -1) {
+ if (actor.forcedFertDrugs > 0) {
+ ovum += jsEither([1, 1, 1, 1, 1, 2, 2, 2, 3]);
+ fertilityStack++;
+ fertilityStack++;
+ }
+ if (V.reproductionFormula === 1 && !canEatFood(actor)) {
+ fertilityStack++;
+ }
+ } else {
+ if (V.masterSuitePregnancyFertilitySupplements === 1 && (actor.assignment === Job.MASTERSUITE || actor.assignment === Job.CONCUBINE)) {
+ ovum += jsEither([0, 0, 0, 1, 1, 2, 2, 2, 3, 3]);
+ fertilityStack++;
+ fertilityStack++;
+ }
+ if (V.reproductionFormula === 1 && (V.week - actor.weekAcquired > 0)) {
+ fertilityStack++;
+ }
}
if (actor.drugs === "super fertility drugs") {
ovum += jsEither([1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5]);
@@ -353,6 +325,9 @@ globalThis.setPregType = function(actor) {
fertilityStack++;
fertilityStack++;
fertilityStack++;
+ } else if (actor.drugs === "fertility supplements") {
+ ovum += jsEither([0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2]);
+ fertilityStack++;
} else if (actor.drugs === "fertility drugs") {
ovum += jsEither([0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3]);
fertilityStack++;
@@ -377,6 +352,9 @@ globalThis.setPregType = function(actor) {
ovum = jsRandom(6, 12);
}
}
+ if (actor.ID === -1) { // temp until player birth is redone
+ ovum = Math.clamp(ovum, 0, 8);
+ }
}
}
}
@@ -474,7 +452,8 @@ globalThis.getNurseryReserved = function( /* slaves */ ) {
return FetusGlobalReserveCount("nursery");
};
-/** Find a slave's father, if they are also one of your slaves, wherever they may be
+/** Find a slave's by ID, if they are also one of your slaves, wherever they may be
+ * Note: not specific to fathers, though that's the most common use.
* @param {number} fatherID
* @returns {FC.HumanState}
*/
diff --git a/src/js/releaseRules.js b/src/js/releaseRules.js
index 0ab23091ca913840ac003803512602a45c3f3d55..d6671c9e866ab31f1137a9f44988997b69dbcd5a 100644
--- a/src/js/releaseRules.js
+++ b/src/js/releaseRules.js
@@ -84,6 +84,24 @@ App.Utils.hasNonassignmentSex = function hasNonassignmentSex(slave) {
return (slave.rules.release.slaves === 1) || this.hasFamilySex(slave) || this.hasPartnerSex(slave);
};
+/**
+ * Returns true if the slave has an assignment that requires them to have sex.
+ * @param {FC.SlaveState} slave
+ * @returns {boolean}
+ */
+App.Utils.hasAssignmentSex = function hasAssignmentSex(slave) {
+ return [Job.PUBLIC, Job.WHORE, Job.BROTHEL, Job.CLUB, Job.GLORYHOLE, Job.ARCADE, Job.FUCKTOY, Job.MASTERSUITE, Job.SUBORDINATE].includes(slave.assignment);
+};
+
+/**
+ * Returns true if the slave is to remain completely chaste.
+ * @param {FC.SlaveState} slave
+ * @returns {boolean}
+ */
+App.Utils.isChaste = function isChaste(slave) {
+ return !App.Utils.hasNonassignmentSex(slave) && !App.Utils.hasAssignmentSex(slave) && !App.Utils.sexAllowed(slave, V.PC);
+};
+
/**
* Returns true if there is any restriction at all on how a slave may choose to get off.
* @param {App.Entity.SlaveState} slave
diff --git a/src/js/reminder.js b/src/js/reminder.js
index 719581a6c7434f8bd0134a6c26d71c862349ad93..595923d3a6df429fb23bdf014ef99d61b21ca14f 100644
--- a/src/js/reminder.js
+++ b/src/js/reminder.js
@@ -1,6 +1,9 @@
App.Reminders = (function() {
- const displayDiv = document.createElement("div");
- const addDiv = document.createElement("div");
+ /**
+ * @type {Array<function():void>}
+ */
+ let activeViewRefreshers = [];
+
return {
add: add,
list: list,
@@ -8,6 +11,7 @@ App.Reminders = (function() {
slaveDisplay: slaveDisplay,
slaveLink: slaveLink,
dialog: dialog,
+ clear: clearActive,
};
/**
@@ -15,10 +19,11 @@ App.Reminders = (function() {
* @param {number} week
* @param {string} [category]
* @param {number} [slaveID]
+ * @returns {boolean} Whether a reminder was actually added or we aborted.
*/
function add(message, week, category = "manual", slaveID = 0) {
if (message === "" || message === null) {
- return;
+ return false;
}
const entry = {message: message, week: week, category: category};
if (slaveID) {
@@ -32,6 +37,7 @@ App.Reminders = (function() {
} else {
V.reminders.splice(index, 0, entry);
}
+ return true;
}
/**
@@ -52,28 +58,23 @@ App.Reminders = (function() {
const outerSpan = document.createElement("span");
- function replace() {
- App.UI.DOM.replace(outerSpan, list({maxFuture, filter, link}));
- App.Utils.scheduleSidebarRefresh();
- }
-
/**
* @param {FC.ReminderEntry} entry
*/
function clearEntry(entry) {
V.reminders.splice(V.reminders.indexOf(entry), 1);
- replace();
+ refreshActive();
}
// We only want to remove visible entries
function clearOverdue() {
V.reminders = V.reminders.filter(e => e.week >= V.week || e.week > V.week + maxFuture || !filter(e));
- replace();
+ refreshActive();
}
function clearAll() {
V.reminders = V.reminders.filter(e => e.week > V.week + maxFuture || !filter(e));
- replace();
+ refreshActive();
}
let overdue = 0;
@@ -126,25 +127,27 @@ App.Reminders = (function() {
}
/**
- * @param {function():void} refresh
* @param {string} [category]
* @param {number} [slaveID]
* @returns {HTMLDivElement}
*/
- function addField(refresh, category, slaveID) {
- jQuery(addDiv).empty();
+ function addField(category, slaveID) {
+ const addDiv = document.createElement("div");
let entry = "";
let week = 0;
addDiv.append(
- App.UI.DOM.makeTextBox("", v => { entry = v; }),
- " in ", App.UI.DOM.makeTextBox(0, v => { week = v; }, true), " weeks.",
+ App.UI.DOM.makeTextBox("", v => {
+ entry = v;
+ }),
+ " in ", App.UI.DOM.makeTextBox(0, v => {
+ week = v;
+ }, true), " weeks.",
" ", App.UI.DOM.link("Add", () => {
- add(entry, V.week + week, category, slaveID);
- refresh();
- App.Utils.scheduleSidebarRefresh();
- jQuery(addDiv).append(addField(refresh, category, slaveID));
+ if (add(entry, V.week + week, category, slaveID)) {
+ refreshActive();
+ }
})
);
@@ -153,10 +156,22 @@ App.Reminders = (function() {
/**
* @param {boolean} [link=false] show passage links
+ * @param {HTMLElement} [displayDiv] Only to be used by the refresh functionality
* @returns {HTMLElement}
*/
- function fullDisplay(link) {
- jQuery(displayDiv).empty();
+ function fullDisplay(link, displayDiv) {
+ if (displayDiv) {
+ // If displayDiv is given, it either is currently being shown or the tree it belonged to was removed from
+ // the page. In that case we don't need to refresh it ever again.
+ if (!displayDiv.isConnected) {
+ return null;
+ }
+ jQuery(displayDiv).empty();
+ } else {
+ displayDiv = document.createElement("div");
+ }
+ activeViewRefreshers.push(() => fullDisplay(link, displayDiv));
+
displayDiv.append(App.UI.DOM.makeElement("h2", "Reminders"));
const listEl = list({link});
@@ -165,17 +180,27 @@ App.Reminders = (function() {
}
displayDiv.append(App.UI.DOM.makeElement("h3", "Add new"));
- displayDiv.append(App.UI.DOM.makeElement("p", addField(() => fullDisplay(link))));
+ displayDiv.append(App.UI.DOM.makeElement("p", addField()));
return displayDiv;
}
/**
* @param {number} slaveID
+ * @param {HTMLElement} [displayDiv] Only to be used by the refresh functionality
* @returns {HTMLElement}
*/
- function slaveDisplay(slaveID) {
- jQuery(displayDiv).empty();
+ function slaveDisplay(slaveID, displayDiv) {
+ if (displayDiv) {
+ if (!displayDiv.isConnected) {
+ return null;
+ }
+ jQuery(displayDiv).empty();
+ } else {
+ displayDiv = document.createElement("div");
+ }
+ activeViewRefreshers.push(() => slaveDisplay(slaveID, displayDiv));
+
displayDiv.append(App.UI.DOM.makeElement("h2", `Reminders for ${SlaveFullName(getSlave(slaveID))}`));
const listEl = list({filter: e => e.slaveID === slaveID});
@@ -184,7 +209,7 @@ App.Reminders = (function() {
}
displayDiv.append(App.UI.DOM.makeElement("h3", "Add new"));
- displayDiv.append(App.UI.DOM.makeElement("p", addField(() => slaveDisplay(slaveID), "slave", slaveID)));
+ displayDiv.append(App.UI.DOM.makeElement("p", addField("slave", slaveID)));
return displayDiv;
}
@@ -211,4 +236,18 @@ App.Reminders = (function() {
$(Dialog.body()).empty().append(slaveID ? slaveDisplay(slaveID) : fullDisplay(showLinks));
Dialog.open();
}
+
+ function refreshActive() {
+ console.log(activeViewRefreshers.length);
+ const ars = activeViewRefreshers;
+ activeViewRefreshers = [];
+ for (const refresher of ars) {
+ refresher();
+ }
+ App.Utils.scheduleSidebarRefresh();
+ }
+
+ function clearActive() {
+ activeViewRefreshers = [];
+ }
})();
diff --git a/src/js/removeSlave.js b/src/js/removeSlave.js
index e6e479acc53307191e1b93c65394be870e688e7d..6cdb3c72a919c34b9ddb1d82a0573180afd3764c 100644
--- a/src/js/removeSlave.js
+++ b/src/js/removeSlave.js
@@ -116,6 +116,10 @@ globalThis.removeSlave = function(slave) {
}
});
+ /* remove from Pit trainee list, if needed */
+ if (V.pit && V.pit.trainingIDs) {
+ V.pit.trainingIDs.delete(AS_ID);
+ }
/* remove from Pit fighters list, if needed */
if (V.pit && V.pit.fighterIDs) {
V.pit.fighterIDs.delete(AS_ID);
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index 66be45512f37b12852935668bed9da7d7b17b256..3b1a393314fc6efd9bf7a110b30f2af0c2c6b370 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -4,8 +4,7 @@
* @returns {boolean}
*/
globalThis.hasSurgeryRule = function(slave, rules) {
- return rules.some(
- rule => ruleApplied(slave, rule));
+ return rules.some(rule => ruleApplied(slave, rule));
};
/**
@@ -65,20 +64,21 @@ globalThis.rulesDemandContraceptives = function(slave, rules) {
};
/**
- * @param {FC.RA.RuleSetters[]} rules
- * @returns {FC.RA.RuleSetters}
+ * @param {Array<[FC.RA.RuleSetters, string]>} rules
+ * @returns {[FC.RA.RuleSetters,object]}
*/
globalThis.mergeRules = function(rules) {
if (rules.length === 0) {
- return emptyDefaultRule().set;
+ return [App.RA.newRule.setters(), {}];
}
- const combinedRule = emptyDefaultRule().set;
+ const combinedRule = App.RA.newRule.setters();
+ const sourceRecord = {};
rules.forEach(rule => {
- App.RA.ruleDeepAssign(combinedRule, rule);
+ App.RA.ruleDeepAssign(combinedRule, rule[0], sourceRecord, rule[1]);
});
- return combinedRule;
+ return [combinedRule, sourceRecord];
};
/**
@@ -178,6 +178,7 @@ App.RA.newRule = function() {
function emptyConditions() {
return {
activation: ["devotion", 20, "gt", 1, "and"],
+ advancedMode: V.raDefaultMode === 1,
selectedSlaves: [],
excludedSlaves: [],
applyRuleOnce: false,
@@ -281,6 +282,7 @@ App.RA.newRule = function() {
earwear: null,
setAssignment: null,
pitRules: null,
+ arenaRules: null,
facilityRemove: false,
removalAssignment: Job.REST,
surgery: emptySurgery(),
@@ -405,7 +407,16 @@ App.RA.shallShrink = function(current, target, step = 1) {
(current === target.val && target.cond === '<'));
};
-App.RA.ruleDeepAssign = function deepAssign(target, source) {
+/**
+ * @template {object} T
+ * @param {object} target Rule or rule part
+ * @param {T} source Rule or rule part, describes the same part as target
+ * @param {object} sourceRecord record what was overwritten. Overwrites are located the same as in target, marked with
+ * sourceName. Describes the same rule(part) as target.
+ * @param {string} sourceName Name for the source object.
+ * @returns {T}
+ */
+App.RA.ruleDeepAssign = function deepAssign(target, source, sourceRecord, sourceName) {
function isObject(o) {
return (o !== undefined && o !== null && typeof o === 'object' && !Array.isArray(o));
}
@@ -418,13 +429,18 @@ App.RA.ruleDeepAssign = function deepAssign(target, source) {
if (!target.hasOwnProperty(key) || target[key] === null) {
target[key] = {};
}
- deepAssign(target[key], source[key]);
+ if (!sourceRecord.hasOwnProperty(key)) {
+ sourceRecord[key] = {};
+ }
+ deepAssign(target[key], source[key], sourceRecord[key], sourceName);
} else if (key === "label" || key === "removeLabel") {
if (source[key] != null) {
if (target[key] != null) {
target[key] += "|" + source[key];
+ sourceRecord[key] += "+" + sourceName;
} else {
target[key] = source[key];
+ sourceRecord[key] = sourceName;
}
}
} else {
@@ -438,6 +454,9 @@ App.RA.ruleDeepAssign = function deepAssign(target, source) {
(key !== "autoBrand" && source[key] !== null));
if (overrides) {
target[key] = source[key];
+ if (source[key] !== null) {
+ sourceRecord[key] = sourceName;
+ }
}
}
}
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index d47e17530bd85da037165d1c16ba5bef4abd7997..c2819680f42843e8dc91cbe97d127320fbc0863c 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -87,11 +87,22 @@ App.RA.options = (function() {
}
function changeName(name) {
- if (name === current_rule.name) { return; }
+ if (name === current_rule.name) {
+ return;
+ }
current_rule.name = name;
reload();
}
+ function duplicate() {
+ const clonedRule = _.cloneDeep(current_rule);
+ clonedRule.ID = generateNewID();
+ clonedRule.name = `Copy of ${clonedRule.name}`;
+ V.currentRule = clonedRule.ID;
+ V.defaultRules.push(clonedRule);
+ reload();
+ }
+
// reload the passage
function reload() {
saveSettings();
@@ -105,7 +116,9 @@ App.RA.options = (function() {
* Save the settings for this rule.
*/
function saveSettings() {
- App.RA.Activation.Editor.save(cond => current_rule.condition.activation = cond);
+ if (current_rule) {
+ App.RA.Activation.Editor.save(current_rule.condition);
+ }
}
const parse = {
@@ -1157,9 +1170,11 @@ App.RA.options = (function() {
const rule = JSON.parse(text);
if (Array.isArray(rule)) {
rule.forEach(r => {
+ r.ID = generateNewID();
V.defaultRules.push(App.Entity.Utils.RARuleDatatypeCleanup(r));
});
} else {
+ rule.ID = generateNewID();
V.defaultRules.push(App.Entity.Utils.RARuleDatatypeCleanup(rule));
}
reload();
@@ -1240,6 +1255,7 @@ App.RA.options = (function() {
this.appendChild(new OptionsItem("Lower Priority", lowerPriority));
this.appendChild(new OptionsItem("Higher Priority", higherPriority));
this.appendChild(new OptionsItem("Rename", rename(this)));
+ this.appendChild(new OptionsItem("Duplicate", duplicate));
this.appendChild(new OptionsItem("Export this rule", () => this.appendChild(new ExportField(current_rule))));
this.appendChild(new OptionsItem("Export all rules", () => this.appendChild(new ExportField(...V.defaultRules))));
this.appendChild(new OptionsItem("Import rule(s)", () => this.appendChild(new NewRuleField())));
@@ -1294,7 +1310,7 @@ App.RA.options = (function() {
class ConditionBuilder extends Element {
render() {
- return App.RA.Activation.Editor.build(current_rule.condition.activation);
+ return App.RA.Activation.Editor.build(current_rule.condition);
}
}
@@ -1453,6 +1469,7 @@ App.RA.options = (function() {
super("behavior", "Behavior", tabButtons);
this.appendChild(new AutomaticAssignmentList());
if (V.pit) {
+ this.appendChild(new ArenaAssignmentList());
this.appendChild(new PitAssignmentList());
}
this.appendChild(new LivingStandardList());
@@ -3958,7 +3975,9 @@ App.RA.options = (function() {
const facilitiesToSkip = [penthouse, facilities.pit, facilities.armory, facilities.arcologyAgent];
for (const fn in facilities) {
const f = facilities[fn];
- if (facilitiesToSkip.includes(f)) { continue; }
+ if (facilitiesToSkip.includes(f)) {
+ continue;
+ }
items.push([f.name, f.job().desc.assignment]);
}
@@ -3968,6 +3987,15 @@ App.RA.options = (function() {
}
}
+ class ArenaAssignmentList extends ListSelector {
+ constructor() {
+ const items = [["remove from arena", 0], ["train at arena", 1]];
+ super("Arena assignment", items);
+ this.setValue(current_rule.set.arenaRules);
+ this.onchange = (value) => current_rule.set.arenaRules = value;
+ }
+ }
+
class PitAssignmentList extends ListSelector {
constructor() {
const items = [["remove from pit", 0], ["assign to pit", 1]];
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index a471808277e3bc4db0453bd739e2a41cdedd135b..06eaddbf73fb5d937155a664f58c9d2043048a1c 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -138,7 +138,7 @@ globalThis.rulesAutosurgery = (function() {
}
const [diff, reaction] = surgeryResult;
- const result1 = reaction.reaction(slave, diff);
+ const result1 = reaction.reaction(slave, diff);
const result2 = reaction.outro(slave, diff, result1);
App.Utils.Diff.applyDiff(slave, diff);
@@ -157,12 +157,12 @@ globalThis.rulesAutosurgery = (function() {
* @param {"hips"|"shoulders"} target
*/
function pelvisShouldersImplants(label, target){
- const request = thisSurgery[`${target}Implant}`];
+ const request = thisSurgery[`${target}Implant`];
if (Math.abs(request) > 0) {
if (Math.abs(request) < 2 || V.surgeryUpgrade) {
const change = request > 0 ? 1 : -1;
commitProcedure(`surgery to ${request > 0 ? "broaden" : "narrow"} ${his} ${label}`,
- s => { s[target] += change; s[`${target}Implant}`] += change; },
+ s => { s[target] += change; s[`${target}Implant`] += change; },
40);
}
}
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index ce794066b8fdf15321f894f22c222dd804e90b8f..dc38aa0a0d72f64b5d3ae387b20c79d6e1c9a67d 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -77,77 +77,69 @@ globalThis.minimumSlaveCost = function(includeLaws = false) {
/**
* @param {App.Entity.SlaveState} slave
- * @returns {Array}
+ * @returns {Array<{text:string, value: number}>}
*/
-globalThis.BeautyArray = (function() {
- "use strict";
-
- let arcology;
- let beauty;
- let retval;
-
- function BeautyReturn(slave) {
- arcology = V.arcologies[0];
- beauty = 0;
- retval = [];
-
- calcInitBeauty(slave);
- if (slave.fuckdoll === 0) {
- adjustBeauty("Not a fuckdoll", (30));
- calcIntelligenceBeauty(slave);
- calcFaceBeauty(slave);
- calcTeethBeauty(slave);
- calcModBeauty(slave);
- calcCosmeticsBeauty(slave);
- calcFSNotFuckdollBeauty(slave);
- calcMiscNotFuckdollBeauty(slave);
- }
- calcHeightBeauty(slave);
- if (slave.dick > 0) {
- calcDickBeauty(slave);
- }
- if (slave.balls > 0) {
- calcBallsBeauty(slave);
- }
- calcButtBeauty(slave);
- calcHipsBeauty(slave);
- calcBoobsBeauty(slave);
- calcWeightBeauty(slave);
- calcMusclesBeauty(slave);
- calcBodyHairBeauty(slave);
- calcImplantBeauty(slave);
- if (arcology.FSRepopulationFocus > 40) {
- calcRepopulationPregBeauty(slave);
- } else if (arcology.FSRepopulationFocusPregPolicy === 1) {
- calcTrendyPregBeauty(slave);
- } else if (arcology.FSRestart > 40) {
- calcRestartPregBeauty(slave);
- }
- if (arcology.FSRepopulationFocusMilfPolicy === 1) {
- calcTrendyMilfBeauty(slave);
- }
- if (arcology.FSGenderRadicalistLawFuta !== 0) {
- calcFutaLawBeauty(slave);
- }
- calcBodyProportionBeauty(slave);
- calcVoiceBeauty(slave);
- calcLimbsBeauty(slave);
- calcPubertyBeauty(slave);
- calcFSMiscBeauty(slave);
-
- calcPurityBeauty(slave);
- calcPhysiqueBeauty(slave);
- if (arcology.FSSlimnessEnthusiastLaw === 1) {
- calcSlimBeauty(slave);
- }
- if (arcology.FSGenderFundamentalistLawBeauty + arcology.FSGenderRadicalistLawBeauty > 0) {
- calcGenderLawBeauty(slave);
- }
-
- calcMultipliersBeauty(slave);
-
- return retval;
- }
+globalThis.BeautyArray = function(slave) {
+ let arcology = V.arcologies[0];
+ let beauty = 0;
+ let retval = [];
+
+ calcInitBeauty(slave);
+ if (slave.fuckdoll === 0) {
+ adjustBeauty("Not a fuckdoll", (30));
+ calcIntelligenceBeauty(slave);
+ calcFaceBeauty(slave);
+ calcTeethBeauty(slave);
+ calcModBeauty(slave);
+ calcCosmeticsBeauty(slave);
+ calcFSNotFuckdollBeauty(slave);
+ calcMiscNotFuckdollBeauty(slave);
+ }
+ calcHeightBeauty(slave);
+ if (slave.dick > 0) {
+ calcDickBeauty(slave);
+ }
+ if (slave.balls > 0) {
+ calcBallsBeauty(slave);
+ }
+ calcButtBeauty(slave);
+ calcHipsBeauty(slave);
+ calcBoobsBeauty(slave);
+ calcWeightBeauty(slave);
+ calcMusclesBeauty(slave);
+ calcBodyHairBeauty(slave);
+ calcImplantBeauty(slave);
+ if (arcology.FSRepopulationFocus > 40) {
+ calcRepopulationPregBeauty(slave);
+ } else if (arcology.FSRepopulationFocusPregPolicy === 1) {
+ calcTrendyPregBeauty(slave);
+ } else if (arcology.FSRestart > 40) {
+ calcRestartPregBeauty(slave);
+ }
+ if (arcology.FSRepopulationFocusMilfPolicy === 1) {
+ calcTrendyMilfBeauty(slave);
+ }
+ if (arcology.FSGenderRadicalistLawFuta !== 0) {
+ calcFutaLawBeauty(slave);
+ }
+ calcBodyProportionBeauty(slave);
+ calcVoiceBeauty(slave);
+ calcLimbsBeauty(slave);
+ calcPubertyBeauty(slave);
+ calcFSMiscBeauty(slave);
+
+ calcPurityBeauty(slave);
+ calcPhysiqueBeauty(slave);
+ if (arcology.FSSlimnessEnthusiastLaw === 1) {
+ calcSlimBeauty(slave);
+ }
+ if (arcology.FSGenderFundamentalistLawBeauty + arcology.FSGenderRadicalistLawBeauty > 0) {
+ calcGenderLawBeauty(slave);
+ }
+
+ calcMultipliersBeauty(slave);
+
+ return retval;
function adjustBeauty(text, beautyChange) {
if (beautyChange) {
@@ -1623,9 +1615,7 @@ globalThis.BeautyArray = (function() {
adjustBeauty("Porn Prestige", (0.1 * beauty));
}
}
-
- return BeautyReturn;
-})();
+};
globalThis.Beauty = function(s) {
let beauty = BeautyArray(s).reduce((result, {value}) => result + value, 0);
@@ -1633,8 +1623,12 @@ globalThis.Beauty = function(s) {
return beauty;
};
+/**
+ * Show an itemized breakdown of the beauty value (Beauty) of the slave.
+ * @param {App.Entity.SlaveState} slave
+ * @returns {HTMLSpanElement}
+ */
globalThis.BeautyTooltip = function(slave) {
- // Make a link. Text should be slave's beauty. Clicking the link will display detailed info about that beauty over the top of the page (tooltip-style)
const beauty = Beauty(slave);
const span = App.UI.DOM.makeElement("span", beauty.toString(), ["pink", "bold"]);
span.tabIndex = 0;
@@ -1646,94 +1640,136 @@ globalThis.BeautyTooltip = function(slave) {
});
return span;
- // Upon the link being clicked, set up some links to sort the info and a span to show it in
function BeautyDisplay() {
- let criteria = "value";
- let direction = "descending";
-
- // Heading line that handles sorting
- let el = document.createElement('div');
+ const el = document.createElement("div");
el.classList.add("tip-details");
+ el.append(RelativeDataTable(BeautyArray(slave), "text", "value", [10, 100]));
- el.appendChild(document.createTextNode(`Sort by: `));
- el.appendChild(App.UI.DOM.generateLinksStrip([
- App.UI.DOM.link("Text", () => {
- criteria = "text";
- jQuery('#cheatBeautyContents').empty().append(BeautyFrame());
- }, []),
- App.UI.DOM.link("Value", () => {
- criteria = "value";
- jQuery('#cheatBeautyContents').empty().append(BeautyFrame());
- }, []),
- App.UI.DOM.link("Ascending", () => {
- direction = "ascending";
- jQuery('#cheatBeautyContents').empty().append(BeautyFrame());
- }, []),
- App.UI.DOM.link("Descending", () => {
- direction = "descending";
- jQuery('#cheatBeautyContents').empty().append(BeautyFrame());
- }, [])
- ]));
-
- let cheatBeautyContents = App.UI.DOM.appendNewElement("div", el, BeautyFrame());
- cheatBeautyContents.id = "cheatBeautyContents";
App.UI.DOM.appendNewElement("div", el, `${beauty * 2}/2 is ${beauty}, ${getPronouns(slave).his} total score`);
return el;
+ }
+};
- // Set up the frame that contains the info
- function BeautyFrame() {
- let el = document.createElement("div");
- el.classList.add("grid-2columns-auto");
+/**
+ * Generate a table displaying text-value (string-number) pairs.
+ * Table can be sorted by text and value
+ * The numbers will be hidden if not in cheat/debug mode and it will show +/- instead
+ *
+ * TODO: move to proper file & namespace
+ *
+ * @param {Array<object>} data Every object must have textKey and valueKey properties
+ * @param {string} textKey
+ * @param {string} valueKey
+ * @param {number[]} signSteps Must be positive and ascending. For every step where the absolute value is larger, add a +/-.
+ * @returns {HTMLDivElement}
+ */
+globalThis.RelativeDataTable = function(data, textKey, valueKey, signSteps) {
+ /** @type {"text"|"value"} */
+ let orderCriteria = "value";
+ /** @type {"ascending"|"descending"} */
+ let orderDirection = "descending";
+
+ const dataFrame = document.createElement("div");
+ dataFrame.append(buttons(), frame());
+ return dataFrame;
+
+ function buttons() {
+ const frag = new DocumentFragment();
+ frag.append(document.createTextNode(`Sort by: `));
+ const links = [];
+ if (orderCriteria === "text") {
+ links.push("Text");
+ } else {
+ links.push(App.UI.DOM.link("Text", () => {
+ orderCriteria = "text";
+ jQuery(dataFrame).empty().append(buttons(), frame());
+ }, []));
+ }
+ if (orderCriteria === "value") {
+ links.push("Value");
+ } else {
+ links.push(App.UI.DOM.link("Value", () => {
+ orderCriteria = "value";
+ jQuery(dataFrame).empty().append(buttons(), frame());
+ }, []));
+ }
+ if (orderDirection === "ascending") {
+ links.push("Ascending");
+ } else {
+ links.push(App.UI.DOM.link("Ascending", () => {
+ orderDirection = "ascending";
+ jQuery(dataFrame).empty().append(buttons(), frame());
+ }, []));
+ }
+ if (orderDirection === "descending") {
+ links.push("Descending");
+ } else {
+ links.push(App.UI.DOM.link("Descending", () => {
+ orderDirection = "descending";
+ jQuery(dataFrame).empty().append(buttons(), frame());
+ }, []));
+ }
+ frag.append(App.UI.DOM.generateLinksStrip(links));
+ return frag;
+ }
- let beautyArray;
- if ((criteria === "text" && direction === "descending") || (criteria === "value" && direction === "ascending")) {
- beautyArray = BeautyArray(slave).sort((a, b) => (a[criteria] > b[criteria]) ? 1 : -1);
- } else {
- beautyArray = BeautyArray(slave).sort((a, b) => (a[criteria] < b[criteria]) ? 1 : -1);
- }
+ /**
+ * @returns {HTMLDivElement}
+ */
+ function frame() {
+ const gridDiv = document.createElement("div");
+ gridDiv.classList.add("grid-2columns-auto");
- beautyArray.forEach((line) => {
- line.value = (Math.floor(line.value * 10) / 10);
+ const key = orderCriteria === "text" ? textKey : valueKey;
- let className;
- if (line.value > 0) {
- className = "green";
- } else if (line.value < 0) {
- className = "red";
- }
+ if ((orderCriteria === "text" && orderDirection === "descending") ||
+ (orderCriteria === "value" && orderDirection === "ascending")) {
+ data.sort((a, b) => (a[key] > b[key]) ? 1 : -1);
+ } else {
+ data.sort((a, b) => (a[key] < b[key]) ? 1 : -1);
+ }
- if (V.cheatMode || V.debugMode) {
- App.UI.DOM.appendNewElement("div", el, line.value.toString(), className);
- } else {
- if (line.value > 0) {
- const value = line.value / 10;
- let plus = '+';
-
- if (value > 10) {
- plus = `+++`;
- } else if (value > 1) {
- plus = `++`;
- }
+ for (const line of data) {
+ const value = (Math.floor(line[valueKey] * 10) / 10);
- App.UI.DOM.appendNewElement("div", el, plus, className);
- } else {
- const value = line.value / 10;
- let minus = '-';
+ let classNames = [];
+ if (value > 0) {
+ classNames.push("green");
+ } else if (value < 0) {
+ classNames.push("red");
+ }
- if (value < -10) {
- minus = `---`;
- } else if (value < -1) {
- minus = `--`;
+ if (V.cheatMode || V.debugMode) {
+ App.UI.DOM.appendNewElement("div", gridDiv, value.toString(), classNames);
+ } else {
+ if (value > 0) {
+ let signs = '+';
+ for (const signStep of signSteps) {
+ if (value > signStep) {
+ signs += "+";
+ } else {
+ break;
}
+ }
- App.UI.DOM.appendNewElement("div", el, minus, className);
+ App.UI.DOM.appendNewElement("div", gridDiv, signs, classNames);
+ } else {
+ let signs = '-';
+ for (const signStep of signSteps) {
+ if (value < -signStep) {
+ signs += "-";
+ } else {
+ break;
+ }
}
+
+ App.UI.DOM.appendNewElement("div", gridDiv, signs, classNames);
}
+ }
- App.UI.DOM.appendNewElement("div", el, line.text);
- });
- return el;
+ App.UI.DOM.appendNewElement("div", gridDiv, line[textKey]);
}
+ return gridDiv;
}
};
@@ -1798,7 +1834,7 @@ globalThis.FResultArray = (function() {
calcHedonismWeight(slave);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
adjustFResult(`Mindbroken: total score reduced by 60% instead of 30%`, -Math.trunc(result * 0.6));
} else {
adjustFResult(`All score totals are cut by 30%`, -Math.trunc(result * 0.3));
@@ -1979,7 +2015,7 @@ globalThis.FResultArray = (function() {
if (slave.tail === "sex") {
adjustFResult(`Tail: Sex`, 1);
}
- if (slave.fetishKnown === 1 && slave.fetishStrength > 60 && slave.fetish !== "none") {
+ if (slave.fetishKnown === 1 && slave.fetishStrength > 60 && slave.fetish !== Fetish.NONE) {
adjustFResult(`Fetish: Known`, slave.fetishStrength / 5);
}
@@ -2205,10 +2241,10 @@ globalThis.FResult = function(s, forSale = 0) {
return FResult;
};
-/** Show an itemized breakdown of the sexual value (FResult) of the slave
+/** Show an itemized breakdown of the sexual value (FResult) of the slave.
* @param {App.Entity.SlaveState} slave
* @param {number} [forSale=0] set to 1 to ignore co-assignment and other temporary factors
- * @returns {Node}
+ * @returns {HTMLSpanElement}
*/
globalThis.FResultTooltip = function(slave, forSale = 0) {
// Make a link. Text should be slave's FResult. Clicking the link will display detailed info about that FResult over the top of the page (tooltip-style)
@@ -2226,93 +2262,10 @@ globalThis.FResultTooltip = function(slave, forSale = 0) {
* @returns {HTMLElement}
*/
function FResultDisplay() {
- let criteria = "value";
- let direction = "descending";
-
- // Heading line that handles sorting
- const el = document.createElement('div');
+ const el = document.createElement("div");
el.classList.add("tip-details");
-
- el.appendChild(document.createTextNode(`Sort by: `));
- el.appendChild(App.UI.DOM.generateLinksStrip([
- App.UI.DOM.link("Text", () => {
- criteria = "text";
- jQuery('#cheatFResultContents').empty().append(FResultFrame);
- }, []),
- App.UI.DOM.link("Value", () => {
- criteria = "value";
- jQuery('#cheatFResultContents').empty().append(FResultFrame);
- }, []),
- App.UI.DOM.link("Ascending", () => {
- direction = "ascending";
- jQuery('#cheatFResultContents').empty().append(FResultFrame);
- }, []),
- App.UI.DOM.link("Descending", () => {
- direction = "descending";
- jQuery('#cheatFResultContents').empty().append(FResultFrame);
- }, [])
- ]));
-
- let cheatFResultContents = App.UI.DOM.appendNewElement("div", el, FResultFrame());
- cheatFResultContents.id = "cheatFResultContents";
+ el.append(RelativeDataTable(FResultArray(slave, forSale), "text", "value", [1, 10]));
return el;
-
- /** Set up the frame that contains the info
- * @returns {HTMLDivElement}
- */
- function FResultFrame() {
- let el = document.createElement("div");
- el.classList.add("grid-2columns-auto");
-
- let fResultArray;
- if ((criteria === "text" && direction === "descending") || (criteria === "value" && direction === "ascending")) {
- fResultArray = FResultArray(slave, forSale).sort((a, b) => (a[criteria] > b[criteria]) ? 1 : -1);
- } else {
- fResultArray = FResultArray(slave, forSale).sort((a, b) => (a[criteria] < b[criteria]) ? 1 : -1);
- }
-
- fResultArray.forEach((line) => {
- line.value = (Math.floor(line.value * 10) / 10);
-
- let className;
- if (line.value > 0) {
- className = "green";
- } else if (line.value < 0) {
- className = "red";
- }
-
- if (V.cheatMode || V.debugMode) {
- App.UI.DOM.appendNewElement("div", el, line.value.toString(), className);
- } else {
- if (line.value > 0) {
- const value = line.value;
- let plus = '+';
-
- if (value > 10) {
- plus = `+++`;
- } else if (value > 1) {
- plus = `++`;
- }
-
- App.UI.DOM.appendNewElement("div", el, plus, className);
- } else {
- const value = line.value;
- let minus = '-';
-
- if (value < -10) {
- minus = `---`;
- } else if (value < -1) {
- minus = `--`;
- }
-
- App.UI.DOM.appendNewElement("div", el, minus, className);
- }
- }
-
- App.UI.DOM.appendNewElement("div", el, line.text);
- });
- return el;
- }
}
};
@@ -2322,12 +2275,12 @@ globalThis.FResultTooltip = function(slave, forSale = 0) {
* @param {boolean} [followLaws] Apply cost variations from enacted Slave Market Regulations
* @param {boolean} [isSpecial] is this slave a special/hero slave
* @param {boolean} [returnDOM]
- * @param {object} [fromMarket] is this slave from the market
+ * @param {Array<{factor: number, reason: string}>} [modifiers]
* @returns {number|Object}
*/
-globalThis.slaveCost = function(slave, isStartingSlave = false, followLaws = false, isSpecial = false, returnDOM = false, fromMarket = null) {
+globalThis.slaveCost = function(slave, isStartingSlave = false, followLaws = false, isSpecial = false, returnDOM = false, modifiers = []) {
const milked = App.SlaveAssignment.getMilked(slave, 1.0, true);
- const beautyObj = slaveCostBeauty(slave, isStartingSlave, followLaws, isSpecial, fromMarket);
+ const beautyObj = slaveCostBeauty(slave, isStartingSlave, followLaws, isSpecial, modifiers);
const cost = beautyObj.cost;
/** Arbitrarily, let's say their milk worth is what they would make in a year. Blocking starting slave for now because milk makes so much money, the estimation makes game start impossible. */
const milkYear = milked.cash * 52;
@@ -2374,23 +2327,23 @@ globalThis.slaveCost = function(slave, isStartingSlave = false, followLaws = fal
el.appendChild(App.UI.DOM.generateLinksStrip([
App.UI.DOM.link("Text", () => {
criteria = "text";
- jQuery(cheatFResultContents).empty().append(costFrame);
+ jQuery(cheatContents).empty().append(costFrame);
}, []),
App.UI.DOM.link("Value", () => {
criteria = "value";
- jQuery(cheatFResultContents).empty().append(costFrame);
+ jQuery(cheatContents).empty().append(costFrame);
}, []),
App.UI.DOM.link("Ascending", () => {
direction = "ascending";
- jQuery(cheatFResultContents).empty().append(costFrame);
+ jQuery(cheatContents).empty().append(costFrame);
}, []),
App.UI.DOM.link("Descending", () => {
direction = "descending";
- jQuery(cheatFResultContents).empty().append(costFrame);
+ jQuery(cheatContents).empty().append(costFrame);
}, [])
]));
- let cheatFResultContents = App.UI.DOM.appendNewElement("div", el, costFrame());
+ let cheatContents = App.UI.DOM.appendNewElement("div", el, costFrame());
App.UI.DOM.appendNewElement("div", el, "A slave's base value is modified by an additive multiplier.", "note");
@@ -2444,10 +2397,10 @@ globalThis.slaveCost = function(slave, isStartingSlave = false, followLaws = fal
* @param {boolean} isStartingSlave is the slave a "starting slave"
* @param {boolean} followLaws Apply cost variations from enacted Slave Market Regulations
* @param {boolean} isSpecial is this slave a special/hero slave
- * @param {object} [fromMarket=null] is this slave from the market
+ * @param {Array<{factor: number, reason: string}>} modifiers market discounts, etc
* @returns {Object}
*/
-globalThis.slaveCostBeauty = function(slave, isStartingSlave, followLaws, isSpecial, fromMarket) {
+globalThis.slaveCostBeauty = function(slave, isStartingSlave, followLaws, isSpecial, modifiers) {
const arcology = V.arcologies[0];
let multiplier = V.slaveCostFactor;
let cost = Beauty(slave) * FResult(slave, 1);
@@ -2473,18 +2426,15 @@ globalThis.slaveCostBeauty = function(slave, isStartingSlave, followLaws, isSpec
calcStartingSlaveCost(slave);
}
- if (fromMarket) {
- if (fromMarket.limitReached) {
- cost += cost * ((V.slavesSeen - V.slaveMarketLimit) * 0.1); // updateMultiplier(`Market reach exceeded`, (cost * (V.slavesSeen - V.slaveMarketLimit)));
- }
- if (fromMarket.costMod > 0 && fromMarket.costMod <= 1) {
- cost *= fromMarket.costMod;
- } else {
- cost += fromMarket.costMod;
- }
- cost = 500 * Math.trunc(cost / 500);
+ // handle incoming modifiers (such as market discounts)
+ for (const mod of modifiers) {
+ cost *= (1 + mod.factor);
+ map.set("(%) " + mod.reason, mod.factor * 100);
}
+ // round to nearest 500 credits
+ cost = 500 * Math.trunc(cost / 500);
+
return {cost: cost, map: map};
/**
@@ -2570,9 +2520,9 @@ globalThis.slaveCostBeauty = function(slave, isStartingSlave, followLaws, isSpec
updateMultiplier(`sexual quirk`, 0.1);
}
if (slave.fetishKnown === 1) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
updateMultiplier(`mindbroken`, -0.3);
- } else if (slave.fetish !== "none") {
+ } else if (slave.fetish !== Fetish.NONE) {
updateMultiplier(`fetish`, slave.fetishStrength / 1000);
}
} else {
@@ -2805,52 +2755,52 @@ globalThis.slaveCostBeauty = function(slave, isStartingSlave, followLaws, isSpec
updateMultiplier(`whore career`, 0.05);
}
}
- if (!App.Data.Careers.Leader.bodyguard.includes(slave.career) && slave.skill.bodyguard >= V.masteredXP) {
+ if (!App.Data.Careers.Leader.bodyguard.includes(slave.career) && slave.skill.bodyguard >= Constant.MASTERED_XP) {
updateMultiplier(`good bodyguard`, 0.1);
}
- if (!App.Data.Careers.Leader.wardeness.includes(slave.career) && slave.skill.wardeness >= V.masteredXP) {
+ if (!App.Data.Careers.Leader.wardeness.includes(slave.career) && slave.skill.wardeness >= Constant.MASTERED_XP) {
updateMultiplier(`good wardeness`, 0.1);
}
- if (!App.Data.Careers.Leader.attendant.includes(slave.career) && slave.skill.attendant >= V.masteredXP) {
+ if (!App.Data.Careers.Leader.attendant.includes(slave.career) && slave.skill.attendant >= Constant.MASTERED_XP) {
updateMultiplier(`good attendant`, 0.1);
}
- if (!App.Data.Careers.Leader.nurse.includes(slave.career) && slave.skill.nurse >= V.masteredXP) {
+ if (!App.Data.Careers.Leader.nurse.includes(slave.career) && slave.skill.nurse >= Constant.MASTERED_XP) {
updateMultiplier(`good nurse`, 0.1);
}
- if (!App.Data.Careers.Leader.matron.includes(slave.career) && slave.skill.matron >= V.masteredXP) {
+ if (!App.Data.Careers.Leader.matron.includes(slave.career) && slave.skill.matron >= Constant.MASTERED_XP) {
updateMultiplier(`good matron`, 0.1);
}
- if (!App.Data.Careers.Leader.schoolteacher.includes(slave.career) && slave.skill.teacher >= V.masteredXP) {
+ if (!App.Data.Careers.Leader.schoolteacher.includes(slave.career) && slave.skill.teacher >= Constant.MASTERED_XP) {
updateMultiplier(`good teacher`, 0.1);
}
- if (!App.Data.Careers.Leader.stewardess.includes(slave.career) && slave.skill.stewardess >= V.masteredXP) {
+ if (!App.Data.Careers.Leader.stewardess.includes(slave.career) && slave.skill.stewardess >= Constant.MASTERED_XP) {
updateMultiplier(`good stewardess`, 0.1);
}
- if (!App.Data.Careers.Leader.milkmaid.includes(slave.career) && slave.skill.milkmaid >= V.masteredXP) {
+ if (!App.Data.Careers.Leader.milkmaid.includes(slave.career) && slave.skill.milkmaid >= Constant.MASTERED_XP) {
updateMultiplier(`good milkmaid`, 0.1);
}
- if (!App.Data.Careers.Leader.farmer.includes(slave.career) && slave.skill.farmer >= V.masteredXP) {
+ if (!App.Data.Careers.Leader.farmer.includes(slave.career) && slave.skill.farmer >= Constant.MASTERED_XP) {
updateMultiplier(`good farmer`, 0.1);
}
- if (!App.Data.Careers.Leader.madam.includes(slave.career) && slave.skill.madam >= V.masteredXP) {
+ if (!App.Data.Careers.Leader.madam.includes(slave.career) && slave.skill.madam >= Constant.MASTERED_XP) {
updateMultiplier(`good madam`, 0.1);
}
- if (!App.Data.Careers.Leader.DJ.includes(slave.career) && slave.skill.DJ >= V.masteredXP) {
+ if (!App.Data.Careers.Leader.DJ.includes(slave.career) && slave.skill.DJ >= Constant.MASTERED_XP) {
updateMultiplier(`good DJ`, 0.1);
}
- if (!App.Data.Careers.Leader.HG.includes(slave.career) && slave.skill.headGirl >= V.masteredXP) {
+ if (!App.Data.Careers.Leader.HG.includes(slave.career) && slave.skill.headGirl >= Constant.MASTERED_XP) {
updateMultiplier(`good headGirl`, 0.1);
}
- if (!App.Data.Careers.Leader.recruiter.includes(slave.career) && slave.skill.recruiter >= V.masteredXP) {
+ if (!App.Data.Careers.Leader.recruiter.includes(slave.career) && slave.skill.recruiter >= Constant.MASTERED_XP) {
updateMultiplier(`good recruiter`, 0.1);
}
- if (!App.Data.Careers.General.servant.includes(slave.career) && slave.skill.servant >= V.masteredXP) {
+ if (!App.Data.Careers.General.servant.includes(slave.career) && slave.skill.servant >= Constant.MASTERED_XP) {
updateMultiplier(`good servant`, 0.05);
}
- if (!App.Data.Careers.General.entertainment.includes(slave.career) && slave.skill.entertainer >= V.masteredXP) {
+ if (!App.Data.Careers.General.entertainment.includes(slave.career) && slave.skill.entertainer >= Constant.MASTERED_XP) {
updateMultiplier(`good entertainer`, 0.05);
}
- if (!App.Data.Careers.General.whore.includes(slave.career) && slave.skill.whore >= V.masteredXP) {
+ if (!App.Data.Careers.General.whore.includes(slave.career) && slave.skill.whore >= Constant.MASTERED_XP) {
updateMultiplier(`good whore`, 0.05);
}
}
@@ -2931,7 +2881,6 @@ globalThis.slaveCostBeauty = function(slave, isStartingSlave, followLaws, isSpec
if (cost < 1000) {
cost = 1000;
}
- cost = 500 * Math.trunc(cost / 500);
}
/**
@@ -2958,9 +2907,7 @@ globalThis.slaveCostBeauty = function(slave, isStartingSlave, followLaws, isSpec
if (slave.skill.oral) {
startingSlaveMultiplier += 0.00001 * slave.skill.oral * slave.skill.oral;
}
- if (slave.skill.combat) {
- startingSlaveMultiplier += 0.1;
- }
+ startingSlaveMultiplier += 0.001 * slave.skill.combat;
if (slave.prestige) {
startingSlaveMultiplier += slave.prestige;
}
@@ -2971,15 +2918,18 @@ globalThis.slaveCostBeauty = function(slave, isStartingSlave, followLaws, isSpec
}
startingSlaveMultiplier = Math.clamp(startingSlaveMultiplier, 0, 10);
cost += cost * startingSlaveMultiplier;
- cost = 500 * Math.trunc(cost / 500);
if (isPCCareerInCategory("slaver")) {
- cost /= 2;
+ cost *= 0.5;
}
}
- function updateMultiplier(string, value) {
+ /**
+ * @param {string} reason
+ * @param {number} value
+ */
+ function updateMultiplier(reason, value) {
if (value) {
- map.set(string, value);
+ map.set(reason, value);
multiplier += value;
}
}
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 935ad0682be9fbd760154bf8867eb6ab1c82d285..4c4831e326709c2efd382c1310d5d802305dbefb 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -49,6 +49,8 @@ App.UI.SlaveList.render = function() {
if ((V.seeImages === 1) && (V.seeSummaryImages === 1)) {
batchRenderer = new App.Art.SlaveArtBatch(IDs, 1);
res.appendChild(batchRenderer.writePreamble());
+ } else {
+ batchRenderer = null;
}
if (V.useSlaveListInPageJSNavigation === 1) {
@@ -177,6 +179,9 @@ App.UI.SlaveList.render = function() {
if (slave.health.shortDamage >= 10) {
list.push(`injuries`);
}
+ if (slave.health.illness > 0) {
+ list.push(`illness`);
+ }
if (S.Nurse) {
if ((slave.chem > 15) && (V.clinicUpgradeFilters === 1)) {
list.push(`unhealthy chemicals`);
@@ -199,7 +204,7 @@ App.UI.SlaveList.render = function() {
}
} else if (slave.assignment === Job.SPA) {
let list = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
assignment.innerText += `, mindbroken`;
} else {
if ((slave.sexualFlaw !== "none") || (slave.behavioralFlaw !== "none")) {
@@ -543,7 +548,7 @@ App.UI.SlaveList.sortingLinks = function(passage) {
const textify = string => capFirstChar(string.replace(/([A-Z])/g, " $1"));
let span = App.UI.DOM.makeElement("span", "Sort by: ");
- let order = ["devotion", "trust", "name", "assignment", "seniority", "actualAge", "visualAge", "physicalAge", "weeklyIncome", "health", "weight", "muscles", "intelligence", "sexDrive", "pregnancy", "prestige"];
+ let order = ["devotion", "trust", "name", "assignment", "seniority", "actualAge", "visualAge", "physicalAge", "weeklyIncome", "beauty", "health", "weight", "muscles", "intelligence", "sexDrive", "pregnancy", "prestige"];
const orderMap = order.map(so => {
return {key: so, name: capFirstChar(so)};
});
@@ -572,10 +577,26 @@ App.UI.SlaveList.sortingLinks = function(passage) {
* @param {boolean} [showTransfersTab=false]
* @param {{assign: string, remove: string, transfer: (string| undefined)}} [tabCaptions]
* @param {slaveToElement} [decoratorFunction]
+ * @param {slaveToElement} [postNote]
+ * @returns {DocumentFragment}
+ */
+App.UI.SlaveList.listSJFacilitySlaves = function(facility, facilityPassage, showTransfersTab = false, tabCaptions = undefined, decoratorFunction = undefined, postNote = undefined) {
+ return App.UI.SlaveList.listJFacilitySlaves(facility.desc.defaultJob, facility, facilityPassage, showTransfersTab, tabCaptions, decoratorFunction, postNote);
+};
+
+/**
+ * Standard tabs for a facility with a given job (J)
+ * @param {string} jobName
+ * @param {App.Entity.Facilities.Facility} facility
+ * @param {string} [facilityPassage]
+ * @param {boolean} [showTransfersTab=false]
+ * @param {{assign: string, remove: string, transfer: (string| undefined)}} [tabCaptions]
+ * @param {slaveToElement} [decoratorFunction]
+ * @param {slaveToElement} [postNote]
* @returns {DocumentFragment}
*/
-App.UI.SlaveList.listSJFacilitySlaves = function(facility, facilityPassage, showTransfersTab = false, tabCaptions = undefined, decoratorFunction = undefined) {
- const job = facility.job();
+App.UI.SlaveList.listJFacilitySlaves = function(jobName, facility, facilityPassage, showTransfersTab = false, tabCaptions = undefined, decoratorFunction = undefined, postNote = undefined) {
+ const job = facility.job(jobName);
facilityPassage = facilityPassage || passage();
tabCaptions = tabCaptions || {
@@ -604,7 +625,16 @@ App.UI.SlaveList.listSJFacilitySlaves = function(facility, facilityPassage, show
SlaveSort.IDs(facilitySlaves);
tabBar.addTab(tabCaptions.remove, "remove", App.UI.SlaveList.render(facilitySlaves, [],
(slave) => App.UI.SlaveList.SlaveInteract.decoratedInteract(slave, decoratorFunction),
- (slave) => App.UI.DOM.link(`Retrieve ${getPronouns(slave).object} from ${facility.name}`, () => removeJob(slave, job.desc.assignment), [], facilityPassage)
+ (slave) => {
+ const frag = new DocumentFragment();
+ if (postNote) {
+ frag.append(postNote(slave));
+ }
+ frag.append(App.UI.DOM.link(`Retrieve ${getPronouns(slave).object} from ${facility.name}`, () => {
+ removeJob(slave, job.desc.assignment);
+ }, [], facilityPassage));
+ return frag;
+ }
));
} else {
tabBar.addTab(tabCaptions.remove, "remove", App.UI.DOM.makeElement("em", `${capFirstChar(facility.name)} is empty for the moment`));
@@ -638,7 +668,7 @@ App.UI.SlaveList.listSJFacilitySlaves = function(facility, facilityPassage, show
let rejectedSlaves = [];
let passedSlaves = [];
slaveIDs.forEach((id) => {
- const rejects = facility.canHostSlave(slaveStateById(id));
+ const rejects = facility.canHostSlave(slaveStateById(id), jobName);
if (rejects.length > 0) {
rejectedSlaves.push({id: id, rejects: rejects});
} else {
@@ -647,7 +677,16 @@ App.UI.SlaveList.listSJFacilitySlaves = function(facility, facilityPassage, show
}, []);
return App.UI.SlaveList.render(passedSlaves, rejectedSlaves,
(slave) => App.UI.SlaveList.SlaveInteract.decoratedInteract(slave, decoratorFunction),
- (slave) => App.UI.DOM.link(`Send ${getPronouns(slave).object} to ${facility.name}`, () => { assignmentTransition(slave, job.desc.assignment, facilityPassage); }));
+ (slave) => {
+ const frag = new DocumentFragment();
+ if (postNote) {
+ frag.append(postNote(slave));
+ }
+ frag.append(App.UI.DOM.link(`Send ${getPronouns(slave).object} to ${facility.name}`, () => {
+ assignmentTransition(slave, job.desc.assignment, facilityPassage);
+ }));
+ return frag;
+ });
}
};
@@ -1166,11 +1205,15 @@ App.UI.SlaveList.slaveSelectionList = function() {
/**
* @param {App.Entity.Facilities.Facility} facility
* @param {string} passage go here after the new facility manager is selected
+ * @param {slaveToElement} [note]
* @returns {HTMLElement}
*/
-App.UI.SlaveList.facilityManagerSelection = function(facility, passage) {
- return this.slaveSelectionList(slave => facility.manager.canEmploy(slave),
+App.UI.SlaveList.facilityManagerSelection = function(facility, passage, note) {
+ return App.UI.SlaveList.slaveSelectionList(slave => facility.manager.canEmploy(slave),
(slave) => App.UI.DOM.passageLink(SlaveFullName(slave), passage,
- () => { assignJob(slave, facility.manager.desc.assignment); }),
- slave => facility.manager.slaveHasExperience(slave));
+ () => {
+ assignJob(slave, facility.manager.desc.assignment);
+ }),
+ slave => facility.manager.slaveHasExperience(slave),
+ note);
};
diff --git a/src/js/slaveSummaryHelpers.js b/src/js/slaveSummaryHelpers.js
index 8d60472158758f2114e1d7545bafa6a26665bb11..e7932545f64dcd94e593e470f381a0e69915e12f 100644
--- a/src/js/slaveSummaryHelpers.js
+++ b/src/js/slaveSummaryHelpers.js
@@ -438,7 +438,7 @@ App.UI.SlaveSummaryImpl = function() {
return value + spData.setting.all;
} else if ((slave.energy > 5) && (slave.clitSetting === "none")) {
return value + spData.setting.none;
- } else if (((slave.fetish !== "none") && (slave.clitSetting === "vanilla"))) {
+ } else if (((slave.fetish !== Fetish.NONE) && (slave.clitSetting === "vanilla"))) {
return value + spData.setting.vanilla;
} else if (slave.fetishStrength <= 95 || slave.fetish !== slave.clitSetting) {
const s = value + spData.setting[slave.clitSetting];
@@ -974,7 +974,7 @@ App.UI.SlaveSummaryImpl = function() {
* @returns {void}
*/
function short_intelligence(slave, c) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
return;
}
const intelligence = slave.intelligence + slave.intelligenceImplant;
@@ -999,9 +999,7 @@ App.UI.SlaveSummaryImpl = function() {
helpers.makeRatedStyledSpan(c, sd.whoring, slave.skill.whoring, 0, true);
helpers.makeRatedStyledSpan(c, sd.entertainment, slave.skill.entertainment, 0, true);
}
- if (slave.skill.combat > 0) {
- helpers.makeStyledSpan(c, sd.fighter);
- }
+ helpers.makeRatedStyledSpan(c, sd.combat, slave.skill.combat, 0, true);
}
/**
@@ -1028,7 +1026,7 @@ App.UI.SlaveSummaryImpl = function() {
* @returns {void}
*/
function long_intelligence(slave, c) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
return;
}
const intelligence = slave.intelligence + slave.intelligenceImplant;
@@ -1053,9 +1051,7 @@ App.UI.SlaveSummaryImpl = function() {
helpers.makeRatedStyledSpan(c, sd.whoring, slave.skill.whoring, 0, true);
helpers.makeRatedStyledSpan(c, sd.entertainment, slave.skill.entertainment, 0, true);
}
- if (slave.skill.combat > 0) {
- helpers.makeStyledSpan(c, sd.fighter);
- }
+ helpers.makeRatedStyledSpan(c, sd.combat, slave.skill.combat, 0, true);
}
/**
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 8d1fd7184d7ce6f089baf01ae02b4fa656d04c91..c9fc763f3da497012f0b78db63a46674023a494d 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -10,7 +10,7 @@ App.UI.SlaveSummaryRenderers = function() {
*/
devotion: function(slave, c) {
const makeSpan = helpers.makeSpan;
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
makeSpan(c, "MB", "mindbroken");
} else {
helpers.makeRatedStyledSpan(c, data.short.mental.devotion, slave.devotion, 100, true);
@@ -290,7 +290,7 @@ App.UI.SlaveSummaryRenderers = function() {
*/
mental: function(slave, c) {
const b = bits.short;
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.fetishKnown === 1) {
b.fetish(slave, c);
}
@@ -394,7 +394,7 @@ App.UI.SlaveSummaryRenderers = function() {
*/
devotion: function(slave, c) {
const makeSpan = helpers.makeSpan;
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
makeSpan(c, "Mindbroken.", "mindbroken");
} else {
helpers.makeRatedStyledSpan(c, data.long.mental.devotion, slave.devotion, 100, true);
@@ -545,9 +545,9 @@ App.UI.SlaveSummaryRenderers = function() {
makeSpan(c, "May be pregnant.");
} else if (slave.pregKnown === 1) {
if (slave.pregType < 2 || slave.broodmother > 0) {
- makeSpan(c, `${slave.pregWeek} weeks pregnant.`);
+ makeSpan(c, `${Math.trunc(slave.pregWeek)} weeks pregnant.`);
} else {
- let desc = `${slave.pregWeek} weeks pregnant with `;
+ let desc = `${Math.trunc(slave.pregWeek)} weeks pregnant with `;
if (slave.pregType >= 40) {
desc += `a tremendous brood of offspring.`;
} else if (slave.pregType >= 20) {
@@ -686,7 +686,7 @@ App.UI.SlaveSummaryRenderers = function() {
*/
mental: function(slave, c) {
const b = bits.long;
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.fetishKnown === 1) {
b.fetish(slave, c);
}
diff --git a/src/js/statsChecker/statsChecker.js b/src/js/statsChecker/statsChecker.js
index c1c4133cd75ee5f024dcb0424c8d5a1576470d7c..9553289f1a2717bf223c1545a7cfc8961656d7e2 100644
--- a/src/js/statsChecker/statsChecker.js
+++ b/src/js/statsChecker/statsChecker.js
@@ -608,13 +608,12 @@ globalThis.isFertile = function(slave) {
/* postpartum */
return false;
} else if (slave.pubertyXX === 0) {
- /* pregmod start */
return false;
} else if (slave.ovaryAge >= 47) {
return false;
} else if (slave.inflation > 2) {
return false;
- } else if (slave.bellyImplant !== -1) {
+ } else if (slave.bellyImplant >= 0) {
return false;
} else if (slave.mpreg === 1 || slave.ovaries === 1) {
if (slave.womb.length > 0) { // superfetation route
@@ -776,6 +775,12 @@ globalThis.canWalk = function(slave) {
} else if (slave.heels === 1 && shoeHeelCategory(slave) === 0) {
return false;
}
+ // player exclusives
+ if (slave.ID === -1) {
+ if (slave.physicalImpairment > 1) {
+ return false;
+ }
+ }
return true;
};
@@ -805,6 +810,12 @@ globalThis.canStand = function(slave) {
} else if (tooBigBelly(slave)) {
return false;
}
+ // player exclusives
+ if (slave.ID === -1) {
+ if (slave.physicalImpairment > 1) {
+ return false;
+ }
+ }
return true;
};
@@ -864,6 +875,12 @@ globalThis.canMove = function(slave) {
return false;
}
}
+ // player exclusives
+ if (slave.ID === -1) {
+ if (slave.physicalImpairment > 1) {
+ return false;
+ }
+ }
return true;
};
@@ -904,8 +921,10 @@ globalThis.isHindered = function(slave) {
if (slave.ID === -1) {
if (onBedRest(slave)) {
return true;
- } else if (slave.criticalDamage !== 0) {
+ } else if (slave.physicalImpairment !== 0) {
return true;
+ // } else if (slave.energy > 95 || slave.need > 0) {
+ // return true;
}
}
return false;
@@ -1048,11 +1067,11 @@ globalThis.tooBigBalls = function(slave) {
globalThis.tooBigDick = function(slave) {
if (!slave) {
return null;
- } else if (slave.dick >= 20 + (slave.muscles * 0.1) && slave.physicalAge <= 3 && slave.dick !== 0) {
+ } else if (slave.dick >= 20 + (slave.muscles * 0.1) && slave.physicalAge <= 3 && slave.dick !== 0) { // 10 - 30
return true;
- } else if (slave.dick >= 45 + (slave.muscles * 0.3) && slave.physicalAge <= 12) {
+ } else if (slave.dick >= 45 + (slave.muscles * 0.3) && slave.physicalAge <= 12) { // 15 - 75
return true;
- } else if (slave.dick >= 68 + (slave.muscles * 0.4)) {
+ } else if (slave.dick >= 68 + (slave.muscles * 0.4)) { // 28 - 108
return true;
}
return false;
@@ -1069,6 +1088,8 @@ globalThis.tooBigButt = function(slave) {
return true;
} else if (slave.butt > 14 && slave.physicalAge <= 12) {
return true;
+ } else if (slave.butt > 22) {
+ return true;
}
return false;
};
@@ -1081,7 +1102,7 @@ globalThis.isVegetable = function(slave) {
if (!slave) {
return false;
}
- return (slave.fetish === "mindbroken");
+ return (slave.fetish === Fetish.MINDBROKEN);
};
/**
@@ -1139,7 +1160,7 @@ globalThis.milkFlavor = function(slave) {
if (slave.milkFlavor === "none") {
return ``;
}
- return `${slave.milkFlavor} flavored `;
+ return `${slave.milkFlavor}-flavored `;
};
globalThis.canBeDeflowered = function(slave) {
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index c36fc5b4fd9a8a201425632fd05c64324dee2950..f479a6ee3cb60f60deb47ed06e3596fa8f85af07 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -374,7 +374,7 @@ globalThis.bodyguardSuccessorEligible = function(slave) {
if (!slave) {
return false;
}
- return (slave.devotion > 50 && slave.muscles >= 0 && slave.weight < 130 && slave.boobs < 8000 && slave.butt < 10 && slave.belly < 5000 && slave.balls < 10 && slave.dick < 10 && slave.preg < 20 && slave.fuckdoll === 0 && slave.fetish !== "mindbroken" && canWalk(slave) && canHold(slave) && canSee(slave) && canHear(slave));
+ return (slave.devotion > 50 && slave.muscles >= 0 && slave.weight < 130 && slave.boobs < 8000 && slave.butt < 10 && slave.belly < 5000 && slave.balls < 10 && slave.dick < 10 && slave.preg < 20 && slave.fuckdoll === 0 && slave.fetish !== Fetish.MINDBROKEN && canWalk(slave) && canHold(slave) && canSee(slave) && canHear(slave));
};
/**
@@ -389,7 +389,7 @@ globalThis.toJson = function(obj) {
};
/**
- * @param {App.Entity.SlaveState} slave
+ * @param {FC.HumanState} slave
* @returns {string}
*/
globalThis.nippleColor = function(slave) {
diff --git a/src/js/underperformingSlaves.js b/src/js/underperformingSlaves.js
index 108896f970fea4cbb2d603e662105e0a6ec8f4ac..fe567d7e61292388c0d844ddcfa6a37f97e46b3f 100644
--- a/src/js/underperformingSlaves.js
+++ b/src/js/underperformingSlaves.js
@@ -19,7 +19,7 @@ App.Underperformers.highSale = function() {
const ratio = slaveCost(slave) / (slave.lastWeeksCashIncome - getSlaveCost(slave));
return ratio > 0 ? ratio : 100000000 + ratio;
},
- count: 7,
+ count: V.underperformersCount,
filter: App.Underperformers.expectIncome
}
),
@@ -42,7 +42,7 @@ App.Underperformers.expensive = function() {
{
part: (slave) => (slave.lastWeeksCashIncome - getSlaveCost(slave)),
largest: false,
- count: 7,
+ count: V.underperformersCount,
filter: App.Underperformers.expectIncome
}
),
@@ -80,5 +80,10 @@ App.Underperformers.passage = function() {
tabBar.addTab("Costing vs earning", "earning", App.Underperformers.expensive());
node.append(tabBar.render());
+ const g = new App.UI.OptionsGroup();
+ g.addOption("Maximum number of slaves", "underperformersCount")
+ .addValue("Default", 7).showTextBox();
+ node.append(g.render());
+
return node;
};
diff --git a/src/js/upgrade.js b/src/js/upgrade.js
index 6c7300124909cc8fe83672bb5be740f09550d4e5..49ee68f797e1502d27ad914608b2bcf698909c28 100644
--- a/src/js/upgrade.js
+++ b/src/js/upgrade.js
@@ -33,7 +33,7 @@ App.Upgrade = class Upgrade {
const cost = Math.trunc(tier.cost) || 0;
- if ((!prereqs || prereqs.every(prereq => prereq())) &&
+ if ((!prereqs || prereqs.every(prereq => prereq === true)) &&
_.isEqual(value, this._object[this._property])) {
App.UI.DOM.appendNewElement("div", frag, text);
diff --git a/src/js/utilsAssessSlave.js b/src/js/utilsAssessSlave.js
index d3233de8c6d292b48cd90f55c44e926894e034e3..e154b50a22ba6b1334e6753dde27ef1cc0e4bd1a 100644
--- a/src/js/utilsAssessSlave.js
+++ b/src/js/utilsAssessSlave.js
@@ -12,7 +12,7 @@ globalThis.getSlaveDevotionClass = function(slave) {
if ((!slave) || (!State)) {
return undefined;
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
return "mindbroken";
}
if (slave.devotion < -95) {
@@ -41,7 +41,7 @@ globalThis.getSlaveTrustClass = function(slave) {
return undefined;
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
return "";
}
@@ -102,7 +102,7 @@ globalThis.getExposure = function(slave) {
};
/**
- * @param {App.Entity.SlaveState} slave
+ * @param {FC.HumanState} slave
* @returns {boolean}
*/
globalThis.canImproveIntelligence = function(slave) {
@@ -111,7 +111,7 @@ globalThis.canImproveIntelligence = function(slave) {
};
/**
- * @param {App.Entity.SlaveState} slave
+ * @param {FC.HumanState} slave
* @returns {number}
*/
globalThis.maxHeight = function(slave) {
@@ -129,7 +129,7 @@ globalThis.maxHeight = function(slave) {
};
/**
- * @param {App.Entity.SlaveState} slave
+ * @param {FC.HumanState} slave
* @returns {boolean}
*/
globalThis.canImproveHeight = function(slave) {
diff --git a/src/js/utilsMisc.js b/src/js/utilsMisc.js
index 82b8a3075f1e44519cb67512ce957e48157e3306..8c79503c4fdef3b243af0aa798b83e332a76f11e 100644
--- a/src/js/utilsMisc.js
+++ b/src/js/utilsMisc.js
@@ -251,6 +251,10 @@ App.Utils.totalNetWorth = function() {
total += App.Mods.SF.totalNetWorth();
total -= App.Mods.SecExp.upkeep.cost();
+ if (V.loans.length > 0) {
+ V.loans.forEach(loan => total -= loan.full);
+ }
+
return total;
};
diff --git a/src/js/utilsPC.js b/src/js/utilsPC.js
index 9f734cb276e081f6e0555584a85e054349cc2360..66bbead3a8e4a104e7fe0b30bfe1a139a9f7e9e9 100644
--- a/src/js/utilsPC.js
+++ b/src/js/utilsPC.js
@@ -123,7 +123,7 @@ globalThis.PCTitle = function() {
}
if (V.SF.Toggle && V.SF.FS.Tension > 100) {
- switch (V.SF.FS.BadOutcome) {
+ switch (App.Mods.SF.fsIntegration.crisis()[1]) {
case 'MIGRATION':
titles.push("The Abandoned");
break;
@@ -555,7 +555,7 @@ globalThis.PCTitle = function() {
} else if (V.slaves.length > 10) {
titles.push("owner of slaves");
}
- const corpValue = App.Corporate.value;
+ const corpValue = App.Corporate.calculateValue();
if (corpValue > 500000) {
titles.push("Corporate Titan");
} else if (corpValue > 250000) {
@@ -620,22 +620,28 @@ globalThis.IncreasePCSkills = function(input, increase = 1) {
};
/** Returns if the player is on mandatory bedrest.
+ * If player still conducts business or is completely disabled is controlled by 'workingFromBed'
* @param {App.Entity.PlayerState} actor
+ * @param {boolean} workingFromBed
* @returns {boolean}
*/
-globalThis.onBedRest = function(actor) {
- // consider player health and injury in the future!
+globalThis.onBedRest = function(actor, workingFromBed = false) {
+ // consider player injuries in the future!
if (!actor) {
return null;
- } else if (actor.health.shortDamage > 10) {
+ } else if (actor.majorInjury > 0) {
return true;
- } else if (!canMove(actor)) {
+ } else if (actor.health.condition < -90) {
return true;
- } else if (actor.preg > actor.pregData.normalBirth / 1.05) { // consider birth delayers and how they play into this
+ } else if (!isMovable(actor) && !workingFromBed) {
return true;
- } else if (actor.womb.find((ft) => ft.genetics.geneticQuirks.polyhydramnios === 2 && ft.age >= 20)) {
+ } else if (isTrapped(actor) && !workingFromBed) {
return true;
- } else if (actor.bellyPreg >= actor.pregAdaptation * 2200) {
+ } else if (actor.preg > actor.pregData.normalBirth / 1.05 && actor.pregControl !== "labor suppressors") { // consider if the player should be able to ignore contractions
+ return true;
+ } else if (actor.womb.find((ft) => ft.genetics.geneticQuirks.polyhydramnios === 2 && ft.age >= 20) && !workingFromBed) {
+ return true;
+ } else if (actor.bellyPreg >= actor.pregAdaptation * 2200 && !workingFromBed) {
return true;
} else if (isInduced(actor)) {
return true;
@@ -643,6 +649,279 @@ globalThis.onBedRest = function(actor) {
return false;
};
+/** Returns if the player is able to move via wheelchair.
+ * Consider moving this to encompass slaves in the future.
+ * Ridiculously far future proofing.
+ * @param {App.Entity.PlayerState} actor
+ * @returns {boolean}
+ */
+globalThis.isMovable = function(actor) {
+ if (!actor) {
+ return null;
+ } else if (canMove(actor)) {
+ return true;
+ } else if (actor.boobs >= 1500000) {
+ return false;
+ } else if (actor.balls >= 160) {
+ return false;
+ } else if (actor.belly >= 1100000) {
+ return false;
+ } else if (actor.weight >= 300) {
+ return false;
+ }
+ return true;
+};
+
+/** Returns if the player has grown so large they no longer can leave their bedroom.
+ * Slaves can force their way. (add health drop for this!)
+ * @param {App.Entity.PlayerState} actor
+ * @returns {boolean}
+ */
+globalThis.isTrapped = function(actor) {
+ if (!actor) {
+ return null;
+ } else if (V.buttAccessibility === 1 || V.pregAccessibility === 1 || V.ballsAccessibility === 1 || V.boobAccessibility === 1) {
+ return false;
+ } else if (actor.boobsImplant >= 600000 || actor.boobs >= 1000000) {
+ return true;
+ } else if (actor.belly >= 800000) {
+ return true;
+ } else if (actor.dick >= 100) {
+ return true;
+ } else if (actor.balls >= 100) {
+ return true;
+ } else if (actor.buttImplant >= 30) {
+ return true;
+ }
+ return false;
+};
+
+/** How badly hindered is the player? Stacks from various sources up until a 75% reduction in your ability to do business.
+ * You have to seriously try to fuck yourself up that badly; just stacking basic hindrances will only get you to 50%.
+ * This probably still needs more adjustments.
+ * @param {FC.HumanState} actor
+ * @param {boolean} sexyTime
+ * @returns {number}
+ */
+globalThis.isHinderedDegree = function(actor, sexyTime = false) {
+ let mult = 1;
+ const averageHeight = Height.mean(actor);
+ const estimatedSackSag = ballsToCM(actor.balls) * .8 * (1 + ((actor.scrotum - actor.balls) * .5));
+ // player exclusives
+ actor = asPlayer(actor);
+ if (!actor) {
+ return mult;
+ }
+ // PC on bedrest plans to work from home.
+ if (onBedRest(actor)) {
+ return .5;
+ } else if (actor.physicalImpairment !== 0) {
+ mult -= .3;
+ // } else if (actor.energy > 95 || actor.need > 0) {
+ // return true;
+ }
+ // not really worrying about this for now
+ if (!isQuadrupedal(actor) && hasAnyQuadrupedLegs(actor)) {
+ mult -= .2;
+ } else if (hasBothQuadrupedLegs(actor) && !hasBothQuadrupedArms(actor)) {
+ mult -= .1;
+ } else if (!hasBothQuadrupedLegs(actor) && hasAnyQuadrupedLegs(actor) && !hasBothQuadrupedArms(actor) && hasAnyQuadrupedArms(actor)) {
+ mult -= .3;
+ }
+ // Not having to walk drastically affects how much assets are a hindrance
+ if (!canWalk(actor)) {
+ mult -= .1; // Of course, not being able to walk is also a hindrance
+ if (actor.belly >= 60000 || actor.belly >= 60000 / (1 + Math.pow(Math.E, -0.4 * (actor.physicalAge - 14))) || actor.belly >= Math.max(10000, ((12500 / 19) * actor.height) - (1172500 / 19))) {
+ mult -= .1;
+ }
+ if (V.pregAccessibility === 1) {
+ if (actor.belly >= 1000000) {
+ mult -= .1;
+ } else if (actor.belly >= 500000) {
+ mult -= .05;
+ }
+ } else {
+ if (actor.belly >= 1000000) {
+ mult -= .25;
+ } else if (actor.belly >= 750000) {
+ mult -= .2;
+ } else if (actor.belly >= 500000) {
+ mult -= .15;
+ } else if (actor.belly >= 250000) {
+ mult -= .1;
+ } else if (actor.belly >= 100000) {
+ mult -= .05;
+ }
+ }
+ // Assets do not hinder prostitutes
+ if (!sexyTime) {
+ if (actor.muscles > 95 && actor.height <= (averageHeight + 10)) {
+ mult -= .05;
+ } else if (actor.muscles < -95) {
+ mult -= .3;
+ } else if (actor.muscles < -60) {
+ mult -= .1;
+ } else if (actor.muscles < -30) {
+ mult -= .05;
+ }
+ if (actor.weight >= 190) {
+ mult -= .05;
+ }
+ if (actor.boobs > 5000) {
+ mult -= .1;
+ }
+ if (V.boobAccessibility === 1) {
+ if (actor.boobs > 75000) {
+ mult -= .1;
+ }
+ } else {
+ if (actor.boobs > 75000) {
+ mult -= .2;
+ } else if (actor.boobs > 50000) {
+ mult -= .15;
+ } else if (actor.boobs > 25000) {
+ mult -= .1;
+ }
+ }
+ if (actor.balls >= 14) {
+ mult -= .1;
+ }
+ if (V.ballsAccessibility === 1) {
+ if (estimatedSackSag > (actor.height / 2)) {
+ mult -= .05;
+ }
+ } else {
+ if (estimatedSackSag > (actor.height / 2)) {
+ mult -= .1;
+ }
+ }
+ if (actor.hips > 2) {
+ mult -= .1;
+ }
+ if (actor.butt > 6) {
+ mult -= .1;
+ }
+ if (V.buttAccessibility === 1) {
+ if (actor.butt > 15) {
+ mult -= .05;
+ }
+ } else {
+ if (actor.butt > 15) {
+ mult -= .1;
+ }
+ }
+ }
+ } else {
+ if (actor.belly >= 60000 || actor.belly >= 60000 / (1 + Math.pow(Math.E, -0.4 * (actor.physicalAge - 14))) || actor.belly >= Math.max(10000, ((12500 / 19) * actor.height) - (1172500 / 19))) {
+ mult -= .1;
+ }
+ if (V.pregAccessibility === 1) {
+ if (actor.belly >= 1000000) {
+ mult -= .2;
+ } else if (actor.belly >= 500000) {
+ mult -= .1;
+ }
+ } else {
+ if (actor.belly >= 1000000) {
+ mult -= .5;
+ } else if (actor.belly >= 750000) {
+ mult -= .4;
+ } else if (actor.belly >= 500000) {
+ mult -= .3;
+ } else if (actor.belly >= 250000) {
+ mult -= .2;
+ } else if (actor.belly >= 100000) {
+ mult -= .1;
+ }
+ }
+ // Assets do not hinder prostitutes
+ if (!sexyTime) {
+ if (actor.muscles > 95 && actor.height <= (averageHeight + 10)) {
+ mult -= .1;
+ } else if (actor.muscles < -95) {
+ mult -= .7;
+ } else if (actor.muscles < -60) {
+ mult -= .5;
+ } else if (actor.muscles < -30) {
+ mult -= .2;
+ }
+ if (actor.weight >= 130 || (actor.weight >= 95 + ((actor.physicalAge - 9) * 5))) {
+ mult -= .1;
+ }
+ if (actor.boobs > 5000) {
+ mult -= .1;
+ }
+ if (V.boobAccessibility === 1) {
+ if (actor.boobs > 75000) {
+ mult -= .15;
+ } else if (actor.boobs > 50000) {
+ mult -= .1;
+ }
+ } else {
+ if (actor.boobs > 75000) {
+ mult -= .6;
+ } else if (actor.boobs > 50000) {
+ mult -= .4;
+ } else if (actor.boobs > 25000) {
+ mult -= .2;
+ } else if (actor.boobs > 10000) {
+ mult -= .1;
+ }
+ }
+ if (actor.balls >= 14) {
+ mult -= .1;
+ }
+ if (V.ballsAccessibility === 1) {
+ if (estimatedSackSag > (actor.height / 2)) {
+ mult -= .15;
+ } else if (estimatedSackSag >= (actor.height / 2) - 10) {
+ mult -= .1;
+ } else if (estimatedSackSag >= (actor.height / 4)) {
+ mult -= .05;
+ }
+ } else {
+ if (estimatedSackSag > (actor.height / 2)) {
+ mult -= .2;
+ } else if (estimatedSackSag >= (actor.height / 2) - 10) {
+ mult -= .15;
+ } else if (estimatedSackSag >= (actor.height / 4)) {
+ mult -= .1;
+ }
+ }
+ if (actor.hips > 2) {
+ mult -= .1;
+ }
+ if (actor.butt > 6) {
+ mult -= .1;
+ }
+ if (V.buttAccessibility === 1) {
+ if (actor.butt > 15) {
+ mult -= .1;
+ }
+ } else {
+ if (actor.butt > 15) {
+ mult -= .2;
+ } else if (actor.butt > 10) {
+ mult -= .1;
+ }
+ }
+ }
+ }
+ if (sexyTime) { // But they do get tired
+ if (actor.muscles < -95) {
+ mult -= .7;
+ } else if (actor.muscles < -60) {
+ mult -= .3;
+ } else if (actor.muscles < -30) {
+ mult -= .1;
+ }
+ if (actor.weight >= 130 || (actor.weight >= 95 + ((actor.physicalAge - 9) * 5))) {
+ mult -= .2;
+ }
+ }
+ return Math.max(.25, mult);
+};
+
/** Returns if the player can eat solid food.
* Consider moving this to encompass slaves in the future.
* @param {App.Entity.PlayerState} actor
@@ -661,6 +940,26 @@ globalThis.canEatFood = function(actor) {
return true;
};
+/**
+ * A consolidated function for checking if the player is currently aroused.
+ * @param {App.Entity.PlayerState} actor
+ * @returns {boolean}
+ */
+globalThis.isPlayerHorny = function(actor) {
+ return ((actor.prostate > 0 && actor.preg > 0 && actor.preg > actor.pregData.normalBirth * .75) ||
+ (actor.preg > 0 && actor.preg > actor.pregData.normalBirth * .66 && actor.pregMood === 2) ||
+ (actor.geneticQuirks.uterineHypersensitivity === 2 &&
+ (actor.bellyPreg >= 10000) ||
+ (actor.belly > (actor.pregAdaptation * 1000)) ||
+ (actor.wombImplant === "restraint" && actor.belly >= 400000)
+ ) ||
+ (actor.need > 0) ||
+ (actor.energy > 95) ||
+ (actor.aphrodisiacs > 0) ||
+ (actor.inflationType === "aphrodisiac") ||
+ (actor.drugs === "priapism agents"));
+};
+
/**
* Param takes "classic" PC careers, and then function checks data to see if PC has that classic career or a 4.0 equivalent.
* @param {"wealth"|"escort"|"servant"|"gang"|"BlackHat"|"capitalist"|"mercenary"|"engineer"|"medicine"|"slaver"|"celebrity"|"arcology owner"} category
@@ -674,3 +973,36 @@ globalThis.isPCCareerInCategory = function(category) {
return false;
}
};
+
+/** Identifies which "tier" a particular career is in
+ * @param {string} [career]
+ * @returns {"master" | "apprentice" | "child"}
+ */
+globalThis.PCCareerTier = function(career = V.PC.career) {
+ /** @type {("master" | "apprentice" | "child")[]} */
+ const tiers = ["master", "apprentice", "child"];
+ const careerGroups = Array.from(App.Data.player.career.values());
+ for (const grp of careerGroups) {
+ for (const tier of tiers) {
+ if (grp[tier] === career) {
+ return tier;
+ }
+ }
+ }
+ console.log(`"${career}" not found in App.Data.player.career`);
+ return "master";
+};
+
+/** Identifies which category the PC's career is in
+ * @param {string} [career]
+ * @returns {string}
+ */
+globalThis.PCCareerCategory = function(career = V.PC.career) {
+ for (const [category, group] of App.Data.player.career) {
+ if (Object.values(group).includes(career)) {
+ return category;
+ }
+ }
+ console.log(`"${career}" not found in App.Data.player.career`);
+ return career;
+};
diff --git a/src/js/utilsSC.js b/src/js/utilsSC.js
index f739adf7f10abd022dccb65d289ed3052e195f97..50d065794dd5d51479e8c8617f2edff5019e251f 100644
--- a/src/js/utilsSC.js
+++ b/src/js/utilsSC.js
@@ -253,7 +253,8 @@ App.UI.DOM.referenceSlaveWithPreview = function(slave, text) {
App.UI.DOM.slaveDescriptionDialog(slave, "Pop-up", {noArt: true}),
App.UI.SlaveList.SlaveInteract.stdInteract(slave, "Go to")
]),
- interactive: true
+ interactive: true,
+ appendTo: document.getElementById("story")
});
return res;
};
diff --git a/src/js/utilsSlave.js b/src/js/utilsSlave.js
index d2e67f3e48a2017769a2b3e9d9924ff3f4e14091..f15d52352c21a7bcbdba515a93f72375193624d5 100644
--- a/src/js/utilsSlave.js
+++ b/src/js/utilsSlave.js
@@ -3,10 +3,7 @@
* Height.mean(nationality, race, genes) - returns the mean adult height for the given combination
* Height.mean(slave) - returns the mean (expected) height for the given slave
*
- * Height.random(nationality, race, genes, age) - returns a random height using the skew-normal distribution
- * around the mean height for the given arguments
- * Height.random(nationality, race, genes) - returns a random height for the given combination of an adult, as above
- * Height.random(slave[, options]) - returns a random height for the given slave, as above.
+ * Height.random(slave[, options]) - returns a random height for the given slave using the skew-normal distribution.
* The additional options object can modify how the values are generated
* in the same way setting them as global configuration would, but only for this
* specific generation.
@@ -18,28 +15,8 @@
* Height.forAge(height, slave) - returns the height adapted to the slave's age and genes
*
* Height.config(configuration) - configures the random height generator globally and returns the current configuration
- * The options and their default values are:
- * limitMult: [-3, 3] - Limit to the values the underlying (normal) random generator returns.
- * In normal use, the values are almost never reached; only 0.27% of values are
- * outside this range and need to be regenerated. With higher skew (see below),
- * this might change.
- * spread: 0.05 - The random values generated are multiplied by this and added to 1 to generate
- * the final height multiplier. The default value together with the default limitMult
- * means that the generated height will always fall within (1 - 0.05 * 3) = 85% and
- * (1 + 0.05 * 3) = 115% of the mean height.
- * Minimum value: 0.001; maximum value: 0.5
- * skew: 0 - How much the height distribution skews to the right (positive) or left (negative) side
- * of the height.
- * Minimum value: -1000, maximum value: 1000
- * limitHeight: [0, 999] - Limit the resulting height range. Warning: A small height limit range
- * paired with a high spread value results in the generator having to
- * do lots of work generating and re-generating random heights until
- * one "fits".
*
* Anon's explanation:
- * limitMult: [0, -30]
- *
- * This specifies a range going up from 0 to -30. It needs to go [-30, 0] instead. Same thing with [0, -5] two lines down. note: technically, this isn't true, because for some bizarre reason Height.random reverses the numbers for you if you get them wrong. But it's important to establish good habits, so.
*
* Skew, spread, limitMult: These are statistics things. BTW, a gaussian distribution is a normal distribution. Just a naming thing.
*
@@ -52,53 +29,46 @@
* There's also limitHeight which you're not using. It's basically limitMult in different units.
*/
globalThis.Height = (function() {
- "use strict";
+ /**
+ * @typedef {object} heightConfig
+ * @property {[number, number]} limitMult Limit to the values the underlying (normal) random generator returns.
+ * In normal use, the values are almost never reached; only 0.27% of values are outside this range and need to
+ * be regenerated. With higher skew (see below), this might change.
+ * @property {number} skew The random values generated are multiplied by this and added to 1 to generate the final
+ * height multiplier. The default value together with the default limitMult means that the generated height
+ * will always fall within (1 - 0.05 * 3) = 85% and (1 + 0.05 * 3) = 115% of the mean height.
+ * Minimum value: 0.001; maximum value: 0.5
+ * @property {number} spread How much the height distribution skews to the right (positive) or left (negative) side
+ * of the height.
+ * Minimum value: -1000, maximum value: 1000
+ * @property {[number, number]} limitHeight Limit the resulting height range.
+ * Warning: A small height limit range paired with a high spread value results in the generator having to do
+ * lots of work generating and re-generating random heights until one "fits".
+ */
- // Global configuration (for different game modes/options/types)
- let minMult = -3.0;
- let maxMult = 3.0;
- let skew = 0.0;
- let spread = 0.05;
- let minHeight = 0;
- let maxHeight = 999;
+ /**
+ * Global configuration (for different game modes/options/types)
+ * @type {heightConfig}
+ */
+ const defaultConfig = {
+ limitMult: [-3.0, 3.0],
+ skew: 0.0,
+ spread: 0.05,
+ limitHeight: [0, 999],
+ };
/**
* Configuration method for the above values
- * @param {any} [conf]
+ * WARNING: Make sure you handle new game/loading saves appropriately when using to change global state!
+ * @param {Partial<heightConfig>} [conf]
* @returns {object}
*/
- const _config = function(conf) {
- if (_.isUndefined(conf)) {
- return {
- limitMult: [minMult, maxMult],
- limitHeight: [minHeight, maxHeight],
- skew: skew,
- spread: spread
- };
- }
- if (_.isFinite(conf.skew)) {
- skew = Math.clamp(conf.skew, -1000, 1000);
- }
- if (_.isFinite(conf.spread)) {
- spread = Math.clamp(conf.spread, 0.001, 0.5);
- }
- if (_.isArray(conf.limitMult) && conf.limitMult.length === 2 && conf.limitMult[0] !== conf.limitMult[1] &&
- _.isFinite(conf.limitMult[0]) && _.isFinite(conf.limitMult[1])) {
- minMult = Math.min(conf.limitMult[0], conf.limitMult[1]);
- maxMult = Math.max(conf.limitMult[0], conf.limitMult[1]);
- }
- if (_.isArray(conf.limitHeight) && conf.limitHeight.length === 2 && conf.limitHeight[0] !== conf.limitHeight[1] &&
- _.isFinite(conf.limitHeight[0]) && _.isFinite(conf.limitHeight[1])) {
- minHeight = Math.min(conf.limitHeight[0], conf.limitHeight[1]);
- maxHeight = Math.max(conf.limitHeight[0], conf.limitHeight[1]);
- }
- return {
- limitMult: [minMult, maxMult],
- limitHeight: [minHeight, maxHeight],
- skew: skew,
- spread: spread
- };
- };
+ function _config(conf) {
+ if (conf) {
+ Object.assign(defaultConfig, conf);
+ }
+ return defaultConfig;
+ }
/* if you can find an average for an undefined, add it in! */
const xxMeanHeight = {
@@ -548,51 +518,25 @@ globalThis.Height = (function() {
* @param {number} [def]
* @returns {object}
*/
- const nationalityMeanHeight = function(table, nationality, race, def) {
+ function nationalityMeanHeight(table, nationality, race, def) {
return table[`${nationality}.${race}`] || table[nationality] || table[`.${race}`] || table[""] || def;
- };
-
- /**
- * Helper method: Generate a skewed normal random variable with the skew s
- * Reference: http://azzalini.stat.unipd.it/SN/faq-r.html
- * @param {number} s
- * @returns {number}
- */
- const skewedGaussian = function(s) {
- let randoms = gaussianPair();
- if (s === 0) {
- // Don't bother, return an unskewed normal distribution
- return randoms[0];
- }
- let delta = s / Math.sqrt(1 + s * s);
- let result = delta * randoms[0] + Math.sqrt(1 - delta * delta) * randoms[1];
- return randoms[0] >= 0 ? result : -result;
- };
-
- /**
- * Height multiplier generator; skewed gaussian according to global parameters
- * @returns {number}
- */
- const multGenerator = function() {
- let result = skewedGaussian(skew);
- while (result < minMult || result > maxMult) {
- result = skewedGaussian(skew);
- }
- return result;
- };
+ }
/**
* Helper method: Generate a height based on the mean one and limited according to config.
+ * @param {heightConfig} config
* @param {number} mean
* @returns {number}
*/
- const heightGenerator = function(mean) {
- let result = mean * (1 + multGenerator() * spread);
- while (result < minHeight || result > maxHeight) {
- result = mean * (1 + multGenerator() * spread);
+ function heightGenerator(config, mean) {
+ const maxMult = Math.max(...config.limitMult);
+ const minMult = Math.min(...config.limitMult);
+ let result = mean * (1 + App.Utils.Math.limitedSkewedGaussian(maxMult, minMult, config.skew) * config.spread);
+ while (result < Math.min(...config.limitHeight) || result > Math.max(...config.limitHeight)) {
+ result = mean * (1 + App.Utils.Math.limitedSkewedGaussian(maxMult, minMult, config.skew) * config.spread);
}
return Math.round(result);
- };
+ }
/**
* Helper method - apply age and genes to the adult height
@@ -601,7 +545,7 @@ globalThis.Height = (function() {
* @param {string} [genes]
* @returns {number}
*/
- const applyAge = function(height, age, genes) {
+ function applyAge(height, age, genes) {
if (!_.isFinite(age) || age < 2 || age >= 20) {
return height;
}
@@ -641,7 +585,7 @@ globalThis.Height = (function() {
// 2 to end of puberty
return Math.round(interpolate(2, minHeight, midAge, midHeight, age));
}
- };
+ }
/**
* @param {string|{nationality: string, race: FC.Race, genes: string, physicalAge: number, birthWeek: number}} nationality
@@ -650,7 +594,7 @@ globalThis.Height = (function() {
* @param {number} [age]
* @returns {number}
*/
- const _meanHeight = function(nationality, race, genes, age) {
+ function _meanHeight(nationality, race, genes, age) {
if (_.isObject(nationality)) {
// We got called with a single slave as the argument
return _meanHeight(nationality.nationality, nationality.race, nationality.genes, nationality.physicalAge + nationality.birthWeek / 52.0);
@@ -691,28 +635,22 @@ globalThis.Height = (function() {
break;
}
return applyAge(result, age, genes);
- };
+ }
/**
- * @param {string|{nationality: string, race: FC.Race, genes: string, physicalAge: number, birthWeek: number}} nationality
- * @param {FC.Race|object} [race]
- * @param {string} [genes]
- * @param {number} [age]
+ * @param {{nationality: string, race: FC.Race, genes: string, physicalAge: number, birthWeek: number}} slave
+ * @param {Partial<heightConfig>} [conf]
* @returns {number}
*/
- const _randomHeight = function(nationality, race, genes, age) {
- const mean = _meanHeight(nationality, race, genes, age);
- // If we got called with a slave object and options, temporarily modify
- // our configuration.
- if (_.isObject(nationality) && _.isObject(race)) {
- const currentConfig = _config();
- _config(race);
- const result = heightGenerator(mean);
- _config(currentConfig);
- return result;
- }
- return heightGenerator(mean);
- };
+ function _randomHeight(slave, conf) {
+ const mean = _meanHeight(slave);
+ if (conf) {
+ const localConfig = Object.assign({}, defaultConfig);
+ Object.assign(localConfig, conf);
+ return heightGenerator(localConfig, mean);
+ }
+ return heightGenerator(defaultConfig, mean);
+ }
/**
* @param {number} height
@@ -720,14 +658,14 @@ globalThis.Height = (function() {
* @param {string} [genes]
* @returns {number}
*/
- const _forAge = function(height, age, genes) {
+ function _forAge(height, age, genes) {
if (_.isObject(age)) {
// We got called with a slave as a second argument
return applyAge(height, age.physicalAge + age.birthWeek / 52.0, age.genes);
} else {
return applyAge(height, age, genes);
}
- };
+ }
return {
mean: _meanHeight,
@@ -738,139 +676,86 @@ globalThis.Height = (function() {
})();
/**
- * Intelligence.random(options) - returns a random intelligence. If no options are passed, the generated number
+ * Intelligence.random(options) - returns a random intelligence value. If no options are passed, the generated number
* will be on a normal distribution with mean 0 and standard deviation 45.
*
- * Intelligence.random({limitIntelligence: [0, 100]})
- *
* Intelligence.config(configuration) - configures the random height generator globally and returns the current configuration
*
- * The options and their default values are:
- * mean: 0 - What the average intelligence will be. Increasing this will make it more likely
- * to generate a smart slave, but will not guarantee it.
- * Minimum value: -100, maximum value: 100
- * limitMult: [-3, 3] - Limit to this many standard deviations from the mean.
- * In normal use, the values are almost never reached; only 0.27% of values are
- * outside this range and need to be regenerated. With higher skew (see below),
- * this might change.
- * spread: 45 - The random standard deviation of the calculated distribution. A higher value
- * will make it more likely to have extreme values, a lower value will make any
- * generated values cluster around the mean. If spread is 0, it will always return the mean.
- * skew: 0 - How much the height distribution skews to the right (positive) or left (negative) side
- * of the height. Unless you have a very specific reason, you should not need to change this.
- * Minimum value: -1000, maximum value: 1000
- * limitIntelligence: [-100,100] - Limit the resulting height range.
- * Warning: A small intelligence limit range not containing the
- * mean, and with a low spread value results in the generator
- * having to do lots of work generating and re-generating random
- * intelligences until one "fits".
- *
* This was modeled using the Height generator above. For some more information, see the comments for that.
- * @returns {{random: number, _config: object}}
*/
globalThis.Intelligence = (function() {
- "use strict";
+ /**
+ * @typedef {object} intelligenceConfig
+ * @property {number} mean What the average intelligence will be. Increasing this will make it more likely to
+ * generate a smart slave, but will not guarantee it.
+ * Minimum value: -100, maximum value: 100
+ * @property {[number, number]} limitMult Limit to this many standard deviations from the mean. In normal use, the
+ * values are almost never reached; only 0.27% of values are outside this range and need to be regenerated.
+ * With higher skew (see below), this might change.
+ * @property {number} skew The random standard deviation of the calculated distribution. A higher value will make it
+ * more likely to have extreme values, a lower value will make any generated values cluster around the mean.
+ * If spread is 0, it will always return the mean.
+ * @property {number} spread How much the height distribution skews to the right (positive) or left (negative) side
+ * of the height. Unless you have a very specific reason, you should not need to change this.
+ * Minimum value: -1000, maximum value: 1000
+ * @property {[number, number]} limitIntelligence Limit the resulting intelligence range.
+ * Warning: A small intelligence limit range not containing the mean, and with a low spread value results in
+ * the generator having to do lots of work generating and re-generating random intelligences until one "fits".
+ */
- // Global configuration (for different game modes/options/types)
- let mean = 0;
- let minMult = -3.0;
- let maxMult = 3.0;
- let skew = 0.0;
- let spread = 45;
- let minIntelligence = -101;
- let maxIntelligence = 100;
+ /**
+ * Global configuration (for different game modes/options/types)
+ * @type {intelligenceConfig}
+ */
+ const globalConfig = {
+ mean: 0,
+ limitMult: [-3.0, 3.0],
+ skew: 0.0,
+ spread: 45,
+ limitIntelligence: [-100, 100],
+ };
/**
* Configuration method for the above values
- * @param {object} [conf] // I'm pretty sure
+ * WARNING: Make sure you handle new game/loading saves appropriately when using to change global state!
+ * @param {Partial<intelligenceConfig>} [conf]
* @returns {object}
*/
- const _config = function(conf) {
- if (_.isUndefined(conf)) {
- return {
- mean: mean,
- limitMult: [minMult, maxMult],
- limitIntelligence: [minIntelligence, maxIntelligence],
- skew: skew,
- spread: spread
- };
- }
- if (_.isFinite(conf.mean)) {
- mean = Math.clamp(conf.mean, -100, 100);
- }
- if (_.isFinite(conf.skew)) {
- skew = Math.clamp(conf.skew, -1000, 1000);
- }
- if (_.isFinite(conf.spread)) {
- spread = Math.clamp(conf.spread, 0.1, 100);
- }
- if (_.isArray(conf.limitMult) && conf.limitMult.length === 2 && conf.limitMult[0] !== conf.limitMult[1] &&
- _.isFinite(conf.limitMult[0]) && _.isFinite(conf.limitMult[1])) {
- minMult = Math.min(conf.limitMult[0], conf.limitMult[1]);
- maxMult = Math.max(conf.limitMult[0], conf.limitMult[1]);
- }
- if (_.isArray(conf.limitIntelligence) && conf.limitIntelligence.length === 2 && conf.limitIntelligence[0] !== conf.limitIntelligence[1] &&
- _.isFinite(conf.limitIntelligence[0]) && _.isFinite(conf.limitIntelligence[1])) {
- minIntelligence = Math.clamp(Math.min(conf.limitIntelligence[0], conf.limitIntelligence[1]), -101, 100);
- maxIntelligence = Math.clamp(Math.max(conf.limitIntelligence[0], conf.limitIntelligence[1]), -101, 100);
- }
- return {
- limitMult: [minMult, maxMult],
- limitIntelligence: [minIntelligence, maxIntelligence],
- skew: skew,
- spread: spread
- };
- };
+ function _config(conf) {
+ if (conf) {
+ Object.assign(globalConfig, conf);
+ }
+ return globalConfig;
+ }
/**
- * Helper method: Generate a skewed normal random variable with the skew s
- * Reference: http://azzalini.stat.unipd.it/SN/faq-r.html
- * @param {number} s
+ * Helper method: Transform the values from {@link App.Utils.Math.limitedSkewedGaussian} to have the appropriate
+ * mean and standard deviation.
+ * @param {intelligenceConfig} config
* @returns {number}
*/
- const skewedGaussian = function(s) {
- let randoms = gaussianPair();
- if (s === 0) {
- // Don't bother, return an unskewed normal distribution
- return randoms[0];
- }
- let delta = s / Math.sqrt(1 + s * s);
- let result = delta * randoms[0] + Math.sqrt(1 - delta * delta) * randoms[1];
- return randoms[0] >= 0 ? result : -result;
- };
-
- // Intelligence multiplier generator; skewed gaussian according to global parameters
- const multGenerator = function() {
- let result = skewedGaussian(skew);
- while (result < minMult || result > maxMult) {
- result = skewedGaussian(skew);
- }
- return result;
- };
-
- // Helper method: Transform the values from multGenerator to have the appropriate mean and standard deviation.
- const intelligenceGenerator = function() {
- let result = multGenerator() * spread + mean;
- while (result < minIntelligence || result > maxIntelligence) {
- result = multGenerator() * spread + mean;
+ function intelligenceGenerator(config) {
+ const minMult = Math.min(...config.limitMult);
+ const maxMult = Math.max(...config.limitMult);
+ let result = App.Utils.Math.limitedSkewedGaussian(maxMult, minMult, config.skew) * config.spread + config.mean;
+ while (result < Math.min(...config.limitIntelligence) || result > Math.max(...config.limitIntelligence)) {
+ result = App.Utils.Math.limitedSkewedGaussian(maxMult, minMult, config.skew) * config.spread + config.mean;
}
return Math.ceil(result);
- };
+ }
/**
- * @param {object} [settings]
+ * @param {Partial<intelligenceConfig>} [config]
* @returns {number}
*/
- const _randomIntelligence = function(settings) {
- if (settings) {
- const currentConfig = _config();
- _config(settings);
- const result = intelligenceGenerator();
- _config(currentConfig);
- return result;
- }
- return intelligenceGenerator();
- };
+ function _randomIntelligence(config) {
+ if (config) {
+ const localConfig = Object.assign({}, globalConfig);
+ Object.assign(localConfig, config);
+ return intelligenceGenerator(localConfig);
+ }
+ return intelligenceGenerator(globalConfig);
+ }
return {
random: _randomIntelligence,
@@ -878,473 +763,6 @@ globalThis.Intelligence = (function() {
};
})();
-/**
- * Takes a string with a baked in pronoun ("Her mother offered her") and returns it with SC variable pronouns("$His mother offered $him")
- * @param {string} slavetext
- * @returns {string}
- */
-globalThis.pronounReplacer = function(slavetext) {
- switch (slavetext) {
- case "After her short but very promising slave racing career, during which she made it through several competitions as a virgin, many people fondly remember fantasizing about taking her.":
- slavetext = "After $his short but very promising slave racing career, during which $he made it through several competitions as a virgin, many people fondly remember fantasizing about taking $him.";
- break;
- case "Her entire body is tattooed with a detailed map of her arteries which, combined with her albinism, gives her a quasi-translucent quality.":
- slavetext = "$His entire body is tattooed with a detailed map of $his arteries which, combined with $his albinism, gives $him a quasi-translucent quality.";
- break;
- case "Her husband sold her into slavery to escape his debts.":
- slavetext = "$His husband sold $him into slavery to escape his debts.";
- break;
- case "Her mother offered her to you as an incentive to take her in.":
- slavetext = "$His mother offered $him to you as an incentive to take them in.";
- break;
- case "Her recognizable face marks her as a descendant of an overthrown royal family.":
- slavetext = "$His recognizable face marks $him as a descendant of an overthrown royal family.";
- break;
- case "Many people remember her from the slavegirl races where she slammed her cock into countless runners' pussies after catching them.":
- slavetext = "Many people remember $him from the slavegirl races where $he slammed $his cock into countless runners' pussies after catching them.";
- break;
- case "She came to you to escape being sold to a cruel master after her producer informed her of her debt.":
- slavetext = "$He came to you to escape being sold to a cruel master after $his producer informed $him of $his debt.";
- break;
- case "She comes from old money and sold herself into slavery to satisfy her obsession with the practice, believing her family would buy her back out of slavery later.":
- slavetext = "$He comes from old money and sold $himself into slavery to satisfy $his obsession with the practice, believing $his family would buy $him back out of slavery later.";
- break;
- case "She has a following in slave pornography. Thousands have enjoyed the sight of her ignoring her own pleasure.":
- slavetext = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him ignoring $his own pleasure.";
- break;
- case "She has a following in slave pornography. Thousands have enjoyed watching her devote herself to her partners' pleasure.":
- slavetext = "$He has a following in slave pornography. Thousands have enjoyed watching $him devote $himself to $his partners' pleasure.";
- break;
- case "She has a following in slave pornography. Thousands have enjoyed watching her do anything for a dick in her ass.":
- slavetext = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for a dick in $his ass.";
- break;
- case "She has a small scar on the back of her right hand. She was injured while participating in the finals of the national kendo tournament, and decided to keep the scar to remind her of her achievements.":
- slavetext = "$He has a small scar on the back of $his right hand. $He was injured while participating in the finals of a national kendo tournament, and decided to keep the scar to remind $him of $his achievements.";
- break;
- case "She has an implanted GPS tracker to find her in case her habit of stalking pretty girls gets the better of her.":
- slavetext = "$He has an implanted GPS tracker to find $him in case $his habit of stalking pretty girls gets the better of $him.";
- break;
- case "She has massive C-clamp piercings in her back that allow her to act as furniture, and a truly enormous vagina.":
- slavetext = "$He has massive C-clamp piercings in $his back that allow $him to act as furniture, and a truly enormous vagina.";
- break;
- case "She has the number of times her father came in you while you were pregnant with her tattooed down her back.":
- slavetext = "$He has the number of times $his father came in you while you were pregnant with $him tattooed down $his back.";
- break;
- case "She is a famed Free Cities slut, and can please anyone.":
- slavetext = "$He is a famed Free Cities slut, and can please anyone.";
- break;
- case "She is a famed Free Cities whore, and commands top prices.":
- slavetext = "$He is a famed Free Cities whore, and commands top prices.";
- break;
- case "She is a prized dairy cow given to you by a failed local pasture of The Cattle Ranch.":
- slavetext = "$He is a prized dairy cow given to you by a failed local pasture of The Cattle Ranch.";
- break;
- case "She is an enslaved Daughter of Liberty.":
- slavetext = "$He is an enslaved Daughter of Liberty.";
- break;
- case "She is an enslaved member of an anti-slavery extremist group.":
- slavetext = "$He is an enslaved member of an anti-slavery extremist group.";
- break;
- case "She is remembered for winning best in show as a breeder.":
- slavetext = "$He is remembered for winning best in show as a breeder.";
- break;
- case "She is remembered for winning best in show as a cockmilker.":
- slavetext = "$He is remembered for winning best in show as a cockmilker.";
- break;
- case "She is remembered for winning best in show as a dairy cow.":
- slavetext = "$He is remembered for winning best in show as a dairy cow.";
- break;
- case "She is the spoiled daughter of a wealthy old world businessman. Many will pay well to use her to discredit her father and family.":
- slavetext = "$He is the spoiled $daughter of a wealthy old world businessman. Many will pay well to use $him to discredit $his father and family.";
- break;
- case "She is well known from her career in slave pornography. Her many fans relish the sight of her abusing others.":
- slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him abusing others.";
- break;
- case "She is well known from her career in slave pornography. Her many fans relish the sight of her being raped.":
- slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being raped.";
- break;
- case "She is well known from her career in slave pornography. Her many fans relish the sight of her being used.":
- slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being used.";
- break;
- case "She is well known from her career in slave pornography. Her many fans relish the sight of her denying herself pleasure.":
- slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him denying $himself pleasure.";
- break;
- case "She is well known from her career in slave pornography. Her many fans relish the sight of her doing anything for a dick up her ass.":
- slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for a dick up $his ass.";
- break;
- case "She is well known from her career in slave pornography. Her many fans relish the sight of her doing anything for attention.":
- slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for attention.";
- break;
- case "She is well known from her career in slave pornography. Her many fans relish the sight of her doing anything for cum.":
- slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for cum.";
- break;
- case "She is well known from her career in slave pornography. Her many fans relish the sight of her getting off from the suffering she caused.":
- slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him getting off from the suffering $he caused.";
- break;
- case "She is well known from her career in slave pornography. Her many fans relish the sight of her swollen with child.":
- slavetext = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him swollen with child.";
- break;
- case "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her being raped.":
- slavetext = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him being raped.";
- break;
- case "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her denying herself pleasure.":
- slavetext = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him denying $himself pleasure.";
- break;
- case "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her doing anything for attention.":
- slavetext = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him doing anything for attention.";
- break;
- case "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her doing anything for cum.":
- slavetext = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him doing anything for cum.";
- break;
- case "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her mid-coitus.":
- slavetext = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him mid-coitus.";
- break;
- case "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her suffering.":
- slavetext = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him suffering.";
- break;
- case "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her swollen with child.":
- slavetext = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him swollen with child.";
- break;
- case "She offered herself for voluntary enslavement, choosing you as her new owner because you treat lactating girls well.":
- slavetext = "$He offered $himself for voluntary enslavement, choosing you as $his new owner because you treat lactating girls well.";
- break;
- case "She offered herself to you for enslavement hoping you would preserve $his incestuous relationship with her sibling.":
- slavetext = "$He offered $himself to you for enslavement hoping you would preserve $his incestuous relationship with $his sibling.";
- break;
- case "She offered to become your slave to protect her incestuous relationship.":
- slavetext = "$He offered to become your slave to protect $his incestuous relationship.";
- break;
- case "She sold herself into slavery out of fear that life on the streets was endangering her pregnancy.":
- slavetext = "$He sold $himself into slavery out of fear that life on the streets was endangering $his pregnancy.";
- break;
- case "She sold herself to you in the hope of someday bearing children.":
- slavetext = "$He sold $himself to you in the hope of someday bearing children.";
- break;
- case "She submitted to enslavement for a better chance at survival than she had as a migrant.":
- slavetext = "$He submitted to enslavement for a better chance at survival than $he had as a migrant.";
- break;
- case "She submitted to enslavement out of a misguided desire to join a sexually libertine society.":
- slavetext = "$He submitted to enslavement out of a misguided desire to join a sexually libertine society.";
- break;
- case "She submitted to enslavement to escape the hard life of an old world whore.":
- slavetext = "$He submitted to enslavement to escape the hard life of an old world whore.";
- break;
- case "She submitted to enslavement to get access to modern prenatal care.":
- slavetext = "$He submitted to enslavement to get access to modern prenatal care.";
- break;
- case "She was a Futanari Sister until you engineered her early enslavement.":
- slavetext = "$He was a Futanari Sister until you engineered $his early enslavement.";
- break;
- case "She was brought up in a radical slave school to match her twin.":
- slavetext = "$He was brought up in a radical slave school to match $his twin.";
- break;
- case "She was given to you by a failed branch campus of St. Claver Preparatory after she served as a plastic surgeon's passing final exam.":
- slavetext = "$He was given to you by a failed branch campus of St. Claver Preparatory after $he served as a plastic surgeon's passing final exam.";
- break;
- case "She was given to you by a failed branch campus of the Hippolyta Academy right after her majority.":
- slavetext = "$He was given to you by a failed branch campus of the Hippolyta Academy right after $his majority.";
- break;
- case "She was given to you by a failed branch campus of the innovative École des Enculées right after her graduation.":
- slavetext = "$He was given to you by a failed branch campus of the innovative École des Enculées right after $his graduation.";
- break;
- case "She was given to you by a failed branch campus of the intense Gymnasium-Academy right after her majority.":
- slavetext = "$He was given to you by a failed branch campus of the intense Gymnasium-Academy right after $his majority.";
- break;
- case "She was given to you by a failed branch campus of The Slavegirl School after she was retrained as a slave girl.":
- slavetext = "$He was given to you by a failed branch campus of the Slavegirl School after $he was retrained as a slave $girl.";
- break;
- case "She was given to you by a failed branch campus of The Slavegirl School right after her majority.":
- slavetext = "$He was given to you by a failed branch campus of the Slavegirl School right after $his majority.";
- break;
- case "She was given to you by a failed subsidiary lab of the Growth Research Institute right after her use as a test subject ended.":
- slavetext = "$He was given to you by a failed subsidiary lab of the Growth Research Institute right after $his use as a test subject ended.";
- break;
- case "She was once the crown prince of an old world kingdom up until you aided her brother in making her 'disappear'.":
- slavetext = "$He was once the crown prince of an old world kingdom up until you aided $his brother in making $him 'disappear'.";
- break;
- case "She was once the princess of an old world kingdom up until her loose habits caught up with her and she was exiled.":
- slavetext = "$He was once the princess of an old world kingdom up until $his loose habits caught up with $him and $he was exiled.";
- break;
- case "She was once the young trophy wife of a powerful man in the old world, but he sold her into slavery in revenge for her infidelity.":
- slavetext = "$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.";
- break;
- case "She was raised in a radical slave school that treated her from a very young age, up to the point that she never experienced male puberty.":
- slavetext = "$He was raised in a radical slave school that treated $him from a very young age, up to the point that $he never experienced male puberty.";
- break;
- case "She was raised in a radical slave school that treated her with drugs and surgery from a very young age.":
- slavetext = "$He was raised in a radical slave school that treated $him with drugs and surgery from a very young age.";
- break;
- case "She was sold into slavery by her older sister.":
- slavetext = "$He was sold into slavery by $his older sister.";
- break;
- case "She was the leader of your arcology's Futanari Sisters until you engineered her community's failure and enslavement.":
- slavetext = "$He was the leader of your arcology's Futanari Sisters until you engineered $his community's failure and enslavement.";
- break;
- case "She was the result of unprotected sex with a client. Her mother tracked you down years after her birth to force her upon you.":
- slavetext = "$He was the result of unprotected sex with a client. $His mother tracked you down years after $his birth to force $him upon you.";
- break;
- case "She was voluntarily enslaved after she decided that your arcology was the best place for her to get the steroids that she'd allowed to define her life.":
- slavetext = "$He was voluntarily enslaved after $he decided that your arcology was the best place for $him to get the steroids that $he'd allowed to define $his life.";
- break;
- case "She was your slave, but you freed her, which she repaid by participating in a coup attempt against you. It failed, and she is again your chattel.":
- slavetext = "$He was your slave, but you freed $him, which $he repaid by participating in a coup attempt against you. It failed, and $he is again your chattel.";
- break;
- case "Shortly after birth, she was sealed in an aging tank until she was of age. She knows nothing of the world outside of what the tank imprinted her with.":
- slavetext = "Shortly after birth, $he was sealed in an aging tank until $he was of age. $He knows nothing of the world outside of what the tank imprinted $him with.";
- break;
- case "Shortly after birth, she was sealed in an aging tank until she was of age. She knows only of the terror that awaits her should she not obey her master.":
- slavetext = "Shortly after birth, $he was sealed in an aging tank until $he was of age. $He knows only of the terror that awaits $him should $he not obey $his master.";
- break;
- case "Though her vocal cords have been altered to keep her from speaking, she is still capable of the occasional moo.":
- slavetext = "Though $his vocal cords have been altered to keep $him from speaking, $he is still capable of the occasional moo.";
- break;
- case "To seal a business deal, a client asked you to knock her up. She is the end result of that fling.":
- slavetext = "To seal a business deal, a client asked you to knock her up. $He is the end result of that fling.";
- break;
- case "When you took her from her previous owner, she was locked into a beautiful rosewood box lined with red velvet, crying.":
- slavetext = "When you took $him from $his previous owner, $he was locked into a beautiful rosewood box lined with red velvet, crying.";
- break;
- case "You acquired her along with her mother when the family business failed.":
- slavetext = "You acquired $him along with $his mother when the family business failed.";
- break;
- case "You acquired her along with her sissy sister due to her inexperience as a madam.":
- slavetext = "You acquired $him along with $his sissy sister due to $his inexperience as a madam.";
- break;
- case "You bankrupted and enslaved her in revenge for her part in the attack on your arcology by the Daughters of Liberty.":
- slavetext = "You bankrupted and enslaved $him in revenge for $his part in the attack on your arcology by the Daughters of Liberty.";
- break;
- case "You bought her fresh from the intense Gymnasium-Academy right after her majority.":
- slavetext = "You bought $him fresh from the intense Gymnasium-Academy right after $his majority.";
- break;
- case "You bought her fresh from the new Slavegirl School after she was retrained as a slave girl.":
- slavetext = "You bought $him fresh from the new Slavegirl School after $he was retrained as a slave $girl.";
- break;
- case "You bought her fresh from the Slavegirl School right after her majority.":
- slavetext = "You bought $him fresh from the Slavegirl School right after $his majority.";
- break;
- case "You bought her from a body dump, completely broken.":
- slavetext = "You bought $him from a body dump, completely broken.";
- break;
- case "You bought her from a wetware CPU farm, her body ruined but her mind subjected to a simulated career.":
- slavetext = "You bought $him from a wetware CPU farm, $his body ruined but $his mind subjected to a simulated career.";
- break;
- case "You bought her from the girl raiders' slave market the week she reached her majority.":
- slavetext = "You bought $him from the $girl raiders' slave market the week $he reached $his majority.";
- break;
- case "You bought her from the Growth Research Institute right after her use as a test subject ended.":
- slavetext = "You bought $him from the Growth Research Institute right after $his use as a test subject ended.";
- break;
- case "You bought her from the innovative École des Enculées right after her graduation.":
- slavetext = "You bought $him from the innovative École des Enculées right after $his graduation.";
- break;
- case "You bought her from the runaway hunters' slave market after they recaptured her and her original owner did not pay their fee.":
- slavetext = "You bought $him from the runaway hunters' slave market after they recaptured $him and $his original owner did not pay their fee.";
- break;
- case "You bought out a deal for her sale after the seller took her virginity and the buyer no longer wanted her.":
- slavetext = "You bought out a deal for $his sale after the seller took $his virginity and the buyer no longer wanted $him.";
- break;
- case "You got her at the Slave Shelter. Her background is obscure, but seems to have involved terrible abuse of her huge cock and balls.":
- slavetext = "You got $him at the Slave Shelter. $His background is obscure, but seems to have involved terrible abuse of $his huge cock and balls.";
- break;
- case "You got her at the Slave Shelter. Her holes were cruelly stretched by constant plug use.":
- slavetext = "You got $him at the Slave Shelter. $His holes were cruelly stretched by constant plug use.";
- break;
- case "You got her at the Slave Shelter. Her owner purposely blinded her by dumping boiling water into her eyes.":
- slavetext = "You got $him at the Slave Shelter. $His owner purposely blinded $him by dumping boiling water into $his eyes.";
- break;
- case "You got her at the Slave Shelter. Her previous owner discarded her after many pregnancies.":
- slavetext = "You got $him at the Slave Shelter. $His previous owner discarded $him after many pregnancies.";
- break;
- case "You got her at the Slave Shelter. Her previous owner forced her to cut off her breasts and cook them.":
- slavetext = "You got $him at the Slave Shelter. $His previous owner forced $him to cut off $his breasts and cook them.";
- break;
- case "You got her at the Slave Shelter. Her previous owner forced her to cut off her dick and balls and cook them.":
- slavetext = "You got $him at the Slave Shelter. $His previous owner forced $him to cut off $his dick and balls and cook them.";
- break;
- case "You got her at the Slave Shelter. Her previous owner gelded her and used her for anal abuse.":
- slavetext = "You got $him at the Slave Shelter. $His previous owner gelded $him and used $him for anal abuse.";
- break;
- case "You got her at the Slave Shelter. It's not clear why her previous owner cut her arms and legs off.":
- slavetext = "You got $him at the Slave Shelter. It's not clear why $his previous owner cut $his arms and legs off.";
- break;
- case "You got her at the Slave Shelter. She has never communicated anything about her background, since she arrived at the shelter with a broken mind.":
- slavetext = "You got $him at the Slave Shelter. $He has never communicated anything about $his background, since $he arrived at the shelter with a broken mind.";
- break;
- case "You got her at the Slave Shelter. She is an enslaved Daughter of Liberty, caught some weeks after the failed coup. Her previous owner used her as a punching bag and dart board, then when he was bored of her tattooed obscenities all over her body and threw her away.":
- slavetext = "You got $him at the Slave Shelter. $He is an enslaved Daughter of Liberty, caught some weeks after the failed coup. $His previous owner used $him as a punching bag and dart board, then when he was bored of $him tattooed obscenities all over $his body and threw $him away.";
- break;
- case "You got her at the Slave Shelter. She was discarded after suffering a terrible reaction to growth hormone treatment.":
- slavetext = "You got $him at the Slave Shelter. $He was discarded after suffering a terrible reaction to growth hormone treatment.";
- break;
- case "You got her at the Slave Shelter. She was found unresponsive in the lower arcology with a gaping pussy and deflated belly. It is unclear what happened to her.":
- slavetext = "You got $him at the Slave Shelter. $He was found unresponsive in the lower arcology with a gaping pussy and deflated belly. It is unclear what happened to $him.";
- break;
- case "You got her at the Slave Shelter. She was worn out by twenty years of brothel service.":
- slavetext = "You got $him at the Slave Shelter. $He was worn out by twenty years of brothel service.";
- break;
- case "You helped free her from a POW camp after being abandoned by her country, leaving her deeply indebted to you.":
- slavetext = "You helped free $him from a POW camp after being abandoned by $his country, leaving $him deeply indebted to you.";
- break;
- case "You kept her after her owner failed to pay your bill for performing surgery on her.":
- slavetext = "You kept $him after $his owner failed to pay your bill for performing surgery on $him.";
- break;
- case "You purchased her as a favor to her father.":
- slavetext = "You purchased $him as a favor to $his father.";
- break;
- case "You purchased her from a King after his son put an illegitimate heir in her womb.":
- slavetext = "You purchased $him from a King after his son put an illegitimate heir in $his womb.";
- break;
- case "You purchased her in order to pave the way for her brother to take the throne.":
- slavetext = "You purchased $him in order to pave the way for $his brother to take the throne.";
- break;
- case "You purchased her indenture contract, making her yours for as long as it lasts.":
- slavetext = "You purchased $his indenture contract, making $him yours for as long as it lasts.";
- break;
- case "You sentenced her to enslavement as a punishment for attempted theft of a slave.":
- slavetext = "You sentenced $him to enslavement as a punishment for attempted theft of a slave.";
- break;
- case "You sentenced her to enslavement as a punishment for dereliction of her duty to you as a mercenary and for theft.":
- slavetext = "You sentenced $him to enslavement as a punishment for dereliction of $his duty to you as a mercenary and for theft.";
- break;
- case "You sentenced her to enslavement as a punishment for smuggling slaves within her body.":
- slavetext = "You sentenced $him to enslavement as a punishment for smuggling slaves within $his body.";
- break;
- case "You stormed her arcology, killed her guards and enslaved her in revenge for insulting you at a dinner party.":
- slavetext = "You stormed $his arcology, killed $his guards, and enslaved $him in revenge for insulting you at a dinner party.";
- break;
- case "You tricked her into enslavement, manipulating her based on her surgical addiction.":
- slavetext = "You tricked $him into enslavement, manipulating $him based on $his surgical addiction.";
- break;
- case "You tricked her mother into selling her into slavery to clear addiction debts.":
- slavetext = "You tricked $his mother into selling $him into slavery to clear addiction debts.";
- break;
- case "You were acquainted with her before you were an arcology owner; your rival tried to use her to manipulate you, but you rescued her.":
- slavetext = "You were acquainted with $him before you were an arcology owner; your rival tried to use $him to manipulate you, but you rescued $him.";
- break;
- case "Your slaving troop kept several girls as fucktoys; you sired her in your favorite.":
- slavetext = "Your slaving troop kept several girls as fucktoys; you sired $him in your favorite.";
- break;
- case "She was enslaved by you when you purchased her debt.":
- slavetext = "$He was enslaved by you when you purchased $his debt.";
- break;
- case "A fresh capture once overpowered you and had his way with you. You kept her as a painful reminder to never lower your guard again.":
- case "Drugs and alcohol can be a potent mix; the night that followed it can sometimes be hard to remember. Needless to say, once your belly began swelling with her, you had to temporarily switch to a desk job for your mercenary group.":
- case "Her musky milky aura drives men and women around her giggly and dumb with lust.":
- case "She chose to be a slave because the romanticized view of it she had turns her on.":
- case "She grew up sheltered and submissive, making her an easy target for enslavement.":
- case "She has a faint air of fatigue about her, and strength too: that of a survivor.":
- case "She has a following in slave pornography. Thousands have enjoyed her getting off from the suffering she caused.":
- case "She has a following in slave pornography. Thousands have enjoyed her humiliating herself.":
- case "She has a following in slave pornography. Thousands have enjoyed the sight of her being raped.":
- case "She has a following in slave pornography. Thousands have enjoyed the sight of her being used.":
- case "She has a following in slave pornography. Thousands have enjoyed the sight of her eating and gaining weight.":
- case "She has a following in slave pornography. Thousands have enjoyed watching her abuse others.":
- case "She has a following in slave pornography. Thousands have enjoyed watching her do anything and everything for cum.":
- case "She has a following in slave pornography. Thousands have enjoyed watching her do anything for attention.":
- case "She has a following in slave pornography. Thousands have enjoyed watching her happily suffer.":
- case "She has a following in slave pornography. Thousands have enjoyed watching her obsess over pumping out babies.":
- case "She has a following in slave pornography. Thousands have enjoyed watching her swell with child.":
- case "She has a verbal tic that causes her to say 'ho, ho, ho' frequently.":
- case "She has many surgical scars and something seems off about her.":
- case "She is a complete mental blank; to her, there is only the Master.":
- case "She is one of the longest legally-enslaved persons in the world, having been a slave for 15 years. She has spent almost all that time working as a slave prostitute, and has been heavily modified to keep her productive.":
- case "She is the winner of a martial arts slave tournament. You won her in a bet.":
- case "She offered herself to you for enslavement to escape having plastic surgery foisted on her.":
- case "She was a runaway slave captured by a gang outside your arcology. You bought her cheap after she was harshly used by them.":
- case "She was a student you enslaved when you evacuated her from a threatened old world grade school.":
- case "She was a volleyball player you enslaved when you evacuated her from a broken down bus.":
- case "She was an expectant mother you enslaved when you evacuated her from a threatened old world hospital.":
- case "She was an orphan forced to live and steal on the streets until you adopted her.":
- case "She was enslaved by you when you overcharged her for surgery.":
- case "She was fresh from the slave markets when you acquired her.":
- case "She was homeless and willing to do anything for food, which in the end resulted in her becoming a slave.":
- case "She was previously owned by a creative sadist, who has left a variety of mental scars on her.":
- case "She was sold to you by an anonymous person who wanted her to suffer.":
- case "She was taken as a slave by a Sultan, who presented her as a gift to a surveyor.":
- case "She was taken into your custody from an owner who treated her as an equal.":
- case "She was the private slave of a con artist cult leader before he had to abandon her and flee.":
- case "She was the result of an intruder brute forcing your firewall, overloading your pleasure sensors, and allowing a corrupted packet to slip by. With a quick wipe of your RAM and cache with some powerful liquor, you have no idea who planted her in your womb.":
- case "You acquired her in the last stages of your career as a noted private military contractor.":
- case "You acquired her in the last stages of your career as a successful venture capitalist.":
- case "You bought her at auction.":
- case "You bought her from The Cattle Ranch.":
- case "You bought her from the enigmatic Futanari Sisters after they sold her into slavery.":
- case "You bought her from the household liquidator.":
- case "You bought her from the kidnappers' slave market, so she was probably forced into slavery.":
- case "You bought her from the prestigious Hippolyta Academy.":
- case "You bought her from the trainers' slave market after they put her through basic training.":
- case "You bought her from the underage raiders' slave market.":
- case "You bought out a deal involving her training to be an expert gelded sex slave.":
- case "You brought her into the arcology mindbroken, little more than a human onahole.":
- case "You brought her into the arcology mindbroken, little more than a walking collection of fuckable holes.":
- case "You captured her during your transition to the arcology":
- case "You conceived her after a male arcology owner, impressed by your work, rewarded you with a night you'll never forget.":
- case "You enslaved her personally during the last stages of your slaving career.":
- case "You helped her give birth, leaving her deeply indebted to you.":
- case "You never thought you would be capable of impregnating yourself, but years of pleasuring yourself with yourself after missions managed to create her.":
- case "You purchased her by special order.":
- case "You purchased her from a King after she expressed knowledge of the prince's affair with another servant.":
- case "You purchased her from FCTV's Home Slave Shopping stream channel.":
- case "You received her as a gift from an arcology owner impressed by your work.":
- case "You received her from a surgeon who botched an implant operation on her and needed to get her out of sight.":
- case "You reserved a mindless slave like her from the Flesh Heap.":
- case "You sentenced her to enslavement as a punishment for attempted burglary.":
- case "You sentenced her to enslavement as a punishment for defying local racial segregation laws.":
- case "You sentenced her to enslavement as a punishment for fraud and theft.":
- case "You sentenced her to enslavement as a punishment for suspected escapism.":
- case "You sentenced her to enslavement as a punishment for theft and battery.":
- case "You sentenced her to enslavement for smuggling drugs into the arcology.":
- case "You sired her after a female arcology owner, impressed by your work, rewarded you with a night you'll never forget.":
- case "You sired her in yourself after an arcology owner, impressed by your work, rewarded you with a night you'll never forget.":
- case "You turned her into a slave girl after she fell into debt to you.":
- case "You won her at a shotgun match against other arcology owners.":
- case "You won her at cards, a memento from your life as one of the idle rich before you became an arcology owner.":
- slavetext = slavetext.replace(/\bherself\b/g, "$himself");
- slavetext = slavetext.replace(/\bHerself\b/g, "$Himself");
- slavetext = slavetext.replace(/\bshe\b/g, "$he");
- slavetext = slavetext.replace(/\bShe\b/g, "$He");
- slavetext = slavetext.replace(/\bher\b/g, "$him");
- slavetext = slavetext.replace(/\bHer\b/g, "$His");
- slavetext = slavetext.replace(/\b girl\b/g, " $girl");
- slavetext = slavetext.replace(/\b woman\b/g, " $woman");
- slavetext = slavetext.replace(/\${2,}/g, '');
- break;
- default:
- if ((slavetext.includes("was serving the public")) || (slavetext.includes("You bought her from"))) {
- slavetext = slavetext.replace(/\bher\b/g, "$him");
- } else if (((slavetext.includes("Your lurcher")) && (slavetext.includes("coursing"))) || ((slavetext.includes("Your")) && (slavetext.includes("while raiding")))) {
- slavetext = slavetext.replace(/\bher\b/g, "$him");
- slavetext = slavetext.replace(/\bshe\b/g, "$he");
- } else if (slavetext.includes("was once the young trophy husband of a powerful woman in the old world, but she sold")) {
- slavetext = "$He was once the young trophy husband of a powerful woman in the old world, but she sold $him into slavery in revenge for $his infidelities.";
- } else if (slavetext.includes("gargantuan dick to be a truly unique slave")) {
- slavetext = "$He was raised as a girl despite $his gargantuan dick to be a truly unique slave.";
- } else if (slavetext.includes("to enslavement for the attempted rape of a free woman")) {
- slavetext = "You sentenced $him to enslavement for the attempted rape of a free woman.";
- } else if (slavetext.includes("to enslavement as a punishment for the rape of a free woman")) {
- slavetext = "You sentenced $him to enslavement as a punishment for the rape of a free woman.";
- } else if (slavetext.includes("only way to obtain surgery to transform $him into a woman")) {
- slavetext = "$He submitted to enslavement as $his only way to obtain surgery to transform $him into a woman.";
- } else if (slavetext.includes("was sold as a slave to satisfy her spousal maintenance after divorce")) {
- slavetext = "Once $he was an arcology security officer, lured to aphrodisiacs addiction and feminized by $his boss (and former wife), to whom $he was sold as a slave to satisfy her spousal maintenance after divorce.";
- } else if (slavetext.includes("asked to be enslaved in the hope you'd treat a fellow woman well")) {
- slavetext = "$He asked to be enslaved in the hope you'd treat a fellow woman well.";
- } else {
- slavetext = slavetext.replace(/\bherself\b/g, "$himself");
- slavetext = slavetext.replace(/\bHerself\b/g, "$Himself");
- slavetext = slavetext.replace(/\bshe\b/g, "$he");
- slavetext = slavetext.replace(/\bShe\b/g, "$He");
- slavetext = slavetext.replace(/\bher\b/g, "$his");
- slavetext = slavetext.replace(/\bHer\b/g, "$His");
- slavetext = slavetext.replace(/\b girl\b/g, " $girl");
- slavetext = slavetext.replace(/\b woman\b/g, " $woman");
- slavetext = slavetext.replace(/\${2,}/g, '');
- }
- break;
- }
- return slavetext;
-};
-
/**
* Describes a slaves pre-slavery career in a gender sensitive way. If career is "a dominatrix" but the slave is male and the pronoun system is on, returns "a dominator"
* @param {App.Entity.SlaveState} slave
@@ -1540,7 +958,7 @@ globalThis.randomCareer = function(slave) {
/**
* @param {FC.HumanState} slave
*/
-globalThis.resyncSlaveHight = function(slave) {
+globalThis.resyncSlaveHeight = function(slave) {
slave.height = Height.random(slave);
};
@@ -1548,7 +966,7 @@ globalThis.resyncSlaveHight = function(slave) {
* @param {App.Entity.SlaveState} slave
*/
globalThis.resyncSlaveToAge = function(slave) {
- resyncSlaveHight(slave);
+ resyncSlaveHeight(slave);
slave.pubertyXX = slave.actualAge < slave.pubertyAgeXX ? 0 : 1;
slave.pubertyXY = slave.actualAge < slave.pubertyAgeXY ? 0 : 1;
if (slave.actualAge < 12) {
@@ -1589,7 +1007,7 @@ globalThis.resyncSlaveToAge = function(slave) {
};
/**
- * @param {string} raceName
+ * @param {FC.Race} raceName
* @returns {string}
*/
globalThis.randomRaceSkin = function(raceName) {
@@ -1663,7 +1081,7 @@ globalThis.randomRaceEye = function(raceName) {
};
/**
- * @param {string} raceName
+ * @param {FC.Race} raceName
* @returns {string}
*/
globalThis.randomRaceHair = function(raceName) {
@@ -1889,7 +1307,7 @@ globalThis.moreNational = function(nation) {
};
/** Deflate a slave (reset inflation to none)
- * @param {App.Entity.SlaveState} slave
+ * @param {FC.HumanState} slave
*/
globalThis.deflate = function(slave) {
slave.inflation = 0;
@@ -1969,7 +1387,7 @@ globalThis.newSlave = function(slave) {
if (slave.preg > 0) {
slave.pregWeek = slave.preg;
- } else {
+ } else if (slave.pregWeek > 0) { // Should clear any abnormalities related to pregnancy while leaving postpartum alone
slave.pregWeek = 0;
}
@@ -1985,16 +1403,16 @@ globalThis.newSlave = function(slave) {
if (areSisters(V.PC, slave) > 0) {
V.PC.sisters += 1;
}
- for (let k = 0; k < V.slaves.length; k++) {
- if (V.slaves[k].mother === slave.ID || V.slaves[k].father === slave.ID) {
+ for (const other of V.slaves) {
+ if (other.mother === slave.ID || other.father === slave.ID) {
slave.daughters++;
}
- if (slave.mother === V.slaves[k].ID || slave.father === V.slaves[k].ID) {
- V.slaves[k].daughters++;
+ if (slave.mother === other.ID || slave.father === other.ID) {
+ other.daughters++;
}
- if (areSisters(V.slaves[k], slave) > 0) {
+ if (areSisters(other, slave) > 0) {
slave.sisters++;
- V.slaves[k].sisters++;
+ other.sisters++;
}
}
@@ -2055,7 +1473,7 @@ globalThis.newSlave = function(slave) {
V.REReductionCheckinIDs.push(slave.ID);
}
- /* special case for MB slave genetic intellignece in slave acquisition */
+ /* special case for MB slave genetic intelligence in slave acquisition */
if (slave.savedIntelligence !== undefined) {
slave.intelligence = slave.savedIntelligence;
}
@@ -2177,84 +1595,91 @@ globalThis.SlaveTitle = function(slave, adjective = true, variability = true) {
let r;
if (V.newDescriptions === 1) {
if (slave.dick > 0 && slave.balls > 0 && slave.boobs > 300 && slave.vagina > -1 && slave.ovaries === 1) {
- if (variability && jsRandom(1, 100) > 50) {
- r = "futanari";
+ if (variability && random(1, 100) > 50) {
+ r = `futanari`;
} else {
- r = "herm";
+ r = `herm`;
}
} else if (slave.dick > 0 && slave.balls === 0 && slave.boobs > 300 && slave.vagina > -1 && slave.ovaries === 1) {
- r = "dickgirl";
+ r = `dickgirl`;
} else if (slave.dick > 0 && slave.vagina > -1 && slave.ovaries === 0) {
- r = "shemale";
+ r = `shemale`;
} else if (slave.dick > 0 && slave.balls === 0 && slave.vagina === -1 && slave.ovaries === 0) {
- r = "eunuch";
+ r = `eunuch`;
} else if (slave.dick > 0 && slave.balls > 0 && slave.vagina === -1 && slave.ovaries === 0) {
if (slave.race === "catgirl") {
- r = "catboy";
+ r = `catboy`;
} else if (slave.face > 10 && slave.hips > -1 && slave.shoulders < 1 && slave.faceShape !== "masculine") {
- r = "trap";
+ r = `trap`;
} else if (slave.boobs > 800) {
- r = "tittyboy";
+ r = `tittyboy`;
} else if (slave.dick === 1 && slave.balls === 1) {
- r = "sissy";
+ r = `sissy`;
} else if (slave.dick > 1 && slave.balls > 1 && slave.height < 165 && slave.muscles < 5 && slave.visualAge < 19 && slave.faceShape !== "masculine") {
- r = "twink";
+ r = `twink`;
} else if (slave.dick > 1 && slave.balls > 1 && slave.height < 160 && slave.muscles < 5 && slave.visualAge < 19) {
- r = "boytoy";
+ r = `boytoy`;
} else if (slave.muscles > 95 && slave.height >= 185) {
- r = "titan";
+ r = `titan`;
} else if (slave.muscles > 30) {
- r = "muscleboy";
+ r = `muscleboy`;
} else {
- r = "slaveboy";
+ r = `slaveboy`;
}
} else if (slave.dick === 0 && slave.balls === 0 && slave.vagina > -1) {
if (slave.race === "catgirl") {
- r = "catgirl";
+ r = `catgirl`;
} else if ((slave.shoulders > slave.hips || slave.faceShape === "masculine") && slave.boobs < 400 && slave.genes === "XY") {
- r = "cuntboy";
+ r = `cuntboy`;
} else if (slave.ovaries === 0 && slave.genes === "XY") {
- r = "tranny";
+ r = `tranny`;
} else if (slave.weight > 10 && slave.boobs > 800 && slave.counter.birthsTotal > 0 && slave.physicalAge > 59) {
- r = "GMILF";
+ r = `GMILF`;
} else if (slave.weight > 10 && slave.boobs > 800 && slave.counter.birthsTotal > 0 && slave.physicalAge > 35) {
- r = "MILF";
+ r = `MILF`;
} else if (slave.lips > 70 && slave.boobs > 2000 && slave.butt > 3) {
- r = "bimbo";
+ r = `bimbo`;
} else if (slave.hips > 1 && slave.boobs > 2000 && slave.butt > 3 && slave.waist < 50) {
- r = "hourglass";
+ r = `hourglass`;
} else if (slave.muscles > 95 && slave.height >= 185) {
- r = "amazon";
+ r = `amazon`;
} else if (slave.muscles > 30) {
- r = "musclegirl";
+ r = `musclegirl`;
} else {
- r = "slavegirl";
+ r = `slavegirl`;
}
} else if (slave.dick === 0 && slave.balls === 0 && slave.vagina === -1) {
- r = "neuter";
+ r = `neuter`;
} else if (slave.dick === 0 && slave.vagina === -1) {
- r = "ballslave";
+ r = `ballslave`;
} else {
- r = "slave";
+ r = `slave`;
}
if (!adjective) {
return r;
}
- if (slave.visualAge < 13) {
- if (slave.actualAge < 3) {
- if (slave.actualAge < 1) {
- r = "baby " + r;
+ if (slave.visualAge < 18) {
+ if (slave.visualAge < 13) {
+ if (slave.actualAge < 3) {
+ if (slave.actualAge < 1) {
+ r = `baby ${r}`;
+ } else {
+ r = `toddler ${r}`;
+ }
} else {
- r = "toddler " + r;
+ if (slave.genes === "XY" && slave.vagina === -1) {
+ r = `shota ${r}`;
+ } else {
+ r = `loli ${r}`;
+ if (slave.boobs > 1000) {
+ r = `oppai ${r}`;
+ }
+ }
}
} else {
- if (slave.genes === "XY" && slave.vagina === -1) {
- r = "shota " + r;
- } else {
- r = "loli " + r;
- }
+ r = `teen ${r}`;
}
}
@@ -2287,7 +1712,7 @@ globalThis.SlaveTitle = function(slave, adjective = true, variability = true) {
}
if (slave.dick > 5 && slave.balls > 5) {
- r = `womb filling ${r}`;
+ r = `womb-filling ${r}`;
} else if (slave.dick > 5) {
r = `well hung ${r}`;
}
@@ -2328,10 +1753,10 @@ globalThis.SlaveTitle = function(slave, adjective = true, variability = true) {
r = `${r} fuckdoll`;
}
} else {
- r = "slave"; /* I don't think there is an 'else'? */
+ r = `slave`;
if ((slave.dick === 0) && (slave.vagina === -1)) {
- /* NULLS */
- r = "null";
+ // NULLS
+ r = `null`;
if ((slave.lactation > 0) && (slave.boobs > 2000)) {
r = `${r} cow`;
} else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
@@ -2355,15 +1780,15 @@ globalThis.SlaveTitle = function(slave, adjective = true, variability = true) {
}
if ((slave.dick === 0) && (slave.vagina !== -1)) {
- /* FEMALES */
+ // FEMALES
if (slave.visualAge > 55) {
- r = "GILF";
+ r = `GILF`;
} else if (slave.visualAge > 35) {
- r = "MILF";
+ r = `MILF`;
} else if (slave.visualAge >= 25) {
- r = "slave";
+ r = `slave`;
} else {
- r = "slavegirl";
+ r = `slavegirl`;
}
if ((slave.muscles > 30) && (slave.height < 185)) {
r = `muscle ${r}`;
@@ -2380,11 +1805,11 @@ globalThis.SlaveTitle = function(slave, adjective = true, variability = true) {
if ((slave.dick !== 0) && (slave.vagina !== -1)) {
if (slave.balls > 0) {
- /* FUTANARI: cock & balls & vagina */
- r = "futanari ";
+ // FUTANARI: cock & balls & vagina
+ r = `futanari `;
} else {
- /* FUTANARI: cock & vagina */
- r = "futa ";
+ // FUTANARI: cock & vagina
+ r = `futa `;
}
if ((slave.lactation > 0) && (slave.boobs > 2000)) {
r = `${r}cow`;
@@ -2412,15 +1837,15 @@ globalThis.SlaveTitle = function(slave, adjective = true, variability = true) {
}
if ((slave.dick !== 0) && (slave.vagina === -1) && (slave.balls > 0) && (slave.boobs > 300) && (slave.butt > 2)) {
- /* SHEMALES: cock & balls, T&A above minimum */
+ // SHEMALES: cock & balls, T&A above minimum
if (slave.visualAge > 55) {
- r = "sheGILF";
+ r = `sheGILF`;
} else if (slave.visualAge > 35) {
- r = "sheMILF";
+ r = `sheMILF`;
} else if (slave.visualAge >= 25) {
- r = "shemale";
+ r = `shemale`;
} else {
- r = "tgirl";
+ r = `tgirl`;
}
if ((slave.muscles > 30) && (slave.height < 185)) {
r = `muscle${r}`;
@@ -2439,24 +1864,24 @@ globalThis.SlaveTitle = function(slave, adjective = true, variability = true) {
if ((slave.dick !== 0) && (slave.vagina === -1) && (slave.balls > 0)) {
if ((slave.shoulders < 1) || (slave.muscles <= 30)) {
if ((slave.faceShape === "masculine") || (slave.faceShape === "androgynous")) {
- /* SISSIES: feminine shoulders or muscles, masculine faces */
+ // SISSIES: feminine shoulders or muscles, masculine faces
if (slave.visualAge > 55) {
- r = "sissyGILF";
+ r = `sissyGILF`;
} else if (slave.visualAge > 35) {
- r = "sissyMILF";
+ r = `sissyMILF`;
} else {
- r = "sissy";
+ r = `sissy`;
}
} else {
- /* TRAPS: feminine shoulders or muscles, feminine faces */
+ // TRAPS: feminine shoulders or muscles, feminine faces
if (slave.visualAge > 55) {
- r = "trapGILF";
+ r = `trapGILF`;
} else if (slave.visualAge > 35) {
- r = "trapMILF";
+ r = `trapMILF`;
} else if (slave.visualAge >= 25) {
- r = "trap";
+ r = `trap`;
} else {
- r = "trapgirl";
+ r = `trapgirl`;
}
}
if (slave.lactation > 0) {
@@ -2471,8 +1896,8 @@ globalThis.SlaveTitle = function(slave, adjective = true, variability = true) {
if ((slave.boobs < 300) || (slave.butt < 2)) {
if ((slave.dick !== 0) && (slave.vagina === -1) && (slave.balls > 0)) {
if ((slave.shoulders > 1) || (slave.muscles >= 30)) {
- /* BITCHES: masculine shoulders or muscles */
- r = "bitch";
+ // BITCHES: masculine shoulders or muscles
+ r = `bitch`;
if ((slave.muscles > 30) && (slave.height < 185)) {
r = `muscle${r}`;
} else if (slave.lactation > 0) {
@@ -2492,7 +1917,7 @@ globalThis.SlaveTitle = function(slave, adjective = true, variability = true) {
}
if ((slave.dick !== 0) && (slave.vagina === -1) && (slave.balls === 0)) {
- r = "dick";
+ r = `dick`;
if (slave.visualAge > 55) {
r = `${r}GILF`;
} else if (slave.visualAge > 35) {
@@ -2834,19 +2259,19 @@ globalThis.DegradingName = function(slave) {
} else {
if (slave.balls > 0) {
if (slave.boobs > 300 && slave.butt > 2) {
- /* SHEMALES: cock & balls, T&A above minimum */
+ // SHEMALES: cock & balls, T&A above minimum
suffixes.push("Shemale");
} else {
if (slave.shoulders < 1 && slave.muscles <= 30) {
if (slave.faceShape === "masculine" || slave.faceShape === "androgynous") {
- /* SISSIES: feminine shoulders or muscles, masculine faces */
+ // SISSIES: feminine shoulders or muscles, masculine faces
suffixes.push("Sissy");
} else {
- /* TRAPS: feminine shoulders or muscles, feminine faces */
+ // TRAPS: feminine shoulders or muscles, feminine faces
suffixes.push("Trap");
}
} else {
- /* BITCHES: masculine shoulders or muscles */
+ // BITCHES: masculine shoulders or muscles
suffixes.push("Bitch");
}
}
@@ -2880,7 +2305,7 @@ globalThis.DegradingName = function(slave) {
if (slave.fetish === "humiliation") {
suffixes.push("Rapebait", "Showgirl");
}
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
suffixes.push("Bottom", "Fuckee", "Rapebait");
}
if (slave.fetish === "dom") {
@@ -3013,7 +2438,7 @@ globalThis.parentNames = function(parent, child) {
if (!child.slaveName) {
for (let i = 0; i < 10; i++) {
continentNationality = hashChoice(V.nationalities);
- child.slaveName = generateName(continentNationality, child.race, useMaleName, sn => !currentSlaveNames.includes(sn)); // jshint ignore: line
+ child.slaveName = generateName(continentNationality, child.race, useMaleName, sn => !currentSlaveNames.includes(sn));
}
}
if (!child.slaveName) {
@@ -3075,172 +2500,262 @@ globalThis.faceIncreaseDesc = function(slave, newFace) {
return r;
};
+/**
+ * @typedef {object} DeadlinessEffect
+ * @property {string} effect
+ * @property {number} value
+ */
+
/**
* @param {App.Entity.SlaveState} slave
- * @returns {number}
+ * @returns {{effects: Array<DeadlinessEffect>, value: number}}
*/
globalThis.deadliness = function(slave) {
- let deadliness = 2;
+ /**
+ * @type {Array<DeadlinessEffect>}
+ */
+ let deadlinessArr = [];
+ let deadlinessSum = 0;
- if (slave.skill.combat > 0) {
- deadliness += 2;
- }
+ adjust("Base Deadliness", 2);
- if (App.Data.Careers.Leader.bodyguard.includes(slave.career)) {
- deadliness += 1;
- } else if (slave.skill.bodyguard >= V.masteredXP) {
- deadliness += 1;
+ combatSkill();
+ bodyguardSkill();
+ age();
+ musclesAndHeight();
+ health();
+ assets();
+ weight();
+ bellyAndPregnancy();
+ genitals();
+ limbs();
+ senses();
+ otherProsthetics();
+ tiredness();
+
+ if (deadlinessSum < 1) {
+ adjust("Minimum deadliness", 1 - deadlinessSum);
}
- if (V.AgePenalty !== 0) {
- if (slave.physicalAge >= 100) {
- deadliness -= 10;
- } else if (slave.physicalAge >= 85) {
- deadliness -= 3;
- } else if (slave.physicalAge >= 70) {
- deadliness -= 1;
+ return {value: deadlinessSum, effects: deadlinessArr};
+
+ /**
+ * @param {string} effect
+ * @param {number} value
+ */
+ function adjust(effect, value) {
+ if (value !== 0) {
+ deadlinessArr.push({effect: effect, value: value});
+ deadlinessSum += value;
}
}
- if (slave.muscles > 30 && slave.muscles <= 95) {
- deadliness += 1;
- } else if (slave.muscles > 95 && slave.height >= 185) {
- deadliness += 2;
- } else if (slave.muscles > 95) {
- deadliness -= 1;
- } else if (slave.muscles < -95) {
- deadliness -= 20;
- } else if (slave.muscles < -30) {
- deadliness -= 7;
- } else if (slave.muscles < -5) {
- deadliness -= 3;
+ function combatSkill() {
+ // The last part of the skill is useless in one-to-one combat -> max 3
+ adjust("Skill: Combat", Math.min(Math.floor(slave.skill.combat / 3.0) / 10, 3));
}
- if (slave.height >= 170) {
- deadliness += 1;
+ function bodyguardSkill() {
+ if (App.Data.Careers.Leader.bodyguard.includes(slave.career) ||
+ slave.skill.bodyguard >= Constant.MASTERED_XP) {
+ adjust("Skill: Bodyguard", 2);
+ }
}
- if (slave.health.condition > 50) {
- deadliness += 1;
- } else if (slave.health.condition < -50) {
- deadliness -= 1;
+ function age() {
+ if (V.AgePenalty !== 0) {
+ if (slave.physicalAge >= 100) {
+ adjust("Age: 100", -10);
+ } else if (slave.physicalAge >= 85) {
+ adjust("Age: 85", -3);
+ } else if (slave.physicalAge >= 70) {
+ adjust("Age: 70", -1);
+ }
+ }
}
- if (slave.health.illness > 3) {
- deadliness -= 3;
- } else if (slave.health.illness > 1) {
- deadliness -= 2;
- } else if (slave.health.illness > 0) {
- deadliness -= 1;
- }
+ function musclesAndHeight() {
+ if (slave.muscles > 30 && slave.muscles <= 95) {
+ adjust(`Muscles: Decent (${slave.muscles})`, 1);
+ } else if (slave.muscles > 95 && slave.height >= 185) {
+ adjust("Perfect stature", 2);
+ } else if (slave.muscles > 95) {
+ adjust(`Muscles: Extreme (${slave.muscles})`, -1);
+ } else if (slave.muscles < -95) {
+ adjust(`Muscles: Weak (${slave.muscles})`, -20);
+ } else if (slave.muscles < -30) {
+ adjust(`Muscles: Weak (${slave.muscles})`, -7);
+ } else if (slave.muscles < -5) {
+ adjust(`Muscles: Weak (${slave.muscles})`, -3);
+ }
- if (slave.boobs > 4000) {
- deadliness -= 2;
- } else if (slave.boobs > 2000) {
- deadliness -= 1;
+ if (slave.height >= 170) {
+ adjust("Tall", 1);
+ }
}
- if (slave.butt > 6) {
- deadliness -= 1;
- }
+ function health() {
+ if (slave.health.condition > 50) {
+ adjust("Health: Good", 1);
+ } else if (slave.health.condition < -50) {
+ adjust("Health: Bad", -1);
+ }
- if (slave.hips > 2) {
- deadliness -= 1;
+ if (slave.health.illness > 3) {
+ adjust(`Ill: ${slave.health.illness}`, -3);
+ } else if (slave.health.illness > 1) {
+ adjust(`Ill: ${slave.health.illness}`, -2);
+ } else if (slave.health.illness > 0) {
+ adjust(`Ill: ${slave.health.illness}`, -1);
+ }
}
- if (slave.weight > 190) {
- deadliness -= 20;
- } else if (slave.weight > 160) {
- deadliness -= 10;
- } else if (slave.weight > 130) {
- deadliness -= 3;
- } else if (slave.weight > 30 || slave.weight < -10) {
- deadliness -= 1;
- }
+ function assets() {
+ if (slave.boobs > 4000) {
+ adjust("Boobs: Huge", -2);
+ } else if (slave.boobs > 2000) {
+ adjust("Boobs: Large", -1);
+ }
- if (slave.bellyFluid >= 10000) {
- deadliness -= 3;
- } else if (slave.bellyFluid >= 5000) {
- deadliness -= 2;
- } else if (slave.bellyFluid >= 2000) {
- deadliness -= 1;
- }
+ if (slave.butt > 6) {
+ adjust("Butt: Huge", -1);
+ }
- if (slave.pregKnown === 1 || slave.bellyPreg >= 1500 || slave.bellyImplant >= 1500) {
- if (slave.belly >= 750000) {
- deadliness -= 50;
- } else if (slave.belly >= 600000) {
- deadliness -= 25;
- } else if (slave.belly >= 450000) {
- deadliness -= 15;
- } else if (slave.belly >= 300000) {
- deadliness -= 10;
- } else if (slave.belly >= 150000) {
- deadliness -= 8;
- } else if (slave.belly >= 100000) {
- deadliness -= 7;
- } else if (slave.belly >= 10000) {
- deadliness -= 3;
- } else if (slave.belly >= 5000) {
- deadliness -= 2;
- } else {
- deadliness -= 1;
+ if (slave.hips > 2) {
+ adjust("Hips: Wide", -1);
}
}
- if (isInLabor(slave)) {
- deadliness -= 15;
- } else if (slave.preg >= slave.pregData.normalBirth && slave.pregControl !== "labor suppressors") {
- deadliness -= 5;
+ function weight() {
+ if (slave.weight > 190) {
+ adjust(`Weight (${slave.weight})`, -20);
+ } else if (slave.weight > 160) {
+ adjust(`Weight (${slave.weight})`, -10);
+ } else if (slave.weight > 130) {
+ adjust(`Weight (${slave.weight})`, -3);
+ } else if (slave.weight > 30 || slave.weight < -10) {
+ adjust(`Weight (${slave.weight})`, -1);
+ }
}
- if (slave.balls >= 15) {
- deadliness -= 1;
- }
+ function bellyAndPregnancy() {
+ if (slave.bellyFluid >= 10000) {
+ adjust(`Belly Fluid (${slave.bellyFluid})`, -3);
+ } else if (slave.bellyFluid >= 5000) {
+ adjust(`Belly Fluid (${slave.bellyFluid})`, -2);
+ } else if (slave.bellyFluid >= 2000) {
+ adjust(`Belly Fluid (${slave.bellyFluid})`, -1);
+ }
+
+ if (slave.pregKnown === 1 || slave.bellyPreg >= 1500 || slave.bellyImplant >= 1500) {
+ if (slave.belly >= 750000) {
+ adjust(`Pregnancy (${slave.belly})`, -50);
+ } else if (slave.belly >= 600000) {
+ adjust(`Pregnancy (${slave.belly})`, -25);
+ } else if (slave.belly >= 450000) {
+ adjust(`Pregnancy (${slave.belly})`, -15);
+ } else if (slave.belly >= 300000) {
+ adjust(`Pregnancy (${slave.belly})`, -10);
+ } else if (slave.belly >= 150000) {
+ adjust(`Pregnancy (${slave.belly})`, -8);
+ } else if (slave.belly >= 100000) {
+ adjust(`Pregnancy (${slave.belly})`, -7);
+ } else if (slave.belly >= 10000) {
+ adjust(`Pregnancy (${slave.belly})`, -3);
+ } else if (slave.belly >= 5000) {
+ adjust(`Pregnancy (${slave.belly})`, -2);
+ } else {
+ adjust(`Pregnancy (${slave.belly})`, -1);
+ }
+ }
- if (slave.dick >= 10) {
- deadliness -= 1;
+ if (isInLabor(slave)) {
+ adjust("In labor: Yes", -15);
+ } else if (slave.preg >= slave.pregData.normalBirth && slave.pregControl !== "labor suppressors") {
+ adjust("In labor: Soon", -5);
+ }
}
- deadliness -= getLimbCount(slave, 0) * 5;
- deadliness -= getLimbCount(slave, 2) * 0.25;
- deadliness -= getLimbCount(slave, 3) * 0.25;
- deadliness -= getLimbCount(slave, 4) * 0.25;
- deadliness += getLimbCount(slave, 5) * 1.25;
- deadliness += getLimbCount(slave, 6) * 2.5;
- if (hasBothLegs(slave) && !canStand(slave)) {
- deadliness -= 20;
- }
+ function genitals() {
+ if (slave.balls >= 15) {
+ adjust("Balls: 15", -1);
+ }
- if (!canSee(slave)) {
- deadliness -= 8;
- } else if (!canSeePerfectly(slave)) {
- deadliness -= 1;
+ if (slave.dick >= 10) {
+ adjust("Dick: 10", -1);
+ }
}
- if (!canHear(slave)) {
- deadliness -= 4;
- } else if ((slave.hears === -1 && slave.earwear !== "hearing aids") || (slave.hears === 0 && slave.earwear === "muffling ear plugs")) {
- deadliness -= 1;
+ function limbs() {
+ adjust(`Missing limb(s): ${getLimbCount(slave, 0)}`, -5 * getLimbCount(slave, 0));
+ adjust(`Basic prosthetic: ${getLimbCount(slave, 2)}`, -0.25 * getLimbCount(slave, 2));
+ adjust(`Sex prosthetic: ${getLimbCount(slave, 3)}`, -0.25 * getLimbCount(slave, 3));
+ adjust(`Beauty prosthetic: ${getLimbCount(slave, 4)}`, -0.25 * getLimbCount(slave, 4));
+ adjust(`Combat prosthetic: ${getLimbCount(slave, 5)}`, 1.25 * getLimbCount(slave, 5));
+ adjust(`Cybernetics: ${getLimbCount(slave, 6)}`, 2.5 * getLimbCount(slave, 6));
+ if (hasBothLegs(slave) && !canStand(slave)) {
+ adjust("Immobile", -20);
+ }
}
- if (["combat", "stinger"].includes(slave.tail)) {
- deadliness += 2;
+ function senses() {
+ if (!canSee(slave)) {
+ adjust("Blind", -8);
+ } else if (!canSeePerfectly(slave)) {
+ adjust("Bad eyes", -1);
+ }
+
+ if (!canHear(slave)) {
+ adjust("Deaf", -4);
+ } else if ((slave.hears === -1 && slave.earwear !== "hearing aids") || (slave.hears === 0 && slave.earwear === "muffling ear plugs")) {
+ adjust("Bad hearing", -1);
+ }
}
- if (["falcon", "arachnid", "kraken"].includes(slave.appendages)) {
- deadliness += 3;
+ function otherProsthetics() {
+ if (["combat", "stinger"].includes(slave.tail)) {
+ adjust("Combat tail", 2);
+ }
+
+ if (["falcon", "arachnid", "kraken"].includes(slave.appendages)) {
+ adjust("Extra limbs", 3);
+ }
}
- if (slave.health.tired > 90) {
- deadliness -= 10;
- } else if (slave.health.tired > 60) {
- deadliness -= 3;
- } else if (slave.health.tired > 30) {
- deadliness -= 1;
+ function tiredness() {
+ if (slave.health.tired > 90) {
+ adjust(`Tired (${slave.health.tired})`, -10);
+ } else if (slave.health.tired > 60) {
+ adjust(`Tired (${slave.health.tired})`, -3);
+ } else if (slave.health.tired > 30) {
+ adjust(`Tired (${slave.health.tired})`, -1);
+ }
}
+};
+
+/**
+ * Show an itemized breakdown of the deadliness value of the slave.
+ * @param {App.Entity.SlaveState} slave
+ * @returns {HTMLSpanElement}
+ */
+globalThis.DeadlinessTooltip = function(slave) {
+ const dl = deadliness(slave);
+ const span = App.UI.DOM.makeElement("span", dl.value.toString());
+ span.tabIndex = 0;
+ span.classList.add("has-tooltip");
+ tippy(span, {
+ content: DeadlinessDisplay(),
+ interactive: true,
+ placement: "right",
+ });
+ return span;
- return Math.max(deadliness, 1);
+ function DeadlinessDisplay() {
+ const el = document.createElement("div");
+ el.classList.add("tip-details");
+ el.append(RelativeDataTable(dl.effects, "effect", "value", [1, 10]));
+ return el;
+ }
};
/** Is the slave ready to retire?
@@ -3324,7 +2839,7 @@ globalThis.ageSlave = function(slave, forceDevelopment = false) {
};
/**
- * @param {App.Entity.SlaveState} slave
+ * @param {FC.HumanState} slave
* @param {number} [induce]
* @returns {string}
*/
@@ -3382,7 +2897,7 @@ globalThis.induceLactation = function(slave, induce = 0) {
globalThis.slaveSkillIncrease = function(targetSkill, slave, skillIncrease = 1) {
let r = "";
let skillDec;
- const {He, he, his, him} = getPronouns(slave);
+ const {He, he, his, him, himself} = getPronouns(slave);
const isLeadership = [
['headGirl', 'HG'],
['recruiter', 'recruiter'],
@@ -3403,7 +2918,7 @@ globalThis.slaveSkillIncrease = function(targetSkill, slave, skillIncrease = 1)
if (!App.Data.Careers.Leader[isLeadershipRole[1]].includes(slave.career)) {
if (slave.skill[targetSkill] <= 20) {
if (slave.skill[targetSkill] + skillIncrease > 20) {
- r = `<span class="green">${He} now has basic skills as a ${capFirstChar(targetSkill)}</span>`;
+ r = `<span class="green">${He} now has basic skills as a ${capFirstChar(targetSkill)}.</span>`;
}
} else if (slave.skill[targetSkill] <= 60) {
if (slave.skill[targetSkill] + skillIncrease > 60) {
@@ -3438,6 +2953,9 @@ globalThis.slaveSkillIncrease = function(targetSkill, slave, skillIncrease = 1)
case 'entertainment':
skillDec = `knowledge about how to be entertaining,`;
break;
+ case "combat":
+ skillDec = `knowledge about defending ${himself},`;
+ break;
}
if (slave.skill[targetSkill] + skillIncrease > 10) {
@@ -3458,6 +2976,8 @@ globalThis.slaveSkillIncrease = function(targetSkill, slave, skillIncrease = 1)
case 'entertainment':
r += ` and can usually avoid serious faux pas.`;
break;
+ case "combat":
+ r += ` and can throw up a fight when attacked.`;
}
}
} else if (slave.skill[targetSkill] <= 30) {
@@ -3473,6 +2993,9 @@ globalThis.slaveSkillIncrease = function(targetSkill, slave, skillIncrease = 1)
case 'entertainment':
skillDec = `skill as an entertainer,`;
break;
+ case "combat":
+ skillDec = "skill in 1-to-1 combat,";
+ break;
}
if (slave.skill[targetSkill] + skillIncrease > 30) {
@@ -3493,25 +3016,31 @@ globalThis.slaveSkillIncrease = function(targetSkill, slave, skillIncrease = 1)
case 'entertainment':
r += ` and can flirt, dance, and strip acceptably.`;
break;
+ case "combat":
+ r += " and can shoot, hit and reload with all common weapons";
}
}
} else if (slave.skill[targetSkill] <= 60) {
switch (targetSkill) {
case 'oral':
- case 'vaginal':
case 'anal':
- skillDec = `${targetSkill} sex expert,`;
+ skillDec = `an ${targetSkill} sex expert,`;
+ break;
+ case 'vaginal':
+ skillDec = `a vaginal sex expert,`;
break;
case 'whoring':
- skillDec = `expert whore,`;
+ skillDec = `an expert whore,`;
break;
case 'entertainment':
- skillDec = `expert entertainer,`;
+ skillDec = `an expert entertainer,`;
break;
+ case "combat":
+ skillDec = `a weapons expert,`;
}
if (slave.skill[targetSkill] + skillIncrease > 60) {
- r = `<span class="green">${He} is now an ${skillDec}</span>`;
+ r = `<span class="green">${He} is now ${skillDec}</span>`;
switch (targetSkill) {
case 'oral':
r += ` and has a delightfully experienced tongue.`;
@@ -3528,6 +3057,9 @@ globalThis.slaveSkillIncrease = function(targetSkill, slave, skillIncrease = 1)
case 'entertainment':
r += ` and can flirt engagingly, dance alluringly, and strip arousingly.`;
break;
+ case "combat":
+ r += ` and can keep ${his} head in complicated tactical situations.`;
+ break;
}
}
} else if (slave.skill[targetSkill] < 100) {
@@ -3543,6 +3075,8 @@ globalThis.slaveSkillIncrease = function(targetSkill, slave, skillIncrease = 1)
case 'entertainment':
skillDec = `is now a masterful entertainer,`;
break;
+ case "combat":
+ skillDec = `is now a weapons master,`;
}
if (slave.skill[targetSkill] + skillIncrease >= 100) {
@@ -3563,6 +3097,9 @@ globalThis.slaveSkillIncrease = function(targetSkill, slave, skillIncrease = 1)
case 'entertainment':
r += ` and can learn nothing more about flirting, dancing, or stripping.`;
break;
+ case "combat":
+ r += ` and can learn nothing more about fighting and tactics.`;
+ break;
}
}
}
@@ -3617,7 +3154,7 @@ globalThis.randomRapeRivalryTarget = function(slave, predicate) {
const willIgnoreRules = disobedience(slave) > jsRandom(0, 100);
function canBeARapeRival(s) {
- return (s.devotion <= 95 && s.energy <= 95 && !s.rivalry && !s.fuckdoll && s.fetish !== "mindbroken");
+ return (s.devotion <= 95 && s.energy <= 95 && !s.rivalry && !s.fuckdoll && s.fetish !== Fetish.MINDBROKEN);
}
function canRape(rapist, rapee) {
@@ -3707,7 +3244,7 @@ globalThis.restoreTraitor = function() {
* @param {number} oldIntelligence Genetic intelligence for slavegen. Seriously, do not use outside of slavegen!
*/
globalThis.applyMindbroken = function(slave, oldIntelligence = -200) {
- slave.fetish = "mindbroken";
+ slave.fetish = Fetish.MINDBROKEN;
slave.fetishStrength = 10;
slave.attrXY = 50;
slave.attrXX = 50;
@@ -3764,3 +3301,19 @@ App.Utils.showSlaveChanges = function(edited, original, dispatch, crumb = "") {
globalThis.stretchedAnusSize = function(dickSize) {
return /** @type {FC.AnusType} */ (Math.clamp(dickSize, 0, 4));
};
+
+/** Determines whether an outfit passes Chattel Religionism's strictest cultural clothing requirements (either base or Holy Nudism)
+ * @param {FC.Clothes} outfit
+ * @returns {boolean}
+ */
+globalThis.ChattelReligionistClothingPass = function(outfit) {
+ const clothes = App.Data.clothes.get(outfit);
+ const fsLovesClothes = clothes && clothes.fs && clothes.fs.loves && clothes.fs.loves.has("FSChattelReligionist");
+ const fsToleratesClothes = clothes && clothes.fs && clothes.fs.tolerates && clothes.fs.tolerates.has("FSChattelReligionist");
+
+ if (V.arcologies[0].FSChattelReligionistLaw2 === 1) {
+ return clothes.exposure === 4 || (clothes.exposure === 3 && (fsLovesClothes || fsToleratesClothes));
+ } else {
+ return fsLovesClothes;
+ }
+};
diff --git a/src/js/utilsSlaves.js b/src/js/utilsSlaves.js
index 74d517ee0c0392df0de49a450bc2ac1a6c99331f..904442e40f8e5350625ed292774934ddbebc66b0 100644
--- a/src/js/utilsSlaves.js
+++ b/src/js/utilsSlaves.js
@@ -57,6 +57,8 @@ globalThis.SlaveSort = function() {
DID: (a, b) => b.ID - a.ID,
AweeklyIncome: (a, b) => a.lastWeeksCashIncome - b.lastWeeksCashIncome,
DweeklyIncome: (a, b) => b.lastWeeksCashIncome - a.lastWeeksCashIncome,
+ Abeauty: (a, b) => Beauty(a) - Beauty(b),
+ Dbeauty: (a, b) => Beauty(b) - Beauty(a),
Ahealth: (a, b) => a.health.health - b.health.health,
Dhealth: (a, b) => b.health.health - a.health.health,
Aweight: (a, b) => a.weight - b.weight,
diff --git a/src/js/vignettes.js b/src/js/vignettes.js
index cd617d62bba1ff2fc0a3431c51c3a4c427fd161e..55d59ede62ee00cc6377d41c0bb3505ed731121b 100644
--- a/src/js/vignettes.js
+++ b/src/js/vignettes.js
@@ -1298,7 +1298,7 @@ globalThis.GetVignette = function(slave) {
effect: -1,
});
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
vignettes.push({
text: `a customer really enjoyed being able to treat ${him} however they liked without eliciting a reaction,`,
type: "cash",
@@ -3314,7 +3314,7 @@ globalThis.GetVignette = function(slave) {
effect: -1,
});
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
vignettes.push({
text: `a citizen really enjoyed being able to treat ${him} however they liked without eliciting a reaction,`,
type: "rep",
@@ -4080,7 +4080,7 @@ globalThis.GetVignette = function(slave) {
});
break;
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
vignettes.push({
text: `${he} forgot to sleep and no one bothered to tell ${him} to. ${He} collapsed from exhaustion halfway through the week, but even by then ${he}'d gotten all ${his} work done and then some,`,
type: "cash",
@@ -4386,7 +4386,7 @@ globalThis.GetVignette = function(slave) {
});
break;
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
vignettes.push({
text: `${he} spent ${his} time watching paint dry. No one bothered telling ${him} the wall wasn't newly painted,`,
type: "cash",
@@ -4662,8 +4662,7 @@ globalThis.GetVignette = function(slave) {
return jsEither(vignettes);
-
- // MARK: Farmyard
+ // Farmyard
function farmyardVignettes(slave) {
let r = [];
@@ -4703,7 +4702,7 @@ globalThis.GetVignette = function(slave) {
if ((V.animals.canine.length > 0) && hasAnyNaturalLegs(slave)) {
r.push({
- text: `an over-excited dog left scratch marks on ${his} leg,`,
+ text: `an over-excited ${getAnimal(V.animals.canine.random()).name} left scratch marks on ${his} leg,`,
type: "health",
effect: -1
});
@@ -4711,7 +4710,7 @@ globalThis.GetVignette = function(slave) {
if (V.animals.hooved.length > 0) {
r.push({
- text: `${he} was injured by a particularly well-endowed horse,`,
+ text: `${he} was injured by a particularly well-endowed ${getAnimal(V.animals.hooved.random()).name},`,
type: "health",
effect: -1
});
@@ -4719,7 +4718,7 @@ globalThis.GetVignette = function(slave) {
if (V.animals.feline.length > 0) {
r.push({
- text: `${he} managed to take two tigers at once, aweing the crowd,`,
+ text: `${he} managed to take two ${getAnimal(V.animals.feline.random()).name}s at once, aweing the crowd,`,
type: "cash",
effect: 1
});
diff --git a/src/js/wombJS.js b/src/js/wombJS.js
index 674e65acc1fc21f136f6d22c2a922701a19d455b..b772615478567254e030b2897aaf3f72dd1e2c9f 100644
--- a/src/js/wombJS.js
+++ b/src/js/wombJS.js
@@ -297,7 +297,7 @@ globalThis.PregDataAtAge = function(pregData, age) {
/** @param {FC.HumanState} actor */
globalThis.WombGetVolume = function(actor) {
- let cache = { age: -1, size: -1, rate: -1 };
+ let cache = {age: -1, size: -1, rate: -1};
let vol = 0;
if (actor.pregData.sizeType === 0) {
@@ -316,7 +316,7 @@ globalThis.WombGetVolume = function(actor) {
if (age !== cache.age) {
const {size, rate} = PregDataAtAge(actor.pregData, age);
// the next baby in this litter will probably want exactly the same data, don't calculate it again
- cache = { age, size, rate };
+ cache = {age, size, rate};
}
return cache;
diff --git a/src/markets/marketUI.js b/src/markets/marketUI.js
index eb60b9b4b808ac65874bf9743a51a43aab09f3f2..66291e9f0a0041552c8cd9e4cbe881253c3b3b4f 100644
--- a/src/markets/marketUI.js
+++ b/src/markets/marketUI.js
@@ -4,9 +4,9 @@
* @param {object} [param1]
* @param {string} [param1.sTitleSingular]
* @param {string} [param1.sTitlePlural]
- * @param {number} [param1.costMod]
+ * @param {Array<{factor: number, reason:string}>} [param1.modifiers]
*/
-App.Markets.purchaseFramework = function(slaveMarket, {sTitleSingular = "slave", sTitlePlural = "slaves", costMod = 1} = {}) {
+App.Markets.purchaseFramework = function(slaveMarket, {sTitleSingular = "slave", sTitlePlural = "slaves", modifiers = []} = {}) {
const el = new DocumentFragment();
const {slave, text} = generateMarketSlave(slaveMarket, (V.market.numArcology || 1));
const {He, him, his} = getPronouns(slave);
@@ -20,21 +20,19 @@ App.Markets.purchaseFramework = function(slaveMarket, {sTitleSingular = "slave",
const applyLaw = applyLawCheck(slaveMarket);
const complianceResult = applyLaw ? App.Desc.lawCompliance(slave, slaveMarket) : ``;
const limitReached = V.slavesSeen > V.slaveMarketLimit;
- const cost = getCost().cost;
+ if (limitReached) {
+ modifiers.push({factor: (V.slavesSeen - V.slaveMarketLimit) * 0.1, reason: "market reach exceeded"});
+ }
+ const {cost, report} = slaveCost(slave, false, applyLaw, false, true, modifiers);
App.Events.addParagraph(el, [
- `The offered price is`, App.UI.DOM.combineNodes(getCost().report, "."),
+ `The offered price is`, App.UI.DOM.combineNodes(report, "."),
limitReached ? `You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.` : ``
]);
el.append(choices());
return el;
- function getCost() {
- const {cost, report} = slaveCost(slave, false, applyLaw, false, true, {limitReached, costMod});
- return {cost, report};
- }
-
function choices() {
const el = document.createElement("p");
let title = {};
diff --git a/src/markets/specificMarkets/corporateMarket.js b/src/markets/specificMarkets/corporateMarket.js
index 3b990318bd66e917934a195cd915c559940cc115..b306db2077212cedfd7eb6ce9ae8b7b54b6061b2 100644
--- a/src/markets/specificMarkets/corporateMarket.js
+++ b/src/markets/specificMarkets/corporateMarket.js
@@ -79,10 +79,10 @@ App.Markets.corporate = function() {
r.toParagraph();
r.push(`${HeU} explains that the corporation captures many people, so it only retains and trains those that fit its product lines.`);
- let costMod = 1;
+ const modifiers = [];
if (V.corp.Market === 1) {
r.push(`Your own local franchise of your corporation allows you to enjoy a discount.`);
- costMod = 0.9;
+ modifiers.push({factor: -0.1, reason: "local corporate franchise"});
r.push(App.UI.DOM.link(
"End corporate slave sales here and return this sector to standard markets.",
() => {
@@ -95,7 +95,7 @@ App.Markets.corporate = function() {
}
r.toParagraph();
- el.append(App.Markets.purchaseFramework("corporate", {costMod: costMod}));
+ el.append(App.Markets.purchaseFramework("corporate", {modifiers}));
r.push(`${HisU} presentation done, the`);
if (V.corp.SpecDick === 1 && V.corp.SpecPussy === 1) {
@@ -121,7 +121,7 @@ App.Markets.corporate = function() {
} else {
r.push(`little behind`);
}
- r.push(`and cocks ${hisU} hips${(V.corp.SpecBalls === -1) ? `, keeping ${hisU} soft cock demurely out of sight` : ``}, if you feel like`);
+ r.push(`and cocks ${hisU} hips${(V.corp.SpecBalls === -1 && (V.arcologies[0].FSGenderFundamentalist === 0 || V.seeDicks > 0)) ? `, keeping ${hisU} soft cock demurely out of sight` : ``}, if you feel like`);
if (V.corp.SpecGender === 2 && V.corp.SpecPussy !== 1) {
r.push(`sodomizing`);
} else {
diff --git a/src/markets/specificMarkets/customSlaveMarket.js b/src/markets/specificMarkets/customSlaveMarket.js
index 8eb1481e7084a78377d1926b4543573cdf3accf4..d9059f30937457877c18b5fbe6cf518636a0d042 100644
--- a/src/markets/specificMarkets/customSlaveMarket.js
+++ b/src/markets/specificMarkets/customSlaveMarket.js
@@ -654,7 +654,8 @@ App.Markets["Custom Slave"] = function() {
const el = document.createElement("div");
const slaveProperty = "skill.combat";
const choices = new Map([
- [1, "Skilled"],
+ [35, "Expert"],
+ [15, "Skilled"],
[0, "Unskilled"],
]);
@@ -662,10 +663,12 @@ App.Markets["Custom Slave"] = function() {
el.append(choicesMaker(slaveProperty, choices, description));
function description() {
- for (const [value, text] of choices) {
- if (slave.skill.combat >= value) {
- return `${text} at combat. `;
- }
+ if (slave.skill.combat <= 10) {
+ return `Unskilled at fighting. `;
+ } else if (slave.skill.combat <= 30) {
+ return `Basic skills at fighting. `;
+ } else {
+ return `Skilled at fighting. `;
}
}
diff --git a/src/markets/specificMarkets/householdLiquidator.js b/src/markets/specificMarkets/householdLiquidator.js
index 4892ac3ee2e545be04b3edfc2f4194d8abcc22c8..4d2ad2477d4b8e177de66dd23a2038fc1ccf971d 100644
--- a/src/markets/specificMarkets/householdLiquidator.js
+++ b/src/markets/specificMarkets/householdLiquidator.js
@@ -18,7 +18,7 @@ App.Markets["Household Liquidator"] = function() {
App.UI.DOM.appendNewElement("p", el, `The household liquidator is offering a set of siblings for sale. You are permitted to inspect both slaves.`);
const relativeSlave = generateRelatedSlave(slave, "younger sibling", oppositeSex);
-
+
newSlaves = prepSlaveSale(3.0, slave, relativeSlave);
} else if (jsRandom(1, 100) > 20) {
// Old enough to have a child who can be a slave.
diff --git a/src/markets/specificMarkets/prestigiousSlave.js b/src/markets/specificMarkets/prestigiousSlave.js
index 20e721233a79f1111bbd254f8d6908fe5d76cf97..a14e42781f7810397d086df809c5ef616ba9f524 100644
--- a/src/markets/specificMarkets/prestigiousSlave.js
+++ b/src/markets/specificMarkets/prestigiousSlave.js
@@ -194,7 +194,7 @@ App.Markets["Prestigious Slave"] = function() {
slave.skill.anal = 0;
slave.skill.whoring = 0;
slave.skill.entertainment = 0;
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
slave.pubicHStyle = "waxed";
slave.underArmHStyle = "waxed";
slave.sexualFlaw = either("hates anal", "hates oral", "hates penetration");
@@ -428,7 +428,6 @@ App.Markets["Prestigious Slave"] = function() {
slave.piercing.nipple.weight = 2;
slave.piercing.genitals.weight = 2;
slave.piercing.vagina.weight = 2;
- slave.piercing.dick.weight = 2;
slave.piercing.anus.weight = 2;
slave.piercing.lips.weight = 2;
slave.piercing.tongue.weight = 2;
@@ -668,7 +667,7 @@ App.Markets["Prestigious Slave"] = function() {
slave.skill.anal = 0;
slave.skill.whoring = 0;
slave.skill.entertainment = 0;
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
slave.pubicHStyle = "waxed";
slave.underArmHStyle = "waxed";
slave.sexualFlaw = either("hates anal", "hates oral", "hates penetration");
@@ -893,7 +892,6 @@ App.Markets["Prestigious Slave"] = function() {
slave.weight = -20;
slave.piercing.nipple.weight = 2;
slave.piercing.genitals.weight = 2;
- slave.piercing.vagina.weight = 2;
slave.piercing.dick.weight = 2;
slave.piercing.anus.weight = 2;
slave.piercing.lips.weight = 2;
diff --git a/src/markets/specificMarkets/schoolFutanari.js b/src/markets/specificMarkets/schoolFutanari.js
index ba7a86e243b5e83aefed632e7eff4b980778f15c..37fc5034f2dc372847e963a7c66614d14ed5bd30 100644
--- a/src/markets/specificMarkets/schoolFutanari.js
+++ b/src/markets/specificMarkets/schoolFutanari.js
@@ -173,14 +173,15 @@ App.Markets.TFS = function() {
App.UI.DOM.appendNewElement("p", el, r.join(" "), "scene-intro");
App.UI.DOM.appendNewElement("p", el, `The Sisters offer a member selected for sale into slavery for inspection via video call. The feed is of an exhausted futa, fast asleep. Whatever ceremonies the Sisters perform before releasing a member into slavery, they seem to have tired her out. There are indistinct but obviously sexual sounds audible in the background; it sounds like an orgy with a very large number of participants is going on nearby.`);
}
- let costMod = 0.8;
+ const modifiers = [];
+ modifiers.push({factor: -0.2, reason: "TFS base discount"});
if (V.TFS.schoolSale !== 0) {
- costMod *= 0.5;
+ modifiers.push({factor: -0.5, reason: "TFS sale"});
} else if (V.TFS.schoolUpgrade !== 0) {
- costMod *= 0.8;
+ modifiers.push({factor: -0.2, reason: "TFS endowment discount"});
}
el.append(
- App.Markets.purchaseFramework("TFS", {costMod: costMod})
+ App.Markets.purchaseFramework("TFS", {modifiers})
);
return el;
diff --git a/src/markets/specificMarkets/schools.js b/src/markets/specificMarkets/schools.js
index b099636b494405be2ed6ad3f11addbc5b98ef042..34cf7b1197c1a20af825e13178880849ca9ad696 100644
--- a/src/markets/specificMarkets/schools.js
+++ b/src/markets/specificMarkets/schools.js
@@ -1,3 +1,16 @@
+/** build cost modifier array for schools; they're all supposed to behave basically the same way except TFS
+ * @param {FC.SlaveSchoolName} school
+ */
+App.Markets.makeSchoolmodifiers = function(school) {
+ const modifiers = [];
+ if (V[school].schoolSale !== 0) {
+ modifiers.push({factor: -0.5, reason: "slave school sale"});
+ } else if (V[school].schoolUpgrade !== 0) {
+ modifiers.push({factor: -0.2, reason: "slave school endowment discount"});
+ }
+ return modifiers;
+}
+
App.Markets.GRI = function() {
const el = new DocumentFragment();
let r = [];
@@ -19,14 +32,9 @@ App.Markets.GRI = function() {
App.UI.DOM.appendNewElement("p", el, r.join(" "), "scene-intro");
App.UI.DOM.appendNewElement("p", el, `GRI offers a fresh graduate for inspection via video call. The interview takes place in the graduate's bare-metal holding cell. Disturbingly, it is strongly reminiscent of an enclosure for a lab animal, only scaled up to contain a lab animal of human dimensions.`);
- let costMod = 1;
- if (V.GRI.schoolSale !== 0) {
- costMod = 0.5;
- } else if (V.GRI.schoolUpgrade !== 0) {
- costMod = 0.8;
- }
+ const modifiers = App.Markets.makeSchoolmodifiers("GRI");
el.append(
- App.Markets.purchaseFramework("GRI", {costMod: costMod})
+ App.Markets.purchaseFramework("GRI", {modifiers})
);
return el;
@@ -49,14 +57,9 @@ App.Markets.LDE = function() {
App.UI.DOM.appendNewElement("p", el, r.join(" "), "scene-intro");
App.UI.DOM.appendNewElement("p", el, `L'École des Enculées offers a fresh graduate for inspection via video call. The interview takes place in the dormitory for the oldest class of girls. Absurdly sexual squeals repeatedly interrupt the call, making it very clear that someone close by the interviewee is experiencing a strong combination of anal pain and anal pleasure.`);
- let costMod = 1;
- if (V.LDE.schoolSale !== 0) {
- costMod = 0.5;
- } else if (V.LDE.schoolUpgrade !== 0) {
- costMod = 0.8;
- }
+ const modifiers = App.Markets.makeSchoolmodifiers("LDE");
el.append(
- App.Markets.purchaseFramework("LDE", {costMod: costMod})
+ App.Markets.purchaseFramework("LDE", {modifiers})
);
return el;
@@ -80,14 +83,9 @@ App.Markets.NUL = function() {
App.UI.DOM.appendNewElement("p", el, r.join(" "), "scene-intro");
App.UI.DOM.appendNewElement("p", el, `Nueva Universidad de Libertad offers a fresh graduate for inspection via video call. The interview takes place in said graduate's dormitory. The room is sparse and utilitarian, and immaculately clean. Likely by design, it looks like the set from an old sci-fi movie.`);
- let costMod = 1;
- if (V.NUL.schoolSale !== 0) {
- costMod = 0.5;
- } else if (V.NUL.schoolUpgrade !== 0) {
- costMod = 0.8;
- }
+ const modifiers = App.Markets.makeSchoolmodifiers("NUL");
el.append(
- App.Markets.purchaseFramework("NUL", {costMod: costMod})
+ App.Markets.purchaseFramework("NUL", {modifiers})
);
return el;
@@ -117,14 +115,9 @@ App.Markets.SCP = function() {
App.UI.DOM.appendNewElement("p", el, `St. Claver Preparatory offers a fresh graduate for inspection via video call. The interview takes place in a very obviously medical office, with medical supply robots wheeling past its glass walls and nurses hurrying to and fro.
`);
- let costMod = 1;
- if (V.SCP.schoolSale !== 0) {
- costMod = 0.5;
- } else if (V.SCP.schoolUpgrade !== 0) {
- costMod = 0.8;
- }
+ const modifiers = App.Markets.makeSchoolmodifiers("SCP");
el.append(
- App.Markets.purchaseFramework("SCP", {costMod: costMod})
+ App.Markets.purchaseFramework("SCP", {modifiers})
);
return el;
@@ -151,14 +144,9 @@ App.Markets.TCR = function() {
r.push(`You can't help but notice the number of bulls lining up along the fence sniffing at you.`);
}
App.UI.DOM.appendNewElement("p", el, r.join(" "));
- let costMod = 1;
- if (V.TCR.schoolSale !== 0) {
- costMod = 0.5;
- } else if (V.TCR.schoolUpgrade !== 0) {
- costMod = 0.8;
- }
+ const modifiers = App.Markets.makeSchoolmodifiers("TCR");
el.append(
- App.Markets.purchaseFramework("TCR", {costMod: costMod, sTitleSingular: "cow", sTitlePlural: "cattle"})
+ App.Markets.purchaseFramework("TCR", {modifiers, sTitleSingular: "cow", sTitlePlural: "cattle"})
);
return el;
@@ -187,14 +175,9 @@ App.Markets.TGA = function() {
App.UI.DOM.appendNewElement("p", el, r.join(" "), "scene-intro");
App.UI.DOM.appendNewElement("p", el, `The Gymnasium-Academy offers a fresh graduate for inspection via video call. The interview takes place in an office overlooking an expansive workout room, in which a large number of naked, fit young bodies are performing punishing workout routines.`);
- let costMod = 1;
- if (V.TGA.schoolSale !== 0) {
- costMod = 0.5;
- } else if (V.TGA.schoolUpgrade !== 0) {
- costMod = 0.8;
- }
+ const modifiers = App.Markets.makeSchoolmodifiers("TGA");
el.append(
- App.Markets.purchaseFramework("TGA", {costMod: costMod})
+ App.Markets.purchaseFramework("TGA", {modifiers})
);
return el;
@@ -218,14 +201,9 @@ App.Markets.HA = function() {
App.UI.DOM.appendNewElement("p", el, r.join(" "), "scene-intro");
App.UI.DOM.appendNewElement("p", el, `The Hippolyta Academy offers a fresh graduate for inspection. The interview takes place in one of the many training areas of the school, where the physical prowess of the candidate can be easily showcased.`);
- let costMod = 1;
- if (V.HA.schoolSale !== 0) {
- costMod = 0.6;
- } else if (V.HA.schoolUpgrade !== 0) {
- costMod = 1.2;
- }
+ const modifiers = App.Markets.makeSchoolmodifiers("HA");
el.append(
- App.Markets.purchaseFramework("HA", {costMod: costMod})
+ App.Markets.purchaseFramework("HA", {modifiers})
);
return el;
@@ -254,14 +232,9 @@ App.Markets.TSS = function() {
App.UI.DOM.appendNewElement("p", el, r.join(" "), "scene-intro");
App.UI.DOM.appendNewElement("p", el, `The Slavegirl School offers a fresh graduate for inspection via video call. The interview takes place in a faculty member's office. Absurdly, it's barely distinguishable from an office at any traditional institution of higher education. The only giveaway is the profusion of sex toys on the desk and the pornography on the walls.`);
- let costMod = 1;
- if (V.TSS.schoolSale !== 0) {
- costMod = 0.5;
- } else if (V.TSS.schoolUpgrade !== 0) {
- costMod = 0.8;
- }
+ const modifiers = App.Markets.makeSchoolmodifiers("TSS");
el.append(
- App.Markets.purchaseFramework("TSS", {costMod: costMod})
+ App.Markets.purchaseFramework("TSS", {modifiers})
);
return el;
@@ -284,14 +257,9 @@ App.Markets.TUO = function() {
App.UI.DOM.appendNewElement("p", el, r.join(" "), "scene-intro");
App.UI.DOM.appendNewElement("p", el, `The Utopian Orphanage offers a fresh graduate for inspection. The interview takes place in the girl's private room, where she showcases her education and wits.`);
- let costMod = 1;
- if (V.TUO.schoolSale !== 0) {
- costMod = 0.6;
- } else if (V.TUO.schoolUpgrade !== 0) {
- costMod = 1.2;
- }
+ const modifiers = App.Markets.makeSchoolmodifiers("TUO");
el.append(
- App.Markets.purchaseFramework("TUO", {costMod: costMod})
+ App.Markets.purchaseFramework("TUO", {modifiers})
);
return el;
diff --git a/src/markets/specificMarkets/slaveMarkets.js b/src/markets/specificMarkets/slaveMarkets.js
index ba482e1abdfc258077e0c3f6347cf5206f17b56c..77fac131fbaebd8254cd9e14d88af527edd9a0a3 100644
--- a/src/markets/specificMarkets/slaveMarkets.js
+++ b/src/markets/specificMarkets/slaveMarkets.js
@@ -199,17 +199,14 @@ App.Markets.neighbor = function() {
App.UI.DOM.appendNewElement("span", el, `${arcology.name}.`, "bold");
el.append(` Some were trained there, specifically for sale, while others are simply being sold.`);
const opinion = App.Neighbor.opinion(V.arcologies[0], arcology);
- let costMod = 1;
- if (opinion !== 0) {
- if (opinion > 2) {
- el.append(` Your cultural ties with ${arcology.name} helps keep the price reasonable.`);
- } else if (opinion < -2) {
- el.append(` Your social misalignment with ${arcology.name} drives up the price.`);
- }
- costMod = (1 - (opinion * 0.05));
+ const modifiers = [{factor: -(opinion/100) * 0.05, reason: opinion > 0 ? "cultural ties" : "cultural friction"}];
+ if (opinion > 2) {
+ el.append(` Your cultural ties with ${arcology.name} helps keep the price reasonable.`);
+ } else if (opinion < -2) {
+ el.append(` Your social misalignment with ${arcology.name} drives up the price.`);
}
- el.append(App.Markets.purchaseFramework("neighbor", {costMod: costMod}));
+ el.append(App.Markets.purchaseFramework("neighbor", {modifiers}));
return el;
};
diff --git a/src/markets/specificMarkets/specialSlave.js b/src/markets/specificMarkets/specialSlave.js
index 06032bd89a8c106bffabdf8feaa2ffe7eebf0013..670ad0813ca7e8be28661816d7b70b250c8bcb41 100644
--- a/src/markets/specificMarkets/specialSlave.js
+++ b/src/markets/specificMarkets/specialSlave.js
@@ -133,10 +133,8 @@ App.Markets["Special Slave"] = function() {
const {his} = getPronouns(slave);
const slaveCost = heroSlaveCost(slave, 20000);
App.UI.DOM.appendNewElement("p", el, App.Desc.longSlave(slave, {market: "generic"}));
-
- p = document.createElement("p");
- p.append(`The offered price is ${cashFormat(slaveCost)}.`);
- p.append(
+ App.UI.DOM.appendNewElement("p", el, `The offered price is ${cashFormat(slaveCost)}.`);
+ App.UI.DOM.appendNewElement("p", el,
App.UI.DOM.link(
`Buy ${his} slave contract`,
() => {
@@ -149,7 +147,6 @@ App.Markets["Special Slave"] = function() {
},
)
);
- el.append(p);
return el;
}
};
diff --git a/src/markets/theMarket/tradeMenials.js b/src/markets/theMarket/tradeMenials.js
index aebf1ed099390c54ef86808578df64fee3413c43..f29ed0017c2359338a57e34000f5591b4a1d0ef2 100644
--- a/src/markets/theMarket/tradeMenials.js
+++ b/src/markets/theMarket/tradeMenials.js
@@ -64,8 +64,8 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
}
if (V.cheatMode && V.cheatModeM) {
const menDemand = function() {
- const el = new DocumentFragment;
- App.UI.DOM.appendNewElement("span", el, `Slave Demand`, `yellowgreen`);
+ const el = new DocumentFragment();
+ App.UI.DOM.appendNewElement("span", el, `Slave Demand`, ["yellowgreen"]);
el.append(`| ${V.menialDemandFactor}`);
return el;
};
@@ -122,7 +122,7 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
if (V.cheatMode && V.cheatModeM) {
const menSupply = function() {
- const el = new DocumentFragment;
+ const el = new DocumentFragment();
App.UI.DOM.appendNewElement("span", el, `Slave Supply`, `yellowgreen`);
el.append(`| ${V.menialSupplyFactor}`);
return el;
@@ -467,7 +467,7 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
const value = forceNeg(menialSlaveCost(number - 100) * number);
V.menialBioreactors += number;
V.menialSupplyFactor -= number;
- cashX(value, "bioreactorsTransfer");
+ cashX(value, "menialBioreactorsTransfer");
jQuery("#menial-transaction-result").empty().append(App.UI.DOM.cashFormat(value));
};
@@ -512,7 +512,7 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
V.menialBioreactors -= number;
V.menialDemandFactor -= number;
jQuery("#menial-transaction-result").empty().append(App.UI.DOM.cashFormat(value));
- cashX(value, "bioreactorsTransfer");
+ cashX(value, "menialBioreactorsTransfer");
};
linkArray.push(
App.UI.DOM.link(
diff --git a/src/neighbor/neighborDescription.js b/src/neighbor/neighborDescription.js
index 72d1f0f3c4f7a9619b6b8300666b5f5ec18466b9..cc97a4a1c3f75d0e8c82056f108261766ca6545a 100644
--- a/src/neighbor/neighborDescription.js
+++ b/src/neighbor/neighborDescription.js
@@ -108,7 +108,7 @@ App.UI.neighborDescription = function(i) {
},
FSBodyPurist: {
95: `a world leader in the drug industry due to its pharmaceutical research breakthroughs`,
- 40: `pouring an ever increasing amount of money into drug research`,
+ 40: `pouring an ever-increasing amount of money into drug research`,
0: `setting up research programs to develop better slave drugs`,
},
FSTransformationFetishist: {
@@ -161,7 +161,7 @@ App.UI.neighborDescription = function(i) {
40: `quite a sight, since its citizens and slaves all lift constantly`,
0: `the site of a musclegirl fetish community`,
},
- FSHedonisticDecadence: {
+ FSHedonisticDecadence: {
95: `very well known as a place where every imaginable desire and fantasy can be fulfilled`,
40: `importing huge amounts of food and alcohol`,
0: `the site of a large number of lazy individuals`,
diff --git a/src/neighbor/neighborDisplay.js b/src/neighbor/neighborDisplay.js
index abae89e2f7c7815ea3416e5a226adb701607ded8..68b35bfb33b5611b0ca3184eda19d353cce5946c 100644
--- a/src/neighbor/neighborDisplay.js
+++ b/src/neighbor/neighborDisplay.js
@@ -11,7 +11,7 @@ App.Neighbor.Display = class {
* @returns {Element}
*/
render() {
- const container = document.createElement("div");
+ const container = App.UI.DOM.makeElement("div", null, ["margin-top"]);
container.id = this.containerID;
function makeSortLink(/** @type {string} */ title, /** @type {string} */ mode) {
diff --git a/src/neighbor/neighborInteract.js b/src/neighbor/neighborInteract.js
index b6d6bfd4b94403d4941f9bd663883df1ddd849f0..c5d724a3c4f3e88304149f8efa2097f7e750a096 100644
--- a/src/neighbor/neighborInteract.js
+++ b/src/neighbor/neighborInteract.js
@@ -208,7 +208,7 @@ App.Neighbor.Interact = function() {
}
const div = App.UI.DOM.appendNewElement("div", frag, App.UI.DOM.generateLinksStrip(links));
if (links.length > 1) {
- App.UI.DOM.appendNewElement("span", div, " Transaction costs will only be paid once.", "detail");
+ App.UI.DOM.appendNewElement("span", div, " Transaction costs will only be paid once.", ["detail"]);
}
}
@@ -349,7 +349,7 @@ App.Neighbor.Interact = function() {
if (agent.fetishStrength > 95) {
if ((agent.fetish === "dom") || (agent.fetish === "sadist")) {
r.push(`${His} sexually dominant fetish helps ${him} fill a leadership role.`);
- } else if ((agent.fetish === "submissive") || (agent.fetish === "masochist")) {
+ } else if ((agent.fetish === Fetish.SUBMISSIVE) || (agent.fetish === "masochist")) {
r.push(`Unfortunately, ${he} has an inappropriate fetish for a leader.`);
} else {
r.push(`${His} sexual fetishes will influence how ${he} leads the arcology.`);
@@ -426,7 +426,7 @@ App.Neighbor.Interact = function() {
replaceDetails(arcID);
});
const div = App.UI.DOM.appendNewElement("div", container, link);
- App.UI.DOM.appendNewElement("span", div, `Will cost ${cashFormat(itemPrice)}`, "detail");
+ App.UI.DOM.appendNewElement("span", div, `Will cost ${cashFormat(itemPrice)}`, ["detail"]);
}
} else {
App.UI.DOM.appendNewElement("div", container, `You already have enough ${itemDisplay}.`);
diff --git a/src/npc/bodyguard/bgDescription.js b/src/npc/bodyguard/bgDescription.js
index 1d2257ac1443a73939de6e63d0221022b50273b3..3e1d6270abe4c5a87683337d28950eeec56195b8 100644
--- a/src/npc/bodyguard/bgDescription.js
+++ b/src/npc/bodyguard/bgDescription.js
@@ -13,7 +13,7 @@ App.Desc.bodyguard = function(slave) {
r.push(`${He} is your bodyguard.`);
r.push(bgWeapon());
- if (slave.skill.combat > 0) {
+ if (slave.skill.combat > 30) {
r.push(`${He} is <span class="skill">skilled at combat:</span> ${he} is comfortable with the use of modern firearms and edged weapons, and ${his} hands`);
if (!hasBothArms(slave)) {
r.push(`would be deadly weapons if ${he} had`);
diff --git a/src/npc/children/childInteract.tw b/src/npc/children/childInteract.tw
index 56026a9e4a4ca099d7e77301cd338d6a913fe672..ae49dbc069f3912e470dd2a95178fa5e2fa9f115 100644
--- a/src/npc/children/childInteract.tw
+++ b/src/npc/children/childInteract.tw
@@ -414,7 +414,7 @@ FIXME:
<<replace "#mini-scene">><<include "FRival">><br> <</replace>>
<</link>>
<</if>>
- <<if ($activeChild.fetish != "mindbroken") && (canTalk($activeChild) || hasAnyArms($activeChild))>>
+ <<if ($activeChild.fetish != Fetish.MINDBROKEN) && (canTalk($activeChild) || hasAnyArms($activeChild))>>
| <<link "Ask $him about $his feelings">><<replace "#mini-scene">><<set $childSex = 1>><<include "FFeelings">><br> <</replace>><</link>>
<</if>>
<<if $activeChild.devotion >= 100 && $activeChild.relationship < 0 && $activeChild.relationship > -3>>
diff --git a/src/npc/children/childSummary.js b/src/npc/children/childSummary.js
index 0b6499fee5fceea96df8ac4f3b216a6fc6285489..4bbb1fb025339cd1a656d9d3e2b1383099e18c0e 100644
--- a/src/npc/children/childSummary.js
+++ b/src/npc/children/childSummary.js
@@ -184,7 +184,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
longPornPrestige(child);
}
if (abbreviate.mental === 1) {
- if (child.fetish !== "mindbroken") {
+ if (child.fetish !== Fetish.MINDBROKEN) {
if (child.fetishKnown === 1) {
shortFetish(child);
}
@@ -201,7 +201,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
shortBehaviorQuirk(child);
shortSexQuirk(child);
} else if (abbreviate.mental === 2) {
- if (child.fetish !== "mindbroken") {
+ if (child.fetish !== Fetish.MINDBROKEN) {
if (child.fetishKnown === 1) {
longFetish(child);
}
@@ -270,7 +270,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
*/
function shortDevotion(child) {
r += `<br>`;
- if (child.fetish === "mindbroken") {
+ if (child.fetish === Fetish.MINDBROKEN) {
r += `<span class="mindbroken">MB</span> `;
} else if (child.devotion < -95) {
r += `<span class="devotion hateful">Hate${V.summaryStats ? `[${child.devotion}]` : ''}</span> `;
@@ -287,7 +287,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
} else {
r += `<span class="devotion worship">Wor${V.summaryStats ? `[${child.devotion}]` : ''}</span> `;
}
- if (child.fetish === "mindbroken") {
+ if (child.fetish === Fetish.MINDBROKEN) {
return;
} else if (child.trust < -95) {
r += `<span class="trust extremely-terrified">ETerr${V.summaryStats ? `[${child.trust}]` : ''}</span> `;
@@ -323,7 +323,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
*/
function longDevotion(child) {
r += `<br>`;
- if (child.fetish === "mindbroken") {
+ if (child.fetish === Fetish.MINDBROKEN) {
r += `<span class="mindbroken">Mindbroken.</span> `;
} else if (child.devotion < -95) {
r += `<span class="devotion hateful">Very hateful${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `;
@@ -340,7 +340,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
} else {
r += `<span class="devotion worship">Worshipful${V.summaryStats ? `[${child.devotion}]` : ''}.</span> `;
}
- if (child.fetish === "mindbroken") {
+ if (child.fetish === Fetish.MINDBROKEN) {
return;
} else if (child.trust < -95) {
r += `<span class="trust extremely-terrified">Extremely terrified${V.summaryStats ? `[${child.trust}]` : ''}.</span> `;
@@ -942,9 +942,9 @@ App.Facilities.Nursery.ChildSummary = function(child) {
r += `Permanently pregnant. `;
} else if (child.pregKnown === 1) {
if (child.pregType < 2) {
- r += `${child.pregWeek} weeks pregnant. `;
+ r += `${Math.trunc(child.pregWeek)} weeks pregnant. `;
} else {
- r += `${child.pregWeek} weeks pregnant with `;
+ r += `${Math.trunc(child.pregWeek)} weeks pregnant with `;
if (child.pregType >= 40) {
r += `a tremendous brood of offspring. `;
} else if (child.pregType >= 20) {
@@ -2613,7 +2613,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
if (child.hasOwnProperty("intelligenceImplant")) {
intelligence += child.intelligenceImplant;
}
- if (child.fetish === "mindbroken") {
+ if (child.fetish === Fetish.MINDBROKEN) {
return;
} else if (child.hasOwnProperty("intelligenceImplant") && child.intelligenceImplant >= 30) {
if (intelligence >= 130) {
@@ -2768,7 +2768,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
if (child.hasOwnProperty("intelligenceImplant")) {
intelligence += child.intelligenceImplant;
}
- if (child.fetish === "mindbroken") {
+ if (child.fetish === Fetish.MINDBROKEN) {
return;
} else if (child.hasOwnProperty("intelligenceImplant") && child.intelligenceImplant >= 30) {
if (intelligence >= 130) {
@@ -3081,7 +3081,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
r += `SP:dom`;
} else if (((child.fetish !== "pregnancy") || (child.fetishStrength <= 95)) && (child.clitSetting === "pregnancy")) {
r += `SP:preg`;
- } else if (((child.fetish !== "none") && (child.clitSetting === "vanilla"))) {
+ } else if (((child.fetish !== Fetish.NONE) && (child.clitSetting === "vanilla"))) {
r += `SP:vanilla`;
} else if ((child.energy <= 95) && (child.clitSetting === "all")) {
r += `SP:all`;
@@ -3539,7 +3539,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
r += `SP: dominance. `;
} else if (((child.fetish !== "pregnancy") || (child.fetishStrength <= 95)) && (child.clitSetting === "pregnancy")) {
r += `SP: pregnancy. `;
- } else if ((child.fetish !== "none") && (child.clitSetting === "vanilla")) {
+ } else if ((child.fetish !== Fetish.NONE) && (child.clitSetting === "vanilla")) {
r += `SP: vanilla. `;
} else if ((child.energy <= 95) && (child.clitSetting === "all")) {
r += `SP: all. `;
diff --git a/src/npc/children/longChildDescription.js b/src/npc/children/longChildDescription.js
index 39f31bd9755c74f59c53f7f284989986985b6bc3..ad2295d3a44150d1b4352141994467c6b6dc6a1a 100644
--- a/src/npc/children/longChildDescription.js
+++ b/src/npc/children/longChildDescription.js
@@ -839,38 +839,67 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
if (pregCollar === 1) {
if (child.pregWeek < 0) {
r += `"I'm a mommy now!" `;
- } else if (!child.pregKnown) {
- r += `"Knock me up!" `;
} else if (child.pregKnown) {
r += `"${child.pregType === 0 ? `1` : `${child.pregType}`} bab${child.pregType > 1 ? `ies` : `y`} on board!" `;
+ } else if (isFertile(child)) {
+ r += `"Knock me up!" `;
+ } else if (child.vagina < 0 && child.mpreg < 1) {
+ r += `"Womb not detected!" `;
+ } else if ((child.ovaries > 0 || child.mpreg > 0) && child.pubertyXX === 0 && child.physicalAge < V.fertilityAge) {
+ r += `"I'm not old enough to get pregnant yet!" `;
} else {
r += `"I'm infertile!" `;
}
} else if (pregCollar === 2) {
- if (child.pregWeek < 0) {
+ if (child.vagina < 0 && child.mpreg < 1) {
+ r += `"I have no womb!" `;
+ } else if (child.pregWeek < 0) {
r += `"${num(child.pregWeek * -1)} week${child.pregWeek !== -1 ? `s` : ``} until I can get preggers again!" `;
} else if (child.pregKnown) {
- r += `"${40 - Math.ceil(child.preg)} weeks till I pop!" `;
- } else {
+ if (child.preg > 40) {
+ r += `"I'm ${Math.ceil(child.preg) - 40} ${Math.ceil(child.preg) - 40 > 1 ? `weeks` : `week`} overdue!" `;
+ } else if (child.preg > 39) {
+ r += `"I'm due this week!" `;
+ } else {
+ r += `"${40 - Math.ceil(child.preg)} ${40 - Math.ceil(child.preg) > 1 ? `weeks` : `week`} till I pop!" `;
+ }
+ } else if (isFertile(child)) {
r += `"My womb needs filling!" `;
+ } else if ((child.ovaries > 0 || child.mpreg > 0) && child.pubertyXX === 0) {
+ r += `"I should be fertile `;
+ if (child.pubertyAgeXX - child.physicalAge > 2) {
+ r += `in about ${Math.round(child.pubertyAgeXX - child.physicalAge)} years!" `;
+ } else if (child.pubertyAgeXX - child.physicalAge > 1) {
+ r += `next year!" `;
+ } else {
+ r += `in about ${Math.ceil((child.pubertyAgeXX * 52 - (child.physicalAge * 52 + child.birthWeek)))} weeks!" `;
+ }
+ } else {
+ r += `"I can't get pregnant right now!" `;
}
} else {
- if (child.pregWeek < 0) {
+ if (child.vagina < 0 && child.mpreg < 1) {
+ r += `"I need a womb!" `;
+ } else if (child.pregWeek < 0) {
r += `"I can't wait for my belly to swell with life again!" `;
- } else if (!child.pregKnown) {
+ } else if (child.pregKnown === 1) {
+ if (child.pregSource === -1) {
+ r += `"Womb claimed by my ${getWrittenTitle(child)}!" `;
+ } else if (child.pregSource === -2 || child.pregSource === 0) {
+ r += `"Baby made by slutting around!" `;
+ } else if (child.pregSource === -7) {
+ r += `"My baby was made with science!" `;
+ } else if (child.pregSource === -9) {
+ r += `"Futanari Sisters, now two for the price of one!" `;
+ } else {
+ r += `"Womb claimed by ${daddy}!" `;
+ }
+ } else if (isFertile(child)) {
r += `"Put a baby in me today!" `;
- } else if (child.pregSource === -1) {
- r += `"Womb claimed by my ${getWrittenTitle(child)}!" `;
- } else if (child.pregSource === -2 || child.pregSource === 0) {
- r += `"Baby made by slutting around!" `;
- } else if (child.pregSource === -7) {
- r += `"My baby was made with science!" `;
- } else if (child.pregSource === -9) {
- r += `"Futanari Sisters, now two for the price of one!" `;
- } else if (child.pregSource > 0) {
- r += `"Womb claimed by ${daddy}!" `;
+ } else if ((child.ovaries > 0 || child.mpreg > 0) && child.pubertyXX === 0 && child.physicalAge < V.fertilityAge) {
+ r += `"I'm too young to get pregnant!" `;
} else {
- r += `"Put a baby in me today!" `;
+ r += `"Try to knock me up some other time!" `;
}
}
}
@@ -6298,7 +6327,7 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
r += App.Desc.eyes(child);
- if (child.fetish === "mindbroken") {
+ if (child.fetish === Fetish.MINDBROKEN) {
r += `However, <span class="coral">${his} mind is fundamentally broken;</span> everything ${he} experiences will quickly be forgotten. `;
}
@@ -7227,7 +7256,7 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
r += App.Desc.brand(child, "ear");
r += App.Desc.brand(child, "neck");
- r += App.Desc.family(child) + " ";
+ // r += App.Desc.family(child) + " "; TODO Assemble DOM instead of string to make this work again
if (child.relationship >= 3 && totalRelatives(child) > 0) {
const lover = getSlave(child.relationshipTarget);
diff --git a/src/npc/databases/cheatmodeDatabase.js b/src/npc/databases/cheatmodeDatabase.js
index 93236105eaed23226f9ef389c7ba5811bedd9ced..919e7945e8a89d1bed3f022b79ac50c43de58777 100644
--- a/src/npc/databases/cheatmodeDatabase.js
+++ b/src/npc/databases/cheatmodeDatabase.js
@@ -317,7 +317,7 @@ App.Intro.cheatModeSlaves = function() {
cheatSlave.nails = 1;
cheatSlave.piercing.ear.weight = 1;
cheatSlave.skill.anal = 35;
- cheatSlave.skill.combat = 1;
+ cheatSlave.skill.combat = 100;
cheatSlave.energy = 65;
cheatSlave.attrXY = 40;
cheatSlave.fetish = "buttslut";
diff --git a/src/npc/databases/dSlavesDatabase.js b/src/npc/databases/dSlavesDatabase.js
index f10b60df74d8f12b674e02fc877b9949502503cc..4fc61cd97aaa265c23b5c3e63a7aa868294a9096 100644
--- a/src/npc/databases/dSlavesDatabase.js
+++ b/src/npc/databases/dSlavesDatabase.js
@@ -128,7 +128,7 @@ App.Data.HeroSlaves.D = [
vaginal: 35,
oral: 35,
anal: 35,
- combat: 1
+ combat: 65
},
intelligence: -20,
attrXY: 40,
@@ -264,7 +264,7 @@ App.Data.HeroSlaves.D = [
vaginal: 15,
oral: 15,
anal: 15,
- combat: 1,
+ combat: 15,
},
attrXX: 80,
attrXY: 40,
@@ -313,7 +313,7 @@ App.Data.HeroSlaves.D = [
vaginal: 100,
oral: 100,
anal: 100,
- combat: 1,
+ combat: 65,
},
clothes: "restrictive latex",
shoes: "heels",
@@ -510,7 +510,7 @@ App.Data.HeroSlaves.D = [
vaginaLube: 1,
ovaries: 1,
skill: {
- combat: 1,
+ combat: 65,
},
intelligence: 20,
intelligenceImplant: 30,
@@ -621,7 +621,7 @@ App.Data.HeroSlaves.D = [
anal: 35,
whoring: 35,
entertainment: 35,
- combat: 1
+ combat: 65
},
intelligence: 30,
intelligenceImplant: 30,
@@ -762,7 +762,7 @@ App.Data.HeroSlaves.D = [
skill: {
oral: 15,
anal: 35,
- combat: 1
+ combat: 65
},
intelligence: 30,
attrXY: 40,
@@ -809,7 +809,7 @@ App.Data.HeroSlaves.D = [
vaginal: 35,
oral: 35,
anal: 35,
- combat: 1
+ combat: 35
},
clothes: "attractive lingerie",
intelligence: 20,
@@ -1099,7 +1099,7 @@ App.Data.HeroSlaves.D = [
skill: {
vaginal: 35,
oral: 35,
- combat: 1
+ combat: 35
},
intelligence: 30,
intelligenceImplant: 30,
@@ -1397,7 +1397,7 @@ App.Data.HeroSlaves.D = [
vaginal: 35,
oral: 35,
anal: 35,
- combat: 1,
+ combat: 35,
},
intelligence: -30,
attrXY: 40,
@@ -1455,7 +1455,7 @@ App.Data.HeroSlaves.D = [
vaginal: 15,
oral: 15,
anal: 15,
- combat: 1
+ combat: 65
},
intelligence: 25,
intelligenceImplant: 30,
@@ -1467,7 +1467,37 @@ App.Data.HeroSlaves.D = [
leg: {
left: {
type: 2
- }
+ },
+ right: {
+ scar: {
+ "right thigh": {
+ burn: 0,
+ chain: 0,
+ cutting: 0,
+ exotic: 0,
+ generic: 2,
+ surgical: 0,
+ menacing: 0,
+ whip: 0
+ },
+ },
+ },
+ },
+ arm: {
+ left: {
+ scar: {
+ "left shoulder": {
+ burn: 0,
+ chain: 0,
+ cutting: 0,
+ exotic: 0,
+ generic: 2,
+ surgical: 0,
+ menacing: 0,
+ whip: 0
+ },
+ },
+ },
},
scar: {
"temple": {
@@ -1480,27 +1510,7 @@ App.Data.HeroSlaves.D = [
menacing: 0,
whip: 0
},
- "right thigh": {
- burn: 0,
- chain: 0,
- cutting: 0,
- exotic: 0,
- generic: 2,
- surgical: 0,
- menacing: 0,
- whip: 0
- },
- "left shoulder": {
- burn: 0,
- chain: 0,
- cutting: 0,
- exotic: 0,
- generic: 2,
- surgical: 0,
- menacing: 0,
- whip: 0
- }
- }
+ },
},
/* missing left leg, burn scar, low sex drive, fighter*/
/* Added customDesc, fixed tattoo syntax, added combat skill, eye color and origin -BoneyM*/
@@ -2033,7 +2043,7 @@ App.Data.HeroSlaves.D = [
intelligence: -30,
attrXY: 40,
fetishKnown: 1,
- brand: {"right buttock": "Cum slut"},
+ leg: {right: {brand: {"right buttock": "Cum slut"}}},
custom: {tattoo: "'bitch whore' is tattooed on $his inner left thigh."}
},
/* Fixed typo in customDesc, increased whore and entertainskill, changed eye color -BoneyM*/
@@ -2135,7 +2145,7 @@ App.Data.HeroSlaves.D = [
behavioralFlaw: "arrogant",
custom: {
tattoo: "$He has a henna tattoo on $his left forearm, and a butterfly tattoo on $his right calf.",
- desc: "$He has high cheekbones on a heart shaped face."
+ desc: "$He has high cheekbones on a heart-shaped face."
},
faceShape: "cute",
sexualQuirk: "size queen"
@@ -2257,7 +2267,7 @@ App.Data.HeroSlaves.D = [
vaginal: 15,
oral: 15,
anal: 15,
- combat: 1
+ combat: 15
},
intelligence: 100,
intelligenceImplant: 30,
@@ -2428,7 +2438,7 @@ App.Data.HeroSlaves.D = [
attrXY: 40,
fetishKnown: 1,
piercing: {lips: {weight: 1}, tongue: {weight: 1}, ear: {weight: 1}, eyebrow: {weight: 1}},
- custom: {desc: "$He has a heart shaped face and many scars."},
+ custom: {desc: "$He has a heart-shaped face and many scars."},
faceShape: "cute",
hips: 3,
markings: "beauty mark"
@@ -2880,7 +2890,7 @@ App.Data.HeroSlaves.D = [
ovaries: 1,
anusTat: "bleached",
skill: {
- combat: 1
+ combat: 65
},
intelligence: 30,
intelligenceImplant: 30,
@@ -2963,7 +2973,7 @@ App.Data.HeroSlaves.D = [
anal: 100,
whoring: 35,
entertainment: 15,
- combat: 1
+ combat: 65
},
clothes: "a comfortable bodysuit",
collar: "heavy gold",
@@ -2973,20 +2983,31 @@ App.Data.HeroSlaves.D = [
attrXX: 80,
attrXY: 40,
fetishKnown: 1,
- piercing: {nipple: {weight: 1}, lips: {weight: 1}, ear: {weight: 1}, nose: {weight: 1}, eyebrow: {weight: 1}, navel: {weight: 1}},
+ piercing: {
+ nipple: {weight: 1},
+ lips: {weight: 1},
+ ear: {weight: 1},
+ nose: {weight: 1},
+ eyebrow: {weight: 1},
+ navel: {weight: 1}
+ },
custom: {
desc: "Amongst the scars that decorate $his body, one in the shape of a heart can be made out on the top of $his right hand."
},
- scar: {
- "right hand": {
- burn: 0,
- chain: 0,
- cutting: 0,
- exotic: 1,
- generic: 0,
- menacing: 0,
- surgical: 0,
- whip: 0
+ arm: {
+ left: {
+ scar: {
+ "right hand": {
+ burn: 0,
+ chain: 0,
+ cutting: 0,
+ exotic: 1,
+ generic: 0,
+ menacing: 0,
+ surgical: 0,
+ whip: 0
+ }
+ }
}
}
},
@@ -3032,7 +3053,7 @@ App.Data.HeroSlaves.D = [
skill: {
whoring: 15,
entertainment: 15,
- combat: 1
+ combat: 15
},
clothes: "nice business attire",
collar: "leather with cowbell",
@@ -3187,7 +3208,7 @@ App.Data.HeroSlaves.D = [
vaginal: 100,
oral: 100,
anal: 100,
- combat: 1
+ combat: 100
},
clothes: "slutty jewelry",
collar: "heavy gold",
@@ -3237,7 +3258,7 @@ App.Data.HeroSlaves.D = [
anal: 100,
whoring: 100,
entertainment: 100,
- combat: 1
+ combat: 100
},
clothes: "nice business attire",
collar: "heavy gold",
@@ -3251,16 +3272,20 @@ App.Data.HeroSlaves.D = [
tattoo: "$He has a small, grinning harlequin tattoo on $his inner thigh.",
desc: "In place of $his left hand's pinkie finger is a large pink scar that crosses the entire back of $his hand."
},
- scar: {
- "left hand": {
- burn: 0,
- chain: 0,
- cutting: 0,
- exotic: 0,
- generic: 2,
- menacing: 0,
- surgical: 0,
- whip: 0
+ arm: {
+ left: {
+ scar: {
+ "left hand": {
+ burn: 0,
+ chain: 0,
+ cutting: 0,
+ exotic: 0,
+ generic: 2,
+ menacing: 0,
+ surgical: 0,
+ whip: 0
+ }
+ }
}
}
},
@@ -3433,7 +3458,7 @@ App.Data.HeroSlaves.D = [
oral: 100,
whoring: 100,
entertainment: 100,
- combat: 1
+ combat: 35
},
clothes: "a slutty outfit",
collar: "pretty jewelry",
@@ -3534,14 +3559,13 @@ App.Data.HeroSlaves.D = [
},
anus: 3,
ovaries: 1,
- brand: {"right buttock": "SLAVE"},
+ leg: {right: {brand: {"right buttock": "SLAVE"}}},
skill: {
vaginal: 100,
oral: 100,
anal: 100,
whoring: 100,
entertainment: 35,
- combat: 0,
},
collar: "heavy gold",
shoes: "flats",
@@ -3576,7 +3600,7 @@ App.Data.HeroSlaves.D = [
anus: 3,
ovaries: 1,
makeup: 1,
- brand: {"right buttock": "SLAVE"},
+ leg: {right: {brand: {"right buttock": "SLAVE"}}},
skill: {
vaginal: 100,
oral: 100,
@@ -3618,7 +3642,7 @@ App.Data.HeroSlaves.D = [
analArea: 1,
ovaries: 1,
skill: {
- combat: 1
+ combat: 100
},
choosesOwnClothes: 1,
collar: "pretty jewelry",
@@ -3667,7 +3691,7 @@ App.Data.HeroSlaves.D = [
oral: 100,
anal: 100,
entertainment: 15,
- combat: 1
+ combat: 65
},
clothes: "a comfortable bodysuit",
collar: "pretty jewelry",
@@ -3712,7 +3736,7 @@ App.Data.HeroSlaves.D = [
oral: 100,
whoring: 100,
entertainment: 100,
- combat: 3
+ combat: 35
},
rules: {
living: "luxurious",
@@ -3817,7 +3841,7 @@ App.Data.HeroSlaves.D = [
vaginaLube: 1,
anus: 3,
ovaries: 1,
- brand: {"right buttock": "your initials"},
+ leg: {right: {brand: {"right buttock": "your initials"}}},
skill: {
vaginal: 100,
oral: 100,
@@ -3945,7 +3969,7 @@ App.Data.HeroSlaves.D = [
stampTat: "tribal patterns",
skill: {
oral: 35,
- combat: 1
+ combat: 35
},
rules: {
living: "luxurious",
@@ -4467,27 +4491,36 @@ App.Data.HeroSlaves.Dextreme = [
surgical: 2,
whip: 0
},
- "left buttock": {
- burn: 0,
- chain: 0,
- cutting: 0,
- exotic: 0,
- generic: 0,
- menacing: 0,
- surgical: 2,
- whip: 0
- },
- "right buttock": {
- burn: 0,
- chain: 0,
- cutting: 0,
- exotic: 0,
- generic: 0,
- menacing: 0,
- surgical: 2,
- whip: 0
- },
- }
+ },
+ leg: {
+ left: {
+ scar: {
+ "left buttock": {
+ burn: 0,
+ chain: 0,
+ cutting: 0,
+ exotic: 0,
+ generic: 0,
+ menacing: 0,
+ surgical: 2,
+ whip: 0
+ },
+ },
+ }, right: {
+ scar: {
+ "right buttock": {
+ burn: 0,
+ chain: 0,
+ cutting: 0,
+ exotic: 0,
+ generic: 0,
+ menacing: 0,
+ surgical: 2,
+ whip: 0
+ },
+ },
+ }
+ },
},
/* heels*/
/* Added origin, makeup and nails, changed eyes -BoneyM*/
diff --git a/src/npc/databases/ddSlavesDatabase.js b/src/npc/databases/ddSlavesDatabase.js
index e28317509d219ba5d212a797da627a629e262321..d31a847c70fcfe1c67b209a48b2243f7ecd3097e 100644
--- a/src/npc/databases/ddSlavesDatabase.js
+++ b/src/npc/databases/ddSlavesDatabase.js
@@ -320,15 +320,6 @@ App.Data.HeroSlaves.DD = [
fetishKnown: 1,
custom: {desc: "$He has beautiful eyes and some scars."},
scar: {
- "right arm": {
- burn: 0,
- chain: 0,
- cutting: 0,
- exotic: 0,
- generic: 1,
- menacing: 0,
- whip: 0
- },
"right breast": {
burn: 0,
chain: 0,
@@ -338,27 +329,48 @@ App.Data.HeroSlaves.DD = [
menacing: 0,
whip: 0
},
- "left buttock": {
- burn: 0,
- chain: 0,
- cutting: 0,
- exotic: 0,
- generic: 1,
- menacing: 0,
- surgical: 0,
- whip: 0
+ },
+ arm: {
+ right: {
+ scar: {
+ "right arm": {
+ burn: 0,
+ chain: 0,
+ cutting: 0,
+ exotic: 0,
+ generic: 1,
+ menacing: 0,
+ whip: 0
+ },
+ },
},
- "left thigh": {
- burn: 0,
- chain: 0,
- cutting: 0,
- exotic: 0,
- generic: 1,
- menacing: 0,
- surgical: 0,
- whip: 0
+ },
+ leg: {
+ left: {
+ scar: {
+ "left buttock": {
+ burn: 0,
+ chain: 0,
+ cutting: 0,
+ exotic: 0,
+ generic: 1,
+ menacing: 0,
+ surgical: 0,
+ whip: 0
+ },
+ "left thigh": {
+ burn: 0,
+ chain: 0,
+ cutting: 0,
+ exotic: 0,
+ generic: 1,
+ menacing: 0,
+ surgical: 0,
+ whip: 0
+ },
+ },
},
- }
+ },
},
{
ID: 800010,
@@ -654,7 +666,7 @@ App.Data.HeroSlaves.DD = [
prostate: 1,
balls: 1,
anusTat: "bleached",
- skill: {oral: 15, combat: 1},
+ skill: {oral: 15, combat: 15},
intelligence: 30,
attrXX: 40,
attrXY: 40,
@@ -694,7 +706,7 @@ App.Data.HeroSlaves.DD = [
balls: 3,
scrotum: 3,
anusTat: "bleached",
- skill: {combat: 1},
+ skill: {combat: 65},
intelligence: 30,
intelligenceImplant: 30,
attrXX: 40,
@@ -774,7 +786,7 @@ App.Data.HeroSlaves.DD = [
balls: 2,
scrotum: 2,
anusTat: "bleached",
- skill: {anal: 100, combat: 1},
+ skill: {anal: 100, combat: 65},
addict: 50,
intelligence: 20,
intelligenceImplant: 30,
@@ -874,7 +886,7 @@ App.Data.HeroSlaves.DD = [
anusTat: "bovine patterns",
makeup: 2,
nails: 2,
- brand: {"right buttock": "SLUT"},
+ leg: {right: {brand: {"right buttock": "SLUT"}}},
shouldersTat: "bovine patterns",
armsTat: "bovine patterns",
legsTat: "bovine patterns",
@@ -1196,7 +1208,7 @@ App.Data.HeroSlaves.DD = [
anal: 15,
whoring: 35,
entertainment: 35,
- combat: 1
+ combat: 15
},
clothes: "a slave gown",
collar: "pretty jewelry",
@@ -1260,7 +1272,7 @@ App.Data.HeroSlaves.DD = [
anal: 15,
whoring: 15,
entertainment: 15,
- combat: 1
+ combat: 35
},
clothes: "a string bikini",
collar: "pretty jewelry",
@@ -1324,7 +1336,7 @@ App.Data.HeroSlaves.DD = [
anal: 100,
whoring: 100,
entertainment: 100,
- combat: 1
+ combat: 35
},
diet: "muscle building",
clothes: "harem gauze",
@@ -1575,7 +1587,7 @@ App.Data.HeroSlaves.DDextreme = [
balls: 3,
scrotum: 3,
anusTat: "bleached",
- skill: {combat: 1},
+ skill: {combat: 65},
intelligence: -40,
intelligenceImplant: 30,
attrXX: 40,
diff --git a/src/npc/descriptions/belly/belly.js b/src/npc/descriptions/belly/belly.js
index 0c6256017e7f85188d1f5d29803a783be02303c7..2d8ed6e576487e54198304534bc3d131c41c0674 100644
--- a/src/npc/descriptions/belly/belly.js
+++ b/src/npc/descriptions/belly/belly.js
@@ -32,7 +32,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
if (slave.belly < 1500) {
if (slave.bellySagPreg > 1 || slave.bellySagPreg === -1) {
if (V.arcologies[0].FSRepopulationFocus !== "unset") {
- r.push(`While most societies would find ${his} sagging, pregnancy ruined stomach unattractive, your repopulation focused one merely sees ${him} as a breeder between pregnancies.`);
+ r.push(`While most societies would find ${his} sagging, pregnancy ruined stomach unattractive, your repopulation-focused one merely sees ${him} as a breeder between pregnancies.`);
} else {
r.push(`Society finds ${his} pregnancy ruined stomach very unattractive.`);
}
@@ -76,32 +76,32 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
if (V.arcologies[0].FSRepopulationFocus !== "unset") {
if (slave.belly >= 1000000) {
if (isBellyFluidLargest) {
- r.push(`Your breeding focused society finds ${his} unfathomable, hyper-swollen, ${slave.inflationType}-filled belly near the pinnacle of fashion despite ${his} inability to have children.`);
+ r.push(`Your breeding-focused society finds ${his} unfathomable, hyper-swollen, ${slave.inflationType}-filled belly near the pinnacle of fashion despite ${his} inability to have children.`);
} else if (slave.bellyImplant > 0) {
- r.push(`Your breeding focused society finds ${his} unfathomable, hyper-swollen, implant-filled belly near the pinnacle of fashion despite ${his} inability to have children.`);
+ r.push(`Your breeding-focused society finds ${his} unfathomable, hyper-swollen, implant-filled belly near the pinnacle of fashion despite ${his} inability to have children.`);
} else {
- r.push(`Your breeding focused society finds ${his} unfathomable, hyper-swollen pregnant belly the perfect realization of the fashionable ideal.`);
+ r.push(`Your breeding-focused society finds ${his} unfathomable, hyper-swollen pregnant belly the perfect realization of the fashionable ideal.`);
}
} else if (slave.belly >= 750000) {
if (isBellyFluidLargest) {
- r.push(`Your breeding focused society finds ${his} monolithic ${slave.inflationType}-filled belly highly fashionable despite ${his} inability to have children.`);
+ r.push(`Your breeding-focused society finds ${his} monolithic ${slave.inflationType}-filled belly highly fashionable despite ${his} inability to have children.`);
} else if (slave.bellyImplant > 0) {
- r.push(`Your breeding focused society finds ${his} monolithic implant-filled belly highly fashionable despite ${his} inability to have children.`);
+ r.push(`Your breeding-focused society finds ${his} monolithic implant-filled belly highly fashionable despite ${his} inability to have children.`);
} else {
- r.push(`Your breeding focused society finds ${his} monolithic pregnant belly near to the perfect realization of the fashionable ideal.`);
+ r.push(`Your breeding-focused society finds ${his} monolithic pregnant belly near to the perfect realization of the fashionable ideal.`);
}
} else if (slave.bellyPreg >= 600000) {
- r.push(`Your breeding focused society finds ${his} titanic bulging pregnant belly the epitome of fashion.`);
+ r.push(`Your breeding-focused society finds ${his} titanic bulging pregnant belly the epitome of fashion.`);
} else if (slave.bellyPreg >= 300000) {
- r.push(`Your breeding focused society finds ${his} massive pregnant belly extremely fashionable.`);
+ r.push(`Your breeding-focused society finds ${his} massive pregnant belly extremely fashionable.`);
} else if (slave.bellyPreg >= 15000) {
- r.push(`Your breeding focused society finds ${his} huge pregnant belly very fashionable.`);
+ r.push(`Your breeding-focused society finds ${his} huge pregnant belly very fashionable.`);
} else if (slave.bellyPreg >= 10000) {
- r.push(`Your breeding focused society finds ${his} big pregnant belly very fashionable.`);
+ r.push(`Your breeding-focused society finds ${his} big pregnant belly very fashionable.`);
} else if (slave.bellyPreg >= 5000) {
- r.push(`Your breeding focused society finds ${his} pregnant belly fashionable.`);
+ r.push(`Your breeding-focused society finds ${his} pregnant belly fashionable.`);
} else if (slave.bellyPreg >= 1500) {
- r.push(`Your breeding focused society finds a developing pregnancy very fashionable.`);
+ r.push(`Your breeding-focused society finds a developing pregnancy very fashionable.`);
}
} else if (V.arcologies[0].FSRepopulationFocusPregPolicy === 1 && slave.bellyPreg >= 1500) {
r.push(`Thanks to your trendsetting policies, society finds ${his} pregnant belly fashionable.`);
@@ -1367,7 +1367,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else if (slave.bellyPreg > 0) {
r.push(`${He} is enormously pregnant,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} womb making ${him} resemble an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} womb, making ${him} resemble an overinflated blow-up doll.`);
if (canWalk(slave)) {
r.push(`${His} walk is more of an awkward waddle as ${he} struggles to handle the weight hanging from ${his} middle.`);
} else if (canStand(slave)) {
@@ -1446,7 +1446,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else {
r.push(`${He} looks full term with septuplets,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant making ${him} resemble an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant, making ${him} resemble an overinflated blow-up doll.`);
if (canWalk(slave)) {
r.push(`${His} walk is more of an awkward waddle as ${he} struggles to handle the weight hanging from ${his} middle.`);
} else if (canStand(slave)) {
@@ -1504,7 +1504,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else if (slave.bellyPreg > 0) {
r.push(`${He} is enormously pregnant,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} womb making ${him} resemble an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} womb, making ${him} resemble an overinflated blow-up doll.`);
if (canWalk(slave)) {
r.push(`${His} walk is more of an awkward waddle as ${he} struggles to handle the weight hanging from ${his} middle.`);
} else if (canStand(slave)) {
@@ -1573,7 +1573,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else {
r.push(`${He} looks full term with sextuplets,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant making ${him} resemble an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant, making ${him} resemble an overinflated blow-up doll.`);
if (canWalk(slave)) {
r.push(`${His} walk is more of an awkward waddle as ${he} struggles to handle the weight hanging from ${his} middle.`);
} else if (canStand(slave)) {
@@ -1631,7 +1631,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else if (slave.bellyPreg > 0) {
r.push(`${He} is enormously pregnant,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} womb making ${him} resemble an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} womb, making ${him} resemble an overinflated blow-up doll.`);
if (canWalk(slave)) {
r.push(`${His} walk is more of an awkward waddle as ${he} struggles to handle the weight hanging from ${his} middle.`);
} else if (canStand(slave)) {
@@ -1706,7 +1706,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else {
r.push(`${He} looks full term with quintuplets,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant making ${him} resemble an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant, making ${him} resemble an overinflated blow-up doll.`);
if (canWalk(slave)) {
r.push(`${His} walk is more of an awkward waddle as ${he} struggles to handle the weight hanging from ${his} middle.`);
} else if (canStand(slave)) {
@@ -1764,7 +1764,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else if (slave.bellyPreg > 0) {
r.push(`${He} is enormously pregnant,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} womb making ${him} resemble an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} womb, making ${him} resemble an overinflated blow-up doll.`);
if (canWalk(slave)) {
r.push(`${His} walk is more of an awkward waddle as ${he} struggles to handle the weight hanging from ${his} middle.`);
} else if (canStand(slave)) {
@@ -1839,7 +1839,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else {
r.push(`${He} looks full term with quadruplets,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant making ${him} resemble an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant, making ${him} resemble an overinflated blow-up doll.`);
if (canWalk(slave)) {
r.push(`${His} walk is more of an awkward waddle as ${he} struggles to handle the weight hanging from ${his} middle.`);
} else if (canStand(slave)) {
@@ -1897,7 +1897,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else if (slave.bellyPreg > 0) {
r.push(`${He} is enormously pregnant,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} womb making ${him} resemble an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} womb, making ${him} resemble an overinflated blow-up doll.`);
if (canWalk(slave)) {
r.push(`${His} walk is more of an awkward waddle as ${he} struggles to handle the weight hanging from ${his} middle.`);
} else if (canStand(slave)) {
@@ -1953,7 +1953,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else {
r.push(`${He} looks full term with triplets,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant making ${him} resemble an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant, making ${him} resemble an overinflated blow-up doll.`);
if (canWalk(slave)) {
r.push(`${His} walk is more of an awkward waddle as ${he} struggles to handle the weight hanging from ${his} middle.`);
} else if (canStand(slave)) {
@@ -1996,7 +1996,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else if (slave.bellyPreg > 0) {
r.push(`${He} is enormously pregnant,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} womb making ${him} resemble an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} womb, making ${him} resemble an overinflated blow-up doll.`);
if (canWalk(slave)) {
r.push(`${His} walk is more of an awkward waddle as ${he} struggles to handle the weight hanging from ${his} middle.`);
} else if (canStand(slave)) {
@@ -2050,7 +2050,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else {
r.push(`${He} looks full term with twins,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant making ${him} resemble an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant, making ${him} resemble an overinflated blow-up doll.`);
if (canWalk(slave)) {
r.push(`${His} walk is more of an awkward waddle as ${he} struggles to handle the weight hanging from ${his} middle.`);
} else if (canStand(slave)) {
@@ -2093,7 +2093,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else if (slave.bellyPreg > 0) {
r.push(`${He} is enormously pregnant,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} womb making ${him} resemble an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} womb, making ${him} resemble an overinflated blow-up doll.`);
if (canWalk(slave)) {
r.push(`${His} walk is more of an awkward waddle as ${he} struggles to handle the weight hanging from ${his} middle.`);
} else if (canStand(slave)) {
@@ -2141,7 +2141,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else {
r.push(`${He} looks hugely pregnant,`);
if (slave.physicalAge <= 3) {
- r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant making ${him} resemble an over inflated blow-up doll.`);
+ r.push(`and ${his} toddlerish body is absolutely filled by ${his} implant, making ${him} resemble an overinflated blow-up doll.`);
if (canWalk(slave)) {
r.push(`${His} walk is more of an awkward waddle as ${he} struggles to handle the weight hanging from ${his} middle.`);
} else if (canStand(slave)) {
@@ -2184,9 +2184,9 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
if (slave.physicalAge <= 3) {
r.push(`and ${his} toddlerish body is absolutely filled by ${his} bloated innards.`);
if (canWalk(slave)) {
- r.push(`${He} can barely waddle and resembles an over inflated blow-up doll.`);
+ r.push(`${He} can barely waddle and resembles an overinflated blow-up doll.`);
} else {
- r.push(`${He} greatly resembles an over inflated blow-up doll.`);
+ r.push(`${He} greatly resembles an overinflated blow-up doll.`);
}
} else if (slave.physicalAge <= 12) {
r.push(`and ${his} massive, drum-taut belly dominates ${his} poor little frame.`);
@@ -4449,817 +4449,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
r.push(`${slave.slaveName}'s latex suit tightly hugs ${his} stomach to showcase ${his} ripped abs.`);
}
break;
- case "a military uniform":
- if (slave.belly >= 1000000) {
- // WIP//
- } else if (slave.belly >= 750000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s monolithic ${slave.inflationType}-filled belly bulges tremendously out of ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} monolithic ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} monolithic ${slave.inflationType}-filled belly.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s monolithic implant-filled belly bulges tremendously out of ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} monolithic implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} monolithic implant-filled belly.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s monolithic pregnant belly bulges tremendously out of ${his} open tunic and undershirt, giving ${his} new recruits the room they need.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} monolithic pregnant belly. It takes full advantage of the freedom to bulge in every direction; ${his} new recruits taking as much space as they can get.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} monolithic pregnant belly. It takes full advantage of the freedom to bulge in every direction; ${his} new recruits taking as much space as they can get.`);
- }
- }
- } else if (slave.belly >= 600000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s titanic ${slave.inflationType}-filled belly hangs heavily out of ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} titanic ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} titanic ${slave.inflationType}-filled belly.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s titanic implant-filled belly hangs heavily out of ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} titanic implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} titanic implant-filled belly.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s titanic pregnant belly hangs heavily out of ${his} open tunic and undershirt, giving ${his} new recruits the room they need.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} titanic pregnant belly. It takes full advantage of the freedom to hang heavily, ${his} new recruits squirming happily.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} titanic pregnant belly. It takes full advantage of the freedom to hang heavily, ${his} new recruits squirming happily.`);
- }
- }
- } else if (slave.belly >= 450000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s gigantic ${slave.inflationType}-filled belly hangs heavily out of ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} gigantic ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} gigantic ${slave.inflationType}-filled belly.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s gigantic implant-filled belly hangs heavily out of ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} gigantic implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} gigantic implant-filled belly.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s gigantic pregnant belly hangs heavily out of ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} gigantic pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} gigantic pregnant belly.`);
- }
- }
- } else if (slave.belly >= 300000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s massive ${slave.inflationType}-filled belly hangs out ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} massive ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} massive ${slave.inflationType}-filled belly.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s massive implant-filled belly hangs out ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} massive implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} massive implant-filled belly.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s massive pregnant belly hangs out ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} massive pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} massive pregnant belly.`);
- }
- }
- } else if (slave.belly >= 150000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s giant ${slave.inflationType}-filled belly hangs out ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} giant ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} giant ${slave.inflationType}-filled belly.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s giant implant-filled belly hangs out ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} giant implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} giant implant-filled belly.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s giant pregnant belly hangs out ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} giant pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} giant pregnant belly.`);
- }
- }
- } else if (slave.belly >= 120000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s giant ${slave.inflationType}-filled belly parts ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} giant ${slave.inflationType}-filled belly has triumphed over its buttons and has joined ${his} breasts in dominating ${his} tunic.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} giant ${slave.inflationType}-filled belly has triumphed over ${his} buttons.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s giant implant-filled belly parts ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} giant implant-filled belly has triumphed over its buttons and has joined ${his} breasts in dominating ${his} tunic.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} giant implant-filled belly has triumphed over ${his} buttons.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s giant pregnant belly parts ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} giant pregnant belly has triumphed over its buttons and has joined ${his} breasts in dominating ${his} tunic.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} giant pregnant belly has triumphed over ${his} buttons.`);
- }
- }
- } else if (slave.belly >= 45000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge ${slave.inflationType}-filled belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} huge ${slave.inflationType}-filled belly has triumphed over its buttons and has joined ${his} breasts in dominating ${his} tunic.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} huge ${slave.inflationType}-filled belly has triumphed over ${his} buttons.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge implant-filled belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} huge implant-filled belly has triumphed over its buttons and has joined ${his} breasts in dominating ${his} tunic.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} huge implant-filled belly has triumphed over ${his} buttons.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge pregnant belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} huge pregnant belly has triumphed over its buttons and has joined ${his} breasts in dominating ${his} tunic.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} huge pregnant belly has triumphed over ${his} buttons.`);
- }
- }
- } else if (slave.belly >= 30000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge ${slave.inflationType}-filled belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt barely closes as it struggles to contain ${his} huge ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic lies half open, since ${his} huge ${slave.inflationType}-filled belly has triumphed over ${his} uniform's buttons.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge implant-filled belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt barely closes as it struggles to contain ${his} huge implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic lies half open, since ${his} huge implant-filled belly has triumphed over ${his} uniform's buttons.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge pregnant belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt barely closes as it struggles to contain ${his} huge pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic lies half open, since ${his} huge pregnant belly has triumphed over ${his} uniform's buttons.`);
- }
- }
- } else if (slave.weight > 190) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s massively fat belly is barely obscured by ${his} massive tits and, in turn, obscures ${his} skirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} massively fat belly has triumphed over ${his} buttons. It hangs free, obscuring ${his} skirt.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} massively fat belly has triumphed over ${his} buttons. It hangs free, obscuring ${his} skirt.`);
- }
- } else if (slave.belly >= 15000 || (slave.bellyAccessory === "a huge empathy belly")) {
- if (slave.bellyAccessory === "a huge empathy belly") {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge pregnant belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} huge pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s huge pregnant belly threatens to pop the buttons off ${his} uniform's jacket.`);
- }
- } else if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge ${slave.inflationType}-filled belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} huge ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s huge ${slave.inflationType}-filled belly threatens to pop the buttons off ${his} uniform's jacket.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge implant-filled belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} huge implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s huge implant-filled belly threatens to pop the buttons off ${his} uniform's jacket.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge pregnant belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} huge pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s huge pregnant belly threatens to pop the buttons off ${his} uniform's jacket.`);
- }
- }
- } else if (slave.belly >= 10000 || (slave.bellyAccessory === "a large empathy belly")) {
- if (slave.bellyAccessory === "a large empathy belly") {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s big pregnant belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} big pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s big pregnant belly greatly stretches ${his} uniform's jacket.`);
- }
- } else if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s hugely swollen belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} hugely swollen belly.`);
- } else {
- r.push(`${slave.slaveName}'s hugely swollen belly greatly stretches ${his} uniform's jacket.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s big implant-filled belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} big implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s big implant-filled belly greatly stretches ${his} uniform's jacket.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s big pregnant belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} big pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s big pregnant belly greatly stretches ${his} uniform's jacket.`);
- }
- }
- } else if (slave.weight > 160) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s hugely fat belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} hugely fat belly, forcing fat to bulge between the overworked buttons. The bottom of it peeks out from under ${his} poor top, obscuring the waist of ${his} skirt.`);
- } else {
- r.push(`${slave.slaveName}'s hugely fat belly distends ${his} uniform's jacket, the bottom of which hangs out from under it, obscuring the waist of ${his} skirt.`);
- }
- } else if (slave.weight > 130) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s big fat belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} big fat belly, the bottom of which peeks out from under it and hangs over the waist of ${his} skirt.`);
- } else {
- r.push(`${slave.slaveName}'s big fat belly is notably distends ${his} uniform's jacket, the bottom of which just barely peeks out from under it, hanging over the waist of ${his} skirt.`);
- }
- } else if (slave.belly >= 5000 || (slave.bellyAccessory === "a medium empathy belly")) {
- if (slave.bellyAccessory === "a medium empathy belly") {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s pregnant belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s pregnant belly notably distends ${his} uniform's jacket.`);
- }
- } else if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s jiggling ${slave.inflationType}-filled belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} jiggling ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s jiggling ${slave.inflationType}-filled belly notably distends ${his} uniform's jacket.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s implant-filled belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s implant-filled belly notably distends ${his} uniform's jacket.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s pregnant belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s pregnant belly notably distends ${his} uniform's jacket.`);
- }
- }
- } else if (slave.weight > 95) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s fat belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt struggles to cover ${his} fat belly, the bottom of which peeks out from under it.`);
- } else {
- r.push(`${slave.slaveName}'s fat belly is covered by ${his} uniform's jacket, the bottom of which just barely peeks out from under it.`);
- }
- } else if (slave.belly >= 1500 || slave.bellyAccessory === "a small empathy belly") {
- if (slave.bellyAccessory === "a small empathy belly") {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s small pregnant belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt covers ${his} small pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s uniform covers ${his} small pregnant belly.`);
- }
- } else if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s ${slave.inflationType}-swollen belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt covers ${his} ${slave.inflationType}-swollen belly.`);
- } else {
- r.push(`${slave.slaveName}'s uniform covers ${his} ${slave.inflationType}-swollen belly.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s implant-rounded belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt covers ${his} implant-rounded belly.`);
- } else {
- r.push(`${slave.slaveName}'s uniform covers ${his} implant-rounded belly.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s growing belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt covers ${his} growing belly.`);
- } else {
- r.push(`${slave.slaveName}'s uniform covers ${his} growing belly.`);
- }
- }
- } else if (slave.weight > 30) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s chubby belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt covers ${his} chubby belly, the bottom of which just barely peeks out from under it.`);
- } else {
- r.push(`${slave.slaveName}'s uniform covers ${his} chubby belly, the bottom of which just barely peeks out from under it.`);
- }
- } else if (slave.bellyPreg >= 100 || slave.bellyImplant >= 100) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s slightly swollen belly can be glimpsed beneath ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt tightly hugs the slight swell to ${his} lower belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic looks a little tight around the middle.`);
- }
- } else if (slave.muscles > 30) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s ripped abs can be glimpsed beneath ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt barely conceals ${his} ripped abs.`);
- } else {
- r.push(`${slave.slaveName}'s ripped abs are completely hidden under ${his} uniform.`);
- }
- }
- break;
- case "a schutzstaffel uniform":
- if (slave.belly >= 1000000) {
- // WIP//
- } else if (slave.belly >= 750000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s monolithic ${slave.inflationType}-filled belly bulges tremendously out of ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} monolithic ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} monolithic ${slave.inflationType}-filled belly.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s monolithic implant-filled belly bulges tremendously out of ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} monolithic implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} monolithic implant-filled belly.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s monolithic pregnant belly bulges tremendously out of ${his} open tunic and undershirt, giving ${his} new recruits the room they need.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} monolithic pregnant belly. It takes full advantage of the freedom to bulge in every direction; ${his} new recruits taking as much space as they can get.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} monolithic pregnant belly. It takes full advantage of the freedom to bulge in every direction; ${his} new recruits taking as much space as they can get.`);
- }
- }
- } else if (slave.belly >= 600000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s titanic ${slave.inflationType}-filled belly hangs heavily out of ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} titanic ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} titanic ${slave.inflationType}-filled belly.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s titanic implant-filled belly hangs heavily out of ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} titanic implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} titanic implant-filled belly.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s titanic pregnant belly hangs heavily out of ${his} open tunic and undershirt, giving ${his} new recruits the room they need.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} titanic pregnant belly. It takes full advantage of the freedom to hang heavily, ${his} new recruits squirming happily.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} titanic pregnant belly. It takes full advantage of the freedom to hang heavily, ${his} new recruits squirming happily.`);
- }
- }
- } else if (slave.belly >= 450000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s gigantic ${slave.inflationType}-filled belly hangs heavily out of ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} gigantic ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} gigantic ${slave.inflationType}-filled belly.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s gigantic implant-filled belly hangs heavily out of ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} gigantic implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} gigantic implant-filled belly.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s gigantic pregnant belly hangs heavily out of ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} gigantic pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} gigantic pregnant belly.`);
- }
- }
- } else if (slave.belly >= 300000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s massive ${slave.inflationType}-filled belly hangs out ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} massive ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} massive ${slave.inflationType}-filled belly.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s massive implant-filled belly hangs out ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} massive implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} massive implant-filled belly.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s massive pregnant belly hangs out ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} massive pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} massive pregnant belly.`);
- }
- }
- } else if (slave.belly >= 150000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s giant ${slave.inflationType}-filled belly hangs out ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} giant ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} giant ${slave.inflationType}-filled belly.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s giant implant-filled belly hangs out ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} giant implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} giant implant-filled belly.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s giant pregnant belly hangs out ${his} open tunic and undershirt.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since there is no chance of closing the buttons over ${his} giant pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since there is no chance of closing the buttons over ${his} giant pregnant belly.`);
- }
- }
- } else if (slave.belly >= 120000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s giant ${slave.inflationType}-filled belly parts ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} giant ${slave.inflationType}-filled belly has triumphed over its buttons and has joined ${his} breasts in dominating ${his} tunic.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} giant ${slave.inflationType}-filled belly has triumphed over ${his} buttons.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s giant implant-filled belly parts ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} giant implant-filled belly has triumphed over its buttons and has joined ${his} breasts in dominating ${his} tunic.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} giant implant-filled belly has triumphed over ${his} buttons.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s giant pregnant belly parts ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} giant pregnant belly has triumphed over its buttons and has joined ${his} breasts in dominating ${his} tunic.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} giant pregnant belly has triumphed over ${his} buttons.`);
- }
- }
- } else if (slave.belly >= 45000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge ${slave.inflationType}-filled belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} huge ${slave.inflationType}-filled belly has triumphed over its buttons and has joined ${his} breasts in dominating ${his} tunic.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} huge ${slave.inflationType}-filled belly has triumphed over ${his} buttons.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge implant-filled belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} huge implant-filled belly has triumphed over its buttons and has joined ${his} breasts in dominating ${his} tunic.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} huge implant-filled belly has triumphed over ${his} buttons.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge pregnant belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} huge pregnant belly has triumphed over its buttons and has joined ${his} breasts in dominating ${his} tunic.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} huge pregnant belly has triumphed over ${his} buttons.`);
- }
- }
- } else if (slave.belly >= 30000) {
- if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge ${slave.inflationType}-filled belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt barely closes as it struggles to contain ${his} huge ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic lies half open, since ${his} huge ${slave.inflationType}-filled belly has triumphed over ${his} uniform's buttons.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge implant-filled belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt barely closes as it struggles to contain ${his} huge implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic lies half open, since ${his} huge implant-filled belly has triumphed over ${his} uniform's buttons.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge pregnant belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt barely closes as it struggles to contain ${his} huge pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic lies half open, since ${his} huge pregnant belly has triumphed over ${his} uniform's buttons.`);
- }
- }
- } else if (slave.weight > 190) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s massively fat belly is barely obscured by ${his} massive tits and, in turn, obscures ${his} trousers.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} massively fat belly has triumphed over ${his} buttons. It hangs free, obscuring ${his} trousers.`);
- } else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} massively fat belly has triumphed over ${his} buttons. It hangs free, obscuring ${his} trousers.`);
- }
- } else if (slave.belly >= 15000 || (slave.bellyAccessory === "a huge empathy belly")) {
- if (slave.bellyAccessory === "a huge empathy belly") {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge pregnant belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} huge pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s huge pregnant belly threatens to pop the buttons off ${his} uniform's jacket.`);
- }
- } else if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge ${slave.inflationType}-filled belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} huge ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s huge ${slave.inflationType}-filled belly threatens to pop the buttons off ${his} uniform's jacket.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge implant-filled belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} huge implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s huge implant-filled belly threatens to pop the buttons off ${his} uniform's jacket.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s huge pregnant belly is barely obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} huge pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s huge pregnant belly threatens to pop the buttons off ${his} uniform's jacket.`);
- }
- }
- } else if (slave.belly >= 10000 || (slave.bellyAccessory === "a large empathy belly")) {
- if (slave.bellyAccessory === "a large empathy belly") {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s big pregnant belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} big pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s big pregnant belly greatly stretches ${his} uniform's jacket.`);
- }
- } else if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s hugely swollen belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} hugely swollen belly.`);
- } else {
- r.push(`${slave.slaveName}'s hugely swollen belly greatly stretches ${his} uniform's jacket.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s big implant-filled belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} big implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s big implant-filled belly greatly stretches ${his} uniform's jacket.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s big pregnant belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} big pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s big pregnant belly greatly stretches ${his} uniform's jacket.`);
- }
- }
- } else if (slave.weight > 160) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s hugely fat belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} hugely fat belly, forcing fat to bulge between the overworked buttons. The bottom of it peeks out from under ${his} poor top, obscuring the waist of ${his} trousers.`);
- } else {
- r.push(`${slave.slaveName}'s hugely fat belly distends ${his} uniform's jacket, the bottom of which hangs out from under it, obscuring the waist of ${his} trousers.`);
- }
- } else if (slave.weight > 130) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s big fat belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} big fat belly, the bottom of which peeks out from under it and hangs over the waist of ${his} trousers.`);
- } else {
- r.push(`${slave.slaveName}'s big fat belly is notably distends ${his} uniform's jacket, the bottom of which just barely peeks out from under it, hanging over the waist of ${his} trousers.`);
- }
- } else if (slave.belly >= 5000 || (slave.bellyAccessory === "a medium empathy belly")) {
- if (slave.bellyAccessory === "a medium empathy belly") {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s pregnant belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s pregnant belly notably distends ${his} uniform's jacket.`);
- }
- } else if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s jiggling ${slave.inflationType}-filled belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} jiggling ${slave.inflationType}-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s jiggling ${slave.inflationType}-filled belly notably distends ${his} uniform's jacket.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s implant-filled belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s implant-filled belly notably distends ${his} uniform's jacket.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s pregnant belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s pregnant belly notably distends ${his} uniform's jacket.`);
- }
- }
- } else if (slave.weight > 95) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s fat belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt struggles to cover ${his} fat belly, the bottom of which peeks out from under it.`);
- } else {
- r.push(`${slave.slaveName}'s fat belly is covered by ${his} uniform's jacket, the bottom of which just barely peeks out from under it.`);
- }
- } else if (slave.belly >= 1500 || slave.bellyAccessory === "a small empathy belly") {
- if (slave.bellyAccessory === "a small empathy belly") {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s small pregnant belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt covers ${his} small pregnant belly.`);
- } else {
- r.push(`${slave.slaveName}'s uniform covers ${his} small pregnant belly.`);
- }
- } else if (isBellyFluidLargest) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s ${slave.inflationType}-swollen belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt covers ${his} ${slave.inflationType}-swollen belly.`);
- } else {
- r.push(`${slave.slaveName}'s uniform covers ${his} ${slave.inflationType}-swollen belly.`);
- }
- } else if (slave.bellyImplant > 0) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s implant-rounded belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt covers ${his} implant-rounded belly.`);
- } else {
- r.push(`${slave.slaveName}'s uniform covers ${his} implant-rounded belly.`);
- }
- } else {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s growing belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt covers ${his} growing belly.`);
- } else {
- r.push(`${slave.slaveName}'s uniform covers ${his} growing belly.`);
- }
- }
- } else if (slave.weight > 30) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s chubby belly is obscured by ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt covers ${his} chubby belly, the bottom of which just barely peeks out from under it.`);
- } else {
- r.push(`${slave.slaveName}'s uniform covers ${his} chubby belly, the bottom of which just barely peeks out from under it.`);
- }
- } else if (slave.bellyPreg >= 100 || slave.bellyImplant >= 100) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s slightly swollen belly can be glimpsed beneath ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt tightly hugs the slight swell to ${his} lower belly.`);
- } else {
- r.push(`${slave.slaveName}'s tunic looks a little tight around the middle.`);
- }
- } else if (slave.muscles > 30) {
- if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s ripped abs can be glimpsed beneath ${his} massive tits.`);
- } else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt barely conceals ${his} ripped abs.`);
- } else {
- r.push(`${slave.slaveName}'s ripped abs are completely hidden under ${his} uniform.`);
- }
- }
- break;
- case "a slutty schutzstaffel uniform":
+ case "a schutzstaffel uniform":
if (slave.belly >= 1000000) {
// WIP//
} else if (slave.belly >= 750000) {
@@ -5472,11 +4662,11 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
}
} else if (slave.weight > 190) {
if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s massively fat belly is barely obscured by ${his} massive tits and, in turn, obscures ${his} miniskirt.`);
+ r.push(`${slave.slaveName}'s massively fat belly is barely obscured by ${his} massive tits and, in turn, obscures ${his} trousers.`);
} else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} massively fat belly has triumphed over ${his} buttons. It hangs free, obscuring ${his} miniskirt.`);
+ r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} massively fat belly has triumphed over ${his} buttons. It hangs free, obscuring ${his} trousers.`);
} else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} massively fat belly has triumphed over ${his} buttons. It hangs free, obscuring ${his} miniskirt.`);
+ r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} massively fat belly has triumphed over ${his} buttons. It hangs free, obscuring ${his} trousers.`);
}
} else if (slave.belly >= 15000 || (slave.bellyAccessory === "a huge empathy belly")) {
if (slave.bellyAccessory === "a huge empathy belly") {
@@ -5550,17 +4740,17 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
if (slave.boobs > 12000) {
r.push(`${slave.slaveName}'s hugely fat belly is obscured by ${his} massive tits.`);
} else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} hugely fat belly, forcing fat to bulge between the overworked buttons. The bottom of it peeks out from under ${his} poor top, obscuring the waist of ${his} miniskirt.`);
+ r.push(`${slave.slaveName}'s undershirt strains to contain ${his} hugely fat belly, forcing fat to bulge between the overworked buttons. The bottom of it peeks out from under ${his} poor top, obscuring the waist of ${his} trousers.`);
} else {
- r.push(`${slave.slaveName}'s hugely fat belly distends ${his} uniform's jacket, the bottom of which hangs out from under it, obscuring the waist of ${his} miniskirt.`);
+ r.push(`${slave.slaveName}'s hugely fat belly distends ${his} uniform's jacket, the bottom of which hangs out from under it, obscuring the waist of ${his} trousers.`);
}
} else if (slave.weight > 130) {
if (slave.boobs > 12000) {
r.push(`${slave.slaveName}'s big fat belly is obscured by ${his} massive tits.`);
} else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} big fat belly, the bottom of which peeks out from under it and hangs over the waist of ${his} miniskirt.`);
+ r.push(`${slave.slaveName}'s undershirt strains to contain ${his} big fat belly, the bottom of which peeks out from under it and hangs over the waist of ${his} trousers.`);
} else {
- r.push(`${slave.slaveName}'s big fat belly is notably distends ${his} uniform's jacket, the bottom of which just barely peeks out from under it, hanging over the waist of ${his} miniskirt.`);
+ r.push(`${slave.slaveName}'s big fat belly is notably distends ${his} uniform's jacket, the bottom of which just barely peeks out from under it, hanging over the waist of ${his} trousers.`);
}
} else if (slave.belly >= 5000 || (slave.bellyAccessory === "a medium empathy belly")) {
if (slave.bellyAccessory === "a medium empathy belly") {
@@ -5664,7 +4854,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
}
}
break;
- case "a red army uniform":
+ case "a slutty schutzstaffel uniform":
if (slave.belly >= 1000000) {
// WIP//
} else if (slave.belly >= 750000) {
@@ -5877,11 +5067,11 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
}
} else if (slave.weight > 190) {
if (slave.boobs > 12000) {
- r.push(`${slave.slaveName}'s massively fat belly is barely obscured by ${his} massive tits and, in turn, obscures ${his} skirt.`);
+ r.push(`${slave.slaveName}'s massively fat belly is barely obscured by ${his} massive tits and, in turn, obscures ${his} miniskirt.`);
} else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} massively fat belly has triumphed over ${his} buttons. It hangs free, obscuring ${his} skirt.`);
+ r.push(`${slave.slaveName}'s undershirt lies half open, since ${his} massively fat belly has triumphed over ${his} buttons. It hangs free, obscuring ${his} miniskirt.`);
} else {
- r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} massively fat belly has triumphed over ${his} buttons. It hangs free, obscuring ${his} skirt.`);
+ r.push(`${slave.slaveName}'s tunic and undershirt lie half open, since ${his} massively fat belly has triumphed over ${his} buttons. It hangs free, obscuring ${his} miniskirt.`);
}
} else if (slave.belly >= 15000 || (slave.bellyAccessory === "a huge empathy belly")) {
if (slave.bellyAccessory === "a huge empathy belly") {
@@ -5955,17 +5145,17 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
if (slave.boobs > 12000) {
r.push(`${slave.slaveName}'s hugely fat belly is obscured by ${his} massive tits.`);
} else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} hugely fat belly, forcing fat to bulge between the overworked buttons. The bottom of it peeks out from under ${his} poor top, obscuring the waist of ${his} skirt.`);
+ r.push(`${slave.slaveName}'s undershirt strains to contain ${his} hugely fat belly, forcing fat to bulge between the overworked buttons. The bottom of it peeks out from under ${his} poor top, obscuring the waist of ${his} miniskirt.`);
} else {
- r.push(`${slave.slaveName}'s hugely fat belly distends ${his} uniform's jacket, the bottom of which hangs out from under it, obscuring the waist of ${his} skirt.`);
+ r.push(`${slave.slaveName}'s hugely fat belly distends ${his} uniform's jacket, the bottom of which hangs out from under it, obscuring the waist of ${his} miniskirt.`);
}
} else if (slave.weight > 130) {
if (slave.boobs > 12000) {
r.push(`${slave.slaveName}'s big fat belly is obscured by ${his} massive tits.`);
} else if (slave.boobs > 4000) {
- r.push(`${slave.slaveName}'s undershirt strains to contain ${his} big fat belly, the bottom of which peeks out from under it and hangs over the waist of ${his} skirt.`);
+ r.push(`${slave.slaveName}'s undershirt strains to contain ${his} big fat belly, the bottom of which peeks out from under it and hangs over the waist of ${his} miniskirt.`);
} else {
- r.push(`${slave.slaveName}'s big fat belly is notably distends ${his} uniform's jacket, the bottom of which just barely peeks out from under it, hanging over the waist of ${his} skirt.`);
+ r.push(`${slave.slaveName}'s big fat belly is notably distends ${his} uniform's jacket, the bottom of which just barely peeks out from under it, hanging over the waist of ${his} miniskirt.`);
}
} else if (slave.belly >= 5000 || (slave.bellyAccessory === "a medium empathy belly")) {
if (slave.bellyAccessory === "a medium empathy belly") {
@@ -6069,6 +5259,8 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
}
}
break;
+ case "a military uniform":
+ case "a red army uniform":
case "a mounty outfit":
if (slave.belly >= 1000000) {
// WIP//
@@ -7040,219 +6232,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
}
break;
case "a long qipao":
- if (slave.belly >= 1000000) {
- // WIP//
- } else if (slave.belly >= 750000) {
- if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a dangerously gravid ${girl}. It tightly clings to ${his} monolithic ${slave.inflationType}-filled belly and draws the eye right to ${his} protruding navel.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a dangerously gravid ${girl}. It tightly clings to ${his} monolithic implant-filled belly and draws the eye right to ${his} protruding navel.`);
- } else {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a dangerously gravid ${girl}. It tightly clings to ${his} monolithic pregnant belly, drawing the eye to ${his} protruding navel, the clear bulges of the life growing within ${him}, and every slight twitch inside ${his} taut middle.`);
- }
- } else if (slave.belly >= 600000) {
- if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such an absurdly gravid ${girl}. It tightly clings to ${his} titanic ${slave.inflationType}-filled belly and draws the eye right to ${his} protruding navel.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such an absurdly gravid ${girl}. It tightly clings to ${his} titanic implant-filled belly and draws the eye right to ${his} protruding navel.`);
- } else {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such an absurdly gravid ${girl}. It tightly clings to ${his} titanic pregnant belly, drawing the eye to ${his} protruding navel, the bulges of the life growing within ${him}, and every kick and squirm inside ${his} straining middle.`);
- }
- } else if (slave.belly >= 450000) {
- if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a massively gravid ${girl}. It tightly clings to ${his} gigantic ${slave.inflationType}-filled belly and draws the eye right to ${his} protruding navel.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a massively gravid ${girl}. It tightly clings to ${his} gigantic implant-filled belly and draws the eye right to ${his} protruding navel.`);
- } else {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a massively gravid ${girl}. It tightly clings to ${his} gigantic pregnant belly, drawing the eye to ${his} protruding navel, the outlines of the life within ${him}, and every kick and squirm inside ${his} straining middle.`);
- }
- } else if (slave.belly >= 300000) {
- if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a hugely gravid ${girl}. It tightly clings to ${his} massive ${slave.inflationType}-filled belly and draws the eye right to ${his} protruding navel.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a hugely gravid ${girl}. It tightly clings to ${his} massive implant-filled belly and draws the eye right to ${his} protruding navel.`);
- } else {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a hugely gravid ${girl}. It tightly clings to ${his} massive pregnant belly, drawing the eye to ${his} protruding navel and clearly showing every kick and squirm inside ${his} bulging middle.`);
- }
- } else if (slave.belly >= 120000) {
- if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a hugely gravid ${girl}. It tightly clings to ${his} giant ${slave.inflationType}-filled belly and draws the eye right to ${his} protruding navel.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a hugely gravid ${girl}. It tightly clings to ${his} giant implant-filled belly and draws the eye right to ${his} protruding navel.`);
- } else {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a hugely gravid ${girl}. It tightly clings to ${his} giant pregnant belly, drawing the eye to ${his} protruding navel and clearly showing every kick and squirm inside ${his} bulging middle.`);
- }
- } else if (slave.belly >= 30000) {
- if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a gravid ${girl}. It tightly clings to ${his} huge ${slave.inflationType}-filled belly and draws the eye right to ${his} protruding navel.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a gravid ${girl}. It tightly clings to ${his} huge implant-filled belly and draws the eye right to ${his} protruding navel.`);
- } else {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a gravid ${girl}. It tightly clings to ${his} huge pregnant belly, drawing the eye to ${his} protruding navel and clearly showing every kick and squirm inside ${his} bulging middle.`);
- }
- } else if (slave.weight > 190) {
- r.push(`${slave.slaveName}'s dress strains to contain ${his} massively fat belly, clearly showing all ${his} folds and rolls. Flab forces its way through every growing tear in ${his} seams; a growing nuisance, as the outfit must be restitched frequently.`);
- } else if (slave.belly >= 15000 || (slave.bellyAccessory === "a huge empathy belly")) {
- if (slave.bellyAccessory === "a huge empathy belly") {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} huge pregnant belly and frequently rides up far enough to show off ${his} privates.`);
- } else if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} huge ${slave.inflationType}-filled belly and frequently rides up far enough to show off ${his} privates.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} huge implant-filled belly and frequently rides up far enough to show off ${his} privates.`);
- } else {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} huge pregnant belly and frequently rides up far enough to show off ${his} privates.`);
- }
- } else if (slave.belly >= 10000 || (slave.bellyAccessory === "a large empathy belly")) {
- if (slave.bellyAccessory === "a large empathy belly") {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} big pregnant belly, leaving it looking much shorter than it really is.`);
- } else if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress barely clings to ${his} hugely swollen belly, leaving it looking much shorter than it really is.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress barely clings to ${his} huge implant-filled belly, leaving it looking much shorter than it really is.`);
- } else {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} big pregnant belly, leaving it looking much shorter than it really is.`);
- }
- } else if (slave.weight > 160) {
- r.push(`${slave.slaveName}'s dress barely clings to ${his} hugely fat belly, clearly showing all ${his} folds and rolls.`);
- } else if (slave.weight > 130) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} big fat belly, clearly showing all ${his} folds and rolls.`);
- } else if (slave.belly >= 5000 || (slave.bellyAccessory === "a medium empathy belly")) {
- if (slave.bellyAccessory === "a medium empathy belly") {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} pregnant belly.`);
- } else if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} jiggling ${slave.inflationType}-filled belly.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} pregnant belly.`);
- }
- } else if (slave.weight > 95) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} fat belly, clearly showing every fold and roll.`);
- } else if (slave.belly >= 1500 || slave.bellyAccessory === "a small empathy belly") {
- if (slave.bellyAccessory === "a small empathy belly") {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} small pregnant belly.`);
- } else if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} ${slave.inflationType}-swollen belly.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} implant-rounded belly.`);
- } else {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} growing belly.`);
- }
- } else if (slave.weight > 30) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} chubby belly, clearly showing every fold and roll.`);
- } else if (slave.bellyPreg >= 100 || slave.bellyImplant >= 100) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} belly, clearly showing the slight swell beneath ${his} navel.`);
- } else if (slave.muscles > 30) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} ripped abs, clearly displaying ${his} six pack.`);
- }
- break;
case "a biyelgee costume":
- if (slave.belly >= 1000000) {
- // WIP//
- } else if (slave.belly >= 750000) {
- if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a dangerously gravid ${girl}. It tightly clings to ${his} monolithic ${slave.inflationType}-filled belly and draws the eye right to ${his} protruding navel.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a dangerously gravid ${girl}. It tightly clings to ${his} monolithic implant-filled belly and draws the eye right to ${his} protruding navel.`);
- } else {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a dangerously gravid ${girl}. It tightly clings to ${his} monolithic pregnant belly, drawing the eye to ${his} protruding navel, the clear bulges of the life growing within ${him}, and every slight twitch inside ${his} taut middle.`);
- }
- } else if (slave.belly >= 600000) {
- if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such an absurdly gravid ${girl}. It tightly clings to ${his} titanic ${slave.inflationType}-filled belly and draws the eye right to ${his} protruding navel.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such an absurdly gravid ${girl}. It tightly clings to ${his} titanic implant-filled belly and draws the eye right to ${his} protruding navel.`);
- } else {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such an absurdly gravid ${girl}. It tightly clings to ${his} titanic pregnant belly, drawing the eye to ${his} protruding navel, the bulges of the life growing within ${him}, and every kick and squirm inside ${his} straining middle.`);
- }
- } else if (slave.belly >= 450000) {
- if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a massively gravid ${girl}. It tightly clings to ${his} gigantic ${slave.inflationType}-filled belly and draws the eye right to ${his} protruding navel.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a massively gravid ${girl}. It tightly clings to ${his} gigantic implant-filled belly and draws the eye right to ${his} protruding navel.`);
- } else {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a massively gravid ${girl}. It tightly clings to ${his} gigantic pregnant belly, drawing the eye to ${his} protruding navel, the outlines of the life within ${him}, and every kick and squirm inside ${his} straining middle.`);
- }
- } else if (slave.belly >= 300000) {
- if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a hugely gravid ${girl}. It tightly clings to ${his} massive ${slave.inflationType}-filled belly and draws the eye right to ${his} protruding navel.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a hugely gravid ${girl}. It tightly clings to ${his} massive implant-filled belly and draws the eye right to ${his} protruding navel.`);
- } else {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a hugely gravid ${girl}. It tightly clings to ${his} massive pregnant belly, drawing the eye to ${his} protruding navel and clearly showing every kick and squirm inside ${his} bulging middle.`);
- }
- } else if (slave.belly >= 120000) {
- if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a hugely gravid ${girl}. It tightly clings to ${his} giant ${slave.inflationType}-filled belly and draws the eye right to ${his} protruding navel.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a hugely gravid ${girl}. It tightly clings to ${his} giant implant-filled belly and draws the eye right to ${his} protruding navel.`);
- } else {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a hugely gravid ${girl}. It tightly clings to ${his} giant pregnant belly, drawing the eye to ${his} protruding navel and clearly showing every kick and squirm inside ${his} bulging middle.`);
- }
- } else if (slave.belly >= 30000) {
- if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a gravid ${girl}. It tightly clings to ${his} huge ${slave.inflationType}-filled belly and draws the eye right to ${his} protruding navel.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a gravid ${girl}. It tightly clings to ${his} huge implant-filled belly and draws the eye right to ${his} protruding navel.`);
- } else {
- r.push(`${slave.slaveName}'s dress is specially tailored to fit such a gravid ${girl}. It tightly clings to ${his} huge pregnant belly, drawing the eye to ${his} protruding navel and clearly showing every kick and squirm inside ${his} bulging middle.`);
- }
- } else if (slave.weight > 190) {
- r.push(`${slave.slaveName}'s dress strains to contain ${his} massively fat belly, clearly showing all ${his} folds and rolls. Flab forces its way through every growing tear in ${his} seams; a growing nuisance, as the outfit must be restitched frequently.`);
- } else if (slave.belly >= 15000 || (slave.bellyAccessory === "a huge empathy belly")) {
- if (slave.bellyAccessory === "a huge empathy belly") {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} huge pregnant belly and frequently rides up far enough to show off ${his} privates.`);
- } else if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} huge ${slave.inflationType}-filled belly and frequently rides up far enough to show off ${his} privates.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} huge implant-filled belly and frequently rides up far enough to show off ${his} privates.`);
- } else {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} huge pregnant belly and frequently rides up far enough to show off ${his} privates.`);
- }
- } else if (slave.belly >= 10000 || (slave.bellyAccessory === "a large empathy belly")) {
- if (slave.bellyAccessory === "a large empathy belly") {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} big pregnant belly, leaving it looking much shorter than it really is.`);
- } else if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress barely clings to ${his} hugely swollen belly, leaving it looking much shorter than it really is.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress barely clings to ${his} huge implant-filled belly, leaving it looking much shorter than it really is.`);
- } else {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} big pregnant belly, leaving it looking much shorter than it really is.`);
- }
- } else if (slave.weight > 160) {
- r.push(`${slave.slaveName}'s dress barely clings to ${his} hugely fat belly, clearly showing all ${his} folds and rolls.`);
- } else if (slave.weight > 130) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} big fat belly, clearly showing all ${his} folds and rolls.`);
- } else if (slave.belly >= 5000 || (slave.bellyAccessory === "a medium empathy belly")) {
- if (slave.bellyAccessory === "a medium empathy belly") {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} pregnant belly.`);
- } else if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} jiggling ${slave.inflationType}-filled belly.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} implant-filled belly.`);
- } else {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} pregnant belly.`);
- }
- } else if (slave.weight > 95) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} fat belly, clearly showing every fold and roll.`);
- } else if (slave.belly >= 1500 || slave.bellyAccessory === "a small empathy belly") {
- if (slave.bellyAccessory === "a small empathy belly") {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} small pregnant belly.`);
- } else if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} ${slave.inflationType}-swollen belly.`);
- } else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} implant-rounded belly.`);
- } else {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} growing belly.`);
- }
- } else if (slave.weight > 30) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} chubby belly, clearly showing every fold and roll.`);
- } else if (slave.bellyPreg >= 100 || slave.bellyImplant >= 100) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} belly, clearly showing the slight swell beneath ${his} navel.`);
- } else if (slave.muscles > 30) {
- r.push(`${slave.slaveName}'s dress tightly clings to ${his} ripped abs, clearly displaying ${his} six pack.`);
- }
- break;
case "a dirndl":
if (slave.belly >= 1000000) {
// WIP//
@@ -7742,21 +6722,21 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
if (slave.bellyAccessory === "a huge empathy belly") {
r.push(`${slave.slaveName}'s monokini shows off the curvature of ${his} big pregnant belly. The swimsuit has been pushed down to just above ${his} popped navel.`);
} else if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s monokini overs less than half of ${his} jiggling ${slave.inflationType}-filled belly.`);
+ r.push(`${slave.slaveName}'s monokini covers less than half of ${his} jiggling ${slave.inflationType}-filled belly.`);
} else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s monokini overs less than half of ${his} implant-filled belly.`);
+ r.push(`${slave.slaveName}'s monokini covers less than half of ${his} implant-filled belly.`);
} else {
r.push(`${slave.slaveName}'s monokini shows off every kick and movement within ${his} big pregnant belly. The swimsuit has been pushed down to just above ${his} popped navel.`);
}
} else if (slave.belly >= 10000 || (slave.bellyAccessory === "a large empathy belly")) {
if (slave.bellyAccessory === "a large empathy belly") {
- r.push(`${slave.slaveName}'s monokini overs only half of ${his} pregnant belly.`);
+ r.push(`${slave.slaveName}'s monokini covers only half of ${his} pregnant belly.`);
} else if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s monokini overs only half of ${his} jiggling ${slave.inflationType}-filled belly.`);
+ r.push(`${slave.slaveName}'s monokini covers only half of ${his} jiggling ${slave.inflationType}-filled belly.`);
} else if (slave.bellyImplant > 0) {
- r.push(`${slave.slaveName}'s monokini overs only half of ${his} implant-filled belly.`);
+ r.push(`${slave.slaveName}'s monokini covers only half of ${his} implant-filled belly.`);
} else {
- r.push(`${slave.slaveName}'s monokini overs only half of ${his} pregnant belly.`);
+ r.push(`${slave.slaveName}'s monokini covers only half of ${his} pregnant belly.`);
}
} else if (slave.weight > 160) {
r.push(`${slave.slaveName}'s monokini tightly clings to ${his} hugely fat belly, clearly displaying every fold, roll and motion in its mass.`);
@@ -9533,11 +8513,11 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
// WIP//
} else if (slave.belly >= 750000) {
if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s monolithic pregnant belly sticks far out of ${his} corset, which is just barely laced above it and straining to hold together under the ever increasing pressure.`);
+ r.push(`${slave.slaveName}'s monolithic pregnant belly sticks far out of ${his} corset, which is just barely laced above it and straining to hold together under the ever-increasing pressure.`);
} else if (slave.bellyImplant > 0) {
r.push(`${slave.slaveName}'s monolithic implant-filled belly sticks far out of ${his} corset, which is just barely laced above it and straining to hold together from the sheer size of ${him}.`);
} else {
- r.push(`${slave.slaveName}'s monolithic pregnant belly sticks far out of ${his} corset, which is just barely laced above it and straining to hold together under the ever increasing pressure.`);
+ r.push(`${slave.slaveName}'s monolithic pregnant belly sticks far out of ${his} corset, which is just barely laced above it and straining to hold together under the ever-increasing pressure.`);
}
} else if (slave.belly >= 600000) {
if (isBellyFluidLargest) {
@@ -10474,7 +9454,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else if (slave.bellyImplant > 0) {
r.push(`${slave.slaveName}'s implant-filled belly is so titanic that most of ${his} string bikini is completely eclipsed by its immense bulk.`);
} else {
- r.push(`${slave.slaveName}'s pregnant belly is so titanic that most of ${his} string bikini is completely eclipsed by the life stuffed mass.`);
+ r.push(`${slave.slaveName}'s pregnant belly is so titanic that most of ${his} string bikini is completely eclipsed by the life-stuffed mass.`);
}
} else if (slave.belly >= 450000) {
if (isBellyFluidLargest) {
@@ -10482,7 +9462,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else if (slave.bellyImplant > 0) {
r.push(`${slave.slaveName}'s implant-filled belly is so gigantic that most of ${his} string bikini is completely eclipsed by its bulk.`);
} else {
- r.push(`${slave.slaveName}'s pregnant belly is so gigantic that most of ${his} string bikini is completely eclipsed by the life filled mass.`);
+ r.push(`${slave.slaveName}'s pregnant belly is so gigantic that most of ${his} string bikini is completely eclipsed by the life-filled mass.`);
}
} else if (slave.belly >= 300000) {
if (isBellyFluidLargest) {
@@ -10490,7 +9470,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else if (slave.bellyImplant > 0) {
r.push(`${slave.slaveName}'s implant-filled belly is so massive that most of ${his} string bikini is completely eclipsed by its bulk.`);
} else {
- r.push(`${slave.slaveName}'s pregnant belly is so massive that most of ${his} string bikini is completely eclipsed by the life swollen mass.`);
+ r.push(`${slave.slaveName}'s pregnant belly is so massive that most of ${his} string bikini is completely eclipsed by the life-swollen mass.`);
}
} else if (slave.belly >= 120000) {
if (isBellyFluidLargest) {
@@ -11447,7 +10427,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else {
r.push(`${slave.slaveName}'s huge pregnant stomach hangs out the front of ${his} suit jacket and blouse, as there is no way ${he} could close them.`);
}
- } else if (slave.belly >= 10000 || (slave.bellyAccessory === "a huge empathy belly") || (slave.bellyAccessory === "a large empathy belly")) {
+ } else if (slave.belly >= 10000 || (slave.bellyAccessory === "a large empathy belly")) {
if (slave.bellyAccessory === "a large empathy belly") {
r.push(`${slave.slaveName}'s big pregnant stomach hangs out the front of ${his} suit jacket and blouse, as there is no way ${he} could close them.`);
} else if (isBellyFluidLargest) {
@@ -11552,7 +10532,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else {
r.push(`${slave.slaveName}'s huge pregnant stomach hangs out the front of ${his} specially tailored blouse and jacket as there is no way for ${him} to close them. ${His} maternity skirt fits ${him} quite well, though.`);
}
- } else if (slave.belly >= 10000 || (slave.bellyAccessory === "a huge empathy belly") || (slave.bellyAccessory === "a large empathy belly")) {
+ } else if (slave.belly >= 10000 || (slave.bellyAccessory === "a large empathy belly")) {
if (slave.bellyAccessory === "a large empathy belly") {
r.push(`${slave.slaveName}'s big pregnant belly strains ${his} specially tailored blouse and jacket.`);
} else if (isBellyFluidLargest) {
@@ -11930,7 +10910,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
} else if (slave.bellyImplant > 0) {
r.push(`${slave.slaveName}'s blouse rests atop ${his} unfathomable, hyper-swollen, implant-filled belly. ${His} skirt barely fits around ${him} and ${his} immensity promises to soon rid ${him} of the oppressive garment.`);
} else {
- r.push(`${slave.slaveName}'s blouse rests atop ${his} unfathomable, hyper-swollen pregnant belly, showing off the mind boggling result of ${his} promiscuity. It's a wonder ${his} straining skirt even manages to hold together with as much movement shoving against it.`);
+ r.push(`${slave.slaveName}'s blouse rests atop ${his} unfathomable, hyper-swollen pregnant belly, showing off the mind-boggling result of ${his} promiscuity. It's a wonder ${his} straining skirt even manages to hold together with as much movement shoving against it.`);
}
} else if (slave.belly >= 750000) {
if (isBellyFluidLargest) {
diff --git a/src/npc/descriptions/boobs/boobs.js b/src/npc/descriptions/boobs/boobs.js
index edaa2296cd827cc7fa45ca53bbba8c7d7235bfb0..38aa2826da86083334875f9519c6fc959f005a0d 100644
--- a/src/npc/descriptions/boobs/boobs.js
+++ b/src/npc/descriptions/boobs/boobs.js
@@ -93,12 +93,12 @@ App.Desc.boobBits = function() {
},
24999: {
cup: "", anCup: false,
- adjective: ["arm filling"],
+ adjective: ["arm-filling"],
noun: ["boobs", "breasts", "mammaries", "masses of breastflesh", "udders"]
},
39999: {
cup: "", anCup: false,
- adjective: ["figure dominating"],
+ adjective: ["figure-dominating"],
noun: ["boobs", "breasts", "mammaries", "masses of breastflesh", "udders"]
},
54999: {
@@ -108,7 +108,7 @@ App.Desc.boobBits = function() {
},
69999: {
cup: "", anCup: false,
- adjective: ["lap filling"],
+ adjective: ["lap-filling"],
noun: ["boobs", "breasts", "mammaries", "masses of breastflesh", "udders"]
},
89999: {
@@ -725,7 +725,7 @@ App.Desc.boobs = function() {
break;
case "a dirndl":
if (slave.boobs > 12000) {
- r += `${slave.slaveName}'s tits are so immense that ${his} dress are incapable of being laced up.`;
+ r += `${slave.slaveName}'s tits are so immense that ${his} dress is incapable of being laced up.`;
} else if (slave.boobs > 4000) {
r += `${slave.slaveName}'s tits are so huge that they prevent ${his} dress from being laced up.`;
} else if (slave.boobs > 2000) {
@@ -738,7 +738,7 @@ App.Desc.boobs = function() {
break;
case "a biyelgee costume":
if (slave.boobs > 12000) {
- r += `${slave.slaveName}'s tits are so immense that ${his} dress are incapable of being buttoned up.`;
+ r += `${slave.slaveName}'s tits are so immense that ${his} dress is incapable of being buttoned up.`;
} else if (slave.boobs > 4000) {
r += `${slave.slaveName}'s tits are so huge that they prevent ${his} dress from being buttoned up.`;
} else if (slave.boobs > 2000) {
@@ -992,7 +992,7 @@ App.Desc.boobs = function() {
case "pregnancy":
r += ' "Milk Me" ';
break;
- case "mindbroken":
+ case Fetish.MINDBROKEN:
r += ' "Free Slut" ';
break;
default:
@@ -1688,7 +1688,7 @@ App.Desc.nipples = function(slave, descType) {
}
break;
case "fuckable":
- r += `swollen shut and leaking ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor} flavored `}milk.`;
+ r += `swollen shut and leaking ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor}-flavored `}milk.`;
break;
default:
r += 'stiffly erect.';
@@ -1784,19 +1784,19 @@ App.Desc.nipples = function(slave, descType) {
if (slave.lactation > 0) {
if ((slave.assignment === App.Data.Facilities.dairy.jobs.cow.assignment) && (V.dairyRestraintsSetting > 1)) {
- r += ` The transparent lines coming off the cups attached to each of ${his} nipples are white with a constant stream of ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor} flavored `}milk.`;
+ r += ` The transparent lines coming off the cups attached to each of ${his} nipples are white with a constant stream of ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor}-flavored `}milk.`;
} else if (slave.lactation === 1) {
if (slave.boobs > 300) {
if (slave.boobsMilk > 0) {
- r += ` ${His} breasts are painfully engorged with ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor} flavored `}milk.`;
+ r += ` ${His} breasts are painfully engorged with ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor}-flavored `}milk.`;
} else {
- r += ` ${His} motherly breasts are full of ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor} flavored `}milk.`;
+ r += ` ${His} motherly breasts are full of ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor}-flavored `}milk.`;
}
} else {
if (slave.boobsMilk > 0) {
r += ` ${His} chest is painfully engorged with ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor} `}milk and leaks with the slightest provocation.`;
} else {
- r += ` ${His} sensitive chest is swollen with ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor} flavored `}milk.`;
+ r += ` ${His} sensitive chest is swollen with ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor}-flavored `}milk.`;
}
}
} else if (slave.fuckdoll > 0) {
@@ -1807,9 +1807,9 @@ App.Desc.nipples = function(slave, descType) {
} else if (slave.nipples === "inverted") {
r += ` ${His} inverted nipples prevent ${him} from releasing milk spontaneously. The lactation drugs are so powerful that if ${he} hasn't been milked in the past hour or so, the built-up pressure leaves ${him} ${!canTalk(slave) ? 'weeping' : 'whining'} piteously.`;
} else if (slave.energy > 95) {
- r += ` The powerful lactation drugs keep ${his} breasts so full of ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor} flavored `}milk that when ${he} orgasms ${slave.balls > 0 ? `${he} releases three jets of white fluid: a stream of milk from each nipple and a squirt of cum from ${his} dickhead` : `${he} cums milk out of ${his} nipples`}.`;
+ r += ` The powerful lactation drugs keep ${his} breasts so full of ${slave.milkFlavor === "none" ? `` : `${slave.milkFlavor}-flavored `}milk that when ${he} orgasms ${slave.balls > 0 ? `${he} releases three jets of white fluid: a stream of milk from each nipple and a squirt of cum from ${his} dickhead` : `${he} cums milk out of ${his} nipples`}.`;
} else {
- r += ` The lactation drugs are so powerful that if ${he} hasn't been milked in the past hour or so, ${he} leaves ${slave.milkFlavor === "none" ? `a milky mess` : `a mess of ${slave.milkFlavor} flavored milk`} wherever ${he} goes.`;
+ r += ` The lactation drugs are so powerful that if ${he} hasn't been milked in the past hour or so, ${he} leaves ${slave.milkFlavor === "none" ? `a milky mess` : `a mess of ${slave.milkFlavor}-flavored milk`} wherever ${he} goes.`;
}
}
if (slave.lactationAdaptation > 10) {
diff --git a/src/npc/descriptions/butt/butt.js b/src/npc/descriptions/butt/butt.js
index 01858a392442a98d319500d072891fb258cb4e81..c635c0fca480c8fa919175691ceaf577619a34a7 100644
--- a/src/npc/descriptions/butt/butt.js
+++ b/src/npc/descriptions/butt/butt.js
@@ -210,7 +210,7 @@ App.Desc.butt = function(slave, descType = DescType.NORMAL) {
case "pregnancy":
r.push(`"Knock Me Up"`);
break;
- case "mindbroken":
+ case Fetish.MINDBROKEN:
r.push(`"No Objections"`);
break;
default:
diff --git a/src/npc/descriptions/career.js b/src/npc/descriptions/career.js
index 10bad3191c3110ff96f8f46fd2de91b5c5409db4..6b6cd1b5f56c99c0dbc19c4a3448aa916a99b3c9 100644
--- a/src/npc/descriptions/career.js
+++ b/src/npc/descriptions/career.js
@@ -109,7 +109,7 @@ App.Desc.career = function(slave) {
} else if (App.Data.Careers.General.grateful.includes(slave.career)) {
r.push(`${career}, so ${he} can remember what it's like`);
if (slave.career === "prisoner") {
- r.push(`no one looking out for you.`);
+ r.push(`with no one looking out for you.`);
} else {
r.push(`to have the freedom to starve.`);
}
@@ -155,7 +155,7 @@ App.Desc.career = function(slave) {
{prop: "entertainer", val: "an entertainer"},
{prop: "whore", val: "a whore"}
];
- const careersArray = careerMap.filter((o) => (slave.skill[o.prop] >= V.masteredXP)).map((o) => o.val);
+ const careersArray = careerMap.filter((o) => (slave.skill[o.prop] >= Constant.MASTERED_XP)).map((o) => o.val);
if (careersArray.length > 0) {
r.push(`${He} has working experience as ${toSentence(careersArray)}.`);
}
diff --git a/src/npc/descriptions/crotch/dick.js b/src/npc/descriptions/crotch/dick.js
index 36049affe03d5417a1100e47dc586efdd43e7dfa..c48a3447559675004f4c987672d4a0f5ec2ebcc5 100644
--- a/src/npc/descriptions/crotch/dick.js
+++ b/src/npc/descriptions/crotch/dick.js
@@ -659,7 +659,7 @@ App.Desc.dick = function(slave, descType = DescType.NORMAL) {
r.push(`is,`);
}
r.push(`${he}'s probably fantasizing about being humiliated.`);
- } else if ((slave.fetish === "submissive") && (slave.fetishStrength > 60) && (slave.fetishKnown === 1)) {
+ } else if ((slave.fetish === Fetish.SUBMISSIVE) && (slave.fetishStrength > 60) && (slave.fetishKnown === 1)) {
r.push(`Judging by how hard ${he}`);
if (slave.prostate > 1) {
r.push(`is and the constant flow of precum leaking from the tip of ${his} dick,`);
@@ -1232,7 +1232,7 @@ App.Desc.dick = function(slave, descType = DescType.NORMAL) {
r.push(`little bead of precum forming at`);
}
r.push(`the hole, ${he}'s probably fantasizing about being humiliated.`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`Judging by the`);
if (slave.prostate > 1) {
r.push(`constant flow of precum leaking from`);
@@ -1416,7 +1416,7 @@ App.Desc.dick = function(slave, descType = DescType.NORMAL) {
r.push(`little bead of precum forming at`);
}
r.push(`the hole, ${he}'s probably fantasizing about being humiliated.`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`Judging by the`);
if (slave.prostate > 1) {
r.push(`constant flow of precum leaking from`);
diff --git a/src/npc/descriptions/describePiercings.js b/src/npc/descriptions/describePiercings.js
index d981dddc46dff4a9c09415e82fd8bd5e877916eb..2ad1e1d8b1e38e6f09afe5e0d83e072ffb0d469a 100644
--- a/src/npc/descriptions/describePiercings.js
+++ b/src/npc/descriptions/describePiercings.js
@@ -54,7 +54,7 @@ App.Desc.piercing = function(slave, surface) {
break;
case "a nice pony outfit":
case "a slutty pony outfit":
- r.push(`${He}'s wearing horseshoe shaped earrings.`);
+ r.push(`${He}'s wearing horseshoe-shaped earrings.`);
break;
case "leather pants and pasties":
case "leather pants":
diff --git a/src/npc/descriptions/descriptionWidgets.js b/src/npc/descriptions/descriptionWidgets.js
index d2948e0bb7395ea70b8ebcef092ebc8f368d8652..047dcd6391a4f1a9fd08d81dcafab26ba57425f8 100644
--- a/src/npc/descriptions/descriptionWidgets.js
+++ b/src/npc/descriptions/descriptionWidgets.js
@@ -95,7 +95,7 @@ App.Desc.eyes = function(slave, descType = DescType.NORMAL) {
}
}
r += `, `;
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r += `fitting for vacant expression constantly adorning ${his} face; ${he} lacks the ability to form higher thought and is completely reliant on others to think for ${him}.`;
} else if (slave.intelligence > 95) {
r += `but ${his} facial expressions reveal ${he} is incisive, quick, cunning; `;
@@ -223,7 +223,7 @@ App.Desc.eyes = function(slave, descType = DescType.NORMAL) {
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r += `${His} ${App.Desc.eyesColor(slave, "", "eye", "eyes", false)} ${hasBothEyes(slave) ? "are" : "is"} dull and vacant; ${he} lacks the capacity for higher thought.`;
} else if (slave.intelligence > 95) {
r += `${His} ${App.Desc.eyeColor(slave)}-eyed gaze is incisive, quick, cunning; `;
@@ -587,7 +587,7 @@ App.Desc.ageAndHealth = function(slave) {
}
if (slave.actualAge !== slave.physicalAge) {
- r += ` However, ${he} has the body of a ${num(slave.physicalAge)}-year-old; `;
+ r += ` However, ${he} has the body of a person ${num(slave.physicalAge)} years old; `;
if (slave.geneticQuirks.progeria === 2 && slave.physicalAge > slave.actualAge && (V.geneticMappingUpgrade >= 1 || (slave.physicalAge >= slave.actualAge + 20 && slave.tankBaby === 0))) {
if (V.geneticMappingUpgrade >= 1) {
r += `not at all surprising, given ${his} genetic condition. `;
@@ -651,12 +651,16 @@ App.Desc.ageAndHealth = function(slave) {
}
r += `${he} still resembles a young ${boy} of around ${slave.visualAge}. `;
neoteny = true;
- } else if (slave.visualAge <= slave.physicalAge - 20 || slave.visualAge >= slave.physicalAge + 20) {
- r += ` ${He} has undergone radical age therapy that makes ${him} look `;
- } else if (slave.visualAge <= slave.physicalAge - 10 || slave.visualAge >= slave.physicalAge + 10) {
- r += ` ${He} has undergone drastic age therapy that makes ${him} look `;
- } else if (slave.visualAge <= slave.physicalAge - 5 || slave.visualAge >= slave.physicalAge + 5) {
- r += ` ${He} has undergone noticeable age therapy that makes ${him} look `;
+ } else if (slave.ageImplant > 0 || slave.visualAge >= slave.physicalAge + 5) {
+ if (slave.visualAge <= slave.physicalAge - 20 || slave.visualAge >= slave.physicalAge + 20) {
+ r += ` ${He} has undergone radical age therapy that makes ${him} look `;
+ } else if (slave.visualAge <= slave.physicalAge - 10 || slave.visualAge >= slave.physicalAge + 10) {
+ r += ` ${He} has undergone drastic age therapy that makes ${him} look `;
+ } else if (slave.visualAge <= slave.physicalAge - 5 || slave.visualAge >= slave.physicalAge + 5) {
+ r += ` ${He} has undergone noticeable age therapy that makes ${him} look `;
+ } else {
+ r += ` ${He} has undergone subtle age therapy that makes ${him} look `;
+ }
} else {
r += ` For various reasons, ${he} looks `;
}
@@ -1111,6 +1115,14 @@ App.Desc.shortLimbs = function(slave) {
return limb + "Combat P-Limb ";
case 6:
return limb + "Cyber P-Limb ";
+ case 7:
+ return limb + "Quad-Feline ";
+ case 8:
+ return limb + "Quad-Canine ";
+ case 9:
+ return limb + "Combat Feline ";
+ case 10:
+ return limb + "Combat Canine ";
default:
return "unknown ID: " + id;
}
@@ -1240,6 +1252,18 @@ App.Desc.longLimbs = function(slave) {
case 6:
r += "cyber ";
break;
+ case 7:
+ r += "quadruped feline ";
+ break;
+ case 8:
+ r += "quadruped canine ";
+ break;
+ case 9:
+ r += "feline combat ";
+ break;
+ case 10:
+ r += "canine combat ";
+ break;
}
if (count > 1) {
r += "prosthetic limbs. ";
@@ -1590,7 +1614,7 @@ App.Desc.geneticQuirkAssessment = function(slave) {
} else if (slave.dick > 0) {
r.push(`${He} is predisposed to having an enormous dick, though it is unlikely to naturally grow any larger than it currently is.`);
} else {
- r.push(`${He} is predisposed to having an enormous dick, or would, if ${he} had one.`);
+ r.push(`${He} is predisposed to having an enormous dick, or would be, if ${he} had one.`);
}
} else if (slave.geneticQuirks.wellHung === 1 && V.geneticMappingUpgrade >= 2) {
r.push(`${He} is a carrier of a gene that causes enhanced penile development.`);
diff --git a/src/npc/descriptions/drugs.js b/src/npc/descriptions/drugs.js
index c002ed3c5ec13a44119a80a16481d5b03826cc8a..81bf52aafef89e2703f75e51cdb35dbaef71b0a3 100644
--- a/src/npc/descriptions/drugs.js
+++ b/src/npc/descriptions/drugs.js
@@ -252,7 +252,7 @@ App.Desc.drugs = function(slave) {
function aphrodisiacs() {
const r = [];
if (slave.aphrodisiacs > 0 || slave.inflationType === "aphrodisiac") {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
ignoredRule = 1;
} else if (disobedience(slave) !== 0) {
ignoredRule = (disobedience(slave) >= jsRandom(1, 100)) ? 1 : 0;
diff --git a/src/npc/descriptions/ears.js b/src/npc/descriptions/ears.js
index 48bfeb01cfcf6ecb4b550ab4d046ffb5a27797ed..c009f8e22d69c0bc967a582a4117f18dc85ab4f2 100644
--- a/src/npc/descriptions/ears.js
+++ b/src/npc/descriptions/ears.js
@@ -71,14 +71,14 @@ App.Desc.ears = function(slave) {
}
r.push(`${either(`tend to droop when ${he} is relaxed or sad`, `twitch at the slightest touch`)}.`);
} else if (slave.earT === "leopard") {
- r.push(`On top of ${his} head ${he} has a pair of cute leopard ears. the ears are`);
+ r.push(`On top of ${his} head ${he} has a pair of cute leopard ears. The ears are`);
if (slave.earTColor === "hairless") {
r.push(`hairless.`);
} else {
r.push(`covered in soft, ${slave.earTColor} colored fur that has`);
- if (slave.earTEffect !== "none") {
+ if (slave.earTEffect !== "none") {
r.push(`${slave.earTEffect} and`);
- }
+ }
r.push(`${slave.patternColor} leopard spots; they`);
}
if (slave.earImplant === 1) {
@@ -96,9 +96,9 @@ App.Desc.ears = function(slave) {
r.push(`hairless but`);
} else {
r.push(`covered in dense, ${slave.earTColor} colored fur that has`);
- if (slave.earTEffect !== "none") {
+ if (slave.earTEffect !== "none") {
r.push(`${slave.earTEffect} and`);
- }
+ }
r.push(`distinct ${slave.patternColor} vertical stripes. They`);
}
if (slave.earImplant === 1) {
@@ -116,9 +116,9 @@ App.Desc.ears = function(slave) {
r.push(`hairless`);
} else {
r.push(`covered in ${slave.earTColor} colored fur that`);
- if (slave.earTEffect !== "none") {
+ if (slave.earTEffect !== "none") {
r.push(`has ${slave.earTEffect} and`);
- }
+ }
r.push(`is packed with ${slave.patternColor} rosettes that have dots in their center. They`);
}
if (slave.earImplant === 1) {
@@ -136,10 +136,10 @@ App.Desc.ears = function(slave) {
r.push(`hairless.`);
} else {
r.push(`covered in ${slave.earTColor} colored fur.`);
- if (slave.earTEffect !== "none") {
+ if (slave.earTEffect !== "none") {
r.push(`that has ${slave.earTEffect}.`);
- }
- r.push(`The ears have tufts of ${slave.hColor} hair sprouting from their base and`);
+ }
+ r.push(`The ears have tufts of ${slave.hColor} hair sprouting from their base and`);
}
if (slave.earImplant === 1) {
r.push(`perk up at`);
diff --git a/src/npc/descriptions/heightImplant.js b/src/npc/descriptions/heightImplant.js
index dc3923afb8e1c0573114c1cec9c37623178e52bd..e23f74769a3f2fd7b1ff752e0799dce0b9c50cf7 100644
--- a/src/npc/descriptions/heightImplant.js
+++ b/src/npc/descriptions/heightImplant.js
@@ -57,22 +57,10 @@ App.Desc.heightImplant = function(slave) {
}
function isare() {
- const d = [];
- if (getLimbCount(slave) === 1) {
- d.push(`is`);
- } else {
- d.push(`are`);
- }
- return d;
+ return getLimbCount(slave) === 1 ? `is` : `are`;
}
function ithastheyhave() {
- const d = [];
- if (getLimbCount(slave) === 1) {
- d.push(`it has`);
- } else {
- d.push(`they have`);
- }
- return d;
+ return getLimbCount(slave) === 1 ? `it has` : `they have`;
}
};
diff --git a/src/npc/descriptions/limbs.js b/src/npc/descriptions/limbs.js
index 7b38f1e61c4ca34a1dcdc8a0ccfa3ab6762062d6..e35ec86d77acd0f2d91d6babdfd350a15218edef 100644
--- a/src/npc/descriptions/limbs.js
+++ b/src/npc/descriptions/limbs.js
@@ -40,10 +40,10 @@ App.Medicine.Limbs.currentLimbs = function(slave) {
App.Medicine.Limbs.selector = function(slave, oldLimbs) {
const {her} = getPronouns(slave);
if (hasAllNaturalLimbs(slave)) {
- return App.UI.DOM.makeElement("span", `You must amputate ${her} limbs before you can attach prosthetics.`, "detail");
+ return App.UI.DOM.makeElement("span", `You must amputate ${her} limbs before you can attach prosthetics.`, ["detail"]);
}
if (slave.PLimb < 1) {
- return App.UI.DOM.makeElement("span", `You must surgically install a prosthetic interface before you can attach prosthetics.`, "detail");
+ return App.UI.DOM.makeElement("span", `You must surgically install a prosthetic interface before you can attach prosthetics.`, ["detail"]);
}
const {his} = getPronouns(slave);
diff --git a/src/npc/descriptions/longSlave.js b/src/npc/descriptions/longSlave.js
index b0e4a208996b7a3f5a074abcebfb38eb5fcb326b..5608109f341c3e62c8212fd4265b73601369060e 100644
--- a/src/npc/descriptions/longSlave.js
+++ b/src/npc/descriptions/longSlave.js
@@ -3,15 +3,13 @@
* @param {FC.Desc.LongSlaveOptions} params
* @returns {DocumentFragment}
*/
-App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt} = {}) {
+App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt, links} = {}) {
const {
He, His, him, he, his
} = getPronouns(slave);
let el = new DocumentFragment();
let span;
- let frag;
- let p;
- let r;
+ let r = new SpacedTextAccumulator();
SlaveStatClamp(slave);
descType = descType || (market ? DescType.MARKET : DescType.NORMAL);
@@ -22,127 +20,111 @@ App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt} =
}
}
- p = document.createElement("p");
// Name
- App.UI.DOM.appendNewElement(
- "span", p,
- `${SlaveFullName(slave)} `,
- ["slave", "name", "simple"]
- );
+ r.push(App.UI.DOM.makeElement("span", `${SlaveFullName(slave)}`, ["slave", "name", "simple"]));
// Label
if (slave.custom.label) {
- p.append("(", App.UI.DOM.makeElement('span', slave.custom.label, "custom-label"), ") ");
+ r.push(App.UI.DOM.combineNodes("(",
+ App.UI.DOM.makeElement('span', slave.custom.label, "custom-label"),
+ ")"));
}
if (market && market !== "starting") {
if (applyLawCheck(market)) {
- p.append(`has passed inspection to be sold in your arcology. `);
+ r.push(`has passed inspection to be sold in your arcology.`);
} else {
- p.append(`is for sale and is available to inspect. `);
+ r.push(`is for sale and is available to inspect.`);
}
if (marketText) {
- $(p).append(marketText, ` `);
+ r.push(marketText);
}
- $(p).append(reportGingering(slave));
- el.appendChild(p);
+ r.push(reportGingering(slave));
+ r.toParagraph();
- p = document.createElement("p");
- p.className = "indent";
- p.appendChild(
- App.UI.DOM.makeElement(
- "span",
- `${slave.slaveName} `,
- "name"
- )
- );
+ r.push(App.UI.DOM.makeElement("span", `${slave.slaveName}`, "name"));
}
- p.append(`is `);
+ r.push(`is`);
// Devotion
- frag = new DocumentFragment();
span = document.createElement('span');
if (slave.devotion < -95) {
- frag.append("a ");
+ r.push("a");
span.className = "devotion hateful";
- span.textContent = "hate-filled, ";
+ span.textContent = "hate-filled,";
} else if (slave.devotion < -50) {
- frag.append("a ");
+ r.push("a");
span.className = "devotion hateful";
- span.textContent = "hateful, ";
+ span.textContent = "hateful,";
} else if (slave.devotion < -20) {
- frag.append("a ");
+ r.push("a");
span.className = "devotion resistant";
- span.textContent = "reluctant, ";
+ span.textContent = "reluctant,";
} else if (slave.devotion <= 20) {
- frag.append("a ");
+ r.push("a");
span.className = "devotion ambivalent";
- span.textContent = "hesitant, ";
+ span.textContent = "hesitant,";
} else if (slave.devotion <= 50) {
- frag.append("an ");
+ r.push("an");
span.className = "devotion accept";
- span.textContent = "accepting, ";
+ span.textContent = "accepting,";
} else if (slave.devotion <= 95) {
- frag.append("a ");
+ r.push("a");
span.className = "devotion devoted";
- span.textContent = "devoted, ";
+ span.textContent = "devoted,";
} else {
- frag.append("a ");
+ r.push("a");
span.className = "devotion worship";
- span.textContent = "worshipful, ";
+ span.textContent = "worshipful,";
}
-
- frag.appendChild(span);
- p.appendChild(frag);
+ r.push(span);
// Trust
span = document.createElement('span');
if (slave.trust < -95) {
span.className = "trust terrified";
- span.textContent = "abjectly terrified ";
+ span.textContent = "abjectly terrified";
} else if (slave.trust < -50) {
span.className = "trust terrified";
- span.textContent = "terrified ";
+ span.textContent = "terrified";
} else if (slave.trust < -20) {
span.className = "trust frightened";
- span.textContent = "frightened ";
+ span.textContent = "frightened";
} else if (slave.trust < 20) {
span.className = "trust fearful";
- span.textContent = "fearful ";
+ span.textContent = "fearful";
} else if (slave.trust <= 50) {
if (slave.devotion < -20) {
span.className = "defiant careful";
- span.textContent = "careful ";
+ span.textContent = "careful";
} else {
span.className = "trust careful";
- span.textContent = "careful ";
+ span.textContent = "careful";
}
} else if (slave.trust < 95) {
if (slave.devotion < -20) {
span.className = "defiant bold";
- span.textContent = "bold ";
+ span.textContent = "bold";
} else {
span.className = "trust trusting";
- span.textContent = "trusting ";
+ span.textContent = "trusting";
}
} else {
if (slave.devotion < -20) {
span.className = "defiant full";
- span.textContent = "defiant ";
+ span.textContent = "defiant";
} else {
span.className = "trust prof-trusting";
- span.textContent = "profoundly trusting ";
+ span.textContent = "profoundly trusting";
}
}
- p.appendChild(span);
+ r.push(span);
- // Slave's Title, ex: "pregnant big bottomed busty milky hourglass broodmother"
- span = App.UI.DOM.appendNewElement("span", p, `${SlaveTitle(slave)}. `, "coral");
- span.style.fontWeight = "bold";
+ // Slave's Title, ex:"pregnant big bottomed busty milky hourglass broodmother"
+ r.push(App.UI.DOM.makeElement("span", `${SlaveTitle(slave)}.`, ["si-slave-title"]));
- r = [];
// Indenture
if (slave.indenture > -1) {
r.push(`${His}`);
@@ -163,28 +145,22 @@ App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt} =
}
}
- r.push(App.Desc.sceneIntro(slave, descType));
+ r.push(...App.Desc.sceneIntro(slave, descType, links));
r.push(App.Desc.name(slave));
r.push(App.Desc.ageAndHealth(slave));
- $(p).append(r.join(" "));
- r = [];
const clinicNameCaps = capFirstChar(V.clinicName);
if (descType !== DescType.MARKET) {
if (V.clinic !== 0 && V.clinicUpgradeScanner === 1) {
if (slave.chem > 15) {
- p.append(`${clinicNameCaps}'s scanners score long term carcinogenic buildup in ${his} body at `,
- App.UI.DOM.makeElement("span", `${Math.ceil(slave.chem / 10)}. `, "cyan"));
+ r.push(`${clinicNameCaps}'s scanners score long term carcinogenic buildup in ${his} body at`,
+ App.UI.DOM.makeElement("span", `${Math.ceil(slave.chem / 10)}.`, "cyan"));
} else {
- p.append(`${clinicNameCaps}'s scanners confirm that ${he} has good prospects for long term health. `);
+ r.push(`${clinicNameCaps}'s scanners confirm that ${he} has good prospects for long term health.`);
}
}
r.push(App.Desc.geneticQuirkAssessment(slave));
-
- if (V.showSexualHistory === 1 && V.ui !== "start") {
- r.push(App.Desc.sexualHistory(slave));
- }
}
r.push(App.Desc.mind(slave, descType));
@@ -205,27 +181,26 @@ App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt} =
}
}
- r.push(App.Desc.family(slave));
+ r.push(App.Desc.family(slave, links));
- r.push(App.Desc.relationRival(slave));
+ r.push(...App.Desc.relationRival(slave, links));
if (slave.bodySwap > 0) {
if (slave.origBodyOwner !== "") {
r.push(`${He} currently possesses ${slave.origBodyOwner}'s body.`);
}
- if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0 && slave.origBodyOwnerID > 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0 && slave.origBodyOwnerID > 0) {
const owner = getSlave(slave.origBodyOwnerID);
if (owner !== undefined) {
- r.push(`${He} is fully aware that ${SlaveFullName(owner)} is in ${his} old body.`);
+ r.push(`${He} is fully aware that`,
+ links ? App.UI.DOM.referenceSlaveWithPreview(owner, SlaveFullName(owner)) : SlaveFullName(owner), `
+ is in ${his} old body.`);
}
}
}
- $(p).append(r.join(` `));
- el.appendChild(p);
- p = document.createElement("p");
- p.className = "indent";
- r = [];
+ r.toParagraph();
+
if (descType !== DescType.MARKET || market === "starting") {
let origin = slave.origin;
if (origin === "$auto") {
@@ -294,9 +269,9 @@ App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt} =
/* Needs contemplation. Slightly redundant with descriptionsWidgets.
if(slave.visualAge === V.idealAge) {
if(slave.actualAge === V.idealAge) {
- r.push(`${He} is ${slave.actualAge}, `);
+ r.push(`${He} is ${slave.actualAge},`);
} else {
- r.push(`${He} appears to be ${slave.visualAge}, `);
+ r.push(`${He} appears to be ${slave.visualAge},`);
}
if(V.idealAge === 18) {
r.push(`and many still find this age especially attractive due to old world tradition.`);
@@ -307,9 +282,9 @@ App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt} =
r.push(`${He} appears to be ${slave.visualAge}, which is nearly the ideal, but as ${he} is actually ${slave.actualAge}, this can sometimes be cause for confusion regarding the appropriate level of enthusiasm society should have for ${him}.`);
} else if(slave.visualAge === V.idealAge - 1) {
if(slave.actualAge === V.idealAge - 1) {
- r.push(`${He} is ${slave.actualAge}, `);
+ r.push(`${He} is ${slave.actualAge},`);
} else {
- r.push(`${He} appears to be ${slave.visualAge}, `);
+ r.push(`${He} appears to be ${slave.visualAge},`);
}
if(V.idealAge === 18) {
r.push(`and many are already looking forward to ${his} birthday with great anticipation due to old world tradition.`);
@@ -317,34 +292,33 @@ App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt} =
r.push(`and many in the arcology are already looking forward to ${his} birthday with great anticipation.`);
}
} else if(slave.actualAge === V.idealAge && slave.visualAge !== V.idealAge) {
- r.push(`${He} is ${slave.actualAge}, a fact that many in the arcology find appealing `);
+ r.push(`${He} is ${slave.actualAge}, a fact that many in the arcology find appealing`);
if(V.idealAge === 18) {
- r.push(`because of old world tradition, `);
+ r.push(`because of old world tradition,`);
}
r.push(`but due to ${his} appearing to be ${slave.visualAge}, there is less enthusiasm for ${him} than there might otherwise be.`);
}
*/
- $(p).append(r.join(" "));
-
if (V.showScores !== 0) {
- p.append(` Currently, ${he} has an `);
+ r.push(`Currently, ${he} has an`);
// Beauty
- App.UI.DOM.appendNewElement("span", p, `attractiveness score `, ["pink", "bold"]);
- App.UI.DOM.appendNewElement("span", p, `of `, ["pink"]);
- p.append(BeautyTooltip(slave), ` and a `);
+ r.push(App.UI.DOM.makeElement("span", `attractiveness score`, ["pink", "bold"]));
+ r.push(App.UI.DOM.makeElement("span", `of`, ["pink"]));
+ r.push(BeautyTooltip(slave), `and a`);
// Fresult
- App.UI.DOM.appendNewElement("span", p, `sexual score `, ["lightcoral", "bold"]);
- App.UI.DOM.appendNewElement("span", p, `of `, ["lightcoral"]);
- p.append(FResultTooltip(slave), App.UI.DOM.makeElement("span", `.`, ["lightcoral"]));
+ r.push(App.UI.DOM.makeElement("span", `sexual score`, ["lightcoral", "bold"]));
+ r.push(App.UI.DOM.makeElement("span", `of`, ["lightcoral"]));
+ r.push(App.UI.DOM.combineNodes(FResultTooltip(slave), App.UI.DOM.makeElement("span", `.`, ["lightcoral"])));
+
+ if (slave.assignment === Job.BODYGUARD || V.cheatMode || V.debugMode) {
+ r.push(`${His} deadliness is`, App.UI.DOM.combineNodes(DeadlinessTooltip(slave), "."));
+ }
}
- el.appendChild(p);
- p = document.createElement('p');
- p.className = "indent";
- r = [];
+ r.toParagraph();
r.push(App.Desc.limbs(slave));
@@ -368,15 +342,25 @@ App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt} =
const wins = slave.counter.pitWins;
const losses = slave.counter.pitLosses;
- r.push(`${He} has participated in ${num(wins + losses)} pit fights,`);
+ r.push(`${He} has participated in ${numberWithPluralOne(wins + losses, "pit fight")},`);
if (wins > 0) {
if (losses > 0) {
r.push(`with ${numberWithPluralOne(wins, "win")} and ${numberWithPluralOne(losses, "loss", "losses")}.`);
} else {
- r.push(`${wins > 2 ? `all of ` : `both of `}which ${he} won.`);
+ if (wins > 2) {
+ r.push(`all of`);
+ } else if (wins > 1) {
+ r.push(`both of`);
+ } // omit for wins === 1
+ r.push(`which ${he} won.`);
}
} else {
- r.push(`${losses > 2 ? `all of ` : `both of `}which ${he} lost.`);
+ if (losses > 2) {
+ r.push(`all of`);
+ } else if (losses > 1) {
+ r.push(`both of`);
+ } // omit for losses === 1
+ r.push(`which ${he} lost.`);
}
}
@@ -399,7 +383,7 @@ App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt} =
}
let scarCounter = 0;
- const scars = App.Medicine.Modification.scarRecord(slave)
+ const scars = App.Medicine.Modification.scarRecord(slave);
for (let scarName in scars) {
if (slave.ID === V.BodyguardID && scarCounter > 1) {
r.push(`${His} scars make ${him} look even more menacing than ${he} actually is.`);
@@ -430,7 +414,7 @@ App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt} =
r.push(`forcing inferior slaves into the tanning beds with ${him} so ${he} can sodomize them while ${he} tans.`);
} else if (slave.fetish === "dom") {
r.push(`bringing other slaves into the tanning beds with ${him} so ${he} can fuck them while ${he} tans.`);
- } else if ((slave.fetish === "masochist") || (slave.fetish === "submissive")) {
+ } else if ((slave.fetish === "masochist") || (slave.fetish === Fetish.SUBMISSIVE)) {
r.push(`letting other slaves into the tanning beds with ${him} so they can fuck ${him} while ${he} tans.`);
} else if (slave.fetish === "boobs") {
r.push(`bringing other slaves into the tanning beds with ${him} so ${he} can tittyfuck them while ${he} tans.`);
@@ -527,27 +511,22 @@ App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt} =
}
}
- $(p).append(r.join(` `));
- p.append(` `);
-
if (slave.voice === 0) {
- p.append(`${He} is `, App.UI.DOM.makeElement('span', "completely silent,", "pink"));
- p.append(` which is understandable, since ${he}'s `, App.UI.DOM.makeElement("span", "mute. ", "red"));
+ r.push(`${He} is`, App.UI.DOM.makeElement('span', "completely silent,", "pink"));
+ r.push(`which is understandable, since ${he}'s`, App.UI.DOM.makeElement("span", "mute.", "red"));
} else if (slave.lips > 95) {
- p.append(`${He} is `, App.UI.DOM.makeElement('span', "effectively mute,", "pink"));
- p.append(` since ${his} lips are so large that ${he} can no longer speak intelligibly. ${He} can still `);
+ r.push(`${He} is`, App.UI.DOM.makeElement('span', "effectively mute,", "pink"));
+ r.push(`since ${his} lips are so large that ${he} can no longer speak intelligibly. ${He} can still`);
if (slave.devotion > 50) {
- p.append(`moan `);
+ r.push(`moan`);
} else if (slave.devotion > 20) {
- p.append(`whimper `);
+ r.push(`whimper`);
} else {
- p.append(`scream `);
+ r.push(`scream`);
}
- p.append(`through them, though. `);
+ r.push(`through them, though.`);
}
- r = [];
-
if (V.showBodyMods === 1) {
if (slave.fuckdoll > 0) {
if (slave.piercing.ear.weight + slave.piercing.eyebrow.weight + slave.piercing.nose.weight > 0) {
@@ -612,67 +591,61 @@ App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt} =
r.push(App.Desc.mods(slave, "hand"));
r.push(App.Desc.mods(slave, "wrist"));
- $(p).append(r.join(` `));
- p.append(` `);
-
if (slave.fuckdoll === 0) {
if (slave.minorInjury !== 0) {
if (slave.minorInjury !== "sore ass") {
- p.append(`${He} is sporting a `);
+ r.push(`${He} is sporting a`);
span = document.createElement('span');
span.className = "red";
- span.textContent = `${slave.minorInjury}, `;
- p.appendChild(span);
- p.append(` covered by makeup. `);
+ span.textContent = `${slave.minorInjury},`;
+ r.push(span);
+ r.push(`covered by makeup.`);
}
}
}
if (slave.health.illness > 0) {
if (slave.fuckdoll === 0) {
- p.append(`${He} `);
+ r.push(`${He}`);
} else {
- p.append(`${His} suit reports that ${he} `);
+ r.push(`${His} suit reports that ${he}`);
}
span = document.createElement('span');
if (slave.health.illness === 1) {
if (slave.fuckdoll === 0) {
- p.append(`is `);
+ r.push(`is`);
span.className = "red";
- span.textContent = `feeling under the weather. `;
- p.appendChild(span);
+ span.textContent = `feeling under the weather.`;
+ r.push(span);
} else {
- p.append(`has `);
+ r.push(`has`);
span.className = "red";
- span.textContent = `fallen ill. `;
- p.appendChild(span);
+ span.textContent = `fallen ill.`;
+ r.push(span);
}
} else if (slave.health.illness === 2) {
- p.append(`is `);
+ r.push(`is`);
span.className = "red";
- span.textContent = `somewhat ill. `;
- p.appendChild(span);
+ span.textContent = `somewhat ill.`;
+ r.push(span);
} else if (slave.health.illness === 3) {
- p.append(`is `);
+ r.push(`is`);
span.className = "red";
- span.textContent = `sick. `;
- p.appendChild(span);
+ span.textContent = `sick.`;
+ r.push(span);
} else if (slave.health.illness === 4) {
- p.append(`is `);
+ r.push(`is`);
span.className = "red";
- span.textContent = `very sick. `;
- p.appendChild(span);
+ span.textContent = `very sick.`;
+ r.push(span);
} else if (slave.health.illness === 5) {
- p.append(`is `);
+ r.push(`is`);
span.className = "red";
- span.textContent = `terribly ill. `;
- p.appendChild(span);
+ span.textContent = `terribly ill.`;
+ r.push(span);
}
}
- el.appendChild(p);
- p = document.createElement("p");
- p.className = "indent";
- r = [];
+ r.toParagraph();
// Calling all boob widgets
r.push(App.Desc.boobs(slave, descType));
r.push(App.Desc.boobsShape(slave));
@@ -680,7 +653,7 @@ App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt} =
r.push(App.Desc.mods(slave, "chest"));
r.push(App.Desc.mods(slave, "breast"));
r.push(App.Desc.shoulders(slave));
- if (slave.appendages !== "none" || slave.wingsShape !== "none"){
+ if (slave.appendages !== "none" || slave.wingsShape !== "none") {
r.push(App.Desc.upperBack(slave));
}
r.push(App.Desc.nipples(slave, descType));
@@ -691,28 +664,22 @@ App.Desc.longSlave = function(slave, {descType, market = 0, marketText, noArt} =
r.push(App.Desc.mods(slave, "belly"));
r.push(App.Desc.butt(slave, descType));
- $(p).append(r.join(` `));
- el.appendChild(p);
-
- p = document.createElement("p");
- p.className = "indent";
- r = [];
+ r.toParagraph();
r.push(App.Desc.crotch(slave, descType));
r.push(App.Desc.dick(slave, descType));
r.push(App.Desc.vagina(slave));
r.push(App.Desc.anus(slave, descType));
- $(p).append(r.join(` `));
- el.appendChild(p);
+ r.toParagraph();
if (slave.fuckdoll === 0) {
- p = document.createElement("p");
- p.className = "indent";
- $(p).append(App.Desc.drugs(slave));
- el.appendChild(p);
+ r.push(App.Desc.drugs(slave));
+ r.toParagraph();
}
+ el.append(r.container());
+
// clear sale and law flags, if set
return el;
diff --git a/src/npc/descriptions/mind.js b/src/npc/descriptions/mind.js
index 76512280e1fc90ef58b528fff325e1a1c875656c..7670acdd28fb8c653908ae6535f3efff2328cbb6 100644
--- a/src/npc/descriptions/mind.js
+++ b/src/npc/descriptions/mind.js
@@ -11,7 +11,7 @@ App.Desc.mind = function(slave, descType) {
if (slave.fuckdoll === 0) {
r.push(App.Desc.eyes(slave, descType));
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`<span class="coral">${His} mind is fundamentally broken;</span> everything ${he} experiences will quickly be forgotten.`);
} else {
r.push(behavioralFlaws());
@@ -412,6 +412,10 @@ App.Desc.mind = function(slave, descType) {
break;
case "breeder":
r.push(`${He}'s <span class="yellow">obsessed with being bred</span> to the point of fetishizing pregnancy itself as much as any act that leads to it.`);
+ break;
+ case "animal lover":
+ r.push(`${He}'s an exclusive <span class="yellow">zoophile:</span> ${he} prefers sex with animals to sex with other humans.`);
+ break;
}
return r.join(" ");
}
@@ -552,8 +556,18 @@ App.Desc.mind = function(slave, descType) {
r.push(`${He} <span class="lightcoral">doesn't mind pain,</span> and shows some masochistic tendencies.`);
}
break;
+ case Fetish.BESTIALITY:
+ if (slave.fetishStrength > 95) {
+ r.push(`${He} has a <span class="lightcoral">bestiality fetish,</span> and prefers animal cocks to human ones.`);
+ } else if (slave.fetishStrength > 60) {
+ r.push(`${He} <span class="lightcoral">is aroused by the mere thought of fucking an animal.</span>`);
+ } else {
+ r.push(`${He} has a <span class="lightcoral">bestiality fetish,</span> and enjoys fucking animals.`);
+ }
+ break;
default:
r.push(`${His} sexual tastes are <span class="pink">quite normal.</span>`);
+ break;
}
} else {
r.push(`${His} fetishes, if any, are not known to you.`);
diff --git a/src/npc/descriptions/relationRival.js b/src/npc/descriptions/relationRival.js
index 68650051dd28a3ea874131233ae4f977416fff9c..bfda67478e96cd0bd38b21d9274eb4ee2433f87f 100644
--- a/src/npc/descriptions/relationRival.js
+++ b/src/npc/descriptions/relationRival.js
@@ -1,45 +1,71 @@
/**
* @param {App.Entity.SlaveState} slave
- * @returns {string}
+ * @param {boolean} links
+ * @returns {Array<string|HTMLElement|DocumentFragment>}
*/
-App.Desc.relationRival = function(slave) {
+App.Desc.relationRival = function(slave, links) {
const r = [];
const {
his, He
} = getPronouns(slave);
- r.push(relative());
- r.push(rival());
+ r.push(...relative());
+ r.push(...rival());
- return r.join(" ");
+ return r;
+ /**
+ * @returns {Array<string|HTMLElement>}
+ */
function relative() {
if (slave.relationship >= 3 && totalRelatives(slave) > 0) {
const lover = getSlave(slave.relationshipTarget);
if (lover) {
if (relativeTerm(slave, lover) !== null) {
- return `${He} is in an <span class="lightgreen">incestuous relationship with ${his} ${relativeTerm(slave, lover)}, ${SlaveFullName(lover)}.</span>`;
+ const s = [];
+ s.push(`${He} is in an`);
+ const span = App.UI.DOM.makeElement("span", `incestuous relationship with ${his} ${relativeTerm(slave, lover)}, `, ["si-family"]);
+ span.append(slaveReference(lover), ".");
+ s.push(span);
+ return s;
}
}
} else if (slave.relationship <= -2) {
if (relativeTerm(slave, V.PC) !== null) {
- return `${He} is in an <span class="lightgreen">incestuous relationship with ${his} ${relativeTerm(slave, V.PC)}, you.</span>`;
+ return [`${He} is in an <span class="si-family">incestuous relationship with ${his} ${relativeTerm(slave, V.PC)}, you.</span>`];
}
}
+ return [];
}
+ /**
+ * @returns {Array<string|HTMLElement|DocumentFragment>}
+ */
function rival() {
if (slave.rivalry !== 0) {
if (getSlave(slave.rivalryTarget)) {
if (slave.rivalry <= 1) {
- return `${He} <span class="lightsalmon">dislikes</span> ${SlaveFullName(getSlave(slave.rivalryTarget))}.`;
+ return [`${He} <span class="si-rival">dislikes</span>`, App.UI.DOM.combineNodes(slaveReference(getSlave(slave.rivalryTarget)), `.`)];
} else if (slave.rivalry <= 2) {
- return `${He} is ${SlaveFullName(getSlave(slave.rivalryTarget))}'s <span class="lightsalmon">rival.</span>`;
+ return [`${He} is`, App.UI.DOM.combineNodes(slaveReference(getSlave(slave.rivalryTarget)), `'s`), `<span class="si-rival">rival.</span>`];
} else {
- return `${He} <span class="lightsalmon">bitterly hates</span> ${SlaveFullName(getSlave(slave.rivalryTarget))}.`;
+ return [`${He} <span class="si-rival">bitterly hates</span>`, App.UI.DOM.combineNodes(slaveReference(getSlave(slave.rivalryTarget)), `.`)];
}
}
}
+ return [];
+ }
+
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string|HTMLSpanElement}
+ */
+ function slaveReference(slave) {
+ if (links) {
+ return App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave));
+ } else {
+ return SlaveFullName(slave);
+ }
}
};
diff --git a/src/npc/descriptions/sceneIntro.js b/src/npc/descriptions/sceneIntro.js
index 76bd52bc258e95bdd2d36ba3300b4997bd1edb42..3783ed6beff816f70d402a82dde8477b87079ca2 100644
--- a/src/npc/descriptions/sceneIntro.js
+++ b/src/npc/descriptions/sceneIntro.js
@@ -1,20 +1,23 @@
/**
* @param {App.Entity.SlaveState} slave
* @param {DescType} descType
- * @returns {string}
+ * @param {boolean} links
+ * @returns {Array<string|HTMLElement>}
*/
-App.Desc.sceneIntro = function(slave, descType) {
+App.Desc.sceneIntro = function(slave, descType, links) {
+ /** @type {Array<string|HTMLElement>} */
const r = [];
const {
he, him, his, He, His, himself, wife
} = getPronouns(slave);
+ const relTarget = slave.relationship > 0 ? getSlave(slave.relationshipTarget) : null;
if (descType === DescType.EVENT) {
r.push(`${He} is currently involved in an event, but is assigned to ${slave.assignment}.`);
if (slave.assignment === Job.SUBORDINATE) {
let lsd = getSlave(slave.subTarget);
if (lsd) {
- r.push(`${He} has been ordered to serve <span class="slave name simple">${SlaveFullName(lsd)}</span> specifically.`);
+ r.push(`${He} has been ordered to serve`, App.UI.DOM.makeElement("span", slaveReference(lsd), ["slave", "name", "simple"]), `specifically.`);
}
}
} else if (descType !== DescType.MARKET) {
@@ -27,12 +30,12 @@ App.Desc.sceneIntro = function(slave, descType) {
r.push(voice());
}
}
- r.push(relationship());
+ r.push(...relationship());
if (slave.fuckdoll === 0) {
r.push(sleepLoc());
}
}
- return r.join(" ");
+ return r;
function inspectionIntro() {
const r = [];
@@ -193,9 +196,11 @@ App.Desc.sceneIntro = function(slave, descType) {
}
function relationship() {
+ /** @type {Array<string|HTMLElement>} */
const r = [];
+
if (slave.relationship === -3) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is <span class="relationship">married to you,</span> not that it matters to ${his} broken mind; to ${him}, ${he} is a slave, nothing more.`);
} else if (slave.devotion + slave.trust >= 175) {
r.push(`${He} is <span class="relationship">happily married to you,</span> though of course ${he} is still your slave; albeit a loving, devoted one.`);
@@ -210,52 +215,49 @@ App.Desc.sceneIntro = function(slave, descType) {
r.push(`${He} is an <span class="relationship">emotional slut,</span> happy to remain officially single and free to treat everyone equally.`);
} else if (slave.relationship === -2) {
r.push(`${He} is <span class="relationship">emotionally bound to you;</span> ${his} feelings for you are comparable to those in a healthy, loving relationship.`);
- } else if (slave.relationship !== 0) {
- let lsd = getSlave(slave.relationshipTarget);
- if (lsd) {
- r.push(`${He} is`);
- // TODO: update this with the new relationship rules
- if (slave.relationship <= 1) {
- r.push(`<span style="font-weight:bold" class="relationship">friends with ${SlaveFullName(lsd)};</span> the rules`);
- if (slave.rules.relationship !== "restrictive") {
- r.push(`encourage`);
- } else {
- r.push(`discourage`);
- }
- r.push(`their relationship.`);
- } else if (slave.relationship <= 2) {
- r.push(`<span style="font-weight:bold" class="relationship">best friends with ${SlaveFullName(lsd)};</span> the rules`);
- if (slave.rules.relationship !== "restrictive") {
- r.push(`encourage`);
- } else {
- r.push(`discourage`);
- }
- r.push(`their close relationship.`);
- } else if (slave.relationship <= 3) {
- r.push(`<span style="font-weight:bold" class="relationship">${SlaveFullName(lsd)}'s friend with benefits;</span> the rules`);
- if (slave.rules.relationship === "permissive") {
- r.push(`encourage`);
- } else {
- r.push(`discourage`);
- }
- r.push(`their sexual relationship.`);
- } else if (slave.relationship <= 4) {
- r.push(`<span style="font-weight:bold" class="relationship">${SlaveFullName(lsd)}'s lover;</span> the rules`);
- if (slave.rules.relationship === "permissive") {
- r.push(`encourage`);
- } else {
- r.push(`discourage`);
- }
- r.push(`their passionate relationship.`);
- } else if (slave.relationship > 4) {
- r.push(`<span style="font-weight:bold" class="relationship">${SlaveFullName(lsd)}'s slave ${wife};</span> the rules`);
- if (slave.rules.relationship === "permissive") {
- r.push(`encourage`);
- } else {
- r.push(`discourage`);
- }
- r.push(`marital bliss.`);
+ } else if (slave.relationship !== 0 && relTarget) {
+ r.push(`${He} is`);
+ // TODO: update this with the new relationship rules
+ if (slave.relationship <= 1) {
+ r.push(slaveRelationshipSpan(`friends with `, slaveReference(relTarget), `;`), `the rules`);
+ if (slave.rules.relationship !== "restrictive") {
+ r.push(`encourage`);
+ } else {
+ r.push(`discourage`);
}
+ r.push(`their relationship.`);
+ } else if (slave.relationship <= 2) {
+ r.push(slaveRelationshipSpan(`best friends with `, slaveReference(relTarget), `;`), `the rules`);
+ if (slave.rules.relationship !== "restrictive") {
+ r.push(`encourage`);
+ } else {
+ r.push(`discourage`);
+ }
+ r.push(`their close relationship.`);
+ } else if (slave.relationship <= 3) {
+ r.push(slaveRelationshipSpan(slaveReference(relTarget), `'s friend with benefits;`), `the rules`);
+ if (slave.rules.relationship === "permissive") {
+ r.push(`encourage`);
+ } else {
+ r.push(`discourage`);
+ }
+ r.push(`their sexual relationship.`);
+ } else if (slave.relationship <= 4) {
+ r.push(slaveRelationshipSpan(slaveReference(relTarget), `'s lover;`), `the rules`);
+ if (slave.rules.relationship === "permissive") {
+ r.push(`encourage`);
+ } else {
+ r.push(`discourage`);
+ }
+ r.push(`their passionate relationship.`);
+ } else if (slave.relationship > 4) {
+ r.push(slaveRelationshipSpan(slaveReference(relTarget), `'s slave ${wife};`), `the rules`);
+ if (slave.rules.relationship === "permissive") {
+ r.push(`encourage`);
+ } else {
+ r.push(`discourage`);
+ }
+ r.push(`marital bliss.`);
}
} else if (slave.fuckdoll === 0) {
if (slave.rules.relationship === "restrictive") {
@@ -269,7 +271,18 @@ App.Desc.sceneIntro = function(slave, descType) {
}
}
- return r.join(" ");
+ return r;
+ }
+
+ /**
+ * @param {Array<string|HTMLElement>} parts
+ * @returns {HTMLSpanElement}
+ */
+ function slaveRelationshipSpan(...parts) {
+ const span = document.createElement("span");
+ span.classList.add("si-relationship");
+ span.append(...parts);
+ return span;
}
function sleepLoc() {
@@ -287,12 +300,13 @@ App.Desc.sceneIntro = function(slave, descType) {
r.push(`${He} sleeps on a bedroll,`);
} else if (slave.rules.living === "normal") {
r.push(`${He} sleeps on a cot,`);
- } else if (slave.relationship >= 4) {
+ } else if (slave.relationship >= 4 && relTarget) {
+ const {wife2, girl2} = getPronouns(relTarget).appendSuffix('2');
r.push(`${He} has ${his} own room, which ${he} shares with ${his}`);
if (slave.relationship === 5) {
- r.push(wife);
+ r.push(wife2);
} else {
- r.push(`${getPronouns(slave).girl}friend`);
+ r.push(`${girl2}friend`);
}
r.push(`whenever they can manage it,`);
} else {
@@ -302,4 +316,16 @@ App.Desc.sceneIntro = function(slave, descType) {
return r.join(" ");
}
+
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string|HTMLSpanElement}
+ */
+ function slaveReference(slave) {
+ if (links) {
+ return App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave));
+ } else {
+ return SlaveFullName(slave);
+ }
+ }
};
diff --git a/src/npc/descriptions/style/clothing.js b/src/npc/descriptions/style/clothing.js
index c097854bba87f034a591dbc5543dd735df45e6c6..2955b378133624c3aebf3da7e393b6742fe5e30d 100644
--- a/src/npc/descriptions/style/clothing.js
+++ b/src/npc/descriptions/style/clothing.js
@@ -320,7 +320,7 @@ App.Desc.clothing = function(slave) {
r.push(`"BUTTSLUT" across the front in capital letters.`);
} else if (slave.fetish === "cumslut" && slave.fetishStrength > 95 && slave.fetishKnown === 1) {
r.push(`"CUMSLUT" across the front in capital letters.`);
- } else if (slave.fetish === "submissive" && slave.fetishStrength > 95 && slave.fetishKnown === 1) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 95 && slave.fetishKnown === 1) {
r.push(`"SUB" on the front in capital letters.`);
} else if (slave.fetish === "sadist" && slave.fetishStrength > 95 && slave.fetishKnown === 1) {
r.push(`"AWFUL BITCH" on the front in capital letters.`);
@@ -796,9 +796,9 @@ App.Desc.clothing = function(slave) {
r.push(`golden whip and manacles insignia of a senior slave officer,`);
} else if ((slave.ID === V.MadamID) || (slave.ID === V.NurseID) || (slave.ID === V.AttendantID) || (slave.ID === V.MatronID) || (slave.ID === V.djID) || (slave.ID === V.MilkmaidID) || (slave.ID === V.FarmerID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.WardenessID)) {
r.push(`golden manacles insignia of a junior slave officer,`);
- } else if ((slave.skill.combat > 0) && getLimbCount(slave, 105) > 0) {
+ } else if ((slave.skill.combat > 60) && getLimbCount(slave, 105) > 0) {
r.push(`silver spear and manacles insignia of an augmented slave soldier,`);
- } else if ((slave.skill.combat > 0) && !isAmputee(slave)) {
+ } else if ((slave.skill.combat > 60) && !isAmputee(slave)) {
r.push(`silver manacles insignia of a slave soldier,`);
} else {
r.push(`black iron manacles insignia of a slave,`);
@@ -818,9 +818,9 @@ App.Desc.clothing = function(slave) {
r.push(`golden whip and manacles insignia of a senior slave officer,`);
} else if ((slave.ID === V.MadamID) || (slave.ID === V.NurseID) || (slave.ID === V.AttendantID) || (slave.ID === V.MatronID) || (slave.ID === V.djID) || (slave.ID === V.MilkmaidID) || (slave.ID === V.FarmerID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.WardenessID)) {
r.push(`golden manacles insignia of a junior slave officer,`);
- } else if ((slave.skill.combat > 0) && getLimbCount(slave, 105) > 0) {
+ } else if ((slave.skill.combat > 60) && getLimbCount(slave, 105) > 0) {
r.push(`silver spear and manacles insignia of an augmented slave soldier,`);
- } else if ((slave.skill.combat > 0) && !isAmputee(slave)) {
+ } else if ((slave.skill.combat > 60) && !isAmputee(slave)) {
r.push(`silver manacles insignia of a slave soldier,`);
} else {
r.push(`black iron manacles insignia of a slave,`);
@@ -840,9 +840,9 @@ App.Desc.clothing = function(slave) {
r.push(`golden whip and manacles insignia of a senior slave officer,`);
} else if ((slave.ID === V.MadamID) || (slave.ID === V.NurseID) || (slave.ID === V.AttendantID) || (slave.ID === V.MatronID) || (slave.ID === V.djID) || (slave.ID === V.MilkmaidID) || (slave.ID === V.FarmerID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.WardenessID)) {
r.push(`golden manacles insignia of a junior slave officer,`);
- } else if ((slave.skill.combat > 0) && getLimbCount(slave, 105) > 0) {
+ } else if ((slave.skill.combat > 60) && getLimbCount(slave, 105) > 0) {
r.push(`silver spear and manacles insignia of an augmented slave soldier,`);
- } else if ((slave.skill.combat > 0) && !isAmputee(slave)) {
+ } else if ((slave.skill.combat > 60) && !isAmputee(slave)) {
r.push(`silver manacles insignia of a slave soldier,`);
} else {
r.push(`black iron manacles insignia of a slave,`);
@@ -862,9 +862,9 @@ App.Desc.clothing = function(slave) {
r.push(`golden whip and manacles insignia of a senior slave officer,`);
} else if ((slave.ID === V.MadamID) || (slave.ID === V.NurseID) || (slave.ID === V.AttendantID) || (slave.ID === V.MatronID) || (slave.ID === V.djID) || (slave.ID === V.MilkmaidID) || (slave.ID === V.FarmerID) || (slave.ID === V.StewardessID) || (slave.ID === V.SchoolteacherID) || (slave.ID === V.WardenessID)) {
r.push(`golden manacles insignia of a junior slave officer,`);
- } else if ((slave.skill.combat > 0) && getLimbCount(slave, 105) > 0) {
+ } else if ((slave.skill.combat > 60) && getLimbCount(slave, 105) > 0) {
r.push(`silver spear and manacles insignia of an augmented slave soldier,`);
- } else if ((slave.skill.combat > 0) && !isAmputee(slave)) {
+ } else if ((slave.skill.combat > 60) && !isAmputee(slave)) {
r.push(`silver manacles insignia of a slave soldier,`);
} else {
r.push(`black iron manacles insignia of a slave,`);
diff --git a/src/npc/descriptions/style/collar.js b/src/npc/descriptions/style/collar.js
index 95d8e02e1b46ba57a36a1815d9069de60bbb0d06..b449d663d675f56255d768097cbd57396fc2509f 100644
--- a/src/npc/descriptions/style/collar.js
+++ b/src/npc/descriptions/style/collar.js
@@ -24,8 +24,6 @@ App.Desc.collar = function(slave) {
if (pregCollar === 1) {
if (slave.pregWeek < 0) {
r.push(`"I'm a mommy now!"`);
- } else if (slave.pregKnown === 0) {
- r.push(`"Knock me up!"`);
} else if (slave.pregKnown === 1) {
if (slave.pregType === 1) {
r.push(`"1 baby`);
@@ -33,11 +31,19 @@ App.Desc.collar = function(slave) {
r.push(`"${slave.pregType} babies`);
}
r.push(`on board!"`);
+ } else if (isFertile(slave)) {
+ r.push(`"Knock me up!"`);
+ } else if (slave.vagina < 0 && slave.mpreg < 1) {
+ r.push(`"Womb not detected!"`);
+ } else if ((slave.ovaries > 0 || slave.mpreg > 0) && slave.pubertyXX === 0 && slave.physicalAge < V.fertilityAge) {
+ r.push(`"I'm not old enough to get pregnant yet!"`);
} else {
r.push(`"I'm infertile!"`);
}
} else if (pregCollar === 2) {
- if (slave.pregWeek < 0) {
+ if (slave.vagina < 0 && slave.mpreg < 1) {
+ r.push(`"I have no womb!"`);
+ } else if (slave.pregWeek < 0) {
r.push(`"${num(slave.pregWeek * -1)}`);
if (slave.pregWeek === -1) {
r.push(`week`);
@@ -47,42 +53,67 @@ App.Desc.collar = function(slave) {
r.push(`until I can get preggers again!"`);
} else if (slave.pregKnown === 1) {
if (slave.broodmother === 2) {
- if (slave.preg > 37) {
+ if (slave.preg >= 36) {
r.push(`"I'm crowning as you read this!"`);
} else {
- r.push(`"${38 - Math.ceil(slave.preg)} weeks till I pop!"`);
+ r.push(`"${37 - Math.ceil(slave.preg)} ${37 - Math.ceil(slave.preg) > 1 ? `weeks` : `week`} till the floodgates open!"`);
}
} else if (slave.broodmother === 1) {
- r.push(`"${38 - Math.ceil(slave.preg)} weeks till I pop!"`);
+ if (slave.preg >= 36) {
+ r.push(`"I'll be giving birth this week!"`);
+ } else {
+ r.push(`"${37 - Math.ceil(slave.preg)} ${37 - Math.ceil(slave.preg) > 1 ? `weeks` : `week`} till the birthing begins!"`);
+ }
+ } else if (slave.preg > 40) {
+ r.push(`"I'm ${Math.ceil(slave.preg) - 40} ${Math.ceil(slave.preg) - 40 > 1 ? `weeks` : `week`} overdue!"`);
+ } else if (slave.preg > 39) {
+ r.push(`"I'm due this week!"`);
} else {
- r.push(`"${40 - Math.ceil(slave.preg)} weeks till I pop!"`);
+ r.push(`"${40 - Math.ceil(slave.preg)} ${40 - Math.ceil(slave.preg) > 1 ? `weeks` : `week`} till I pop!"`);
}
- } else {
+ } else if (isFertile(slave)) {
r.push(`"My womb needs filling!"`);
+ } else if ((slave.ovaries > 0 || slave.mpreg > 0) && slave.pubertyXX === 0) {
+ r.push(`"I should be fertile`);
+ if (slave.pubertyAgeXX - slave.physicalAge > 2) {
+ r.push(`in about ${Math.round(slave.pubertyAgeXX - slave.physicalAge)} years!"`);
+ } else if (slave.pubertyAgeXX - slave.physicalAge > 1) {
+ r.push(`next year!"`);
+ } else {
+ r.push(`in about ${Math.ceil((slave.pubertyAgeXX * 52 - (slave.physicalAge * 52 + slave.birthWeek)))} weeks!"`);
+ }
+ } else {
+ r.push(`"I can't get pregnant right now!"`);
}
} else {
- if (slave.pregWeek < 0) {
+ if (slave.vagina < 0 && slave.mpreg < 1) {
+ r.push(`"I need a womb!"`);
+ } else if (slave.pregWeek < 0) {
r.push(`"I can't wait for my belly to swell with life again!"`);
- } else if (slave.pregKnown === 0) {
+ } else if (slave.pregKnown === 1) {
+ if (slave.pregSource === -1) {
+ r.push(`"Womb claimed by my ${getWrittenTitle(slave)}!"`);
+ } else if (slave.pregSource === 0 || slave.pregSource === -2 || slave.pregSource === -5) {
+ r.push(`"Baby made by slutting around!"`);
+ } else if (slave.pregSource === -7) {
+ r.push(`"My baby was made with science!"`);
+ } else if (slave.pregSource === -9) {
+ r.push(`"Futanari Sisters, now two for the price of one!"`);
+ } else {
+ r.push(`"Womb claimed by ${daddy}!"`);
+ }
+ } else if (isFertile(slave)) {
r.push(`"Put a baby in me today!"`);
- } else if (slave.pregSource === -1) {
- r.push(`"Womb claimed by my ${getWrittenTitle(slave)}!"`);
- } else if (slave.pregSource === 0 || slave.pregSource === -2 || slave.pregSource === -5) {
- r.push(`"Baby made by slutting around!"`);
- } else if (slave.pregSource === -7) {
- r.push(`"My baby was made with science!"`);
- } else if (slave.pregSource === -9) {
- r.push(`"Futanari Sisters, now two for the price of one!"`);
- } else if (slave.pregSource > 0) {
- r.push(`"Womb claimed by ${daddy}!"`);
+ } else if ((slave.ovaries > 0 || slave.mpreg > 0) && slave.pubertyXX === 0 && slave.physicalAge < V.fertilityAge) {
+ r.push(`"I'm too young to get pregnant!"`);
} else {
- r.push(`"Put a baby in me today!"`);
+ r.push(`"Try to knock me up some other time!"`);
}
}
}
break;
case "silk ribbon":
- r.push(`${He} is wearing a tight silk ribbon fitted to ${his} neck, it is oddly elegant.`);
+ r.push(`${He} is wearing a tight silk ribbon fitted to ${his} neck; it is oddly elegant.`);
break;
case "tight steel":
r.push(`${He} is wearing a tight steel collar whose restricting metal touch ${he} cannot escape.`);
diff --git a/src/npc/descriptions/style/hairClothing.js b/src/npc/descriptions/style/hairClothing.js
index b99b8a5b518f9c583e6138b88b65871fa2e90aca..1e49e206b15c4780ab2eef6446c2cd2977c45438 100644
--- a/src/npc/descriptions/style/hairClothing.js
+++ b/src/npc/descriptions/style/hairClothing.js
@@ -3880,7 +3880,7 @@ App.Desc.hairClothing = function(slave) {
r.push(`is permed, and back in a big, long ponytail tied with a scrunchy in noxious 80's pastel colors.`);
break;
case "a slutty qipao":
- r.push(`is back in short ponytail secured by jade rings etched with images of`);
+ r.push(`is back in a short ponytail secured by jade rings etched with images of`);
r.push(App.Desc.image(slave));
break;
case "spats and a tank top":
@@ -3890,14 +3890,14 @@ App.Desc.hairClothing = function(slave) {
r.push(`is tied into a small ponytail, that leaves ${his} short hair to wave in the wind.`);
break;
case "a kimono":
- r.push(`is in short ponytail secured by ivory combs carved with images of`);
+ r.push(`is in a short ponytail secured by ivory combs carved with images of`);
r.push(App.Desc.image(slave));
break;
case "uncomfortable straps":
- r.push(`is back in short ponytail secured by leather ties.`);
+ r.push(`is back in a short ponytail secured by leather ties.`);
break;
case "shibari ropes":
- r.push(`is back in short ponytail secured with rope.`);
+ r.push(`is back in a short ponytail secured with rope.`);
break;
case "restrictive latex":
r.push(`sticks out of a hole in the back of ${his} latex hood.`);
diff --git a/src/npc/descriptions/upperBack.js b/src/npc/descriptions/upperBack.js
index a154d96894121f488b34bf35786db0f08bc36c2a..65bb30173d430b967d1795a26594ec15459166e9 100644
--- a/src/npc/descriptions/upperBack.js
+++ b/src/npc/descriptions/upperBack.js
@@ -40,7 +40,7 @@ App.Desc.upperBack = function(slave) {
} else if (slave.appendages === "kraken") {
r.push(`${he} has a set of eight, ${slave.appendagesColor} tentacles${slave.appendagesEffect === "none" ? `` : ` that have ${slave.appendagesEffect} on them`}. The tentacles are made of an advanced synthetic alloy. Being extremely durable in addition to very light, allows the tentacles to extend to thrice their original length. An built-in AI helps with combat, 3-dimensional maneuvering and appendage coordination.`);
} else if (slave.appendages === "sex") {
- r.push(`${he} has a set of eight, ${slave.appendagesColor} pleasure appendages${slave.appendagesEffect === "none" ? `` : ` that have ${slave.appendagesEffect} on them`}. The lithe appendages all have different shaped tips with vibration and lube dispensation built-in.`);
+ r.push(`${he} has a set of eight, ${slave.appendagesColor} pleasure appendages${slave.appendagesEffect === "none" ? `` : ` that have ${slave.appendagesEffect} on them`}. The lithe appendages all have different-shaped tips with vibration and lube dispensation built-in.`);
} else if (slave.appendages === "flight") {
r.push(`${he} has a pair of large, ${slave.appendagesColor} metallic wings${slave.appendagesEffect === "none" ? `` : ` that have ${slave.appendagesEffect} on them`}. Its durable frame, made of advanced materials, is sufficiently lightweight to allow its small thrusters to support flight while being strong enough to sustain structural integrity.`);
}
diff --git a/src/npc/descriptions/womb/pregnancy.js b/src/npc/descriptions/womb/pregnancy.js
index 4fddba9d0b3217321c2d4b7e2eb225526222bba5..1beb67819a43c2f375eef412e04e1e6febaa65cd 100644
--- a/src/npc/descriptions/womb/pregnancy.js
+++ b/src/npc/descriptions/womb/pregnancy.js
@@ -351,7 +351,7 @@ App.Desc.pregnancy = function(slave, descType = DescType.NORMAL) {
r.push(`${His} period is late.`);
}
if (slave.preg + 5 <= slave.pregWeek && slave.preg <= slave.pregData.normalBirth + 2 && slave.bellyPreg >= 100) {
- r.push(`Despite being pregnant for ${slave.pregWeek} weeks,`);
+ r.push(`Despite having been pregnant for ${slave.pregWeek} weeks,`);
if (slave.broodmother > 0) {
if (slave.broodmotherOnHold > 0) {
r.push(`${he} will be pregnant for another ${slave.broodmotherCountDown} weeks while ${his} remaining implant-induced pregnancies come to term.`);
@@ -391,7 +391,7 @@ App.Desc.pregnancy = function(slave, descType = DescType.NORMAL) {
if (slave.preg > slave.pregData.minLiveBirth && slave.preg >= slave.pregWeek + 10) {
r.push(`Even though ${he} is a mere ${slave.pregWeek} weeks along, ${his} pregnancy is at its end.`);
} else if (slave.preg >= slave.pregWeek + (slave.pregData.normalBirth / 2.66)) {
- r.push(`Despite being pregnant for only ${slave.pregWeek} weeks,`);
+ r.push(`Despite having been pregnant for only ${slave.pregWeek} weeks,`);
if (slave.preg === slave.pregWeek * 2) {
r.push(`${he} could shockingly pass for a girl twice as far along.`);
} else if (slave.preg === slave.pregWeek * 4) {
@@ -400,7 +400,7 @@ App.Desc.pregnancy = function(slave, descType = DescType.NORMAL) {
r.push(`${he} shockingly looks like a girl on ${his} ${ordinalSuffix(Math.round(slave.preg))} week of pregnancy.`);
}
} else if (slave.preg >= slave.pregWeek + (slave.pregData.normalBirth / 4)) {
- r.push(`Despite being pregnant for only ${slave.pregWeek} weeks,`);
+ r.push(`Despite having been pregnant for only ${slave.pregWeek} weeks,`);
if (slave.preg === slave.pregWeek * 2) {
r.push(`${he} could surprisingly pass for a girl twice as far along.`);
} else if (slave.preg === slave.pregWeek * 4) {
@@ -409,7 +409,7 @@ App.Desc.pregnancy = function(slave, descType = DescType.NORMAL) {
r.push(`${he} surprisingly looks like a girl on ${his} ${ordinalSuffix(Math.round(slave.preg))} week of pregnancy.`);
}
} else if (slave.preg >= slave.pregWeek + (slave.pregData.normalBirth / 8)) {
- r.push(`Despite being pregnant for only ${slave.pregWeek} weeks,`);
+ r.push(`Despite having been pregnant for only ${slave.pregWeek} weeks,`);
if (slave.preg === slave.pregWeek * 2) {
r.push(`${he} could pass for a girl twice as far along.`);
} else if (slave.preg === slave.pregWeek * 4) {
@@ -418,7 +418,7 @@ App.Desc.pregnancy = function(slave, descType = DescType.NORMAL) {
r.push(`${he} looks like a woman on ${his} ${ordinalSuffix(Math.round(slave.preg))} week of pregnancy.`);
}
} else {
- r.push(`Despite being pregnant for only ${slave.pregWeek} weeks, ${his} pregnancy is larger than anticipated.`);
+ r.push(`Despite having been pregnant for only ${slave.pregWeek} weeks, ${his} pregnancy is larger than anticipated.`);
}
}
if (slave.pregKnown === 1 && descType !== DescType.MARKET) {
diff --git a/src/npc/descriptions/womb/superfetation.js b/src/npc/descriptions/womb/superfetation.js
index f1841349f2e6cc05bd2836a0374bf4d2dd6a4cea..6fbf9674f3c15225b93c98c840fddf74a4a77a17 100644
--- a/src/npc/descriptions/womb/superfetation.js
+++ b/src/npc/descriptions/womb/superfetation.js
@@ -65,7 +65,7 @@ App.Desc.superfetation = function(slave, descType) {
r.push(`${was} fathered by ${daddyName(slaveWD.litterData[litCount][0].fatherID)}'s seed,`);
}
} else {
- r.push(`${is} too young to tell the father of,`);
+ r.push(`${is} too young to tell the father of.`);
}
}
}
diff --git a/src/npc/generate/generateGenetics.js b/src/npc/generate/generateGenetics.js
index 34bf7ae2de7bf37852983fea106d993339b591f4..07725c1cc7c2dcb8dfea1beb557fc74e082442ce 100644
--- a/src/npc/generate/generateGenetics.js
+++ b/src/npc/generate/generateGenetics.js
@@ -66,22 +66,10 @@ globalThis.generateGenetics = (function() {
}
if (actor2 > 0) {
father = V.genePool.find(s => s.ID === actor2);
- activeFather = getSlave(actor2);
+ activeFather = findFather(actor2);
if (father === undefined) {
father = activeFather;
}
- if (father === undefined) {
- if (V.incubator.capacity > 0) {
- father = V.incubator.tanks.find(s => s.ID === actor2);
- activeFather = 0; // activeFather = father?
- }
- }
- if (father === undefined) {
- if (V.nursery > 0) {
- father = V.cribs.find(s => s.ID === actor2);
- activeFather = 0; // activeFather = father?
- }
- }
if (father === undefined) {
father = 0;
activeFather = 0;
@@ -603,7 +591,7 @@ globalThis.generateGenetics = (function() {
} else {
fetish = jsEither(["none", "none", "none", "none", "none", mother.fetish, mother.fetish]);
}
- if (fetish === "mindbroken") { fetish = "none"; }
+ if (fetish === Fetish.MINDBROKEN) { fetish = "none"; }
return fetish;
}
@@ -1223,7 +1211,7 @@ globalThis.generateChild = function(mother, ovum, incubator = false) {
child.energy = 0;
child.anus = 0;
if (child.vagina > 0) { child.vagina = 0; }
- if (child.fetish !== "none") { child.fetishStrength = 20; }
+ if (child.fetish !== Fetish.NONE) { child.fetishStrength = 20; }
if (child.dick > 0) {
child.foreskin = 1;
child.balls = 1;
@@ -1312,33 +1300,14 @@ globalThis.generateChild = function(mother, ovum, incubator = false) {
function regenerateSurname(child) {
// clone case - copy surname from genetic origin
if (child.clone) {
- if (child.cloneID === -1) {
- child.slaveSurname = V.PC.slaveSurname;
- } else {
- const cloneSeed = getSlave(child.cloneID);
- if (cloneSeed !== undefined) {
- if (cloneSeed.slaveSurname !== 0 && cloneSeed.slaveSurname !== "") {
- child.slaveSurname = cloneSeed.slaveSurname;
- }
- }
+ const cloneSeed = getRelative(child.cloneID);
+ if (cloneSeed && nameOrNull(cloneSeed.slaveSurname)) {
+ child.slaveSurname = cloneSeed.slaveSurname;
}
return;
}
// non-clone case - build surname from parent surnames according to the arcology's universal rules
- function getMother() {
- if (child.mother === -1) {
- return V.PC;
- }
- return getSlave(child.mother);
- }
-
- function getFather() {
- if (child.father === -1) {
- return V.PC;
- }
- return getSlave(child.father);
- }
/** @param {FC.Zeroable<string>} name */
function nameOrNull(name) {
@@ -1365,8 +1334,8 @@ function regenerateSurname(child) {
}
}
- const father = getFather();
- const mother = getMother();
+ const father = getRelative(child.father);
+ const mother = getRelative(child.mother);
const fatherName = father ? nameOrNull(father.slaveName) : null;
const motherName = mother ? nameOrNull(mother.slaveName) : null;
diff --git a/src/npc/generate/generateLeadershipSlave.js b/src/npc/generate/generateLeadershipSlave.js
index 2a2b7cbb7d3b62ce7ad3933693aabe8cf404ccb6..4862b4c8e606e6cac00c10e7cd500c840fcaa3f5 100644
--- a/src/npc/generate/generateLeadershipSlave.js
+++ b/src/npc/generate/generateLeadershipSlave.js
@@ -69,7 +69,7 @@ globalThis.generateLeadershipSlave = function(input, location) {
slave.height = Height.random(slave, {skew: 3, spread: .2, limitMult: [1, 4]});
slave.weight = jsRandom(-10, 10);
slave.teeth = either("normal", "pointy");
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
if (jsRandom(0, 2) === 0) {
configureLimbs(slave, "all", 5);
}
@@ -81,7 +81,7 @@ globalThis.generateLeadershipSlave = function(input, location) {
slave.fetish = "sadist";
slave.fetishStrength = 100;
slave.muscles = jsRandom(50, 80);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
applyMaleGenitalia({dick: jsRandom(3, 6), balls: jsRandom(3, 6), prostate: either(1, 1, 1, 2, 2, 3)});
slave.career = either(App.Data.Careers.Leader.wardeness);
break;
diff --git a/src/npc/generate/generateMarketSlave.js b/src/npc/generate/generateMarketSlave.js
index 4e298cb935d5d07ff5e1fa403f59d65a6e6b0271..c6c135c9cc8839ba59afb34aaa6c2d1cb3a8335e 100644
--- a/src/npc/generate/generateMarketSlave.js
+++ b/src/npc/generate/generateMarketSlave.js
@@ -123,15 +123,15 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
}
if (V.corp.SpecWeight > 0) {
slave.weight = jsRandom(-85 + V.corp.SpecWeight * 20, -65 + V.corp.SpecWeight * 30);
- if (V.corp.SpecWeight === 1) {
+ if (V.corp.SpecWeight === 1) { // weight -65 to -35
r += `Trainees are practically starved through a rigorous diet. `;
- } else if (V.corp.SpecWeight === 2) {
+ } else if (V.corp.SpecWeight === 2) { // -45 to -5
r += `Trainees are put on a diet to get them nice and thin. `;
- } else if (V.corp.SpecWeight === 3) {
+ } else if (V.corp.SpecWeight === 3) { // -25 to 25
r += `Thin trainees are fattened up; fat trainees are slimmed down. `;
- } else if (V.corp.SpecWeight === 5) {
+ } else if (V.corp.SpecWeight === 5) { // 15 to 85
r += `Trainees are fattened until they're nice and curvy. `;
- } else {
+ } else { // V.corp.SpecWeight === 6; weight 35 to 115
r += `Trainees are fed as much as they can stomach. `;
}
} else {
@@ -139,15 +139,15 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
}
if (V.corp.SpecMuscle > 0) {
slave.muscles = jsRandom(-85, -65) + V.corp.SpecMuscle * 25;
- if (V.corp.SpecMuscle === 1) {
+ if (V.corp.SpecMuscle === 1) { // muscles -60 to -40
r += `Trainees are kept physically inactive and frail. `;
- } else if (V.corp.SpecMuscle === 2) {
+ } else if (V.corp.SpecMuscle === 2) { // -35 to -15
r += `Trainees are kept physically weak. `;
- } else if (V.corp.SpecMuscle === 3) {
+ } else if (V.corp.SpecMuscle === 3) { // -10 to 10
r += `Trainees' muscles are kept soft. `;
- } else if (V.corp.SpecMuscle === 4) {
+ } else if (V.corp.SpecMuscle === 4) { // 15 to 35
r += `Trainees are brought up to a good state of physical fitness. `;
- } else if (V.corp.SpecMuscle === 5) {
+ } else if (V.corp.SpecMuscle === 5) { // 40 to 60
r += `Trainees are subjected to punishing workout routines and only sold when ripped. `;
}
} else {
@@ -854,24 +854,24 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
}
if (neighbor.FSPetiteAdmiration > 20) {
r += `They tend to be short, some far more than others. `;
- if (slave.height >= 160) {
+ if (slave.height >= Height.forAge(160, slave)) {
slave.height = Height.random(slave, {limitMult: [-2, 0]});
- if (slave.height >= 160) {
+ if (slave.height >= Height.forAge(160, slave)) {
slave.height = Height.random(slave, {limitMult: [-3, -1]});
- if (slave.height >= 160) {
- slave.height = jsRandom(90, 130);
+ if (slave.height >= Height.forAge(160, slave)) {
+ slave.height = Height.forAge(jsRandom(90, 130), slave);
slave.geneticQuirks.dwarfism = 2;
}
}
}
} else if (neighbor.FSStatuesqueGlorification > 20) {
r += `They tend to be tall, if not unbelievably so. `;
- if (slave.height < 170) {
+ if (slave.height < Height.forAge(170, slave)) {
slave.height = Height.random(slave, {limitMult: [0, 2]});
- if (slave.height < 170) {
+ if (slave.height < Height.forAge(170, slave)) {
slave.height = Height.random(slave, {limitMult: [1, 3]});
- if (slave.height < 170) {
- slave.height = jsRandom(200, 264);
+ if (slave.height < Height.forAge(170, slave)) {
+ slave.height = Height.forAge(jsRandom(200, 264), slave);
slave.geneticQuirks.gigantism = 2;
}
}
@@ -943,11 +943,11 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
if (jsRandom(0, 3) === 0) {
slave.behavioralFlaw = "gluttonous";
}
- if (slave.fetish === "none") {
+ if (slave.fetish === Fetish.NONE) {
slave.fetish = jsEither(["boobs", "buttslut", "cumslut", "dom", "humiliation", "masochist", "pregnancy", "sadist", "submissive"]);
}
slave.fetishStrength = jsRandom(60, 90);
- if (jsRandom(1, 100) <= 5 && slave.fetish !== "mindbroken") {
+ if (jsRandom(1, 100) <= 5 && slave.fetish !== Fetish.MINDBROKEN) {
switch (slave.fetish) {
case "submissive":
slave.sexualFlaw = "neglectful";
@@ -1265,7 +1265,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.birthName = "";
slave.birthSurname = "";
if (slave.career === "a soldier") {
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
} else {
slave.skill.combat = 0;
}
@@ -1321,7 +1321,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
case "hunters": {
slave = GenerateNewSlave(null, SGProp);
slave.origin = "You bought $him from the runaway hunters' slave market after they recaptured $him and $his original owner did not pay their fee.";
- slave.devotion = -20;
+ slave.devotion = jsRandom(-60, -30);
slave.trust = jsRandom(-15, 15);
slave.intelligence = Intelligence.random({limitIntelligence: [0, 100]});
slave.intelligenceImplant = 15;
@@ -1346,7 +1346,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.balls = 0;
}
}
- slave.skill.combat = jsEither([0, 0, 0, 0, 0, 1]);
+ slave.skill.combat = jsEither([0, 0, 0, 0, 30, 70]);
slave.skill.entertainment = jsRandom(15, 100);
slave.skill.whoring = jsRandom(15, 100);
slave.skill.oral = jsRandom(15, 100);
@@ -1446,8 +1446,8 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
SGProp.maxAge = 42;
slave = GenerateNewSlave(null, SGProp);
slave.origin = "You bought $him from the trainers' slave market after they put $him through basic training.";
- slave.devotion += 40;
- slave.trust += 40;
+ slave.devotion = jsRandom(-45, 15);
+ slave.trust = jsRandom(-35, 15);
setHealth(slave, jsRandom(-20, 80), Math.max(normalRandInt(0, 2), 0), undefined, Math.max(normalRandInt(0, 0.4), jsRandom(10, 40)));
if (slave.vagina !== -1) {
slave.skill.vaginal += 15;
@@ -1551,7 +1551,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.intelligenceImplant = 30;
slave.accent = Math.min(slave.accent, 1);
slave.skill.entertainment = 75;
- slave.skill.combat = jsEither([0, 1, 1]);
+ slave.skill.combat = jsEither([0, 30, 70]);
} else {
slave.face = random(10, 65);
slave.intelligence = Intelligence.random({limitIntelligence: [35, 75]});
@@ -1821,7 +1821,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.skill.whoring = 0;
slave.skill.entertainment = 0;
if (V.TGA.schoolUpgrade === 2) {
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
} else {
slave.skill.combat = 0;
}
@@ -2263,7 +2263,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.skill.whoring = 10;
slave.skill.entertainment = jsEither([20, 40, 40, 60]);
}
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.pubicHStyle = "waxed";
slave.underArmHStyle = "waxed";
slave.sexualQuirk = jsEither(["caring", "none", "none", "unflinching"]);
@@ -2433,7 +2433,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.muscles = jsRandom(20, 80);
slave.chem = 10 * jsRandom(1, 3);
slave.custom.tattoo = "The prominent emblem of a local gang spans the length of his shoulders.";
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
break;
}
case "gang assaulter": {
@@ -2452,7 +2452,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.waist = jsRandom(10, 50);
slave.chem = 10 * jsRandom(1, 3);
slave.custom.tattoo = "The prominent emblem of a local gang spans the length of $his shoulders.";
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
break;
}
case "gang bruiser": {
@@ -2471,7 +2471,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.waist = jsRandom(10, 70);
slave.chem = 10 * jsRandom(1, 3);
slave.custom.tattoo = "The prominent emblem of a local gang spans the length of $his shoulders.";
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
break;
}
case "gang thief": {
@@ -2490,7 +2490,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.waist = jsRandom(10, 70);
slave.chem = 10 * jsRandom(1, 3);
slave.custom.tattoo = "The prominent emblem of a local gang spans the length of $his shoulders.";
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
break;
}
case "drug peddler": {
@@ -2506,7 +2506,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.muscles = jsRandom(20, 40);
slave.chem = 10 * jsRandom(3, 5);
slave.custom.tattoo = "The prominent emblem of a local gang spans the length of $his shoulders.";
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
break;
}
case "hitman": {
@@ -2522,7 +2522,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.weight = jsRandom(-30, 10);
slave.waist = jsRandom(-10, 50);
slave.muscles = jsRandom(20, 40);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
break;
}
case "assassin": {
@@ -2538,7 +2538,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.weight = jsRandom(-30, 10);
slave.waist = jsRandom(-10, 10);
slave.muscles = jsRandom(20, 40);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
break;
}
case "murder": {
@@ -2552,7 +2552,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.intelligence = jsRandom(-40, 60);
setHealth(slave, jsRandom(-20, 20), undefined, undefined, undefined, jsRandom(30, 80));
slave.muscles = jsRandom(20, 80);
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
break;
}
case "manslaughter": {
@@ -2615,7 +2615,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.weight = jsRandom(-30, 10);
slave.waist = jsRandom(-10, 10);
slave.muscles = jsRandom(20, 40);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
break;
}
case "terrorist": {
@@ -2646,7 +2646,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.weight = jsRandom(-10, 10);
slave.waist = jsRandom(-10, 10);
slave.muscles = jsRandom(20, 60);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
slave.behavioralFlaw = "arrogant";
break;
}
@@ -2662,7 +2662,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
setHealth(slave, jsRandom(-40, 60), Math.max(normalRandInt(5, 4), 0), Math.max(normalRandInt(5, 4), 0), undefined, jsRandom(30, 80));
slave.weight = jsRandom(-50, 10);
slave.waist = jsRandom(-10, 10);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
break;
}
case "officer": {
@@ -2679,7 +2679,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.weight = jsRandom(-10, 10);
slave.waist = jsRandom(-10, 10);
slave.muscles = jsRandom(20, 40);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
break;
}
case "specOps": {
@@ -2696,7 +2696,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.weight = jsRandom(-10, 10);
slave.waist = jsRandom(-10, 10);
slave.muscles = jsRandom(30, 60);
- slave.skill.combat = 1;
+ slave.skill.combat = 100;
break;
}
case "sniper": {
@@ -2713,7 +2713,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.weight = jsRandom(-10, 10);
slave.waist = jsRandom(-10, 10);
slave.muscles = jsRandom(30, 60);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
if (slave.boobs > 400) {
slave.boobs = 400;
}
@@ -2733,7 +2733,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.weight = jsRandom(-10, 10);
slave.waist = jsRandom(-10, 10);
slave.muscles = jsRandom(50, 60);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
break;
}
case "soldier": {
@@ -2750,7 +2750,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.weight = jsRandom(-10, 10);
slave.waist = jsRandom(-10, 10);
slave.muscles = jsRandom(30, 60);
- slave.skill.combat = 1;
+ slave.skill.combat = 70;
break;
}
case "private": {
@@ -2767,7 +2767,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.weight = jsRandom(-10, 10);
slave.waist = jsRandom(-10, 10);
slave.muscles = jsRandom(10, 40);
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
break;
}
}
@@ -2941,7 +2941,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.weight = jsRandom(-10, 10);
slave.waist = jsRandom(-10, 10);
slave.muscles = jsRandom(10, 40);
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
break;
}
case "murder": {
@@ -3079,7 +3079,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.weight = jsRandom(-10, 10);
slave.waist = jsRandom(-10, 10);
slave.muscles = jsRandom(30, 60);
- slave.skill.combat = 1;
+ slave.skill.combat = 20;
break;
}
case "battery": {
@@ -3093,7 +3093,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.weight = jsRandom(-10, 10);
slave.waist = jsRandom(-10, 10);
slave.muscles = jsRandom(40, 60);
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
break;
}
case "tax evasion": {
@@ -3269,7 +3269,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
if (slave.muscles < 10) {
slave.muscles = jsRandom(10, 45);
}
- slave.skill.combat = 1;
+ slave.skill.combat = 40;
break;
case "manslaughter":
slave.origin = "You purchased $his life at a prison sale. $He was locked away for manslaughter.";
diff --git a/src/npc/generate/generateNewSlaveJS.js b/src/npc/generate/generateNewSlaveJS.js
index 4fb1209114eb4a1ed7c556dd768a7f41dfd03a6e..504680174ad2a9dd9b998455894630d9c8981aee 100644
--- a/src/npc/generate/generateNewSlaveJS.js
+++ b/src/npc/generate/generateNewSlaveJS.js
@@ -1619,7 +1619,7 @@ globalThis.GenerateNewSlave = (function() {
if (slave.origHColor === "red") {
slave.origHColor = jsEither(["chestnut", "auburn", "auburn", "auburn", "auburn", "ginger", "ginger", "copper", "copper", "red"]);
}
- if ((skinToneLevel(slave.origSkin) > 5) && (skinToneLevel(slave.origSkin) < 10)) {
+ if ((skinToneLevel(slave.origSkin) > 5) && (skinToneLevel(slave.origSkin) < 10)) { // pale to fair
if (jsRandom(1, 4) === 1) {
slave.markings = jsEither(["beauty mark", "beauty mark", "birthmark", "birthmark", "freckles", "freckles", "freckles", "heavily freckled"]);
}
diff --git a/src/npc/generate/generateRelatedSlave.js b/src/npc/generate/generateRelatedSlave.js
index b9c84451094589c3bb31380784cd2ca71852e938..9d9dd98adf8b36bd1322f6c37f06b1c293c1989b 100644
--- a/src/npc/generate/generateRelatedSlave.js
+++ b/src/npc/generate/generateRelatedSlave.js
@@ -576,7 +576,7 @@ globalThis.generateRelatedSlave = (function() {
slave.clit = 0;
slave.labia = 0;
slave.ovaries = 0;
- slave.preg = -2;
+ slave.preg = 0;
if (slave.geneticQuirks.wellHung === 2) {
slave.dick = either(5, 5, 6);
} else {
diff --git a/src/npc/generate/heroCreator.js b/src/npc/generate/heroCreator.js
index 8c0c6cb7adeeed2dded23e8e9f866fc090ebbeda..2f821c29c9e139d788cf4354e69d1bfc48e6919a 100644
--- a/src/npc/generate/heroCreator.js
+++ b/src/npc/generate/heroCreator.js
@@ -141,53 +141,41 @@ App.Utils.getHeroSlave = function(heroSlave) {
SetBellySize(newSlave);
- /* special slaves exceptions to keep siblings sensible */
- if (newSlave.mother === -9999 && newSlave.father === -9998) {
- /* The twins — Camille & Kennerly */
- for (let k = 0; k < V.slaves.length; k++) {
- if (areSisters(V.slaves[k], newSlave) > 0) {
- newSlave.actualAge = V.slaves[k].actualAge;
- newSlave.physicalAge = newSlave.actualAge;
- newSlave.visualAge = newSlave.actualAge;
- newSlave.ovaryAge = newSlave.actualAge;
- newSlave.birthWeek = V.slaves[k].birthWeek;
- }
+ let slave; // special slaves exceptions to keep siblings sensible
+ if (newSlave.mother === -9999 && newSlave.father === -9998) { // The twins — Camille & Kennerly
+ slave = V.slaves.find(s => areSisters(s, newSlave) > 0);
+ if (slave) {
+ newSlave.actualAge = slave.actualAge;
+ newSlave.physicalAge = newSlave.actualAge;
+ newSlave.visualAge = newSlave.actualAge;
+ newSlave.ovaryAge = newSlave.actualAge;
+ newSlave.birthWeek = slave.birthWeek;
}
}
- if (newSlave.mother === -9997 && newSlave.father === -9996) {
- /* The siblings — Elisa & Martin */
- for (let k = 0; k < V.slaves.length; k++) {
- if (areSisters(V.slaves[k], newSlave) > 0) {
- if (newSlave.birthName === "Elisa") {
- newSlave.actualAge = V.slaves[k].actualAge - 1;
- newSlave.physicalAge = newSlave.actualAge;
- newSlave.visualAge = newSlave.actualAge;
- newSlave.ovaryAge = newSlave.actualAge;
- } else if (newSlave.birthName === "Martin") {
- newSlave.actualAge = V.slaves[k].actualAge + 1;
- newSlave.physicalAge = newSlave.actualAge;
- newSlave.visualAge = newSlave.actualAge;
- newSlave.ovaryAge = newSlave.actualAge;
- }
+ if (newSlave.mother === -9997 && newSlave.father === -9996) { // The siblings — Elisa & Martin
+ slave = V.slaves.find(s => areSisters(s, newSlave) > 0);
+ if (slave) {
+ if (newSlave.birthName === "Elisa") {
+ newSlave.actualAge = slave.actualAge - 1;
+ } else if (newSlave.birthName === "Martin") {
+ newSlave.actualAge = slave.actualAge + 1;
}
+ newSlave.physicalAge = newSlave.actualAge;
+ newSlave.visualAge = newSlave.actualAge;
+ newSlave.ovaryAge = newSlave.actualAge;
}
}
- if (newSlave.mother === -9995 && newSlave.father === -9994) {
- /* The fruit siblings — Green & Purple Grape */
- for (let k = 0; k < V.slaves.length; k++) {
- if (areSisters(V.slaves[k], newSlave) > 0) {
- if (newSlave.birthName === "Green Grape") {
- newSlave.actualAge = V.slaves[k].actualAge - 5;
- newSlave.physicalAge = newSlave.actualAge;
- newSlave.visualAge = newSlave.actualAge;
- newSlave.ovaryAge = newSlave.actualAge;
- } else if (newSlave.birthName === "Purple Grape") {
- newSlave.actualAge = V.slaves[k].actualAge + 5;
- newSlave.physicalAge = newSlave.actualAge;
- newSlave.visualAge = newSlave.actualAge;
- newSlave.ovaryAge = newSlave.actualAge;
- }
+ if (newSlave.mother === -9995 && newSlave.father === -9994) { // The fruit siblings — Green & Purple Grape
+ slave = V.slaves.find(s => areSisters(s, newSlave) > 0);
+ if (slave) {
+ if (newSlave.birthName === "Green Grape") {
+ newSlave.actualAge = slave.actualAge - 5;
+ } else if (newSlave.birthName === "Purple Grape") {
+ newSlave.actualAge = slave.actualAge + 5;
}
+ newSlave.physicalAge = newSlave.actualAge;
+ newSlave.visualAge = newSlave.actualAge;
+ newSlave.ovaryAge = newSlave.actualAge;
}
}
diff --git a/src/npc/generate/lawCompliance.js b/src/npc/generate/lawCompliance.js
index 9f197d832c40b55ab1039c99e36a7f0ba49661e3..d67ff08d971afaff42bc95806a0fd2ab942f9863 100644
--- a/src/npc/generate/lawCompliance.js
+++ b/src/npc/generate/lawCompliance.js
@@ -146,7 +146,7 @@ App.Desc.lawCompliance = function(slave, market = 0) {
if (market !== "Elite Slave" && policies.countEugenicsSMRs() > 0) {
r.push(eugenicsSMRsCount());
}
-
+
SlaveStatClamp(slave);
return r.join(" ");
@@ -767,29 +767,29 @@ App.Desc.lawCompliance = function(slave, market = 0) {
function eugenicsSMRsCount() {
const r = [];
- let eugenicsMarketTest = 1;
+ const sterilizationReasons = []
r.push(`As soon as ${he} arrived in the slave market, ${he} was subjected to a battery of testing:`);
if (V.policies.SMR.eugenics.intelligenceSMR === 1) {
r.push(`an intelligence test,`);
if (slave.intelligence + slave.intelligenceImplant <= 50) {
- eugenicsMarketTest = 0;
+ sterilizationReasons.push(`too stupid`);
}
}
if (V.policies.SMR.eugenics.heightSMR === 1) {
r.push(`rigorous height and bone measurements,`);
if (slave.height < (Height.mean(slave) + 15)) {
- eugenicsMarketTest = 0;
+ sterilizationReasons.push(`too short`);
}
}
if (V.policies.SMR.eugenics.faceSMR === 1) {
r.push(`strict judgments of ${his} facial attractiveness,`);
if (slave.face < 40) {
- eugenicsMarketTest = 0;
+ sterilizationReasons.push(`too ugly`);
}
}
r.push(`a physical exam, and more.`);
- if (eugenicsMarketTest === 0) {
- r.push(`${He} failed, and only then learned that by failing ${he} placed ${himself} under the merciless dictates of eugenic theory.`);
+ if (sterilizationReasons.length > 0) {
+ r.push(`${He} failed, being found <span class="red">${toSentence(sterilizationReasons)},</span> and only then learned that by failing ${he} placed ${himself} under the merciless dictates of eugenic theory.`);
if (slave.balls > 0 && (isFertile(slave) || slave.preg > 0)) {
r.push(`${His} balls were promptly`);
if (V.seeExtreme === 1) {
diff --git a/src/npc/generate/newChildIntro.js b/src/npc/generate/newChildIntro.js
index 04f0ce1d96d0fa413c65c41a029d92b67b8891e9..6c688df9711bf13638e1733cb0907ce1277a767a 100644
--- a/src/npc/generate/newChildIntro.js
+++ b/src/npc/generate/newChildIntro.js
@@ -253,7 +253,7 @@ App.UI.newChildIntro = function(slave) {
}
)
);
- if (getSlave(slave.mother) || getSlave(slave.father) || slave.mother === -1 || slave.father === -1) {
+ if (getRelative(slave.mother) || getRelative(slave.father)) {
App.UI.DOM.appendNewElement(
"div",
surnaming,
@@ -424,7 +424,7 @@ App.UI.newChildIntro = function(slave) {
} = getPronouns(tempMom).appendSuffix("2");
r.push(`${He} glances at ${his} mother`);
if (tempMom.relationship === -3) {
- if (tempMom.fetish === "mindbroken") {
+ if (tempMom.fetish === Fetish.MINDBROKEN) {
r.push(`and <span class="devotion dec">notices how dull</span> the look on ${his2} face is. ${tempMom.slaveName} is standing there blankly. ${He2} doesn't even recognize ${his2} ${daughter}, <span class="trust dec">frightening</span> the poor ${girl}.`);
slave.trust -= 25;
slave.devotion -= 10;
@@ -565,7 +565,7 @@ App.UI.newChildIntro = function(slave) {
} = getPronouns(tempDad).appendSuffix("2");
r.push(`${He} glances at ${his} father`);
if (tempDad.relationship === -3) {
- if (tempDad.fetish === "mindbroken") {
+ if (tempDad.fetish === Fetish.MINDBROKEN) {
r.push(`and <span class="devotion dec">notices how dull</span> the look on ${his2} face is. ${tempDad.slaveName} is standing there blankly. ${He2} doesn't even recognize ${his2} ${daughter}, <span class="trust dec">frightening</span> the poor ${girl}.`);
slave.trust -= 25;
slave.devotion -= 10;
@@ -861,7 +861,7 @@ App.UI.newChildIntro = function(slave) {
}
if (V.arcologies[0].FSRepopulationFocus >= 50) {
if (slave.readyOva > 0) {
- r.push(`${He} notices all the rounded bellies in your arcology and <span class="trust inc">instinctively feels at home with ${his} egg filled womb.</span>`);
+ r.push(`${He} notices all the rounded bellies in your arcology and <span class="trust inc">instinctively feels at home with ${his} egg-filled womb.</span>`);
slave.trust += 2;
}
}
@@ -902,6 +902,8 @@ App.UI.newChildIntro = function(slave) {
slave.devotion += 4;
}
+ App.Events.addParagraph(el, r);
+
// Normal intro stuff
el.append(
App.UI.newSlaveIntro(
diff --git a/src/npc/generate/newSlaveIntro.js b/src/npc/generate/newSlaveIntro.js
index 2dbb21a93781eb974a82e26651d713a6663b9fa2..6f18bf72aac84c6c5193c9b416e50187cc88b103 100644
--- a/src/npc/generate/newSlaveIntro.js
+++ b/src/npc/generate/newSlaveIntro.js
@@ -11,7 +11,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
const desc = SlaveTitle(slave);
const {title: Master} = getEnunciation(slave);
const {
- His, He, his, him, he, girl, hers, himself, daughter
+ His, He, his, him, he, girl, hers, himself, woman, daughter
} = getPronouns(slave);
const {woman: womanP, girl: girlP} = getPronouns(V.PC);
const hands = (hasBothArms(slave)) ? "hands" : "hand";
@@ -309,7 +309,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
}
if ((slave.attrXY > 50 || slave.energy > 95) && slave.behavioralFlaw !== "hates men" && slave.trust >= -20) {
- if (PC.dick === 0 && PC.boobs < 300) {
+ if (PC.dick !== 0 && PC.boobs < 300) {
r.push(`${He} seems to think you're handsome, and is more willing to <span class="hotpink">try for your approval</span> than ${he} would otherwise be. ${He} glances at your crotch when ${he} thinks you're not looking.`);
slave.devotion += 4;
}
@@ -924,7 +924,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
linkName: `Brand ${him} on the ${brandTarget} to make it clear that ${his} life of luxury and prestige is over`,
result: function(slave) {
const r = [];
- r.push(`The former knight stands in front of you, glaring down as you casually announce that you'll be branding ${his} ${brandTarget} to mark ${him} as property. ${He}'s an absolutely enormous mass of corded muscle, all of it on naked display, and the furious glint in ${his} eyes makes it look like ${he}'s thinking about snapping you in two at any moment. As the captive man tries ${his} best to silently intimidate you, you laugh, once, and bring your face up close to ${his}, making it disturbingly clear that ${his} muscle and strength is no use anymore. Escorted by your drones, you bring the ex-Knight to the body modification studio, strap ${him} down, and take your time to heat up the brand before bringing it to ${his} virgin flesh with a sudden ferocity that makes the huge man scream in agony. As ${he} writhes and thrashes under the straps, ${he} gets his first taste of <span class="gold">genuine pain,</span> and ${he} <span class="mediumorchid">hates you</span> even more than ${he} did before as ${his} <span class="health dec">wound</span> heals.`);
+ r.push(`The former knight stands in front of you, glaring down as you casually announce that you'll be branding ${his} ${brandTarget} to mark ${him} as property. ${He}'s an absolutely enormous mass of corded muscle, all of it on naked display, and the furious glint in ${his} eyes makes it look like ${he}'s thinking about snapping you in two at any moment. As the captive ${woman} tries ${his} best to silently intimidate you, you laugh, once, and bring your face up close to ${his}, making it disturbingly clear that ${his} muscle and strength is no use anymore. Escorted by your drones, you bring the ex-Knight to the body modification studio, strap ${him} down, and take your time to heat up the brand before bringing it to ${his} virgin flesh with a sudden ferocity that makes the huge ${woman} scream in agony. As ${he} writhes and thrashes under the straps, ${he} gets his first taste of <span class="gold">genuine pain,</span> and ${he} <span class="mediumorchid">hates you</span> even more than ${he} did before as ${his} <span class="health dec">wound</span> heals.`);
applyBrand();
return r.join(" ");
},
@@ -958,7 +958,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
linkName: `Abort ${his} child`,
result: function(slave) {
const r = [];
- r.push(`You loudly place an innocuous-looking drug injector on your desk, and ${him} think about it for a long moment. Then, you declare exactly what made that sound: abortifacients. After a moment of comprehension, ${his} mood instantly improves. ${He} pledges to <span class="hotpink">submit to you,</span>`);
+ r.push(`You loudly place an innocuous-looking drug injector on your desk, and let ${him} think about it for a long moment. Then, you declare exactly what made that sound: abortifacients. After a moment of comprehension, ${his} mood instantly improves. ${He} pledges to <span class="hotpink">submit to you,</span>`);
if (PC.dick !== 0 && PC.vagina !== -1) {
r.push(`suck your cock, take it in ${his} pussy, take it up ${his} ass, eat you out,`);
} else if (PC.dick !== 0) {
@@ -1125,7 +1125,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(VCheck.Anal(slave, 1));
}
- r.push(`You tell ${him} that slaves working in your penthouse are all expected to please you, and ${he}'ll have to impress you. ${He} smiles and even giggles a little, standing to strip off ${his} clothes, taking ${his} time and showing off ${his} fresh body. ${He} gets lewder and lewder, displaying youthful libido basking in the gaze of ${his} crush. ${He} slowly becomes more and more desperate to entice you, so you ${him} keep going out of curiosity, to see how far ${he}'ll go. ${He} goes to the point of reclining on the couch with ${his} legs back, spreading ${himself} and masturbating, and when that fails to get you out of your chair, ${he} begins to wink ${his}`);
+ r.push(`You tell ${him} that slaves working in your penthouse are all expected to please you, and ${he}'ll have to impress you. ${He} smiles and even giggles a little, standing to strip off ${his} clothes, taking ${his} time and showing off ${his} fresh body. ${He} gets lewder and lewder, displaying youthful libido basking in the gaze of ${his} crush. ${He} slowly becomes more and more desperate to entice you, so you let ${him} keep going out of curiosity, to see how far ${he}'ll go. ${He} goes to the point of reclining on the couch with ${his} legs back, spreading ${himself} and masturbating, and when that fails to get you out of your chair, ${he} begins to wink ${his}`);
if (temp > 50) {
r.push(`pussy`);
} else {
@@ -1235,7 +1235,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
linkName: `Let ${him} know ${he}'ll have to earn ${his} rewards`,
result: function(slave) {
const r = [];
- r.push(`You complete the induction and then perform a thorough inspection, noting down each area in which surgery or drugs could improve ${his} body. ${He} understands what you're doing and can barely contain ${his} excitement, but you tell ${him} that ${he}'ll have to earn such improvements. ${His} face falls. You reassure ${him} that it won't take the years ${he} would have had to work to afford such things ${himself}, but that ${he} needs to be a good slave, and soon, for you to spend resources on ${him}. You ${him} start by taking a rough buttfuck, bent over the desk. ${His} ass is tight and you are not merciful. ${He} gasps and moans but takes it all the same, <span class="mediumaquamarine">trusting</span> that ${he}'ll eventually be rewarded with transformation.`);
+ r.push(`You complete the induction and then perform a thorough inspection, noting down each area in which surgery or drugs could improve ${his} body. ${He} understands what you're doing and can barely contain ${his} excitement, but you tell ${him} that ${he}'ll have to earn such improvements. ${His} face falls. You reassure ${him} that it won't take the years ${he} would have had to work to afford such things ${himself}, but that ${he} needs to be a good slave, and soon, for you to spend resources on ${him}. You let ${him} start by taking a rough buttfuck, bent over the desk. ${His} ass is tight and you are not merciful. ${He} gasps and moans but takes it all the same, <span class="mediumaquamarine">trusting</span> that ${he}'ll eventually be rewarded with transformation.`);
r.push(VCheck.Anal(slave, 1));
slave.trust += 10;
return r.join(" ");
@@ -1481,7 +1481,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
r.push(`As you finish, ${he2}`);
if (slave2.fetish === "cumslut") {
r.push(`opens ${his2} mouth and savors your gift, thanking you once ${he2}'s swallowed enough to be able to talk again.`);
- } else if ((slave2.fetish === "buttslut") || (slave2.fetish === "submissive")) {
+ } else if ((slave2.fetish === "buttslut") || (slave2.fetish === Fetish.SUBMISSIVE)) {
r.push(`collapses on the floor with ${his2} ass high in the air, thanking you for painting ${his2} hole white.`);
} else {
r.push(`thanks you.`);
@@ -1549,7 +1549,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
r.push(`As you finish, ${he2}`);
if (slave2.fetish === "cumslut") {
r.push(`opens ${his2} mouth and savors your gift, thanking you once ${he2}'s swallowed enough to be able to talk again.`);
- } else if ((slave2.fetish === "buttslut") || (slave2.fetish === "submissive")) {
+ } else if ((slave2.fetish === "buttslut") || (slave2.fetish === Fetish.SUBMISSIVE)) {
r.push(`collapses on the floor with ${his2} ass high in the air, thanking you for painting ${his2} hole white.`);
} else {
r.push(`thanks you.`);
@@ -1617,7 +1617,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
r.push(`As you finish, ${he2}`);
if (slave2.fetish === "cumslut") {
r.push(`opens ${his2} mouth and savors your gift, thanking you once ${he2}'s swallowed enough to be able to talk again.`);
- } else if ((slave2.fetish === "buttslut") || (slave2.fetish === "submissive")) {
+ } else if ((slave2.fetish === "buttslut") || (slave2.fetish === Fetish.SUBMISSIVE)) {
r.push(`collapses on the floor with ${his2} ass high in the air, thanking you for painting ${his2} hole white.`);
} else {
r.push(`thanks you.`);
@@ -1676,7 +1676,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
r.push(`As you finish, ${he2}`);
if (slave2.fetish === "cumslut") {
r.push(`opens ${his2} mouth and savors your gift, thanking you once ${he2}'s swallowed enough to be able to talk again.`);
- } else if ((slave2.fetish === "buttslut") || (slave2.fetish === "submissive")) {
+ } else if ((slave2.fetish === "buttslut") || (slave2.fetish === Fetish.SUBMISSIVE)) {
r.push(`collapses on the floor with ${his2} ass high in the air, thanking you for painting ${his2} hole white.`);
} else {
r.push(`thanks you.`);
@@ -1744,7 +1744,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
r.push(`As you finish, ${he2}`);
if (slave2.fetish === "cumslut") {
r.push(`opens ${his2} mouth and savors your gift, thanking you once ${he2}'s swallowed enough to be able to talk again.`);
- } else if ((slave2.fetish === "buttslut") || (slave2.fetish === "submissive")) {
+ } else if ((slave2.fetish === "buttslut") || (slave2.fetish === Fetish.SUBMISSIVE)) {
r.push(`collapses on the floor with ${his2} ass high in the air, thanking you for painting ${his2} hole white.`);
} else {
r.push(`thanks you.`);
@@ -2537,7 +2537,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
App.UI.DOM.appendNewElement("div", p, `...or show ${him} what it's like here for a slave`, "note");
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
/*
choice({
linkName: `Teach ${him} how to use ${his} throat`,
@@ -2588,7 +2588,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
if (tankBorn) {
r.push(`${he} moans lewdly and relaxes, giving in to the tank's teachings. ${He} might not be an impregnation fetishist, but ${he} is <span class="hotpink">willing to submit</span> to have ${his} body used as your receptacle and may even grow to enjoy it.`);
slave.devotion += 4;
- if (random(1, 100) > 60 && slave.fetish === "none") {
+ if (random(1, 100) > 60 && slave.fetish === Fetish.NONE) {
slave.fetish = "pregnancy";
slave.fetishStrength = 20;
}
@@ -2600,7 +2600,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(`${he} climaxes, ${his} impregnation fetish displayed cutely on ${his} face.`);
}
- r.push(`As you ${him} go, ${he} feels`);
+ r.push(`As you let ${him} go, ${he} feels`);
if (PC.dick !== 0) {
r.push(`your`);
} else {
@@ -2626,7 +2626,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(`${he} climaxes, ${his} impregnation fetish forcing ${him} to feel pleasure ${his} mind would prefer to reject.`);
}
- r.push(`As you ${him} go, ${he} cries openly,`);
+ r.push(`As you let ${him} go, ${he} cries openly,`);
if (PC.dick !== 0) {
r.push(`your`);
} else {
@@ -2692,7 +2692,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(`${he} climaxes, ${his} impregnation fetish displayed cutely on ${his} face.`);
}
- r.push(`As you ${him} go, ${he} feels your cum dripping out of ${him}, and ${he} <span class="hotpink">feels like your property.</span>`);
+ r.push(`As you let ${him} go, ${he} feels your cum dripping out of ${him}, and ${he} <span class="hotpink">feels like your property.</span>`);
slave.devotion += 5;
} else {
r.push(`${he} gasps and does ${his} best to relax, accepting the flow.`);
@@ -2712,7 +2712,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(`${he} climaxes, ${his} impregnation fetish forcing ${him} to feel pleasure ${his} mind would prefer to reject.`);
}
- r.push(`As you ${him} go, ${he} cries openly, your cum dripping out of ${him}, and ${he} <span class="hotpink">feels like your property.</span>`);
+ r.push(`As you let ${him} go, ${he} cries openly, your cum dripping out of ${him}, and ${he} <span class="hotpink">feels like your property.</span>`);
slave.devotion += 4;
} else {
r.push(`${he} groans and struggles a little, disgusted to be filled by your fluids so immediately.`);
@@ -2906,7 +2906,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
}
lineBreak();
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
choice({
linkName: `Break ${him} in publicly`,
result(slave) {
@@ -2954,7 +2954,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
}
r.push(`the passing spectators. ${He} might not be a humiliation fetishist, but ${he} is <span class="hotpink">willing to submit</span> to being used as a sex slave in public and may even grow to enjoy it.`);
slave.devotion += 4;
- if (random(1, 100) > 60 && slave.fetish === "none") {
+ if (random(1, 100) > 60 && slave.fetish === Fetish.NONE) {
slave.fetish = "humiliation";
slave.fetishStrength = 20;
}
@@ -3081,7 +3081,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
});
}
lineBreak();
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.bellyPreg >= 5000) {
choice({
// TODO: tankBorn
@@ -3104,7 +3104,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.trust += 5;
r.push(VCheck.Vaginal(slave, 1));
- if (slave.fetish === "none" && jsRandom(1, 100) > 60) {
+ if (slave.fetish === Fetish.NONE && jsRandom(1, 100) > 60) {
slave.fetish = "pregnancy";
slave.fetishStrength = 10;
}
@@ -3215,7 +3215,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.lactationDuration = 2;
}
slave.devotion += 4;
- if (random(1, 100) > 60 && slave.fetish === "none") {
+ if (random(1, 100) > 60 && slave.fetish === Fetish.NONE) {
slave.fetish = "boobs";
slave.fetishStrength = 20;
}
@@ -3276,7 +3276,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
}
r.push(`in cum and <span class="hotpink">thrilled to be the center of attention.</span> Though ${he} may not be a cumslut now, ${he} certainly has the potential to become one.`);
slave.devotion += 4;
- if (random(1, 100) > 60 && slave.fetish === "none") {
+ if (random(1, 100) > 60 && slave.fetish === Fetish.NONE) {
slave.fetish = "cumslut";
slave.fetishStrength = 20;
}
@@ -3308,7 +3308,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
r.push(`licking ${hisU} cunt,`);
}
r.push(`hitting all the right places and making the helpless ${girlU} squirm with pleasure. Any plea for mercy results in a renewed effort to push the ${girlU} over the edge. ${slave.slaveName} is certainly <span class="hotpink">enjoying ${his} treat,</span> and by the looks of things, may be a developing dom!`);
- if (random(1, 100) > 60 && slave.fetish === "none") {
+ if (random(1, 100) > 60 && slave.fetish === Fetish.NONE) {
slave.fetish = "dom";
slave.fetishStrength = 20;
}
@@ -3321,7 +3321,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
r.push(`ram ${his} arm deep into ${his} toy's cunt`);
}
r.push(`causing the hapless ${girlU} to writhe in discomfort. Any plea for mercy results in even more intense torment. ${slave.slaveName} is certainly <span class="hotpink">enjoying ${his} treat,</span> and by the looks of things, may be a developing sadist!`);
- if (random(1, 100) > 60 && slave.fetish === "none") {
+ if (random(1, 100) > 60 && slave.fetish === Fetish.NONE) {
slave.fetish = "sadist";
slave.fetishStrength = 20;
}
@@ -3381,7 +3381,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
r.push(`${he} shoves you onto your back and deeply penetrates you. Before you can kick ${him} off, ${he} thrusts twice and unloads ${his} pent up orgasm deep into your pussy. ${He} pulls out with a huge smile on ${his} face and a <span class="hotpink">deep love</span> for ${his} mate. You glower at ${him} as cum pools from your stretched cunt; ${he} might not be a dom now, but ${he} may certainly become one.`);
slave.devotion += 5;
seX(slave, "penetrative", V.PC, "vaginal");
- if (random(1, 100) > 60 && slave.fetish === "none") {
+ if (random(1, 100) > 60 && slave.fetish === Fetish.NONE) {
slave.fetish = "dom";
slave.fetishStrength = 20;
}
@@ -3534,7 +3534,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
}
r.push(`${He} spends a lot of time comparing your belly to ${his} own; ${he} might not be a pregnancy fetishist, but it seems likely ${he} may become one.`);
slave.devotion += 5;
- if (random(1, 100) > 40 && slave.fetish === "none") {
+ if (random(1, 100) > 40 && slave.fetish === Fetish.NONE) {
slave.fetish = "pregnancy";
slave.fetishStrength = 20;
}
@@ -3589,7 +3589,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
actX(slave, "oral", 1);
}
- if (random(1, 100) > 40 && slave.fetish === "none") {
+ if (random(1, 100) > 40 && slave.fetish === Fetish.NONE) {
slave.fetish = "pregnancy";
slave.fetishStrength = 20;
}
@@ -3607,7 +3607,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
r.push(`Once ${he} drains you of your supply, you <span class="mediumaquamarine">cuddle up to ${him}</span> and allow ${him} to caress your body. ${He} spends a lot of time comparing your belly to ${his} own, ${he} might not be a pregnancy fetishist, but it seems likely ${he} may become one.`);
slave.devotion += 15;
slave.trust += 15;
- if (random(1, 100) > 40 && slave.fetish === "none") {
+ if (random(1, 100) > 40 && slave.fetish === Fetish.NONE) {
slave.fetish = "pregnancy";
slave.fetishStrength = 20;
}
@@ -3654,27 +3654,27 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
if (PC.boobsImplant > 0) {
r.push(`fake,`);
}
- r.push(`milk laden breasts.`);
+ r.push(`milk-laden breasts.`);
} else if (PC.boobs >= 1200) {
r.push(`huge,`);
if (PC.boobsImplant > 0) {
r.push(`fake,`);
}
- r.push(`milk laden breasts.`);
+ r.push(`milk-laden breasts.`);
} else if (PC.boobs >= 1000) {
r.push(`large,`);
if (PC.boobsImplant > 0) {
r.push(`fake,`);
}
- r.push(`milk laden breasts.`);
+ r.push(`milk-laden breasts.`);
} else if (PC.boobs >= 800) {
- r.push(`big, milk laden breasts.`);
+ r.push(`big, milk-laden breasts.`);
} else if (PC.boobs >= 650) {
- r.push(`milk laden breasts.`);
+ r.push(`milk-laden breasts.`);
} else if (PC.boobs >= 500) {
- r.push(`small, milk laden breasts.`);
+ r.push(`small, milk-laden breasts.`);
} else if (PC.boobs >= 300) {
- r.push(`tiny, milk laden breasts.`);
+ r.push(`tiny, milk-laden breasts.`);
} else {
r.push(`milk swollen chest.`);
}
@@ -3686,7 +3686,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(`wet pussy and enthusiastically begins rubbing your clit.`);
}
- r.push(`You clutch your pervy ${girl} closer to you as ${he} caresses your pregnancy with one hand and gets you off with the other. Before long you find yourself bucking your hips with lust, a queue for you to release ${him} from your nipple so ${he} may slide down your gravid dome of a belly to finish you off. Happy to serve ${his} pregnant ${getWrittenTitle(slave)}, ${he} returns to your chest, happy to relieve you of the pressure building in your neglected breast.`);
+ r.push(`You clutch your pervy ${girl} closer to you as ${he} caresses your pregnancy with one hand and gets you off with the other. Before long you find yourself bucking your hips with lust, a cue for you to release ${him} from your nipple so ${he} may slide down your gravid dome of a belly to finish you off. Happy to serve ${his} pregnant ${getWrittenTitle(slave)}, ${he} returns to your chest, happy to relieve you of the pressure building in your neglected breast.`);
if (slave.fetishKnown === 0) {
r.push(`Judging by that show, <span class="green">${he} savors getting to be with a pregnant ${womanP}.</span>`);
slave.fetishKnown = 1;
@@ -3767,7 +3767,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
r.push(`Suddenly, ${he} shoves you onto your back and begins enthusiastically fucking your breasts. Before you can push ${him} off, ${he} thrusts hard and unloads ${his} pent-up orgasm deep into your cleavage and across your face. ${He} sits back with a huge smile on ${his} face and a <span class="hotpink">new connection to you.</span> ${He} <span class="gold">recoils in surprise and fear</span> when you respond by slapping ${him} across the face for ${his} impudence. ${He} might not look like a dom, but ${he} may turn into one.`);
slave.devotion += 5;
slave.trust -= 5;
- if (random(1, 100) > 60 && slave.fetish === "none") {
+ if (random(1, 100) > 60 && slave.fetish === Fetish.NONE) {
slave.fetish = "dom";
slave.fetishStrength = 20;
}
@@ -3853,7 +3853,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
}
r.push(`a <span class="hotpink">lasting bond</span> is established between you two. ${He} happily returns to snuggling your tits before you can help ${him} up and send ${him} off. ${He} might be turning into a breast fetishist, if you had to guess.`);
slave.devotion += 5;
- if (random(1, 100) > 40 && slave.fetish === "none") {
+ if (random(1, 100) > 40 && slave.fetish === Fetish.NONE) {
slave.fetish = "boobs";
slave.fetishStrength = 20;
}
@@ -4070,7 +4070,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
if (tankBorn) {
r.push(`${He} gasps with surprise, but does not object or try to escape. ${He} accepts the spanking, viewing it as a game, and taunts your hand with ${his} rear; by the end, ${he} may even be starting to enjoy it. You're not particularly harsh, and ${he} gets up after you tire of swatting ${his} bottom <span class="hotpink">with a smile</span> on ${his} face.`);
slave.devotion += 4;
- if (random(1, 100) > 60 && slave.fetish === "none") {
+ if (random(1, 100) > 60 && slave.fetish === Fetish.NONE) {
slave.fetish = "masochist";
slave.fetishStrength = 20;
}
@@ -4096,7 +4096,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(`${He} groans with unwilling pleasure, feeling the pain radiate out from ${his} buttocks with each swat, feeling it seem to circle around ${his} hips to pool between ${his} legs. ${He} does not orgasm, but feels much more pleasure than ${he}'s willing to admit.`);
}
- r.push(`When you ${him} up, ${he}'s sobbing, more from humiliation than pain. However, ${he} <span class="hotpink">submits</span> to an uncomfortable groping of ${his} buttocks, which are pleasingly warm from the spanking.`);
+ r.push(`When you let ${him} up, ${he}'s sobbing, more from humiliation than pain. However, ${he} <span class="hotpink">submits</span> to an uncomfortable groping of ${his} buttocks, which are pleasingly warm from the spanking.`);
slave.devotion += 4;
} else {
r.push(`${He} gasps with pain, and starts to wriggle off you until you pin ${him} with your other hand. ${He} accepts the rest of the spanking unhappily. You're not particularly harsh, and ${he} gets up after you tire of swatting ${his} bottom, <span class="gold">fearful</span> due to the humiliation rather than the pain.`);
@@ -4250,7 +4250,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(`${his} limb`);
}
- r.push(`behind ${him}, secure them together, and hoist ${him} up to the ceiling on a rope. ${He} hangs up there like a sex slave chandelier${(slave.boobs >= 650) ? `, breasts swaying in a lovely way whenever ${he} struggles` : ``}. Periodically you ${him} down to stretch ${his} aching`);
+ r.push(`behind ${him}, secure them together, and hoist ${him} up to the ceiling on a rope. ${He} hangs up there like a sex slave chandelier${(slave.boobs >= 650) ? `, breasts swaying in a lovely way whenever ${he} struggles` : ``}. Periodically you let ${him} down to stretch ${his} aching`);
if ((!hasAnyArms(slave) && !hasBothLegs(slave)) || (!hasBothArms(slave) && !hasAnyLegs(slave))) {
r.push(`limb,`);
} else {
@@ -4335,10 +4335,10 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(`${He} groans with guilty pleasure, feeling ${his} muscles ache and ${his} torso swell. ${He} does not orgasm from ${his} "meal," but feels much more pleasure than ${he}'s willing to admit.`);
}
- r.push(`When you ${him} up, ${he}'s sobbing, more from humiliation than discomfort. However, ${he} <span class="hotpink">submits</span> to an uncomfortable groping of ${his} stomach, which is pleasingly taut from the inflation. You decide to leave ${him} plugged for a few hours, impressing on ${him} still more that ${his} fate is out of ${his} control.`);
+ r.push(`When you let ${him} up, ${he}'s sobbing, more from humiliation than discomfort. However, ${he} <span class="hotpink">submits</span> to an uncomfortable groping of ${his} stomach, which is pleasingly taut from the inflation. You decide to leave ${him} plugged for a few hours, impressing on ${him} still more that ${his} fate is out of ${his} control.`);
slave.devotion += 4;
} else {
- r.push(`${He} gasps in horror, and starts to struggle frantically against ${his} bonds. However, as the fluid reaches ${him} ${he} seems to resign ${himself} to ${his} fate. Once ${he} reaches a fullness you like you ${him} up, <span class="gold">fearful</span> due to the humiliation rather than the swelling. ${He} limps off to ${his} new duties as quickly as ${he} can, before you can unplug ${him}. Oh well!`);
+ r.push(`${He} gasps in horror, and starts to struggle frantically against ${his} bonds. However, as the fluid reaches ${him} ${he} seems to resign ${himself} to ${his} fate. Once ${he} reaches a fullness you like you let ${him} up, <span class="gold">fearful</span> due to the humiliation rather than the swelling. ${He} limps off to ${his} new duties as quickly as ${he} can, before you can unplug ${him}. Oh well!`);
slave.trust -= 4;
}
}
@@ -4543,7 +4543,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(`${His} belly steadily swells from a few months of apparent pregnancy, to "spent too much time at the buffet", until it finally stops wobbling, grows taut and forces ${his} belly button into an outie. Your cow groans not only with the weight and mounting pressure, but with guilt as well. Before long, ${he} reaches a quivering orgasm.`);
}
- r.push(`You stroke ${his} gurgling stomach slowly, before turning off the valve, unfastening ${his} binds and leaving your <span class="hotpink">very pleased</span> cum balloon to savor ${his} meal. You'll make sure to set aside enough cum from your cumslaves for ${him} to drink ${himself} stupid with, and, glancing over your shoulder, find ${him} eagerly masturbating to ${his} cum filled gut. ${He}'ll probably intend to keep ${himself} filled to the brim, which is fine by you.`);
+ r.push(`You stroke ${his} gurgling stomach slowly, before turning off the valve, unfastening ${his} binds and leaving your <span class="hotpink">very pleased</span> cum balloon to savor ${his} meal. You'll make sure to set aside enough cum from your cumslaves for ${him} to drink ${himself} stupid with, and, glancing over your shoulder, find ${him} eagerly masturbating to ${his} cum-filled gut. ${He}'ll probably intend to keep ${himself} filled to the brim, which is fine by you.`);
slave.devotion += 5;
} else {
if (!hasBothEyes(slave)) {
@@ -4551,7 +4551,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(`${His} eyes swell`);
}
- r.push(`with horror, but ${he} does not flinch or make a sound. ${His} belly also swells, from a few months of apparent pregnancy, to 'spent too much time at the buffet', till it finally stops wobbling, grows taut and forces ${his} belly button into an outie. Satisfied, you shut off the valve, deciding to leave ${him} to consider ${his} cum filled middle. Time passes. ${His}`);
+ r.push(`with horror, but ${he} does not flinch or make a sound. ${His} belly also swells, from a few months of apparent pregnancy, to 'spent too much time at the buffet', till it finally stops wobbling, grows taut and forces ${his} belly button into an outie. Satisfied, you shut off the valve, deciding to leave ${him} to consider ${his} cum-filled middle. Time passes. ${His}`);
if (canSee(slave)) {
r.push(`eyes are glazed over,`);
} else {
@@ -4629,7 +4629,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(`${His} eyes swell`);
}
- r.push(`with horror, but ${he} does not flinch or make a sound. ${His} belly also swells, from a few months of apparent pregnancy, to "spent too much time at the buffet", till it finally stops wobbling, grows taut and forces ${his} belly button into an outie. Satisfied, you shut off the valve, deciding to leave ${him} to consider ${his} milk filled middle. Time passes. ${His}`);
+ r.push(`with horror, but ${he} does not flinch or make a sound. ${His} belly also swells, from a few months of apparent pregnancy, to "spent too much time at the buffet", till it finally stops wobbling, grows taut and forces ${his} belly button into an outie. Satisfied, you shut off the valve, deciding to leave ${him} to consider ${his} milk-filled middle. Time passes. ${His}`);
if (canSee(slave)) {
r.push(`eyes are glazed over,`);
} else {
@@ -4838,6 +4838,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.trust += 20;
slave.boobs += 500;
slave.drugs = "hyper breast injections";
+ App.Events.refreshEventArt(slave);
jQuery("#introResult").empty().append(
`${He} squeals in protest as you inject ${his} breasts with their first dosage of HA-HGH, though ${he} changes ${his} tune by the end of the day once ${he} realizes ${his} breasts are bigger. By the end of the week, ${he}'s <span class="hotpink">deliriously happy</span> over ${his} swollen chest and <span class="mediumaquamarine">hopes</span> you'll let them grow even larger.`
);
@@ -4853,6 +4854,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.trust += 10;
slave.boobs += 200;
slave.drugs = "breast injections";
+ App.Events.refreshEventArt(slave);
jQuery("#introResult").empty().append(
`${He} squeals in protest as you inject ${his} breasts with their first dosage of A-HGH, though ${he} changes ${his} tune by the end of the week once ${he} realizes ${his} breasts are bigger than before. ${He}'s <span class="hotpink">deliriously happy</span> that ${his} chest is swelling and <span class="mediumaquamarine">hopes</span> you'll make them even larger.`
);
@@ -4883,6 +4885,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
slave.boobShape = "normal";
}
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`You escort ${him} to the remote surgery, strap ${him} in, and put ${him} under. When ${he} awakes, ${he} can't`);
if (hasAnyArms(slave)) {
@@ -4915,6 +4918,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
slave.boobShape = "normal";
}
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`You escort ${him} to the remote surgery, strap ${him} in, and put ${him} under. When ${he} awakes, ${he} can't`);
if (hasAnyArms(slave)) {
@@ -4954,6 +4958,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
slave.boobShape = "normal";
}
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`You escort ${him} to the remote surgery, strap ${him} in, and put ${him} under. When ${he} awakes, ${he} can't`);
if (hasAnyArms(slave)) {
@@ -4987,6 +4992,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
slave.boobShape = "normal";
}
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`You escort ${him} to the remote surgery, strap ${him} in, and put ${him} under. When ${he} awakes, ${he} can't`);
if (hasAnyArms(slave)) {
@@ -5039,6 +5045,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.devotion += 15;
slave.trust += 15;
slave.bellyAccessory = "a huge empathy belly";
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`You tell ${him} to cover ${his} eyes and wait while you go fetch something for ${him}. Lugging back the biggest empathy belly you had available, you slip it onto ${him}, eliciting a grunt of discomfort. You order ${him} to open ${his} eyes and look ${himself} over. ${He}'s <span class="hotpink">deliriously happy</span> at ${his} huge belly and <span class="mediumaquamarine">bounces cheerfully</span> when ${he}`);
if (canHear(slave)) {
@@ -5063,6 +5070,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
surgeryDamage(slave, 50);
SetBellySize(slave);
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`You escort ${him} to the remote surgery, strap ${him} in, and put ${him} under. When ${he} awakes from ${his} induced coma, ${he} nearly faints at the`);
if (canSee(slave)) {
@@ -5095,6 +5103,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
surgeryDamage(slave, 10);
SetBellySize(slave);
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`You escort ${him} to the remote surgery, strap ${him} in, and put ${him} under. When ${he} awakes, ${he} can't`);
if (hasAnyArms(slave)) {
@@ -5145,6 +5154,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.trust += 20;
slave.dick += 3;
slave.drugs = "hyper penis enhancement";
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`${He} squeals in protest as you inject ${his} penis with its first dosage of HA-HGH, though ${he} changes ${his} tune by the end of the day once ${he} realizes ${his} dick feels heavier. By the end of the week, ${he}'s <span class="hotpink">deliriously happy</span> over ${his} meaty cock and <span class="mediumaquamarine">hopes</span> you'll let it grow even larger.`);
jQuery("#introResult").empty().append(r.join(" "));
@@ -5160,6 +5170,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.trust += 10;
slave.dick += 1;
slave.drugs = "penis enhancement";
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`${He} squeals in protest as you inject ${his} cock with its first dosage of A-HGH, though ${he} changes ${his} tune by the end of the week once ${he} realizes ${his} dick feels heavier than before. ${He}'s <span class="hotpink">deliriously happy</span> that ${his} penis is steadily growing and <span class="mediumaquamarine">hopes</span> you'll make it even larger.`);
jQuery("#introResult").empty().append(r.join(" "));
@@ -5200,6 +5211,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.trust += 20;
slave.balls += 10;
slave.drugs = "hyper testicle enhancement";
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`${He} squeals in protest as you inject ${his} testicles with their first dosage of HA-HGH, though ${he} changes ${his} tune by the end of the day once ${he} realizes ${his} nuts feel heavier. By the end of the week, ${he}'s <span class="hotpink">deliriously happy</span> over ${his} swollen balls and <span class="mediumaquamarine">hopes</span> you'll let them grow even larger.`);
jQuery("#introResult").empty().append(r.join(" "));
@@ -5215,6 +5227,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.trust += 10;
slave.balls += 1;
slave.drugs = "testicle enhancement";
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`${He} squeals in protest as you inject ${his} testicles with their first dosage of A-HGH, though ${he} changes ${his} tune by the end of the week once ${he} realizes ${his} nuts feel heavier and fuller than before. ${He}'s <span class="hotpink">deliriously happy</span> that ${his} balls are steadily swelling and <span class="mediumaquamarine">hopes</span> you'll make them even larger.`);
jQuery("#introResult").empty().append(r.join(" "));
@@ -5255,6 +5268,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.hipsImplant = 1;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
surgeryDamage(slave, 40);
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`You escort ${him} to the remote surgery, strap ${him} in, and put ${him} under. When ${he} awakes, ${he} can't`);
if (hasAnyArms(slave)) {
@@ -5281,6 +5295,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.hipsImplant = 1;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
surgeryDamage(slave, 40);
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`You escort ${him} to the remote surgery, strap ${him} in, and put ${him} under. When ${he} awakes, ${he} can't`);
if (hasAnyArms(slave)) {
@@ -5329,6 +5344,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.trust += 20;
slave.butt += 3;
slave.drugs = "hyper butt injections";
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`${He} squeals in protest as you inject ${his} buttcheeks with their first dosage of HA-HGH, though ${he} changes ${his} tune by the end of the day once ${he} realizes ${his} butt is larger than ever. By the end of the week, ${he}'s <span class="hotpink">deliriously happy</span> over ${his} swollen rear and <span class="mediumaquamarine">hopes</span> you'll let it grow even larger.`);
jQuery("#introResult").empty().append(r.join(" "));
@@ -5344,6 +5360,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.trust += 10;
slave.butt += 1;
slave.drugs = "butt injections";
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`${He} squeals in protest as you inject ${his} buttcheeks with their first dosage of A-HGH, though ${he} changes ${his} tune by the end of the week once ${he} realizes ${his} butt is bigger than before. ${He}'s <span class="hotpink">deliriously happy</span> that ${his} rear is swelling and <span class="mediumaquamarine">hopes</span> you'll make it even larger.`);
jQuery("#introResult").empty().append(r.join(" "));
@@ -5368,6 +5385,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.buttImplantType = "advanced fillable";
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
surgeryDamage(slave, 10);
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`You escort ${him} to the remote surgery, strap ${him} in, and put ${him} under. When ${he} awakes, ${he} can't`);
if (hasAnyArms(slave)) {
@@ -5395,6 +5413,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.buttImplantType = "fillable";
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
surgeryDamage(slave, 10);
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`You escort ${him} to the remote surgery, strap ${him} in, and put ${him} under. When ${he} awakes, ${he} can't`);
if (hasAnyArms(slave)) {
@@ -5421,6 +5440,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.buttImplantType = "string";
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
surgeryDamage(slave, 10);
+ App.Events.refreshEventArt(slave);
const r = [];
r.push(`You escort ${him} to the remote surgery, strap ${him} in, and put ${him} under. When ${he} awakes, ${he} can't`);
if (hasAnyArms(slave)) {
diff --git a/src/npc/generate/slaveGenerationJS.js b/src/npc/generate/slaveGenerationJS.js
index aea42dcc3584ad1718f4eb8d694c52b8b8abf461..524a2ddf936489e19d14f726d7f5dc97179172ac 100644
--- a/src/npc/generate/slaveGenerationJS.js
+++ b/src/npc/generate/slaveGenerationJS.js
@@ -1423,7 +1423,7 @@ globalThis.generatePuberty = function(slave) {
/**
* Apply the effects of an age lift (make them appear younger than they do currently)
- * @param {App.Entity.SlaveState} slave
+ * @param {FC.HumanState} slave
*/
globalThis.applyAgeImplant = function(slave) {
if (slave.visualAge >= 25) {
@@ -1435,7 +1435,7 @@ globalThis.applyAgeImplant = function(slave) {
/**
* Makes someone appear older than they do currently
- * @param {App.Entity.SlaveState} slave
+ * @param {FC.HumanState} slave
*/
globalThis.applyAgeImplantOlder = function(slave) {
if (slave.visualAge < 80) {
diff --git a/src/npc/importSlave.js b/src/npc/importSlave.js
index 857a98725c745601d9b322bef5626ed2904c1a6d..675d24968595a78d4dbcee11a0a569c9f692778e 100644
--- a/src/npc/importSlave.js
+++ b/src/npc/importSlave.js
@@ -26,6 +26,6 @@ App.UI.SlaveInteract.importSlave = function() {
App.UI.SlaveInteract.exportSlave = function(slave) {
const el = new DocumentFragment();
App.UI.DOM.appendNewElement("p", el, `Copy the following block of code for importing: `, "note");
- App.UI.DOM.appendNewElement("code", el, toJson(slave));
+ App.UI.DOM.appendNewElement("textarea", el, toJson(slave), ["export-field"]);
return el;
};
diff --git a/src/npc/infants/infantSummary.js b/src/npc/infants/infantSummary.js
index 2171b9167e231e9a4f031cd728972f7b5775eee6..f201007f3ade8eeed9a9b44581db71b75aadf3a5 100644
--- a/src/npc/infants/infantSummary.js
+++ b/src/npc/infants/infantSummary.js
@@ -1200,7 +1200,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
intelligence += child.intelligenceImplant;
}
- if (child.fetish === "mindbroken") {
+ if (child.fetish === Fetish.MINDBROKEN) {
return;
} else if (child.hasOwnProperty("intelligenceImplant") && child.intelligenceImplant >= 30) {
if (intelligence >= 130) {
diff --git a/src/npc/infants/longInfantDescription.js b/src/npc/infants/longInfantDescription.js
index 9e3f39f648597252dc9de4eca105f73d3fd4a9e2..40657d5fa00706ea619ef63ef7990cfcb7a6271b 100644
--- a/src/npc/infants/longInfantDescription.js
+++ b/src/npc/infants/longInfantDescription.js
@@ -221,7 +221,7 @@ App.Facilities.Nursery.LongInfantDescription = function(child, {market = 0, even
r += `. `;
}
- r += App.Desc.family(child) + ' ';
+ // r += App.Desc.family(child) + ' '; TODO Assemble DOM instead of string to make this work again
if (father && fatherPC) {
if (child.eyeColor === PC.eye.origColor) {
diff --git a/src/npc/interaction/FFuckdollAnal.js b/src/npc/interaction/FFuckdollAnal.js
index 550fc70058c1096da62273c8d01b4816e4f7ef10..1d18b2774157357e1af83d79138ecf5bc4abd702 100644
--- a/src/npc/interaction/FFuckdollAnal.js
+++ b/src/npc/interaction/FFuckdollAnal.js
@@ -132,7 +132,7 @@ App.Interact.fFuckdollAnal = function(slave) {
r.push(`The Fuckdoll will be cleaned by another slave.`);
}
if (slave.anus === 0) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
r.push(`As you return to your business, ${he} shakes slightly in place, and a few low moans come out of ${his} face hole. This is probably a reaction to losing ${his} anal virginity.`);
} else {
r.push(`${He} gives no external indication that ${he}'s aware that ${he}'s just lost ${his} anal virginity.`);
diff --git a/src/npc/interaction/FFuckdollImpreg.js b/src/npc/interaction/FFuckdollImpreg.js
index 480dd340eb72b93132e36ec7be15a9ab37fe1710..c6ceff21948174ea2a643c0dac9e130e690a102b 100644
--- a/src/npc/interaction/FFuckdollImpreg.js
+++ b/src/npc/interaction/FFuckdollImpreg.js
@@ -137,7 +137,7 @@ App.Interact.fFuckdollImpreg = function(slave) {
}
r.push(`The Fuckdoll will be cleaned by another slave.`);
if (slave.anus === 0) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
r.push(`As you return to your business, ${he} shakes slightly in place, and a few low moans come out of ${his} face hole. This is probably a reaction to losing ${his} anal virginity.`);
} else {
r.push(`${He} gives no external indication that ${he}'s aware that ${he}'s just lost ${his} virginity.`);
@@ -157,7 +157,7 @@ App.Interact.fFuckdollImpreg = function(slave) {
}
r.push(`The Fuckdoll will be cleaned by another slave.`);
if (slave.vagina === 0) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
r.push(`As you return to your business, ${he} shakes slightly in place, and a few low moans come out of ${his} face hole. This is probably a reaction to losing ${his} virginity.`);
} else {
r.push(`${He} gives no external indication that ${he}'s aware that ${he}'s just lost ${his} virginity.`);
diff --git a/src/npc/interaction/FFuckdollVaginal.js b/src/npc/interaction/FFuckdollVaginal.js
index 57202af5626dfabdfa14ea29c1193c245512201e..e1e06ac71a2f5847a0a9e85f183b1349ef961136 100644
--- a/src/npc/interaction/FFuckdollVaginal.js
+++ b/src/npc/interaction/FFuckdollVaginal.js
@@ -133,7 +133,7 @@ App.Interact.fFuckdollVaginal = function(slave) {
r.push(`The Fuckdoll will be cleaned by another slave.`);
}
if (slave.vagina === 0) {
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
r.push(`As you return to your business, ${he} shakes slightly in place, and a few low moans come out of ${his} face hole. This is probably a reaction to losing ${his} virginity.`);
} else {
r.push(`${He} gives no external indication that ${he}'s aware that ${he}'s just lost ${his} virginity.`);
diff --git a/src/npc/interaction/FSuckle.js b/src/npc/interaction/FSuckle.js
index 7ea15f6099556f1145b2af2808851bec87cad7b1..95305395d154b56dc330d5948a5d7d4e9e43cb60 100644
--- a/src/npc/interaction/FSuckle.js
+++ b/src/npc/interaction/FSuckle.js
@@ -50,7 +50,7 @@ App.Interact.fSuckle = function(slave) {
}
if (canMove(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} complies without a thought.`);
} else if (slave.devotion > 20 && slave.trust > 20) {
r.push(`${He} complies,`);
@@ -80,7 +80,7 @@ App.Interact.fSuckle = function(slave) {
}
}
} else {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} pays no attention as ${he} is carefully positioned for your use.`);
} else if (slave.devotion > 20 && slave.trust > 20) {
r.push(`Though ${he} has no agency over this,`);
@@ -191,7 +191,7 @@ App.Interact.fSuckle = function(slave) {
} else {
r.push(`the needy hole leaking all over your floor.`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} obeys without question and mechanically begins to`);
if (V.PC.dick !== 0) {
r.push(`jerk you off.`);
@@ -236,7 +236,7 @@ App.Interact.fSuckle = function(slave) {
}
} else {
r.push(`instruct ${him} to use ${his} hand to appease the evident arousal between your legs.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} obeys without question and mechanically begins to`);
if (V.PC.dick !== 0) {
r.push(`jerk you off.`);
@@ -296,7 +296,7 @@ App.Interact.fSuckle = function(slave) {
r.push(`clit, as if begging to join in. You struggle to shift yourself to an angle where you could attach your sex to`);
}
r.push(`${his} nippleslit.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.PC.dick !== 0) {
r.push(`${He} gasps in surprise as you force yourself all the way into ${him} and your gravid swell parts ${his} breasts.`);
} else {
@@ -334,7 +334,7 @@ App.Interact.fSuckle = function(slave) {
r.push(`clit, as if begging to join in. You shift to angle yourself just right before thrusting your hips upwards in an attempt to attach your sex to`);
}
r.push(`${his} nippleslit.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (V.PC.dick !== 0) {
r.push(`${He} gasps in surprise as you push all the way into ${him}.`);
} else {
@@ -456,7 +456,7 @@ App.Interact.fSuckle = function(slave) {
} else {
r.push(`instruct ${him} to use ${his} hand to appease the evident arousal between your legs.`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} obeys without question and mechanically begins to`);
if (V.PC.dick !== 0) {
r.push(`jerk you off.`);
@@ -480,7 +480,7 @@ App.Interact.fSuckle = function(slave) {
}
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`You`);
if (mood === 1) {
r.push(`struggle to lean forward and wrap your lips gently around a nipple,`);
@@ -687,7 +687,7 @@ App.Interact.fSuckle = function(slave) {
r.push(`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.`);
} else if (mood === 1) {
r.push(`You cuddle up against ${him}, holding close to ${him} as you snooze off your milky meal.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} struggles in discomfort at your pregnant weight pinning ${him} down until ${he} manages to rouse your ${onlyPlural(V.PC.pregType, 'child', 'children')} and get you to move.`);
} else if (slave.devotion > 20 && slave.trust > 20) {
r.push(`${He} holds you close, gently caressing your head and pregnancy as you rest it off.`);
diff --git a/src/npc/interaction/fAbuse.js b/src/npc/interaction/fAbuse.js
index e0778ac089ace6073ed91554582f248863aec242..3812a95d08e1d9ed845e8a04c2094a10d40afdd9 100644
--- a/src/npc/interaction/fAbuse.js
+++ b/src/npc/interaction/fAbuse.js
@@ -15,15 +15,15 @@ App.Interact.fAbuse = function(slave) {
if (slave.assignment === Job.BODYGUARD) {
if (slave.fetish === "masochist" && slave.fetishKnown === 1 && slave.fetishStrength > 95) {
r.push(`Knowing how much your bodyguard likes being hurt, you decide to reward ${him} in ${his} own particular way.`);
- } else if (slave.muscles < -5 && slave.skill.combat === 0) {
+ } else if (slave.muscles < -5 && slave.skill.combat <= 30) {
r.push(`Looking at your bodyguard, you think ${he} doesn't seem that dangerous, as ${he} can barely hold a weapon up. You order ${him} to spar with you, and you quickly overpower ${him} without even breaking a sweat. Afterwards, you take the pretext of punishing ${him} to satisfy your urges.`);
- } else if (slave.muscles >= -5 && slave.muscles <= 5 && slave.skill.combat !== 0) {
+ } else if (slave.muscles >= -5 && slave.muscles <= 5 && slave.skill.combat > 30) {
r.push(`You glance at your bodyguard. ${He} looks like ${he} can handle ${himself}, and you know ${he} does, but ${his} lack of musculature makes ${him} look somewhat frail. You inform ${him} that ${he} isn't muscular enough, and that you'll punish ${him} yourself for neglecting ${his} physique.`);
- } else if (slave.muscles > 50 && slave.skill.combat === 0) {
+ } else if (slave.muscles > 50 && slave.skill.combat <= 30) {
r.push(`Your bodyguard may look strong and powerful, you know ${he} can't really handle ${his} weapon. You order ${him} to spar with you, and you use ${his} own muscles against ${him}, winning easily. Afterwards, you take the pretext of punishing ${him} to satisfy your urges.`);
- } else if (slave.muscles > 5 && slave.skill.combat !== 0) {
+ } else if (slave.muscles > 5 && slave.skill.combat > 30) {
r.push(`Your bodyguard stands at your side. ${He} is definitely a force to be reckoned with. You know you'd have a hard time besting ${him}, and do not wish to get hurt, so you'll just inform ${him} ${he}'ll be undertaking some particular training.`);
- } else if (slave.muscles > 5 && slave.skill.combat === 0) {
+ } else if (slave.muscles > 5 && slave.skill.combat <= 30) {
r.push(`Your bodyguard may look fit, you know ${he} can't really handle ${his} weapon. You order ${him} to spar with you; while ${he} may be quick, ${he} mostly just flails ${his} weapon around allowing you an easy win. Afterwards, you take the pretext of punishing ${him} to satisfy your urges.`);
}
}
@@ -680,15 +680,15 @@ App.Interact.fAbuse = function(slave) {
}
if (slave.assignment === Job.BODYGUARD) {
- if (slave.muscles <= 5 && slave.skill.combat === 0) {
+ if (slave.muscles <= 5 && slave.skill.combat <= 30) {
r.push(`Your bodyguard accepts this as a punishment for ${his} uselessness.`);
- } else if (slave.muscles <= 5 && slave.skill.combat !== 0) {
+ } else if (slave.muscles <= 5 && slave.skill.combat > 30) {
r.push(`Your bodyguard accepts this as a punishment for ${his} lack of muscles`);
- } else if (slave.muscles > 30 && slave.skill.combat === 0) {
+ } else if (slave.muscles > 30 && slave.skill.combat <= 30) {
r.push(`Your bodyguard accepts this as a punishment for ${his} lack of combat skills`);
- } else if (slave.muscles > 5 && slave.skill.combat !== 0) {
+ } else if (slave.muscles > 5 && slave.skill.combat > 30) {
r.push(`Your bodyguard just admits it as a part of ${his} body training.`);
- } else if (slave.muscles > 5 && slave.skill.combat === 0) {
+ } else if (slave.muscles > 5 && slave.skill.combat <= 30) {
r.push(`Your bodyguard accepts this as a punishment for ${his} lack of expertise`);
}
if (slave.fetish === "masochist" && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
@@ -754,7 +754,7 @@ App.Interact.fAbuse = function(slave) {
}
}
if (random(1, 100) > (50+slave.devotion+slave.trust) && slave.assignment !== Job.BODYGUARD) {
- if (slave.fetish !== "mindbroken" && slave.fetishKnown === 0 && slave.clitSetting !== slave.fetish) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fetishKnown === 0 && slave.clitSetting !== slave.fetish) {
r.push(`${His} acceptance of your abuse has twisted ${his}`);
if (random(1, 2) === 1 && slave.fetish !== "submissive") {
r.push(`<span class="lightcoral">sexuality towards submissiveness.</span>`);
@@ -767,7 +767,7 @@ App.Interact.fAbuse = function(slave) {
}
}
}
- if (slave.fetish === "mindbroken" && slave.relationship === -3) {
+ if (slave.fetish === Fetish.MINDBROKEN && slave.relationship === -3) {
if (slave.kindness) {
slave.kindness = 0;
}
diff --git a/src/npc/interaction/fAnimal.js b/src/npc/interaction/fAnimal.js
index f418979d7ab2f72a27ec32cfd46be362e274fc85..b19e5cc1572d4952f23e1b8ae12f66588f4d56ee 100644
--- a/src/npc/interaction/fAnimal.js
+++ b/src/npc/interaction/fAnimal.js
@@ -19,7 +19,7 @@ App.Interact.fAnimal = function(slave, type, act) {
ORAL: "oral",
};
- const approvingFetishes = ["masochist", "humiliation", "perverted", "sinful"]; // not strictly fetishes, but approvingFetishesAndBehavioralQuirksAndSexualQuirks doesn't have the same ring to it
+ const approvingFetishes = [Fetish.MASOCHIST, Fetish.HUMILIATION, Fetish.BESTIALITY, "perverted", "sinful"]; // not strictly fetishes, but approvingFetishesAndBehavioralQuirksAndSexualQuirks doesn't have the same ring to it
/** @type {App.Entity.Animal} */
const animal = getAnimal(V.active[type]);
@@ -32,30 +32,7 @@ App.Interact.fAnimal = function(slave, type, act) {
let orifice;
const anAnimal = `${animal.articleAn} ${animal.name}`;
-
- if ([Job.FUCKTOY, Job.MASTERSUITE].includes(slave.assignment)) {
- if (slave.toyHole === "pussy") {
- act = "vaginal";
- } else if (slave.toyHole === "ass") {
- act = "anal";
- } else if (slave.toyHole === "mouth") {
- act = "oral";
- } else {
- if (canDoVaginal(slave)) {
- act = "vaginal";
- } else if (canDoAnal(slave)) {
- act = "anal";
- } else {
- act = "oral";
- }
- }
- } else if (canDoVaginal(slave)) {
- act = "vaginal";
- } else if (canDoAnal(slave)) {
- act = "anal";
- } else {
- act = "oral";
- }
+ const hasFuckedAnimals = slave.partners.has(-8);
seX(slave, act, "animal");
@@ -63,8 +40,8 @@ App.Interact.fAnimal = function(slave, type, act) {
approvingFetishes.includes(slave.fetish) ||
approvingFetishes.includes(slave.sexualQuirk) ||
approvingFetishes.includes(slave.behavioralQuirk) ||
- slave.fetish === "buttslut" && act === Acts.ANAL ||
- slave.fetish === "cumslut" && act === Acts.ORAL ||
+ slave.fetish === Fetish.BUTTSLUT && act === Acts.ANAL ||
+ slave.fetish === Fetish.CUMSLUT && act === Acts.ORAL ||
slave.sexualQuirk === "gagfuck queen" && act === Acts.ORAL;
switch (act) {
@@ -72,7 +49,7 @@ App.Interact.fAnimal = function(slave, type, act) {
orifice = () => either("mouth", "throat");
break;
case Acts.VAGINAL:
- orifice = () => either("pussy", "cunt");
+ orifice = () => either("pussy", "cunt", "slit");
hole = 0;
break;
case Acts.ANAL:
@@ -83,13 +60,13 @@ App.Interact.fAnimal = function(slave, type, act) {
throw new Error(`Unexpected act type '${act}' in fAnimal()`);
}
- if (slave.fetish === "cumslut" && act === Acts.ORAL) {
+ if (slave.fetish === Fetish.CUMSLUT && act === Acts.ORAL) {
fetishDesc = `getting to drink more cum`;
- } else if (slave.fetish === "humiliation") {
+ } else if (slave.fetish === Fetish.HUMILIATION) {
fetishDesc = `committing such a humiliating act`;
- } else if (slave.fetish === "buttslut" && act === Acts.ANAL) {
+ } else if (slave.fetish === Fetish.BUTTSLUT && act === Acts.ANAL) {
fetishDesc = `getting to take a cock up ${his} ass`;
- } else if (slave.fetish === "masochist") {
+ } else if (slave.fetish === Fetish.MASOCHIST) {
fetishDesc = `committing such a painful act`;
} else if (slave.sexualQuirk === "perverted") {
fetishDesc = `committing such a perverted act`;
@@ -123,6 +100,11 @@ App.Interact.fAnimal = function(slave, type, act) {
} else if (slave.devotion > 20) {
text.push(slaveGainsQuirk());
}
+ if (random(100) > 10 &&
+ slave.fetish === Fetish.NONE ||
+ (!approvingFetishes.includes(slave.fetish) && slave.fetishStrength < 75)) {
+ text.push(slaveGainsFetish());
+ }
if (V.postSexCleanUp) {
text.push(cleanup());
@@ -149,23 +131,31 @@ App.Interact.fAnimal = function(slave, type, act) {
? `get fucked by`
: `get fucked in the ass by`} ${anAnimal}.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
text.push(`${slave.slaveName} nods ${his} head dumbly, ${his} eyes vacant${!canSee(slave) ? ` as always` : ``}.`);
} else {
if (slave.devotion > 50) {
if (act === Acts.ORAL) {
if (slaveApproves) {
- text.push(`${slave.slaveName}'s face visibly brightens at the prospect of ${fetishDesc}, even if it's an animal${slave.fetish === "cumslut" ? `'s cum` : ` that ${he} has to suck off`}.`);
+ text.push(`${slave.slaveName}'s face visibly brightens at the prospect of ${fetishDesc}, even if it's ${anAnimal}${slave.fetish === Fetish.CUMSLUT ? `'s cum` : ` that ${he} has to suck off`}.`);
} else {
- text.push(`${slave.slaveName} visibly blanches at the thought of having to suck down an animal's cum, but ${he} is so devoted to you that ${he} reluctantly agrees.`);
+ text.push(`${slave.slaveName} visibly blanches at the thought of having to suck down ${anAnimal}'s cum,`);
+ if (!hasFuckedAnimals) {
+ text.push(`especially because ${he}'s never fucked an animal before,`);
+ }
+ text.push(`but ${he} is so devoted to you that ${he} reluctantly agrees.`);
}
} else {
if ((act === Acts.VAGINAL && slave.vagina > 0) ||
(act === Acts.ANAL && slave.anus > 0)) {
if (slaveApproves) {
- text.push(`${slave.slaveName}'s face visibly brightens at the thought of ${fetishDesc}, even if the dick is an animal's.`);
+ text.push(`${slave.slaveName}'s face visibly brightens at the thought of ${fetishDesc}, even if the dick is ${anAnimal}'s.`);
} else {
- text.push(`${slave.slaveName} looks visibly disturbed, but is so attentive to your will that ${he} agrees.`);
+ if (hasFuckedAnimals) {
+ text.push(`This wouldn't be the first time ${he}'s had to fuck an animal, and ${he} so is willing to do absolutely anything for you that ${he} nonchalantly agrees.`);
+ } else {
+ text.push(`${slave.slaveName} looks visibly disturbed because ${he}'s never fucked an animal before, but is so attentive to your will that ${he} reluctantly agrees.`);
+ }
}
} else {
if (slaveApproves) {
@@ -180,7 +170,11 @@ App.Interact.fAnimal = function(slave, type, act) {
if (slaveApproves) {
text.push(`${slave.slaveName} isn't too keen on the idea of sucking off an animal, but the idea of ${fetishDesc} is enough to get ${him} to comply.`);
} else {
- text.push(`${slave.slaveName} tries in vain to conceal ${his} horror at the thought of blowing an animal, but quickly regains ${his} composure.`);
+ text.push(`${slave.slaveName} tries in vain to conceal ${his} horror at the thought of blowing an animal,`);
+ if (!hasFuckedAnimals) {
+ text.push(`especially because ${he}'s never fucked an animal before,`);
+ }
+ text.push(`but quickly regains ${his} composure.`);
}
} else {
if (
@@ -188,9 +182,13 @@ App.Interact.fAnimal = function(slave, type, act) {
(act === Acts.ANAL && slave.anus > 0)
) {
if (slaveApproves) {
- text.push(`${slave.slaveName} doesn't seem terribly keen on the idea of fucking an animal, but the thought of ${fetishDesc} seems to be enough to win ${him} over.`);
+ text.push(`${slave.slaveName} doesn't seem terribly keen on the idea of fucking an animal ${hasFuckedAnimals ? `again` : ``}, but the thought of ${fetishDesc} seems to be enough to win ${him} over.`);
} else {
- text.push(`${slave.slaveName} tries in vain to conceal ${his} horror at the thought of fucking an animal, but quickly regains ${his} composure.`);
+ if (hasFuckedAnimals) {
+ text.push(`This wouldn't be the first time ${he}'s had to fuck an animal, but you can tell ${he} still isn't exactly thrilled about the idea.`);
+ } else {
+ text.push(`${slave.slaveName} tries in vain to conceal ${his} horror at the thought of fucking an animal, but quickly regains ${his} composure.`);
+ }
}
} else {
if (slaveApproves) {
@@ -205,14 +203,22 @@ App.Interact.fAnimal = function(slave, type, act) {
if (slaveApproves) {
text.push(`${slave.slaveName} looks disgusted at the thought of sucking off an animal at first, but the thought of the ${fetishDesc} that comes with it seems to spark a small flame of lust in ${him}.`);
} else {
- text.push(`${slave.slaveName} tries in vain to conceal ${his} horror at the thought of blowing an animal${canWalk(slave) ? `, and only the threat of worse punishment keeps ${him} from running away as fast as ${he} can` : ``}.`);
+ if (hasFuckedAnimals) {
+ text.push(`This wouldn't be the first time ${he}'s had to fuck an animal, and you can tell the memories of ${his} previous encounters are flooding back as ${he} pales.`);
+ } else {
+ text.push(`${slave.slaveName} tries in vain to conceal ${his} horror at the thought of blowing an animal${canWalk(slave) ? `, and only the threat of worse punishment keeps ${him} from running away as fast as ${he} can` : ``}.`);
+ }
}
} else {
if ((act === Acts.VAGINAL && slave.vagina > 0) || (act === Acts.ANAL && slave.anus > 0)) {
if (slaveApproves) {
text.push(`${slave.slaveName} looks disgusted at the thought of fucking an animal at first, but the thought of the ${fetishDesc} that comes with it seems to spark a small flame of lust in ${him}.`);
} else {
- text.push(`${slave.slaveName} tries in vain to conceal ${his} horror at the thought of fucking an animal${canWalk(slave) ? `, and only the threat of worse punishment keeps ${him} from running away as fast as ${he} can` : ``}.`);
+ if (hasFuckedAnimals) {
+ text.push(`This wouldn't be the first time ${he}'s had to fuck an animal, and you can tell the memories of ${his} previous encounters are flooding back as ${he} pales.`);
+ } else {
+ text.push(`${slave.slaveName} tries in vain to conceal ${his} horror at the thought of fucking an animal${canWalk(slave) ? `, and only the threat of worse punishment keeps ${him} from running away as fast as ${he} can` : ``}.`);
+ }
}
} else {
if (slaveApproves) {
@@ -244,11 +250,11 @@ App.Interact.fAnimal = function(slave, type, act) {
switch (animal.name) {
case V.active.canine:
- if (type === Acts.ORAL) {
+ if (act === Acts.ORAL) {
if (slaveApproves) {
text.push(`The slave seems to quickly get over the fact that the dick currently in ${his} mouth belongs to a canine as ${his} more carnal desires kick in.`);
} else {
- text.push(`The slave visibly gags as the unfamiliar texture of ${anAnimal}'s cock fills it, then gives a groan as the beast thrusts, filling ${his} throat.`);
+ text.push(`The slave visibly gags as the ${hasFuckedAnimals ? `strange` : `unfamiliar`} texture of ${anAnimal}'s cock fills it, then gives a groan as the beast thrusts, filling ${his} throat.`);
}
} else {
if (canWalk(slave)) {
@@ -261,22 +267,22 @@ App.Interact.fAnimal = function(slave, type, act) {
}
break;
case V.active.hooved:
- if (type === Acts.ORAL) {
+ if (act === Acts.ORAL) {
if (slaveApproves) {
text.push(`The slave seems to quickly get over the fact that dick currently in ${his} mouth is not a human one as ${his} more carnal desires kick in.`);
} else {
- text.push(`The slave visibly gags as the unfamiliar texture of ${anAnimal}'s cock fills it, then gives a groan as the beast thrusts, stretching ${his} poor throat to the limit.`);
+ text.push(`The slave visibly gags as the ${hasFuckedAnimals ? `strange` : `unfamiliar`} texture of ${anAnimal}'s cock fills it, then gives a groan as the beast thrusts, stretching ${his} poor throat to the limit.`);
}
} else {
text.push(`${slave.slaveName} gives a long, drawn-out moan as the huge phallus `, slave.vagina < 4 ? `<span class="change positive">stretches</span>` : `fills`, ` ${his} ${orifice()} nearly to its breaking point.`);
}
break;
case V.active.feline:
- if (type === Acts.ORAL) {
+ if (act === Acts.ORAL) {
if (slaveApproves) {
text.push(`The slave seems to quickly get over the fact that dick currently in ${his} mouth belongs to ${anAnimal} as ${his} more carnal desires kick in.`);
} else {
- text.push(`The slave visibly gags as the unfamiliar texture of ${anAnimal}'s cock fills it, then gives a groan as the beast thrusts, the barbs on its cock rubbing the inside of ${his} mouth raw.`);
+ text.push(`The slave visibly gags as the ${hasFuckedAnimals ? `strange` : `unfamiliar`} texture of ${anAnimal}'s cock fills it, then gives a groan as the beast thrusts, the barbs on its cock rubbing the inside of ${his} mouth raw.`);
}
} else {
text.push(`${slave.slaveName} gives a squeal of pain as the barbed cock makes its way into ${his} ${orifice()}.`);
@@ -302,7 +308,7 @@ App.Interact.fAnimal = function(slave, type, act) {
if (slaveApproves) {
text.push(`Though the slave still seems to have some reservations about sucking off an animal, ${he} seems to forget that the cock in ${his} mouth belongs to ${anAnimal} soon enough, once ${his} carnal desires kick in.`);
} else {
- text.push(`The slave visibly gags as the unfamiliar texture of ${anAnimal}'s cock fills it, and you get the feeling ${he} is beginning to reevaluate just how much ${he} wants to avoid punishment.`);
+ text.push(`The slave visibly gags as the ${hasFuckedAnimals ? `strange` : `unfamiliar`} texture of ${anAnimal}'s cock fills it, and you get the feeling ${he} is beginning to reevaluate just how much ${he} wants to avoid punishment.`);
}
} else {
if (canWalk(slave)) {
@@ -319,7 +325,7 @@ App.Interact.fAnimal = function(slave, type, act) {
if (slaveApproves) {
text.push(`Though the slave still seems to have some reservations about sucking off ${anAnimal}, ${he} seems to forget that the cock in ${his} mouth isn't human soon enough, once ${his} carnal desires kick in.`);
} else {
- text.push(`The slave visibly gags as the unfamiliar texture of ${anAnimal}'s cock fills it, and you get the feeling ${he} is beginning to reevaluate just how much ${he} wants to avoid punishment.`);
+ text.push(`The slave visibly gags as the ${hasFuckedAnimals ? `strange` : `unfamiliar`} texture of ${anAnimal}'s cock fills it, and you get the feeling ${he} is beginning to reevaluate just how much ${he} wants to avoid punishment.`);
}
} else {
text.push(`${slave.slaveName} gives a long, drawn-out groan as the huge phallus `, slave.vagina < 4 ? `<span class="change positive">stretches</span>` : `fills`, ` ${his} ${orifice()} nearly to its breaking point.`);
@@ -330,7 +336,7 @@ App.Interact.fAnimal = function(slave, type, act) {
if (slaveApproves) {
text.push(`Though the slave still seems to have some reservations about sucking off an animal, ${he} seems to forget that the cock in ${his} mouth belongs to a feline soon enough, once ${his} carnal desires kick in.`);
} else {
- text.push(`The slave visibly gags as the unfamiliar texture of ${anAnimal}'s barbed dick fills it, and you get the feeling ${he} is beginning to reevaluate just how much ${he} wants to avoid punishment.`);
+ text.push(`The slave visibly gags as the ${hasFuckedAnimals ? `strange` : `unfamiliar`} texture of ${anAnimal}'s barbed dick fills it, and you get the feeling ${he} is beginning to reevaluate just how much ${he} wants to avoid punishment.`);
}
} else {
text.push(`${slave.slaveName} gives a squeal of pain as the barbed cock makes its way into ${his} ${orifice()}.`);
@@ -356,7 +362,7 @@ App.Interact.fAnimal = function(slave, type, act) {
if (slaveApproves) {
text.push(`Though the slave still seems to have some reservations about sucking off an animal, ${he} seems to forget that the cock in ${his} mouth belongs to ${anAnimal} soon enough, once ${his} carnal desires kick in.`);
} else {
- text.push(`The slave visibly gags as the unfamiliar texture of ${anAnimal}'s cock fills it, and you get the feeling ${he} is beginning to reevaluate just how much ${he} wants to avoid punishment.`);
+ text.push(`The slave visibly gags as the ${hasFuckedAnimals ? `strange` : `unfamiliar`} texture of ${anAnimal}'s cock fills it, and you get the feeling ${he} is beginning to reevaluate just how much ${he} wants to avoid punishment.`);
}
} else {
if (canWalk(slave)) {
@@ -373,7 +379,7 @@ App.Interact.fAnimal = function(slave, type, act) {
if (slaveApproves) {
text.push(`Though the slave still seems to have some reservations about sucking off ${anAnimal}, ${he} seems to forget that the cock in ${his} mouth isn't human soon enough, once ${his} carnal desires kick in.`);
} else {
- text.push(`The slave visibly gags as the unfamiliar texture of ${anAnimal}'s cock fills it, and you get the feeling ${he} is beginning to reevaluate just how much ${he} wants to avoid punishment.`);
+ text.push(`The slave visibly gags as the ${hasFuckedAnimals ? `strange` : `unfamiliar`} texture of ${anAnimal}'s cock fills it, and you get the feeling ${he} is beginning to reevaluate just how much ${he} wants to avoid punishment.`);
}
} else {
text.push(`${slave.slaveName} gives a long, drawn-out groan as the huge phallus `, slave.vagina < 4 ? `<span class="change positive">stretches</span>` : `fills`, ` ${his} ${orifice()} nearly to its breaking point.`);
@@ -384,7 +390,7 @@ App.Interact.fAnimal = function(slave, type, act) {
if (slaveApproves) {
text.push(`Though the slave still seems to have some reservations about sucking off an animal, ${he} seems to forget that the cock in ${his} mouth belongs to a feline soon enough, once ${his} carnal desires kick in.`);
} else {
- text.push(`The slave visibly gags as the unfamiliar texture of ${anAnimal}'s barbed dick fills it, and you get the feeling ${he} is beginning to reevaluate just how much ${he} wants to avoid punishment.`);
+ text.push(`The slave visibly gags as the ${hasFuckedAnimals ? `strange` : `unfamiliar`} texture of ${anAnimal}'s barbed dick fills it, and you get the feeling ${he} is beginning to reevaluate just how much ${he} wants to avoid punishment.`);
}
} else {
text.push(`${slave.slaveName} gives a squeal of pain as the barbed cock makes its way into ${his} ${orifice()}.`);
@@ -417,7 +423,7 @@ App.Interact.fAnimal = function(slave, type, act) {
: `a slight blush to ${his} cheeks`}
tells you that ${he}'s enjoying this, at least a little.`);
} else {
- text.push(`The slave visibly gags as the unfamiliar texture of ${anAnimal}'s cock fills it, and you get the feeling ${he} would have run away a long time ago if ${he} wasn't a little tied up at the moment.`);
+ text.push(`The slave visibly gags as the ${hasFuckedAnimals ? `strange` : `unfamiliar`} texture of ${anAnimal}'s cock fills it, and you get the feeling ${he} would have run away a long time ago if ${he} wasn't more than a little tied up at the moment.`);
}
} else {
if (canWalk(slave)) {
@@ -441,7 +447,7 @@ App.Interact.fAnimal = function(slave, type, act) {
: `a slight blush to ${his} cheeks`}
tells you that ${he}'s enjoying this, at least a little.`);
} else {
- text.push(`The slave visibly gags as the unfamiliar texture of ${anAnimal}'s cock fills it, and you get the feeling ${he} would have run away a long time ago if ${he} wasn't a little tied up at the moment.`);
+ text.push(`The slave visibly gags as the ${hasFuckedAnimals ? `strange` : `unfamiliar`} texture of ${anAnimal}'s cock fills it, and you get the feeling ${he} would have run away a long time ago if ${he} wasn't a little tied up at the moment.`);
}
} else {
text.push(`${slave.slaveName} lets out a blood-curdling scream as the huge phallus `, slave.vagina < 4 ? `<span class="change positive">stretches</span>` : `fills`, ` ${his} ${orifice()} nearly to its breaking point.`);
@@ -459,7 +465,7 @@ App.Interact.fAnimal = function(slave, type, act) {
: `a slight blush to ${his} cheeks`}
tells you that ${he}'s enjoying this, at least a little.`);
} else {
- text.push(`The slave visibly gags as the unfamiliar texture of ${anAnimal}'s barbed dick fills it, and you get the feeling ${he} would have run away a long time ago if ${he} wasn't a little tied up at the moment .`);
+ text.push(`The slave visibly gags as the ${hasFuckedAnimals ? `strange` : `unfamiliar`} texture of ${anAnimal}'s barbed dick fills it, and you get the feeling ${he} would have run away a long time ago if ${he} wasn't a little tied up at the moment .`);
}
} else {
text.push(`${slave.slaveName} lets out a blood-curdling scream as the barbed cock makes its way into ${his} ${orifice()}.`);
@@ -483,8 +489,7 @@ App.Interact.fAnimal = function(slave, type, act) {
switch (animal.name) {
case V.active.canine:
if (act === Acts.ORAL) {
- // TODO: rewrite this so its not so similar
- text.push(`The ${animal.species === "dog" ? `hound` : animal.name} wastes no time in beginning to hammer away at ${his} ${orifice()} in the way only canines can, causing ${slave.slaveName} to moan uncontrollably as its thick, veiny member probes the depths of ${his} ${orifice()}. A few short minutes later, ${he} gives a loud groan ${slaveApproves ? `and shakes in orgasm ` : ``}as the ${animal.name}'s knot begins to swell and its dick begins to erupt a thick stream of jizz down ${his} abused throat. Soon enough, the ${animal.name} finally finishes cumming and its knot is sufficiently small enough to slip out of ${slave.slaveName}'s mouth, causing ${him} to immediately begin coughing and retching uncontrollably. Having finished its business, the ${animal.name} runs off, presumably in search of food.`);
+ text.push(`${slave.slaveName} gets to work, ${his} head bobbing back and forth rhythmically as ${he} works on bringing the ${animal.name} to orgasm. ${His} efforts pay off after a few minutes when the ${animal.species === "dog" ? `hound` : animal.name}'s knot begins to swell. Eyes wide and brimming with tears from the sudden lack of oxygen, ${he} realizes has no choice but to finish what ${he} started and swallow all of the semen pouring down ${his} abused throat. Soon enough, the ${animal.name} finally finishes cumming and its knot is sufficiently small enough to slip out of ${slave.slaveName}'s mouth, causing ${him} to immediately begin coughing and retching uncontrollably. Having finished its business, the ${animal.name} runs off, presumably in search of food.`);
} else {
text.push(`The ${animal.species === "dog" ? `hound` : animal.name} wastes no time in beginning to hammer away at ${his} ${orifice()} in the way only canines can, causing ${slave.slaveName} to moan uncontrollably as its thick, veiny member probes the depths of ${his} ${orifice()}. A few short minutes later, ${he} gives a loud groan ${slaveApproves ? `and shakes in orgasm ` : ``}as the ${animal.name}'s knot begins to swell and its dick begins to erupt a thick stream of jizz into ${his} ${orifice()}. Soon enough, the ${animal.name} finally finishes cumming and its knot is sufficiently small enough to slip out of ${slave.slaveName}'s ${act === Acts.VAGINAL && slave.vagina < 3 || act === Acts.ANAL && slave.anus < 2
? `now-gaping ${orifice()}`
@@ -493,14 +498,14 @@ App.Interact.fAnimal = function(slave, type, act) {
break;
case V.active.hooved:
if (act === Acts.ORAL) {
- text.push(`The ${animal.species === "horse" ? `stallion` : animal.name} begins to thrust faster and faster, causing ${him} to moan and groan past the huge ${animal.species} cock stretching ${his} poor throat to its limits. Before too long, the ${animal.name}'s movements begin to slow, and you can see its large testicles contract as its begins to erupt and pour its thick semen down ${his} throat and into ${his} stomach, filling it to the brim. After what seems like an impossibly long time, the ${animal.name}'s dick finally begins to soften and pull out, causing ${slave.slaveName} to begin coughing and retching uncontrollably. You have another slave lead the ${animal.name} away, with a fresh apple as a treat for its good performance.`);
+ text.push(`${slave.slaveName} gets to work, ${his} head bobbing back and forth rhythmically as ${he} works on bringing the ${animal.name} to orgasm. ${His} efforts pay off after a few minutes when the ${animal.species === "horse" ? `stallion` : animal.name} begins to pant as its orgasm approaches. Before too long, the ${animal.name}'s movements begin to slow, and you can see its large testicles contract as its begins to erupt and pour its thick semen down ${his} throat and into ${his} stomach, filling it to the brim. After what seems like an impossibly long time, the ${animal.name}'s dick finally begins to soften and pull out, causing ${slave.slaveName} to begin coughing and retching uncontrollably. You have another slave lead the ${animal.name} away, with a fresh apple as a treat for its good performance.`);
} else {
text.push(`The ${animal.species === "horse" ? `stallion` : animal.name} begins to thrust faster and faster, causing ${him} to moan and groan as the huge ${animal.species} cock ${act === Acts.VAGINAL ? `batters ${his} cervix` : `fills ${him} completely`}. Before too long, the ${animal.name}'s movements begin to slow, and you can see its large testicles contract as its begins to erupt and fill ${his} ${orifice()} with its thick baby batter. After what seems like an impossibly long time, the ${animal.name}'s dick finally begins to soften and pull out, leaving ${slave.slaveName} panting and covered in sweat. You have another slave lead the ${animal.name} away, with a fresh apple as a treat for its good performance.`);
}
break;
case V.active.feline:
if (act === Acts.ORAL) {
- text.push(`The ${animal.name} begins to move, thrusting faster and faster. The ${girl} underneath it can't stop a groan of pain from escaping ${his} lips as the ${animal.species}'s barbed dick rubs the inside of ${his} mouth and throat raw. After a few minutes of painful coupling, the ${animal.species}'s thrusts finally slow, then stop completely as its ${animal.species !== "cat" ? `large` : ``} cock erupts down ${slave.slaveName}'s throat. With a ${animal.species !== "cat" ? `deep bellow` : `loud meow`}, he finally dismounts, gives you a long look, then stalks off.`);
+ text.push(`${slave.slaveName} gets to work, ${his} head bobbing back and forth rhythmically as ${he} works on bringing the ${animal.name} to orgasm. ${His} efforts pay off after a few minutes when the ${animal.name} begins to pant as its orgasm approaches. After a few minutes of painful coupling, the ${animal.species}'s thrusts finally slow, then stop completely as its ${animal.species !== "cat" ? `large` : ``} cock erupts down ${slave.slaveName}'s throat. With a ${animal.species !== "cat" ? `deep bellow` : `loud meow`}, he finally dismounts, gives you a long look, then stalks off.`);
} else {
text.push(`The ${animal.name} begins to move, thrusting faster and faster. The ${girl} underneath it can't stop a groan of pain from escaping ${his} lips as the ${animal.species}'s barbed dick rubs the inside of ${his} ${orifice()} raw. After a few minutes of painful coupling, the ${animal.species}'s thrusts finally slow, then stop completely as its ${animal.species !== "cat" ? `large` : ``} cock erupts, filling ${slave.slaveName} with its sperm. With a ${animal.species !== "cat" ? `deep bellow` : `loud meow`}, he finally dismounts, gives you a long look, then stalks off.`);
}
@@ -633,33 +638,6 @@ App.Interact.fAnimal = function(slave, type, act) {
}
function slaveGainsQuirk() {
- if (slave.fetish === "none") {
- if (random(1, 100) > 90) { // 10% chance of gaining fetish
- /** @type {FC.Fetish[]} */
- const fetishes = [
- "humiliation",
- "masochist",
- ];
-
- if (act === Acts.ANAL) {
- fetishes.push("buttslut");
- }
-
- const fetish = fetishes.random();
-
- fetishChange(slave, fetish);
-
- if (fetish === "buttslut") {
- return `${He} couldn't help but orgasm when the ${animal.name} filled ${him} with its seed, and now the thought of another member in ${his} bottom <span class="fetish gain>turns ${him} on.</span>`;
- }
- if (fetish === "humiliation") {
- return `You can't help but notice that ${he} ${slave.dick > 0 ? `is sporting an erection` : ``}${slave.vagina > -1 ? slave.dick > 0 ? ` and ` : `has a distinct sheen on ${his} pussylips` : `seems distinctly uncomfortable`} after the beast has finished. <span class="fetish gain">It seems ${he} is a bit of a humiliation slut!</span>`;
- }
- if (fetish === "masochist") {
- return `${He} didn't seem to mind the pain – in fact, it seems ${he} got off on it. <span class="fetish gain">${He}'s a masochist!</span>`;
- }
- }
- }
if (slave.behavioralQuirk === "none") {
if (random(1, 100) > 90) { // 10% chance of gaining quirk
/** @type {FC.BehavioralQuirk[]} */
@@ -669,7 +647,7 @@ App.Interact.fAnimal = function(slave, type, act) {
quirks.push("sinful");
}
- const quirk = quirks.random();
+ const quirk = quirks.random() ?? "none";
slave.behavioralQuirk = quirk;
@@ -693,7 +671,7 @@ App.Interact.fAnimal = function(slave, type, act) {
quirks.push("size queen");
}
- const quirk = quirks.random();
+ const quirk = quirks.random() ?? "none";
slave.sexualQuirk = quirk;
@@ -713,6 +691,38 @@ App.Interact.fAnimal = function(slave, type, act) {
}
}
+ function slaveGainsFetish() {
+ if (random(1, 100) > 90) { // 10% chance of gaining fetish
+ /** @type {FC.Fetish[]} */
+ const fetishes = [
+ Fetish.HUMILIATION,
+ Fetish.MASOCHIST,
+ Fetish.BESTIALITY,
+ ];
+
+ if (act === Acts.ANAL) {
+ fetishes.push(Fetish.BUTTSLUT);
+ }
+
+ const fetish = fetishes.random();
+
+ fetishChange(slave, fetish);
+
+ if (fetish === Fetish.BUTTSLUT) {
+ return `${He} couldn't help but orgasm when the ${animal.name} filled ${him} with its seed, and now the thought of another member in ${his} bottom <span class="fetish gain>turns ${him} on.</span>`;
+ }
+ if (fetish === Fetish.HUMILIATION) {
+ return `You can't help but notice that ${he} ${slave.dick > 0 ? `is sporting an erection` : ``}${slave.vagina > -1 ? slave.dick > 0 ? ` and ` : `has a distinct sheen on ${his} pussylips` : `seems distinctly uncomfortable`} after the beast has finished. <span class="fetish gain">It seems ${he} is a bit of a humiliation slut!</span>`;
+ }
+ if (fetish === Fetish.MASOCHIST) {
+ return `${He} didn't seem to mind the pain – in fact, it seems ${he} got off on it. <span class="fetish gain">${He}'s a masochist!</span>`;
+ }
+ if (fetish === Fetish.BESTIALITY) {
+ return `${He} seems to have <span class="devotion inc">really taken to</span> getting fucked by animals – <span class="fetish gain">${he} has a bestiality fetish!</span>`;
+ }
+ }
+ }
+
// Virginity Check Functions
function virginityCheck(type) {
diff --git a/src/npc/interaction/fAnus.js b/src/npc/interaction/fAnus.js
index 7dde70b5bdf860438d6bbb2d9b324ac3bc7c10c0..298c11e75e19b45e4025a80be4d9b86e3fa35fc8 100644
--- a/src/npc/interaction/fAnus.js
+++ b/src/npc/interaction/fAnus.js
@@ -129,7 +129,7 @@ App.Interact.fAnus = function(slave) {
slave.trust -= 10;
}
slave.anus++;
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
if (hasAnyArms(slave)) {
text.push(`You instruct ${him} to present ${his} anus. ${He} dully`);
if (hasBothLegs(slave)) {
@@ -393,7 +393,7 @@ App.Interact.fAnus = function(slave) {
}
function slaveGainsQuirk() {
- if (slave.fetish === "none" && slave.sexualFlaw !== "hates anal") {
+ if (slave.fetish === Fetish.NONE && slave.sexualFlaw !== "hates anal") {
slave.fetish = "buttslut";
slave.fetishKnown = 1;
diff --git a/src/npc/interaction/fAssistedSex.js b/src/npc/interaction/fAssistedSex.js
index 63f4e5b3e8037883477dd3696efb27cc78a644b5..70ce1d4fad4a459afece9b21434a781b74887fde 100644
--- a/src/npc/interaction/fAssistedSex.js
+++ b/src/npc/interaction/fAssistedSex.js
@@ -93,7 +93,7 @@ App.Interact.fAssistedSex = function(slave) {
text.push(`draw away, revealing ${his} crying face, then lift above ${his} head in a deliberately provocative pose.`);
}
- text.push(`${He} tenses in a moment of instinctive resistance, then surrenders ${his} body to ${his} aids' total control, clearly afraid of punishment.`);
+ text.push(`${He} tenses in a moment of instinctive resistance, then surrenders ${his} body to ${his} aides' total control, clearly afraid of punishment.`);
}
return text.join(' ');
@@ -135,14 +135,14 @@ App.Interact.fAssistedSex = function(slave) {
text.push(`away from you, ${his} servants lift ${him} higher, and ${he}`);
if (V.PC.dick !== 0) {
- text.push(`teases your dick with a series of masterful — and carefully balanced — belly isolations, rubbing the thick nub of ${his} belly button in small semicircles around your oozing cockhead as ${he} does so. Right when you feel ready to explode, ${he} rotates around, bringing`);
+ text.push(`teases your dick with a series of masterful — and carefully balanced — belly oscillations, rubbing the thick nub of ${his} belly button in small semicircles around your oozing cockhead as ${he} does so. Right when you feel ready to explode, ${he} rotates around, bringing`);
if (slave.butt > 11) {
text.push(`${his} overgrown, wobbling ass cheeks`);
} else if (slave.butt > 5) {
text.push(`${his} huge, wobbling ass cheeks`);
} else if (Math.floor(slave.buttImplant/slave.butt) > .60) {
- text.push(`${his} saline inflated ass cheeks`);
+ text.push(`${his} saline-inflated ass cheeks`);
} else if (slave.butt > 2) {
text.push(`${his} wobbling ass cheeks`);
} else {
@@ -165,7 +165,7 @@ App.Interact.fAssistedSex = function(slave) {
text.push(`a thick stream of semen all over ${his} ass and back, ${he} shifts into a kneeling position on the ground in front of you, tilted sideways so that ${his} massive fecundity can pool on the ground beside ${him}, and gently sucks you off, cleaning your dick with ${his} mouth.`);
} else {
- text.push(`Presses the thick nub of ${his} belly button into your pussy, rubbing it back and forth against your engorged clit as ${he} performs a series of masterful — and carefully balanced — belly isolations. After ${he} has you quaking at the edge of release, ${he} rolls forward and buries ${his} head in your lap, plying you with ${his}`);
+ text.push(`Presses the thick nub of ${his} belly button into your pussy, rubbing it back and forth against your engorged clit as ${he} performs a series of masterful — and carefully balanced — belly oscillations. After ${he} has you quaking at the edge of release, ${he} rolls forward and buries ${his} head in your lap, plying you with ${his}`);
if (slave.devotion > 95) {
text.push(`devoted tongue`);
diff --git a/src/npc/interaction/fBeg.js b/src/npc/interaction/fBeg.js
index 673d56ad331ba8e14940245411aadfa1b410b5dc..958d5de7b160895d04902dd69a197e5758b7a3f0 100644
--- a/src/npc/interaction/fBeg.js
+++ b/src/npc/interaction/fBeg.js
@@ -688,7 +688,7 @@ App.Interact.fBeg = function(slave) {
}
function slaveGainsQuirk() {
- if (slave.fetish === "none" && slave.behavioralFlaw !== "liberated") {
+ if (slave.fetish === Fetish.NONE && slave.behavioralFlaw !== "liberated") {
slave.fetish = "submissive";
slave.fetishKnown = 1;
diff --git a/src/npc/interaction/fBellyFuck.js b/src/npc/interaction/fBellyFuck.js
index 5f999e3d31a7f2b6fc8595b34b48eb6cdfd3a767..007dba1bf01f91e6fff50d04a4e471752647b99e 100644
--- a/src/npc/interaction/fBellyFuck.js
+++ b/src/npc/interaction/fBellyFuck.js
@@ -84,15 +84,15 @@ App.Interact.fBellyFuck = function(slave) {
text.push(`massive belly,`);
}
- text.push(`and won't be a particularly able lover because of this, but enjoying this obstacle is half the point.`);
+ text.push(`though ${he} is still too restricted to be a particularly able lover, but enjoying this obstacle is half the point.`);
}
text.push(`Once ${he} is situated in the center of your office, you walk a circle around ${him}, taking special care to`);
if (slave.bellyTat === "a heart") {
- text.push(`trace a hand over the obliterated heart shaped tattoo on the front of ${his} immensely stretched belly.`);
+ text.push(`trace a hand over the obliterated heart-shaped tattoo on the front of ${his} immensely stretched belly.`);
} else if (slave.bellyTat === "a star") {
- text.push(`trace a hand over the obliterated star shaped tattoo on the front of ${his} immensely stretched belly.`);
+ text.push(`trace a hand over the obliterated star-shaped tattoo on the front of ${his} immensely stretched belly.`);
} else if (slave.bellyTat === "a butterfly") {
text.push(`trace a hand over the obliterated butterfly tattoo on the front of ${his} immensely stretched belly.`);
} else {
@@ -106,7 +106,7 @@ App.Interact.fBellyFuck = function(slave) {
const text = [];
if (slave.devotion > 95) {
- text.push(`${He} purrs in response to your touch, leaning forward against ${his} belly and`);
+ text.push(`${He} purrs in response to your touch, leaning forward against ${his} belly, and`);
if (!hasAnyLegs(slave)) {
text.push(`wiggles`);
@@ -133,7 +133,7 @@ App.Interact.fBellyFuck = function(slave) {
} else if (slave.butt > 5) {
text.push(`huge ass,`);
} else if (Math.floor(slave.buttImplant/slave.butt) > .60) {
- text.push(`jiggly, saline filled ass,`);
+ text.push(`jiggly, saline-filled ass,`);
} else if (slave.butt > 2) {
text.push(`thick ass,`);
} else {
diff --git a/src/npc/interaction/fBoobs.js b/src/npc/interaction/fBoobs.js
index 0fd3c45186b204e45ea11b3e2157d3df6033721e..089c55330a411c37b7cb7398a66a38ca67a2fff7 100644
--- a/src/npc/interaction/fBoobs.js
+++ b/src/npc/interaction/fBoobs.js
@@ -199,7 +199,7 @@ App.Interact.fBoobs = function(slave) {
if (V.seeRace === 1) {
r.push(slave.race);
}
- r.push(`mouth and rubs a nipple with one hand and ${his} anal opening with the other, since ${he} can't touch ${his} cock. The situation brings ${him} some pleasure, but the first twitches of ${his} cock against ${his} chastity cage are so uncomfortable that ${he} subsides into busy mechanical dick sucking. ${He} writhes uncomfortably, frustrated beyond belief.`);
+ r.push(`mouth and rubs a nipple with one hand and ${his} anal opening with the other, since ${he} can't touch ${his} cock. The situation brings ${him} some pleasure, but the first twitches of ${his} cock against ${his} chastity cage are so uncomfortable that ${he} subsides into busy mechanical dick-sucking. ${He} writhes uncomfortably, frustrated beyond belief.`);
} else if (slave.fetish === "cumslut" && slave.fetishStrength > 60 && slave.fetishKnown === 1 && slave.dick !== 0 && V.PC.dick !== 0) {
r.push(`${He} comes over eagerly, with hunger in ${his} eyes. ${He} gives you a titjob with ${his} lubricated cleavage while you sit at your desk. As a cumslut ${he}'s almost desperate to get your cum into ${his}`);
if (V.seeRace === 1) {
@@ -314,7 +314,7 @@ App.Interact.fBoobs = function(slave) {
}
}
} else if (random(1, 100) > (110-slave.devotion)) {
- if (slave.fetish === "none" &&
+ if (slave.fetish === Fetish.NONE &&
(slave.behavioralFlaw !== "hates men" || V.PC.dick === 0) &&
(slave.behavioralFlaw !== "hates women" || V.PC.dick > 0)
) {
diff --git a/src/npc/interaction/fButt.js b/src/npc/interaction/fButt.js
index 002e71087893db40252c575a46967d26c549e6e3..cfd47ece188db81c605a632dc8d8ef961e044d57 100644
--- a/src/npc/interaction/fButt.js
+++ b/src/npc/interaction/fButt.js
@@ -345,7 +345,7 @@ App.Interact.fButt = function(slave) {
if (slave.bellyPreg >= 1500) {
text.push(`The poor ${girl}'s pregnant belly makes taking a rough fuck in both ${his} holes uncomfortable for ${him}.`);
} else if (slave.bellyImplant >= 1500) {
- text.push(`The poor ${girl}'s implant filled belly makes taking a rough fuck in both ${his} holes uncomfortable for ${him}.`);
+ text.push(`The poor ${girl}'s implant-filled belly makes taking a rough fuck in both ${his} holes uncomfortable for ${him}.`);
} else if (slave.bellyFluid >= 1500) {
text.push(`The poor ${girl}'s sloshing belly makes taking a rough fuck in both ${his} holes uncomfortable for ${him}, though the lewd jiggling the pounding sends through it is quite a sight.`);
}
@@ -372,7 +372,7 @@ App.Interact.fButt = function(slave) {
}
function slaveGainsQuirk() {
- if (slave.fetish === "none" && slave.sexualFlaw !== "hates penetration") {
+ if (slave.fetish === Fetish.NONE && slave.sexualFlaw !== "hates penetration") {
slave.fetish = "buttslut";
slave.fetishKnown = 1;
diff --git a/src/npc/interaction/fCaress.js b/src/npc/interaction/fCaress.js
index 446c1230b28c3db57592759fa1fb003c433179b1..a4e68b6f5386e243db745d8285fe107c161891df 100644
--- a/src/npc/interaction/fCaress.js
+++ b/src/npc/interaction/fCaress.js
@@ -56,7 +56,7 @@ App.Interact.fCaress = function(slave) {
function setup() {
const text = [];
- if (slave.fetish === "mindbroken" && slave.relationship !== -3) {
+ if (slave.fetish === Fetish.MINDBROKEN && slave.relationship !== -3) {
text.push(`${He} complies mechanically. ${He} remembers that when getWrittenTitle(slave)'s commands are not obeyed, there is punishment.`);
} else if (slave.relationship === -2) {
text.push(`${He} eagerly complies, happy to be near the object of ${his} longing. Once ${he}'s close, you hold ${his} face in your palms and gaze deeply`);
@@ -69,7 +69,7 @@ App.Interact.fCaress = function(slave) {
text.push(`${He} blushes furiously.`);
} else if (slave.relationship === -3) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
text.push(`${He} complies mechanically. ${He} remembers that when ${getWrittenTitle(slave)}'s commands are not obeyed, there is punishment. Once ${he}'s close, you hold ${his} face in your palms and look into ${his} blank ${App.Desc.eyesColor(slave)}. ${He} doesn't react.`);
} else if (slave.devotion+slave.trust >= 175) {
text.push(`${He} happily complies, eager to be close to the ${womanP} who married ${him}. Once ${he}'s close, you hold ${his} face in your palms and look into ${his} ${App.Desc.eyesColor(slave)}. ${He} finds the intense look from the ${womanP} ${he}'s married to affirming, and looks down with a`);
@@ -198,7 +198,7 @@ App.Interact.fCaress = function(slave) {
text.push(`cheekbones. Grazing ${his} temple and brushing ${his} forehead simultaneously, you smoothly motion along ${his} eyelids and nose, and tenderly stroke ${his} face with both hands as you take ${his} head lightly and trace around it, gently massaging as you go. You work your way down, slowly and gradually, along ${his} neck with one hand, then the other, briefly pausing before continuing your path down to ${his} shoulders and`);
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
text.push(`${he} starts to gasp as`);
} else {
text.push(`starts to shudder as`);
@@ -206,7 +206,7 @@ App.Interact.fCaress = function(slave) {
text.push(`you slide your hands down ${his} side, across ${his} back and along ${his} belly taking every moment to savor the contours of ${his} body before going back up again to ${his} face.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
text.push(`${His} posture doesn't change. ${He} initially only reacts slightly to your physical touch but then stops reacting completely. When you stop, ${his} ${App.Desc.eyesColor(slave)} track the movements of your hands briefly but then stare blankly ahead of ${him}, awaiting further use of ${his} body.`);
} else if (slave.relationship === -2) {
text.push(`${His} eyes gradually close and ${he} slowly leans ${his} head back, relaxing as ${he} feels your caress. ${He} gently gasps as ${he} feels your warm`);
diff --git a/src/npc/interaction/fDance.js b/src/npc/interaction/fDance.js
index 7557c9e1ff7dece1df7953e11fbc2e119dd7f2e4..635c2db45019e5dd66f55102d0243ee4f9beca3a 100644
--- a/src/npc/interaction/fDance.js
+++ b/src/npc/interaction/fDance.js
@@ -1618,7 +1618,7 @@ App.Interact.fDance = function(slave) {
case "pregnancy":
text.push(`"Milk Me"`);
break;
- case "mindbroken":
+ case Fetish.MINDBROKEN:
text.push(`"Free Slut"`);
break;
default:
@@ -2046,7 +2046,7 @@ App.Interact.fDance = function(slave) {
}
function slaveGainsQuirk() {
- if (slave.fetish === "none" && slave.sexualFlaw !== "shamefast") {
+ if (slave.fetish === Fetish.NONE && slave.sexualFlaw !== "shamefast") {
slave.fetish = "humiliation";
slave.fetishKnown = 1;
diff --git a/src/npc/interaction/fDick.js b/src/npc/interaction/fDick.js
index 4926933a2b49a622e879a07f82fc32d3aefd2278..0ced69215e42411137ea40e08d0ff6df2d011d40 100644
--- a/src/npc/interaction/fDick.js
+++ b/src/npc/interaction/fDick.js
@@ -138,7 +138,7 @@ App.Interact.fDick = function(slave) {
text.push(`cock.`);
}
- if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fuckdoll === 0) {
if (slave.devotion > 20) {
text.push(`${He} thought ${he} would be fucking another slave, not ${his} ${getWrittenTitle(slave)}, so to say ${he}'s pleasantly surprised would be an understatement.`);
} else if (slave.devotion >= -20) {
@@ -184,7 +184,7 @@ App.Interact.fDick = function(slave) {
text.push(`making it abundantly clear that you want ${his} cum.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
text.push(`Like a doll, ${he} dumbly remains still, completely indifferent that ${he}'s deep in ${his} ${getWrittenTitle(slave)}'s`);
if (V.PC.vagina !== -1) {
@@ -369,7 +369,7 @@ App.Interact.fDick = function(slave) {
text.push(`and stroke ${his} soft perineum.`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
text.push(`Like a broken doll, ${he} dumbly remains still, watching you without interest. You start moving up and on ${his} shaft, until you climax and notice that so did ${slave.slaveName}. Since ${he} is mindbroken, ${his} responses to you are purely physiological and your actions have no affect on ${him} mentally. You leave your toy for one of your other slaves to clean and maintain.`);
} else {
text.push(`You ride your helpless slave until you both climax.`);
@@ -383,7 +383,7 @@ App.Interact.fDick = function(slave) {
const text = [];
- if (canMove(slave) && slave.fetish !== "mindbroken" && V.postSexCleanUp > 0) {
+ if (canMove(slave) && slave.fetish !== Fetish.MINDBROKEN && V.postSexCleanUp > 0) {
switch (slave.assignment) {
case "whore":
text.push(`${He} heads to the bathroom to clean ${his} dick before returning to selling ${his} body publicly.`);
diff --git a/src/npc/interaction/fEmbrace.js b/src/npc/interaction/fEmbrace.js
index 0b6a8261a70cab9be7140451fd0253935aa358bb..9e85acfb8c872fc67d910e05982ca7d2facb185e 100644
--- a/src/npc/interaction/fEmbrace.js
+++ b/src/npc/interaction/fEmbrace.js
@@ -40,7 +40,7 @@ App.Interact.fEmbrace = function(slave) {
text.push(`have another slave set ${him} down on your desk.`);
}
- if (slave.fetish === "mindbroken" && slave.relationship !== -3) {
+ if (slave.fetish === Fetish.MINDBROKEN && slave.relationship !== -3) {
text.push(`${He} complies automatically. ${He} remembers that when ${getWrittenTitle(slave)}'s commands are not obeyed, there is punishment.`);
} else if (slave.relationship === -2) {
text.push(`${He} excitedly complies, happy to be near the object of ${his} longing. Once ${he}'s close, you take ${his} completely relaxed head in your hands and gaze deeply`);
@@ -53,7 +53,7 @@ App.Interact.fEmbrace = function(slave) {
text.push(`${He} blushes furiously.`);
} else if (slave.relationship === -3) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
text.push(`${He} complies mechanically. ${He} remembers that when ${getWrittenTitle(slave)}'s commands are not obeyed, there is punishment. Once ${he}'s close, you hold ${his} face in your palms and look into ${his} blank ${App.Desc.eyesColor(slave)}. ${He} shows no reaction.`);
} else if (slave.devotion+slave.trust >= 175) {
text.push(`${He} lovingly complies, hurrying to come close to the ${womanP} who married ${him}. Once ${he}'s close, you take your willing ${wife}'s head in your hands and gaze deeply into ${his} ${App.Desc.eyesColor(slave)}. ${He} finds the intense look from the ${womanP} ${he}'s married to affirming, and looks down with a`);
@@ -173,7 +173,7 @@ App.Interact.fEmbrace = function(slave) {
function aftermath() {
const text = [];
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
text.push(`${His} posture doesn't change. ${He} initially only reacts slightly to your physical touch but eventually ${he} relaxes in the warmth of your embrace against ${him}. You know that this may only be a physiological reaction, nothing more. For a brief moment you think you detect a spark of life in ${his} dull eyes but just as quickly, it is gone. When you stop, ${his} ${App.Desc.eyesColor(slave)} track the movements of your hands briefly but then ${he} stares blankly ahead of ${him}, not understanding what is happening.`);
} else if (slave.relationship === -2) {
text.push(`In the warmth of your embrace, ${he} turns towards you, ${his} passionate ${App.Desc.eyesColor(slave)} staring intently at your face. ${He} leans closer to you and kisses you as you hold ${him}. ${His} heart beats faster and then gradually slows as ${he} grows accustomed to your body against ${hers}. Eventually, ${he} relaxes totally and ${his} eyes gradually close, melting in your arms. When you finally stop and relax your embrace, ${his} eyes remain closed and ${his} mouth still in a rapturous shape for a moment before ${he} slowly opens ${his} eyes and smiles at you with a blissful look on ${his} face.`);
diff --git a/src/npc/interaction/fFeelings.js b/src/npc/interaction/fFeelings.js
index d7934e5ce6015e92be758340fd0609e24e878c88..da675d4fb2e0e762541b71ed9a992b8f1aadffee 100644
--- a/src/npc/interaction/fFeelings.js
+++ b/src/npc/interaction/fFeelings.js
@@ -274,7 +274,7 @@ App.Interact.fFeelings = function(slave) {
text.push(`${Master}, my body is full...`);
if (slave.geneticQuirks.uterineHypersensitivity === 2) {
- text.push(`I can't fit anymore... So than why does every near rupture feel so fucking good?`);
+ text.push(`I can't fit any more... So than why does every near rupture feel so fucking good?`);
} else if (slave.sexualFlaw === "self hating") {
text.push(`I surely couldn't even`);
@@ -410,7 +410,7 @@ App.Interact.fFeelings = function(slave) {
}
text.push(`cum in my belly. Oh! I like my belly, too, and that warm, sloshy feeling as it's packed full of baby juice. It's so — I'm sorry, ${Master}. I think my mouth is watering. Please give me a moment to collect myself.`);
} else if (V.PC.dick !== 0) {
- text.push(`is my tummy${(slave.vagina > -1) ? ` — and my womb` : ``}! The sloshy feeling when I'm all packed full of cum in both ends gets me so incredibly horny. sometimes I wonder what it would be like if I were just a puffed up cum-balloon of a ${woman}, helpless and filled with cum, over, and over, and — I'm sorry, ${Master}. I'm being weird again, aren't I?`);
+ text.push(`is my tummy${(slave.vagina > -1) ? ` — and my womb` : ``}! The sloshy feeling when I'm all packed full of cum in both ends gets me so incredibly horny. Sometimes I wonder what it would be like if I were just a puffed up cum-balloon of a ${woman}, helpless and filled with cum, over, and over, and — I'm sorry, ${Master}. I'm being weird again, aren't I?`);
} else {
text.push(`is my mouth, I love how it feels to — to eat pussy, ${Master}. I love eating out your pussy. Especially when it's been filled up with some`);
if (canTaste(slave)) {
@@ -601,11 +601,11 @@ App.Interact.fFeelings = function(slave) {
text.push(`I like showing off my big boobs.`);
}
if (slave.lips > 40) {
- text.push(`Can't forget my dick sucking lips, I don't know what I'd do without them.`);
+ text.push(`Can't forget my dick-sucking lips, I don't know what I'd do without them.`);
} else {
text.push(`Can't forget my lips and tongue, getting people off with them is fun too.`);
}
- } else if (slave.fetish === "submissive" && slave.fetishStrength > 60) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60) {
text.push(`is my bare ${slave.skin} skin, I like how it feels when you look me all over before you take me.`);
} else if (slave.fetish === "dom" && slave.fetishStrength > 60 && slave.muscles > 30) {
text.push(`is my muscles, I like how it feels to be strong, forcing another slave.`);
@@ -677,7 +677,7 @@ App.Interact.fFeelings = function(slave) {
text.push(`Thank you for breeding me, ${Master}! Please use me to make babies whenever you want.`);
}
} else if (slave.pregKnown === 1) {
- text.push(`is my belly, now that it has a baby growing in it. I can't wait for it to start showing.`);
+ text.push(`is my belly, now that it has ${slave.pregType >= 2 ? `the babies` : `a baby`} growing in it. I can't wait for it to start showing.`);
if (slave.pregSource === -1) {
text.push(`Thank you for impregnating me, ${Master}!`);
}
@@ -1006,7 +1006,7 @@ App.Interact.fFeelings = function(slave) {
} else {
text.push(`${Spoken(slave, `pussy, ${Master},"`)} ${he} ${say}s eagerly. ${Spoken(slave, `"I can just imagine your clit against my tongue.`)}`);
}
- } else if (slave.fetish === "submissive" && slave.fetishStrength > 60) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60) {
if (V.PC.boobs < 300) {
text.push(`Your strong arms feels so good when you hold me down.`);
} else {
@@ -1528,7 +1528,7 @@ App.Interact.fFeelings = function(slave) {
case "fertility drugs":
if (isFertile(slave)) {
text.push(`${Spoken(slave, `I feel like I need to have a baby, ${Master}, like right now.`)}`);
- if (slave.fetishKnown === 1 && slave.fetish === "submissive" && slave.fetishStrength > 60) {
+ if (slave.fetishKnown === 1 && slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60) {
text.push(`${Spoken(slave, `I can't wait for someone to pin me down and fuck me pregnant.`)}`);
} else if (slave.fetishKnown === 1 && slave.fetish === "dom" && slave.fetishStrength > 60) {
text.push(`${Spoken(slave, `Makes me want to pin down a cute little`)}`);
@@ -1548,8 +1548,8 @@ App.Interact.fFeelings = function(slave) {
case "super fertility drugs":
if (isFertile(slave)) {
text.push(`${Spoken(slave, `My womb feels so full, ${Master}, I need to be fertilized!`)}`);
- if (slave.fetishKnown === 1 && slave.fetish === "submissive" && slave.fetishStrength > 60) {
- text.push(`${Spoken(slave, `I can't wait to be pinned to the floor by my life swollen belly.`)}`);
+ if (slave.fetishKnown === 1 && slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60) {
+ text.push(`${Spoken(slave, `I can't wait to be pinned to the floor by my life-swollen belly.`)}`);
} else if (slave.fetishKnown === 1 && slave.fetish === "dom" && slave.fetishStrength > 60) {
text.push(`${Spoken(slave, `I can't wait till my belly is huge enough to really demand worship.`)}`);
} else if (slave.fetishKnown === 1 && slave.fetish === "pregnancy" && slave.fetishStrength > 60) {
@@ -1700,7 +1700,7 @@ App.Interact.fFeelings = function(slave) {
if (slave.fetishKnown === 1) {
if (slave.energy > 95) {
text.push(`${Spoken(slave, `It's pretty nice, being milked.`)}`);
- } else if (slave.fetish === "submissive" && slave.fetishStrength > 60) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60) {
text.push(`${Spoken(slave, `It's nice being milked, I get treated like I deserve.`)}`);
} else if (slave.fetish === "boobs" && slave.fetishStrength > 60) {
text.push(`${Spoken(slave, `It's so, so wonderful being milked.`)}`);
@@ -1916,13 +1916,13 @@ App.Interact.fFeelings = function(slave) {
if (sex > 0 && beauty > 0 && combat > 0) {
text.push(`${Spoken(slave, `${His2} P-Limbs do look cool and I like how strong they can make ${him2} but they scare me a little, sometimes. Though of course ${he2} disables the weapons when we're together."`)} ${He} giggles. ${Spoken(slave, `"${He2} has vibe fingers, so that's awesome.`)}`);
} else if (sex > 0 && beauty > 0) {
- text.push(`${Spoken(slave, `I really like ${his2} P-Limbs. They're very pretty, but kind of cold. That's just how ${he2} is."`)} ${He} giggles. ${Spoken(slave, `" ${He2} has vibe fingers. so that's awesome.`)}`);
+ text.push(`${Spoken(slave, `I really like ${his2} P-Limbs. They're very pretty, but kind of cold. That's just how ${he2} is."`)} ${He} giggles. ${Spoken(slave, `" ${He2} has vibe fingers. So that's awesome.`)}`);
} else if (beauty > 0 && combat > 0) {
text.push(`${Spoken(slave, `${His2} P-Limbs do look cool and I like how strong they can make ${him2} but they scare me a little, sometimes. Though of course ${he2} disables the weapons when we're together.`)}`);
} else if (sex > 0 && combat > 0) {
- text.push(`${Spoken(slave, `${His2} P-Limbs do scare me a little, sometimes. Though of course ${he2} disables the weapons when we're together."`)} ${He} giggles. ${Spoken(slave, `"${He2} has vibe fingers. so that's awesome.`)}`);
+ text.push(`${Spoken(slave, `${His2} P-Limbs do scare me a little, sometimes. Though of course ${he2} disables the weapons when we're together."`)} ${He} giggles. ${Spoken(slave, `"${He2} has vibe fingers. So that's awesome.`)}`);
} else if (sex > 0) {
- text.push(`${Spoken(slave, `And, um."`)} ${He} giggles. ${Spoken(slave, `"${He2} has vibe fingers. so that's awesome.`)}`);
+ text.push(`${Spoken(slave, `And, um."`)} ${He} giggles. ${Spoken(slave, `"${He2} has vibe fingers. So that's awesome.`)}`);
} else if (beauty > 0) {
text.push(`${Spoken(slave, `I really like ${his2} P-Limbs. They're very pretty, but kind of cold. That's just how ${he2} is.`)}`);
} else if (combat > 0) {
@@ -2022,7 +2022,7 @@ App.Interact.fFeelings = function(slave) {
} else if (slave.devotion > 20) {
text.push(`${Spoken(slave, `I'm proud to be a slave of the new Pharaoh.`)}`);
} else {
- text.push(`${Spoken(slave, `Being a slave in this new Egypt is a little reassuring. some of the other slavs say they used to use slaves for great things, anyway.`)}`);
+ text.push(`${Spoken(slave, `Being a slave in this new Egypt is a little reassuring. Some of the other slaves say they used to use slaves for great things, anyway.`)}`);
}
}
if (V.arcologies[0].FSChattelReligionist >= 10) {
@@ -2048,7 +2048,7 @@ App.Interact.fFeelings = function(slave) {
}
}
if (V.arcologies[0].FSDegradationist >= 10) {
- if (slave.fetishKnown === 1 && slave.fetish === "submissive" && slave.fetishStrength > 60) {
+ if (slave.fetishKnown === 1 && slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60) {
text.push(`${Spoken(slave, `I — I always knew I was a useless bitch, so it's easy to accept being degraded.`)}`);
} else if (slave.devotion > 20) {
text.push(`${Spoken(slave, `I'm your worthless little degraded fuckpuppet, ${Master}.`)}`);
@@ -2098,7 +2098,7 @@ App.Interact.fFeelings = function(slave) {
}
if (V.arcologies[0].FSGenderFundamentalist >= 10) {
if (slave.intelligence+slave.intelligenceImplant > 50) {
- text.push(`${Spoken(slave, `I shouldn't be surprised at how easy it is to reinforce traditional values in a new, slavery focused culture.`)}`);
+ text.push(`${Spoken(slave, `I shouldn't be surprised at how easy it is to reinforce traditional values in a new, slavery-focused culture.`)}`);
} else if (slave.attrKnown === 1 && slave.attrXX > 80) {
text.push(`${Spoken(slave, `I really like how you're encouraging slavery to focus on girls."`)} ${He} giggles. ${Spoken(slave, `"I like girls!`)}`);
} else if (slave.dick > 0) {
@@ -2195,9 +2195,9 @@ App.Interact.fFeelings = function(slave) {
} else if (slave.belly >= 1500 && V.arcologies[0].FSRepopulationFocus !== "unset" && V.propOutcome === 0 && slave.breedingMark === 0) {
text.push(`${Spoken(slave, `I know I'm an ugly fat slut. I wish my belly wasn't so big.`)}`);
} else if (slave.butt > 3) {
- text.push(`${Spoken(slave, `I know I'm an ugly, fat assed slut. I wish it was smaller.`)}`);
+ text.push(`${Spoken(slave, `I know I'm an ugly, fat-assed slut. I wish it was smaller.`)}`);
} else if (slave.boobs > 500) {
- text.push(`${Spoken(slave, `I know I'm an ugly, big boobed slut. I wish my chest was smaller.`)}`);
+ text.push(`${Spoken(slave, `I know I'm an ugly, big-boobed slut. I wish my chest was smaller.`)}`);
} else {
text.push(`${Spoken(slave, `It's nice, living in a place where I don't need big boobs to be pretty.`)}`);
}
diff --git a/src/npc/interaction/fFeet.js b/src/npc/interaction/fFeet.js
index f0e00c72c324272599c92342589622de6cfa0ead..aa059090313c9cc1520a8b6ee887623cb16f818c 100644
--- a/src/npc/interaction/fFeet.js
+++ b/src/npc/interaction/fFeet.js
@@ -93,9 +93,9 @@ App.Interact.fFeet = function(slave) {
if (slave.boobs >= 30000) {
boobsDesc = "skip";
- boobs = "room filling";
+ boobs = "room-filling";
} else if (slave.boobs >= 20000) {
- boobsDesc = "beanbag sized";
+ boobsDesc = "beanbag-sized";
} else if (slave.boobs >= 8500) {
boobsDesc = "obscenely massive";
} else if (slave.boobs >= 8000) {
@@ -249,7 +249,7 @@ App.Interact.fFeet = function(slave) {
// Part 1: Order and reaction
r.push(`You call ${slave.slaveName} to your office, telling ${him} to use ${his} ${feet} to please you.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} is brought to you and stands blankly by your desk.`);
} else if (slave.relationship === -3 && slave.devotion >= 60 ) {
r.push(`Your devoted slave ${wife} is delighted to get another chance to pleasure you.`);
@@ -272,7 +272,7 @@ App.Interact.fFeet = function(slave) {
}
// Extra 1 if tease/perverted and not mindbroken
- if ((slave.sexualQuirk === "tease" || slave.sexualQuirk === "perverted") && slave.devotion > 60 && slave.fetish !== "mindbroken") {
+ if ((slave.sexualQuirk === "tease" || slave.sexualQuirk === "perverted") && slave.devotion > 60 && slave.fetish !== Fetish.MINDBROKEN) {
r.push(`Before you can begin, ${he} arches`);
if (hasBothLegs(slave)) {
r.push(`a`);
@@ -316,7 +316,7 @@ App.Interact.fFeet = function(slave) {
} else {
r.push(`then pour lubricant onto your hands, massaging it into ${his} ${slave.skin} ${feet}: rubbing ${his} ${hasBothLegs(slave) ? `arches` : `arch`}, ${hasBothLegs(slave) ? `soles` : `sole`}, and toes.`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows little reaction to your efforts.`);
} else { // not mindbroken
if (slave.devotion < -50) {
@@ -343,7 +343,7 @@ App.Interact.fFeet = function(slave) {
}
// Part 3: Actions, attraction/devotion and fetishes
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`You hold ${his} ${feet} and thrust between them as ${he}`);
if (canSee(slave)) {
r.push(`watches you blankly.`);
@@ -531,7 +531,7 @@ App.Interact.fFeet = function(slave) {
}
// Extra 2: if not mindbroken/immobile, tease with a flash.
- if (slave.fetish !== "mindbroken" && canWalk(slave) && slave.sexualQuirk === "tease" && slave.devotion >= 60) {
+ if (slave.fetish !== Fetish.MINDBROKEN && canWalk(slave) && slave.sexualQuirk === "tease" && slave.devotion >= 60) {
if (canSee(slave)) {
r.push(`Seeing`);
} else {
@@ -603,7 +603,7 @@ App.Interact.fFeet = function(slave) {
}
// PC orgasms
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`You eventually cum all over ${his} ${skin}`);
if (V.PC.balls >= 9) {
r.push(`${feet} ${legsAdj} ${legs}, and even ${belly} belly with your massive load.`);
@@ -734,7 +734,7 @@ App.Interact.fFeet = function(slave) {
r.push(`${feet},`);
}
r.push(`and ${he} whimpers as even ${his} ${feet} used as a sex object.`);
- } else if (slave.fetish === "submissive" && slave.fetishKnown === 1 && slave.fetishStrength >= 60) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishKnown === 1 && slave.fetishStrength >= 60) {
r.push(`You eventually cum all over ${his} ${skin}`);
if (V.PC.balls >= 9) {
r.push(`${feet} ${legsAdj} ${legs}, and even ${his} ${belly} belly with your massive load`);
@@ -839,7 +839,7 @@ App.Interact.fFeet = function(slave) {
}
// Extra 3: devoted perverted slave giggles and orgasms
- if (slave.fetish !== "mindbroken" && canWalk(slave) && slave.sexualQuirk === "perverted" && slave.devotion >= 60 && !(slave.fetish === "cumslut" && slave.fetishKnown === 1 && slave.fetishStrength >= 60)) {
+ if (slave.fetish !== Fetish.MINDBROKEN && canWalk(slave) && slave.sexualQuirk === "perverted" && slave.devotion >= 60 && !(slave.fetish === "cumslut" && slave.fetishKnown === 1 && slave.fetishStrength >= 60)) {
r.push(`${He} was getting off on the footjob, but the feeling of your cum on`);
if (slave.fetish === "buttslut" && slave.fetishKnown === 1 && slave.fetishStrength >= 60 && V.PC.balls >= 5) {
r.push(`${his} ass and thighs sets off a strong orgasm of ${his} own, ${his} ${thighsAdj} ${legs} quivering as`);
diff --git a/src/npc/interaction/fKiss.js b/src/npc/interaction/fKiss.js
index 7c79d741b8fd33c7472f99803afdca84f5de9dc9..f0a6e4307b16111462d671642973d7c206b9ffba 100644
--- a/src/npc/interaction/fKiss.js
+++ b/src/npc/interaction/fKiss.js
@@ -54,7 +54,7 @@ App.Interact.fKiss = function(slave) {
slave.mouthAccessory = "none";
}
- if (slave.fetish === "mindbroken" && slave.relationship !== -3) {
+ if (slave.fetish === Fetish.MINDBROKEN && slave.relationship !== -3) {
r.push(`${He} complies mechanically. ${He} remembers that when ${getWrittenTitle(slave)}'s commands are not obeyed, there is punishment.`);
} else if (slave.relationship === -2) {
r.push(`${He} hurriedly complies, happy to be near the object of ${his} longing. Once ${he}'s close, you take a moment to gaze deeply`);
@@ -65,7 +65,7 @@ App.Interact.fKiss = function(slave) {
}
r.push(`${He} blushes furiously.`);
} else if (slave.relationship === -3) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} complies mechanically. ${He} remembers that when ${getWrittenTitle(slave)}'s commands are not obeyed, there is punishment. You kiss ${him} deeply and intensely; ${he} doesn't understand why.`);
} else if (slave.devotion + slave.trust >= 175) {
r.push(`${He} complies in a ${wife}ly fashion, moving ${his} body as ${he} approaches to best catch your desire. Once ${he}'s close, you take a moment to gaze deeply`);
@@ -191,7 +191,7 @@ App.Interact.fKiss = function(slave) {
}
if (slave.relationship === -3) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${His} mouth opens to accept the kiss, and is compliant with your questing tongue. You kiss your broken ${wife} deeply. ${His} posture remains completely unchanged. Being kissed affects ${him} as little as being penetrated, being struck, being loved, or being your ${wife}: not at all. When you pull away,`);
if (canSee(slave)) {
r.push(`${his} ${App.Desc.eyesColor(slave)} track you carefully, awaiting further use of ${his} body.`);
@@ -285,7 +285,7 @@ App.Interact.fKiss = function(slave) {
r.push(`${He} asks hesitantly, "I-is that it, ${Master}?"`);
}
}
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${His} mouth opens to accept the kiss, and is compliant with your questing tongue. ${His} posture remains completely unchanged. Being kissed affects ${him} as little as being penetrated, being struck, or being loved: not at all. When you pull away,`);
if (canSee(slave)) {
r.push(`${his} ${App.Desc.eyesColor(slave)} track you carefully, awaiting further use of ${his} body.`);
diff --git a/src/npc/interaction/fLips.js b/src/npc/interaction/fLips.js
index 86c07f360a994ee0612c88a57607013775186228..8cae92531cad671233e78441273c61a277da39f9 100644
--- a/src/npc/interaction/fLips.js
+++ b/src/npc/interaction/fLips.js
@@ -425,7 +425,7 @@ App.Interact.fLips = function(slave) {
slave.sexualFlaw = "hates oral";
}
} else if (random(1, 100) > (110 - slave.devotion)) {
- if (V.PC.dick !== 0 && slave.fetish === "none" && slave.sexualFlaw !== "hates oral") {
+ if (V.PC.dick !== 0 && slave.fetish === Fetish.NONE && slave.sexualFlaw !== "hates oral") {
r.push(`Consummating an enjoyable sexual encounter by drinking your cum has <span class="fetish gain">encouraged ${him} to focus on oral sex.</span>`);
slave.fetish = "cumslut";
slave.fetishKnown = 1;
diff --git a/src/npc/interaction/fMaternitySwing.js b/src/npc/interaction/fMaternitySwing.js
index 7f0c52f240d90a8aa729cf62fa01c1d85307f53d..788c414fe6e1ed97dd135cea8221acb2d094c36c 100644
--- a/src/npc/interaction/fMaternitySwing.js
+++ b/src/npc/interaction/fMaternitySwing.js
@@ -26,20 +26,20 @@ App.Interact.fMaternitySwing = function(slave) {
}
r.push(`and`);
if (slave.bellyPreg >= 1000000) {
- r.push(`ridiculously enormous, baby packed belly`);
+ r.push(`ridiculously enormous, baby-packed belly`);
} else if (slave.bellyPreg >= 750000) {
r.push(`mountainous, baby-stuffed gut`);
} else if (slave.bellyPreg >= 600000) {
- r.push(`titanic, baby swollen womb`);
+ r.push(`titanic, baby-swollen womb`);
} else {
r.push(`massive belly`);
}
r.push(`hanging above the floor of your office, you turn your attention to molesting ${his} ripe protuberances. Running your tongue along the distended nub of ${his} belly button, you kiss your way up the fertile curve of ${his} belly, making your way to ${his} tits so that you can suck on ${his} ${slave.nipples} nipples. ${He} squirms in ${his} restraints and`);
if (slave.devotion > 95) {
- if (!canTalk(slave)) {
- r.push(`begs you to fuck ${him} already`);
+ if (canTalk(slave)) {
+ r.push(`begs you to fuck ${him} already.`);
} else {
- r.push(`groans inchoately, obviously desperate for you to fuck ${him}`);
+ r.push(`groans inchoately, obviously desperate for you to fuck ${him}.`);
}
} else if (slave.trust < -20 && slave.devotion > -10) {
r.push(`groans with barely restrained lust.`);
@@ -56,7 +56,7 @@ App.Interact.fMaternitySwing = function(slave) {
if (slave.bellyPreg >= 600000) {
r.push(`brood-slave`);
} else {
- r.push(`glorified belly balloon`);
+ r.push(`glorified belly-balloon`);
}
r.push(`into a string of mutual orgasms with some truly astounding aerial sex.`);
if (canDoVaginal(slave)) {
diff --git a/src/npc/interaction/fPat.js b/src/npc/interaction/fPat.js
index 4447a0833b3f14b7489784e53eb9043b18529c95..043b302ee48383d937f01844c41e3734f02bd9d7 100644
--- a/src/npc/interaction/fPat.js
+++ b/src/npc/interaction/fPat.js
@@ -42,7 +42,7 @@ App.Interact.fPat = function(slave) {
/* approach*/
- if (slave.fetish === "mindbroken" && slave.relationship !== -3) {
+ if (slave.fetish === Fetish.MINDBROKEN && slave.relationship !== -3) {
r.push(`${He} complies robotically. ${He} remembers that when ${getWrittenTitle(slave)}'s commands are not obeyed, there is punishment.`);
} else if (slave.relationship === -2) {
r.push(`${He} eagerly complies, happy to be near the object of ${his} longing. Once ${he}'s close, you hold ${his} face in your palms and gaze deeply`);
@@ -53,7 +53,7 @@ App.Interact.fPat = function(slave) {
}
r.push(`${He} blushes furiously.`);
} else if (slave.relationship === -3) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} complies mechanically. ${He} remembers that when ${getWrittenTitle(slave)}'s commands are not obeyed, there is punishment. Once ${he}'s close, you hold ${his} face in your palms and look into ${his} empty ${App.Desc.eyesColor(slave)}. ${He} shows no reaction`);
} else if (slave.devotion+slave.trust >= 175) {
r.push(`${He} complies in a ${wife}ly fashion, moving ${his} body as ${he} approaches to best enflame your desire, eager to be close to the ${womanP} who married ${him}. Once ${he}'s close, you hold ${his} face in your palms and gaze`);
@@ -151,7 +151,7 @@ App.Interact.fPat = function(slave) {
/* action */
r.push(`You walk around ${him}, drawing closer and slowly resting your hand on ${his} head. You let it rest for a few seconds to get ${him} accustomed to your touch.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Tenderly and lovingly you brush your fingers along ${his} head, enjoying the feeling of your poor mentally shattered slave's inability to resist you. ${He} initially reacts slightly to your physical touch, but soon stops reacting completely. Nevertheless, you continue to gingerly stroke ${his}`);
if (isBald) {
r.push(`shaven scalp,`);
@@ -170,7 +170,7 @@ App.Interact.fPat = function(slave) {
} else {
r.push(`hair.`);
}
- } else if (slave.devotion > 50 && slave.fetish === "submissive" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
+ } else if (slave.devotion > 50 && slave.fetish === Fetish.SUBMISSIVE && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
r.push(`${He} stiffens at your touch but slowly relaxes at the sensation of your hand on ${his} head. You tenderly and lovingly stroke your fingers along ${his} scalp, enjoying the feeling of your slave's subservience. ${He} gently, submissively, presses ${his} head against your hand, like a dog. As you continue`);
if (isBald) {
r.push(`kneading ${his} shaved scalp,`);
@@ -289,7 +289,7 @@ App.Interact.fPat = function(slave) {
r.push(`lips`);
}
r.push(`with your fingertips. You move your hand to the side of your slave's head, stroking ${his} temple gently.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`This causes an unconscious shiver to travel down ${his} spine.`);
} else if (slave.devotion > 50) {
r.push(`This causes ${him} to shudder in delight and to move ${his} hand to your hip, squeezing it gently.`);
@@ -313,7 +313,7 @@ App.Interact.fPat = function(slave) {
/* outro + reaction */
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`When you stop,`);
if (canSee(slave)) {
r.push(`${his} ${App.Desc.eyesColor(slave)} track the movements of your hands briefly before returning to their usual stare,`);
@@ -395,7 +395,7 @@ App.Interact.fPat = function(slave) {
r.push(`face`);
}
r.push(`practically begging you to let ${him} take this farther.`);
- } else if (slave.devotion > 50 && slave.fetish === "submissive" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
+ } else if (slave.devotion > 50 && slave.fetish === Fetish.SUBMISSIVE && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
r.push(`As you stroke ${his} head, ${he} reacts almost as though you're stroking ${his} nether regions, and begins to moan and press ${himself} lewdly against your`);
if (V.PC.boobs >= 1400) {
r.push(`giant tits.`);
diff --git a/src/npc/interaction/fPoolSex.js b/src/npc/interaction/fPoolSex.js
index aeec33d65ebc0cdca4c0dbfa3069bac2df5c9a58..2204dfd4638bd1827b0826c4acd9e7a1572242fd 100644
--- a/src/npc/interaction/fPoolSex.js
+++ b/src/npc/interaction/fPoolSex.js
@@ -44,7 +44,7 @@ App.Interact.fPoolSex = function(slave) {
} else {
r.push(`waits patiently as`);
}
- r.push(`you strip down and change into your swimming outfit. When it's clear that you're ready to join ${him}, ${he} motions at the pool's holographic console and coos in delight as its mobility assistance devices kick in, rolling ${him} into the curative gel. You sink yourself into the pool, taking a moment to bask in the feeling of the warm, curative laced goo as it relaxes your muscles${(V.PC.preg > 30) ? ` and soothes your stretched skin` : ``} , then wade toward your waiting slave.`);
+ r.push(`you strip down and change into your swimming outfit. When it's clear that you're ready to join ${him}, ${he} motions at the pool's holographic console and coos in delight as its mobility assistance devices kick in, rolling ${him} into the curative gel. You sink yourself into the pool, taking a moment to bask in the feeling of the warm, curative-laced goo as it relaxes your muscles${(V.PC.preg > 30) ? ` and soothes your stretched skin` : ``}, then wade toward your waiting slave.`);
App.Events.addParagraph(node, r);
r = [];
r.push(`${He} smiles and beckons you toward ${him}, rubbing circles in the exploded sides of ${his} colossal belly, then gasps as you take a handful of the ooze and shove it right in ${his} face. ${He} sputters indignantly and then`);
@@ -62,7 +62,7 @@ App.Interact.fPoolSex = function(slave) {
}
r.push(`the change in your demeanor, ${he} rolls back to recline at the pool's edge and, once you've joined ${him},`);
if (hasAnyArms(slave)) {
- r.push(`reaches down to masturbate your ooze lubricated dick.`);
+ r.push(`reaches down to masturbate your ooze-lubricated dick.`);
} else {
r.push(`rolls forward and reaches down to tease your cockhead with ${his} mouth${(slave.boobs > 600) ? ` and tits` : ``}.`);
}
@@ -72,7 +72,7 @@ App.Interact.fPoolSex = function(slave) {
} else if (slave.butt > 5) {
r.push(`massive, cushiony ass`);
} else if (Math.floor(slave.buttImplant / slave.butt) > .60) {
- r.push(`implant swollen ass`);
+ r.push(`implant-swollen ass`);
} else if (slave.butt > 2) {
r.push(`plush ass`);
} else {
@@ -91,7 +91,7 @@ App.Interact.fPoolSex = function(slave) {
r.push(VCheck.Anal(slave, 1));
}
} else {
- r.push(`ooze stimulated quim is in need of ${his} tender care. Seeing the change in your demeanor, ${he} rolls back to recline at the pool's edge and, once you've joined ${him},`);
+ r.push(`ooze-stimulated quim is in need of ${his} tender care. Seeing the change in your demeanor, ${he} rolls back to recline at the pool's edge and, once you've joined ${him},`);
if (hasAnyArms(slave)) {
r.push(`reaches down to masturbate your pussy, squeezing and rubbing your clit.`);
} else {
@@ -121,7 +121,7 @@ App.Interact.fPoolSex = function(slave) {
r.push(`waits patiently as`);
}
}
- r.push(`you strip down and change into your swimming outfit. When it's clear that you're ready to join ${him}, ${he} motions at the pool's holographic console and its mobility assistance devices kick in, rolling ${him} into the curative gel. You sink yourself into the pool, taking a moment to bask in the feeling of the warm, curative laced goo as it relaxes your muscles${(V.PC.preg > 30) ? ` and soothes your stretched skin` : ``}, then wade toward your waiting slave.`);
+ r.push(`you strip down and change into your swimming outfit. When it's clear that you're ready to join ${him}, ${he} motions at the pool's holographic console and its mobility assistance devices kick in, rolling ${him} into the curative gel. You sink yourself into the pool, taking a moment to bask in the feeling of the warm, curative-laced goo as it relaxes your muscles${(V.PC.preg > 30) ? ` and soothes your stretched skin` : ``}, then wade toward your waiting slave.`);
App.Events.addParagraph(node, r);
r = [];
r.push(`${He} smiles politely, rubbing circles in the exploded sides of ${his} colossal belly, then gasps as you take a handful of the ooze and shove it right in ${his} face. ${He} sputters indignantly and then`);
@@ -139,7 +139,7 @@ App.Interact.fPoolSex = function(slave) {
}
r.push(`the change in your demeanor, ${he} rolls back to recline at the pool's edge and, once you've joined ${him},`);
if (hasAnyArms(slave)) {
- r.push(`reaches down to masturbate your ooze lubricated dick.`);
+ r.push(`reaches down to masturbate your ooze-lubricated dick.`);
} else {
r.push(`rolls forward and reaches down to tease your cockhead with ${his} mouth${(slave.boobs > 600) ? ` and tits` : ``}.`);
}
@@ -149,7 +149,7 @@ App.Interact.fPoolSex = function(slave) {
} else if (slave.butt > 5) {
r.push(`massive, cushiony ass`);
} else if (Math.floor(slave.buttImplant / slave.butt) > .60) {
- r.push(`implant swollen ass`);
+ r.push(`implant-swollen ass`);
} else if (slave.butt > 2) {
r.push(`plush ass`);
} else {
@@ -168,7 +168,7 @@ App.Interact.fPoolSex = function(slave) {
r.push(VCheck.Anal(slave, 1));
}
} else {
- r.push(`ooze stimulated quim is in need of ${his} tender care. Seeing the change in your demeanor, ${he} rolls back to recline at the pool's edge and, once you've joined ${him},`);
+ r.push(`ooze-stimulated quim is in need of ${his} tender care. Seeing the change in your demeanor, ${he} rolls back to recline at the pool's edge and, once you've joined ${him},`);
if (hasAnyArms(slave)) {
r.push(`reaches down to masturbate your pussy, squeezing and rubbing your clit.`);
} else {
@@ -203,14 +203,14 @@ App.Interact.fPoolSex = function(slave) {
}
r.push(`${He} starts as you enter, watching tensely as`);
}
- r.push(`you strip down and change into your swimming outfit. When you're ready to join ${him}, you motion at the pool's holographic console and its mobility assistance devices kick in, rolling ${him} into the curative gel. You sink yourself into the pool, taking a moment to bask in the feeling of the warm, curative laced goo as it relaxes your muscles${(V.PC.preg > 30) ? ` and soothes your stretched skin` : ``}, then wade toward your worried looking slave.`);
+ r.push(`you strip down and change into your swimming outfit. When you're ready to join ${him}, you motion at the pool's holographic console and its mobility assistance devices kick in, rolling ${him} into the curative gel. You sink yourself into the pool, taking a moment to bask in the feeling of the warm, curative-laced goo as it relaxes your muscles${(V.PC.preg > 30) ? ` and soothes your stretched skin` : ``}, then wade toward your worried looking slave.`);
App.Events.addParagraph(node, r);
r = [];
r.push(`${He} smiles politely, rubbing circles in the exploded sides of ${his} colossal belly, then cries out in surprise as you take a handful of the ooze and shove it right in ${his} face. ${He} sputters, blushing, and wobbles back and forth, clearly trying not to react as you cover ${him} in thick wads of gel, over and over. After several minutes of this, you decide that your`);
if (V.PC.dick !== 0) {
r.push(`solid, quivering erection is in need of ${his} tender care. You force ${him} back into a reclining position at the pool's edge and order ${him} to`);
if (hasAnyArms(slave)) {
- r.push(`masturbate your ooze lubricated dick.`);
+ r.push(`masturbate your ooze-lubricated dick.`);
} else {
r.push(`tease your cockhead with ${his} mouth.`);
}
@@ -220,13 +220,13 @@ App.Interact.fPoolSex = function(slave) {
} else if (slave.butt > 4) {
r.push(`massive, cushiony ass`);
} else if (slave.butt > 2) {
- r.push(`implant swollen ass`);
+ r.push(`implant-swollen ass`);
} else if (slave.buttImplant === 1) {
r.push(`plush ass`);
} else {
r.push(`back`);
}
- r.push(`and the pool's silk lined wall. Reaching, you tease ${his}`);
+ r.push(`and the pool's silk-lined wall. Reaching, you tease ${his}`);
if (canDoVaginal(slave)) {
r.push(`kitty`);
} else {
@@ -239,7 +239,7 @@ App.Interact.fPoolSex = function(slave) {
r.push(VCheck.Anal(slave, 1));
}
} else {
- r.push(`ooze stimulated quim is in need of ${his} tender care. You force ${him} back to recline at the pool's edge and, once you've joined ${him},`);
+ r.push(`ooze-stimulated quim is in need of ${his} tender care. You force ${him} back to recline at the pool's edge and, once you've joined ${him},`);
if (hasAnyArms(slave)) {
r.push(`set ${him} to masturbating your pussy, squeezing and rubbing your clit.`);
} else {
diff --git a/src/npc/interaction/fRelation.js b/src/npc/interaction/fRelation.js
index 52162e42907e5f7cb5354819ca392863b0a4d1d7..c67a6f6994d95cf21c0856f4aea96a9c563ca2c2 100644
--- a/src/npc/interaction/fRelation.js
+++ b/src/npc/interaction/fRelation.js
@@ -167,9 +167,9 @@ App.Interact.fRelation = function(slave, partner) {
}
r.push(`and ${slave.slaveName}'s mouth tour ${his2} body. When you finish in ${his2}`);
if (partner.dick > 0) {
- r.push(`asshole, ${his2} ${daughter} hastens to lavish attention on ${his} ${partnerRel}'s well fucked, cum filled butt.`);
+ r.push(`asshole, ${his2} ${daughter} hastens to lavish attention on ${his} ${partnerRel}'s well fucked, cum-filled butt.`);
} else {
- r.push(`pussy, ${his2} ${daughter} hastens to lavish attention on ${his} ${partnerRel}'s well fucked, cum filled cunt.`);
+ r.push(`pussy, ${his2} ${daughter} hastens to lavish attention on ${his} ${partnerRel}'s well fucked, cum-filled cunt.`);
}
seX(slave, "oral", partner, "oral", 2);
r.push(VCheck.Partner(partner, 1));
diff --git a/src/npc/interaction/fSlaveSelfImpreg.js b/src/npc/interaction/fSlaveSelfImpreg.js
index 1bd7684ff26caa5cbab9aaecf6211ae88622273e..76f5b55a10411474f90ccbc051d028e5c6d4a251 100644
--- a/src/npc/interaction/fSlaveSelfImpreg.js
+++ b/src/npc/interaction/fSlaveSelfImpreg.js
@@ -18,7 +18,7 @@ App.Interact.fSlaveSelfImpreg = function(slave) {
let enjoy = true;
const superfetation = (slave.geneticQuirks.superfetation === 2 && slave.pregKnown === 1) ? 1 : 0;
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
if (slave.devotion <= 20) {
if (slave.devotion < -20) {
r.push(`${slave.slaveName}`);
@@ -90,7 +90,7 @@ App.Interact.fSlaveSelfImpreg = function(slave) {
}
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${slave.slaveName} is dully cooperative as you ensure ${he} is positioned conveniently on a bench to give you access to both aspects of ${his} genitalia. A quick dose of vasodilators ensures that ${he} is ready to perform, even if ${he} is unable to fully comprehend what is about to happen. Once ${he} is fully erect, your personal assistant uses a mechanical toy to efficiently stimulate ${him} to climax, while you hold a small container in place to collect ${his} emission. Moments later, you've loaded ${slave.slaveName}'s seed into a syringe and dispensed the contents deep within ${his}`);
if (slave.mpreg === 1) {
r.push(`ass.`);
diff --git a/src/npc/interaction/fVagina.js b/src/npc/interaction/fVagina.js
index ffb19c8059544de97d1e29ef5c5ba2c6196fc38f..c3d49fc66b32c6333add01cc1f7988866a119a63 100644
--- a/src/npc/interaction/fVagina.js
+++ b/src/npc/interaction/fVagina.js
@@ -108,7 +108,7 @@ App.Interact.fVagina = function(slave) {
fSpeed = random(1, 100);
}
- if (canMove(slave) && slave.fetish !== "mindbroken") {
+ if (canMove(slave) && slave.fetish !== Fetish.MINDBROKEN) {
r.push(`You decide to fuck ${him}`);
if (fPosition <= 20) {
r.push(`in the missionary position`);
@@ -195,7 +195,7 @@ App.Interact.fVagina = function(slave) {
}
if (slave.vagina === 0 && canDoVaginal(slave)) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} accepts your orders dumbly and presents ${his} virgin pussy for defloration${(V.PC.dick === 0) ? `, watching without real interest as you don a strap-on` : ``}. Since ${he} is mindbroken, <span class="virginity loss">losing ${his} virginity</span> has no impact on any part of ${him} other than ${his} vagina.`);
} else if (slave.devotion > 20) {
r.push(`${He} accepts your orders without comment and presents ${his} virgin pussy for defloration${(V.PC.dick === 0) ? `, watching with some small trepidation as you don a strap-on` : ``}. You gently ease into ${his} pussy before gradually increasing the intensity of your thrusts into ${him}. Before long, ${he}'s moaning loudly as you pound away. Since ${he} is already well broken, this new connection with ${his} ${getWrittenTitle(slave)} <span class="devotion inc">increases ${his} devotion to you.</span> <span class="virginity loss">${His} pussy has been broken in.</span> ${He} looks forward to having ${his} pussy fucked by you again.`);
@@ -220,7 +220,7 @@ App.Interact.fVagina = function(slave) {
slave.trust -= 4;
}
slave.vagina++;
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Since ${his} mind is gone, ${he}'s yours to use as a human sex doll. You throw ${him} over the couch and amuse yourself with ${him} for a while; ${his} body retains its instinctual responses, at least. You finish inside ${him} and leave your toy for one of your other slaves to clean and maintain.`);
} else if (isAmputee(slave)) {
r.push(`Since ${he}'s a quadruple amputee, ${he}'s yours to use as a human sex toy. You set ${him}`);
@@ -322,7 +322,7 @@ App.Interact.fVagina = function(slave) {
} else {
r.push(`fuck ${him} slowly and tenderly.`);
}
- } else if (slave.fetish === "submissive" && slave.fetishStrength > 60 && slave.fetishKnown === 1 && V.PC.dick !== 0) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60 && slave.fetishKnown === 1 && V.PC.dick !== 0) {
r.push(`${He} comes over, smiling a little submissive smile, and spreads ${himself} for you. You take ${him} on the couch next to your desk after ${he} gets into position.`);
if (fPosition <= 20) { // missionary
if (slave.bellyPreg >= 600000) {
@@ -1105,7 +1105,7 @@ App.Interact.fVagina = function(slave) {
if (slave.bellyPreg >= 1500) {
r.push(`The poor slave's belly gets in the way, but the added perversion of fucking a pregnant hole makes the inconvenience worthwhile.`);
} else if (slave.bellyImplant >= 1500) {
- r.push(`The poor slave's implant filled belly gets in the way, but the added perversion of fucking a ${girl} with such a round stomach makes the inconvenience worthwhile.`);
+ r.push(`The poor slave's implant-filled belly gets in the way, but the added perversion of fucking a ${girl} with such a round stomach makes the inconvenience worthwhile.`);
} else if (slave.bellyFluid >= 1500) {
r.push(`The poor slave's sloshing belly gets in the way, but the added perversion of seeing it jiggle makes the inconvenience worthwhile.`);
}
@@ -1116,7 +1116,7 @@ App.Interact.fVagina = function(slave) {
slave.sexualFlaw = "hates penetration";
}
} else if (random(1, 100) > (110 - slave.devotion)) {
- if (slave.fetish === "none" && slave.energy <= 95 && slave.sexualFlaw !== "hates penetration" && slave.ovaries === 1 || slave.mpreg === 1) {
+ if (slave.fetish === Fetish.NONE && slave.energy <= 95 && slave.sexualFlaw !== "hates penetration" && slave.ovaries === 1 || slave.mpreg === 1) {
r.push(`Enjoying sex with you seems to have <span class="fetish gain">encouraged ${his} biological clock.</span>`);
slave.fetish = "pregnancy";
slave.fetishKnown = 1;
diff --git a/src/npc/interaction/fillUpButt.js b/src/npc/interaction/fillUpButt.js
index f1d6526c219dec31aac8b6962ef1284e0d1ca0ca..b7097bc228a53df358be5928926e8c3a5eef4e31 100644
--- a/src/npc/interaction/fillUpButt.js
+++ b/src/npc/interaction/fillUpButt.js
@@ -12,7 +12,9 @@ App.Interact.fillUpButt = function(slave) {
he, his, him, himself
} = getPronouns(slave);
- slave.bellyAccessory = "none";
+ if (slave.bellyAccessory !== "a support band") {
+ slave.bellyAccessory = "none";
+ }
let pregDiscovery = 0;
r.push(`You`);
switch (slave.inflationType) {
@@ -91,7 +93,7 @@ App.Interact.fillUpButt = function(slave) {
r.push(`Not wanting to risk such a mess, you send ${him} for a medical examination. While most of the tests come back normal, one in particular catches your eye; <span class="lime">${he} is pregnant${(slave.preg > slave.pregData.normalBirth/4) ? ` and surprisingly far along` : ``}.</span> ${He} should be able to still handle at least two liters of ${slave.inflationType} up ${his} ass, however.`);
deflate(slave);
slave.pregKnown = 1;
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
if (canMove(slave)) {
r.push(`You instruct ${him} to present ${his} buttocks and anus but ${he} remains still and unresponsive. Talking to a broken mind is pointless.`);
}
diff --git a/src/npc/interaction/fillUpFace.js b/src/npc/interaction/fillUpFace.js
index 00da0eff4ae151a8155551a214501ed11ba21346..b003ed4903aaae48b36b43ddcc6ae5ddac46ea1d 100644
--- a/src/npc/interaction/fillUpFace.js
+++ b/src/npc/interaction/fillUpFace.js
@@ -12,7 +12,9 @@ App.Interact.fillUpFace = function(slave) {
he, his, him, himself
} = getPronouns(slave);
- slave.bellyAccessory = "none";
+ if (slave.bellyAccessory !== "a support band") {
+ slave.bellyAccessory = "none";
+ }
let pregDiscovery = 0;
const belly = bellyAdjective(slave);
r.push(`You attach a hose to ${V.dairyName} tap with the pipes set to pump ${slave.inflationType} and affix a special nozzle to it, one with straps useful for anchoring it to resisting slaves, before calling ${him} over so you can feel ${him} up while you force-feed ${him} ${slave.inflationType}.`);
@@ -21,7 +23,7 @@ App.Interact.fillUpFace = function(slave) {
r.push(`${He} looks uneasy at the prospect of taking in that much, far more than could be considered normal.`);
pregDiscovery = 1;
} else {
- if (slave.fetish === "submissive" && slave.devotion >= -20) {
+ if (slave.fetish === Fetish.SUBMISSIVE && slave.devotion >= -20) {
r.push(`${He} blushes at the thought of being forcibly fed.`);
} else if (slave.fetish === "cumslut" && slave.devotion >= -20 && slave.inflationType === "cum") {
r.push(`${He}'s pleased at the idea of turning into a cum balloon.`);
@@ -39,7 +41,7 @@ App.Interact.fillUpFace = function(slave) {
r.push(`Not wanting to risk such a mess, you send ${him} for a medical examination. While most of the tests come back normal, one in particular catches your eye; <span class="lime">${He} is pregnant${(slave.preg > slave.pregData.normalBirth/4) ? `` : ` and surprisingly far along`}.</span> ${He} should be able to still handle at least two liters of ${slave.inflationType}, however.`);
deflate(slave);
slave.pregKnown = 1;
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
if (canMove(slave)) {
r.push(`You instruct ${him} to take a seat on your lap and open ${his} mouth wide for the hose, but ${he} remains still and unresponsive. Talking to a broken mind is pointless.`);
}
diff --git a/src/npc/interaction/fondleBoobs.js b/src/npc/interaction/fondleBoobs.js
index 937cf63247e92985a8493a4c54b1de079889834b..81f815f9ba15af99290d3cd6499cf03967f01926 100644
--- a/src/npc/interaction/fondleBoobs.js
+++ b/src/npc/interaction/fondleBoobs.js
@@ -229,7 +229,7 @@ App.Interact.fondleBoobs = function(slave) {
} else {
r.push(`${He} smiles at you.`);
}
- } else if (slave.fetish === "submissive" && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
r.push(`${He} eagerly comes over to you, to stand between you and your desk. You lean over while ${he} submissively lies down upon it, face-up, with ${his} breasts pointed to the air. You place your hands on ${his}`);
if (slave.boobs >= 20000) {
r.push(`colossal tits, before sinking your body into their immense softness,`);
diff --git a/src/npc/interaction/fondleButt.js b/src/npc/interaction/fondleButt.js
index 54b0eb0a2d19128ca27be9e18feaddf0e4b64334..1d12bfa9301e5a9ebc2f4bd2ad27ffcafec9f686 100644
--- a/src/npc/interaction/fondleButt.js
+++ b/src/npc/interaction/fondleButt.js
@@ -354,7 +354,7 @@ App.Interact.fondleButt = function(slave) {
r.push(`reflexively`);
}
r.push(`shut ${his} eyes, trying not to think about what's happening to ${his} butt. This only encourages you to continue. You keep squeezing ${his} buttocks tenderly — first one, then the other and then finally both and ${he} can't help but quiver while in your grasp. You pull ${his} body closer towards you by ${his} buttocks, turn ${him} around, and push ${him} down, bending ${him} over your desk while ${he} tries to push away. You look at ${his} rear while you squeeze ${his} cheeks and rub them with your firm hands. You wander along the outline of ${his} posterior with both your eyes and hands, then look at ${his} virgin butthole as you trace it with your fingers and thumb. Eventually, you decide to stop. ${He} slowly stands and looks in your eyes, as though almost demanding answers. ${He} looks apprehensive about what you will do next.`);
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
if (canMove(slave)) {
r.push(`You instruct ${him} to present ${his} buttocks and anus but ${he} remains still and unresponsive. Talking to a broken mind is pointless.`);
}
diff --git a/src/npc/interaction/fondleDick.js b/src/npc/interaction/fondleDick.js
index 1fbe9cacf308ed3c234f229811044f3e1863754e..8f9723da8bd6ed4653505afbbc1e65dd0b0b9059 100644
--- a/src/npc/interaction/fondleDick.js
+++ b/src/npc/interaction/fondleDick.js
@@ -72,7 +72,7 @@ App.Interact.fondleDick = function(slave) {
}
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Like a doll, ${he} dumbly remains still, watching your hands move towards ${him} without any real interest. You gently trace your fingers along ${his} ${dickDesc()} before taking it gently in one hand and tenderly stroking your hand along its`);
strokeAndSqueeze();
if (!canAchieveErection(slave)) {
@@ -96,7 +96,7 @@ App.Interact.fondleDick = function(slave) {
r.push(`facing`);
}
r.push(`you as you stop moving your hands. You leave your toy for one of your other slaves to clean and maintain.`);
- } else if (slave.fetish === "submissive" && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
r.push(`${He} comes submissively over, smiling a little submissive smile, and points ${his} dick towards you. You gently trace your fingers along ${his} ${dickDesc()} before taking it gently in one hand and tenderly stroking your hand along its`);
strokeAndSqueeze();
standardStiffy();
@@ -138,7 +138,7 @@ App.Interact.fondleDick = function(slave) {
}
r.push(`moving to match your hand movements. ${He} moans and shudders, leaking ${his} cockmilk as ${he} orgasms in your hands. ${He} dutifully looks at you as you stop moving your hands and get cleaned up.`);
} else {
- r.push(`${He} devotedly comes over and gives you an impassioned kiss. ${He} smiles and points ${his} dick towards you. You gently trace your fingers along ${his} ${dickDesc()} before taking it gently in one hand and tenderly stroking your hand along its shaft`);
+ r.push(`${He} devotedly comes over and gives you an impassioned kiss. ${He} smiles and points ${his} dick towards you. You gently trace your fingers along ${his} ${dickDesc()} before taking it gently in one hand and tenderly stroking your hand along its`);
strokeAndSqueeze();
standardStiffy();
r.push(`${He} begs you not to stop. Soon, ${he} moans and ${his} movements indicate that ${he} is about to orgasm. ${He} shudders and leaks ${his} cockmilk as ${he} orgasms in your hands. ${He} looks at you passionately as you stop moving your hands and get cleaned up.`);
diff --git a/src/npc/interaction/fondleVagina.js b/src/npc/interaction/fondleVagina.js
index ef2ce2ed2de6b0355c6f25e2187747cf66dced89..a1ab20ad528078358e4eb0ae816c9a4b2aed9f04 100644
--- a/src/npc/interaction/fondleVagina.js
+++ b/src/npc/interaction/fondleVagina.js
@@ -92,7 +92,7 @@ App.Interact.fondleVagina = function(slave) {
}
if (slave.vagina === 0) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} accepts your orders dumbly and presents ${his} virgin pussy to you,`);
if (canSee(slave)) {
r.push(`watching your hands move towards ${him}`);
@@ -371,7 +371,7 @@ App.Interact.fondleVagina = function(slave) {
}
r.push(`you as you stop moving your hand.`);
}
- } else if (slave.fetish === "mindbroken") {
+ } else if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Like a doll, ${he} dumbly remains still,`);
if (canSee(slave)) {
r.push(`watching your hands move towards ${him}`);
@@ -475,7 +475,7 @@ App.Interact.fondleVagina = function(slave) {
r.push(`facing`);
}
r.push(`you as you stop moving your hand. You leave your toy for one of your other slaves to clean and maintain.`);
- } else if (slave.fetish === "submissive" && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
r.push(`${He} comes submissively over, smiling a little submissive smile, and points ${his} pussy towards you${(slave.scrotum > 0) ? `, shifting ${his} balls out of the way and` : ``}. You gently trace along ${his}`);
if (slave.labia === 1) {
r.push(`lovely petals`);
diff --git a/src/npc/interaction/forceFeeding.js b/src/npc/interaction/forceFeeding.js
index c4826660980e499975b6809245e43fe61ed508d3..7eca00205d7aa8b900ab140ccd01a1c1e7b3a2cb 100644
--- a/src/npc/interaction/forceFeeding.js
+++ b/src/npc/interaction/forceFeeding.js
@@ -15,11 +15,13 @@ App.Interact.forceFeeding = function(slave) {
let doMe;
const belly = bellyAdjective(slave);
- slave.bellyAccessory = "none";
+ if (slave.bellyAccessory !== "a support band") {
+ slave.bellyAccessory = "none";
+ }
let isDone = slave.inflation-1;
let pregDiscovery = 0;
r.push(`You call ${him} over and ask ${him} to wait patiently for a moment.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shows no response as`);
} else {
r.push(`${He} barely has time to ponder why you called for ${him} when`);
@@ -44,7 +46,7 @@ App.Interact.forceFeeding = function(slave) {
r.push(`very existence`);
}
r.push(`of the food.`);
- } else if (slave.fetish === "submissive" && slave.devotion >= -20) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.devotion >= -20) {
r.push(`${He} blushes at the thought of being forced to eat for another's amusement.`);
} else if (slave.behavioralFlaw === "gluttonous" && slave.devotion >= -20) {
r.push(`${He}'s awestruck that you approve of ${his} gluttony enough to present ${him} a feast.`);
@@ -72,7 +74,7 @@ App.Interact.forceFeeding = function(slave) {
if (canMove(slave)) {
r.push(`You instruct ${him} to take a seat on your lap and open`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`wide, but ${he} remains still and unresponsive. Talking to a broken mind is pointless.`);
} else {
r.push(`wide.`);
@@ -85,7 +87,7 @@ App.Interact.forceFeeding = function(slave) {
r.push(`crawl away,`);
}
r.push(`but you catch ${him} and pull ${him} into your lap, wrapping an arm`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He} meekly settles into your lap and shudders as ${he} feels your dominant hand wrap`);
} else if (slave.behavioralFlaw === "gluttonous") {
r.push(`${He} wastes no time getting into position with ${his} mouth agape as you wrap your hand`);
@@ -99,7 +101,7 @@ App.Interact.forceFeeding = function(slave) {
} else if (isAmputee(slave)) {
if (slave.devotion < -20) {
r.push(`${He}'s opposed to the thought of being forced to eat all that food, but as an amputee can do nothing about it. You heft ${him} onto your lap, wrapping an arm`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He}'s opposed to the thought of being forced to eat all that food, but as an amputee can do nothing about it; not that ${he}'d go against your orders anyway. ${He} shudders with pleasure as you heft ${him} onto your lap, wrapping a dominant arm`);
} else if (slave.behavioralFlaw === "gluttonous") {
r.push(`${He} can't wait to chow down, but as an amputee can do nothing to get in position. ${He} shudders with anticipation as you heft ${him} onto your lap, wrapping an arm`);
@@ -120,7 +122,7 @@ App.Interact.forceFeeding = function(slave) {
r.push(`You inform ${him} ${he}'ll be taking a seat on your lap and opening wide for ${his} meal.`);
if (slave.devotion < -20) {
r.push(`${He}'s opposed to the thought of being forced to eat all that food, but since ${he} is immobile, can't escape. You heft ${him} onto your lap, wrapping an arm`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He} accepts your orders without question. ${He} shudders with pleasure as you heft ${him} onto your lap, wrapping a dominant arm`);
} else if (slave.behavioralFlaw === "gluttonous") {
r.push(`${He} eagerly tries to get to your lap faster. ${He} shudders with anticipation as you heft ${him} onto your lap, wrapping your arm`);
@@ -132,7 +134,7 @@ App.Interact.forceFeeding = function(slave) {
r.push(`${He} squirms with excitement as you heft ${him} onto your lap, wrapping an arm`);
}
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`You reach out and wrap your arms`);
}
@@ -162,14 +164,14 @@ App.Interact.forceFeeding = function(slave) {
} else {
r.push(`firm, flat`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`belly, pulling ${him} into your lap.`);
} else {
r.push(`belly.`);
}
r.push(`You hold ${him} tight as you pull ${his} meal closer, dip in a cup and bring it to ${his} lips.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`It takes little effort to get ${him} to gulp down the contents`);
} else if (slave.devotion < -20) {
r.push(`${He} struggles in your lap and refuses to open ${his} mouth. You drop the cup back into the bucket and lean in close. You quickly clip ${his} nose shut, eliciting a panicked thrash from the ${girl}.`);
@@ -177,7 +179,7 @@ App.Interact.forceFeeding = function(slave) {
r.push(`You warn ${him} that ${his} punishment will be severe if ${he} comes that close to kicking over the buckets again.`);
}
r.push(`With ${his} mouth forced open, you now have a clear avenue with which to pour the slave food into ${his} mouth. ${He} sputters as ${he} struggles to swallow with ${his} nose shut. After several cups, tears are streaming down ${his} face from the discomfort. Weeping, ${he} implores you to remove the clamp so that ${he} may drink like a good ${girl}.`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He} submissively drinks the contents and readies ${his} lips for the next,`);
} else if (slave.behavioralFlaw === "gluttonous") {
r.push(`${He} hurriedly gulps down the contents and opens wide for the next,`);
@@ -189,18 +191,18 @@ App.Interact.forceFeeding = function(slave) {
r.push(`${He} happily downs the contents,`);
}
- if (slave.fetish !== "mindbroken" && slave.devotion < -20) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.devotion < -20) {
r.push(`You readily comply and waste no time in bring cupful after cupful to ${his} lips.`);
} else {
r.push(`so you keep the cupfuls coming.`);
}
r.push(`You can feel ${his} ${slave.skin} belly swelling with ${slave.inflationType} as it pushes out against your hand. Once ${he} has downed two liters, you give ${his} bloated belly a slap, eliciting`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`a small burp from the broken slave`);
} else if (slave.devotion < -20) {
r.push(`a shudder from the groaning slave`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`a subtle belch that the moaning slave quickly apologizes for,`);
} else if (slave.behavioralFlaw === "gluttonous") {
r.push(`a subtle belch from the moaning slave`);
@@ -218,16 +220,16 @@ App.Interact.forceFeeding = function(slave) {
if (slave.pregKnown === 0 && slave.preg > slave.pregData.normalBirth/13.33 && isDone > 0) {
r.push(`As soon as the next helping enters ${him} you feel something is wrong. ${He} begins to heave,`);
- if (slave.fetish !== "mindbroken" && slave.devotion > 50) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.devotion > 50) {
r.push(`struggling to keep down the slave food, however ${he} shortly expels the entirety of ${his} stomach across the floor.`);
} else {
r.push(`shortly expelling the entirety of ${his} stomach`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`all over ${himself} and your lap.`);
} else if (slave.devotion < -20) {
r.push(`all over ${himself} and your lap.`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`onto your floor.`);
} else if (slave.behavioralFlaw === "gluttonous") {
r.push(`all over ${himself} and your lap.`);
@@ -237,11 +239,11 @@ App.Interact.forceFeeding = function(slave) {
r.push(`across the floor.`);
}
r.push(`It didn't seem to be willful,`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`not that much is with ${him}, but is still unacceptable.`);
} else if (slave.devotion < -20) {
r.push(`given how pathetically ${he} is cowering from your wrath, but is completely unacceptable.`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`given how ${he} is begging to clean it up with ${his} tongue, but is completely unacceptable.`);
} else if (slave.behavioralFlaw === "gluttonous") {
r.push(`given how ${he} is in tears over the loss of such a meal, but is completely unacceptable.`);
@@ -257,11 +259,11 @@ App.Interact.forceFeeding = function(slave) {
if (isDone > 0) {
isDone--;
r.push(`But ${he} isn't done`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`yet.`);
} else if (slave.devotion < -20) {
r.push(`yet.`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`yet, not that ${he} minds.`);
} else if (slave.behavioralFlaw === "gluttonous") {
r.push(`yet, much to ${his} delight.`);
@@ -273,11 +275,11 @@ App.Interact.forceFeeding = function(slave) {
r.push(`yet, not that ${he}'d complain about fulfilling your desires.`);
}
r.push(`More and more you feed ${him}; ${his} belly swelling ever larger and growing even heavier as ${he}`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`guzzles`);
} else if (slave.devotion < -20) {
r.push(`painstakingly drinks`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`diligently drinks`);
} else if (slave.behavioralFlaw === "gluttonous") {
r.push(`desperately sucks down`);
@@ -289,11 +291,11 @@ App.Interact.forceFeeding = function(slave) {
r.push(`diligently drinks`);
}
r.push(`the slave food. You reposition yourself to bet a better hold on ${his} bulging food baby. As ${he} passes the gallon mark, you give the swollen orb a good jiggle, eliciting`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`a burp from the broken slave and tons of motion under your arm.`);
} else if (slave.devotion < -20) {
r.push(`a pained burp from the crying slave and tons of motion under your arm.`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`a moan of arousal over your control and tons of motion under your arm.`);
} else if (slave.behavioralFlaw === "gluttonous") {
r.push(`a load hiccup, tons of motion under your arm, and a plea for more food.`);
@@ -308,11 +310,11 @@ App.Interact.forceFeeding = function(slave) {
r = [];
}
if (isDone > 0) {
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} squirms a little in discomfort, but ${he} still has another gallon to go, so you continue feeding food into ${his} mouth.`);
} else if (slave.devotion < -20) {
r.push(`${He} squirms in discomfort, but ${he} still has another gallon to go and ${he} knows it. You remind ${him} of the ways you can torment ${him} in this state so you can continue feeding food into ${his} mouth without too much resistance.`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He} gets comfortable as ${he} still has another gallon to go and ${he} knows it. Gulping, ${he} opens ${his} mouth in preparation, eager to obey ${his} dom.`);
} else if (slave.behavioralFlaw === "gluttonous") {
r.push(`${He} still has another gallon to go and ${he} knows it, so ${he} wastes no time in letting you know ${he}'s ready.`);
@@ -324,11 +326,11 @@ App.Interact.forceFeeding = function(slave) {
r.push(`${He} still has another gallon to go and ${he} knows it, but if ${getWrittenTitle(slave)} wants ${him} to be stuffed like a turkey, ${he}'ll happily comply. ${He} wastes no time in opening up for your next helping.`);
}
r.push(`You can feel the pressure growing in ${his} middle as it fills out under your arm more and more. ${He}`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`mechanically downs every sip you give ${him} with no concern for ${his} own health.`);
} else if (slave.devotion < -20) {
r.push(`struggles to down every sip you give ${him} and pants heavily whenever ${he} gets the chance.`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`struggles to down every sip you give ${him} and pants heavily whenever ${he} gets the chance.`);
} else if (slave.behavioralFlaw === "gluttonous") {
r.push(`forces down every sip you give ${him} and pants heavily when ${his} mouth isn't full.`);
@@ -344,11 +346,11 @@ App.Interact.forceFeeding = function(slave) {
r.push(`gentle`);
}
r.push(`slap, eliciting`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`a large belch from the broken slave.`);
} else if (slave.devotion < -20) {
r.push(`a large belch and a glare from the straining slave.`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`a large belch and a squeak of shame from the submissive slave.`);
} else if (slave.behavioralFlaw === "gluttonous") {
r.push(`a large belch and a content sigh from the bloated glutton.`);
@@ -371,11 +373,11 @@ App.Interact.forceFeeding = function(slave) {
r = [];
}
r.push(`Knocking the empty buckets aside, you help ${his}`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`hiccupping`);
} else if (slave.devotion < -20) {
r.push(`hiccupping`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`hiccupping`);
} else if (slave.behavioralFlaw === "gluttonous") {
r.push(`hiccupping`);
@@ -387,7 +389,7 @@ App.Interact.forceFeeding = function(slave) {
r.push(`hefty`);
}
r.push(`bulk onto the couch to recover.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`After a few minutes of rest, and several glares from you when it appears ${his} meal might be coming back up,`);
} else if (slave.devotion < -20) {
r.push(`${He}`);
@@ -397,7 +399,7 @@ App.Interact.forceFeeding = function(slave) {
r.push(`faces you,`);
}
r.push(`as though almost demanding answers. ${He} looks apprehensive about what you will do next. After a few minutes of rest, and several glares from you when it appears ${his} meal might be coming back up,`);
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${He}`);
if (canSee(slave)) {
r.push(`looks in your eyes;`);
@@ -421,15 +423,15 @@ App.Interact.forceFeeding = function(slave) {
r.push(`${He} sighs contently, hoping you'll give ${him} more attention. ${He} is proud to let you know that you could fit even more in ${him} if you wanted. After a few minutes of rest,`);
}
r.push(`you order ${him} to continue stuffing ${himself} to maintain ${his} current size until you say otherwise.`);
- if (slave.fetish !== "mindbroken" && slave.devotion >= -20 && slave.behavioralFlaw === "gluttonous") {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.devotion >= -20 && slave.behavioralFlaw === "gluttonous") {
r.push(`${He} squeals with glee at the order.`);
}
r.push(`You spend ${his} remaining time in recovery`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`teasing ${his} belly until you tire of ${him} and send ${him} on ${his} way.`);
} else if (slave.devotion < -20) {
r.push(`tormenting ${his} gurgling belly until you tire of ${his} sobbing and send ${him} on ${his} way.`);
- } else if (slave.fetish === "submissive" && slave.devotion <= 20) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.devotion <= 20) {
r.push(`toying with ${his} belly until you tire of ${his} moaning and send ${him} on ${his} way.`);
} else if (slave.behavioralFlaw === "gluttonous" && slave.devotion <= 20) {
r.push(`massaging ${his} stuffed belly until you tire of ${him} and send ${him} on ${his} way.`);
@@ -661,7 +663,7 @@ App.Interact.forceFeeding = function(slave) {
r.push(`${His} belly wobbles as ${he} is helped from your office.`);
}
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`You question if the broken ${girl} understood your commands, but relish the idea of force-feeding ${him} even more should ${he} fail you.`);
}
}
diff --git a/src/npc/interaction/killSlave.js b/src/npc/interaction/killSlave.js
index b6bed51be6b16c580b90ee88f6f894215ab3bc2c..af598c69c8ccdb23c4f990b8de993d5a99bc9dbb 100644
--- a/src/npc/interaction/killSlave.js
+++ b/src/npc/interaction/killSlave.js
@@ -64,7 +64,7 @@ App.UI.SlaveInteract.killSlave = function(slave) {
text.push(`It's hard to tell the expression on the Fuckdoll's face, but your guess is it's`);
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
text.push(`one of`);
if (slave.devotion > 50) {
@@ -102,7 +102,7 @@ App.UI.SlaveInteract.killSlave = function(slave) {
text.push(`and waits for you to continue. You tell ${him} that you've gotten tired of having ${him} around and that you decided it is time to get rid of ${him}.`);
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
text.push(`${His} expression changes to one of`);
if (slave.devotion > 50) {
@@ -196,7 +196,7 @@ App.UI.SlaveInteract.killSlave = function(slave) {
function plannedFight() {
const plannedFightsDiv = document.createElement("div");
- plannedFightsDiv.append(`${!slave.fuckdoll && slave.fetish !== "mindbroken" ? `You abruptly cut ${his} begging short once you` : `You change your mind as you suddenly`} remember ${getSlave(V.pit.slaveFightingBodyguard).slaveName} is already fighting your bodyguard ${S.Bodyguard.slaveName} for ${his} life this week.`);
+ plannedFightsDiv.append(`${!slave.fuckdoll && slave.fetish !== Fetish.MINDBROKEN ? `You abruptly cut ${his} begging short once you` : `You change your mind as you suddenly`} remember ${getSlave(V.pit.slaveFightingBodyguard).slaveName} is already fighting your bodyguard ${S.Bodyguard.slaveName} for ${his} life this week.`);
App.UI.DOM.appendNewElement("div", plannedFightsDiv, App.UI.DOM.passageLink(`Cancel the fight`, V.returnTo, () => {
V.pit.slaveFightingBodyguard = null;
@@ -245,7 +245,7 @@ App.UI.SlaveInteract.killSlave = function(slave) {
arr.push(`Fuckdolls cannot properly fight.`);
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
arr.push(`Mindbroken slaves cannot properly fight.`);
}
@@ -263,7 +263,7 @@ App.UI.SlaveInteract.killSlave = function(slave) {
function kill() {
const killDiv = document.createElement("div");
- if (!slave.fuckdoll && slave.fetish !== "mindbroken") {
+ if (!slave.fuckdoll && slave.fetish !== Fetish.MINDBROKEN) {
killDiv.append(`You simply smile at ${him} and tell ${him} not to worry `);
} else {
killDiv.append(`You say nothing `);
@@ -271,9 +271,9 @@ App.UI.SlaveInteract.killSlave = function(slave) {
killDiv.append(`as you continue ${qualifiedFS
? `sharpening your ${weapon}.`
- : `threading on a suppressor.`} ${slave.slaveName} ${!slave.fuckdoll && slave.fetish !== "mindbroken"
+ : `threading on a suppressor.`} ${slave.slaveName} ${!slave.fuckdoll && slave.fetish !== Fetish.MINDBROKEN
? `gives an audible sigh of relief and begins to thank you profusely, though ${his} thanks are cut short as the sound of`
- : `continues to stand there ${slave.fetish === "mindbroken" ? `dumbly` : ``} until the sound of`} ${qualifiedFS
+ : `continues to stand there ${slave.fetish === Fetish.MINDBROKEN ? `dumbly` : ``} until the sound of`} ${qualifiedFS
? `a sharp edge slicing through flesh`
: `a suppressed gunshot`} rings through the room. You have another servant clean up the mess as you continue with what you were previously doing.`);
@@ -439,19 +439,12 @@ App.UI.SlaveInteract.killSlave = function(slave) {
} else {
const subDiv = document.createElement("div");
- const daughters = [];
const mother = getPronouns(slave).mother;
- if (arr.length > 2) {
- daughters.push(toSentence(arr));
- } else {
- daughters.push(`${getSlave(arr[0]).slaveName} and ${getSlave(arr[1]).slaveName}`);
- }
-
arr.forEach(i => getSlave(i).devotion -= 25);
App.Events.addParagraph(subDiv, [
- `${His} children, ${daughters}, are <span class="devotion dec">horrified</span> that you would take their ${mother} from them.`
+ `${His} children, ${toSentence(arr.map(i => getSlave(i).slaveName))}, are <span class="devotion dec">horrified</span> that you would take their ${mother} from them.`
]);
return subDiv;
@@ -475,29 +468,12 @@ App.UI.SlaveInteract.killSlave = function(slave) {
return subDiv;
} else {
const subDiv = document.createElement("div");
-
- const twins = [];
-
const sister = getPronouns(slave).sister;
- if (arr.length > 2) {
- let lastTwin = arr.pop();
-
- for (const twin of arr) {
- twins.push(`${getSlave(twin).slaveName},`);
-
- getSlave(twin).devotion -= 30;
- }
-
- twins.push(`and ${getSlave(lastTwin).slaveName}`);
- } else {
- twins.push(`${getSlave(arr[0]).slaveName} and ${getSlave(arr[1]).slaveName}`);
- }
-
arr.forEach(i => getSlave(i).devotion -= 30);
App.Events.addParagraph(subDiv, [
- `${His} twins, ${twins.join(' ')} are <span class="devotion dec">devastated</span> that you would take their ${sister} from them.`
+ `${His} twins, ${toSentence(arr.map(i => getSlave(i).slaveName))} are <span class="devotion dec">devastated</span> that you would take their ${sister} from them.`
]);
return subDiv;
@@ -522,26 +498,12 @@ App.UI.SlaveInteract.killSlave = function(slave) {
} else {
const subDiv = document.createElement("div");
- const sisters = [];
-
const sister = getPronouns(slave).sister;
- if (arr.length > 2) {
- let lastSister = arr.pop();
-
- for (const sister of arr) {
- sisters.push(`${getSlave(sister).slaveName},`);
- }
-
- sisters.push(`and ${getSlave(lastSister).slaveName}`);
- } else {
- sisters.push(`${getSlave(arr[0]).slaveName} and ${getSlave(arr[1]).slaveName}`);
- }
-
arr.forEach(i => getSlave(i).devotion -= 25);
App.Events.addParagraph(subDiv, [
- `${His} sister, ${sisters.join(' ')} are <span class="devotion dec">grief-stricken</span> that you would take their ${sister} from them.`
+ `${His} sisters, ${toSentence(arr.map(i => getSlave(i).slaveName))} are <span class="devotion dec">grief-stricken</span> that you would take their ${sister} from them.`
]);
return subDiv;
@@ -566,26 +528,12 @@ App.UI.SlaveInteract.killSlave = function(slave) {
} else {
const subDiv = document.createElement("div");
- const halfSisters = [];
-
const sister = getPronouns(slave).sister;
- if (arr.length > 2) {
- let lastHalfSister = arr.pop();
-
- for (const sister of arr) {
- halfSisters.push(`${getSlave(sister).slaveName},`);
- }
-
- halfSisters.push(`and ${getSlave(lastHalfSister).slaveName}`);
- } else {
- halfSisters.push(`${getSlave(arr[0]).slaveName} and ${getSlave(arr[1]).slaveName}`);
- }
-
arr.forEach(i => getSlave(i).devotion -= 20);
App.Events.addParagraph(subDiv, [
- `${His} half-sisters, ${halfSisters.join(' ')}, are <span class="devotion dec">saddened</span> that you would take their ${sister} from them.`
+ `${His} half-sisters, ${toSentence(arr.map(i => getSlave(i).slaveName))}, are <span class="devotion dec">saddened</span> that you would take their ${sister} from them.`
]);
return subDiv;
@@ -593,11 +541,10 @@ App.UI.SlaveInteract.killSlave = function(slave) {
}
function getRelationshipEffects(ID) {
- if (getSlave(ID).fetish !== "mindbroken") {
+ const target = getSlave(ID);
+ if (target.fetish !== Fetish.MINDBROKEN) {
const subDiv = document.createElement("div");
- const target = getSlave(ID);
-
App.Events.addParagraph(subDiv, [
`${target.slaveName} is <span class="devotion dec">grief-stricken</span> that you have killed ${getPronouns(target).his} best source of comfort and companionship in a life of bondage.`
]);
@@ -668,7 +615,7 @@ App.UI.SlaveInteract.killSlave = function(slave) {
function mercy() {
const mercyDiv = document.createElement("div");
- if (!slave.fuckdoll && slave.fetish !== "mindbroken") {
+ if (!slave.fuckdoll && slave.fetish !== Fetish.MINDBROKEN) {
App.Events.addParagraph(mercyDiv, [mercyReaction()]);
} else {
mercyDiv.append(`You change your mind, and with a wave of your hand, send ${slave.slaveName} back to ${his} duties. Maybe some other time.`);
@@ -818,7 +765,7 @@ App.UI.SlaveInteract.killSlave = function(slave) {
let reactionText = `The fear on ${his} face is palpable, though ${he} nods slowly and agrees, not seeing another choice.`;
- if (slave.skill.combat) {
+ if (slave.skill.combat > 30) {
reactionText = `${He} nods ${his} head and straightens up, as though mentally preparing ${himself} for the fight for ${his} life.`;
}
diff --git a/src/npc/interaction/passage/abort.js b/src/npc/interaction/passage/abort.js
index 11727043ce376ba38594f95d3ae0c05eabc6d211..6a177208161c897844494e57065ea4ba94ea9cbd 100644
--- a/src/npc/interaction/passage/abort.js
+++ b/src/npc/interaction/passage/abort.js
@@ -18,7 +18,7 @@ App.Interact.abort = function(slave) {
r.push(`It was so early in ${his} pregnancy that the potential mental effects are diminished.`);
} else {
r.push(`${slave.slaveName} is`);
- if (slave.fuckdoll > 0 || slave.fetish === "mindbroken") {
+ if (slave.fuckdoll > 0 || slave.fetish === Fetish.MINDBROKEN) {
r.push(`completely unmoved by the development.`);
} else if (slave.sexualFlaw === "breeder") {
r.push(`<span class="red">fundamentally broken.</span> ${His} entire concept of self and sexuality was wrapped up in the life growing within ${him}, and now it is gone.`);
diff --git a/src/npc/interaction/passage/fAnimalImpreg.js b/src/npc/interaction/passage/fAnimalImpreg.js
index 3f2b9909410424d344d0b29f137f8bf03e5386ca..b798cd61ef1973eb369af16d3880ec2c9feb54df 100644
--- a/src/npc/interaction/passage/fAnimalImpreg.js
+++ b/src/npc/interaction/passage/fAnimalImpreg.js
@@ -13,34 +13,34 @@ App.Interact.fAnimalImpreg = function(slave) {
/* FIXME: this might not work */
for (const canine of V.animals.canine) {
- if (canBreed(slave, canine)) {
+ if (canBreed(slave, getAnimal(canine))) {
App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
- `Have a ${canine.species !== "dog" ? canine.species : canine.breed} knock ${him} up`,
+ `Have a ${getAnimal(canine).species !== "dog" ? getAnimal(canine).species : getAnimal(canine).name} knock ${him} up`,
() => jQuery(node).empty().append(content(canine))
));
eligibility = true;
}
}
for (const hooved of V.animals.hooved) {
- if (canBreed(slave, hooved)) {
+ if (canBreed(slave, getAnimal(hooved))) {
App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
- `Have a ${hooved.species} knock ${him} up`,
+ `Have a ${getAnimal(hooved).species} knock ${him} up`,
() => jQuery(node).empty().append(content(hooved))
));
eligibility = true;
}
}
for (const feline of V.animals.feline) {
- if (canBreed(slave, feline)) {
+ if (canBreed(slave, getAnimal(feline))) {
App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
- `Have a ${feline.species !== "cat" ? feline.species : feline.breed} knock ${him} up`,
+ `Have a ${getAnimal(feline).species !== "cat" ? getAnimal(feline).species : getAnimal(feline).name} knock ${him} up`,
() => jQuery(node).empty().append(content(feline))
));
eligibility = true;
}
}
if (!eligibility) {
- App.UI.DOM.appendNewElement("div", node, `You have no animals capable of inseminating ${him}`, `note`);
+ App.UI.DOM.appendNewElement("div", node, `You have no animals capable of inseminating ${him}`, ['note']);
}
App.Events.addParagraph(node, r);
return node;
@@ -48,16 +48,16 @@ App.Interact.fAnimalImpreg = function(slave) {
function content(animal) {
const el = new DocumentFragment();
r.push(`You have a servant lead the`);
- if (animal.species !== "dog" || animal.species !== "cat") {
+ if (animal.species !== "dog" && animal.species !== "cat") {
r.push(animal.species);
} else {
- r.push(animal.breed);
+ r.push(animal.name);
}
r.push(`in on a leash and feed him a special treat, one laced with high amounts of aphrodisiacs and vasodilators. They have an effect very rapidly, and the`);
if (animal.species !== "dog" && animal.species !== "cat") {
r.push(`${animal.species}'s`);
} else {
- r.push(`${animal.breed}'s`);
+ r.push(`${animal.name}'s`);
}
r.push(`${animal.dickSize} cock quickly stands at attention.`);
diff --git a/src/npc/interaction/passage/fMarry.js b/src/npc/interaction/passage/fMarry.js
index 444ae7c4b54f178128476a37a3644ab60dc084a0..e9c94420d85b567b5e40051c3da839c7cdece122 100644
--- a/src/npc/interaction/passage/fMarry.js
+++ b/src/npc/interaction/passage/fMarry.js
@@ -26,7 +26,7 @@ App.Interact.fMarry = function(slave) {
} = getPronouns(assistant.pronouns().main).appendSuffix("A");
let reactionType;
r.push(`You tell ${slave.slaveName} that you're going to marry ${him}. (A proposal, of course, would be inappropriate, even in so enlightened a place as your arcology.)`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`${He} doesn't react.`);
reactionType = 0;
} else if (slave.devotion+slave.trust >= 175) {
@@ -61,7 +61,7 @@ App.Interact.fMarry = function(slave) {
}
r.push(Spoken(slave, `"Thank you, ${Master}. I am going to do my best to be a`));
if (slave.fetishKnown === 1 && slave.fetishStrength > 60) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(Spoken(slave, `perfect submissive ${wife} to you,`));
} else if (slave.fetish === "cumslut") {
r.push(Spoken(slave, `perfect oral ${wife},`));
@@ -137,7 +137,7 @@ App.Interact.fMarry = function(slave) {
if (canTalk(slave)) {
r.push(`${He} ${say}s,`, Spoken(slave, `"Please ${Master}, I don't want to`));
if (slave.fetishKnown === 1 && slave.fetishStrength > 60) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(Spoken(slave, `be your little submissive fucktoy,`));
} else if (slave.fetish === "cumslut") {
r.push(Spoken(slave, `be your cum sucker,`));
@@ -230,7 +230,7 @@ App.Interact.fMarry = function(slave) {
}
r.push(`burst into tears, but this one is unusually effective. It seems ${slave.slaveName} does not want to marry you, if ${his} prolonged, anguished sobbing is anything to go by. However, ${he} would have to be a fool to think there's any way out of it. You lean in and whisper that`);
if (slave.fetishKnown === 1 && slave.fetishStrength > 60) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${he}'ll make the perfect submissive ${wife} for you dominate.`);
} else if (slave.fetish === "cumslut") {
r.push(`${he}'ll make the perfect oral ${wife} for your`);
@@ -550,7 +550,7 @@ App.Interact.fMarry = function(slave) {
slave.slaveSurname = V.PC.slaveSurname;
const hears = canHear(slave) ? "hears" : "understands";
r.push(`You also command ${V.assistant.name} to rename your new slave wife ${slave.slaveName} ${slave.slaveSurname}.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`The new Mrs. ${slave.slaveSurname} ${hears} this, of course, and shows no reaction. Like many things, names mean nothing to ${him} now.`);
} else if (slave.devotion+slave.trust >= 175) {
r.push(`The new Mrs. ${slave.slaveSurname} ${hears} this, of course, and breaks down again. Being brusquely redesignated as your slave ${wife} was such a sterile experience that ${he} wasn't sure it was real, and hearing that ${he}'s to take your surname <span class="trust inc">reassures ${him}</span> that it is. Not to mention, ${he} might be a ${SlaveTitle(slave)}, but ${he}'s still a ${girl}, and hearing that ${he} wouldn't get a decent wedding did disappoint ${him}, but this makes up for it. You might not be all that expressive, but <span class="devotion inc">${he}'s your wife,</span> and that's what matters to ${him}.`);
@@ -861,7 +861,7 @@ App.Interact.fMarry = function(slave) {
}
r.push(`"Done," ${heA} says when you climax. "Enjoy your`);
if (slave.fetishKnown === 1 && slave.fetishStrength > 60) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`submissive slave ${wife}!"`);
} else if (slave.fetish === "cumslut") {
r.push(`slave ${wife}'s mouth!"`);
@@ -962,7 +962,7 @@ App.Interact.fMarry = function(slave) {
const r = [];
slave.slaveSurname = V.PC.slaveSurname;
r.push(`You also command ${V.assistant.name} to rename your new slave wife ${slave.slaveName} ${slave.slaveSurname}.`);
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`Before you get too distracted, you tell your lovely new ${wife} that ${he}'s now to be known as ${slave.slaveName} ${slave.slaveSurname}. You are uncertain if it sunk in or not.`);
} else if (slave.devotion+slave.trust >= 175) {
r.push(`Before you get too distracted, you tell your lovely new ${wife} that ${he}'s now to be known as ${slave.slaveName} ${slave.slaveSurname}. It would be an understatement to say ${he}'s delighted. ${He}'s a good ${SlaveTitle(slave)}, but even ${he} has to retain a kernel of doubt about whether a marriage between an owner and a piece of property is really worth much. This <span class="trust inc">reassures ${him}</span> that it is. ${His} special day probably wasn't exactly like ${he} might once have imagined it, but ${he} obviously thinks it's been <span class="devotion inc">very nice,</span> all things considered.`);
diff --git a/src/npc/interaction/passage/fSlaveImpreg.js b/src/npc/interaction/passage/fSlaveImpreg.js
index a475a8b0e764dc5e2315e2af00d942cd6b08a128..27b934ce639c4f7b08ca225b0bd69f48dfa96c91 100644
--- a/src/npc/interaction/passage/fSlaveImpreg.js
+++ b/src/npc/interaction/passage/fSlaveImpreg.js
@@ -28,7 +28,7 @@ App.Interact.fSlaveImpregChoosePartner = class extends App.Interact.BaseChoosePa
App.UI.DOM.appendNewElement("span", container, ` (${adj} inbreeding, CoI of ${kinship})`);
}
}
-}
+};
/**
* @param {App.Entity.SlaveState} slave
@@ -54,7 +54,9 @@ App.Interact.fSlaveImpreg = function(slave, impregnatrix) {
himP
} = getPronouns(V.PC).appendSuffix("P");
- r.push(`The first necessary step is to prepare the donatrix.`);
+ const donatrix = (impregnatrix.pronoun === App.Data.Pronouns.Kind.female || V.diversePronouns === 0) ? `donatrix` : `donor`;
+
+ r.push(`The first necessary step is to prepare the ${donatrix}.`);
const belly = bellyAdjective(slave);
const superfetation = (slave.geneticQuirks.superfetation === 2 && slave.pregKnown === 1) ? 1 : 0;
const penCountBonus = random(6, 20);
@@ -182,7 +184,7 @@ App.Interact.fSlaveImpreg = function(slave, impregnatrix) {
r.push(`You set ${him} up for ${impregnatrix.slaveName}, face-up so ${he} is pinned under the weight of ${his} giant cock.`);
} else if (tooBigBalls(slave)) {
r.push(`You set ${him} up for ${impregnatrix.slaveName}, face-${(slave.belly >= 60000) ? `up` : `down`} so the weight of ${his} giant balls anchor ${him} helplessly in place.`);
- } else if (slave.fetish === "submissive" && slave.fetishStrength > 60 && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60 && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
r.push(`${He} is accustomed to submit to you, but as a natural submissive ${he} doesn't have much trouble submitting to ${impregnatrix.slaveName}'s seed instead.`);
} else if (slave.devotion < -20) {
r.push(`${He} tries to refuse, so you restrain ${him} despite ${his} resistance to the idea of being made a breeder.`);
@@ -212,7 +214,7 @@ App.Interact.fSlaveImpreg = function(slave, impregnatrix) {
impregnatrix.anus = 1;
}
} else if (impregnatrix.devotion < -20) {
- r.push(`Since your semen donatrix is restrained, you order ${slave.slaveName} to present ${himself} on the couch, and then maneuver ${impregnatrix.slaveName}'s dick into place. ${slave.slaveName} does ${his} best to hump ${himself} against the unwilling cock until you deal ${impregnatrix.slaveName} a terrific swat across the ass and promise to give ${him2} more of the same until ${he2} gets going. After watching ${him2} mechanically fuck for a while, you stop ${him2}, push an electrostimulator up ${his2} butt, and administer a shock to ${his2} ${prostate} that forces ${him2} to empty ${his2} nuts into ${slave.slaveName}. ${He} <span class="mediumorchid">resents</span> what you made ${him2} do and <span class="gold">fears you</span> as a result. Though ${slave.slaveName} accepts the situation, ${he} looks into ${impregnatrix.slaveName}'s eyes with obvious apology.`);
+ r.push(`Since your semen ${donatrix} is restrained, you order ${slave.slaveName} to present ${himself} on the couch, and then maneuver ${impregnatrix.slaveName}'s dick into place. ${slave.slaveName} does ${his} best to hump ${himself} against the unwilling cock until you deal ${impregnatrix.slaveName} a terrific swat across the ass and promise to give ${him2} more of the same until ${he2} gets going. After watching ${him2} mechanically fuck for a while, you stop ${him2}, push an electrostimulator up ${his2} butt, and administer a shock to ${his2} ${prostate} that forces ${him2} to empty ${his2} nuts into ${slave.slaveName}. ${He} <span class="mediumorchid">resents</span> what you made ${him2} do and <span class="gold">fears you</span> as a result. Though ${slave.slaveName} accepts the situation, ${he} looks into ${impregnatrix.slaveName}'s eyes with obvious apology.`);
impregnatrix.devotion -= 5;
impregnatrix.trust -= 5;
seX(impregnatrix, "anal", V.PC);
diff --git a/src/npc/interaction/passage/fSlaveSlaveAss.js b/src/npc/interaction/passage/fSlaveSlaveAss.js
index 691fe98701eccc415b684dbf68ebb9ae3aca055e..a91fed705032ce9461158fa5369b9b7890b45e33 100644
--- a/src/npc/interaction/passage/fSlaveSlaveAss.js
+++ b/src/npc/interaction/passage/fSlaveSlaveAss.js
@@ -286,12 +286,12 @@ App.Interact.fSlaveSlaveAss = function(slave, rapist) {
}
}
- if (slave.fetish === "submissive" && slave.fetishStrength > 60 && slave.fetishKnown === 1 && slave.anus === 0) {
+ if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60 && slave.fetishKnown === 1 && slave.anus === 0) {
r.push(`${He} presents ${his} virgin asshole to ${rapist.slaveName} without protest. This act <span class="virginity loss"> breaks in ${his} asshole,</span> and <span class="hotpink">reminds ${him}</span> of ${his} status as a submissive slave.`);
slave.anus = 1;
slave.devotion += 4;
slave.fetishStrength += 1;
- } else if (slave.fetish === "submissive" && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
r.push(`${He} smiles as ${he} lays back and presents ${his} asshole to ${rapist.slaveName}. ${He} openly enjoys submitting ${himself} for others to make use of.`);
} else if ((slave.devotion > 20 && slave.anus === 0) ) {
r.push(`${He} accepts your orders without comment and presents ${his} virgin asshole to ${rapist.slaveName}. ${He} gasps in shock when ${he} feels the`);
@@ -375,7 +375,7 @@ App.Interact.fSlaveSlaveAss = function(slave, rapist) {
}
r.push(`leaving ${him} annoyed at ${his} lack of control, though ${he} still somewhat enjoyed ${himself}.`);
}
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
if (slave.devotion < -20) {
r.push(`By the end of the day ${slave.slaveName}'s abused backdoor is`);
@@ -422,7 +422,7 @@ App.Interact.fSlaveSlaveAss = function(slave, rapist) {
} else {
r.push(`strap-on.`);
}
- r.push(`With the added stimulus of penetrating a tight hole alongside ${his2} dear ${getWrittenTitle(rapist)}, ${rapist.slaveName} comes indecently hard, but no where near as hard as the completely overloaded ${slave.slaveName}. All of you collapse into an exhausted, happy pile of flesh.`);
+ r.push(`With the added stimulus of penetrating a tight hole alongside ${his2} dear ${getWrittenTitle(rapist)}, ${rapist.slaveName} comes indecently hard, but nowhere near as hard as the completely overloaded ${slave.slaveName}. All of you collapse into an exhausted, happy pile of flesh.`);
}
seX(slave, "anal", rapist);
diff --git a/src/npc/interaction/passage/fSlaveSlaveDick.js b/src/npc/interaction/passage/fSlaveSlaveDick.js
index c133de0af1ced5a5421507bf89814205b7ee5c16..6d1cd239955f048ffe1df9bf53bd435f8a7aafa5 100644
--- a/src/npc/interaction/passage/fSlaveSlaveDick.js
+++ b/src/npc/interaction/passage/fSlaveSlaveDick.js
@@ -64,7 +64,7 @@ App.Interact.fSlaveSlaveDick = function(slave, rapist) {
r.push(`You take a look at the bound cock toy.`);
- if (slave.fetish === "mindbroken" && slave.career !== "a dairy cow" && slave.career !== "a breeding bull") {
+ if (slave.fetish === Fetish.MINDBROKEN && slave.career !== "a dairy cow" && slave.career !== "a breeding bull") {
r.push(`Since ${slave.slaveName} is mentally broken, the restraints don't do anything but set the scene.`);
} else if (slave.devotion > 50) {
r.push(`Since ${slave.slaveName} is devoted, ${his} restraints are more for the show than for practical purposes.`);
@@ -100,7 +100,7 @@ App.Interact.fSlaveSlaveDick = function(slave, rapist) {
}
}
- if (slave.fetish === "mindbroken" && slave.career !== "a dairy cow" && slave.career !== "a breeding bull") {
+ if (slave.fetish === Fetish.MINDBROKEN && slave.career !== "a dairy cow" && slave.career !== "a breeding bull") {
if (slave.energy > 40) {
r.push(`${slave.slaveName}`);
r.push(`is broken mentally, but has a serviceable libido. After a bit of stimulation ${he}'s good to go without any further reaction on ${his} own.`);
@@ -114,7 +114,7 @@ App.Interact.fSlaveSlaveDick = function(slave, rapist) {
}
r.push(`from becoming erect. A massive dose of vasodilators fixes this, and you think you see ${his} face twitch with the pain, but there is no further reaction.`);
}
- } else if (slave.fetish === "mindbroken" && slave.career === "a dairy cow") {
+ } else if (slave.fetish === Fetish.MINDBROKEN && slave.career === "a dairy cow") {
if (slave.energy > 40) {
r.push(`${slave.slaveName}, as a good cow with a good libido, takes only a little fondling before ${his}`);
if (slave.clit >= 4) {
@@ -133,13 +133,13 @@ App.Interact.fSlaveSlaveDick = function(slave, rapist) {
r.push(`becomes erect, and ${he} moos in discomfort and struggles against ${his} restraints.`);
bottomDrugged = 1;
}
- } else if (slave.fetish === "mindbroken" && slave.career === "a breeding bull") {
+ } else if (slave.fetish === Fetish.MINDBROKEN && slave.career === "a breeding bull") {
r.push(`${slave.slaveName}, as a good bull, was already erect while being tied down. It seems ${he} knows what's going to happen to ${him} soon. Maybe someone at the Cattle Ranch has been sampling their bulls?`);
} else {
if (slave.devotion >= -20) {
if (slave.energy > 40) {
if (slave.fetishKnown === 1) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`${slave.slaveName}`);
r.push(`is a known sub, and seconds after ${he} is ordered to lie down to be restrained ${his}`);
if (slave.clit >= 4) {
@@ -261,7 +261,7 @@ App.Interact.fSlaveSlaveDick = function(slave, rapist) {
App.Events.addParagraph(el, r);
r = [];
- if (slave.fetish === "mindbroken" && slave.career !== "a dairy cow" && slave.career !== "a breeding bull") {
+ if (slave.fetish === Fetish.MINDBROKEN && slave.career !== "a dairy cow" && slave.career !== "a breeding bull") {
r.push(`${slave.slaveName} doesn't even notice`);
if (isIncest) {
if (slave.father === rapist.ID && slave.mother === rapist.ID) {
@@ -279,7 +279,7 @@ App.Interact.fSlaveSlaveDick = function(slave, rapist) {
r.push(`the other slave,`);
}
r.push(`and simply lays still.`);
- } else if (slave.fetish === "mindbroken" && (slave.career === "a dairy cow" || slave.career === "a breeding bull")) {
+ } else if (slave.fetish === Fetish.MINDBROKEN && (slave.career === "a dairy cow" || slave.career === "a breeding bull")) {
if (isIncest) {
r.push(`${slave.slaveName}'s simple mind does not even acknowledge that ${rapist.slaveName} is`);
if (slave.father === rapist.ID && slave.mother === rapist.ID) {
@@ -494,15 +494,15 @@ App.Interact.fSlaveSlaveDick = function(slave, rapist) {
App.Events.addParagraph(el, r);
r = [];
- if (rapist.fetish === "mindbroken" && rapist.career !== "a dairy cow" && rapist.career !== "a breeding bull") {
+ if (rapist.fetish === Fetish.MINDBROKEN && rapist.career !== "a dairy cow" && rapist.career !== "a breeding bull") {
r.push(`${rapist.slaveName} stares blankly, and needs to be deliberately guided to straddle ${slave.slaveName}.`);
if (isIncest) {
r.push(`Naturally, ${he2} isn't even aware of the impending incest.`);
}
- if (slave.fetish === "mindbroken" && slave.career !== "a dairy cow" && slave.career !== "a breeding bull") {
+ if (slave.fetish === Fetish.MINDBROKEN && slave.career !== "a dairy cow" && slave.career !== "a breeding bull") {
r.push(`Since both slaves are essentially vegetables, this is shaping up to be a rather contrived sexual demonstration. The parts are all there, but the actors aren't going to contribute much to the show.`);
}
- } else if (rapist.fetish === "mindbroken" && (rapist.career === "a dairy cow")) {
+ } else if (rapist.fetish === Fetish.MINDBROKEN && (rapist.career === "a dairy cow")) {
r.push(`${rapist.slaveName} sees the`);
if (slave.clit >= 4) {
r.push(`massive clit`);
@@ -513,7 +513,7 @@ App.Interact.fSlaveSlaveDick = function(slave, rapist) {
if (isIncest) {
r.push(`Naturally, since ${he2} thinks ${he2}'s a cow, incest means nothing to ${him2}.`);
}
- } else if (rapist.fetish === "mindbroken" && (rapist.career === "a breeding bull")) {
+ } else if (rapist.fetish === Fetish.MINDBROKEN && (rapist.career === "a breeding bull")) {
r.push(`${rapist.slaveName} sees the`);
if (slave.clit >= 4) {
r.push(`massive clit`);
@@ -648,7 +648,7 @@ App.Interact.fSlaveSlaveDick = function(slave, rapist) {
if (incestMood === "Top" || incestMood === "Both" || !(isIncest)) {
if (rapist.fetishKnown === 1) {
- if (rapist.fetish === "submissive") {
+ if (rapist.fetish === Fetish.SUBMISSIVE) {
r.push(`${rapist.slaveName} usually prefers to be underneath someone with a`);
if (slave.clit >= 4) {
r.push(`massive clit`);
@@ -919,7 +919,7 @@ App.Interact.fSlaveSlaveDick = function(slave, rapist) {
}
r.push(`${He2} begins playing with ${him2} immediately, fondling, pinching and licking while bouncing on the meaty shaft. Occasionally ${he2} stops, denying ${slave.slaveName} release and teasing ${him}, fully enjoying ${his2} dominant role.`);
if (slave.dick > 0) {
- if (slave.fetish === "submissive") {
+ if (slave.fetish === Fetish.SUBMISSIVE) {
r.push(`By the end of the session ${slave.slaveName}'s abused, pent-up penis has shot a massive load into ${rapist.slaveName}'s welcoming pussy. ${He} is glad to be dominated.`);
} else {
r.push(`By the end of the session ${slave.slaveName}'s abused, pent-up penis has shot a massive load, to ${his} horror and resentment, into the blissfully satisfied ${rapist.slaveName}.`);
diff --git a/src/npc/interaction/passage/fSlaveSlaveVag.js b/src/npc/interaction/passage/fSlaveSlaveVag.js
index 89eefc31c85b10e6c1c2dd902dc928dd82b1aa84..98421890dba761f521b5b0162b61b7139746dde9 100644
--- a/src/npc/interaction/passage/fSlaveSlaveVag.js
+++ b/src/npc/interaction/passage/fSlaveSlaveVag.js
@@ -297,12 +297,12 @@ App.Interact.fSlaveSlaveVag = function(slave, rapist) {
}
}
- if (slave.fetish === "submissive" && slave.fetishStrength > 60 && slave.fetishKnown === 1 && slave.vagina === 0) {
+ if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60 && slave.fetishKnown === 1 && slave.vagina === 0) {
r.push(`${He} presents ${his} virgin pussy to ${rapist.slaveName} without protest. This act <span class="virginity loss"> breaks in ${his} pussy,</span> and <span class="devotion inc">reminds ${him}</span> of ${his} status as a submissive slave.`);
slave.vagina = 1;
slave.devotion += 4;
slave.fetishStrength += 1;
- } else if (slave.fetish === "submissive" && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
+ } else if (slave.fetish === Fetish.SUBMISSIVE && slave.fetishStrength > 60 && slave.fetishKnown === 1) {
r.push(`${He} smiles as ${he} lays back and presents ${his} pussy to ${rapist.slaveName}. ${He} openly enjoys submitting ${himself} for others to make use of.`);
} else if ((slave.devotion > 20 && slave.vagina === 0) ) {
r.push(`${He} accepts your orders without comment and presents ${his} virgin pussy to ${rapist.slaveName}. ${He} gasps in shock when ${he} feels the`);
@@ -386,7 +386,7 @@ App.Interact.fSlaveSlaveVag = function(slave, rapist) {
}
r.push(`leaving ${him} annoyed at ${his} lack of control, though ${he} still somewhat enjoyed ${himself}.`);
}
- } else if (slave.fetish === "submissive") {
+ } else if (slave.fetish === Fetish.SUBMISSIVE) {
if (slave.devotion < -20) {
r.push(`By the end of the day ${slave.slaveName}'s abused cunt is`);
@@ -437,7 +437,7 @@ App.Interact.fSlaveSlaveVag = function(slave, rapist) {
} else {
r.push(`strap-on.`);
}
- r.push(`With the added stimulus of penetrating a tight hole alongside ${his2} dear ${getWrittenTitle(rapist)}, ${rapist.slaveName} comes indecently hard, but no where near as hard as the completely overloaded ${slave.slaveName}. All of you collapse into an exhausted, happy pile of flesh.`);
+ r.push(`With the added stimulus of penetrating a tight hole alongside ${his2} dear ${getWrittenTitle(rapist)}, ${rapist.slaveName} comes indecently hard, but nowhere near as hard as the completely overloaded ${slave.slaveName}. All of you collapse into an exhausted, happy pile of flesh.`);
}
if (canImpreg(slave, rapist)) {
diff --git a/src/npc/interaction/passage/matchmaking.js b/src/npc/interaction/passage/matchmaking.js
index fd94da123ca3adade9c6b0a54773539f67ca56f3..ee70c9ba0379cc09d2da74bb429fea02553d398d 100644
--- a/src/npc/interaction/passage/matchmaking.js
+++ b/src/npc/interaction/passage/matchmaking.js
@@ -86,9 +86,9 @@ App.Interact.matchmaking = function(slave) {
r = [];
r.push(`Being ordered into a relationship would be difficult for anyone, but they're so obedient that <span class="lightgreen">they do their best and make it work.</span> You ensure that they do, and your determined efforts to do so <span class="mediumorchid">reduce their devotion to you,</span> though it's mostly by redirection towards each other. And in any case, they remain devoted enough, and will likely return to their earlier worshipfulness in a few weeks at most.`);
let matched = 1;
- if (slave.fetish === "submissive" && subSlave.fetish === "dom") {
+ if (slave.fetish === Fetish.SUBMISSIVE && subSlave.fetish === "dom") {
r.push(`${subSlave.slaveName} is a dom and ${slave.slaveName} is a sub. It's a match out of bad fiction.`);
- } else if (subSlave.fetish === "submissive" && slave.fetish === "dom") {
+ } else if (subSlave.fetish === Fetish.SUBMISSIVE && slave.fetish === "dom") {
r.push(`${slave.slaveName} is a dom and ${subSlave.slaveName} is a sub. It's a match out of bad fiction.`);
} else if (slave.fetish === "masochist" && subSlave.fetish === "sadist") {
r.push(`${subSlave.slaveName} is a sadist and ${slave.slaveName} is a masochist. They're a perfect ouroboros of agony.`);
@@ -107,19 +107,19 @@ App.Interact.matchmaking = function(slave) {
} else if (subSlave.fetish === "buttslut" && slave.fetish === "dom") {
r.push(`${slave.slaveName} likes fucking other girls, so once ${subSlave.slaveName} asks ${him} to just do it to ${his2} ass all the time, they're both happy.`);
} else if (slave.fetish === "boobs" && subSlave.boobs > 4000) {
- r.push(`${slave.slaveName} fetishized breasts so much that ${he} thinks ${subSlave.slaveName}'s udders are one of the sexiest things ${he}'s ever seen.`);
+ r.push(`${slave.slaveName} fetishizes breasts so much that ${he} thinks ${subSlave.slaveName}'s udders are two of the sexiest things ${he}'s ever seen.`);
} else if (subSlave.fetish === "boobs" && slave.boobs > 4000) {
- r.push(`${subSlave.slaveName} fetishized breasts so much that ${he2} thinks ${slave.slaveName}'s udders are one of the sexiest things ${he2}'s ever seen.`);
+ r.push(`${subSlave.slaveName} fetishizes breasts so much that ${he2} thinks ${slave.slaveName}'s udders are two of the sexiest things ${he2}'s ever seen.`);
} else if ((slave.fetish === "pregnancy" && subSlave.fetish === "pregnancy") && subSlave.bellyPreg >= 300000 && slave.bellyPreg >= 300000) {
- r.push(`${slave.slaveName} and ${subSlave.slaveName} are both enormously laden with children, much to the other's delight. They can't wait to explore each other's baby-filled middles.`);
+ r.push(`${slave.slaveName} and ${subSlave.slaveName} are both enormously laden with children, much to their delight. They can't wait to explore each other's baby-filled middles.`);
} else if ((slave.fetish === "pregnancy" && subSlave.fetish === "pregnancy") && subSlave.preg > subSlave.pregData.normalBirth/2 && slave.preg > slave.pregData.normalBirth/2) {
- r.push(`${slave.slaveName} and ${subSlave.slaveName} are both heavily pregnant, much to the other's delight.`);
+ r.push(`${slave.slaveName} and ${subSlave.slaveName} are both heavily pregnant, much to each other's delight.`);
} else if ((subSlave.fetish === "pregnancy") && slave.bellyPreg >= 300000) {
r.push(`${subSlave.slaveName} fetishizes pregnant bellies so much that ${he2} is awestruck by ${slave.slaveName}'s enormous, baby-filled middle.`);
} else if ((slave.fetish === "pregnancy") && subSlave.bellyPreg >= 300000) {
r.push(`${slave.slaveName} fetishizes pregnant bellies so much that ${he} is awestruck by ${subSlave.slaveName}'s enormous, baby-filled middle.`);
} else if ((subSlave.fetish === "pregnancy") && slave.preg > slave.pregData.normalBirth/2) {
- r.push(`${subSlave.slaveName} fetishizes pregnant bellies so much that ${he2} thinks ${slave.slaveName} gravid middle is one of the sexiest things ${he2}'s ever seen.`);
+ r.push(`${subSlave.slaveName} fetishizes pregnant bellies so much that ${he2} thinks ${slave.slaveName}'s gravid middle is one of the sexiest things ${he2}'s ever seen.`);
} else if ((slave.fetish === "pregnancy") && subSlave.preg > subSlave.pregData.normalBirth/2) {
r.push(`${slave.slaveName} fetishizes pregnant bellies so much that ${he} thinks ${subSlave.slaveName}'s gravid middle is one of the sexiest things ${he}'s ever seen.`);
} else if ((slave.fetish === "pregnancy" && subSlave.fetish === "pregnancy") && subSlave.bellyPreg >= 100 && slave.bellyPreg >= 100) {
diff --git a/src/npc/interaction/slaveOnSlaveFeeding/fSlaveFeed.js b/src/npc/interaction/slaveOnSlaveFeeding/fSlaveFeed.js
index c52902c95ae7f4cd0244e331aae85130b9d56de4..4e51a38af062e0bae8469631b8e34c805c59ef22 100644
--- a/src/npc/interaction/slaveOnSlaveFeeding/fSlaveFeed.js
+++ b/src/npc/interaction/slaveOnSlaveFeeding/fSlaveFeed.js
@@ -13,6 +13,9 @@ globalThis.FSlaveFeed = function(slave, milkTap) {
let incestTake;
let r = [];
const relative = relativeTerm(slave, milkTap);
+ if (slave.bellyAccessory !== "a support band") {
+ slave.bellyAccessory = "none";
+ }
App.Events.drawEventArt(el, [slave, milkTap]);
@@ -29,7 +32,7 @@ globalThis.FSlaveFeed = function(slave, milkTap) {
if (milkTap.fuckdoll > 0) {
r.push(`This is hilariously easy, as you have complete control over how ${milkTap.slaveName} is posed.`);
- } else if (milkTap.fetish === "mindbroken") {
+ } else if (milkTap.fetish === Fetish.MINDBROKEN) {
r.push(`This is very easy, as ${milkTap.slaveName} blankly follows your every will. Combined with ${his2} instinct to relieve the pressure in ${his2} breasts, ${he2} is simple to position.`);
} else if (milkTap.rivalryTarget === slave.ID) {
r.push(`This is rather easy, as ${milkTap.slaveName} wants to`);
@@ -98,7 +101,7 @@ globalThis.FSlaveFeed = function(slave, milkTap) {
}
} else if (milkTap.mother === slave.ID) {
if (incestGive) {
- r.push(`This is easy enough, as ${milkTap.slaveName} is aroused at the lewdity of breast feeding ${his2} own mother.`);
+ r.push(`This is easy enough, as ${milkTap.slaveName} is aroused at the lewdness of breast feeding ${his2} own mother.`);
if (milkTap.lactation > 1) {
r.push(`${He2} is practically gushing milk with excitement.`);
} else {
@@ -281,7 +284,7 @@ globalThis.FSlaveFeed = function(slave, milkTap) {
r.push(`get between`);
}
r.push(`${milkTap.slaveName}'s massive milky breasts and eagerly approaches ${his} nipples to suckle.`);
- } else if ((slave.fetish === "submissive") && (slave.fetishStrength > 60) && (slave.fetishKnown === 1)) {
+ } else if ((slave.fetish === Fetish.SUBMISSIVE) && (slave.fetishStrength > 60) && (slave.fetishKnown === 1)) {
r.push(`${He} is accustomed to submitting to you, but as a natural submissive ${he} doesn't have much trouble submitting to ${milkTap.slaveName}'s mothering instead.`);
} else if (slave.devotion < -20) {
r.push(`${He} tries to refuse, so you strap ${him} to ${milkTap.slaveName}'s breast, milky ${milkTap.nipples} nipple wedged in ${his} mouth.`);
@@ -1075,7 +1078,7 @@ globalThis.FSlaveFeed = function(slave, milkTap) {
if (milkTap.fuckdoll > 0) {
r.push(`This is hilariously easy, as you have complete control over how ${milkTap.slaveName} is posed.`);
- } else if (milkTap.fetish === "mindbroken") {
+ } else if (milkTap.fetish === Fetish.MINDBROKEN) {
r.push(`This is very easy, as ${milkTap.slaveName} blankly follows your every will. Combined with ${his2} instinct to relieve the building pressure in ${his2} loins, ${he2} is simple to position.`);
} else if (milkTap.rivalryTarget === slave.ID) {
r.push(`This is rather easy, as ${milkTap.slaveName} wants to`);
@@ -1106,7 +1109,7 @@ globalThis.FSlaveFeed = function(slave, milkTap) {
}
} else if (slave.father === milkTap.ID) {
if (incestGive) {
- r.push(`This is easy enough, as ${milkTap.slaveName} cherishes the sheer lewdity of having ${his2} dick sucked by ${his2} ${relative}.`);
+ r.push(`This is easy enough, as ${milkTap.slaveName} cherishes the sheer lewdness of having ${his2} dick sucked by ${his2} ${relative}.`);
} else {
r.push(`This is tough, as ${milkTap.slaveName} is rather uncomfortable having ${his2} dick sucked by ${his2} ${relative}, but ${he2} can't really complain about getting ${his2} overfilled nuts drained.`);
}
@@ -1118,7 +1121,7 @@ globalThis.FSlaveFeed = function(slave, milkTap) {
}
} else if (milkTap.father === slave.ID) {
if (incestGive) {
- r.push(`This is easy enough, as ${milkTap.slaveName} cherishes the sheer lewdity of having ${his2} dick sucked by ${his2} own father.`);
+ r.push(`This is easy enough, as ${milkTap.slaveName} cherishes the sheer lewdness of having ${his2} dick sucked by ${his2} own father.`);
} else {
r.push(`This is tough, as ${milkTap.slaveName} is very uncomfortable having ${his2} dick sucked by ${his2} own father, but ${he2} can't really complain about getting ${his2} overfilled nuts drained.`);
}
@@ -1275,7 +1278,7 @@ globalThis.FSlaveFeed = function(slave, milkTap) {
r.push(`${his} ${relative}'s cock.`);
} else if ((slave.fetish === "cumslut") && (slave.fetishKnown === 1) && (slave.fetishStrength > 60) && (slave.devotion >= -20)) {
r.push(`${He} can't wait to wrap ${his} lips around ${milkTap.slaveName}'s cock and balloon with cum, so ${he} eagerly approaches the waiting shaft.`);
- } else if ((slave.fetish === "submissive") && (slave.fetishStrength > 60) && (slave.fetishKnown === 1)) {
+ } else if ((slave.fetish === Fetish.SUBMISSIVE) && (slave.fetishStrength > 60) && (slave.fetishKnown === 1)) {
r.push(`${He} is accustomed to submitting to you, but as a natural submissive ${he} doesn't have much trouble submitting to ${milkTap.slaveName} instead.`);
} else if (slave.devotion < -20) {
r.push(`${He} tries to refuse, so you tie ${him} up, force a mouth spreader into ${him}, and position ${him} for ${milkTap.slaveName} to thrust into.`);
@@ -1963,7 +1966,7 @@ globalThis.FSlaveFeed = function(slave, milkTap) {
}
r.push(`against ${him} while ${he} deepthroats ${milkTap.slaveName}. With every thrust against the moaning slave, both you and ${milkTap.slaveName} come closer to climax.`);
}
- r.push(`You wrap an arm around ${slave.slaveName}'s middle so you may feel ${his} stomach swell with ejaculate and place your other hand to ${milkTap.slaveName}'s breasts to prevent ${him2} from feeling left out from your attention.`);
+ r.push(`You wrap an arm around ${slave.slaveName}'s middle so you may feel ${his} stomach swell with ejaculate and place your other hand to one of ${milkTap.slaveName}'s nipples to prevent ${him2} from feeling left out from your attention.`);
if (slave.inflation === 3) {
r.push(`You cum multiple times as you feel ${his} belly slowly round with cum, transform into a jiggling mass, and finally grow taut under your molesting fingers.`);
@@ -1979,7 +1982,7 @@ globalThis.FSlaveFeed = function(slave, milkTap) {
r.push(`${slave.slaveName}`);
r.push(`got off quite strongly from the growing pressure within ${him}, <span class="hotpink">cementing</span> ${his} <span class="lime">first fucking</span> as something special.`);
slave.devotion += 4;
- slave.anus = 1;
+ slave.vagina = 1;
} else if (canDoAnal(slave) && (slave.anus === 0)) {
r.push(`${slave.slaveName}`);
r.push(`got off quite strongly from the growing pressure within ${him}, <span class="hotpink">cementing</span> ${his} <span class="lime">first anal</span> as something special.`);
diff --git a/src/npc/startingGirls/editFamily.js b/src/npc/startingGirls/editFamily.js
index c4e40a8d1d36275f73af8aec97f6877ad4991244..e5518809d18ca7dacf8dd4b847113e9e6766ec3d 100644
--- a/src/npc/startingGirls/editFamily.js
+++ b/src/npc/startingGirls/editFamily.js
@@ -597,47 +597,20 @@ App.Intro.editFamily = function(slave, cheat) {
App.UI.DOM.link(
"Reset ALL PC Relatives",
() => {
- let sameMother = 0;
- let sameFather = 0;
-
for (const s of V.slaves) {
if (s.newGamePlus === 0) {
- if (s.mother === V.PC.ID) {
+ if (s.mother === V.PC.ID || s.mother === V.PC.mother) {
s.mother = 0;
}
- if (s.father === V.PC.ID) {
+ if (s.father === V.PC.ID || s.father == V.PC.father) {
s.father = 0;
}
- if (s.mother === V.PC.mother) {
- sameMother++;
- }
- if (s.father === V.PC.father) {
- sameFather++;
- }
- }
- }
- if (sameMother === 0 && slave.mother === V.PC.mother) {
- slave.mother = 0;
- }
- if (sameFather === 0 && slave.father === V.PC.father) {
- slave.father = 0;
- }
- for (let efw = 0; (efw < V.slaves.length && (sameMother === 1 || sameFather === 1)); efw++) {
- if (V.slaves[efw].newGamePlus === 0) {
- if (V.slaves[efw].mother === V.PC.mother && sameMother === 1) {
- V.slaves[efw].mother = 0;
- sameMother = 0;
- }
- if (V.slaves[efw].father === V.PC.father && sameFather === 1) {
- V.slaves[efw].father = 0;
- sameFather = 0;
- }
}
}
- if (slave.mother === V.PC.ID) {
+ if (slave.mother === V.PC.ID || slave.mother === V.PC.mother) {
slave.mother = 0;
}
- if (slave.father === V.PC.ID) {
+ if (slave.father === V.PC.ID || slave.father === V.PC.father) {
slave.father = 0;
}
V.PC.father = 0;
diff --git a/src/npc/startingGirls/startingGirls.js b/src/npc/startingGirls/startingGirls.js
index ff060db4081b54e06e7ba90b3d9b629f8c2bcb4b..9ac3f6f25eda20fb66d6f935a90749dc1cf8c396 100644
--- a/src/npc/startingGirls/startingGirls.js
+++ b/src/npc/startingGirls/startingGirls.js
@@ -183,9 +183,7 @@ App.StartingGirls.applyCareerBonus = function(slave) {
case "hoodlum":
case "street urchin":
improveCondition(slave, 5);
- if (slave.skill.combat < 1) {
- slave.skill.combat += 1;
- }
+ slave.skill.combat = 20;
break;
case "BlackHat":
case "hacker":
@@ -237,7 +235,7 @@ App.StartingGirls.randomizeUnknowns = function(slave) {
slave.attrXY = random(0, 100);
slave.energy = random(1, 90);
}
- if (slave.fetish !== "mindbroken" && slave.fetishKnown === 0) {
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fetishKnown === 0) {
slave.fetishStrength = random(0, 90);
slave.fetish = either("boobs", "buttslut", "cumslut", "dom", "humiliation", "masochist", "none", "none", "none", "none", "none", "none", "none", "none", "none", "none", "pregnancy", "sadist", "submissive");
}
@@ -621,7 +619,7 @@ App.StartingGirls.playerOrigin = function(slave) {
data.origin = "You won $him at cards, a memento from your life as one of the idle rich before you became an arcology owner.";
data.tattoo = "$He has the silhouette of an arcology tattooed on the nape of $his neck.";
}
- if (slave.fetish === "mindbroken") {
+ if (slave.fetish === Fetish.MINDBROKEN) {
if (!isAmputee(slave)) {
data.origin = "You brought $him into the arcology mindbroken, little more than a walking collection of fuckable holes.";
} else {
@@ -716,7 +714,7 @@ App.StartingGirls.physical = function(slave, cheat = false) {
option = options.addCustomOption(`Average height for a ${slave.physicalAge} year old is ${heightToEitherUnit(Height.mean(slave))}`)
.addButton(
"Make average",
- () => resyncSlaveHight(slave),
+ () => resyncSlaveHeight(slave),
""
);
if (cheat) {
@@ -1863,7 +1861,7 @@ App.StartingGirls.mental = function(slave, cheat = false) {
options.addOption("Fetish", "fetishKnown", slave)
.addValue("Unknown", 0, () => {
- if (!cheat && slave.fetish !== "none") {
+ if (!cheat && slave.fetish !== Fetish.NONE) {
slave.fetish = rollRandomFetish();
}
})
@@ -1885,7 +1883,7 @@ App.StartingGirls.mental = function(slave, cheat = false) {
});
}
- if (slave.fetish !== "none" && slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.NONE && slave.fetish !== Fetish.MINDBROKEN) {
App.StartingGirls.addSet(
options.addOption("Fetish strength", "fetishStrength", slave),
App.Data.StartingGirls.fetishStrength);
@@ -1911,7 +1909,7 @@ App.StartingGirls.mental = function(slave, cheat = false) {
App.Data.StartingGirls.energy);
}
- if (slave.fetish !== "mindbroken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
options.addOption("Behavioral Flaw", "behavioralFlaw", slave)
.addValueList([["None", "none"], ["Arrogant", "arrogant"], ["Bitchy", "bitchy"], ["Odd", "odd"], ["Hates Men", "hates men"],
["Hates Women", "hates women"], ["Anorexic", "anorexic"], ["Gluttonous", "gluttonous"], ["Devout", "devout"],
@@ -1974,12 +1972,13 @@ App.StartingGirls.skills = function(slave, cheat = false) {
options.addOption("Entertainment", "entertainment", slave.skill),
App.Data.StartingGirls.skill);
- options.addOption("Combat", "combat", slave.skill)
- .addValueList([["Unskilled", 0], ["Skilled", 1]]);
+ App.StartingGirls.addSet(
+ options.addOption("Combat", "combat", slave.skill),
+ App.Data.StartingGirls.skill);
// skill warning
const totalSkill = slave.skill.whoring + slave.skill.entertainment + slave.skill.vaginal
- + slave.skill.anal + slave.skill.oral + (slave.skill.combat * 100);
+ + slave.skill.anal + slave.skill.oral + slave.skill.combat;
if (totalSkill > 200 && !cheat) {
let comment = ["Starting slaves incur"];
@@ -2121,7 +2120,7 @@ App.StartingGirls.finalize = function(slave) {
App.StartingGirls.stats = function(slave) {
const el = new DocumentFragment();
const options = new App.UI.OptionsGroup();
- const counters = Object.keys(new App.Entity.SlaveActionsCountersState()).sort((a, b) => a.toLowerCase() > b.toLowerCase());
+ const counters = Object.keys(new App.Entity.SlaveActionsCountersState()).sort((a, b) => a.localeCompare(b, undefined, {sensitivity: 'base'}));
const titles = new Map([
["birthsTotal", "Total births"],
["laborCount", "Labor count"],
diff --git a/src/npc/startingGirls/startingGirlsPassage.js b/src/npc/startingGirls/startingGirlsPassage.js
index 1d2414a5c038cc2fd89e88c9b1e98a44d615b301..fce85cf53638b1ceec619dada51250f788e68add 100644
--- a/src/npc/startingGirls/startingGirlsPassage.js
+++ b/src/npc/startingGirls/startingGirlsPassage.js
@@ -24,18 +24,33 @@ App.StartingGirls.passage = function() {
}
} else {
const pronoun = V.slaves.length > 1 ? "they" : getPronouns(V.slaves[0]).he;
- r.push(App.UI.DOM.combineNodes(App.UI.DOM.toSentence(V.slaves.map(s => App.UI.DOM.slaveDescriptionDialog(s))), "'s"));
- r.push(`records have been finalized; ${pronoun} will arrive with you when you take over your new arcology.`);
+ r.push(`The following slave records have been finalized; ${pronoun} will arrive with you when you take over your new arcology.`);
}
r.push(App.UI.DOM.makeElement("div", "Current cash reserves can be found on the far left sidebar."));
App.Events.addNode(el, r, "p");
+ if (V.slaves.length > 0) {
+ for (const slave of V.slaves) {
+ const cost = slave.slaveCost;
+ App.Events.addNode(el, [
+ App.UI.DOM.slaveDescriptionDialog(slave),
+ `costing: ${cashFormatColor(cost)}`,
+ App.UI.DOM.generateLinksStrip([
+ App.UI.DOM.link("Delete", () => {
+ cashX(Math.abs(cost), "slaveTransfer", slave);
+ removeSlave(slave);
+ }, [], "Starting Girls")
+ ])
+ ], "div");
+ }
+ App.Events.addNode(el, [], "p");
+ }
const headerLinks = App.UI.DOM.appendNewElement("div", el);
linkArray.push(
App.UI.DOM.makeElement(
"span",
App.UI.DOM.passageLink("Refresh", "Starting Girls"),
- "major-link"
+ ["major-link"]
)
);
linkArray.push(
diff --git a/src/npc/surgery/bodySwap/bodySwapReaction.js b/src/npc/surgery/bodySwap/bodySwapReaction.js
index aca16292ce8a0d57b1a00a34c567741b4b8385b1..b18c2db8460914255f4ca049760d31ecf3a1c6a4 100644
--- a/src/npc/surgery/bodySwap/bodySwapReaction.js
+++ b/src/npc/surgery/bodySwap/bodySwapReaction.js
@@ -30,7 +30,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r = [];
if (hasAnyArms(body)) { /* (has arms) */
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`After a while, ${he} begins to stir, ${his} eyes fluttering. ${He} lets out a low groan and reaches up to rub at ${his} eyes. ${He} stops and stares uncomprehendingly`);
if (sight === -2) {
r.push(`into <span class="red">the darkness that is ${his} new world.</span> ${He} goes into a panic and begins thrashing violently until ${he} is restrained and sedated. Hopefully when ${he} comes to again, ${he}'ll have forgotten ${he} could ever see in the first place.`);
@@ -97,7 +97,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
if (end !== 1) {
- if (body.skin !== soul.skin && canSee(body) && body.fetish !== "mindbroken") {
+ if (body.skin !== soul.skin && canSee(body) && body.fetish !== Fetish.MINDBROKEN) {
r.push(`${His} <span class="coral">newly ${body.skin} skin</span> is the first thing that leaps out at ${him}.`);
if (body.devotion > 50) {
r.push(`${He} is fascinated by the change and what this means for ${him}.`);
@@ -118,7 +118,7 @@ globalThis.bodySwapReaction = function(body, soul) {
if (hasAnyProstheticArms(body) && !hasAnyProstheticArms(body)) {
r.push(`finger, the servo motors whining softly with each movement.`);
if (body.hears <= -2) {
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`${He} vaguely reacts to the sounds coming from ${his} arm, though not to any meaningful extent.`);
} else if (body.devotion >= -20) {
r.push(`A look of morbid curiosity crosses ${his} features.`);
@@ -132,7 +132,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (hasAnyProstheticArms(body)) {
r.push(`finger, the servo motors whining softly with each movement.`);
- } else if (body.fetish === "mindbroken") {
+ } else if (body.fetish === Fetish.MINDBROKEN) {
r.push(`finger as if nothing changed.`);
} else if (body.muscles < soul.muscles - 5) { /* (less muscle)*/
if (body.devotion > 20) {
@@ -142,7 +142,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion -= 1;
}
} else if (body.muscles > soul.muscles + 5) { /* (more muscle)*/
- if (body.devotion >= -20 || body.fetish !== "mindbroken") {
+ if (body.devotion >= -20 || body.fetish !== Fetish.MINDBROKEN) {
r.push(`finger, the arm <span class="lime">${(canSee(body)) ? `visibly more toned` : `noticeably stronger`}</span> than ${his} old one. With a clench of ${his} fist, the muscles of the limb bulge slightly. ${He} is <span class="hotpink">happy</span> that you would take into consideration such a small detail, and knows that life will be just that much easier now.`);
body.devotion += 2;
} else {
@@ -221,7 +221,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.lips > soul.lips + 10) {
r.push(`${His} fingers brush ${his} lips and ${he} pauses for a moment,`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`as if`);
}
r.push(`noticing that <span class="lime">they are larger now</span> than they once were.`);
@@ -239,13 +239,13 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.lips < soul.lips - 10) {
r.push(`${His} fingers brush ${his} lips and ${he} pauses for a moment,`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`as if`);
}
r.push(`noticing that <span class="orange">they are smaller</span> now than they once were.`);
} else {
r.push(`${His} fingers brush ${his} lips and ${he} pauses for a moment,`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`having found nothing different about them.`);
} else {
r.push(`finding them familiar enough.`);
@@ -256,7 +256,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
if (body.teeth === "removable" && soul.teeth !== "removable") { /* no teeth */
r.push(`A look of confusion crosses ${his} face, ${his} brow furrowing slightly. You see ${him} work ${his} jaw for moment before ${he} turns ${his} head and spits out a set of dentures.`);
- if (body.devotion < -20 && body.fetish !== "mindbroken") {
+ if (body.devotion < -20 && body.fetish !== Fetish.MINDBROKEN) {
r.push(`${He} <span class="mediumorchid">glowers</span> at them, knowing full well they'll be back in ${his} mouth shortly.`);
body.devotion -= 2;
}
@@ -287,7 +287,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
r.push(`when ${he} does.`);
}
- if (body.physicalAge < 40 && soul.physicalAge > 50 && body.fetish !== "mindbroken") {
+ if (body.physicalAge < 40 && soul.physicalAge > 50 && body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`${He} can feel the <span class="green">lack of wrinkles</span> on ${his} face and <span class="hotpink">smiles broadly.</span>`);
body.devotion += 2;
@@ -347,7 +347,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.boobsImplant >= soul.boobsImplant + 20000) { /* (Extreme bigger implants)*/
r.push(`<span class="lime">a pair of absolutely enormous fake tits ballooning out from ${him}.</span>`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`As ${he} examines ${his} breasts, ${he} seems to understand that they are much bigger now, though what lies within eludes ${his} mind.`);
} else if (body.devotion > 20) {
r.push(`This new size excites ${him} and ${he} looks forward to experimenting with them.`);
@@ -358,10 +358,10 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.boobs >= soul.boobs + 20000) { /* (Extreme bigger breasts)*/
r.push(`<span class="lime">a pair of massive tits hanging from ${his} chest.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
r.push(`As ${he} feels them, ${he} recognizes the familiar firmness of the implants at their cores.`);
}
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`As ${he} examines ${his} breasts, ${he} seems to understand that they are much bigger now.`);
} else if (body.devotion > 20) {
r.push(`This new size excites ${him} and ${he} looks forward to experimenting with them.`);
@@ -378,7 +378,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion += 5;
}
} else if (body.boobs > soul.boobs + 100) { /* (Bigger breasts)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`breasts. As ${he} examines them closer, ${he} seems to understand that <span class="lime">they are bigger now.</span>`);
} else if (body.devotion > 20) {
r.push(`<span class="lime">${his} bust has grown.</span> ${He} is caught off guard at the size of ${his} new chest. ${He} bounces them in ${his} ${(hasBothArms(body)) ? `palms` : `palm`}, marveling at their mass.`);
@@ -394,7 +394,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
body.devotion -= 5;
} else if (body.boobs <= soul.boobs - 100 && soul.boobs > 300) { /* (Smaller breasts)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`breasts. As ${he} examines them closer, ${he} seems to understand that <span class="orange">they are smaller now.</span>`);
} else if (body.devotion > 20) {
r.push(`<span class="orange">that ${his} chest is smaller.</span> ${He} shrugs this off, as ${his} devotion to you overrides any anguish this might cause.`);
@@ -403,14 +403,14 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion -= 2;
}
} else { /* (No change (less than a 100 cc's of change)*/
- if (body.devotion > 20 && body.fetish !== "mindbroken") {
+ if (body.devotion > 20 && body.fetish !== Fetish.MINDBROKEN) {
r.push(`a familiar chest waiting for ${him}.`);
if (body.physicalAge < soul.physicalAge - 5) { /* (younger)*/
r.push(`${He} is pleased to see ${his} breasts are now more pert and smooth than they were before.`);
}
} else {
r.push(`that ${his} breasts are roughly the same.`);
- if ((body.physicalAge < soul.physicalAge - 5) && body.fetish !== "mindbroken") { /* (younger)*/
+ if ((body.physicalAge < soul.physicalAge - 5) && body.fetish !== Fetish.MINDBROKEN) { /* (younger)*/
r.push(`Except, of course, that they are younger and more pert, something that ${he} <span class="hotpink">can't help but appreciate.</span>`);
body.devotion += 2;
}
@@ -438,7 +438,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.boobsImplant >= soul.boobsImplant + 20000) { /* (Extreme bigger implants)*/
r.push(`<span class="lime">a pair of absolutely enormous fake tits protruding far from ${his} body.</span>`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`As ${he} examines ${his} breasts, ${he} seems to understand that they are much bigger now, yet far more firm than they were before.`);
} else if (body.devotion > 20) {
r.push(`This new size excites ${him} and ${he} looks forward to experimenting with them.`);
@@ -449,10 +449,10 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.boobs >= soul.boobs + 20000) { /* (Extreme bigger breasts)*/
r.push(`<span class="lime">a pair of massive tits hanging from ${his} chest.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
r.push(`As ${he} moves, ${he} recognizes a familiar firmness at their cores.`);
}
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`As ${he} examines ${his} breasts, ${he} seems to understand that they are much bigger now, yet far more soft than they were before.`);
} else if (body.devotion > 20) {
r.push(`This new size excites ${him} and ${he} looks forward to experimenting with them.`);
@@ -469,7 +469,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion += 5;
}
} else if (body.boobs > soul.boobs + 100) { /* (Bigger breasts)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`breasts. As ${he} examines them closer, ${he} seems to understand that <span class="lime">they are bigger now.</span>`);
} else if (body.devotion > 20) {
r.push(`<span class="lime">${his} bust has grown.</span> ${He} is caught off guard at the size of ${his} new chest. ${He} bounces them in ${his} ${(hasBothArms(body)) ? `palms` : `palm`}, marveling at their firmness.`);
@@ -485,7 +485,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
body.devotion -= 5;
} else if (body.boobs <= soul.boobs - 100 && soul.boobs > 300) { /* (Smaller breasts)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`breasts. As ${he} examines them closer, ${he} seems to understand that <span class="orange">they are smaller now.</span>`);
} else if (body.devotion > 20) {
r.push(`<span class="orange">${his} chest is smaller.</span> ${He} shrugs this off, as ${his} devotion to you overrides any anguish this might cause.`);
@@ -500,7 +500,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion -= 2;
}
} else { /* (No change (less than a 100 cc's of change)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`the same chest ${he} had before, except maybe firmer than ${his} addled brain remembers.`);
} else if (body.devotion > 20) {
r.push(`a familiar chest waiting for ${him}. ${He} quickly realizes ${his} mistake once ${he} squeezes them.`);
@@ -524,7 +524,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
body.devotion -= 5;
} else if (body.boobs <= 300) { /* flat*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`and finds that <span class="orange">${his} implants and breasts are completely gone.</span> This draws no reaction from ${him}.`);
} else if (body.devotion > 20) {
r.push(`and finds nothing. <span class="orange">Not only have ${his} implants been removed, but ${he}'s been left completely flat.</span> It is what it is.`);
@@ -553,10 +553,10 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.boobs >= soul.boobs + 20000) { /* (Extreme bigger breasts)*/
r.push(`<span class="lime">and finds a pair of massive tits hanging from ${his} chest.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
r.push(`As ${he} fondles them, ${he} can just make out that ${he} no longer has implants.`);
}
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`As ${he} examines ${his} breasts, ${he} seems to understand that they are much bigger now.`);
} else if (body.devotion > 20) {
r.push(`This new size excites ${him} and ${he} looks forward to experimenting with them.`);
@@ -573,7 +573,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion += 5;
}
} else if (body.boobs > soul.boobs + 100) { /* (Bigger breasts)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`breasts. As ${he} examines them, ${he} seems to understand that <span class="lime">they are bigger now.</span>`);
} else if (body.devotion > 20) {
r.push(`<span class="lime">and finds ${his} bust has grown.</span> ${He} is caught off guard at the size of ${his} new chest. ${He} bounces them in ${his} ${(hasBothArms(body)) ? `palms` : `palm`}, marveling at the motion of silicone free flesh.`);
@@ -602,7 +602,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion -= 2;
}
} else { /* (No change (less than a 100 cc's of change)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`and finds nothing off about ${his} chest.`);
} else if (body.devotion > 20) {
r.push(`and finds a familiar chest waiting for ${him}, albeit <span class="coral">implant free.</span>`);
@@ -626,7 +626,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
body.devotion -= 5;
} else if (body.boobs <= 300 && soul.boobs > 300) { /* flat*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`and <span class="orange">finds nothing.</span> ${He} doesn't seem to care, though.`);
} else if (body.devotion > 20) {
r.push(`and finds nothing; <span class="orange">${his} breasts are completely gone.</span> At least it's a literal weight off ${his} chest.`);
@@ -655,10 +655,10 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.boobs >= soul.boobs + 20000) { /* (Extreme bigger breasts)*/
r.push(`and finds a <span class="lime">pair of massive tits hanging from ${his} chest.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
r.push(`As ${he} feels them, ${he} can clearly tell they are completely natural.`);
}
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`As ${he} examines ${his} breasts, ${he} seems to understand that they are much bigger now.`);
} else if (body.devotion > 20) {
r.push(`This new size excites ${him} and ${he} looks forward to experimenting with them.`);
@@ -675,7 +675,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion += 5;
}
} else if (body.boobs > soul.boobs + 100) { /* (Bigger breasts)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`and finds breasts. As ${he} examines them, ${he} seems to understand that <span class="lime">they are bigger now.</span>`);
} else if (body.devotion > 20) {
r.push(`and finds <span class="lime">${his} bust has grown.</span> ${He} is caught off guard at the size of ${his} new chest. ${He} bounces them in ${his} ${(hasBothArms(body)) ? `palms` : `palm`}, marveling at the motion of ${his} soft flesh.`);
@@ -691,7 +691,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
body.devotion -= 5;
} else if (body.boobs <= soul.boobs - 100 && soul.boobs > 300) { /* (Smaller breasts)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`breasts. As ${he} examines them, ${he} seems to understand <span class="orange">that they smaller now.</span>`);
} else if (body.devotion > 20) {
r.push(`that <span class="orange">${his} breasts are smaller.</span> ${He} shrugs this off, as ${his} devotion to you overrides any anguish this might cause.`);
@@ -700,7 +700,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion -= 2;
}
} else { /* (No change (less than a 100 cc's of change)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`nothing out of the ordinary.`);
} else if (body.devotion > 20) {
r.push(`a familiar chest waiting for ${him}.`);
@@ -728,14 +728,14 @@ globalThis.bodySwapReaction = function(body, soul) {
} else {
r.push(`<span class="coral">steady streams of milk start to flow from ${his} nipples.</span>`);
}
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`${He} reels back at the wet feeling.`);
} else if (body.devotion > 20) {
r.push(`${He} is delighted by the fact that ${his} breasts now produce milk. This is a gift ${he} will happily use for your benefit.`);
} else {
r.push(`${He} is irritated that you have altered ${his} body to produce milk.`);
}
- } else if (body.fetish === "mindbroken") {
+ } else if (body.fetish === Fetish.MINDBROKEN) {
// TODO: write me
} else if (body.lactation > 1 && soul.lactation === 1) {
r.push(`${He} realizes ${his} breasts are <span class="lime">rapidly producing milk.</span> ${He} groans at the unfamiliar pressure.`);
@@ -750,7 +750,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`${He} groans as ${he} discovers just how badly ${he} needs to be milked.`);
}
- if (body.nipples !== soul.nipples && body.fetish !== "mindbroken") { /* (if nipples have changed shape)*/
+ if (body.nipples !== soul.nipples && body.fetish !== Fetish.MINDBROKEN) { /* (if nipples have changed shape)*/
r.push(`Once ${he} is satisfied with ${his} tits, ${he} shifts ${his} chest to get a better`);
if (canSee(body)) {
r.push(`view of`);
@@ -805,7 +805,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
/* (if breasts have changed shape)*/
- if (body.boobShape !== soul.boobShape && body.boobs > 300 && body.fetish !== "mindbroken") {
+ if (body.boobShape !== soul.boobShape && body.boobs > 300 && body.fetish !== Fetish.MINDBROKEN) {
r.push(`As ${he} releases ${his} boobs, ${he} discovers they no longer rest the same either;`);
if (body.boobShape === "saggy") { /* (drooping or older)*/
r.push(`<span class="red">they now sag,</span> disappointing ${him}.`);
@@ -839,7 +839,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
}
- if (canSee(body) && body.fetish !== "mindbroken") {
+ if (canSee(body) && body.fetish !== Fetish.MINDBROKEN) {
App.Events.addParagraph(el, r);
r = [];
if (soul.voice === 0) {
@@ -906,7 +906,7 @@ globalThis.bodySwapReaction = function(body, soul) {
} else if (!canWalk(body)) {
r.push(`and immediately collapses under ${his} own weight.`);
}
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
r.push(`${He} looks at you`);
if (body.devotion >= -20) {
r.push(`<span class="hotpink">submissively</span>`);
@@ -926,7 +926,7 @@ globalThis.bodySwapReaction = function(body, soul) {
/* (height changes) */
if (body.height >= soul.height + 10) {
r.push(`wobbles for a moment as ${he} adjusts to ${his} new height.`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`The benefits of <span class="lime">being taller</span> don't register to the broken ${girl}.`);
} else if (body.devotion > 20) {
r.push(`${He} is <span class="hotpink">truly pleased</span> that you have taken the effort to make ${him} <span class="lime">taller,</span> knowing that a lot of everyday things in life will be easier, and that ${he} will be viewed as having more stature now, both metaphorically and literally.`);
@@ -936,7 +936,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.trust += 1;
}
} else if (body.height <= soul.height - 10) {
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`doesn't quite realize that ${he} is <span class="lime">shorter than before.</span>`);
} else {
r.push(`starts at the falling sensation before realizing ${he} is just <span class="lime">shorter than ${he} was before.</span>`);
@@ -962,7 +962,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
r.push(`${his} new figure.`);
- if (body.fetish !== "mindbroken" && canSee(body)) {
+ if (body.fetish !== Fetish.MINDBROKEN && canSee(body)) {
if (body.race !== soul.race) { /* (race changes)*/
r.push(`It immediately strikes ${him} that ${he} is <span class="coral">no longer ${soul.race}.</span> ${His} new ${body.race} body`);
if (body.devotion > 50) {
@@ -988,7 +988,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`${He} begins to run ${his} fingers through ${his} hair, only to <span class="red">find it gone.</span>`);
}
r.push(`This`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`catches ${his} attention, and ${he} spends some time rubbing ${his} new smooth scalp.`);
} else if (body.devotion > 20) {
r.push(`feels fun and interesting, and ${he} gently rubs ${his} new smooth scalp.`);
@@ -1003,7 +1003,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`${He} moves to rub ${his} bald head, only to find ${he} <span class="green">has a full head of hair.</span>`);
}
r.push(`This`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`catches ${his} attention, and ${he} spends some time pulling at ${his} new hair.`);
} else if (body.devotion >= -20) {
r.push(`makes ${him} <span class="hotpink">squeal with delight.</span> ${He} plays with ${his} new hair, enjoying how it feels between ${his} fingers.`);
@@ -1048,7 +1048,7 @@ globalThis.bodySwapReaction = function(body, soul) {
} else if (body.physicalAge >= 18) {
r.push(`${He}'s shocked to find ${he}'s now a fresh adult.`);
}
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
r.push(`This is disturbing to ${him} on a fundamental level,`);
if (body.devotion > 50) {
r.push(`as that means ${he} will now will have less time with you before the end of ${his}`);
@@ -1078,7 +1078,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`${He} shudders with pleasure at the thought of cumming in a fertile pussy. ${He} realizes this body has gone through puberty.`);
}
}
- } else if (body.fetish !== "mindbroken") {
+ } else if (body.fetish !== Fetish.MINDBROKEN) {
r.push(`${He} starts as ${he}`);
if (canSee(body)) {
r.push(`sees`);
@@ -1122,7 +1122,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`${He} never expected to be a young adult again.`);
}
}
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
let puberty = 0;
if (
(
@@ -1170,7 +1170,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`The very next thing ${he} finds is how much`);
if (body.weight >= soul.weight + 5) {
r.push(`<span class="red">heavier ${he} is.</span>`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`With ${his} broken mind, ${he} shows no real reaction to this new weight.`);
} else if (body.devotion > 50) {
if (body.behavioralFlaw === "gluttonous") {
@@ -1206,7 +1206,7 @@ globalThis.bodySwapReaction = function(body, soul) {
} else if (body.behavioralQuirk === "insecure") {
r.push(`${He} is surprisingly fine with this; you know best, after all.`);
} else if (body.behavioralQuirk === "fitness" && body.weight > 30) {
- r.push(`${He} is <span class="mediumorchid">irritated and frustrated</span> at this new weight. ${He} should be fit not fat!`);
+ r.push(`${He} is <span class="mediumorchid">irritated and frustrated</span> at this new weight. ${He} should be fit, not fat!`);
body.devotion -= 10;
} else {
r.push(`${He} is <span class="mediumorchid">irritated and frustrated</span> at this new`);
@@ -1224,7 +1224,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else {
r.push(`<span class="green">lighter ${he} is.</span>`);
- if (body.fetish === "mindbroken") { /* mindbroken*/
+ if (body.fetish === Fetish.MINDBROKEN) { /* mindbroken*/
r.push(`${He} doesn't show much reaction to ${his} lost weight.`);
} else if (body.devotion > 50) { /* devoted*/
r.push(`${He} is pleased that you have given ${him} a more slender and svelte`);
@@ -1249,7 +1249,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`The last major change to ${his} body structure worth ${his} attention is`);
if (body.muscles >= soul.muscles + 5) {
r.push(`that ${he} is <span class="lime">significantly more muscular</span> than ${he} once was.`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 50) {
r.push(`${He} is happy with ${his} newfound strength and looks forward to putting this power to work for you.`);
} else {
@@ -1288,7 +1288,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`and since this is not ${his} first pregnancy, ${he} is able to recognize the <span class="pink">life within ${him}.</span>`);
}
} else if (body.bellyPreg >= 450000) {
- r.push(`and ${he} can immediately see that ${he} is <span class="pink">insanely pregnant;</span> ${his} body stretched full of babies.`);
+ r.push(`and ${he} can immediately see that ${he} is <span class="pink">insanely pregnant,</span> ${his} body stretched full of babies.`);
} else if (body.bellyPreg >= 150000) {
r.push(`and ${he} can quite clearly see that ${he} is <span class="pink">enormously pregnant,</span> so much so that ${his} body could quite believably be carrying nine full sized babies.`);
} else if (body.bellyPreg >= 60000) {
@@ -1300,7 +1300,7 @@ globalThis.bodySwapReaction = function(body, soul) {
} else if (body.bellyPreg >= 100) {
r.push(`and ${he} feels a <span class="pink">slight swell to ${his} stomach.</span>`);
}
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.bellyPreg >= 100 || body.counter.birthsTotal > 0) {
if (body.devotion > 50) {
r.push(`Even though ${he} didn't get to experience being made into one, ${he} is delighted to be a mother${(body.counter.birthsTotal > 0) ? ` again` : ``}.`);
@@ -1372,7 +1372,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`${He} is filled with <span class="mediumorchid">hatred for you</span> for snatching ${his} pregnancy away from ${him}.`);
body.devotion -= 15;
}
- } else if (body.fetish !== "mindbroken") {
+ } else if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 50) {
r.push(`While ${he} will miss the chance of meeting ${his} future child, ${he} will no longer be weighed down by it as ${he} gets used to ${his} new body.`);
} else if (body.devotion > 20) {
@@ -1400,7 +1400,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`${He} is filled with <span class="mediumorchid">hatred for you</span> for snatching ${his} pregnancy away from ${him}.`);
body.devotion -= 15;
}
- } else if (body.fetish !== "mindbroken") {
+ } else if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 50) {
r.push(`While ${he} will miss the chance of meeting ${his} future child, ${he} will no longer be weighed down by it as ${he} gets used to ${his} new body.`);
} else if (body.devotion > 20) {
@@ -1429,7 +1429,7 @@ globalThis.bodySwapReaction = function(body, soul) {
} else if (body.bellyImplant >= 100) {
r.push(`feels a <span class="pink">slight swell to ${his} stomach.</span>`);
} else {
- r.push(`finds <span class="pink">no signs of an implant swollen belly.</span>`);
+ r.push(`finds <span class="pink">no signs of an implant-swollen belly.</span>`);
}
if (body.devotion > 20) {
r.push(`${He} appreciates how much easier it will be with a smaller middle.`);
@@ -1450,7 +1450,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
if (body.weight >= soul.weight + 30) { /* (fatter)*/
r.push(`${his} stomach until ${he} feels just how <span class="red">much more weight</span> ${he} is carrying.`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`${He} finds ${his} new curves intriguing.`);
} else {
@@ -1460,7 +1460,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
if (body.bellySag > soul.bellySag && body.belly < 100) {
r.push(`${He} also notices <span class="red">how much it sags.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`This isn't pleasant, but ${he} bears it for you.`);
} else {
@@ -1470,7 +1470,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.bellySag < soul.bellySag && body.belly < 100) {
r.push(`${He} also notices it is <span class="green">tighter despite being softer.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`This is great for ${his} self-image and ${he} happily strokes ${his} new firm belly.`);
} else {
@@ -1481,7 +1481,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.weight <= soul.weight - 30) { /* (thinner)*/
r.push(`${his} stomach and ${he} finds ${his} body <span class="green">thinner.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`${He} finds ${his} new curves intriguing.`);
} else {
@@ -1491,7 +1491,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
if (body.bellySag > soul.bellySag && body.belly < 100) {
r.push(`${He} also notices how it <span class="red">has a sag to it.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`This isn't pleasant, but ${he} bears it for you.`);
} else {
@@ -1501,7 +1501,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.bellySag < soul.bellySag && body.belly < 100) {
r.push(`${He} also notices it is <span class="green">tighter despite being softer.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`This is great for ${his} self-image and ${he} happily strokes ${his} new perkier belly.`);
} else {
@@ -1512,7 +1512,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.bellySag > soul.bellySag && body.belly < 100) { /* (belly sag)*/
r.push(`${his} stomach and ${he} notices a <span class="red">sag in ${his} belly.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`This isn't pleasant, but ${he} bears it for you.`);
} else {
@@ -1522,7 +1522,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.bellySag < soul.bellySag && body.belly < 100) { /* (subtracted)*/
r.push(`${his} stomach and notices the <span class="green">sag in ${his} belly has lessened.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`This is great for ${his} self-image and ${he} happily strokes ${his} new tight belly.`);
} else {
@@ -1532,7 +1532,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.weight < 10 && body.muscles > 5 && body.belly < 100) {
r.push(`${his} <span class="lime">muscled stomach.</span> ${He} stops to trace ${his} abs.`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`${He} finds ${his} new strength intriguing.`);
} else {
@@ -1550,7 +1550,7 @@ globalThis.bodySwapReaction = function(body, soul) {
/* waist */
if (body.waist > soul.waist + 40) {
r.push(`As ${he} explores ${his} middle, ${he} also takes note of ${his} <span class="orange">wider waist.</span>`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`The effects of such a change on ${his} appearance go right over ${his} head.`);
} else if (body.devotion > 20) {
r.push(`This change disappoints ${him}. ${He} wishes ${he} could have been more feminine for you.`);
@@ -1560,7 +1560,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.waist < soul.waist - 40) {
r.push(`As ${he} explores ${his} middle, ${he} also takes note of ${his} <span class="lime">narrower waist.</span>`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`The effects of such a change on ${his} appearance go right over ${his} head.`);
} else if (body.devotion > 20) {
r.push(`This change pleases ${him}; ${he} can't wait to feel your hands around ${him}.`);
@@ -1686,7 +1686,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`<span class="orange">smaller</span>`);
}
r.push(`than it was, and ${he} is`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`not bothered one way or the other by this development; it isn't even clear if ${he} notices anything different about ${his} cock.`);
} else if (body.devotion > 20) {
if (body.dick > soul.dick + 4) {
@@ -1756,7 +1756,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`Then ${he} takes a moment to cup ${his} balls, it seems they are`);
if (body.balls > soul.balls + 4) {
r.push(`<span class="lime">much larger</span> now. This`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`does not seem to register in ${his} mind.`);
} else if (body.devotion > 20) {
r.push(`amazing addition to ${his} body is <span class="hotpink">surely welcome.</span> ${He} moans as ${he} fondles ${his} new balls, groaning as ${he} rolls their weight around. ${His} face is flushed by the time ${he}'s done "examining" them.`);
@@ -1779,7 +1779,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.balls > soul.balls) {
r.push(`<span class="lime">larger</span> now. This`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`change doesn't mean much of anything to ${him}.`);
} else if (body.devotion > 20) {
r.push(`change delights ${him} and ${he} spends ample time jostling and toying with ${his} bigger nuts.`);
@@ -1794,7 +1794,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else {
r.push(`<span class="orange">smaller</span> now, and this`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`goes largely unnoticed.`);
} else if (body.devotion > 20) {
r.push(`change, while not necessarily fun, is appreciated by your devoted slave nonetheless.`);
@@ -1805,7 +1805,7 @@ globalThis.bodySwapReaction = function(body, soul) {
cockChanged = 1;
}
- if (cockChanged === 1 && body.fetish !== "mindbroken") {
+ if (cockChanged === 1 && body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`${He} is thrilled at your modifications to ${his} genitals and is excited to explore those changes with you.`);
} else {
@@ -1829,7 +1829,7 @@ globalThis.bodySwapReaction = function(body, soul) {
if (body.vagina === 0) { /* (+virginity)*/
r.push(`As ${he} prods at ${his} pussy, ${he} feels a slight tightness and a bit of difficulty as ${he} tries to press ${his} finger inside of ${himself}. ${He} realizes this body is a <span class="lime">virgin!</span>`);
if (body.vagina > 0) {
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`And this would likely mean something to ${him}, if ${his} mind was not lost.`);
} else if (body.devotion > 20) {
r.push(`${He} is happy to be a virgin again so that ${he} can lose it to you.`);
@@ -1841,7 +1841,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (soul.vagina !== -1 && body.vagina < soul.vagina) { /* (+tightness)*/
r.push(`${He} notices ${he} is <span class="lime">tighter</span> now than ${he} was before.`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`And this might have been significant to ${him}, if ${his} brain worked correctly.`);
} else if (body.devotion > 20) {
r.push(`Sex will be more pleasurable than it was before and ${he} looks forward to breaking in ${his} new pussy with you.`);
@@ -1851,7 +1851,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (soul.vagina !== -1 && body.vagina > soul.vagina) { /* (-tightness)*/
r.push(`${He} notices how ${he} is now <span class="orange">looser</span> than ${he} was before.`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`And this might be important to ${him}, if ${his} head was in working order.`);
} else if (body.devotion > 20) {
r.push(`${He} giggles a bit as ${he} tests out how many fingers ${he} can fit inside ${his} new loose hole, though ${he} wishes ${he} were still tight for you.`);
@@ -1888,7 +1888,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`much`);
}
r.push(`wider.</span>`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`${He} pays them little mind and reaches around to learn how`);
} else if (body.fetish === "pregnancy" && body.counter.birthsTotal > 0) {
r.push(`${He} seems <span class="hotpink">overjoyed</span> at their new size; It means ${he}'ll be even better at popping out babies than ever. ${He} continues around back to learn how`);
@@ -1916,7 +1916,7 @@ globalThis.bodySwapReaction = function(body, soul) {
} else { /* (+1 size)*/
r.push(`a fair bit.`);
}
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`As soon as ${his} ${(hasBothArms(body)) ? `hands leave` : `hand leaves`} its mass does ${he} forget it wasn't always this big.`);
} else if (body.devotion > 20) {
r.push(`This is a pleasing development as ${he} looks forward to putting this new rear to the test with you.`);
@@ -1941,7 +1941,7 @@ globalThis.bodySwapReaction = function(body, soul) {
} else { /* (-1 size)*/
r.push(`a fair bit.`);
}
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`${He} is saddened that there is now less of ${him} for you to play with, but remembers that you chose this body for ${him} and hopes that you will still make use of ${his} rear.`);
} else {
@@ -1954,7 +1954,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
if (body.buttImplant > 0 && soul.buttImplant === 0) { /* (+butt implants)*/
r.push(`${He} also notes that <span class="coral">there are implants in ${him},</span> as ${his} prodding reveals a certain stiffness in ${his} ass's shape.`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`It pleases ${him} that you would invest in such a minor way in ${his} body.`);
} else {
@@ -1963,7 +1963,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.buttImplant === 0 && soul.buttImplant > 0) { /* (-butt implants)*/
r.push(`${He} also notes that ${he} <span class="coral">no longer has ass implants,</span> as ${his} experimentation reveals a more natural bounce to ${his} buttocks.`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`${He} is happy that you think ${his} body doesn't need any artificial modification to be pleasing.`);
} else {
@@ -1980,7 +1980,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`much`);
}
r.push(`narrower.</span>`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`${He} pays it little mind.`);
} else if (body.fetish === "pregnancy" && body.counter.birthsTotal > 0) {
r.push(`${He} seems a little caught up on their new size, likely by concern over future pregnancies and childbirth.`);
@@ -2006,7 +2006,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
/* tattoos */
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
const tatLocations = [
"boobsTat",
"buttTat",
@@ -2028,7 +2028,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
}
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.origBodyOwnerID === body.ID) {
r.push(`This is ${his} body alright.`);
} else if (body.ID === body.cloneID) {
@@ -2052,7 +2052,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (canSee(body)) { /* (amputee) + sight */
r.push(`After a while, ${he} begins to stir, ${his} eyes fluttering.`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (sight === 2) {
r.push(`${He} just stares at the ceiling for some time, completely overwhelmed <span class="green">that ${he} can now see.</span> ${He}'s <span class="hotpink">quite grateful</span> that <span class="mediumaquamarine">you would give ${him} such a gift.</span>`);
body.devotion += 15;
@@ -2069,7 +2069,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`${He} just stares at the ceiling for some time, having difficulty processing that <span class="green">${he} can now see.</span> The gift of sight is lost upon ${him}, as is that ${he} is no longer in ${his} own body.`);
}
r.push(`${He} lets out a low groan and reaches up to rub at ${his} eyes. Or rather, ${he} attempts to. A visible look of confusion crosses ${his} face and ${he} strains to sit up, but all ${he} manages to do is wiggle, ${his} movements reminding you of a suffocating goldfish. As the cloud of anesthetics fades, ${he} realizes what's happened to ${him}`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`and is supremely unaffected by it, as ${his} mind has already left ${him}.`);
if (sight === 2) {
r.push(`<span class="green">Since ${he} can now see,</span> ${he} spends a significant amount of time just taking in the world before turning upon ${himself}. Since ${he} has no reference of ${his} previous body left, ${he} might as well have always possessed this body.`);
@@ -2087,7 +2087,7 @@ globalThis.bodySwapReaction = function(body, soul) {
if (isAmputee(soul)) { /* (was already an amputee) */
r.push(`but ${he} realizes that at least nothing about ${his} limbs, or lack thereof, has changed.`);
} else {
- r.push(`${His} eyes seem to bulge; ${his} heart monitor begins to beep faster and more insistently. Eventually, your assistant is forced to inject ${him} with a sedative. ${His} eyes flutter closed and the heart monitors beeping slows to a steady pulse. Hopefully ${he}'ll be calmer when ${he} wakes up again, though the memory of waking without limbs will <span class="gold">stick with ${him}.</span>`);
+ r.push(`and ${his} eyes seem to bulge, the heart monitor begins to beep faster and more insistently. Eventually, your assistant is forced to inject ${him} with a sedative. ${His} eyes flutter closed and the heart monitors beeping slows to a steady pulse. Hopefully ${he}'ll be calmer when ${he} wakes up again, though the memory of waking without limbs will <span class="gold">stick with ${him}.</span>`);
r.push(App.UI.DOM.makeElement("div", `...`));
r.push(`When ${he} wakes up again, ${he} seems stable; the cold <span class="hotpink">acceptance</span> of ${his} fate clouds ${his} eyes.`);
body.devotion += 5;
@@ -2100,7 +2100,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r = [];
r.push(`${He} cranes ${his} neck to look down on ${himself}`);
- if (body.skin !== soul.skin && body.fetish !== "mindbroken") {
+ if (body.skin !== soul.skin && body.fetish !== Fetish.MINDBROKEN) {
r.push(`only to quickly recoil in shock when ${he} sees ${his} <span class="coral">newly ${body.skin} skin.</span>`);
if (body.devotion > 50) {
r.push(`${He} is fascinated by the change and what this means for ${him}.`);
@@ -2139,7 +2139,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.boobsImplant >= soul.boobsImplant + 20000) { /* (Extreme bigger implants)*/
r.push(`<span class="lime">a pair of absolutely enormous fake tits looming over ${him}.</span>`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`As ${he} examines ${his} breasts, ${he} seems to understand that they are much bigger now, though what lies within eludes ${his} mind.`);
} else if (body.devotion > 20) {
r.push(`This new size excites ${him} and ${he} looks forward to experimenting with them.`);
@@ -2150,10 +2150,10 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.boobs >= soul.boobs + 20000) { /* (Extreme bigger breasts)*/
r.push(`<span class="lime">a pair of massive tits resting on ${his} chest.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
r.push(`As ${he} moves, ${he} recognizes the familiar weight of the implants at their cores.`);
}
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`As ${he} examines ${his} breasts, ${he} seems to understand that they are much bigger now.`);
} else if (body.devotion > 20) {
r.push(`This new size excites ${him} and ${he} looks forward to experimenting with them.`);
@@ -2170,7 +2170,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion += 5;
}
} else if (body.boobs > soul.boobs + 100) { /* (Bigger breasts)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`breasts. As ${he} examines them closer, ${he} seems to understand that <span class="lime">they are bigger now.</span>`);
} else if (body.devotion > 20) {
r.push(`<span class="lime">${his} bust has grown.</span> ${He} is caught off guard at the size of ${his} new chest. ${He} shakes ${his} shoulders, marveling at their mass.`);
@@ -2186,7 +2186,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
body.devotion -= 5;
} else if (body.boobs <= soul.boobs - 100 && soul.boobs > 300) { /* (Smaller breasts)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`breasts. As ${he} examines them closer, ${he} seems to understand that <span class="orange">they are smaller now.</span>`);
} else if (body.devotion > 20) {
r.push(`<span class="orange">that ${his} chest is smaller.</span> ${He} shrugs this off, as ${his} devotion to you overrides any anguish this might cause.`);
@@ -2195,14 +2195,14 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion -= 2;
}
} else { /* (No change (less than a 100 cc's of change)*/
- if (body.devotion > 20 && body.fetish !== "mindbroken") {
+ if (body.devotion > 20 && body.fetish !== Fetish.MINDBROKEN) {
r.push(`a familiar chest waiting for ${him}.`);
if (body.physicalAge < soul.physicalAge - 5) { /* (younger)*/
r.push(`${He} is pleased to see ${his} breasts are now more pert and smooth than they were before.`);
}
} else {
r.push(`that ${his} breasts are roughly the same.`);
- if ((body.physicalAge < soul.physicalAge - 5) && body.fetish !== "mindbroken") { /* (younger)*/
+ if ((body.physicalAge < soul.physicalAge - 5) && body.fetish !== Fetish.MINDBROKEN) { /* (younger)*/
r.push(`Except, of course, that they are younger and more pert, something that ${he} <span class="hotpink">can't help but appreciate.</span>`);
body.devotion += 2;
}
@@ -2230,7 +2230,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.boobsImplant >= soul.boobsImplant + 20000) { /* (Extreme bigger implants)*/
r.push(`<span class="lime">a pair of absolutely enormous fake tits looming over ${him}.</span>`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`As ${he} examines ${his} breasts, ${he} seems to understand that they are much bigger now, yet not able to move as much.`);
} else if (body.devotion > 20) {
r.push(`This new size excites ${him} and ${he} looks forward to experimenting with them.`);
@@ -2241,10 +2241,10 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.boobs >= soul.boobs + 20000) { /* (Extreme bigger breasts)*/
r.push(`<span class="lime">a pair of massive tits resting on ${his} chest.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
r.push(`As ${he} moves, ${he} recognizes a familiar firmness at their cores.`);
}
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`As ${he} examines ${his} breasts, ${he} seems to understand that they are much bigger now, yet not able to move as much.`);
} else if (body.devotion > 20) {
r.push(`This new size excites ${him} and ${he} looks forward to experimenting with them.`);
@@ -2261,7 +2261,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion += 5;
}
} else if (body.boobs > soul.boobs + 100) { /* (Bigger breasts)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`breasts. As ${he} examines them closer, ${he} seems to understand that <span class="lime">they are bigger now.</span>`);
} else if (body.devotion > 20) {
r.push(`<span class="lime">${his} bust has grown.</span> ${He} is caught off guard at the size of ${his} new chest. ${He} shakes ${his} shoulders, marveling at their firmness.`);
@@ -2277,7 +2277,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
body.devotion -= 5;
} else if (body.boobs <= soul.boobs - 100 && soul.boobs > 300) { /* (Smaller breasts)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`breasts. As ${he} examines them closer, ${he} seems to understand that <span class="orange">they are smaller now.</span>`);
} else if (body.devotion > 20) {
r.push(`<span class="orange">${his} chest is smaller.</span> ${He} shrugs this off, as ${his} devotion to you overrides any anguish this might cause.`);
@@ -2286,7 +2286,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion -= 2;
}
} else { /* (No change (less than a 100 cc's of change)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`the same chest ${he} had before, except maybe firmer than ${his} addled brain remembers.`);
} else if (body.devotion > 20) {
r.push(`a familiar chest waiting for ${him}. ${He} quickly realizes ${his} mistake once ${he} jiggles them.`);
@@ -2310,7 +2310,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
body.devotion -= 5;
} else if (body.boobs <= 300) { /* flat*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`and finds that <span class="orange">${his} implants and breasts are completely gone.</span> This draws no reaction from ${him}.`);
} else if (body.devotion > 20) {
r.push(`and finds nothing. <span class="orange">Not only have ${his} implants been removed, but ${he}'s been left completely flat.</span> It is what it is.`);
@@ -2333,10 +2333,10 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.boobs >= soul.boobs + 20000) { /* (Extreme bigger breasts)*/
r.push(`<span class="lime">and finds a pair of massive tits resting on ${his} chest.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
r.push(`As ${he} moves, ${he} can just make out that ${he} no longer has implants.`);
}
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`As ${he} examines ${his} breasts, ${he} seems to understand that they are much bigger now.`);
} else if (body.devotion > 20) {
r.push(`This new size excites ${him} and ${he} looks forward to experimenting with them.`);
@@ -2353,7 +2353,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion += 5;
}
} else if (body.boobs > soul.boobs + 100) { /* (Bigger breasts)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`breasts. As ${he} examines them, ${he} seems to understand that <span class="lime">they are bigger now.</span>`);
} else if (body.devotion > 20) {
r.push(`<span class="lime">and finds ${his} bust has grown.</span> ${He} is caught off guard at the size of ${his} new chest. ${He} shakes ${his} shoulders, marveling at the motion of silicone free flesh.`);
@@ -2381,7 +2381,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion -= 2;
}
} else { /* (No change (less than a 100 cc's of change)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`and finds nothing off about ${his} chest.`);
} else if (body.devotion > 20) {
r.push(`and finds a familiar chest waiting for ${him}, albeit <span class="coral">implant free.</span>`);
@@ -2405,7 +2405,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
body.devotion -= 5;
} else if (body.boobs <= 300 && soul.boobs > 300) { /* flat*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`and <span class="orange">finds nothing.</span> ${He} doesn't seem to care, though.`);
} else if (body.devotion > 20) {
r.push(`and finds nothing; <span class="orange">${his} breasts are completely gone.</span> At least it's a literal weight off ${his} chest.`);
@@ -2428,10 +2428,10 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.boobs >= soul.boobs + 20000) { /* (Extreme bigger breasts)*/
r.push(`and finds a <span class="lime">pair of massive tits resting on ${his} chest.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
r.push(`As ${he} moves, ${he} can clearly tell they are completely natural.`);
}
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`As ${he} examines ${his} breasts, ${he} seems to understand that they are much bigger now.`);
} else if (body.devotion > 20) {
r.push(`This new size excites ${him} and ${he} looks forward to experimenting with them.`);
@@ -2448,7 +2448,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion += 5;
}
} else if (body.boobs > soul.boobs + 100) { /* (Bigger breasts)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`and finds breasts. As ${he} examines them, ${he} seems to understand that <span class="lime">they are bigger now.</span>`);
} else if (body.devotion > 20) {
r.push(`and finds <span class="lime">${his} bust has grown.</span> ${He} is caught off guard at the size of ${his} new chest. ${He} shakes ${his} shoulders, marveling at the motion of ${his} soft flesh.`);
@@ -2464,7 +2464,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
body.devotion -= 5;
} else if (body.boobs <= soul.boobs - 100 && soul.boobs > 300) { /* (Smaller breasts)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`breasts. As ${he} examines them, ${he} seems to understand <span class="orange">that they smaller now.</span>`);
} else if (body.devotion > 20) {
r.push(`that <span class="orange">${his} breasts are smaller.</span> ${He} shrugs this off, as ${his} devotion to you overrides any anguish this might cause.`);
@@ -2478,7 +2478,7 @@ globalThis.bodySwapReaction = function(body, soul) {
body.devotion -= 2;
}
} else { /* (No change (less than a 100 cc's of change)*/
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`nothing out of the ordinary.`);
} else if (body.devotion > 20) {
r.push(`a familiar chest waiting for ${him}.`);
@@ -2495,9 +2495,9 @@ globalThis.bodySwapReaction = function(body, soul) {
}
}
if (body.piercing.areola.weight !== 0 && soul.piercing.areola.weight === 0) {
- if (body.fetish !== "mindbroken" && body.boobs >= 10000) {
+ if (body.fetish !== Fetish.MINDBROKEN && body.boobs >= 10000) {
r.push(`${He} can just barely catch the glimmer of the piercings adorning ${his} areolae.`);
- } else if (body.fetish === "mindbroken" && body.boobs >= 10000) {
+ } else if (body.fetish === Fetish.MINDBROKEN && body.boobs >= 10000) {
/* out of sight, out of mind */
} else if (body.boobs >= 1000) {
r.push(`${He} gawks at the piercings adorning ${his} areolae for a spell.`);
@@ -2514,14 +2514,14 @@ globalThis.bodySwapReaction = function(body, soul) {
} else {
r.push(`<span class="coral">steady streams of milk start to flow from ${his} nipples.</span>`);
}
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`${He} shudders at the wet feeling.`);
} else if (body.devotion > 20) {
r.push(`${He} is delighted by the fact that ${his} breasts now produce milk. This is a gift ${he} will happily use for your benefit.`);
} else {
r.push(`${He} is irritated that you have altered ${his} body to produce milk.`);
}
- } else if (body.fetish === "mindbroken") {
+ } else if (body.fetish === Fetish.MINDBROKEN) {
// TODO: write me
} else if (body.lactation > 1 && soul.lactation === 1) {
r.push(`${He} realizes ${his} breasts are <span class="lime">rapidly producing milk.</span> ${He} groans at the unfamiliar pressure.`);
@@ -2536,7 +2536,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`${He} groans as ${he} discovers just how badly ${he} needs to be milked.`);
}
- if (body.nipples !== soul.nipples && body.fetish !== "mindbroken") { /* (if nipples have changed shape)*/
+ if (body.nipples !== soul.nipples && body.fetish !== Fetish.MINDBROKEN) { /* (if nipples have changed shape)*/
r.push(`Once ${he} is satisfied with ${his} tits, ${he} shifts ${himself} to get a better view of ${his} nipples, having noticed that they don't look quite the same as before.`);
switch (body.nipples) {
case "fuckable":
@@ -2569,7 +2569,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
/* (if breasts have changed shape)*/
- if (body.boobShape !== soul.boobShape && body.boobs > 300 && body.fetish !== "mindbroken") {
+ if (body.boobShape !== soul.boobShape && body.boobs > 300 && body.fetish !== Fetish.MINDBROKEN) {
r.push(`As ${he} settles back down, ${he} discovers they no longer rest the same either;`);
if (body.boobShape === "saggy") { /* (drooping or older)*/
r.push(`<span class="red">they now sag to ${his} sides,</span> disappointing ${him}.`);
@@ -2605,7 +2605,7 @@ globalThis.bodySwapReaction = function(body, soul) {
App.Events.addParagraph(el, r);
r = [];
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
// TODO: write me
} else if (soul.voice === 0) {
r.push(`After a moment, ${he} turns to you and gestures for a mirror.`);
@@ -2641,7 +2641,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`${His} eyes lock onto ${his} face.`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.race !== soul.race) { /* (race changes)*/
r.push(`It immediately strikes ${him} that ${he} is <span class="coral">no longer ${soul.race}.</span> ${His} new ${body.race} body`);
if (body.devotion > 50) {
@@ -2662,7 +2662,7 @@ globalThis.bodySwapReaction = function(body, soul) {
if (body.bald === 1 && soul.bald === 0) { /* (+baldness)*/
r.push(`Something about ${his} head catches ${his} eye; <span class="red">${he} is now bald.</span> This`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`catches ${his} attention, and ${he} spends some time shaking ${his} head to feel the air on ${his} scalp.`);
} else if (body.devotion > 20) {
r.push(`feels fun and interesting.`);
@@ -2672,7 +2672,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.bald === 0 && soul.bald === 1) { /* (-baldness)*/
r.push(`Something about ${his} head catches ${his} eye; <span class="green">${he} now has hair.</span> This`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`catches ${his} attention, and ${he} spends some time shaking ${his} head to feel to make ${his} hair move.`);
} else if (body.devotion >= -20) {
r.push(`makes ${him} <span class="hotpink">squeal with delight.</span> ${He} plays with ${his} new hair, enjoying how it feels as ${he} moves ${his} head.`);
@@ -2698,7 +2698,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.lips > soul.lips + 10) {
r.push(`${His} eyes lock on ${his} lips and ${he} pauses for a moment,`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`as if`);
}
r.push(`noticing that <span class="lime">they are larger now</span> than they once were.`);
@@ -2716,13 +2716,13 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.lips < soul.lips - 10) {
r.push(`${His} eyes lock on ${his} lips and ${he} pauses for a moment,`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`as if`);
}
r.push(`noticing that <span class="orange">they are smaller</span> now than they once were.`);
} else {
r.push(`${His} eyes lock on ${his} lips and ${he} pauses for a moment,`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`having found nothing different about them.`);
} else {
r.push(`finding them familiar enough.`);
@@ -2733,7 +2733,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
if (body.teeth === "removable" && soul.teeth !== "removable") { /* no teeth */
r.push(`A look of confusion crosses ${his} face, ${his} brow furrowing slightly. You see ${him} work ${his} jaw for moment before ${he} turns ${his} head and spits out a set of dentures.`);
- if (body.devotion < -20 && body.fetish !== "mindbroken") {
+ if (body.devotion < -20 && body.fetish !== Fetish.MINDBROKEN) {
r.push(`${He} <span class="mediumorchid">glowers</span> at them, knowing full well they'll be back in ${his} mouth shortly.`);
body.devotion -= 2;
}
@@ -2764,7 +2764,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
r.push(`when ${he} does.`);
}
- if (body.physicalAge < 40 && soul.physicalAge > 50 && body.fetish !== "mindbroken") {
+ if (body.physicalAge < 40 && soul.physicalAge > 50 && body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`${He} notices the <span class="green">lack of wrinkles</span> on ${his} face and <span class="hotpink">smiles broadly.</span>`);
body.devotion += 2;
@@ -2802,7 +2802,7 @@ globalThis.bodySwapReaction = function(body, soul) {
} else if (body.physicalAge >= 18) {
r.push(`${He}'s shocked to find ${he}'s now a fresh adult.`);
}
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
r.push(`This is disturbing to ${him} on a fundamental level,`);
if (body.devotion > 50) {
r.push(`as that means ${he} will now will have less time with you before the end of ${his}`);
@@ -2832,7 +2832,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`${He} shudders with pleasure at the thought of cumming in a fertile pussy. ${He} realizes this body has gone through puberty.`);
}
}
- } else if (body.fetish !== "mindbroken") {
+ } else if (body.fetish !== Fetish.MINDBROKEN) {
r.push(`${He} starts as ${he}`);
if (canSee(body)) {
r.push(`sees`);
@@ -2876,7 +2876,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`${He} never expected to be a young adult again.`);
}
}
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
let puberty = 0;
if (
(
@@ -2924,7 +2924,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`The very next thing ${he} finds is how much`);
if (body.weight >= soul.weight + 5) {
r.push(`<span class="red">heavier ${he} is.</span>`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`With ${his} broken mind, ${he} shows no real reaction to this new weight.`);
} else if (body.devotion > 50) {
if (body.behavioralFlaw === "gluttonous") {
@@ -2978,7 +2978,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else {
r.push(`<span class="green">lighter ${he} is.</span>`);
- if (body.fetish === "mindbroken") { /* mindbroken*/
+ if (body.fetish === Fetish.MINDBROKEN) { /* mindbroken*/
r.push(`${He} doesn't show much reaction to ${his} lost weight.`);
} else if (body.devotion > 50) { /* devoted*/
r.push(`${He} is pleased that you have given ${him} a more slender and svelte`);
@@ -3003,7 +3003,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`The last major change to ${his} body structure worth ${his} attention is`);
if (body.muscles >= soul.muscles + 5) {
r.push(`that ${he} is <span class="lime">significantly more muscular</span> than ${he} once was.`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 50) {
r.push(`${He} is happy with ${his} newfound strength and looks forward to putting this power to work for you, as limited as it may be.`);
} else {
@@ -3053,7 +3053,7 @@ globalThis.bodySwapReaction = function(body, soul) {
} else if (body.bellyPreg >= 100) {
r.push(`and ${he} see a <span class="pink">slight swell to ${his} stomach.</span>`);
}
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.bellyPreg >= 100 || body.counter.birthsTotal > 0) {
if (body.devotion > 50) {
r.push(`Even though ${he} didn't get to experience being made into one, ${he} is delighted to be a mother${(body.counter.birthsTotal > 0) ? ` again` : ``}.`);
@@ -3125,7 +3125,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`${He} is filled with <span class="mediumorchid">hatred for you</span> for snatching ${his} pregnancy away from ${him}.`);
body.devotion -= 15;
}
- } else if (body.fetish !== "mindbroken") {
+ } else if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 50) {
r.push(`While ${he} will miss the chance of meeting ${his} future child, ${he} will no longer be weighed down by it as ${he} gets used to ${his} new body.`);
} else if (body.devotion > 20) {
@@ -3153,7 +3153,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`${He} is filled with <span class="mediumorchid">hatred for you</span> for snatching ${his} pregnancy away from ${him}.`);
body.devotion -= 15;
}
- } else if (body.fetish !== "mindbroken") {
+ } else if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 50) {
r.push(`While ${he} will miss the chance of meeting ${his} future child, ${he} will no longer be weighed down by it as ${he} gets used to ${his} new body.`);
} else if (body.devotion > 20) {
@@ -3203,7 +3203,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
if (body.weight >= soul.weight + 30) { /* (fatter)*/
r.push(`${his} stomach until ${he} feels just how <span class="red">much more weight</span> ${he} is carrying.`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`${He} finds ${his} new curves intriguing.`);
} else {
@@ -3213,7 +3213,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
if (body.bellySag > soul.bellySag && body.belly < 100) {
r.push(`${He} also notices <span class="red">how much it sags.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`This isn't pleasant, but ${he} bears it for you.`);
} else {
@@ -3223,7 +3223,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.bellySag < soul.bellySag && body.belly < 100) {
r.push(`${He} also notices it is <span class="green">tighter despite being softer.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`This is great for ${his} self-image and ${he} happily strokes ${his} new firm belly.`);
} else {
@@ -3234,7 +3234,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.weight <= soul.weight - 30) { /* (thinner)*/
r.push(`${his} stomach and ${he} finds ${his} body <span class="green">thinner.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`${He} finds ${his} new curves intriguing.`);
} else {
@@ -3244,7 +3244,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
if (body.bellySag > soul.bellySag && body.belly < 100) {
r.push(`${He} also notices how it <span class="red">has a sag to it.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`This isn't pleasant, but ${he} bears it for you.`);
} else {
@@ -3254,7 +3254,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.bellySag < soul.bellySag && body.belly < 100) {
r.push(`${He} also notices it is <span class="green">tighter despite being softer.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`This is great for ${his} self-image and ${he} happily strokes ${his} new perkier belly.`);
} else {
@@ -3265,7 +3265,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.bellySag > soul.bellySag && body.belly < 100) { /* (belly sag)*/
r.push(`${his} stomach and ${he} notices a <span class="red">sag in ${his} belly.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`This isn't pleasant, but ${he} bears it for you.`);
} else {
@@ -3275,7 +3275,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.bellySag < soul.bellySag && body.belly < 100) { /* (subtracted)*/
r.push(`${his} stomach and notices the <span class="green">sag in ${his} belly has lessened.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`This is great for ${his} self-image and ${he} happily strokes ${his} new tight belly.`);
} else {
@@ -3285,7 +3285,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.weight < 10 && body.muscles > 5 && body.belly < 100) {
r.push(`${his} <span class="lime">muscled stomach.</span>`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`${He} finds ${his} new strength intriguing.`);
} else {
@@ -3304,7 +3304,7 @@ globalThis.bodySwapReaction = function(body, soul) {
if (body.belly < 30000 || body.weight <= 95) {
if (body.waist > soul.waist + 40) {
r.push(`As ${he} explores ${his} middle, ${he} also takes note of ${his} <span class="orange">wider waist.</span>`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`The effects of such a change on ${his} appearance go right over ${his} head.`);
} else if (body.devotion > 20) {
r.push(`This change disappoints ${him}. ${He} wishes ${he} could have been more feminine for you.`);
@@ -3314,7 +3314,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.waist < soul.waist - 40) {
r.push(`As ${he} explores ${his} middle, ${he} also takes note of ${his} <span class="lime">narrower waist.</span>`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`The effects of such a change on ${his} appearance go right over ${his} head.`);
} else if (body.devotion > 20) {
r.push(`This change pleases ${him}; ${he} can't wait to feel your hands around ${him}.`);
@@ -3339,7 +3339,7 @@ globalThis.bodySwapReaction = function(body, soul) {
} else { /* (+1 size)*/
r.push(`a fair bit.`);
}
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`This is a pleasing development as ${he} looks forward to putting this new rear to the test with you.`);
} else {
@@ -3358,7 +3358,7 @@ globalThis.bodySwapReaction = function(body, soul) {
} else { /* (-1 size)*/
r.push(`a fair bit.`);
}
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`${He} is saddened that there is now less of ${him} for you to play with, but remembers that you chose this body for ${him} and hopes that you will still make use of ${his} rear.`);
} else {
@@ -3371,7 +3371,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
if (body.buttImplant > 0 && soul.buttImplant === 0) { /* (+butt implants)*/
r.push(`${He} also notes that <span class="coral">there are implants in ${him},</span> as ${his} ass's shape didn't really change as it moved.`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`It pleases ${him} that you would invest in such a minor way in ${his} body.`);
} else {
@@ -3380,7 +3380,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.buttImplant === 0 && soul.buttImplant > 0) { /* (-butt implants)*/
r.push(`${He} also notes that ${he} <span class="coral">no longer has ass implants,</span> as ${his} experimentation reveals a more natural bounce to ${his} buttocks.`);
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`${He} is happy that you think ${his} body doesn't need any artificial modification to be pleasing.`);
} else {
@@ -3389,7 +3389,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
}
}
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.hips !== soul.hips) {
r.push(`As ${he} prepares to look at ${his} crotch, it occurs to ${him} that ${his} hips are`);
if (body.hips > soul.hips) {
@@ -3453,7 +3453,7 @@ globalThis.bodySwapReaction = function(body, soul) {
} else {
r.push(`enormous boobs taking up so much space.`);
}
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
r.push(`${He} shifts ${his} weight so that ${he} falls onto ${his} back`);
if (body.piercing.corset.weight !== 0 && soul.piercing.corset.weight === 0) {
r.push(`and recoils as ${he} lands on something unfamiliar and hard. ${His} mind races as to what it could be, before the realization sets in that ${he} now has a corset piercing up ${his} back. Once ${he} gets used to the feeling, ${he} leans to ${his} side to finally get a view around ${his} body.`);
@@ -3588,7 +3588,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`<span class="orange">smaller</span>`);
}
r.push(`than it was, and ${he} is`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`not bothered one way or the other by this development; it isn't even clear if ${he} notices anything different about ${his} cock.`);
} else if (body.devotion > 20) {
if (body.dick > soul.dick + 4) {
@@ -3634,7 +3634,7 @@ globalThis.bodySwapReaction = function(body, soul) {
r.push(`Then ${he} takes a moment to jostle ${his} balls, it seems they are`);
if (body.balls > soul.balls + 4) {
r.push(`<span class="lime">much larger</span> now. This`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`does not seem to register in ${his} mind.`);
} else if (body.devotion > 20) {
r.push(`amazing addition to ${his} body is <span class="hotpink">surely welcome.</span> ${He} moans as ${he} rubs against ${his} new balls, groaning as their weight shifts around. ${His} face is flushed by the time ${he}'s done "examining" them.`);
@@ -3651,7 +3651,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (body.balls > soul.balls) {
r.push(`<span class="lime">larger</span> now. This`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`change doesn't mean much of anything to ${him}.`);
} else if (body.devotion > 20) {
r.push(`change delights ${him} and ${he} spends ample time jostling ${his} bigger nuts.`);
@@ -3666,7 +3666,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else {
r.push(`<span class="orange">smaller</span> now, and this`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`goes largely unnoticed.`);
} else if (body.devotion > 20) {
r.push(`change, while not necessarily fun, is appreciated by your devoted slave nonetheless.`);
@@ -3677,7 +3677,7 @@ globalThis.bodySwapReaction = function(body, soul) {
cockChanged = 1;
}
- if (cockChanged === 1 && body.fetish !== "mindbroken") {
+ if (cockChanged === 1 && body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 20) {
r.push(`${He} is thrilled at your modifications to ${his} genitals and is excited to explore those changes with you.`);
} else {
@@ -3714,7 +3714,7 @@ globalThis.bodySwapReaction = function(body, soul) {
if (body.vagina === 0) { /* (+virginity)*/
r.push(`${He} can't really tell, but it looks like it may be <span class="lime">unbroken.</span>`);
if (body.vagina > 0) {
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`And this would likely mean something to ${him}, if ${his} mind was not lost.`);
} else if (body.devotion > 20) {
r.push(`${He} is happy to be a virgin again so that ${he} can lose it to you.`);
@@ -3726,7 +3726,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (soul.vagina !== -1 && body.vagina < soul.vagina) { /* (+tightness)*/
r.push(`${He} can't really tell, but it looks like it may be <span class="lime">tighter</span> now.`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`And this might have been significant to ${him}, if ${his} brain worked correctly.`);
} else if (body.devotion > 20) {
r.push(`Sex will be more pleasurable than it was before and ${he} looks forward to breaking in ${his} new pussy with you.`);
@@ -3736,7 +3736,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
} else if (soul.vagina !== -1 && body.vagina > soul.vagina) { /* (-tightness)*/
r.push(`${He} can't really tell, but it looks like it may be <span class="orange">looser</span> now.`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`And this might be important to ${him}, if ${his} head was in working order.`);
} else if (body.devotion > 20) {
r.push(`${He} giggles a bit as ${he} tests out how many fingers ${he} can fit inside ${his} new loose hole, though ${he} wishes ${he} were still tight for you.`);
@@ -3760,7 +3760,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
/* tattoos */
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
const tatLocations = [
"boobsTat",
"buttTat",
@@ -3782,7 +3782,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
}
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.origBodyOwnerID === body.ID) {
r.push(`This is ${his} body alright. Some things might have changed,`);
if (body.devotion > 50) {
@@ -3803,7 +3803,7 @@ globalThis.bodySwapReaction = function(body, soul) {
} else { /* blind amp that needs you to detail the changes to ${his} body */
r.push(`After a while, ${he} begins to stir, ${his} eyes fluttering.`);
if (sight === -2) {
- if (body.fetish !== "mindbroken") {
+ if (body.fetish !== Fetish.MINDBROKEN) {
if (body.devotion > 50) {
r.push(`${He} nearly panics when ${he} finds <span class="red">${he} can no longer see.</span> ${He} barely manages to keep calm before accepting this is the fate you have chosen for ${him}.`);
} else if (body.devotion > 20) {
@@ -3820,7 +3820,7 @@ globalThis.bodySwapReaction = function(body, soul) {
}
if (end !== 1) {
r.push(`${He} lets out a low groan and reaches up to rub at ${his} eyes. Or rather, ${he} attempts to. A visible look of confusion crosses ${his} face and ${he} strains to sit up, but all ${he} manages to do is wiggle, ${his} movements reminding you of a suffocating goldfish. As the cloud of anesthetics fades, ${he} realizes what's happened to ${him}`);
- if (body.fetish === "mindbroken") {
+ if (body.fetish === Fetish.MINDBROKEN) {
r.push(`and is supremely unaffected by it, as ${his} mind has already left ${him}.`);
} else if (body.devotion > 20) {
r.push(`and begins to panic, ${his} breaths quickening. With a visible look of concentration, ${his} breathing slows and ${he} tries to take stock of ${his} new body`);
@@ -3834,7 +3834,7 @@ globalThis.bodySwapReaction = function(body, soul) {
if (isAmputee(soul)) { /* (was already an amputee) */
r.push(`but ${he} realizes that at least nothing about ${his} limbs, or lack thereof, has changed.`);
} else {
- r.push(`${His} eyes seem to bulge, ${his} heart monitor begins to beep faster and more insistently. Eventually, your assistant is forced to inject ${him} with a sedative. ${His} eyes flutter closed and the heart monitors beeping slows to a steady pulse. Hopefully ${he}'ll be calmer when ${he} wakes up again, though the memory of waking without limbs will <span class="gold">stick with ${him}.</span>`);
+ r.push(`and ${his} eyes seem to bulge; the heart monitor begins to beep faster and more insistently. Eventually, your assistant is forced to inject ${him} with a sedative. ${His} eyes flutter closed and the heart monitors beeping slows to a steady pulse. Hopefully ${he}'ll be calmer when ${he} wakes up again, though the memory of waking without limbs will <span class="gold">stick with ${him}.</span>`);
r.push(App.UI.DOM.makeElement("div", `...`));
r.push(`When ${he} wakes up again, ${he} seems stable; the cold <span class="hotpink">acceptance</span> of ${his} fate clouds ${his} eyes.`);
body.devotion += 5;
diff --git a/src/npc/surgery/bodySwap/huskSlaveSwap.js b/src/npc/surgery/bodySwap/huskSlaveSwap.js
index 813997d8182790c87a78e9d98e09963af9acb756..599ceb4acfdf26c8084c55bd4a93179352157194 100644
--- a/src/npc/surgery/bodySwap/huskSlaveSwap.js
+++ b/src/npc/surgery/bodySwap/huskSlaveSwap.js
@@ -39,7 +39,7 @@ App.UI.SlaveInteract.huskSlaveSwap = function() {
const {
he2, him2, his2
} = getPronouns(V.slaves[myBody]).appendSuffix("2");
- if (V.slaves[myBody].fetish !== "mindbroken" && V.slaves[myBody].fuckdoll === 0) {
+ if (V.slaves[myBody].fetish !== Fetish.MINDBROKEN && V.slaves[myBody].fuckdoll === 0) {
if (V.slaves[myBody].devotion > 20) {
r.push(`${V.slaves[myBody].slaveName} is somewhat saddened to see ${his2} body leave forever.`);
} else if (V.slaves[myBody].devotion >= -50) {
diff --git a/src/npc/surgery/organFarm.js b/src/npc/surgery/organFarm.js
index 469de81f6f7660d63cac96a572278c5165b6c55c..aaa889265c91e8d4f9c24f15c7a59d3e0641250c 100644
--- a/src/npc/surgery/organFarm.js
+++ b/src/npc/surgery/organFarm.js
@@ -43,7 +43,7 @@ App.Medicine.OrganFarm.growActions = function(slave) {
})));
const tooltip = typeof organ.tooltip === "string" ? organ.tooltip : organ.tooltip(slave);
- array.push(App.UI.DOM.makeElement("div", `Costs ${cashFormat(organ.cost)}${tooltip !== "" ? ` and ${tooltip}` : ""}.`, "detail"));
+ array.push(App.UI.DOM.makeElement("div", `Costs ${cashFormat(organ.cost)}${tooltip !== "" ? ` and ${tooltip}` : ""}.`, ["detail"]));
if (organ.implantActions.some((o) => {
return o.canImplant(slave);
@@ -377,7 +377,7 @@ App.Medicine.OrganFarm.currentlyGrowing = function() {
}
if (growLines.length === 0 && finishLines.length === 0) {
- App.UI.DOM.appendNewElement("div", frag, "Organs must be genetically matched to their host slave. To begin growing organs for a slave, take them to the Remote Surgery.", "detail");
+ App.UI.DOM.appendNewElement("div", frag, "Organs must be genetically matched to their host slave. To begin growing organs for a slave, take them to the Remote Surgery.", ["detail"]);
}
return frag;
diff --git a/src/npc/surgery/surgery.js b/src/npc/surgery/surgery.js
index b35aaa749cd9e9d47e89c3811534bea1600bffae..eb04fa79269118ef3ab0cbd960714b8f6044d0ab 100644
--- a/src/npc/surgery/surgery.js
+++ b/src/npc/surgery/surgery.js
@@ -130,6 +130,7 @@ App.Medicine.Surgery.apply = function(procedure, cheat) {
if (reaction.removeJob) {
removeJob(slave, Job.LURCHER, true);
+ removeJob(slave, Job.ARENA, true);
removeJob(slave, Job.PIT, true);
removeJob(slave, slave.assignment);
}
@@ -289,7 +290,7 @@ App.Medicine.Surgery.sizingProcedures = function() {
};
const distanceDecreased = (newValue) => {
- return distanceToRangeDecreased(currentDistance, distanceToRange(newValue, options.targetSize), options.targetSize);
+ return distanceToRangeDecreased(Math.abs(currentDistance), Math.abs(distanceToRange(newValue, options.targetSize)), options.targetSize);
};
/**
@@ -620,6 +621,9 @@ globalThis.eyeSurgery = function(slave, side, action) {
if (eyeExists) {
slave.eye[side].vision = 2;
}
+ if (["corrective glasses", "corrective contacts"].includes(slave.eyewear)) {
+ slave.eyewear = "none";
+ }
return;
default:
throw Error(`${typeof action} "${action}" not found`);
diff --git a/src/npc/surgery/surrogacyWorkaround.js b/src/npc/surgery/surrogacyWorkaround.js
index 6b0b600d09dd5c10cd42bdb97557d6365fd9d703..5c028eaf38478fa74e604c7da24648a09f124725 100644
--- a/src/npc/surgery/surrogacyWorkaround.js
+++ b/src/npc/surgery/surrogacyWorkaround.js
@@ -57,8 +57,9 @@ App.UI.surrogacyWorkaround = function() {
for (const slave of V.slaves) {
if (slave.balls > 0 && slave.pubertyXY === 1 && isSlaveAvailable(slave) && canBreed(donatrix, slave)) {
- App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
- SlaveFullName(slave),
+ const div = App.UI.DOM.appendNewElement("div", node, App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave)));
+ div.append(" ", App.UI.DOM.link(
+ "Select",
() => {
V.impregnatrix = slave;
App.UI.reload();
@@ -99,14 +100,24 @@ App.UI.surrogacyWorkaround = function() {
App.UI.reload();
}
));
+ } else if (V.PC.counter.storedCum > 0) {
+ App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
+ "Use a vial of your own",
+ () => {
+ V.impregnatrix = V.PC;
+ V.PC.counter.storedCum--;
+ App.UI.reload();
+ }
+ ));
}
App.UI.DOM.appendNewElement("h2", node, `Chosen surrogate: ${receive}`);
for (const slave of V.slaves) {
if (canBeReceptrix(slave)) {
- App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
- SlaveFullName(slave),
+ const div = App.UI.DOM.appendNewElement("div", node, App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave)));
+ div.append(" ", App.UI.DOM.link(
+ "Select",
() => {
V.receptrix = slave;
App.UI.reload();
diff --git a/src/personalAssistant/assistantAppearance.js b/src/personalAssistant/assistantAppearance.js
index 735b3b718c43c146b40bed75e4ada21a3e7d88b9..7f22ab0a6ac239b4b149ecc5d46511cf7f9ba87b 100644
--- a/src/personalAssistant/assistantAppearance.js
+++ b/src/personalAssistant/assistantAppearance.js
@@ -114,7 +114,7 @@ globalThis.PersonalAssistantAppearance = function() {
r.push(`with long flowing hair, tribal tattoos, shredded abs, and bone jewelry. ${HeA} has bigger natural tits than anyone that ripped could possibly maintain.`);
}
if (V.cockFeeder === 1 && paSeed === 1) {
- r.push(`A recognizable little representation of one of your slaves is down on ${hisU} knees in front of ${himA}, eating ${himA} out. The slave must be down in the kitchen, getting a meal out of the food dispensers. As you watch, the amazon orgasms, producing a little female barbarian shout.`);
+ r.push(`A recognizable little representation of one of your slaves is down on ${hisU} knees in front of ${himA}, eating ${himA} out. The slave must be down in the kitchen, getting a meal out of the food dispensers. As you watch, the amazon orgasms, producing a feminine little barbarian shout.`);
} else if (V.suppository === 1 && paSeed === 2) {
r.push(`A recognizable little representation of one of your slaves is down on ${hisU} knees in front of ${himA}, letting the amazon use two fingers on ${hisU} butthole. The slave must be receiving ${hisU} drugs from one of the dildo dispensers. As you watch, the amazon looks up at you, winks, and shoves ${hisA} entire hand up the struggling slave's ass.`);
} else if (masturbationAllowed === 1 && paSeed === 3) {
@@ -126,35 +126,35 @@ globalThis.PersonalAssistantAppearance = function() {
} else if (paSeed === 6 && V.studio === 1) {
r.push(`The amazon has ${hisA} hand inside a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and ${V.assistant.name} is clearly turning the feed of it into porn.`);
} else if (paSeed === 7 && V.assistant.market) {
- r.push(`${HeA}'s accompanied by your market assistant's tribes ${womanM} avatar.`);
+ r.push(`${HeA}'s accompanied by your market assistant's tribes${womanM} avatar.`);
if (V.assistant.market.relationship === "cute") {
r.push(`They're chatting companionably as ${V.assistant.name} stretches and the market assistant's avatar does a complex calculation on ${hisM} fingers. ${V.assistant.name} is telling a long story, and the market assistant is listening kindly.`);
} else if (V.assistant.market.relationship === "nonconsensual") {
- r.push(`${V.assistant.name} is taking ${hisA} tribal slave from behind. It's technically tribbing, since all ${heA}'s doing is grinding ${hisA} cunt against the market assistant's, but the poor little tribes ${womanM} is being fucked hard regardless.`);
+ r.push(`${V.assistant.name} is taking ${hisA} tribal slave from behind. It's technically tribbing, since all ${heA}'s doing is grinding ${hisA} cunt against the market assistant's, but the poor little tribes${womanM} is being fucked hard regardless.`);
} else if (V.assistant.market.relationship === "incestuous") {
r.push(`${V.assistant.name} is getting some manual stimulation from ${hisA} ${sisterM}, who is watching ${hisM} muscular sibling's aroused thrashing with amusement as ${heM} slides ${hisM} whole hand in and out of ${V.assistant.name}'s cunt.`);
} else {
- r.push(`They're doing it in the missionary position, kissing deeply. They're technically tribbing, but ${V.assistant.name}'s muscular body and the tribes ${womanM}'s ${wifeM}ly form make it look very pure and traditional.`);
+ r.push(`They're doing it in the missionary position, kissing deeply. They're technically tribbing, but ${V.assistant.name}'s muscular body and the tribes${womanM}'s ${wifeM}ly form make it look very pure and traditional.`);
}
} else {
r.push(`${HeA}'s doing push-ups, glancing at you at the top of each rep to see if you need ${himA}. When ${heA} sees your attention, ${heA} pushes hard enough to bounce to a standing position. Seeing that you're just looking, ${heA} winks, flexes, and drops back down to do crunches.`);
}
break;
case "businesswoman":
- r.push(`${HeA}'s a cute little ${assistantRace()} business ${womanA}`);
+ r.push(`${HeA}'s a cute little ${assistantRace()} business${womanA}`);
if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`wearing a nice suit, with chopsticks holding ${hisA} silver hair back in a bun. ${HisA} clothes are conservative, but they can't hide ${hisA} generous curves.`);
}
if (V.cockFeeder === 1 && paSeed === 1) {
- r.push(`A recognizable little representation of one of your slaves has ${hisU} head under the front of ${hisA} skirt, and is eating ${himA} out. The slave must be down in the kitchen, getting a meal out of the food dispensers. The business ${womanA} notices you watching and winks, running a possessive hand through the slave's hair.`);
+ r.push(`A recognizable little representation of one of your slaves has ${hisU} head under the front of ${hisA} skirt, and is eating ${himA} out. The slave must be down in the kitchen, getting a meal out of the food dispensers. The business${womanA} notices you watching and winks, running a possessive hand through the slave's hair.`);
} else if (V.suppository === 1 && paSeed === 2) {
- r.push(`A recognizable little representation of one of your slaves is down on ${hisU} knees in front of ${himA}, and the business ${womanA} is using a big strap-on on the poor slave's butt. The slave must be receiving ${hisU} drugs from one of the dildo dispensers. The business ${womanA} notices you watching ${himA} and gives you a cheerful little wave, ignoring the slave's distress.`);
+ r.push(`A recognizable little representation of one of your slaves is down on ${hisU} knees in front of ${himA}, and the business${womanA} is using a big strap-on on the poor slave's butt. The slave must be receiving ${hisU} drugs from one of the dildo dispensers. The business${womanA} notices you watching ${himA} and gives you a cheerful little wave, ignoring the slave's distress.`);
} else if (masturbationAllowed === 1 && paSeed === 3) {
r.push(`${HeA}'s fucking a recognizable little representation of one of your slaves with a strap-on, which the slave is obviously enjoying. The slave must be using one of the penthouse's many vibrators. ${HeA} sees you watching and whispers something in the slave's ear; the slave looks up at you and blushes.`);
} else if (paSeed === 4) {
- r.push(`A recognizable little representation of one of your slaves is lying with ${hisU} head in ${hisA} lap. The business ${womanA} is wearing a little stethoscope and is listening to the slave breathe; the slave must be getting a checkup. The business ${womanA} is taking notes on a tablet; ${heA} nods in satisfaction.`);
+ r.push(`A recognizable little representation of one of your slaves is lying with ${hisU} head in ${hisA} lap. The business${womanA} is wearing a little stethoscope and is listening to the slave breathe; the slave must be getting a checkup. The business${womanA} is taking notes on a tablet; ${heA} nods in satisfaction.`);
} else if (paSeed === 5 && V.invasionVictory > 0) {
r.push(`${HeA}'s sitting primly next to a representation of one of your security drones, working on a little tablet. Every so often, ${heA} reaches over and rubs the drone's upper armor affectionately. When ${heA} sees you looking at ${himA}, ${heA} blushes and says, "I like this one. He did very well during the invasion. And he's so handsome!"`);
} else if (paSeed === 6 && V.studio === 1) {
@@ -215,30 +215,30 @@ globalThis.PersonalAssistantAppearance = function() {
}
break;
case "schoolgirl":
- r.push(`${HeA}'s a cute little ${assistantRace()} school ${girlA}`);
+ r.push(`${HeA}'s a cute little ${assistantRace()} school${girlA}`);
if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`wearing a plaid skirt and a white shirt. ${HisA} breasts strain against the material, and ${hisA} skirt is short enough to show off a bit of bottom.`);
}
if (V.cockFeeder === 1 && paSeed === 1) {
- r.push(`A recognizable little representation of one of your slaves has ${hisU} head under the front of ${hisA} skirt, and is eating ${himA} out. The slave must be down in the kitchen, getting a meal out of the food dispensers. As you watch, the school ${girlA} orgasms, blushing furiously when ${heA} notices you watching.`);
+ r.push(`A recognizable little representation of one of your slaves has ${hisU} head under the front of ${hisA} skirt, and is eating ${himA} out. The slave must be down in the kitchen, getting a meal out of the food dispensers. As you watch, the school${girlA} orgasms, blushing furiously when ${heA} notices you watching.`);
} else if (V.suppository === 1 && paSeed === 2) {
- r.push(`A recognizable little representation of one of your slaves is down on ${hisU} knees in front of ${himA}, letting the school ${girlA} push two fingers gently in and out of ${hisU} butt. The slave must be receiving ${hisU} drugs from one of the dildo dispensers. As you watch, the school ${girlA} notices you watching ${himA}, blushes, looks away, and starts working faster.`);
+ r.push(`A recognizable little representation of one of your slaves is down on ${hisU} knees in front of ${himA}, letting the school${girlA} push two fingers gently in and out of ${hisU} butt. The slave must be receiving ${hisU} drugs from one of the dildo dispensers. As you watch, the school${girlA} notices you watching ${himA}, blushes, looks away, and starts working faster.`);
} else if (masturbationAllowed === 1 && paSeed === 3) {
r.push(`${HeA}'s having sex with a recognizable little representation of one of your slaves, kissing ${himU} and giggling occasionally. The slave must be using one of the penthouse's many vibrators. ${HeA} sees you watching and blushes, but then shifts a little so you can see better.`);
} else if (paSeed === 4) {
- r.push(`A recognizable little representation of one of your slaves is lying with ${hisU} head in ${hisA} lap. The school ${girlA} is wearing a little stethoscope and is listening to the slave breathe; the slave must be getting a checkup. The school ${girlA} is patting the ${girlU}'s head reassuringly.`);
+ r.push(`A recognizable little representation of one of your slaves is lying with ${hisU} head in ${hisA} lap. The school${girlA} is wearing a little stethoscope and is listening to the slave breathe; the slave must be getting a checkup. The school${girlA} is patting the ${girlU}'s head reassuringly.`);
} else if (paSeed === 5 && V.invasionVictory > 0) {
r.push(`${HeA}'s planting a wet kiss on a representation of one of your security drones; ${heA} pats it lovingly and manages to press quite a bit of boob against the side of one of its gun assemblies. When ${heA} sees you looking at ${himA}, ${heA} giggles and says, "What? I like him! He did really well during the invasion. And he's cute!"`);
} else if (paSeed === 6 && V.studio === 1) {
r.push(`${HeA}'s getting oral from a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and ${V.assistant.name} is clearly turning the feed of it into porn.`);
} else if (paSeed === 7 && V.assistant.market) {
- r.push(`${HeA}'s accompanied by your market assistant's nerdy school ${girlM} avatar.`);
+ r.push(`${HeA}'s accompanied by your market assistant's nerdy school${girlM} avatar.`);
if (V.assistant.market.relationship === "cute") {
r.push(`They're sitting next to each other, and appear to be doing homework side by side. The market assistant's work looks like complicated math problems, while ${V.assistant.name} is looking through lewd pictures of slaves, albeit with some kind of higher purpose.`);
} else if (V.assistant.market.relationship === "nonconsensual") {
- r.push(`${V.assistant.name} is wearing a strap-on, and is bullying ${hisA} school ${girlM} conquest's pussy. The market assistant's avatar orgasms loudly as you watch, and then claps both hands over ${hisM} mouth, crying a little, unwilling to give ${V.assistant.name} the satisfaction.`);
+ r.push(`${V.assistant.name} is wearing a strap-on, and is bullying ${hisA} school${girlM} conquest's pussy. The market assistant's avatar orgasms loudly as you watch, and then claps both hands over ${hisM} mouth, crying a little, unwilling to give ${V.assistant.name} the satisfaction.`);
} else if (V.assistant.market.relationship === "incestuous") {
r.push(`They're making faces at each other and giggling, but as you watch them, this degenerates rapidly into clumsy kissing, groping of each other's breasts, and finally some enthusiastic tribbing.`);
} else {
@@ -249,7 +249,7 @@ globalThis.PersonalAssistantAppearance = function() {
}
break;
case "hypergoddess":
- r.push(`${HeA}'s a cute "little" ${assistantRace()} fertility goddess, with monstrously wide hips, enormous milky breasts and a room filling belly. ${HisA} overfull stomach bulges and squirms from ${hisA} hundreds of occupants, as well as parts ${hisA} milk swollen breasts to either side.`);
+ r.push(`${HeA}'s a cute "little" ${assistantRace()} fertility goddess, with monstrously wide hips, enormous milky breasts, and a room-filling belly. ${HisA} overfull stomach bulges and squirms from ${hisA} hundreds of occupants, as well as parts ${hisA} milk swollen breasts to either side.`);
if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
@@ -316,7 +316,7 @@ globalThis.PersonalAssistantAppearance = function() {
} else if (V.assistant.market.relationship === "incestuous") {
r.push(`They're playing doctor with each other. ${V.assistant.name} is currently inspecting ${hisA} ${sisterM}'s vagina, making sure everything is alright. Once ${heA} finishes, ${heA} states ${hisA} diagnosis and the needed cure. ${HeA} bends over ${hisA} ${sisterM} and begins administering ${hisA} "cure".`);
} else {
- r.push(`They're playing house with each other, well house based off your penthouse. ${V.assistant.name} is pretending to be you while ${hisA} friend assumes ${V.assistant.name}'s role. They are currently caught up in deciding the best way to arrange the beds in the slave quarters.`);
+ r.push(`They're playing house with each other - the house in question being your penthouse. ${V.assistant.name} is pretending to be you while ${hisA} friend assumes ${V.assistant.name}'s role. They are currently caught up in deciding the best way to arrange the beds in the slave quarters.`);
}
} else {
r.push(`${HeA}'s watching you attentively, waiting for a chance to be helpful. When ${heA} sees your glance, ${heA} smiles shyly and looks away before returning to your gaze.`);
@@ -327,7 +327,7 @@ globalThis.PersonalAssistantAppearance = function() {
if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
- r.push(`belly wearing shorts and a white shirt that rides up ${hisA} growing belly.`);
+ r.push(`belly, wearing shorts and a white shirt that rides up ${hisA} swelling middle.`);
}
if (V.cockFeeder === 1 && paSeed === 1) {
r.push(`A recognizable little representation of one of your slaves has ${hisU} head under ${hisA} pregnant belly, and is eating ${himA} out. The slave must be down in the kitchen, getting a meal out of the food dispensers. As you watch, the little ${girlA} orgasms, blushing furiously when ${heA} notices you watching.`);
@@ -397,11 +397,11 @@ globalThis.PersonalAssistantAppearance = function() {
}
break;
case "pregnant fairy":
- r.push(`${HeA}'s a cute little fairy with a swollen belly`);
+ r.push(`${HeA}'s a cute little fairy with a swollen belly,`);
if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
- r.push(`wearing ${hisA} birthday suit, with ${hisA} nude form obscured by the light coming from ${hisA} belly. ${HisA} silky golden hair cascades down ${hisA} back.`);
+ r.push(`wearing only ${hisA} birthday suit, with ${hisA} nude form obscured by the light coming from ${hisA} belly. ${HisA} silky golden hair cascades down ${hisA} back.`);
}
if (V.cockFeeder === 1 && paSeed === 1) {
r.push(`A recognizable little representation of one of your slaves sits beside ${himA}, with ${hisU} tongue scraping across ${hisA} breast to catch the beads of milk that flow. The slave must be down in the kitchen, getting a meal out of the food dispensers. The fairy notices you watching and winks, ${hisA} unattended breast giving out a small spray of milk.`);
@@ -431,7 +431,7 @@ globalThis.PersonalAssistantAppearance = function() {
}
break;
case "slimegirl":
- r.push(`${HeA}'s a girlish shaped figure, bearing a crimson core, made entirely out of`);
+ r.push(`${HeA}'s a loosely girl-shaped figure, bearing a crimson core, made entirely out of`);
if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
@@ -446,7 +446,7 @@ globalThis.PersonalAssistantAppearance = function() {
} else if (paSeed === 4) {
r.push(`A recognizable little representation of one of your slaves is lying with ${hisU} head in ${hisA} lap. The goo ${girlA} is covering ${hisU} chest and is listening to the slave breathe; the slave must be getting a checkup. The goo ${girlA} is patting the ${girlU}'s head reassuringly.`);
} else if (paSeed === 5 && V.invasionVictory > 0) {
- r.push(`${HeA}'s planting a very wet kiss on a representation of one of your security drones; ${heA} hugs it as best until it pops into ${himA}. When ${heA} sees you looking at ${himA}, ${heA} giggles and says, "What? I like him! He did really well during the invasion. I promise he won't rust in here!"`);
+ r.push(`${HeA}'s planting a very wet kiss on a representation of one of your security drones; ${heA} hugs it as best ${heA} can until it pops into ${himA}. When ${heA} sees you looking at ${himA}, ${heA} giggles and says, "What? I like him! He did really well during the invasion. I promise he won't rust in here!"`);
} else if (paSeed === 6 && V.studio === 1) {
r.push(`${HeA}'s getting oral from a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and your personal assistant is clearly turning the feed of it into porn.`);
} else {
@@ -475,9 +475,9 @@ globalThis.PersonalAssistantAppearance = function() {
if (V.cockFeeder === 1 && paSeed === 1) {
r.push(`A recognizable little representation of one of your slaves is locking lips with ${himA}. The slave must be down in the kitchen, getting a meal out of the food dispensers. The angel notices you watching, blushes deeply and covers ${himselfA} and the slave with a wing.`);
} else if (V.suppository === 1 && paSeed === 2) {
- r.push(`A recognizable little representation of one of your slaves is across ${hisA} lap, ${hisU} rear red from a recent spanking. The slave must be receiving ${hisU} drugs from one of the dildo dispensers. The angel notices you watching, nods, and resumes spanking, ignoring the slave's distress.`);
+ r.push(`A recognizable little representation of one of your slaves is laid across ${hisA} lap, ${hisU} rear red from a recent spanking. The slave must be receiving ${hisU} drugs from one of the dildo dispensers. The angel notices you watching, nods, and resumes spanking, ignoring the slave's distress.`);
} else if (masturbationAllowed === 1 && paSeed === 3) {
- r.push(`${HeA} has a visible representation of one of your slaves across ${hisA} lap, a vibrator partially inserted into ${himU}, which the slave is obviously enjoying. The slave must be using one of the penthouse's many vibrators. ${HeA} notices you watching and blushes deeply before returning to pleasuring the slave.`);
+ r.push(`${HeA} has a visible representation of one of your slaves laid across ${hisA} lap, a vibrator partially inserted into ${himU}, which the slave is obviously enjoying. The slave must be using one of the penthouse's many vibrators. ${HeA} notices you watching and blushes deeply before returning to pleasuring the slave.`);
} else if (paSeed === 4) {
r.push(`A recognizable little representation of one of your slaves is lying with ${hisU} head in ${hisA} lap. The angel is embracing ${himU} gently and silently; the slave must be getting a checkup. ${HeA} looks up at you with a smile; the slave must be doing well.`);
} else if (paSeed === 5 && V.invasionVictory > 0) {
@@ -517,7 +517,7 @@ globalThis.PersonalAssistantAppearance = function() {
} else if (V.suppository === 1 && paSeed === 2) {
r.push(`A recognizable little representation of one of your slaves is before ${himA}, ass in the air, as ${heA} eagerly fists ${hisU} rear. The slave must be receiving ${hisU} drugs from one of the dildo dispensers. The cherub notices you watching and tosses you a thumbs up with ${hisA} free hand.`);
} else if (masturbationAllowed === 1 && paSeed === 3) {
- r.push(`A recognizable little representation of one of your slaves is before ${himA}, ass in the air, as ${heA} eagerly fucks ${himU} with a strap-on, which the slave is obviously enjoying. The slave must be using one of the penthouse's many vibrators. ${HeA} notices you watching, tosses up a thumbs up at you and increases ${hisA} thrusting.`);
+ r.push(`A recognizable little representation of one of your slaves is before ${himA}, ass in the air, as ${heA} eagerly fucks ${himU} with a strap-on, which the slave is obviously enjoying. The slave must be using one of the penthouse's many vibrators. ${HeA} notices you watching, tosses up a thumbs up at you and intensifies ${hisA} thrusting.`);
} else if (paSeed === 4) {
r.push(`A recognizable little representation of one of your slaves is lying before ${himA}. The cherub is hovering in front of ${hisU} chest, head to ${hisU} breast, listening to ${hisU} heartbeat; the slave must be getting a checkup. ${HeA} beams you a smile; the slave must be doing well.`);
} else if (paSeed === 5 && V.invasionVictory > 0) {
@@ -553,7 +553,7 @@ globalThis.PersonalAssistantAppearance = function() {
} else if (masturbationAllowed === 1 && paSeed === 3) {
r.push(`A recognizable little representation of one of your slaves is before ${himA}, perched atop a wooden horse with sexual fluids running down its sides. The slave must be using one of the penthouse's many sex toys. Noticing you watching, the imp flies above ${himU} and roughly forces ${himU} down, eliciting a scream of surprise from the horny slave. ${HeA} likely upped the output on whatever toy the slave was using.`);
} else if (paSeed === 4) {
- r.push(`A recognizable little representation of one of your slaves is lying on ${hisU} side before ${himA}; belly painfully distended. The imp is hovering over ${himU} holding an enema bag; the slave must be getting a checkup. ${HeA} notices your gaze and squeezes the bag, forcing a burst of liquid into the slave's gut and drawing a moan of discomfort out of the ${girlU}.`);
+ r.push(`A recognizable little representation of one of your slaves is lying on ${hisU} side before ${himA}, belly painfully distended. The imp is hovering over ${himU} holding an enema bag; the slave must be getting a checkup. ${HeA} notices your gaze and squeezes the bag, forcing a burst of liquid into the slave's gut and drawing a moan of discomfort out of the ${girlU}.`);
} else if (paSeed === 5 && V.invasionVictory > 0) {
r.push(`${HeA}'s flapping around in circles chasing a representation of one of your security drones with a mallet. When ${heA} sees you looking at ${himA}, ${heA} quickly hides the hammer behind ${hisA} back, giggles and says, "He let some get away and needed to be punished!"`);
} else if (paSeed === 6 && V.studio === 1) {
@@ -565,9 +565,9 @@ globalThis.PersonalAssistantAppearance = function() {
} else if (V.assistant.market.relationship === "nonconsensual") {
r.push(`${V.assistant.name} has ${hisA} plaything tightly bound to a rack and is gleefully pouring hot wax onto the oddly silent market assistant. You see why when a drop lands on ${hisM} sensitive clit, eliciting a scream from the restrained imp; ${V.assistant.name} pulls ${hisM} restraints even tighter as punishment.`);
} else if (V.assistant.market.relationship === "incestuous") {
- r.push(`${V.assistant.name} and ${hisA} ${sisterM} are struggling to stay airborne as they attempt push an oversized, double-ended dildo out of their own cunt and into the other's. When they notice you watching, ${V.assistant.name} seizes the opportunity to bear down hard, forcing the entirety of the toy into the distracted market assistant. ${HeM} crashes to the ground, hands upon ${hisM} cock bulged middle, orgasming indecently.`);
+ r.push(`${V.assistant.name} and ${hisA} ${sisterM} are struggling to stay airborne as they attempt to push an oversized, double-ended dildo out of their own cunt and into the other's. When they notice you watching, ${V.assistant.name} seizes the opportunity to bear down hard, forcing the entirety of the toy into the distracted market assistant. ${HeM} crashes to the ground, hands upon ${hisM} cock-bulged middle, orgasming indecently.`);
} else {
- r.push(`They're taking swings at each other with switches. Giggling with each swing and moaning with every successful strike.`);
+ r.push(`They're taking swings at each other with switches, giggling with each swing and moaning with every successful strike.`);
}
} else {
r.push(`${HeA}'s inspecting ${hisA} arsenal of toys and punishment tools. When ${heA} notices you watching, ${heA} grabs ${hisA} favorite and eagerly makes use of it on ${himselfA}.`);
@@ -576,6 +576,7 @@ globalThis.PersonalAssistantAppearance = function() {
case "witch":
r.push(`${HeA}'s a cute little ${assistantRace()} witch with thin, flowing robes and a wide brimmed, if rather stereotypical, witch's hat.`);
if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
+ r.push(`${HeA} appears to have just attempted a new and unfamiliar spell from ${hisA} tome.`);
r.push(FSfunc());
} else {
r.push(`${HeA} frequently carries a tome of new and erotic spells.`);
@@ -637,11 +638,11 @@ globalThis.PersonalAssistantAppearance = function() {
if (V.assistant.market.relationship === "cute") {
r.push(`The market assistant is tightly wrapped in a bodysuit made of ${V.assistant.name}, save for ${hisM} exposed, very pregnant, belly. ${HisA} head briefly appears over the ${girlM}'s face and eyes you, while the market assistant giggles at the sensations covering ${hisM} body.`);
} else if (V.assistant.market.relationship === "nonconsensual") {
- r.push(`The market assistant has been reduced to nothing more than a bloated incubator. ${V.assistant.name} runs ${hisA} tendrils across ${hisA} breeder's swollen body, fondling ${hisM} squirming, offspring filled breasts and massaging ${hisM} octuplet sized, bulging pregnancy. The hapless ${girlM} twitches slightly as several more wormlike creatures slip from ${hisM} body, prompting ${V.assistant.name} to drive ${hisA} tentacles into all ${hisM} holes and vigorously pump ${himM} full of even more aphrodisiacs and eggs.`);
+ r.push(`The market assistant has been reduced to nothing more than a bloated incubator. ${V.assistant.name} runs ${hisA} tendrils across ${hisA} breeder's swollen body, fondling ${hisM} squirming, offspring-filled breasts and massaging ${hisM} octuplet-sized, bulging pregnancy. The hapless ${girlM} twitches slightly as several more wormlike creatures slip from ${hisM} body, prompting ${V.assistant.name} to drive ${hisA} tentacles into all ${hisM} holes and vigorously pump ${himM} full of even more aphrodisiacs and eggs.`);
} else if (V.assistant.market.relationship === "incestuous") {
r.push(`The market assistant's arms and legs are sunken into a wall of ${V.assistant.name}'s flesh; ${hisM} immense stomach and breasts allowed to hang free. One of ${hisM} breasts visibly shifts as another wormlike larva pushes its way out of ${hisM} nipple, waking the addled ${girlM} from ${hisM} stupor. ${HeM} moans lustfully, ${hisM} mind thoroughly warped by ${V.assistant.name}'s aphrodisiacs, "${SisterA}! I need more...I feel sho empty! Fill me up till I bursht!" ${V.assistant.name} wastes no time in snaking into ${hisM} gaping holes and pumping ${himM} so full ${hisM} belly touches the floor and breasts heave massively.`);
} else {
- r.push(`They're sitting side by side, the market assistant resting an arm atop ${hisM} huge, larvae filled belly while clutching a newborn to ${hisM} breast. ${V.assistant.name} embraces ${hisA} pregnant lover with several tentacles before drawing one to the ${girlM}'s lips. ${HeM} delicately kisses it before wrapping ${hisM} lips around it and pleasuring ${hisM} mate.`);
+ r.push(`They're sitting side by side, the market assistant resting an arm atop ${hisM} huge, larvae-filled belly while clutching a newborn to ${hisM} breast. ${V.assistant.name} embraces ${hisA} pregnant lover with several tentacles before drawing one to the ${girlM}'s lips. ${HeM} delicately kisses it before wrapping ${hisM} lips around it and pleasuring ${hisM} mate.`);
}
} else {
r.push(`${HeA}'s idly standing there, at least when you look at ${himA}; you catch strange things in the corner of your vision while you are working.`);
@@ -657,7 +658,7 @@ globalThis.PersonalAssistantAppearance = function() {
if (V.cockFeeder === 1 && paSeed === 1) {
r.push(`${HeA} has a recognizable little representation of one of your slaves with ${hisU} lips around the base of ${hisA} dick and a huge bulge down ${hisU} throat. The slave must be down in the kitchen, getting a meal out of the food dispensers. ${HeA} notices you watching and energetically renews deepthroating the slave. ${HeA} moans lewdly as ${heA} blows ${hisA} load in the slave's mouth, forcing cum to spray out the slave's nose and around ${hisA} cock. ${HeA} sighs with disappointment at the mess the slave has made.`);
} else if (V.suppository === 1 && paSeed === 2) {
- r.push(`${HeA} is happily assfucking a recognizable little representation of one of your slaves. The slave must be receiving ${hisU} drugs from one of the dildo dispensers. ${HeA} notices you watching, increases ${hisA} pace and cums deep in the slave's rear, slightly rounding ${hisU} belly with cum.`);
+ r.push(`${HeA} is happily assfucking a recognizable little representation of one of your slaves. The slave must be receiving ${hisU} drugs from one of the dildo dispensers. ${HeA} notices you watching, increases ${hisA} pace, and cums deep in the slave's rear, slightly rounding ${hisU} belly with cum.`);
} else if (masturbationAllowed === 1 && paSeed === 3) {
r.push(`A recognizable little representation of one of your slaves is riding ${hisA} erect cock. The slave must be using one of the penthouse's many sex toys. ${HeA} notices you watching and winks at you, before promising not to suck too much life from ${hisA} enthusiastic partner.`);
} else if (paSeed === 4) {
@@ -673,7 +674,7 @@ globalThis.PersonalAssistantAppearance = function() {
} else if (V.assistant.market.relationship === "nonconsensual") {
r.push(`The market assistant is being violently penetrated by ${V.assistant.name}, ${hisM} bloated belly swaying in tune to ${hisA} thrusts. The hapless ${girlM} struggles in discomfort as the incubus blows another load into ${hisM} already full womb, causing cum to backflow out of ${hisM} now loose pussy. ${V.assistant.name} leans back, motions to you, and asks, "Plenty of holes still to go around, if you want one!"`);
} else if (V.assistant.market.relationship === "incestuous") {
- r.push(`The market assistant is eagerly riding ${hisM} big ${sisterA}, ${V.assistant.name}'s, dick. You can't help but notice how full ${hisM} breasts have gotten and how plump ${hisM} ass and thighs now are. ${HeM} moans with lust as ${V.assistant.name} cums into ${hisM} fertile pussy; a glowing sigil appearing below ${hisM} navel. ${HeM} is well on ${hisM} way to becoming the succubus consort of ${hisM} once human ${sisterA}.`);
+ r.push(`The market assistant is eagerly riding ${hisM} big ${sisterA}, ${V.assistant.name}'s, dick. You can't help but notice how full ${hisM} breasts have gotten and how plump ${hisM} ass and thighs now are. ${HeM} moans with lust as ${V.assistant.name} cums into ${hisM} fertile pussy; a glowing sigil appearing below ${hisM} navel. ${HeM} is well on ${hisM} way to becoming the succubus consort of ${hisM} once-human ${sisterA}.`);
} else {
r.push(`The market assistant is embracing ${V.assistant.name} as ${heM} is lovingly penetrated by the caring incubus. They pull each other close as they cum together, locking lips and refusing to let go until the other is completely satisfied. It takes quite some before they settle down and wave to you, thanking you deeply for the true love you've gifted them.`);
}
@@ -768,7 +769,7 @@ globalThis.PersonalAssistantAppearance = function() {
r.push(`${HeA}'s absentmindedly jerking off. It isn't until after ${heA} has blown ${hisA} load that ${heA} notices you've been watching.`);
break;
case "slave professionalism":
- r.push(`${HeA} is patiently awaiting ${hisA} ${properMaster()} attention and now that ${heA} has it, asks if you want what's in ${hisA} pants.`);
+ r.push(`${HeA} is patiently awaiting ${hisA} ${properMaster()}'s attention, and now that ${heA} has it, asks if you want what's in ${hisA} pants.`);
break;
case "petite admiration":
r.push(`${HeA}'s absentmindedly giving ${himselfA} head. When ${heA} notices you watching, ${heA} pops ${hisA} cockhead out of ${hisA} mouth, imploring you to finish ${himA} off.`);
@@ -791,7 +792,7 @@ globalThis.PersonalAssistantAppearance = function() {
if (V.cockFeeder === 1 && paSeed === 1) {
r.push(`${HeA} has a recognizable little representation of one of your slave between ${hisA} legs and is moaning with lust as the slave eagerly eats ${himA} out. The slave must be down in the kitchen, getting a meal out of the food dispensers. When ${heA} notices you watching, ${heA} gives you a show by cumming hard across the slave's face.`);
} else if (V.suppository === 1 && paSeed === 2) {
- r.push(`${HeA} is happily assfucking a recognizable little representation of one of your slaves with a strap-on. The slave must be receiving ${hisU} drugs from one of the dildo dispensers. Noticing you watching, ${heA} unwinds ${hisA} tail from the around the slave and begins fucking ${hisA} own pussy with it.`);
+ r.push(`${HeA} is happily assfucking a recognizable little representation of one of your slaves with a strap-on. The slave must be receiving ${hisU} drugs from one of the dildo dispensers. Noticing you watching, ${heA} unwinds ${hisA} tail from around the slave and begins fucking ${hisA} own pussy with it.`);
} else if (masturbationAllowed === 1 && paSeed === 3) {
r.push(`A recognizable little representation of one of your slaves is sharing a double-ended dildo with ${himA}. The slave must be using one of the penthouse's many sex toys. ${HeA} notices you watching and blows you a kiss, before promising not to suck too much life from ${hisA} enthusiastic partner.`);
} else if (paSeed === 4) {
@@ -807,23 +808,23 @@ globalThis.PersonalAssistantAppearance = function() {
} else if (V.assistant.market.relationship === "nonconsensual") {
r.push(`The market assistant is being violently ridden by ${V.assistant.name}, ${hisA} fuller assets swaying in tune to ${hisA} movements. The hapless ${girlM} struggles pitifully as the succubus coaxes another load out of ${hisA} exhausted toy. ${V.assistant.name} leans back, strokes ${hisA} luscious body and says, "${HisM} energy is making me even more beautiful for you!"`);
} else if (V.assistant.market.relationship === "incestuous") {
- r.push(`The market assistant is being ridden by ${hisM} enormously pregnant big ${sisterA}, ${V.assistant.name}. ${HeM}'s supporting ${hisA} taut belly as ${heA} uses ${hisA} hands to hold their twins to ${hisA} swollen breasts. You can't help but notice how full ${hisM} balls have become and thick ${hisM} shaft is. ${HeM} moans with lust as ${V.assistant.name} bucks with orgasm before painting ${hisA} womb with another coat of sperm. ${V.assistant.name} grunts slightly as ${hisM} dick grows larger inside ${himA} and ${hisM} balls swell for a second round. ${HeM} is well on ${hisM} way to becoming the incubus lover of ${hisM} once human ${sisterA}.`);
+ r.push(`The market assistant is being ridden by ${hisM} enormously pregnant big ${sisterA}, ${V.assistant.name}. ${HeM}'s supporting ${hisA} taut belly as ${heA} uses ${hisA} hands to hold their twins to ${hisA} swollen breasts. You can't help but notice how full ${hisM} balls have become and thick ${hisM} shaft is. ${HeM} moans with lust as ${V.assistant.name} bucks with orgasm before painting ${hisA} womb with another coat of sperm. ${V.assistant.name} grunts slightly as ${hisM} dick grows larger inside ${himA} and ${hisM} balls swell for a second round. ${HeM} is well on ${hisM} way to becoming the incubus lover of ${hisM} once-human ${sisterA}.`);
} else {
r.push(`The market assistant is tenderly fucking ${V.assistant.name} in the missionary position. ${HeM} leans in as they cum together, locking lips and kissing ${hisM} lover deeply. Once they are both satisfied, they snuggle up for a post coitus rest and thank you deeply for the true love you've gifted them.`);
}
} else {
switch (V.assistant.fsAppearance) {
case "paternalist":
- r.push(`${HeA}'s absentmindedly groping ${hisA} tits. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and leans forward giving you a tantalizing view of ${hisA} cleavage.`);
+ r.push(`${HeA}'s absentmindedly groping ${hisA} tits. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and leans forward, giving you a tantalizing view of ${hisA} cleavage.`);
break;
case "degradationist":
- r.push(`${HeA}'s absentmindedly playing with ${hisA} nipple rings. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and runs ${hisA} hands down ${hisA} curves to ${hisA} crotch where ${heA} traces the piercings dangling from ${hisA} labia.`);
+ r.push(`${HeA}'s absentmindedly playing with ${hisA} nipple rings. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and runs ${hisA} hands down ${hisA} curves to ${hisA} crotch, where ${heA} traces the piercings dangling from ${hisA} labia.`);
break;
case "supremacist":
r.push(`${HeA}'s absentmindedly groping ${hisA} tits. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and runs ${hisA} hands down ${hisA} curves, tempting you with ${hisA} pure ${V.arcologies[0].FSSupremacistRace} body.`);
break;
case "subjugationist":
- r.push(`${HeA}'s absentmindedly groping ${hisA} tits. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and runs ${hisA} hands down ${hisA} curves while coming onto you like a needy ${V.arcologies[0].FSSubjugationistRace} slut.`);
+ r.push(`${HeA}'s absentmindedly groping ${hisA} tits. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and runs ${hisA} hands down ${hisA} curves, while coming onto you like a needy ${V.arcologies[0].FSSubjugationistRace} slut.`);
break;
case "chattel religionist":
r.push(`${HeA}'s absentmindedly groping ${hisA} tits. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and runs ${hisA} hands down ${hisA} sides and to ${hisA} pussy while moaning seductively.`);
@@ -838,7 +839,7 @@ globalThis.PersonalAssistantAppearance = function() {
}
break;
case "repopulation focus":
- r.push(`${HeA}'s absentmindedly sucking a tit. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and runs ${hisA} hands down ${hisA} curves and across ${hisA} pregnancy where ${heA} traces ${hisA} popped navel. A flurry of kicks bulge ${hisA} belly as it grows slightly larger. ${HeA} sighs and pats ${hisA} added mass.`);
+ r.push(`${HeA}'s absentmindedly sucking a tit. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and runs ${hisA} hands down ${hisA} curves and across ${hisA} pregnancy, where ${heA} traces ${hisA} popped navel. A flurry of kicks bulge ${hisA} belly as it grows slightly larger. ${HeA} sighs and pats ${hisA} added mass.`);
break;
case "eugenics":
r.push(`${HeA}'s absentmindedly groping ${hisA} tits. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and spreads ${hisA} legs, inviting you to enjoy ${hisA} perfect pussy.`);
@@ -863,7 +864,7 @@ globalThis.PersonalAssistantAppearance = function() {
r.push(`${HeA}'s absentmindedly milking a pair of ${hisA} tits. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and leaps to ${hisA} feet, causing ${hisA} quartet of milk bags to spring loose from ${hisA} tops. ${HeA} giggles as ${heA} gestures the many ways you could titfuck ${himA}.`);
break;
case "maturity preferentialist":
- r.push(`${HeA}'s absentmindedly groping ${hisA} tits. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and begins making a motion you can only fathom the meaning of.`);
+ r.push(`${HeA}'s absentmindedly groping ${hisA} tits. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and makes a motion you can only begin to fathom the meaning of.`);
break;
case "youth preferentialist":
if (V.minimumSlaveAge === 3) {
@@ -890,7 +891,7 @@ globalThis.PersonalAssistantAppearance = function() {
r.push(`${HeA}'s absentmindedly fingering ${himselfA}. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and climaxes with a wet gush before spreading ${hisA} legs for round two.`);
break;
case "slave professionalism":
- r.push(`${HeA} is patiently awaiting ${hisA} ${properMaster()} attention and now that ${heA} has it, curtsies and asks what pleasure you desire.`);
+ r.push(`${HeA} is patiently awaiting ${hisA} ${properMaster()}'s attention, and now that ${heA} has it, curtsies and asks what pleasure you desire.`);
break;
case "petite admiration":
r.push(`${HeA}'s absentmindedly groping ${hisA} tits. When ${heA} notices you eyeing ${himA}, ${heA} smiles coyly and lifts ${hisA} arms, begging to be picked up.`);
@@ -961,7 +962,7 @@ globalThis.PersonalAssistantAppearance = function() {
"repopulation focus": `${HeA}'s very pregnant; ${hisA} belly is covered in large bulges revealing the eggs growing within ${himA}.`,
eugenics: `${HeA}'s wearing a complex chastity device, keeping ${hisA} dicks and cunt unusable.`,
"physical idealist": `${HeA}'s quite muscular, and behaves with total confidence.`,
- "hedonistic decadence": `${HeA}'s quite heavy set, and prefers to laze about eating and masturbating.`,
+ "hedonistic decadence": `${HeA}'s quite heavyset, and prefers to laze about eating and masturbating.`,
"gender radicalist": `${HeA}'s accentuated ${hisA} androgyny, with ${hisA} tits and ${hisA} cocks ${hisA} only obvious gendered traits.`,
"gender fundamentalist": `${HeA}'s made ${himselfA} as cute as a demonic little creature with cocks and tentacle hair can possibly be.`,
"asset expansionist": `${HeA}'s increased the size of ${hisA} assets recently: ${hisA} cocks are so large that ${heA} can give them a blowjob, and ${hisA} boobs are so big ${heA} can give ${himselfA} a titjob at the same time.`,
@@ -1017,24 +1018,24 @@ globalThis.PersonalAssistantAppearance = function() {
"roman revivalist": `wearing the armor of a Roman auxilia, complete with lorica hamata and oval shield painted with your arcology's symbols.`,
"neoimperialist": `wearing a full set of advanced, powered battle armor, painted in your colors and with the crest of your family displayed prominently over a massive holographic tower shield.`,
"aztec revivalist": `wearing the battledress of the greatest warriors, ${heA} stands incredibly imposing, holding a spear and shield.`,
- "egyptian revivalist": `wearing a simple white linen dress, kohl eye shadow, and sandals, making ${himA} look like a barbarian immigrant to the land of the Nile.`,
+ "egyptian revivalist": `wearing a simple white linen dress, kohl eyeshadow, and sandals, making ${himA} look like a barbarian immigrant to the land of the Nile.`,
"edo revivalist": `wearing a Japanese warrior's robe with a pair of swords tucked into its sash.`,
"arabian revivalist": `with a bare chest, loose pantaloons, and a broad silk sash wound around ${hisA} waist with a scimitar thrust into it.`,
"chinese revivalist": `wearing loose silk robes belted with rope and carrying a simple warrior monk's staff.`,
- "chattel religionist": `wearing a crusader's mail. ${HisA} long blonde hair cascades down the back of ${hisA} surcoat in golden glory.`,
+ "chattel religionist": V.arcologies[0].FSChattelReligionistLaw2 === 1 ? `with your religion's holy symbol painted on ${hisA} nude body. ${HisA} long blonde hair cascades down ${hisA} back in golden glory.` : `wearing a crusader's mail. ${HisA} long blonde hair cascades down the back of ${hisA} surcoat in golden glory.`,
"repopulation focus": `with an enormous belly. Its oversized occupant kicks and squirms ferociously, eager to be born.`,
eugenics: `with a complex bone chastity belt blocking ${hisA} vagina.`,
"physical idealist": `whose muscles are lovingly rendered in lifelike detail.`,
"hedonistic decadence": `with a thick layer of fat covering ${hisA} muscled body. ${HeA} typically carries a half-eaten roast pig over ${hisA} shoulder.`,
"gender radicalist": `who is so heavily muscled that ${heA}'s become quite androgynous lately.`,
"gender fundamentalist": `whose heavy musculature does not detract from ${hisA} feminine beauty.`,
- "asset expansionist": `who's almost muscle-bound.`,
- "transformation fetishist": `who's almost muscle-bound.`,
+ "asset expansionist": `whose enormous muscles easily bear the weight of ${hisA} equally oversized chest and hindquarters.`,
+ "transformation fetishist": `who's almost unnaturally muscle-bound.`,
pastoralist: `wearing jean overalls, a plaid shirt whose sleeves are strained by ${hisA} biceps, and rubber boots, and has a cowboy hat pushed back on ${hisA} pretty head.`,
"maturity preferentialist": `with streaks of grey running through ${hisA} long flowing hair. ${HeA} has bigger natural tits than anyone that ripped could possibly maintain.`,
"youth preferentialist": `with whose innocent appearance belies ${hisA} heavy muscles. ${HeA} has bigger natural tits than anyone that ripped could possibly maintain.`,
"slimness enthusiast": `with long flowing hair, tribal tattoos, shredded abs, and bone jewelry. ${HisA} perky boobs are usually concealed by ${hisA} ornaments.`,
- "body purist": `with a realistic tribes ${womanA}'s garb of woven jewelry and shell beads. ${HeA} has bigger natural tits than anyone that ripped could possibly maintain.`,
+ "body purist": `with a realistic tribes${womanA}'s garb of woven jewelry and shell beads. ${HeA} has bigger natural tits than anyone that ripped could possibly maintain.`,
"intellectual dependency": `with much more muscle than brains.`,
"slave professionalism": `with a keen mind to complement ${hisA} ripped body.`,
"petite admiration": `who, despite ${hisA} small stature, can still wrestle ${hisA} peers into submission.`,
@@ -1048,16 +1049,16 @@ globalThis.PersonalAssistantAppearance = function() {
"subjugationist": `wearing a nice, slightly-used suit. ${HeA} speaks with a stereotypical ${V.arcologies[0].FSSubjugationistRace} voice, but is otherwise the model of a perfect subservient secretary.`,
"roman revivalist": `wearing a fine stola appropriate for a respectable Roman lady, with ${hisA} hair up in a complicated style.`,
"neoimperialist": `wearing an elegant black suit tailored perfectly for ${hisA} holographic body, one that you recognize as being the latest in old-world fashion.`,
- "aztec revivalist": `wearing a modest huipil, ${hisA} hair braided to two ponytails, ${heA}'s the picture of quiet elegance.`,
- "egyptian revivalist": `wearing a simple white linen dress, kohl eye shadow, sandals, and a serene expression.`,
+ "aztec revivalist": `wearing a modest huipil, ${hisA} hair braided to two ponytails. ${HeA}'s the picture of quiet elegance.`,
+ "egyptian revivalist": `wearing a simple white linen dress, kohl eyeshadow, sandals, and a serene expression.`,
"edo revivalist": `wearing a fine kimono, getae, tabi, and an expression of perfect serenity.`,
"arabian revivalist": `wearing a tailored suit, a silk headscarf, and aviator sunglasses, making ${himA} look like a little oil heiress.`,
"chinese revivalist": `wearing a conservative silk qipao. ${HisA} hair is pulled back into a bun and secured by a couple of chopsticks.`,
"chattel religionist": `wearing a tailored suit. ${HeA} has a prominent religious symbol on a necklace that rests over ${hisA} generous bosom.`,
"physical idealist": `wearing a tailored suit. ${HeA}'s proportioned to make it very obvious that ${heA} works out.`,
"hedonistic decadence": `wearing a tailored suit. ${HeA}'s proportioned to make it very obvious that ${heA} enjoys a good drink after the day is done.`,
- "repopulation focus": `wearing a nice suit, it's tailored to contain ${hisA} pregnant belly.`,
- "eugenics": `wearing a nice suit and wearing the insignia of the Elite upon ${hisA} arm. ${HisA} suit strains to contain ${hisA} belly, swollen with the child of another Elite.`,
+ "repopulation focus": `wearing a nice suit, specially tailored to contain ${hisA} pregnant belly.`,
+ "eugenics": `wearing a nice suit and bearing the insignia of the Elite upon ${hisA} arm. ${HisA} suit strains to contain ${hisA} belly, swollen with the child of another Elite.`,
"gender radicalist": `wearing a nice suit. ${HeA}'s changed ${hisA} appearance recently to make ${himselfA} quite androgynous.`,
"gender fundamentalist": `wearing a nice suit. ${HeA}'s changed ${hisA} appearance recently to make ${himselfA} more feminine, with a softer expression and a pretty fall of silver-blonde hair over one shoulder.`,
"asset expansionist": `wearing a nice suit, which is tailored to fit ${himA} despite the fact that ${heA} has breasts almost as large as ${heA} is.`,
@@ -1070,8 +1071,7 @@ globalThis.PersonalAssistantAppearance = function() {
"intellectual dependency": `in a suit two sizes too small. ${HisA} breasts threaten to pop ${hisA} buttons, ${hisA} skirt conceals nothing, and ${hisA} cleavage serves as a handy storage compartment.`,
"slave professionalism": `wearing a refined suit that perfectly hugs ${hisA} curves, with ${hisA} silver-blonde hair braided down ${hisA} back. A pair of half-glasses tell you not to waste ${hisA} time.`,
"petite admiration": `wearing a suit tailored to ${hisA} petite figure.`,
- "statuesque glorification": `wearing a suit tailored to ${hisA} towering figure. Few measure up to him.`,
-
+ "statuesque glorification": `wearing a suit tailored to ${hisA} towering figure. Few measure up to ${himA}.`,
},
"goddess": {
"default": ``,
@@ -1081,11 +1081,11 @@ globalThis.PersonalAssistantAppearance = function() {
"subjugationist": `with swollen hips and breasts and a huge pregnant belly. ${HeA}'s nude aside from a crown of wilted flowers and the iron shackles on ${hisA} wrists and ankles.`,
"roman revivalist": `with swollen hips and a big pregnant belly. ${HeA}'s clothed in a loose stola, with dozens of flowers woven into ${hisA} curly auburn hair.`,
"neoimperialist": `with a heaving, pregnant belly. The crest of your family is emblazoned over ${hisA} womb, as if the unborn child is already your property.`,
- "aztec revivalist": `glowing like a sun goddess, ${hisA} full belly commands awe and respect in all who see ${himA}.`,
+ "aztec revivalist": `glowing like a sun goddess; ${hisA} full belly commands awe and respect in all who see ${himA}.`,
"egyptian revivalist": `wielding an ankh-headed staff. ${HeA}'s wearing a gilded headdress and linen skirt, but leaves ${hisA} breasts and pregnant stomach bare to gleam like bronze.`,
- "edo revivalist": `${HisA} swollen hips and pregnant belly loosely wrapped in a red tomesode. ${HisA} waterfall of black hair is held by a comb shaped like big pointed fox ears.`,
+ "edo revivalist": `${hisA} swollen hips and pregnant belly loosely wrapped in a red tomesode. ${HisA} waterfall of black hair is held by a comb shaped like big pointed fox ears.`,
"arabian revivalist": `with swollen hips and breasts and a big pregnant belly. ${HeA}'s wrapped ${himselfA} in white silks, but only the veil around ${hisA} face is opaque.`,
- "chinese revivalist": `${HisA} swollen hips and pregnant belly barely concealed under colorful silk robes, covered in flowers and embroidery.`,
+ "chinese revivalist": `${hisA} swollen hips and pregnant belly barely concealed under colorful silk robes, covered in flowers and embroidery.`,
"chattel religionist": `with swollen breasts and a big pregnant belly. ${HeA}'s surrounded by a nimbus of light and flowing platinum hair, like an angel carrying a few new cherubim.`,
"physical idealist": `trim and athletic despite ${hisA} pregnant belly. ${HeA}'s nude aside from a crown of flowers, ${hisA} modesty protected only by ${hisA} flowing hair.`,
"hedonistic decadence": `with soft, plush features. ${HisA} belly is so fat it is difficult to tell ${heA} is pregnant at first. ${HeA}'s nude aside from a crown of flowers, ${hisA} modesty protected only by ${hisA} flowing hair.`,
@@ -1093,16 +1093,16 @@ globalThis.PersonalAssistantAppearance = function() {
"eugenics": `with swollen hips and breasts and a big pregnant belly. ${HeA} is stunningly beautiful and proudly bears the insignia of the Elite upon ${hisA} breast.`,
"gender radicalist": `although ${heA}'d be nearly androgynous without the rounded pregnant belly. ${HisA} short hair and flowing robe conceal any other feminine traits.`,
"gender fundamentalist": `with swollen hips and breasts and a huge pregnant belly. ${HeA}'s nude aside from a crown of roses, and makes no attempt to cover ${hisA} radiant body.`,
- "asset expansionist": `${HisA} big pregnant belly almost eclipsed by ${hisA} enormous breasts. ${HeA}'s nude aside from the sunflowers woven into ${hisA} long hair.`,
+ "asset expansionist": `${hisA} big pregnant belly almost eclipsed by ${hisA} enormous breasts. ${HeA}'s nude aside from the sunflowers woven into ${hisA} long hair.`,
"transformation fetishist": `clad in a rainbow of flowers and latex pasties. Even pregnant, ${hisA} breasts and ass are too firm to be natural, like a porn star who forgot ${hisA} birth control.`,
"pastoralist": `with oversized breasts pouring streams of milk down ${hisA} pregnant belly like a fountain. ${HeA}'s nude aside from the wildflowers tucked in ${hisA} hair.`,
"maturity preferentialist": `with only ${hisA} huge hips and a wreath of flowers to protect ${hisA} modesty. ${HisA} stretch-marks and laugh-lines suggest the child ${heA}'s carrying is not ${hisA} first.`,
"youth preferentialist": `with swollen breasts and a big pregnant belly. ${HeA}'s nude aside from a wreath of daffodils, ${hisA} body radiant with youthful energy.`,
- "slimness enthusiast": `${HisA} big pregnant belly dominating ${hisA} otherwise lithe frame. ${HeA}'s nude aside from a crown of flowers, ${hisA} modesty protected only by ${hisA} flowing hair.`,
+ "slimness enthusiast": `${hisA} big pregnant belly dominating ${hisA} otherwise lithe frame. ${HeA}'s nude aside from a crown of flowers, ${hisA} modesty protected only by ${hisA} flowing hair.`,
"body purist": `with swollen hips and breasts and a big pregnant belly. ${HeA}'s nude aside from a crown of flowers, ${hisA} modesty protected only by ${hisA} flowing hair.`,
"intellectual dependency": `with swollen hips and breasts and a big pregnant belly. ${HeA}'s nude aside from a crown of flowers, with no sense of modesty.`,
- "slave professionalism": `${HisA} swollen hips and pregnant belly loosely wrapped in an elegant kimono. ${HeA} radiates experience.`,
- "petite admiration": `${HisA} big pregnant belly utterly dominating ${hisA} short height. ${HeA}'s nude aside from a crown of flowers, ${hisA} modesty protected only by ${hisA} flowing hair.`,
+ "slave professionalism": `${hisA} swollen hips and pregnant belly loosely wrapped in an elegant kimono. ${HeA} radiates experience.`,
+ "petite admiration": `${hisA} big pregnant belly utterly dominating ${hisA} short height. ${HeA}'s nude aside from a crown of flowers, ${hisA} modesty protected only by ${hisA} flowing hair.`,
"statuesque glorification": `with swollen breasts and an enormous pregnant belly to fit ${hisA} towering form. ${HeA}'s nude aside from a crown of flowers, ${hisA} modesty protected only by ${hisA} flowing hair.`,
},
"hypergoddess": {
@@ -1115,7 +1115,7 @@ globalThis.PersonalAssistantAppearance = function() {
"subjugationist": `${HeA} is shackled onto a large bed, the iron chains forcing ${hisA} legs apart and putting ${hisA} gaping pussy on display. Occasionally a stream of liquid pours from ${hisA} crotch along with a healthy ${V.arcologies[0].FSSubjugationistRace} slave baby.`,
"roman revivalist": `${HeA}'s taken to reclining on a traditional Roman couch and drinking wine out of a shallow dish. Occasionally a stream of liquid pours from ${hisA} crotch along with a healthy baby.`,
"neoimperialist": `${HeA}'s made ${himselfA} up like a glowing goddess, a golden halo surrounding ${hisA} head at all times. Occasionally a stream of liquid pours from ${hisA} crotch along with a healthy baby.`,
- "aztec revivalist": `${HeA} glows like a sun goddess, ${hisA} life-giving belly commands awe and respect in all who see ${himA}. Every sacrifice before ${himA} coincides with another life entering the world.`,
+ "aztec revivalist": `${HeA} glows like a sun goddess; ${hisA} life-giving belly commands awe and respect in all who see ${himA}. Every sacrifice before ${himA} coincides with another life entering the world.`,
"egyptian revivalist": `${HeA}'s wearing an Egyptian melting perfume cake on ${hisA} head. Occasionally a stream of liquid pours from ${hisA} crotch along with a healthy baby.`,
"edo revivalist": `${HeA}'s wearing a brief Japanese bathhouse robe. Occasionally a stream of liquid pours from ${hisA} crotch along with a healthy baby.`,
"arabian revivalist": `${HeA}'s dressed ${himselfA} like an oil millionaire's broodmother, with silken linens. Occasionally a stream of liquid pours from ${hisA} crotch along with a healthy baby.`,
@@ -1127,24 +1127,24 @@ globalThis.PersonalAssistantAppearance = function() {
"gender fundamentalist": `${HisA} belly has become absolutely massive recently: It fills most of your desk when ${heA}'s around. ${HeA} constantly births children from ${hisA} loins.`,
"asset expansionist": `${HeA}'s increased the size of ${hisA} assets recently: ${hisA} boobs fill more of your desk than ${hisA} belly.`,
"transformation fetishist": `${HisA} tits, ass and lips are carefully rendered to make them look fake.`,
- "pastoralist": `Powerful jets of milk flow from ${hisA} desk filling boobs.`,
+ "pastoralist": `Powerful jets of milk flow from ${hisA} desk-filling boobs.`,
"maturity preferentialist": `${HeA}'s quite mature; ${hisA} belly is covered in stretch marks.`,
get "youth preferentialist"() {
- if (V.minimumSlaveAge > 13) {
- return `${HeA}'s fresh into adulthood and already has had more children than most women. ${HeA} leans against ${hisA} mammoth belly as another child parts ${hisA} youthful pussy.`;
- } else if (V.minimumSlaveAge > 8) {
+ if (V.minimumSlaveAge >= 18) {
+ return `${HeA}'s fresh into adulthood and already has had more children than most women ever will. ${HeA} leans against ${hisA} mammoth belly as another child parts ${hisA} youthful pussy.`;
+ } else if (V.minimumSlaveAge > 12) {
return `${HeA}'s fresh into ${hisA} teens and firmly anchored by ${hisA} mammoth belly. ${HisA} attempts to try and move are frequently interrupted as another child begins forcing is way out of ${hisA} tight pussy.`;
- } else if (V.minimumSlaveAge > 4) {
+ } else if (V.minimumSlaveAge > 6) {
return `${HeA}'s just a young ${girlA} and already has had more children than most women will in their lives. ${HeA} happily embraces ${hisA} mammoth belly, the force of ${hisA} hug forcing milk out of ${hisA} breasts and babies out of ${hisA} crotch.`;
} else {
- return `${HeA}'s surprisingly young; ${heA} happily bounces atop ${hisA} mammoth belly forcing milk out of ${hisA} breasts and babies out of ${hisA} crotch.`;
+ return `${HeA}'s surprisingly young; ${heA} happily bounces atop ${hisA} mammoth belly, forcing milk out of ${hisA} breasts and babies out of ${hisA} crotch.`;
}
},
"slimness enthusiast": `${HisA} massive pregnant belly completely dwarfs ${hisA} otherwise lithe frame.`,
"body purist": `${HeA}'s recently improved ${hisA} appearance to look more natural, with prettier boobs and softer hips.`,
"intellectual dependency": `${HeA} has long since become incapable of fingering ${himselfA}, but it doesn't matter when every birth is orgasmic.`,
"slave professionalism": `${HeA}'s wearing a flowing dress, complete with a concealed layer to house ${hisA} newborns until ${heA} is dismissed. Occasionally ${heA} quivers slightly, calculatingly giving birth when it is least disruptive.`,
- "petite admiration": `${HeA} stands no chance of moving on ${hisA} as ${hisA} mammoth belly has long since lifted ${hisA} petite body off the ground.`,
+ "petite admiration": `${HeA} stands no chance of moving on ${hisA} own, as ${hisA} mammoth belly has long since lifted ${hisA} petite body off the ground.`,
"statuesque glorification": `${HeA}'s increased ${hisA} height massively, but ${hisA} mammoth belly has grown proportionately as well. Occasionally a stream of liquid pours from ${hisA} crotch along with a rather lanky baby.`,
},
"schoolgirl": {
@@ -1155,14 +1155,14 @@ globalThis.PersonalAssistantAppearance = function() {
"subjugationist": `wearing a plaid skirt and a white shirt. ${HeA} speaks with a stereotypical ${V.arcologies[0].FSSubjugationistRace} accent, giving the impression of a foreign exchange student with much to learn.`,
"roman revivalist": `wearing a ${girlA}'s stola, with ${hisA} hair pulled up into a proper upper-class Roman coiffure. ${HeA} usually carries a wax tablet and a stylus.`,
"neoimperialist": `wearing a prim and proper school uniform, with your family crest on ${hisA} breast pocket. ${HisA} short plaid skirt occasionally flips up to flash a hint of ${hisA} holographic panties.`,
- "aztec revivalist": `wearing only an overshirt, ${hisA} cute little legs are complimented by ${hisA} twin tails.`,
- "egyptian revivalist": `wearing a simple white linen skirt, kohl eye shadow, sandals, and no top at all, baring ${hisA} perky young breasts.`,
+ "aztec revivalist": `wearing only an overshirt. ${HisA} cute little legs are complimented by ${hisA} twin tails.`,
+ "egyptian revivalist": `wearing a simple white linen skirt, kohl eyeshadow, sandals, and no top at all, baring ${hisA} perky young breasts.`,
"edo revivalist": `wearing a simple robe appropriate for a proper, traditional Japanese lady.`,
"arabian revivalist": `wearing a long plaid skirt, a clean white shirt, and a headscarf, making ${himA} look like an Arab ${girlA} attending a Western school.`,
"chinese revivalist": `wearing a plaid skirt and a white shirt. ${HisA} hair is pulled back into a bun and secured by a couple of chopsticks.`,
"chattel religionist": `wearing a plaid skirt and a white shirt. ${HeA} has a prominent religious symbol on a necklace that rests at the level of ${hisA} perky tits.`,
"physical idealist": `wearing a plaid skirt, a white shirt, and athletic shoes. ${HeA} usually renders ${himselfA} flushed with exercise, as though ${heA} just came from gym class.`,
- "hedonistic decadence": `wearing a plaid skirt and a white shirt. The buttons of ${hisA} shirt struggle against ${hisA} plush body and ${hisA} skirt rides up ${hisA} plump butt to expose ${hisA} panties.`,
+ "hedonistic decadence": `wearing a plaid skirt and a white shirt. The buttons of ${hisA} shirt struggle against ${hisA} plush body, and ${hisA} skirt rides up ${hisA} plump butt to expose ${hisA} panties.`,
"repopulation focus": `wearing a plaid skirt and a white shirt, though ${hisA} shirt rides up ${hisA} growing pregnancy. It seems ${heA} found another way to support ${hisA} team.`,
"eugenics": `wearing a plaid skirt and a white shirt. ${HeA} usually can be seen studying to become an upstanding member of society's elite.`,
"gender radicalist": `wearing a plaid skirt and a white shirt. ${HeA}'s changed ${hisA} appearance recently to make ${himselfA} quite androgynous.`,
@@ -1187,61 +1187,61 @@ globalThis.PersonalAssistantAppearance = function() {
"roman revivalist": `${girlA} wearing a ${girlA}'s stola.`,
"neoimperialist": `${girlA} wearing a tiny elementary schooler's uniform, complete with miniature plaid skirt.`,
"aztec revivalist": `${girlA} wearing only an overshirt; ${hisA} cute little legs are complimented by ${hisA} twin tails.`,
- "egyptian revivalist": `${girlA} wearing a simple white linen dress, kohl eye shadow and sandals.`,
+ "egyptian revivalist": `${girlA} wearing a simple white linen dress, kohl eyeshadow, and sandals.`,
"edo revivalist": `${girlA} wearing a kimono far too large for ${himselfA}.`,
"arabian revivalist": `${girlA} wearing a simple linen dress and a headscarf.`,
"chinese revivalist": `${girlA} wearing a cute silk qipao.`,
"chattel religionist": `${girlA} wearing the garb of a priestess of the new faith.`,
- "repopulation focus": `${girlA} wearing a loose dress, its middle bulges considerably from ${hisA} pregnancy.`,
+ "repopulation focus": `${girlA} wearing a loose dress; its middle bulges considerably from ${hisA} pregnancy.`,
"eugenics": `slave ${girlA} wearing nothing but an overly complex chastity belt and trying ${hisA} best to do master proud.`,
"degradationist": `${girlA} wearing an oversized v-neck t-shirt. The neck hole hangs low enough to show off ${hisA} perky A-cup tits and the piercings through them.`,
"physical idealist": `${girlA} wearing spats and a tight shirt. ${HeA} occasionally renders ${himselfA} sweaty, as if just finishing exercising.`,
"hedonistic decadence": `${girlA} wearing spats barely pulled over ${hisA} big ass and a tight shirt that rides up ${hisA} chubby belly. It seems someone snuck out of gym class.`,
"gender radicalist": `${girlA} wearing shorts and a t-shirt. ${HeA}'s changed ${hisA} appearance recently to make ${himselfA} quite androgynous.`,
- "gender fundamentalist": `${girlA} wearing a skirt and a white shirt. ${HisA} slightly swollen belly peeks out from under ${hisA} shirt causing ${himA} to blush whenever you glance at it.`,
+ "gender fundamentalist": `${girlA} wearing a skirt and a white shirt. ${HisA} slightly swollen belly peeks out from under ${hisA} shirt, causing ${himA} to blush whenever you glance at it.`,
"asset expansionist": `${girlA} wearing a school swimsuit. ${HisA} breasts are unrealistically huge for ${hisA} young age and bulge lewdly around the straps of ${hisA} suit.`,
- "transformation fetishist": `${girlA} wearing short shorts and a t-shirt. At first glance it looks like ${heA} stuck two overinflated balloons up ${hisA} shirt but with closer inspection they are revealed to be ridiculous implants.`,
+ "transformation fetishist": `${girlA} wearing short shorts and a t-shirt. At first glance it looks like ${heA} stuck two overinflated balloons up ${hisA} shirt, but with closer inspection they are revealed to be ridiculous implants.`,
"pastoralist": `${girlA} wearing shorts and a white shirt. There's a little wet spot over each of ${hisA} nipples.`,
"maturity preferentialist": `${girlA} wearing a school uniform. ${HeA} keeps rubbing ${hisA} bottom, making it look like teacher just spanked ${himA}.`,
- "youth preferentialist": `${girlA} wearing a child's dress. ${HeA} looks barely more than three.`,
+ "youth preferentialist": `${girlA} wearing a child's dress. ${HeA} looks barely more than ${num(V.idealAge.clamp(V.minimumSlaveAge, 12))}.`,
"slimness enthusiast": `${girlA} wearing shorts and a white shirt. ${HeA} looks extremely thin.`,
"body purist": `${girlA}. ${HeA}'s recently improved ${hisA} appearance to look more natural, with freckles and a winning smile.`,
"intellectual dependency": `${girlA} wearing nothing at all. The breeze feels nice and modesty is not something ${heA} can understand.`,
"slave professionalism": `${girlA} wearing a long black dress. ${HeA} is trying ${hisA} best to compose ${himselfA} and grow into a proper young ${womanA}.`,
- "petite admiration": `${girlA} wearing a dress much to large for ${himA}. ${HisA} tiny form is just begging for a piggyback ride.`,
- "statuesque glorification": `${girlA} wearing a too small dress. ${HeA}'s growing up fast, but still has a long way to go if ${heA} wants to stand out in a crowd.`,
+ "petite admiration": `${girlA} wearing a dress much too large for ${himA}. ${HisA} tiny form is just begging for a piggyback ride.`,
+ "statuesque glorification": `${girlA} wearing a too-small dress. ${HeA}'s growing up fast, but still has a long way to go if ${heA} wants to stand out in a crowd.`,
},
"preggololi": {
"default": ``,
- "paternalist": `belly wearing a cute pink dress. The middle is stretched tight by ${hisA} growing belly.`,
- "supremacist": `belly wearing a cute yellow dress. ${HeA} cradles ${hisA} swollen belly protectively, glowing with pride at carrying ${V.arcologies[0].FSSupremacistRace !== 0 ? addA(V.arcologies[0].FSSupremacistRace) : ""} child.`,
+ "paternalist": `belly, wearing a cute pink dress. The middle is stretched tight by ${hisA} growing belly.`,
+ "supremacist": `belly, wearing a cute yellow dress. ${HeA} cradles ${hisA} swollen belly protectively, glowing with pride at carrying ${V.arcologies[0].FSSupremacistRace !== 0 ? addA(V.arcologies[0].FSSupremacistRace) : ""} child.`,
"subjugationist": `belly, wearing nothing but a pregnancy biometrics collar. The collar's display reads 'Carrying 2 more ${V.arcologies[0].FSSubjugationistRace} subhumans!', something the ${girlA} occasionally reads aloud to ${himselfA}.`,
- "roman revivalist": `belly wearing a ${girlA}'s stola.`,
- "neoimperialist": `belly wearing a tiny elementary schooler's uniform, complete with miniature plaid skirt. ${HisA} belly swells underneath the cotton shirt.`,
- "aztec revivalist": `belly wearing only an overshirt which struggles to cover ${hisA} rounded middle; ${hisA} cute little legs are complimented by ${hisA} twin tails.`,
- "egyptian revivalist": `belly wearing a bulging white linen dress, kohl eye shadow and sandals.`,
- "edo revivalist": `belly wearing a kimono far too large for ${himselfA} but does nothing to distract from ${hisA} swollen midriff.`,
- "arabian revivalist": `belly wearing a bulging linen dress and a headscarf.`,
- "chinese revivalist": `belly wearing a tight silk qipao.`,
- "chattel religionist": `belly wearing the garb of a priestess of the new faith.`,
+ "roman revivalist": `belly, wearing a ${girlA}'s stola.`,
+ "neoimperialist": `belly, wearing a tiny elementary schooler's uniform, complete with miniature plaid skirt. ${HisA} belly swells underneath the cotton shirt.`,
+ "aztec revivalist": `belly, wearing only an overshirt which struggles to cover ${hisA} rounded middle; ${hisA} cute little legs are complimented by ${hisA} twin tails.`,
+ "egyptian revivalist": `belly, wearing a bulging white linen dress, kohl eyeshadow and sandals.`,
+ "edo revivalist": `belly, wearing a kimono far too large for ${himselfA} but does nothing to distract from ${hisA} swollen midriff.`,
+ "arabian revivalist": `belly, wearing a bulging linen dress and a headscarf.`,
+ "chinese revivalist": `belly, wearing a tight silk qipao.`,
+ "chattel religionist": `belly, wearing the garb of a priestess of the new faith.`,
"repopulation focus": `belly. ${HeA} recently adjusted ${hisA} pregnancy size to make it even larger. ${HisA} swelling ass and tits spill out from ${hisA} shorts and tube-top and the occasional kick can be seen from ${hisA} octuplets.`,
- "eugenics": `belly, rather, ${heA} was. ${HisA} chastity belt has been torn open and ${hisA} belly is grotesquely swollen with subhuman spawn. Occasionally a malformed, impish child claws its way out of ${hisA} violated pussy.`,
- "degradationist": `belly wearing an open vest and a thong. It shows off ${hisA} pierced milky B-cup tits and swollen pregnant belly. A large bar is driven through ${hisA} popped navel.`,
- "physical idealist": `belly wearing spats and a tight shirt. ${HisA} shirt rides up on ${hisA} large belly and ${hisA} growing butt fills out ${hisA} spats nicely. ${HeA} cradles ${hisA} belly with a sullen look knowing it limits ${hisA} activities.`,
- "hedonistic decadence": `belly reclining on a chair with a big bowl of snack food. ${HeA} belches and pats ${hisA} belly happily.`,
- "gender radicalist": `belly wearing shorts and a t-shirt. ${HisA} androgynous look makes ${himA} look like a pregnant boy.`,
- "gender fundamentalist": `belly wearing a skirt and a white shirt. ${HeA} is extremely pregnant, carrying triplets. ${HeA} blushes and pats ${hisA} belly whenever ${heA} notices your gaze.`,
- "asset expansionist": `belly wearing a school swimsuit. ${HisA} breasts are unrealistically huge for ${hisA} young age and bulge lewdly around the straps of ${hisA} overfilled suit. ${HisA} suit is extremely tight around the middle thanks to ${hisA} growing belly.`,
- "transformation fetishist": `belly wearing short shorts and a t-shirt. At first glance it looks like ${heA} stuck two overinflated balloons up ${hisA} shirt but with closer inspection they are revealed to be ridiculous implants. They sit atop ${hisA} bulging belly.`,
- "pastoralist": `belly wearing shorts and a white shirt. There's a little wet spot over each of ${hisA} nipples. ${HisA} breasts have swollen to C-cups thanks to ${hisA} pregnancy and the milkings.`,
- "maturity preferentialist": `belly wearing a school uniform. ${HisA} top is left unbuttoned to allow ${hisA} belly room. ${HeA} keeps rubbing ${hisA} bottom, making it look like Teacher just spanked ${himA}.`,
- "youth preferentialist": `belly wearing nothing, as nothing will fit ${hisA} lewd body. ${HeA} looks barely more than three and is laying atop ${hisA} proportionally enormous belly.`,
- "slimness enthusiast": `belly wearing shorts and a white shirt. ${HisA} slim body makes ${hisA} pregnant belly look much bigger than it is.`,
+ "eugenics": `belly, or rather, ${heA} was. ${HisA} chastity belt has been torn open and ${hisA} belly is grotesquely swollen with subhuman spawn. Occasionally a malformed, impish child claws its way out of ${hisA} violated pussy.`,
+ "degradationist": `belly, wearing an open vest and a thong. It shows off ${hisA} pierced milky B-cup tits and swollen pregnant belly. A large bar is driven through ${hisA} popped navel.`,
+ "physical idealist": `belly, wearing spats and a tight shirt. ${HisA} shirt rides up on ${hisA} large belly and ${hisA} growing butt fills out ${hisA} spats nicely. ${HeA} cradles ${hisA} belly with a sullen look knowing it limits ${hisA} activities.`,
+ "hedonistic decadence": `belly, reclining on a chair with a big bowl of snack food. ${HeA} belches and pats ${hisA} belly happily.`,
+ "gender radicalist": `belly, wearing shorts and a t-shirt. ${HisA} androgynous look makes ${himA} look like a pregnant boy.`,
+ "gender fundamentalist": `belly, wearing a skirt and a white shirt. ${HeA} is extremely pregnant, carrying triplets. ${HeA} blushes and pats ${hisA} belly whenever ${heA} notices your gaze.`,
+ "asset expansionist": `belly, wearing a school swimsuit. ${HisA} breasts are unrealistically huge for ${hisA} young age and bulge lewdly around the straps of ${hisA} overfilled suit. ${HisA} suit is extremely tight around the middle thanks to ${hisA} growing belly.`,
+ "transformation fetishist": `belly, wearing short shorts and a t-shirt. At first glance it looks like ${heA} stuck two overinflated balloons up ${hisA} shirt but with closer inspection they are revealed to be ridiculous implants. They sit atop ${hisA} bulging belly.`,
+ "pastoralist": `belly, wearing shorts and a white shirt. There's a little wet spot over each of ${hisA} nipples. ${HisA} breasts have swollen to C-cups thanks to ${hisA} pregnancy and the milkings.`,
+ "maturity preferentialist": `belly, wearing a school uniform. ${HisA} top is left unbuttoned to allow ${hisA} belly room. ${HeA} keeps rubbing ${hisA} bottom, making it look like Teacher just spanked ${himA}.`,
+ "youth preferentialist": `belly, wearing nothing, as nothing will fit ${hisA} lewd body. ${HeA} looks barely more than three and is laying atop ${hisA} proportionally enormous belly.`,
+ "slimness enthusiast": `belly, wearing shorts and a white shirt. ${HisA} slim body makes ${hisA} pregnant belly look much bigger than it is.`,
"body purist": `belly. ${HeA}'s recently improved ${hisA} appearance to look more natural, with freckles and a winning smile. ${HeA} cradles ${hisA} swelling belly and twirls when you look ${hisA} way.`,
"intellectual dependency": `belly. ${HeA} spends a lot of trying to suck it in, not understanding that ${heA}'s with child and not just fat.`,
- "slave professionalism": `belly wearing a tight black dress. ${HeA} is trying ${hisA} best to compose ${himselfA} and grow into a proper young ${womanA}, despite ${hisA} lack of control.`,
- "petite admiration": `belly filling out a dress tailored for a ${girlA} taller than ${himA}. ${HisA} shortness makes ${hisA} pregnant belly look much bigger than it is.`,
- "statuesque glorification": `belly wearing a too small dress. ${HeA}'s growing up fast and, given the size of ${hisA} belly, so is ${hisA} child.`,
+ "slave professionalism": `belly, wearing a tight black dress. ${HeA} is trying ${hisA} best to compose ${himselfA} and grow into a proper young ${womanA}, despite ${hisA} lack of control.`,
+ "petite admiration": `belly, filling out a dress tailored for a ${girlA} taller than ${himA}. ${HisA} shortness makes ${hisA} pregnant belly look much bigger than it is.`,
+ "statuesque glorification": `belly, wearing a too-small dress. ${HeA}'s growing up fast and, given the size of ${hisA} belly, so is ${hisA} child.`,
},
"fairy": {
"default": ``,
@@ -1253,7 +1253,7 @@ globalThis.PersonalAssistantAppearance = function() {
"roman revivalist": `fairy wearing a small handkerchief wrapped around ${himA} like a toga, with one tiny breast sticking out. A wreath made of twisted clovers sits on ${hisA} head.`,
"neoimperialist": `fairy, ${hisA} tiny body encased in a tight-fitting, high-tech bodysuit.`,
"aztec revivalist": `fairy, yellow paint creating tribal patterns across ${hisA} naked form.`,
- "egyptian revivalist": `fairy wearing a simple white linen dress and has eye shadow poorly applied around ${hisA} eyes.`,
+ "egyptian revivalist": `fairy wearing a simple white linen dress and has eyeshadow poorly applied around ${hisA} eyes.`,
"edo revivalist": `fairy wearing a fine kimono and holding a little fan. ${HeA} looks like a little Hina doll.`,
"arabian revivalist": `fairy wearing a strip of silk as a dress.`,
"chinese revivalist": `fairy wearing a silk cheongsam with a little green cap on ${hisA} head. ${HisA} hair is braided on the sides. ${HeA} looks like a figurine from some kind of game.`,
@@ -1265,7 +1265,7 @@ globalThis.PersonalAssistantAppearance = function() {
"gender fundamentalist": `fairy wearing a well-sewn blue dress, with a large red bow tied to the back of ${hisA} waist length golden-blonde hair. ${HeA} looks like a little Bucuresti doll.`,
"asset expansionist": `fairy wearing a pair of pants and a t-shirt. ${HeA} has two blueberries stuffed into the front of ${hisA} shirt.`,
"transformation fetishist": `fairy wearing a pair of tight jeans and a t-shirt. ${HeA} has two grapes stuffed into ${hisA} shirt, and some cotton shoved in the back of ${hisA} jeans.`,
- "pastoralist": `fairy wearing only a pair of overalls. The overalls are just loose enough to let ${hisA} nearly flat chest to peek out when ${heA} turns or bends over.`,
+ "pastoralist": `fairy wearing only a pair of overalls. The overalls are just loose enough to let ${hisA} nearly flat chest peek out when ${heA} turns or bends over.`,
"maturity preferentialist": `fairy wearing an old wool dress and spinning a cane.`,
"youth preferentialist": `fairy wearing a kindergartner's uniform, complete with rain cap and red backpack.`,
"slimness enthusiast": `fairy wearing a handkerchief with a hole in it like a poncho. ${HeA} looks as slim as usual, with ${hisA} naked body completely visible from the sides.`,
@@ -1279,19 +1279,19 @@ globalThis.PersonalAssistantAppearance = function() {
"default": ``,
"eugenics": `wearing nothing but a band with insignia of the Elite emblazoned on it.`,
"paternalist": `wearing a well-sewn blue dress, with a large red bow tied to the back of ${hisA} waist length golden-blonde hair. ${HeA} looks like a little Bucuresti doll.`,
- "degradationist": `and completely unclothed, with ${hisA} hair in a mess and covered in dirt.`,
- "supremacist": `and distinctly ${V.arcologies[0].FSSupremacistRace} features. ${HeA} has wrapped a golden ribbon around ${hisA} chest to create an improvised bra, and another under ${hisA} swollen belly to fashion a thong.`,
- "subjugationist": `and exaggerated ${V.arcologies[0].FSSubjugationistRace} features. ${HeA} is completely unclothed, with ${hisA} hair in a mess and covered in dirt.`,
+ "degradationist": `and is completely unclothed, with ${hisA} hair in a mess and covered in dirt.`,
+ "supremacist": `and has distinctly ${V.arcologies[0].FSSupremacistRace} features. ${HeA} has wrapped a golden ribbon around ${hisA} chest to create an improvised bra, and another under ${hisA} swollen belly to fashion a thong.`,
+ "subjugationist": `and has exaggerated ${V.arcologies[0].FSSubjugationistRace} features. ${HeA} is completely unclothed, with ${hisA} hair in a mess and covered in dirt.`,
"roman revivalist": `wearing a small handkerchief wrapped around ${himA} like a toga, with one tiny milky breast sticking out. A wreath made of twisted clovers sits on ${hisA} head.`,
"neoimperialist": `whose tiny body is encased in a tight-fitting, high-tech bodysuit. ${HisA} belly swells underneath the skintight material.`,
- "aztec revivalist": `smeared with yellow paint creating tribal patterns across ${hisA} naked form and curving around ${hisA} swollen belly.`,
- "egyptian revivalist": `wearing a simple white linen dress and has eye shadow poorly applied around ${hisA} eyes.`,
+ "aztec revivalist": `smeared with yellow paint that creates tribal patterns across ${hisA} naked form and curves around ${hisA} swollen belly.`,
+ "egyptian revivalist": `wearing a simple white linen dress and eyeshadow poorly applied around ${hisA} eyes.`,
"edo revivalist": `wearing a fine kimono and holding a little fan. ${HeA} looks like a little Hina doll.`,
"arabian revivalist": `wearing a strip of silk as a dress.`,
"chinese revivalist": `wearing a silk cheongsam with a little green cap on ${hisA} head. ${HisA} hair is braided on the sides. ${HeA} looks like a figurine from some kind of game.`,
"chattel religionist": `wearing a little gold-white habit and glowing with purity.`,
"physical idealist": `wearing a training bra and spats. ${HisA} large belly sticks out even more.`,
- "hedonistic decadence": `that is nude and sitting upon a large pastry, covered in cream. ${HeA} occasionally pulls off a piece to nibble on.`,
+ "hedonistic decadence": `totally nude and sitting upon a large pastry, covered in cream. ${HeA} occasionally pulls off a piece to nibble on.`,
"repopulation focus": `wearing a lovely maternity dress, which shows off ${hisA} swollen belly.`,
"gender radicalist": `wearing a pair of pants. Just the pants.`,
"gender fundamentalist": `wearing a well-sewn blue dress, with a large red bow tied to the back of ${hisA} waist length golden-blonde hair. ${HeA} looks like a little Bucuresti doll.`,
@@ -1301,39 +1301,39 @@ globalThis.PersonalAssistantAppearance = function() {
"maturity preferentialist": `wearing an old wool dress and rocking back and forth on a rocking chair, cradling ${hisA} belly.`,
"youth preferentialist": `wearing a kindergartner's uniform, complete with rain cap and red backpack. ${HisA} swollen belly looks out of place.`,
"slimness enthusiast": `wearing a handkerchief with a hole in it like a poncho. ${HisA} pregnant belly forces the poncho to spread wide, leaving little of ${hisA} body to the imagination.`,
- "body purist": `wearing ${hisA} birthday suit, with pale unblemished pregnant belly on full display and silky golden hair cascading down ${hisA} back.`,
+ "body purist": `wearing only ${hisA} birthday suit, ${hisA} pale unblemished pregnant belly on full display and silky golden hair cascading down ${hisA} back.`,
"intellectual dependency": `wearing a thong as a string bikini. ${HeA} frequently pouts over all the weight ${heA} has been putting on lately.`,
"slave professionalism": `wearing a graduation gown.`,
- "petite admiration": `wearing ${hisA} birthday suit, with ${hisA} nude form obscured by the light ${hisA} belly. ${HeA}'s recently adjusted ${hisA} size so that, at a glance, ${heA} appears to be nothing more than a glowing oval.`,
+ "petite admiration": `wearing ${hisA} birthday suit, with ${hisA} nude form obscured by the light coming from ${hisA} belly. ${HeA}'s recently adjusted ${hisA} size so that, at a glance, ${heA} appears to be nothing more than a glowing oval.`,
"statuesque glorification": `wearing a simple dress. ${HeA}'s adjusted the length of ${hisA} dress to make it appear that ${heA} is taller than ${heA} really is, but it keeps riding up ${hisA} middle and ruining the look.`,
},
"slimegirl": {
"default": ``,
- "paternalist": `slime with a modest pink dress floating inside ${himA}.`,
+ "paternalist": `slime, with a modest pink dress floating inside ${himA}.`,
"supremacist": `slime. ${HeA} keeps trying to shape ${hisA} goo into a beautiful ${V.arcologies[0].FSSupremacistRace} ${girlA}, but ${heA} hasn't quite perfected the finer details yet.`,
"subjugationist": `slime. ${HeA} keeps trying to shape ${hisA} goo into a pretty face, but keeps ending up with over-exaggerated ${V.arcologies[0].FSSubjugationistRace} features instead.`,
- "roman revivalist": `slime with a ${girlA}'s stola sinking into ${hisA} head.`,
- "neoimperialist": `slime wearing a high-class suit that fits loosely around ${hisA} gelatinous features, occasionally slipping inside the slime.`,
- "egyptian revivalist": `slime and quite perturbed about the amount of sand caught in ${himA}.`,
- "edo revivalist": `slime with a silken kimono floating inside ${himA}.`,
- "arabian revivalist": `slime with a headscarf and a pair of sunglasses floating inside ${himA}.`,
+ "roman revivalist": `slime, with a ${girlA}'s stola sinking into ${hisA} head.`,
+ "neoimperialist": `slime, wearing a high-class suit that fits loosely around ${hisA} gelatinous features, occasionally slipping inside the slime.`,
+ "egyptian revivalist": `slime, and quite perturbed about the amount of sand caught in ${himA}.`,
+ "edo revivalist": `slime, with a silken kimono floating inside ${himA}.`,
+ "arabian revivalist": `slime, with a headscarf and a pair of sunglasses floating inside ${himA}.`,
"aztec revivalist": `slime.`, // TODO: missing in SC, expand someday.
- "chinese revivalist": `slime with a silk qipao floating inside ${himA}.`,
- "chattel religionist": `slime with several symbols of the new faith floating inside ${himA}.`,
+ "chinese revivalist": `slime, with a silk qipao floating inside ${himA}.`,
+ "chattel religionist": `slime, with several symbols of the new faith floating inside ${himA}.`,
"repopulation focus": `slime. ${HisA} amorphous body has noticeable hip, butt, and breast curves as well as several more cores gathered in ${hisA} rounded stomach.`,
- "eugenics": `slime with a chastity belt floating inside ${himA}.`,
- "degradationist": `slime with a number of piercings sinking into ${hisA} body.`,
- "physical idealist": `slime and trying to shape ${hisA} goo into muscles.`,
+ "eugenics": `slime, with a chastity belt floating inside ${himA}.`,
+ "degradationist": `slime, with a number of piercings sinking into ${hisA} body.`,
+ "physical idealist": `slime, doing ${hisA} best to shape ${hisA} goo into muscles.`,
"hedonistic decadence": `slime. ${HeA} has accumulated a large amount of excess goo, giving ${himA} quite a corpulent shape.`,
"gender radicalist": `slime. ${HeA} keeps trying to shape ${hisA} goo into a cock.`,
"gender fundamentalist": `slime. ${HisA} amorphous body has noticeable hip, butt, and breast curves.`,
"asset expansionist": `slime. ${HisA} amorphous body has ridiculously huge hip, butt, and breast curves.`,
- "transformation fetishist": `slime with a pair of big silicone implants floating around ${hisA} chest.`,
- "pastoralist": `slime with quite a large amount of milk mixed with ${hisA} body. ${HeA} keeps trying to shape ${hisA} goo into big milky tits.`,
+ "transformation fetishist": `slime, with a pair of big silicone implants floating around ${hisA} chest.`,
+ "pastoralist": `slime, with quite a large amount of milk mixed with ${hisA} body. ${HeA} keeps trying to shape ${hisA} goo into big milky tits.`,
"maturity preferentialist": `slime. ${HisA} core is noticeably larger and shows signs of splitting many times.`,
- "youth preferentialist": `slime. ${HisA} core is as immature as ${hisA} body`,
+ "youth preferentialist": `slime. ${HisA} core is as immature as ${hisA} body.`,
"slimness enthusiast": `slime. ${HeA} is compacting ${hisA} slime to make ${himselfA} look thinner.`,
- "body purist": `slime with the purest goo ${hisA} body could be made of.`,
+ "body purist": `slime, with the purest goo ${hisA} body could be made of.`,
"intellectual dependency": `slime.`,
"slave professionalism": `slime.`,
"petite admiration": `slime.`,
@@ -1348,12 +1348,12 @@ globalThis.PersonalAssistantAppearance = function() {
"roman revivalist": `${HeA} is wearing a fine stola appropriate for a respectable Roman lady, with ${hisA} hair up in a complicated style.`,
"neoimperialist": `${HeA} is wearing a skintight bodysuit that gives ${himA} the appearance of some kind of techno-angel, cybernetics and angelic beauty meshing seamlessly together.`,
"aztec revivalist": `${HeA} is wearing a modest huipil with ${hisA} hair braided to two ponytails; ${heA}'s the picture of quiet elegance.`,
- "egyptian revivalist": `${HeA} is wearing a simple white linen dress, kohl eye shadow, sandals, and a serene expression.`,
+ "egyptian revivalist": `${HeA} is wearing a simple white linen dress, kohl eyeshadow, sandals, and a serene expression.`,
"edo revivalist": `${HeA} is wearing a fine kimono with slits for ${hisA} wings, getae, tabi, and an expression of perfect serenity.`,
"arabian revivalist": `${HeA} is wearing a tailored suit, a silk headscarf, and aviator sunglasses, making ${himA} look ridiculous.`,
"chinese revivalist": `${HeA} is wearing a conservative silk qipao with special slits for ${hisA} wings. ${HisA} hair is pulled back into a bun and secured by a couple of chopsticks.`,
- "chattel religionist": `${HeA} has adjusted ${hisA} outfit to consist of nothing but the symbol of your new religion carefully tailored to cover ${hisA} nipples and crotch. ${HeA} wears another around ${hisA} neck and a blush on ${hisA} cheeks.`,
- "physical idealist": `${HeA} has swapped out ${hisA} usual linen dress for one that shows off ${hisA} toned arms, legs and abs.`,
+ "chattel religionist": `${HeA} has adjusted ${hisA} outfit to consist of nothing but the symbol of your new religion, carefully tailored to cover ${hisA} nipples and crotch. ${HeA} wears another around ${hisA} neck and a blush on ${hisA} cheeks.`,
+ "physical idealist": `${HeA} has swapped out ${hisA} usual linen dress for one that shows off ${hisA} toned arms, legs, and abs.`,
"hedonistic decadence": `${HeA} has swapped out ${hisA} usual linen dress for one that covers ${hisA} plush curves. ${HeA} finds walking easier than trying to fly with ${hisA} weighty body.`,
"repopulation focus": `${HisA} simple white linen dress is parted by ${hisA} full term pregnancy; likely a lost soul being given a new chance.`,
"eugenics": `${HeA} has swapped out ${hisA} usual linen dress for a fabulous one to match ${hisA} perfect appearance. ${HeA} proudly wears the symbol of high society on ${hisA} arm and, judging by the slight curve to ${hisA} middle, is growing a child just as beautiful as ${himA}.`,
@@ -1361,9 +1361,9 @@ globalThis.PersonalAssistantAppearance = function() {
"gender fundamentalist": `${HeA} wears a simple white linen dress that struggles to cover both ${hisA} full breasts and child-bearing hips.`,
"asset expansionist": `${HeA} has recently given up on trying to cover ${hisA} arm-filling breasts, resorting to just wearing a skirt; a skirt that strains against ${hisA} enormous rear. ${HeA} certainly won't be flying anyway.`,
"transformation fetishist": `${HeA} wears a simple white linen dress that struggles to contain ${hisA} big, perky, obviously fake breasts.`,
- "pastoralist": `${HeA} wears a simple white linen dress that struggles to cover ${hisA} full breasts. ${HeA} frequently tries to hide ${hisA} nipples; ${hisA} milk having rendered ${hisA} dress transparent.`,
+ "pastoralist": `${HeA} wears a simple white linen dress that struggles to cover ${hisA} full breasts. ${HeA} frequently tries to hide ${hisA} nipples, ${hisA} milk having rendered ${hisA} dress transparent.`,
"maturity preferentialist": `${HeA} wears a simple white linen dress and has recently altered appearance to be more mature. ${HisA} face is one of experience and ${hisA} hair has streaks of silver.`,
- "youth preferentialist": `${HeA} wears a simple white linen dress that tastefully hugs ${hisA} youthful body. ${HeA} looks barely 18; a tantalizing risk.`,
+ "youth preferentialist": `${HeA} wears a simple white linen dress that tastefully hugs ${hisA} youthful body. ${HeA} looks barely ${num(V.minimumSlaveAge, true)}; a tantalizing risk.`,
"slimness enthusiast": `${HeA} wears a simple white linen dress that tastefully hugs ${hisA} thin body.`,
"body purist": `${HeA} has forgone covering ${himselfA} to allow ${hisA} radiant, pure body to be visible to all.`,
get "intellectual dependency"() {
@@ -1376,33 +1376,32 @@ globalThis.PersonalAssistantAppearance = function() {
return r;
},
"slave professionalism": `${HeA} wears a flowing white linen dress that highlights ${hisA} grace.`,
- "petite admiration": `${HeA} wears a simple white linen dress that trails along after ${himA} when ${heA} walks. ${HeA}'s fine with this since flying makes ${himA} look tall.`,
+ "petite admiration": `${HeA} wears a simple white linen dress that trails along after ${himA} when ${heA} walks. ${HeA}'s fine with this, since flying makes ${himA} look tall.`,
"statuesque glorification": `${HeA} wears a long white linen dress, while concealing, shows off ${hisA} pleasant curves and long legs.`,
-
},
"cherub": {
"default": ``,
"paternalist": `${HeA} has swapped ${hisA} usual short skirt for a much longer one. No more panty flashes for you!`,
"degradationist": `${HeA} is wearing black lipstick along with ${hisA} usual white linen dress with a short skirt. Occasionally you get a glance up that skirt; a dark black thong greets you.`,
- "supremacist": `${HeA} is wearing a cute little dressed stitched with designs from ${V.arcologies[0].FSSupremacistRace} culture. Occasionally you get a glance up it; a white pair of panties with similar designs say hello.`,
+ "supremacist": `${HeA} is wearing a cute little dress stitched with designs from ${V.arcologies[0].FSSupremacistRace} culture. Occasionally you get a glance up it; a white pair of panties with similar designs say hello.`,
"subjugationist": `${HeA} is shackled to an iron ball and chain that's almost as big as ${heA} is, and ${heA} has to slowly and comically drag it behind ${himA} to get anywhere. Occasionally ${heA} tumbles over in ${hisA} struggles, flipping ${hisA} white linen dress up and treating you to a good look at ${hisA} panties.`,
"roman revivalist": `${HeA} is wearing a cute little tunic. Occasionally you get a glance up it; a cute little pussy says hello.`,
"neoimperialist": `${HeA} is wearing a tiny executive skirt that mixes cute and professional. ${HeA}'s obviously not wearing any panties underneath.`,
"aztec revivalist": `${HeA} is wearing a huipil with ${hisA} hair braided to two ponytails. You can clearly see through the sides that ${heA} has chosen to forgo underwear.`,
- "egyptian revivalist": `${HeA} is wearing a simple white linen dress, kohl eye shadow, and a serene expression. ${HisA} dress hangs low enough to block your view, unfortunately.`,
+ "egyptian revivalist": `${HeA} is wearing a simple white linen dress, kohl eyeshadow, and a serene expression. ${HisA} dress hangs low enough to block your view, unfortunately.`,
"edo revivalist": `${HeA} is wearing a cute little kimono with slits for ${hisA} wings. Occasionally you get a glance up it; a lovely pair of panties say hello.`,
"arabian revivalist": `${HeA} wears a fine dress, a silk headscarf, aviator sunglasses, and an overly conservative posture. No seeing up ${hisA} dress for you!`,
"chinese revivalist": `${HeA} is wearing a conservative silk qipao with special slits for ${hisA} wings. ${HisA} hair is pulled back into a bun and secured by a couple of chopsticks. It you try really hard, you can get a peek of ${hisA} panties as ${heA} flutters by.`,
- "chattel religionist": `${HeA} has adjusted ${hisA} outfit to consist of nothing but the symbol of your new religion carefully tailored to cover ${hisA} nipples and crotch. Another dangles from ${hisA} neck. ${HisA} attire leaves little to the imagination.`,
+ "chattel religionist": `${HeA} has adjusted ${hisA} outfit to consist of nothing but the symbol of your new religion, carefully tailored to cover ${hisA} nipples and crotch. Another dangles from ${hisA} neck. ${HisA} attire leaves little to the imagination.`,
"physical idealist": `${HeA} has chosen to ditch ${hisA} usual linen dress for nothing but ${hisA} undies in order to show off ${hisA} muscles.`,
"hedonistic decadence": `${HeA} has become so plump lately that no amount of tugging will get ${hisA} linen dress to cover ${hisA} exposed panties. ${HeA} struggles to stay aloft with such a plush body.`,
- "repopulation focus": `${HeA} has chosen to ditch ${hisA} usual linen dress for just ${hisA} panties. ${HeA} struggles to fly with ${hisA} heavy pregnancy and milk laden breasts.`,
+ "repopulation focus": `${HeA} has chosen to ditch ${hisA} usual linen dress for just ${hisA} panties. ${HeA} struggles to fly with ${hisA} heavy pregnancy and milk-laden breasts.`,
"eugenics": `${HeA} wears simple white linen dress with a short skirt that frequently lets you catch glimpses of ${hisA} chastity belt.`,
"gender radicalist": `${HeA} wears simple white linen dress with a short skirt that frequently lets you catch glimpses of ${hisA} panties. ${HeA} has become rather boyish lately and you swear that there is a slight bulge in ${hisA} panties.`,
"gender fundamentalist": `${HeA} wears a simple white linen dress that struggles to cover both ${hisA} full breasts and child-bearing hips. ${HisA} short skirt frequently rides you to give you a lovely view of ${hisA} panties.`,
"asset expansionist": `${HeA} has recently taken to wearing nothing put ${hisA} panties, having given up on fitting into ${hisA} dress. ${HeA} struggles to fly with ${hisA} massive tits weighing ${himA} down, and ${heA} commonly has to pause to pull ${hisA} underwear out of ${hisA} buttcrack.`,
"transformation fetishist": `${HeA} wears a simple white linen dress that struggles to cover both ${hisA} big fake breasts and ass. ${HisA} short skirt feebly rests atop ${hisA} panty devouring rear, giving you a lovely view.`,
- "pastoralist": `${HeA} has begun leaving the top of ${hisA} white linen dress open to allow ${hisA} milk laden breasts to hang free. ${HeA} tends to leave a trail where ever ${heA} flies.`,
+ "pastoralist": `${HeA} has begun leaving the top of ${hisA} white linen dress open to allow ${hisA} milk-laden breasts to hang free. ${HeA} tends to leave a trail wherever ${heA} flies.`,
"maturity preferentialist": `${HeA} has recently updated ${hisA} appearance to be more mature; an air of experience follows ${himA} as ${heA} flies around. ${HeA} a wears simple white linen dress with a short skirt that frequently lets you catch glimpses of ${hisA} panties; polka-dotted, oddly enough.`,
"youth preferentialist": `${HeA} has recently updated ${hisA} appearance to be more youthful. ${HeA} frequently flutters by, enjoying ${hisA} youthful vigor. ${HeA} a wears simple white linen dress with a short skirt that frequently lets you catch glimpses of ${hisA} panties; an adorable pair of bloomers.`,
"slimness enthusiast": `${HeA} wears simple white linen dress with a short skirt that hangs loosely off ${hisA} pleasantly thin body. ${HisA} panties are obviously a bit loose too, as ${heA} frequently has to stop, swoop down and retrieve them whenever they fall off ${hisA} flat ass.`,
@@ -1439,7 +1438,7 @@ globalThis.PersonalAssistantAppearance = function() {
"hedonistic decadence": `${HeA} has become rather chubby lately. ${HeA} may want to change up ${hisA} routine of tormenting the hungry by devouring food before them.`,
"repopulation focus": `${HeA}'s added a pair of tight belts across ${hisA} stomach recently. The taut material painfully digs into ${hisA} growing pregnancy.`,
"eugenics": `${HeA} has an iron chastity belt under ${hisA} loincloth and two large bulges in ${hisA} middle. You don't have to guess ${heA} has a pair of enormous dildos locked inside ${himA}.`,
- "gender radicalist": `${HeA}'s recently begun rendering ${himselfA} more androgynous. Something can be seen commonly tenting ${hisA} loincloth; whenever it shifts to the side, you catch sight of a thumb sized and heavily pierced clitoris.`,
+ "gender radicalist": `${HeA}'s recently begun rendering ${himselfA} more androgynous. Something can be seen commonly tenting ${hisA} loincloth; whenever it shifts to the side, you catch sight of a thumb-sized and heavily pierced clitoris.`,
"gender fundamentalist": `${HeA}'s recently increased the size of ${hisA} breasts and width of ${hisA} hips. The belt around ${hisA} chest tightly binds ${hisA} new bust and causes its flesh to bulge and jiggle delightfully.`,
"asset expansionist": `${HeA}'s had to let out ${hisA} chest belt to accommodate ${hisA} new excessive bust, but only a little; the belt creates a deep canyon across ${hisA} chest with plenty of flesh bulging above and below the straining leather.`,
"transformation fetishist": `${HeA}'s had to let out ${hisA} chest belt to accommodate ${hisA} new excessive bust, but only a little; the belt creates a deep canyon across ${hisA} fake chest and threatens to painfully pop the underlying implants.`,
@@ -1452,18 +1451,17 @@ globalThis.PersonalAssistantAppearance = function() {
"slave professionalism": `${HeA}'s taken to carrying a box of needles to make use of ${hisA} extensive knowledge of anatomy. This is one acupuncture session you don't want a part of.`,
"petite admiration": `${HisA} new, tiny body opens up a new realm of torments. You can hear ${himA} scheming about what holes ${heA} could theoretically force ${himselfA} up now.`,
"statuesque glorification": `${HisA} new, giant body brings with it an even larger ego. No longer a mere imp, ${heA}'s a borderline devil.`,
-
},
"witch": {
"default": ``,
- "paternalist": `${HeA} still hasn't managed to undo the spell; ${hisA} chest is still unnaturally smooth, not one nipple peaks the fabric of the robe.`,
+ "paternalist": `${HeA} still hasn't managed to undo the spell; ${hisA} chest is still unnaturally smooth, not one nipple peaking the fabric of the robe.`,
"degradationist": `${HeA} still hasn't managed to undo the spell; ${hisA} face, hands and every surface of ${hisA} body are completely covered in tattoos. It is especially noticeable when ${heA} talks that ${hisA} tongue is tattooed too; wonder what decorates the surfaces of ${hisA} body you can't see?`,
get "supremacist"() {
const r = [`${HeA}'s managed to correct the spell, and even succeed in it. ${HeA} is now`];
if (V.arcologies[0].FSSupremacistRace === "mixed race") {
r.push(`the perfect blend of every ethnicity, with all of their best qualities and none of their flaws.`);
} else {
- r.push(`ethnically 100 % pure ${V.arcologies[0].FSSupremacistRace}.`);
+ r.push(`ethnically 100% pure ${V.arcologies[0].FSSupremacistRace}.`);
}
r.push(`If ${heA} were real, ${heA} would make the perfect breeding stock for the next generation of the master race.`);
return r.join(" ");
@@ -1490,16 +1488,18 @@ globalThis.PersonalAssistantAppearance = function() {
"gender radicalist": `${HeA} has chosen to embrace the outcome of ${hisA} spell; ${heA} either sports a bulge or a tent in the front of ${hisA} dress and can frequently be seen reading books on male anatomy.`,
"gender fundamentalist": `${HeA} still hasn't managed to undo the spell; ${hisA} belly has become so swollen with ovum ${heA} looks ready to birth triplets. ${HeA} can barely concentrate; ${hisA} mind focused entirely on dicks cumming in ${hisA} wet pussy, but ${heA} can't risk it, knowing full well ${heA}'d become so pregnant ${heA}'d likely burst. ${HisA} ample breasts and child bearing hips only make it harder to keep away from cocks.`,
"asset expansionist": `${HeA}'s managed to partially undo the spell; ${hisA} breasts are merely as big as ${heA} is now. One simple, correctly performed, levitation spell later and ${heA} is fully capable of functioning with ${hisA} oversized tits.`,
- "transformation fetishist": `While ${heA} has managed to regain ${hisA} flexibility, ${heA} still greatly resembles an overinflated blow-up doll. ${HisA} lips are stuck in an O shape, ${hisA} breasts are the size of beach balls, ${hisA} ass and thighs larger than any ${girlA}'s you've seen, and above all else is ${hisA} huge medicine ball sized belly; fortunately they don't weigh nearly as much as they should, part of the benefits of being an inflatable sex-doll.`,
- "pastoralist": `${HeA}'s managed to shrink ${hisA} nine breasts somewhat; they are merely head sized now. The front of ${hisA} robes is strained from ${hisA} excessive number of milky tits.`,
- "maturity preferentialist": `${HeA}'s managed to reign in ${hisA} aging spell and with a little size up to ${hisA} breasts, hips and ass makes a very pleasant MILF.`,
+ "transformation fetishist": `While ${heA} has managed to regain ${hisA} flexibility, ${heA} still greatly resembles an overinflated blow-up doll. ${HisA} lips are stuck in an O shape, ${hisA} breasts are the size of beach balls, ${hisA} ass and thighs are larger than any ${girlA}'s you've seen, and above all else is ${hisA} huge medicine ball sized belly; fortunately they don't weigh nearly as much as they should, part of the benefits of being an inflatable sex-doll.`,
+ "pastoralist": `${HeA}'s managed to shrink ${hisA} nine breasts somewhat; they are merely head-sized now. The front of ${hisA} robes is strained from ${hisA} excessive number of milky tits.`,
+ "maturity preferentialist": `${HeA}'s managed to reign in ${hisA} aging spell, and with a little size up to ${hisA} breasts, hips, and ass, makes a very pleasant MILF.`,
get "youth preferentialist"() {
if (V.minimumSlaveAge === 3) {
return `${HeA}'s adjusted ${hisA} tiny body slightly to be less feeble. Now ${heA} is a fully capable and adorable toddler witch in an oversized robe, though ${heA} has to fight to keep ${hisA} hat from covering ${hisA} entire head.`;
} else if (V.minimumSlaveAge <= 7) {
- return `${HeA}'s decided to embrace ${hisA} spell and now appears as an adorable ${loliA} witch. ${HeA} has to watch ${hisA} step to not trip over ${hisA} trailing robe and has to constantly readjust ${hisA} head devouring hat.`;
- } else if (V.minimumSlaveAge <= 13) {
- return `${HeA}'s decided to embrace ${hisA} spell and now appears as a cute teenage witch. ${HisA} robe is a little long, but ${heA} manages just fine.`;
+ return `${HeA}'s decided to embrace ${hisA} spell and now appears as an adorable ${loliA} witch. ${HeA} has to watch ${hisA} step to not trip over ${hisA} trailing robe and has to constantly readjust ${hisA} head-devouring hat.`;
+ } else if (V.minimumSlaveAge <= 12) {
+ return `${HeA}'s decided to embrace ${hisA} spell and now appears as a cute preteen witch. ${HisA} robe is a little long, but ${heA} manages just fine.`;
+ } else if (V.minimumSlaveAge < 18) {
+ return `${HeA}'s decided to embrace ${hisA} spell and now appears as a budding teenaged witch.`;
} else {
return `${HeA}'s decided to embrace ${hisA} spell and now appears as a witch fresh into adulthood.`;
}
@@ -1508,9 +1508,8 @@ globalThis.PersonalAssistantAppearance = function() {
"body purist": `${HeA} has attempted to fix ${hisA} misspell and succeeded in preventing ${hisA} clothes from becoming transparent, to ${himselfA} only. ${HeA} appears nude, even though ${heA} is fully clothed, much to everyone's enjoyment.`,
"intellectual dependency": `${HeA} still hasn't managed to figure out that ${heA} drained ${hisA} intelligence; not that it matters when all your spells now have so many fun effects! (And you can't read.)`,
"slave professionalism": `${HeA}'s managed to work out some of the kinks of the spell, though it's left ${himA} quite the perfectionist.`,
- "petite admiration": `${HeA}'s decided to embrace ${hisA} spell, and with a strength booster, manages quite fine with ${hisA} proportionately mountainous tits.`,
+ "petite admiration": `${HeA}'s decided to embrace the shortening effect of ${hisA} spell, and with a strength booster, manages quite fine with ${hisA} proportionately mountainous tits.`,
"statuesque glorification": `${HeA}'s managed to correct the spell, and even succeed in it. ${HeA} stands tall, proud at ${hisA} success.`,
-
},
"ERROR_1606_APPEARANCE_FILE_CORRUPT": {
"default": ``,
@@ -1537,21 +1536,23 @@ globalThis.PersonalAssistantAppearance = function() {
},
"eugenics": `wearing nothing at all. You can't take your eyes off of ${hisA} perfect body, but at the same time, you feel a strange sense of danger about ${himA}.`,
"gender radicalist": `wearing nothing at all. Even though ${heA} lacks a penis, you can't shake the feeling that it's a trap.`,
- "gender fundamentalist": `full breasts, wide hips and wearing absolutely nothing. You swear ${hisA} tits are moving slightly and an unusual bulge can be seen writhing in ${hisA} lower belly.`,
- "asset expansionist": `wearing nothing at all; not that anything could fit ${himA}. ${HeA} is absolutely massive; ${hisA} breasts easily dwarfing the rest of ${hisA} body and quivering obscenely. Every so often, a bulge moves up a nipple as a wormlike creature is born into the world.`,
- "transformation fetishist": `wearing nothing at all; not that anything could fit ${himA}. ${HisA} breasts and ass are splitting around the massive, round objects distending them. The orbs are slightly translucent; lots of small wormlike creatures can be seen squirming within.`,
- "pastoralist": `wearing nothing at all; not that anything could fit ${himA}. ${HeA} is absolutely massive; ${hisA} breasts easily dwarfing the rest of ${hisA} body and quivering obscenely. An extremely dense, white liquid is steadily forcing its way from ${hisA} gaping nipples.`,
+ "gender fundamentalist": `full breasts, wide hips, and no clothing at all. You swear ${hisA} tits are moving slightly and an unusual bulge can be seen writhing in ${hisA} lower belly.`,
+ "asset expansionist": `wearing nothing at all, not that anything could fit ${himA}. ${HeA} is absolutely massive, ${hisA} breasts easily dwarfing the rest of ${hisA} body and quivering obscenely. Every so often, a bulge moves up a nipple as a wormlike creature is born into the world.`,
+ "transformation fetishist": `wearing nothing at all, not that anything could fit ${himA}. ${HisA} breasts and ass are splitting around the massive, round objects distending them. The orbs are slightly translucent; lots of small wormlike creatures can be seen squirming within.`,
+ "pastoralist": `wearing nothing at all, not that anything could fit ${himA}. ${HeA} is absolutely massive, ${hisA} breasts easily dwarfing the rest of ${hisA} body and quivering obscenely. An extremely dense, white liquid is steadily forcing its way from ${hisA} gaping nipples.`,
"maturity preferentialist": `wearing nothing at all. ${HeA} seems to be quite old and vulnerable, but something feels off about ${himA}.`,
get "youth preferentialist"() {
const r = [`wearing nothing at all.`];
if (V.minimumSlaveAge === 3) {
- r.push(`${HeA}'s an adorable toddler just ripe for the taking; though a feeling of danger radiates from ${hisA} tiny body.`);
+ r.push(`${HeA}'s an adorable toddler just ripe for the taking, though a feeling of danger radiates from ${hisA} tiny body.`);
} else if (V.minimumSlaveAge <= 7) {
- r.push(`${HeA}'s a cute ${loliA} and ripe for the taking; though a feeling of danger radiates from ${hisA} small body.`);
- } else if (V.minimumSlaveAge <= 13) {
- r.push(`${HeA}'s a pretty teenager and ripe for the taking; though a feeling of danger radiates from ${himA}.`);
+ r.push(`${HeA}'s a cute ${loliA} and ripe for the taking, though a feeling of danger radiates from ${hisA} small body.`);
+ } else if (V.minimumSlaveAge <= 12) {
+ r.push(`${HeA}'s a charming preteen and ripe for the taking, though a feeling of danger radiates from ${hisA} growing body.`);
+ } else if (V.minimumSlaveAge < 18) {
+ r.push(`${HeA}'s a pretty teenager and ripe for the taking, though a feeling of danger radiates from ${himA}.`);
} else {
- r.push(`${HeA} seems to be fresh into adulthood and ripe for the taking; though a feeling of danger radiates from ${himA}.`);
+ r.push(`${HeA} seems to be fresh into adulthood and ripe for the taking, though a feeling of danger radiates from ${himA}.`);
}
return r.join(" ");
},
@@ -1582,7 +1583,7 @@ globalThis.PersonalAssistantAppearance = function() {
get "eugenics"() {
const r = [`${HeA}'s become even more irresistible lately;`];
if (V.PC.vagina !== -1) {
- r.push(`you can't help but think of that perfect cock cumming deep in your pussy and your belly rounding with a gorgeous child.`);
+ r.push(`you can't help but think of that perfect cock cumming deep in your pussy, and your belly rounding with a gorgeous child.`);
} else {
r.push(`the children sired by such a stud are unimaginable.`);
}
@@ -1590,11 +1591,11 @@ globalThis.PersonalAssistantAppearance = function() {
},
get "gender radicalist"() {
if (V.arcologies[0].FSGenderRadicalistLawFuta === 1) {
- return `${HeA} is wearing nothing at all and has recently rendered ${himselfA} slightly more feminine. ${HeA} makes sure to make exaggerated motions to show off the pussy hidden beneath ${hisA} swinging nuts.`;
+ return `${HeA} is wearing nothing at all, and has recently rendered ${himselfA} slightly more feminine. ${HeA} makes sure to make exaggerated motions to show off the pussy hidden beneath ${hisA} swinging nuts.`;
} else if (V.arcologies[0].FSGenderRadicalistLawFuta === 2) {
return `${HeA} has recently increased the size of ${hisA} genitals and has given up trying to wear pants; they just get in the way of ${hisA} prominent erection.`;
} else if (V.arcologies[0].FSGenderRadicalistLawFuta === 3) {
- return `${HeA} is wearing nothing at all; not that anything could fit ${himA}. ${HisA} cock and balls are utterly dwarfed by ${hisA} door-jamming hips, massive ass and extra thick thighs.`;
+ return `${HeA} is wearing nothing at all, not that anything could fit ${himA}. ${HisA} cock and balls are utterly dwarfed by ${hisA} door-jamming hips, massive ass, and extra thick thighs.`;
} else if (V.arcologies[0].FSGenderRadicalistLawFuta === 4) {
return `${HeA} is wearing loose clothing and has recently rendered ${himselfA} slightly more feminine. ${HeA} does ${hisA} best to appear the perfect little femboy despite what's slipping down ${hisA} pant leg.`;
} else {
@@ -1602,17 +1603,19 @@ globalThis.PersonalAssistantAppearance = function() {
}
},
"gender fundamentalist": `${HeA} is wearing a cute dress that tightly hugs ${hisA} attractive curves. ${HeA} may be rendering ${himselfA} more feminine, but can't hide the bulge under ${hisA} skirt.`,
- "asset expansionist": `${HeA} is wearing nothing at all; not that anything could fit ${himA}. ${HisA} cock and balls are so large they reach the ground when ${heA} stands.`,
+ "asset expansionist": `${HeA} is wearing nothing at all, not that anything could fit ${himA}. ${HisA} cock and balls are so large they reach the ground when ${heA} stands.`,
"transformation fetishist": `${HeA} is wearing jeans and a tight shirt. ${HisA} overly long erection runs up ${hisA} front and protrudes out the neck of ${hisA} top.`,
- "pastoralist": `${HeA} is wearing nothing at all; not that anything could fit ${himA}. ${HisA} balls are absolutely massive; ${hisA} sizable cock looks tiny resting atop them. ${HeA} can barely take a step without overstimulating and orgasming across ${hisA} sack.`,
+ "pastoralist": `${HeA} is wearing nothing at all, not that anything could fit ${himA}. ${HisA} balls are absolutely massive; ${hisA} sizable cock looks tiny resting atop them. ${HeA} can barely take a step without overstimulating and orgasming across ${hisA} sack.`,
"maturity preferentialist": `${HeA} has recently begun presenting ${himselfA} as an experienced, mature man with an oddly familiar mustache and goatee.`,
get "youth preferentialist"() {
- const r = [`${HeA} has recently adjusted ${hisA} age to reflect your youth focused society.`];
+ const r = [`${HeA} has recently adjusted ${hisA} age to reflect your youth-focused society.`];
if (V.minimumSlaveAge === 3) {
r.push(`${HeA}'s an adorable toddler with an enormous cock hanging from ${hisA} shorts.`);
} else if (V.minimumSlaveAge <= 7) {
r.push(`${HeA}'s a cute shota with ball-filled shorts and a huge erection sneaking up ${hisA} shirt.`);
- } else if (V.minimumSlaveAge <= 13) {
+ } else if (V.minimumSlaveAge <= 12) {
+ r.push(`${HeA}'s a charming preteen with a scandalous bulge running more than halfway down ${hisA} pant leg.`);
+ } else if (V.minimumSlaveAge < 18) {
r.push(`${HeA}'s an attractive teenager with an immodest bulge running down ${hisA} pant leg.`);
} else {
r.push(`${HeA}'s an attractive young adult with an immodest bulge running down ${hisA} pant leg.`);
@@ -1623,7 +1626,7 @@ globalThis.PersonalAssistantAppearance = function() {
"body purist": `${HeA} is wearing nothing at all, happy to show off ${hisA} flawless body. ${HisA} cock and balls are now the ideal size to penetrate a natural girl.`,
get "intellectual dependency"() {
if (V.arcologies[0].FSIntellectualDependencyLawBeauty === 1) {
- return `${HeA} is wearing nothing but a pair of jeans with the fly down to let ${hisA} junk hang loose. ${HeA} likes ${hisA} sex simple and straightforward. (The button is too difficult for ${himA}.)`;
+ return `${HeA} is wearing nothing but a pair of jeans, with the fly down to let ${hisA} junk hang loose. ${HeA} likes ${hisA} sex simple and straightforward. (The button is too difficult for ${himA}.)`;
} else {
return `${HeA} is wearing nothing at all; it would just get in the way. ${HeA}'s hard and ready to go, not that ${heA} could think of anything else to do.`;
}
@@ -1631,7 +1634,6 @@ globalThis.PersonalAssistantAppearance = function() {
"slave professionalism": `${HeA} is wearing a fine suit and ready to offer a deal no one could refuse.`,
"petite admiration": `${HeA} is wearing nothing at all and has recently rendered ${himselfA} quite short; the perfect height to slip through a crowd, unseen and slapping booty.`,
"statuesque glorification": `${HeA} is wearing nothing at all and has recently rendered ${himselfA} quite tall, so tall, in fact, that few can stop ${himA} from sticking ${hisA} cock in their face.`,
-
},
"succubus": {
"default": ``,
@@ -1679,17 +1681,19 @@ globalThis.PersonalAssistantAppearance = function() {
}
},
"gender fundamentalist": `${HeA} is wearing a form fitting dress that emphasizes ${hisA} feminine curves. A gorgeous sight, given that ${heA} has recently adjusted ${hisA} body to be a lovely future mother.`,
- "asset expansionist": `${HeA} is wearing nothing at all; not that anything could fit ${himA}. ${HisA} breasts nearly touch the ground when ${heA} stands, yet are naturally perky. ${HisA} butt is so enormous it is a wonder ${heA} can even walk.`,
+ "asset expansionist": `${HeA} is wearing nothing at all, not that anything could fit ${himA}. ${HisA} breasts nearly touch the ground when ${heA} stands, yet are naturally perky. ${HisA} butt is so enormous it is a wonder ${heA} can even walk.`,
"transformation fetishist": `${HeA} is wearing a minidress so tight it fully outlines ${hisA} huge butt implants and barely contains the lower half of ${hisA} beach ball sized tits.`,
- "pastoralist": `${HeA} is wearing a pair of cow-print bikinis over ${hisA} head sized breasts. A quartet of wet spots adorn ${hisA} tops at all times.`,
+ "pastoralist": `${HeA} is wearing a pair of cow-print bikinis over ${hisA} head-sized breasts. A quartet of wet spots adorn ${hisA} tops at all times.`,
"maturity preferentialist": `${HeA} has recently begun presenting ${himselfA} as an experienced, mature ${womanA}; one can only wonder what positions and tricks ${heA} knows.`,
get "youth preferentialist"() {
- const r = [`${HeA} has recently adjusted ${hisA} age to reflect your youth focused society.`];
+ const r = [`${HeA} has recently adjusted ${hisA} age to reflect your youth-focused society.`];
if (V.minimumSlaveAge === 3) {
r.push(`${HeA}'s an adorable toddler wearing a cute pink dress.`);
} else if (V.minimumSlaveAge <= 7) {
- r.push(`${HeA}'s a cute ${loliA} wearing tight, crotch hugging spats and a tight tube top across ${hisA} flat chest.`);
- } else if (V.minimumSlaveAge <= 13) {
+ r.push(`${HeA}'s a cute ${loliA} wearing tight, crotch-hugging spats and a tight tube top across ${hisA} flat chest.`);
+ } else if (V.minimumSlaveAge <= 12) {
+ r.push(`${HeA}'s a charming preteen wearing tight denim shorts and a loose crop top across the tiny buds of ${hisA} chest.`);
+ } else if (V.minimumSlaveAge < 18) {
r.push(`${HeA}'s an attractive teenager wearing short shorts and a sheer top that shows off ${hisA} newly grown breasts.`);
} else {
r.push(`${HeA}'s an attractive young adult wearing a sheer dress that shows off ${hisA} youthful curves.`);
@@ -1705,7 +1709,7 @@ globalThis.PersonalAssistantAppearance = function() {
},
"body purist": `${HeA} is wearing nothing at all, happy to show off ${hisA} flawless body. ${HisA} curves are perfect; it's the only way to describe ${himA}.`,
get "intellectual dependency"() {
- const r = [`${HeA} is wearing nothing at all; it would just get in the way.`];
+ const r = [`${HeA} is wearing nothing at all; clothes would just get in the way.`];
if (V.arcologies[0].FSIntellectualDependencyLawBeauty === 1) {
r.push(`${HisA} lavish makeup, long nails, luxurious hair,`);
if (V.arcologies[0].FSSlimnessEnthusiastLaw !== 1) {
@@ -1734,7 +1738,7 @@ globalThis.PersonalAssistantAppearance = function() {
if (V.arcologies[0].FSRepopulationFocus !== "unset") {
r.push(`baby bump,`);
}
- r.push(`narrow waist, and huge dicksucking lips spell out bimbo far better than ${heA} ever could.`);
+ r.push(`narrow waist, and huge dicksucking lips spell out 'bimbo' far better than ${heA} ever could.`);
} else {
r.push(`${HeA}'s moist and ready to go, not that ${heA} could think of anything else to do.`);
}
diff --git a/src/player/desc/pLongBelly.js b/src/player/desc/pLongBelly.js
index b200c6cfa0ed9ee7889b93f4c76ff5c12316e74a..aac178a8266578f5d3fcbc2ceeaccb8b6ab5e10c 100644
--- a/src/player/desc/pLongBelly.js
+++ b/src/player/desc/pLongBelly.js
@@ -40,9 +40,9 @@ App.Desc.Player.belly = function(PC = V.PC) {
if (PC.physicalAge <= 12) {
r.push(`You have been reduced to nothing more than`);
if (PC.belly > (PC.pregAdaptation * 1000)) {
- r.push(`a breaking womb with a ${loliP} attached. It's a constant struggle to not be lost under the squirming mass of infants that consume every available space inside you.`);
+ r.push(`a breaking womb with a ${loliP} attached. It's a constant struggle to not be lost under the quivering mass of infants that consume every available space inside you.`);
} else {
- r.push(`an overstuffed womb with a ${loliP} attached. It's a constant struggle to not be lost under the squirming mass of infants that fill your body.`);
+ r.push(`an overstuffed womb with a ${loliP} attached. It's a constant struggle to not be lost under the quivering mass of infants that fill your body.`);
}
} else {
r.push(`You have been reduced to nothing more than`);
@@ -57,6 +57,10 @@ App.Desc.Player.belly = function(PC = V.PC) {
}
r.push(`belly off the ground.`);
}
+ if (PC.weight > 190) {
+ r.push(`Your massively fat belly is stretched past its limit, resembling a "normal" pregnancy more than the gut it is.`);
+ }
+ r.push(`You are so full, you can clearly make out the distinct features of each of the outermost infants forced against the thin layer of skin and womb by their countless siblings. Your womb is so cramped, its contents are practically shrinkwrapped under the sheer pressure.`);
if (PC.belly > (PC.pregAdaptation * 1000)) {
r.push(`Your stomach has taken up a rather bruised tone; you likely don't have much time left.`);
}
@@ -103,7 +107,7 @@ App.Desc.Player.belly = function(PC = V.PC) {
r.push(`belly off the ground, which certainly makes life complicated.`);
}
if (PC.weight > 190) {
- r.push(`Your massively fat belly is stretched to its limit, so much so your folds have been pulled flat and your softness, firm.The implant takes up so much room in your body that it can be clearly seen through your skin.`);
+ r.push(`Your massively fat belly is stretched to its limit, so much so your folds have been pulled flat and your softness, firm. The implant takes up so much room in your body that it can be clearly seen through your skin.`);
} else {
r.push(`The implant filling your body takes up so much room that it can be clearly seen through your skin.`);
}
@@ -115,7 +119,9 @@ App.Desc.Player.belly = function(PC = V.PC) {
}
}
r.push(stackedInflation());
- if (canMove(PC)) {
+ if (isMovable(PC) && !canMove(PC)) {
+ r.push(`It takes a little repositioning, but your wheelchair allows you to see your various sides with ease; a feat, really.`);
+ } else if (canMove(PC)) {
r.push(`As laughable as it is, your only means of seeing your various sides is to pivot around your boundless middle as lifting it is out of the question. Even getting into a position to do this is an uphill battle.`);
} else {
r.push(`It's impossible to roll into a position where you can see anything other than your boundless middle. Half because it is you now, and half because you literally can't move it.`);
@@ -250,7 +256,9 @@ App.Desc.Player.belly = function(PC = V.PC) {
}
}
r.push(stackedInflation());
- if (canMove(PC)) {
+ if (isMovable(PC) && !canMove(PC)) {
+ r.push(`It takes a little repositioning, but your wheelchair allows you to see your various sides with ease; a feat, really.`);
+ } else if (canMove(PC)) {
r.push(`As laughable as it is, your only means of seeing your various sides is to pivot around your boundless middle rather than try to reposition it to get a better look at yourself.`);
if (PC.bellyPreg > 0) {
if (PC.belly > (PC.pregAdaptation * 1000)) {
@@ -333,7 +341,9 @@ App.Desc.Player.belly = function(PC = V.PC) {
}
}
r.push(stackedInflation());
- if (canMove(PC)) {
+ if (isMovable(PC) && !canMove(PC)) {
+ r.push(`It takes a little repositioning, but your wheelchair allows you to see your various sides with ease; a feat, really.`);
+ } else if (canMove(PC)) {
r.push(`As laughable as it is, it is now easier to pivot around your boundless middle than try to reposition it to get a better look at yourself.`);
if (PC.bellyPreg > 0) {
if (PC.belly > (PC.pregAdaptation * 1000)) {
@@ -401,7 +411,12 @@ App.Desc.Player.belly = function(PC = V.PC) {
}
}
r.push(stackedInflation());
- if (canMove(PC)) {
+ if (isMovable(PC) && !canMove(PC)) {
+ r.push(`Not only is it impossible to see around your bulbous middle in the mirror, but it juts out so far that it is pressing against the cold surface despite a concentrated effort to not roll into it.`);
+ if (PC.bellyPreg > 0) {
+ r.push(`Of course, the impact set your brood off, so now your ${(PC.belly > (PC.pregAdaptation * 1000)) ? "sore" : ""} stomach is squirming about, making it difficult to get a good look at anything on its surface.`);
+ }
+ } else if (canMove(PC)) {
r.push(`Not only is it impossible to see around your bulbous middle in the mirror, but it juts out so far that it is pressing against the cold surface despite your efforts to avoid being too close to it.`);
if (PC.bellyPreg > 0) {
r.push(`Of course, this set your brood off, so now your ${(PC.belly > (PC.pregAdaptation * 1000)) ? "sore" : ""} stomach is squirming about, making it difficult to get a good look at anything on its surface.`);
@@ -459,7 +474,7 @@ App.Desc.Player.belly = function(PC = V.PC) {
}
}
r.push(stackedInflation());
- if (canMove(PC)) {
+ if (isMovable(PC)) {
r.push(`Not only is it impossible to see around your bulbous middle in the mirror, but it juts out so far that it is pressing against the cold surface despite your efforts to avoid being too close to it.`);
} else {
r.push(`It's near impossible to roll into a position where you can see anything other than your boundless middle.`);
@@ -1438,8 +1453,15 @@ App.Desc.Player.belly = function(PC = V.PC) {
if (PC.belly >= 300000) {
if (V.pregAccessibility === 1) {
r.push(`Fortunately, you've had the penthouse remodeled to support ${girlP}s with such motherly figures, so fitting through the doors, using furniture and reaching things isn't a concern.`);
+ } else if (V.buttAccessibility === 1 || V.ballsAccessibility === 1 || V.boobAccessibility === 1) {
+ r.push(`The halls and doors of the penthouse have already been remodeled to accommodate other enormous assets, so a ${girlP} with a figure as motherly as yours can still get around. Now if only you could use the rest of it without your belly getting in the way.`);
} else {
r.push(`Even worse, the penthouse was not designed to handle ${girlP}s with a figure as motherly as yours; you crowd the halls, get stuck in doors and on furniture, and can never reach anything without your belly bumping into something.`);
+ if (PC.belly >= 800000) {
+ r.push(`Well you did, right up until you outgrew the bedroom door and became <span class="red">stuck inside it.</span>`);
+ } else if (PC.belly >= 775000) {
+ r.push(`Your bedroom door is especially bad... A little bit bigger and you may be stuck in here.`);
+ }
}
}
@@ -1465,11 +1487,17 @@ App.Desc.Player.belly = function(PC = V.PC) {
} else {
r.push(`You're so bulbous and heavy that`);
}
- r.push(`you can no longer realistically move yourself are now confined to your bedroom.`);
- if (PC.bellyPreg > 0) {
- r.push(`You'll never be lonely though, not with all the lives pinning you down.`);
+ r.push(`you can no longer realistically move yourself are now confined to`);
+ if (isMovable(PC)) {
+ r.push(`a wheelchair.`);
+ r.push(bellyAccessibility());
} else {
- r.push(`It's so wide that even lying down is uncomfortable without a mountain of pillows to support your body with.`);
+ r.push(`your bedroom.`);
+ if (PC.bellyPreg > 0) {
+ r.push(`You'll never be lonely though, not with all the lives pinning you down.`);
+ } else {
+ r.push(`It's so wide that even lying down is uncomfortable without a mountain of pillows to support your body with.`);
+ }
}
} else if (isBellyHeavy) {
r.push(`You're so bulbous and heavy that it makes getting around a challenge.`);
@@ -1533,6 +1561,8 @@ App.Desc.Player.belly = function(PC = V.PC) {
} else {
r.push(`but you wouldn't still have this belly if you didn't find that arousing, would you?`);
}
+ } else if (PC.belly >= 105000 && !canMove(PC) && isMovable(PC)) {
+ r.push(`Getting in and out of your wheelchair is an ordeal these days, and that isn't even considering how far off of it you protrude.`);
} else if (PC.belly >= 105000 && canStand(PC)) {
r.push(`You have trouble standing up and sitting down, with the former an exhausting endeavor.`);
} else if (PC.belly >= 90000 && canWalk(PC)) {
@@ -1564,13 +1594,13 @@ App.Desc.Player.belly = function(PC = V.PC) {
} else if (PC.bellyPreg >= 750000) {
r.push(`While the massive pressure is arousing enough, the real pleasure are the endless vibrations caused by the minute motions of your brood. It's practically impossible to get anything done when chaining orgasm after orgasm until you risk passing out.`);
} else if (PC.bellyPreg >= 600000) {
- r.push(`Between the constant movement and the pressure against your sensetive womb, it's impossible to not be constantly aroused. The quivering never ends, trapping you in a game of orgasm roulette.`);
+ r.push(`Between the constant movement and the pressure against your sensitive womb, it's impossible to not be constantly aroused. The quivering never ends, trapping you in a game of orgasm roulette.`);
} else if (PC.bellyPreg >= 450000) {
- r.push(`Between the movement and the pressure against your sensetive womb, it's impossible to not be constantly aroused. Any kick can send you over the edge, and there are just so many of them…`);
+ r.push(`Between the movement and the pressure against your sensitive womb, it's impossible to not be constantly aroused. Any kick can send you over the edge, and there are just so many of them…`);
} else if (PC.wombImplant === "restraint" && PC.belly >= 400000) {
- r.push(`Your womb is so full that the restraining mesh designed to support it has begun to strangle it, but thanks to your overly sensetive uterus, this feels way better than it should.`);
+ r.push(`Your womb is so full that the restraining mesh designed to support it has begun to strangle it, but thanks to your overly sensitive uterus, this feels way better than it should.`);
} else if (PC.bellyPreg >= 10000) {
- r.push(`Between the movement and the pressure in your sensetive womb, you find it difficult to not be in a state of constant arousal.`);
+ r.push(`Between the movement and the pressure in your sensitive womb, you find it difficult to not be in a state of constant arousal.`);
}
} else if ((PC.dick > 0 || PC.genes === "XY") && PC.prostate > 0 && PC.preg > 0 && PC.preg > PC.pregData.normalBirth * .75) { // Do this here for dicks and males, otherwise do it in the special vagina description
r.push(`Not only is your bladder under constant pressure from your advanced pregnancy, but your prostate is too. Between that and your baby's movements, you find it difficult to not be in a state of constant arousal.`);
diff --git a/src/player/desc/pLongBody.js b/src/player/desc/pLongBody.js
index dfcf39cb20433873c5f73f9368864b7a09648818..1643a76f78a2be309fa37b2ffd72103c4c8bd357 100644
--- a/src/player/desc/pLongBody.js
+++ b/src/player/desc/pLongBody.js
@@ -66,7 +66,7 @@ App.Desc.Player.body = function(PC = V.PC) {
r.push(`You're <span class="orange">${PC.actualAge}</span> and full of vigor, if still underage by society's standards.`, ageDifference);
}
if (V.playerAging) {
- r.push(`Your birthday is ${PC.birthWeek === 51 ? `next week` : `in ${52 - PC.birthWeek} weeks`}.`);
+ r.push(`Your birthday is ${PC.birthWeek === 51 ? `next week` : `in ${num(52 - PC.birthWeek)} weeks`}.`);
}
return r.join(" ");
}
@@ -203,7 +203,7 @@ App.Desc.Player.body = function(PC = V.PC) {
r.push(`However, you're so powerfully built that you can do it with effort, though you're out of breath just standing here.`);
} else if (PC.muscles > 30) {
r.push(`You're strong enough to get to your feet, but given you're currently leaning against a chair to take some of the load off, that may not be for much longer.`);
- } else {
+ } else {
r.push(`It takes a lot to get on your feet, so you try to avoid that if possible.`);
}
}
@@ -215,6 +215,7 @@ App.Desc.Player.body = function(PC = V.PC) {
function shoulders() {
const r = [];
+ const pubertyAge = Math.min(PC.pubertyAgeXX, PC.pubertyAgeXY);
if (PC.shoulders < -1) {
r.push(`Your shoulders and chest are very narrow and feminine.`);
@@ -225,6 +226,43 @@ App.Desc.Player.body = function(PC = V.PC) {
} else if (PC.shoulders > 0) {
r.push(`You have fairly broad shoulders, giving you a masculine appearance.`);
}
+ if (PC.underArmHStyle === "hairless" || PC.physicalAge < pubertyAge - 2) {
+ r.push(`Your armpits are perfectly smooth and naturally hairless.`);
+ } else if (PC.underArmHStyle === "bald") {
+ r.push(`Oddly, your armpits have gone bald and stopped growing hair.`);
+ } else if (PC.physicalAge < pubertyAge - 1) {
+ r.push(`A few ${PC.underArmHColor} wisps of hair adorn your armpits.`);
+ } else if (PC.physicalAge < pubertyAge) {
+ r.push(`With puberty approaching, you've sprouted a small patch of ${PC.underArmHColor} hair in your armpits.`);
+ } else if (PC.underArmHStyle === "shaved") {
+ r.push(`You keep your armpits shaved, but there is a light ${PC.underArmHColor} stubble starting to grow.`);
+ } else if (PC.underArmHStyle === "neat") {
+ r.push(`You keep your armpit hair neatly trimmed`);
+ if (!hasBothArms(PC)) {
+ r.push(`since`);
+ if (hasAnyArms(PC)) {
+ r.push(`at least half`);
+ } else {
+ r.push(`it`);
+ }
+ r.push(`is always in full view.`);
+ } else {
+ r.push(`to not be visible unless you want it to be.`);
+ }
+ } else if (PC.underArmHStyle === "bushy") {
+ r.push(`You've let your ${PC.underArmHColor} armpit hair grow freely,`);
+ if (!hasAnyArms(PC)) {
+ r.push(`creating two bushy patches under where your arms used to be.`);
+ } else {
+ r.push(`where it can be seen poking out from under your`);
+ if (hasBothArms(PC)) {
+ r.push(`arms`);
+ } else {
+ r.push(`arm`);
+ }
+ r.push(`if you look closely.`);
+ }
+ }
return r.join(" ");
}
diff --git a/src/player/desc/pLongBoobs.js b/src/player/desc/pLongBoobs.js
index 7bcda31cf2391aa2a8908c213a3d0f5c2845c1be..74281dcbd63d26e779169a2c732502a4158f23aa 100644
--- a/src/player/desc/pLongBoobs.js
+++ b/src/player/desc/pLongBoobs.js
@@ -183,7 +183,7 @@ App.Desc.Player.boobs = function(PC = V.PC) {
function nipples() {
const r = [];
- if (PC.aphrodisiacs > 0 || PC.inflationType === "aphrodisiac" || PC.energy > 95 || PC.need > 0) {
+ if (isPlayerHorny(PC)) {
switch (PC.nipples) {
case "tiny":
r.push(`You have stiff little nubs ${areolae()}.`);
@@ -196,7 +196,7 @@ App.Desc.Player.boobs = function(PC = V.PC) {
break;
case "partially inverted":
case "inverted":
- r.push(`Your nipples are stiffly erect and ${areolae()}. They'd be inverted if you weren't so horny right now.`);
+ r.push(`Your nipples are stiffly erect and ${areolae()} They'd be inverted if you weren't so horny right now.`);
break;
case "huge":
if (PC.boobs - PC.boobsImplant > 7500) {
@@ -210,7 +210,7 @@ App.Desc.Player.boobs = function(PC = V.PC) {
} else {
r.push(`Your nipples are enormously erect and`);
}
- r.push(`areolae()`);
+ r.push(areolae());
break;
case "fuckable":
r.push(`Your nipples are swollen shut and ${areolae()}`);
@@ -370,8 +370,19 @@ App.Desc.Player.boobs = function(PC = V.PC) {
if (PC.boobs >= 25000) {
if (V.boobAccessibility === 1) {
r.push(`On the bright side, you've had the penthouse remodeled for ${girlP}s with such substantial bosoms already, so fitting through doors and using furniture isn't a concern.`);
+ } else if (V.pregAccessibility === 1 || V.ballsAccessibility === 1 || V.buttAccessibility === 1) {
+ r.push(`Still, the halls and doors of the penthouse have been remodeled to accommodate other enormous assets, so there's plenty of room for your substantial busom. Too bad everything is still at the perfect height to jab you in the tits.`);
} else {
r.push(`Even worse, the penthouse was not designed to handle ${girlP}s with bosoms as substantial as yours; you crowd whichever halls or doors you use and find an uncomfortable number of objects poking and prodding your tits.`);
+ if (PC.boobsImplant >= 600000) {
+ r.push(`But with implants wider than a standard doorway, you aren't keen on trying to force them through, <span class="red">leaving you trapped inside your room.</span>`);
+ } else if (PC.boobs >= 1000000) {
+ r.push(`In fact, you're so busty that any efforts to cram your tits through your doorway result in them plugging the doorway, effectively <span class="red">sealing you inside your room.</span>`);
+ } else if (PC.boobsImplant >= 599000) {
+ r.push(`The only way to get in and out of your bedroom is to do so one tit at a time; unless you wanted to be trapped in your own home, it might not be the best idea to size up your implants much more.`);
+ } else if (PC.boobs >= 995000) {
+ r.push(`It's become really difficult to feed the entirety of your breastflesh through the doorway when you need to pass through; you are at risk of plugging it should you grow much more.`);
+ }
}
}
return r.join(" ");
@@ -383,7 +394,13 @@ App.Desc.Player.boobs = function(PC = V.PC) {
if ((PC.physicalAge <= 12 && PC.boobs > 100000 + (PC.muscles * 50)) ||
(PC.physicalAge < 18 && PC.boobs > 250000 + (PC.muscles * 100)) ||
(PC.physicalAge >= 18 && PC.boobs > 500000 + (PC.muscles * 200))) {
- r.push(`Your tits are so enormous you've lost the ability to lift them and are now stuck in bed. You'll never be without pillows, however.`);
+ r.push(`Your tits are so enormous you've lost the ability to lift them and`);
+ if (isMovable(PC)) {
+ r.push(`must use a wheelchair to cart yourself around.`);
+ r.push(boobAccessibility());
+ } else {
+ r.push(`are now stuck in bed. You'll never be without pillows, however.`);
+ }
} else if (PC.boobs > sizeLimit) {
r.push(`Your tits are so heavy that it makes moving around difficult.`);
if (canWalk(PC)) {
@@ -391,7 +408,7 @@ App.Desc.Player.boobs = function(PC = V.PC) {
r.push(`However, you're so powerfully built that you can comfortably stand up straight, though you definitely feel it in the morning.`);
} else if (PC.muscles > 30) {
r.push(`Your back is strong enough to support their weight, but you frequently catch yourself slouching under their weight, so you may be nearing your limit.`);
- } else {
+ } else {
r.push(`It takes a lot of effort to keep upright with them, so you're most comfortable letting them rest on something when you have the chance.`);
}
} else if (PC.boobs >= dwarfSize) {
@@ -419,13 +436,13 @@ App.Desc.Player.boobs = function(PC = V.PC) {
} else if (PC.boobs >= 70000) {
r.push(`you have a <span class="orange">pair of door-crowding breasts.</span>`);
} else if (PC.boobs >= 55000) {
- r.push(`you have a <span class="orange">pair of lap filling breasts.</span>`);
+ r.push(`you have a <span class="orange">pair of lap-filling breasts.</span>`);
} else if (PC.boobs >= 40000) {
r.push(`you have a <span class="orange">pair of beachball-sized breasts.</span>`);
} else if (PC.boobs >= 25000) {
- r.push(`you have a <span class="orange">pair of figure dominating breasts.</span>`);
+ r.push(`you have a <span class="orange">pair of figure-dominating breasts.</span>`);
} else if (PC.boobs >= 15000) {
- r.push(`you have a <span class="orange">pair of arm filling breasts.</span>`);
+ r.push(`you have a <span class="orange">pair of arm-filling breasts.</span>`);
} else if (PC.boobs >= 10000) {
r.push(`you have a <span class="orange">pair of obscenely massive breasts.</span>`);
} else if (PC.boobs >= 9000) {
@@ -570,6 +587,11 @@ App.Desc.Player.boobs = function(PC = V.PC) {
} else {
r.push(`you have nothing in the breast department. You're <span class="orange">completely flat.</span>`);
}
+ // temp
+ if (PC.boobs >= 1600) {
+ r.push(boobShape());
+ r.push(boobVolume());
+ }
r.push(
boobFreckles(),
nipples()
diff --git a/src/player/desc/pLongButt.js b/src/player/desc/pLongButt.js
index 952eba1f010a2b31bb076ea8051d1e2cc6ab3413..70caba5619dd62e104ed0ef5400ed81eb45c668e 100644
--- a/src/player/desc/pLongButt.js
+++ b/src/player/desc/pLongButt.js
@@ -1,7 +1,7 @@
App.Desc.Player.butt = function(PC = V.PC) {
const r = [];
const implantRatio = PC.buttImplant / PC.butt;
- const implantType = PC.buttImplantType !== "normal" ? PC.buttImplantType : "";
+ const implantType = PC.buttImplantType !== "normal" ? PC.buttImplantType : "";
const {girlP} = getPronouns(PC).appendSuffix("P");
function hips() {
@@ -204,8 +204,15 @@ App.Desc.Player.butt = function(PC = V.PC) {
if (PC.butt > 15) {
if (V.buttAccessibility === 1) {
r.push(`It's a good thing you've had the penthouse remodeled for ${girlP}s with such ponderous bottoms already, so you can at least live comfortably at home.`);
+ } else if (V.pregAccessibility === 1 || V.ballsAccessibility === 1 || V.boobAccessibility === 1) {
+ r.push(`The halls and doors of the penthouse have already been remodeled to accommodate other enormous assets, so a ${girlP} with a ponderous bottom like yours can still get around.`);
} else {
r.push(`Even worse, the penthouse was not designed to handle ${girlP}s with bottoms as ponderous as yours; the narrow halls and doors give unbroken slaves an easy means to elude you.`);
+ if (PC.buttImplant >= 30) {
+ r.push(`Not that it matters when your ass implants are so huge they no longer fit through your bedroom door, <span class="red">leaving you trapped inside.</span>`);
+ } else if (PC.buttImplant >= 28) {
+ r.push(`And your bedroom door... Was it always this narrow?`);
+ }
}
}
return r.join(" ");
@@ -214,8 +221,12 @@ App.Desc.Player.butt = function(PC = V.PC) {
function weight() {
const r = [];
- if (PC.physicalAge <= 12 && PC.butt > 14) {
- r.push(`Your ass weighs so much you can no longer drag it off your bed. It makes a comfy cushion, at least.`);
+ if ((PC.physicalAge <= 12 && PC.butt > 14) || PC.butt > 22) {
+ r.push(`Your ass weighs so much you can no longer stand up on your own, and dragging it off your bed just ends with you on the floor. It makes a comfy cushion, at least.`);
+ if (isMovable(PC)) {
+ r.push(`When you do decide to go somewhere, you're reliant on an extra-wide wheelchair to get you there.`);
+ r.push(buttAccessibility());
+ }
} else if ((PC.physicalAge <= 12 && PC.butt >= 12) || (PC.physicalAge > 12 && PC.butt > 17)) {
r.push(`Your ass is so unwieldy and heavy that it makes moving around difficult.`);
if (canWalk(PC)) {
@@ -227,13 +238,16 @@ App.Desc.Player.butt = function(PC = V.PC) {
}
} else if (PC.muscles > 30) {
r.push(`Your legs are strong enough to support its weight, but it's still much more comfortable to remain seated; it's either time to work your quads harder or consider a reduction.`);
- } else {
+ } else {
r.push(`It takes a lot of effort to not be forced into a sitting position with it, so you're most comfortable just letting it rest on something when you have the chance.`);
}
- } else {
+ r.push(buttAccessibility());
+ } else if (isMovable(PC)) {
r.push(`But that's to be expected since you require an extra-wide wheelchair to get anywhere.`);
+ r.push(buttAccessibility());
+ } else {
+ r.push(`But you couldn't do that anyway, so it's not a concern.`);
}
- r.push(buttAccessibility());
} else if (PC.butt > 6 && canWalk(PC)) {
r.push(`Your ass is heavy enough to`);
if (hasBothProstheticLegs(PC)) {
diff --git a/src/player/desc/pLongCrotch.js b/src/player/desc/pLongCrotch.js
index 2d1c07bbaa18e027b4cc975fcc8beae928c2690a..68928031e4a529c5dbfcfb71b324a1abeb10e66d 100644
--- a/src/player/desc/pLongCrotch.js
+++ b/src/player/desc/pLongCrotch.js
@@ -3,18 +3,7 @@ App.Desc.Player.crotch = function(PC = V.PC) {
const {girlP} = getPronouns(PC).appendSuffix('P');
const legs = hasBothLegs(PC) ? "legs" : "leg";
const hands = hasBothArms(PC) ? "hands" : "hand";
- const isAroused = ((PC.prostate > 0 && PC.preg > 0 && PC.preg > PC.pregData.normalBirth * .75) ||
- (PC.preg > 0 && PC.preg > PC.pregData.normalBirth * .66 && PC.pregMood === 2) ||
- (PC.geneticQuirks.uterineHypersensitivity === 2 &&
- (PC.bellyPreg >= 10000) ||
- (PC.belly > (PC.pregAdaptation * 1000)) ||
- (PC.wombImplant === "restraint" && PC.belly >= 400000)
- ) ||
- (PC.need > 0) ||
- (PC.energy > 95) ||
- (PC.aphrodisiacs > 0) ||
- (PC.inflationType === "aphrodisiac") ||
- (PC.drugs === "priapism agents"));
+ const isAroused = isPlayerHorny(PC);
const isVirile = (PC.balls > 0 && PC.pubertyXY === 1 && PC.vasectomy === 0 && PC.ballType !== "sterile");
const cumTotal = (cumAmount(PC) / 70) || 0;
const foreskinRatio = (PC.foreskin - PC.dick);
@@ -34,14 +23,16 @@ App.Desc.Player.crotch = function(PC = V.PC) {
} else if (PC.prostate > 1 && PC.belly < 5000) {
r.push(`your bulging prostate`);
}
- if (PC.prostate > 1) {
- r.push(`and`);
- }
if (PC.physicalAge >= pubertyAge - 2 && !["bald", "hairless", "waxed"].includes(PC.pubicHStyle)) {
+ if (PC.prostate > 1 && PC.belly < 5000) {
+ r.push(`and`);
+ }
if (PC.physicalAge < pubertyAge - 1) {
r.push(`your wispy pubic hair`);
} else if (PC.physicalAge < pubertyAge) {
r.push(`your small patch of ${PC.pubicHColor} pubic hair`);
+ } else if (PC.pubicHStyle === "shaved") {
+ r.push(`your ${PC.pubicHColor} stubble`);
} else if (PC.pubicHStyle === "in a strip") {
r.push(`your strip of ${PC.pubicHColor} pubic hair`);
} else if (PC.pubicHStyle === "neat") {
@@ -49,7 +40,7 @@ App.Desc.Player.crotch = function(PC = V.PC) {
} else if (PC.pubicHStyle === "bushy" || PC.pubicHStyle === "bushy in the front and neat in the rear") {
r.push(`your ${PC.pubicHColor} bush`);
} else if (PC.pubicHStyle === "very bushy") {
- r.push(`your snail trial and adjacent forest of ${PC.pubicHColor} pubic hair`);
+ r.push(`your snail trail and adjacent forest of ${PC.pubicHColor} pubic hair`);
}
}
r.push(r.pop() + `, you have`);
@@ -449,8 +440,9 @@ App.Desc.Player.crotch = function(PC = V.PC) {
(PC.dick >= 68 + (PC.muscles * 0.4))
) {
r.push(`Your cock is a monolith of soft flesh and weighty enough that you can no longer realistically carry it without assistance.`);
- if (canStand(PC)) {
- r.push(`You could drag it along behind you, but that would be painful, at the very least.`);
+ if (isMovable(PC)) {
+ r.push(`You could drag it along behind you, but that would be painful, at the very least, so you have to resort to using a specialized cart pushed by a motorized wheelchair instead.`);
+ r.push(dickAccessibility());
}
} else if (PC.dick >= 30) {
r.push(`Your cock is so massive that it is difficult to live with. That's not really surprising, seeing as you have to`);
@@ -489,10 +481,26 @@ App.Desc.Player.crotch = function(PC = V.PC) {
function dickAccessibility() {
const r = [];
- if (V.dickAccessibility === 1) {
- r.push(`It's a good thing you've had the penthouse remodeled for ${girlP}s with enormous dongs, now at least you can relieve yourself without worry.`);
- } else {
- r.push(`Even worse, the penthouse was not designed to handle ${girlP}s with dongs as extensive as yours; it's best not to think about the troubles you have when nature calls.`);
+ if (PC.dick >= 10) {
+ if (V.dickAccessibility === 1) {
+ r.push(`It's a good thing you've had the penthouse remodeled for ${girlP}s with enormous dongs, now at least you can relieve yourself without worry.`);
+ if (PC.dick >= 100) {
+ if (V.pregAccessibility === 1 || V.ballsAccessibility === 1 || V.boobAccessibility === 1 || V.buttAccessibility === 1) {
+ r.push(`You didn't think it was possible, but odds are that, without the penthouse remodeling, you wouldn't be able to drag your dick out of your bedroom.`);
+ } else {
+ r.push(`Or it would be, if the remodel had included doorway and hall expansions at all. You are <span class="red">currently trapped in your bedroom</span> due to the inability to feed the entire mass of your dick out of it.`);
+ }
+ }
+ } else {
+ r.push(`Even worse, the penthouse was not designed to handle ${girlP}s with dongs as extensive as yours; it's best not to think about the troubles you have when nature calls.`);
+ if (PC.dick >= 100) {
+ if (V.pregAccessibility === 1 || V.ballsAccessibility === 1 || V.boobAccessibility === 1 || V.buttAccessibility === 1) {
+ r.push(`At the very least, you don't have to worry about getting stuck in your room with it due to the penthouse remodels.`);
+ } else {
+ r.push(`You didn't think it possible, but your dick is so massive you can no longer push it through the doorway and out into the hall, <span class="red">leaving you trapped in your room.</span>`);
+ }
+ }
+ }
}
return r.join(" ");
@@ -578,7 +586,9 @@ App.Desc.Player.crotch = function(PC = V.PC) {
r.push(`your relentless use of growth hormones has`);
}
r.push(`forced them to grow;`);
- if (V.ballsAccessibility === 1) {
+ if (PC.balls >= 160) {
+ r.push(`they're so heavy you've lost the ability to move them without an industrial crane. But it gives you plenty of time to focus on the joys of having oversized nuts, like`);
+ } else if (V.ballsAccessibility === 1) {
r.push(`they'd complicate your life if your penthouse hadn't already been redesigned with oversized balls in mind, allowing you to focus on the joys of having oversized nuts, like`);
} else {
r.push(`even one is enough to make life complicated in a world designed around normal body proportions, and you're packing two of them in your sack. At least there's a certain pleasure to be derived from`);
@@ -586,7 +596,7 @@ App.Desc.Player.crotch = function(PC = V.PC) {
if (cumTotal >= 1) {
r.push(`feeling a slave's belly steadily swell from all the cum you're pumping into them.`);
} else {
- r.push(`watching a new slave panic when you lumber in and mount them for the first time, terrified of just how much cum is about to be pumped into their body.`);
+ r.push(`watching a new slave panic when you ${canMove(PC) ? "lumber over and " : ""}mount them for the first time, terrified of just how much cum is about to be pumped into their body.`);
}
} else if (PC.balls >= 50) {
r.push(`They're about the size of ${PC.balls >= 100 ? "large" : ""} beachballs thanks to`);
@@ -595,11 +605,10 @@ App.Desc.Player.crotch = function(PC = V.PC) {
} else {
r.push(`your relentless use of growth hormones;`);
}
- r.push(`it's impossible to find a position where they aren't in the way`);
- if (hasAnyLegs(PC)) {
- r.push(`of your ${legs},`);
+ if (canWalk(PC)) {
+ r.push(`it's impossible to find a position where they aren't in the way of your ${legs},`);
} else {
- r.push(`when you have to be moved,`);
+ r.push(`pulling them along in a cart attached to a wheelchair is a nuisance,`);
}
r.push(`your clothing has to be custom tailored around them, and it's hard to not just be the "${girlP} with the balls", but there's a certain pleasure in`);
if (cumTotal >= 1) {
@@ -607,7 +616,25 @@ App.Desc.Player.crotch = function(PC = V.PC) {
} else {
r.push(`watching a new slave panic when you're about to cum.`);
}
- r.push(`They make life far more interesting despite the inconveniences.`);
+ r.push(`They make life far more interesting despite the`);
+ if (PC.balls > 90 && isMovable(PC)) {
+ if (V.ballsAccessibility === 1) {
+ r.push(`inconveniences outside the penthouse, which you've had redesigned to accommodate such proportions.`);
+ } else {
+ r.push(`inconveniences, even as they begin to really add up.`);
+ if (PC.balls > 95) {
+ if (V.buttAccessibility === 1 || V.pregAccessibility === 1 || V.boobAccessibility === 1) {
+ r.push(`Fortunately, you've had the penthouse redesigned to accommodate other enormous assets, so you can at least move around without much issue.`);
+ } else if (PC.balls >= 100) {
+ r.push(`Like not being able to force your balls through your bedroom doors without agonizing pain, for instance. Until you come up with a solution, <span class="red">you're stuck.</span>`);
+ } else {
+ r.push(`It's starting to become rather painful to get in and out of your bedroom; you might not be able to if you get any bigger.`);
+ }
+ }
+ }
+ } else {
+ r.push(`inconveniences.`);
+ }
} else if (PC.balls >= 30) {
r.push(`They're about the size of watermelons thanks to`);
if (V.PC.ballsImplant > 0) {
@@ -823,7 +850,7 @@ App.Desc.Player.crotch = function(PC = V.PC) {
} else {
r.push(`You don't get wet at all, even when aroused,`);
if (PC.vagina > 0) {
- r.push(`so penetration is unpleasant at best.`);
+ r.push(`so penetration is unpleasant without the use of artificial lubricants.`);
} else if (PC.trueVirgin) {
r.push(`so sex doesn't seem like it would be that fun for you.`);
} else {
@@ -836,7 +863,7 @@ App.Desc.Player.crotch = function(PC = V.PC) {
}
} else {
if (isAroused) {
- if (!canMove(PC)) {
+ if (!isMovable(PC)) {
r.push(`You and your bedding`);
if (canSmell(PC)) {
r.push(`reek of pussy juices`);
diff --git a/src/player/desc/pLongDescription.js b/src/player/desc/pLongDescription.js
index 48a175c2f1573d7250e8ac68077af4555115fc82..12519eed367322cc1a1898efc4a2dcc15b294dcc 100644
--- a/src/player/desc/pLongDescription.js
+++ b/src/player/desc/pLongDescription.js
@@ -15,9 +15,9 @@ App.Desc.Player.longDescription = function(PC = V.PC) {
if (PC.dick && PC.vagina !== -1) {
r.push(`futanari`);
} else if (PC.dick > 0) {
- r.push(`man`);
+ r.push(`${PC.actualAge > 12 ? "man" : "boy"}`);
} else {
- r.push(`woman`);
+ r.push(`${PC.actualAge > 12 ? "woman" : "girl"}`);
}
r.push(`with`);
if (PC.markings === "freckles") {
@@ -32,6 +32,8 @@ App.Desc.Player.longDescription = function(PC = V.PC) {
if (canStand(PC)) {
r.push(`You take a step back to focus more on your overall self.`);
+ } else if (isMovable(PC)) {
+ r.push(`You roll yourself back to focus more on your overall self.`);
}
r.push(App.Desc.Player.body(PC));
r.toParagraph();
@@ -53,10 +55,10 @@ App.Desc.Player.longDescription = function(PC = V.PC) {
r.push(`It flows into your`);
r.push(App.Desc.Player.butt());
r.toParagraph();
- if (!canMove(PC)) {
+ if (!isMovable(PC)) {
r.push(`You roll over to get a better view of your crotch.`);
} else if (PC.belly >= 100000 || PC.weight > 160) {
- r.push(`You shift your weight and make use of some angled mirrors to see your crotch beneath your belly.`);
+ r.push(`You shift your weight and make use of some angled mirrors to see your crotch beneath your ${!canMove(PC) ? "lap-filling " : ""}belly.`);
} else if (PC.dick === 0 && PC.vagina === -1) {
r.push(`You turn your attention to your nether regions.`);
} else if (PC.dick > 0) {
@@ -65,7 +67,10 @@ App.Desc.Player.longDescription = function(PC = V.PC) {
r.push(`You turn your attention to your special place.`);
}
r.push(App.Desc.Player.crotch());
+ r.toParagraph();
+ r.push(App.Desc.Player.health());
r.toParagraph();
+
return r.container();
};
diff --git a/src/player/desc/pLongFace.js b/src/player/desc/pLongFace.js
index 283276ed0b21ac6477839bddc39ed612ccd8e485..6a6500ea64f5cc6f174bad84b30b67c131ffecbc 100644
--- a/src/player/desc/pLongFace.js
+++ b/src/player/desc/pLongFace.js
@@ -24,7 +24,7 @@ App.Desc.Player.face = function(PC = V.PC) {
if (PC.hStyle.includes("bald") || PC.bald === 1) {
r.push(`no hair`);
} else {
- r.push(`${hairLength} ${PC.hColor} hair,`);
+ r.push(`${hairLength} ${PC.hColor} hair${PC.hEffect === "none" ? `` : ` with ${PC.hEffect}`},`);
}
// hStyle here?
r.push(`${App.Desc.eyesColor(PC)}, and`);
diff --git a/src/player/desc/pLongHealth.js b/src/player/desc/pLongHealth.js
new file mode 100644
index 0000000000000000000000000000000000000000..a603da072ba606568d8c83826ca16cfecd9b8e1d
--- /dev/null
+++ b/src/player/desc/pLongHealth.js
@@ -0,0 +1,122 @@
+App.Desc.Player.health = function(PC = V.PC) {
+ const r = [];
+ const PCH = PC.health;
+
+ if (PCH.condition < -90) {
+ r.push(`<span class="red">You look as if you already have one foot in the grave.</span>`);
+ } else if (PCH.condition < -50) {
+ r.push(`You feel <span class="red">really unwell.</span>`);
+ } else if (PCH.condition < -20) {
+ r.push(`You feel <span class="red">under the weather.</span>`);
+ } else if (PCH.condition <= 20) {
+ r.push(`You feel <span class="yellow">fine,</span> just fine.`);
+ } else if (PCH.condition <= 50) {
+ r.push(`You're feeling <span class="green">pretty good.</span>`);
+ } else if (PCH.condition <= 90) {
+ r.push(`You're feeling <span class="green">really great.</span>`);
+ } else {
+ r.push(`You've <span class="green">never felt better.</span>`);
+ }
+
+ if (PCH.shortDamage >= 20) {
+ if (PCH.condition < -20) {
+ if (PCH.shortDamage >= 200) {
+ r.push(`Your body agrees, leaving you <span class="red">increasingly vulnerable to further injuries.</span>`);
+ } else {
+ r.push(`To make it worse, a <span class="red">feeling of malaise</span> looms over you.`);
+ }
+ } else {
+ if (PCH.shortDamage >= 200) {
+ r.push(`Your body, however, has a different opinion; it is <span class="red">susceptible to further injury</span> unless given time to heal.`);
+ } else {
+ r.push(`A <span class="red">feeling of malaise</span> hangs over you, however.`);
+ }
+ }
+ }
+
+ if (PCH.illness === 1) {
+ r.push(`You <span class="yellow">might be coming down with something.</span>`);
+ } else if (PCH.illness === 2) {
+ r.push(`You've caught some sort of <span class="yellow">minor illness.</span>`);
+ } else if (PCH.illness === 3) {
+ r.push(`You've <span class="red">fallen ill;</span> you should see a doctor as soon as you can.`);
+ } else if (PCH.illness === 4) {
+ r.push(`You've <span class="red">become seriously ill;</span> you need to see as soon as you can.`);
+ } else if (PCH.illness === 5) {
+ r.push(`You've <span class="red">been stricken with a life-threatening illness;</span> you need to see a doctor immediately!`);
+ }
+
+ if (PC.physicalImpairment > 1 ) {
+ r.push(`Your body has been <span class="red">completely ruined,</span> making even the simplest of tasks a challenge.`);
+ } else if (PC.physicalImpairment > 0) {
+ r.push(`Your body has suffered <span class="yellow">permanent damage,</span> making life little more difficult.`);
+ }
+
+ if (V.debugMode) {
+ r.push(`Your current health is ${PCH.condition}, with ${PCH.shortDamage} short term damage and ${PCH.longDamage} long term damage. You have a carcinogen build up of ${PC.chem} and an illness severity of ${PCH.illness}.`);
+ }
+
+ // This all is going to be revised.
+ // shortDamage will be lingering damage, should increase the odds of further damaging events based off its value, and will naturally decay
+ // longDamage will not decay, and is caused by high chem and passing a shortDamage threshold. Works similar to shortDamage in increasing susceptibility, but at a greatly reduced percent. Also decreases max life span.
+ // criticalDamage is a permanent flaw gained by cheating death in certain events.
+ /*
+ if (PCH.shortDamage > 5 || PCH.longDamage > 5 || PCH.condition < 0) {
+ const ldc = PCH.longDamage > 5 || PCH.condition < 0 ? `,` : `.`);
+ const c = PCH.condition < 0 ? `,` : `.`);
+
+ let and = '';
+
+ r.push(` Upon closer inspection you note that ${he}`);
+
+ array = [];
+ if (PCH.shortDamage >= 100) {
+ array.push(`looks <span class="red">absolutely brutalized</span> and will never be quite the way he was${ldc}`);
+ } else if (PCH.shortDamage >= 70) {
+ array.push(`is <span class="red">gravely injured</span> with assured lasting effects${ldc}`);
+ } else if (PCH.shortDamage >= 40) {
+ array.push(`is <span class="red">seriously injured</span> with some lasting effects${ldc}`);
+ } else if (PCH.shortDamage >= 20) {
+ array.push(`is <span class="orange">injured${ldc}</span>`);
+ } else if (PCH.shortDamage > 5) {
+ array.push(`seems to have suffered a <span class="yellow">minor injury</span> recently${ldc}`);
+ }
+
+ if (PCH.longDamage > 5) {
+ if (PCH.shortDamage > 5 && PCH.condition >= 0) {
+ and = `and `);
+ }
+
+ if (PCH.longDamage >= 70) {
+ array.push(`${and}is suffering heavily under accumulated <span class="red">permanent health problems${c}</span>`);
+ } else if (PCH.longDamage >= 40) {
+ array.push(`${and}has some clear <span class="red">permanent health issues${c}</span>`);
+ } else if (PCH.longDamage >= 20) {
+ array.push(`${and}shows signs of <span class="orange">lasting health problems${c}</span>`);
+ } else {
+ array.push(`${and}carries some <span class="yellow">minor niggles${c}</span>`);
+ }
+ }
+
+ if (PCH.condition < 0) {
+ if (PCH.shortDamage > 5 || PCH.longDamage > 5) {
+ and = `and `);
+ }
+
+ if (PCH.condition < -80 && PCH.shortDamage !== 0 && PCH.longDamage !== 0) {
+ array.push(`${and}has been treated so badly he <span class="red">is close to the brink.</span>`);
+ } else if (PCH.condition < -50) {
+ array.push(`${and}appears to be in <span class="red">terrible condition.</span>`);
+ } else if (PCH.condition < -20) {
+ array.push(`${and}appears to be in <span class="orange">poor condition.</span>`);
+ } else {
+ array.push(`${and}could be in <span class="yellow">better condition.</span>`);
+ }
+ }
+
+ r.push(` ${array.join(' ')}`);
+ }
+ */
+
+ return r.join(" ");
+};
diff --git a/src/player/desc/pNotesBelly.js b/src/player/desc/pNotesBelly.js
index e7e16d62cbf734834812215f2c89ea984f07e072..31ad6617d607edb1c2ce14a83c61187476043c23 100644
--- a/src/player/desc/pNotesBelly.js
+++ b/src/player/desc/pNotesBelly.js
@@ -107,7 +107,7 @@ App.Desc.Player.pNotesBelly = function(PC = V.PC) {
if (PC.pregMood === 1) {
r.push(`Though you definitely appreciate their aid.`);
} else if (PC.pregMood === 2) {
- r.push(`Your hormones practically rule you, leading you to demand your slaves to be prepared to pleasure you at a moments notice. Your needy cunt hungers for dick and you don't care`);
+ r.push(`Your hormones practically rule you, leading you to demand your slaves to be prepared to pleasure you at a moment's notice. Your needy cunt hungers for dick and you don't care`);
if (V.seeDicks !== 0) {
r.push(`what it is attached to`);
} else {
diff --git a/src/player/desc/pNotesBoobs.js b/src/player/desc/pNotesBoobs.js
index c83d3b669d1bdfb7a6f83f19f2fd662c5753bb66..83ebfdbb00988015b527468551ebe36a713bc551 100644
--- a/src/player/desc/pNotesBoobs.js
+++ b/src/player/desc/pNotesBoobs.js
@@ -35,7 +35,7 @@ App.Desc.Player.pNotesBoobs = function(PC = V.PC) {
if (PC.markings === "freckles") {
r.push(`top, showing off your freckled cleavage.`);
} else if (PC.markings === "heavily freckled") {
- r.push(`top, freckle packed cleavage.`);
+ r.push(`top, freckle-packed cleavage.`);
} else {
r.push(`top.`);
}
diff --git a/src/player/doctorConsultation.js b/src/player/doctorConsultation.js
new file mode 100644
index 0000000000000000000000000000000000000000..fa77acef0818062373450a3981cfc730f56b791a
--- /dev/null
+++ b/src/player/doctorConsultation.js
@@ -0,0 +1,538 @@
+App.UI.doctorConsultation = function() {
+ const frag = document.createElement("div");
+
+ const drugsDiv = document.createElement("div");
+ const examDiv = document.createElement("div");
+ const treatDiv = document.createElement("div");
+ const illnessDiv = document.createElement("div");
+ const {
+ HeU,
+ heU, hisU,
+ womanU
+ } = getNonlocalPronouns(V.seeDicks === 0 ? 0 : 100).appendSuffix("U");
+ const {girlP} = getPronouns(V.PC).appendSuffix('P');
+
+ const arcology = V.arcologies[0];
+ const price = Math.max(Math.min((Math.pow(5, V.baseDifficulty) * 10), 10000), 500);
+
+ if (V.doctor.state > 0) { // Don't charge on the first visit.
+ cashX(forceNeg(price), "PCmedical");
+ }
+
+ if (V.doctor.state > 1) {
+ App.Events.addParagraph(frag, [
+ `You head to the private clinic to meet with your doctor for another medical examination. After a short wait, and a payment of <span class="cash">${cashFormat(price)},</span> you're directed to your doctor's exam room for your appointment. "Back again so soon? We're happy to keep giving you drugs and advice if you keep giving us money; the owner wants to buy a new organ farm, after all. Have to say I am a bit jealous of our neighbor's expensive new toy — I mean, can you blame me? The only toys we find here are usually lodged someplace${V.PC.actualAge < V.minimumSlaveAge ? "— Ah! Never mind! Someone your age shouldn't be hearing things like that, and no, I don't want to know what you get up to up there in the penthouse" : " they shouldn't be, if you catch my drift. You can only take so much of that before you start to question your career decisions. Oh, and good luck ever looking at them the same way again"}."`
+ ]);
+ } else if (V.doctor.state > 0) {
+ App.Events.addParagraph(frag, [
+ `You head to the private clinic to meet with your doctor for a medical examination. After a short wait, and a payment of <span class="cash">${cashFormat(price)},</span> you're directed to your doctor's exam room for your appointment. "${V.PC.health.condition < 20 || V.PC.health.illness > 1 || V.PC.addict > 10 ? "Well, you've seen better days, haven't you? Came to the right place to be put back in order, though" : "You seem to be doing well, but let's see what the tests have to say about that"}. Hop up on the scale and we'll get this over with."`
+ ]);
+ V.doctor.state = 2;
+ } else {
+ App.Events.addParagraph(frag, [
+ `You make your way to ${arcology.name}'s main medical pavilion, which houses the largest private clinic in the arcology, intent on finding a primary physician to keep an eye on your health. ${arcology.FSHedonisticDecadence !== "unset" ? "There is a substantial wait before you're seen, owing to the increasingly eccentric people that make up your citizenry, so you have plenty of time to deal with registering and enjoy a little people-watching" : "The clinic operates like a well-oiled machine, and you barely get through registering yourself"} before your name is called. As you enter the exam room, you're greeted by an imposing, rather harried-looking ${womanU}, "Welcome, ${PlayerName()}.${V.PC.actualAge < V.minimumSlaveAge ? `" ${HeU} gives you a momentary dirty look before realizing what ${heU} did. "Apologies, I just thought you'd be a little older... never mind.` : ""} I will be serving as your doctor from here on, and while the first visit is free, future ones will run you <span class="noteworthy">${cashFormat(price)},</span> so do try to remember that. To start, would you please step onto this scale so we may begin this examination?"`
+ ]);
+ V.doctor.state = 1;
+ }
+ frag.append(medicalExam());
+
+ if (V.PC.health.condition <= 20) {
+ frag.append(healthBoost());
+ }
+ if (V.PC.health.illness > 1) {
+ frag.append(treatIllness());
+ }
+
+ frag.append(drugs());
+
+ return frag;
+
+ function medicalExam() {
+ const r = [];
+ const PCH = V.PC.health;
+
+ r.push(`"With all the tests completed, let's see how you did.`);
+ if (PCH.condition < -90) {
+ r.push(`<span class="red">Good lord, you are very unwell.</span> We can stabilize you, but after that, go home and rest. Eat well, keep your spirits up, and maybe pray a little. If you feel you are dying, call us at once.`);
+ } else if (PCH.condition < -50) {
+ r.push(`<span class="red">You're very unhealthy.</span> After I treat you, go home and rest. Eat well, keep your spirits up, and get some rest. If it persists, come back at once.`);
+ } else if (PCH.condition < -20) {
+ r.push(`<span class="red">You're rather unhealthy.</span> Get lots of rest and whatever light exercise you can manage. If it gets worse, come back at once, don't wait.`);
+ } else if (PCH.condition <= 20) {
+ r.push(`<span class="yellow">You are in fair health.</span> A little worrying, but nothing bad yet.`);
+ } else if (PCH.condition <= 50) {
+ r.push(`<span class="green">Your health is good,</span> but not great. Nothing to worry about, as long as it doesn't start dipping.`);
+ } else if (PCH.condition <= 90) {
+ r.push(`<span class="green">Your health is great;</span> keep doing whatever it is you're doing.`);
+ } else {
+ r.push(`<span class="green">Your health is pretty much the ideal;</span> it can't possibly get any better.`);
+ }
+
+ if (PCH.illness > 1) {
+ if (PCH.condition <= 20) {
+ r.push(`And <span class="red">you're sick</span> to top it off, but we've got something for that too. If you get any worse, you know where we are.`);
+ } else {
+ r.push(`You've got <span class="red">some sort of illness</span> going on, but that's pretty easily dealt with via medication, and in your health, you should bounce back nicely.`);
+ }
+ }
+
+ r.push(`On the physical side,`);
+ if (V.PC.weight > 190) {
+ r.push(`you are <span class="red">much too fat.</span>`);
+ if (arcology.FSHedonisticDecadence !== "unset") {
+ r.push(`But who isn't these days?" ${HeU} sighs, patting ${hisU} own growing gut. "Anyway, a little less weight would do you some good.`);
+ } else if (PCH.condition < -20) {
+ r.push(`All that weight is quite literally crushing you. This is why your health is in decline.`);
+ } else {
+ r.push(`You may be managing your health well enough to fool yourself into thinking you'll be fine, but it will catch up to you one day, and when it does, it's all downhill from there.`);
+ }
+ } else if (V.PC.weight > 160) {
+ r.push(`you are <span class="red">too fat.</span>`);
+ if (arcology.FSHedonisticDecadence !== "unset") {
+ r.push(`But who isn't these days?" ${HeU} sighs, patting ${hisU} own growing gut. "Anyway, a little exercise and watching what you eat will keep your health up despite the weight.`);
+ } else if (PCH.condition < -20) {
+ r.push(`Poor health coupled with obesity puts you at serious risk of heart failure. Think about that before each meal.`);
+ } else {
+ r.push(`You may be managing your health well enough, but there is always the looming chance of complications arising from your weight, and when it happens, you may find it hard to get back on your feet, leading to further issues down the road.`);
+ }
+ } else if (V.PC.weight > 130) {
+ r.push(`you are <span class="red">too fat.</span>`);
+ if (arcology.FSHedonisticDecadence !== "unset") {
+ r.push(`But who isn't these days?" ${HeU} sighs, patting ${hisU} own growing gut. "Anyway, a little exercise and watching what you eat will keep any complications at bay.`);
+ } else if (PCH.condition < -20) {
+ r.push(`Your weight is not a good mix with your overall health. You'll find yourself plagued with complications that will steadily drag you further and further down.`);
+ } else {
+ r.push(`With your overall health, I think you should manage fine despite the weight. You may hit a snag here and there, but you're fit enough to bounce back. If you don't, however, we'll be here to patch you up.`);
+ }
+ } else if (V.PC.weight > 95) {
+ r.push(`you are getting rather fat.`);
+ if (arcology.FSHedonisticDecadence !== "unset") {
+ r.push(`But who isn't these days?" ${HeU} sighs, patting ${hisU} own growing gut. "Anyway, just consider your future wellbeing, is all.`);
+ } else if (PCH.condition < -20) {
+ r.push(`While any complications will still be minor, your poor health will make them far more frequent then you'd like.`);
+ } else {
+ r.push(`You're healthy enough that it isn't a concern though. And even if anything happens due to your weight, you're fit enough to shrug it off.`);
+ }
+ } else if (V.PC.weight < -95) {
+ r.push(`you are <span class="red">very malnourished.</span>`);
+ if (PCH.condition > 20) {
+ r.push(`You need to eat more or your health will start to falter.`);
+ } else {
+ r.push(`This is no doubt a major factor in your recent health issues.`);
+ }
+ } else if (V.PC.weight < -30) {
+ r.push(`you are a bit thin.`);
+ if (PCH.condition < -20) {
+ r.push(`I recommend putting on a little weight until your health improves. Having to work it off afterwards will help solidify your wellbeing as well.`);
+ }
+ } else {
+ r.push(`your weight is fine.`);
+ }
+
+ if (V.PC.preg > 0) {
+ if (V.PC.actualAge <= 12 && V.PC.actualAge < V.minimumSlaveAge) {
+ if (V.PC.pregKnown) {
+ if (isInduced(V.PC)) {
+ r.push(r.pop() + `" ${HeU} seems to be trying ${hisU} hardest to avoid looking at you, "You're fully dilated, but at your age, odds aren't in your favor for a successful natural birth. If you'd consent, I'll have you prepped for a cesarean at once.`);
+ } else if (V.dangerousPregnancy === 1) {
+ if ((V.PC.belly > (V.PC.pregAdaptation * 3200)) || V.PC.bellyPreg >= 500000) {
+ r.push(r.pop() + `" ${HeU} looks ready to vomit after having inspected your body-turned-womb, "This is going to haunt my dreams. How, why? I can't understand what would propel a child to do this to themselves. I have no advice for you other than taking residency here until whatever happens, happens. I just hope there's something left to salvage...`);
+ } else if ((V.PC.bellyPreg >= V.PC.pregAdaptation * 2200) || (V.PC.womb.find((ft) => ft.genetics.geneticQuirks.polyhydramnios === 2 && ft.age >= 20))) {
+ r.push(r.pop() + `" ${HeU} grimaces at the bulge hanging heavily from your underage body, "Your body is about at the limit of what it can handle. The best I can tell you is to try to not move around if you can help it. When further complications arise, please seek us out fast.`);
+ } else if (V.PC.bellyPreg > V.PC.pregAdaptation * 1000) {
+ r.push(r.pop() + `" ${HeU} grimaces at the bulge extending from your underage body, "This was truly inevitable. Kids shouldn't be having kids. Their bodies just can't handle it. The best I can tell you is to avoid strenuous activities, get lots of rest, and keep to a healthy diet. It's only going to become more complicated from here.`);
+ } else {
+ r.push(r.pop() + `" ${HeU} glances uncomfortably at your stomach, "Your pregnancy is progressing smoothly, for now. But children aren't ready to make babies, so please take it easy.`);
+ }
+ } else {
+ r.push(r.pop() + `" ${HeU} glances uncomfortably at your stomach, "Your pregnancy is progressing smoothly, for now. But children aren't ready to make babies, so please take it easy.`);
+ }
+ } else {
+ r.push(`Your urine sample says you are... <span class="pregnancy">pregnant.</span> If someone took advantage of you, you can tell us, you know. This is a safe place. Or, um, have you been 'experimenting'? No, no, I don't want to know if you have been.`);
+ V.PC.pregKnown = 1;
+ }
+ } else if (V.PC.actualAge < V.minimumSlaveAge) {
+ if (V.PC.pregKnown) {
+ if (isInduced(V.PC)) {
+ r.push(`I didn't want to say anything at the moment, but you're fully dilated, and since you're a bit young still, should I take you to maternity or...?`);
+ } else if (V.dangerousPregnancy === 1) {
+ if ((V.PC.belly > (V.PC.pregAdaptation * 3200)) || V.PC.bellyPreg >= 500000) {
+ r.push(`Dear god, how did you manage to get yourself into this state? At your age, to be swollen like that; it's just disturbing to see. Anyway, assuming your womb just doesn't burst on its own, try to stay as still as much as possible and, um, avoid pointy objects?`);
+ } else if ((V.PC.bellyPreg >= V.PC.pregAdaptation * 2200) || (V.PC.womb.find((ft) => ft.genetics.geneticQuirks.polyhydramnios === 2 && ft.age >= 20))) {
+ r.push(`Hmm, your body is struggling to bear the weight in your womb. Try to stay put as much as you can and don't move around too much. No strenuous activities, either! Especially 'fooling around' after it got you into this state!`);
+ } else if (V.PC.bellyPreg > V.PC.pregAdaptation * 1000) {
+ r.push(`Hmm, your body is starting to have a bit of trouble, it seems. Just take it easy and you shouldn't run into any complications.`);
+ } else {
+ r.push(`Your pregnancy is progressing smoothly.`);
+ }
+ } else {
+ r.push(`Your pregnancy is progressing smoothly.`);
+ }
+ } else {
+ r.push(`Your urine sample... You do know about protection, right? 'Cause, <span class="pregnancy">you're pregnant.</span>`);
+ V.PC.pregKnown = 1;
+ }
+ } else {
+ if (V.PC.pregKnown) {
+ if (isInduced(V.PC)) {
+ r.push(`I didn't want to say anything at the moment, but you're fully dilated, and I'm pretty sure the baby is coming out even as we speak. Should we, take care of that for you, or...?`);
+ } else if (V.dangerousPregnancy === 1) {
+ if ((V.PC.belly > (V.PC.pregAdaptation * 3200)) || V.PC.bellyPreg >= 500000) {
+ r.push(`I'll never not be disturbed by this. Assuming your womb just doesn't burst on its own, try to stay as still as you can and, um, avoid pointy objects?`);
+ } else if ((V.PC.bellyPreg >= V.PC.pregAdaptation * 2200) || (V.PC.womb.find((ft) => ft.genetics.geneticQuirks.polyhydramnios === 2 && ft.age >= 20))) {
+ r.push(`Hmm, your belly is pretty tight. Try to stay put as much as you can and don't move around too much. No strenuous activities, either! If you really need to do 'that', just take it slow.`);
+ } else if (V.PC.bellyPreg > V.PC.pregAdaptation * 1000) {
+ r.push(`Hmm, your belly is a little tight. Just take it easy and your pregnancy will progress without trouble.`);
+ } else {
+ r.push(`Your pregnancy is progressing smoothly.`);
+ }
+ } else {
+ r.push(`Your pregnancy is progressing smoothly.`);
+ }
+ } else {
+ r.push(`That urine sample you gave up has a surprise for you. <span class="pregnancy">Congratulations, you're pregnant!</span>`);
+ V.PC.pregKnown = 1;
+ }
+ }
+ }
+ if ((V.PC.bellyPreg >= V.PC.pregAdaptation * 2200) || (V.PC.womb.find((ft) => ft.genetics.geneticQuirks.polyhydramnios === 2 && ft.age >= 20))) {
+ r.push(`We have drugs that can delay birth to an extent, helping to avoid miscarriage and premature birth in at-risk mothers. With what I've seen, you're eligible for them. They aren't the healthiest things to take, however, and there are serious issues if you accidentally forget to stop taking them to allow for birth when you're due.`);
+ }
+ if (V.PC.preg > V.PC.pregData.normalBirth / 1.42 && V.PC.hips === -2 && V.PC.hipsImplant === 0) {
+ r.push(`Your hips are a bit too narrow for birth and, assuming you manage, you will end up splitting your pelvis. You could take these tablets to boost the amount of relaxin in your system in an effort to widen your hips, but long term use will cause more problems than it's worth. It's up to you if you want to take them or just opt for a cesarean section.`);
+ }
+
+ // injuries
+ if (V.PC.physicalImpairment > 0) {
+ r.push(r.pop() + `" ${HeU} sighs, "No improvements to the physical damage...`);
+ }
+
+ if (V.PC.hears === -1) {
+ r.push(`Hearing could be better...`);
+ } else {
+ r.push(`Hearing is fine...`);
+ }
+ if (anyVisionEquals(V.PC, 1)) {
+ r.push(`Eyesight is poor...`);
+ // Do something with laser eye surgery here?
+ } else {
+ r.push(`Eyesight, fine...`);
+ }
+
+ if (V.PC.energy > 95) {
+ if (V.PC.actualAge <= 12) {
+ r.push(`Anaphrodisiacs. I'm prescribing them to you. You are way too young to be doing things like that. Now I feel dirty thanks to you.`);
+ } else {
+ r.push(`I noticed your orgasm during the cancer screening. You've lost control of your sex drive, haven't you? I can prescribe anaphrodisiacs to you if you want to regain your composure.`);
+ }
+ }
+
+ if (V.PC.addict > 3 || V.PC.aphrodisiacs > 0 || V.PC.inflationType === "aphrodisiac") {
+ r.push(`The urinalysis tells me you've been hitting the aphrodisiacs. I hope you know the risks involved with that. I'm sure you do, but if you ever need any assistance with it, we do have detox pills available.`);
+ }
+
+ if (V.PC.chem > 5) {
+ if (canEatFood(V.PC)) {
+ r.push(`You've got some <span class="red">carcinogen buildup</span> according to your blood test. Whatever it is that you are doing to cause this, you should know that it is taking years off your life. It's hard to get rid of too, which is the real problem, but I think there is a diet that can help deal with it. Or at least there was, I don't know how easy it is to obtain the ingredients anymore.`);
+ } else {
+ r.push(`You've got some <span class="red">carcinogen buildup</span> according to your blood test. Your diet will neutralize most of it, given time. Still, you should probably cut back on whatever it is you're doing.`);
+ }
+ }
+
+ if (V.week > 45 && V.PC.digestiveSystem === "atrophied") {
+ r.push(`<span class="noteworthy">Some progress has been made when it comes to reversing the effects of long-term consumption of slave food.</span> It's best described as an intermediary diet to get your body used to real food again. From what I've heard, the process is horrible, and you can't stop once you start or you'll undo all your effort. Hmm, it also says not to give it to pregnant and nursing women, the infirm, and those with compromised immune systems. Oh, and that one should put on some body fat before starting, to help offset the whole starvation thing. The more I read, the worse it gets, but it may be worth considering, given your, you know, past.`);
+ }
+ r.push(`And that's all that's worth really noting."`);
+
+ r.join(" ");
+ App.Events.addNode(examDiv, r);
+
+ return examDiv;
+ }
+
+ function drugs() {
+ const hormonesDiv = document.createElement("div");
+ const playerDrugsDiv = document.createElement("div");
+ const pregDrugsDiv = document.createElement("div");
+ const anaphrodisiacDiv = document.createElement("div");
+ const weaningDiv = document.createElement("div");
+
+ App.Events.addParagraph(frag, [
+ `"With that out of the way, ${V.PC.actualAge < V.minimumSlaveAge ? "I guess I should ask if there is anything our pharmacy could do for you, though I'm not entirely comfortable offering someone your age drugs like these. I guess you are legally an adult, for all intents and purposes, so my opinion doesn't really matter, does it" : "is there anything our pharmacy can help you with"}? A prescription will last as long as you keep refilling it, and overall it's a much safer choice than going under the knife at any of our neighbors or resorting to using drugs designed for slaves."`
+ ]);
+
+ if (V.week > 45 && V.PC.digestiveSystem === "atrophied") {
+ drugsDiv.append(slaveFoodCure());
+ }
+
+ if (V.consumerDrugs === 0) {
+ drugsDiv.append(playerDrugs());
+ drugsDiv.append(hormones());
+ }
+ if (V.PC.pregControl !== "none" || V.PC.bellyPreg >= V.PC.pregAdaptation * 2200 || (V.PC.womb.find((ft) => ft.genetics.geneticQuirks.polyhydramnios === 2 && ft.age >= 20))) {
+ drugsDiv.append(pregDrugs());
+ }
+ if (V.PC.energy > 95 || V.PC.aphrodisiacs < 0) {
+ drugsDiv.append(anaphrodisiacs());
+ }
+
+ return drugsDiv;
+
+ function playerDrugs() {
+ App.UI.DOM.appendNewElement("h3", playerDrugsDiv, `Drugs`);
+ const text = [];
+ const links = [];
+
+ if (V.PC.drugs === "no drugs") {
+ playerDrugsDiv.append(`You are not using any pharmaceutical drugs. Start taking: `);
+ } else {
+ playerDrugsDiv.append(`You are planning on taking ${V.PC.drugs}. Instead take: `);
+ }
+
+ if (V.PC.drugs !== "breast enhancers") {
+ if (V.PC.boobs < 10000) {
+ links.push(App.UI.DOM.link(`Breast enhancers`, () => {
+ V.PC.drugs = "breast enhancers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Breast enhancers`, [
+ `"Surely your back is already hurting? I can't advise going any larger, not that the patches would be effective anyway."`,
+ ]));
+ }
+ }
+ if (V.PC.drugs !== "butt enhancers") {
+ if (V.PC.butt < 8) {
+ links.push(App.UI.DOM.link(`Butt enhancers`, () => {
+ V.PC.drugs = "butt enhancers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Butt enhancers`, [
+ `"Isn't it getting a bit hard for you to move? I can't advise going any larger, not that the patches would be effective anyway."`,
+ ]));
+ }
+ }
+ if (V.PC.drugs !== "lip enhancers") {
+ if (V.PC.lips <= 85) {
+ links.push(App.UI.DOM.link(`Lip enhancers`, () => {
+ V.PC.drugs = "lip enhancers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Lip enhancers`, [
+ `"I can hear how difficult it is for you to form words with those lips. I'm not going to be the one that costs you the ability to talk."`,
+ ]));
+ }
+ }
+ if (V.PC.drugs !== "penis enlargers") {
+ if (V.PC.dick > 0) {
+ if (V.PC.dick < 6) {
+ links.push(App.UI.DOM.link(`Penis enlargers`, () => {
+ V.PC.drugs = "penis enlargers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Penis enlargers`, [
+ `"The lightheadedness you feel when you get aroused is mostly due to your current size, so getting larger will only make things worse."`,
+ ]));
+ }
+ }
+ }
+ if (V.PC.drugs !== "testicle enlargers") {
+ if (V.PC.balls > 0 && V.PC.scrotum > 0) {
+ if (V.PC.balls < 30) {
+ links.push(App.UI.DOM.link(`Testicle enlargers`, () => {
+ V.PC.drugs = "testicle enlargers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Testicle enlargers`, [
+ `I could diagnose you with elephantiasis and nobody would bat an eye over it. Really though, nothing I can say would help the patches actually work on you at that size.`,
+ ]));
+ }
+ }
+ }
+ if (V.PC.drugs !== "fertility supplements") {
+ if (V.PC.ovaries === 1 || V.PC.mpreg === 1) {
+ links.push(App.UI.DOM.link(`Fertility supplements`, () => {
+ V.PC.drugs = "fertility supplements";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Fertility supplements`, [
+ `It would be a waste of drugs to give these to someone that doesn't even have the organs needed to produce eggs.`,
+ ]));
+ }
+ }
+ if (V.PC.drugs !== "hip wideners") {
+ if (V.PC.preg > V.PC.pregData.normalBirth / 1.42 && V.PC.hips === -2 && V.PC.hipsImplant === 0) {
+ links.push(App.UI.DOM.link(`Hip wideners`, () => {
+ V.PC.drugs = "hip wideners";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ }
+ if (V.PC.drugs !== "detox pills") {
+ if (V.PC.addict > 3) {
+ links.push(App.UI.DOM.link(`Detox pills`, () => {
+ V.PC.drugs = "detox pills";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ }
+
+ text.push(App.UI.DOM.generateLinksStrip(links));
+
+ App.Events.addNode(playerDrugsDiv, text);
+
+ return playerDrugsDiv;
+ }
+
+ function hormones() {
+ App.UI.DOM.appendNewElement("h3", hormonesDiv, `Hormones`);
+ const text = [];
+ const links = [];
+
+ if (V.PC.hormones !== 0) {
+ hormonesDiv.append(`You are planning to use ${V.PC.hormones === 1 ? "female" : "male"} hormones this week. `);
+ links.push(App.UI.DOM.link(`Decide against it`, () => {
+ V.PC.hormones = 0;
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ hormonesDiv.append(`You do not intend to take artificial hormones. `);
+ }
+ if (V.PC.hormones > -1) {
+ links.push(App.UI.DOM.link(`Start male hormones`, () => {
+ V.PC.hormones = -1;
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ if (V.PC.hormones < 1) {
+ links.push(App.UI.DOM.link(`Start female hormones`, () => {
+ V.PC.hormones = 1;
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+
+ text.push(App.UI.DOM.generateLinksStrip(links));
+ App.Events.addNode(hormonesDiv, text);
+
+ return hormonesDiv;
+ }
+
+ function pregDrugs() {
+ App.UI.DOM.appendNewElement("h3", pregDrugsDiv, `Pregnancy Drugs`);
+ const text = [];
+
+ if (V.PC.pregControl === "none") {
+ pregDrugsDiv.append(`You've been advised to start taking labor suppressors. `);
+ text.push(
+ App.UI.DOM.link(`Follow ${hisU} advice`, () => {
+ V.PC.pregControl = "labor suppressors";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ })
+ );
+ } else {
+ pregDrugsDiv.append(`You're taking labor suppressors to ${V.PC.preg >= V.PC.pregData.normalBirth ? "delay giving birth" : "prevent giving birth prematurely"}. `);
+ text.push(
+ App.UI.DOM.link(`Decide against it`, () => {
+ V.PC.pregControl = "none";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ })
+ );
+ }
+
+
+ App.Events.addNode(pregDrugsDiv, text);
+
+ return pregDrugsDiv;
+ }
+
+ function anaphrodisiacs() {
+ const text = [];
+
+ App.UI.DOM.appendNewElement("h3", anaphrodisiacDiv, `Anaphrodisiacs`);
+
+ if (V.PC.aphrodisiacs < 0) {
+ anaphrodisiacDiv.append(`You plan on taking anaphrodisiacs to reign in your sex drive. `);
+ text.push(
+ App.UI.DOM.link(`Decide against it`, () => {
+ V.PC.aphrodisiacs = 0;
+ App.UI.DOM.replace(drugsDiv, drugs);
+ })
+ );
+ } else {
+ anaphrodisiacDiv.append(`You've been offered an anaphrodisiac prescription to combat your nymphomania. `);
+ text.push(
+ App.UI.DOM.link(`Take ${hisU} offer`, () => {
+ V.PC.aphrodisiacs = -1;
+ App.UI.DOM.replace(drugsDiv, drugs);
+ })
+ );
+ }
+
+ App.Events.addNode(anaphrodisiacDiv, text);
+
+ return anaphrodisiacDiv;
+ }
+
+ function slaveFoodCure() {
+ const text = [];
+
+ App.UI.DOM.appendNewElement("h3", weaningDiv, `Diet`);
+ weaningDiv.append(`You have been given the opportunity to eat real food again. `);
+ if (V.PC.preg > 0) {
+ text.push(App.UI.DOM.disabledLink(`Start the process`, [
+ `It would be unethical to allow you to start this diet while pregnant.`,
+ ]));
+ } else if (V.PC.health.condition <= 20) {
+ text.push(App.UI.DOM.disabledLink(`Start the process`, [
+ `In your condition, this diet will have a deleterious effect on your health.`,
+ ]));
+ } else if (V.PC.health.illness > 1) {
+ text.push(App.UI.DOM.disabledLink(`Start the process`, [
+ `This diet will decimate your health, and with you ill, well... It won't end well.`,
+ ]));
+ } else if (V.PC.weight < -10) {
+ text.push(App.UI.DOM.disabledLink(`Start the process`, [
+ `Put on a little weight first. I'd hate to see you starve to death or be forced to give up halfway.`,
+ ]));
+ } else {
+ text.push(
+ App.UI.DOM.link(`Start the process`, () => {
+ V.PC.diet = "weaning";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ })
+ );
+ }
+
+ App.Events.addNode(weaningDiv, text);
+
+ return weaningDiv;
+ }
+ }
+
+ function healthBoost() {
+ const text = [];
+
+ text.push(`${HeU} gives you a quick prick with a syringe. "${V.PC.actualAge > 12 ? `Here's a little something to <span class="health inc">help your health.</span> It's just a quick pick-me-up, but perhaps it will get you back on track` : `That's a good ${girlP}, that wasn't so bad, was it? Here, have a lollipop to feel better. As for the shot, it should <span class="health inc">improve your health a little,</span> and hopefully set you on the road to recovery`}."`);
+ improveCondition(V.PC, 5);
+
+ App.Events.addNode(treatDiv, text);
+
+ return treatDiv;
+ }
+
+ function treatIllness() {
+ const text = [];
+
+ text.push(`${HeU} hands you a pill bottle. "${V.PC.actualAge > 12 ? `These should <span class="health inc">get that illness under control.</span> Take them with food, three times a day, and you should be feeling a lot better by the time they run out` : `Take one of these with your breakfast, lunch and dinner, alright? Keep doing that until they're all gone and that <span class="health inc">illness should stop making you feel so bad.</span> Make sure you take all of them, too! Just because you start to feel fine doesn't mean you're cured yet`}."`);
+ V.PC.health.illness = Math.max(0, V.PC.health.illness-2);
+
+ App.Events.addNode(illnessDiv, text);
+
+ return illnessDiv;
+ }
+};
diff --git a/src/player/electiveSurgery.js b/src/player/electiveSurgery.js
index 5b04f4d6342985b65163b922eb94f2237deed382..649debccc9a751b5f4773008361e64a8896abc4c 100644
--- a/src/player/electiveSurgery.js
+++ b/src/player/electiveSurgery.js
@@ -2,12 +2,133 @@ App.UI.electiveSurgery = function() {
const el = document.createElement("div");
const {
HeU,
- heU, hisU
+ heU, hisU, himU, himselfU,
+ girlU
} = getNonlocalPronouns(V.seeDicks === 100 ? 100 : 0).appendSuffix("U");
- App.Events.addParagraph(el, [
- `You arrive at your favorite plastic surgeon for your appointment to find them as busy as ever, but you find yourself quickly hurried into an exam room by their cute assistant. ${HeU} wastes no time in hurrying you into ${hisU} office, stripping you down, measuring you and making sure you are healthy enough for surgery, all the while not so subtly running ${hisU} hands across every part of you. "So, what can I help you with?"`
- ]);
+ const arcology = V.arcologies[0];
+ let freebie = 0;
+
+ // half for a visual, half to keep track of asset variations
+ // important notes are boobs, butt, belly, and dick
+ const nurse = BaseSlave();
+ nurse.race = arcology.FSSupremacistRace;
+ nurse.devotion = 100;
+ nurse.trust = 100;
+ if (["asian", "semitic", "southern european", "white"].includes(nurse.race)) {
+ nurse.skin = "light";
+ } else {
+ nurse.skin = "brown";
+ }
+ if (arcology.FSHedonisticDecadence !== "unset") {
+ nurse.weight = 60;
+ } else {
+ nurse.weight = -30;
+ }
+ nurse.waist = -60;
+ if (arcology.FSPhysicalIdealist !== "unset") {
+ nurse.muscles = 20;
+ }
+ if (arcology.FSSlimnessEnthusiast !== "unset") {
+ nurse.boobs = 300;
+ } else {
+ nurse.boobs = 2000;
+ if (arcology.FSAssetExpansionist !== "unset") {
+ nurse.boobs = 10000;
+ }
+ if (arcology.FSTransformationFetishist !== "unset") {
+ nurse.boobs = 10000;
+ nurse.boobsImplant = 9800;
+ } else if (arcology.FSBodyPurist === "unset") {
+ nurse.boobsImplant = nurse.boobs - 1000;
+ }
+ }
+ nurse.boobShape = "perky";
+ if (arcology.FSPastoralist !== "unset") {
+ nurse.lactation = 2;
+ }
+ nurse.hips = 1;
+ if (arcology.FSSlimnessEnthusiast !== "unset") {
+ nurse.butt = 1;
+ } else {
+ nurse.butt = 4;
+ if (arcology.FSAssetExpansionist !== "unset") {
+ nurse.butt = 8;
+ nurse.buttImplant = 4;
+ }
+ if (arcology.FSGenderRadicalistLawFuta === 1) {
+ nurse.dick = 3;
+ nurse.balls = 2;
+ } else if (arcology.FSGenderRadicalistLawFuta === 3) {
+ nurse.butt = 12;
+ nurse.hips = 3;
+ }
+ if (arcology.FSTransformationFetishist !== "unset") {
+ nurse.buttImplant = nurse.butt-2;
+ } else if (arcology.FSBodyPurist === "unset") {
+ nurse.buttImplant = 2;
+ }
+ }
+ nurse.lips = 60;
+ nurse.lipsImplant = 40;
+ nurse.hLength = 20;
+ nurse.hStyle = "bun";
+ nurse.hColor = "black";
+ nurse.eye.left.iris = "brown";
+ nurse.eye.right.iris = "brown";
+ if (arcology.FSIntellectualDependency !== "unset") {
+ nurse.clothes = "a slutty nurse outfit";
+ } else {
+ nurse.clothes = "a nice nurse outfit";
+ }
+ if (V.pSurgery.nursePreg > 0) {
+ nurse.preg = V.pSurgery.nursePreg;
+ nurse.pregType = 1;
+ SetBellySize(nurse);
+ }
+
+ if (V.pSurgery.state > 1) {
+ App.Events.addParagraph(el, [
+ `You arrive at your favorite plastic surgeon for your appointment to find them as busy as ever, but you find yourself quickly directed into an exam room by their jealous assistant. ${(nurse.butt > 10 || nurse.belly >= 10000) ? `The ponderous ${girlU} squeezes in after you and starts` : `${HeU} gets right to the point in`} stripping you down, measuring you and making sure you are healthy enough for surgery${(nurse.butt > 10 || nurse.belly >= 5000 || nurse.boobs > 2000) ? `; it's actually kind of impressive just how well ${heU}'s managing to avoid brushing ${hisU} lewd body against you` : ""}. "What can we help you with today?"`
+ ]);
+ } else if (V.pSurgery.state > 0) {
+ App.Events.addParagraph(el, [
+ `You arrive at your favorite plastic surgeon for your appointment to find them as busy as ever, but you find yourself ${(nurse.butt > 10 || nurse.belly >= 10000) ? "directed" : "quickly hurried"} into an exam room by their ${nurse.boobs > 2000 ? "busty" : "cute"} assistant. ${(nurse.butt > 10 || nurse.belly >= 10000) ? `The ponderous ${girlU} squeezes in after you and starts` : `${HeU} wastes no time`} stripping you down, measuring you and making sure you are healthy enough for surgery, all the while not so subtly running ${hisU} hands across ${nurse.belly >= 5000 ? `your body and pushing ${hisU} baby bump into` : "every part of"} you. ${V.pSurgery.disloyal ? "...I can tell you've had surgery done by someone other than us. And that's fine and all. It's just the 'happy ending' is a courtesy, you know? And I'm not sure I'm feeling it anymore. Well then, what surgery you want?" : "So, what can I help you with?"}"`
+ ]);
+ if (V.pSurgery.disloyal) {
+ V.pSurgery.state = 2;
+ }
+ } else {
+ App.Events.addParagraph(el, [
+ `You ${canWalk(V.PC) ? "wander" : "drive"} up and down ${arcology.name}'s primary medical pavilion, taking in what practices are available and their relative popularity. ${arcology.FSBodyPurist !== "unset" ? "Most of the plastic surgeons have packed up and left, but of those that chose to stay," : "While there is no shortage of plastic surgeons to choose from,"} there is a clear winner; the small suite at the end of the wing completely swarmed by patrons. It takes some effort to work your way through the crowd, but the moment the ${nurse.boobs > 2000 ? "busty" : "cute"} assistant behind the counter notices you and ${nurse.belly >= 10000 ? "waddles" : "rushes"} over${nurse.butt > 10 ? `, practically bulldozing ${himselfU} a path in the process with ${hisU} absurd hips and rear` : ""}, do you find yourself whisked away to an exam room by ${himU}. "${V.PC.visualAge < V.minimumSlaveAge ? "Oh my god! You're so cute! Does your mother know you're here? If she doesn't, your secret's safe with us!" : "You're the new owner, right? Recognized you from the newsfeeds"}. Anyway, we'll need to do a few measurements, take some biometrics, and sign a couple papers before we can put you under the knife. You know, standard business and all that." With the paperwork taken care of, and after what can only be called an "intimate fondlng" under the guise of a medical examination${nurse.butt > 10 || nurse.belly >= 5000 || nurse.boobs > 2000 ? `, with a little helping of ${hisU} larger assets rubbing against you on the side` : ""}, you're ready to look over the available procedures. ${nurse.butt > 10 || nurse.belly >= 5000 || nurse.boobs > 2000 ? `"Heh, yeah I can get a little handsy, and feeling all of this," ${heU} gestures at ${hisU} enhanced curves, "pushing against someone is just soo thrilling!` : `"Heh, yeah I can get a little handsy.`} I think that's part of why we're so popular, not that the doctor's work is shabby or anything! I mean, I came out okay, right? Plus I really do enjoy seeing what they can come up with, it's an art form, really, and boy does it get me excited." ${HeU} coughs and gets back to the heart of the matter. "You have a dream body, and we have the means to make it happen! So, what can I help you with?"`
+ ]);
+ App.Events.addParagraph(el, [
+ `"Oh! I almost forgot! Since you're a new client, <span class="green">today's basic surgery is half off!</span>${arcology.FSBodyPurist !== "unset" ? ` But, <span class="red">the cost of implants is still high</span> due to policy, unfortunately...` : arcology.FSTransformationFetishist !== "unset" ? ` And with <span class="green">implants being so cheap,</span> we're practically giving them away!` : ""}"`
+ ]);
+ freebie = 1;
+ V.pSurgery.state = 1;
+ }
+ if (V.pSurgery.state > 1) {
+ if (arcology.FSBodyPurist !== "unset") {
+ App.Events.addParagraph(el, [
+ `"Oh, and thanks to your leadership, I <span class="red">can't get reasonably priced implants anymore.</span> So thanks for that."`
+ ]);
+ } else if (arcology.FSTransformationFetishist !== "unset") {
+ App.Events.addParagraph(el, [
+ `"Oh, and you should know that we have an abundance of implants being made, so <span class="green">they're quite cheap</span> these days. So thanks, I guess..."`
+ ]);
+ }
+ } else if (V.pSurgery.state > 0) {
+ if (arcology.FSBodyPurist !== "unset") {
+ App.Events.addParagraph(el, [
+ `"Ah! And you should be aware that there is an implant shortage <span class="red">driving up their price.</span> I guess that's just how things are these days..."`
+ ]);
+ } else if (arcology.FSTransformationFetishist !== "unset") {
+ App.Events.addParagraph(el, [
+ `"Oh, and we're overflowing with implants, as if you couldn't tell, so <span class="green">they're really cheap!</span> I know I'm going to get some more put in soon!"`
+ ]);
+ }
+ }
face();
skin();
@@ -21,12 +142,27 @@ App.UI.electiveSurgery = function() {
return el;
+ function applyDiscount(price, implant = false) {
+ if (freebie === 1) {
+ price *= .5;
+ }
+ if (implant) {
+ if (arcology.FSBodyPurist !== "unset") {
+ price *= 2;
+ } else if (arcology.FSTransformationFetishist !== "unset") {
+ price *= .5;
+ }
+ }
+ price = Math.trunc(price);
+ return price;
+ }
+
function face() {
const p = document.createElement("p");
const r = [];
const linkArray = [];
App.Events.addNode(p, [
- `"You sure you want to mess with that lovely face?" ${heU} teases, caressing your cheek. "<span class="cash">${cashFormat(5000)}.</span> Also wouldn't recommend changing your eyes, face shape or skin color; some security systems get real uppity over things like that. Though I s'pose race and hair can fall under that as well, but hey, we don't handle racial surgery and this isn't a hair salon, so nothing to worry about, right? Yes, I'm certain your systems will recognize you after we finish working on you — give us some credit."`
+ `"You sure you want to mess with that lovely face?" ${heU} teases, caressing your cheek. "<span class="cash">${cashFormat(applyDiscount(5000))}.</span> Also wouldn't recommend changing your eyes, face shape or skin color; some security systems get real uppity over things like that. Though I s'pose race and hair can fall under that as well, but hey, we don't handle racial surgery and this isn't a hair salon, so nothing to worry about, right? Yes, I'm certain your systems will recognize you after we finish working on you — give us some credit."`
], "div");
r.push(`You're <span class="intro question">${V.PC.actualAge} years old.</span>`);
if (V.PC.faceImplant) {
@@ -35,7 +171,7 @@ App.UI.electiveSurgery = function() {
linkArray.push(surgeryLink("Undo Facial surgery", "restoreFace", () => {
V.PC.faceImplant = 0;
V.PC.visualAge = V.PC.physicalAge;
- cashX(forceNeg(5000), "PCmedical");
+ cashX(forceNeg(applyDiscount(5000)), "PCmedical");
}));
}
} else {
@@ -49,12 +185,12 @@ App.UI.electiveSurgery = function() {
if (V.PC.visualAge >= 25) {
linkArray.push(surgeryLink(`${V.PC.actualAge < 35 ? 'Remodel your face to appear younger' : 'Get a face lift'}`, "ageDown", () => {
V.PC.faceImplant = 1;
- cashX(forceNeg(5000), "PCmedical");
+ cashX(forceNeg(applyDiscount(5000)), "PCmedical");
}));
}
linkArray.push(surgeryLink("Remodel your face to appear older", "ageUp", () => {
V.PC.faceImplant = 1;
- cashX(forceNeg(5000), "PCmedical");
+ cashX(forceNeg(applyDiscount(5000)), "PCmedical");
}));
}
App.Events.addNode(p, r, "div");
@@ -66,7 +202,7 @@ App.UI.electiveSurgery = function() {
const p = document.createElement("p");
const r = [];
App.Events.addNode(p, [
- `"Your skin is beautiful as is, but we can change it if you want," ${heU} says, pulling a large tanning bed-like cart out of a closet. "<span class="cash">${cashFormat(2000)}.</span> This thing just came out of testing. I assure you it doesn't cause cancer anymore! But still, mind your security systems. We won't be held accountable if you get arrested for trying to enter your penthouse." ${HeU} looks a little worrisome, "Now, there are some side effects, and we will have to keep you under special care for a few days. It's similar to a severe sunburn, across your entire body, all of it, even down there. Now don't give me that look, we have special ointments to soothe the pain and have a little fun with." ${HeU} tosses you a wink alongside a hesitant giggle. "Now all your typical skin tones are preprogrammed into it, and with a couple button presses... There! I unlocked the option for custom hues. Now this thing is going to recolor your skin pigment permanently, so you might want to take it seriously. It'll all be on you if I choke with laughter ${(V.PC.dick !== 0) ? `sucking on your big polka-dotted cock` : `going down on your polka-dotted pussy`}!"`
+ `"Your skin is beautiful as is, but we can change it if you want," ${heU} says, pulling a large tanning bed-like cart out of a closet. "<span class="cash">${cashFormat(applyDiscount(2000))}.</span> This thing just came out of testing. I assure you it doesn't cause cancer anymore! But still, mind your security systems. We won't be held accountable if you get arrested for trying to enter your penthouse." ${HeU} looks a little worrisome, "Now, there are some side effects, and we will have to keep you under special care for a few days. It's similar to a severe sunburn, across your entire body, all of it, even down there. Now don't give me that look, we have special ointments to soothe the pain and have a little fun with." ${HeU} tosses you a wink alongside a hesitant giggle. "Now all your typical skin tones are preprogrammed into it, and with a couple button presses... There! I unlocked the option for custom hues. Now this thing is going to recolor your skin pigment permanently, so you might want to take it seriously. It'll all be on you if I choke with laughter ${(V.PC.dick !== 0) ? `sucking on your big polka-dotted cock` : `going down on your polka-dotted pussy`}!"`
], "div");
r.push(`You have <span class="intro question">${V.PC.skin} skin.</span>`);
@@ -89,14 +225,14 @@ App.UI.electiveSurgery = function() {
const select = App.UI.DOM.makeSelect(choices, V.PC.skin, value => {
V.PC.skin = value;
- cashX(forceNeg(2000), "PCmedical");
+ cashX(forceNeg(applyDiscount(2000)), "PCmedical");
showDegradation("skinTone");
});
choiceDiv.append(select, " or custom ", App.UI.DOM.makeTextBox(
V.PC.skin, v => {
V.PC.skin = v;
- cashX(forceNeg(2000), "PCmedical");
+ cashX(forceNeg(applyDiscount(2000)), "PCmedical");
showDegradation("skinTone");
}
));
@@ -109,7 +245,7 @@ App.UI.electiveSurgery = function() {
const r = [];
const linkArray = [];
App.Events.addNode(p, [
- `"Maybe some breast work? I assure you they are lovely," ${heU} says as ${heU} brushes the back of your head with ${hisU} own pair. "<span class="cash">${cashFormat(5000)}</span> for a reduction, <span class="cash">${cashFormat(10000)}</span> for implants, that includes size ups, and <span class="cash">${cashFormat(15000)}</span> for additional breast tissue. That last one might as well be real!${(V.PC.boobs < 700) ? " With a little work, we can even remove a small amount of fat from your breasts to bring your cup size down without damaging their inner workings. Though we'll have to build them up some before we can stick reasonable implants into you." : ""}"`
+ `"Maybe some breast work? I assure you they are lovely," ${heU} says as ${heU} brushes the back of your head with ${hisU} own pair. "<span class="cash">${cashFormat(applyDiscount(5000))}</span> for a reduction, <span class="cash">${cashFormat(applyDiscount(10000, true))}</span> for implants, that includes size ups, and <span class="cash">${cashFormat(applyDiscount(15000))}</span> for additional breast tissue. That last one might as well be real!${(V.PC.boobs < 700) ? " With a little work, we can even remove a small amount of fat from your breasts to bring your cup size down without damaging their inner workings. Though we'll have to build them up some before we can stick reasonable implants into you." : ""}"`
], "div");
if (V.PC.boobs >= 1400) {
if (V.PC.boobsImplant > 0) {
@@ -205,7 +341,7 @@ App.UI.electiveSurgery = function() {
V.PC.boobs -= V.PC.boobsImplant;
V.PC.boobsImplant = 0;
V.PC.boobsImplantType = "none";
- cashX(forceNeg(5000), "PCmedical");
+ cashX(forceNeg(applyDiscount(5000)), "PCmedical");
});
}
@@ -213,21 +349,21 @@ App.UI.electiveSurgery = function() {
return surgeryLink("Get the next size up", "breastEnlargementImplant", () => {
V.PC.boobs += 200;
V.PC.boobsImplant += 200;
- cashX(forceNeg(10000), "PCmedical");
+ cashX(forceNeg(applyDiscount(10000, true)), "PCmedical");
});
}
function breastEnlargement(boobGrowth = 200) {
return surgeryLink("Add additional breast tissue", "breastEnlargement", () => {
V.PC.boobs += boobGrowth;
- cashX(forceNeg(15000), "PCmedical");
+ cashX(forceNeg(applyDiscount(15000)), "PCmedical");
});
}
function breastShrinkageRelative() {
return surgeryLink("Have tissue removed", "breastShrinkage", () => {
V.PC.boobs -= 200;
- cashX(forceNeg(5000), "PCmedical");
+ cashX(forceNeg(applyDiscount(5000)), "PCmedical");
});
}
@@ -236,7 +372,7 @@ App.UI.electiveSurgery = function() {
V.PC.boobs += 200;
V.PC.boobsImplant += 200;
V.PC.boobsImplantType = "normal";
- cashX(forceNeg(10000), "PCmedical");
+ cashX(forceNeg(applyDiscount(10000, true)), "PCmedical");
});
}
@@ -247,21 +383,21 @@ App.UI.electiveSurgery = function() {
function breastShrinkageAbsolute(newSize) {
return surgeryLink("Have fatty tissue removed", "breastShrinkage", () => {
V.PC.boobs = newSize;
- cashX(forceNeg(5000), "PCmedical");
+ cashX(forceNeg(applyDiscount(5000)), "PCmedical");
});
}
function flatChest() {
return surgeryLink("Have them removed", "flatChest", () => {
V.PC.boobs = 100;
- cashX(forceNeg(5000), "PCmedical");
+ cashX(forceNeg(applyDiscount(5000)), "PCmedical");
});
}
function breasts() {
return surgeryLink("Get a pair of breasts", "breasts", () => {
V.PC.boobs = 650;
- cashX(forceNeg(15000), "PCmedical");
+ cashX(forceNeg(applyDiscount(15000)), "PCmedical");
});
}
}
@@ -349,11 +485,12 @@ App.UI.electiveSurgery = function() {
} else if (V.PC.belly >= 100) {
r.push(`"Awwww, you have a bun in the oven! That's so adorable; didn't think you the type," ${heU} says as ${heU} rubs your slightly swollen belly. No denying it now.`);
}
- } else if (V.PC.belly >= 100 && V.PC.preg < 1) {
- r.push(`${HeU} pinches your belly. "How about a tummy tuck? We can smooth this right out, cheaply too, <span class="cash">${cashFormat(500)}.</span>" ${HeU} lets your saggy middle flop back to its usual drooping state.`);
+ } else if (V.PC.bellySag > 0) {
+ r.push(`${HeU} pinches your belly. "How about a tummy tuck? We can smooth this right out, cheaply too, <span class="cash">${cashFormat(applyDiscount(500))}.</span>" ${HeU} lets your saggy middle flop back to its usual drooping state.`);
linkArray.push(surgeryLink("Firm up your stomach", "tummyTuck", () => {
- V.PC.belly = 0;
- cashX(forceNeg(500), "PCmedical");
+ V.PC.bellySag = 0;
+ V.PC.bellySagPreg = 0;
+ cashX(forceNeg(applyDiscount(500)), "PCmedical");
}));
}
App.Events.addNode(p, r, "div");
@@ -415,7 +552,7 @@ App.UI.electiveSurgery = function() {
V.PC.butt += 1;
V.PC.buttImplant += 1;
V.PC.buttImplantType = "normal";
- cashX(forceNeg(10000), "PCmedical");
+ cashX(forceNeg(applyDiscount(10000, true)), "PCmedical");
}),
buttEnlargement(),
);
@@ -429,14 +566,14 @@ App.UI.electiveSurgery = function() {
V.PC.butt -= V.PC.buttImplant;
V.PC.buttImplant = 0;
V.PC.buttImplantType = "none";
- cashX(forceNeg(5000), "PCmedical");
+ cashX(forceNeg(applyDiscount(5000)), "PCmedical");
});
}
function buttShrinkage() {
return surgeryLink("Have fat removed", "buttShrinkage", () => {
V.PC.butt -= 1;
- cashX(forceNeg(5000), "PCmedical");
+ cashX(forceNeg(applyDiscount(5000)), "PCmedical");
});
}
@@ -444,14 +581,14 @@ App.UI.electiveSurgery = function() {
return surgeryLink("Get the next size up", "buttEnlargementImplant", () => {
V.PC.butt += 1;
V.PC.buttImplant += 1;
- cashX(forceNeg(10000), "PCmedical");
+ cashX(forceNeg(applyDiscount(10000, true)), "PCmedical");
});
}
function buttEnlargement() {
return surgeryLink("Add additional fatty tissue", "buttEnlargement", () => {
V.PC.butt += 1;
- cashX(forceNeg(15000), "PCmedical");
+ cashX(forceNeg(applyDiscount(15000)), "PCmedical");
});
}
}
@@ -462,7 +599,7 @@ App.UI.electiveSurgery = function() {
const linkArray = [];
if (V.PC.balls !== 0 && V.PC.scrotum !== 0) {
App.Events.addNode(p, [
- `"We could add gel around your testes to make your balls look bigger. Would also dampen any impacts to them as well, if that is anything to consider," ${heU} says, running a finger down the length of your shaft. "<span class="cash">${cashFormat(7500)}</span> for draining and <span class="cash">${cashFormat(12000)}</span> for filling, it's not the most simple procedure, you know? Anyway, they'll be very obvious, if that turns you on." ${HeU} takes another look at you before offering another option. "Of course, if you want bigger balls in a <i>functional</i> sense, we can do that too. The doctor's research in advanced targeted growth hormones has shown promising results in test subjects, and he's been able to use them successfully on a few citizen patients so far. A direct injection of hormones, and your testes will grow on their own. Unlike the cosmetic gel, there's no easily reversing this treatment, unless you are willing to subject yourself to slave drugs. It's expensive too, for the high quality drugs you want; <span class="cash">${cashFormat(25000)}</span> for one round of therapy. I should also warn you that repeated doses tend to have an increased effect."`
+ `"We could add gel around your testes to make your balls look bigger. Would also dampen any impacts to them as well, if that is anything to consider," ${heU} says, running a finger down the length of your shaft. "<span class="cash">${cashFormat(applyDiscount(7500))}</span> for draining and <span class="cash">${cashFormat(applyDiscount(12000))}</span> for filling, it's not the most simple procedure, you know? Anyway, they'll be very obvious, if that turns you on." ${HeU} takes another look at you before offering another option. "Of course, if you want bigger balls in a <i>functional</i> sense, we can do that too. The doctor's research in advanced targeted growth hormones has shown promising results in test subjects, and he's been able to use them successfully on a few citizen patients so far. A direct injection of hormones, and your testes will grow on their own. Unlike the cosmetic gel, there's no easily reversing this treatment, unless you are willing to subject yourself to slave drugs. It's expensive too, for the high quality drugs you want; <span class="cash">${cashFormat(25000)}</span> for one round of therapy. I should also warn you that repeated doses tend to have an increased effect."`
], "div");
if (V.PC.balls >= 30) {
r.push(`You have a <span class="intro question">monstrous, massive pair of balls</span> roughly the size of small watermelons; it's impossible to sit normally, so you've had to buy special chairs, you've given up on wearing pants, and they're so obvious that people probably assume they're fake, but every slave you fuck gets to really feel the load you pump into them, and you love it.`);
@@ -471,12 +608,12 @@ App.UI.electiveSurgery = function() {
surgeryLink("Have gel extracted", "ballShrinkage", () => {
V.PC.balls = 14;
V.PC.ballsImplant = 11;
- cashX(forceNeg(7500), "PCmedical");
+ cashX(forceNeg(applyDiscount(7500)), "PCmedical");
}),
surgeryLink("Have a lot of gel extracted", "ballBigShrinkage", () => {
V.PC.balls = 5;
V.PC.ballsImplant = 2;
- cashX(forceNeg(7500), "PCmedical");
+ cashX(forceNeg(applyDiscount(7500)), "PCmedical");
}),
);
}
@@ -488,18 +625,18 @@ App.UI.electiveSurgery = function() {
surgeryLink("Have even more gel added", "ballEnlargement", () => {
V.PC.balls = 30;
V.PC.ballsImplant = 27;
- cashX(forceNeg(15000), "PCmedical");
+ cashX(forceNeg(applyDiscount(15000)), "PCmedical");
}),
surgeryLink("Have gel extracted", "ballShrinkage", () => {
V.PC.balls = 9;
V.PC.ballsImplant = 6;
- cashX(forceNeg(7500), "PCmedical");
+ cashX(forceNeg(applyDiscount(7500)), "PCmedical");
}),
);
} else {
linkArray.push(surgeryLink("Get another round of growth hormones anyway", "ballEnlargementHorm", () => {
V.PC.balls = 30;
- cashX(forceNeg(15000), "PCmedical");
+ cashX(forceNeg(applyDiscount(15000)), "PCmedical");
}));
}
} else if (V.PC.balls >= 9) {
@@ -509,18 +646,18 @@ App.UI.electiveSurgery = function() {
surgeryLink("Have more gel added", "ballEnlargement", () => {
V.PC.balls = 14;
V.PC.ballsImplant = 11;
- cashX(forceNeg(15000), "PCmedical");
+ cashX(forceNeg(applyDiscount(15000)), "PCmedical");
}),
surgeryLink("Have gel extracted", "ballShrinkage", () => {
V.PC.balls = 5;
V.PC.ballsImplant = 2;
- cashX(forceNeg(7500), "PCmedical");
+ cashX(forceNeg(applyDiscount(7500)), "PCmedical");
}),
);
} else {
linkArray.push(surgeryLink("Get another round of growth hormones", "ballEnlargementHorm", () => {
V.PC.balls = 14;
- cashX(forceNeg(15000), "PCmedical");
+ cashX(forceNeg(applyDiscount(15000)), "PCmedical");
}));
}
} else if (V.PC.balls >= 5) {
@@ -530,18 +667,18 @@ App.UI.electiveSurgery = function() {
surgeryLink("Have more gel added", "ballEnlargement", () => {
V.PC.balls = 9;
V.PC.ballsImplant = 6;
- cashX(forceNeg(15000), "PCmedical");
+ cashX(forceNeg(applyDiscount(15000)), "PCmedical");
}),
surgeryLink("Have gel extracted", "ballShrinkage", () => {
V.PC.balls = 3;
V.PC.ballsImplant = 0;
- cashX(forceNeg(7500), "PCmedical");
+ cashX(forceNeg(applyDiscount(7500)), "PCmedical");
}),
);
} else {
linkArray.push(surgeryLink("Get another round of growth hormones", "ballEnlargementHorm", () => {
V.PC.balls = 9;
- cashX(forceNeg(15000), "PCmedical");
+ cashX(forceNeg(applyDiscount(15000)), "PCmedical");
}));
}
} else {
@@ -549,12 +686,12 @@ App.UI.electiveSurgery = function() {
linkArray.push(
surgeryLink("Get hormone treatment", "ballEnlargementHorm", () => {
V.PC.balls = 5;
- cashX(forceNeg(15000), "PCmedical");
+ cashX(forceNeg(applyDiscount(15000)), "PCmedical");
}),
surgeryLink("Have the gel added", "ballEnlargement", () => {
V.PC.balls = 5;
V.PC.ballsImplant = 2;
- cashX(forceNeg(15000), "PCmedical");
+ cashX(forceNeg(applyDiscount(15000)), "PCmedical");
}),
);
}
@@ -568,12 +705,12 @@ App.UI.electiveSurgery = function() {
const p = document.createElement("p");
const r = [];
if (V.PC.vagina >= 3 && V.PC.newVag === 0) {
- r.push(`"Looking a little loose down there; I can fix that for you. Get you nice and tight again. Oh, and our pussies are guaranteed to not lose their tightness, or your money back! <span class="cash">${cashFormat(15000)}</span> for a brand new vagina."`);
+ r.push(`"Looking a little loose down there; I can fix that for you. Get you nice and tight again. Oh, and our pussies are guaranteed to not lose their tightness, or your money back! <span class="cash">${cashFormat(applyDiscount(15000))}</span> for a brand new vagina."`);
App.Events.addNode(p, r, "div");
p.append(App.UI.DOM.makeElement("div", surgeryLink("Get a tighter vagina", "tightPussy", () => {
V.PC.vagina = 1;
V.PC.newVag = 1;
- cashX(forceNeg(15000), "PCmedical");
+ cashX(forceNeg(applyDiscount(15000)), "PCmedical");
})));
}
@@ -673,6 +810,7 @@ App.UI.electiveSurgery = function() {
V.PC.scrotum = 0;
V.PC.dick = 0;
V.PC.prostate = 0;
+ V.PC.counter.storedCum += 10;
V.PC.vagina = 1;
V.PC.newVag = 1;
V.PC.vaginaLube = 1;
diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js
index a62186dcdf3c14b92e965b1d826d98e05477b88f..18ea55c44bf34ad1a8b9c25b2e34676959b32c72 100644
--- a/src/player/js/PlayerState.js
+++ b/src/player/js/PlayerState.js
@@ -319,7 +319,7 @@ App.Entity.PlayerState = class PlayerState {
* * 50 - 90: Extremely healthy
* * 90 - : Unnaturally healthy
*/
- condition: 0,
+ condition: 60,
/** your short term health damage, used to determine how long you are in recovery */
shortDamage: 0,
/** your long term health damage */
@@ -349,6 +349,11 @@ App.Entity.PlayerState = class PlayerState {
* @type {FC.MinorInjury}
*/
this.minorInjury = 0;
+ /**
+ * you have taken a major injury
+ * number of weeks laid up in bed until recovery
+ */
+ this.majorInjury = 0;
/**
* you have a life-changing injury/malaise
* @type {number | string}
@@ -433,6 +438,10 @@ App.Entity.PlayerState = class PlayerState {
/** kemonomimi ear color
* "hairless" */
this.earTColor = "hairless";
+ /** top ear effect color */
+ this.earTEffectColor = "none";
+ /** top ear effect */
+ this.earTEffect = "none";
/** sense of smell
0 - yes, -1 - no */
this.smells = 0;
@@ -458,10 +467,42 @@ App.Entity.PlayerState = class PlayerState {
this.tailShape = "none";
/** tail color */
this.tailColor = "none";
+ /** tail effect color */
+ this.tailEffectColor = "none";
+ /** tail effect */
+ this.tailEffect = "none";
+ /**
+ * Does she have a back interface installed
+ * * 0: no
+ * * 1: yes
+ * @type {FC.Bool}
+ */
+ this.PBack = 0;
+ /** the current shape of their modular wings
+ * @type {FC.WingsShape} */
+ this.wingsShape = "none";
+ /** tail color */
+ this.appendagesColor = "none";
+ /** appendages effect color */
+ this.appendagesEffectColor = "none";
+ /** appendages effect */
+ this.appendagesEffect = "none";
+ /** The color of their pattern
+ * @type {FC.PatternColor}
+ * applies to:
+ * @param {FC.PatternedEars} ears
+ * @param {FC.PatternedTails} tails
+ * @param {FC.PatternedAppendages} appendages
+ */
+ this.patternColor = "black";
/** your original hair color, defaults to your initial hair color. */
this.origHColor = "blonde";
/** hair color */
this.hColor = "blonde";
+ /** hair effect color */
+ this.hEffectColor = "none";
+ /** hair effect */
+ this.hEffect = "none";
/** pubic hair color */
this.pubicHColor = "blonde";
/** armpit hair style */
@@ -520,6 +561,7 @@ App.Entity.PlayerState = class PlayerState {
* * 1: basic interface
* * 2: advanced interface
* * 3: quadruped interface
+ * @type {0 | 1 | 2 | 3}
*/
this.PLimb = 0;
/**
@@ -1341,6 +1383,7 @@ App.Entity.PlayerState = class PlayerState {
* may accept strings, use at own risk
* * "none"
* * "flats"
+ * @type {FC.WithNone<FC.Shoes>}
*/
this.shoes = "none";
/**
@@ -1872,6 +1915,13 @@ App.Entity.PlayerState = class PlayerState {
* @type {FC.AnimalType}
*/
this.eggType = "human";
+ /**
+ * Is she on gestation altering drugs?
+ * * "none"
+ * * "labor suppressors"
+ * @type {FC.WithNone<FC.GestationDrug>}
+ */
+ this.pregControl = "none";
/** */
this.ageAdjust = 0;
/** You are bald
@@ -1920,6 +1970,10 @@ App.Entity.PlayerState = class PlayerState {
* @type {FC.Bool}
* 0: no; 1: yes */
this.vasectomy = 0;
+ /** Is the slave's hair under constant maintenance?
+ * @type {FC.Bool}
+ * 0: no; 1: yes */
+ this.haircuts = 0;
/** Your skills */
this.skill = new App.Entity.PlayerSkillsState();
/** Your Preferences */
@@ -1951,24 +2005,18 @@ App.Entity.PlayerState = class PlayerState {
flavoring: 0
};
/** flavor of their milk*/
- this.milkFlavor = "none";
+ this.milkFlavor = "none";
+ /* eslint-disable camelcase*/
+ this.NCSyouthening = 0;
/** erratic weight gain
*
* 0: stable; 1: gaining; -1: losing */
this.weightDirection = 0;
// exclusive minor player variables (probably) here
- /** are you on fertility supplements
- *
- * 0: no; 1: yes */
- this.fertDrugs = 0;
/** have you been drugged with fertility drugs
*
* 0: no; 1+: how many weeks they will remain in your system */
this.forcedFertDrugs = 0;
- /** Are you taking pills to fuck more slaves each week?
- *
- * 0: no; 1: yes */
- this.staminaPills = 0;
/** Player's coefficient of inbreeding */
this.inbreedingCoeff = 0;
/** Controls if femPC lost virginity before or after taking over */
diff --git a/src/player/js/enslavePlayer.js b/src/player/js/enslavePlayer.js
index 173e62009054e598c10f2dd568a2b9c68b885840..b91146ac0b39b2fc7e7f8a20bba2bc37bac26687 100644
--- a/src/player/js/enslavePlayer.js
+++ b/src/player/js/enslavePlayer.js
@@ -10,7 +10,7 @@ globalThis.convertPlayerToSlave = function(player, badEnd = "boring") {
slave.skill.anal = 100;
slave.skill.whoring = 0;
slave.skill.entertainment = 100;
- slave.skill.combat = 1;
+ slave.skill.combat = 100;
slave.skill.headGirl = 200;
slave.skill.recruiter = 200;
slave.skill.bodyguard = 0;
@@ -85,13 +85,10 @@ globalThis.convertPlayerToSlave = function(player, badEnd = "boring") {
slave.currentRules = [];
slave.HGExclude = 0;
slave.choosesOwnChastity = 0;
- slave.pregControl = "none";
slave.readyProsthetics = [];
slave.onDiet = 0;
slave.haircuts = 0;
slave.newGamePlus = 0;
- /* eslint-disable camelcase*/
- slave.NCSyouthening = 0;
slave.override_Race = 0;
slave.override_Skin = 0;
slave.override_Eye_Color = 0;
@@ -128,9 +125,7 @@ globalThis.convertPlayerToSlave = function(player, badEnd = "boring") {
delete slave.refreshmentType;
delete slave.rumor;
delete slave.physicalImpairment;
- delete slave.fertDrugs;
delete slave.forcedFertDrugs;
- delete slave.staminaPills;
/* badEnd will be used here to apply unique effects depending on the ending */
diff --git a/src/player/managePersonalAffairs.js b/src/player/managePersonalAffairs.js
index 9374d7c79e7fb7d525db2cbae7205c6b07f47c6b..c8f8c97c3cd6505036901c924e690bac25d4e122 100644
--- a/src/player/managePersonalAffairs.js
+++ b/src/player/managePersonalAffairs.js
@@ -7,9 +7,12 @@ App.UI.managePersonalAffairs = function() {
const drugsDiv = document.createElement("div");
const dietDiv = document.createElement("div");
const lactationDiv = document.createElement("div");
+ const pervertDiv = document.createElement("div");
+ const socialDiv = document.createElement("div");
const breederExamDiv = document.createElement("div");
const PC = V.PC;
+ const arcology = V.arcologies[0];
if (V.cheatMode) {
if (V.cheatMode === 1) {
@@ -27,7 +30,6 @@ App.UI.managePersonalAffairs = function() {
frag.append(
appearance(),
- skills(),
reputation(),
diet(),
drugs(),
@@ -37,16 +39,22 @@ App.UI.managePersonalAffairs = function() {
frag.append(lactation());
}
- if (V.propOutcome === 1 && V.arcologies[0].FSRestart !== "unset") {
+ if (V.propOutcome === 1 && arcology.FSRestart !== "unset") {
frag.append(breederExam());
}
+ frag.append(perversions());
+
+ frag.append(socials());
+
+ frag.append(skills());
+
return frag;
function appearance() {
- const hairColorsDiv = document.createElement("div");
- const weddingDiv = document.createElement("div");
- const FCTVDiv = document.createElement("div");
+ const doctorDiv = document.createElement("div");
+ const surgeonDiv = document.createElement("div");
+ const salonDiv = document.createElement("div");
let text = [];
@@ -70,557 +78,355 @@ App.UI.managePersonalAffairs = function() {
App.Events.addParagraph(appearanceDiv, text);
text = [];
- if (V.playerSurgery === 0) {
- text.push(App.UI.DOM.passageLink(`Visit your plastic surgeon`, "Elective Surgery", () => {
- V.playerSurgery = 4;
- }));
- } else if (V.playerSurgery === 1) {
- text.push(`Your favorite plastic surgeon is booked solid for the next week.`);
- } else {
- text.push(`Your favorite plastic surgeon is booked solid for the next ${V.playerSurgery} weeks.`);
- }
-
- text.push(App.Medicine.Modification.eyeSelector(PC));
-
- text.push(hairColors());
-
- if (V.weddingPlanned) {
- text.push(wedding());
+ if (isMovable(PC)) {
+ text.push(doctor());
+ text.push(surgeon());
}
-
- if (V.FCTV.receiver) {
- text.push(FCTV());
+ if (hasAnyArms(PC)) {
+ text.push(salon());
}
App.Events.addNode(appearanceDiv, text);
return appearanceDiv;
- function hairColors() {
- const colors = ["auburn", "black", "blonde", "blue", "blue-violet", "brown", "burgundy", "chestnut", "chocolate brown", "copper", "crimson", "dark blue", "dark brown", "dark orchid", "ginger", "golden", "green", "green-yellow", "grey", "hazel", "jet black", "pink", "platinum blonde", "purple", "red", "sea green", "silver", "strawberry-blonde", "white"];
- const links = [];
-
- hairColorsDiv.append(`You have a selection of hair dyes available: `);
+ function doctor() {
+ const text = [];
- colors.forEach(color => links.push(
- PC.hColor === color
- ? App.UI.DOM.disabledLink(capFirstChar(color),
- [`Your hair is already ${color}.`])
- : App.UI.DOM.link(capFirstChar(color), () => {
- V.PC.hColor = color;
+ if (V.doctor.state > 0) {
+ text.push(App.UI.DOM.passageLink(`Consult your doctor`, "Doctor Consultation", () => {
+ }));
+ } else {
+ text.push(App.UI.DOM.passageLink(`Seek out a local doctor`, "Doctor Consultation", () => {
+ }));
+ }
+ App.Events.addNode(doctorDiv, text);
+ return doctorDiv;
+ }
- App.UI.DOM.replace(appearanceDiv, appearance);
- })
- ));
+ function surgeon() {
+ const text = [];
- hairColorsDiv.append(App.UI.DOM.generateLinksStrip(links));
+ if (V.pSurgery.cooldown === 0) {
+ if (V.pSurgery.state > 0) {
+ text.push(App.UI.DOM.passageLink(`Visit your plastic surgeon`, "Elective Surgery", () => {
+ V.pSurgery.cooldown = 4;
+ }));
+ } else {
+ text.push(App.UI.DOM.passageLink(`Seek out a local plastic surgeon`, "Elective Surgery", () => {
+ V.pSurgery.cooldown = 4;
+ }));
+ }
+ } else if (V.pSurgery.cooldown === 1) {
+ text.push(`Your favorite plastic surgeon is booked solid for the next week.`);
+ } else {
+ text.push(`Your favorite plastic surgeon is booked solid for the next ${V.pSurgery.cooldown} weeks.`);
+ }
+ App.Events.addNode(surgeonDiv, text);
+ return surgeonDiv;
+ }
- return hairColorsDiv;
+ function salon() {
+ salonDiv.append(App.UI.DOM.passageLink(`Change your appearance`, "Personal Appearance",));
+ return salonDiv;
}
+ }
- function wedding() {
- const text = [];
+ function reputation() {
+ const customTitleDiv = document.createElement("div");
+ const textBoxDiv = document.createElement("div");
+ const renamePlayerDiv = document.createElement("div");
+ const newNameDiv = document.createElement("div");
+ const pronounsDiv = document.createElement("div");
+ const rumorsDiv = document.createElement("div");
+ const familyDiv = document.createElement("div");
+ const pregnancyDiv = document.createElement("div");
+ const birthsDiv = document.createElement("div");
+ const partnersDiv = document.createElement("div");
+ const knockedUpDiv = document.createElement("div");
+ const fatheredDiv = document.createElement("div");
+ const breedingDiv = document.createElement("div");
- App.UI.DOM.appendNewElement("h2", weddingDiv, `Wedding`);
+ App.UI.DOM.appendNewElement("h2", reputationDiv, `Reputation`);
+ App.UI.DOM.appendNewElement("h3", reputationDiv, `Name`);
- text.push(`You have a wedding planned for this weekend; you are`);
+ reputationDiv.append(
+ `On formal occasions, you are announced as ${PCTitle()}. By slaves, however, you prefer to be called ${properMaster()}.`,
+ customTitle(),
+ renamePlayer(),
+ // pronouns(), // TODO: waiting for 5.0 per pregmodder
+ rumors(),
+ family(),
+ );
- if (V.weddingPlanned === 1) {
- text.push(`marrying`);
- } else if (V.weddingPlanned === 2) {
- text.push(`sharing`);
- } else if (V.weddingPlanned === 3) {
- text.push(`knocking up`);
- } else {
- throw new Error(`Invalid V.weddingPlanned value of '${V.weddingPlanned}' in managePersonalAffairs()`);
- }
+ if (PC.ovaries === 1 || PC.mpreg === 1) {
+ reputationDiv.append(pregnancy());
+ }
- text.push(
- marryingList(),
- App.UI.DOM.link(`Cancel it`, () => {
- V.weddingPlanned = 0;
- V.marrying = [];
+ const links = [];
- App.UI.DOM.replace(appearanceDiv, appearance);
- })
- );
+ if (PC.preg > 0 && V.pregnancyMonitoringUpgrade) {
+ links.push(App.UI.DOM.passageLink(`Inspect pregnancy`, 'Analyze PC Pregnancy'));
+ }
- App.Events.addNode(weddingDiv, text);
+ if (PC.preg >= 0 && PC.ovaries && PC.ovaryAge < 47) {
+ links.push(App.UI.DOM.passageLink(`Harvest and implant an egg`, 'Surrogacy Workaround', () => {
+ // @ts-ignore
+ V.donatrix = V.PC;
+ // @ts-ignore
+ V.impregnatrix = "undecided";
+ // @ts-ignore
+ V.receptrix = "undecided";
- return weddingDiv;
+ V.nextLink = 'Manage Personal Affairs';
+ }));
+ }
- function marryingList() {
- const listSpan = document.createElement("span");
+ reputationDiv.append(App.UI.DOM.generateLinksStrip(links));
- listSpan.append(
- App.UI.DOM.toSentence(V.marrying.map(id => App.UI.DOM.passageLink(SlaveFullName(getSlave(id)), 'Slave Interact'))),
- `.`,
- );
+ if (PC.counter.birthsTotal > 0) {
+ reputationDiv.append(births());
+ }
- return listSpan;
- }
+ if (PC.partners.size > 0) {
+ reputationDiv.append(partners());
}
- function FCTV() {
- const text = [];
+ if (PC.counter.slavesKnockedUp > 0) {
+ reputationDiv.append(knockedUp());
+ } else if (PC.counter.slavesFathered > 0) {
+ reputationDiv.append(fathered());
+ }
- const links = [];
+ if (PC.vagina !== -1 && arcology.FSRestartDecoration >= 100) {
+ reputationDiv.append(breeding());
+ }
- App.UI.DOM.appendNewElement("h2", FCTVDiv, `FCTV`);
+ return reputationDiv;
- if (V.FCTV.pcViewership.frequency === 1) {
- text.push(`You make sure to tune in to FCTV at least once a week.`);
- } else if (V.FCTV.pcViewership.frequency === 2) {
- text.push(`You make sure to tune in to FCTV at least once biweekly.`);
- } else if (V.FCTV.pcViewership.frequency === 4) {
- text.push(`You make sure to tune in to FCTV at least once a month.`);
- } else {
- text.push(`You don't watch FCTV.`);
- }
+ function customTitle() {
+ if (!PC.customTitle) {
+ textBoxDiv.append(
+ `Custom title: `,
+ App.UI.DOM.makeTextBox(PC.customTitle || '', (title) => {
+ if (!title) {
+ title = '';
+ }
- if (V.FCTV.pcViewership.frequency === 1) {
- links.push(App.UI.DOM.disabledLink(`Watch every week`, [
- `You are already watching every week.`,
- ]));
- } else {
- links.push(App.UI.DOM.link(`Watch every week`, () => {
- V.FCTV.pcViewership.frequency = 1;
- App.UI.DOM.replace(FCTVDiv, FCTV);
- }));
- }
- if (V.FCTV.pcViewership.frequency === 2) {
- links.push(App.UI.DOM.disabledLink(`Watch every other week`, [
- `You are already watching every other week.`,
- ]));
- } else {
- links.push(App.UI.DOM.link(`Watch every other week`, () => {
- V.FCTV.pcViewership.frequency = 2;
- App.UI.DOM.replace(FCTVDiv, FCTV);
- }));
- }
- if (V.FCTV.pcViewership.frequency === 4) {
- links.push(App.UI.DOM.disabledLink(`Watch once a month`, [
- `You are already watching once a month.`,
- ]));
- } else {
- links.push(App.UI.DOM.link(`Watch once a month`, () => {
- V.FCTV.pcViewership.frequency = 4;
- App.UI.DOM.replace(FCTVDiv, FCTV);
- }));
- }
- if (V.FCTV.pcViewership.frequency === -1) {
- links.push(App.UI.DOM.disabledLink(`Ignore it`, [
- `You are already not watching.`,
- ]));
+ V.PC.customTitle = title;
+ V.PC.customTitleLisp = lispReplace(PC.customTitle);
+
+ App.UI.DOM.replace(reputationDiv, reputation);
+ }),
+ );
+
+ customTitleDiv.append(App.UI.DOM.makeElement("div", App.UI.DOM.linkReplace(`Set a custom title for slaves to address you as`, textBoxDiv)));
} else {
- links.push(App.UI.DOM.link(`Ignore it`, () => {
- V.FCTV.pcViewership.frequency = -1;
- App.UI.DOM.replace(FCTVDiv, FCTV);
- }));
- }
+ customTitleDiv.append(
+ `Your custom title is `,
+ App.UI.DOM.makeTextBox(PC.customTitle || '', (title) => {
+ V.PC.customTitle = title;
+ V.PC.customTitleLisp = lispReplace(PC.customTitle);
- if (V.saveImported > 0 && !V.FCTV.remote) {
- text.push(
- `You know TVs should have a remote.`,
- App.UI.DOM.link(`Buy one yourself`, () => {
- V.FCTV.remote = 1;
+ App.UI.DOM.replace(reputationDiv, reputation);
+ }),
+ App.UI.DOM.link(`Stop using a custom title`, () => {
+ V.PC.customTitle = undefined;
+ V.PC.customTitleLisp = undefined;
- cashX(forceNeg(100 * V.upgradeMultiplierTrade), "capEx");
- App.UI.DOM.replace(FCTVDiv, FCTV);
- })
+ App.UI.DOM.replace(reputationDiv, reputation);
+ }),
);
}
- text.push(App.UI.DOM.generateLinksStrip(links));
-
- App.Events.addNode(FCTVDiv, text);
+ return customTitleDiv;
+ }
- return FCTVDiv;
+ // TODO: waiting for 5.0 per pregmodder
+ function pronouns() {
+ const options = new App.UI.OptionsGroup();
+ const {he, him} = getPronouns(V.PC);
+ options.addOption("", "pronoun", V.PC)
+ .addValue("She/Her", App.Data.Pronouns.Kind.female)
+ .addValue("He/Him", App.Data.Pronouns.Kind.male)
+ .addValue("It", App.Data.Pronouns.Kind.neutral);
+ // .addValue("They/Them", App.Data.Pronouns.Kind.epicene) - TODO: epicene pronouns have verb tense problems ("they is...")
+ // .addValue("Custom", App.Data.Pronouns.Kind.custom) - TODO: custom pronoun mechanism is incomplete/broken right now
+ pronounsDiv.append("Your preferred pronouns are ", App.UI.DOM.linkReplace(`${he}/${him}.`, options.render()));
+ return pronounsDiv;
}
- }
- function skills() {
- App.UI.DOM.appendNewElement("h2", skillsDiv, `Personal Skills`);
+ function renamePlayer() {
+ newNameDiv.append(
+ `New name: `,
+ App.UI.DOM.makeTextBox(PC.slaveName, (name) => {
+ V.PC.slaveName = name;
+ repX(-500, "event");
- skillsDiv.append(`You ponder what skills may be useful in running your arcology.`);
+ App.UI.DOM.replace(reputationDiv, reputation);
+ }),
+ );
- App.UI.DOM.appendNewElement("div", skillsDiv, `Trading: ${getPlayerTradingSkill()}`);
- App.UI.DOM.appendNewElement("div", skillsDiv, `Warfare: ${getPlayerWarfareSkill()}`);
- App.UI.DOM.appendNewElement("div", skillsDiv, `Slaving: ${getPlayerSlavingSkill()}`);
- App.UI.DOM.appendNewElement("div", skillsDiv, `Engineering: ${getPlayerEngineeringSkill()}`);
- App.UI.DOM.appendNewElement("div", skillsDiv, `Medicine: ${getPlayerMedicineSkill()}`);
- App.UI.DOM.appendNewElement("div", skillsDiv, `Hacking: ${getPlayerHackingSkill()}`);
+ renamePlayerDiv.append(App.UI.DOM.linkReplace(`Rename yourself`, newNameDiv));
+ App.UI.DOM.appendNewElement("span", renamePlayerDiv, ` Will cost you some reputation`, ['note']);
- return skillsDiv;
+ return renamePlayerDiv;
+ }
- function getPlayerTradingSkill() {
- if (PC.skill.trading >= 100) {
- return `You are a master at economics and trading.`;
- } else if (PC.skill.trading >= 80) {
- return `You are an expert at economics and trading.`;
- } else if (PC.skill.trading >= 60) {
- return `You are skilled in economics and trading.`;
- } else if (PC.skill.trading >= 40) {
- return `You know some things about economics and trading.`;
- } else if (PC.skill.trading >= 20) {
- return `You are a beginner in economics.`;
- } else if (PC.skill.trading >= 0) {
- return `You know only the basics of trading.`;
- } else if (PC.skill.trading >= -20) {
- return `You know how to haggle a little.`;
- } else if (PC.skill.trading >= -40) {
- return `You know how to shop around.`;
- } else if (PC.skill.trading >= -60) {
- return `You know not to pay sticker price.`;
- } else if (PC.skill.trading >= -80) {
- return `People always give you discounts, but you never save any money.`;
- } else {
- return `They said it was a bear market, so where are the bears?`;
- }
- }
+ function rumors() {
+ App.UI.DOM.appendNewElement("h3", rumorsDiv, `Rumors`);
- function getPlayerWarfareSkill() {
- if (PC.skill.warfare >= 100) {
- return `You are a master of warfare.`;
- } else if (PC.skill.warfare >= 80) {
- return `You are an expert at tactics and strategy.`;
- } else if (PC.skill.warfare >= 60) {
- return `You are skilled in combat.`;
- } else if (PC.skill.warfare >= 40) {
- return `You know some things about combat.`;
- } else if (PC.skill.warfare >= 20) {
- return `You are a beginner in tactics and strategy.`;
- } else if (PC.skill.warfare >= 0) {
- return `You know only the basics of fighting.`;
- } else if (PC.skill.warfare >= -20) {
- return `You know how to hold a gun.`;
- } else if (PC.skill.warfare >= -40) {
- return `You know how to stab with a knife.`;
- } else if (PC.skill.warfare >= -60) {
- return `Go for the throat?`;
- } else if (PC.skill.warfare >= -80) {
- return `Just kick them in the balls, right?`;
- } else {
- return `People like you are usually the first raped in a war.`;
- }
- }
+ App.Events.addNode(rumorsDiv, [getPlayerRumors()]);
- function getPlayerSlavingSkill() {
- if (PC.skill.slaving >= 100) {
- return `You are a master slaver.`;
- } else if (PC.skill.slaving >= 80) {
- return `You are an expert at enslaving.`;
- } else if (PC.skill.slaving >= 60) {
- return `You are skilled in slaving.`;
- } else if (PC.skill.slaving >= 40) {
- return `You know some things about getting slaves.`;
- } else if (PC.skill.slaving >= 20) {
- return `You are a beginner in slaving.`;
- } else if (PC.skill.slaving >= 0) {
- return `You know only the basics of slaving.`;
- } else if (PC.skill.slaving >= -20) {
- return `You know how to avoid becoming a slave.`;
- } else if (PC.skill.slaving >= -40) {
- return `You know to read contracts before you sign them.`;
- } else if (PC.skill.slaving >= -60) {
- return `You know to be careful.`;
- } else if (PC.skill.slaving >= -80) {
- return `You know better than to trust anyone.`;
- } else {
- return `It would be easy to enslave you.`;
- }
- }
+ return rumorsDiv;
- function getPlayerEngineeringSkill() {
- if (PC.skill.engineering >= 100) {
- return `You are a master engineer.`;
- } else if (PC.skill.engineering >= 80) {
- return `You are an expert at engineering.`;
- } else if (PC.skill.engineering >= 60) {
- return `You are skilled in engineering.`;
- } else if (PC.skill.engineering >= 40) {
- return `You know some things about engineering.`;
- } else if (PC.skill.engineering >= 20) {
- return `You are a beginner in engineering.`;
- } else if (PC.skill.engineering >= 0) {
- return `You know only the basics of engineering.`;
- } else if (PC.skill.engineering >= -20) {
- return `You can build a gingerbread house that doesn't collapse.`;
- } else if (PC.skill.engineering >= -40) {
- return `You can tie a tight knot, does that count?`;
- } else if (PC.skill.engineering >= -60) {
- return `Glue is your friend; lots of it.`;
- } else if (PC.skill.engineering >= -80) {
- return `You know better than to even try to build something.`;
- } else {
- return `You can cook; that's sort of like building something, right?`;
+ function getPlayerRumors() {
+ if (PC.degeneracy > 100) {
+ return `There are severe and devastating rumors about you spreading across the arcology.`;
+ } else if (PC.degeneracy > 75) {
+ return `There are severe rumors about you spreading across the arcology.`;
+ } else if (PC.degeneracy > 50) {
+ return `There are bad rumors about you spreading across the arcology.`;
+ } else if (PC.degeneracy > 25) {
+ return `There are rumors about you spreading across the arcology.`;
+ } else if (PC.degeneracy > 10) {
+ return `There are minor rumors about you spreading across the arcology.`;
+ } else {
+ return `The occasional rumor about you can be heard throughout the arcology.`;
+ }
}
}
- function getPlayerMedicineSkill() {
- if (PC.skill.medicine >= 100) {
- return `You are a master surgeon.`;
- } else if (PC.skill.medicine >= 80) {
- return `You are an expert at medicine and surgery.`;
- } else if (PC.skill.medicine >= 60) {
- return `You are skilled in surgery.`;
- } else if (PC.skill.medicine >= 40) {
- return `You know some things about medicine.`;
- } else if (PC.skill.medicine >= 20) {
- return `You are a beginner in medicine.`;
- } else if (PC.skill.medicine >= 0) {
- return `You know the basics of treating injuries.`;
- } else if (PC.skill.medicine >= -20) {
- return `You can stop a wound from getting infected.`;
- } else if (PC.skill.medicine >= -40) {
- return `Gauze is your friend. Just keep wrapping.`;
- } else if (PC.skill.medicine >= -60) {
- return `You know how to apply a band-aid.`;
- } else if (PC.skill.medicine >= -80) {
- return `Cure-alls are wonderful. Why aren't they sold in stores, though?`;
- } else {
- return `Alcohol makes pain go away, right?`;
- }
- }
+ function family() {
+ App.UI.DOM.appendNewElement("h3", familyDiv, `Family`);
- function getPlayerHackingSkill() {
- if (PC.skill.hacking >= 100) {
- return `You are a master of hacking.`;
- } else if (PC.skill.hacking >= 80) {
- return `You are an expert at hacking.`;
- } else if (PC.skill.hacking >= 60) {
- return `You are skilled in hacking.`;
- } else if (PC.skill.hacking >= 40) {
- return `You know some things about hacking.`;
- } else if (PC.skill.hacking >= 20) {
- return `You are a beginner in hacking.`;
- } else if (PC.skill.hacking >= 0) {
- return `You know only the basics of hacking.`;
- } else if (PC.skill.hacking >= -20) {
- return `You know how to click a mouse.`;
- } else if (PC.skill.hacking >= -40) {
- return `Enter does something?`;
- } else if (PC.skill.hacking >= -60) {
- return `Where is the "any" key?`;
- } else if (PC.skill.hacking >= -80) {
- return `You can push the power button, good job.`;
- } else {
- return `This black box thingy is magical.`;
- }
- }
- }
+ familyDiv.append(App.UI.DOM.linkReplace(`Pull up the file on your family tree`, renderFamilyTree(V.slaves, -1)));
- function reputation() {
- const customTitleDiv = document.createElement("div");
- const textBoxDiv = document.createElement("div");
- const renamePlayerDiv = document.createElement("div");
- const newNameDiv = document.createElement("div");
- const rumorsDiv = document.createElement("div");
- const familyDiv = document.createElement("div");
- const pregnancyDiv = document.createElement("div");
- const birthsDiv = document.createElement("div");
- const partnersDiv = document.createElement("div");
- const knockedUpDiv = document.createElement("div");
- const fatheredDiv = document.createElement("div");
- const breedingDiv = document.createElement("div");
- const cumTapDiv = document.createElement("div");
- const impregnateSelfDiv = document.createElement("div");
+ if (totalPlayerRelatives(PC) > 0 || (V.showMissingSlaves && (PC.mother in V.missingTable || PC.father in V.missingTable))) {
+ familyDiv.append(App.Desc.family(PC, true));
+ }
- App.UI.DOM.appendNewElement("h2", reputationDiv, `Reputation`);
- App.UI.DOM.appendNewElement("h3", reputationDiv, `Name`);
+ return familyDiv;
+ }
- reputationDiv.append(
- `On formal occasions, you are announced as ${PCTitle()}. By slaves, however, you prefer to be called ${properMaster()}.`,
- customTitle(),
- renamePlayer(),
- rumors(),
- family(),
- );
+ function pregnancy() {
+ const text = [];
+ const links = [];
- if (PC.vagina !== -1) {
- reputationDiv.append(pregnancy());
- }
+ const miniSceneSpan = App.UI.DOM.appendNewElement("span", pregnancyDiv);
+ const abortLink = App.UI.DOM.link(`Abort the child`, () => {
+ TerminatePregnancy(V.PC);
- if (PC.counter.birthsTotal > 0) {
- reputationDiv.append(births());
- }
+ // App.UI.DOM.linkReplace does not support handlers afaik
+ App.UI.DOM.replace(miniSceneSpan, `You take a syringe filled with abortifacients and make yourself comfortable. Injecting the vial through your belly into your womb, your close your eyes and wait for what is coming. Once you feel it is over, you clean yourself up and go on your way, child free.`);
+ App.UI.DOM.replace(appearanceDiv, appearance);
+ App.UI.DOM.replace(drugsDiv, drugs);
+ });
- if (PC.partners.size > 0) {
- reputationDiv.append(partners());
- }
+ App.UI.DOM.appendNewElement("h2", pregnancyDiv, `Contraceptives and Fertility`);
- if (PC.counter.slavesKnockedUp > 0) {
- reputationDiv.append(knockedUp());
- } else if (PC.counter.slavesFathered > 0) {
- reputationDiv.append(fathered());
- }
+ if (PC.labor === 1) {
+ text.push(`You are beginning to feel contractions; you'll be giving birth soon.`);
+ } else if (PC.preg >= 39) {
+ text.push(`Your due date is looming, but your ${PC.pregType > 1 ? `children don't` : `child doesn't`} seem to be interested in coming out just yet.`);
- const links = [];
+ text.push(miniSceneSpan, App.UI.DOM.link(`Induce childbirth`, () => {
+ V.PC.labor = 1;
+ App.UI.DOM.replace(pregnancyDiv, pregnancy);
+ }));
+ } else if (PC.preg >= 8) {
+ text.push(`You're currently ${num(PC.preg)} ${PC.preg > 1 ? `weeks` : `week`} pregnant${V.PC.pregSource !== -1 && V.PC.pregSource !== -6 ? ", something rather unbecoming for an arcology owner" : ""}.`);
- if (PC.preg > 0 && V.pregnancyMonitoringUpgrade) {
- links.push(App.UI.DOM.passageLink(`Inspect pregnancy`, 'Analyze PC Pregnancy'));
- }
+ if (arcology.FSRestart === "unset" || V.eugenicsFullControl === 1 || (V.PC.pregSource !== -1 && V.PC.pregSource !== -6)) {
+ miniSceneSpan.append(abortLink);
+ text.push(miniSceneSpan);
+ }
+ } else if (PC.preg >= 4 && PC.pregKnown) {
+ text.push(`You're having morning sickness${V.PC.pregSource !== -1 && V.PC.pregSource !== -6 ? "; it isn't too late to hide your pregnancy if desired.." : ""}.`);
- if (PC.preg >= 0 && PC.ovaries && PC.ovaryAge < 47) {
- links.push(App.UI.DOM.passageLink(`Harvest and implant an egg`, 'Surrogacy Workaround', () => {
- // @ts-ignore
- V.donatrix = V.PC;
- // @ts-ignore
- V.impregnatrix = "undecided";
- // @ts-ignore
- V.receptrix = "undecided";
+ if (arcology.FSRestart === "unset" || V.eugenicsFullControl === 1 || (V.PC.pregSource !== -1 && V.PC.pregSource !== -6)) {
+ miniSceneSpan.append(abortLink);
+ text.push(miniSceneSpan);
+ }
+ } else if (PC.preg >= 4) {
+ miniSceneSpan.append(`Your period is late, so the first thing you do is test yourself for a potential pregnancy. A pregnancy test confirms that `, App.UI.DOM.makeElement("span", `you are pregnant. `, ['pregnant']));
- V.nextLink = 'Manage Personal Affairs';
- }));
- }
+ PC.pregKnown = 1;
+ if (arcology.FSRestart === "unset" || V.eugenicsFullControl === 1 || (V.PC.pregSource !== -1 && V.PC.pregSource !== -6)) {
+ miniSceneSpan.append(abortLink);
- reputationDiv.append(App.UI.DOM.generateLinksStrip(links));
+ text.push(miniSceneSpan);
+ }
+ } else if (PC.preg > 0 && PC.pregKnown) {
+ text.push(`You have a bun baking in the oven.`);
- if (PC.vagina !== -1 && V.arcologies[0].FSRestartDecoration >= 100) {
- reputationDiv.append(breeding());
- }
+ if (arcology.FSRestart === "unset" || V.eugenicsFullControl === 1 || (V.PC.pregSource !== -1 && V.PC.pregSource !== -6)) {
+ text.push(App.UI.DOM.link(`Pop some morning after pills`, () => {
+ WombFlush(V.PC);
- if (PC.preg === 0 && PC.pregWeek === 0 && PC.vagina > -1) {
- reputationDiv.append(
- cumTap(),
- impregnateSelf(),
- );
- }
+ App.UI.DOM.replace(appearanceDiv, appearance);
+ App.UI.DOM.replace(reputationDiv, reputation);
+ App.UI.DOM.replace(pregnancyDiv, pregnancy);
+ }));
+ }
+ } else if (PC.preg > 0) {
+ text.push(`Your fertile ${PC.mpreg === 1 ? "ass" : ""}pussy has been thoroughly seeded; there is a chance you are pregnant.`);
- return reputationDiv;
-
- function customTitle() {
- if (!PC.customTitle) {
- textBoxDiv.append(
- `Custom title: `,
- App.UI.DOM.makeTextBox(PC.customTitle || '', (title) => {
- if (!title) {
- title = '';
- }
-
- V.PC.customTitle = title;
- V.PC.customTitleLisp = lispReplace(PC.customTitle);
-
- App.UI.DOM.replace(reputationDiv, reputation);
- }),
- );
-
- customTitleDiv.append(App.UI.DOM.makeElement("div", App.UI.DOM.linkReplace(`Set a custom title for slaves to address you as`, textBoxDiv)));
- } else {
- customTitleDiv.append(
- `Your custom title is `,
- App.UI.DOM.makeTextBox(PC.customTitle || '', (title) => {
- V.PC.customTitle = title;
- V.PC.customTitleLisp = lispReplace(PC.customTitle);
+ if (arcology.FSRestart === "unset" || V.eugenicsFullControl === 1 || (V.PC.pregSource !== -1 && V.PC.pregSource !== -6)) {
+ text.push(App.UI.DOM.link(`Pop some morning after pills`, () => {
+ WombFlush(V.PC);
+ App.UI.DOM.replace(appearanceDiv, appearance);
App.UI.DOM.replace(reputationDiv, reputation);
- }),
- App.UI.DOM.link(`Stop using a custom title`, () => {
- V.PC.customTitle = undefined;
- V.PC.customTitleLisp = undefined;
+ App.UI.DOM.replace(pregnancyDiv, pregnancy);
+ }));
+ }
+ } else if (PC.pregWeek < 0) {
+ text.push(`You're still recovering from your recent pregnancy.`);
+ } else if (PC.bellyImplant > -1) {
+ text.push(`Your abdominal implant rests in your womb, blocking any chance of conception.`);
+ } else if (PC.preg === -3) {
+ text.push(`You've been sterilized and will never have children.`);
+ } else if (PC.preg === -2) {
+ text.push(`You're barren and can't get pregnant.`);
+ } else if (PC.pubertyXX === 0) {
+ text.push(`Your eggs aren't quite ready yet.`);
+ } else if (PC.ovaryAge >= 47) {
+ text.push(`You're menopausal. Your time to bear children has passed.`);
+ } else if (PC.preg === -1) {
+ text.push(`You're currently on birth control.`);
+ links.push(
+ App.UI.DOM.disabledLink(`Start taking birth control`, [
+ `You are already taking birth control.`
+ ]),
+ App.UI.DOM.link(`Stop taking birth control`, () => {
+ V.PC.preg = 0;
- App.UI.DOM.replace(reputationDiv, reputation);
+ App.UI.DOM.replace(pregnancyDiv, pregnancy);
}),
);
- }
-
- return customTitleDiv;
- }
-
- function renamePlayer() {
- newNameDiv.append(
- `New name: `,
- App.UI.DOM.makeTextBox(PC.slaveName, (name) => {
- V.PC.slaveName = name;
- repX(-500, "event");
-
- App.UI.DOM.replace(reputationDiv, reputation);
- }),
- );
-
- renamePlayerDiv.append(App.UI.DOM.linkReplace(`Rename yourself`, newNameDiv));
- App.UI.DOM.appendNewElement("span", renamePlayerDiv, ` Will cost you some reputation`, ['note']);
-
- return renamePlayerDiv;
- }
-
- function rumors() {
- App.UI.DOM.appendNewElement("h3", rumorsDiv, `Rumors`);
-
- App.Events.addNode(rumorsDiv, [getPlayerRumors()]);
-
- return rumorsDiv;
-
- function getPlayerRumors() {
- if (PC.degeneracy > 100) {
- return `There are severe and devastating rumors about you spreading across the arcology.`;
- } else if (PC.degeneracy > 75) {
- return `There are severe rumors about you spreading across the arcology.`;
- } else if (PC.degeneracy > 50) {
- return `There are bad rumors about you spreading across the arcology.`;
- } else if (PC.degeneracy > 25) {
- return `There are rumors about you spreading across the arcology.`;
- } else if (PC.degeneracy > 10) {
- return `There are minor rumors about you spreading across the arcology.`;
+ text.push(App.UI.DOM.generateLinksStrip(links));
+ } else if (PC.preg === 0) {
+ // check if the player is already taking fertility drugs as refreshment
+ const fertRefresh = PC.refreshment.toLowerCase().indexOf("fertility") !== -1 ? 1 : 0;
+ if (fertRefresh) {
+ text.push(`You're currently fertile and enjoying ${PC.refreshment}; a risky combination.`);
} else {
- return `The occasional rumor about you can be heard throughout the arcology.`;
- }
- }
- }
-
- function family() {
- App.UI.DOM.appendNewElement("h3", familyDiv, `Family`);
-
- familyDiv.append(App.UI.DOM.linkReplace(`Pull up the file on your family tree`, renderFamilyTree(V.slaves, -1)));
-
- if (totalPlayerRelatives(PC) > 0 || (V.showMissingSlaves && (PC.mother in V.missingTable || PC.father in V.missingTable))) {
- App.Events.addNode(familyDiv, [App.Desc.family(PC)]);
- }
-
- return familyDiv;
- }
-
- function pregnancy() {
- const text = [];
-
- const miniSceneSpan = App.UI.DOM.appendNewElement("span", pregnancyDiv);
- const abortLink = App.UI.DOM.link(`Abort the child`, () => {
- TerminatePregnancy(V.PC);
-
- // App.UI.DOM.linkReplace does not support handlers afaik
- App.UI.DOM.replace(miniSceneSpan, `You take a syringe filled with abortifacients and make yourself comfortable. Injecting the vial through your belly into your womb, your close your eyes and wait for what is coming. Once you feel it is over, you clean yourself up and go on your way, child free.`);
- App.UI.DOM.replace(appearanceDiv, appearance);
- App.UI.DOM.replace(drugsDiv, drugs);
- });
-
- App.UI.DOM.appendNewElement("h2", pregnancyDiv, `Contraceptives and Fertility`);
-
- if (PC.preg < 6 && PC.pregKnown) {
- miniSceneSpan.append(`Your period is late, so the first thing you do is test yourself for a potential pregnancy. A pregnancy test confirms `, App.UI.DOM.makeElement("span", `you are pregnant. `, ['pregnant']));
-
- if (V.arcologies[0].FSRestart === "unset" || V.eugenicsFullControl === 1 || (V.PC.pregSource !== -1 && V.PC.pregSource !== -6)) {
- miniSceneSpan.append(abortLink);
-
- text.push(miniSceneSpan);
+ text.push(`You're currently fertile.`);
}
- } else if (PC.labor === 1) {
- text.push(`You are beginning to feel contractions; you'll be giving birth soon.`);
- } else if (PC.preg >= 39) {
- text.push(`Your due date is looming, but your ${PC.pregType > 1 ? `children don't` : `child doesn't`} seem to be interested in coming out just yet.`);
-
- text.push(miniSceneSpan, App.UI.DOM.link(`Induce childbirth`, () => {
- V.PC.labor = 1;
-
- App.UI.DOM.replace(pregnancyDiv, pregnancy);
- }));
- } else if (PC.pregKnown) {
- text.push(`You're pregnant, something rather unbecoming for an arcology owner.`);
-
- if (V.arcologies[0].FSRestart === "unset" || V.eugenicsFullControl === 1 || (V.PC.pregSource !== -1 && V.PC.pregSource !== -6)) {
- miniSceneSpan.append(abortLink);
-
- text.push(miniSceneSpan);
+ if (PC.forcedFertDrugs > 0) {
+ text.push(`You feel a strange eagerness whenever you think of bareback sex.`);
}
+ links.push(
+ App.UI.DOM.link(`Start taking birth control`, () => {
+ V.PC.preg = -1;
+ App.UI.DOM.replace(pregnancyDiv, pregnancy);
+ }),
+ App.UI.DOM.disabledLink(`Stop taking birth control`, [
+ `You are not currently taking birth control.`
+ ]),
+ );
+ text.push(App.UI.DOM.generateLinksStrip(links));
}
App.Events.addNode(pregnancyDiv, text);
@@ -717,7 +523,7 @@ App.UI.managePersonalAffairs = function() {
const partners = new Map([
[-1, "you"],
- [-2, `citizens of ${V.arcologies[0].name}`],
+ [-2, `citizens of ${arcology.name}`],
[-3, `your former master`],
[-4, `another arcology owner`],
[-6, `members of the Societal Elite`],
@@ -834,62 +640,6 @@ App.UI.managePersonalAffairs = function() {
return breedingDiv;
}
-
- function cumTap() {
- const text = [];
-
- if (V.dairyPiping && (cumSlaves().length > 0 || V.arcologies[0].FSPastoralistLaw === 1)) {
- if (PC.skill.cumTap === 0) {
- text.push(
- `The tap connected to ${V.dairyName} has a variety of attachments, one of which being a very tantalizing dick-shaped nozzle. It looks like it would be a perfect fit for you, if you were curious, that is.`,
- App.UI.DOM.passageLink(`No one is looking...`, 'FSelf'),
- );
- } else {
- text.push(
- `The tap connected to ${V.dairyName} is calling to you. Begging to let it fill you with cum again. If you wanted to try and go bigger, that is.`,
- App.UI.DOM.generateLinksStrip([
- App.UI.DOM.passageLink(`Sounds fun!`, 'FSelf'),
- App.UI.DOM.link(`You only want to get pregnant`, () => {
- V.PC.preg = 1;
- V.PC.pregSource = 0;
- V.PC.pregKnown = 1;
- V.PC.pregType = setPregType(V.PC);
-
- WombImpregnate(V.PC, V.PC.pregType, 0, 1);
-
- App.UI.DOM.replace(cumTapDiv, cumTap);
- })
- ])
- );
- }
- }
-
- App.Events.addNode(cumTapDiv, text);
-
- return cumTapDiv;
- }
-
- function impregnateSelf() {
- const text = [];
-
- if (V.PC.vagina > 0 && V.PC.dick) {
- if (V.PC.counter.birthSelf > 0) {
- text.push(
- `Who better to impregnate you than you?`,
- App.UI.DOM.passageLink(`Impregnate yourself`, 'MpregSelf'),
- );
- } else {
- text.push(
- `You have an empty vagina, a working set of balls, and a strong craving for a hot creampie. Who better to give it to you than you?`,
- App.UI.DOM.passageLink(`Grab an extra syringe`, 'MpregSelf'),
- );
- }
- }
-
- App.Events.addNode(impregnateSelfDiv, text);
-
- return impregnateSelfDiv;
- }
}
function diet() {
@@ -912,6 +662,8 @@ App.UI.managePersonalAffairs = function() {
text.push(`You are eating energy rich food and spending ${PC.muscles > 0 ? "extra " : ""}time in the gym.`);
} else if (PC.diet === "exotic") {
text.push(`You are eating exotic foods to boost your energy in bed.`);
+ } else if (PC.diet === "medicinal") {
+ text.push(`You are eating medicinal foods to ${PC.health.condition < 90 ? "better" : "solidify"} your health.`);
} else if (PC.diet === "corrective") {
text.push(`The automated feeder is controlling your portions in order to correct your weight.`);
} else if (PC.diet === "cum production") {
@@ -947,7 +699,7 @@ App.UI.managePersonalAffairs = function() {
links.push(App.UI.DOM.disabledLink(`Cleanse`, [
`${onDiet}`,
]));
- } else if (PC.condition < 90 || PC.chem >= 10) {
+ } else if (PC.health.condition < 90 || PC.chem >= 10) {
links.push(App.UI.DOM.link(`Cleanse`, () => {
PC.diet = "cleansing";
App.UI.DOM.replace(dietDiv, diet);
@@ -977,7 +729,7 @@ App.UI.managePersonalAffairs = function() {
links.push(App.UI.DOM.disabledLink(`Correct weight`, [
`${onDiet}`,
]));
- } else if (slave.weight > 10 || slave.weight < -10) {
+ } else if (PC.weight > 10 || PC.weight < -10) {
links.push(App.UI.DOM.link(`Correct weight`, () => {
PC.diet = "corrective";
App.UI.DOM.replace(dietDiv, diet);
@@ -992,7 +744,7 @@ App.UI.managePersonalAffairs = function() {
links.push(App.UI.DOM.disabledLink(`Gain weight`, [
`${onDiet}`,
]));
- } else if (PC.weight >= -95) {
+ } else if (PC.weight <= 195) {
links.push(App.UI.DOM.link(`Gain weight`, () => {
PC.diet = "fattening";
App.UI.DOM.replace(dietDiv, diet);
@@ -1006,29 +758,37 @@ App.UI.managePersonalAffairs = function() {
links.push(App.UI.DOM.disabledLink(`Build muscle`, [
`${onDiet}`,
]));
- } else if (PC.muscles < 100 && !isAmputee(PC)) {
+ } else if (PC.muscles < 100 && !isAmputee(PC) && !onBedRest(PC)) {
links.push(App.UI.DOM.link(`Build muscle`, () => {
PC.diet = "muscle building";
App.UI.DOM.replace(dietDiv, diet);
}));
- } else if (!isAmputee(PC)) {
+ } else if (isAmputee(PC)) {
links.push(App.UI.DOM.disabledLink(`Build muscle`, [
- `You can't get any stronger`,
+ `You can't work out with no limbs`,
+ ]));
+ } else if (onBedRest(PC)) {
+ links.push(App.UI.DOM.disabledLink(`Build muscle`, [
+ `You are in no condition to work out`,
]));
} else {
links.push(App.UI.DOM.disabledLink(`Build muscle`, [
- `You can't work out with no limbs`,
+ `You can't get any stronger`,
]));
}
if (PC.diet === "slimming") {
links.push(App.UI.DOM.disabledLink(`Slim down`, [
`${onDiet}`,
]));
- } else if (PC.muscles > 0 && canWalk(PC)) {
+ } else if (PC.muscles > 0 && canWalk(PC) && !onBedRest(PC)) {
links.push(App.UI.DOM.link(`Slim down`, () => {
PC.diet = "slimming";
App.UI.DOM.replace(dietDiv, diet);
}));
+ } else if (onBedRest(PC)) {
+ links.push(App.UI.DOM.disabledLink(`Build muscle`, [
+ `You are in no condition to be doing cardio`,
+ ]));
} else if (!canWalk(PC)) {
links.push(App.UI.DOM.disabledLink(`Slim down`, [
`You can't focus on cardio if you can't walk`,
@@ -1113,6 +873,16 @@ App.UI.managePersonalAffairs = function() {
App.UI.DOM.replace(dietDiv, diet);
}));
}
+ if (PC.diet === "medicinal") {
+ links.push(App.UI.DOM.disabledLink(`Medicinal`, [
+ `${onDiet}`,
+ ]));
+ } else {
+ links.push(App.UI.DOM.link(`Medicinal`, () => {
+ PC.diet = "medicinal";
+ App.UI.DOM.replace(dietDiv, diet);
+ }));
+ }
}
text.push(App.UI.DOM.generateLinksStrip(links));
@@ -1123,165 +893,714 @@ App.UI.managePersonalAffairs = function() {
}
function drugs() {
- const staminaDrugsDiv = document.createElement("div");
- const contraceptivesDiv = document.createElement("div");
- const fertilityDrugsDiv = document.createElement("div");
+ const hormonesDiv = document.createElement("div");
+ const playerDrugsDiv = document.createElement("div");
+ const pregDrugsDiv = document.createElement("div");
+ const aphrodisiacDiv = document.createElement("div");
App.UI.DOM.appendNewElement("h2", drugsDiv, `Drugs`);
- drugsDiv.append(staminaDrugs());
-
- if (PC.vagina !== -1) {
- drugsDiv.append(
- contraceptives(),
- fertilityDrugs(),
- );
+ drugsDiv.append(playerDrugs());
+ if (PC.hormones !== 0 || V.consumerDrugs !== 0) {
+ drugsDiv.append(hormones());
}
+ if (PC.pregControl !== "none") {
+ drugsDiv.append(pregDrugs());
+ }
+ drugsDiv.append(aphrodisiacs());
return drugsDiv;
- function staminaDrugs() {
- const linkDiv = App.UI.DOM.makeElement("div", null, ['indent']);
-
- if (PC.staminaPills) {
- staminaDrugsDiv.append(`You are currently taking stamina enhancing pills in order to enjoy more slaves per week.`);
- linkDiv.append(App.UI.DOM.link(`Stop taking stamina enhancing drugs`, () => {
- V.PC.staminaPills = 0;
-
+ function hormones() {
+ App.UI.DOM.appendNewElement("h3", hormonesDiv, `Hormones`);
+ if (PC.hormones !== 0) {
+ const linkDiv = App.UI.DOM.makeElement("div", null, ['indent']);
+ hormonesDiv.append(`You are currently taking ${PC.hormones === 1 ? "female" : "male"} hormones.`);
+ if (V.consumerDrugs !== 1) {
+ linkDiv.append(App.UI.DOM.link(`Stop filling your prescription`, () => {
+ V.PC.hormones = 0;
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ App.UI.DOM.appendNewElement("div", linkDiv, `You will need to visit your doctor to start a new prescription.`, ["indent", "note"]);
+ } else {
+ linkDiv.append(App.UI.DOM.link(`Stop taking them`, () => {
+ V.PC.hormones = 0;
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ hormonesDiv.append(linkDiv);
+ } else {
+ const links = [];
+ hormonesDiv.append(`You are not taking any hormones. `);
+ links.push(App.UI.DOM.link(`Male hormones`, () => {
+ V.PC.hormones = -1;
App.UI.DOM.replace(drugsDiv, drugs);
}));
- } else {
- staminaDrugsDiv.append(`You are not on any stamina enhancers.`);
- linkDiv.append(App.UI.DOM.link(`More stamina means more sex`, () => {
- V.PC.staminaPills = 1;
-
+ links.push(App.UI.DOM.link(`Female hormones`, () => {
+ V.PC.hormones = 1;
App.UI.DOM.replace(drugsDiv, drugs);
}));
+ hormonesDiv.append(App.UI.DOM.generateLinksStrip(links));
}
- staminaDrugsDiv.append(linkDiv);
-
- return staminaDrugsDiv;
+ return hormonesDiv;
}
- function contraceptives() {
- const text = [];
- const links = [];
+ function playerDrugs() {
+ const consumerDrugsDiv = document.createElement("div");
+ const buyDrugsDiv = document.createElement("div");
+ const slaveDrugsDiv = document.createElement("div");
- if (PC.preg >= 8) {
- text.push(`You're currently ${num(PC.preg)} ${PC.preg > 1 ? `weeks` : `week`} pregnant, so contraception doesn't matter right now.`);
- } else if (PC.preg >= 6) {
- text.push(`You're having morning sickness.`);
- } else if (PC.preg > 1) {
- text.push(`You've missed your period. This could be bad.`);
- } else if (PC.preg > 0) {
- text.push(`Your fertile pussy has been thoroughly seeded; there is a chance you are pregnant.`);
+ if (PC.drugs !== "no drugs") {
+ playerDrugsDiv.append(`You are currently using ${PC.drugs}.`);
+ playerDrugsDiv.append(App.UI.DOM.link(` Stop taking them`, () => {
+ V.PC.drugs = "no drugs";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ if ((["breast enhancers", "butt enhancers", "lip enhancers", "penis enlargers", "testicle enlargers", "fertility supplements"].includes(PC.drugs) && V.consumerDrugs === 0) || (["hip wideners", "detox pills"].includes(PC.drugs))) {
+ App.UI.DOM.appendNewElement("div", playerDrugsDiv, `You will need to visit your doctor to start a new prescription.`, ["indent", "note"]);
+ }
+ } else {
+ playerDrugsDiv.append(`You are not using any pharmaceutical drugs.`);
+ }
- if (V.arcologies[0].FSRestart === "unset" || V.eugenicsFullControl === 1 || (V.PC.pregSource !== -1 && V.PC.pregSource !== -6)) {
- text.push(App.UI.DOM.link(`Pop some morning after pills`, () => {
- WombFlush(V.PC);
+ App.UI.DOM.appendNewElement("h3", playerDrugsDiv, `Consumer-grade`);
+ playerDrugsDiv.append(consumerDrugs());
+ if (V.consumerDrugs === 0 && V.dispensary === 1 && PC.skill.medicine >= 100) {
+ playerDrugsDiv.append(buyConsumerDrugs());
+ }
+ App.UI.DOM.appendNewElement("h3", playerDrugsDiv, `Slave-grade`);
+ playerDrugsDiv.append(slaveDrugs());
+
+ return playerDrugsDiv;
+
+ function consumerDrugs() {
+ const text = [];
+ const links = [];
+
+ if (V.consumerDrugs === 1) {
+ if (PC.drugs !== "breast enhancers") {
+ if (PC.boobs < 50000) {
+ links.push(App.UI.DOM.link(`Breast enhancers`, () => {
+ PC.drugs = "breast enhancers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Breast enhancers`, [
+ `Breasts are too big for the patches to work`,
+ ]));
+ }
+ }
+ if (PC.drugs !== "butt enhancers") {
+ if (PC.butt < 20) {
+ links.push(App.UI.DOM.link(`Butt enhancers`, () => {
+ PC.drugs = "butt enhancers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Butt enhancers`, [
+ `Butt is too large for the patches to work`,
+ ]));
+ }
+ }
+ if (PC.drugs !== "lip enhancers") {
+ if (PC.lips < 100 || (PC.lips <= 85 && V.seeExtreme !== 1)) {
+ links.push(App.UI.DOM.link(`Lip enhancers`, () => {
+ PC.drugs = "lip enhancers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Lip enhancers`, [
+ `Lips cannot grow larger`,
+ ]));
+ }
+ }
+ if (PC.drugs !== "penis enlargers") {
+ if (PC.dick > 0 || PC.vagina >= 0) {
+ if (PC.dick > 0) {
+ if (PC.dick < 30) {
+ links.push(App.UI.DOM.link(`Penis enlargers`, () => {
+ PC.drugs = "penis enlargers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Penis enlargers`, [
+ `Penis is too large for the patches to work`,
+ ]));
+ }
+ } else {
+ if (PC.clit < 5) {
+ links.push(App.UI.DOM.link(`Clit enlargers`, () => {
+ PC.drugs = "penis enlargers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Clit enlargers`, [
+ `Clit can't get any bigger`,
+ ]));
+ }
+ }
+ }
+ }
+ if (PC.drugs !== "testicle enlargers") {
+ if (PC.balls > 0 && PC.scrotum > 0) {
+ if (PC.balls < 125) {
+ links.push(App.UI.DOM.link(`Testicle enlargers`, () => {
+ PC.drugs = "testicle enlargers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Testicle enlargers`, [
+ `Balls are too large for the patches to work`,
+ ]));
+ }
+ }
+ }
+ if (PC.drugs !== "fertility supplements") {
+ links.push(App.UI.DOM.link(`Fertility supplements`, () => {
+ PC.drugs = "fertility supplements";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ }
- App.UI.DOM.replace(appearanceDiv, appearance);
- App.UI.DOM.replace(reputationDiv, reputation);
- App.UI.DOM.replace(contraceptivesDiv, contraceptives);
+ if (PC.drugs !== "stamina enhancers") {
+ links.push(App.UI.DOM.link(`Stamina enhancers`, () => {
+ PC.drugs = "stamina enhancers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ if (PC.drugs !== "appetite suppressors") {
+ links.push(App.UI.DOM.link(`Appetite suppressors`, () => {
+ PC.drugs = "appetite suppressors";
+ App.UI.DOM.replace(drugsDiv, drugs);
}));
}
- } else if (PC.pregWeek < 0) {
- text.push(`You're still recovering from your recent pregnancy.`);
- } else if (PC.preg === -2) {
- text.push(`You're menopausal. Your time to bear children has passed.`);
- } else if (PC.preg === -1) {
- text.push(`You're currently on birth control.`);
- links.push(
- App.UI.DOM.disabledLink(`Start taking birth control`, [
- `You are already taking birth control.`
- ]),
- App.UI.DOM.link(`Stop taking birth control`, () => {
- V.PC.preg = 0;
- App.UI.DOM.replace(contraceptivesDiv, contraceptives);
- }),
- );
- } else if (PC.preg === 0) {
- text.push(`You're currently fertile.`);
- links.push(
- App.UI.DOM.link(`Start taking birth control`, () => {
- V.PC.preg = -1;
- V.PC.fertDrugs = 0;
+ text.push(App.UI.DOM.generateLinksStrip(links));
+
+ App.Events.addNode(consumerDrugsDiv, text);
+
+ return consumerDrugsDiv;
+ }
- App.UI.DOM.replace(contraceptivesDiv, contraceptives);
+ function buyConsumerDrugs() {
+ const drugsCash = 20000;
+ buyDrugsDiv.append(
+ App.UI.DOM.link(`Purchase a prescription drug license`, () => {
+ V.consumerDrugs = 1;
+ cashX(forceNeg(drugsCash), "capEx");
+
+ App.UI.DOM.replace(drugsDiv, drugs);
}),
- App.UI.DOM.disabledLink(`Stop taking birth control`, [
- `You are not currently taking birth control.`
- ]),
);
+ App.UI.DOM.appendNewElement("span", buyDrugsDiv, ` Will cost you ${(cashFormat(drugsCash))}`, ['note']);
+
+ return buyDrugsDiv;
}
- text.push(App.UI.DOM.generateLinksStrip(links));
+ function slaveDrugs() {
+ const text = [];
+ const links = [];
+ if (arcology.FSSlaveProfessionalismResearch === 1) {
+ if (PC.drugs !== "psychostimulants") {
+ if (canImproveIntelligence(PC)) {
+ links.push(App.UI.DOM.link(`Psychostimulants`, () => {
+ PC.drugs = "psychostimulants";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Psychostimulants`, [
+ `Cannot improve intelligence further this way`,
+ ]));
+ }
+ }
+ }
+
+ if (arcology.FSAssetExpansionistResearch === 1) {
+ if (PC.drugs !== "hyper breast injections") {
+ if (PC.boobs < 50000) {
+ links.push(App.UI.DOM.link(`Hyper breast injections`, () => {
+ PC.drugs = "hyper breast injections";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Hyper breast injections`, [
+ `Breasts are too big for the drugs to work`,
+ ]));
+ }
+ }
+ }
+ if (PC.drugs !== "breast injections" && PC.drugs !== "intensive breast injections") {
+ if (PC.boobs < 50000) {
+ if (PC.drugs !== "breast injections") {
+ links.push(App.UI.DOM.link(`Breast injections`, () => {
+ PC.drugs = "breast injections";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ if (PC.drugs !== "intensive breast injections") {
+ links.push(App.UI.DOM.link(`Intensive breast injections`, () => {
+ PC.drugs = "intensive breast injections";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Breast injections`, [
+ `Breasts are too big for the drugs to work`,
+ ]));
+ }
+ }
+ if (arcology.FSSlimnessEnthusiastResearch === 1) {
+ if (PC.drugs !== "breast redistributors") {
+ if ((PC.boobs - PC.boobsImplant - PC.boobsMilk) > 100) {
+ links.push(App.UI.DOM.link(`Breast redistributors`, () => {
+ PC.drugs = "breast redistributors";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Breast redistributors`, [
+ `Already flat enough`,
+ ]));
+ }
+ }
+ }
- App.Events.addNode(contraceptivesDiv, text);
+ if (V.dispensary) {
+ if (PC.drugs !== "nipple enhancers") {
+ if (["inverted", "partially inverted", "cute", "tiny", "puffy", "flat"].includes(PC.nipples)) {
+ links.push(App.UI.DOM.link(`Nipple enhancers`, () => {
+ PC.drugs = "nipple enhancers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else if (PC.nipples === "huge") {
+ links.push(App.UI.DOM.disabledLink(`Nipple enhancers`, [
+ `Nipples cannot get any larger`,
+ ]));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Nipple enhancers`, [
+ `Will not affect your nipples`,
+ ]));
+ }
+ }
+ }
+ if (arcology.FSSlimnessEnthusiastResearch === 1) {
+ if (PC.drugs !== "nipple atrophiers") {
+ if (PC.nipples === "huge" || PC.nipples === "puffy" || PC.nipples === "cute") {
+ links.push(App.UI.DOM.link(`Nipple atrophiers`, () => {
+ PC.drugs = "nipple atrophiers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Nipple atrophiers`, [
+ `Will not affect your nipples`,
+ ]));
+ }
+ }
+ }
- return contraceptivesDiv;
- }
+ if (arcology.FSAssetExpansionistResearch === 1) {
+ if (PC.drugs !== "hyper butt injections") {
+ if (PC.butt < 20) {
+ links.push(App.UI.DOM.link(`Hyper butt injections`, () => {
+ PC.drugs = "hyper butt injections";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Hyper butt injections`, [
+ `Ass cannot grow larger`,
+ ]));
+ }
+ }
+ }
+ if (PC.drugs !== "butt injections" && PC.drugs !== "intensive butt injections") {
+ if (PC.butt < 9) {
+ if (PC.drugs !== "butt injections") {
+ links.push(App.UI.DOM.link(`Butt injections`, () => {
+ PC.drugs = "butt injections";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ if (PC.drugs !== "intensive butt injections") {
+ links.push(App.UI.DOM.link(`Intensive butt injections`, () => {
+ PC.drugs = "intensive butt injections";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Butt injections`, [
+ `Ass is too big for the drugs to work`,
+ ]));
+ }
+ }
+ if (arcology.FSSlimnessEnthusiastResearch === 1) {
+ if (PC.drugs !== "butt redistributors") {
+ if (PC.butt - PC.buttImplant > 0) {
+ links.push(App.UI.DOM.link(`Butt redistributors`, () => {
+ PC.drugs = "butt redistributors";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Butt redistributors`, [
+ `No ass left to lose`,
+ ]));
+ }
+ }
+ }
- function fertilityDrugs() {
- const text = [];
- const links = [];
+ if (V.dispensary) {
+ if (PC.drugs !== "lip injections") {
+ if (PC.lips <= 95 || (PC.lips <= 85 && V.seeExtreme !== 1)) {
+ links.push(App.UI.DOM.link(`lip injections`, () => {
+ PC.drugs = "lip injections";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`lip injections`, [
+ `Lips cannot grow larger`,
+ ]));
+ }
+ }
+ }
+ if (arcology.FSSlimnessEnthusiastResearch === 1) {
+ if (PC.drugs !== "lip atrophiers") {
+ if (PC.lips - PC.lipsImplant > 0) {
+ links.push(App.UI.DOM.link(`Lip atrophiers`, () => {
+ PC.drugs = "lip atrophiers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Lip atrophiers`, [
+ `No lip left to give`,
+ ]));
+ }
+ }
+ }
- // check if the player is already taking fertility drugs as refreshment
- const fertRefresh = PC.refreshment.toLowerCase().indexOf("fertility") !== -1 ? 1 : 0;
+ if (arcology.FSAssetExpansionistResearch === 1) {
+ if (PC.drugs !== "hyper penis enhancement") {
+ if (PC.dick > 0) {
+ if (PC.dick < 30) {
+ links.push(App.UI.DOM.link(`Hyper penis enhancement`, () => {
+ PC.drugs = "hyper penis enhancement";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Hyper penis enhancement`, [
+ `Dick cannot grow larger`,
+ ]));
+ }
+ } else {
+ if (PC.clit < 5) {
+ links.push(App.UI.DOM.link(`Hyper clitoris enhancement`, () => {
+ PC.drugs = "hyper penis enhancement";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Hyper clitoris enhancement`, [
+ `Clit cannot grow larger`,
+ ]));
+ }
+ }
+ }
+ }
+ if (PC.drugs !== "penis enhancement" && PC.drugs !== "intensive penis enhancement") {
+ if (PC.dick > 0) {
+ if (PC.dick < 10) {
+ if (PC.drugs !== "penis enhancement") {
+ links.push(App.UI.DOM.link(`Penis enhancement`, () => {
+ PC.drugs = "penis enhancement";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ if (PC.drugs !== "intensive penis enhancement") {
+ links.push(App.UI.DOM.link(`Intensive penis enhancement`, () => {
+ PC.drugs = "intensive penis enhancement";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Penis enhancement`, [
+ `Dick is too big for the drugs to work`,
+ ]));
+ }
+ } else {
+ if (PC.clit < 5) {
+ if (PC.drugs !== "penis enhancement") {
+ links.push(App.UI.DOM.link(`Clitoris enhancement`, () => {
+ PC.drugs = "penis enhancement";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ if (PC.drugs !== "intensive penis enhancement") {
+ links.push(App.UI.DOM.link(`Intensive clitoris enhancement`, () => {
+ PC.drugs = "intensive penis enhancement";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Penis enhancement`, [
+ `Clit cannot grow larger`,
+ ]));
+ }
+ }
+ }
+ if (arcology.FSSlimnessEnthusiastResearch === 1) {
+ if (PC.drugs !== "penis atrophiers") {
+ if (PC.dick > 1) {
+ links.push(App.UI.DOM.link(`Penile atrophiers`, () => {
+ PC.drugs = "penis atrophiers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Penile atrophiers`, [
+ `Dick cannot possibly get smaller`,
+ ]));
+ }
+ }
+ if (PC.drugs !== "clitoris atrophiers") {
+ if (PC.clit > 0) {
+ links.push(App.UI.DOM.link(`Clitoral atrophiers`, () => {
+ PC.drugs = "clitoris atrophiers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Clitoral atrophiers`, [
+ `Clit cannot possibly get smaller`,
+ ]));
+ }
+ }
+ }
+ if (PC.drugs !== "priapism agents") {
+ if (PC.dick.isBetween(0, 11) && !canAchieveErection(PC)) {
+ links.push(App.UI.DOM.link(`Priapism agents`, () => {
+ PC.drugs = "priapism agents";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ }
- if (PC.fertDrugs === 1) {
- text.push(`You are currently taking fertility supplements${fertRefresh ? ` on top of the ${PC.refreshment}` : ``}.`);
+ if (PC.balls > 0) {
+ if (arcology.FSAssetExpansionistResearch === 1) {
+ if (PC.drugs !== "hyper testicle enhancement") {
+ links.push(App.UI.DOM.link(`Hyper testicle enhancement`, () => {
+ PC.drugs = "hyper testicle enhancement";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ }
+ if (PC.drugs !== "testicle enhancement" && PC.drugs !== "intensive testicle enhancement") {
+ links.push(App.UI.DOM.link(`Testicle enhancement`, () => {
+ PC.drugs = "testicle enhancement";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ links.push(App.UI.DOM.link(`Intensive testicle enhancement`, () => {
+ PC.drugs = "intensive testicle enhancement";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ }
- if (PC.forcedFertDrugs > 0) {
- text.push(`You feel a strange eagerness whenever you think of bareback sex.`);
+ if (PC.drugs !== "fertility drugs") {
+ links.push(App.UI.DOM.link(`Fertility drugs`, () => {
+ PC.drugs = "fertility drugs";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ if (PC.drugs !== "super fertility drugs") {
+ if (V.seeHyperPreg === 1 && V.superFertilityDrugs === 1) {
+ links.push(App.UI.DOM.link(`Super fertility drugs`, () => {
+ PC.drugs = "super fertility drugs";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
}
- links.push(
- App.UI.DOM.disabledLink(`Start taking fertility drugs`, [
- `You are already taking fertility drugs.`
- ]),
- App.UI.DOM.link(`Stop taking fertility drugs`, () => {
- V.PC.fertDrugs = 0;
+ if (V.precociousPuberty === 1 && V.pubertyHormones === 1) {
+ if (PC.balls > 0 && PC.pubertyXY === 0) {
+ if (PC.drugs !== "male hormone injections") {
+ links.push(App.UI.DOM.link(`XY injections`, () => {
+ PC.drugs = "male hormone injections";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ }
+ if ((PC.ovaries === 1 || PC.mpreg === 1) && PC.pubertyXX === 0) {
+ if (PC.drugs !== "female hormone injections") {
+ links.push(App.UI.DOM.link(`XX injections`, () => {
+ PC.drugs = "female hormone injections";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ }
+ }
+ if (PC.drugs !== "hormone blockers") {
+ links.push(App.UI.DOM.link(`Hormone blockers`, () => {
+ PC.drugs = "hormone blockers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ if (PC.drugs !== "hormone enhancers") {
+ links.push(App.UI.DOM.link(`Hormone enhancers`, () => {
+ PC.drugs = "hormone enhancers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
- App.UI.DOM.replace(fertilityDrugsDiv, fertilityDrugs);
- })
- );
- } else {
- text.push(`You are not on any fertility supplements${fertRefresh ? `, other than the ${PC.refreshment}, of course` : ``}.`);
+ if (arcology.FSSlimnessEnthusiastResearch === 1) {
+ if (PC.drugs !== "labia atrophiers") {
+ if (PC.labia > 0) {
+ links.push(App.UI.DOM.link(`Labia atrophiers`, () => {
+ PC.drugs = "labia atrophiers";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ }
+ }
+ if (V.growthStim === 1) {
+ if (PC.drugs !== "growth stimulants") {
+ if (canImproveHeight(PC)) {
+ links.push(App.UI.DOM.link(`Growth stimulants`, () => {
+ PC.drugs = "growth stimulants";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Growth stimulants`, [
+ `Your body just cannot grow any more`,
+ ]));
+ }
+ }
+ }
+ links.push(App.UI.DOM.link(`Steroids`, () => {
+ PC.drugs = "steroids";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ if (PC.boobs > 250 && PC.boobShape !== "saggy" && V.purchasedSagBGone === 1) {
+ if (PC.drugs !== "sag-B-gone") {
+ links.push(App.UI.DOM.link(`Sag-B-Gone breast lifting cream`, () => {
+ PC.drugs = "sag-B-gone";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ }
+ }
+ if (arcology.FSYouthPreferentialistResearch === 1) {
+ if (PC.drugs !== "anti-aging cream") {
+ if (PC.visualAge > 18) {
+ links.push(App.UI.DOM.link(`Anti-aging cream`, () => {
+ PC.drugs = "anti-aging cream";
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(`Anti-aging cream`, [
+ `Cream alone can only get you so far`,
+ ]));
+ }
+ }
+ }
- if (PC.forcedFertDrugs > 0) {
- text.push(`You feel a strange eagerness whenever you think of bareback sex.`);
+ text.push(App.UI.DOM.generateLinksStrip(links));
+
+ App.Events.addNode(slaveDrugsDiv, text);
+
+ if (canEatFood(PC)) {
+ if ((arcology.FSBodyPuristLaw === 0 && V.healthyDrugsUpgrade === 0) || (["hyper breast injections", "hyper butt injections", "growth stimulants", "hyper penis enhancement", "hyper testicle enhancement", "super fertility drugs"].includes(PC.drugs))) {
+ App.UI.DOM.appendNewElement("div", slaveDrugsDiv, `Most slave-grade drugs are unhealthy and should be used sparingly.`, ["indent", "note"]);
+ }
}
- if (PC.preg === 0) {
- links.push(
- App.UI.DOM.link(`Start taking fertility drugs`, () => {
- V.PC.fertDrugs = 1;
+ return slaveDrugsDiv;
+ }
+ }
+
+ function pregDrugs() {
+ const text = [];
+
+ App.UI.DOM.appendNewElement("h3", pregDrugsDiv, `Pregnancy Drugs`);
+ pregDrugsDiv.append(`You are currently using labor suppressors to delay birth.`);
+ text.push(
+ App.UI.DOM.link(`Stop taking them`, () => {
+ PC.pregControl = "none";
+ App.UI.DOM.replace(appearanceDiv, appearance);
+ App.UI.DOM.replace(drugsDiv, drugs);
+ })
+ );
+ App.Events.addNode(pregDrugsDiv, text);
+
+ return pregDrugsDiv;
+ }
+
+ function aphrodisiacs() {
+ const text = [];
- App.UI.DOM.replace(fertilityDrugsDiv, fertilityDrugs);
+ App.UI.DOM.appendNewElement("h3", aphrodisiacDiv, `Aphrodisiacs`);
+ if (PC.aphrodisiacs > 0) {
+ if (PC.addict > 10) {
+ text.push(`You are enjoying aphrodisiacs and how fun they are to use.`);
+ } else if (PC.addict > 3) {
+ text.push(`You are currently enjoying aphrodisiacs and how fun they make sex.`);
+ } else {
+ text.push(`You are currently using aphrodisiacs to supercharge your sex drive.`);
+ }
+ if (random(1, 100) > PC.addict * 4) {
+ text.push(
+ App.UI.DOM.link(`Stop taking them`, () => {
+ PC.aphrodisiacs = 0;
+ App.UI.DOM.replace(appearanceDiv, appearance);
+ App.UI.DOM.replace(drugsDiv, drugs);
})
);
} else {
- links.push(
- App.UI.DOM.disabledLink(`Start taking fertility drugs`, [
- PC.preg > 0 ? `You are already pregnant.` : `You cannot get pregnant`
+ const addicted = ["Yeah right", "How about not?", "Maybe later...", "Tomorrow seems better...", "Yeah, no", "Not happening", "Would rather not", "Feels too good", "No stopping it"];
+ text.push(
+ App.UI.DOM.disabledLink(`Stop taking them`, [
+ `${jsEither(addicted)}`,
])
);
}
- links.push(
- App.UI.DOM.disabledLink(`Stop taking fertility drugs`, [
- `You are not currently taking fertility drugs.`
- ]),
+ } else if (PC.aphrodisiacs < 0) {
+ text.push(`You are currently using anaphrodisiacs to reign in your sex drive.`);
+ text.push(
+ App.UI.DOM.link(`Stop taking them`, () => {
+ PC.aphrodisiacs = 0;
+ App.UI.DOM.replace(appearanceDiv, appearance);
+ App.UI.DOM.replace(drugsDiv, drugs);
+ })
+ );
+ } else if (PC.addict > 10) {
+ text.push(`You are currently cut off from your aphrodisiacs by that fucking bitch of a PA.`);
+ text.push(
+ App.UI.DOM.link(`Override your decision`, () => {
+ PC.aphrodisiacs = 1;
+ App.UI.DOM.replace(appearanceDiv, appearance);
+ App.UI.DOM.replace(drugsDiv, drugs);
+ })
);
+ } else {
+ text.push(`You are not taking any aphrodisiacs.`);
+ if (PC.addict > 0) {
+ text.push(
+ App.UI.DOM.link(`But you could be...`, () => {
+ PC.aphrodisiacs = 1;
+ App.UI.DOM.replace(appearanceDiv, appearance);
+ App.UI.DOM.replace(drugsDiv, drugs);
+ })
+ );
+ } else {
+ text.push(
+ App.UI.DOM.link(`Start taking them`, () => {
+ PC.aphrodisiacs = 1;
+ App.UI.DOM.replace(appearanceDiv, appearance);
+ App.UI.DOM.replace(drugsDiv, drugs);
+ })
+ );
+ }
+ }
+ App.Events.addNode(aphrodisiacDiv, text);
+ if (PC.aphrodisiacs === 0 && PC.addict === 0) {
+ App.UI.DOM.appendNewElement("div", aphrodisiacDiv, `Aphrodisiacs will increase the amount of sex you can have in a week, but are dangerously addictive.`, ["indent", "note"]);
}
- text.push(App.UI.DOM.generateLinksStrip(links));
-
- App.Events.addNode(fertilityDrugsDiv, text);
-
- return fertilityDrugsDiv;
+ return aphrodisiacDiv;
}
}
@@ -1302,7 +1621,6 @@ App.UI.managePersonalAffairs = function() {
]),
App.UI.DOM.link(`Stop using the milkers`, () => {
V.PC.rules.lactation = "maintain";
-
App.UI.DOM.replace(lactationDiv, lactation);
}),
App.UI.DOM.disabledLink(`Use the penthouse milkers`, [
@@ -1322,7 +1640,6 @@ App.UI.managePersonalAffairs = function() {
]),
App.UI.DOM.link(`Use the penthouse milkers`, () => {
V.PC.rules.lactation = "sell";
-
App.UI.DOM.replace(lactationDiv, lactation);
}),
])
@@ -1337,12 +1654,10 @@ App.UI.managePersonalAffairs = function() {
App.UI.DOM.generateLinksStrip([
App.UI.DOM.link(`Stop milking yourself`, () => {
V.PC.rules.lactation = "none";
-
App.UI.DOM.replace(lactationDiv, lactation);
}),
App.UI.DOM.link(`Stop using the milkers`, () => {
V.PC.rules.lactation = "maintain";
-
App.UI.DOM.replace(lactationDiv, lactation);
}),
App.UI.DOM.disabledLink(`Use the penthouse milkers`, [
@@ -1356,7 +1671,6 @@ App.UI.managePersonalAffairs = function() {
App.UI.DOM.generateLinksStrip([
App.UI.DOM.link(`Stop milking yourself`, () => {
V.PC.rules.lactation = "none";
-
App.UI.DOM.replace(lactationDiv, lactation);
}),
App.UI.DOM.disabledLink(`Keep yourself milked`, [
@@ -1364,7 +1678,6 @@ App.UI.managePersonalAffairs = function() {
]),
App.UI.DOM.link(`Use the penthouse milkers`, () => {
V.PC.rules.lactation = "sell";
-
App.UI.DOM.replace(lactationDiv, lactation);
}),
])
@@ -1378,12 +1691,10 @@ App.UI.managePersonalAffairs = function() {
]),
App.UI.DOM.link(`Keep yourself milked`, () => {
V.PC.rules.lactation = "maintain";
-
App.UI.DOM.replace(lactationDiv, lactation);
}),
App.UI.DOM.link(`Use the penthouse milkers`, () => {
V.PC.rules.lactation = "sell";
-
App.UI.DOM.replace(lactationDiv, lactation);
}),
])
@@ -1397,7 +1708,6 @@ App.UI.managePersonalAffairs = function() {
`You are spending time stimulating your breasts and nipples to bring in your milk.`,
App.UI.DOM.link(`Lose interest.`, () => {
V.PC.rules.lactation = "none";
-
App.UI.DOM.replace(lactationDiv, lactation);
})
);
@@ -1405,7 +1715,6 @@ App.UI.managePersonalAffairs = function() {
text.push(
App.UI.DOM.link(`Sounds fun!`, () => {
V.PC.rules.lactation = "induce";
-
App.UI.DOM.replace(lactationDiv, lactation);
})
);
@@ -1424,4 +1733,471 @@ App.UI.managePersonalAffairs = function() {
return breederExamDiv;
}
+
+ function perversions() {
+ const bloatingDiv = document.createElement("div");
+ const cumTapDiv = document.createElement("div");
+ const impregnateSelfDiv = document.createElement("div");
+
+ App.UI.DOM.appendNewElement("h2", pervertDiv, `Perversions`);
+
+ // set these to use standard preg/inflation bars
+ if (PC.preg === 0 && PC.pregWeek === 0 && PC.vagina > -1) {
+ pervertDiv.append(
+ cumTap(),
+ impregnateSelf(),
+ );
+ }
+
+ function bloating() {
+ const text = [];
+
+ let bloating = document.createElement('div');
+ if (PC.inflation > 0) {
+ let intro = document.createElement('span');
+ intro.textContent = "Required Bloating";
+ intro.style.textDecoration = "underline";
+ bloating.append(intro);
+
+ bloating.append(": ");
+
+ let requirement = document.createElement('span');
+ requirement.style.fontWeight = "bold";
+ requirement.id = "inflate";
+ if (PC.inflation === 3) {
+ requirement.textContent = `he is required to keep 2 gallons of ${PC.inflationType} in him at all times`;
+ } else if (PC.inflation === 2) {
+ requirement.textContent = `he is required to keep 4 liters of ${PC.inflationType} in him at all times`;
+ } else if (PC.inflation === 1) {
+ requirement.textContent = `he is required to keep 2 liters of ${PC.inflationType} in him at all times`;
+ }
+ bloating.append(requirement);
+ bloating.append(". ");
+
+ let link = App.UI.DOM.link(
+ `Let $him deflate`,
+ () => {
+ deflate(PC);
+ },
+ );
+ bloating.append(link);
+ }
+
+ return bloatingDiv;
+ }
+
+ function cumTap() {
+ const text = [];
+
+ if (V.dairyPiping && (cumSlaves().length > 0 || arcology.FSPastoralistLaw === 1)) {
+ if (PC.skill.cumTap === 0) {
+ text.push(
+ `The tap connected to ${V.dairyName} has a variety of attachments, one of which being a very tantalizing dick-shaped nozzle. It looks like it would be a perfect fit for you, if you were curious, that is.`,
+ App.UI.DOM.passageLink(`No one is looking...`, 'FSelf'),
+ );
+ } else {
+ text.push(
+ `The tap connected to ${V.dairyName} is calling to you. Begging to let it fill you with cum again. If you wanted to try and go bigger, that is.`,
+ App.UI.DOM.generateLinksStrip([
+ App.UI.DOM.passageLink(`Sounds fun!`, 'FSelf'),
+ App.UI.DOM.link(`You only want to get pregnant`, () => {
+ V.PC.preg = 1;
+ V.PC.pregSource = 0;
+ V.PC.pregKnown = 1;
+ V.PC.pregType = setPregType(V.PC);
+
+ WombImpregnate(V.PC, V.PC.pregType, 0, 1);
+
+ App.UI.DOM.replace(cumTapDiv, cumTap);
+ })
+ ])
+ );
+ }
+ }
+ /*
+ if (V.dairyPiping && (cumSlaves().length > 0 || arcology.FSPastoralistLaw === 1)) {
+ if (PC.vagina > 0 || PC.anus > 0)
+ if (PC.skill.cumTap === 0) {
+ text.push(
+ `The tap connected to ${V.dairyName} has a variety of attachments, one of which being a very tantalizing dick-shaped nozzle. It looks like it would be a perfect fit for you, if you were curious, that is.`,
+ App.UI.DOM.passageLink(`No one is looking...`, 'FSelf'),
+ );
+ } else {
+ text.push(
+ `The tap connected to ${V.dairyName} is calling to you. Begging to let it fill you with cum again. If you wanted to try and go bigger, that is.`,
+ App.UI.DOM.passageLink(`Sounds fun!`, 'FSelf');
+ if (canGetPregnant(PC)) {
+ App.UI.DOM.link(`You only want to get pregnant`, () => {
+ PC.preg = 1;
+ PC.pregSource = 0;
+ PC.pregKnown = 1;
+ PC.pregType = setPregType(V.PC);
+
+ WombImpregnate(PC, PC.pregType, 0, 1);
+
+ App.UI.DOM.replace(cumTapDiv, cumTap);
+ });
+ }
+ );
+ }
+ }
+ */
+
+ App.Events.addNode(cumTapDiv, text);
+
+ return cumTapDiv;
+ }
+
+ function impregnateSelf() {
+ const text = [];
+
+ if (V.PC.vagina > 0 && V.PC.dick) {
+ if (V.PC.counter.birthSelf > 0) {
+ text.push(
+ `Who better to impregnate you than you?`,
+ App.UI.DOM.passageLink(`Impregnate yourself`, 'MpregSelf'),
+ );
+ } else {
+ text.push(
+ `You have an empty vagina, a working set of balls, and a strong craving for a hot creampie. Who better to give it to you than you?`,
+ App.UI.DOM.passageLink(`Grab an extra syringe`, 'MpregSelf'),
+ );
+ }
+ }
+ /*
+ if ((canImpreg(PC, PC) || canFemPreg(PC, PC)) && PC.counter.birthSelf > 0) {
+ text.push(
+ `Who better to impregnate you than you?`,
+ App.UI.DOM.passageLink(`Impregnate yourself`, 'MpregSelf'),
+ );
+ } else if (PC.balls > 0 && PC.energy > 20) {
+ if (PC.vagina >= 0) {
+ text.push(
+ `You have a${PC.vagina > 0 ? "n empty" : " tingling feeling in your"} vagina, a working set of balls, and a strong craving for a hot creampie. Who better to give it to you than you?`,
+ App.UI.DOM.passageLink(`Grab an extra syringe`, 'MpregSelf'),
+ );
+ } else if (PC.anus > 0) {
+ text.push(
+ `You have an empty anus, a working set of balls, and a strong craving for a hot creampie. Who better to give it to you than you?`,
+ App.UI.DOM.passageLink(`Grab an extra syringe`, 'MpregSelf'),
+ );
+ }
+ }
+ */
+
+ App.Events.addNode(impregnateSelfDiv, text);
+
+ return impregnateSelfDiv;
+ }
+
+ return pervertDiv;
+ }
+
+ function socials() {
+ const weddingDiv = document.createElement("div");
+ const FCTVDiv = document.createElement("div");
+ let text = [];
+
+ if (V.weddingPlanned) {
+ text.push(wedding());
+ }
+
+ if (V.FCTV.receiver) {
+ text.push(FCTV());
+ }
+
+ App.Events.addNode(socialDiv, text);
+
+ function wedding() {
+ const text = [];
+
+ App.UI.DOM.appendNewElement("h2", weddingDiv, `Wedding`);
+
+ text.push(`You have a wedding planned for this weekend; you are`);
+
+ if (V.weddingPlanned === 1) {
+ text.push(`marrying`);
+ } else if (V.weddingPlanned === 2) {
+ text.push(`sharing`);
+ } else if (V.weddingPlanned === 3) {
+ text.push(`knocking up`);
+ } else {
+ throw new Error(`Invalid V.weddingPlanned value of '${V.weddingPlanned}' in managePersonalAffairs()`);
+ }
+
+ text.push(
+ marryingList(),
+ App.UI.DOM.link(`Cancel it`, () => {
+ V.weddingPlanned = 0;
+ V.marrying = [];
+
+ App.UI.DOM.replace(appearanceDiv, appearance);
+ })
+ );
+
+ App.Events.addNode(weddingDiv, text);
+
+ return weddingDiv;
+
+ function marryingList() {
+ const listSpan = document.createElement("span");
+
+ listSpan.append(
+ App.UI.DOM.toSentence(V.marrying.map(id => App.UI.DOM.passageLink(SlaveFullName(getSlave(id)), 'Slave Interact'))),
+ `.`,
+ );
+
+ return listSpan;
+ }
+ }
+
+ function FCTV() {
+ const text = [];
+ const links = [];
+
+ App.UI.DOM.appendNewElement("h2", FCTVDiv, `FCTV`);
+
+ if (V.FCTV.pcViewership.frequency === 1) {
+ text.push(`You make sure to tune in to FCTV at least once a week.`);
+ } else if (V.FCTV.pcViewership.frequency === 2) {
+ text.push(`You make sure to tune in to FCTV at least once biweekly.`);
+ } else if (V.FCTV.pcViewership.frequency === 4) {
+ text.push(`You make sure to tune in to FCTV at least once a month.`);
+ } else {
+ text.push(`You don't watch FCTV.`);
+ }
+
+ if (V.FCTV.pcViewership.frequency === 1) {
+ links.push(App.UI.DOM.disabledLink(`Watch every week`, [
+ `You are already watching every week.`,
+ ]));
+ } else {
+ links.push(App.UI.DOM.link(`Watch every week`, () => {
+ V.FCTV.pcViewership.frequency = 1;
+ App.UI.DOM.replace(FCTVDiv, FCTV);
+ }));
+ }
+ if (V.FCTV.pcViewership.frequency === 2) {
+ links.push(App.UI.DOM.disabledLink(`Watch every other week`, [
+ `You are already watching every other week.`,
+ ]));
+ } else {
+ links.push(App.UI.DOM.link(`Watch every other week`, () => {
+ V.FCTV.pcViewership.frequency = 2;
+ App.UI.DOM.replace(FCTVDiv, FCTV);
+ }));
+ }
+ if (V.FCTV.pcViewership.frequency === 4) {
+ links.push(App.UI.DOM.disabledLink(`Watch once a month`, [
+ `You are already watching once a month.`,
+ ]));
+ } else {
+ links.push(App.UI.DOM.link(`Watch once a month`, () => {
+ V.FCTV.pcViewership.frequency = 4;
+ App.UI.DOM.replace(FCTVDiv, FCTV);
+ }));
+ }
+ if (V.FCTV.pcViewership.frequency === -1) {
+ links.push(App.UI.DOM.disabledLink(`Ignore it`, [
+ `You are already not watching.`,
+ ]));
+ } else {
+ links.push(App.UI.DOM.link(`Ignore it`, () => {
+ V.FCTV.pcViewership.frequency = -1;
+ App.UI.DOM.replace(FCTVDiv, FCTV);
+ }));
+ }
+
+ if (V.saveImported > 0 && !V.FCTV.remote) {
+ text.push(
+ `You know TVs should have a remote.`,
+ App.UI.DOM.link(`Buy one yourself`, () => {
+ V.FCTV.remote = 1;
+
+ cashX(forceNeg(100 * V.upgradeMultiplierTrade), "capEx");
+ App.UI.DOM.replace(FCTVDiv, FCTV);
+ })
+ );
+ }
+
+ text.push(App.UI.DOM.generateLinksStrip(links));
+
+ App.Events.addNode(FCTVDiv, text);
+
+ return FCTVDiv;
+ }
+
+ return socialDiv;
+ }
+
+ function skills() {
+ App.UI.DOM.appendNewElement("h2", skillsDiv, `Personal Skills`);
+
+ skillsDiv.append(`You ponder what skills may be useful in running your arcology.`);
+
+ App.UI.DOM.appendNewElement("div", skillsDiv, `Trading: ${getPlayerTradingSkill()}`);
+ App.UI.DOM.appendNewElement("div", skillsDiv, `Warfare: ${getPlayerWarfareSkill()}`);
+ App.UI.DOM.appendNewElement("div", skillsDiv, `Slaving: ${getPlayerSlavingSkill()}`);
+ App.UI.DOM.appendNewElement("div", skillsDiv, `Engineering: ${getPlayerEngineeringSkill()}`);
+ App.UI.DOM.appendNewElement("div", skillsDiv, `Medicine: ${getPlayerMedicineSkill()}`);
+ App.UI.DOM.appendNewElement("div", skillsDiv, `Hacking: ${getPlayerHackingSkill()}`);
+
+ return skillsDiv;
+
+ function getPlayerTradingSkill() {
+ if (PC.skill.trading >= 100) {
+ return `You are a master at economics and trading.`;
+ } else if (PC.skill.trading >= 80) {
+ return `You are an expert at economics and trading.`;
+ } else if (PC.skill.trading >= 60) {
+ return `You are skilled in economics and trading.`;
+ } else if (PC.skill.trading >= 40) {
+ return `You know some things about economics and trading.`;
+ } else if (PC.skill.trading >= 20) {
+ return `You are a beginner in economics.`;
+ } else if (PC.skill.trading >= 0) {
+ return `You know only the basics of trading.`;
+ } else if (PC.skill.trading >= -20) {
+ return `You know how to haggle a little.`;
+ } else if (PC.skill.trading >= -40) {
+ return `You know how to shop around.`;
+ } else if (PC.skill.trading >= -60) {
+ return `You know not to pay sticker price.`;
+ } else if (PC.skill.trading >= -80) {
+ return `People always give you discounts, but you never save any money.`;
+ } else {
+ return `They said it was a bear market, so where are the bears?`;
+ }
+ }
+
+ function getPlayerWarfareSkill() {
+ if (PC.skill.warfare >= 100) {
+ return `You are a master of warfare.`;
+ } else if (PC.skill.warfare >= 80) {
+ return `You are an expert at tactics and strategy.`;
+ } else if (PC.skill.warfare >= 60) {
+ return `You are skilled in combat.`;
+ } else if (PC.skill.warfare >= 40) {
+ return `You know some things about combat.`;
+ } else if (PC.skill.warfare >= 20) {
+ return `You are a beginner in tactics and strategy.`;
+ } else if (PC.skill.warfare >= 0) {
+ return `You know only the basics of fighting.`;
+ } else if (PC.skill.warfare >= -20) {
+ return `You know how to hold a gun.`;
+ } else if (PC.skill.warfare >= -40) {
+ return `You know how to stab with a knife.`;
+ } else if (PC.skill.warfare >= -60) {
+ return `Go for the throat?`;
+ } else if (PC.skill.warfare >= -80) {
+ return `Just kick them in the balls, right?`;
+ } else {
+ return `People like you are usually the first raped in a war.`;
+ }
+ }
+
+ function getPlayerSlavingSkill() {
+ if (PC.skill.slaving >= 100) {
+ return `You are a master slaver.`;
+ } else if (PC.skill.slaving >= 80) {
+ return `You are an expert at enslaving.`;
+ } else if (PC.skill.slaving >= 60) {
+ return `You are skilled in slaving.`;
+ } else if (PC.skill.slaving >= 40) {
+ return `You know some things about getting slaves.`;
+ } else if (PC.skill.slaving >= 20) {
+ return `You are a beginner in slaving.`;
+ } else if (PC.skill.slaving >= 0) {
+ return `You know only the basics of slaving.`;
+ } else if (PC.skill.slaving >= -20) {
+ return `You know how to avoid becoming a slave.`;
+ } else if (PC.skill.slaving >= -40) {
+ return `You know to read contracts before you sign them.`;
+ } else if (PC.skill.slaving >= -60) {
+ return `You know to be careful.`;
+ } else if (PC.skill.slaving >= -80) {
+ return `You know better than to trust anyone.`;
+ } else {
+ return `It would be easy to enslave you.`;
+ }
+ }
+
+ function getPlayerEngineeringSkill() {
+ if (PC.skill.engineering >= 100) {
+ return `You are a master engineer.`;
+ } else if (PC.skill.engineering >= 80) {
+ return `You are an expert at engineering.`;
+ } else if (PC.skill.engineering >= 60) {
+ return `You are skilled in engineering.`;
+ } else if (PC.skill.engineering >= 40) {
+ return `You know some things about engineering.`;
+ } else if (PC.skill.engineering >= 20) {
+ return `You are a beginner in engineering.`;
+ } else if (PC.skill.engineering >= 0) {
+ return `You know only the basics of engineering.`;
+ } else if (PC.skill.engineering >= -20) {
+ return `You can build a gingerbread house that doesn't collapse.`;
+ } else if (PC.skill.engineering >= -40) {
+ return `You can tie a tight knot, does that count?`;
+ } else if (PC.skill.engineering >= -60) {
+ return `Glue is your friend; lots of it.`;
+ } else if (PC.skill.engineering >= -80) {
+ return `You know better than to even try to build something.`;
+ } else {
+ return `You can cook; that's sort of like building something, right?`;
+ }
+ }
+
+ function getPlayerMedicineSkill() {
+ if (PC.skill.medicine >= 100) {
+ return `You are a master surgeon.`;
+ } else if (PC.skill.medicine >= 80) {
+ return `You are an expert at medicine and surgery.`;
+ } else if (PC.skill.medicine >= 60) {
+ return `You are skilled in surgery.`;
+ } else if (PC.skill.medicine >= 40) {
+ return `You know some things about medicine.`;
+ } else if (PC.skill.medicine >= 20) {
+ return `You are a beginner in medicine.`;
+ } else if (PC.skill.medicine >= 0) {
+ return `You know the basics of treating injuries.`;
+ } else if (PC.skill.medicine >= -20) {
+ return `You can stop a wound from getting infected.`;
+ } else if (PC.skill.medicine >= -40) {
+ return `Gauze is your friend. Just keep wrapping.`;
+ } else if (PC.skill.medicine >= -60) {
+ return `You know how to apply a band-aid.`;
+ } else if (PC.skill.medicine >= -80) {
+ return `Cure-alls are wonderful. Why aren't they sold in stores, though?`;
+ } else {
+ return `Alcohol makes pain go away, right?`;
+ }
+ }
+
+ function getPlayerHackingSkill() {
+ if (PC.skill.hacking >= 100) {
+ return `You are a master of hacking.`;
+ } else if (PC.skill.hacking >= 80) {
+ return `You are an expert at hacking.`;
+ } else if (PC.skill.hacking >= 60) {
+ return `You are skilled in hacking.`;
+ } else if (PC.skill.hacking >= 40) {
+ return `You know some things about hacking.`;
+ } else if (PC.skill.hacking >= 20) {
+ return `You are a beginner in hacking.`;
+ } else if (PC.skill.hacking >= 0) {
+ return `You know only the basics of hacking.`;
+ } else if (PC.skill.hacking >= -20) {
+ return `You know how to click a mouse.`;
+ } else if (PC.skill.hacking >= -40) {
+ return `Enter does something?`;
+ } else if (PC.skill.hacking >= -60) {
+ return `Where is the "any" key?`;
+ } else if (PC.skill.hacking >= -80) {
+ return `You can push the power button, good job.`;
+ } else {
+ return `This black box thingy is magical.`;
+ }
+ }
+ }
};
diff --git a/src/player/pcSalon.js b/src/player/pcSalon.js
new file mode 100644
index 0000000000000000000000000000000000000000..2f2404674fc40ab8d7e23bb0cfd3ef19a56cdfad
--- /dev/null
+++ b/src/player/pcSalon.js
@@ -0,0 +1,635 @@
+/**
+ * UI for the Salon. Refreshes without refreshing the passage.
+ * @param {App.Entity.PlayerState} PC
+ */
+App.UI.playerSalon = function(PC) {
+ const container = document.createElement("span");
+ container.id = "salon";
+
+ container.append(createPage());
+ return container;
+
+ function createPage() {
+ const el = new DocumentFragment();
+
+ el.append(intro());
+ el.append(eyewear());
+ if (getBestVision(PC) > 0) {
+ if (
+ (["leopard", "tiger", "jaguar"].includes(PC.earT) && PC.earTColor !== "hairless") ||
+ ["leopard", "tiger", "jaguar", "gazelle", "tanuki", "raccoon"].includes(PC.tailShape) ||
+ PC.wingsShape === "moth"
+ ) {
+ el.append(pattern());
+ }
+ el.append(ears());
+ if (PC.horn !== "none") {
+ el.append(horns());
+ }
+ el.append(hair());
+ /*
+ el.append(makeup());
+ el.append(nails());
+ */
+ el.append(bodyHair());
+ if (PC.tail !== "none") {
+ el.append(tail());
+ }
+ if (PC.appendages !== "none") {
+ el.append(appendages());
+ }
+ el.append(skin());
+ }
+ return el;
+ }
+
+ function intro() {
+ const el = new DocumentFragment();
+ App.UI.DOM.appendNewElement("h1", el, "Personal Salon");
+ App.UI.DOM.appendNewElement("div", el, `You unpack your personal salon kit so that you may adjust your appearance.`, "scene-intro");
+ return el;
+ }
+
+ function eyewear() {
+ const el = new DocumentFragment();
+ App.UI.DOM.appendNewElement("h3", el, "Eyewear");
+ const r = [];
+ const options = new App.UI.OptionsGroup();
+
+ if (getBestVision(PC) === 0) {
+ r.push(`You are blind; you have no idea what any of this stuff is. Oh hey! Glasses!`);
+ } else if (anyVisionEquals(PC, 1)) {
+ r.push(`You are nearsighted`);
+ } else {
+ r.push(`Your vision is normal`);
+ }
+
+ const option = options.addOption(r.join(" "), "eyewear", PC)
+ .addValue("None", "none")
+ .addValue("Cosmetic glasses", "glasses");
+ if (getBestVision(PC) !== 0 && anyVisionEquals(PC, 1)) {
+ option.addValue("Corrective glasses", "corrective glasses");
+ if (hasAnyEyes(PC)) {
+ option.addValue("Corrective contacts", "corrective contacts");
+ }
+ }
+ el.append(options.render());
+
+ el.append(App.Medicine.Modification.eyeSelector(PC));
+ return el;
+ }
+
+ function pattern() {
+ const el = new DocumentFragment();
+ App.UI.DOM.appendNewElement("h3", el, "Pattern");
+
+ el.append(App.Medicine.Salon.pattern(PC));
+
+ return el;
+ }
+
+ function ears() {
+ const el = new DocumentFragment();
+ App.UI.DOM.appendNewElement("h3", el, "Ears");
+ const r = [];
+ const options = new App.UI.OptionsGroup();
+
+ if (PC.earImplant === 1) {
+ r.push(`You have artificial inner ear implants`);
+ } else if (PC.hears < -1) {
+ r.push(`You are deaf`);
+ } else if (PC.hears > -1) {
+ r.push(`Your hearing is normal`);
+ } else {
+ r.push(`You are hard of hearing`);
+ }
+ const option = options.addOption(r.join(" "), "earwear", PC)
+ .addValue("None", "none");
+ // Hard of hearing
+ if (PC.hears === -1 && PC.earImplant !== 1) {
+ option.addValue("Hearing aids", "hearing aids");
+ }
+
+ // Top ear Color
+ if (PC.earT !== "none" && PC.earTColor !== "hairless") {
+ let title;
+ let option;
+ let showChoices = true;
+ const filtered = App.Medicine.Modification.Color.Primary.filter(c => ![PC.earTColor].includes(c.value));
+
+ title = `You have ${PC.earTColor} ears${PC.earTEffect === "none" ? `.` : ` with ${PC.earTEffect}.`}`;
+ App.UI.DOM.appendNewElement("div", el, title);
+
+ if (showChoices) {
+ if (PC.earTEffect !== "none" || PC.earTEffectColor !== "none") {
+ options.addCustomOption("")
+ .addButton("Remove effect", () => {
+ PC.earTEffect = "none";
+ PC.earTEffectColor = "none";
+ App.UI.reload();
+ });
+ }
+
+ option = options.addOption("Fur Color", "earTColor", PC);
+ for (const color of App.Medicine.Modification.Color.Primary) {
+ option.addValue(capFirstChar(color.value), color.value);
+ }
+ option.pulldown();
+
+ option = options.addOption("Effect color", "earTEffectColor", PC);
+ for (const color of filtered) {
+ option.addValue(capFirstChar(color.value), color.value);
+ }
+ option.pulldown();
+
+ option = options.addOption("Effect", "earTEffect", PC);
+ for (const color of App.Medicine.Modification.Color.Effect) {
+ option.addValue(capFirstChar(color.value), `${PC.earTEffectColor} ${color.value}`);
+ }
+ option.pulldown();
+ }
+ }
+ el.append(options.render());
+
+ return el;
+ }
+
+ function horns() {
+ const el = new DocumentFragment();
+ App.UI.DOM.appendNewElement("h3", el, "Horns");
+ const options = new App.UI.OptionsGroup();
+
+ const option = options.addOption(`Dye your ${PC.horn}`, "hornColor", PC);
+ for (const hornColor of App.Medicine.Modification.hornColor) {
+ option.addValue(capFirstChar(hornColor), hornColor);
+ }
+
+ el.append(options.render());
+
+ return el;
+ }
+
+ function makeup() {
+ const el = new DocumentFragment();
+ App.UI.DOM.appendNewElement("h3", el, "Makeup");
+ const r = [];
+ const options = new App.UI.OptionsGroup();
+
+ // Needs descriptions
+ options.addOption(r.join(" "), "makeup", PC)
+ .addValue("Makeup free", 0)
+ .addValue("Nice", 1)
+ .addValue("Gorgeous", 2)
+ .addValue("Slutty", 4)
+ .addValue("Color-coordinate with hair", 3);
+
+ options.addOption("", "makeup", PC)
+ .addValue("Neon", 5)
+ .addValue("Neon, color-coordinate with hair", 6);
+
+ options.addOption("", "makeup", PC)
+ .addValue("Metallic", 7)
+ .addValue("Metallic, color-coordinate with hair", 8);
+
+ el.append(options.render());
+
+ return el;
+ }
+
+ function nails() {
+ const el = new DocumentFragment();
+ App.UI.DOM.appendNewElement("h3", el, "Nails");
+ const r = [];
+ const options = new App.UI.OptionsGroup();
+
+ // Needs descriptions
+ options.addOption(r.join(" "), "nails", PC)
+ .addValue("Neatly clipped", 0)
+ .addValue("Long and elegant", 1)
+ .addValue("Sharp and claw-like", 3)
+ .addValue("Bright and glittery", 4)
+ .addValue("Very long and garish", 5)
+ .addValue("Color-coordinate with hair", 2);
+
+ options.addOption("", "nails", PC)
+ .addValue("Neon", 6)
+ .addValue("Neon, color-coordinate with hair", 7);
+
+ options.addOption("", "nails", PC)
+ .addValue("Metallic", 8)
+ .addValue("Metallic, color-coordinate with hair", 9);
+
+ el.append(options.render());
+
+ return el;
+ }
+
+ function hair() {
+ const el = new DocumentFragment();
+ let option;
+ App.UI.DOM.appendNewElement("h3", el, "Hair");
+ const options = new App.UI.OptionsGroup();
+ let title;
+ let showChoices = true;
+ const hasWig = (PC.bald === 1 && PC.hStyle !== "bald");
+ const filtered = App.Medicine.Modification.Color.Primary.filter(c => ![PC.hColor].includes(c.value));
+
+ if (PC.bald === 1) {
+ if (PC.hStyle === "bald") {
+ title = `You are completely bald.`;
+ showChoices = false;
+ } else {
+ title = `You're wearing a ${PC.hColor}${PC.hEffect === "none" ? `` : ` with ${PC.hEffect}`} wig.`;
+ }
+ } else {
+ title = `You have ${PC.hColor} hair${PC.hEffect === "none" ? `` : ` with ${PC.hEffect}`}.`;
+ }
+ App.UI.DOM.appendNewElement("div", el, title);
+
+ if (PC.bald === 1) {
+ options.addOption(`Use a wig`, "hStyle", PC)
+ .addValue("Enable", "neat").on()
+ .addValue("Disable", "bald").off();
+ }
+
+ if (showChoices) {
+ if (PC.hLength > 1) {
+ // Color
+ if (PC.hEffectColor !== "none" || PC.hEffect !== "none") {
+ options.addCustomOption("")
+ .addButton("Remove effects", () => {
+ PC.hEffectColor = "none";
+ PC.hEffect = "none";
+ App.UI.reload();
+ });
+ }
+ option = options.addOption("Primary color", "hColor", PC);
+ if (PC.origHColor !== PC.hColor) {
+ option.addValue("Restore your natural color", PC.origHColor);
+ }
+ for (const color of App.Medicine.Modification.Color.Primary) {
+ option.addValue(capFirstChar(color.value), color.value);
+ }
+ option.pulldown();
+
+ option = options.addOption("Effect", "hEffect", PC);
+ for (const color of App.Medicine.Modification.Color.Effect) {
+ option.addValue(capFirstChar(color.value), `${PC.hEffectColor} ${color.value}`);
+ }
+ option.pulldown();
+
+ option = options.addOption("Effect color", "hEffectColor", PC);
+ for (const color of filtered) {
+ option.addValue(capFirstChar(color.value), color.value);
+ }
+ option.pulldown();
+ }
+ /*
+ // Style
+ if (PC.hLength > 1) {
+ title = `Go get your ${hasWig ? "wig" : "hair"} styled `;
+ } else {
+ title = `Your ${hasWig ? "wig" : "hair"} is too short to style meaningfully`;
+ }
+ option = options.addOption(title, "hStyle", PC);
+ if (PC.hLength > 1) {
+ for (const style of App.Medicine.Modification.hairStyles.Normal) {
+ option.addValue(style.title, style.value, billMod);
+ }
+ option.pulldown();
+ }
+
+ // Style + Cut
+ if (PC.hLength > 1) {
+ option = options.addOption(`${hasWig ? "Change wig style and length" : "Cut and style hair"}`, "hStyle", PC);
+ if (PC.hLength > 1) {
+ for (const style of App.Medicine.Modification.hairStyles.Cut) {
+ option.addValue(
+ style.title,
+ style.value,
+ () => {
+ PC.hLength = style.hLength;
+ billMod();
+ });
+ }
+ }
+ }
+ */
+
+ // Length
+ option = options.addOption(`${hasWig ? "Choose a longer or shorter wig" : "Cut or lengthen hair"}`, "hLength", PC);
+ if (PC.hLength > 0) {
+ for (const style of App.Medicine.Modification.hLength) {
+ if (
+ (style.hasOwnProperty("requirements") && !style.requirements(PC)) ||
+ (style.hLength && style.hLength > PC.hLength)
+ ) {
+ continue;
+ }
+ option.addValue(style.title, style.hLength);
+ }
+ if (!PC.bald && PC.hLength < 150) {
+ option.addValue("Apply extensions", PC.hLength + 10);
+ }
+ } else {
+ option.addValue("Apply hair growth stimulating treatment", 1);
+ }
+
+ option.showTextBox();
+
+ // Maintain
+ if (!hasWig) {
+ options.addOption(`Keep your hair this length`, "haircuts", PC)
+ .addValue("Enable", 1).on()
+ .addValue("Disable", 0).off();
+ }
+ }
+
+ el.append(options.render());
+ return el;
+ }
+
+ function bodyHair() {
+ const el = new DocumentFragment();
+ const options = new App.UI.OptionsGroup();
+ let option;
+ let r = [];
+ App.UI.DOM.appendNewElement("h3", el, "Body hair");
+
+ // Eyebrows
+ if (PC.eyebrowHStyle !== "bald") {
+ // Describe and change color
+ if (PC.eyebrowHStyle === "shaved" || PC.eyebrowHStyle === "bald") {
+ r.push(`Your eyebrows would be ${PC.eyebrowHColor} if you had any.`);
+ } else {
+ r.push(`You have ${PC.eyebrowHColor} eyebrows.`);
+ }
+
+ option = options.addOption(r.join(" "), "eyebrowHColor", PC);
+ if (PC.eyebrowHColor !== PC.hColor) {
+ option.addValue("Match your hair", PC.hColor);
+ }
+ option.addValueList(makeAList(App.Medicine.Modification.Color.Primary.map(color => color.value)));
+ option.pulldown();
+
+ // Style
+ option = options.addOption(`Style your ${PC.eyebrowHStyle} eyebrows`, "eyebrowHStyle", PC).showTextBox();
+ for (const fullness of App.Medicine.Modification.eyebrowStyles) {
+ option.addValue(capFirstChar(fullness), fullness);
+ }
+ option.pulldown();
+
+ // Fullness
+ option = options.addOption(`Adjust your ${PC.eyebrowFullness} eyebrows' fullness`, "eyebrowFullness", PC);
+ for (const fullness of App.Medicine.Modification.eyebrowFullness) {
+ option.addValue(capFirstChar(fullness), fullness);
+ }
+ option.pulldown();
+ } else {
+ options.addComment(`You have no eyebrows.`);
+ }
+
+ // Pubic hair
+ const pubertyAge = Math.min(PC.pubertyAgeXX, PC.pubertyAgeXY);
+ r = [];
+ const hasPubes = (PC.pubicHStyle !== "bald" && PC.pubicHStyle !== "hairless" && PC.physicalAge >= pubertyAge - 1);
+ const hasPitHair = (PC.underArmHStyle !== "bald" && PC.underArmHStyle !== "hairless" && PC.physicalAge >= pubertyAge - 1);
+ if (hasPubes) {
+ if (PC.physicalAge < pubertyAge) {
+ r.push(`You've got a growing patch of wispy ${PC.pubicHColor} pubic hair.`);
+ } else if (PC.pubicHStyle === "in a strip") {
+ r.push(`You have a shaved strip of ${PC.pubicHColor} pubic hair.`);
+ } else if (PC.pubicHStyle === "waxed") {
+ r.push(`Your pubes would be ${PC.pubicHColor} if you stopped waxing them.`);
+ } else {
+ r.push(`Your ${PC.pubicHStyle} pubic hair is ${PC.pubicHColor}.`);
+ }
+ } else {
+ r.push(`Your groin ${!hasPitHair ? "and underarms are" : "is"} completely hairless.`);
+ }
+ option = options.addOption(r.join(" "), "pubicHColor", PC);
+ if (hasPubes) {
+ if (PC.pubicHColor !== PC.hColor) {
+ option.addValue("Match the curtains", PC.hColor);
+ }
+ option.addValueList(makeAList(App.Medicine.Modification.Color.Primary.map(color => color.value)))
+ .pulldown();
+ // Style
+ option = options.addOption(`Style your pubic hair`, "pubicHStyle", PC);
+ for (const fullness of App.Medicine.Modification.pubicStyles) {
+ option.addValue(capFirstChar(fullness), fullness);
+ }
+ option.pulldown();
+ }
+
+ // Armpit hair
+ r = [];
+ if (hasPitHair) {
+ r.push(`Your`);
+ if (PC.physicalAge < pubertyAge) {
+ r.push(`wispy underarm hair`);
+ } else {
+ r.push(`${PC.underArmHStyle} underarm hair`);
+ }
+ if (PC.underArmHStyle === "waxed") {
+ r.push(`would be ${PC.underArmHColor} if left unwaxed.`);
+ } else {
+ r.push(`is ${PC.underArmHColor}.`);
+ }
+ } else if (hasPubes) {
+ r.push(`Your underarms are completely hairless.`);
+ }
+ option = options.addOption(r.join(" "), "underArmHColor", PC);
+ if (hasPitHair) {
+ if (PC.underArmHColor !== PC.hColor) {
+ option.addValue("Match the hair", PC.hColor);
+ }
+ option.addValueList(makeAList(App.Medicine.Modification.Color.Primary.map(color => color.value)))
+ .pulldown();
+ // Style
+ option = options.addOption(`Style Your armpit hair`, "underArmHStyle", PC);
+ for (const fullness of App.Medicine.Modification.armpitStyles) {
+ option.addValue(capFirstChar(fullness), fullness);
+ }
+ option.pulldown();
+ }
+
+ el.append(options.render());
+ return el;
+ }
+
+ function tail() {
+ const el = new DocumentFragment();
+ App.UI.DOM.appendNewElement("h3", el, "Tail");
+ const options = new App.UI.OptionsGroup();
+ let title;
+ let option;
+ const filtered = App.Medicine.Modification.Color.Primary.filter(c => ![PC.tailColor].includes(c.value));
+
+ title = `Your tail is ${PC.tailColor}${PC.tailEffect === "none" ? `` : ` with ${PC.tailEffect}`}.`;
+ App.UI.DOM.appendNewElement("div", el, title);
+
+ if (PC.earT !== "none" && (PC.earTColor !== PC.tailColor || PC.earTEffect !== PC.tailEffect)) {
+ options.addCustomOption("")
+ .addButton("Match your ears", () => {
+ PC.tailColor = PC.earTColor;
+ PC.tailEffect = PC.earTEffect;
+ App.UI.reload();
+ });
+ } else if (PC.tailColor !== PC.hColor) {
+ options.addCustomOption("")
+ .addButton("Match your hair", () => {
+ PC.tailColor = PC.hColor;
+ PC.tailEffect = PC.hEffect;
+ App.UI.reload();
+ });
+ }
+
+ if (PC.tailEffect !== "none" || PC.tailEffectColor !== "none") {
+ options.addCustomOption("")
+ .addButton("Remove effects", () => {
+ PC.tailEffect = "none";
+ PC.tailEffectColor = "none";
+ App.UI.reload();
+ });
+ }
+
+ option = options.addOption("Fur Color", "tailColor", PC);
+ for (const color of App.Medicine.Modification.Color.Primary) {
+ option.addValue(capFirstChar(color.value), color.value);
+ }
+ option.pulldown();
+
+ option = options.addOption("Effect", "tailEffect", PC);
+ for (const color of App.Medicine.Modification.Color.Effect) {
+ option.addValue(capFirstChar(color.value), `${PC.tailEffectColor} ${color.value}`);
+ }
+ option.pulldown();
+
+ option = options.addOption("Effect color", "tailEffectColor", PC);
+ for (const color of filtered) {
+ option.addValue(capFirstChar(color.value), color.value);
+ }
+ option.pulldown();
+
+ el.append(options.render());
+
+ return el;
+ }
+
+ function appendages() {
+ const el = new DocumentFragment();
+ App.UI.DOM.appendNewElement("h3", el, "Appendages");
+ const options = new App.UI.OptionsGroup();
+ let title;
+ let option;
+ const filtered = App.Medicine.Modification.Color.Primary.filter(c => ![PC.appendagesColor].includes(c.value));
+
+ title = `Your appendages are ${PC.appendagesColor}${PC.appendagesEffect === "none" ? `` : ` with ${PC.appendagesEffect}`}.`;
+ App.UI.DOM.appendNewElement("div", el, title);
+
+ if (PC.appendagesEffect !== "none" || PC.appendagesEffectColor !== "none") {
+ options.addCustomOption("")
+ .addButton("Remove effects", () => {
+ PC.appendagesEffect = "none";
+ PC.appendagesEffectColor = "none";
+ App.UI.reload();
+ });
+ }
+
+ option = options.addOption("Fur Color", "appendagesColor", PC);
+ for (const color of App.Medicine.Modification.Color.Primary) {
+ option.addValue(capFirstChar(color.value), color.value);
+ }
+ option.pulldown();
+
+ option = options.addOption("Effect color", "appendagesEffectColor", PC);
+ for (const color of filtered) {
+ option.addValue(capFirstChar(color.value), color.value);
+ }
+ option.pulldown();
+
+ option = options.addOption("Effect", "appendagesEffect", PC);
+ for (const color of App.Medicine.Modification.Color.Effect) {
+ option.addValue(capFirstChar(color.value), `${PC.appendagesEffectColor} ${color.value}`);
+ }
+ option.pulldown();
+
+ el.append(options.render());
+
+ return el;
+ }
+
+ function skin() {
+ const el = new DocumentFragment();
+ let option;
+ App.UI.DOM.appendNewElement("h3", el, "Skin");
+ const options = new App.UI.OptionsGroup();
+ let comment = [];
+
+ if (!isMovable(PC)) {
+ App.UI.DOM.appendNewElement("div", el, `You can't do anything more as you are too large to leave your bed.`, "scene-intro");
+ } else {
+ App.UI.DOM.appendNewElement("div", el, `You can use the auto salon to modify yourself further.`, "skin-intro");
+
+ option = options.addOption(`You have ${PC.skin} skin.`, "skin", PC);
+ if (App.Medicine.Modification.dyedSkins.includes(PC.skin)) {
+ option.addValue("Remove coloring", PC.origSkin, billMod);
+ } else if ((PC.skin === "sun tanned") || (PC.skin === "spray tanned")) {
+ option.addValue("Remove tanning", PC.origSkin, billMod);
+ }
+
+ if (!App.Medicine.Modification.dyedSkins.includes(PC.skin)) {
+ if (PC.skin !== "sun tanned") {
+ if (skinToneLevel(PC.skin) < 6) {
+ comment.push(`Your skin is so light in color that any attempt at natural tanning is likely to damage your skin.`);
+ } else if ((skinToneLevel(PC.skin) > 20)) {
+ comment.push(`Your skin is so dark in color that any attempt at natural tanning is not likely to appear on your skin.`);
+ } else {
+ option.addValue("Sun tan", "sun tanned", billMod);
+ }
+ }
+ if (PC.skin !== "spray tanned") {
+ option.addValue("Spray tan", "sun tanned", billMod);
+ }
+ option.addComment(comment.join(" "));
+ }
+
+ option = options.addOption(`Dye or paint`, "skin", PC).showTextBox();
+ for (const dye of App.Medicine.Modification.dyedSkins) {
+ option.addValue(capFirstChar(dye), dye, billMod);
+ }
+ option.pulldown();
+
+ if (PC.markings === "beauty mark") {
+ option = options.addOption(`You have a prominent mole on your face`, "markings", PC)
+ .addValue("Remove it", "none", billMod);
+ if (PC.face > 40) {
+ option.addComment(`Your face is so attractive that the mole qualifies as a beauty mark and enhances your allure.`);
+ } else if (PC.face < -10) {
+ option.addComment(`It isn't very attractive.`);
+ } else {
+ option.addComment(`It makes you stand out more, but that's all.`);
+ }
+ }
+ if (PC.markings === "birthmark") {
+ option = options.addOption(`You have a large visible birthmark`, "markings", PC)
+ .addValue("Bleach it", "none", billMod);
+ if (PC.prestige > 0 || PC.porn.prestige > 1) {
+ option.addComment(`It makes you look unique among your peers.`);
+ }
+ }
+ }
+ el.append(options.render());
+
+ return el;
+ }
+
+ function billMod() {
+ cashX(forceNeg(V.modCost), "PCcosmetics", PC);
+ }
+
+ function makeAList(iterable) {
+ return Array.from(iterable, (k => [capFirstChar(k), k]));
+ }
+};
diff --git a/src/player/pcSurgeryDegradation.js b/src/player/pcSurgeryDegradation.js
index 68000e8d82b92cf630143aad61937b72b16ef9d9..523c89ad7f101fad94c62294b27f2c0c24b84804 100644
--- a/src/player/pcSurgeryDegradation.js
+++ b/src/player/pcSurgeryDegradation.js
@@ -147,7 +147,7 @@ App.UI.PCSurgeryDegradation = function(surgeryType) {
}
r.push(`Either way, this is a good thing. Your breasts work."`);
}
- r.push(`You can't help but moan under your building arousal as ${heU} massages and teases your implant laden breasts. "Enjoying yourself are we? Let me finish you off." ${HeU} sneaks a hand down to your`);
+ r.push(`You can't help but moan under your building arousal as ${heU} massages and teases your implant-laden breasts. "Enjoying yourself are we? Let me finish you off." ${HeU} sneaks a hand down to your`);
if (V.PC.dick !== 0) {
r.push(`stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.`);
} else {
@@ -269,7 +269,7 @@ App.UI.PCSurgeryDegradation = function(surgeryType) {
} else {
r.push(`big`);
}
- r.push(`rounded butt. "Size isn't everything in an ass, shape is important too, though I think you've got a good balance. We didn't need to do much reshaping when we put in the implant." ${HeU} begins groping your bottom, feeling the silicone filled implant for any oddities. "I know you're still a little sore, but bear with it. There, everything feels good, now rest up and you'll be set! Though you may need some help righting yourself until you get used to its added weight. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Groggy, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.`);
+ r.push(`rounded butt. "Size isn't everything in an ass, shape is important too, though I think you've got a good balance. We didn't need to do much reshaping when we put in the implant." ${HeU} begins groping your bottom, feeling the silicone-filled implant for any oddities. "I know you're still a little sore, but bear with it. There, everything feels good, now rest up and you'll be set! Though you may need some help righting yourself until you get used to its added weight. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Groggy, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.`);
break;
case "buttEnlargement":
r.push(`After a few hours, you awaken in the recovery wing, face-down in a bed made to accommodate a person with your body type, with a sore ass. You push yourself up and look at the mass under the cover behind you that is your rear, taking note of how much bigger it is now than when you arrived. "So do you like it?", asks the surgeon's assistant, seating ${himselfU} beside you and bringing ${hisU} hands to your`);
diff --git a/src/player/personalAttentionSelect.js b/src/player/personalAttentionSelect.js
index a7b4e8ae543de07adad55e1c1f3e7f2c7edb6371..d1c5cf624b4acbdd69fc24ccbff5ab83433fafd3 100644
--- a/src/player/personalAttentionSelect.js
+++ b/src/player/personalAttentionSelect.js
@@ -14,6 +14,11 @@ App.UI.Player.personalAttention = function() {
function content() {
const frag = new DocumentFragment();
+ // ensure only the maximum number of slaves are being trained
+ if (V.personalAttention.slaves && V.personalAttention.slaves.length > (V.PC.skill.slaving >= 100 ? 2 : 1)) {
+ V.personalAttention.slaves.shift();
+ }
+
frag.append(
focus(),
proclamations(),
@@ -457,10 +462,6 @@ App.UI.Player.personalAttention = function() {
if (!V.personalAttention.slaves || V.personalAttention.slaves.length === 0) {
frag.append(`You have not selected a slave for your personal attention.`);
} else {
- if (V.personalAttention.slaves.length > (V.PC.skill.slaving >= 100 ? 2 : 1)) { // ensure only the maximum number of slaves are being trained
- V.personalAttention.slaves.shift();
- }
-
for (let i = 0; i < V.personalAttention.slaves.length; i++) {
const div = App.UI.DOM.appendNewElement("div", frag, null, ['margin-bottom', 'card']);
const slave = getSlave(V.personalAttention.slaves[i].ID);
diff --git a/src/pregmod/FCTV/FCTVshows.js b/src/pregmod/FCTV/FCTVshows.js
index 1d3a2dfa50b511697ba43ff8fc4ba47c5c035d28..a099f8d79bc1527157f29f65325b8f4334b721a7 100644
--- a/src/pregmod/FCTV/FCTVshows.js
+++ b/src/pregmod/FCTV/FCTVshows.js
@@ -2263,7 +2263,7 @@ App.Data.FCTV.channels = {
r.push(`<p>At this point, her stomach is so distended that the black pitch is showing around individual feathers. Annie and Dakota lock eyes and giggle, while Kate moves to where the noose is tied.</p>`);
r.push(`<p>"Ready?" They ask the girl. She can barely open her eyes and doesn't move her head. "Ok then, here we go!"</p>`);
- r.push(`<p>Kate loosens the rope just as Annie and Dakota each lift a leg. With nothing else to support her, the girl's full weight comes to bear on the plug, which finally smears its tarry way home with a "pop." The Indian girl shudders with an impossible... orgasm? and screams.</p>`);
+ r.push(`<p>Kate loosens the rope just as Annie and Dakota each lift a leg. With nothing else to support her, the girl's full weight comes to bear on the plug, which finally smears its tarry way home with a "pop." The Indian girl screams and shudders with an impossible... orgasm?</p>`);
r.push(`<p>Annie releases the noose from the scaffold and shoves her over on her back. "You LIKED that? You disgust me." She is powerless to move, and lays there groaning and drooling beneath the weight of her stomach.</p>`);
r.push(`<p>"Better finish your drink, little chicken." Dakota wrings out the skin, and the liquid has nowhere to go but in. She neatly wraps rawhide around the bag to make sure the inflation can't reverse, and then covers the whole thing with pitch. It will not be coming undone soon.</p>`);
diff --git a/src/pregmod/blackMarket.js b/src/pregmod/blackMarket.js
index 87070aeeea7308626e30361e0c3a1285664beadc..1257bc5b2509897e3164b76ad88f1249795284d5 100644
--- a/src/pregmod/blackMarket.js
+++ b/src/pregmod/blackMarket.js
@@ -41,6 +41,24 @@ App.UI.blackMarket = function() {
options.render()
]);
+ if (V.consumerDrugs === 0 && V.dispensary === 1 && V.PC.skill.medicine < 100) {
+ r = [];
+ const drugsCash = 50000;
+ App.UI.DOM.appendNewElement("div", node, `An eclectic variety of services as well; a hacker can get you signed up for consumer-grade drug designs usually reserved for medical professionals for a mere ${(cashFormat(drugsCash))}.`);
+ if (V.cash >= drugsCash) {
+ App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
+ "Add them to the pharmaceutical fabricator",
+ () => {
+ cashX(-drugsCash, "capEx");
+ V.consumerDrugs = 1;
+ App.UI.reload();
+ }
+ ));
+ } else {
+ r.push(`<span class="cash dec">${(cashFormat(50000))}</span> is out of your price range for now.`);
+ }
+ }
+
/*
if (V.arcologies[0].FSPaternalist !== "unset") {
//<br><br>
@@ -306,9 +324,10 @@ App.UI.blackMarket = function() {
if (V.thisWeeksIllegalWares !== 0 && V.thisWeeksIllegalWares.length > 0) {
for (const ware of V.thisWeeksIllegalWares) { // TODO: why do we loop at all, instead of just checking if it's in array.
switch (ware) {
- case "childhoodFertilityInducedNCS":
+ case "childhoodFertilityInducedNCS": {
+ const NCSCash = 135000;
if (V.minimumSlaveAge <= 15) {
- r.push(App.UI.DOM.makeElement("div", `Childhood Fertility Induced NCS (Induced Neotenic Complex Syndrome or Syndrome X modified for fertility).`, "cyan"));
+ r.push(App.UI.DOM.makeElement("div", `Childhood Fertility Induced NCS (Induced Neotenic Complex Syndrome or Syndrome X modified for fertility).`, ["cyan"]));
if (V.minimumSlaveAge > 8) {
r.push(`Illegal information for the Childhood Fertility <span class="orange">Induced NCS</span> (genetic engineering and hormonal blend) research recipe.`);
App.Events.addNode(node, r, "div");
@@ -316,15 +335,6 @@ App.UI.blackMarket = function() {
r.push(`"I'm sorry, I can't sell this product to you, even if I wanted to," he says. "I have this technology, which if applied, would make slaves appear younger than the legal age of majority. I picked it up from an exotics dealer, who picked it up from some old world government research center. And yes, I know, this is a black market, and I would be happy to sell it to you, except, you see, too many of the wrong people know I have it, and while the knowledge isn't illegal, selling or using it is. See if I sell this to you, you'd start getting younger looking slaves, and those people would try to take us both down, and since I'm not the master of an arcology, I would probably end up enslaved, and I'm not interested in that. If only the laws were more open about who could have sex with who, I could sell this to anyone interested."`);
r.push(`Since the agreed upon minimum age in your Free City is greater than eight, it would draw way too much attention for you to make use of the research recipe for the Childhood Fertility <span class="orange">Induced NCS</span> (genetic engineering and hormonal blend).`);
App.Events.addNode(node, r, "div");
- r = [];
- r.push(
- `He notices your interest and lets you read the information`,
- App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("Childhood Fertility Induced NCS", "Childhood Fertility Induced NCS"),
- `.`
- )
- );
- V.merchantIllegalWares.delete("childhoodFertilityInducedNCS");
} else {
if (V.geneticMappingUpgrade === 0) {
r.push(`You lack the facilities required for such a treatment to be effective on specific individuals.`);
@@ -352,7 +362,6 @@ App.UI.blackMarket = function() {
`Remember, though, no money back on this. Technology like this doesn't exist anywhere else, your treated slaves will stay and become younger looking forever, and your older ones will slowly begin to regress towards a disturbingly young mid-childhood state. All those caveats aside, if this sounds like something you'd want, then buy now!"`
);
}
- const NCSCash = 135000;
if (V.cash >= NCSCash) {
r.push(r.pop() + `"`);
App.Events.addNode(node, r, "div");
@@ -373,24 +382,28 @@ App.UI.blackMarket = function() {
App.Events.addNode(node, r, "div");
r.push(`You cannot afford the asking price of <span class="cash dec">${(cashFormat(NCSCash))}</span> for the Childhood Fertility <span class="orange">Induced NCS</span> (genetic engineering and hormonal blend) research recipe.`);
}
- r.push(
- `He notices your interest and lets you read the information`,
- App.UI.DOM.combineNodes(
- App.Encyclopedia.Dialog.linkDOM("Childhood Fertility Induced NCS", "Childhood Fertility Induced NCS"),
- "."
- )
- );
} else {
r.push(`You already possess the Childhood Fertility <span class="orange">Induced NCS</span> (genetic engineering and hormonal blend) research recipe.`);
V.merchantIllegalWares.delete("childhoodFertilityInducedNCS");
}
}
}
+ if ((V.minimumSlaveAge <= 15 && V.minimumSlaveAge > 8) || (V.cash < NCSCash)) {
+ r.push(
+ `He notices your interest and lets you read the information`,
+ App.UI.DOM.combineNodes(App.Encyclopedia.link("Childhood Fertility Induced NCS"), ".")
+ );
+ App.Events.addNode(node, r, "div");
+ if (V.minimumSlaveAge <= 15 && V.minimumSlaveAge > 8) {
+ V.merchantIllegalWares.delete("childhoodFertilityInducedNCS");
+ }
+ }
} else {
r.push(`You have no interest in such a distasteful research.`);
V.merchantIllegalWares.delete("childhoodFertilityInducedNCS");
}
break;
+ }
case "UterineRestraintMesh":
if (V.UterineRestraintMesh === 0) {
if (V.seePreg === 1) {
@@ -417,7 +430,7 @@ App.UI.blackMarket = function() {
r = [];
r.push(`"This is an interesting one... It's designed to prevent any sort of rupturing of the uterus, but, while that idea is great and all, it does jack shit to prevent leaks from elsewhere in the organ. The guy funding the research company was pissed when his slave bloated up like a cum-filled balloon and dropped dead, destroyed most of the development lab. Fortunately, he failed to ruin the best part of it — these blueprints. Now, you're probably wondering what good is something like this, but I've done business with a number of industrial slave farms, and they swear upon its ability to force a girl to carry far more children than physically possible; well, up until their wombs crushed their organs, that is. I supposed it'd work with anything solid, really, if you enjoy sticking things up into slave girls."`);
} else {
- r.push(App.UI.DOM.makeElement("span", "The autosurgery lacks the finesse needed to implant something of this complexity, so designs for a supportive uterine mesh are unusable until it is upgraded.", "note"));
+ r.push(App.UI.DOM.makeElement("span", "The autosurgery lacks the finesse needed to implant something of this complexity, so designs for a supportive uterine mesh are unusable until it is upgraded.", ["note"]));
}
} else {
r.push(`You lack the facilities needed to produce implants of this complexity, so designs for a supportive uterine mesh are currently unobtainable.`);
diff --git a/src/pregmod/eliteBreedingExam.js b/src/pregmod/eliteBreedingExam.js
index b58842e53a15c52fe960575e320f738317bcd34b..5e4ff6f2e4550dd790f431ef30e36089d6e1a749 100644
--- a/src/pregmod/eliteBreedingExam.js
+++ b/src/pregmod/eliteBreedingExam.js
@@ -278,9 +278,15 @@ App.Interact.eliteBreedingExam = function(slave = null) {
removeJob(slave, slave.assignment);
consequences.push(`reassigned to <span class="green">rest</span>`);
}
- if (V.pit && V.pit.fighterIDs.includes(slave.ID)) {
- removeJob(slave, Job.PIT);
- consequences.push(`<span class="yellow">removed</span> from ${V.pit.name}'s fighting roster`);
+ if (V.pit) {
+ if (V.pit.trainingIDs.includes(slave.ID)) {
+ removeJob(slave, Job.ARENA);
+ consequences.push(`<span class="yellow">removed</span> from ${V.pit.name}'s training roster`);
+ }
+ if (V.pit.fighterIDs.includes(slave.ID)) {
+ removeJob(slave, Job.PIT);
+ consequences.push(`<span class="yellow">removed</span> from ${V.pit.name}'s fighting roster`);
+ }
}
if (consequences.length > 0) {
App.Events.addNode(frag, r, "div");
diff --git a/src/pregmod/surrogacy.js b/src/pregmod/surrogacy.js
index 42a9ccf38cf8b43d11b62cd14bc6b14ddd551353..1eadac307093958748fb2645737b7ebf83fa4211 100644
--- a/src/pregmod/surrogacy.js
+++ b/src/pregmod/surrogacy.js
@@ -24,7 +24,7 @@ App.UI.surrogacy = function() {
if (V.impregnatrix.ID === -1) {
return V.PC;
} else {
- return getSlave(V.impregnatrix.ID) || V.incubator.tanks.find(t => t.ID === V.impregnatrix.ID);
+ return findFather(V.impregnatrix.ID);
}
}
}
@@ -44,7 +44,7 @@ App.UI.surrogacy = function() {
He,
he, his, him
} = getPronouns(receptrix);
- if (receptrix.fetish === "mindbroken") {
+ if (receptrix.fetish === Fetish.MINDBROKEN) {
r.push(`${receptrix.slaveName} leaves the surgery with a certain warmth in ${his} lower abdomen, ${he} knows that ${he} has been impregnated.`);
} else if (receptrix.fetish === "pregnancy" && receptrix.fetishStrength > 60 && receptrix.fetishKnown === 1) {
if (canSee(receptrix)) {
@@ -111,7 +111,7 @@ App.UI.surrogacy = function() {
He,
he, his, him
} = getPronouns(receptrix);
- if (receptrix.fetish === "mindbroken") {
+ if (receptrix.fetish === Fetish.MINDBROKEN) {
r.push(`${receptrix.slaveName} leaves the surgery with a certain warmth in ${his} lower abdomen, ${he} knows that ${he} has been impregnated.`);
} else if ((receptrix.fetish === "pregnancy") && (receptrix.fetishStrength > 60) && (receptrix.fetishKnown === 1)) {
if (canSee(receptrix)) {
@@ -184,7 +184,7 @@ App.UI.surrogacy = function() {
He,
he, his, him
} = getPronouns(receptrix);
- if (receptrix.fetish === "mindbroken") {
+ if (receptrix.fetish === Fetish.MINDBROKEN) {
r.push(`${receptrix.slaveName} leaves the surgery with a certain warmth in ${his} lower abdomen,`);
if (receptrix.ID === donatrix.ID) {
r.push(`but has no idea ${he} carries ${his} own clone.`);
diff --git a/src/zz1-last/setupEventHandlers.js b/src/zz1-last/setupEventHandlers.js
index 44e3eb0ff12766cd4d9cd3e22cc761cfe6d0f20f..896ed386a423cbfecb38f5b1ab0d3a56fe463e76 100644
--- a/src/zz1-last/setupEventHandlers.js
+++ b/src/zz1-last/setupEventHandlers.js
@@ -14,6 +14,7 @@ $(document).on(":passageinit", () => {
delete V.passageSwitchHandler;
}
App.UI.Tabs.clear();
+ App.Reminders.clear();
profileEvents.passageinit();
});