From 5ce8ab5b791852c2368e221a1fa6c45e30a009d2 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Fri, 26 Apr 2019 14:21:18 -0400
Subject: [PATCH] Reverted expanded objects and functions
---
src/SpecialForce/SpecialForce.js | 30 ++--
src/endWeek/saChoosesOwnClothes.js | 85 ++-------
src/endWeek/saPorn.js | 180 ++++----------------
src/endWeek/saWorkTheFarm.js | 22 +--
src/init/storyInit.tw | 4 +-
src/js/DefaultRules.js | 50 ++----
src/js/economyJS.js | 10 +-
src/js/familyTreeJS.js | 17 +-
src/uncategorized/BackwardsCompatibility.tw | 4 +-
src/uncategorized/costsWidgets.tw | 4 +-
10 files changed, 93 insertions(+), 313 deletions(-)
diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index 2201e7d39de..a88da511caa 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -1,20 +1,16 @@
// V=SugarCube.State.variables, T=SugarCube.State.temporary;
window.Main = function() {
const V = State.variables;
- V.SF = {
- Toggle:V.SF.Toggle, Active:-1, Depravity:0, Size:0, Upgrade:0, Gift:0,
+ V.SF = {Toggle:V.SF.Toggle, Active:-1, Depravity:0, Size:0, Upgrade:0, Gift:0,
UC:{Assign:0, Lock:0, num:0}, ROE:"hold", Target:"recruit", Regs:"strict",
- Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""
- };
+ Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""};
V.arcologies[0].SFRaid = 1; V.arcologies[0].SFRaidTarget = -1;
};
window.Squad = function() {
const V = State.variables;
- V.SF.Squad = {
- Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0,
+ V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0,
PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0},
- GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0
- };
+ GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
};
window.Colonel = function() {
const V = State.variables;
@@ -22,18 +18,14 @@ window.Colonel = function() {
};
window.MercCon = function() {
const V = State.variables;
- V.SF.MercCon = {
- History:0, CanAttend:-2, Income:0, Revenue:0, Menials:0,
- TotalMenials:0, Mercs:0, TotalMercs:0
- };
+ V.SF.MercCon = {History:0, CanAttend:-2, Income:0, Revenue:0, Menials:0,
+ TotalMenials:0, Mercs:0, TotalMercs:0};
};
window.Facility = function() {
const V = State.variables;
- V.SF.Facility = {
- Toggle:0, Active:0, LC:0, Workers:0, Max:5,
+ V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5,
Caps:"Special force support facility", Lower:"special force support facility",
- Decoration:"standard", Speed:0, Upgrade:0, IDs:[]
- };
+ Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
};
window.SFInit = function() {
@@ -133,8 +125,7 @@ window.SFBC = function() {
if (V.ColonelCore === undefined) V.ColonelCore = "";
if (V.ColonelDiscussion === undefined) V.ColonelDiscussion = 0;
if (V.ColonelSexed === undefined) V.ColonelSexed = 0;
- V.SF.Colonel = {
- Core:V.ColonelCore,
+ V.SF.Colonel = {Core:V.ColonelCore,
Talk:V.securityForceColonelToken,
Fun:V.securityForceColonelSexed,
Status:V.ColonelRelationship}; ColonelClean();
@@ -143,8 +134,7 @@ window.SFBC = function() {
if (V.TotalTradeShowIncome === undefined) V.TotalTradeShowIncome = 0;
if (V.TradeShowHelots === undefined) V.TradeShowHelots = 0;
if (V.TotalTradeShowHelots === undefined) V.TotalTradeShowHelots = 0;
- V.SF.MercCon = {
- History:V.OverallTradeShowAttendance,
+ V.SF.MercCon = {History:V.OverallTradeShowAttendance,
CanAttend:V.CurrentTradeShowAttendance,
Income:V.TradeShowIncome,
Revenue:V.TotalTradeShowIncome,
diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js
index 6411730f5ac..311701dd614 100644
--- a/src/endWeek/saChoosesOwnClothes.js
+++ b/src/endWeek/saChoosesOwnClothes.js
@@ -110,10 +110,7 @@ window.saChoosesOwnClothes = (function() {
if (slave.fetish === "mindbroken") {
if (V.arcologies[0].FSChattelReligionist > 0) {
- selection = {
- text: `${he} commonly sees others wearing chattel habits and is drawn to doing so ${himself}.`,
- clothes: "a chattel habit"
- };
+ selection = {text: `${he} commonly sees others wearing chattel habits and is drawn to doing so ${himself}.`, clothes: "a chattel habit"};
} else {
clothing.push("panties");
if (V.arcologies[0].FSEgyptianRevivalist > 0) {
@@ -154,101 +151,53 @@ window.saChoosesOwnClothes = (function() {
chosenClothing = jsEither(clothing);
switch (chosenClothing) {
case "egyptian":
- selection = {
- text: `${he} commonly sees others wearing nothing but jewelry and is drawn to doing so ${himself}.`,
- clothes: "slutty jewelry"
- };
+ selection = {text: `${he} commonly sees others wearing nothing but jewelry and is drawn to doing so ${himself}.`, clothes: "slutty jewelry"};
break;
case "roman":
- selection = {
- text: `${he} commonly sees others wearing togas and is drawn to doing so ${himself}.`,
- clothes: "a toga"
- };
+ selection = {text: `${he} commonly sees others wearing togas and is drawn to doing so ${himself}.`, clothes: "a toga"};
break;
case "aztec":
- selection = {
- text: `${he} commonly sees others wearing huipils and is drawn to doing so ${himself}.`,
- clothes: "a huipil"
- };
+ selection = {text: `${he} commonly sees others wearing huipils and is drawn to doing so ${himself}.`, clothes: "a huipil"};
break;
case "edo":
- selection = {
- text: `${he} commonly sees others wearing kimonos and is drawn to doing so ${himself}.`,
- clothes: "a kimono"
- };
+ selection = {text: `${he} commonly sees others wearing kimonos and is drawn to doing so ${himself}.`, clothes: "a kimono"};
break;
case "arabic":
- selection = {
- text: `${he} commonly sees others wearing silk and is drawn to doing so ${himself}.`,
- clothes: "harem gauze"
- };
+ selection = {text: `${he} commonly sees others wearing silk and is drawn to doing so ${himself}.`, clothes: "harem gauze"};
break;
case "chinese":
- selection = {
- text: `${he} commonly sees others wearing qipaos and is drawn to doing so ${himself}.`,
- clothes: "a slutty qipao"
- };
+ selection = {text: `${he} commonly sees others wearing qipaos and is drawn to doing so ${himself}.`, clothes: "a slutty qipao"};
break;
case "genderFund":
if (jsRandom(1, 2) === 1) {
- selection = {
- text: `${he} commonly sees cheerleaders around and instinctually follows along.`,
- clothes: jsEither(["a cheerleader outfit", "a schoolgirl outfit"])
- };
+ selection = {text: `${he} commonly sees cheerleaders around and instinctually follows along.`, clothes: jsEither(["a cheerleader outfit", "a schoolgirl outfit"])};
} else {
- selection = {
- text: `${he} commonly sees bunnies around and instinctually follows along.`,
- clothes: "a bunny outfit"
- };
+ selection = {text: `${he} commonly sees bunnies around and instinctually follows along.`, clothes: "a bunny outfit"};
}
break;
case "paternalist":
- selection = {
- text: `${he} commonly sees others wearing normal clothing and is drawn to doing so ${himself}.`,
- clothes: "conservative clothing"
- };
+ selection = {text: `${he} commonly sees others wearing normal clothing and is drawn to doing so ${himself}.`, clothes: "conservative clothing"};
break;
case "degradationist":
- selection = {
- text: `${he} commonly sees others wearing chains and is drawn to doing so ${himself}.`,
- clothes: jsEither(["chains", "shibari ropes", "uncomfortable straps"])
- };
+ selection = {text: `${he} commonly sees others wearing chains and is drawn to doing so ${himself}.`, clothes: jsEither(["chains", "shibari ropes", "uncomfortable straps"])};
break;
case "mature":
- selection = {
- text: `${he} commonly sees others wearing suits and is drawn to doing so ${himself}.`,
- clothes: jsEither(["a nice maid outfit", "nice business attire", "slutty business attire"])
- };
+ selection = {text: `${he} commonly sees others wearing suits and is drawn to doing so ${himself}.`, clothes: jsEither(["a nice maid outfit", "nice business attire", "slutty business attire"])};
break;
case "youth":
- selection = {
- text: `${he} commonly sees schoolgirls around and instinctually follows along.`,
- clothes: jsEither(["a cheerleader outfit", "a schoolgirl outfit"])
- };
+ selection = {text: `${he} commonly sees schoolgirls around and instinctually follows along.`, clothes: jsEither(["a cheerleader outfit", "a schoolgirl outfit"])};
break;
case "physicalIdealist":
- selection = {
- text: `${he} commonly sees naked girls around and seldom realizes they are coated in oil.`,
- clothes: jsEither(["body oil", "no clothing", "no clothing"])
- };
+ selection = {text: `${he} commonly sees naked girls around and seldom realizes they are coated in oil.`, clothes: jsEither(["body oil", "no clothing", "no clothing"])};
break;
case "pastoralist":
- selection = {
- text: `${he} commonly sees cowgirls around and instinctually follows along.`,
- clothes: "Western clothing"
- };
+ selection = {text: `${he} commonly sees cowgirls around and instinctually follows along.`, clothes: "Western clothing"};
break;
case "bodyPurist":
- selection = {
- text: `${he} commonly sees others wearing tight, form-fitting clothes and is drawn to doing so ${himself}.`,
- clothes: jsEither(["a comfortable bodysuit", "a halter top dress", "a leotard", "a leotard", "a slave gown", "a string bikini", "clubslut netting", "restrictive latex"])
- };
+ selection = {text: `${he} commonly sees others wearing tight, form-fitting clothes and is drawn to doing so ${himself}.`, clothes: jsEither(["a comfortable bodysuit", "a halter top dress", "a leotard", "a leotard", "a slave gown", "a string bikini", "clubslut netting", "restrictive latex"])};
break;
default:
- selection = {
- text: `${he} chooses to put on underwear, the reasons lost to ${him}, and moves on.`,
- clothes: jsEither(["attractive lingerie", "panties"])
- };
+ selection = {text: `${he} chooses to put on underwear, the reasons lost to ${him}, and moves on.`, clothes: jsEither(["attractive lingerie", "panties"])};
break;
}
}
diff --git a/src/endWeek/saPorn.js b/src/endWeek/saPorn.js
index 997922a4838..93ab5aa36c5 100644
--- a/src/endWeek/saPorn.js
+++ b/src/endWeek/saPorn.js
@@ -5,220 +5,112 @@
* @returns {object}
*/
window.getHighestPorn = function(slave) {
- let max = {
- value: 0,
- type: "none"
- };
+ let max = {value: 0, type: "none"};
if (slave.porn.fame.general > max.value) {
- max = {
- value: slave.porn.fame.general,
- type: "generic"
- };
+ max = {value: slave.porn.fame.general, type: "generic"};
}
if (slave.porn.fame.fuckdoll > max.value) {
- max = {
- value: slave.porn.fame.fuckdoll,
- type: "fuckdoll"
- };
+ max = {value: slave.porn.fame.fuckdoll, type: "fuckdoll"};
}
if (slave.porn.fame.rape > max.value) {
- max = {
- value: slave.porn.fame.rape,
- type: "rape"
- };
+ max = {value: slave.porn.fame.rape, type: "rape"};
}
if (slave.porn.fame.preggo > max.value) {
- max = {
- value: slave.porn.fame.preggo,
- type: "preggo"
- };
+ max = {value: slave.porn.fame.preggo, type: "preggo"};
}
if (slave.porn.fame.BBW > max.value) {
- max = {
- value: slave.porn.fame.BBW,
- type: "BBW"
- };
+ max = {value: slave.porn.fame.BBW, type: "BBW"};
}
if (slave.porn.fame.gainer > max.value) {
- max = {
- value: slave.porn.fame.gainer,
- type: "weight gain"
- };
+ max = {value: slave.porn.fame.gainer, type: "weight gain"};
}
if (slave.porn.fame.stud > max.value) {
- max = {
- value: slave.porn.fame.stud,
- type: "big dick"
- };
+ max = {value: slave.porn.fame.stud, type: "big dick"};
}
if (slave.porn.fame.loli > max.value) {
- max = {
- value: slave.porn.fame.loli,
- type: "underage"
- };
+ max = {value: slave.porn.fame.loli, type: "underage"};
}
if (slave.porn.fame.deepThroat > max.value) {
- max = {
- value: slave.porn.fame.deepThroat,
- type: "deepthroat"
- };
+ max = {value: slave.porn.fame.deepThroat, type: "deepthroat"};
}
if (slave.porn.fame.struggleFuck > max.value) {
- max = {
- value: slave.porn.fame.struggleFuck,
- type: "unwilling"
- };
+ max = {value: slave.porn.fame.struggleFuck, type: "unwilling"};
}
if (slave.porn.fame.painal > max.value) {
- max = {
- value: slave.porn.fame.painal,
- type: "hardcore anal"
- };
+ max = {value: slave.porn.fame.painal, type: "hardcore anal"};
}
if (slave.porn.fame.tease > max.value) {
- max = {
- value: slave.porn.fame.tease,
- type: "softcore"
- };
+ max = {value: slave.porn.fame.tease, type: "softcore"};
}
if (slave.porn.fame.romantic > max.value) {
- max = {
- value: slave.porn.fame.romantic,
- type: "romantic"
- };
+ max = {value: slave.porn.fame.romantic, type: "romantic"};
}
if (slave.porn.fame.pervert > max.value) {
- max = {
- value: slave.porn.fame.pervert,
- type: "really perverted"
- };
+ max = {value: slave.porn.fame.pervert, type: "really perverted"};
}
if (slave.porn.fame.caring > max.value) {
- max = {
- value: slave.porn.fame.caring,
- type: "voyeur"
- };
+ max = {value: slave.porn.fame.caring, type: "voyeur"};
}
if (slave.porn.fame.unflinching > max.value) {
- max = {
- value: slave.porn.fame.unflinching,
- type: "unspeakable"
- };
+ max = {value: slave.porn.fame.unflinching, type: "unspeakable"};
}
if (slave.porn.fame.sizeQueen > max.value) {
- max = {
- value: slave.porn.fame.sizeQueen,
- type: "huge insertion"
- };
+ max = {value: slave.porn.fame.sizeQueen, type: "huge insertion"};
}
if (slave.porn.fame.neglectful > max.value) {
- max = {
- value: slave.porn.fame.neglectful,
- type: "orgasm denial"
- };
+ max = {value: slave.porn.fame.neglectful, type: "orgasm denial"};
}
if (slave.porn.fame.cumAddict > max.value) {
- max = {
- value: slave.porn.fame.cumAddict,
- type: "cum addiction"
- };
+ max = {value: slave.porn.fame.cumAddict, type: "cum addiction"};
}
if (slave.porn.fame.analAddict > max.value) {
- max = {
- value: slave.porn.fame.analAddict,
- type: "anal addiction"
- };
+ max = {value: slave.porn.fame.analAddict, type: "anal addiction"};
}
if (slave.porn.fame.attentionWhore > max.value) {
- max = {
- value: slave.porn.fame.attentionWhore,
- type: "exhibition"
- };
+ max = {value: slave.porn.fame.attentionWhore, type: "exhibition"};
}
if (slave.porn.fame.breastGrowth > max.value) {
- max = {
- value: slave.porn.fame.breastGrowth,
- type: "breast expansion"
- };
+ max = {value: slave.porn.fame.breastGrowth, type: "breast expansion"};
}
if (slave.porn.fame.abusive > max.value) {
- max = {
- value: slave.porn.fame.abusive,
- type: "abuse"
- };
+ max = {value: slave.porn.fame.abusive, type: "abuse"};
}
if (slave.porn.fame.malicious > max.value) {
- max = {
- value: slave.porn.fame.malicious,
- type: "sexual torture"
- };
+ max = {value: slave.porn.fame.malicious, type: "sexual torture"};
}
if (slave.porn.fame.selfHating > max.value) {
- max = {
- value: slave.porn.fame.selfHating,
- type: "self hating"
- };
+ max = {value: slave.porn.fame.selfHating, type: "self hating"};
}
if (slave.porn.fame.breeder > max.value) {
- max = {
- value: slave.porn.fame.breeder,
- type: "breeder"
- };
+ max = {value: slave.porn.fame.breeder, type: "breeder"};
}
if (slave.porn.fame.sub > max.value) {
- max = {
- value: slave.porn.fame.sub,
- type: "submissive"
- };
+ max = {value: slave.porn.fame.sub, type: "submissive"};
}
if (slave.porn.fame.cumSlut > max.value) {
- max = {
- value: slave.porn.fame.cumSlut,
- type: "cum"
- };
+ max = {value: slave.porn.fame.cumSlut, type: "cum"};
}
if (slave.porn.fame.anal > max.value) {
- max = {
- value: slave.porn.fame.anal,
- type: "buttslut"
- };
+ max = {value: slave.porn.fame.anal, type: "buttslut"};
}
if (slave.porn.fame.humiliation > max.value) {
- max = {
- value: slave.porn.fame.humiliation,
- type: "humiliating"
- };
+ max = {value: slave.porn.fame.humiliation, type: "humiliating"};
}
if (slave.porn.fame.boobs > max.value) {
- max = {
- value: slave.porn.fame.boobs,
- type: "breast"
- };
+ max = {value: slave.porn.fame.boobs, type: "breast"};
}
if (slave.porn.fame.dom > max.value) {
- max = {
- value: slave.porn.fame.dom,
- type: "dominant"
- };
+ max = {value: slave.porn.fame.dom, type: "dominant"};
}
if (slave.porn.fame.sadist > max.value) {
- max = {
- value: slave.porn.fame.sadist,
- type: "sadistic"
- };
+ max = {value: slave.porn.fame.sadist, type: "sadistic"};
}
if (slave.porn.fame.masochist > max.value) {
- max = {
- value: slave.porn.fame.masochist,
- type: "masochistic"
- };
+ max = {value: slave.porn.fame.masochist, type: "masochistic"};
}
if (slave.porn.fame.pregnancy > max.value) {
- max = {
- value: slave.porn.fame.pregnancy,
- type: "pregnancy fetish"
- };
+ max = {value: slave.porn.fame.pregnancy, type: "pregnancy fetish"};
}
return max;
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index a45c1172457..75b64a10d38 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -95,7 +95,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
if (slave.tired === 1) {
t += `${He} is so tired that ${he} doesn't have the energy to work efficiently, impacting ${his} production. `;
}
- t += `As a result, ${he} produces <span class="chocolate">${ massFormat(food) }</span> of food over the week. `;
+ t += `As a result, ${he} produces <span class="chocolate">${massFormat(food)}</span> of food over the week. `;
// Close Food Production
@@ -115,9 +115,9 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
}
if (arcology.FSSubjugationist !== "unset") {
if (slave.race === arcology.FSSubjugationistRace) {
- t += `Society <span class="green">approves</span> of the degradation you submit your ${ arcology.FSSubjugationistRace } slaves to, and so ${he} earns you a bit more. `;
+ t += `Society <span class="green">approves</span> of the degradation you submit your ${arcology.FSSubjugationistRace} slaves to, and so ${he} earns you a bit more. `;
} else {
- t += `Society doesn't disapprove of ${him} not being ${ arcology.FSSubjugationistRace }, but ${he} doesn't earn as much as ${he} would if ${he} was ${ arcology.FSSubjugationistRace }. `;
+ t += `Society doesn't disapprove of ${him} not being ${arcology.FSSubjugationistRace}, but ${he} doesn't earn as much as ${he} would if ${he} was ${arcology.FSSubjugationistRace}. `;
}
}
if (arcology.FSRepopulationFocus !== "unset") {
@@ -213,16 +213,16 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
}
if (arcology.FSYouthPreferentialist !== "unset") {
if (slave.visualAge > 25) { // TODO: not sure about this age
- t += `${arcology.name }'s citizens <span class="red">disapprove</span> of your using such old slaves to put on shows. `;
+ t += `${arcology.name}'s citizens <span class="red">disapprove</span> of your using such old slaves to put on shows. `;
} else {
- t += `${arcology.name }'s citizens <span class="green">approve</span> of your using young slaves to put on shows. `;
+ t += `${arcology.name}'s citizens <span class="green">approve</span> of your using young slaves to put on shows. `;
}
}
if (arcology.FSMaturityPreferentialist !== "unset") {
if (slave.visualAge > 25) { // TODO: not sure about this age
- t += `${arcology.name }'s citizens <span class="green">approve</span> of your using mature slaves to put on shows. `;
+ t += `${arcology.name}'s citizens <span class="green">approve</span> of your using mature slaves to put on shows. `;
} else {
- t += `${arcology.name }'s citizens <span class="red">disapprove</span> of your using such young slaves to put on shows. `;
+ t += `${arcology.name}'s citizens <span class="red">disapprove</span> of your using such young slaves to put on shows. `;
}
}
if (arcology.FSSlimnessEnthusiast !== "unset") {
@@ -428,7 +428,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
}
}
if (slave.behavioralQuirk === "fitness") {
- t += `${slave.slaveName } <span class="hotpink">privately enjoys</span> the exercise ${he} receives while working in ${farmyardName}. `;
+ t += `${slave.slaveName} <span class="hotpink">privately enjoys</span> the exercise ${he} receives while working in ${farmyardName}. `;
slave.devotion += 1;
}
@@ -438,13 +438,13 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
if (V.showVignettes) {
const vignette = GetVignette(slave);
- t += `__This week__ ${ vignette.text}`;
+ t += `__This week__ ${vignette.text}`;
if (vignette.type === "cash") {
FResult(slave);
if (vignette.effect > 0) {
- t += ` <span class="yellowgreen">making you an extra ${ cashFormat(Math.trunc(V.FResult*vignette.effect)) }.</span> `;
+ t += ` <span class="yellowgreen">making you an extra ${cashFormat(Math.trunc(V.FResult*vignette.effect))}.</span> `;
} else if (vignette.effect < 0) {
- t += ` <span class="red">losing you ${ cashFormat(Math.abs(Math.trunc(V.FResult*vignette.effect))) }.</span> `;
+ t += ` <span class="red">losing you ${cashFormat(Math.abs(Math.trunc(V.FResult*vignette.effect)))}.</span> `;
} else {
t += ` an incident without lasting effect. `;
}
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index cf6b022a0de..36edcad3daa 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -341,9 +341,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $useAccordion = 0>>
<<set $useTabs = 0>>
- <<set $tabChoice = {
- Main: "all"
- }>>
+ <<set $tabChoice = {Main: "all"}>>
<<set $formatNumbers = 0>>
/* onlyintendeddickgirls variables */
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 7d9282ce389..95575dbabc3 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1305,80 +1305,50 @@ window.DefaultRules = (function() {
if (rule.growth_boobs !== "no default setting") {
let _priority;
if (slave.boobs < rule.growth_boobs) {
- _priority = {
- drug: "breast injections",
- weight: (rule.growth_boobs - slave.boobs) / rule.growth_boobs
- };
+ _priority = {drug: "breast injections", weight: (rule.growth_boobs - slave.boobs) / rule.growth_boobs};
_priorities.push(_priority);
} else if ((slave.boobs > parseInt(rule.growth_boobs) + 200) && slave.weight < 100 && (V.arcologies[0].FSSlimnessEnthusiastResearch === 1)) {
- _priority = {
- drug: "breast redistributors",
- weight: (1 + ((slave.boobs - slave.boobsImplant - slave.boobsMilk - rule.growth_boobs) / rule.growth_boobs))
- };
+ _priority = {drug: "breast redistributors", weight: (1 + ((slave.boobs - slave.boobsImplant - slave.boobsMilk - rule.growth_boobs) / rule.growth_boobs))};
_priorities.push(_priority);
}
}
if (rule.growth_butt !== "no default setting") {
let _priority;
if (slave.butt < rule.growth_butt) {
- _priority = {
- drug: "butt injections",
- weight: (rule.growth_butt - slave.butt) / rule.growth_butt
- };
+ _priority = {drug: "butt injections", weight: (rule.growth_butt - slave.butt) / rule.growth_butt};
_priorities.push(_priority);
} else if ((Math.trunc(slave.butt) > rule.growth_butt) && slave.weight < 100 && (V.arcologies[0].FSSlimnessEnthusiastResearch === 1)) {
- _priority = {
- drug: "butt redistributors",
- weight: (1 + ((slave.butt - slave.buttImplant - rule.growth_butt) / rule.growth_butt))
- };
+ _priority = {drug: "butt redistributors", weight: (1 + ((slave.butt - slave.buttImplant - rule.growth_butt) / rule.growth_butt))};
_priorities.push(_priority);
}
}
if (rule.growth_lips !== "no default setting") {
let _priority;
if (slave.lips < rule.growth_lips) {
- _priority = {
- drug: "lip injections",
- weight: (rule.growth_lips - slave.lips) / rule.growth_lips
- };
+ _priority = {drug: "lip injections", weight: (rule.growth_lips - slave.lips) / rule.growth_lips};
_priorities.push(_priority);
} else if ((slave.lips > rule.growth_lips) && (V.arcologies[0].FSSlimnessEnthusiastResearch === 1)) {
- _priority = {
- drug: "lip atrophiers",
- weight: (1 + ((slave.lips - slave.lipsImplant - rule.growth_lips) / rule.growth_lips))
- };
+ _priority = {drug: "lip atrophiers", weight: (1 + ((slave.lips - slave.lipsImplant - rule.growth_lips) / rule.growth_lips))};
_priorities.push(_priority);
}
}
if (rule.growth_dick !== "no default setting" && slave.dick) {
let _priority;
if (slave.dick < rule.growth_dick) {
- _priority = {
- drug: "penis enhancement",
- weight: (rule.growth_dick - slave.dick) / rule.growth_dick
- };
+ _priority = {drug: "penis enhancement", weight: (rule.growth_dick - slave.dick) / rule.growth_dick};
_priorities.push(_priority);
} else if ((slave.dick > rule.growth_dick) && (V.arcologies[0].FSSlimnessEnthusiastResearch === 1)) {
- _priority = {
- drug: "penis atrophiers",
- weight: (1 + ((slave.dick - rule.growth_dick) / rule.growth_dick))
- };
+ _priority = {drug: "penis atrophiers", weight: (1 + ((slave.dick - rule.growth_dick) / rule.growth_dick))};
_priorities.push(_priority);
}
}
if (rule.growth_balls !== "no default setting" && slave.balls) {
let _priority;
if (slave.balls < rule.growth_balls) {
- _priority = {
- drug: "testicle enhancement",
- weight: (rule.growth_balls - slave.balls) / rule.growth_balls
- };
+ _priority = {drug: "testicle enhancement", weight: (rule.growth_balls - slave.balls) / rule.growth_balls};
_priorities.push(_priority);
} else if ((slave.balls > rule.growth_balls) && (V.arcologies[0].FSSlimnessEnthusiastResearch === 1)) {
- _priority = {
- drug: "testicle atrophiers",
- weight: (1 + ((slave.balls - rule.growth_balls) / rule.growth_balls))
- };
+ _priority = {drug: "testicle atrophiers", weight: (1 + ((slave.balls - rule.growth_balls) / rule.growth_balls))};
_priorities.push(_priority);
}
}
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 7573cff3fab..d503dcbc696 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -961,9 +961,7 @@ window.menialSlaveCost = function(q) {
window.NPCSexSupply = function(LC) {
const V = State.variables;
- let NPCSexSupply = {
- lowerClass: V.NPCSexSupply.lowerClass
- };
+ let NPCSexSupply = {lowerClass: V.NPCSexSupply.lowerClass};
// Lower class calculations
LC += V.sexSubsidiesLC / 10 - V.sexSupplyBarriersLC / 20;
@@ -981,11 +979,7 @@ window.NPCSexSupply = function(LC) {
// The function for calculating and storing a slave's sexual interaction with citizens/'the outside'
window.slaveJobValues = function() {
const V = State.variables;
- let slaveJobValues = {
- arcade: 0,
- club: 0,
- clubSP: 0
- },
+ let slaveJobValues = {arcade: 0, club: 0, clubSP: 0},
clubSpots = 0,
toTheClubTotal = 0,
DJRepBonus = 0;
diff --git a/src/js/familyTreeJS.js b/src/js/familyTreeJS.js
index 93ebf31abe8..5961eed719d 100644
--- a/src/js/familyTreeJS.js
+++ b/src/js/familyTreeJS.js
@@ -47,12 +47,7 @@ window.renderFamilyTree = function(slaves, filterID) {
ftreeHeight = 1200;
}
- margin = {
- top: 0,
- left: 0,
- bottom: 0,
- right: 0
- };
+ margin = {top: 0, left: 0, bottom: 0, right: 0};
chartWidth = ftreeWidth - (margin.left + margin.right);
@@ -227,10 +222,7 @@ window.renderFamilyTree = function(slaves, filterID) {
};
window.buildFamilyTree = function(slaves = State.variables.slaves, filterID) {
- let family_graph = {
- nodes: [],
- links: []
- };
+ let family_graph = {nodes: [], links: []};
let node_lookup = {};
let preset_lookup = {
'-2': 'A citizen',
@@ -414,10 +406,7 @@ window.buildFamilyTree = function(slaves = State.variables.slaves, filterID) {
let seen = {};
let saveTree = {};
- function relatedTo(character, targetID, relIDs = {
- tree: {},
- related: false
- }) {
+ function relatedTo(character, targetID, relIDs = {tree: {}, related: false}) {
relIDs.tree[character.ID] = true;
if (related[character.ID]) {
relIDs.related = true;
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 26e2efdf8bb..2fe2b72df38 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -233,9 +233,7 @@
<<unset $customValue>>
<</if>>
<<if ndef $tabChoice>>
- <<set $tabChoice = {
- Main: "all"
- }>>
+ <<set $tabChoice = {Main: "all"}>>
<</if>>
/* pregmod stuff */
diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw
index fd33a509e53..22ec2b66973 100644
--- a/src/uncategorized/costsWidgets.tw
+++ b/src/uncategorized/costsWidgets.tw
@@ -511,7 +511,7 @@
<<widget "setupLastWeeksCash">>
/* Feel free to add categories. Just make sure to display them in costsBudget.tw as well! */
<<set $lastWeeksCashIncome = {
-/*Slave Jobs*/
+/* Slave Jobs */
whore: 0,
whoreBrothel: 0,
rest: 0,
@@ -529,7 +529,7 @@ porn: 0,
recruiter: 0,
-/*Slaves in general*/
+/* Slaves in general */
fuckdolls: 0,
menialTrades: 0,
menialBioreactors: 0,
--
GitLab