diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 5caec9358e1af9245e9a4283a4b576e149529735..e2fd0b1a8dcfd4a2dc53710f5d85aa979ff3516a 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -680,8 +680,8 @@ window.PCTitle = function PCTitle() {
titles.push("The Betrayed");
break;
case "Exodus":
- titles.push("The Abandoned");
- break;
+ titles.push("The Abandoned");
+ break;
}
}
@@ -1297,26 +1297,26 @@ window.SlaveTitle = /** @param {App.Entity.SlaveState} slave */ function SlaveTi
r = "slave"; /* I don't tihnk there is an 'else'? */
if ((slave.dick === 0) && (slave.vagina === -1)) { /* NULLS */
r = "null";
- if ((slave.lactation > 0) && (slave.boobs > 2000)) {
- r = r + " cow";
- } else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
- r = r + " bimbo ";
- } else if (slave.boobs > 6000) {
- r = r + " boob";
- } else if (slave.butt > 6) {
- r = r + " ass";
- } else if ((slave.muscles > 30) && (slave.height < 185)) {
- r = r + " muscle";
- }
- if (slave.visualAge > 55) {
- r = r + "GILF";
- } else if (slave.visualAge > 35) {
- r = r + "MILF";
- } else if (slave.visualAge >= 25) {
- r = r + "slave";
- } else {
- r = r + "girl";
- }
+ if ((slave.lactation > 0) && (slave.boobs > 2000)) {
+ r = r + " cow";
+ } else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
+ r = r + " bimbo ";
+ } else if (slave.boobs > 6000) {
+ r = r + " boob";
+ } else if (slave.butt > 6) {
+ r = r + " ass";
+ } else if ((slave.muscles > 30) && (slave.height < 185)) {
+ r = r + " muscle";
+ }
+ if (slave.visualAge > 55) {
+ r = r + "GILF";
+ } else if (slave.visualAge > 35) {
+ r = r + "MILF";
+ } else if (slave.visualAge >= 25) {
+ r = r + "slave";
+ } else {
+ r = r + "girl";
+ }
}
if ((slave.dick === 0) && (slave.vagina !== -1)) { /* FEMALES */
@@ -1329,48 +1329,48 @@ window.SlaveTitle = /** @param {App.Entity.SlaveState} slave */ function SlaveTi
} else {
r = "slavegirl";
}
- if ((slave.muscles > 30) && (slave.height < 185)) {
- r = "muscle " + r;
- } else if ((slave.lactation > 0) && (slave.boobs > 2000)) {
- r = r + " cow";
- } else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
- r = r + " bimbo";
- } else if (slave.boobs > 6000) {
- r = "boob" + r;
- } else if (slave.butt > 6) {
- r = "ass" + r;
- }
+ if ((slave.muscles > 30) && (slave.height < 185)) {
+ r = "muscle " + r;
+ } else if ((slave.lactation > 0) && (slave.boobs > 2000)) {
+ r = r + " cow";
+ } else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
+ r = r + " bimbo";
+ } else if (slave.boobs > 6000) {
+ r = "boob" + r;
+ } else if (slave.butt > 6) {
+ r = "ass" + r;
+ }
}
if ((slave.dick !== 0) && (slave.vagina !== -1)) {
- if (slave.balls > 0) { /* FUTANARI: cock & balls & vagina */
- r = "futanari ";
- } else { /* FUTANARI: cock & vagina */
- r = "futa ";
- }
- if ((slave.lactation > 0) && (slave.boobs > 2000)) {
- r = r + "cow";
- } else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
- r = r + "bimbo ";
- } else if (slave.boobs > 6000) {
- r = r + "boob";
- } else if (slave.butt > 6) {
- r = r + "ass";
- } else if ((slave.muscles > 30) && (slave.height < 185)) {
- r = r + "muscle";
- }
- if (slave.visualAge > 55) {
- r = r + "GILF";
- } else if (slave.visualAge > 35) {
- r = r + "MILF";
- } else if (slave.visualAge >= 25) {
- r = r + "slave";
- } else {
- r = r + "girl";
- }
- if (slave.dick > 5 && slave.balls > 5 && slave.boobs > 5000) {
- r = "hyper " + r;
- }
+ if (slave.balls > 0) { /* FUTANARI: cock & balls & vagina */
+ r = "futanari ";
+ } else { /* FUTANARI: cock & vagina */
+ r = "futa ";
+ }
+ if ((slave.lactation > 0) && (slave.boobs > 2000)) {
+ r = r + "cow";
+ } else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
+ r = r + "bimbo ";
+ } else if (slave.boobs > 6000) {
+ r = r + "boob";
+ } else if (slave.butt > 6) {
+ r = r + "ass";
+ } else if ((slave.muscles > 30) && (slave.height < 185)) {
+ r = r + "muscle";
+ }
+ if (slave.visualAge > 55) {
+ r = r + "GILF";
+ } else if (slave.visualAge > 35) {
+ r = r + "MILF";
+ } else if (slave.visualAge >= 25) {
+ r = r + "slave";
+ } else {
+ r = r + "girl";
+ }
+ if (slave.dick > 5 && slave.balls > 5 && slave.boobs > 5000) {
+ r = "hyper " + r;
+ }
}
if ((slave.dick !== 0) && (slave.vagina === -1) && (slave.balls > 0) && (slave.boobs > 300) && (slave.butt > 2)) { /* SHEMALES: cock & balls, T&A above minimum */
@@ -1383,17 +1383,17 @@ window.SlaveTitle = /** @param {App.Entity.SlaveState} slave */ function SlaveTi
} else {
r = "tgirl";
}
- if ((slave.muscles > 30) && (slave.height < 185)) {
- r = "muscle" + r;
- } else if ((slave.lactation > 0) && (slave.boobs > 2000)) {
- r = r + " cow";
- } else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
- r = r + " bimbo";
- } else if (slave.boobs > 6000) {
- r = "topheavy " + r;
- } else if (slave.butt > 6) {
- r = "bottomheavy " + r;
- }
+ if ((slave.muscles > 30) && (slave.height < 185)) {
+ r = "muscle" + r;
+ } else if ((slave.lactation > 0) && (slave.boobs > 2000)) {
+ r = r + " cow";
+ } else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
+ r = r + " bimbo";
+ } else if (slave.boobs > 6000) {
+ r = "topheavy " + r;
+ } else if (slave.butt > 6) {
+ r = "bottomheavy " + r;
+ }
}
if ((slave.boobs < 300) || (slave.butt < 2)) {
@@ -1418,11 +1418,11 @@ window.SlaveTitle = /** @param {App.Entity.SlaveState} slave */ function SlaveTi
r = "trapgirl";
}
}
- if (slave.lactation > 0) {
- r = r + " cow";
- } else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
- r = r + " bimbo";
- }
+ if (slave.lactation > 0) {
+ r = r + " cow";
+ } else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
+ r = r + " bimbo";
+ }
}
}
}
@@ -1431,46 +1431,46 @@ window.SlaveTitle = /** @param {App.Entity.SlaveState} slave */ function SlaveTi
if ((slave.dick !== 0) && (slave.vagina === -1) && (slave.balls > 0)) {
if ((slave.shoulders > 1) || (slave.muscles >= 30)) { /* BITCHES: masculine shoulders or muscles */
r = "bitch";
- if ((slave.muscles > 30) && (slave.height < 185)) {
- r = "muscle" + r;
- } else if (slave.lactation > 0) {
- r = r + "cow";
- } else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
- r = "bimbo " + r;
- }
- if (slave.visualAge > 55) {
- r = "aged " + r;
- } else if (slave.visualAge > 35) {
- r = "mature " + r;
- } else if (slave.visualAge < 25) {
- r = "young " + r;
- }
+ if ((slave.muscles > 30) && (slave.height < 185)) {
+ r = "muscle" + r;
+ } else if (slave.lactation > 0) {
+ r = r + "cow";
+ } else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
+ r = "bimbo " + r;
+ }
+ if (slave.visualAge > 55) {
+ r = "aged " + r;
+ } else if (slave.visualAge > 35) {
+ r = "mature " + r;
+ } else if (slave.visualAge < 25) {
+ r = "young " + r;
+ }
}
}
}
if ((slave.dick !== 0) && (slave.vagina === -1) && (slave.balls === 0)) {
r = "dick";
- if (slave.visualAge > 55) {
- r = r + "GILF";
- } else if (slave.visualAge > 35) {
- r = r + "MILF";
- } else if (slave.visualAge >= 25) {
- r = r + "slave";
- } else {
- r = r + "girl";
- }
- if ((slave.muscles > 30) && (slave.height < 185)) {
- r = "muscle" + r;
- } else if ((slave.lactation > 0) && (slave.boobs > 2000)) {
- r = r + " cow";
- } else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
- r = r + " bimbo";
- } else if (slave.boobs > 6000) {
- r = "boob " + r;
- } else if (slave.butt > 6) {
- r = "ass " + r;
- }
+ if (slave.visualAge > 55) {
+ r = r + "GILF";
+ } else if (slave.visualAge > 35) {
+ r = r + "MILF";
+ } else if (slave.visualAge >= 25) {
+ r = r + "slave";
+ } else {
+ r = r + "girl";
+ }
+ if ((slave.muscles > 30) && (slave.height < 185)) {
+ r = "muscle" + r;
+ } else if ((slave.lactation > 0) && (slave.boobs > 2000)) {
+ r = r + " cow";
+ } else if ((slave.boobsImplant > 0) && (slave.buttImplant > 0)) {
+ r = r + " bimbo";
+ } else if (slave.boobs > 6000) {
+ r = "boob " + r;
+ } else if (slave.butt > 6) {
+ r = "ass " + r;
+ }
}
if ((slave.muscles > 30) && (slave.height > 185)) {
@@ -1912,48 +1912,48 @@ window.SlaveSort = /** @param {App.Entity.SlaveState[]} slaves */ function Slave
const V = State.variables;
if (main) {
switch (V.sortSlavesBy) {
- case "name":
- if (V.sortSlavesOrder === "ascending")
- slaves = slaves.sort((a, b) => a.slaveName < b.slaveName ? -1 : 1);
- else
- slaves = slaves.sort((a, b) => a.slaveName > b.slaveName ? -1 : 1);
- break;
- case "assignment":
- if (V.sortSlavesOrder === "ascending")
- slaves = slaves.sort((a, b) => a.assignment < b.assignment ? -1 : 1);
- else
- slaves = slaves.sort((a, b) => a.assignment > b.assignment ? -1 : 1);
- break;
- case "seniority":
- if (V.sortSlavesOrder === "ascending")
- slaves = slaves.sort((a, b) => b.weekAcquired - a.weekAcquired);
- else
- slaves = slaves.sort((a, b) => a.weekAcquired - b.weekAcquired);
- break;
- case "actualAge":
- if (V.sortSlavesOrder === "ascending")
- slaves = slaves.sort((a, b) => a.actualAge - b.actualAge);
- else
- slaves = slaves.sort((a, b) => b.actualAge - a.actualAge);
- break;
- case "visualAge":
- if (V.sortSlavesOrder === "ascending")
- slaves = slaves.sort((a, b) => a.visualAge - b.visualAge);
- else
- slaves = slaves.sort((a, b) => b.visualAge - a.visualAge);
- break;
- case "physicalAge":
- if (V.sortSlavesOrder === "physicalAge")
- slaves = slaves.sort((a, b) => a.physicalAge - b.physicalAge);
- else
- slaves = slaves.sort((a, b) => b.physicalAge - a.physicalAge);
- break;
- default:
- if (V.sortSlavesOrder === "ascending")
- slaves = slaves.sort((a, b) => a.devotion - b.devotion);
- else
- slaves = slaves.sort((a, b) => b.devotion - a.devotion);
- break;
+ case "name":
+ if (V.sortSlavesOrder === "ascending")
+ slaves = slaves.sort((a, b) => a.slaveName < b.slaveName ? -1 : 1);
+ else
+ slaves = slaves.sort((a, b) => a.slaveName > b.slaveName ? -1 : 1);
+ break;
+ case "assignment":
+ if (V.sortSlavesOrder === "ascending")
+ slaves = slaves.sort((a, b) => a.assignment < b.assignment ? -1 : 1);
+ else
+ slaves = slaves.sort((a, b) => a.assignment > b.assignment ? -1 : 1);
+ break;
+ case "seniority":
+ if (V.sortSlavesOrder === "ascending")
+ slaves = slaves.sort((a, b) => b.weekAcquired - a.weekAcquired);
+ else
+ slaves = slaves.sort((a, b) => a.weekAcquired - b.weekAcquired);
+ break;
+ case "actualAge":
+ if (V.sortSlavesOrder === "ascending")
+ slaves = slaves.sort((a, b) => a.actualAge - b.actualAge);
+ else
+ slaves = slaves.sort((a, b) => b.actualAge - a.actualAge);
+ break;
+ case "visualAge":
+ if (V.sortSlavesOrder === "ascending")
+ slaves = slaves.sort((a, b) => a.visualAge - b.visualAge);
+ else
+ slaves = slaves.sort((a, b) => b.visualAge - a.visualAge);
+ break;
+ case "physicalAge":
+ if (V.sortSlavesOrder === "physicalAge")
+ slaves = slaves.sort((a, b) => a.physicalAge - b.physicalAge);
+ else
+ slaves = slaves.sort((a, b) => b.physicalAge - a.physicalAge);
+ break;
+ default:
+ if (V.sortSlavesOrder === "ascending")
+ slaves = slaves.sort((a, b) => a.devotion - b.devotion);
+ else
+ slaves = slaves.sort((a, b) => b.devotion - a.devotion);
+ break;
}
V.slaveIndices = slaves2indices();
} else {
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 7b441043d74772a5d0fd6ffb5c66387956818da4..b8efa6520e9d7fb20d546cff37509d6b79f72bca 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -6,13 +6,13 @@ window.Job = Object.freeze({
JAIL: 'be confined in the cellblock', WARDEN: 'be the Wardeness', CLINIC: 'get treatment in the clinic', NURSE: 'be the Nurse',
HGTOY: 'live with your Head Girl', SCHOOL: 'learn in the schoolroom', TEACHER: 'be the Schoolteacher', SPA: 'rest in the spa', ATTEND: 'be the Attendant',
NANNY: 'work as a nanny', MATRON: 'be the Matron', FARMYARD: 'work as a farmhand', FARMER: 'be the Farmer', REST: 'rest'
- });
+});
window.PersonalAttention = Object.freeze({TRADE: 'trading', WAR: 'warfare', SLAVING: 'slaving', ENGINEERING: 'engineering', MEDICINE: 'medicine', MAID: 'upkeep', HACKING: 'hacking'});
window.predictCost = function(array) {
var array2 = array;
var totalCosts = (
- getBrothelCosts() +
+ getBrothelCosts() +
getBrothelAdsCosts() +
getArcadeCosts() +
getClubCosts() +
@@ -46,10 +46,10 @@ window.predictCost = function(array) {
//in the old order these were applied after multiplication. Not sure if deliberate, but I'm leaving it for now.
totalCosts += (
- getSFCosts() +
+ getSFCosts() +
getWeatherCosts()
);
-/*
+ /*
// clean up
if(totalCosts > 0) {
totalCosts = 0;
@@ -292,7 +292,7 @@ window.getSecurityExpansionCost = function() {
return secExpCost;
};
- //general arcology costs
+//general arcology costs
window.getLifestyleCosts = function() {
var costs = 0;
@@ -457,19 +457,19 @@ window.getCyberModCosts = function() {
window.getPCTrainingCosts = function() {
var costs = 0;
if(State.variables.PC.actualAge >= State.variables.IsInPrimePC && State.variables.PC.actualAge < State.variables.IsPastPrimePC) {
- if(State.variables.personalAttention === PersonalAttention.TRADE) {
- costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
- } else if(State.variables.personalAttention === PersonalAttention.WAR) {
- costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
- } else if(State.variables.personalAttention === PersonalAttention.SLAVING) {
- costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
- } else if(State.variables.personalAttention === PersonalAttention.ENGINEERING) {
- costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
- } else if(State.variables.personalAttention === PersonalAttention.MEDICINE) {
- costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
- } else if(State.variables.personalAttention === PersonalAttention.HACKING) {
- costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
- }
+ if(State.variables.personalAttention === PersonalAttention.TRADE) {
+ costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
+ } else if(State.variables.personalAttention === PersonalAttention.WAR) {
+ costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
+ } else if(State.variables.personalAttention === PersonalAttention.SLAVING) {
+ costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
+ } else if(State.variables.personalAttention === PersonalAttention.ENGINEERING) {
+ costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
+ } else if(State.variables.personalAttention === PersonalAttention.MEDICINE) {
+ costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
+ } else if(State.variables.personalAttention === PersonalAttention.HACKING) {
+ costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
+ }
}
return costs;
};
@@ -541,43 +541,43 @@ window.getSlaveMinorCosts = function(slave) {
var costs = 0;
var rulesCost = State.variables.rulesCost;
if(slave.assignment === Job.SERVANT || slave.assignment === Job.SERVER) {
- if(slave.trust < -20) {
- costs -= rulesCost * 4;
- } else if(slave.devotion < -20) {
- if (slave.trust >= 20) {
- costs -= rulesCost / 2;
+ if(slave.trust < -20) {
+ costs -= rulesCost * 4;
+ } else if(slave.devotion < -20) {
+ if (slave.trust >= 20) {
+ costs -= rulesCost / 2;
+ } else {
+ costs -= rulesCost * 2;
+ }
+ } else if(slave.devotion <= 20) {
+ costs -= rulesCost * 3;
+ } else if(slave.devotion <= 50) {
+ costs -= rulesCost * 4;
} else {
- costs -= rulesCost * 2;
+ costs -= rulesCost * 5;
+ }
+ if(slave.fetish === 'submissive') {
+ costs -= rulesCost;
+ } else if(slave.fetish === 'dom') {
+ costs += rulesCost;
+ }
+ if(slave.relationship < -1) {
+ costs -= rulesCost;
+ }
+ if(slave.energy < 20) {
+ costs -= rulesCost;
+ } else if(slave.energy < 40) {
+ costs -= rulesCost / 2;
+ }
+ if(slave.lactation > 0) {
+ costs -= 25;
+ }
+ if(slave.assignment === Job.SERVANT) {
+ costs -= rulesCost;
+ }
+ if(setup.servantCareers.includes(slave.career) || slave.skillS >= State.variables.masteredXP) {
+ costs -= rulesCost;
}
- } else if(slave.devotion <= 20) {
- costs -= rulesCost * 3;
- } else if(slave.devotion <= 50) {
- costs -= rulesCost * 4;
- } else {
- costs -= rulesCost * 5;
- }
- if(slave.fetish === 'submissive') {
- costs -= rulesCost;
- } else if(slave.fetish === 'dom') {
- costs += rulesCost;
- }
- if(slave.relationship < -1) {
- costs -= rulesCost;
- }
- if(slave.energy < 20) {
- costs -= rulesCost;
- } else if(slave.energy < 40) {
- costs -= rulesCost / 2;
- }
- if(slave.lactation > 0) {
- costs -= 25;
- }
- if(slave.assignment === Job.SERVANT) {
- costs -= rulesCost;
- }
- if(setup.servantCareers.includes(slave.career) || slave.skillS >= State.variables.masteredXP) {
- costs -= rulesCost;
- }
}
return costs;
};
@@ -592,80 +592,80 @@ window.getSlaveCost = function(s) {
// Living expenses
switch(s.assignment) {
- case Job.ARCADE:
- cost += rulesCost * 0.75;
- break;
- case Job.DAIRY:
- if(State.variables.dairyRestraintsSetting >= 2) {
+ case Job.ARCADE:
cost += rulesCost * 0.75;
- } else if(s.livingRules === LivingRule.NORMAL) {
- cost += rulesCost * 1.5;
- } else if(State.variables.dairyDecoration === 'Degradationist') {
- cost += rulesCost * 0.90;
- } else {
- cost += rulesCost;
- }
- break;
- case Job.BROTHEL:
- if(s.livingRules === LivingRule.NORMAL) {
- cost += rulesCost * 1.5;
- } else {
- cost += rulesCost;
- }
- break;
- case Job.SCHOOL: case Job.CLUB:
- cost += rulesCost * 1.5;
- break;
- case Job.CLINIC:
- if(s.livingRules === LivingRule.LUXURIOUS) {
- cost += rulesCost * 2;
- } else if(s.livingRules === LivingRule.NORMAL) {
- cost += rulesCost * 1.5;
- } else {
- cost += rulesCost;
- }
- break;
- case Job.SPA: case Job.NANNY:
- if(s.livingRules === LivingRule.LUXURIOUS) {
- cost += rulesCost * 1.75;
- } else if(s.livingRules === LivingRule.NORMAL) {
- cost += rulesCost * 1.5;
- } else {
- cost += rulesCost;
- }
- break;
- case Job.SERVANT:
- if(s.livingRules === LivingRule.NORMAL) {
- cost += rulesCost * 1.5;
- } else {
- if(State.variables.servantsQuartersDecoration === 'Degradationist') {
+ break;
+ case Job.DAIRY:
+ if(State.variables.dairyRestraintsSetting >= 2) {
+ cost += rulesCost * 0.75;
+ } else if(s.livingRules === LivingRule.NORMAL) {
+ cost += rulesCost * 1.5;
+ } else if(State.variables.dairyDecoration === 'Degradationist') {
cost += rulesCost * 0.90;
} else {
cost += rulesCost;
}
- }
- break;
- case Job.JAIL:
- if(s.livingRules === LivingRule.NORMAL) {
- cost += rulesCost * 1.25;
- } else {
- cost += rulesCost * 0.90;
- }
- break;
- case Job.MADAM: case Job.DJ: case Job.NURSE: case Job.WARDEN:
- case Job.ATTEND: case Job.STEWARD: case Job.MILKMAID: case Job.TEACHER:
- case Job.MATRON:
- cost += rulesCost * 2;
- break;
- default:
- if(s.livingRules === LivingRule.LUXURIOUS) {
- cost += rulesCost * (s.relationship >= 4 ? 3 : 4);
- } else if(s.livingRules === LivingRule.NORMAL) {
+ break;
+ case Job.BROTHEL:
+ if(s.livingRules === LivingRule.NORMAL) {
+ cost += rulesCost * 1.5;
+ } else {
+ cost += rulesCost;
+ }
+ break;
+ case Job.SCHOOL: case Job.CLUB:
+ cost += rulesCost * 1.5;
+ break;
+ case Job.CLINIC:
+ if(s.livingRules === LivingRule.LUXURIOUS) {
+ cost += rulesCost * 2;
+ } else if(s.livingRules === LivingRule.NORMAL) {
+ cost += rulesCost * 1.5;
+ } else {
+ cost += rulesCost;
+ }
+ break;
+ case Job.SPA: case Job.NANNY:
+ if(s.livingRules === LivingRule.LUXURIOUS) {
+ cost += rulesCost * 1.75;
+ } else if(s.livingRules === LivingRule.NORMAL) {
+ cost += rulesCost * 1.5;
+ } else {
+ cost += rulesCost;
+ }
+ break;
+ case Job.SERVANT:
+ if(s.livingRules === LivingRule.NORMAL) {
+ cost += rulesCost * 1.5;
+ } else {
+ if(State.variables.servantsQuartersDecoration === 'Degradationist') {
+ cost += rulesCost * 0.90;
+ } else {
+ cost += rulesCost;
+ }
+ }
+ break;
+ case Job.JAIL:
+ if(s.livingRules === LivingRule.NORMAL) {
+ cost += rulesCost * 1.25;
+ } else {
+ cost += rulesCost * 0.90;
+ }
+ break;
+ case Job.MADAM: case Job.DJ: case Job.NURSE: case Job.WARDEN:
+ case Job.ATTEND: case Job.STEWARD: case Job.MILKMAID: case Job.TEACHER:
+ case Job.MATRON:
cost += rulesCost * 2;
- } else {
- cost += rulesCost;
- }
- break;
+ break;
+ default:
+ if(s.livingRules === LivingRule.LUXURIOUS) {
+ cost += rulesCost * (s.relationship >= 4 ? 3 : 4);
+ } else if(s.livingRules === LivingRule.NORMAL) {
+ cost += rulesCost * 2;
+ } else {
+ cost += rulesCost;
+ }
+ break;
}
// Food
@@ -792,62 +792,62 @@ window.getSlaveCost = function(s) {
// Enemas
if(s.inflation === 3) {
switch(s.inflationType) {
- case 'water':
- cost += 100;
- break;
- case 'food':
- cost += (foodCost * 4);
- break;
- case 'curative': case 'aphrodisiac': case 'tightener':
- cost += (100 + (drugsCost * 2));
- break;
+ case 'water':
+ cost += 100;
+ break;
+ case 'food':
+ cost += (foodCost * 4);
+ break;
+ case 'curative': case 'aphrodisiac': case 'tightener':
+ cost += (100 + (drugsCost * 2));
+ break;
}
} else if(s.inflation === 2) {
switch(s.inflationType) {
- case 'water':
- cost += 50;
- break;
- case 'food':
- cost += (foodCost * 2);
- break;
- case 'curative': case 'aphrodisiac': case 'tightener':
- cost += (50 + (drugsCost * 2));
- break;
+ case 'water':
+ cost += 50;
+ break;
+ case 'food':
+ cost += (foodCost * 2);
+ break;
+ case 'curative': case 'aphrodisiac': case 'tightener':
+ cost += (50 + (drugsCost * 2));
+ break;
}
} else if(s.inflation === 1) {
switch(s.inflationType) {
- case 'water':
- cost += 25;
- break;
- case 'food':
- cost += (foodCost);
- break;
- case 'curative': case 'aphrodisiac': case 'tightener':
- cost += (25 + (drugsCost * 2));
- break;
+ case 'water':
+ cost += 25;
+ break;
+ case 'food':
+ cost += (foodCost);
+ break;
+ case 'curative': case 'aphrodisiac': case 'tightener':
+ cost += (25 + (drugsCost * 2));
+ break;
}
}
// Drugs
switch(s.drugs) {
- case 'anti-aging cream':
- cost += drugsCost * 10;
- break;
- case 'female hormone injections': case 'male hormone injections': case 'intensive breast injections':
- case 'intensive butt injections': case 'intensive penis enhancement': case 'intensive testicle enhancement':
- case 'intensive lip injections': case 'hyper breast injections': case 'hyper butt injections':
- case 'hyper penis enhancement': case 'hyper testicle enhancement': case 'hyper lip injections':
- case 'growth stimulants':
- cost += drugsCost * 5;
- break;
- case 'sag-B-gone':
- cost += Math.trunc(drugsCost * 0.1);
- break;
- case 'no drugs': case 'none':
- break;
- default:
- cost += drugsCost * 2;
- break;
+ case 'anti-aging cream':
+ cost += drugsCost * 10;
+ break;
+ case 'female hormone injections': case 'male hormone injections': case 'intensive breast injections':
+ case 'intensive butt injections': case 'intensive penis enhancement': case 'intensive testicle enhancement':
+ case 'intensive lip injections': case 'hyper breast injections': case 'hyper butt injections':
+ case 'hyper penis enhancement': case 'hyper testicle enhancement': case 'hyper lip injections':
+ case 'growth stimulants':
+ cost += drugsCost * 5;
+ break;
+ case 'sag-B-gone':
+ cost += Math.trunc(drugsCost * 0.1);
+ break;
+ case 'no drugs': case 'none':
+ break;
+ default:
+ cost += drugsCost * 2;
+ break;
}
if(s.curatives > 0 && s.assignmentVisible === 1) {
cost += drugsCost * s.curatives;
@@ -1126,8 +1126,8 @@ window.cashX = function(cost, what, who) {
//record the slave, if available
if (typeof who !== 'undefined') {
- who.lastWeeksCashIncome += cost;
- who.lifetimeCashIncome += cost;
+ who.lastWeeksCashIncome += cost;
+ who.lifetimeCashIncome += cost;
}
}