diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 51e884fb284f868f76bfaf02fc26b187494325d2..da99a03fbfe304830b04f914684c85d17c432743 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
window.LivingRule = Object.freeze({LUXURIOUS: 'luxurious', NORMAL: 'normal', SPARE: 'spare'});
window.Job = Object.freeze({
DAIRY: 'work in the dairy', MILKMAID: 'be the Milkmaid', MASTER_SUITE: 'serve in the master suite', CONCUBINE: 'be your Concubine',
@@ -13,7 +12,7 @@ window.PersonalAttention = Object.freeze({TRADE: 'trading', WAR: 'warfare', SLAV
window.predictCost = function(array) {
const array2 = array;
let totalCosts = (
- getBrothelCosts() +
+ getBrothelCosts() +
getBrothelAdsCosts() +
getArcadeCosts() +
getClubCosts() +
@@ -591,7 +590,7 @@ window.getSlaveCost = function(s) {
const drugsCost = State.variables.drugsCost;
// Living expenses
- switch(s.assignment) {
+ switch (s.assignment) {
case Job.ARCADE:
cost += rulesCost * 0.75;
break;
@@ -607,7 +606,7 @@ window.getSlaveCost = function(s) {
}
break;
case Job.FARMYARD:
- if(s.livingRules === LivingRule.NORMAL) {
+ if (s.livingRules === LivingRule.NORMAL) {
cost += rulesCost * 1.5;
} else if (State.variables.farmyardDecoration === 'Roman Revivalist') {
cost += rulesCost * 1.5;
@@ -677,7 +676,7 @@ window.getSlaveCost = function(s) {
// Food
cost += foodCost * 4;
- switch(s.diet) {
+ switch (s.diet) {
case 'fattening': case 'muscle building':
cost += foodCost;
break;
@@ -801,7 +800,7 @@ window.getSlaveCost = function(s) {
// Enemas
if (s.inflation === 3) {
- switch(s.inflationType) {
+ switch (s.inflationType) {
case 'water':
cost += 100;
break;
@@ -813,7 +812,7 @@ window.getSlaveCost = function(s) {
break;
}
} else if (s.inflation === 2) {
- switch(s.inflationType) {
+ switch (s.inflationType) {
case 'water':
cost += 50;
break;
@@ -825,7 +824,7 @@ window.getSlaveCost = function(s) {
break;
}
} else if (s.inflation === 1) {
- switch(s.inflationType) {
+ switch (s.inflationType) {
case 'water':
cost += 25;
break;
@@ -839,7 +838,7 @@ window.getSlaveCost = function(s) {
}
// Drugs
- switch(s.drugs) {
+ switch (s.drugs) {
case 'anti-aging cream':
cost += drugsCost * 10;
break;
@@ -908,10 +907,10 @@ window.NPCSexSupply = function(LC) {
// Lower class calculations
LC += V.sexSubsidiesLC / 10 - V.sexSupplyBarriersLC / 20;
- if(LC >= 0.5) {
+ if (LC >= 0.5) {
NPCSexSupply.lowerClass += Math.max(Math.trunc(NPCSexSupply.lowerClass * ((LC - 0.5) * (0.2 - V.sexSupplyBarriersLC / 25))), (50 * (1 - V.sexSupplyBarriersLC / 5))); // Max growth of 10% per week, unless it is really low, than a flat 50
- } else if(LC < 0.5) {
- if(NPCSexSupply.lowerClass > V.lowerClass * (3 - V.sexSupplyBarriersLC / 2)) { // Natural market share of competitors is at least 30%
+ } else if (LC < 0.5) {
+ if (NPCSexSupply.lowerClass > V.lowerClass * (3 - V.sexSupplyBarriersLC / 2)) { // Natural market share of competitors is at least 30%
NPCSexSupply.lowerClass -= Math.trunc(NPCSexSupply.lowerClass * ((0.5 - LC) / 5)); // Max reduction of 10% per week
}
}
@@ -927,76 +926,76 @@ window.slaveJobValues = function() {
// This section is for specific slaves or non-unique slaves adding their values to the whole
// Accounting for fuckdolls
- if(V.fuckdolls > 0) {
+ if (V.fuckdolls > 0) {
slaveJobValues.arcade += (V.fuckdolls - (V.arcade - V.arcadeSlaves)) * 140 + (V.arcade - V.arcadeSlaves) * (175 + 35 * V.arcadeUpgradeInjectors);
}
// Accounting for the DJ.
V.DJ = V.slaves.find(s => {
- return s.assignment == "be the DJ";
+ return s.assignment === "be the DJ";
});
- if(V.DJ !== 0) {
- if(!canTalk(V.DJ)) {
+ if (V.DJ !== 0) {
+ if (!canTalk(V.DJ)) {
//''__@@.pink;$DJ.slaveName@@__'' can't speak @@.yellow;and cannot serve as your DJ any more.@@<br>
V.DJ = 0;
V.unDJ = 1;
- } else if(V.DJ.preg > 37 && V.DJ.broodmother === 2) {
+ } else if (V.DJ.preg > 37 && V.DJ.broodmother === 2) {
//''__@@.pink;$DJ.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your DJ any longer.@@
V.DJ = 0;
V.unDJ = 2;
- } else if(V.DJ.fetish == "mindbroken") {
+ } else if (V.DJ.fetish === "mindbroken") {
//''__@@.pink;$DJ.slaveName@@__'' is mindbroken @@.yellow;and cannot serve as your DJ any more.@@<br>
V.DJ = 0;
V.unDJ = 3;
- } else if(!canWalk(V.DJ)) {
+ } else if (!canWalk(V.DJ)) {
//''__@@.pink;$DJ.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your DJ any more.@@<br>
V.DJ = 0;
V.unDJ = 4;
- } else if(!canHear(V.DJ)) {
+ } else if (!canHear(V.DJ)) {
//''__@@.pink;$DJ.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your DJ any more.@@<br>
V.DJ = 0;
V.unDJ = 5;
}
}
- if(V.DJ !== 0) {
- if(V.DJ.relationship === -3 && V.DJ.devotion > 50) {
+ if (V.DJ !== 0) {
+ if (V.DJ.relationship === -3 && V.DJ.devotion > 50) {
DJRepBonus += 0.1;
//$He tries $his best to be your energetic, cheerful wife.
}
- if(V.DJ.eyes === -2) {
+ if (V.DJ.eyes === -2) {
DJRepBonus += 0.15;
}
- if(V.DJ.skill.entertainment <= 10) {
+ if (V.DJ.skill.entertainment <= 10) {
//Though $DJ.slaveName does $his best to lead on the club, with $his lack of skill $he can do little.
- } else if(V.DJ.skill.entertainment <= 30) {
+ } else if (V.DJ.skill.entertainment <= 30) {
DJRepBonus += 0.05;
//$DJ.slaveName's basic skills marginally @@.green;improve@@ the atmosphere on $clubName.
- } else if(V.DJ.skill.entertainment <= 60) {
+ } else if (V.DJ.skill.entertainment <= 60) {
DJRepBonus += 0.1;
//$DJ.slaveName's skills @@.green;improve@@ the atmosphere on $clubName.
- } else if(V.DJ.skill.entertainment < 100) {
+ } else if (V.DJ.skill.entertainment < 100) {
DJRepBonus += 0.15;
//$DJ.slaveName's skills greatly @@.green;improve@@ the atmosphere on $clubName.
- } else if(V.DJ.skill.entertainment >= 100) {
+ } else if (V.DJ.skill.entertainment >= 100) {
DJRepBonus += 0.20;
//$DJ.slaveName's mastery immensely @@.green;improves@@ the atmosphere on $clubName.
}
- if(V.DJ.muscles > 5 && V.DJ.muscles <= 95) {
+ if (V.DJ.muscles > 5 && V.DJ.muscles <= 95) {
V.DJRepBonus += 0.05;
//$His toned body helps $him lead $his fellow club girls by letting $him dance all night.
}
- if(V.DJ.intelligence + V.DJ.intelligenceImplant > 15) {
+ if (V.DJ.intelligence + V.DJ.intelligenceImplant > 15) {
DJRepBonus += 0.05 * Math.floor((V.DJ.intelligence + V.DJ.intelligenceImplant)/32);
//$He's smart enough to make an actual contribution to the music, greatly enhancing the entire experience.
}
- if(V.DJ.face > 95) {
+ if (V.DJ.face > 95) {
DJRepBonus += 0.05;
//$His great beauty is a further draw, even when $he's in $his DJ booth, but especially when $he comes out to dance.
}
- if(setup.DJCareers.includes(V.DJ.career)) {
+ if (setup.DJCareers.includes(V.DJ.career)) {
DJRepBonus += 0.05;
//$He has musical experience from $his life before $he was a slave, a grounding that gives $his tracks actual depth.
- } else if(V.DJ.skill.DJ >= V.masteredXP) {
+ } else if (V.DJ.skill.DJ >= V.masteredXP) {
DJRepBonus += 0.05;
//$He has musical experience from working for you, giving $his tracks actual depth.
}
@@ -1006,14 +1005,14 @@ window.slaveJobValues = function() {
}
// Checking for space in the club
- if(V.club > 0 && V.ClubiIDs.length < V.club) {
+ if (V.club > 0 && V.ClubiIDs.length < V.club) {
clubSpots = V.club - V.ClubiIDs.length;
}
// Glory hole slaves adding to 'arcade'
V.JobIDArray["work a glory hole"].forEach(ID => {
let s = V.slaves[V.slaveIndices[ID]];
- s.sexAmount = Math.trunc((jsRandom(160,200) + (20 * (4 - s.anus)) + (10 * (4 - s.vagina)) + Math.trunc(s.health / 5)) * 0.8);
+ s.sexAmount = Math.trunc((jsRandom(160, 200) + (20 * (4 - s.anus)) + (10 * (4 - s.vagina)) + Math.trunc(s.health / 5)) * 0.8);
slaveJobValues.arcade += s.sexAmount;
});
@@ -1026,15 +1025,14 @@ window.slaveJobValues = function() {
// The slave value sees use during individual end of the week evaluation
// The aggregate is used for determining macro variables like 'prices' for slave goods and services to then be used in end week calculations
V.slaves.forEach(s => {
-
// Arcade slaves adding to 'arcade'
- if(s.assignment === "be confined in the arcade") {
- s.sexAmount = (jsRandom(200,240) + (20 * (4 - (s.anus - 2 * V.arcadeUpgradeInjectors))) + (10 * (4 - (s.vagina - 2 * V.arcadeUpgradeInjectors))) + Math.trunc(s.health / 5));
+ if (s.assignment === "be confined in the arcade") {
+ s.sexAmount = (jsRandom(200, 240) + (20 * (4 - (s.anus - 2 * V.arcadeUpgradeInjectors))) + (10 * (4 - (s.vagina - 2 * V.arcadeUpgradeInjectors))) + Math.trunc(s.health / 5));
slaveJobValues.arcade += s.sexAmount;
}
// Club and public sluts adding to 'club'. Also recruiters assigned as sexual ambassador to another arcology.
- if(s.assignment === "serve in the club" || (s.assignment === "recruit girls" && V.recruiterTarget === "other arcologies")) {
+ if (s.assignment === "serve in the club" || (s.assignment === "recruit girls" && V.recruiterTarget === "other arcologies")) {
SJVClub(s);
}
});
@@ -1044,142 +1042,142 @@ window.slaveJobValues = function() {
s.minorInjury = 0;
// The beauty multiplier
- if(s.sexualFlaw === "attention whore") {
+ if (s.sexualFlaw === "attention whore") {
beautyMultiplier += 0.1;
}
- if(V.arcologies[0].FSEdoRevivalist !== "unset") {
+ if (V.arcologies[0].FSEdoRevivalist !== "unset") {
beautyMultiplier += V.arcologies[0].FSEdoRevivalist / (V.FSLockinLevel * 3);
}
- if(((V.universalRulesFacilityWork === 1) && (s.assignment === "serve the public") && (clubSpots > 0)) || (s.assignment === "serve in the club")) {
- if(s.assignment == "serve the public") {
+ if (((V.universalRulesFacilityWork === 1) && (s.assignment === "serve the public") && (clubSpots > 0)) || (s.assignment === "serve in the club")) {
+ if (s.assignment === "serve the public") {
toTheClub = 1;
V.slavesGettingHelp += 1;
}
- if(V.clubAdsSpending !== 0) {
- if(V.clubAdsStacked === 1) {
- if(isStacked(s) === true) {
+ if (V.clubAdsSpending !== 0) {
+ if (V.clubAdsStacked === 1) {
+ if (isStacked(s) === true) {
beautyMultiplier += 0.05;
//$His stacked body fits $clubName's ad campaign, getting $him more attention.
}
- } else if(V.clubAdsStacked === -1) {
- if(isSlim(s) === true) {
+ } else if (V.clubAdsStacked === -1) {
+ if (isSlim(s) === true) {
beautyMultiplier += 0.05;
//$His slim body fits $clubName's ad campaign, getting $him more attention.
}
}
- if(V.clubAdsPreg === 1) {
- if(isPreg(s) === true) {
+ if (V.clubAdsPreg === 1) {
+ if (isPreg(s) === true) {
beautyMultiplier += 0.05;
//$His gravid body fits $clubName's ad campaign, getting $him more attention.
}
- } else if(V.clubAdsPreg === -1) {
- if(isNotPreg(s) === true) {
+ } else if (V.clubAdsPreg === -1) {
+ if (isNotPreg(s) === true) {
beautyMultiplier += 0.05;
//$His flat belly fits $clubName's ad campaign, getting $him more attention.
}
}
- if(V.clubAdsModded === 1) {
- if(isModded(s) === true) {
+ if (V.clubAdsModded === 1) {
+ if (isModded(s) === true) {
beautyMultiplier += 0.05;
//Body art like $hers is a major draw.
}
- } else if(V.clubAdsModded === -1) {
- if(isUnmodded(s) === true) {
+ } else if (V.clubAdsModded === -1) {
+ if (isUnmodded(s) === true) {
beautyMultiplier += 0.05;
//Very clean bodies like $hers are a major draw.
}
}
- if(V.clubAdsImplanted === 1) {
- if(isSurgicallyImproved(s) === true) {
+ if (V.clubAdsImplanted === 1) {
+ if (isSurgicallyImproved(s) === true) {
beautyMultiplier += 0.05;
//Many citizens come to $clubName looking to fuck a plastic slut like $him.
}
- } else if(V.clubAdsImplanted === -1) {
- if(isPure(s) === true) {
+ } else if (V.clubAdsImplanted === -1) {
+ if (isPure(s) === true) {
beautyMultiplier += 0.05;
//Many citizens come to $clubName looking to get with a natural $girl like $him.
}
}
- if(V.clubAdsOld === 1) {
- if(isYoung(s) === false) {
+ if (V.clubAdsOld === 1) {
+ if (isYoung(s) === false) {
beautyMultiplier += 0.05;
//$He's perfect for $clubName, which practically exists to match citizens up with mature slaves.
}
- } else if(V.clubAdsOld === -1) {
- if(isYoung(s) === true && s.physical >= 18) {
+ } else if (V.clubAdsOld === -1) {
+ if (isYoung(s) === true && s.physical >= 18) {
beautyMultiplier += 0.05;
//$He's perfect for $clubName, which practically exists to match citizens up with young slaves.
}
- } else if(V.clubAdsOld === -2) {
- if(s.physical <= 18 && s.physical >= 13) {
+ } else if (V.clubAdsOld === -2) {
+ if (s.physical <= 18 && s.physical >= 13) {
beautyMultiplier += 0.05;
//$He's perfect for $clubName, which practically exists to match citizens up with teenage slaves.
}
- } else if(V.clubAdsOld === -3) {
- if(s.physical < 13) {
+ } else if (V.clubAdsOld === -3) {
+ if (s.physical < 13) {
beautyMultiplier += 0.05;
//$He's perfect for $clubName, which practically exists to match citizens up with $loli slaves.
}
}
- if(V.clubAdsXX === 1) {
- if(s.dick === 0) {
+ if (V.clubAdsXX === 1) {
+ if (s.dick === 0) {
beautyMultiplier += 0.05;
//Almost everyone who comes to $clubName is looking to fuck a $girl like $him.
}
- } else if(V.clubAdsXX == -1) {
- if(s.dick > 0) {
+ } else if (V.clubAdsXX === -1) {
+ if (s.dick > 0) {
beautyMultiplier += 0.05;
//Almost everyone who comes to $clubName is looking to poke a $girl who cums when buttfucked.
}
}
}
}
- if(s.assignment === "serve in the club" || toTheClub === 1) {
+ if (s.assignment === "serve in the club" || toTheClub === 1) {
beautyMultiplier += DJRepBonus;
}
- if(canHear(s) === false) {
+ if (canHear(s) === false) {
beautyMultiplier -= 0.15;
//$His inability to move to the rhythm of the music is very off putting to those looking to party.
}
//Injuries
- if(s.curatives < 1 || s.inflationType !== "curative") {
- if(s.health < -50) {
+ if (s.curatives < 1 || s.inflationType !== "curative") {
+ if (s.health < -50) {
s.health -= 8;
s.minorInjury = 1;
- } else if(s.health < -20 && jsRandom(1,100) > 50) {
+ } else if (s.health < -20 && jsRandom(1, 100) > 50) {
s.health -= 5;
s.minorInjury = 1;
- } else if(!canDoVaginal(s)) {
- if(canDoAnal(s)) {
- if(jsRandom(1,100) > 40+(10*(s.skill.anal + s.skill.oral))) {
- s.health -= 5;
- s.minorInjury = 1;
+ } else if (!canDoVaginal(s)) {
+ if (canDoAnal(s)) {
+ if (jsRandom(1, 100) > 40+(10*(s.skill.anal + s.skill.oral))) {
+ s.health -= 5;
+ s.minorInjury = 1;
}
- } else if(jsRandom(1,100) > 40 + (10 * s.skill.oral)) {
+ } else if (jsRandom(1, 100) > 40 + (10 * s.skill.oral)) {
s.health -= 5;
s.minorInjury = 1;
}
- } else if(s.skill.anal + s.skill.oral + s.skill.vaginal < 300) {
- if(jsRandom(1,100) > 10+((s.skill.anal + s.skill.oral + s.skill.vaginal)/10)) {
+ } else if (s.skill.anal + s.skill.oral + s.skill.vaginal < 300) {
+ if (jsRandom(1, 100) > 10+((s.skill.anal + s.skill.oral + s.skill.vaginal)/10)) {
s.minorInjury = 1;
}
}
}
- if(s.minorInjury === 1 && s.assignment === "serve the public") {
+ if (s.minorInjury === 1 && s.assignment === "serve the public") {
let injuryChance;
s.health -= 5;
beautyMultiplier -= 0.05;
- if(canDoAnal(s)) {
- injuryChance = jsRandom(1,100);
+ if (canDoAnal(s)) {
+ injuryChance = jsRandom(1, 100);
} else {
- injuryChance = jsRandom(1,80);
+ injuryChance = jsRandom(1, 80);
}
- if(injuryChance > 80) {
+ if (injuryChance > 80) {
s.minorInjury = "sore ass";
- } else if(injuryChance > 60) {
+ } else if (injuryChance > 60) {
s.minorInjury = "black eye";
- } else if(injuryChance > 40) {
+ } else if (injuryChance > 40) {
s.minorInjury = "split lip";
} else if (injuryChance > 20) {
s.minorInjury = "bad bruise";
@@ -1187,8 +1185,8 @@ window.slaveJobValues = function() {
s.minorInjury = "sore muscle";
}
}
- if((s.hears === -1 && s.earwear !== "hearing aids") || (s.hears === 0 && s.earwear === "muffling ear plugs") || (s.hears === -2)) {
- if(!canHear(s)) {
+ if ((s.hears === -1 && s.earwear !== "hearing aids") || (s.hears === 0 && s.earwear === "muffling ear plugs") || (s.hears === -2)) {
+ if (!canHear(s)) {
beautyMultiplier -= 0.5;
} else {
beautyMultiplier -= 0.75;
@@ -1198,8 +1196,8 @@ window.slaveJobValues = function() {
// The amount of sexual acts
s.sexAmount = Beauty(s) / 2 + 100;
- if(s.assignment === "be the DJ") {
- if((V.clubSlaves + toTheClubTotal > 0) && (V.clubSlaves + toTheClubTotal < 10)) {
+ if (s.assignment === "be the DJ") {
+ if ((V.clubSlaves + toTheClubTotal > 0) && (V.clubSlaves + toTheClubTotal < 10)) {
s.sexAmount *= (10 - V.clubSlaves - toTheClubTotal) / 10;
}
}
@@ -1207,40 +1205,39 @@ window.slaveJobValues = function() {
// The quality/value of each sexual act
s.sexQuality = FResult(s);
- if((s.releaseRules === "restrictive" || s.releaseRules === "chastity") && s.standardReward !== "orgasm" && s.energy >= 20) {
+ if ((s.releaseRules === "restrictive" || s.releaseRules === "chastity") && s.standardReward !== "orgasm" && s.energy >= 20) {
s.sexQuality += 2;
}
- if(canDoAnal(s) && s.anus === 0) {
+ if (canDoAnal(s) && s.anus === 0) {
s.sexQuality += 5; // This was at 10, not sure what the reasoning behind that was
}
- if(canDoVaginal(s) && s.vagina === 0) {
+ if (canDoVaginal(s) && s.vagina === 0) {
s.sexQuality += 5;
}
- if(s.devotion > 95 || s.energy > 95) {
+ if (s.devotion > 95 || s.energy > 95) {
s.sexQuality += 2;
- } else if(s.devotion > 50) {
+ } else if (s.devotion > 50) {
s.sexQuality += 1;
- } else if(s.devotion > 20) {
+ } else if (s.devotion > 20) {
// Nothing happens
- } else if(s.trust < -20) {
+ } else if (s.trust < -20) {
s.sexQuality -= 1;
} else {
s.sexQuality -= 2;
}
- if(s.assignment === "serve in the club") {
+ if (s.assignment === "serve in the club") {
s.sexQuality += 2;
- } else if(toTheClub === 1) {
+ } else if (toTheClub === 1) {
s.sexQuality += 2;
clubSpots -= 1;
}
- if(s.assignment !== "recruit girls") {
+ if (s.assignment !== "recruit girls") {
slaveJobValues.club += s.sexAmount * s.sexQuality;
}
- return;
}
// Saturation penalty for public servants. Even the most beautiful slaves lose some of their shine if they have too much competition.
- if(slaveJobValues.club > 0) {
+ if (slaveJobValues.club > 0) {
slaveJobValues.clubSP = (Math.pow(slaveJobValues.club / 1000, 0.95) * 1000) / slaveJobValues.club;
}
return slaveJobValues;
@@ -1252,49 +1249,48 @@ window.corpValue = function() {
const V = State.variables;
if (V.corpIncorporated === 0) {
return 0;
- } else {
- let corpAssets = 0;
- if (V.corpDivExtra > 0) {
- corpAssets += V.corpDivExtraDev * 16000 + V.corpDivExtraSlaves * 10000;
- }
- if (V.corpDivLegal > 0) {
- corpAssets += V.corpDivLegalDev * 20000 + V.corpDivLegalSlaves * 15000;
- }
- if (V.corpDivBreak > 0) {
- corpAssets += V.corpDivBreakDev * 7200 + V.corpDivBreakSlaves * 10000 + V.corpDivBreakSlaves2 * 15000;
- }
- if (V.corpDivSurgery > 0) {
- corpAssets += V.corpDivSurgeryDev * 16000 + V.corpDivSurgerySlaves * 15000 + V.corpDivSurgerySlaves2 * 23000;
- }
- if (V.corpDivTrain > 0) {
- if (V.corpDivSurgery + V.corpDivTrain < 2 && V.corpDivTrainSurgerySwitch === 0) {
- corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * 15000 + V.corpDivTrainSlaves2 * 26000;
- } else if (V.corpDivTrainSurgerySwitch === 1 && V.corpDivTrainSurgeryTimer < 5) {
- corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * (15000 + 1600 * V.corpDivTrainSurgeryTimer) + V.corpDivTrainSlaves2 * (26000 + 1600 * V.corpDivTrainSurgeryTimer);
- } else {
- corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * 23000 + V.corpDivTrainSlaves2 * 34000;
- }
- }
- if (V.corpDivArcade > 0) {
- corpAssets += V.corpDivArcadeDev * 4000 + V.corpDivArcadeSlaves * 10000;
- }
- if (V.corpDivMenial > 0) {
- corpAssets += V.corpDivMenialDev * 5200 + V.corpDivMenialSlaves * 15000;
- }
- if (V.corpDivDairy > 0) {
- corpAssets += V.corpDivDairyDev * 12000 + V.corpDivDairySlaves * 23000;
+ }
+ let corpAssets = 0;
+ if (V.corpDivExtra > 0) {
+ corpAssets += V.corpDivExtraDev * 16000 + V.corpDivExtraSlaves * 10000;
+ }
+ if (V.corpDivLegal > 0) {
+ corpAssets += V.corpDivLegalDev * 20000 + V.corpDivLegalSlaves * 15000;
+ }
+ if (V.corpDivBreak > 0) {
+ corpAssets += V.corpDivBreakDev * 7200 + V.corpDivBreakSlaves * 10000 + V.corpDivBreakSlaves2 * 15000;
+ }
+ if (V.corpDivSurgery > 0) {
+ corpAssets += V.corpDivSurgeryDev * 16000 + V.corpDivSurgerySlaves * 15000 + V.corpDivSurgerySlaves2 * 23000;
+ }
+ if (V.corpDivTrain > 0) {
+ if (V.corpDivSurgery + V.corpDivTrain < 2 && V.corpDivTrainSurgerySwitch === 0) {
+ corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * 15000 + V.corpDivTrainSlaves2 * 26000;
+ } else if (V.corpDivTrainSurgerySwitch === 1 && V.corpDivTrainSurgeryTimer < 5) {
+ corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * (15000 + 1600 * V.corpDivTrainSurgeryTimer) + V.corpDivTrainSlaves2 * (26000 + 1600 * V.corpDivTrainSurgeryTimer);
+ } else {
+ corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * 23000 + V.corpDivTrainSlaves2 * 34000;
}
- if (V.corpDivWhore > 0) {
- if (V.corpDivSurgery + V.corpDivTrain < 2 && V.corpDivTrainSurgerySwitch === 0) {
- corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * 26000;
- } else if (V.corpDivTrainSurgerySwitch === 1 && V.corpDivTrainSurgeryTimer < 20) {
- corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * (26000 + 400 * V.corpDivTrainSurgeryTimer);
- } else {
- corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * 34000;
- }
+ }
+ if (V.corpDivArcade > 0) {
+ corpAssets += V.corpDivArcadeDev * 4000 + V.corpDivArcadeSlaves * 10000;
+ }
+ if (V.corpDivMenial > 0) {
+ corpAssets += V.corpDivMenialDev * 5200 + V.corpDivMenialSlaves * 15000;
+ }
+ if (V.corpDivDairy > 0) {
+ corpAssets += V.corpDivDairyDev * 12000 + V.corpDivDairySlaves * 23000;
+ }
+ if (V.corpDivWhore > 0) {
+ if (V.corpDivSurgery + V.corpDivTrain < 2 && V.corpDivTrainSurgerySwitch === 0) {
+ corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * 26000;
+ } else if (V.corpDivTrainSurgerySwitch === 1 && V.corpDivTrainSurgeryTimer < 20) {
+ corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * (26000 + 400 * V.corpDivTrainSurgeryTimer);
+ } else {
+ corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * 34000;
}
- return corpAssets + V.corpDividend + V.corpCash;
}
+ return corpAssets + V.corpDividend + V.corpCash;
};
// Corporation Share Price
@@ -1304,9 +1300,8 @@ window.corpSharePrice = function(q = 0) {
const V = State.variables;
if (V.corpIncorporated === 0) {
return 0;
- } else {
- return Math.trunc(1000 * (corpValue() / (V.personalShares + V.publicShares + q)));
}
+ return Math.trunc(1000 * (corpValue() / (V.personalShares + V.publicShares + q)));
};
// Corporation Division Slave room
@@ -1317,63 +1312,56 @@ window.corpDivBreakSlavesRoom = function() {
const V = State.variables;
if (V.corpDivBreak === 1 && V.corpDivBreakDev > V.corpDivBreakSlaves) {
return V.corpDivBreakDev - V.corpDivBreakSlaves;
- } else {
- return 0;
}
+ return 0;
};
window.corpDivSurgerySlavesRoom = function() {
const V = State.variables;
if (V.corpDivSurgery === 1 && V.corpDivSurgeryDev > V.corpDivSurgerySlaves) {
return V.corpDivSurgeryDev - V.corpDivSurgerySlaves;
- } else {
- return 0;
}
+ return 0;
};
window.corpDivTrainSlavesRoom = function() {
const V = State.variables;
if (V.corpDivTrain === 1 && V.corpDivTrainDev > V.corpDivTrainSlaves) {
return V.corpDivTrainDev - V.corpDivTrainSlaves;
- } else {
- return 0;
}
+ return 0;
};
window.corpDivArcadeSlavesRoom = function() {
const V = State.variables;
if (V.corpDivArcade === 1 && V.corpDivArcadeDev > V.corpDivArcadeSlaves) {
return V.corpDivArcadeDev - V.corpDivArcadeSlaves;
- } else {
- return 0;
}
+ return 0;
};
window.corpDivMenialSlavesRoom = function() {
const V = State.variables;
if (V.corpDivMenial === 1 && V.corpDivMenialDev > V.corpDivMenialSlaves) {
return V.corpDivMenialDev - V.corpDivMenialSlaves;
- } else {
- return 0;
}
+ return 0;
};
window.corpDivDairySlavesRoom = function() {
const V = State.variables;
if (V.corpDivDairy === 1 && V.corpDivDairyDev > V.corpDivDairySlaves) {
return V.corpDivDairyDev - V.corpDivDairySlaves;
- } else {
- return 0;
}
+ return 0;
};
window.corpDivWhoreSlavesRoom = function() {
const V = State.variables;
if (V.corpDivWhore === 1 && V.corpDivWhoreDev > V.corpDivWhoreSlaves) {
return V.corpDivWhoreDev - V.corpDivWhoreSlaves;
- } else {
- return 0;
}
+ return 0;
};
//Corporation race blacklisting/whitelisting
@@ -1406,15 +1394,15 @@ window.getSlaveStatisticData = function(s, facility) {
if (facility.income.has(s.ID)) {
return facility.income.get(s.ID);
- } else {
- const data = {
- ID: s.ID, slaveName: s.slaveName, customLabel: s.custom.label,
- income: 0, adsIncome: 0, rep: 0, food: 0, cost: getSlaveCost(s),
- customers: 0 /* brothel, club, ... */
- };
- facility.income.set(s.ID, data);
- return data;
}
+
+ const data = {
+ ID: s.ID, slaveName: s.slaveName, customLabel: s.custom.label,
+ income: 0, adsIncome: 0, rep: 0, food: 0, cost: getSlaveCost(s),
+ customers: 0 /* brothel, club, ... */
+ };
+ facility.income.set(s.ID, data);
+ return data;
};
window.initFacilityStatistics = function(facility) {
@@ -1470,7 +1458,6 @@ window.cashX = function(cost, what, who) {
//INCOME
if (cost > 0) {
-
//record the action
if (typeof V.lastWeeksCashIncome[what] !== 'undefined') {
V.lastWeeksCashIncome[what] += cost;
@@ -1487,7 +1474,6 @@ window.cashX = function(cost, what, who) {
//EXPENSES
else if (cost < 0) {
-
//record the action
if (typeof V.lastWeeksCashExpenses[what] !== 'undefined') {
V.lastWeeksCashExpenses[what] += cost;
@@ -1521,7 +1507,6 @@ window.repX = function(rep, what, who) {
//INCOME
//These are all scaled relative to current rep except when recording the who, to keep comparisons between slaves possible across times. This quite drastically reduces rep income at high levels of rep and only slightly at low levels.
if (rep > 0) {
-
//record the slave, if available
if (typeof who !== 'undefined') {
who.lastWeeksRepIncome += rep;
@@ -1542,7 +1527,6 @@ window.repX = function(rep, what, who) {
//EXPENSES
else if (rep < 0) {
-
//record the action
if (typeof V.lastWeeksRepExpenses[what] !== 'undefined') {
V.lastWeeksRepExpenses[what] += rep;