diff --git a/Changelog.txt b/Changelog.txt
index 2c3258812651a99a2fc8b79727ee9fe7ba704661..0829a6ba3d280a61d50931d955ee68977f204f8d 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -2,6 +2,13 @@ Pregmod
0.10.7.1-3.8.x
+ -learned how to add vectors
+ -fixed nicea event chain
+ -fixed issues with the TFS
+ -clothing data overhaul
+ -description options converted to JS
+ -fixes
+
12/13/2020
3
diff --git a/devTools/types/SugarCubeExtensions.d.ts b/devTools/types/SugarCubeExtensions.d.ts
index 52eaed4fd5f7094d7ace8765ef0f122992e8e563..e8709b836aec7898ad34082c2a5df7c74d817d19 100644
--- a/devTools/types/SugarCubeExtensions.d.ts
+++ b/devTools/types/SugarCubeExtensions.d.ts
@@ -26,9 +26,6 @@ declare module "twine-sugarcube" {
filterRegions: string[];
heightBoostingShoes: string[];
highHeels: string[];
- humiliatingClothes: string[];
- modestClothes: string[];
- sluttyClothes: string[];
pregData: Record<string, FC.PregnancyData>;
diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index 11a4116e3d8df59fa7a7444e0e59b9a122549610..0eb056d6ae95bca4b260104044987341ad4f81ad 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -1551,13 +1551,6 @@ App.Data.misc = {
fakeBellies: ["a huge empathy belly", "a large empathy belly", "a medium empathy belly", "a small empathy belly"],
/* lets fake bellies be separated from other .bellyAccessory */
- modestClothes: ["a ball gown", "a biyelgee costume", "a bunny outfit", "a burkini", "a burqa", "a comfortable bodysuit", "a cybersuit", "a dirndl", "a gothic lolita dress", "a halter top dress", "a hanbok", "a hijab and abaya", "a hijab and blouse", "a huipil", "a kimono", "a klan robe", "a latex catsuit", "a leotard", "a long qipao", "a maternity dress", "a military uniform", "a mini dress", "a mounty outfit", "a nice maid outfit", "a nice nurse outfit", "a niqab and abaya", "a one-piece swimsuit", "a penitent nuns habit", "a police uniform", "a red army uniform", "a schoolgirl outfit", "a schutzstaffel uniform", "a slave gown", "a slutty maid outfit", "a slutty nurse outfit", "a slutty qipao", "a sweater and cutoffs", "a t-shirt and jeans", "a toga", "an oversized t-shirt and boyshorts", "battlearmor", "battledress", "conservative clothing", "cutoffs and a t-shirt", "leather pants and a tube top", "lederhosen", "nice business attire", "restrictive latex", "slutty business attire", "spats and a tank top", "sport shorts and a sports bra", "sport shorts and a t-shirt", "stretch pants and a crop-top", "Imperial Plate"],
-
- sluttyClothes: ["a bimbo outfit", "a chattel habit", "a cheerleader outfit", "a fallen nuns habit", "a schoolgirl outfit", "a skimpy loincloth", "a slutty klan robe", "a slutty maid outfit", "a slutty nurse outfit", "a slutty outfit", "a slutty pony outfit", "a slutty qipao", "a slutty schutzstaffel uniform", "a string bikini", "a succubus outfit", "a t-shirt and panties", "a t-shirt and thong", "a tank-top and panties", "a tube top and thong", "attractive lingerie", "attractive lingerie for a pregnant woman", "clubslut netting", "kitty lingerie", "leather pants and a tube top", "leather pants and pasties", "panties and pasties", "pasties", "slutty business attire", "slutty jewelry", "sport shorts and a sports bra", "striped underwear", "a tight Imperial bodysuit"],
-
- /* stuff that reveals genitals */
- humiliatingClothes: ["a bra", "a button-up shirt", "a chattel habit", "a fallen nuns habit", "a skimpy loincloth", "a sports bra", "a string bikini", "a striped bra", "a succubus outfit", "a sweater", "a t-shirt", "a tank-top", "a thong", "a tube top", "clubslut netting", "pasties", "restrictive latex", "shibari ropes", "slutty jewelry", "uncomfortable straps", "Western clothing"],
-
highHeels: ["boots", "extreme heels", "extreme platform heels", "heels", "platform heels"],
heightBoostingShoes: ["extreme heels", "extreme platform heels", "heels", "platform heels", "platform shoes", "pumps"],
@@ -1940,7 +1933,7 @@ App.Data.misc = {
}
};
-/* Nationalities based on $continent value. Note that $continent can be undefined! */
+/* Nationalities based on V.continent value. Note that V.continent can be undefined! */
App.Data.misc.nationalityPoolSelector = {
"North America": App.Data.misc.northAmericaNationalities,
"South America": App.Data.misc.southAmericaNationalities,
diff --git a/js/003-data/slaveWearData.js b/js/003-data/slaveWearData.js
index 0d1d044b570a3ec5e7b02945f9d3a87ac51e7c1f..03ad7172883e89977867e3647bce011dc18f92c4 100644
--- a/js/003-data/slaveWearData.js
+++ b/js/003-data/slaveWearData.js
@@ -1,633 +1,1286 @@
/**
- * @typedef {object} slaveWear
+ * @typedef {object} clothes
* @property {string} name
- * @property {string} value
- * @property {string} [fs]
+ * @property {FC.FutureSociety} [fs] Automatically unlocked with this FS.
* @property {boolean} [requirements]
+ * @property {0|1|2|3|4} [exposure] 0: Modest, 1: Acceptable, 2: Slutty, 3: Humiliating (exposes genitals), 4: Might as well be nude
+ * @property {boolean} [harsh]
+ * @property {boolean} [topless]
*/
/**
- * @typedef {Array<slaveWear>|Array<slaveWearChastity>} slaveWearCategory
+ * @type {Map.<string, clothes>} The string here will be what is applied to the relevant slave property. Slave.clothes = "a bunny outfit", not "Bunny outfit".
*/
-
-/** @type {Object.<string, slaveWearCategory>} */
-App.Data.slaveWear = {
-
- niceClothes: [
+App.Data.clothes = new Map([
+ ["attractive lingerie for a pregnant woman",
{
name: "Maternity lingerie",
- value: "attractive lingerie for a pregnant woman",
fs: "FSRepopulationFocus",
- get requirements() { return V.boughtItem.clothing.maternityLingerie === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.maternityLingerie === 1; },
+ exposure: 2
+ }
+ ],
+ ["a bunny outfit",
{
name: "Bunny outfit",
- value: "a bunny outfit",
fs: "FSGenderFundamentalist",
- get requirements() { return V.boughtItem.clothing.bunny === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.bunny === 1; },
+ exposure: 1
+ }
+ ],
+ ["body oil",
{
name: "Body oil",
- value: "body oil",
fs: "FSPhysicalIdealist",
- get requirements() { return V.boughtItem.clothing.oil === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.oil === 1; },
+ exposure: 4
+ }
+ ],
+ ["a chattel habit",
{
name: "Chattel habit",
- value: "a chattel habit",
fs: "FSChattelReligionist",
- get requirements() { return V.boughtItem.clothing.habit === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.habit === 1; },
+ exposure: 3
+ }
+ ],
+ ["conservative clothing",
{
name: "Conservative clothing",
- value: "conservative clothing",
fs: "FSPaternalist",
- get requirements() { return V.boughtItem.clothing.conservative === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.conservative === 1; },
+ exposure: 0
+ }
+ ],
+ ["harem gauze",
{
name: "Harem gauze",
- value: "harem gauze",
fs: "FSArabianRevivalist",
- get requirements() { return V.boughtItem.clothing.harem === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.harem === 1; },
+ exposure: 1
+ }
+ ],
+ ["a huipil",
{
name: "Huipil",
- value: "a huipil",
fs: "FSAztecRevivalist",
- get requirements() { return V.boughtItem.clothing.huipil === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.huipil === 1; },
+ exposure: 0
+ }
+ ],
+ ["a kimono",
{
name: "Kimono",
- value: "a kimono",
fs: "FSEdoRevivalist",
- get requirements() { return (V.boughtItem.clothing.kimono === 1 || V.continent === "Japan"); }
- },
+ get requirements() { return (V.boughtItem.clothing.kimono === 1 || V.continent === "Japan"); },
+ exposure: 0
+ }
+ ],
+ ["a maternity dress",
{
name: "Maternity dress",
- value: "a maternity dress",
fs: "FSRepopulationFocus",
- get requirements() { return V.boughtItem.clothing.maternityDress === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.maternityDress === 1; },
+ exposure: 0,
+ }
+ ],
+ ["a slutty qipao",
{
name: "Qipao (slutty)",
- value: "a slutty qipao",
fs: "FSChineseRevivalist",
- get requirements() { return V.boughtItem.clothing.qipao === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.qipao === 1; },
+ exposure: 2
+ }
+ ],
+ ["a long qipao",
{
name: "Qipao (long)",
- value: "a long qipao",
fs: "FSChineseRevivalist",
- get requirements() { return V.boughtItem.clothing.cultural === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.cultural === 1; },
+ exposure: 0
+ }
+ ],
+ ["Imperial Plate",
{
name: "Imperial Plate",
- value: "Imperial Plate",
fs: "FSNeoImperialist",
- get requirements() { return V.boughtItem.clothing.imperialarmor === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.imperialarmor === 1; },
+ exposure: 0
+ }
+ ],
+ ["a tight Imperial bodysuit",
{
name: "Imperial Bodysuit",
- value: "a tight Imperial bodysuit",
fs: "FSNeoImperialist",
- get requirements() { return V.boughtItem.clothing.imperialsuit === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.imperialsuit === 1; },
+ exposure: 2
+ }
+ ],
+ ["stretch pants and a crop-top",
{
name: "Stretch pants and a crop-top",
- value: "stretch pants and a crop-top",
fs: "FSHedonisticDecadence",
- get requirements() { return V.boughtItem.clothing.lazyClothes === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.lazyClothes === 1; },
+ exposure: 0
+ }
+ ],
+ ["a toga",
{
name: "Toga",
- value: "a toga",
fs: "FSRomanRevivalist",
- get requirements() { return V.boughtItem.clothing.toga === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.toga === 1; },
+ exposure: 1
+ }
+ ],
+ ["Western clothing",
{
name: "Western clothing",
- value: "Western clothing",
fs: "FSPastoralist",
- get requirements() { return V.boughtItem.clothing.western === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.western === 1; },
+ exposure: 3
+ }
+ ],
+ ["a courtesan dress",
{
name: "Courtesan dress",
- value: "a courtesan dress",
fs: "FSSlaveProfessionalism",
- get requirements() { return V.boughtItem.clothing.courtesan === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.courtesan === 1; },
+ exposure: 1
+ }
+ ],
+ ["a bimbo outfit",
{
name: "Bimbo outfit",
- value: "a bimbo outfit",
fs: "FSIntellectualDependency",
- get requirements() { return V.boughtItem.clothing.bimbo === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.bimbo === 1; },
+ exposure: 2
+ }
+ ],
+ ["petite admi outfit",
{
name: "Petite admi outfit",
- value: "petite admi outfit",
fs: "FSPetiteAdmiration",
- get requirements() { return V.boughtItem.clothing.petite === 1; }
- },
- {name: "Battlearmor", value: "battlearmor", get requirements() { return V.boughtItem.clothing.military === 1; }},
- {name: "Military uniform", value: "a military uniform", get requirements() { return V.boughtItem.clothing.military === 1; }},
- {name: "Red Army uniform", value: "a red army uniform", get requirements() { return V.boughtItem.clothing.military === 1; }},
- {name: "Battledress", value: "battledress", get requirements() { return V.boughtItem.clothing.military === 1; }},
- {name: "Biyelgee costume", value: "a biyelgee costume", get requirements() { return V.boughtItem.clothing.cultural === 1; }},
- {name: "Dirndl", value: "a dirndl", get requirements() { return V.boughtItem.clothing.cultural === 1; }},
- {name: "Lederhosen", value: "lederhosen", get requirements() { return V.boughtItem.clothing.cultural === 1; }},
- {name: "Mounty outfit", value: "a mounty outfit", get requirements() { return V.boughtItem.clothing.cultural === 1; }},
- {name: "Hanbok", value: "a hanbok", get requirements() { return V.boughtItem.clothing.cultural === 1; }},
+ get requirements() { return V.boughtItem.clothing.petite === 1; },
+ exposure: 0
+ }
+ ],
+ ["battlearmor",
+ {
+ name: "Battlearmor",
+ get requirements() { return V.boughtItem.clothing.military === 1; },
+ exposure: 0
+ }
+ ],
+ ["a military uniform",
+ {
+ name: "Military uniform",
+ get requirements() { return V.boughtItem.clothing.military === 1; },
+ exposure: 0
+ }
+ ],
+ ["a red army uniform",
+ {
+ name: "Red Army uniform",
+ get requirements() { return V.boughtItem.clothing.military === 1; },
+ exposure: 0
+ }
+ ],
+ ["battledress",
+ {
+ name: "Battledress",
+ get requirements() { return V.boughtItem.clothing.military === 1; },
+ exposure: 0
+ }
+ ],
+ ["a biyelgee costume",
+ {
+ name: "Biyelgee costume",
+ get requirements() { return V.boughtItem.clothing.cultural === 1; },
+ exposure: 0
+ }
+ ],
+ ["a dirndl",
+ {
+ name: "Dirndl",
+ get requirements() { return V.boughtItem.clothing.cultural === 1; },
+ exposure: 0
+ }
+ ],
+ ["lederhosen",
+ {
+ name: "Lederhosen",
+ get requirements() { return V.boughtItem.clothing.cultural === 1; },
+ exposure: 0
+ }
+ ],
+ ["a mounty outfit",
+ {
+ name: "Mounty outfit",
+ get requirements() { return V.boughtItem.clothing.cultural === 1; },
+ exposure: 0
+ }
+ ],
+ ["a hanbok",
+ {
+ name: "Hanbok",
+ get requirements() { return V.boughtItem.clothing.cultural === 1; },
+ exposure: 0
+ }
+ ],
+ ["a burqa",
{
name: "Burqa",
- value: "a burqa",
- get requirements() { return V.boughtItem.clothing.middleEastern === 1 || V.continent === "the Middle East"; }
- },
+ get requirements() { return V.boughtItem.clothing.middleEastern === 1 || V.continent === "the Middle East"; },
+ exposure: 0
+ }
+ ],
+ ["a niqab and abaya",
{
name: "Niqab and abaya",
- value: "a niqab and abaya",
- get requirements() { return V.boughtItem.clothing.middleEastern === 1 || V.continent === "the Middle East"; }
- },
+ get requirements() { return V.boughtItem.clothing.middleEastern === 1 || V.continent === "the Middle East"; },
+ exposure: 0
+ }
+ ],
+ ["a hijab and blouse",
{
name: "Hijab and blouse",
- value: "a hijab and blouse",
- get requirements() { return (V.boughtItem.clothing.conservative === 1 || V.continent === "the Middle East"); }
- },
+ get requirements() { return (V.boughtItem.clothing.conservative === 1 || V.continent === "the Middle East"); },
+ exposure: 0
+ }
+ ],
+ ["a burkini",
{
name: "Burkini",
- value: "a burkini",
- get requirements() { return V.boughtItem.clothing.swimwear === 1 && (V.boughtItem.clothing.swimwear === 1 || V.continent === "the Middle East"); }
- },
- {name: "Santa dress", value: "a Santa dress", get requirements() { return V.boughtItem.clothing.costume === 1; }},
-
- {name: "Klan robe", value: "a klan robe", get requirements() { return V.boughtItem.clothing.pol === 1; }},
- {name: "Slutty klan robe", value: "a slutty klan robe", get requirements() { return V.boughtItem.clothing.pol === 1; }},
- {name: "Schutzstaffel uniform", value: "a schutzstaffel uniform", get requirements() { return V.boughtItem.clothing.pol === 1; }},
- {name: "Slutty schutzstaffel uniform", value: "a slutty schutzstaffel uniform", get requirements() { return V.boughtItem.clothing.pol === 1; }},
-
- {name: "Nice business attire", value: "nice business attire", get requirements() { return V.boughtItem.clothing.career === 1; }},
- {name: "Nurse (nice)", value: "a nice nurse outfit", get requirements() { return V.boughtItem.clothing.career === 1; }},
- {name: "Police uniform", value: "a police uniform", get requirements() { return V.boughtItem.clothing.career === 1; }},
+ get requirements() { return V.boughtItem.clothing.swimwear === 1 && (V.boughtItem.clothing.swimwear === 1 || V.continent === "the Middle East"); },
+ exposure: 1
+ }
+ ],
+ ["a Santa dress",
+ {
+ name: "Santa dress",
+ get requirements() { return V.boughtItem.clothing.costume === 1; },
+ exposure: 2
+ }
+ ],
+ ["a klan robe",
+ {
+ name: "Klan robe",
+ get requirements() { return V.boughtItem.clothing.pol === 1; },
+ exposure: 0
+ }
+ ],
+ ["a slutty klan robe",
+ {
+ name: "Slutty klan robe",
+ get requirements() { return V.boughtItem.clothing.pol === 1; },
+ exposure: 2
+ }
+ ],
+ ["a schutzstaffel uniform",
+ {
+ name: "Schutzstaffel uniform",
+ get requirements() { return V.boughtItem.clothing.pol === 1; },
+ exposure: 0
+ }
+ ],
+ ["a slutty schutzstaffel uniform",
+ {
+ name: "Slutty schutzstaffel uniform",
+ get requirements() { return V.boughtItem.clothing.pol === 1; },
+ exposure: 2
+ }
+ ],
+ ["nice business attire",
+ {
+ name: "Nice business attire",
+ get requirements() { return V.boughtItem.clothing.career === 1; },
+ exposure: 0
+ }
+ ],
+ ["a nice nurse outfit",
+ {
+ name: "Nurse (nice)",
+ get requirements() { return V.boughtItem.clothing.career === 1; },
+ exposure: 0
+ }
+ ],
+ ["a police uniform",
+ {
+ name: "Police uniform",
+ get requirements() { return V.boughtItem.clothing.career === 1; },
+ exposure: 0
+ }
+ ],
+ ["a nice maid outfit",
{
name: "Maid (nice)",
- value: "a nice maid outfit",
- get requirements() { return V.boughtItem.clothing.career === 1 || V.PC.career === "servant" || V.PC.career === "handmaiden" || V.PC.career === "child servant"; }
- },
-
- {name: "Ballgown", value: "a ball gown", get requirements() { return V.boughtItem.clothing.dresses === 1; }},
- {name: "Gothic lolita dress", value: "a gothic lolita dress", get requirements() { return V.boughtItem.clothing.dresses === 1; }},
-
- {name: "Cybersuit", value: "a cybersuit", get requirements() { return V.boughtItem.clothing.bodysuits === 1; }},
- {name: "Latex catsuit", value: "a latex catsuit", get requirements() { return V.boughtItem.clothing.bodysuits === 1; }},
-
- {name: "Button-up shirt and panties", value: "a button-up shirt and panties", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "Button-up shirt", value: "a button-up shirt", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "Cutoffs", value: "cutoffs", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "Jeans", value: "jeans", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "Leather pants and a tube top", value: "leather pants and a tube top", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "Leather pants", value: "leather pants", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "Oversized t-shirt", value: "an oversized t-shirt", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "Sweater and cutoffs", value: "a sweater and cutoffs", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "Sweater and panties", value: "a sweater and panties", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "Sweater", value: "a sweater", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "T-shirt and jeans", value: "a t-shirt and jeans", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "T-shirt and panties", value: "a t-shirt and panties", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "T-shirt", value: "a t-shirt", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "Tank-top and panties", value: "a tank-top and panties", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "Tank-top", value: "a tank-top", get requirements() { return V.boughtItem.clothing.casual === 1; }},
- {name: "Tube top", value: "a tube top", get requirements() { return V.boughtItem.clothing.casual === 1; }},
-
- {name: "Boyshorts", value: "boyshorts", get requirements() { return V.boughtItem.clothing.underwear === 1; }},
- {name: "Bra", value: "a bra", get requirements() { return V.boughtItem.clothing.underwear === 1; }},
- {name: "Kitty lingerie", value: "kitty lingerie", get requirements() { return V.boughtItem.clothing.underwear === 1; }},
- {name: "Panties and pasties", value: "panties and pasties", get requirements() { return V.boughtItem.clothing.underwear === 1; }},
- {name: "Skimpy loincloth", value: "a skimpy loincloth", get requirements() { return V.boughtItem.clothing.underwear === 1; }},
- {name: "Thong", value: "a thong", get requirements() { return V.boughtItem.clothing.underwear === 1; }},
- {name: "Pasties", value: "pasties", get requirements() { return V.boughtItem.clothing.underwear === 1; }},
-
+ get requirements() { return V.boughtItem.clothing.career === 1 || V.PC.career === "servant" || V.PC.career === "handmaiden" || V.PC.career === "child servant"; },
+ exposure: 0
+ }
+ ],
+ ["a ball gown",
+ {
+ name: "Ballgown",
+ get requirements() { return V.boughtItem.clothing.dresses === 1; },
+ exposure: 0
+ }
+ ],
+ ["a gothic lolita dress",
+ {
+ name: "Gothic lolita dress",
+ get requirements() { return V.boughtItem.clothing.dresses === 1; },
+ exposure: 0
+ }
+ ],
+ ["a cybersuit",
+ {
+ name: "Cybersuit",
+ get requirements() { return V.boughtItem.clothing.bodysuits === 1; },
+ exposure: 0
+ }
+ ],
+ ["a latex catsuit",
+ {
+ name: "Latex catsuit",
+ get requirements() { return V.boughtItem.clothing.bodysuits === 1; },
+ exposure: 1
+ }
+ ],
+ ["a button-up shirt and panties",
+ {
+ name: "Button-up shirt and panties",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 2
+ }
+ ],
+ ["a button-up shirt",
+ {
+ name: "Button-up shirt",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 3
+ }
+ ],
+ ["cutoffs",
+ {
+ name: "Cutoffs",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 2
+ }
+ ],
+ ["jeans",
+ {
+ name: "Jeans",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 2,
+ topless: true
+ }
+ ],
+ ["leather pants and a tube top",
+ {
+ name: "Leather pants and a tube top",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 1
+ }
+ ],
+ ["leather pants",
+ {
+ name: "Leather pants",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 2,
+ topless: true
+ }
+ ],
+ ["an oversized t-shirt",
+ {
+ name: "Oversized t-shirt",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 3
+ }
+ ],
+ ["a sweater and cutoffs",
+ {
+ name: "Sweater and cutoffs",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 0
+ }
+ ],
+ ["a sweater and panties",
+ {
+ name: "Sweater and panties",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 2
+ }
+ ],
+ ["a sweater",
+ {
+ name: "Sweater",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 3
+ }
+ ],
+ ["a t-shirt and jeans",
+ {
+ name: "T-shirt and jeans",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 0
+ }
+ ],
+ ["a t-shirt and panties",
+ {
+ name: "T-shirt and panties",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 2
+ }
+ ],
+ ["a t-shirt",
+ {
+ name: "T-shirt",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 3
+ }
+ ],
+ ["a tank-top and panties",
+ {
+ name: "Tank-top and panties",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 2
+ }
+ ],
+ ["a tank-top",
+ {
+ name: "Tank-top",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 3
+ }
+ ],
+ ["a tube top",
+ {
+ name: "Tube top",
+ get requirements() { return V.boughtItem.clothing.casual === 1; },
+ exposure: 3
+ }
+ ],
+ ["boyshorts",
+ {
+ name: "Boyshorts",
+ get requirements() { return V.boughtItem.clothing.underwear === 1; },
+ exposure: 2,
+ topless: true
+ }
+ ],
+ ["a bra",
+ {
+ name: "Bra",
+ get requirements() { return V.boughtItem.clothing.underwear === 1; },
+ exposure: 3
+ }
+ ],
+ ["kitty lingerie",
+ {
+ name: "Kitty lingerie",
+ get requirements() { return V.boughtItem.clothing.underwear === 1; },
+ exposure: 2
+ }
+ ],
+ ["panties and pasties",
+ {
+ name: "Panties and pasties",
+ get requirements() { return V.boughtItem.clothing.underwear === 1; },
+ exposure: 2
+ }
+ ],
+ ["a skimpy loincloth",
+ {
+ name: "Skimpy loincloth",
+ get requirements() { return V.boughtItem.clothing.underwear === 1; },
+ exposure: 3
+ }
+ ],
+ ["a thong",
+ {
+ name: "Thong",
+ get requirements() { return V.boughtItem.clothing.underwear === 1; },
+ exposure: 3,
+ topless: true
+ }
+ ],
+ ["pasties",
+ {
+ name: "Pasties",
+ get requirements() { return V.boughtItem.clothing.underwear === 1; },
+ exposure: 3
+ }
+ ],
+ ["leather pants and pasties",
{
name: "Leather pants and pasties",
- value: "leather pants and pasties",
- get requirements() { return V.boughtItem.clothing.underwear === 1 && V.boughtItem.clothing.casual === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.underwear === 1 && V.boughtItem.clothing.casual === 1; },
+ exposure: 2,
+ }
+ ],
+ ["a t-shirt and thong",
{
name: "T-shirt and thong",
- value: "a t-shirt and thong",
- get requirements() { return V.boughtItem.clothing.underwear === 1 && V.boughtItem.clothing.casual === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.underwear === 1 && V.boughtItem.clothing.casual === 1; },
+ exposure: 3,
+ }
+ ],
+ ["a tube top and thong",
{
name: "Tube top and thong",
- value: "a tube top and thong",
- get requirements() { return V.boughtItem.clothing.underwear === 1 && V.boughtItem.clothing.casual === 1; }
- },
+ get requirements() { return V.boughtItem.clothing.underwear === 1 && V.boughtItem.clothing.casual === 1; },
+ exposure: 3,
+ }
+ ],
+ ["an oversized t-shirt and boyshorts",
{
name: "Oversized t-shirt and boyshorts",
- value: "an oversized t-shirt and boyshorts",
- get requirements() { return V.boughtItem.clothing.underwear === 1 && V.boughtItem.clothing.casual === 1; }
- },
- {name: "Sport shorts and a sports bra", value: "sport shorts and a sports bra", get requirements() { return V.boughtItem.clothing.sports === 1; }},
- {name: "Sport shorts", value: "sport shorts", get requirements() { return V.boughtItem.clothing.sports === 1; }},
- {name: "Sports bra", value: "a sports bra", get requirements() { return V.boughtItem.clothing.sports === 1; }},
+ get requirements() { return V.boughtItem.clothing.underwear === 1 && V.boughtItem.clothing.casual === 1; },
+ exposure: 0,
+ }
+ ],
+ ["sport shorts and a sports bra",
+ {
+ name: "Sport shorts and a sports bra",
+ get requirements() { return V.boughtItem.clothing.sports === 1; },
+ exposure: 1,
+ }
+ ],
+ ["sport shorts",
+ {
+ name: "Sport shorts",
+ get requirements() { return V.boughtItem.clothing.sports === 1; },
+ exposure: 2,
+ topless: true
+ }
+ ],
+ ["a sports bra",
+ {
+ name: "Sports bra",
+ get requirements() { return V.boughtItem.clothing.sports === 1; },
+ exposure: 3
+ }
+ ],
+ ["sport shorts and a t-shirt",
{
name: "Sport shorts and a t-shirt",
- value: "sport shorts and a t-shirt",
- get requirements() { return V.boughtItem.clothing.sports === 1 && V.boughtItem.clothing.casual === 1; }
- },
- {name: "Pony outfit (nice)", value: "a nice pony outfit", get requirements() { return V.boughtItem.clothing.pony === 1; }},
- {name: "Pony outfit (slutty)", value: "a slutty pony outfit", get requirements() { return V.boughtItem.clothing.pony === 1; }},
-
- {name: "Monokini", value: "a monokini", get requirements() { return V.boughtItem.clothing.swimwear === 1; }},
- {name: "One-piece swimsuit", value: "a one-piece swimsuit", get requirements() { return V.boughtItem.clothing.swimwear === 1; }},
-
+ get requirements() { return V.boughtItem.clothing.sports === 1 && V.boughtItem.clothing.casual === 1; },
+ exposure: 0
+ }
+ ],
+ ["a nice pony outfit",
+ {
+ name: "Pony outfit (nice)",
+ get requirements() { return V.boughtItem.clothing.pony === 1; },
+ exposure: 1
+ }
+ ],
+ ["a slutty pony outfit",
+ {
+ name: "Pony outfit (slutty)",
+ get requirements() { return V.boughtItem.clothing.pony === 1; },
+ exposure: 2
+ }
+ ],
+ ["a monokini",
+ {
+ name: "Monokini",
+ get requirements() { return V.boughtItem.clothing.swimwear === 1; },
+ exposure: 3
+ }
+ ],
+ ["a one-piece swimsuit",
+ {
+ name: "One-piece swimsuit",
+ get requirements() { return V.boughtItem.clothing.swimwear === 1; },
+ exposure: 1
+ }
+ ],
+ ["a striped bra",
{
name: "Striped bra",
- value: "a striped bra",
- get requirements() { return V.boughtItem.clothing.pantsu === 1 || V.continent === "Japan"; }
- },
+ get requirements() { return V.boughtItem.clothing.pantsu === 1 || V.continent === "Japan"; },
+ exposure: 3
+ }
+ ],
+ ["striped panties",
{
name: "Striped panties",
- value: "striped panties",
- get requirements() { return V.boughtItem.clothing.pantsu === 1 || V.continent === "Japan"; }
- },
+ get requirements() { return V.boughtItem.clothing.pantsu === 1 || V.continent === "Japan"; },
+ exposure: 2,
+ topless: true
+ }
+ ],
+ ["striped underwear",
{
name: "Striped underwear",
- value: "striped underwear",
- get requirements() { return V.boughtItem.clothing.pantsu === 1 || V.continent === "Japan"; }
- },
-
- // "Normal" things:
- {name: "Apron", value: "an apron"},
- {name: "Bangles", value: "slutty jewelry"},
- {name: "Clubslut netting", value: "clubslut netting"},
- {name: "Cutoffs and a t-shirt", value: "cutoffs and a t-shirt"},
- {name: "Bodysuit", value: "a comfortable bodysuit"},
- {name: "Cheerleader", value: "a cheerleader outfit"},
- {name: "Fallen nun", value: "a fallen nuns habit"},
- {name: "Hijab and abaya", value: "a hijab and abaya"},
- {name: "Leotard", value: "a leotard"},
- {name: "Maid (slutty)", value: "a slutty maid outfit"},
- {name: "Mini dress", value: "a mini dress"},
- {name: "Nice lingerie", value: "attractive lingerie"},
- {name: "Nurse (slutty)", value: "a slutty nurse outfit"},
- {name: "Overalls", value: "overalls"},
- {name: "Panties", value: "panties"},
- {name: "Scalemail bikini", value: "a scalemail bikini"},
- {name: "Schoolgirl", value: "a schoolgirl outfit"},
- {name: "Slutty outfit", value: "a slutty outfit"},
- {name: "Spats and a tank top", value: "spats and a tank top"},
- {name: "String bikini", value: "a string bikini"},
- {name: "Succubus costume", value: "a succubus outfit"},
- {name: "Suit (slutty)", value: "slutty business attire"},
-
- // {name: "Let them choose", value: "choosing her own clothes"},
- {name: "Haltertop dress", value: "a halter top dress"},
- {name: "Slave gown", value: "a slave gown"}
+ get requirements() { return V.boughtItem.clothing.pantsu === 1 || V.continent === "Japan"; },
+ exposure: 2,
+ topless: true
+ }
],
- harshClothes: [
+ // "Normal" things:
+ ["an apron",
{
- name: "Chains",
- value: "chains",
- fs: "FSDegradationist",
- get requirements() { return V.boughtItem.clothing.chains === 1; }
- },
- {name: "Go naked", value: "no clothing"},
- {name: "Penitent nun", value: "a penitent nuns habit"},
- {name: "Restrictive latex", value: "restrictive latex"},
- {name: "Shibari ropes", value: "shibari ropes"},
- {name: "Uncomfortable straps", value: "uncomfortable straps"}
+ name: "Apron",
+ exposure: 2,
+ }
],
-
- niceCollars: [
- {name: "Stylish leather", value: "stylish leather"},
- {name: "Satin choker", value: "satin choker"},
- {name: "Silken ribbon", value: "silk ribbon"},
- {name: "Heavy gold", value: "heavy gold"},
- {name: "Pretty jewelry", value: "pretty jewelry"},
- {name: "Nice retirement counter", value: "nice retirement counter", get requirements() { return V.seeAge === 1; }},
- {name: "Pregnancy biometrics", value: "preg biometrics", get requirements() { return V.seePreg === 1; }},
- {name: "Bell", value: "bell collar"},
- {name: "Cowbell", value: "leather with cowbell"},
- {
- name: "Bowtie collar",
- value: "bowtie",
- fs: "FSGenderFundamentalist",
- get requirements() { return V.boughtItem.clothing.bunny === 1; }
- },
+ ["slutty jewelry",
{
- name: "Neck tie",
- value: "neck tie",
- fs: "FSPaternalist",
- get requirements() { return V.boughtItem.clothing.conservative === 1; }
- },
- {
- name: "Ancient Egyptian",
- value: "ancient Egyptian",
- fs: "FSEgyptianRevivalist",
- get requirements() { return V.boughtItem.clothing.egypt === 1; }
- },
+ name: "Bangles",
+ exposure: 3
+ }
],
-
- harshCollars: [
- {name: "Tight steel", value: "tight steel"},
- {name: "Cruel retirement counter", value: "cruel retirement counter", get requirements() { return V.seeAge === 1; }},
- {name: "Uncomfortable leather", value: "uncomfortable leather"},
- {name: "Shock punishment", value: "shock punishment"},
- {name: "Neck corset", value: "neck corset"},
+ ["clubslut netting",
+ {
+ name: "Clubslut netting",
+ exposure: 3
+ }
],
-
- faceAccessory: [
- {name: "Porcelain mask", value: "porcelain mask"},
- {name: "Cat ears", value: "cat ears"},
+ ["cutoffs and a t-shirt",
+ {
+ name: "Cutoffs and a t-shirt",
+ exposure: 0
+ }
],
-
- mouthAccessory: [
- {name: "Ball gag", value: "ball gag"},
- {name: "Bit gag", value: "bit gag"},
- {name: "Ring gag", value: "ring gag"},
+ ["a comfortable bodysuit",
{
- name: "Massive dildo gag",
- value: "massive dildo gag",
- get requirements() { return V.boughtItem.toys.gags === 1; }
- },
- {name: "Dildo gag", value: "dildo gag"},
+ name: "Bodysuit",
+ exposure: 1
+ }
],
-
- shoes: [
- {name: "Barefoot", value: "none"},
- {name: "Flats", value: "flats"},
- {name: "Heels", value: "heels"},
- {name: "Pumps", value: "pumps"},
- {name: "Thigh boots", value: "boots"},
- {name: "Painfully extreme heels", value: "extreme heels"},
- {
- name: "Platforms",
- value: "platform shoes",
- fs: "FSStatuesqueGlorification",
- get requirements() { return (V.boughtItem.shoes.heels === 1); }
- },
- {
- name: "Platform heels",
- value: "platform heels",
- fs: "FSStatuesqueGlorification",
- get requirements() { return (V.boughtItem.shoes.heels === 1); }
- },
- {
- name: "Painfully extreme platform heels",
- value: "extreme platform heels",
- fs: "FSStatuesqueGlorification",
- get requirements() { return (V.boughtItem.shoes.heels === 1); }
+ ["a cheerleader outfit",
+ {
+ name: "Cheerleader",
+ exposure: 2
}
],
-
- bellyAccessories: [
- {name: "None", value: "none"},
- {name: "Tight corset", value: "a corset"},
- {name: "Extreme corset", value: "an extreme corset"},
- {name: "Supportive band", value: "a support band"},
- {
- name: "1st Trimester belly",
- value: "a small empathy belly",
- fs: "FSRepopulationFocus",
- get requirements() { return V.boughtItem.clothing.belly === 1; }
- },
+ ["a fallen nuns habit",
{
- name: "2nd Trimester belly",
- value: "a medium empathy belly",
- fs: "FSRepopulationFocus",
- get requirements() { return V.boughtItem.clothing.belly === 1; }
- },
+ name: "Fallen nun",
+ exposure: 3
+ }
+ ],
+ ["a hijab and abaya",
{
- name: "3rd Trimester belly",
- value: "a large empathy belly",
- fs: "FSRepopulationFocus",
- get requirements() { return V.boughtItem.clothing.belly === 1; }
- },
+ name: "Hijab and abaya",
+ exposure: 0
+ }
+ ],
+ ["a leotard",
{
- name: "3rd Trimester twins belly",
- value: "a huge empathy belly",
- fs: "FSRepopulationFocus",
- get requirements() { return V.boughtItem.clothing.belly === 1; }
+ name: "Leotard",
+ exposure: 1
}
],
-
- vaginalAccessories: [
+ ["a slutty maid outfit",
{
- name: "None",
- value: "none"
- },
+ name: "Maid (slutty)",
+ exposure: 2
+ }
+ ],
+ ["a mini dress",
{
- name: "Bullet vibrator",
- value: "bullet vibrator"
- },
+ name: "Mini dress",
+ exposure: 2
+ }
+ ],
+ ["attractive lingerie",
{
- name: "Smart bullet vibrator",
- value: "smart bullet vibrator",
- get requirements() { return V.boughtItem.toys.smartVibes === 1; }
- },
+ name: "Nice lingerie",
+ exposure: 2
+ }
+ ],
+ ["a slutty nurse outfit",
{
- name: "Dildo",
- value: "dildo"
- },
+ name: "Nurse (slutty)",
+ exposure: 2
+ }
+ ],
+ ["overalls",
{
- name: "Long dildo",
- value: "long dildo",
- get requirements() { return V.boughtItem.toys.dildos === 1; }
- },
+ name: "Overalls",
+ exposure: 1
+ }
+ ],
+ ["panties",
{
- name: "Large dildo",
- value: "large dildo"
- },
+ name: "Panties",
+ exposure: 2,
+ topless: true
+ }
+ ],
+ ["a scalemail bikini",
{
- name: "Long, large dildo",
- value: "long, large dildo",
- get requirements() { return V.boughtItem.toys.dildos === 1; }
- },
+ name: "Scalemail bikini",
+ exposure: 2
+ }
+ ],
+ ["a schoolgirl outfit",
{
- name: "Huge dildo",
- value: "huge dildo",
- get requirements() { return V.boughtItem.toys.dildos === 1; }
- },
+ name: "Schoolgirl",
+ exposure: 1
+ }
+ ],
+ ["a slutty outfit",
{
- name: "Long, huge dildo",
- value: "long, huge dildo",
- get requirements() { return V.boughtItem.toys.dildos === 1; }
+ name: "Slutty outfit",
+ exposure: 2
}
],
-
- vaginalAttachments: [
- {name: "None", value: "none"},
+ ["spats and a tank top",
{
- name: "Vibrating attachment",
- value: "vibrator",
- get requirements() { return V.boughtItem.toys.vaginalAttachments === 1; }
- },
+ name: "Spats and a tank top",
+ exposure: 0
+ }
+ ],
+ ["a string bikini",
{
- name: "Smart vibrating attachment",
- value: "smart vibrator",
- get requirements() { return V.boughtItem.toys.smartVaginalAttachments === 1; }
+ name: "String bikini",
+ exposure: 3
}
],
-
- dickAccessories: [
- {name: "None", value: "none"},
+ ["a succubus outfit",
{
- name: "Bullet vibrator",
- value: "bullet vibrator"
- },
+ name: "Succubus costume",
+ exposure: 3
+ }
+ ],
+ ["slutty business attire",
{
- name: "Smart bullet vibrator",
- value: "smart bullet vibrator",
- get requirements() { return V.boughtItem.toys.smartVibes === 1; }
+ name: "Suit (slutty)",
+ exposure: 2,
}
],
- buttplugs: [
- {
- name: "None",
- value: "none"
- },
+ /*
+ ["choosing her own clothes",
+{
+ name: "Let them choose",
+ }
+],
+ */
+ ["a halter top dress",
+ {
+ name: "Haltertop dress",
+ exposure: 0
+ }
+ ],
+ ["a slave gown",
{
- name: "Standard plug",
- value: "plug"
- },
+ name: "Slave gown",
+ exposure: 0
+ }
+ ],
+ ["chains",
{
- name: "Long plug",
- value: "long plug",
- get requirements() { return V.boughtItem.toys.buttPlugs === 1; }
- },
+ name: "Chains",
+ fs: "FSDegradationist",
+ get requirements() { return V.boughtItem.clothing.chains === 1; },
+ exposure: 4,
+ harsh: true
+ }
+ ],
+ ["no clothing",
{
- name: "Large plug",
- value: "large plug"
- },
+ name: "Go naked",
+ exposure: 4,
+ harsh: true
+ }
+ ],
+ ["a penitent nuns habit",
{
- name: "Long, large plug",
- value: "long, large plug",
- get requirements() { return V.boughtItem.toys.buttPlugs === 1; }
- },
+ name: "Penitent nun",
+ exposure: 0,
+ harsh: true
+ }
+ ],
+ ["restrictive latex",
{
- name: "Huge plug",
- value: "huge plug",
- },
+ name: "Restrictive latex",
+ exposure: 3,
+ harsh: true
+ }
+ ],
+ ["shibari ropes",
{
- name: "Long, huge plug",
- value: "long, huge plug",
- get requirements() { return V.boughtItem.toys.buttPlugs === 1; }
+ name: "Shibari ropes",
+ exposure: 4,
+ harsh: true
}
],
+ ["uncomfortable straps",
+ {
+ name: "Uncomfortable straps",
+ exposure: 3,
+ harsh: true
+ }
+ ]
+]);
+/**
+ * @typedef {object} slaveWear
+ * @property {string} name
+ * @property {FC.FutureSociety} [fs] Automatically unlocked with this FS.
+ * @property {boolean} [requirements]
+ * @property {boolean} [harsh]
+ */
+
+/**
+ * @typedef {Map<string, slaveWear|slaveWearChastity>} slaveWearCategory
+ */
+
+/** @type {Object.<string, slaveWearCategory>} */
+App.Data.slaveWear = {
+ collars: new Map([
+ ["stylish leather", {name: "Stylish leather"}],
+ ["satin choker", {name: "Satin choker"}],
+ ["silk ribbon", {name: "Silken ribbon"}],
+ ["heavy gold", {name: "Heavy gold"}],
+ ["pretty jewelry", {name: "Pretty jewelry"}],
+ ["nice retirement counter",
+ {
+ name: "Nice retirement counter",
+ get requirements() {
+ return V.seeAge === 1;
+ }
+ }
+ ],
+ ["preg biometrics",
+ {
+ name: "Pregnancy biometrics",
+ get requirements() {
+ return V.seePreg === 1;
+ }
+ }
+ ],
+ ["bell collar", {name: "Bell"}],
+ ["leather with cowbell", {name: "Cowbell"}],
+ ["bowtie",
+ {
+ name: "Bowtie collar",
+ fs: "FSGenderFundamentalist",
+ get requirements() {
+ return V.boughtItem.clothing.bunny === 1;
+ }
+ }
+ ],
+ ["neck tie",
+ {
+ name: "Neck tie",
+ fs: "FSPaternalist",
+ get requirements() {
+ return V.boughtItem.clothing.conservative === 1;
+ }
+ }
+ ],
+ ["ancient Egyptian",
+ {
+ name: "Ancient Egyptian",
+ fs: "FSEgyptianRevivalist",
+ get requirements() {
+ return V.boughtItem.clothing.egypt === 1;
+ }
+ }
+ ],
+ ["tight steel",
+ {
+ name: "Tight steel",
+ harsh: true
+ }
+ ],
+ ["cruel retirement counter",
+ {
+ name: "Cruel retirement counter",
+ get requirements() {
+ return V.seeAge === 1;
+ },
+ harsh: true
+ }
+ ],
+ ["uncomfortable leather",
+ {
+ name: "Uncomfortable leather",
+ harsh: true
+ }
+ ],
+ ["shock punishment",
+ {
+ name: "Shock punishment",
+ harsh: true
+ }
+ ],
+ ["neck corset",
+ {
+ name: "Neck corset",
+ harsh: true
+ }
+ ],
+ ]),
+
+ faceAccessory: new Map([
+ ["porcelain mask", {name: "Porcelain mask"}],
+ ["cat ears", {name: "Cat ears"}],
+ ]),
- buttplugAttachments: [
- {name: "None", value: "none"},
- {name: "Tail", value: "tail", get requirements() { return V.boughtItem.toys.buttPlugTails === 1; }},
- {name: "Fox tail", value: "fox tail", get requirements() { return V.boughtItem.toys.buttPlugTails === 1; }},
- {name: "Cat tail", value: "cat tail", get requirements() { return V.boughtItem.toys.buttPlugTails === 1; }},
- {name: "Cow tail", value: "cow tail", get requirements() { return V.boughtItem.toys.buttPlugTails === 1; }}
- ],
- /**
- * @typedef {object} slaveWearChastity
- * @property {string} name
- * @property {string} value
- * @property {object} updateSlave
- * @property {string} [fs]
- */
+ mouthAccessory: new Map([
+ ["ball gag", {name: "Ball gag"}],
+ ["bit gag", {name: "Bit gag"}],
+ ["ring gag", {name: "Ring gag"}],
+ ["massive dildo gag",
+ {
+ name: "Massive dildo gag",
+ get requirements() {
+ return V.boughtItem.toys.gags === 1;
+ }
+ }
+ ],
+ ["dildo gag", {name: "Dildo gag"}
+ ],
+ ]),
+
+ shoes: new Map([
+ ["none", {name: "Barefoot"}],
+ ["flats", {name: "Flats"}],
+ ["heels", {name: "Heels"}],
+ ["pumps", {name: "Pumps"}],
+ ["boots", {name: "Thigh boots"}],
+ ["extreme heels", {name: "Painfully extreme heels"}],
+ ["platform shoes",
+ {
+ name: "Platforms",
+ fs: "FSStatuesqueGlorification",
+ get requirements() {
+ return (V.boughtItem.shoes.heels === 1);
+ }
+ }
+ ],
+ ["platform heels",
+ {
+ name: "Platform heels",
+ fs: "FSStatuesqueGlorification",
+ get requirements() {
+ return (V.boughtItem.shoes.heels === 1);
+ }
+ }
+ ],
+ ["extreme platform heels",
+ {
+ name: "Painfully extreme platform heels",
+ fs: "FSStatuesqueGlorification",
+ get requirements() {
+ return (V.boughtItem.shoes.heels === 1);
+ }
+ }
+ ],
+ ]),
- /** @type {Array<slaveWearChastity>} */
- chastityDevices: [
- // '.value' must be a string, so using update slave so I can update multiple values.
+ bellyAccessories: new Map([
+ ["none", {name: "None"}],
+ ["a corset", {name: "Tight corset"}],
+ ["an extreme corset", {name: "Extreme corset"}],
+ ["a support band", {name: "Supportive band"}],
+ ["a small empathy belly",
+ {
+ name: "1st Trimester belly",
+ fs: "FSRepopulationFocus",
+ get requirements() {
+ return V.boughtItem.clothing.belly === 1;
+ }
+ }
+ ],
+ ["a medium empathy belly",
+ {
+ name: "2nd Trimester belly",
+ fs: "FSRepopulationFocus",
+ get requirements() {
+ return V.boughtItem.clothing.belly === 1;
+ }
+ }
+ ],
+ ["a large empathy belly",
+ {
+ name: "3rd Trimester belly",
+ fs: "FSRepopulationFocus",
+ get requirements() {
+ return V.boughtItem.clothing.belly === 1;
+ }
+ }
+ ],
+ ["a huge empathy belly",
+ {
+ name: "3rd Trimester twins belly",
+ fs: "FSRepopulationFocus",
+ get requirements() {
+ return V.boughtItem.clothing.belly === 1;
+ }
+ }
+ ]
+ ]),
+
+ vaginalAccessories: new Map([
+ ["none", {name: "None"}],
+ ["bullet vibrator", {name: "Bullet vibrator"}],
+ ["smart bullet vibrator",
+ {
+ name: "Smart bullet vibrator",
+ get requirements() {
+ return V.boughtItem.toys.smartVibes === 1;
+ }
+ }
+ ],
+ ["dildo", {name: "Dildo"}],
+ ["long dildo",
+ {
+ name: "Long dildo",
+ get requirements() {
+ return V.boughtItem.toys.dildos === 1;
+ }
+ }
+ ],
+ ["large dildo", {name: "Large dildo"}],
+ ["long, large dildo",
+ {
+ name: "Long, large dildo",
+ get requirements() {
+ return V.boughtItem.toys.dildos === 1;
+ }
+ }
+ ],
+ ["huge dildo",
+ {
+ name: "Huge dildo",
+ get requirements() {
+ return V.boughtItem.toys.dildos === 1;
+ }
+ }
+ ],
+ ["long, huge dildo",
+ {
+ name: "Long, huge dildo",
+ get requirements() {
+ return V.boughtItem.toys.dildos === 1;
+ }
+ }
+ ]
+ ]),
+
+ vaginalAttachments: new Map([
+ ["none", {name: "None"}],
+ ["vibrator",
+ {
+ name: "Vibrating attachment",
+ get requirements() {
+ return V.boughtItem.toys.vaginalAttachments === 1;
+ }
+ }
+ ],
+ ["smart vibrator",
+ {
+ name: "Smart vibrating attachment",
+ get requirements() {
+ return V.boughtItem.toys.smartVaginalAttachments === 1;
+ }
+ }
+ ]
+ ]),
+
+ dickAccessories: new Map([
+ ["none", {name: "None"}],
+ ["bullet vibrator", {name: "Bullet vibrator"}],
+ ["smart bullet vibrator",
+ {
+ name: "Smart bullet vibrator",
+ get requirements() {
+ return V.boughtItem.toys.smartVibes === 1;
+ }
+ }
+ ]
+ ]),
+
+ buttplugs: new Map([
+ ["none", {name: "None"}],
+ ["plug", {name: "Standard plug"}],
+ ["long plug",
+ {
+ name: "Long plug",
+ get requirements() {
+ return V.boughtItem.toys.buttPlugs === 1;
+ }
+ }
+ ],
+ ["large plug", {name: "Large plug"}],
+ ["long, large plug",
+ {
+ name: "Long, large plug",
+ get requirements() {
+ return V.boughtItem.toys.buttPlugs === 1;
+ }
+ }
+ ],
+ ["huge plug", {name: "Huge plug"}],
+ ["long, huge plug",
+ {
+ name: "Long, huge plug",
+ get requirements() {
+ return V.boughtItem.toys.buttPlugs === 1;
+ }
+ }
+ ]
+ ]),
+
+ buttplugAttachments: new Map([
+ ["none", {name: "None"}],
+ ["tail",
+ {
+ name: "Tail",
+ get requirements() {
+ return V.boughtItem.toys.buttPlugTails === 1;
+ }
+ }
+ ],
+ ["fox tail",
+ {
+ name: "Fox tail",
+ get requirements() {
+ return V.boughtItem.toys.buttPlugTails === 1;
+ }
+ }
+ ],
+ ["cat tail",
+ {
+ name: "Cat tail",
+ get requirements() {
+ return V.boughtItem.toys.buttPlugTails === 1;
+ }
+ }
+ ],
+ ["cow tail",
+ {
+ name: "Cow tail",
+ get requirements() {
+ return V.boughtItem.toys.buttPlugTails === 1;
+ }
+ }
+ ]
+ ]),
+};
+/**
+ * @typedef {object} slaveWearChastity
+ * @property {string} name
+ * @property {string} value
+ * @property {object} updateSlave
+ * @property {FC.FutureSociety} [fs]
+ */
+
+/** @type {Map<string, slaveWearChastity>} */
+App.Data.slaveWear.chastityDevices = new Map([
+ // '.value' must be a string, so using update slave so I can update multiple values.
+ ["none",
{
name: "None",
- value: "none",
updateSlave: {
choosesOwnChastity: 0,
chastityAnus: 0,
chastityPenis: 0,
chastityVagina: 0
},
- },
+ }
+ ],
+ ["anal chastity",
{
name: "Anal chastity",
- value: "anal chastity",
updateSlave: {
choosesOwnChastity: 0,
chastityAnus: 1,
chastityPenis: 0,
chastityVagina: 0
}
- },
+ }
+ ],
+ ["chastity belt",
{
name: "Chastity belt",
- value: "chastity belt",
updateSlave: {
choosesOwnChastity: 0,
chastityAnus: 0,
chastityPenis: 0,
chastityVagina: 1
},
- },
+ }
+ ],
+ ["combined chastity belt",
{
name: "Combined chastity belt",
- value: "combined chastity belt",
updateSlave: {
choosesOwnChastity: 0,
chastityAnus: 1,
chastityPenis: 0,
chastityVagina: 1
},
- },
+ }
+ ],
+ ["chastity cage",
{
name: "Chastity cage",
- value: "chastity cage",
updateSlave: {
choosesOwnChastity: 0,
chastityAnus: 0,
chastityPenis: 1,
chastityVagina: 0
},
- },
+ }
+ ],
+ ["combined chastity cage",
{
name: "Combined chastity cage",
- value: "combined chastity cage",
updateSlave: {
choosesOwnChastity: 0,
chastityAnus: 1,
chastityPenis: 1,
chastityVagina: 0
},
- },
+ }
+ ],
+ ["genital chastity",
{
name: "Genital chastity",
- value: "genital chastity",
updateSlave: {
choosesOwnChastity: 0,
chastityAnus: 0,
chastityPenis: 1,
chastityVagina: 1
},
- },
+ }
+ ],
+ ["full chastity",
{
name: "Full chastity",
- value: "full chastity",
updateSlave: {
choosesOwnChastity: 0,
chastityAnus: 1,
chastityPenis: 1,
chastityVagina: 1
},
- },
+ }
+ ],
+ ["choose own chastity",
{
name: "Choose own chastity",
- value: "choose own chastity",
fs: "FSRestart",
updateSlave: {
choosesOwnChastity: 1
},
- },
+ }
+ ],
+ ["revoke choosing own chastity",
{
name: "Revoke choosing own chastity",
- value: "revoke choosing own chastity",
fs: "FSRestart",
updateSlave: {
choosesOwnChastity: 0
},
- },
- ],
-};
+ }
+ ]
+]);
diff --git a/src/002-config/colors.css b/src/002-config/colors.css
index 5ec1f2b54f102e6c637684c805e5730a01aff6ee..373459ca14ada07963c2f2c45ebb86c8766906ce 100644
--- a/src/002-config/colors.css
+++ b/src/002-config/colors.css
@@ -6,4 +6,5 @@
--button-disabled-color: #1a1a1a;
--link-color: #68D;
+ --link-hover-color: #8af
}
diff --git a/src/002-config/mousetrapConfig.js b/src/002-config/mousetrapConfig.js
index da2641fb38a03b0b3aae3041456e9e0b7a941f50..dd39ff0c3d8b77d5ca4062e99907c29746b1c5b6 100644
--- a/src/002-config/mousetrapConfig.js
+++ b/src/002-config/mousetrapConfig.js
@@ -255,11 +255,43 @@ App.UI.Hotkeys = (function() {
}
}
+ function settingsPage() {
+ const f = document.createDocumentFragment();
+
+ App.UI.DOM.appendNewElement("h1", f, "Hotkey Settings");
+
+ const p = document.createElement("p");
+ const ul = document.createElement("ul");
+
+ let li = document.createElement("li");
+ li.append("On keyboard layouts other than the ");
+ const a = document.createElement("a");
+ a.href = "https://en.wikipedia.org/wiki/File:KB_United_States.svg";
+ a.target = "_blank";
+ a.append("US-QWERTY layout");
+ li.append(a,
+ "there may be keys or combinations of keys where the recorded key is different from the key used to listen to key events. You will have to find these keys yourself through trial and error.");
+ ul.append(li);
+
+ App.UI.DOM.appendNewElement("li", ul, "Custom hotkeys are browser specific and are not part of your save.");
+
+ li = document.createElement("li");
+ li.append("While we try not to overwrite browser or OS level key combinations it is possible to do so with custom hotkeys. This also means that during recording of custom hotkeys no browser or OS level key combinations are available. There are however keys that cannot be overwritten, the ",
+ App.UI.DOM.makeElement("code", "Win key"), " on Windows is an example for this.");
+ ul.append(li);
+
+ p.append(ul);
+ f.append(p);
+
+ f.append(settingsMenu());
+ return f;
+ }
+
return {
add: addDefault,
hotkeys: hotkeysForAction,
init: init,
- settings: settingsMenu,
+ settings: settingsPage,
};
})();
diff --git a/src/004-base/domPassage.js b/src/004-base/domPassage.js
new file mode 100644
index 0000000000000000000000000000000000000000..441a8a87ef71ae7eaec796f7b57030bc4ce44811
--- /dev/null
+++ b/src/004-base/domPassage.js
@@ -0,0 +1,26 @@
+/**
+ * A pure DOM Passage, the SugarCube Wikifier never gets invoked.
+ */
+App.DomPassage = class extends Passage {
+ /**
+ * @param {string} title
+ * @param {function():DocumentFragment|function():HTMLElement} callback
+ * @param {string[]} tags
+ */
+ constructor(title, callback, tags = []) {
+ super(title, {
+ hasAttribute: a => a === "tags",
+ getAttribute: () => tags.join(" ")
+ });
+ this.callback = callback;
+
+ Story.add(this);
+ }
+
+ /**
+ * @returns {DocumentFragment|HTMLElement}
+ */
+ render() {
+ return this.callback();
+ }
+};
diff --git a/src/005-passages/arcologyBuildingPassages.js b/src/005-passages/arcologyBuildingPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..cf43a8f8c94f8fe949f96093d7cd9e8f2d71481b
--- /dev/null
+++ b/src/005-passages/arcologyBuildingPassages.js
@@ -0,0 +1,8 @@
+new App.DomPassage("Cell",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Main";
+
+ return V.building.renderCell(V.cellPath);
+ }, ["jump-from-safe", "no-history"]
+);
diff --git a/src/005-passages/birthPassages.js b/src/005-passages/birthPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..fa602b32314ea310487e22002f3668a037b3f6df
--- /dev/null
+++ b/src/005-passages/birthPassages.js
@@ -0,0 +1,17 @@
+new App.DomPassage("BirthStorm",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Slave Interact";
+
+ return birth(getSlave(V.AS), {birthStorm: true});
+ }
+);
+
+new App.DomPassage("csec",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Slave Interact";
+
+ return birth(getSlave(V.AS), {cSection: true});
+ }
+);
diff --git a/src/005-passages/endWeekPassages.js b/src/005-passages/endWeekPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..510a03aaa94a118e1d3745ea7d21e684f24cc5d9
--- /dev/null
+++ b/src/005-passages/endWeekPassages.js
@@ -0,0 +1,13 @@
+new App.DomPassage("Slave Assignments Report",
+ () => {
+ V.nextLink = "Economics"; V.nextButton = "Continue";
+
+ const f = document.createDocumentFragment();
+ App.UI.DOM.appendNewElement("h1", f, `${V.arcologies[0].name} Weekly Slave Report - Week ${V.week}`);
+ f.append(App.EndWeek.slaveAssignmentReport());
+
+ App.UI.EndWeekAnim.end();
+
+ return f;
+ }
+);
diff --git a/src/005-passages/eventsPassages.js b/src/005-passages/eventsPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..c9c0031adfeed933e1a62ed820c8ea9789feb3e8
--- /dev/null
+++ b/src/005-passages/eventsPassages.js
@@ -0,0 +1,59 @@
+/* ### Scheduled Events ### */
+new App.DomPassage("SE Burst",
+ () => {
+ V.nextButton = "Continue";
+ V.nextLink = "Scheduled Event";
+
+ return allBursts();
+ }
+);
+
+new App.DomPassage("SE Death",
+ () => {
+ V.nextButton = "Continue";
+ V.nextLink = "Scheduled Event";
+
+ return allDeaths();
+ }
+);
+
+new App.DomPassage("SE Birth",
+ () => {
+ V.nextButton = "Continue";
+ V.nextLink = "Scheduled Event";
+
+ return allBirths();
+ }
+);
+
+new App.DomPassage("SE pit fight", () => App.Facilities.Pit.fight(V.pit.lethal));
+
+new App.DomPassage("SE pc birthday", () => App.Events.pcBirthday.runEvent());
+
+/* ### Non Random Events ### */
+
+new App.DomPassage("Murder Attempt",
+ () => {
+ if (V.event === "slave trade") {
+ return App.Events.murderAttemptFollowup("slave", V.illegalDeals.slave.company, V.illegalDeals.slave.type);
+ } else if (V.event === "trade deal") {
+ return App.Events.murderAttemptFollowup("trade", V.illegalDeals.trade.company);
+ } else if (V.event === "military deal") {
+ return App.Events.murderAttemptFollowup("military", V.illegalDeals.military.company);
+ } else {
+ return App.Events.murderAttempt();
+ }
+ }
+);
+
+/* ### Random Events ### */
+
+new App.DomPassage("JS Random Event",
+ () => {
+ V.nextButton = "Continue";
+
+ const f = document.createDocumentFragment();
+ V.event.execute(f);
+ return f;
+ }
+);
diff --git a/src/005-passages/facilitiesPassages.js b/src/005-passages/facilitiesPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..9d537fa220a3978dfc0837949f2016cc0d5be6a4
--- /dev/null
+++ b/src/005-passages/facilitiesPassages.js
@@ -0,0 +1,70 @@
+/* ### Standard Facilities ### */
+new App.DomPassage("Pit", () => { return App.Facilities.Pit.pit(); }, ["jump-to-safe", "jump-from-safe"]);
+
+new App.DomPassage("Incubator", () => { return App.UI.incubator(); }, ["jump-to-safe", "jump-from-safe"]);
+
+/* ### Slave Interact Facilities ### */
+new App.DomPassage("Wardrobe",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Manage Penthouse";
+
+ return App.UI.WardrobeShopping("FS");
+ }, ["jump-to-safe", "jump-from-safe"]
+);
+
+new App.DomPassage("Salon",
+ () => {
+ V.nextButton = "Confirm changes";
+ V.nextLink = "Slave Interact";
+ V.encyclopedia = "The Auto Salon";
+
+ return App.UI.salon(getSlave(V.AS));
+ }, ["jump-to-safe", "jump-from-safe"]
+);
+
+new App.DomPassage("Body Modification",
+ () => {
+ V.nextButton = "Confirm changes";
+ V.nextLink = "Slave Interact";
+ V.encyclopedia = "The Studio";
+
+ return App.UI.bodyModification(getSlave(V.AS));
+ }, ["jump-to-safe", "jump-from-safe"]
+);
+
+/* ### Special Facilities ### */
+new App.DomPassage("Agent Select",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Neighbor Interact";
+ V.encyclopedia = "Agents";
+
+ const f = document.createDocumentFragment();
+ App.UI.DOM.appendNewElement("h2", f, "Appoint an Agent from your devoted slaves");
+
+ // TODO Logic should not be handled here.
+ f.append(App.UI.SlaveList.slaveSelectionList(
+ s => s.fuckdoll === 0
+ && s.devotion > 20
+ && s.intelligence + s.intelligenceImplant > 15
+ && s.intelligenceImplant >= 15
+ && canWalk(s) && canSee(s) && canHear(s) && canTalk(s)
+ && s.broodmother < 2
+ && (s.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset"),
+ (slave) => App.UI.DOM.passageLink(SlaveFullName(slave), "Agent Workaround",
+ () => { V.i = V.slaves.findIndex((s) => s.ID === slave.ID); }),
+ s => App.Entity.facilities.arcologyAgent.manager.slaveHasExperience(s)
+ ));
+
+ return f;
+ }, ["jump-from-safe"]
+);
+
+new App.DomPassage("Rules Assistant",
+ () => {
+ const div = document.createElement("div");
+ App.RA.options(div);
+ return div;
+ }, ["jump-to-safe", "jump-from-safe"]
+);
diff --git a/src/005-passages/interactPassages.js b/src/005-passages/interactPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..d04947c2ba4414ae06cd52b643f3a517d96435d2
--- /dev/null
+++ b/src/005-passages/interactPassages.js
@@ -0,0 +1,23 @@
+/* ### Central Slave Interact ### */
+new App.DomPassage("Slave Interact",
+ () => {
+ V.nextButton = "Confirm changes";
+ V.nextLink = "Main";
+
+ return App.UI.SlaveInteract.mainPage(getSlave(V.AS));
+ }
+);
+
+/* ### Single Interaction ### */
+new App.DomPassage("BeastFucked", () => App.Interact.fAnimal(getSlave(V.AS), V.animalType));
+
+new App.DomPassage("SlaveOnSlaveFeeding",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Slave Interact";
+
+ return App.UI.SlaveInteract.slaveOnSlaveFeedingSelection(getSlave(V.AS));
+ }
+);
+
+new App.DomPassage("KillSlave", () => App.UI.SlaveInteract.killSlave(getSlave(V.AS)));
diff --git a/src/005-passages/introPassages.js b/src/005-passages/introPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..5a7e68624eac9916e331dc1bf3758d286173ba32
--- /dev/null
+++ b/src/005-passages/introPassages.js
@@ -0,0 +1,10 @@
+new App.DomPassage("PC Body Intro", () => { return App.Intro.PCBodyIntro(); });
+
+new App.DomPassage("Intro Summary", () => { return App.Intro.summary(); });
+
+new App.DomPassage("Acquisition",
+ () => {
+ V.encyclopedia = "How to Play";
+ return App.Intro.acquisition();
+ }
+);
diff --git a/src/005-passages/optionsPassages.js b/src/005-passages/optionsPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..00ce48b86345f5f972262dc8399c754de6f2cddd
--- /dev/null
+++ b/src/005-passages/optionsPassages.js
@@ -0,0 +1,57 @@
+new App.DomPassage("Options",
+ () => {
+ if (lastVisited("Slave Interact") === 1) {
+ V.storedLink = "Slave Interact";
+ } else {
+ V.storedLink = "Main";
+ }
+
+ V.nextButton = "Back";
+ V.nextLink = V.storedLink;
+ V.encyclopedia = "How to Play";
+
+ return App.UI.optionsPassage();
+ }, ["jump-to-safe", "jump-from-safe"]
+);
+
+new App.DomPassage("Description Options",
+ () => {
+ V.nextButton = "Back";
+ if (V.storedLink !== "Slave Interact") {
+ if (lastVisited("Slave Interact") === 1) {
+ V.storedLink = "Slave Interact";
+ } else {
+ V.storedLink = "Options";
+ }
+ }
+ V.nextLink = V.storedLink;
+
+ return App.UI.descriptionOptions();
+ }, ["jump-to-safe", "jump-from-safe"]
+);
+
+new App.DomPassage("Summary Options",
+ () => {
+ V.nextButton = "Back";
+ if (V.storedLink !== "Slave Interact" && V.storedLink !== "Main") {
+ if (lastVisited("Main") === 1) {
+ V.storedLink = "Main";
+ } else {
+ V.storedLink = "Options";
+ }
+ }
+ V.nextLink = V.storedLink;
+ V.passageSwitchHandler = App.EventHandlers.optionsChanged;
+
+ return App.UI.summaryOptions();
+ }, ["jump-to-safe", "jump-from-safe"]
+);
+
+new App.DomPassage("Hotkey Settings",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Main";
+
+ return App.UI.Hotkeys.settings();
+ }, ["jump-to-safe", "jump-from-safe"]
+);
diff --git a/src/arcologyBuilding/cell.tw b/src/arcologyBuilding/cell.tw
deleted file mode 100644
index 5875dadfa14b53fb708c8d3c3e7436dfae16616a..0000000000000000000000000000000000000000
--- a/src/arcologyBuilding/cell.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: Cell [nobr jump-from-safe no-history]
-
-<<set $nextButton = "Back", $nextLink = "Main">>
-
-<<includeDOM V.building.renderCell(V.cellPath)>>
diff --git a/src/endWeek/reportsTW/slaveAssignmentsReport.tw b/src/endWeek/reportsTW/slaveAssignmentsReport.tw
deleted file mode 100644
index d1145b3b4f0851d4c11ae9a236f128f5d3261090..0000000000000000000000000000000000000000
--- a/src/endWeek/reportsTW/slaveAssignmentsReport.tw
+++ /dev/null
@@ -1,8 +0,0 @@
-:: Slave Assignments Report [nobr]
-
-<<set $nextLink = "Economics", $nextButton = "Continue">>
-
-<h1> $arcologies[0].name Weekly Slave Report - Week $week</h1>
-
-<<includeDOM App.EndWeek.slaveAssignmentReport()>>
-<<run App.UI.EndWeekAnim.end()>>
diff --git a/src/endWeek/saClothes.js b/src/endWeek/saClothes.js
index bf925dfc8df15fe35d7c4b68fc87a66406214d2f..0abf5f1e2b96472cc80935c0cbb4f286ccb32cd6 100644
--- a/src/endWeek/saClothes.js
+++ b/src/endWeek/saClothes.js
@@ -85,251 +85,298 @@ App.SlaveAssignment.clothes = (function() {
*
*/
function clothingEffects(slave) {
- switch (slave.clothes) {
- case "no clothing":
- if (slave.devotion >= -20) {
- if (slave.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) {
- 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") {
- 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) {
- r.push(`${His} libido is so strong that ${he} <span class="hotpink">enjoys being naked and available.</span>`);
- slave.devotion += 1;
- }
- }
- break;
- case "a penitent nuns habit":
- r.push(`The mortification of the flesh ${he} endures from wearing ${his} sackcloth habit slowly and painfully <span class="hotpink">purifies ${his} mind</span> of any but devoted, <span class="gold">fearful</span> thoughts. It's also <span class="health dec">unhealthy.</span>`);
- slave.devotion += 2;
- slave.trust -= 2;
- healthDamage(slave, 3);
- if (slave.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>`);
+ if (App.Data.clothes.get(slave.clothes) && getExposure(slave) === 4) {
+ if (slave.devotion >= -20) {
+ if (slave.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 === "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;
- }
- }
- break;
- case "uncomfortable straps":
- if (slave.devotion >= -20 && slave.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>`);
+ } else if (slave.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.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>`);
+ } else if (slave.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;
- slave.trust -= 1;
- if (slave.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) {
- 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";
+ } else if (slave.energy > 95) {
+ r.push(`${His} libido is so strong that ${he} <span class="hotpink">enjoys being naked and available.</span>`);
+ slave.devotion += 1;
+ }
+ }
+ }
+ // humiliating clothing effects
+ if (slave.fetishKnown === 0 || slave.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;
+ }
+ }
+ }
+
+ if (App.Data.clothes.get(slave.clothes)) {
+ if (App.Data.clothes.get(slave.clothes).harsh) {
+ switch (slave.clothes) {
+ case "a penitent nuns habit":
+ r.push(`The mortification of the flesh ${he} endures from wearing ${his} sackcloth habit slowly and painfully <span class="hotpink">purifies ${his} mind</span> of any but devoted, <span class="gold">fearful</span> thoughts. It's also <span class="health dec">unhealthy.</span>`);
+ slave.devotion += 2;
+ slave.trust -= 2;
+ healthDamage(slave, 3);
+ if (slave.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;
- slave.fetishStrength = 10;
+ } else if (slave.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;
+ }
}
- }
- } else {
- if (slave.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) {
- 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;
+ break;
+ case "uncomfortable straps":
+ if (slave.devotion >= -20 && slave.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) {
+ 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) {
+ 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;
+ }
+ }
+ } else {
+ if (slave.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) {
+ 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;
+ }
+ }
}
- }
- }
- break;
- case "chains":
- if (slave.devotion >= -20 && slave.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) {
- r.push(`The chains ${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) {
- 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) {
- 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;
+ break;
+ case "chains":
+ if (slave.devotion >= -20 && slave.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) {
+ r.push(`The chains ${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) {
+ 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) {
+ 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;
+ }
+ }
+ } else {
+ if (slave.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) {
+ 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;
+ }
+ }
}
- }
- } else {
- if (slave.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) {
- 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;
+ break;
+ case "restrictive latex":
+ if (slave.devotion > 20 && slave.trust >= -50 && slave.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;
+ } else if (slave.fetishStrength > 60) {
+ r.push(`As a submissive ${he} <span class="hotpink">openly enjoys being immured in latex.</span>`);
+ slave.devotion += 2;
+ } else {
+ r.push(`${His} submissive tendencies help ${him} <span class="hotpink">enjoy being immured in latex.</span>`);
+ slave.devotion += 1;
+ }
+ } else if (slave.devotion < -20) {
+ r.push(`The latex ${he}'s wearing limits ${his} world to <span class="hotpink">your input and control</span> and <span class="gold">fear</span> of unexpected pain.`);
+ slave.devotion += 1;
+ slave.trust -= 1;
}
- }
- }
- break;
- case "restrictive latex":
- if (slave.devotion > 20 && slave.trust >= -50 && slave.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;
- } else if (slave.fetishStrength > 60) {
- r.push(`As a submissive ${he} <span class="hotpink">openly enjoys being immured in latex.</span>`);
- slave.devotion += 2;
- } else {
- r.push(`${His} submissive tendencies help ${him} <span class="hotpink">enjoy being immured in latex.</span>`);
- slave.devotion += 1;
- }
- } else if (slave.devotion < -20) {
- r.push(`The latex ${he}'s wearing limits ${his} world to <span class="hotpink">your input and control</span> and <span class="gold">fear</span> of unexpected pain.`);
- slave.devotion += 1;
- slave.trust -= 1;
- }
- break;
- case "shibari ropes":
- if (slave.devotion > 20 && slave.trust >= -50 && slave.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;
- } else if (slave.fetishStrength > 60) {
- r.push(`As a submissive ${he} <span class="hotpink">openly enjoys wearing binding ropes as clothing.</span>`);
- slave.devotion += 2;
- } else {
- r.push(`${His} submissive tendencies help ${him} <span class="hotpink">enjoy wearing binding ropes as clothing.</span>`);
- slave.devotion += 1;
- }
- } else if (slave.devotion < -20) {
- r.push(`The ropes ${he}'s wearing restrict ${him} without pain, rendering ${him} <span class="hotpink">susceptible to control</span> and <span class="gold">afraid.</span>`);
- slave.devotion += 1;
- slave.trust -= 1;
- }
- break;
- case "an apron":
- if (slave.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;
- } else {
- 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") {
- if (slave.fetishKnown === 0) {
- r.push(`${He} pretends to be embarrassed by ${his} extremely revealing clothing but seems to get off on it. <span class="lightcoral">${He}'s into humiliation.</span>`);
- slave.fetishKnown = 1;
- } else if (slave.fetishStrength > 60) {
- r.push(`${He} pretends to be embarrassed by ${his} extremely revealing clothing but <span class="hotpink">openly gets off on it.</span>`);
- slave.devotion += 2;
- } else {
- r.push(`${He} pretends to be embarrassed by ${his} extremely revealing clothing but <span class="hotpink">secretly gets off on it.</span>`);
- slave.devotion += 1;
- }
- } else if (slave.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;
- } else if (slave.fetishStrength > 60) {
- r.push(`${He} <span class="hotpink">openly gets off</span> from how motherly ${he} looks wearing nothing but an apron over ${his}`);
- if (slave.bellyPreg > 100) {
- r.push(`increasingly`);
+ break;
+ case "shibari ropes":
+ if (slave.devotion > 20 && slave.trust >= -50 && slave.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;
+ } else if (slave.fetishStrength > 60) {
+ r.push(`As a submissive ${he} <span class="hotpink">openly enjoys wearing binding ropes as clothing.</span>`);
+ slave.devotion += 2;
+ } else {
+ r.push(`${His} submissive tendencies help ${him} <span class="hotpink">enjoy wearing binding ropes as clothing.</span>`);
+ slave.devotion += 1;
+ }
+ } else if (slave.devotion < -20) {
+ r.push(`The ropes ${he}'s wearing restrict ${him} without pain, rendering ${him} <span class="hotpink">susceptible to control</span> and <span class="gold">afraid.</span>`);
+ slave.devotion += 1;
+ slave.trust -= 1;
}
- r.push(`gravid frame.`);
- slave.devotion += 2;
- } else {
- r.push(`${He} <span class="hotpink">secretly gets off</span> from how motherly ${he} feels wearing nothing but an apron over ${his}`);
- if (slave.bellyPreg > 100) {
- r.push(`increasingly`);
+ break;
+ default:
+ if (slave.devotion >= -20 && slave.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) {
+ r.push(`The outfit ${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) {
+ 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) {
+ 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;
+ }
+ }
+ } else {
+ if (slave.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) {
+ 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;
+ }
+ }
}
- r.push(`gravid frame.`);
- slave.devotion += 1;
- }
- } else if (slave.devotion <= 20) {
- r.push(`${He} is <span class="mediumorchid">inappropriately proud</span> of the nice apron ${he}'s wearing, <span class="mediumaquamarine">building ${his} confidence.</span>`);
- slave.devotion -= 5;
- slave.trust += 3;
- } else {
- r.push(`${He} is <span class="hotpink">proud</span> and <span class="mediumaquamarine">confident</span> of the nice apron ${he}'s wearing.`);
- slave.devotion += 1;
- slave.trust += 1;
}
- break;
- default:
- if (slave.devotion <= 20) {
- r.push(`${He} is <span class="mediumorchid">inappropriately proud</span> of the nice clothes ${he}'s wearing, <span class="mediumaquamarine">building ${his} confidence.</span>`);
- slave.devotion -= 5;
- slave.trust += 3;
- } else if (slave.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;
- } else if (slave.fetishStrength > 60) {
- r.push(`${He} pretends to be embarrassed by ${his} clearly exposed breasts but <span class="hotpink">openly gets off on it.</span>`);
- slave.devotion += 2;
- } else {
- 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" && setup.humiliatingClothes.includes(slave.clothes)) {
- if (slave.fetishKnown === 0) {
- r.push(`${He} pretends to be embarrassed by ${his} extremely revealing clothing but seems to get off on it. <span class="lightcoral">${He}'s into humiliation.</span>`);
- slave.fetishKnown = 1;
- } else if (slave.fetishStrength > 60) {
- r.push(`${He} pretends to be embarrassed by ${his} extremely revealing clothing but <span class="hotpink">openly gets off on it.</span>`);
- slave.devotion += 2;
- } else {
- r.push(`${He} pretends to be embarrassed by ${his} extremely revealing clothing but <span class="hotpink">secretly gets off on it.</span>`);
- slave.devotion += 1;
- }
- } else if (slave.dick > 0) {
- /* males have trouble with outfit block */ /* return to with crotch description overhaul */
- switch (slave.clothes) {
- case "attractive lingerie":
- case "attractive lingerie for a pregnant woman":
- r.push(`${He} is <span class="hotpink">proud</span> of the pretty lingerie ${he}'s wearing, but ${he} constantly has to adjust ${his} g-string to cover ${his} penis.`);
- slave.devotion += 1;
- break;
- case "a string bikini":
- r.push(`${He} is <span class="hotpink">proud</span> of the slutty swimsuit ${he}'s wearing, but ${he} constantly has to adjust ${his} string bikini bottom in a vain effort to cover ${his} penis.`);
+ } else { // nice
+ switch (slave.clothes) {
+ case "an apron":
+ if (slave.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;
+ } else {
+ 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") {
+ if (slave.fetishKnown === 0) {
+ r.push(`${He} pretends to be embarrassed by ${his} extremely revealing clothing but seems to get off on it. <span class="lightcoral">${He}'s into humiliation.</span>`);
+ slave.fetishKnown = 1;
+ } else if (slave.fetishStrength > 60) {
+ r.push(`${He} pretends to be embarrassed by ${his} extremely revealing clothing but <span class="hotpink">openly gets off on it.</span>`);
+ slave.devotion += 2;
+ } else {
+ r.push(`${He} pretends to be embarrassed by ${his} extremely revealing clothing but <span class="hotpink">secretly gets off on it.</span>`);
+ slave.devotion += 1;
+ }
+ } else if (slave.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;
+ } else if (slave.fetishStrength > 60) {
+ r.push(`${He} <span class="hotpink">openly gets off</span> from how motherly ${he} looks wearing nothing but an apron over ${his}`);
+ if (slave.bellyPreg > 100) {
+ r.push(`increasingly`);
+ }
+ r.push(`gravid frame.`);
+ slave.devotion += 2;
+ } else {
+ r.push(`${He} <span class="hotpink">secretly gets off</span> from how motherly ${he} feels wearing nothing but an apron over ${his}`);
+ if (slave.bellyPreg > 100) {
+ r.push(`increasingly`);
+ }
+ r.push(`gravid frame.`);
+ slave.devotion += 1;
+ }
+ } else if (slave.devotion <= 20) {
+ r.push(`${He} is <span class="mediumorchid">inappropriately proud</span> of the nice apron ${he}'s wearing, <span class="mediumaquamarine">building ${his} confidence.</span>`);
+ slave.devotion -= 5;
+ slave.trust += 3;
+ } else {
+ r.push(`${He} is <span class="hotpink">proud</span> and <span class="mediumaquamarine">confident</span> of the nice apron ${he}'s wearing.`);
slave.devotion += 1;
- break;
- default:
+ slave.trust += 1;
+ }
+ break;
+ default:
+ if (slave.devotion <= 20) {
+ if (App.Data.clothes.get(slave.clothes).exposure === 0) {
+ r.push(`${He} is <span class="mediumorchid">inappropriately proud</span> of the modest clothes ${he}'s wearing; their decency <span class="mediumaquamarine">rapidly building ${his} confidence.</span>`);
+ slave.trust += 7;
+ } else if (App.Data.clothes.get(slave.clothes).exposure === 1) {
+ r.push(`${He} is <span class="mediumorchid">inappropriately proud</span> of the nice clothes ${he}'s wearing; their relative decency <span class="mediumaquamarine">building ${his} confidence.</span>`);
+ slave.trust += 5;
+ } else if (App.Data.clothes.get(slave.clothes).exposure <= 3) {
+ r.push(`${He} is <span class="mediumorchid">inappropriately proud</span> of the nice clothes ${he}'s wearing, <span class="mediumaquamarine">building ${his} confidence.</span>`);
+ slave.trust += 3;
+ }
+ slave.devotion -= 5;
+ } else if (slave.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;
+ } else if (slave.fetishStrength > 60) {
+ r.push(`${He} pretends to be embarrassed by ${his} clearly exposed breasts but <span class="hotpink">openly gets off on it.</span>`);
+ slave.devotion += 2;
+ } else {
+ 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) {
+ if (slave.fetishKnown === 0) {
+ r.push(`${He} pretends to be embarrassed by ${his} extremely revealing clothing but seems to get off on it. <span class="lightcoral">${He}'s into humiliation.</span>`);
+ slave.fetishKnown = 1;
+ } else if (slave.fetishStrength > 60) {
+ r.push(`${He} pretends to be embarrassed by ${his} extremely revealing clothing but <span class="hotpink">openly gets off on it.</span>`);
+ slave.devotion += 2;
+ } else {
+ r.push(`${He} pretends to be embarrassed by ${his} extremely revealing clothing but <span class="hotpink">secretly gets off on it.</span>`);
+ slave.devotion += 1;
+ }
+ } else if (slave.dick > 0) {
+ /* males have trouble with outfit block */ /* return to with crotch description overhaul */
+ switch (slave.clothes) {
+ case "attractive lingerie":
+ case "attractive lingerie for a pregnant woman":
+ r.push(`${He} is <span class="hotpink">proud</span> of the pretty lingerie ${he}'s wearing, but ${he} constantly has to adjust ${his} g-string to cover ${his} penis.`);
+ slave.devotion += 1;
+ break;
+ case "a string bikini":
+ r.push(`${He} is <span class="hotpink">proud</span> of the slutty swimsuit ${he}'s wearing, but ${he} constantly has to adjust ${his} string bikini bottom in a vain effort to cover ${his} penis.`);
+ slave.devotion += 1;
+ break;
+ default:
+ r.push(`${He} is <span class="hotpink">proud</span> and <span class="mediumaquamarine">confident</span> of the nice clothes ${he}'s wearing.`);
+ slave.devotion += 1;
+ slave.trust += 1;
+ }
+ } else {
r.push(`${He} is <span class="hotpink">proud</span> and <span class="mediumaquamarine">confident</span> of the nice clothes ${he}'s wearing.`);
slave.devotion += 1;
slave.trust += 1;
- }
- } else {
- r.push(`${He} is <span class="hotpink">proud</span> and <span class="mediumaquamarine">confident</span> of the nice clothes ${he}'s wearing.`);
- slave.devotion += 1;
- slave.trust += 1;
- }
- }
-
- // humiliating clothing effects
- if (slave.fetishKnown === 0 || slave.fetish === "none") {
- if (setup.humiliatingClothes.includes(slave.clothes)) {
- 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;
+ }
}
}
}
@@ -418,7 +465,7 @@ App.SlaveAssignment.clothes = (function() {
if (slave.collar === "heavy gold" || slave.collar === "ancient Egyptian") {
r.push(`${He} bears the burden of ${his} heavy gold collar with <span class="mediumaquamarine">confidence.</span>`);
slave.trust += 1;
- } else if (slave.collar === "bowtie" || slave.collar === "neck tie" ) {
+ } else if (slave.collar === "bowtie" || slave.collar === "neck tie") {
r.push(`The ${slave.collar} and shirt collar ${he} wears fill ${him} with <span class="mediumaquamarine">confidence,</span> since although they conceal a more traditional slave collar that can be used to restrain ${him}, they don't look like it.`);
slave.trust += 1;
} else if (["nice retirement counter", "pretty jewelry", "satin choker", "silk ribbon", "stylish leather"].includes(slave.collar)) {
diff --git a/src/endWeek/saRelationships.js b/src/endWeek/saRelationships.js
index b470976241be7c412c0e9e48b513318cae0fd459..13ebd05336e18a585152fe3c154c2f10fee81fac 100644
--- a/src/endWeek/saRelationships.js
+++ b/src/endWeek/saRelationships.js
@@ -877,6 +877,7 @@ App.SlaveAssignment.relationships = (function() {
if (areRelated(slave, relative)) {
const relationType = relativeTerm(slave, relative);
const repType = relative.ID === -1 ? "PCRelationships" : "SlaveRelationships";
+ const whose = relative.ID === -1 ? "your" : "their";
if (slave.fetish !== "mindbroken") {
if (relative.ID === -1) {
@@ -949,7 +950,7 @@ App.SlaveAssignment.relationships = (function() {
}
}
if (V.arcologies[0].FSEgyptianRevivalist !== "unset") {
- r.push(`Society <span class="reputation inc">strongly approves</span> of your incestuous relationship, which advances the Egyptian revivalist ideal of slave incest.`);
+ r.push(`Society <span class="reputation inc">strongly approves</span> of ${whose} incestuous relationship, which advances the Egyptian revivalist ideal of slave incest.`);
repX((2 * V.FSSingleSlaveRep * (V.arcologies[0].FSEgyptianRevivalist / V.FSLockinLevel)), repType, slave);
V.arcologies[0].FSEgyptianRevivalist += (0.1 * V.FSSingleSlaveRep);
if (slave.bellyPreg >= 1500 && slave.pregSource === relative.ID) {
@@ -958,7 +959,7 @@ App.SlaveAssignment.relationships = (function() {
V.arcologies[0].FSEgyptianRevivalist += (0.05 * V.FSSingleSlaveRep * App.EndWeek.saVars.pornFameBonus);
}
} else if (V.arcologies[0].FSEgyptianRevivalistIncestPolicy === 1) {
- r.push(`Society <span class="reputation inc">enjoys</span> your incestuous relationship since incest is currently trendy.`);
+ r.push(`Society <span class="reputation inc">enjoys</span> ${whose} incestuous relationship since incest is currently trendy.`);
repX((1.5 * V.FSSingleSlaveRep), repType, slave);
if (slave.bellyPreg >= 1500 && slave.pregSource === relative.ID) {
r.push(`<span class="reputation inc">The effect is enhanced</span> by ${slave.slaveName}'s pureblooded pregnancy.`);
diff --git a/src/endWeek/saSharedVariables.js b/src/endWeek/saSharedVariables.js
index 81608508ffef26ba0ac0ef0768900c84b5ac28bf..dce35fec271d5fd534abd96b96af81fff0333a07 100644
--- a/src/endWeek/saSharedVariables.js
+++ b/src/endWeek/saSharedVariables.js
@@ -49,7 +49,7 @@ App.EndWeek.SASharedVariables = class {
this.pornFameBonus = 1;
/** Used to condense all the possible galactorrhea lactation start points to a single line of text in saLongTermPhysicalEffects. */
this.inappropriateLactation = 0;
- /** TODO: move $slaveUsedRest here after saRules is converted, and find others */
+ /** TODO: move V.slaveUsedRest here after saRules is converted, and find others */
}
/** Compute shared subslave ratio (subslaves per ordinary slave) */
diff --git a/src/events/eventUtils.js b/src/events/eventUtils.js
index 6a117d3f283b325621417b3d09bd237fd7d42943..b8a9df8934acf8860d3ed8b22d143739862bb0ac 100644
--- a/src/events/eventUtils.js
+++ b/src/events/eventUtils.js
@@ -1,5 +1,5 @@
App.Events.drawEventArt = (function() {
- const validSingleOutfits = App.Data.slaveWear.niceClothes.map(c => c.value).concat(App.Data.slaveWear.harshClothes.map(c => c.value));
+ const validSingleOutfits = Array.from(App.Data.clothes.keys());
/** draw event art, with the option to dress the slave in a particular way
* @param {Node} node - DOM node to attach art to
diff --git a/src/events/intro/acquisition.tw b/src/events/intro/acquisition.tw
deleted file mode 100644
index 15af72727f501a40741b9b601aae933abce6594e..0000000000000000000000000000000000000000
--- a/src/events/intro/acquisition.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: Acquisition [nobr]
-
-<<set $encyclopedia = "How to Play">>
-
-<<includeDOM App.Intro.acquisition()>>
\ No newline at end of file
diff --git a/src/events/intro/initNationalities.js b/src/events/intro/initNationalities.js
index 491a310a163420291102d36146a0ccb0a4a225a8..ea2f76c796b3ba5aa1a6a7e65adcd4d48bb1b661 100644
--- a/src/events/intro/initNationalities.js
+++ b/src/events/intro/initNationalities.js
@@ -583,7 +583,7 @@ App.Intro.initNationalities = function() {
/* Nationalities Setup */
if (!V.customVariety) {
- /* If non-custom variety, empties or defines $nationalities */
+ /* If non-custom variety, empties or defines V.nationalities */
V.nationalities = {};
}
const needLocalNationalities = !V.customVariety && !V.internationalTrade;
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
deleted file mode 100644
index 27d3c57173f853f6fb5737a6721f6d46862d7f44..0000000000000000000000000000000000000000
--- a/src/events/intro/introSummary.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: Intro Summary [nobr]
-
-<<includeDOM App.Intro.summary()>>
\ No newline at end of file
diff --git a/src/events/intro/pcBodyIntro.tw b/src/events/intro/pcBodyIntro.tw
deleted file mode 100644
index 1d857050e432f15ae9ece9ee57952db52706c38b..0000000000000000000000000000000000000000
--- a/src/events/intro/pcBodyIntro.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: PC Body Intro [nobr]
-
-<<includeDOM App.Intro.PCBodyIntro()>>
\ No newline at end of file
diff --git a/src/events/jsRandomEvent.tw b/src/events/jsRandomEvent.tw
deleted file mode 100644
index 727de9081521a8aef6911e5c7bab34d519a112e5..0000000000000000000000000000000000000000
--- a/src/events/jsRandomEvent.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: JS Random Event [nobr]
-
-<<set $nextButton = "Continue">>
-
-<<run html5passage(n => $event.execute(n))>>
diff --git a/src/events/scheduled/burst/seBurst.tw b/src/events/scheduled/burst/seBurst.tw
deleted file mode 100644
index 74189c5a03b92eb1a819943da5c34c0e0757fed8..0000000000000000000000000000000000000000
--- a/src/events/scheduled/burst/seBurst.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: SE Burst [nobr]
-
-<<set $nextButton = "Continue", $nextLink = "Scheduled Event">>
-
-<<includeDOM allBursts()>>
diff --git a/src/events/scheduled/murderAttempt.tw b/src/events/scheduled/murderAttempt.tw
deleted file mode 100644
index fbf1e9c509e5cdc191716f2eca68eed40d61518c..0000000000000000000000000000000000000000
--- a/src/events/scheduled/murderAttempt.tw
+++ /dev/null
@@ -1,11 +0,0 @@
-:: Murder Attempt [nobr]
-
-<<if $event == "slave trade">>
- <<includeDOM App.Events.murderAttemptFollowup("slave", V.illegalDeals.slave.company, V.illegalDeals.slave.type)>>
-<<elseif $event == "trade deal">>
- <<includeDOM App.Events.murderAttemptFollowup("trade", V.illegalDeals.trade.company)>>
-<<elseif $event == "military deal">>
- <<includeDOM App.Events.murderAttemptFollowup("military", V.illegalDeals.military.company)>>
-<<else>>
- <<includeDOM App.Events.murderAttempt()>>
-<</if>>
diff --git a/src/events/scheduled/pitFight.tw b/src/events/scheduled/pitFight.tw
deleted file mode 100644
index ac9e7f27f3cb48d6d70ab48d352cb8dc875478d8..0000000000000000000000000000000000000000
--- a/src/events/scheduled/pitFight.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: SE pit fight
-
-<<includeDOM App.Facilities.Pit.fight(V.pit.lethal)>>
diff --git a/src/events/scheduled/sePCBirthday.tw b/src/events/scheduled/sePCBirthday.tw
deleted file mode 100644
index ca2a41894161bd2bba7e52bbe58f06af45140f84..0000000000000000000000000000000000000000
--- a/src/events/scheduled/sePCBirthday.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: SE pc birthday [nobr]
-
-<<includeDOM App.Events.pcBirthday.runEvent()>>
\ No newline at end of file
diff --git a/src/facilities/bodyModification/bodyModification.tw b/src/facilities/bodyModification/bodyModification.tw
deleted file mode 100644
index 74cbfe0d6445fe245e36d74688fd68b05eacfec5..0000000000000000000000000000000000000000
--- a/src/facilities/bodyModification/bodyModification.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: Body Modification [nobr jump-from-safe]
-
-<<set $nextButton = "Confirm changes", $nextLink = "Slave Interact", $encyclopedia = "The Studio">>
-
-<<includeDOM App.UI.bodyModification(getSlave($AS))>>
\ No newline at end of file
diff --git a/src/facilities/fsDecoration.js b/src/facilities/fsDecoration.js
index 0088928df73056fc9769fe78d265bfdcb8343a33..b937b06c90caf3aef67c299a4f7f0affdeb39164 100644
--- a/src/facilities/fsDecoration.js
+++ b/src/facilities/fsDecoration.js
@@ -242,7 +242,7 @@ App.UI.FSChangeDecoration = function(FS, items = []) {
costs = 10000;
el.append(
App.UI.DOM.link(
- `Station slaves in your arcology's public spaces to promote this goal`,
+ `Customize the exterior of the arcology to support this goal`,
() => {
V.arcologies[0][FSDecoration] = 100;
cashX(forceNeg(costs), "capEx");
diff --git a/src/facilities/incubator/incubator.tw b/src/facilities/incubator/incubator.tw
deleted file mode 100644
index 5c699aa7bde10c6d2cb9d29dbb745fea5f56c909..0000000000000000000000000000000000000000
--- a/src/facilities/incubator/incubator.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: Incubator [nobr jump-to-safe jump-from-safe]
-
-<<includeDOM App.UI.incubator()>>
\ No newline at end of file
diff --git a/src/facilities/pit/pit.tw b/src/facilities/pit/pit.tw
deleted file mode 100644
index e0ebcece67db665fb8dac13416878ac687a4265e..0000000000000000000000000000000000000000
--- a/src/facilities/pit/pit.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: Pit [nobr jump-to-safe jump-from-safe]
-
-<<includeDOM App.Facilities.Pit.pit()>>
diff --git a/src/facilities/salon/salon.tw b/src/facilities/salon/salon.tw
deleted file mode 100644
index 07bb6f37df73148445f546bf7c0e95cc38fb42a3..0000000000000000000000000000000000000000
--- a/src/facilities/salon/salon.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: Salon [nobr jump-from-safe]
-
-<<set $nextButton = "Confirm changes", $nextLink = "Slave Interact", $encyclopedia = "The Auto Salon">>
-
-<<includeDOM App.UI.salon(getSlave($AS))>>
\ No newline at end of file
diff --git a/src/facilities/salon/salonPassage.js b/src/facilities/salon/salonPassage.js
index 20b0aab88504918ea0b801d8e069723acbcce54c..f2e6f5189f9286600a5fc64a0837c81f514619dd 100644
--- a/src/facilities/salon/salonPassage.js
+++ b/src/facilities/salon/salonPassage.js
@@ -30,6 +30,7 @@ App.UI.salon = function(slave, cheat = false) {
}
el.append(hair());
el.append(makeup());
+ el.append(nails());
el.append(skin());
el.append(bodyHair());
return el;
@@ -145,6 +146,32 @@ App.UI.salon = function(slave, cheat = false) {
return el;
}
+ function nails() {
+ const el = new DocumentFragment();
+ App.UI.DOM.appendNewElement("h3", el, "Nails");
+ const options = new App.UI.OptionsGroup();
+
+ options.addOption(App.Desc.nails(slave), "nails", slave)
+ .addValue("Neatly clipped", 0, billMod)
+ .addValue("Long and elegant", 1, billMod)
+ .addValue("Sharp and claw-like", 3, billMod)
+ .addValue("Bright and glittery", 4, billMod)
+ .addValue("Very long and garish", 4, billMod)
+ .addValue("Color-coordinate with hair", 2, billMod);
+
+ options.addOption("", "makeup", slave)
+ .addValue("Neon", 6, billMod)
+ .addValue("Neon, color-coordinate with hair", 7, billMod);
+
+ options.addOption("", "makeup", slave)
+ .addValue("Metallic", 8, billMod)
+ .addValue("Metallic, color-coordinate with hair", 9, billMod);
+
+ el.append(options.render());
+
+ return el;
+ }
+
function hair() {
const el = new DocumentFragment();
let option;
@@ -440,7 +467,7 @@ App.UI.salon = function(slave, cheat = false) {
option = options.addOption(r.join(" "), "pubicHColor", slave);
if (hasPubes) {
if (slave.pubicHColor !== slave.hColor) {
- option.addValue("Match the curtains", slave.pubicHColor);
+ option.addValue("Match the curtains", slave.hColor);
}
option.addValueList(makeAList(App.Medicine.Modification.Color.Primary.map(color => color.value)))
.addCallbackToEach(billMod)
diff --git a/src/facilities/wardrobe/wardrobe.tw b/src/facilities/wardrobe/wardrobe.tw
deleted file mode 100644
index 56636db39ef96275968236cfa04b805d00db57ac..0000000000000000000000000000000000000000
--- a/src/facilities/wardrobe/wardrobe.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: Wardrobe [nobr jump-to-safe jump-from-safe]
-
-<<set $nextButton = "Back", $nextLink = "Manage Penthouse">>
-
-<<includeDOM App.UI.WardrobeShopping("FS")>>
diff --git a/src/facilities/wardrobe/wardrobeShopping.js b/src/facilities/wardrobe/wardrobeShopping.js
index c25b749e9cc0ed36c0033ca3664b8ba9fabc0e29..c1aa035e680c1476eb3d57537a7c0d7ffcdbdffb 100644
--- a/src/facilities/wardrobe/wardrobeShopping.js
+++ b/src/facilities/wardrobe/wardrobeShopping.js
@@ -7,10 +7,8 @@ App.UI.WardrobeShopping = function() {
let r = [];
r.push(`The room containing all the clothes and accessories you have available to dress your slaves in, as well as the supplies and tools your tailor needs to resize them to better fit your slaves. Several mirrors are set up for a slave to try on outfits should they be allowed to dress themselves. The selection includes`);
- const ownItAll = (
- App.Data.slaveWear.niceClothes.every((i) => isItemAccessible.entry(i.value, "clothing")) &&
- App.Data.slaveWear.harshClothes.every((i) => isItemAccessible.entry(i.value, "clothing"))
- );
+ const ownItAll = Array.from(App.Data.clothes.keys()).every((key) => isItemAccessible.entry(key, "clothing"));
+
if (ownItAll) {
r.push(`outfits from all manner of cultures and societies; not a single style eludes you.`);
} else {
diff --git a/src/gui/css/options.css b/src/gui/css/options.css
index d1d13a5cda81a249638223a767af91562035cbf8..6153a8a965c8a61ee0298571dc892623e057606f 100644
--- a/src/gui/css/options.css
+++ b/src/gui/css/options.css
@@ -14,13 +14,7 @@ div.options-group div.button-group {
margin: 6px 0;
}
-div.options-group .comment {
- color: gray;
- font-style: italic;
- margin-left: 10px;
-}
-
-div.options-group button {
+.button-group button {
color: var(--link-color);
background-color: var(--button-color);
border: none; /* outline instead of border */
@@ -29,15 +23,16 @@ div.options-group button {
margin-left: 2px;
}
-div.options-group button:hover {
+.button-group button:hover {
background-color: var(--button-hover-color);
+ color: var(--link-hover-color)
}
-div.options-group button.selected {
+.button-group button.selected {
background-color: var(--button-selected-color);
}
-div.options-group button.disabled {
+.button-group button.disabled {
color: white;
pointer-events: none;
cursor: default;
@@ -67,6 +62,12 @@ div.options-group button.neutral:hover {
background-color: #666600;
}
+div.options-group .comment {
+ color: gray;
+ font-style: italic;
+ margin-left: 10px;
+}
+
/* input box */
div.options-group input {
border: 2px solid var(--button-border-color);
diff --git a/src/gui/options/descriptionOptions.js b/src/gui/options/descriptionOptions.js
index 6b4e0da08707ff4981c98a0cf8784a82d6660807..95316f47ea60815e05069213b11dfd22ad4af2a5 100644
--- a/src/gui/options/descriptionOptions.js
+++ b/src/gui/options/descriptionOptions.js
@@ -60,7 +60,7 @@ App.UI.descriptionOptions = function() {
.addValueList([["Integers", 2], ["Both", 1], ["Words", 0]]);
if (V.showNumbers === 1) {
- options.addOption("Only numbers up to $showNumbersMax are displayed as words", "showNumbersMax")
+ options.addOption(`Only numbers up to ${V.showNumbersMax} are displayed as words`, "showNumbersMax")
.addValue("Default (20)", 20).showTextBox();
}
diff --git a/src/gui/options/descriptionOptions.tw b/src/gui/options/descriptionOptions.tw
deleted file mode 100644
index 5ac19a8fb4a8d1706591ea51f229b194ec813c73..0000000000000000000000000000000000000000
--- a/src/gui/options/descriptionOptions.tw
+++ /dev/null
@@ -1,13 +0,0 @@
-:: Description Options [nobr jump-to-safe jump-from-safe]
-
-<<set $nextButton = "Back">>
-<<if $storedLink !== "Slave Interact">>
- <<if lastVisited("Slave Interact") === 1>>
- <<set $storedLink = "Slave Interact">>
- <<else>>
- <<set $storedLink = "Options">>
- <</if>>
-<</if>>
-<<set $nextLink = $storedLink>>
-
-<<includeDOM App.UI.descriptionOptions()>>
diff --git a/src/gui/options/hotkeySettings.tw b/src/gui/options/hotkeySettings.tw
deleted file mode 100644
index b1bf6388eacc1f4df01bd3ee5d965dceab84e39e..0000000000000000000000000000000000000000
--- a/src/gui/options/hotkeySettings.tw
+++ /dev/null
@@ -1,27 +0,0 @@
-:: Hotkey Settings [nobr jump-to-safe jump-from-safe]
-
-<<set $nextButton = "Back", $nextLink = "Main">>
-
-<h1>Hotkey Settings</h1>
-
-<p>
- <ul>
- <li>
- On keyboard layouts other than the <a href="https://en.wikipedia.org/wiki/File:KB_United_States.svg"
- target="_blank">US-QWERTY layout</a> there may be keys or combinations of keys where the recorded key is
- different from the key used to listen to key events. You will have to find these keys yourself through trial
- and error.
- </li>
- <li>
- Custom hotkeys are browser specific and are not part of your save.
- </li>
- <li>
- While we try not to overwrite browser or OS level key combinations it is possible to do so with custom
- hotkeys. This also means that during recording of custom hotkeys no browser or OS level key combinations are
- available. There are however keys that cannot be overwritten, the <code>Win key</code> on Windows is an
- example for this.
- </li>
- </ul>
-</p>
-
-<<includeDOM App.UI.Hotkeys.settings()>>
diff --git a/src/gui/options/options.js b/src/gui/options/options.js
index a6ffd81760751d90cabb3ebeff05929bc7c4e08f..74cbea915f9176f506b76654c5beca92560d623e 100644
--- a/src/gui/options/options.js
+++ b/src/gui/options/options.js
@@ -1,465 +1,1061 @@
-App.UI.OptionsGroup = (function() {
- class Row {
- /**
- * @param {HTMLDivElement} container
- */
- render(container) {} // jshint ignore:line
- }
+App.UI.optionsPassage = function() {
+ const el = new DocumentFragment();
+ V.passageSwitchHandler = App.EventHandlers.optionsChanged;
+ el.append(intro());
+
+ // Results
+ const results = document.createElement("div");
+ results.id = "results";
+ el.append(results);
+
+ App.UI.tabBar.handlePreSelectedTab(V.tabChoice.Options);
+ // TODO: move me
/**
- * @typedef value
- * @property {*} value
- * @property {string} [name]
- * @property {string} mode
- * @property {number} [compareValue]
- * @property {string} [descAppend] can be SC markup
- * @property {boolean} [on]
- * @property {boolean} [off]
- * @property {boolean} [neutral]
- * @property {Function} [callback]
+ *
+ * @param {string} id
+ * @param {Node} element
+ * @returns {HTMLSpanElement}
*/
+ function makeSpanIded(id, element) {
+ const span = document.createElement("span");
+ span.id = id;
+ span.append(element);
+ return span;
+ }
- class Option extends Row {
- /**
- * @param {string} description can be SC markup
- * @param {string} property
- * @param {object} [object=V]
- */
- constructor(description, property, object = V) {
- super();
- this.description = description;
- this.property = property;
- this.object = object;
- /**
- * @type {Array<value>}
- */
- this.valuePairs = [];
- }
+ const tabCaptions = {
+ "display": 'Display',
+ "contentFlavor": 'Content & flavour',
+ "mods": 'Mods',
+ "debugCheating": 'Debug & cheating',
+ "experimental": 'Experimental'
+ };
- /**
- * @param {*} name
- * @param {*} [value=name]
- * @param {Function} [callback]
- * @returns {Option}
- */
- addValue(name, value = name, callback = undefined) {
- this.valuePairs.push({
- name: name, value: value, mode: "=", callback: callback
- });
- return this;
- }
+ const tabBar = App.UI.DOM.appendNewElement("div", el, '', "tab-bar");
+ tabBar.append(
+ App.UI.tabBar.tabButton('display', tabCaptions.display),
+ App.UI.tabBar.tabButton('content-flavor', tabCaptions.contentFlavor),
+ App.UI.tabBar.tabButton('mods', tabCaptions.mods),
+ App.UI.tabBar.tabButton('debug-cheating', tabCaptions.debugCheating),
+ App.UI.tabBar.tabButton('experimental', tabCaptions.experimental),
+ );
- /**
- * @param {Array<*|Array>} values
- * @returns {Option}
- */
- addValueList(values) {
- for (const value of values) {
- if (Array.isArray(value)) {
- this.addValue(value[0], value[1]);
- } else {
- this.addValue(value);
- }
- }
- return this;
- }
+ el.append(App.UI.tabBar.makeTab('display', makeSpanIded("content-display", display())));
+ el.append(App.UI.tabBar.makeTab('content-flavor', makeSpanIded("content-content-flavor", contentFlavor())));
+ el.append(App.UI.tabBar.makeTab('mods', makeSpanIded("content-mods", mods())));
+ el.append(App.UI.tabBar.makeTab('debug-cheating', makeSpanIded("content-debug-cheating", debugCheating())));
+ el.append(App.UI.tabBar.makeTab('experimental', makeSpanIded("content-experimental", experimental())));
- /**
- * @param {Map} values
- * @returns {Option}
- */
- addValueMap(values) {
- for (const [key, value] of values) {
- this.addValue(key, value);
- }
- return this;
- }
+ return el;
- /**
- * @param {*} value
- * @param {number} compareValue
- * @param {string} mode on of: "<", "<=", ">", ">="
- * @param {string} [name=value]
- */
- addRange(value, compareValue, mode, name = value) {
- this.valuePairs.push({
- name: name, value: value, mode: mode, compareValue: compareValue
- });
- return this;
- }
+ function intro() {
+ let links;
+ let options;
+ let r;
+ const el = new DocumentFragment();
- /**
- * @param {Object} [params]
- * @param {string} [params.unit]
- * @param {boolean} [params.large=false]
- * @returns {Option}
- */
- showTextBox({unit, large = false} = {}) {
- this.textbox = {unit: unit, large: large};
- return this;
- }
+ options = new App.UI.OptionsGroup();
+ options.addOption("End of week autosaving is currently", "autosave")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+ el.append(options.render());
- /**
- * @param {string} comment can be SC markup
- * @returns {Option}
- */
- addComment(comment) {
- this.comment = comment;
- return this;
- }
+ App.UI.DOM.appendNewElement("div", el, `This save was created using FC version ${V.ver} build ${V.releaseID}. You are currently playing version: ${App.Version.base}, mod version: ${App.Version.pmod}, build: ${App.Version.release}${App.Version.commitHash ? `, commit: ${App.Version.commitHash}` : ``}`);
- /**
- * Adds a button that executes the callback when clicked AND reloads the passage
- *
- * @param {string} name
- * @param {Function} callback
- * @param {string} passage
- */
- customButton(name, callback, passage) {
- this.valuePairs.push({
- name: name, value: passage, callback: callback, mode: "custom"
- });
- return this;
- }
+ links = [];
+ links.push(App.UI.DOM.passageLink("Apply Backwards Compatibility Update", "Backwards Compatibility"));
- /**
- * @param {Node} node
- * @returns {Option}
- */
- addCustomDOM(node) {
- this.valuePairs.push({
- value: node, mode: "DOM"
- });
- return this;
- }
+ links.push(
+ App.UI.DOM.link(
+ `Reset extended family mode controllers`,
+ () => {
+ resetFamilyCounters();
+ const span = document.createElement("span");
+ span.classList.add("note");
+ App.UI.DOM.appendNewElement("span", span, "Done: ", "lightgreen");
+ span.append("all family relations flushed and rebuilt.");
+ jQuery("#results").empty().append(span);
+ },
+ [],
+ "",
+ "Clears and rebuilds .sister and .daughter tracking."
+ )
+ );
- /* modify last added option */
- /**
- * Added to the description if last added value is selected.
- * example use: addValue(...).customDescription(...).addValue(...).customDescription(...)
- * @param {string} description can be SC markup
- */
- customDescription(description) {
- this.valuePairs.last().descAppend = description;
- return this;
+ if (isNaN(V.rep)) {
+ links.push(
+ App.UI.DOM.link(
+ `Reset Reputation (${V.rep})`,
+ () => {
+ V.rep = 0;
+ jQuery("#results").empty().append(`Reputation reset to ${V.rep}`);
+ },
+ [],
+ "Options"
+ )
+ );
}
- /**
- * @param {Function} callback gets executed on every button click. Selected value is given as argument.
- */
- addCallback(callback) {
- this.valuePairs.last().callback = callback;
- return this;
+ if (isNaN(V.rep)) {
+ links.push(
+ App.UI.DOM.link(
+ `Reset Money (${V.cash})`,
+ () => {
+ V.cash = 500;
+ jQuery("#results").empty().append(`Cash reset to ${V.cash}`);
+ },
+ [],
+ "Options"
+ )
+ );
}
- /**
- * @param {Function} callback gets executed on every button click. Selected value is given as argument.
- */
- addCallbackToEach(callback) {
- this.valuePairs.forEach(pair => pair.callback = callback);
- return this;
+ if (V.releaseID === 1057) {
+ links.push(
+ App.UI.DOM.link(
+ `Free male anatomy removal due to accidentally flawed updater`,
+ () => {
+ V.PC.dick = 0;
+ V.PC.balls = 0;
+ V.PC.prostate = 0;
+ V.PC.scrotum = 0;
+ V.PC.ballsImplant = 0;
+ jQuery("#results").empty().append(`Cash reset to ${V.cash}`);
+ },
+ [],
+ "Options",
+ "Use this if your female PC picked up a few extra parts during the conversion process.",
+ )
+ );
}
- /**
- * Mark option as on to style differently.
- * @returns {Option}
- */
- on() {
- this.valuePairs.last().on = true;
- return this;
- }
+ App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(links));
- /**
- * Mark option as off to style differently.
- * @returns {Option}
- */
- off() {
- this.valuePairs.last().off = true;
- return this;
+ if ((V.releaseID >= 1000) || V.ver.startsWith("0.9") || V.ver.startsWith("0.8") || V.ver.startsWith("0.7") || V.ver.startsWith("0.6")) {
+ App.UI.DOM.appendNewElement("h3", el, `NEW GAME PLUS`);
+ r = [];
+ r.push(`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. New Game Plus`);
+ r.push(App.UI.DOM.makeElement("span", "MAY", "yellow"));
+ r.push(`work across versions. To attempt to migrate a save across versions:`);
+ App.Events.addNode(el, r, "div", "note");
+
+ const ngpInstructions = document.createElement("ol");
+ App.UI.DOM.appendNewElement("li", ngpInstructions, "Save on this screen", "note");
+ App.UI.DOM.appendNewElement("li", ngpInstructions, "Re-open the .html in a new tab then load the above save.", "note");
+ App.UI.DOM.appendNewElement(
+ "li",
+ ngpInstructions,
+ App.UI.DOM.link(
+ "Activate New Game Plus.",
+ () => {
+ V.ui = "start";
+ },
+ [],
+ "New Game Plus"
+ ),
+ "note"
+ );
+ el.append(ngpInstructions);
+ } else {
+ 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;
+ }
- /**
- * Mark option as neutral to style differently.
- * @returns {Option}
- */
- neutral() {
- this.valuePairs.last().neutral = true;
- return this;
+ function display() {
+ const el = new DocumentFragment();
+ let options;
+ let r;
+
+ App.UI.DOM.appendNewElement("h2", el, "Reports");
+
+ options = new App.UI.OptionsGroup();
+
+ options.addOption("End week report descriptive details are", "showEWD")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("End week report performance details are", "showEWM")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Master Suite report details such as slave changes are", "verboseDescriptions")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("End week societal effects from slaves are", "compressSocialEffects", V.UI)
+ .addValue("Expanded", 0).on().addValue("Compacted", 1).off();
+
+ options.addOption("Accordion on week end defaults to", "useAccordion")
+ .addValue("Open", 0).on().addValue("Collapsed", 1).off();
+
+ options.addOption("Economic Tabs on weekly reports are", "useTabs")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Economic detail sheets for facilities are", "showEconomicDetails")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Economic report neighbor details such as trade impacts on culture are", "showNeighborDetails")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Numeric formatting is currently", "formatNumbers")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("This will comma-format numbers in some areas.");
+
+ el.append(options.render());
+
+ App.UI.DOM.appendNewElement("h2", el, "General");
+
+ options = new App.UI.OptionsGroup();
+
+ options.addOption("Main menu leadership controls displayed", "positionMainLinks")
+ .addValueList([["Above", 1], ["Above and below", 0], ["Below", -1]]);
+
+ options.addOption("New Model UI", "newModelUI")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Penthouse Facility Display", "verticalizeArcologyLinks")
+ .addValueList([["Triple column", 3], ["Double Column", 2], ["Single Column", 1], ["Collapsed", 0]]);
+
+ options.addOption("Main menu arcology description", "seeArcology")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Main menu desk description", "seeDesk")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Main menu newsfeed", "seeFCNN")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Tips from the Encyclopedia are", "showTipsFromEncy")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Help tooltips are", "tooltipsEnabled")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment(`This is mostly for new players. <span class='exampleTooltip noteworthy'>Colored text</span> can have tooltips.`);
+
+ options.addOption("Main menu slave tabs are", "useSlaveSummaryTabs")
+ .addValue("Enabled", 1).on().addValue("CardStyle", 2).on().addValue("Disabled", 0).off();
+
+ options.addOption("The slave Quick list in-page scroll-to is", "useSlaveListInPageJSNavigation")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Condense special slaves into their own tab", "useSlaveSummaryOverviewTab")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Interactions with your fucktoys are", "fucktoyInteractionsPosition")
+ .addValueList([["next to them", 1], ["at page bottom", 0]]);
+
+ 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();
+
+ el.append(options.render());
+
+ r = [];
+ r.push(`UI theme selector. Allows to select a single CSS file to be loaded.`);
+ r.push(App.UI.DOM.makeElement("span", `The file has to be located in the same directory as the HTML file otherwise it will simply not load at all.`, "red"));
+ r.push(App.UI.Theme.selector());
+ App.Events.addParagraph(el, r);
+
+ App.UI.DOM.appendNewElement("h2", el, "Sidebar");
+
+ options = new App.UI.OptionsGroup();
+
+ options.addOption("Cash is", "Cash", V.sideBarOptions)
+ .addValue("Shown", 1).on().addValue("Hidden", 0).off();
+
+ options.addOption("Upkeep is", "Upkeep", V.sideBarOptions)
+ .addValue("Shown", 1).on().addValue("Hidden", 0).off();
+
+ options.addOption("Sex slave count is", "SexSlaveCount", V.sideBarOptions)
+ .addValue("Shown", 1).on().addValue("Hidden", 0).off();
+
+ options.addOption("Room population is", "roomPop", V.sideBarOptions)
+ .addValue("Shown", 1).on().addValue("Hidden", 0).off();
+
+ options.addOption("GSP is", "GSP", V.sideBarOptions)
+ .addValue("Shown", 1).on().addValue("Hidden", 0).off();
+
+ options.addOption("Rep is", "Rep", V.sideBarOptions)
+ .addValue("Shown", 1).on().addValue("Hidden", 0).off();
+
+ options.addOption("Confirmation before ending a week is", "confirmWeekEnd", V.sideBarOptions)
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("Enabling this will open a dialog box to confirm you meant to end a week.");
+
+ if (V.secExpEnabled > 0) {
+ options.addOption("Authority is", "Authority", V.sideBarOptions)
+ .addValue("Shown", 1).on().addValue("Hidden", 0).off();
+
+ options.addOption("Security is", "Security", V.sideBarOptions)
+ .addValue("Shown", 1).on().addValue("Hidden", 0).off();
+
+ options.addOption("Crime is", "Crime", V.sideBarOptions)
+ .addValue("Shown", 1).on().addValue("Hidden", 0).off();
}
- /**
- * Puts the options in side a pulldown if there are at least 6.
- * Not counting text boxes or comments.
- * @returns {Option}
- */
- pulldown() {
- this.enablePulldown = true;
- return this;
+ el.append(options.render());
+
+
+ App.UI.DOM.appendNewElement("h2", el, "Images");
+ el.append(App.UI.artOptions());
+
+ return el;
+ }
+
+ function contentFlavor() {
+ const el = new DocumentFragment();
+ let r;
+ let options;
+
+ App.UI.DOM.appendNewElement("h2", el, "Content");
+
+ r = [];
+ r.push("More granular control of what appears is in");
+ r.push(App.UI.DOM.passageLink("Description Options", "Description Options"));
+ App.Events.addNode(el, r, "div", "note");
+
+ options = new App.UI.OptionsGroup();
+
+ options.addOption("The difficulty setting is currently set to", "baseDifficulty")
+ .addValueList([["Very easy", 1], ["Easy", 2], ["Default", 3], ["Hard", 4], ["Very hard", 5]]);
+
+ options.addOption("Slaves falling ill is currently", "seeIllness")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("Will not affect existing ill slaves already in-game.");
+
+ options.addOption("Extreme content like amputation is currently", "seeExtreme")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("Will not affect extreme surgeries already applied in-game.");
+
+ options.addOption("Bestiality related content is currently", "seeBestiality")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Watersports related content is currently", "seePee")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Incest content is currently", "seeIncest")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Pregnancy related content is currently", "seePreg")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("Will not affect existing pregnancies already in-game.");
+
+ options.addOption("Child gender to be generated based off dick content settings", "seeDicksAffectsPregnancy")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment(`${(V.seeDicksAffectsPregnancy === 1) ? `Currently ${V.seeDicks}% of children will be born male. ` : ``}Will not affect existing pregnancies already in-game.`);
+
+ if (V.seeDicksAffectsPregnancy === 0) {
+ options.addOption("XX slaves only father daughters", "adamPrinciple")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("Will not affect existing pregnancies already in-game.");
}
- /**
- * @param {HTMLDivElement} container
- */
- render(container) {
- /* left side */
- const desc = document.createElement("div");
- desc.className = "description";
- $(desc).wiki(this.description);
- container.append(desc);
-
- /* right side */
- const currentValue = this.object[this.property];
- let anySelected = false;
-
- const buttonGroup = document.createElement("div");
- buttonGroup.classList.add("button-group");
- if (!this.enablePulldown || this.valuePairs.length < 6) {
- for (const value of this.valuePairs) {
- if (value.mode === "DOM") {
- /* insert DOM and go to next element */
- buttonGroup.append(value.value);
- continue;
- }
- const button = document.createElement("button");
- button.append(value.name);
- if (value.on) {
- button.classList.add("on");
- } else if (value.off) {
- button.classList.add("off");
- } else if (value.neutral) {
- button.classList.add("neutral");
- }
- if (value.mode === "custom") {
- button.onclick = () => {
- value.callback();
- if (value.value) {
- Engine.play(value.value);
- } else {
- App.UI.reload();
- }
- };
- } else {
- if (value.mode === "=" && currentValue === value.value) {
- button.classList.add("selected", "disabled");
- anySelected = true;
- if (value.descAppend !== undefined) {
- desc.append(" ");
- $(desc).wiki(value.descAppend);
- }
- } else if (!anySelected && inRange(value.mode, value.compareValue, currentValue)) {
- button.classList.add("selected");
- // disable the button if clicking it won't change the variable value
- if (currentValue === value.value) {
- button.classList.add("disabled");
- }
- anySelected = true;
- if (value.descAppend !== undefined) {
- desc.append(" ");
- $(desc).wiki(value.descAppend);
- }
- }
- button.onclick = () => {
- this.object[this.property] = value.value;
- if (value.callback) {
- value.callback();
- }
- App.UI.reload();
- };
- }
- buttonGroup.append(button);
- }
- } else {
- let matchFound = false;
- let select = document.createElement("select");
-
- for (const value of this.valuePairs) {
- let el = document.createElement("option");
- el.textContent = value.name;
- el.value = value.value;
- if (this.object[this.property] === value.value) {
- el.selected = true;
- matchFound = true;
- }
- select.appendChild(el);
- }
- if (!matchFound) {
- select.selectedIndex = -1;
- }
- select.onchange = () => {
- const O = select.options[select.selectedIndex];
- if (isNaN(Number(O.value))) {
- this.object[this.property] = O.value;
- } else {
- this.object[this.property] = Number(O.value);
- }
- const originalObj = this.valuePairs.find(obj => obj.name === O.textContent);
- if (originalObj && typeof originalObj.callback === "function") {
- originalObj.callback();
- }
- App.UI.reload();
- };
- buttonGroup.append(select);
+ options.addOption("Extreme pregnancy content like broodmothers is currently", "seeHyperPreg")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("Will not affect existing hyperpregnancies already in-game.");
+
+ options.addOption("Pregnancy complications due to multiples and body size are currently", "dangerousPregnancy")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption(`Precocious puberty (pregnancy younger than ${V.fertilityAge})`, "precociousPuberty")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("Will not affect existing precocious puberty cases already in-game.");
+
+ options.addOption("Slaves with fat lips or heavy oral piercings may lisp", "disableLisping")
+ .addValue("Yes", 0).on().addValue("No", 1).off();
+
+ options.addOption("Disables the long term damage mechanic. //Temp option//", "disableLongDamage")
+ .addValue("Enabled", 0).on().addValue("Disabled", 1).off();
+
+ options.addOption("Experimental male pronouns are currently", "diversePronouns")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("Apply Backwards Compatibility after changing to update slave's pronouns. Not all scenes support male pronouns and this is not yet incorporated into the lore or mechanics.");
+
+ options.addOption("Male slave names are currently", "allowMaleSlaveNames")
+ .addValue("Enabled", true).on().addValue("Disabled", false).off()
+ .addComment("This only affects slave generation and not your ability to name your slaves.");
+
+ options.addOption("Missing slave names are currently", "showMissingSlaves")
+ .addValue("Enabled", true).on().addValue("Disabled", false).off();
+
+ el.append(options.render());
+
+ App.UI.DOM.appendNewElement("h2", el, `Intersecting mechanics`);
+
+ options = new App.UI.OptionsGroup();
+
+ options.addOption("Slave assets affected by weight is", "weightAffectsAssets")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("Diet will still affect asset size.");
+
+ options.addOption("Curative side effects are", "curativeSideEffects")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("If enabled, curatives have a chance to give slaves harmful side effects.");
+
+ el.append(options.render());
+
+ App.UI.DOM.appendNewElement("h2", el, `Flavour`);
+
+ options = new App.UI.OptionsGroup();
+
+ options.addOption("Slave reactions to facility assignments are", "showAssignToScenes")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Post sex clean up", "postSexCleanUp")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Appraisal miniscenes on slave sale are", "showAppraisal")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Assignment performance vignettes on the end week report are", "showVignettes")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Slaves can have alternate titles", "newDescriptions")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Family titles for relatives", "allowFamilyTitles")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Limit family growth", "limitFamilies")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("Restricts acquisition of additional relatives, by means other than birth, for slaves with families.");
+
+ options.addOption("Distant relatives such as aunts, nieces and cousins are", "showDistantRelatives")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ el.append(options.render());
+ return el;
+ }
+
+ function mods() {
+ const el = new DocumentFragment();
+ let options;
+
+ options = new App.UI.OptionsGroup();
+
+ options.addOption("The Special Force Mod is currently", "Toggle", V.SF)
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .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().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>");
+
+ el.append(options.render());
+
+ if (V.secExpEnabled > 0) {
+ if (Object.values(V.SecExp).length === 0) {
+ App.SecExp.generalBC();
+ Engine.play("Options");
}
+ App.UI.DOM.appendNewElement("h2", el, `Security Expansion mod options`);
+ if (V.terrain === "oceanic") {
+ App.UI.DOM.appendNewElement("div", el, `Oceanic arcologies are not by default subject to external attacks. You can however allow them to happen anyway. If you choose to do so please keep in mind that descriptions and mechanics are not intended for naval combat but land combat.`);
+ }
+ options = new App.UI.OptionsGroup();
- if (this.textbox) {
- const isNumber = typeof currentValue === "number";
- const textbox = App.UI.DOM.makeTextBox(currentValue, input => {
- this.object[this.property] = input;
- App.UI.reload();
- }, isNumber);
- if (isNumber) {
- textbox.classList.add("number");
- }
- if (this.textbox.large) {
- textbox.classList.add("full-width");
- }
- buttonGroup.append(textbox);
- if (this.textbox.unit) {
- buttonGroup.append(" ", this.textbox.unit);
- }
+ if (V.SecExp.settings.battle.enabled > 0 || V.SecExp.settings.rebellion.enabled > 0) {
+ options.addOption("Detailed battle statistics are", "showStats", V.SecExp.settings)
+ .addValue("Shown", 1).on().addValue("Hidden", 0).off()
+ .addComment("Visibility of detailed statistics and battle turns.");
+
+ options.addOption("Difficulty is", "difficulty", V.SecExp.settings)
+ .addValueList([["Extremely hard", 2], ["Very hard", 1.5], ["Hard", 1.25], ["Normal", 1], ["Easy", 0.75], ["Very easy", 0.5]]);
+
+ options.addOption("Unit descriptions are", "unitDescriptions", V.SecExp.settings)
+ .addValue("Abbreviated", 1).addValue("Summarized", 0);
}
- if (this.comment) {
- const comment = document.createElement("span");
- comment.classList.add("comment");
- $(comment).wiki(this.comment);
- buttonGroup.append(comment);
+ options.addOption("Battles are", "enabled", V.SecExp.settings.battle)
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Rebellions are", "enabled", V.SecExp.settings.rebellion)
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ if (V.SecExp.settings.battle.enabled > 0) {
+ options.addOption("Battle frequency", "frequency", V.SecExp.settings.battle)
+ .addValueList([["Extremely high", 2], ["Very high", 1.5], ["High", 1.25], ["Normal", 1], ["Low", 0.75], ["Very low", 0.5]]);
}
- container.append(buttonGroup);
-
- function inRange(mode, compareValue, value) {
- if (mode === "<") {
- return value < compareValue;
- } else if (mode === "<=") {
- return value <= compareValue;
- } else if (mode === ">") {
- return value > compareValue;
- } else if (mode === ">=") {
- return value >= compareValue;
- }
- return false;
+
+ if (V.SecExp.settings.rebellion.enabled > 0) {
+ options.addOption("Rebellion buildup", "speed", V.SecExp.settings.rebellion)
+ .addValueList([["Extremely fast", 2], ["Very fast", 1.5], ["Fast", 1.25], ["Normal", 1], ["Slow", 0.75], ["Very slow", 0.5]]);
}
- }
- }
- class Comment extends Row {
- /**
- * @param {string} comment can be SC markup
- */
- constructor(comment) {
- super();
- this.comment = comment;
- this.long = false;
- }
- /**
- * @param {HTMLDivElement} container
- */
- render(container) {
- /* left */
- container.append(document.createElement("div"));
-
- /* right */
- const comment = document.createElement("div");
- comment.classList.add("comment");
- $(comment).wiki(this.comment);
- container.append(comment);
- }
- }
+ if (V.SecExp.settings.battle.enabled > 0) {
+ options.addOption("Commanders gain a prestige rank every 10 victories", "allowSlavePrestige", V.SecExp.settings.battle)
+ .addValue("Yes", 1).on().addValue("No", 0).off();
+ }
- class CustomRow extends Row {
- /**
- * @param {HTMLElement|string} element
- */
- constructor(element) {
- super();
- this.element = element;
+ if (V.SecExp.settings.battle.enabled > 0) {
+ options.addOption("Force battles", "force", V.SecExp.settings.battle)
+ .addValue("Yes", 1).on().addValue("No", 0).off();
+ }
+ if (V.SecExp.settings.rebellion.enabled > 0) {
+ options.addOption("Force rebellions", "force", V.SecExp.settings.rebellion)
+ .addValue("Yes", 1).on().addValue("No", 0).off()
+ .addComment("Rebellions take precedence over Battles.");
+ }
+
+ if (V.SecExp.settings.battle.enabled > 0) {
+ options.addOption("Late game major battles are", "enabled", V.SecExp.settings.battle.major)
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+ }
+
+ if (V.SecExp.settings.battle.enabled > 0 && V.SecExp.settings.battle.major.enabled > 0) {
+ options.addOption("Multiplier is", "mult", V.SecExp.settings.battle.major)
+ .addValueList([["Extremely high", 2], ["Very high", 1.5], ["High", 1.25], ["Normal", 1], ["Low", 0.75], ["Very low", 0.5]]);
+
+ options.addOption("This week a major battle is", "force", V.SecExp.settings.battle.major)
+ .addValue("Guaranteed", 1).on().addValue("Not guaranteed", 0).off();
+ }
+
+ if (V.SecExp.settings.battle.enabled > 0 && V.SecExp.settings.battle.major.enabled > 0) {
+ options.addOption("Gameover on battle loss", "gameOver", V.SecExp.settings.battle.major)
+ .addValue("Yes", 1).on().addValue("No", 0).off();
+ }
+
+ if (V.SecExp.settings.rebellion.enabled > 0) {
+ options.addOption("Gameover on rebellion loss", "gameOver", V.SecExp.settings.rebellion)
+ .addValue("Yes", 1).on().addValue("No", 0).off();
+ }
+
+ el.append(options.render());
+
+ const subHeading = document.createElement("div");
+ subHeading.classList.add("subHeading");
+
+ if (V.debugMode || V.cheatMode || V.cheatModeM) { // TODO make me a fucking function
+ App.UI.DOM.appendNewElement("div", subHeading, "Debug/cheat", "bold");
+ let td;
+ let links;
+ const table = document.createElement("table");
+ table.classList.add("invisible");
+ el.append(table);
+
+ let tr = document.createElement("tr");
+ tr.style.textAlign = "center";
+
+ td = createTd();
+ links = [];
+ links.push(
+ App.UI.DOM.link(
+ "Set loyalty high",
+ () => {
+ changeLoyalty("high");
+ },
+ [],
+ "Options"
+ )
+ );
+ links.push(
+ App.UI.DOM.link(
+ "Set loyalty average",
+ () => {
+ changeLoyalty("average");
+ },
+ [],
+ "Options"
+ )
+ );
+ links.push(
+ App.UI.DOM.link(
+ "Set loyalty low",
+ () => {
+ changeLoyalty("low");
+ },
+ [],
+ "Options"
+ )
+ );
+ links.push(
+ App.UI.DOM.link(
+ "Randomize loyalty",
+ () => {
+ changeLoyalty("random");
+ },
+ [],
+ "Options"
+ )
+ );
+
+ td.append(App.UI.DOM.generateLinksStrip(links));
+ tr.append(td);
+ table.append(tr);
+
+ tr = document.createElement("tr");
+ tr.style.textAlign = "center";
+ td = createTd();
+ links = [];
+ links.push(App.UI.DOM.link(
+ "Give Authority",
+ () => {
+ V.SecExp.core.authority = Math.clamp(V.SecExp.core.authority + 1000, 0, 20000);
+ },
+ [],
+ "Options"
+ ));
+ links.push(App.UI.DOM.link(
+ "Remove Authority",
+ () => {
+ V.SecExp.core.authority = Math.clamp(V.SecExp.core.authority - 1000, 0, 20000);
+ },
+ [],
+ "Options"
+ ));
+ td.append(App.UI.DOM.generateLinksStrip(links));
+ tr.append(td);
+ table.append(tr);
+
+
+ tr = document.createElement("tr");
+ td = document.createElement("td");
+ td.style.textAlign = "right";
+ links = [];
+ links.push(App.UI.DOM.link(
+ "Raise security",
+ () => {
+ V.SecExp.core.security = Math.clamp(V.SecExp.core.security + 5, 0, 100);
+ },
+ [],
+ "Options"
+ ));
+ links.push(App.UI.DOM.link(
+ "Lower security",
+ () => {
+ V.SecExp.core.security = Math.clamp(V.SecExp.core.security - 5, 0, 100);
+ },
+ [],
+ "Options"
+ ));
+ tr.append(App.UI.DOM.generateLinksStrip(links));
+ tr.append(td);
+
+ td = document.createElement("td");
+ td.style.textAlign = "left";
+ links = [];
+ links.push(App.UI.DOM.link(
+ "Raise crime",
+ () => {
+ V.SecExp.core.crimeLow = Math.clamp(V.SecExp.core.crimeLow + 5, 0, 100);
+ },
+ [],
+ "Options"
+ ));
+ links.push(App.UI.DOM.link(
+ "Lower crime",
+ () => {
+ V.SecExp.core.crimeLow = Math.clamp(V.SecExp.core.crimeLow - 5, 0, 100);
+ },
+ [],
+ "Options"
+ ));
+ tr.append(App.UI.DOM.generateLinksStrip(links));
+ tr.append(td);
+ table.append(tr);
+
+ tr = document.createElement("tr");
+ td = document.createElement("td");
+ td.style.textAlign = "right";
+ links = [];
+ links.push(App.UI.DOM.link(
+ "Give militia manpower",
+ () => {
+ V.SecExp.units.militia.free += 30;
+ },
+ [],
+ "Options"
+ ));
+ links.push(App.UI.DOM.link(
+ "Remove militia manpower",
+ () => {
+ V.SecExp.units.militia.free = Math.max(V.SecExp.units.militia.free - 30, 0);
+ },
+ [],
+ "Options"
+ ));
+ tr.append(App.UI.DOM.generateLinksStrip(links));
+ tr.append(td);
+
+ td = document.createElement("td");
+ td.style.textAlign = "left";
+ links = [];
+ links.push(App.UI.DOM.link(
+ "Give mercs manpower",
+ () => {
+ V.SecExp.units.mercs.free += 30;
+ },
+ [],
+ "Options"
+ ));
+ links.push(App.UI.DOM.link(
+ "Remove mercs manpower",
+ () => {
+ V.SecExp.units.mercs.free = Math.max(V.SecExp.units.mercs.free - 30, 0);
+ },
+ [],
+ "Options"
+ ));
+ tr.append(App.UI.DOM.generateLinksStrip(links));
+ tr.append(td);
+ table.append(tr);
+ subHeading.append(table);
+ el.append(subHeading);
+ } /* closes cheatmode check */
+ } /* closes SecExp check*/
+ return el;
+
+ function createTd() {
+ const td = document.createElement("td");
+ td.style.columnSpan = "2";
+ return td;
}
/**
- * @param {HTMLDivElement} container
+ *
+ * @param {"high"|"average"|"low"|"random"} level
*/
- render(container) {
- /** @type {HTMLDivElement} */
- const div = App.UI.DOM.makeElement("div", this.element, "custom-row");
- container.append(div);
+ function changeLoyalty(level) {
+ const numberMap = new Map([
+ ["high", [80, 100]],
+ ["average", [40, 60]],
+ ["low", [20]],
+ ["random", [100]],
+ ]);
+
+ for (const squad of App.SecExp.unit.humanSquads()) {
+ squad.loyalty = numberGenerator();
+ }
+
+ function numberGenerator() {
+ const range = numberMap.get(level);
+ if (range[1]) {
+ return random(range[0], range[1]);
+ } else {
+ return random(range[0]);
+ }
+ }
}
}
- return class {
- constructor() {
- /**
- * @type {Array<Row>}
- */
- this.rows = [];
- this.doubleColumn = false;
+ function debugCheating() {
+ const el = new DocumentFragment();
+ let options;
+ let option;
+ let links;
+ let r;
+ const popCap = menialPopCap();
+
+ App.UI.DOM.appendNewElement("h2", el, `Debug`);
+
+ options = new App.UI.OptionsGroup();
+
+ options.addOption("DebugMode is", "debugMode")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("This will add a Display Variables and Bug Report passage to the sidebar.");
+
+ if (V.debugMode > 0) {
+ options.addOption("The custom function part of debug mode is", "debugModeCustomFunction")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
}
- /**
- * @returns {App.UI.OptionsGroup}
- */
- enableDoubleColumn() {
- this.doubleColumn = true;
- return this;
+ option = options.addOption("Genetics array")
+ .customButton("Run test", () => { }, "test genetics");
+ if (V.cheatMode === 1) {
+ option.customButton("Edit Genetics", () => { }, "Edit Genetics");
+ } else {
+ option.addComment("Enable cheat mode to edit genetics.");
}
- /**
- * @template {Row} T
- * @param {T} row
- * @returns {T}
- * @private
- */
- _addRow(row) {
- this.rows.push(row);
- return row;
+ options.addOption("Rules Assistant").customButton("Reset Rules", () => { initRules(); }, "Rules Assistant");
+
+ options.addOption("Passage Profiler is", "profiler")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("Outputs performance data at the bottom of every passage.");
+
+ el.append(options.render());
+
+ App.UI.DOM.appendNewElement("h2", el, `Cheating`);
+
+ options = new App.UI.OptionsGroup();
+
+ options.addOption("CheatMode is", "cheatMode")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("This will allow manual selection of events and unlock some options that would usually be restricted by progress.");
+
+ if (V.cheatMode === 0) {
+ el.append(options.render());
+ } else {
+ options.addOption("Sidebar Cheats are currently", "cheatModeM")
+ .addValue("Shown", 1).on().addValue("Hidden", 0).off();
+
+ options.addOption("Slave aging", "seeAge")
+ .addValue("Enabled", 1).on().addValue("Celebrate birthdays, but don't age.", 2).neutral().addValue("Disabled", 0).off();
+
+ el.append(options.render());
+
+ links = [];
+
+ links.push(
+ App.UI.DOM.link(
+ `Add ${commaNum(100000)} money`,
+ () => {
+ V.cheater = 1;
+ cashX(100000, "cheating");
+ },
+ [],
+ "Options"
+ )
+ );
+
+ links.push(
+ App.UI.DOM.link(
+ `Add ${commaNum(10000)} rep`,
+ () => {
+ V.cheater = 1;
+ repX(10000, "cheating");
+ },
+ [],
+ "Options"
+ )
+ );
+
+ r = [];
+ r.push(App.UI.DOM.generateLinksStrip(links));
+ r.push(App.UI.DOM.makeElement("span", "Cheating will be flagged in your save", "note"));
+ App.Events.addNode(el, r, "div", "scLink2");
+
+
+ SectorCounts();
+
+ links = [];
+ links.push(
+ App.UI.DOM.link(
+ "Raise prosperity cap",
+ () => {
+ V.AProsperityCapModified += 10;
+ },
+ [],
+ "Options"
+ )
+ );
+
+ links.push(
+ App.UI.DOM.link(
+ "Lower prosperity cap",
+ () => {
+ V.AProsperityCapModified -= 10;
+ },
+ [],
+ "Options"
+ )
+ );
+ App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(links), "scLink2");
+
+
+ links = [];
+ links.push(
+ App.UI.DOM.link(
+ "Raise prosperity",
+ () => {
+ V.arcologies[0].prosperity = Math.clamp(V.arcologies[0].prosperity + 10, 0, V.AProsperityCap);
+ },
+ [],
+ "Options"
+ )
+ );
+
+ links.push(
+ App.UI.DOM.link(
+ "Lower prosperity",
+ () => {
+ V.arcologies[0].prosperity = Math.clamp(V.arcologies[0].prosperity - 10, 0, V.AProsperityCap);
+ },
+ [],
+ "Options"
+ )
+ );
+ App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(links), "scLink2");
+
+ links = [];
+ links.push(
+ App.UI.DOM.link(
+ "Give menial slaves",
+ () => {
+ V.menials = Math.clamp(V.menials + 30, 0, popCap.value);
+ },
+ [],
+ "Options"
+ )
+ );
+
+ links.push(
+ App.UI.DOM.link(
+ "Remove menial slaves",
+ () => {
+ V.menials = Math.clamp(V.menials - 30, 0, popCap.value);
+ },
+ [],
+ "Options"
+ )
+ );
+ App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(links), "scLink2");
+
+ links = [];
+
+ // Will no longer work as intended due to population changes
+ links.push(
+ App.UI.DOM.link(
+ "Add citizens",
+ () => {
+ V.lowerClass = Math.max(V.lowerClass + 200, 0);
+ },
+ [],
+ "Options"
+ )
+ );
+
+ // also no longer properly functional
+ links.push(
+ App.UI.DOM.link(
+ "Remove citizens",
+ () => {
+ V.lowerClass = Math.max(V.lowerClass - 200, 0);
+ },
+ [],
+ "Options"
+ )
+ );
+ App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(links), "scLink2");
+
+ links = [];
+ // Will work to a limited degree, minimums and maximums for slaves are set through population
+ links.push(
+ App.UI.DOM.link(
+ "Add slaves",
+ () => {
+ V.NPCSlaves = Math.max(V.NPCSlaves + 200, 0);
+ },
+ [],
+ "Options"
+ )
+ );
+
+ // Will work to a limited degree
+ links.push(
+ App.UI.DOM.link(
+ "Remove slaves",
+ () => {
+ V.NPCSlaves = Math.max(V.NPCSlaves - 200, 0);
+ },
+ [],
+ "Options"
+ )
+ );
+ App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(links), "scLink2");
}
+ return (el);
+ }
- /**
- * @param {string} name
- * @param {string} property
- * @param {object} [object=V]
- * @returns {Option}
- */
- addOption(name, property, object = V) {
- const option = new Option(name, property, object);
- return this._addRow(option);
+ function experimental() {
+ const el = new DocumentFragment();
+ let options;
+ let r;
+
+ r = [];
+ r.push(`Experimental means just that: experimental. Options below are likely to be in an`);
+ r.push(App.UI.DOM.makeElement("span", `even more incomplete or broken state than usual.`, "yellow"));
+ r.push(App.UI.DOM.makeElement("span", `THEY MAY NOT WORK AT ALL.`, "red"));
+ r.push(`Make sure you back up your save before enabling any of these, and if you are that interested, consider helping to improve them.`);
+ App.Events.addNode(el, r, "div", "bold");
+
+ options = new App.UI.OptionsGroup();
+
+ if (V.seePreg !== 0) {
+ options.addOption("Nursery is", "nursery", V.experimental)
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("This will enable the experimental nursery, which allows players to interact with growing slave children. An alternative to the incubator.");
}
- /**
- * @param {string} comment may contain SC markup
- * @returns {Comment}
- */
- addComment(comment) {
- const c = new Comment(comment);
- return this._addRow(c);
+ options.addOption("Food is", "food", V.experimental)
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("This will enable the experimental food supply and demand system, as well as a new farmyard building and assignments.");
+
+ if (V.seeExtreme === 1 && V.seeBestiality === 1) {
+ options.addOption("Animal Ovaries are", "animalOvaries", V.experimental)
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("This will allow slaves to be impregnated by animals.");
}
- /**
- * Adds a custom element taking up both rows
- *
- * @param {HTMLElement|string} element
- * @returns {CustomRow}
- */
- addCustom(element) {
- return this._addRow(new CustomRow(element));
+ if (V.seeExtreme === 1) {
+ options.addOption("Dinner party", "dinnerParty", V.experimental)
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
+ .addComment("This will enable a controversial but very broken event. Warning: Snuff, cannibalism.");
}
- /**
- * @returns {HTMLDivElement}
- */
- render() {
- const container = document.createElement("div");
- container.className = "options-group";
- if (this.doubleColumn) {
- container.classList.add("double");
- }
+ options.addOption("New event", "tempEventToggle")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
- for (/** @type {Row} */ const row of this.rows) {
- row.render(container, this.doubleColumn);
- }
+ el.append(options.render());
+ return el;
+ }
+};
- return container;
+App.UI.artOptions = function() {
+ const el = new DocumentFragment();
+ let options = new App.UI.OptionsGroup();
+
+ if (V.seeImages > 0) {
+ App.Events.drawEventArt(el, BaseSlave());
+ }
+
+ options.addOption("Images are", "seeImages")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ if (V.seeImages > 0) {
+ options.addOption("Image style is", "imageChoice")
+ .addValueList([["Revamped embedded vector art", 3], ["Non-embedded vector art", 2], ["NoX/Deepmurk's vector art", 1], ["Shokushu's rendered imagepack", 0]]);
+
+ if (V.imageChoice === 1) {
+ options.addComment('<span class="warning">Git compiled only, no exceptions.</span>');
+
+ options.addOption("Face artwork is", "seeFaces")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Highlights on shiny clothing are", "seeVectorArtHighlights")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Height scaling", "seeHeight")
+ .addValue("All images", 2).on().addValue("Small images", 1).neutral().addValue("Disabled", 0).off();
+
+ options.addOption("Clothing erection bulges are", "showClothingErection")
+ .addValue("Enabled", true).on().addValue("Disabled", false).off();
+ } else if (V.imageChoice === 0) {
+ options.addComment(`You need """to"""
+ <a href="https://mega.nz/#!upoAlBaZ!EbZ5wCixxZxBhMN_ireJTXt0SIPOywO2JW9XzTIPhe0">download the image pack</a>
+ """and""" put the 'renders' folder into the resources/ folder where this html file is.`
+ );
+
+ options.addOption("Slave summary fetish images are", "seeMainFetishes")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+ } else if (V.imageChoice === 3) {
+ options.addComment('<span class="warning">Git compiled only, no exceptions.</span>');
+
+ options.addOption("Clothing erection bulges are", "showClothingErection")
+ .addValue("Enabled", true).on().addValue("Disabled", false).off();
}
- };
-})();
+
+ options.addOption("PA avatar art is", "seeAvatar")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Slave images in lists are", "seeSummaryImages")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
+ options.addOption("Slave images in the weekly report are", "seeReportImages")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+ }
+ el.append(options.render());
+ return el;
+};
diff --git a/src/gui/options/options.tw b/src/gui/options/options.tw
deleted file mode 100644
index ca66ab0ffb92b01a2d5066879ccc78c592c88172..0000000000000000000000000000000000000000
--- a/src/gui/options/options.tw
+++ /dev/null
@@ -1,11 +0,0 @@
-:: Options [nobr jump-to-safe jump-from-safe]
-
-<<if lastVisited("Slave Interact") === 1>>
- <<set $storedLink = "Slave Interact">>
-<<else>>
- <<set $storedLink = "Main">>
-<</if>>
-
-<<set $nextButton = "Back", $nextLink = $storedLink, $encyclopedia = "How to Play">>
-
-<<includeDOM App.UI.optionsPassage()>>
\ No newline at end of file
diff --git a/src/gui/options/optionsGroup.js b/src/gui/options/optionsGroup.js
new file mode 100644
index 0000000000000000000000000000000000000000..a6ffd81760751d90cabb3ebeff05929bc7c4e08f
--- /dev/null
+++ b/src/gui/options/optionsGroup.js
@@ -0,0 +1,465 @@
+App.UI.OptionsGroup = (function() {
+ class Row {
+ /**
+ * @param {HTMLDivElement} container
+ */
+ render(container) {} // jshint ignore:line
+ }
+
+ /**
+ * @typedef value
+ * @property {*} value
+ * @property {string} [name]
+ * @property {string} mode
+ * @property {number} [compareValue]
+ * @property {string} [descAppend] can be SC markup
+ * @property {boolean} [on]
+ * @property {boolean} [off]
+ * @property {boolean} [neutral]
+ * @property {Function} [callback]
+ */
+
+ class Option extends Row {
+ /**
+ * @param {string} description can be SC markup
+ * @param {string} property
+ * @param {object} [object=V]
+ */
+ constructor(description, property, object = V) {
+ super();
+ this.description = description;
+ this.property = property;
+ this.object = object;
+ /**
+ * @type {Array<value>}
+ */
+ this.valuePairs = [];
+ }
+
+ /**
+ * @param {*} name
+ * @param {*} [value=name]
+ * @param {Function} [callback]
+ * @returns {Option}
+ */
+ addValue(name, value = name, callback = undefined) {
+ this.valuePairs.push({
+ name: name, value: value, mode: "=", callback: callback
+ });
+ return this;
+ }
+
+ /**
+ * @param {Array<*|Array>} values
+ * @returns {Option}
+ */
+ addValueList(values) {
+ for (const value of values) {
+ if (Array.isArray(value)) {
+ this.addValue(value[0], value[1]);
+ } else {
+ this.addValue(value);
+ }
+ }
+ return this;
+ }
+
+ /**
+ * @param {Map} values
+ * @returns {Option}
+ */
+ addValueMap(values) {
+ for (const [key, value] of values) {
+ this.addValue(key, value);
+ }
+ return this;
+ }
+
+ /**
+ * @param {*} value
+ * @param {number} compareValue
+ * @param {string} mode on of: "<", "<=", ">", ">="
+ * @param {string} [name=value]
+ */
+ addRange(value, compareValue, mode, name = value) {
+ this.valuePairs.push({
+ name: name, value: value, mode: mode, compareValue: compareValue
+ });
+ return this;
+ }
+
+ /**
+ * @param {Object} [params]
+ * @param {string} [params.unit]
+ * @param {boolean} [params.large=false]
+ * @returns {Option}
+ */
+ showTextBox({unit, large = false} = {}) {
+ this.textbox = {unit: unit, large: large};
+ return this;
+ }
+
+ /**
+ * @param {string} comment can be SC markup
+ * @returns {Option}
+ */
+ addComment(comment) {
+ this.comment = comment;
+ return this;
+ }
+
+ /**
+ * Adds a button that executes the callback when clicked AND reloads the passage
+ *
+ * @param {string} name
+ * @param {Function} callback
+ * @param {string} passage
+ */
+ customButton(name, callback, passage) {
+ this.valuePairs.push({
+ name: name, value: passage, callback: callback, mode: "custom"
+ });
+ return this;
+ }
+
+ /**
+ * @param {Node} node
+ * @returns {Option}
+ */
+ addCustomDOM(node) {
+ this.valuePairs.push({
+ value: node, mode: "DOM"
+ });
+ return this;
+ }
+
+ /* modify last added option */
+
+ /**
+ * Added to the description if last added value is selected.
+ * example use: addValue(...).customDescription(...).addValue(...).customDescription(...)
+ * @param {string} description can be SC markup
+ */
+ customDescription(description) {
+ this.valuePairs.last().descAppend = description;
+ return this;
+ }
+
+ /**
+ * @param {Function} callback gets executed on every button click. Selected value is given as argument.
+ */
+ addCallback(callback) {
+ this.valuePairs.last().callback = callback;
+ return this;
+ }
+
+ /**
+ * @param {Function} callback gets executed on every button click. Selected value is given as argument.
+ */
+ addCallbackToEach(callback) {
+ this.valuePairs.forEach(pair => pair.callback = callback);
+ return this;
+ }
+
+ /**
+ * Mark option as on to style differently.
+ * @returns {Option}
+ */
+ on() {
+ this.valuePairs.last().on = true;
+ return this;
+ }
+
+ /**
+ * Mark option as off to style differently.
+ * @returns {Option}
+ */
+ off() {
+ this.valuePairs.last().off = true;
+ return this;
+ }
+
+ /**
+ * Mark option as neutral to style differently.
+ * @returns {Option}
+ */
+ neutral() {
+ this.valuePairs.last().neutral = true;
+ return this;
+ }
+
+ /**
+ * Puts the options in side a pulldown if there are at least 6.
+ * Not counting text boxes or comments.
+ * @returns {Option}
+ */
+ pulldown() {
+ this.enablePulldown = true;
+ return this;
+ }
+
+ /**
+ * @param {HTMLDivElement} container
+ */
+ render(container) {
+ /* left side */
+ const desc = document.createElement("div");
+ desc.className = "description";
+ $(desc).wiki(this.description);
+ container.append(desc);
+
+ /* right side */
+ const currentValue = this.object[this.property];
+ let anySelected = false;
+
+ const buttonGroup = document.createElement("div");
+ buttonGroup.classList.add("button-group");
+ if (!this.enablePulldown || this.valuePairs.length < 6) {
+ for (const value of this.valuePairs) {
+ if (value.mode === "DOM") {
+ /* insert DOM and go to next element */
+ buttonGroup.append(value.value);
+ continue;
+ }
+ const button = document.createElement("button");
+ button.append(value.name);
+ if (value.on) {
+ button.classList.add("on");
+ } else if (value.off) {
+ button.classList.add("off");
+ } else if (value.neutral) {
+ button.classList.add("neutral");
+ }
+ if (value.mode === "custom") {
+ button.onclick = () => {
+ value.callback();
+ if (value.value) {
+ Engine.play(value.value);
+ } else {
+ App.UI.reload();
+ }
+ };
+ } else {
+ if (value.mode === "=" && currentValue === value.value) {
+ button.classList.add("selected", "disabled");
+ anySelected = true;
+ if (value.descAppend !== undefined) {
+ desc.append(" ");
+ $(desc).wiki(value.descAppend);
+ }
+ } else if (!anySelected && inRange(value.mode, value.compareValue, currentValue)) {
+ button.classList.add("selected");
+ // disable the button if clicking it won't change the variable value
+ if (currentValue === value.value) {
+ button.classList.add("disabled");
+ }
+ anySelected = true;
+ if (value.descAppend !== undefined) {
+ desc.append(" ");
+ $(desc).wiki(value.descAppend);
+ }
+ }
+ button.onclick = () => {
+ this.object[this.property] = value.value;
+ if (value.callback) {
+ value.callback();
+ }
+ App.UI.reload();
+ };
+ }
+ buttonGroup.append(button);
+ }
+ } else {
+ let matchFound = false;
+ let select = document.createElement("select");
+
+ for (const value of this.valuePairs) {
+ let el = document.createElement("option");
+ el.textContent = value.name;
+ el.value = value.value;
+ if (this.object[this.property] === value.value) {
+ el.selected = true;
+ matchFound = true;
+ }
+ select.appendChild(el);
+ }
+ if (!matchFound) {
+ select.selectedIndex = -1;
+ }
+ select.onchange = () => {
+ const O = select.options[select.selectedIndex];
+ if (isNaN(Number(O.value))) {
+ this.object[this.property] = O.value;
+ } else {
+ this.object[this.property] = Number(O.value);
+ }
+ const originalObj = this.valuePairs.find(obj => obj.name === O.textContent);
+ if (originalObj && typeof originalObj.callback === "function") {
+ originalObj.callback();
+ }
+ App.UI.reload();
+ };
+ buttonGroup.append(select);
+ }
+
+ if (this.textbox) {
+ const isNumber = typeof currentValue === "number";
+ const textbox = App.UI.DOM.makeTextBox(currentValue, input => {
+ this.object[this.property] = input;
+ App.UI.reload();
+ }, isNumber);
+ if (isNumber) {
+ textbox.classList.add("number");
+ }
+ if (this.textbox.large) {
+ textbox.classList.add("full-width");
+ }
+ buttonGroup.append(textbox);
+ if (this.textbox.unit) {
+ buttonGroup.append(" ", this.textbox.unit);
+ }
+ }
+
+ if (this.comment) {
+ const comment = document.createElement("span");
+ comment.classList.add("comment");
+ $(comment).wiki(this.comment);
+ buttonGroup.append(comment);
+ }
+ container.append(buttonGroup);
+
+ function inRange(mode, compareValue, value) {
+ if (mode === "<") {
+ return value < compareValue;
+ } else if (mode === "<=") {
+ return value <= compareValue;
+ } else if (mode === ">") {
+ return value > compareValue;
+ } else if (mode === ">=") {
+ return value >= compareValue;
+ }
+ return false;
+ }
+ }
+ }
+
+ class Comment extends Row {
+ /**
+ * @param {string} comment can be SC markup
+ */
+ constructor(comment) {
+ super();
+ this.comment = comment;
+ this.long = false;
+ }
+
+ /**
+ * @param {HTMLDivElement} container
+ */
+ render(container) {
+ /* left */
+ container.append(document.createElement("div"));
+
+ /* right */
+ const comment = document.createElement("div");
+ comment.classList.add("comment");
+ $(comment).wiki(this.comment);
+ container.append(comment);
+ }
+ }
+
+ class CustomRow extends Row {
+ /**
+ * @param {HTMLElement|string} element
+ */
+ constructor(element) {
+ super();
+ this.element = element;
+ }
+
+ /**
+ * @param {HTMLDivElement} container
+ */
+ render(container) {
+ /** @type {HTMLDivElement} */
+ const div = App.UI.DOM.makeElement("div", this.element, "custom-row");
+ container.append(div);
+ }
+ }
+
+ return class {
+ constructor() {
+ /**
+ * @type {Array<Row>}
+ */
+ this.rows = [];
+ this.doubleColumn = false;
+ }
+
+ /**
+ * @returns {App.UI.OptionsGroup}
+ */
+ enableDoubleColumn() {
+ this.doubleColumn = true;
+ return this;
+ }
+
+ /**
+ * @template {Row} T
+ * @param {T} row
+ * @returns {T}
+ * @private
+ */
+ _addRow(row) {
+ this.rows.push(row);
+ return row;
+ }
+
+ /**
+ * @param {string} name
+ * @param {string} property
+ * @param {object} [object=V]
+ * @returns {Option}
+ */
+ addOption(name, property, object = V) {
+ const option = new Option(name, property, object);
+ return this._addRow(option);
+ }
+
+ /**
+ * @param {string} comment may contain SC markup
+ * @returns {Comment}
+ */
+ addComment(comment) {
+ const c = new Comment(comment);
+ return this._addRow(c);
+ }
+
+ /**
+ * Adds a custom element taking up both rows
+ *
+ * @param {HTMLElement|string} element
+ * @returns {CustomRow}
+ */
+ addCustom(element) {
+ return this._addRow(new CustomRow(element));
+ }
+
+ /**
+ * @returns {HTMLDivElement}
+ */
+ render() {
+ const container = document.createElement("div");
+ container.className = "options-group";
+ if (this.doubleColumn) {
+ container.classList.add("double");
+ }
+
+ for (/** @type {Row} */ const row of this.rows) {
+ row.render(container, this.doubleColumn);
+ }
+
+ return container;
+ }
+ };
+})();
diff --git a/src/gui/options/optionsPassage.js b/src/gui/options/optionsPassage.js
deleted file mode 100644
index 74cbea915f9176f506b76654c5beca92560d623e..0000000000000000000000000000000000000000
--- a/src/gui/options/optionsPassage.js
+++ /dev/null
@@ -1,1061 +0,0 @@
-App.UI.optionsPassage = function() {
- const el = new DocumentFragment();
- V.passageSwitchHandler = App.EventHandlers.optionsChanged;
- el.append(intro());
-
- // Results
- const results = document.createElement("div");
- results.id = "results";
- el.append(results);
-
- App.UI.tabBar.handlePreSelectedTab(V.tabChoice.Options);
-
- // TODO: move me
- /**
- *
- * @param {string} id
- * @param {Node} element
- * @returns {HTMLSpanElement}
- */
- function makeSpanIded(id, element) {
- const span = document.createElement("span");
- span.id = id;
- span.append(element);
- return span;
- }
-
- const tabCaptions = {
- "display": 'Display',
- "contentFlavor": 'Content & flavour',
- "mods": 'Mods',
- "debugCheating": 'Debug & cheating',
- "experimental": 'Experimental'
- };
-
- const tabBar = App.UI.DOM.appendNewElement("div", el, '', "tab-bar");
- tabBar.append(
- App.UI.tabBar.tabButton('display', tabCaptions.display),
- App.UI.tabBar.tabButton('content-flavor', tabCaptions.contentFlavor),
- App.UI.tabBar.tabButton('mods', tabCaptions.mods),
- App.UI.tabBar.tabButton('debug-cheating', tabCaptions.debugCheating),
- App.UI.tabBar.tabButton('experimental', tabCaptions.experimental),
- );
-
- el.append(App.UI.tabBar.makeTab('display', makeSpanIded("content-display", display())));
- el.append(App.UI.tabBar.makeTab('content-flavor', makeSpanIded("content-content-flavor", contentFlavor())));
- el.append(App.UI.tabBar.makeTab('mods', makeSpanIded("content-mods", mods())));
- el.append(App.UI.tabBar.makeTab('debug-cheating', makeSpanIded("content-debug-cheating", debugCheating())));
- el.append(App.UI.tabBar.makeTab('experimental', makeSpanIded("content-experimental", experimental())));
-
- return el;
-
- function intro() {
- let links;
- let options;
- let r;
- const el = new DocumentFragment();
-
- options = new App.UI.OptionsGroup();
- options.addOption("End of week autosaving is currently", "autosave")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
- el.append(options.render());
-
- App.UI.DOM.appendNewElement("div", el, `This save was created using FC version ${V.ver} build ${V.releaseID}. You are currently playing version: ${App.Version.base}, mod version: ${App.Version.pmod}, build: ${App.Version.release}${App.Version.commitHash ? `, commit: ${App.Version.commitHash}` : ``}`);
-
- links = [];
- links.push(App.UI.DOM.passageLink("Apply Backwards Compatibility Update", "Backwards Compatibility"));
-
- links.push(
- App.UI.DOM.link(
- `Reset extended family mode controllers`,
- () => {
- resetFamilyCounters();
- const span = document.createElement("span");
- span.classList.add("note");
- App.UI.DOM.appendNewElement("span", span, "Done: ", "lightgreen");
- span.append("all family relations flushed and rebuilt.");
- jQuery("#results").empty().append(span);
- },
- [],
- "",
- "Clears and rebuilds .sister and .daughter tracking."
- )
- );
-
-
- if (isNaN(V.rep)) {
- links.push(
- App.UI.DOM.link(
- `Reset Reputation (${V.rep})`,
- () => {
- V.rep = 0;
- jQuery("#results").empty().append(`Reputation reset to ${V.rep}`);
- },
- [],
- "Options"
- )
- );
- }
-
- if (isNaN(V.rep)) {
- links.push(
- App.UI.DOM.link(
- `Reset Money (${V.cash})`,
- () => {
- V.cash = 500;
- jQuery("#results").empty().append(`Cash reset to ${V.cash}`);
- },
- [],
- "Options"
- )
- );
- }
-
- if (V.releaseID === 1057) {
- links.push(
- App.UI.DOM.link(
- `Free male anatomy removal due to accidentally flawed updater`,
- () => {
- V.PC.dick = 0;
- V.PC.balls = 0;
- V.PC.prostate = 0;
- V.PC.scrotum = 0;
- V.PC.ballsImplant = 0;
- jQuery("#results").empty().append(`Cash reset to ${V.cash}`);
- },
- [],
- "Options",
- "Use this if your female PC picked up a few extra parts during the conversion process.",
- )
- );
- }
-
- App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(links));
-
- if ((V.releaseID >= 1000) || V.ver.startsWith("0.9") || V.ver.startsWith("0.8") || V.ver.startsWith("0.7") || V.ver.startsWith("0.6")) {
- App.UI.DOM.appendNewElement("h3", el, `NEW GAME PLUS`);
- r = [];
- r.push(`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. New Game Plus`);
- r.push(App.UI.DOM.makeElement("span", "MAY", "yellow"));
- r.push(`work across versions. To attempt to migrate a save across versions:`);
- App.Events.addNode(el, r, "div", "note");
-
- const ngpInstructions = document.createElement("ol");
- App.UI.DOM.appendNewElement("li", ngpInstructions, "Save on this screen", "note");
- App.UI.DOM.appendNewElement("li", ngpInstructions, "Re-open the .html in a new tab then load the above save.", "note");
- App.UI.DOM.appendNewElement(
- "li",
- ngpInstructions,
- App.UI.DOM.link(
- "Activate New Game Plus.",
- () => {
- V.ui = "start";
- },
- [],
- "New Game Plus"
- ),
- "note"
- );
- el.append(ngpInstructions);
- } else {
- 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;
- }
-
- function display() {
- const el = new DocumentFragment();
- let options;
- let r;
-
- App.UI.DOM.appendNewElement("h2", el, "Reports");
-
- options = new App.UI.OptionsGroup();
-
- options.addOption("End week report descriptive details are", "showEWD")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("End week report performance details are", "showEWM")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Master Suite report details such as slave changes are", "verboseDescriptions")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("End week societal effects from slaves are", "compressSocialEffects", V.UI)
- .addValue("Expanded", 0).on().addValue("Compacted", 1).off();
-
- options.addOption("Accordion on week end defaults to", "useAccordion")
- .addValue("Open", 0).on().addValue("Collapsed", 1).off();
-
- options.addOption("Economic Tabs on weekly reports are", "useTabs")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Economic detail sheets for facilities are", "showEconomicDetails")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Economic report neighbor details such as trade impacts on culture are", "showNeighborDetails")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Numeric formatting is currently", "formatNumbers")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("This will comma-format numbers in some areas.");
-
- el.append(options.render());
-
- App.UI.DOM.appendNewElement("h2", el, "General");
-
- options = new App.UI.OptionsGroup();
-
- options.addOption("Main menu leadership controls displayed", "positionMainLinks")
- .addValueList([["Above", 1], ["Above and below", 0], ["Below", -1]]);
-
- options.addOption("New Model UI", "newModelUI")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Penthouse Facility Display", "verticalizeArcologyLinks")
- .addValueList([["Triple column", 3], ["Double Column", 2], ["Single Column", 1], ["Collapsed", 0]]);
-
- options.addOption("Main menu arcology description", "seeArcology")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Main menu desk description", "seeDesk")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Main menu newsfeed", "seeFCNN")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Tips from the Encyclopedia are", "showTipsFromEncy")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Help tooltips are", "tooltipsEnabled")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment(`This is mostly for new players. <span class='exampleTooltip noteworthy'>Colored text</span> can have tooltips.`);
-
- options.addOption("Main menu slave tabs are", "useSlaveSummaryTabs")
- .addValue("Enabled", 1).on().addValue("CardStyle", 2).on().addValue("Disabled", 0).off();
-
- options.addOption("The slave Quick list in-page scroll-to is", "useSlaveListInPageJSNavigation")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Condense special slaves into their own tab", "useSlaveSummaryOverviewTab")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Interactions with your fucktoys are", "fucktoyInteractionsPosition")
- .addValueList([["next to them", 1], ["at page bottom", 0]]);
-
- 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();
-
- el.append(options.render());
-
- r = [];
- r.push(`UI theme selector. Allows to select a single CSS file to be loaded.`);
- r.push(App.UI.DOM.makeElement("span", `The file has to be located in the same directory as the HTML file otherwise it will simply not load at all.`, "red"));
- r.push(App.UI.Theme.selector());
- App.Events.addParagraph(el, r);
-
- App.UI.DOM.appendNewElement("h2", el, "Sidebar");
-
- options = new App.UI.OptionsGroup();
-
- options.addOption("Cash is", "Cash", V.sideBarOptions)
- .addValue("Shown", 1).on().addValue("Hidden", 0).off();
-
- options.addOption("Upkeep is", "Upkeep", V.sideBarOptions)
- .addValue("Shown", 1).on().addValue("Hidden", 0).off();
-
- options.addOption("Sex slave count is", "SexSlaveCount", V.sideBarOptions)
- .addValue("Shown", 1).on().addValue("Hidden", 0).off();
-
- options.addOption("Room population is", "roomPop", V.sideBarOptions)
- .addValue("Shown", 1).on().addValue("Hidden", 0).off();
-
- options.addOption("GSP is", "GSP", V.sideBarOptions)
- .addValue("Shown", 1).on().addValue("Hidden", 0).off();
-
- options.addOption("Rep is", "Rep", V.sideBarOptions)
- .addValue("Shown", 1).on().addValue("Hidden", 0).off();
-
- options.addOption("Confirmation before ending a week is", "confirmWeekEnd", V.sideBarOptions)
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("Enabling this will open a dialog box to confirm you meant to end a week.");
-
- if (V.secExpEnabled > 0) {
- options.addOption("Authority is", "Authority", V.sideBarOptions)
- .addValue("Shown", 1).on().addValue("Hidden", 0).off();
-
- options.addOption("Security is", "Security", V.sideBarOptions)
- .addValue("Shown", 1).on().addValue("Hidden", 0).off();
-
- options.addOption("Crime is", "Crime", V.sideBarOptions)
- .addValue("Shown", 1).on().addValue("Hidden", 0).off();
- }
-
- el.append(options.render());
-
-
- App.UI.DOM.appendNewElement("h2", el, "Images");
- el.append(App.UI.artOptions());
-
- return el;
- }
-
- function contentFlavor() {
- const el = new DocumentFragment();
- let r;
- let options;
-
- App.UI.DOM.appendNewElement("h2", el, "Content");
-
- r = [];
- r.push("More granular control of what appears is in");
- r.push(App.UI.DOM.passageLink("Description Options", "Description Options"));
- App.Events.addNode(el, r, "div", "note");
-
- options = new App.UI.OptionsGroup();
-
- options.addOption("The difficulty setting is currently set to", "baseDifficulty")
- .addValueList([["Very easy", 1], ["Easy", 2], ["Default", 3], ["Hard", 4], ["Very hard", 5]]);
-
- options.addOption("Slaves falling ill is currently", "seeIllness")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("Will not affect existing ill slaves already in-game.");
-
- options.addOption("Extreme content like amputation is currently", "seeExtreme")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("Will not affect extreme surgeries already applied in-game.");
-
- options.addOption("Bestiality related content is currently", "seeBestiality")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Watersports related content is currently", "seePee")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Incest content is currently", "seeIncest")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Pregnancy related content is currently", "seePreg")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("Will not affect existing pregnancies already in-game.");
-
- options.addOption("Child gender to be generated based off dick content settings", "seeDicksAffectsPregnancy")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment(`${(V.seeDicksAffectsPregnancy === 1) ? `Currently ${V.seeDicks}% of children will be born male. ` : ``}Will not affect existing pregnancies already in-game.`);
-
- if (V.seeDicksAffectsPregnancy === 0) {
- options.addOption("XX slaves only father daughters", "adamPrinciple")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("Will not affect existing pregnancies already in-game.");
- }
-
- options.addOption("Extreme pregnancy content like broodmothers is currently", "seeHyperPreg")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("Will not affect existing hyperpregnancies already in-game.");
-
- options.addOption("Pregnancy complications due to multiples and body size are currently", "dangerousPregnancy")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption(`Precocious puberty (pregnancy younger than ${V.fertilityAge})`, "precociousPuberty")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("Will not affect existing precocious puberty cases already in-game.");
-
- options.addOption("Slaves with fat lips or heavy oral piercings may lisp", "disableLisping")
- .addValue("Yes", 0).on().addValue("No", 1).off();
-
- options.addOption("Disables the long term damage mechanic. //Temp option//", "disableLongDamage")
- .addValue("Enabled", 0).on().addValue("Disabled", 1).off();
-
- options.addOption("Experimental male pronouns are currently", "diversePronouns")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("Apply Backwards Compatibility after changing to update slave's pronouns. Not all scenes support male pronouns and this is not yet incorporated into the lore or mechanics.");
-
- options.addOption("Male slave names are currently", "allowMaleSlaveNames")
- .addValue("Enabled", true).on().addValue("Disabled", false).off()
- .addComment("This only affects slave generation and not your ability to name your slaves.");
-
- options.addOption("Missing slave names are currently", "showMissingSlaves")
- .addValue("Enabled", true).on().addValue("Disabled", false).off();
-
- el.append(options.render());
-
- App.UI.DOM.appendNewElement("h2", el, `Intersecting mechanics`);
-
- options = new App.UI.OptionsGroup();
-
- options.addOption("Slave assets affected by weight is", "weightAffectsAssets")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("Diet will still affect asset size.");
-
- options.addOption("Curative side effects are", "curativeSideEffects")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("If enabled, curatives have a chance to give slaves harmful side effects.");
-
- el.append(options.render());
-
- App.UI.DOM.appendNewElement("h2", el, `Flavour`);
-
- options = new App.UI.OptionsGroup();
-
- options.addOption("Slave reactions to facility assignments are", "showAssignToScenes")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Post sex clean up", "postSexCleanUp")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Appraisal miniscenes on slave sale are", "showAppraisal")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Assignment performance vignettes on the end week report are", "showVignettes")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Slaves can have alternate titles", "newDescriptions")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Family titles for relatives", "allowFamilyTitles")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Limit family growth", "limitFamilies")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("Restricts acquisition of additional relatives, by means other than birth, for slaves with families.");
-
- options.addOption("Distant relatives such as aunts, nieces and cousins are", "showDistantRelatives")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- el.append(options.render());
- return el;
- }
-
- function mods() {
- const el = new DocumentFragment();
- let options;
-
- options = new App.UI.OptionsGroup();
-
- options.addOption("The Special Force Mod is currently", "Toggle", V.SF)
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .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().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>");
-
- el.append(options.render());
-
- if (V.secExpEnabled > 0) {
- if (Object.values(V.SecExp).length === 0) {
- App.SecExp.generalBC();
- Engine.play("Options");
- }
- App.UI.DOM.appendNewElement("h2", el, `Security Expansion mod options`);
- if (V.terrain === "oceanic") {
- App.UI.DOM.appendNewElement("div", el, `Oceanic arcologies are not by default subject to external attacks. You can however allow them to happen anyway. If you choose to do so please keep in mind that descriptions and mechanics are not intended for naval combat but land combat.`);
- }
- options = new App.UI.OptionsGroup();
-
- if (V.SecExp.settings.battle.enabled > 0 || V.SecExp.settings.rebellion.enabled > 0) {
- options.addOption("Detailed battle statistics are", "showStats", V.SecExp.settings)
- .addValue("Shown", 1).on().addValue("Hidden", 0).off()
- .addComment("Visibility of detailed statistics and battle turns.");
-
- options.addOption("Difficulty is", "difficulty", V.SecExp.settings)
- .addValueList([["Extremely hard", 2], ["Very hard", 1.5], ["Hard", 1.25], ["Normal", 1], ["Easy", 0.75], ["Very easy", 0.5]]);
-
- options.addOption("Unit descriptions are", "unitDescriptions", V.SecExp.settings)
- .addValue("Abbreviated", 1).addValue("Summarized", 0);
- }
-
- options.addOption("Battles are", "enabled", V.SecExp.settings.battle)
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Rebellions are", "enabled", V.SecExp.settings.rebellion)
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- if (V.SecExp.settings.battle.enabled > 0) {
- options.addOption("Battle frequency", "frequency", V.SecExp.settings.battle)
- .addValueList([["Extremely high", 2], ["Very high", 1.5], ["High", 1.25], ["Normal", 1], ["Low", 0.75], ["Very low", 0.5]]);
- }
-
- if (V.SecExp.settings.rebellion.enabled > 0) {
- options.addOption("Rebellion buildup", "speed", V.SecExp.settings.rebellion)
- .addValueList([["Extremely fast", 2], ["Very fast", 1.5], ["Fast", 1.25], ["Normal", 1], ["Slow", 0.75], ["Very slow", 0.5]]);
- }
-
-
- if (V.SecExp.settings.battle.enabled > 0) {
- options.addOption("Commanders gain a prestige rank every 10 victories", "allowSlavePrestige", V.SecExp.settings.battle)
- .addValue("Yes", 1).on().addValue("No", 0).off();
- }
-
- if (V.SecExp.settings.battle.enabled > 0) {
- options.addOption("Force battles", "force", V.SecExp.settings.battle)
- .addValue("Yes", 1).on().addValue("No", 0).off();
- }
- if (V.SecExp.settings.rebellion.enabled > 0) {
- options.addOption("Force rebellions", "force", V.SecExp.settings.rebellion)
- .addValue("Yes", 1).on().addValue("No", 0).off()
- .addComment("Rebellions take precedence over Battles.");
- }
-
- if (V.SecExp.settings.battle.enabled > 0) {
- options.addOption("Late game major battles are", "enabled", V.SecExp.settings.battle.major)
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
- }
-
- if (V.SecExp.settings.battle.enabled > 0 && V.SecExp.settings.battle.major.enabled > 0) {
- options.addOption("Multiplier is", "mult", V.SecExp.settings.battle.major)
- .addValueList([["Extremely high", 2], ["Very high", 1.5], ["High", 1.25], ["Normal", 1], ["Low", 0.75], ["Very low", 0.5]]);
-
- options.addOption("This week a major battle is", "force", V.SecExp.settings.battle.major)
- .addValue("Guaranteed", 1).on().addValue("Not guaranteed", 0).off();
- }
-
- if (V.SecExp.settings.battle.enabled > 0 && V.SecExp.settings.battle.major.enabled > 0) {
- options.addOption("Gameover on battle loss", "gameOver", V.SecExp.settings.battle.major)
- .addValue("Yes", 1).on().addValue("No", 0).off();
- }
-
- if (V.SecExp.settings.rebellion.enabled > 0) {
- options.addOption("Gameover on rebellion loss", "gameOver", V.SecExp.settings.rebellion)
- .addValue("Yes", 1).on().addValue("No", 0).off();
- }
-
- el.append(options.render());
-
- const subHeading = document.createElement("div");
- subHeading.classList.add("subHeading");
-
- if (V.debugMode || V.cheatMode || V.cheatModeM) { // TODO make me a fucking function
- App.UI.DOM.appendNewElement("div", subHeading, "Debug/cheat", "bold");
- let td;
- let links;
- const table = document.createElement("table");
- table.classList.add("invisible");
- el.append(table);
-
- let tr = document.createElement("tr");
- tr.style.textAlign = "center";
-
- td = createTd();
- links = [];
- links.push(
- App.UI.DOM.link(
- "Set loyalty high",
- () => {
- changeLoyalty("high");
- },
- [],
- "Options"
- )
- );
- links.push(
- App.UI.DOM.link(
- "Set loyalty average",
- () => {
- changeLoyalty("average");
- },
- [],
- "Options"
- )
- );
- links.push(
- App.UI.DOM.link(
- "Set loyalty low",
- () => {
- changeLoyalty("low");
- },
- [],
- "Options"
- )
- );
- links.push(
- App.UI.DOM.link(
- "Randomize loyalty",
- () => {
- changeLoyalty("random");
- },
- [],
- "Options"
- )
- );
-
- td.append(App.UI.DOM.generateLinksStrip(links));
- tr.append(td);
- table.append(tr);
-
- tr = document.createElement("tr");
- tr.style.textAlign = "center";
- td = createTd();
- links = [];
- links.push(App.UI.DOM.link(
- "Give Authority",
- () => {
- V.SecExp.core.authority = Math.clamp(V.SecExp.core.authority + 1000, 0, 20000);
- },
- [],
- "Options"
- ));
- links.push(App.UI.DOM.link(
- "Remove Authority",
- () => {
- V.SecExp.core.authority = Math.clamp(V.SecExp.core.authority - 1000, 0, 20000);
- },
- [],
- "Options"
- ));
- td.append(App.UI.DOM.generateLinksStrip(links));
- tr.append(td);
- table.append(tr);
-
-
- tr = document.createElement("tr");
- td = document.createElement("td");
- td.style.textAlign = "right";
- links = [];
- links.push(App.UI.DOM.link(
- "Raise security",
- () => {
- V.SecExp.core.security = Math.clamp(V.SecExp.core.security + 5, 0, 100);
- },
- [],
- "Options"
- ));
- links.push(App.UI.DOM.link(
- "Lower security",
- () => {
- V.SecExp.core.security = Math.clamp(V.SecExp.core.security - 5, 0, 100);
- },
- [],
- "Options"
- ));
- tr.append(App.UI.DOM.generateLinksStrip(links));
- tr.append(td);
-
- td = document.createElement("td");
- td.style.textAlign = "left";
- links = [];
- links.push(App.UI.DOM.link(
- "Raise crime",
- () => {
- V.SecExp.core.crimeLow = Math.clamp(V.SecExp.core.crimeLow + 5, 0, 100);
- },
- [],
- "Options"
- ));
- links.push(App.UI.DOM.link(
- "Lower crime",
- () => {
- V.SecExp.core.crimeLow = Math.clamp(V.SecExp.core.crimeLow - 5, 0, 100);
- },
- [],
- "Options"
- ));
- tr.append(App.UI.DOM.generateLinksStrip(links));
- tr.append(td);
- table.append(tr);
-
- tr = document.createElement("tr");
- td = document.createElement("td");
- td.style.textAlign = "right";
- links = [];
- links.push(App.UI.DOM.link(
- "Give militia manpower",
- () => {
- V.SecExp.units.militia.free += 30;
- },
- [],
- "Options"
- ));
- links.push(App.UI.DOM.link(
- "Remove militia manpower",
- () => {
- V.SecExp.units.militia.free = Math.max(V.SecExp.units.militia.free - 30, 0);
- },
- [],
- "Options"
- ));
- tr.append(App.UI.DOM.generateLinksStrip(links));
- tr.append(td);
-
- td = document.createElement("td");
- td.style.textAlign = "left";
- links = [];
- links.push(App.UI.DOM.link(
- "Give mercs manpower",
- () => {
- V.SecExp.units.mercs.free += 30;
- },
- [],
- "Options"
- ));
- links.push(App.UI.DOM.link(
- "Remove mercs manpower",
- () => {
- V.SecExp.units.mercs.free = Math.max(V.SecExp.units.mercs.free - 30, 0);
- },
- [],
- "Options"
- ));
- tr.append(App.UI.DOM.generateLinksStrip(links));
- tr.append(td);
- table.append(tr);
- subHeading.append(table);
- el.append(subHeading);
- } /* closes cheatmode check */
- } /* closes SecExp check*/
- return el;
-
- function createTd() {
- const td = document.createElement("td");
- td.style.columnSpan = "2";
- return td;
- }
-
- /**
- *
- * @param {"high"|"average"|"low"|"random"} level
- */
- function changeLoyalty(level) {
- const numberMap = new Map([
- ["high", [80, 100]],
- ["average", [40, 60]],
- ["low", [20]],
- ["random", [100]],
- ]);
-
- for (const squad of App.SecExp.unit.humanSquads()) {
- squad.loyalty = numberGenerator();
- }
-
- function numberGenerator() {
- const range = numberMap.get(level);
- if (range[1]) {
- return random(range[0], range[1]);
- } else {
- return random(range[0]);
- }
- }
- }
- }
-
- function debugCheating() {
- const el = new DocumentFragment();
- let options;
- let option;
- let links;
- let r;
- const popCap = menialPopCap();
-
- App.UI.DOM.appendNewElement("h2", el, `Debug`);
-
- options = new App.UI.OptionsGroup();
-
- options.addOption("DebugMode is", "debugMode")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("This will add a Display Variables and Bug Report passage to the sidebar.");
-
- if (V.debugMode > 0) {
- options.addOption("The custom function part of debug mode is", "debugModeCustomFunction")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
- }
-
- option = options.addOption("Genetics array")
- .customButton("Run test", () => { }, "test genetics");
- if (V.cheatMode === 1) {
- option.customButton("Edit Genetics", () => { }, "Edit Genetics");
- } else {
- option.addComment("Enable cheat mode to edit genetics.");
- }
-
- options.addOption("Rules Assistant").customButton("Reset Rules", () => { initRules(); }, "Rules Assistant");
-
- options.addOption("Passage Profiler is", "profiler")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("Outputs performance data at the bottom of every passage.");
-
- el.append(options.render());
-
- App.UI.DOM.appendNewElement("h2", el, `Cheating`);
-
- options = new App.UI.OptionsGroup();
-
- options.addOption("CheatMode is", "cheatMode")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("This will allow manual selection of events and unlock some options that would usually be restricted by progress.");
-
- if (V.cheatMode === 0) {
- el.append(options.render());
- } else {
- options.addOption("Sidebar Cheats are currently", "cheatModeM")
- .addValue("Shown", 1).on().addValue("Hidden", 0).off();
-
- options.addOption("Slave aging", "seeAge")
- .addValue("Enabled", 1).on().addValue("Celebrate birthdays, but don't age.", 2).neutral().addValue("Disabled", 0).off();
-
- el.append(options.render());
-
- links = [];
-
- links.push(
- App.UI.DOM.link(
- `Add ${commaNum(100000)} money`,
- () => {
- V.cheater = 1;
- cashX(100000, "cheating");
- },
- [],
- "Options"
- )
- );
-
- links.push(
- App.UI.DOM.link(
- `Add ${commaNum(10000)} rep`,
- () => {
- V.cheater = 1;
- repX(10000, "cheating");
- },
- [],
- "Options"
- )
- );
-
- r = [];
- r.push(App.UI.DOM.generateLinksStrip(links));
- r.push(App.UI.DOM.makeElement("span", "Cheating will be flagged in your save", "note"));
- App.Events.addNode(el, r, "div", "scLink2");
-
-
- SectorCounts();
-
- links = [];
- links.push(
- App.UI.DOM.link(
- "Raise prosperity cap",
- () => {
- V.AProsperityCapModified += 10;
- },
- [],
- "Options"
- )
- );
-
- links.push(
- App.UI.DOM.link(
- "Lower prosperity cap",
- () => {
- V.AProsperityCapModified -= 10;
- },
- [],
- "Options"
- )
- );
- App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(links), "scLink2");
-
-
- links = [];
- links.push(
- App.UI.DOM.link(
- "Raise prosperity",
- () => {
- V.arcologies[0].prosperity = Math.clamp(V.arcologies[0].prosperity + 10, 0, V.AProsperityCap);
- },
- [],
- "Options"
- )
- );
-
- links.push(
- App.UI.DOM.link(
- "Lower prosperity",
- () => {
- V.arcologies[0].prosperity = Math.clamp(V.arcologies[0].prosperity - 10, 0, V.AProsperityCap);
- },
- [],
- "Options"
- )
- );
- App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(links), "scLink2");
-
- links = [];
- links.push(
- App.UI.DOM.link(
- "Give menial slaves",
- () => {
- V.menials = Math.clamp(V.menials + 30, 0, popCap.value);
- },
- [],
- "Options"
- )
- );
-
- links.push(
- App.UI.DOM.link(
- "Remove menial slaves",
- () => {
- V.menials = Math.clamp(V.menials - 30, 0, popCap.value);
- },
- [],
- "Options"
- )
- );
- App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(links), "scLink2");
-
- links = [];
-
- // Will no longer work as intended due to population changes
- links.push(
- App.UI.DOM.link(
- "Add citizens",
- () => {
- V.lowerClass = Math.max(V.lowerClass + 200, 0);
- },
- [],
- "Options"
- )
- );
-
- // also no longer properly functional
- links.push(
- App.UI.DOM.link(
- "Remove citizens",
- () => {
- V.lowerClass = Math.max(V.lowerClass - 200, 0);
- },
- [],
- "Options"
- )
- );
- App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(links), "scLink2");
-
- links = [];
- // Will work to a limited degree, minimums and maximums for slaves are set through population
- links.push(
- App.UI.DOM.link(
- "Add slaves",
- () => {
- V.NPCSlaves = Math.max(V.NPCSlaves + 200, 0);
- },
- [],
- "Options"
- )
- );
-
- // Will work to a limited degree
- links.push(
- App.UI.DOM.link(
- "Remove slaves",
- () => {
- V.NPCSlaves = Math.max(V.NPCSlaves - 200, 0);
- },
- [],
- "Options"
- )
- );
- App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(links), "scLink2");
- }
- return (el);
- }
-
- function experimental() {
- const el = new DocumentFragment();
- let options;
- let r;
-
- r = [];
- r.push(`Experimental means just that: experimental. Options below are likely to be in an`);
- r.push(App.UI.DOM.makeElement("span", `even more incomplete or broken state than usual.`, "yellow"));
- r.push(App.UI.DOM.makeElement("span", `THEY MAY NOT WORK AT ALL.`, "red"));
- r.push(`Make sure you back up your save before enabling any of these, and if you are that interested, consider helping to improve them.`);
- App.Events.addNode(el, r, "div", "bold");
-
- options = new App.UI.OptionsGroup();
-
- if (V.seePreg !== 0) {
- options.addOption("Nursery is", "nursery", V.experimental)
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("This will enable the experimental nursery, which allows players to interact with growing slave children. An alternative to the incubator.");
- }
-
- options.addOption("Food is", "food", V.experimental)
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("This will enable the experimental food supply and demand system, as well as a new farmyard building and assignments.");
-
- if (V.seeExtreme === 1 && V.seeBestiality === 1) {
- options.addOption("Animal Ovaries are", "animalOvaries", V.experimental)
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("This will allow slaves to be impregnated by animals.");
- }
-
- if (V.seeExtreme === 1) {
- options.addOption("Dinner party", "dinnerParty", V.experimental)
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("This will enable a controversial but very broken event. Warning: Snuff, cannibalism.");
- }
-
- options.addOption("New event", "tempEventToggle")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- el.append(options.render());
- return el;
- }
-};
-
-App.UI.artOptions = function() {
- const el = new DocumentFragment();
- let options = new App.UI.OptionsGroup();
-
- if (V.seeImages > 0) {
- App.Events.drawEventArt(el, BaseSlave());
- }
-
- options.addOption("Images are", "seeImages")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- if (V.seeImages > 0) {
- options.addOption("Image style is", "imageChoice")
- .addValueList([["Revamped embedded vector art", 3], ["Non-embedded vector art", 2], ["NoX/Deepmurk's vector art", 1], ["Shokushu's rendered imagepack", 0]]);
-
- if (V.imageChoice === 1) {
- options.addComment('<span class="warning">Git compiled only, no exceptions.</span>');
-
- options.addOption("Face artwork is", "seeFaces")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Highlights on shiny clothing are", "seeVectorArtHighlights")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Height scaling", "seeHeight")
- .addValue("All images", 2).on().addValue("Small images", 1).neutral().addValue("Disabled", 0).off();
-
- options.addOption("Clothing erection bulges are", "showClothingErection")
- .addValue("Enabled", true).on().addValue("Disabled", false).off();
- } else if (V.imageChoice === 0) {
- options.addComment(`You need """to"""
- <a href="https://mega.nz/#!upoAlBaZ!EbZ5wCixxZxBhMN_ireJTXt0SIPOywO2JW9XzTIPhe0">download the image pack</a>
- """and""" put the 'renders' folder into the resources/ folder where this html file is.`
- );
-
- options.addOption("Slave summary fetish images are", "seeMainFetishes")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
- } else if (V.imageChoice === 3) {
- options.addComment('<span class="warning">Git compiled only, no exceptions.</span>');
-
- options.addOption("Clothing erection bulges are", "showClothingErection")
- .addValue("Enabled", true).on().addValue("Disabled", false).off();
- }
-
- options.addOption("PA avatar art is", "seeAvatar")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Slave images in lists are", "seeSummaryImages")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
-
- options.addOption("Slave images in the weekly report are", "seeReportImages")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off();
- }
- el.append(options.render());
- return el;
-};
diff --git a/src/gui/options/summaryOptions.tw b/src/gui/options/summaryOptions.tw
deleted file mode 100644
index a5fcb72e82afd398b58281ee7dc2ec44b94d0462..0000000000000000000000000000000000000000
--- a/src/gui/options/summaryOptions.tw
+++ /dev/null
@@ -1,14 +0,0 @@
-:: Summary Options [nobr jump-to-safe jump-from-safe]
-
-<<set $nextButton = "Back">>
-<<if $storedLink !== "Slave Interact" && $storedLink !== "Main">>
- <<if lastVisited("Main") === 1>>
- <<set $storedLink = "Main">>
- <<else>>
- <<set $storedLink = "Options">>
- <</if>>
-<</if>>
-<<set $nextLink = $storedLink>>
-<<set $passageSwitchHandler = App.EventHandlers.optionsChanged>>
-
-<<includeDOM App.UI.summaryOptions()>>
\ No newline at end of file
diff --git a/src/interaction/siDescription.js b/src/interaction/siDescription.js
index daeceffb745707c99d9a8ba818a6e2c1175b9f6d..86fddfb5659cd962e0907b9fb29e99188beb0898 100644
--- a/src/interaction/siDescription.js
+++ b/src/interaction/siDescription.js
@@ -34,7 +34,7 @@ App.UI.SlaveInteract.description = function(slave) {
"Description Options",
() => {
jQuery("#description-link").empty().append(hideOptions());
- jQuery("#description-options").empty().append(App.UI.DOM.renderPassage("Description Options"));
+ jQuery("#description-options").empty().append(App.UI.descriptionOptions());
}
);
}
diff --git a/src/interaction/siWardrobe.js b/src/interaction/siWardrobe.js
index 805960ad548f48fe4506a1b74bc8dd37a5336de8..8f604fb5e4c150cccac060fb245fd5072973a0d9 100644
--- a/src/interaction/siWardrobe.js
+++ b/src/interaction/siWardrobe.js
@@ -1,177 +1,218 @@
App.UI.SlaveInteract.wardrobe = function(slave) {
const {
// eslint-disable-next-line no-unused-vars
- he,
him,
his,
} = getPronouns(slave);
- const el = new DocumentFragment();
- el.append(clothes());
- if (slave.fuckdoll === 0) {
- el.append(collar());
- el.append(mask());
- el.append(mouth());
- el.append(armAccessory());
- el.append(shoes());
- el.append(legAccessory());
- el.append(bellyAccessory());
- el.append(buttplug());
- el.append(buttplugAttachment());
- el.append(vaginalAccessory());
- el.append(vaginalAttachment());
- el.append(dickAccessory());
- el.append(chastity());
- }
+ let filters = {};
+ const el = document.createElement("span");
+ el.id = "content";
+ el.append(contents())
+ return el;
- App.UI.DOM.appendNewElement("h3", el, `Shopping`);
- el.append(shopping());
- return el;
+ function contents() {
+ const frag = new DocumentFragment();
+ if (slave.fuckdoll === 0) {
+ frag.append(filtersDOM());
+ frag.append(clothes());
+ frag.append(mask());
+ frag.append(mouth());
+ frag.append(armAccessory());
+ frag.append(shoes());
+ frag.append(legAccessory());
+ frag.append(bellyAccessory());
+ frag.append(buttplug());
+ frag.append(buttplugAttachment());
+ frag.append(vaginalAccessory());
+ frag.append(vaginalAttachment());
+ frag.append(dickAccessory());
+ frag.append(chastity());
+ } else {
+ frag.append(clothes());
+ }
+
+ App.UI.DOM.appendNewElement("h3", frag, `Shopping`);
+ frag.append(shopping());
+
+ return frag;
+ }
+
+ function filtersDOM() {
+ const el = document.createElement("div");
+ el.classList.add("filter-row");
+ el.append("Filters: ");
+
+ const niceFilters = new Map([
+ [false, "Nice"],
+ [true, "Harsh"],
+ ]);
+ let span = document.createElement("span");
+ span.classList.add("button-group");
+ for (const [bool, string] of niceFilters) {
+ const button = App.UI.DOM.makeElement("button", string);
+ if (filters.harsh === bool) {
+ button.classList.add("selected", "disabled");
+ } else {
+ button.onclick = () => {
+ filters.harsh = bool;
+ refresh();
+ };
+ }
+ span.append(button);
+ }
+ el.append(span);
+
+ const exposureFilters = new Map([
+ [0, "Modest"],
+ [1, "Normal"],
+ [2, "Slutty"],
+ [3, "Humiliating"],
+ [4, "Practically nude"],
+ ]);
+ span = document.createElement("span");
+ span.classList.add("button-group");
+ for (const [num, string] of exposureFilters) {
+ const button = App.UI.DOM.makeElement("button", string);
+ if (filters.exposure === num) {
+ button.classList.add("selected", "disabled");
+ } else {
+ button.onclick = () => {
+ filters.exposure = num;
+ refresh();
+ };
+ }
+ span.append(button);
+ }
+ el.append(span);
+
+ // clear filters
+ const resetButton = App.UI.DOM.makeElement("button", "Reset Filters");
+ resetButton.onclick = () => {
+ filters = {};
+ refresh();
+ };
+ App.UI.DOM.appendNewElement("span", el, resetButton, "button-group");
+ return el;
+ }
function clothes() {
- let el = document.createElement('div');
+ const el = document.createElement('div');
let links;
if (slave.fuckdoll === 0) {
+ // First Row
let label = document.createElement('div');
label.append(`Clothes: `);
- let choice = App.UI.DOM.disabledLink(`${slave.clothes}`, [clothTooltip(`${slave.clothes}`)]);
+ let choice = App.UI.DOM.disabledLink(`${slave.clothes} `, [clothTooltip(`${slave.clothes}`)]);
choice.style.fontWeight = "bold";
label.appendChild(choice);
+ if (slave.fuckdoll !== 0 || slave.clothes === "restrictive latex" || slave.clothes === "a latex catsuit" || slave.clothes === "a cybersuit" || slave.clothes === "a comfortable bodysuit") {
+ if (V.seeImages === 1 && V.imageChoice === 1) {
+ // Color options
+ label.appendChild(colorOptions("clothingBaseColor"));
+ }
+ }
+
// Choose her own
if (slave.clothes !== `choosing her own clothes`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: ` Let ${him} choose`, updateSlave: {clothes: `choosing her own clothes`, choosesOwnClothes: 1}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "clothes", false, refresh));
+ label.appendChild(generateRows(choiceOptionsArray, "clothes", false));
}
el.appendChild(label);
-
-
- let niceOptionsArray = [];
- let harshOptionsArray = [];
-
- let clothingOption;
- // Nice clothes
- App.Data.slaveWear.niceClothes.forEach(item => {
- clothingOption = {
- text: item.name,
- updateSlave: {clothes: item.value, choosesOwnClothes: 0},
- FS: item.fs
- };
- niceOptionsArray.push(clothingOption);
- });
- // Harsh clothes
- App.Data.slaveWear.harshClothes.forEach(item => {
- clothingOption = {
- text: item.name,
- updateSlave: {clothes: item.value, choosesOwnClothes: 0},
- FS: item.fs
- };
- if (item.value !== "choosing her own clothes") {
- harshOptionsArray.push(clothingOption);
- }
- });
-
- // Sort
- niceOptionsArray = niceOptionsArray.sort((a, b) => (a.text > b.text) ? 1 : -1);
- harshOptionsArray = harshOptionsArray.sort((a, b) => (a.text > b.text) ? 1 : -1);
-
- // Nice options
- links = document.createElement('div');
- links.className = "choices";
- links.append(`Nice: `);
- links.appendChild(App.UI.SlaveInteract.generateRows(niceOptionsArray, slave, "clothes", true, refresh));
- el.appendChild(links);
-
- // Harsh options
- links = document.createElement('div');
- links.className = "choices";
- links.append(`Harsh: `);
- links.appendChild(App.UI.SlaveInteract.generateRows(harshOptionsArray, slave, "clothes", true, refresh));
- el.appendChild(links);
+ links = App.UI.DOM.appendNewElement("div", el, clothingSelection());
+ links.id = "clothing-selection";
}
- if (slave.fuckdoll !== 0 || slave.clothes === "restrictive latex" || slave.clothes === "a latex catsuit" || slave.clothes === "a cybersuit" || slave.clothes === "a comfortable bodysuit") {
- if (V.seeImages === 1 && V.imageChoice === 1) {
- // Color options
- links = document.createElement('div');
- links.className = "choices";
- links.append(`Color: `);
- links.appendChild(colorOptions("clothingBaseColor"));
- el.appendChild(links);
- }
- }
-
- return el;
- }
-
- function collar() {
- let el = document.createElement('div');
- let label = document.createElement('div');
+ const label = document.createElement('div');
label.append(`Collar: `);
-
let choice = App.UI.DOM.disabledLink(`${slave.collar}`, [clothTooltip(`${slave.collar}`)]);
choice.style.fontWeight = "bold";
label.appendChild(choice);
-
// Choose her own
if (slave.collar !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: ` None`, updateSlave: {collar: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "collar", false, refresh));
+ label.appendChild(generateRows(choiceOptionsArray, "collar", false));
}
-
el.appendChild(label);
- let niceOptionsArray = [];
- let harshOptionsArray = [];
+ links = App.UI.DOM.appendNewElement("div", el, collar());
+ links.id = "collar-selection";
- let clothingOption;
- // Nice collar
- App.Data.slaveWear.niceCollars.forEach(item => {
- clothingOption = {
- text: item.name,
- updateSlave: {collar: item.value},
- FS: item.fs
- };
- niceOptionsArray.push(clothingOption);
- });
- // Harsh collar
- App.Data.slaveWear.harshCollars.forEach(item => {
- clothingOption = {
- text: item.name,
- updateSlave: {collar: item.value},
- FS: item.fs
- };
- harshOptionsArray.push(clothingOption);
- });
+ return el;
- // Sort
- niceOptionsArray = niceOptionsArray.sort((a, b) => (a.text > b.text) ? 1 : -1);
- harshOptionsArray = harshOptionsArray.sort((a, b) => (a.text > b.text) ? 1 : -1);
+ function clothingSelection() {
+ const el = new DocumentFragment();
+ let array = [];
- // Nice options
- let links = document.createElement('div');
- links.className = "choices";
- links.append(`Nice: `);
- links.appendChild(App.UI.SlaveInteract.generateRows(niceOptionsArray, slave, "collar", true, refresh));
- el.appendChild(links);
+ for (const [key, object] of App.Data.clothes) {
+ if (key === "choosing her own clothes") {
+ continue;
+ }
+ if (filters.hasOwnProperty("exposure") && filters.exposure !== object.exposure) {
+ continue;
+ }
+ if (filters.hasOwnProperty("harsh") && ((filters.harsh === false && object.harsh) || (filters.harsh === true && !object.harsh))) {
+ continue;
+ }
+ const reshapedItem = {
+ text: object.name,
+ updateSlave: {clothes: key, choosesOwnClothes: 0},
+ FS: object.fs,
+ exposure: object.exposure,
+ };
+ array.push(reshapedItem);
+ }
- // Harsh options
- links = document.createElement('div');
- links.className = "choices";
- links.append(`Harsh: `);
- links.appendChild(App.UI.SlaveInteract.generateRows(harshOptionsArray, slave, "collar", true, refresh));
- el.appendChild(links);
+ // Sort
+ array = array.sort((a, b) => (a.text > b.text) ? 1 : -1);
+ const list = generateRows(array, "clothes", true);
+ if ($(list)[0].children.length > 0) {
+ App.UI.DOM.appendNewElement("div", el, list, "choices");
+ } else {
+ App.UI.DOM.appendNewElement("div", el, "No available clothing meets your criteria", ["note", "choices"]);
+ }
+ return el;
+ }
- return el;
+ function collar() {
+ const el = new DocumentFragment();
+ let array = [];
+
+ for (const [key, object] of App.Data.slaveWear.collars) {
+ if (key === "choosing her own clothes") {
+ continue;
+ }
+ if (filters.hasOwnProperty("harsh") && ((filters.harsh === false && object.harsh) || (filters.harsh === true && !object.harsh))) {
+ continue;
+ }
+ const reshapedItem = {
+ text: object.name,
+ updateSlave: {collar: key},
+ FS: object.fs,
+ };
+ array.push(reshapedItem);
+ }
+
+ // Sort
+ array = array.sort((a, b) => (a.text > b.text) ? 1 : -1);
+ const list = generateRows(array, "collar", true);
+ if ($(list)[0].children.length > 0) {
+ App.UI.DOM.appendNewElement("div", el, list, "choices");
+ } else {
+ App.UI.DOM.appendNewElement("div", el, "No available collar meets your criteria", ["note", "choices"]);
+ }
+ return el;
+ }
}
function mask() {
- let el = document.createElement('div');
+ const el = document.createElement('div');
- let label = document.createElement('div');
+ const label = document.createElement('div');
label.append(`Mask: `);
let choice = App.UI.DOM.disabledLink(`${slave.faceAccessory} `, [clothTooltip(`${slave.faceAccessory}`)]);
@@ -182,29 +223,28 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
if (slave.faceAccessory !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: ` None`, updateSlave: {faceAccessory: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "faceAccessory", false, refresh));
+ label.appendChild(generateRows(choiceOptionsArray, "faceAccessory", false));
}
el.appendChild(label);
let array = [];
- let clothingOption;
- App.Data.slaveWear.faceAccessory.forEach(item => {
- clothingOption = {
- text: item.name,
- updateSlave: {faceAccessory: item.value},
- FS: item.fs
+ for (const [key, object] of App.Data.slaveWear.faceAccessory) {
+ const reshapedItem = {
+ text: object.name,
+ updateSlave: {faceAccessory: key},
+ FS: object.fs,
};
- array.push(clothingOption);
- });
+ array.push(reshapedItem);
+ }
// Sort
array = array.sort((a, b) => (a.text > b.text) ? 1 : -1);
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(array, slave, "faceAccessory", true, refresh));
+ links.appendChild(generateRows(array, "faceAccessory", true));
el.appendChild(links);
if (slave.eyewear === "corrective glasses" || slave.eyewear === "glasses" || slave.eyewear === "blurring glasses" || slave.faceAccessory === "porcelain mask") {
@@ -224,9 +264,9 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
function mouth() {
- let el = document.createElement('div');
+ const el = document.createElement('div');
- let label = document.createElement('div');
+ const label = document.createElement('div');
label.append(`Gag: `);
let choice = App.UI.DOM.disabledLink(`${slave.mouthAccessory}`, [clothTooltip(`${slave.mouthAccessory}`)]);
@@ -237,40 +277,38 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
if (slave.mouthAccessory !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: ` None`, updateSlave: {mouthAccessory: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "mouthAccessory", false, refresh));
+ label.appendChild(generateRows(choiceOptionsArray, "mouthAccessory", false));
}
el.appendChild(label);
let array = [];
- let clothingOption;
- // mouthAccessory
- App.Data.slaveWear.mouthAccessory.forEach(item => {
- clothingOption = {
- text: item.name,
- updateSlave: {mouthAccessory: item.value},
- FS: item.fs
+ for (const [key, object] of App.Data.slaveWear.mouthAccessory) {
+ const reshapedItem = {
+ text: object.name,
+ updateSlave: {mouthAccessory: key},
+ FS: object.fs,
};
- array.push(clothingOption);
- });
+ array.push(reshapedItem);
+ }
// Sort
array = array.sort((a, b) => (a.text > b.text) ? 1 : -1);
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(array, slave, "mouthAccessory", true, refresh));
+ links.appendChild(generateRows(array, "mouthAccessory", true));
el.appendChild(links);
return el;
}
function armAccessory() {
- let el = document.createElement('div');
+ const el = document.createElement('div');
// App.Desc.armwear(slave)
- let label = document.createElement('div');
+ const label = document.createElement('div');
label.append(`Arm accessory: `);
let choice = App.UI.DOM.disabledLink(`${slave.armAccessory}`, [clothTooltip(`${slave.armAccessory}`)]);
@@ -282,7 +320,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
// Choose her own
if (slave.armAccessory !== "none") {
array.push({text: ` None`, updateSlave: {armAccessory: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(array, slave, "armAccessory", false, refresh));
+ label.appendChild(generateRows(array, "armAccessory", false));
}
el.appendChild(label);
@@ -293,16 +331,16 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
{text: "Hand gloves", updateSlave: {armAccessory: "hand gloves"}},
{text: "Elbow gloves", updateSlave: {armAccessory: "elbow gloves"}}
];
- links.appendChild(App.UI.SlaveInteract.generateRows(array, slave, "armAccessory", false, refresh));
+ links.appendChild(generateRows(array, "armAccessory", false));
el.appendChild(links);
return el;
}
function shoes() {
- let el = document.createElement('div');
+ const el = document.createElement('div');
- let label = document.createElement('div');
+ const label = document.createElement('div');
label.append(`Shoes: `);
let choice = App.UI.DOM.disabledLink(`${slave.shoes}`, [clothTooltip(`${slave.shoes}`)]);
@@ -314,22 +352,21 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
if (slave.shoes !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: `None`, updateSlave: {shoes: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "shoes", false, refresh));
+ label.appendChild(generateRows(choiceOptionsArray, "shoes", false));
}
*/
el.appendChild(label);
let optionsArray = [];
- let clothingOption;
- App.Data.slaveWear.shoes.forEach(item => {
- clothingOption = {
- text: item.name,
- updateSlave: {shoes: item.value},
- FS: item.fs
+ for (const [key, object] of App.Data.slaveWear.shoes) {
+ const reshapedItem = {
+ text: object.name,
+ updateSlave: {shoes: key},
+ FS: object.fs,
};
- optionsArray.push(clothingOption);
- });
+ optionsArray.push(reshapedItem);
+ }
// Sort
// No sort here since we want light -> advanced. optionsArray = optionsArray.sort((a, b) => (a.text > b.text) ? 1 : -1);
@@ -337,7 +374,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "shoes", true, refresh));
+ links.appendChild(generateRows(optionsArray, "shoes", true));
el.appendChild(links);
if (V.seeImages === 1 && V.imageChoice === 1 && slave.shoes !== "none") {
@@ -353,12 +390,12 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
function legAccessory() {
- let el = document.createElement('div');
+ const el = document.createElement('div');
- let label = document.createElement('div');
+ const label = document.createElement('div');
label.append(`Leg accessory: `);
- let choice = App.UI.DOM.disabledLink(`${slave.legAccessory}`, [clothTooltip(`${slave.legAccessory}`)]);
+ const choice = App.UI.DOM.disabledLink(`${slave.legAccessory}`, [clothTooltip(`${slave.legAccessory}`)]);
choice.style.fontWeight = "bold";
label.appendChild(choice);
@@ -367,7 +404,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
// Choose her own
if (slave.legAccessory !== "none") {
array.push({text: ` None`, updateSlave: {legAccessory: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(array, slave, "legAccessory", false, refresh));
+ label.appendChild(generateRows(array, "legAccessory", false));
}
el.appendChild(label);
@@ -378,7 +415,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
{text: "Short stockings", updateSlave: {legAccessory: "short stockings"}},
{text: "Long stockings", updateSlave: {legAccessory: "long stockings"}}
];
- links.appendChild(App.UI.SlaveInteract.generateRows(array, slave, "legAccessory", false, refresh));
+ links.appendChild(generateRows(array, "legAccessory", false));
el.appendChild(links);
return el;
@@ -390,18 +427,19 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
let optionsArray = [];
- let clothingOption;
- App.Data.slaveWear.bellyAccessories.forEach(item => {
- clothingOption = {
- text: item.name,
- updateSlave: {bellyAccessory: item.value},
- FS: item.fs
- };
- if (item.value !== "none") {
+ for (const [key, object] of App.Data.slaveWear.bellyAccessories) {
+ if (key === "none") {
// skip none in set, we set the link elsewhere.
- optionsArray.push(clothingOption);
+ continue;
}
- });
+ const reshapedItem = {
+ text: object.name,
+ updateSlave: {bellyAccessory: key},
+ FS: object.fs,
+ };
+ optionsArray.push(reshapedItem);
+ }
+
// Sort
// No sort here since we want small -> large.optionsArray = optionsArray.sort((a, b) => (a.text > b.text) ? 1 : -1);
@@ -416,7 +454,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
// Choose her own
if (slave.bellyAccessory !== `none`) {
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "bellyAccessory", false, refresh));
+ label.appendChild(generateRows(choiceOptionsArray, "bellyAccessory", false));
}
el.appendChild(label);
@@ -424,7 +462,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "bellyAccessory", true, refresh));
+ links.appendChild(generateRows(optionsArray, "bellyAccessory", true));
if (slave.pregKnown === 1) {
let note = document.createElement('span');
note.className = "note";
@@ -438,9 +476,9 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
function buttplug() {
// App.Desc.buttplug(slave)
- let el = document.createElement('div');
+ const el = document.createElement('div');
- let label = document.createElement('div');
+ const label = document.createElement('div');
label.append(`Anal accessory: `);
let choice = App.UI.DOM.disabledLink(`${slave.buttplug}`, [clothTooltip(`${slave.buttplug}`)]);
@@ -450,24 +488,24 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
if (slave.buttplug !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: ` None`, updateSlave: {buttplug: `none`, buttplugAttachment: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "buttplug", false, refresh));
+ label.appendChild(generateRows(choiceOptionsArray, "buttplug", false));
}
el.appendChild(label);
let optionsArray = [];
- let clothingOption;
- App.Data.slaveWear.buttplugs.forEach(item => {
- clothingOption = {
- text: item.name,
- updateSlave: {buttplug: item.value},
- FS: item.fs
- };
- if (item.value !== "none") {
+ for (const [key, object] of App.Data.slaveWear.buttplugs) {
+ if (key === "none") {
// skip none in set, we set the link elsewhere.
- optionsArray.push(clothingOption);
+ continue;
}
- });
+ const reshapedItem = {
+ text: object.name,
+ updateSlave: {buttplug: key},
+ FS: object.fs,
+ };
+ optionsArray.push(reshapedItem);
+ }
// Sort
// No sort here since we want small -> large. optionsArray = optionsArray.sort((a, b) => (a.text > b.text) ? 1 : -1);
@@ -475,46 +513,46 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "buttplug", true, refresh));
+ links.appendChild(generateRows(optionsArray, "buttplug", true));
el.appendChild(links);
return el;
}
function buttplugAttachment() {
- let el = document.createElement('div');
+ const el = document.createElement('div');
if (slave.buttplug === "none") {
return el;
}
- let label = document.createElement('div');
+ const label = document.createElement('div');
label.append(`Anal accessory attachment: `);
- let choice = App.UI.DOM.disabledLink(`${slave.buttplugAttachment}`, [clothTooltip(`${slave.buttplugAttachment}`)]);
+ const choice = App.UI.DOM.disabledLink(`${slave.buttplugAttachment}`, [clothTooltip(`${slave.buttplugAttachment}`)]);
choice.style.fontWeight = "bold";
label.appendChild(choice);
if (slave.buttplugAttachment !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: ` None`, updateSlave: {buttplugAttachment: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "buttplugAttachment", false, refresh));
+ label.appendChild(generateRows(choiceOptionsArray, "buttplugAttachment", false));
}
el.appendChild(label);
let optionsArray = [];
- let clothingOption;
- App.Data.slaveWear.buttplugAttachments.forEach(item => {
- clothingOption = {
- text: item.name,
- updateSlave: {buttplugAttachment: item.value},
- FS: item.fs
- };
- if (item.value !== "none") {
+ for (const [key, object] of App.Data.slaveWear.buttplugAttachments) {
+ if (key === "none") {
// skip none in set, we set the link elsewhere.
- optionsArray.push(clothingOption);
+ continue;
}
- });
+ const reshapedItem = {
+ text: object.name,
+ updateSlave: {buttplugAttachment: key},
+ FS: object.fs,
+ };
+ optionsArray.push(reshapedItem);
+ }
// Sort
optionsArray = optionsArray.sort((a, b) => (a.text > b.text) ? 1 : -1);
@@ -522,7 +560,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "buttplugAttachment", true, refresh));
+ links.appendChild(generateRows(optionsArray, "buttplugAttachment", true));
el.appendChild(links);
return el;
@@ -531,9 +569,9 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
function vaginalAccessory() {
// <<vaginalAccessoryDescription>>
- let el = document.createElement('div');
+ const el = document.createElement('div');
- let label = document.createElement('div');
+ const label = document.createElement('div');
label.append(`Vaginal accessory: `);
let choice = App.UI.DOM.disabledLink(`${slave.vaginalAccessory}`, [clothTooltip(`${slave.vaginalAccessory}`)]);
@@ -543,24 +581,24 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
if (slave.vaginalAccessory !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: ` None`, updateSlave: {vaginalAccessory: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "vaginalAccessory", false, refresh));
+ label.appendChild(generateRows(choiceOptionsArray, "vaginalAccessory", false));
}
el.appendChild(label);
let optionsArray = [];
- let clothingOption;
- App.Data.slaveWear.vaginalAccessories.forEach(item => {
- clothingOption = {
- text: item.name,
- updateSlave: {vaginalAccessory: item.value},
- FS: item.fs
- };
- if (item.value !== "none") {
+ for (const [key, object] of App.Data.slaveWear.vaginalAccessories) {
+ if (key === "none") {
// skip none in set, we set the link elsewhere.
- optionsArray.push(clothingOption);
+ continue;
}
- });
+ const reshapedItem = {
+ text: object.name,
+ updateSlave: {vaginalAccessory: key},
+ FS: object.fs,
+ };
+ optionsArray.push(reshapedItem);
+ }
// Sort
// No sort here since we want small -> large. optionsArray = optionsArray.sort((a, b) => (a.text > b.text) ? 1 : -1);
@@ -568,7 +606,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "vaginalAccessory", true, refresh));
+ links.appendChild(generateRows(optionsArray, "vaginalAccessory", true));
el.appendChild(links);
return el;
@@ -590,24 +628,24 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
if (slave.vaginalAttachment !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: ` None`, updateSlave: {vaginalAttachment: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "vaginalAttachment", false, refresh));
+ label.appendChild(generateRows(choiceOptionsArray, "vaginalAttachment", false));
}
el.appendChild(label);
let optionsArray = [];
- let clothingOption;
- App.Data.slaveWear.vaginalAttachments.forEach(item => {
- clothingOption = {
- text: item.name,
- updateSlave: {vaginalAttachment: item.value},
- FS: item.fs
- };
- if (item.value !== "none") {
+ for (const [key, object] of App.Data.slaveWear.vaginalAttachments) {
+ if (key === "none") {
// skip none in set, we set the link elsewhere.
- optionsArray.push(clothingOption);
+ continue;
}
- });
+ const reshapedItem = {
+ text: object.name,
+ updateSlave: {vaginalAttachments: key},
+ FS: object.fs,
+ };
+ optionsArray.push(reshapedItem);
+ }
// Sort
optionsArray = optionsArray.sort((a, b) => (a.text > b.text) ? 1 : -1);
@@ -615,43 +653,43 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "vaginalAttachment", true, refresh));
+ links.appendChild(generateRows(optionsArray, "vaginalAttachment", true));
el.appendChild(links);
return el;
}
function dickAccessory() {
- let el = document.createElement('div');
+ const el = document.createElement('div');
- let label = document.createElement('div');
+ const label = document.createElement('div');
label.append(`Dick accessory: `);
- let choice = App.UI.DOM.disabledLink(`${slave.dickAccessory}`, [clothTooltip(`${slave.dickAccessory}`)]);
+ const choice = App.UI.DOM.disabledLink(`${slave.dickAccessory}`, [clothTooltip(`${slave.dickAccessory}`)]);
choice.style.fontWeight = "bold";
label.appendChild(choice);
if (slave.dickAccessory !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: ` None`, updateSlave: {dickAccessory: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "dickAccessory", false, refresh));
+ label.appendChild(generateRows(choiceOptionsArray, "dickAccessory", false));
}
el.appendChild(label);
let optionsArray = [];
- let clothingOption;
- App.Data.slaveWear.dickAccessories.forEach(item => {
- clothingOption = {
- text: item.name,
- updateSlave: {dickAccessory: item.value},
- FS: item.fs
- };
- if (item.value !== "none") {
+ for (const [key, object] of App.Data.slaveWear.dickAccessories) {
+ if (key === "none") {
// skip none in set, we set the link elsewhere.
- optionsArray.push(clothingOption);
+ continue;
}
- });
+ const reshapedItem = {
+ text: object.name,
+ updateSlave: {dickAccessory: key},
+ FS: object.fs,
+ };
+ optionsArray.push(reshapedItem);
+ }
// Sort
// No sort here since we want small -> large. optionsArray = optionsArray.sort((a, b) => (a.text > b.text) ? 1 : -1);
@@ -659,16 +697,16 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "dickAccessory", true, refresh));
+ links.appendChild(generateRows(optionsArray, "dickAccessory", true));
el.appendChild(links);
return el;
}
function chastity() {
- let el = document.createElement('div');
+ const el = document.createElement('div');
- let label = document.createElement('div');
+ const label = document.createElement('div');
label.append(`Chastity devices: `);
let chasCho = "";
@@ -709,25 +747,26 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
chastityVagina: 0
}
});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "chastity", false, refresh));
+ label.appendChild(generateRows(choiceOptionsArray, "chastity", false));
}
el.appendChild(label);
let optionsArray = [];
- let clothingOption;
- App.Data.slaveWear.chastityDevices.forEach(item => {
- clothingOption = {
- text: item.name,
- updateSlave: {},
- FS: item.fs
- };
- Object.assign(clothingOption.updateSlave, item.updateSlave);
- if (item.value !== "none") {
+ for (const [key, object] of App.Data.slaveWear.chastityDevices) {
+ if (key === "none") {
// skip none in set, we set the link elsewhere.
- optionsArray.push(clothingOption);
+ continue;
}
- });
+ const reshapedItem = {
+ text: object.name,
+ updateSlave: {},
+ FS: object.fs,
+ };
+ Object.assign(reshapedItem.updateSlave, object.updateSlave);
+ optionsArray.push(reshapedItem);
+ }
+
// Sort
// skip sort for this one too. optionsArray = optionsArray.sort((a, b) => (a.text > b.text) ? 1 : -1);
@@ -735,7 +774,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "chastity", true, refresh));
+ links.appendChild(generateRows(optionsArray, "chastity", true));
el.appendChild(links);
return el;
@@ -753,8 +792,8 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
* @returns {Node}
*/
function colorOptions(update) {
- let el = new DocumentFragment();
- let colorChoice = App.UI.DOM.colorInput(
+ const el = new DocumentFragment();
+ const colorChoice = App.UI.DOM.colorInput(
slave[update],
v => {
slave[update] = v;
@@ -779,46 +818,51 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
function refresh() {
App.Art.refreshSlaveArt(slave, 3, "art-frame");
- jQuery("#content-appearance").empty().append(App.UI.SlaveInteract.wardrobe(slave));
+ jQuery("#content").empty().append(contents());
}
/**
* Figure out a tooltip text to use based on clothing name.
* Described effects are mainly from saClothes.js some are from saLongTermMentalEffects.js or saLongTermPhysicalEffects.js
- * Potential fetish relevations are not mentioned.
+ * Potential fetish revelations are not mentioned.
* Chastity options could mention that at least fucktoys can appreciate maintaining their virginity but I assume just choosing a hole to focus on has the same effect so it's not really a clothing effect.
* what's the word for below 20 devotion slaves? Disobedient?
* Also accepting is a bit weird for ones above, I think I've seen obedient being used instead.
*/
function clothTooltip(cloth) {
let Cloth = capFirstChar(cloth);
+ let desc;
switch (cloth) {
/* nice clothes without specific effects(besides FS or being slutty/humiliating/modest) are handled at the end */
case "choosing her own clothes":
case "choosing his own clothes":
- return Cloth + ", increases or greatly reduces devotion based on whether the slave is obedient(devotion at accepting or higher).";
+ desc = "Increases or greatly reduces devotion based on whether the slave is obedient(devotion at accepting or higher).";
+ break;
case "no clothing":
- return Cloth + " increases devotion for resistant humiliations fetishists and nymphos.";
+ desc = "Increases devotion for resistant humiliations fetishists and nymphos.";
+ break;
case "a penitent nuns habit":
- return Cloth + " increases devotion and fear but damages health, may cause masochism.";
+ desc = "Increases devotion and fear but damages health, may cause masochism.";
+ break;
case "restrictive latex":
- return Cloth + ", it's modest and humiliating, increases fear and devotion for resistant slaves and just devotion for obedient, non-terrified submissives.";
+ desc = "Increases fear and devotion for resistant slaves and just devotion for obedient, non-terrified submissives.";
+ break;
case "shibari ropes":
- return Cloth + ", it's humiliating, increases fear and devotion for resistant slaves and just devotion for obedient, non-terrified submissives.";
+ desc = "Increases fear and devotion for resistant slaves and just devotion for obedient, non-terrified submissives.";
+ break;
case "uncomfortable straps":
- return Cloth + ", it's humiliating, increase devotion and fear for slaves who are disobedient and not terrified. Masochists who are at least ambivalent gain devotion, may also cause masochism.";
+ desc = "Increases devotion and fear for slaves who are disobedient and not terrified. Masochists who are at least ambivalent gain devotion, may also cause masochism.";
+ break;
case "chains":
- return Cloth + " increase devotion and fear for slaves who are disobedient and not terrified. Masochists who are at least ambivalent gain devotion, may also cause masochism.";
-
+ desc = "Increases devotion and fear for slaves who are disobedient and not terrified. Masochists who are at least ambivalent gain devotion, may also cause masochism.";
+ break;
case "an apron":
- return Cloth + ", nice clothing that increases just devotion for submissives, humiliation fetishists and visibly pregnant pregnancy fetishists regardless of devotion level.";
+ desc = "Increases just devotion for submissives, humiliation fetishists and visibly pregnant pregnancy fetishists regardless of devotion level.";
+ break;
case "a monokini":
- return Cloth + ", nice clothing that boob fetishists enjoy.";
-
- case "none":
- return "No effect one way or another.";
-
+ desc = "Boob fetishists enjoy.";
+ break;
case "heavy gold":
case "ancient Egyptian":
case "bowtie":
@@ -828,148 +872,251 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
case "satin choker":
case "silk ribbon":
case "stylish leather":
- return Cloth + " on obedient slaves reduces fear, on non-obedient ones reduces fear a lot and devotion somewhat.";
+ desc = "On obedient slaves reduces fear, on non-obedient ones reduces fear a lot and devotion somewhat.";
+ break;
case "preg biometrics":
- return Cloth + " increases devotion for those who have pregnancy fetish while fertile or a humiliation fetish. For others obedient ones gain devotion, ambivalent ones gain fear and devotion and resistant ones lose devotion and gain fear.";
+ desc = "Increases devotion for those who have pregnancy fetish while fertile or a humiliation fetish. For others obedient ones gain devotion, ambivalent ones gain fear and devotion and resistant ones lose devotion and gain fear.";
+ break;
case "bell collar":
- return Cloth + " on non-obedient slaves reduces fear a lot and devotion somewhat.";
+ desc = "On non-obedient slaves reduces fear a lot and devotion somewhat.";
+ break;
case "leather with cowbell":
- return Cloth + " on obedient slaves with boob fetish increases devotion, on disobedient slaves reduces fear a lot and devotion somewhat.";
-
+ desc = "On obedient slaves with boob fetish increases devotion, on disobedient slaves reduces fear a lot and devotion somewhat.";
+ break;
case "tight steel":
case "uncomfortable leather":
case "neck corset":
case "cruel retirement counter":
- return Cloth + " increases fear for non-obedient slaves.";
+ desc = "Increases fear for non-obedient slaves.";
+ break;
case "shock punishment":
- return Cloth + " for non-obedient slaves increases fear a great deal and reduces devotion, for resistant non-odd slaves it affects both much more a single time and gives the odd flaw.";
-
+ desc = "For non-obedient slaves increases fear a great deal and reduces devotion, for resistant non-odd slaves it affects both much more a single time and gives the odd flaw.";
+ break;
case "cat ears":
- return Cloth + " increase fear and devotion for disobedient slaves, submissives and nymphos also enjoy wearing one.";
+ desc = "Increases fear and devotion for disobedient slaves, submissives and nymphos also enjoy wearing one.";
+ break;
case "porcelain mask":
- return Cloth + " obscures the face, increases fear and devotion for disobedient slaves, submissives and nymphos also enjoy wearing one.";
-
+ desc = "Obscures the face, increases fear and devotion for disobedient slaves, submissives and nymphos also enjoy wearing one.";
+ break;
case "ball gag":
case "bit gag":
case "ring gag":
- return Cloth + " increases fear and devotion for disobedient slaves, submissives and nymphos also enjoy wearing one.";
+ desc = "Increases fear and devotion for disobedient slaves, submissives and nymphos also enjoy wearing one.";
+ break;
case "dildo gag":
case "massive dildo gag":
- return Cloth + " increases oral skill up to a point and causes fear for disobedient slaves.";
-
+ desc = "Increases oral skill up to a point and causes fear for disobedient slaves.";
+ break;
case "hand gloves":
case "elbow gloves":
- return Cloth + " have no effect one way or another.";
-
+ desc = "Have no effect one way or another.";
+ break;
case "flats":
- return Cloth + " have no effect one way or another.";
+ desc = "Have no effect one way or another.";
+ break;
case "heels":
case "boots":
case "platform heels":
- return Cloth + " increase height, resistant slaves with natural legs resent wearing them.";
+ desc = "Increases height, resistant slaves with natural legs resent wearing them.";
+ break;
case "pumps":
case "platform shoes":
- return Cloth + " increase height.";
+ desc = "Increases height.";
+ break;
case "extreme heels":
case "extreme platform heels":
- return Cloth + " increase height, slaves with natural legs who are resistant resent and fear wearing them while non-resistant ones become more fearful(unless masochistic) and obedient.";
-
+ desc = "Increases height, slaves with natural legs who are resistant resent and fear wearing them while non-resistant ones become more fearful(unless masochistic) and obedient.";
+ break;
case "short stockings":
- return Cloth + " have no effect one way or another.";
case "long stockings":
- return Cloth + " have no effect one way or another.";
-
+ desc = "Have no effect one way or another.";
+ break;
case "a tight corset":
- return Cloth + " slowly narrows the waist into wispy one.";
+ desc = "Slowly narrows the waist into wispy one.";
+ break;
case "an extreme corset":
- return Cloth + " 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";
+ desc = "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";
+ break;
case "a supportive band":
- return Cloth + " reduces chance of miscarriage.";
+ desc = "Reduces chance of miscarriage.";
+ break;
case "a small empathy belly":
case "a medium empathy belly":
case "a large empathy belly":
case "a huge empathy belly":
- return Cloth + " strenghtens or removes(a weak) pregnancy fetish and affects devotion in various ways depending on devotion, fertility and having a pregnancy fetish or breeder flaw.";
-
+ desc = "Strengthens or removes(a weak) pregnancy fetish and affects devotion in various ways depending on devotion, fertility and having a pregnancy fetish or breeder flaw.";
+ break;
case "bullet vibrator":
- return Cloth + " increases devotion but weakens fetish and libido.";
+ desc = "Increases devotion but weakens fetish and libido.";
+ break;
case "smart bullet vibrator":
- return Cloth + " increases devotion and affects a specific fetish, attraction or sex drive.";
+ desc = "Increases devotion and affects a specific fetish, attraction or sex drive.";
+ break;
case "dildo":
- return Cloth + " stretches vagina from virgin to tight, might remove hatred of penetration.";
+ desc = "Stretches vagina from virgin to tight, might remove hatred of penetration.";
+ break;
case "long dildo":
- return Cloth + " stretches vagina from virging to tight, might remove hatred of penetration. Makes size queens happy while others less trusting.";
+ desc = "Stretches vagina from virgin to tight, might remove hatred of penetration. Makes size queens happy while others less trusting.";
+ break;
case "large dildo":
case "long, large dildo":
- return Cloth + " stretches vagina into a loose one, on a tight vagina increases obedience and fear.";
+ desc = "Stretches vagina into a loose one, on a tight vagina increases obedience and fear.";
+ break;
case "huge dildo":
case "long, huge dildo":
- return Cloth + " stretches vagina into a cavernous one, on smaller vaginas size queens get much more devoted, masochists and submissives much more devoted and fearful and anyone else becomes much less devoted and trusting. Might cause miscarriage.";
-
+ desc = "Stretches vagina into a cavernous one, on smaller vaginas size queens get much more devoted, masochists and submissives much more devoted and fearful and anyone else becomes much less devoted and trusting. Might cause miscarriage.";
+ break;
case "vibrator":
- return Cloth + " ";
case "smart vibrator":
- return Cloth + " ";
-
+ desc = "";
+ break;
case "plug":
- return Cloth + " stretches butthole from virgin to tight, might remove hatred of anal.";
+ desc = "Stretches butthole from virgin to tight, might remove hatred of anal.";
+ break;
case "long plug":
- return Cloth + " stretches vagina from virging to tight, might remove hatred of penetration. Makes size queens happy.";
+ desc = "Stretches vagina from virgin to tight, might remove hatred of penetration. Makes size queens happy.";
+ break;
case "large plug":
case "long, large plug":
- return Cloth + " stretches vagina into a loose one, on a tight vagina increases obedience and fear.";
+ desc = "Stretches vagina into a loose one, on a tight vagina increases obedience and fear.";
+ break;
case "huge plug":
case "long, huge plug":
- return Cloth + " stretches vagina into a cavernous one, on smaller vaginas size queens get much more devoted, masochists and submissives much more devoted and fearful and anyone else becomes much less devoted and trusting. Might cause miscarriage.";
-
+ desc = "Stretches vagina into a cavernous one, on smaller vaginas size queens get much more devoted, masochists and submissives much more devoted and fearful and anyone else becomes much less devoted and trusting. Might cause miscarriage.";
+ break;
case "tail":
case "fox tail":
case "cat tail":
case "cow tail":
- return Cloth + " makes it more scary to wear a plug but might give humiliation fetish,";
-
-
+ desc = "Makes it more scary to wear a plug but might give humiliation fetish,";
+ break;
case "anal chastity":
- return Cloth + " prevents losing anal virginity.";
+ desc = "Prevents losing anal virginity.";
+ break;
case "chastity belt":
- return Cloth + " prevents losing virginity, has various effects, obedient virgins, buttsluts and ones with relatively high sex drive are most affected.";
- case "":
+ desc = "Prevents losing virginity, has various effects, obedient virgins, buttsluts and ones with relatively high sex drive are most affected.";
+ break;
case "combined chastity belt":
- return Cloth + " prevents losing virginities, has various effects, obedient virgins, buttsluts and ones with relatively high sex drive are most affected.";
+ desc = "Prevents losing virginities, has various effects, obedient virgins, buttsluts and ones with relatively high sex drive are most affected.";
+ break;
case "chastity cage":
- return Cloth + " prevents using penis, has various effects, devotion, trust and sex drive of unresistant slaves with healthy sex drive all suffer from wearing one unless they're a masochist, nympho, neglectful, buttslut, sterile or lack balls.";
+ desc = "Prevents using penis, has various effects, devotion, trust and sex drive of unresistant slaves with healthy sex drive all suffer from wearing one unless they're a masochist, nympho, neglectful, buttslut, sterile or lack balls.";
+ break;
case "combined chastity cage":
- return Cloth + " protects both penis and anus from sex, has various effects, devotion and trust and sex drive of unresistant slaves with healthy sex drive all suffer from wearing one unless they're a masochist, nympho, neglectful, buttslut, sterile or lack balls.";
+ desc = "Protects both penis and anus from sex, has various effects, devotion and trust and sex drive of unresistant slaves with healthy sex drive all suffer from wearing one unless they're a masochist, nympho, neglectful, buttslut, sterile or lack balls.";
+ break;
case "genital chastity":
- return Cloth + " protects both penis and vagina from sex, has various effects.";
+ desc = "Protects both penis and vagina from sex, has various effects.";
+ break;
case "full chastity":
- return Cloth + " protects penis, vagina and anus, has various effects.";
+ desc = "Protects penis, vagina and anus, has various effects.";
+ break;
case "choosing her own chastity":
case "choosing his own chastity":
case "choose own chastity":
- return Cloth + " ";
case "revoke choosing own chastity":
- return Cloth + " ";
-
- default: {
- /* assuming nice clothes, could actually add some sort of check to make sure. */
- /* which clothes have these is decided in miscData.js */
- let clothTooltip = Cloth + "";
- if (setup.humiliatingClothes.includes(cloth)) {
- clothTooltip += ", it's humiliating";
- }
- if (setup.sluttyClothes.includes(cloth)) {
- clothTooltip += ", it's slutty";
+ desc = "";
+ break;
+ }
+ if (cloth === "none") {
+ return "No effect one way or another.";
+ } else {
+ const clothingData = App.Data.clothes.get(cloth);
+ if (clothingData) {
+ switch (clothingData.exposure) {
+ case 4:
+ Cloth += ", might as well be naked";
+ break;
+ case 3:
+ Cloth += ", it's humiliating";
+ break;
+ case 2:
+ Cloth += ", it's slutty";
+ break;
+ case 1:
+ Cloth += ", it's normal";
+ break;
+ case 0:
+ Cloth += ", it's modest";
+ break;
+ default:
+ if (!clothingData.harsh) {
+ Cloth += ", it's only nice (meaning non-obedients lose devotion and fear while obedients gain devotion and trust)";
+ }
}
- if (setup.modestClothes.includes(cloth)) {
- clothTooltip += ", it's modest";
+ }
+ return Cloth + ". " + (desc || "");
+ }
+ }
+ /** @typedef RowItem
+ * @type {object}
+ * @property {FC.FutureSociety} [FS] - FS requirement, if any
+ * @property {string} [text] - link text
+ * @property {object} [updateSlave] - properties to be merged onto the slave
+ * @property {object} [update] - properties to be merged into global state
+ * @property {string} [note]
+ * @property {string} [slutty]
+ * @property {string} [humiliating]
+ */
+
+ /** Generate a row of choices
+ * @param {RowItem[]} array
+ * @param {string} [category] - should be in the form of slave.category, the thing we want to update.
+ * @param {boolean} [accessCheck=false]
+ * @returns {HTMLUListElement}
+ */
+ function generateRows(array, category, accessCheck = false) {
+ const linkArray = [];
+ for (const item of array) {
+ let link;
+ // Some items will never be in App.Data.slaveWear, especially "none" if it falls in between harsh and nice data sets. Trying to look it up would cause an error, which is what access check works around.
+ const itemName = (category === "chastity") ? item.text.toLowerCase() : item.updateSlave[category]; // Yucky. Category name does not match for chastity (since it sets multiple kinds of chastity at once). Compare using a lowercase name instead.
+ const unlocked = (accessCheck === true) ? isItemAccessible.entry(itemName, category, slave) : false;
+ if (accessCheck === false || unlocked) {
+ if (typeof unlocked === 'string') { // is it just text?
+ link = App.UI.DOM.disabledLink(item.text, [unlocked]);
+ } else {
+ link = document.createElement('span');
+
+ // Set up the link
+ link.appendChild(
+ App.UI.DOM.link(
+ `${item.text} `,
+ () => { click(item); },
+ [],
+ "",
+ clothTooltip(itemName)
+ )
+ );
+
+ if (item.FS) {
+ let FS = App.UI.DOM.disabledLink(`FS`, [FutureSocieties.displayAdj(item.FS)]);
+ FS.style.fontStyle = "italic";
+ link.appendChild(FS);
+ }
+
+ // add a note node if required
+ if (item.note) {
+ link.appendChild(App.UI.DOM.makeElement('span', ` ${item.note}`, 'note'));
+ }
}
- if (clothTooltip === Cloth + "") {
- clothTooltip += ", it's only nice(meaning non-obedients lose devotion and fear while obedients gain devotion and trust).";
+ linkArray.push(link);
+ }
+ }
+
+ return App.UI.DOM.generateLinksStrip(linkArray);
+
+ /** @param {RowItem} arrayOption */
+ function click(arrayOption) {
+ if (arrayOption.updateSlave) {
+ for (const slaveProperty in arrayOption.updateSlave) {
+ _.set(slave, slaveProperty, arrayOption.updateSlave[slaveProperty]);
}
- clothTooltip += ".";
- return clothTooltip;
}
+ if (arrayOption.update) {
+ Object.assign(V, arrayOption.update);
+ }
+ refresh();
}
}
};
diff --git a/src/interaction/wardrobe.css b/src/interaction/wardrobe.css
new file mode 100644
index 0000000000000000000000000000000000000000..328e67174f1d5f419a88e340667593b10c395041
--- /dev/null
+++ b/src/interaction/wardrobe.css
@@ -0,0 +1,7 @@
+div.filter-row {
+ line-height: 3em;
+}
+
+div.filter-row .button-group {
+ margin: 1em;
+}
diff --git a/src/js/CustomSlave.js b/src/js/CustomSlave.js
index c7b490342668b31f2a7e614f11fbd21f063978eb..ef5f202cc65b69c4e88417575018dee593fc6909 100644
--- a/src/js/CustomSlave.js
+++ b/src/js/CustomSlave.js
@@ -1,7 +1,7 @@
/**
* Contains the parameters for the player's custom slave order.
* Some members are ignored by huskSlave (particularly mental properties).
- * NOTE: $customSlave/$huskSlave IS NOT A SLAVE. Do not treat them like you would treat an instance of SlaveState.
+ * NOTE: V.customSlave/V.huskSlave IS NOT A SLAVE. Do not treat them like you would treat an instance of SlaveState.
*/
App.Entity.CustomSlaveOrder = class CustomSlaveOrder {
constructor() {
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 05184b60941ad0969982dd641a35c1a40ab89055..fe0c3924c6ae3d5b608fb4205f4743d24fa2e822 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -29,7 +29,7 @@ globalThis.assignJob = function(slave, job) {
const idx = V.slaveIndices[slave.ID];
/**
- * this helper makes sure global references global IDs ($HeadGirlID, $AttendantID, etc) are set correctly
+ * this helper makes sure global references global IDs (V.HeadGirlID, V.AttendantID, etc) are set correctly
* @param {string} propName
*/
function uniqueJob(propName) {
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 06e96167ea11dfedfb489d766789a578d426d1aa..056ba297b2cc72f891c157a1ed69d560053a08e9 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -7,23 +7,23 @@ globalThis.DJRepBonus = function() {
const djIntel = S.DJ.intelligence + S.DJ.intelligenceImplant;
if (S.DJ.relationship === -3 && S.DJ.devotion > 50) {
value += 0.1;
- // $He tries $his best to be your energetic, cheerful $wife.
+ // $He tries $his best to be your energetic, cheerful ${wife}.
}
if (!canSee(S.DJ)) {
value += 0.15;
}
if ( S.DJ.skill.entertainment > 10 && S.DJ.skill.entertainment <= 30) {
value += 0.05;
- // $DJ.slaveName's basic skills marginally <span class="green">improve</span> the atmosphere in $clubName.
+ // V.DJ.slaveName's basic skills marginally <span class="green">improve</span> the atmosphere in V.clubName.
} else if (S.DJ.skill.entertainment <= 60) {
value += 0.1;
- // $DJ.slaveName's skills <span class="green">improve</span> the atmosphere in $clubName.
+ // V.DJ.slaveName's skills <span class="green">improve</span> the atmosphere in V.clubName.
} else if (S.DJ.skill.entertainment < 100) {
value += 0.15;
- // $DJ.slaveName's skills greatly <span class="green">improve</span> the atmosphere in $clubName.
+ // V.DJ.slaveName's skills greatly <span class="green">improve</span> the atmosphere in V.clubName.
} else if (S.DJ.skill.entertainment >= 100) {
value += 0.20;
- // $DJ.slaveName's mastery immensely <span class="green">;improves</span> the atmosphere in $clubName.
+ // V.DJ.slaveName's mastery immensely <span class="green">;improves</span> the atmosphere in V.clubName.
}
if (S.DJ.muscles > 5 && S.DJ.muscles <= 95) {
value += 0.05;
@@ -1058,7 +1058,7 @@ globalThis.getSlaveCostArray = function(s) {
V.masterSuiteUpgradePregnancy === 1) {
// Extra feeding costs to support pregnancy are covered by master suite luxuries.
// TODO: Include them here anyway?
- retval.push({text: "Extra feeding costs to support pregnancy are covered by $masterSuiteName luxuries", value: 0});
+ retval.push({text: `Extra feeding costs to support pregnancy are covered by ${V.masterSuiteName} luxuries`, value: 0});
} else {
t = "Extra feeding to support ";
if (s.pregControl === "speed up") {
@@ -1470,20 +1470,20 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman
const madamIntel = madam.intelligence + madam.intelligenceImplant;
App.EndWeek.saVars.madamBonus = 0;
if (madam.relationship === -3 && madam.devotion > 50) {
- // As your loving $wife, $he does $his best to attract attention to your brothel.
+ // As your loving ${wife}, ${he} does $his best to attract attention to your brothel.
App.EndWeek.saVars.madamBonus += 0.25;
}
if (madam.skill.whoring > 10 && madam.skill.whoring <= 30) {
- // S.Madam.slaveName's basic skills marginally yellowgreen;improve business at $brothelName.
+ // S.Madam.slaveName's basic skills marginally yellowgreen;improve business at V.brothelName.
App.EndWeek.saVars.madamBonus += 0.05;
} else if (madam.skill.whoring <= 60) {
- // S.Madam.slaveName's skills yellowgreen;improve business at $brothelName.
+ // S.Madam.slaveName's skills yellowgreen;improve business at V.brothelName.
App.EndWeek.saVars.madamBonus += 0.1;
} else if (madam.skill.whoring < 100) {
- // S.Madam.slaveName's skills greatly yellowgreen;improve business at $brothelName.
+ // S.Madam.slaveName's skills greatly yellowgreen;improve business at V.brothelName.
App.EndWeek.saVars.madamBonus += 0.15;
} else {
- // S.Madam.slaveName's mastery immensely yellowgreen;improves business at $brothelName.
+ // S.Madam.slaveName's mastery immensely yellowgreen;improves business at V.brothelName.
App.EndWeek.saVars.madamBonus += 0.20;
}
if (madam.actualAge > 35) {
@@ -2181,7 +2181,7 @@ globalThis.initFacilityStatistics = function(facility = {}) {
/*
-Welcome to the new way to spend and make money, all while having it recorded: cashX! In the past, costs were directly deducted from $cash, with something like <<set $cash -= 100>>.
+Welcome to the new way to spend and make money, all while having it recorded: cashX! In the past, costs were directly deducted from V.cash, with something like V.cash -= 100.
The new system will still happily spend your money, but it will also record it in the appropriate budget category and (optionally) the appropriate slave as well.
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 7a00f5433c4aabedea6a2bb705ce690216ac285b..f6a9abd490498eabc960372571b19a4c0fc837ef 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -618,7 +618,7 @@ globalThis.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.trust > 20) {
if (eventSlave.rules.speech !== "restrictive") {
if (eventSlave.choosesOwnClothes !== 1) {
- if (setup.modestClothes.includes(eventSlave.clothes)) {
+ if (getExposure(eventSlave) === 0) {
V.RESSevent.push("modest clothes");
}
}
diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index f0c5fc0cb1f13e86ed1266dd6d4e060240306d8a..0831a12e9615da0341d14995bc6782f5ee91dcf8 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -15,51 +15,45 @@ globalThis.isItemAccessible = (function() {
if (V.cheatMode === 1) {
return true;
}
- let niceDB = [];
- let harshDB = [];
+ let selectedDB;
switch (category) {
case "clothing":
case "clothes":
- niceDB = App.Data.slaveWear.niceClothes;
- harshDB = App.Data.slaveWear.harshClothes;
+ selectedDB = App.Data.clothes;
break;
case "collar":
- niceDB = App.Data.slaveWear.niceCollars;
- harshDB = App.Data.slaveWear.harshCollars;
+ selectedDB = App.Data.slaveWear.collars;
break;
case "bellyAccessory":
- niceDB = App.Data.slaveWear.bellyAccessories;
+ selectedDB = App.Data.slaveWear.bellyAccessories;
break;
case "buttplug":
- niceDB = App.Data.slaveWear.buttplugs;
+ selectedDB = App.Data.slaveWear.buttplugs;
break;
case "buttplugAttachment":
- niceDB = App.Data.slaveWear.buttplugAttachments;
+ selectedDB = App.Data.slaveWear.buttplugAttachments;
break;
case "vaginalAccessory":
- niceDB = App.Data.slaveWear.vaginalAccessories;
+ selectedDB = App.Data.slaveWear.vaginalAccessories;
break;
case "vaginalAttachment":
- niceDB = App.Data.slaveWear.vaginalAttachments;
+ selectedDB = App.Data.slaveWear.vaginalAttachments;
break;
case "dickAccessory":
- niceDB = App.Data.slaveWear.vaginalAccessories;
+ selectedDB = App.Data.slaveWear.dickAccessories;
break;
case "shoes":
- niceDB = App.Data.slaveWear.shoes;
+ selectedDB = App.Data.slaveWear.shoes;
break;
case "chastity":
- niceDB = App.Data.slaveWear.chastityDevices;
+ selectedDB = App.Data.slaveWear.chastityDevices;
break;
default:
console.log(`made a category for ${category} automatically, may need to define this by hand`);
- niceDB = App.Data.slaveWear[category];
+ selectedDB = App.Data.slaveWear[category];
break;
}
- let item = niceDB.find((i) => i.value === string);
- if (!item && (typeof harshDB !== 'undefined')) {
- item = harshDB.find((i) => i.value === string);
- }
+ const item = selectedDB.get(string);
if (!item) {
console.log(`${string} is not a registered piece of clothing! Check App.Data.slaveWear.${category}`);
return false; /* couldn't be found */
@@ -68,20 +62,22 @@ globalThis.isItemAccessible = (function() {
}
/**
* Returns array of wearable clothing in format [name, value], basically player facing / game data.
- * @param {Array} db Array to look in (such as App.Data.slaveWear.niceClothes)
+ * @param {Map} map Map to look in (such as App.Data.clothes)
+ * @param {string} [filter] for example, if we want to filer clothing data by the "harsh" property, pass harsh as the parameter here.
+ * @param {any} [filterValue] remove any clothing where the .filter property does not match this value. Function will evaluate undefined as false.
* @returns {Array}
*/
- function array(db) {
+ function array(map, filter, filterValue) {
const array = [];
- db.forEach((i) => {
- if (V.cheatMode || isAvailable(i)) {
- let name = i.name;
- if (i.fs) {
- name = `${i.name} (FS)`;
- }
- array.push([name, i.value]);
+ for (const [key, obj] of map) {
+ if (filter && filterValue !== (obj[filter] || false)) {
+ continue;
}
- });
+ if (V.cheatMode || isAvailable(obj)) {
+ const name = (obj.fs) ? `${obj.name} (FS)` : obj.name;
+ array.push([name, key]);
+ }
+ }
return array;
}
diff --git a/src/js/releaseRules.js b/src/js/releaseRules.js
index d391f4604ef8160466dd4e729d8224cfbda63214..ab0a354a055fc0872a7cdb3c9b2a458c13652cc9 100644
--- a/src/js/releaseRules.js
+++ b/src/js/releaseRules.js
@@ -182,7 +182,11 @@ App.Utils.releaseSummaryLong = function releaseSummaryLong(slave) {
if (rel.master === 1) {
permissions.push("you");
}
- return permissions.reduce(function(res, ch, i, arr) { return res + (i === arr.length - 1 ? ' and ' : ', ') + ch; });
+ if (permissions.length > 0) {
+ return permissions.reduce(function(res, ch, i, arr) { return res + (i === arr.length - 1 ? ' and ' : ', ') + ch; });
+ } else {
+ return "restrictive";
+ }
}
};
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index fac661e1abb84f818d347a51ecee3ad5cfda62a1..b25965885ae9744963c8a840e280933f6bd85ffa 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -398,7 +398,7 @@ globalThis.emptyDefaultRule = App.RA.newRule.rule;
/**
* Saves the slave, silently fires the RA, saves the slave's after-RA state, and then reverts the slave.
- * Call and then check potential change against $slaveAfterRA to see if the RA would revert it.
+ * Call and then check potential change against V.slaveAfterRA to see if the RA would revert it.
* @param {App.Entity.SlaveState} slave
*/
globalThis.RulesDeconfliction = function(slave) {
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index ccc8b24aa8fafc3d015748080a818e4239f2212b..c084389ccd93fe2e570bc7cf0c1f91e6cddd3a37 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -5,14 +5,17 @@
// wrapped in a closure so as not to pollute the global namespace
// the widgets are generic enough to be reusable; if similar user interfaces are ported to JS, we could move the classes to the global scope
-globalThis.rulesAssistantOptions = (function() {
+/**
+ * @param {HTMLDivElement} div container for the RA UI
+ */
+App.RA.options = (function() {
"use strict";
const noDefaultSetting = {value: "!NDS!", text: "no default setting"};
/** @type {FC.RA.Rule} */
let current_rule, root;
- function rulesAssistantOptions(element) {
+ function rulesAssistantOptions(div) {
V.nextButton = "Back to Main";
V.nextLink = "Main";
V.returnTo = "Main";
@@ -25,7 +28,7 @@ globalThis.rulesAssistantOptions = (function() {
current_rule = V.defaultRules[idx];
}
}
- root = new Root(element);
+ root = new Root(div);
}
function returnP(e) { return e.keyCode === 13; }
@@ -1806,11 +1809,11 @@ globalThis.rulesAssistantOptions = (function() {
];
super("Clothes", items);
- const nClothes = isItemAccessible.array(App.Data.slaveWear.niceClothes);
+ const nClothes = isItemAccessible.array(App.Data.clothes, "harsh", false);
nClothes.sort(function(a, b) { if (a[0] < b[0]) { return -1; } if (a[0] > b[0]) { return 1; } return 0; });
this._nice = new ListSubSection(this, "Nice", nClothes);
- const hClothes = isItemAccessible.array(App.Data.slaveWear.harshClothes);
+ const hClothes = isItemAccessible.array(App.Data.clothes, "harsh", true);
hClothes.sort(function(a, b) { if (a[0] < b[0]) { return -1; } if (a[0] > b[0]) { return 1; } return 0; });
this._harsh = new ListSubSection(this, "Harsh", hClothes);
@@ -1833,11 +1836,11 @@ globalThis.rulesAssistantOptions = (function() {
];
super("Collar", items);
- const niceCollars = isItemAccessible.array(App.Data.slaveWear.niceCollars);
+ const niceCollars = isItemAccessible.array(App.Data.slaveWear.collars, "harsh", false);
niceCollars.sort(function(a, b) { if (a[0] < b[0]) { return -1; } if (a[0] > b[0]) { return 1; } return 0; });
this._nice = new ListSubSection(this, "Nice", niceCollars);
- const harshCollars = isItemAccessible.array(App.Data.slaveWear.harshCollars);
+ const harshCollars = isItemAccessible.array(App.Data.slaveWear.collars, "harsh", true);
harshCollars.sort(function(a, b) { if (a[0] < b[0]) { return -1; } if (a[0] > b[0]) { return 1; } return 0; });
this._harsh = new ListSubSection(this, "Harsh", harshCollars);
diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js
index 818930d7541957bd65cef9aac1441b4832af4fac..245464e021bfdb959ca036789e36dd982ab138f8 100644
--- a/src/js/sexActsJS.js
+++ b/src/js/sexActsJS.js
@@ -244,7 +244,7 @@ globalThis.VCheck = (function() {
}
/**
- * Before using this function, set $partner to the index of the partner in the $slaves array
+ * Before using this function, set V.partner to the index of the partner in the V.slaves array
analTimes is how many times to increment the Anal counts, if there is no Vagina available.
bothTimes is how many times to increment both holes counts (usually it is half of Anal).
In both cases if left undefined it will assume it to be 1.
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index d872a676193912b4d85b82df738f3e822bc07a4e..eceecbd41bfcd32850eaf714614e3c12b9f4b428 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -392,7 +392,7 @@ App.UI.SlaveList.render = function() {
const res = document.createDocumentFragment();
/* Useful for finding weird combinations — usages of this passage that don't yet generate the quick index.
- * <<print 'pass/count/indexed/flag::[' + passageName + '/' + _Count + '/' + _indexed + '/' + $SlaveSummaryFiler + ']'>>
+ * <<print 'pass/count/indexed/flag::[' + passageName + '/' + _Count + '/' + _indexed + '/' + V.SlaveSummaryFiler + ']'>>
*/
if (IDs.length > 1 && passageName === "Main") {
diff --git a/src/js/statsChecker/statsChecker.js b/src/js/statsChecker/statsChecker.js
index 461e30fdb1421aad863e3782e08c782694da47d0..d014fb2dbe227b8135604bbc4ef58fbe75cd13bf 100644
--- a/src/js/statsChecker/statsChecker.js
+++ b/src/js/statsChecker/statsChecker.js
@@ -472,7 +472,7 @@ globalThis.bimboScore = function(slave) {
if (slave.skin === "sun tanned" || slave.skin === "spray tanned") {
degree++;
}
- if (setup.sluttyClothes.includes(slave.clothes)) {
+ if (getExposure(slave) === 2) {
degree++;
}
@@ -914,7 +914,7 @@ globalThis.isHindered = function(slave) {
return true;
} else if (slave.weight >= 130 || (slave.weight >= 95 + ((slave.physicalAge - 9) * 5))) {
return true;
- } else if (slave.belly >= 60000 || slave.belly >= 60000 / (1 + Math.Pow(Math.E, -0.4 * (slave.physicalAge - 14))) || slave.belly >= Math.max(10000, ((12500 / 19) * slave.height) - (1172500 / 19))) {
+ } else if (slave.belly >= 60000 || slave.belly >= 60000 / (1 + Math.pow(Math.E, -0.4 * (slave.physicalAge - 14))) || slave.belly >= Math.max(10000, ((12500 / 19) * slave.height) - (1172500 / 19))) {
return true;
} else if (slave.boobs > 5000) {
return true;
diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js
index 779c965102fff7ef801041666187948cecb7d077..14f26e503ccbfd87a4971cc1de810d4e86f5bb46 100644
--- a/src/js/utilsFC.js
+++ b/src/js/utilsFC.js
@@ -3084,3 +3084,13 @@ App.Utils.alphabetizeIterable = function(iterable) {
const clonedArray = (Array.from(iterable));
return clonedArray.sort(compare);
};
+
+/**
+ * Returns how exposing a slave's outfit is, after taking into consideration a topless outfit is more revealing for beboobed slaves or female ones.
+ * @param {App.Entity.SlaveState} slave
+ * @returns {0|1|2|3|4}
+ */
+globalThis.getExposure = function(slave) {
+ const clothes = App.Data.clothes.get(slave.clothes);
+ return (clothes.topless && clothes.exposure < 3 && (slave.boobs > 299 || (slave.genes === 'XX' && slave.vagina >= 0))) ? 3 : clothes.exposure;
+};
diff --git a/src/js/utilsSC.js b/src/js/utilsSC.js
index baf505a24abd25c10d4ef741642a139a24a28f67..4f9316836e7081b3ced53a33acc7bec8ea6d04bd 100644
--- a/src/js/utilsSC.js
+++ b/src/js/utilsSC.js
@@ -1,18 +1,3 @@
-/**
- * circumvents SugarCube, allowing a plain HTML5 UI within it
- *
- * @param {function(HTMLElement): HTMLElement} passageFunction
- */
-globalThis.html5passage = function(passageFunction) {
- $(document).one(":passagedisplay", (ev) => {
- const element = document.createElement("div");
- element.classList.add("passage");
- document.getElementById("passages").appendChild(element);
- passageFunction(element);
- $(document).off(":passagedisplay");
- });
-};
-
/**
* If you want to include a SugarCube passage in a JS function use this. The result must be printed using the <<print>>
* macro.
diff --git a/src/js/wombJS.js b/src/js/wombJS.js
index 8265298e9ea6a979ffecf2d0c29461ddb7ab7792..21245d278d7dd34d085c10163115bfe1699b9cf8 100644
--- a/src/js/wombJS.js
+++ b/src/js/wombJS.js
@@ -7,19 +7,19 @@ Design limitations:
Usage from SugarCube code (samples):
-WombInit($slave) - before first pregnancy, at slave creation, of as backward compatibility update.
+WombInit(V.slave) - before first pregnancy, at slave creation, of as backward compatibility update.
-WombImpregnate($slave, $fetus_count, $fatherID, $initial_age) - should be added after normal impregnation code, with already calculated fetus count. ID of father - can be used in future for processing children from different fathers in one pregnancy. Initial age normally 1 (as .preg normally set to 1), but can be raised if needed. Also should be called at time as broodmother implant add another fetus(es), or if new fetuses added from other sources in future (transplanting maybe?)
+WombImpregnate(V.slave, V.fetus_count, V.fatherID, V.initial_age) - should be added after normal impregnation code, with already calculated fetus count. ID of father - can be used in future for processing children from different fathers in one pregnancy. Initial age normally 1 (as .preg normally set to 1), but can be raised if needed. Also should be called at time as broodmother implant add another fetus(es), or if new fetuses added from other sources in future (transplanting maybe?)
-WombProgress($slave, $time_to_add_to_fetuses, $real_time_to_add_to_fetuses) - after code that update $slave.preg, time to add should be the same.
+WombProgress(V.slave, V.time_to_add_to_fetuses, V.real_time_to_add_to_fetuses) - after code that update V.slave.preg, time to add should be the same.
-$isReady = WombBirthReady($slave, $birth_ready_age) - how many children ready to be birthed if their time to be ready is $birth_ready_age (40 is for normal length pregnancy). Return int - count of ready to birth children, or 0 if no ready exists.
+V.isReady = WombBirthReady(V.slave, V.birth_ready_age) - how many children ready to be birthed if their time to be ready is V.birth_ready_age (40 is for normal length pregnancy). Return int - count of ready to birth children, or 0 if no ready exists.
-$children = WombBirth($slave, $birth_ready_age) - for actual birth. Return array with fetuses objects that birthed (can be used in future) and remove them from womb array of $slave. Should be called at actual birth code in SugarCube. fetuses that not ready remained in womb (array).
+V.children = WombBirth(V.slave, V.birth_ready_age) - for actual birth. Return array with fetuses objects that birthed (can be used in future) and remove them from womb array of V.slave. Should be called at actual birth code in SugarCube. fetuses that not ready remained in womb (array).
-WombFlush($slave) - clean womb (array). Can be used at broodmother birthstorm or abortion situations in game. But birthstorm logically should use WombBirth($slave, 35) or so before - some children in this event is live capable, others is not.
+WombFlush(V.slave) - clean womb (array). Can be used at broodmother birthstorm or abortion situations in game. But birthstorm logically should use WombBirth(V.slave, 35) or so before - some children in this event is live capable, others is not.
-$slave.bellyPreg = WombGetVolume($slave) - return double, with current womb volume in CC - for updating $slave.bellyPreg, or if need to update individual fetuses sizes.
+V.slave.bellyPreg = WombGetVolume(V.slave) - return double, with current womb volume in CC - for updating V.slave.bellyPreg, or if need to update individual fetuses sizes.
*/
diff --git a/src/markets/specificMarkets/schoolFutanari.js b/src/markets/specificMarkets/schoolFutanari.js
index 9bd0ba9588e877a223cc835ce3ac3754b3bb24bd..e5643fba810534ea45974fb56ca8b2779edc4bc6 100644
--- a/src/markets/specificMarkets/schoolFutanari.js
+++ b/src/markets/specificMarkets/schoolFutanari.js
@@ -21,120 +21,122 @@ App.Markets.TFS = function() {
App.UI.DOM.appendNewElement("p", el, `It hasn't been long enough since you allowed them to use your organ farm to add ovaries to themselves for the effects to be obvious yet. Most of them are doubtless pregnant, however. There's been a subtle shift in their sexual behavior, too: they're much more likely to focus on vaginal sex than they were before, so much so that they often double penetrate each others' pussies. When there aren't any cunts available, they do their best to hold their orgasms until one opens up, so to speak.`);
}
}
- }
- App.UI.DOM.appendNewElement("p", el, `Visitors are not common: in fact, visitors are only as frequent as you feel like visiting. It takes a while before they notice you. When a dreamy-eyed young futa finally does, she reaches a lazy hand over to alert the eldest one present by tugging on one of her nipples and pointing in your direction. The elder looks over at you and gives you a friendly wave followed by a wait-one-moment gesture. She's curled up on her back with her cockhead in her own mouth, using both hands to give her own shaft a boob job while a younger futa is eats her ass and fingers her pussy. The futa matron orgasms promptly, sucking down her own cum. She gets up languidly, her plush body, softening forearm-sized dick, and enormous natural boobs making it a wonderful sight.`);
+ App.UI.DOM.appendNewElement("p", el, `Visitors are not common: in fact, visitors are only as frequent as you feel like visiting. It takes a while before they notice you. When a dreamy-eyed young futa finally does, she reaches a lazy hand over to alert the eldest one present by tugging on one of her nipples and pointing in your direction. The elder looks over at you and gives you a friendly wave followed by a wait-one-moment gesture. She's curled up on her back with her cockhead in her own mouth, using both hands to give her own shaft a boob job while a younger futa is eats her ass and fingers her pussy. The futa matron orgasms promptly, sucking down her own cum. She gets up languidly, her plush body, softening forearm-sized dick, and enormous natural boobs making it a wonderful sight.`);
- if (V.PC.title === 1) {
- r.push(`"Protector,`);
- } else {
- r.push(`"Protectrix,`);
- }
- r.push(`thank you so much for coming to see us. Our own Selection of a Sister to serve in slavery is not to take place for some time, but our communications interface in that side room," she points, "will permit you to access a regional listing of Selected Sisters ${(V.TFS.farmUpgrade > 0) ? `, all of which are fully fertile and produce their own natural female hormones, thanks to you` : ``}." She looks uncharacteristically uncertain. "Will you permit me to`);
- if (V.PC.dick !== 0) {
- if (V.PC.vagina !== -1) {
- r.push(`worship your perfect genitalia`);
+ if (V.PC.title === 1) {
+ r.push(`"Protector,`);
} else {
- r.push(`serve your cock`);
+ r.push(`"Protectrix,`);
}
- } else {
- r.push(`adore your pussy`);
- }
- r.push(`while you use it? I think my Sisters will forgive me the infidelity."`);
- if (V.PC.dick !== 0 && V.PC.vagina !== -1 && V.PC.boobs >= 300) {
- r.push(`She looks at you speculatively. "Or you could join us for a while."`);
- }
- const result = document.createElement("p");
- result.id = "result";
- App.UI.DOM.appendNewElement(
- "div",
- result,
- App.UI.DOM.link(
- "Let her give you oral while you browse",
- () => {
- r = [];
- r.push(`You accept her offer, and she walks seductively over to the interface with the listing of available Sisters, getting down on her knees below it. When you step up to look through the listing, she presses her huge soft tits against your knees`);
- if (V.PC.dick !== 0) {
- if (V.PC.vagina !== -1) {
- r.push(`and nuzzles her plush lips and hot tongue against your womanhood, using one hand to massage your shaft languidly. Perusing the very thorough pictures and videos of the pretty futanari for sale here is arousing enough without a truly masterful oral queen pleasing both your cock and your pussy, and you cum quickly. She drinks your cum rapturously and returns her mouth to your wet cunt, eagerly working to bring more forth.`);
- } else {
- r.push(`and snuggles her face between your thighs, nuzzling her nose into your ballsack before licking it with appetite and then sucking each of your balls gently, one by one. Meanwhile one of her clever hands is languidly massaging your shaft, bringing forth a drop of precum which she laps up with appetite. Humming with pleasure, she deepthroats you without apparent effort, her mischievous tongue flicking forward to lap at your scrotum. You blow your load down her throat, and she starts to suck you hard again.`);
- }
- } else {
- r.push(`and trails nibbles and kisses along your inner thighs before nuzzling her plush lips and hot tongue against your womanhood. Perusing the very thorough pictures and videos of the pretty futanari for sale here is arousing enough without a truly masterful cunt pleaser working her magic between your legs, and you've orgasmed before you finish one listing. She prolongs the climax cleverly and then starts to build you towards another.`);
- }
-
- jQuery("#result").empty().append(r.join(" "));
+ r.push(`thank you so much for coming to see us. Our own Selection of a Sister to serve in slavery is not to take place for some time, but our communications interface in that side room," she points, "will permit you to access a regional listing of Selected Sisters ${(V.TFS.farmUpgrade > 0) ? `, all of which are fully fertile and produce their own natural female hormones, thanks to you` : ``}." She looks uncharacteristically uncertain. "Will you permit me to`);
+ if (V.PC.dick !== 0) {
+ if (V.PC.vagina !== -1) {
+ r.push(`worship your perfect genitalia`);
+ } else {
+ r.push(`serve your cock`);
}
- )
- );
+ } else {
+ r.push(`adore your pussy`);
+ }
+ r.push(`while you use it? I think my Sisters will forgive me the infidelity."`);
+ if (V.PC.dick !== 0 && V.PC.vagina !== -1 && V.PC.boobs >= 300) {
+ r.push(`She looks at you speculatively. "Or you could join us for a while."`);
+ }
+ App.UI.DOM.appendNewElement("p", el, r.join(" "));
- if (V.PC.dick !== 0 && V.PC.vagina >= 0 && V.PC.boobs >= 300) {
- App.UI.DOM.appendNewElement("div", result,
+ const result = App.UI.DOM.appendNewElement("p", el);
+ result.id = "result";
+ App.UI.DOM.appendNewElement(
+ "div",
+ result,
App.UI.DOM.link(
- "Join the Sisters' orgy",
+ "Let her give you oral while you browse",
() => {
r = [];
- V.futaAddiction += 1;
- switch (V.futaAddiction) {
- case 1:
- r.push(`You agree to spend some time taking part in the Sisters' orgy. The futa matron looks doubtful. "You'd have to agree to act as one of us," she says. "No different. No special sexual treatment." Her voice rises cutely on the last syllable, as you take her enormous dick in one hand and begin to stroke it vigorously. "V-very well," she gasps, taking one of your breasts in each of her hands.`);
- if (V.PC.vagina === 0) {
- r.push(`You leave the Sisters' suite a few hours later, <span class="green">leaving your virginity behind.</span> You are tired and a bit sore, but satisfied.`);
- V.PC.vagina = 1;
- } else {
- r.push(`You leave the Sisters' suite after a few hours of fucking and being fucked, feeling tired but satisfied.`);
- }
- if (canGetPregnant(V.PC)) {
- r.push(knockMeUp(V.PC, 5, 0, -9, true));
- }
- break;
- case 2:
- r.push(`She doesn't have to explain the Sisters' sexual equality this time, or that you have to subject yourself to it. You remember, and you let her know you're willing by giving her a friendly hug that squashes your breasts against each other and rubs your stiff pricks together. She reaches around you to grab your ass, already pulling you towards the pile of futas. You leave the Sisters' suite after a few hours of fucking and being fucked, in a state of total sexual satiation.`);
- if (canGetPregnant(V.PC)) {
- r.push(knockMeUp(V.PC, 10, 0, -9, true));
- }
- break;
- case 3:
- r.push(`She asked that with a distinctly flirty tone, obviously hoping you'd agree again, and she isn't disappointed. You take her by the hand and skip over to the pile of futas, most of which know you very intimately by now. They see their Sister and you approaching, and those of them that don't have their mouths full greet you eagerly. Three of them quickly rearrange themselves to present you with a couple of dicks to sit on and a pussy to fuck, all at once. You leave the Sisters' suite after many hours of fucking and being fucked, tired but satisfied.`);
- if (canGetPregnant(V.PC)) {
- r.push(knockMeUp(V.PC, 20, 0, -9, true));
- }
- break;
- case 4:
- r.push(`She asked that in a knowing voice, confident you'd agree, and was already moving in to kiss you when you did. She seems to want you more than usual today, and pulls you down onto the edge of the pit, guiding your cock into her pussy. She isn't selfish, of course, and reaches around to spread your buttocks so you can get fucked while you fuck. You leave the Sisters' suite after many hours of this, very tired. You wonder when you can make time to visit the Sisters again.`);
- if (canGetPregnant(V.PC)) {
- r.push(knockMeUp(V.PC, 40, 0, -9, true));
- }
- break;
- case 5:
- r.push(`She runs her tongue over her lips as she asks, and sits you down on the edge of the pit and deepthroats you as soon as you agree. She wants your cum, and uses a couple of fingers to tickle your prostate and make it appear faster. You jerk with orgasm, and she pushes your wet cock up against your stomach so she can fuck your pussy. She pauses for a moment, letting a younger Sister enter her ass first. You leave the Sisters' suite after a full day of this, utterly exhausted but eager to return.`);
- if (canGetPregnant(V.PC)) {
- r.push(knockMeUp(V.PC, 60, 0, -9, true));
- }
- break;
- case 6:
- r.push(`You nod, and she turns back towards the orgy, not seeing any reason to lead you, since you know the way. You both sink back into the pile of cocks, pussies, mouths, asses, boobs; the hours go by without you noticing. You leave the Sisters' suite unable to remember specifics, but you clearly fucked and got fucked by every futa there at least once. You're surprised when you learn how long you were there, but the worries of being an arcology owner no longer seem as pressing as they once did.`);
- if (canGetPregnant(V.PC)) {
- r.push(knockMeUp(V.PC, 80, 0, -9, true));
- }
- break;
- case 7:
- r.push(`You don't even bother to respond, and head straight for the orgy. You insert yourself into an eager mouth, bending over so the matron following you can take you from behind. The worries of your life as an arcology owner seem very far away as she slides inside you. You only leave when ${V.assistant.name} repeatedly pages you over the arcology's public announcement system. On the way to your office, you notice how full of cum your stomach is, how relaxed your pussy and ass are, and how happy you feel.`);
- if (canGetPregnant(V.PC)) {
- r.push(knockMeUp(V.PC, 100, 0, -9, true));
- }
- break;
- case 8:
- V.gameover = "sisters";
- SugarCube.Engine.play("Gameover");
- break;
- default:
- V.futaAddiction = 0;
+ r.push(`You accept her offer, and she walks seductively over to the interface with the listing of available Sisters, getting down on her knees below it. When you step up to look through the listing, she presses her huge soft tits against your knees`);
+ if (V.PC.dick !== 0) {
+ if (V.PC.vagina !== -1) {
+ r.push(`and nuzzles her plush lips and hot tongue against your womanhood, using one hand to massage your shaft languidly. Perusing the very thorough pictures and videos of the pretty futanari for sale here is arousing enough without a truly masterful oral queen pleasing both your cock and your pussy, and you cum quickly. She drinks your cum rapturously and returns her mouth to your wet cunt, eagerly working to bring more forth.`);
+ } else {
+ r.push(`and snuggles her face between your thighs, nuzzling her nose into your ballsack before licking it with appetite and then sucking each of your balls gently, one by one. Meanwhile one of her clever hands is languidly massaging your shaft, bringing forth a drop of precum which she laps up with appetite. Humming with pleasure, she deepthroats you without apparent effort, her mischievous tongue flicking forward to lap at your scrotum. You blow your load down her throat, and she starts to suck you hard again.`);
+ }
+ } else {
+ r.push(`and trails nibbles and kisses along your inner thighs before nuzzling her plush lips and hot tongue against your womanhood. Perusing the very thorough pictures and videos of the pretty futanari for sale here is arousing enough without a truly masterful cunt pleaser working her magic between your legs, and you've orgasmed before you finish one listing. She prolongs the climax cleverly and then starts to build you towards another.`);
}
+
jQuery("#result").empty().append(r.join(" "));
}
)
);
+
+ if (V.PC.dick !== 0 && V.PC.vagina >= 0 && V.PC.boobs >= 300) {
+ App.UI.DOM.appendNewElement("div", result,
+ App.UI.DOM.link(
+ "Join the Sisters' orgy",
+ () => {
+ r = [];
+ V.futaAddiction += 1;
+ switch (V.futaAddiction) {
+ case 1:
+ r.push(`You agree to spend some time taking part in the Sisters' orgy. The futa matron looks doubtful. "You'd have to agree to act as one of us," she says. "No different. No special sexual treatment." Her voice rises cutely on the last syllable, as you take her enormous dick in one hand and begin to stroke it vigorously. "V-very well," she gasps, taking one of your breasts in each of her hands.`);
+ if (V.PC.vagina === 0) {
+ r.push(`You leave the Sisters' suite a few hours later, <span class="green">leaving your virginity behind.</span> You are tired and a bit sore, but satisfied.`);
+ V.PC.vagina = 1;
+ } else {
+ r.push(`You leave the Sisters' suite after a few hours of fucking and being fucked, feeling tired but satisfied.`);
+ }
+ if (canGetPregnant(V.PC)) {
+ r.push(knockMeUp(V.PC, 5, 0, -9, true));
+ }
+ break;
+ case 2:
+ r.push(`She doesn't have to explain the Sisters' sexual equality this time, or that you have to subject yourself to it. You remember, and you let her know you're willing by giving her a friendly hug that squashes your breasts against each other and rubs your stiff pricks together. She reaches around you to grab your ass, already pulling you towards the pile of futas. You leave the Sisters' suite after a few hours of fucking and being fucked, in a state of total sexual satiation.`);
+ if (canGetPregnant(V.PC)) {
+ r.push(knockMeUp(V.PC, 10, 0, -9, true));
+ }
+ break;
+ case 3:
+ r.push(`She asked that with a distinctly flirty tone, obviously hoping you'd agree again, and she isn't disappointed. You take her by the hand and skip over to the pile of futas, most of which know you very intimately by now. They see their Sister and you approaching, and those of them that don't have their mouths full greet you eagerly. Three of them quickly rearrange themselves to present you with a couple of dicks to sit on and a pussy to fuck, all at once. You leave the Sisters' suite after many hours of fucking and being fucked, tired but satisfied.`);
+ if (canGetPregnant(V.PC)) {
+ r.push(knockMeUp(V.PC, 20, 0, -9, true));
+ }
+ break;
+ case 4:
+ r.push(`She asked that in a knowing voice, confident you'd agree, and was already moving in to kiss you when you did. She seems to want you more than usual today, and pulls you down onto the edge of the pit, guiding your cock into her pussy. She isn't selfish, of course, and reaches around to spread your buttocks so you can get fucked while you fuck. You leave the Sisters' suite after many hours of this, very tired. You wonder when you can make time to visit the Sisters again.`);
+ if (canGetPregnant(V.PC)) {
+ r.push(knockMeUp(V.PC, 40, 0, -9, true));
+ }
+ break;
+ case 5:
+ r.push(`She runs her tongue over her lips as she asks, and sits you down on the edge of the pit and deepthroats you as soon as you agree. She wants your cum, and uses a couple of fingers to tickle your prostate and make it appear faster. You jerk with orgasm, and she pushes your wet cock up against your stomach so she can fuck your pussy. She pauses for a moment, letting a younger Sister enter her ass first. You leave the Sisters' suite after a full day of this, utterly exhausted but eager to return.`);
+ if (canGetPregnant(V.PC)) {
+ r.push(knockMeUp(V.PC, 60, 0, -9, true));
+ }
+ break;
+ case 6:
+ r.push(`You nod, and she turns back towards the orgy, not seeing any reason to lead you, since you know the way. You both sink back into the pile of cocks, pussies, mouths, asses, boobs; the hours go by without you noticing. You leave the Sisters' suite unable to remember specifics, but you clearly fucked and got fucked by every futa there at least once. You're surprised when you learn how long you were there, but the worries of being an arcology owner no longer seem as pressing as they once did.`);
+ if (canGetPregnant(V.PC)) {
+ r.push(knockMeUp(V.PC, 80, 0, -9, true));
+ }
+ break;
+ case 7:
+ r.push(`You don't even bother to respond, and head straight for the orgy. You insert yourself into an eager mouth, bending over so the matron following you can take you from behind. The worries of your life as an arcology owner seem very far away as she slides inside you. You only leave when ${V.assistant.name} repeatedly pages you over the arcology's public announcement system. On the way to your office, you notice how full of cum your stomach is, how relaxed your pussy and ass are, and how happy you feel.`);
+ if (canGetPregnant(V.PC)) {
+ r.push(knockMeUp(V.PC, 100, 0, -9, true));
+ }
+ break;
+ case 8:
+ V.gameover = "sisters";
+ SugarCube.Engine.play("Gameover");
+ break;
+ default:
+ V.futaAddiction = 0;
+ }
+ jQuery("#result").empty().append(r.join(" "));
+ }
+ )
+ );
+ }
} else {
App.UI.DOM.appendNewElement("p", el, `The Futanari Sisters use the same legalistic structures as other slave schools, but are actually very different. They're quite enigmatic, and inquiry into their cult-like methods is politely discouraged. All the Sisters own the institution together, and seem to share the goal of pursuing transformation of themselves to fit the classic futanari fetish — that is, to transform themselves into beautiful, curvaceous women with large dicks. All Sisters remain within the closed society for at least seven years. The Sisters fund themselves by selling members into slavery: interestingly, the more impressive a member is, the older she seems to be when sold; there may be a sort of selection mechanism by which the losers are sold immediately and the winners remain, leading the Sisters. This does not mean that ex-Sisters are unhappy with enslavement. On the contrary, it seems to be an expected stage of their lives, and not shameful.`, "scene-intro");
if (V.TFS.schoolUpgrade !== 0) {
diff --git a/src/neighbor/neighborDisplay.js b/src/neighbor/neighborDisplay.js
index 8e5d962fd1b7d81fe2e2fee7580d6cebfb709a04..ad90dbedb033ba880e4942e08767c967bb623819 100644
--- a/src/neighbor/neighborDisplay.js
+++ b/src/neighbor/neighborDisplay.js
@@ -34,7 +34,7 @@ App.Neighbor.Display = class {
container.appendChild(this._renderGrid());
} else if (V.neighborDisplay === "list-name") {
container.appendChild(this._renderListName());
- } else { // default if $neighborDisplay is unset for some reason; canonically "list"
+ } else { // default if V.neighborDisplay is unset for some reason; canonically "list"
container.appendChild(this._renderListID());
}
return container;
diff --git a/src/npc/agent/agentSelect.tw b/src/npc/agent/agentSelect.tw
deleted file mode 100644
index e337c0d0ba671437a066fa34cdf110e684d62163..0000000000000000000000000000000000000000
--- a/src/npc/agent/agentSelect.tw
+++ /dev/null
@@ -1,11 +0,0 @@
-:: Agent Select [nobr jump-from-safe]
-
-<<set $nextButton = "Back", $nextLink = "Neighbor Interact", $encyclopedia = "Agents">>
-''Appoint an Agent from your devoted slaves:''
-
-<<includeDOM App.UI.SlaveList.slaveSelectionList(
- s => (s.fuckdoll === 0 && s.devotion > 20 && s.intelligence + s.intelligenceImplant > 15 && s.intelligenceImplant >= 15 && canWalk(s) && canSee(s) && canHear(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset")),
- (slave) => App.UI.DOM.passageLink(SlaveFullName(slave), 'Agent Workaround',
- () => { V.i = V.slaves.findIndex((s) => s.ID === slave.ID); }),
- s => App.Entity.facilities.arcologyAgent.manager.slaveHasExperience(s)
- )>>
diff --git a/src/npc/descriptions/limbs.js b/src/npc/descriptions/limbs.js
index e520c22826173e15a37f36143fbbd40c612deea0..4c621ae1e65fdb5a445768c50ee7c014fe849a34 100644
--- a/src/npc/descriptions/limbs.js
+++ b/src/npc/descriptions/limbs.js
@@ -106,7 +106,7 @@ App.Desc.limbChange = function() {
}
/**
- * Displays a selector for prosthetic limbs of getSlave($AS)
+ * Displays a selector for prosthetic limbs of getSlave(V.AS)
* @param {App.Entity.SlaveState} slave
* @param {{}} oldLimbs
* @param {string} [returnTo]
diff --git a/src/npc/generate/generateMarketSlave.js b/src/npc/generate/generateMarketSlave.js
index 8ad6a40d508d6651237758f6a4671641ff91c84f..4f6cafd26f1b6a401a1fb19565f07ac7cc382195 100644
--- a/src/npc/generate/generateMarketSlave.js
+++ b/src/npc/generate/generateMarketSlave.js
@@ -469,7 +469,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
SGProp.race = neighbor.FSSubjugationistRace;
}
if (neighbor.FSRepopulationFocus > 50) {
- genes = "XX"; // "exclusively female" - does not respect $seeDicks
+ genes = "XX"; // "exclusively female" - does not respect V.seeDicks
SGProp.minAge = V.fertilityAge;
}
if (neighbor.FSYouthPreferentialist > 20) {
diff --git a/src/npc/interaction/fAnimal.js b/src/npc/interaction/fAnimal.js
index d56550acdb62f5c6634dd54498e340cc30fe5bee..e835c9e40aa0b1784e43d4d6732aed37cb4a3209 100644
--- a/src/npc/interaction/fAnimal.js
+++ b/src/npc/interaction/fAnimal.js
@@ -15,10 +15,6 @@ App.Interact.fAnimal = function(slave, type) {
ORAL: "oral",
};
- const vaginal = Acts.VAGINAL;
- const anal = Acts.ANAL;
- const oral = Acts.ORAL;
-
const approvingFetishes = ["masochist", "humiliation", "perverted", "sinful"]; // not strictly fetishes, but approvingFetishesAndBehavioralQuirksAndSexualQuirks doesn't have the same ring to it
const animal = V.active[type];
@@ -30,49 +26,49 @@ App.Interact.fAnimal = function(slave, type) {
let hole;
let orifice;
- const anAnimal = animal.articleAn ? `an ${animal.name}` : `a ${animal.name}`;
+ const anAnimal = `${animal.articleAn} ${animal.name}`;
if (slave.assignment === Job.FUCKTOY || slave.assignment === Job.MASTERSUITE) {
if (slave.toyHole === "pussy") {
- act = vaginal;
+ act = Acts.VAGINAL;
} else if (slave.toyHole === "ass") {
- act = anal;
+ act = Acts.ANAL;
} else if (slave.toyHole === "mouth") {
- act = oral;
+ act = Acts.ORAL;
} else {
if (canDoVaginal(slave)) {
- act = vaginal;
+ act = Acts.VAGINAL;
} else if (canDoAnal(slave)) {
- act = anal;
+ act = Acts.ANAL;
} else {
- act = oral;
+ act = Acts.ORAL;
}
}
} else if (canDoVaginal(slave)) {
- act = vaginal;
+ act = Acts.VAGINAL;
} else if (canDoAnal(slave)) {
- act = anal;
+ act = Acts.ANAL;
} else {
- act = oral;
+ act = Acts.ORAL;
}
const slaveApproves = () =>
approvingFetishes.includes(slave.fetish) ||
approvingFetishes.includes(slave.sexualQuirk) ||
approvingFetishes.includes(slave.behavioralQuirk) ||
- slave.fetish === "buttslut" && act === anal ||
- slave.fetish === "cumslut" && act === oral ||
- slave.sexualQuirk === "gagfuck queen" && act === oral;
+ slave.fetish === "buttslut" && act === Acts.ANAL ||
+ slave.fetish === "cumslut" && act === Acts.ORAL ||
+ slave.sexualQuirk === "gagfuck queen" && act === Acts.ORAL;
switch (act) {
- case oral:
+ case Acts.ORAL:
orifice = () => either("mouth", "throat");
break;
- case vaginal:
+ case Acts.VAGINAL:
orifice = () => either("pussy", "cunt");
hole = 0;
break;
- case anal:
+ case Acts.ANAL:
orifice = () => either("asshole", "rectum");
hole = 1;
break;
@@ -80,17 +76,17 @@ App.Interact.fAnimal = function(slave, type) {
throw new Error(`Unexpected act type '${act}' in fAnimal()`);
}
- if (slave.fetish === "cumslut" && act === oral) {
+ if (slave.fetish === "cumslut" && act === Acts.ORAL) {
fetishDesc = `getting to drink more cum`;
} else if (slave.fetish === "humiliation") {
fetishDesc = `committing such a humiliating act`;
- } else if (slave.fetish === "buttslut" && act === anal) {
+ } else if (slave.fetish === "buttslut" && act === Acts.ANAL) {
fetishDesc = `getting to take a cock up ${his} ass`;
} else if (slave.fetish === "masochist") {
fetishDesc = `committing such a painful act`;
} else if (slave.sexualQuirk === "perverted") {
fetishDesc = `committing such a perverted act`;
- } else if (slave.sexualQuirk === "gagfuck queen" && act === oral) {
+ } else if (slave.sexualQuirk === "gagfuck queen" && act === Acts.ORAL) {
fetishDesc = `getting to suck more dick`;
} else if (slave.behavioralQuirk === "sinful") {
fetishDesc = `committing such a sinful act`;
@@ -121,9 +117,9 @@ App.Interact.fAnimal = function(slave, type) {
r.push(`You order another slave to bring ${slave.slaveName} over. Once ${he} is situated, you`);
}
- r.push(`tell ${him} you want to watch ${him} ${act === oral ?
+ r.push(`tell ${him} you want to watch ${him} ${act === Acts.ORAL ?
`suck off` :
- act === vaginal ?
+ act === Acts.VAGINAL ?
`get fucked by` :
`get fucked in the ass by`} ${anAnimal}. `);
@@ -152,14 +148,14 @@ App.Interact.fAnimal = function(slave, type) {
function introDevoted() {
const mainSpan = document.createElement("span");
- if (act === oral) {
+ if (act === Acts.ORAL) {
if (slaveApproves()) {
mainSpan.append(`${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`}. `);
} else {
mainSpan.append(`${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. `);
}
} else {
- if ((act === vaginal && slave.vagina > 0) || (act === anal && slave.anus > 0)) {
+ if ((act === Acts.VAGINAL && slave.vagina > 0) || (act === Acts.ANAL && slave.anus > 0)) {
if (slaveApproves()) {
mainSpan.append(`${slave.slaveName}'s face visibly brightens at the thought of ${fetishDesc}, even if the dick is an animal's. `);
} else {
@@ -180,14 +176,14 @@ App.Interact.fAnimal = function(slave, type) {
function introNondevoted() {
const mainSpan = document.createElement("span");
- if (act === oral) {
+ if (act === Acts.ORAL) {
if (slaveApproves()) {
mainSpan.append(`${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 {
mainSpan.append(`${slave.slaveName} tries in vain to conceal ${his} horror at the thought of blowing an animal, but quickly regains ${his} composure. `);
}
} else {
- if ((act === vaginal && slave.vagina > 0) || (act === anal && slave.anus > 0)) {
+ if ((act === Acts.VAGINAL && slave.vagina > 0) || (act === Acts.ANAL && slave.anus > 0)) {
if (slaveApproves()) {
mainSpan.append(`${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. `);
} else {
@@ -195,9 +191,9 @@ App.Interact.fAnimal = function(slave, type) {
}
} else {
if (slaveApproves()) {
- mainSpan.append(`${slave.slaveName} clearly has some reservations about having ${his} ${act === anal ? `anal ` : ``}virginity taken by ${anAnimal}, but the thought of ${fetishDesc} is enough to make agree to comply. `);
+ mainSpan.append(`${slave.slaveName} clearly has some reservations about having ${his} ${act === Acts.ANAL ? `anal ` : ``}virginity taken by ${anAnimal}, but the thought of ${fetishDesc} is enough to make agree to comply. `);
} else {
- mainSpan.append(`${slave.slaveName} tries in vain to conceal ${his} horror at the thought of having ${his} precious ${act === anal ? `rosebud` : `pearl`} taken by a beast, but quickly regains ${his} composure. `);
+ mainSpan.append(`${slave.slaveName} tries in vain to conceal ${his} horror at the thought of having ${his} precious ${act === Acts.ANAL ? `rosebud` : `pearl`} taken by a beast, but quickly regains ${his} composure. `);
}
}
}
@@ -208,14 +204,14 @@ App.Interact.fAnimal = function(slave, type) {
function introNonresistant() {
const mainSpan = document.createElement("span");
- if (act === oral) {
+ if (act === Acts.ORAL) {
if (slaveApproves()) {
mainSpan.append(`${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 {
mainSpan.append(`${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 === vaginal && slave.vagina > 0) || (act === anal && slave.anus > 0)) {
+ if ((act === Acts.VAGINAL && slave.vagina > 0) || (act === Acts.ANAL && slave.anus > 0)) {
if (slaveApproves()) {
mainSpan.append(`${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 {
@@ -223,9 +219,9 @@ App.Interact.fAnimal = function(slave, type) {
}
} else {
if (slaveApproves()) {
- mainSpan.append(`${slave.slaveName} clearly has some reservations about having ${his} ${act === anal ? `anal ` : ``}virginity taken by ${anAnimal}, but the thought of ${fetishDesc} is enough to make agree to comply. `);
+ mainSpan.append(`${slave.slaveName} clearly has some reservations about having ${his} ${act === Acts.ANAL ? `anal ` : ``}virginity taken by ${anAnimal}, but the thought of ${fetishDesc} is enough to make agree to comply. `);
} else {
- mainSpan.append(`${slave.slaveName} tries in vain to conceal ${his} horror at the thought of having ${his} precious ${act === anal ? `rosebud` : `pearl`} taken by a beast${canWalk(slave) ? `, and only the threat of worse punishment keeps ${him} from running away as fast as ${he} can` : ``}. `);
+ mainSpan.append(`${slave.slaveName} tries in vain to conceal ${his} horror at the thought of having ${his} precious ${act === Acts.ANAL ? `rosebud` : `pearl`} taken by a beast${canWalk(slave) ? `, and only the threat of worse punishment keeps ${him} from running away as fast as ${he} can` : ``}. `);
}
}
}
@@ -264,7 +260,7 @@ App.Interact.fAnimal = function(slave, type) {
mainSpan = document.createElement("span"),
r = [];
- if (act === oral) {
+ if (act === Acts.ORAL) {
r.push(`You have ${him} kneel on the floor before calling in the ${animal.name}. The beast slowly saunters up to the slave where ${he} waits, showing little concern when the slave reaches out and begins masturbating it to begin the process of getting the animal hard. Once the ${animal.name} is hard enough, ${slave.slaveName} takes its cock and begins to give it a few tentative licks before finally putting it in ${his} mouth. `);
} else {
r.push(`You have ${him} ${slave.clothes !== "no clothing" ? `take off ${his} clothes and ` : ``}get on the floor, ass in the air, before calling in the ${animal.name}. The beast slowly saunters up to the slave, where it takes only a few short moments for its animal brain to realize that what it is standing behind is a warm hole that needs to be filled with seed. `);
@@ -284,12 +280,12 @@ App.Interact.fAnimal = function(slave, type) {
throw new Error(`Unexpected animal type '${animal}' in consummationDevoted()`);
}
- if (act !== oral) {
+ if (act !== Acts.ORAL) {
mainSpan.append(virginityCheck(act));
}
function consummationDevotedCanine(type) {
- if (type === oral) {
+ if (type === Acts.ORAL) {
if (slaveApproves()) {
r.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 {
@@ -302,12 +298,12 @@ App.Interact.fAnimal = function(slave, type) {
r.push(`The canine takes a few curious sniffs, then lines up its large cock with ${slave.slaveName}'s ${orifice()}. `);
}
- r.push(`It takes a few tries, but the ${animal.name} finally manages to sink its cock into ${his} ${slaveApproves() && act === vaginal ? `wet ` : ``}${orifice()} and begin to hammer away in the way that only canines can. `);
+ r.push(`It takes a few tries, but the ${animal.name} finally manages to sink its cock into ${his} ${slaveApproves() && act === Acts.VAGINAL ? `wet ` : ``}${orifice()} and begin to hammer away in the way that only canines can. `);
}
}
function consummationDevotedHooved(type) {
- if (type === oral) {
+ if (type === Acts.ORAL) {
if (slaveApproves()) {
r.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 {
@@ -319,7 +315,7 @@ App.Interact.fAnimal = function(slave, type) {
}
function consummationDevotedFeline(type) {
- if (type === oral) {
+ if (type === Acts.ORAL) {
if (slaveApproves()) {
r.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 {
@@ -340,7 +336,7 @@ App.Interact.fAnimal = function(slave, type) {
mainSpan = document.createElement("span"),
r = [];
- if (act === oral) {
+ if (act === Acts.ORAL) {
r.push(`You tell ${him} to kneel on the floor before calling in the ${animal.name}. The beast slowly saunters up to the slave where ${he} waits, showing little concern when the slave hesitantly reaches out and begins masturbating it to begin the process of getting the animal hard. Once the ${animal.name} is hard enough, ${slave.slaveName} takes its cock, and, after taking a moment to steel ${his} resolve, begins to give it a few reluctant licks before putting it in ${his} mouth. `);
} else {
r.push(`You tell ${him} to ${slave.clothes !== "no clothing" ? `take off ${his} clothes and ` : ``}get on the floor, ass in the air, before calling in the ${animal.name}. The beast slowly saunters up to the slave, where it takes only a few seconds for its animal brain to realize that what it is standing behind is a warm hole that needs to be filled with seed. `);
@@ -360,12 +356,12 @@ App.Interact.fAnimal = function(slave, type) {
throw new Error(`Unexpected animal type '${animal}' in consummationDevoted()`);
}
- if (act !== oral) {
+ if (act !== Acts.ORAL) {
mainSpan.append(virginityCheck(act));
}
function consummationNondevotedCanine(type) {
- if (type === oral) {
+ if (type === Acts.ORAL) {
if (slaveApproves()) {
r.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 {
@@ -378,12 +374,12 @@ App.Interact.fAnimal = function(slave, type) {
r.push(`The canine takes a few curious sniffs, then lines up its large cock with ${slave.slaveName}'s ${orifice()}. `);
}
- r.push(`It takes a few tries, but the ${animal.name} finally manages to sink its cock into ${his} ${slaveApproves() && act === vaginal ? `wet ` : ``}${orifice()} and begin to hammer away in the way that only canines can. `);
+ r.push(`It takes a few tries, but the ${animal.name} finally manages to sink its cock into ${his} ${slaveApproves() && act === Acts.VAGINAL ? `wet ` : ``}${orifice()} and begin to hammer away in the way that only canines can. `);
}
}
function consummationNondevotedHooved(type) {
- if (type === oral) {
+ if (type === Acts.ORAL) {
if (slaveApproves()) {
r.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 {
@@ -395,7 +391,7 @@ App.Interact.fAnimal = function(slave, type) {
}
function consummationNondevotedFeline(type) {
- if (type === oral) {
+ if (type === Acts.ORAL) {
if (slaveApproves()) {
r.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 {
@@ -416,7 +412,7 @@ App.Interact.fAnimal = function(slave, type) {
mainSpan = document.createElement("span"),
r = [];
- if (act === oral) {
+ if (act === Acts.ORAL) {
r.push(`You force ${him} to kneel on the floor before calling in the ${animal.name}. The beast slowly saunters up to the slave where ${he} waits, showing little concern when the slave reluctantly reaches out and begins masturbating it to begin the process of getting the animal hard. Once the ${animal.name} is hard enough, ${slave.slaveName} takes its cock and begins to give it a few tentative licks before finally putting it in ${his} mouth. `);
} else {
r.push(`You force ${him} to ${slave.clothes !== "no clothing" ? `take off ${his} clothes and ` : ``}get on the floor, ass in the air, before calling in the ${animal.name}. The beast slowly saunters up to the slave, where it takes only a few short moments for its animal brain to realize that what it is standing behind is a warm hole that needs to be filled with seed. `);
@@ -436,12 +432,12 @@ App.Interact.fAnimal = function(slave, type) {
throw new Error(`Unexpected animal type '${animal}' in consummationNonresistant()`);
}
- if (act !== oral) {
+ if (act !== Acts.ORAL) {
mainSpan.append(virginityCheck(act));
}
function consummationNonresistantCanine(type) {
- if (type === oral) {
+ if (type === Acts.ORAL) {
if (slaveApproves()) {
r.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 {
@@ -454,12 +450,12 @@ App.Interact.fAnimal = function(slave, type) {
r.push(`The canine takes a few curious sniffs, then lines up its large cock with ${slave.slaveName}'s ${orifice()}. `);
}
- r.push(`It takes a few tries, but the ${animal.name} finally manages to sink its cock into ${his} ${slaveApproves() && act === vaginal ? `wet ` : ``}${orifice()} and begin to hammer away in the way that only canines can. `);
+ r.push(`It takes a few tries, but the ${animal.name} finally manages to sink its cock into ${his} ${slaveApproves() && act === Acts.VAGINAL ? `wet ` : ``}${orifice()} and begin to hammer away in the way that only canines can. `);
}
}
function consummationNonresistantHooved(type) {
- if (type === oral) {
+ if (type === Acts.ORAL) {
if (slaveApproves()) {
r.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 {
@@ -471,7 +467,7 @@ App.Interact.fAnimal = function(slave, type) {
}
function consummationNonresistantFeline(type) {
- if (type === oral) {
+ if (type === Acts.ORAL) {
if (slaveApproves()) {
r.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 {
@@ -492,7 +488,7 @@ App.Interact.fAnimal = function(slave, type) {
mainSpan = document.createElement("span"),
r = [];
- if (act === oral) {
+ if (act === Acts.ORAL) {
r.push(`You have to physically force ${him} to kneel on the floor before calling in the ${animal.name}. The beast slowly saunters up to the slave where ${he} is restrained, showing little concern when another slave reaches out and begins masturbating it to begin the process of getting the animal hard. Once the ${animal.name} is hard enough, the slave takes its cock and lines it up with ${slave.slaveName}'s mouth. The animal needs no prompting, and thrusts itself into ${his} ring-gagged mouth. `);
} else {
r.push(`You have to physically force ${him} to ${slave.clothes !== "no clothing" ? `take off ${his} clothes and ` : ``} get on the floor, ass in the air and restraints around ${his} wrists and ankles, before calling in the ${animal.name}. The beast slowly saunters up to the slave, where it takes only a few short moments for its animal brain to realize that what it is standing behind is a warm hole that needs to be filled with seed. `);
@@ -512,12 +508,12 @@ App.Interact.fAnimal = function(slave, type) {
throw new Error(`Unexpected animal type '${animal}' in consummationResistant()`);
}
- if (act !== oral) {
+ if (act !== Acts.ORAL) {
mainSpan.append(virginityCheck(act));
}
function consummationResistantCanine(type) {
- if (type === oral) {
+ if (type === Acts.ORAL) {
if (slaveApproves()) {
r.push(`The slave glares daggers at you as ${he} takes the full length of the canine's cock in ${his} mouth, but ${slave.dick ?
canAchieveErection(slave) ?
@@ -537,12 +533,12 @@ App.Interact.fAnimal = function(slave, type) {
r.push(`The canine takes a few curious sniffs, then lines up its large cock with ${slave.slaveName}'s ${orifice()}. `);
}
- r.push(`It takes a few tries, but the ${animal.name} finally manages to sink its cock into ${his} ${slaveApproves() && act === vaginal ? `wet ` : ``}${orifice()} and begin to hammer away in the way that only canines can. `);
+ r.push(`It takes a few tries, but the ${animal.name} finally manages to sink its cock into ${his} ${slaveApproves() && act === Acts.VAGINAL ? `wet ` : ``}${orifice()} and begin to hammer away in the way that only canines can. `);
}
}
function consummationResistantHooved(type) {
- if (type === oral) {
+ if (type === Acts.ORAL) {
if (slaveApproves()) {
r.push(`The slave glares daggers at you as ${he} takes the full length of the ${animal.name}'s cock in ${his} mouth, but ${slave.dick ?
canAchieveErection(slave) ?
@@ -561,7 +557,7 @@ App.Interact.fAnimal = function(slave, type) {
}
function consummationResistantFeline(type) {
- if (type === oral) {
+ if (type === Acts.ORAL) {
if (slaveApproves()) {
r.push(`The slave glares daggers at you as ${he} takes the full length of the feline's cock in ${his} mouth, but ${slave.dick ?
canAchieveErection(slave) ?
@@ -608,28 +604,28 @@ App.Interact.fAnimal = function(slave, type) {
throw new Error(`Unexpected animal type '${animal}' in completion()`);
}
- if (act !== oral && canGetPregnant(slave) && canBreed(slave, animal)) {
+ if (act !== Acts.ORAL && canGetPregnant(slave) && canBreed(slave, animal)) {
knockMeUp(slave, 5, hole, -8);
}
function completionCanine() {
- if (act === oral) {
+ if (act === Acts.ORAL) {
r.push(`The ${animal.species === "dog" ? `hound` : animal.name} wastes no time in beginning to hammer away at ${his} ${orifice()}, 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. `);
} else {
- r.push(`The ${animal.species === "dog" ? `hound` : animal.name} wastes no time in beginning to hammer away at ${his} ${orifice()}, 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 === vaginal && slave.vagina < 3 || act === anal && slave.anus < 2 ?
+ r.push(`The ${animal.species === "dog" ? `hound` : animal.name} wastes no time in beginning to hammer away at ${his} ${orifice()}, 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()}` :
orifice()}, causing a thick stream of cum to slide out of it. Having finished its business, the ${animal.name} runs off, presumably in search of food. `);
}
switch (act) {
- case oral:
+ case Acts.ORAL:
slave.counter.oral++;
break;
- case vaginal:
+ case Acts.VAGINAL:
slave.counter.vaginal++;
slave.vagina = slave.vagina < 3 ? 3 : slave.vagina;
break;
- case anal:
+ case Acts.ANAL:
slave.counter.anal++;
slave.anus = slave.anus < 2 ? 2 : slave.anus;
break;
@@ -639,21 +635,21 @@ App.Interact.fAnimal = function(slave, type) {
}
function completionHooved() {
- if (act === oral) {
+ if (act === Acts.ORAL) {
r.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. `);
} else {
- r.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 === 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. `);
+ r.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. `);
}
switch (act) {
- case oral:
+ case Acts.ORAL:
slave.counter.oral++;
break;
- case vaginal:
+ case Acts.VAGINAL:
slave.counter.vaginal++;
slave.vagina = slave.vagina < 4 ? 4 : slave.vagina;
break;
- case anal:
+ case Acts.ANAL:
slave.counter.anal++;
slave.anus = slave.anus < 3 ? 3 : slave.anus;
break;
@@ -663,7 +659,7 @@ App.Interact.fAnimal = function(slave, type) {
}
function completionFeline() {
- if (act === oral) {
+ if (act === Acts.ORAL) {
r.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. `);
} else {
r.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. `);
@@ -672,14 +668,14 @@ App.Interact.fAnimal = function(slave, type) {
healthDamage(slave, 1);
switch (act) {
- case oral:
+ case Acts.ORAL:
slave.counter.oral++;
return;
- case vaginal:
+ case Acts.VAGINAL:
slave.counter.vaginal++;
slave.vagina = slave.vagina < 2 ? 2 : slave.vagina;
return;
- case anal:
+ case Acts.ANAL:
slave.counter.anal++;
slave.anus = slave.anus < 1 ? 1 : slave.anus;
return;
@@ -702,21 +698,21 @@ App.Interact.fAnimal = function(slave, type) {
if (jsRandom(1, 100) > 100 + slave.devotion) {
switch (act) {
- case oral:
+ case Acts.ORAL:
if (slave.energy < 95 && slave.sexualFlaw !== "hates oral") {
mainSpan.append(`Having ${anAnimal} fuck ${his} throat by force has given ${him} a hatred of oral sex. `);
}
slave.sexualFlaw = "hates oral";
break;
- case vaginal:
+ case Acts.VAGINAL:
if (slave.energy < 95 && slave.sexualFlaw !== "hates penetration") {
mainSpan.append(`Having ${anAnimal} fuck ${him} by force has given ${him} a hatred of penetration. `);
}
slave.sexualFlaw = "hates penetration";
break;
- case anal:
+ case Acts.ANAL:
if (slave.energy < 95 && slave.sexualFlaw !== "hates anal") {
mainSpan.append(`Having ${anAnimal} fuck ${his} asshole by force has given ${him} a hatred of anal penetration. `);
}
@@ -736,8 +732,8 @@ App.Interact.fAnimal = function(slave, type) {
mainSpan = document.createElement("span"),
r = [];
- if (act !== oral) {
- if (act === vaginal) {
+ if (act !== Acts.ORAL) {
+ if (act === Acts.VAGINAL) {
if (slave.vagina === 3) {
r.push(`${capFirstChar(animal.name)} cum drips out of ${his} fucked-out hole. `);
} else if (slave.vagina === 2) {
@@ -832,8 +828,8 @@ App.Interact.fAnimal = function(slave, type) {
virginityLossSpan = App.UI.DOM.makeElement("span", '', ["virginity", "loss"]);
switch (type) {
- case vaginal:
- if (act === vaginal && slave.vagina === 0) {
+ case Acts.VAGINAL:
+ if (act === Acts.VAGINAL && slave.vagina === 0) {
virginityLossSpan.append(`${his} virginity is taken from ${him}${slave.devotion < -20 ? ` by force` : ``}. `);
mainSpan.append(`The slave gives a loud ${slave.devotion > 20 ? `moan` : `groan`} as `, virginityLossSpan, ` `);
@@ -842,8 +838,8 @@ App.Interact.fAnimal = function(slave, type) {
}
return mainSpan;
- case anal:
- if (act === anal && slave.anus === 0) {
+ case Acts.ANAL:
+ if (act === Acts.ANAL && slave.anus === 0) {
mainSpan.append(`The slave gives a loud ${slave.devotion > 20 ? `moan` : `groan`} as ${his} anal virginity is taken from ${him}${slave.devotion < -20 ? ` by force` : ``}. `);
mainSpan.append(virginityEffects(type));
@@ -863,7 +859,7 @@ App.Interact.fAnimal = function(slave, type) {
healthSpan = App.UI.DOM.makeElement("span", '', ["health", "dec"]);
switch (type) {
- case vaginal:
+ case Acts.VAGINAL:
if (slave.devotion >= -20) {
if (slaveApproves()) {
devotionSpan.classList.add("devotion", "inc");
@@ -926,7 +922,7 @@ App.Interact.fAnimal = function(slave, type) {
healthDamage(slave, 5);
return mainSpan;
- case anal:
+ case Acts.ANAL:
if (slave.devotion >= -20) {
if (slaveApproves()) {
devotionSpan.classList.add("devotion", "inc");
diff --git a/src/npc/interaction/killSlave.tw b/src/npc/interaction/killSlave.tw
deleted file mode 100644
index 7b1327b99eb466fdfcceb6cc6ed56cb6fe077e18..0000000000000000000000000000000000000000
--- a/src/npc/interaction/killSlave.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: KillSlave [nobr]
-
-<<includeDOM App.UI.SlaveInteract.killSlave(getSlave($AS))>>
diff --git a/src/npc/interaction/passage/birthStorm.tw b/src/npc/interaction/passage/birthStorm.tw
deleted file mode 100644
index c083ae497bae8b1a90794713c0201f5fad278547..0000000000000000000000000000000000000000
--- a/src/npc/interaction/passage/birthStorm.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: BirthStorm [nobr]
-
-<<set $nextButton = "Back", $nextLink = "Slave Interact">>
-
-<<includeDOM birth(getSlave(V.AS), {birthStorm: true})>>
diff --git a/src/npc/interaction/passage/csec.tw b/src/npc/interaction/passage/csec.tw
deleted file mode 100644
index 9b82c7aa9b7b764da02cf3f09bafa164f855f78c..0000000000000000000000000000000000000000
--- a/src/npc/interaction/passage/csec.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: csec [nobr]
-
-<<set $nextButton = "Back", $nextLink = "Slave Interact">>
-
-<<includeDOM birth(getSlave(V.AS), {cSection: true})>>
\ No newline at end of file
diff --git a/src/npc/interaction/slaveOnSlaveFeeding/slaveOnSlaveFeeding.tw b/src/npc/interaction/slaveOnSlaveFeeding/slaveOnSlaveFeeding.tw
deleted file mode 100644
index eb76ca5c03a99a60215323121d4b4953c300fc74..0000000000000000000000000000000000000000
--- a/src/npc/interaction/slaveOnSlaveFeeding/slaveOnSlaveFeeding.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: SlaveOnSlaveFeeding [nobr]
-
-<<set $nextButton = "Back", $nextLink = "Slave Interact">>
-
-<<includeDOM App.UI.SlaveInteract.slaveOnSlaveFeedingSelection(getSlave($AS))>>
diff --git a/src/npc/startingGirls/startingGirls.js b/src/npc/startingGirls/startingGirls.js
index 10c209d4dca62a800339ec28c6379b4630d5bce6..68a7b5c4a16e33fd562169d777b805234d83f896 100644
--- a/src/npc/startingGirls/startingGirls.js
+++ b/src/npc/startingGirls/startingGirls.js
@@ -498,7 +498,7 @@ App.StartingGirls.applyPlayerOrigin = function(slave) {
slave.origin = "$He was the result of unprotected sex with a customer. $His mother abandoned your child on the brothel's doorstep.";
slave.custom.tattoo = "$He has your ID number tattooed on $his right breast.";
} else {
- if (slave.actualAge >= V.PC.age + 10) {
+ if (slave.actualAge >= V.PC.actualAge + 10) {
slave.origin = "$He was a fellow prostitute who was like a parent to you.";
} else {
slave.origin = "$He was a fellow underage prostitute you often played with.";
@@ -1061,7 +1061,6 @@ App.StartingGirls.physical = function(slave) {
App.StartingGirls.profile = function(slave) {
const el = new DocumentFragment();
let options = new App.UI.OptionsGroup();
- let r;
let option;
const {His} = getPronouns(slave);
@@ -1158,19 +1157,24 @@ App.StartingGirls.profile = function(slave) {
});
option = options.addOption("Prestige", "prestige", slave)
- .addValueList([["None", 0], ["Locally known", 1], ["Regionally famous", 2], ["World renowned", 3]]);
+ .addValueList([
+ ["None", 0],
+ ["Locally known", 1],
+ ["Regionally famous", 2],
+ ["World renowned", 3]
+ ]);
if (slave.prestige > 0) {
- r = [];
+ const r = [];
r.push("Starting slaves incur an extreme cost penalty for prestige. This slave's");
if (slave.actualAge >= 25) {
if (slave.actualAge > 35) {
- r.push(" advanced");
+ r.push("advanced");
}
- r.push(" age decreases the penalty.");
+ r.push("age decreases the penalty.");
} else {
- r.push(" young age requires paying the full penalty.");
+ r.push("young age requires paying the full penalty.");
}
- option.addComment(`<span class=warning>${r.join(" ")}</span>`);
+ option.addComment(`<span class="warning">${r.join(" ")}</span>`);
}
options.addOption(`${His} nationality is`, "nationality", slave).showTextBox()
@@ -1197,7 +1201,7 @@ App.StartingGirls.profile = function(slave) {
.addComment("Prevent Starting Girls from overwriting custom origin and tattoo with its defaults.");
if (slave.prestige) {
- options.addOption("Prestige description", "prestigeDesc", V).showTextBox().addComment("Use complete, capitalized and punctuated sentences.");
+ options.addOption("Prestige description", "prestigeDesc", slave).showTextBox().addComment("Use complete, capitalized and punctuated sentences.");
}
options.addOption("Description", "desc", slave.custom).showTextBox().addComment("Use complete, capitalized and punctuated sentences.");
options.addOption("Label", "label", slave.custom).showTextBox().addComment("Use a short phrase");
@@ -1244,7 +1248,7 @@ App.StartingGirls.mental = function(slave) {
} else {
r.push("young age requires paying the full penalty.");
}
- option.addComment(`<span class=warning>${r.join(" ")}</span>`);
+ option.addComment(`<span class="warning">${r.join(" ")}</span>`);
}
options.addOption("Trust", "trust", slave).showTextBox()
diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js
index 63e88a47b9a08a7fe9b00c94b5d618821edf11b6..25b76da113b47acca9c5a3b6a5c9d1e381308643 100644
--- a/src/player/js/PlayerState.js
+++ b/src/player/js/PlayerState.js
@@ -983,7 +983,7 @@ App.Entity.PlayerState = class PlayerState {
*/
this.readyOva = 0;
/** exclusive variable
- * (uncommon in events)($PC.preg >= 28)
+ * (uncommon in events)(V.PC.preg >= 28)
* how you act when heavily pregnant
* * 0 - no change
* * 1 - submissive and motherly
diff --git a/src/pregmod/beastFucked.tw b/src/pregmod/beastFucked.tw
deleted file mode 100644
index 29e64e842d9b31af59617d31a2bbf8291313915d..0000000000000000000000000000000000000000
--- a/src/pregmod/beastFucked.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: BeastFucked [nobr]
-
-<<includeDOM App.Interact.fAnimal(getSlave($AS), $animalType)>>
diff --git a/src/pregmod/seDeath.tw b/src/pregmod/seDeath.tw
deleted file mode 100644
index 0aa3e98c7c554378bcd5712ee0730a4b896521ec..0000000000000000000000000000000000000000
--- a/src/pregmod/seDeath.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: SE Death [nobr]
-
-<<set $nextButton = "Continue", $nextLink = "Scheduled Event">>
-
-<<includeDOM allDeaths()>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 9385414d4e09825bcead5ba8a45bd4c75455a3a4..83afff5c798fdf56d19a58b6e6cabc9fcfd12373 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1011,7 +1011,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<set $slaves[$slaveIndices[$subSlave.ID]] = $subSlave>>
<</replace>>
<</link>> //This will cost <<print cashFormat(500)>>//
-<<if $AttendantID != $activeSlave.ID && $AttendantID != $subSlave.ID>>
+<<if $AttendantID != 0 && $AttendantID != $activeSlave.ID && $AttendantID != $subSlave.ID>>
<br><<link "Give them a night at the Spa together">>
<<set _clothesTemp = $activeSlave.clothes, $activeSlave.clothes = "no clothing">>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index 9e0239302b3c79b3dcf6e88eea3fd801050e5c04..d69dc78e57ba8540e329c8c18fbf88caa08e751d 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -565,7 +565,7 @@
<</if>>
<<if _slave.foreskin > 0>> <<set _slave.foreskin = _slave.dick>> <</if>>
<<set _slave.preg = -3>>
- <<if $TFS.farmUpgrade != 0>>
+ <<if $TFS.farmUpgrade > 0>>
<<set _slave.ovaries = 1>>
<<if $TFS.farmUpgrade >= 2>>
<<set _slave.preg = random(1,41)>>
@@ -641,7 +641,7 @@
<<set _slave.anus = 3>>
<<set _slave.fetish = "dom">>
<<set _slave.preg = -3>>
- <<if $TFS.farmUpgrade != 0>>
+ <<if $TFS.farmUpgrade > 0>>
<<set _slave.ovaries = 1>>
<<if $TFS.farmUpgrade >= 2>>
<<set _slave.preg = random(1,41)>>
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
deleted file mode 100644
index 662b7abb69484c8d982fcd4bf31a37733e7507a6..0000000000000000000000000000000000000000
--- a/src/uncategorized/rulesAssistant.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: Rules Assistant [nobr jump-to-safe jump-from-safe]
-
-<<run html5passage(rulesAssistantOptions)>>
diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw
deleted file mode 100644
index ad8e39fce25d28e8d32e36d87f2121abceef402b..0000000000000000000000000000000000000000
--- a/src/uncategorized/seBirth.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: SE Birth [nobr]
-
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Scheduled Event">>
-
-<<includeDOM allBirths()>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
deleted file mode 100644
index aea8b167fc824af6937dd5e2a7ee5102faea00a7..0000000000000000000000000000000000000000
--- a/src/uncategorized/slaveInteract.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: Slave Interact [nobr jump-from-safe]
-
-<<set $nextButton = "Confirm changes", $nextLink = "Main">>
-
-<<includeDOM App.UI.SlaveInteract.mainPage(getSlave(V.AS))>>
diff --git a/src/uncategorized/tfsFarmUpgrade.tw b/src/uncategorized/tfsFarmUpgrade.tw
index 2513fa3268fcaa01ade5e2b3860b365a6b2b55a6..d2f11d88994a3eb086dee29f0c134a45a0fe4afc 100644
--- a/src/uncategorized/tfsFarmUpgrade.tw
+++ b/src/uncategorized/tfsFarmUpgrade.tw
@@ -30,14 +30,14 @@ whether we will use contraception after we are transformed." She shudders sudden
<span id="result">
<<link "Permit them access, but tell them to use contraception">>
<<replace "#result">>
- You signify your assent, telling the Sister that the organ farm will accept seed tissue from any of them for the purpose of fabricating ovaries. To your mild surprise, she responds by breaking down into cutely inelegant crying. You add that you think the Sisters are beautiful as they are, and recruits will continue to approach them; it's not necessary for them to go through the rigors of pregnancy. It takes her a long time to manage to thank to properly, and she hurries to end the call before she can embarrass herself further.
+ You signify your assent, telling the Sister that the organ farm will accept seed tissue from any of them for the purpose of fabricating ovaries. To your mild surprise, she responds by breaking down into cutely inelegant crying. You add that you think the Sisters are beautiful as they are, and recruits will continue to approach them; it's not necessary for them to go through the rigors of pregnancy. It takes her a long time to manage to thank you properly, and she hurries to end the call before she can embarrass herself further.
<<set $TFS.farmUpgrade = 1>>
<</replace>>
<</link>>
<<if $seePreg != 0>>
<br><<link "Permit them access, and encourage them to get pregnant">>
<<replace "#result">>
- You signify your assent, telling the Sister that the organ farm will accept seed tissue from any of them for the purpose of fabricating ovaries. To your mild surprise, she responds with cutely inelegant crying. You add that you think the world needs more Futanari Sisters, especially ones as cute and sexy as you're confident her many daughters will be. At that, she breaks down completely, one of her hands going to rub her belly gently. It takes her a long time to manage to thank to properly, and she hurries to end the call before she can embarrass herself further.<<if $arcologies[0].FSRestartDecoration == 100 && $eugenicsFullControl != 1>> The Societal Elite are @@.red;outraged@@ that you would not only allow such a breach of eugenics to occur, but encourage it.<</if>>
+ You signify your assent, telling the Sister that the organ farm will accept seed tissue from any of them for the purpose of fabricating ovaries. To your mild surprise, she responds with cutely inelegant crying. You add that you think the world needs more Futanari Sisters, especially ones as cute and sexy as you're confident her many daughters will be. At that, she breaks down completely, one of her hands going to rub her belly gently. It takes her a long time to manage to thank you properly, and she hurries to end the call before she can embarrass herself further.<<if $arcologies[0].FSRestartDecoration == 100 && $eugenicsFullControl != 1>> The Societal Elite are @@.red;outraged@@ that you would not only allow such a breach of eugenics to occur, but encourage it.<</if>>
<<set $TFS.farmUpgrade = 2>>
<<if $arcologies[0].FSRestart != "unset" && $eugenicsFullControl != 1>>
<<set $failedElite += 275>>
@@ -47,7 +47,7 @@ whether we will use contraception after we are transformed." She shudders sudden
<<if $seeHyperPreg == 1>>
<br><<link "Permit them access, and encourage them to embrace hyperpregnancy.">>
<<replace "#result">>
- You signify your assent, telling the Sister that the organ farm will accept seed tissue from any of them for the purpose of fabricating ovaries, so long as they are willing to bear as many children as they can handle. To your mild surprise, she responds with cutely inelegant crying. You add that you think the world needs many more Futanari Sisters, especially ones as cute and sexy as you're confident her countless daughters will be. At that, she breaks down completely, one of her hands going to rub her belly gently. It takes her a long time to manage to thank to properly, and she hurries to end the call before she can embarrass herself further.<<if $arcologies[0].FSRestartDecoration == 100 && $eugenicsFullControl != 1>> The Societal Elite are @@.red;outraged@@ that you would not only allow such a breach of eugenics to occur, but encourage it to such an obscene degree.<</if>>
+ You signify your assent, telling the Sister that the organ farm will accept seed tissue from any of them for the purpose of fabricating ovaries, so long as they are willing to bear as many children as they can handle. To your mild surprise, she responds with cutely inelegant crying. You add that you think the world needs many more Futanari Sisters, especially ones as cute and sexy as you're confident her countless daughters will be. At that, she breaks down completely, one of her hands going to rub her belly gently. It takes her a long time to manage to thank you properly, and she hurries to end the call before she can embarrass herself further.<<if $arcologies[0].FSRestartDecoration == 100 && $eugenicsFullControl != 1>> The Societal Elite are @@.red;outraged@@ that you would not only allow such a breach of eugenics to occur, but encourage it to such an obscene degree.<</if>>
<<set $TFS.farmUpgrade = 3>>
<<if $arcologies[0].FSRestart != "unset" && $eugenicsFullControl != 1>>
<<set $failedElite += 1000>>
@@ -58,7 +58,7 @@ whether we will use contraception after we are transformed." She shudders sudden
/*
<br><<link "Decline, but grant them something more fitting">>
<<replace "#result">>
- You decline her offer and propose a new one, letting the Sister know that the organ farm will accept seed tissue from any of them for the purpose of fabricating testicular ovaries, which should satisfy their desires, if in an unorthodox way. To your mild surprise, she responds with cutely inelegant crying. You add that you think the world needs more Futanari Sisters, especially ones as cute and sexy as you're confident her many daughters will be. At that, she breaks down completely, one of her hands going to rub her balls gently. It takes her a long time to manage to thank to properly, and she hurries to end the call before she can embarrass herself further.<<if $arcologies[0].FSRestartDecoration == 100 && $eugenicsFullControl != 1>> The Societal Elite are @@.red;outraged@@ that you would not only allow such a breach of eugenics to occur, but encourage it.<</if>>
+ You decline her offer and propose a new one, letting the Sister know that the organ farm will accept seed tissue from any of them for the purpose of fabricating testicular ovaries, which should satisfy their desires, if in an unorthodox way. To your mild surprise, she responds with cutely inelegant crying. You add that you think the world needs more Futanari Sisters, especially ones as cute and sexy as you're confident her many daughters will be. At that, she breaks down completely, one of her hands going to rub her balls gently. It takes her a long time to manage to thank you properly, and she hurries to end the call before she can embarrass herself further.<<if $arcologies[0].FSRestartDecoration == 100 && $eugenicsFullControl != 1>> The Societal Elite are @@.red;outraged@@ that you would not only allow such a breach of eugenics to occur, but encourage it.<</if>>
<<set $TFS.farmUpgrade = 4>>
<<if $arcologies[0].FSRestart != "unset" && $eugenicsFullControl != 1>>
<<set $failedElite += 100>>