diff --git a/src/endWeek/reports/dairyReport.js b/src/endWeek/reports/dairyReport.js
index 217c63f54453ca776a3e203519adcfc349a61454..d21ba36749edebc592a844371b3d8bf5bd4b1cb1 100644
--- a/src/endWeek/reports/dairyReport.js
+++ b/src/endWeek/reports/dairyReport.js
@@ -54,7 +54,7 @@ App.EndWeek.dairyReport = function() {
if (slave.bellyPreg >= 500 && V.dairyPregSetting > 0) {
breeders++;
}
- if ((V.milkmaidImpregnates === 1) && (canPenetrate(S.Milkmaid)) && S.Milkmaid.pubertyXY === 1 && !slaveResting(S.Milkmaid)) {
+ if (V.milkmaidImpregnates === 1 && canPenetrate(S.Milkmaid) && S.Milkmaid.pubertyXY === 1 && !slaveResting(S.Milkmaid)) {
if (canImpreg(slave, S.Milkmaid)) {
slave.preg = 1;
slave.pregSource = V.MilkmaidID;
@@ -130,8 +130,8 @@ App.EndWeek.dairyReport = function() {
MMWorkout += 1;
}
}
- if ((V.dairyStimulatorsSetting < 2) && (S.Milkmaid.dick > 4) && (canPenetrate(S.Milkmaid)) && prostateStim !== 1) {
- if ((slave.balls > 0) && (slave.prostate > 0)) {
+ if (V.dairyStimulatorsSetting < 2 && S.Milkmaid.dick > 4 && canPenetrate(S.Milkmaid) && prostateStim !== 1) {
+ if (slave.balls > 0 && slave.prostate > 0) {
prostateStim = 1;
}
}
@@ -230,7 +230,7 @@ App.EndWeek.dairyReport = function() {
if (S.Milkmaid.career === "a breeding bull") {
r.push(`${He} was conditioned to fill empty wombs, so ${he} takes a <span class="hotpink">deep pleasure</span> in ${his} job.`);
S.Milkmaid.devotion++;
- } else if ((S.Milkmaid.fetish === "pregnancy" && S.Milkmaid.fetishKnown === 1)) {
+ } else if (S.Milkmaid.fetish === "pregnancy" && S.Milkmaid.fetishKnown === 1) {
r.push(`${He} has a pregnancy fetish, so ${he} finds ${his} job <span class="hotpink">quite enjoyable,</span> especially when ${he} gets to watch the cows swell with ${his} children.`);
S.Milkmaid.devotion += Math.ceil(S.Milkmaid.fetishStrength / 25);
S.Milkmaid.fetishStrength += 2;
@@ -242,22 +242,22 @@ App.EndWeek.dairyReport = function() {
}
if (FLsFetish === 1) {
r.push(`In ${his} line of work, ${he} touches more breasts than even you do. ${He} lives in an atmosphere of quivering, heaving, milky breastflesh; of girls who shudder and moan when ${he} touches their creamy nipples. ${He} has <span class="lightcoral">become more of a breast ${girl}.</span>`);
- } else if ((FLsFetish === 2)) {
+ } else if (FLsFetish === 2) {
r.push(`It's a hard life, pulling teats and washing cows, but it does <span class="lightsalmon">make ${him} more of a breast fetishist.</span>`);
- } else if ((FLsFetish === 3)) {
+ } else if (FLsFetish === 3) {
r.push(`In ${his} line of work, ${he} touches more dicks and balls than most sluts. ${He} lives in an atmosphere of constant orgasm and ejaculation; of girls who shudder and moan when ${he} touches their engorged members. ${He} has <span class="lightcoral">become more of a cum ${girl}.</span>`);
- } else if ((FLsFetish === 4)) {
+ } else if (FLsFetish === 4) {
r.push(`It's a hard life, cupping balls, cleaning dicks, and observing semen quality, but it does <span class="lightsalmon">make ${him} more of a cum fetishist.</span>`);
- } else if ((FLsFetish === 5)) {
+ } else if (FLsFetish === 5) {
r.push(`In ${his} line of work, ${he} fondles more pregnancies than most clinics. ${He} lives in an atmosphere of swollen, hanging, baby-filled bellies; of girls who shudder and moan when ${he} runs ${his} hands across their bellies. ${He} has <span class="lightcoral">grown a taste for girls laden with child.</span>`);
- } else if ((FLsFetish === 6)) {
+ } else if (FLsFetish === 6) {
r.push(`It's a hard life, washing bellies and inspecting pussies, but it does <span class="lightsalmon">make ${him} more of a pregnancy fetishist.</span>`);
}
if (S.Milkmaid.muscles > 30) {
V.milkmaidHealthBonus++;
r.push(`${His} muscles help ${him} handle the fattest or most reluctant cow.`);
}
- if ((MMWorkout > random(1, 30 - S.Milkmaid.geneticQuirks.mLoss + S.Milkmaid.geneticQuirks.mGain)) && S.Milkmaid.muscles < 60) {
+ if (MMWorkout > random(1, 30 - S.Milkmaid.geneticQuirks.mLoss + S.Milkmaid.geneticQuirks.mGain) && S.Milkmaid.muscles < 60) {
r.push(`Constantly having to wrestle unruly or aiding heavy cows into their stalls forces ${him} to <span class="lime">build muscle.</span>`);
S.Milkmaid.muscles++;
}
@@ -317,7 +317,7 @@ App.EndWeek.dairyReport = function() {
slave.trust++;
}
if (slave.prestigeDesc === "$He is remembered for winning best in show as a dairy cow.") {
- if ((slave.lactation > 0) && ((slave.boobs - slave.boobsImplant) > 6000)) {
+ if (slave.lactation > 0 && (slave.boobs - slave.boobsImplant) > 6000) {
r.push(`${He} spends extra time with ${slave.slaveName}, the well-known cow. ${He} is fascinated by ${slave.slaveName}'s massive ${commaNum(slave.boobs)}cc breasts and spends extra time massaging and kneading them to maximize production.`);
slave.devotion += 3;
slave.trust += 3;
@@ -326,7 +326,7 @@ App.EndWeek.dairyReport = function() {
}
}
if (slave.prestigeDesc === "$He is remembered for winning best in show as a cockmilker.") {
- if (((slave.balls > 6) && (slave.dick !== 0)) || ((slave.balls > 4) && (slave.dick !== 0) && (slave.prostate > 1))) {
+ if ((slave.balls > 6 && slave.dick !== 0) || (slave.balls > 4 && slave.dick !== 0 && slave.prostate > 1)) {
r.push(`${He} spends extra time with ${slave.slaveName}, the massive ejaculating cow. ${He} can't help but massage the cow's dick and testes to stimulate them further and coax more from them.`);
slave.devotion += 3;
slave.trust += 3;
@@ -398,13 +398,22 @@ App.EndWeek.dairyReport = function() {
he, him, his, He, His, wife, girl
} = getPronouns(slave));
/* Special attention section */
- if ((V.legendaryCowID === 0) && (slave.lactation > 0) && ((slave.boobs - slave.boobsImplant - slave.boobsMilk) > 6000) && (slave.devotion > 50) && (slave.prestige === 0)) {
- V.legendaryCowID = slave.ID;
- }
- if ((V.legendaryBallsID === 0) && (slave.dick !== 0) && (slave.balls > 5 || (slave.balls > 4 && slave.prostate > 1)) && (slave.devotion > 50) && (slave.prestige === 0)) {
- V.legendaryBallsID = slave.ID;
+ if (slave.devotion > 50 && slave.prestige === 0) {
+ if (
+ V.legendaryCowID === 0 && slave.lactation > 0 &&
+ (slave.boobs - slave.boobsImplant - slave.boobsMilk) > 6000
+ ) {
+ V.legendaryCowID = slave.ID;
+ }
+ if (
+ V.legendaryBallsID === 0 && slave.dick !== 0 &&
+ (slave.balls > 5 || (slave.balls > 4 && slave.prostate > 1))
+ ) {
+ V.legendaryBallsID = slave.ID;
+ }
}
+
/* Perform facility based rule changes */
if (V.dairySlimMaintain === 0) {
if (V.dairyWeightSetting === 0) {
@@ -442,7 +451,7 @@ App.EndWeek.dairyReport = function() {
}
} else if (slave.weight > 10) {
slave.diet = "restricted";
- } else if ((slave.diet === "fattening") || slave.diet === "healthy" || (V.dairyRestraintsSetting > 1)) {
+ } else if (slave.diet === "fattening" || slave.diet === "healthy" || V.dairyRestraintsSetting > 1) {
slave.diet = "healthy";
}
if (V.dairyRestraintsSetting > 1) {
@@ -518,7 +527,7 @@ App.EndWeek.dairyReport = function() {
cumWeek += milkResults.cum;
/* Facility Specific End of Week effects */
- if ((slave.devotion <= 20) && (slave.trust >= -20)) {
+ if (slave.devotion <= 20 && slave.trust >= -20) {
slave.devotion -= 5;
slave.trust -= 5;
}
@@ -535,12 +544,12 @@ App.EndWeek.dairyReport = function() {
deflate(slave);
}
const gigantomastiaMod = slave.geneticQuirks.gigantomastia === 2 ? (slave.geneticQuirks.macromastia === 2 ? 3 : 2) : 1;
- if ((slave.lactation > 0) && (V.dairySlimMaintain === 0 || (slave.boobs > 700))) {
+ if (slave.lactation > 0 && (V.dairySlimMaintain === 0 || slave.boobs > 700)) {
if (slave.boobs < 2000) {
growth = 100;
- } else if ((slave.boobs < 5000 * gigantomastiaMod)) {
+ } else if (slave.boobs < 5000 * gigantomastiaMod) {
growth = 50;
- } else if ((slave.boobs < 10000 * gigantomastiaMod)) {
+ } else if (slave.boobs < 10000 * gigantomastiaMod) {
growth = 25;
} else {
growth = 0;
@@ -562,14 +571,14 @@ App.EndWeek.dairyReport = function() {
}
if (V.dairySlimMaintain === 0) {
if (V.dairyImplantsSetting <= 1) {
- if ((slave.lactation < 2) && (slave.boobs > 300 || slave.balls === 0 || slave.lactation === 1 || V.dairyImplantsSetting === 1)) {
+ if (slave.lactation < 2 && (slave.boobs > 300 || slave.balls === 0 || slave.lactation === 1 || V.dairyImplantsSetting === 1)) {
slave.lactation = 2;
slave.lactationDuration = 2;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
surgeryDamage(slave, 10);
}
} else if (V.dairyImplantsSetting === 3) {
- if ((slave.lactation < 1) && (slave.boobs > 300 || slave.balls === 0)) {
+ if (slave.lactation < 1 && (slave.boobs > 300 || slave.balls === 0)) {
induceLactation(slave, 9);
}
}
@@ -583,7 +592,7 @@ App.EndWeek.dairyReport = function() {
slave.hormones = V.dairyHormonesSetting;
}
}
- if ((V.dairyFeedersUpgrade === 1) && (V.dairyFeedersSetting > 0)) {
+ if (V.dairyFeedersUpgrade === 1 && V.dairyFeedersSetting > 0) {
if (V.dairySlimMaintain === 0 && slave.diet === "fattening") {
slave.weight += 2;
if (slave.weightDirection === 1) {
@@ -598,14 +607,14 @@ App.EndWeek.dairyReport = function() {
if (slave.boobs < 50000) {
if (V.arcologies[0].FSAssetExpansionistResearch === 1) {
if (slave.boobs < 2000) {
- growth = 75 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
- } else if ((slave.boobs < 5000 * gigantomastiaMod)) {
- growth = 50 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
+ growth = 75 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
+ } else if (slave.boobs < 5000 * gigantomastiaMod) {
+ growth = 50 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
} else {
- growth = 25 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
+ growth = 25 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
}
} else {
- growth = 25 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50 - slave.physicalAge) / 4));
+ growth = 25 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50 - slave.physicalAge) / 4);
}
if (slave.boobs <= 20000 && slave.boobs + growth > 20000) {
boobtacular++;
@@ -621,14 +630,14 @@ App.EndWeek.dairyReport = function() {
if (slave.boobs < 25000) {
if (V.arcologies[0].FSAssetExpansionistResearch === 1) {
if (slave.boobs < 2000) {
- growth = 75 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
- } else if ((slave.boobs < 5000 * gigantomastiaMod)) {
- growth = 50 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
+ growth = 75 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
+ } else if (slave.boobs < 5000 * gigantomastiaMod) {
+ growth = 50 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
} else {
- growth = 25 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
+ growth = 25 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
}
} else {
- growth = 25 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50 - slave.physicalAge) / 4));
+ growth = 25 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50 - slave.physicalAge) / 4);
}
if (slave.boobs <= 20000 && slave.boobs + growth > 20000) {
boobtacular++;
@@ -642,14 +651,14 @@ App.EndWeek.dairyReport = function() {
if (slave.boobs < 10000) {
if (V.arcologies[0].FSAssetExpansionistResearch === 1) {
if (slave.boobs < 2000) {
- growth = 75 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
- } else if ((slave.boobs < 5000 * gigantomastiaMod)) {
- growth = 50 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
+ growth = 75 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
+ } else if (slave.boobs < 5000 * gigantomastiaMod) {
+ growth = 50 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
} else {
- growth = 25 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
+ growth = 25 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
}
} else {
- growth = 25 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50 - slave.physicalAge) / 4));
+ growth = 25 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50 - slave.physicalAge) / 4);
}
if (slave.boobs <= 20000 && slave.boobs + growth > 20000) {
boobtacular++;
@@ -663,14 +672,14 @@ App.EndWeek.dairyReport = function() {
if (slave.boobs < 5000) {
if (V.arcologies[0].FSAssetExpansionistResearch === 1) {
if (slave.boobs < 2000) {
- growth = 75 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
- } else if ((slave.boobs < 5000 * gigantomastiaMod)) {
- growth = 50 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
+ growth = 75 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
+ } else if (slave.boobs < 5000 * gigantomastiaMod) {
+ growth = 50 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
} else {
- growth = 25 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
+ growth = 25 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
}
} else {
- growth = 25 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50 - slave.physicalAge) / 4));
+ growth = 25 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50 - slave.physicalAge) / 4);
}
if (slave.boobs <= 20000 && slave.boobs + growth > 20000) {
boobtacular++;
@@ -683,20 +692,29 @@ App.EndWeek.dairyReport = function() {
}
}
if (slave.balls > 0) {
+ const ballFormula = (10 * slave.balls) - (10 * V.dairyRestraintsSetting) - (V.injectionUpgrade * 10);
if (V.arcologies[0].FSAssetExpansionistResearch === 1) {
if (slave.geneMods.NCS === 0 && slave.balls < 125) {
slave.balls++;
- } else if ((slave.geneMods.NCS === 1) && (slave.balls < 125) && (random(1, 600) > (30 + (10 * slave.balls) - (10 * V.dairyRestraintsSetting) - (V.injectionUpgrade * 10)))) {
+ } else if (
+ slave.geneMods.NCS === 1 && slave.balls < 125 &&
+ random(1, 600) > (30 + ballFormula)
+ ) {
slave.balls++;
}
if (slave.balls >= 125) {
balltacular++;
btSlave = slave;
}
- } else if ((slave.balls < 10)) {
- if ((slave.geneMods.NCS === 0) && (random(1, 100) > (40 + (10 * slave.balls) - (10 * V.dairyRestraintsSetting) - (V.injectionUpgrade * 10)))) {
+ } else if (slave.balls < 10) {
+ if (slave.geneMods.NCS === 0 &&
+ random(1, 100) > (40 + ballFormula)
+ ) {
slave.balls++;
- } else if ((slave.geneMods.NCS === 1) && (slave.balls < 125) && (random(1, 50) > (40 + (10 * slave.balls) - (10 * V.dairyRestraintsSetting) - (V.injectionUpgrade * 10)))) {
+ } else if (
+ slave.geneMods.NCS === 1 && slave.balls < 125 &&
+ random(1, 50) > (40 + ballFormula)
+ ) {
slave.balls++;
}
if (slave.balls >= 10) {
@@ -705,10 +723,11 @@ App.EndWeek.dairyReport = function() {
}
}
if (slave.dick > 0) {
+ const dickFormula = (10 * slave.dick) - (10 * V.dairyRestraintsSetting) - (V.injectionUpgrade * 10);
if (slave.dick < 10) {
- if ((slave.geneMods.NCS === 0) && (random(1, 100) > (40 + (10 * slave.dick) - (10 * V.dairyRestraintsSetting) - (V.injectionUpgrade * 10)))) {
+ if (slave.geneMods.NCS === 0 && random(1, 100) > (40 + dickFormula)) {
slave.dick++;
- } else if (((slave.geneMods.NCS === 1) && (random(1, 50) > (40 + (10 * slave.dick) - (10 * V.dairyRestraintsSetting) - (V.injectionUpgrade * 10))))) {
+ } else if (slave.geneMods.NCS === 1 && random(1, 50) > (40 + dickFormula)) {
slave.dick++;
}
}
@@ -723,7 +742,7 @@ App.EndWeek.dairyReport = function() {
if (slave.anus >= 4) {
anusesStretched++;
}
- } else if ((slave.anus < 3)) {
+ } else if (slave.anus < 3) {
slave.anus++;
}
if (slave.health.condition < 60) {
@@ -733,14 +752,14 @@ App.EndWeek.dairyReport = function() {
if (slave.boobs < 50000) {
if (V.arcologies[0].FSAssetExpansionistResearch === 1) {
if (slave.boobs < 2000) {
- growth = 75 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
- } else if ((slave.boobs < 5000 * gigantomastiaMod)) {
- growth = 50 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
+ growth = 75 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
+ } else if (slave.boobs < 5000 * gigantomastiaMod) {
+ growth = 50 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
} else {
- growth = 25 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
+ growth = 25 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
}
} else {
- growth = 25 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50 - slave.physicalAge) / 4));
+ growth = 25 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50 - slave.physicalAge) / 4);
}
if (slave.boobs <= 20000 && slave.boobs + growth > 20000) {
boobtacular++;
@@ -754,14 +773,14 @@ App.EndWeek.dairyReport = function() {
if (slave.boobs < 25000) {
if (V.arcologies[0].FSAssetExpansionistResearch === 1) {
if (slave.boobs < 2000) {
- growth = 75 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
- } else if ((slave.boobs < 5000 * gigantomastiaMod)) {
- growth = 50 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
+ growth = 75 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
+ } else if (slave.boobs < 5000 * gigantomastiaMod) {
+ growth = 50 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
} else {
- growth = 25 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
+ growth = 25 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
}
} else {
- growth = 25 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50 - slave.physicalAge) / 4));
+ growth = 25 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50 - slave.physicalAge) / 4);
}
if (slave.boobs <= 20000 && slave.boobs + growth > 20000) {
boobtacular++;
@@ -775,14 +794,14 @@ App.EndWeek.dairyReport = function() {
if (slave.boobs < 10000) {
if (V.arcologies[0].FSAssetExpansionistResearch === 1) {
if (slave.boobs < 2000) {
- growth = 75 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
- } else if ((slave.boobs < 5000 * gigantomastiaMod)) {
- growth = 50 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
+ growth = 75 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
+ } else if (slave.boobs < 5000 * gigantomastiaMod) {
+ growth = 50 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
} else {
- growth = 25 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4));
+ growth = 25 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50) / 4);
}
} else {
- growth = 25 * Math.trunc((V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50 - slave.physicalAge) / 4));
+ growth = 25 * Math.trunc(V.injectionUpgrade * 2) + V.dairyFeedersSetting + V.dairyRestraintsSetting + ((50 - slave.physicalAge) / 4);
}
if (slave.boobs <= 20000 && slave.boobs + growth > 20000) {
boobtacular++;
@@ -803,26 +822,26 @@ App.EndWeek.dairyReport = function() {
slave.muscles -= 1 + slave.geneticQuirks.mLoss;
}
if (slave.fetish === "mindbroken") {
- if ((slave.boobs > 48000) && ((slave.balls >= 10) || (slave.balls === 0))) {
+ if (slave.boobs > 48000 && (slave.balls >= 10 || slave.balls === 0)) {
V.bioreactorPerfectedID = slave.ID;
}
} else {
if (slave.sexualFlaw !== "self hating") {
- if ((slave.sexualFlaw !== "cum addict") || (V.dairyFeedersSetting === 0)) {
- if ((slave.sexualFlaw !== "anal addict") || (V.dairyStimulatorsSetting === 0)) {
- if ((slave.sexualFlaw !== "breeder") || (slave.preg < 0) || (V.dairyPregSetting === 0)) {
+ if (slave.sexualFlaw !== "cum addict" || V.dairyFeedersSetting === 0) {
+ if (slave.sexualFlaw !== "anal addict" || V.dairyStimulatorsSetting === 0) {
+ if (slave.sexualFlaw !== "breeder" || slave.preg < 0 || V.dairyPregSetting === 0) {
if (V.dairyStimulatorsSetting > 1) {
- if ((slave.sexualFlaw !== "hates anal") && (slave.sexualQuirk !== "painal queen")) {
+ if (slave.sexualFlaw !== "hates anal" && slave.sexualQuirk !== "painal queen") {
slave.sexualFlaw = "hates anal";
}
}
if (V.dairyPregSetting > 1) {
- if ((slave.sexualFlaw !== "hates penetration") && (slave.sexualQuirk !== "strugglefuck queen")) {
+ if (slave.sexualFlaw !== "hates penetration" && slave.sexualQuirk !== "strugglefuck queen") {
slave.sexualFlaw = "hates penetration";
}
}
if (V.dairyFeedersSetting > 1) {
- if ((slave.sexualFlaw !== "hates oral") && (slave.sexualQuirk !== "gagfuck queen")) {
+ if (slave.sexualFlaw !== "hates oral" && slave.sexualQuirk !== "gagfuck queen") {
slave.sexualFlaw = "hates oral";
}
}
@@ -840,72 +859,77 @@ App.EndWeek.dairyReport = function() {
}
if ((V.dairyStimulatorsSetting + V.dairyFeedersSetting + V.dairyPregSetting) > 5) {
if (slave.devotion <= 95 && slave.sexualFlaw !== "self hating") {
- if ((slave.sexualFlaw !== "breeder") || (slave.preg < 0)) {
+ if (slave.sexualFlaw !== "breeder" || slave.preg < 0) {
if (slave.devotion > -75) {
slave.devotion -= 10;
if (slave.devotion < -65) {
hateFilled++;
hfSlave = slave;
}
- } else if ((slave.trust > -75)) {
+ } else if (slave.trust > -75) {
slave.trust -= 10;
if (slave.trust < -65) {
horrified++;
hrSlave = slave;
}
- } else if ((slave.skill.vaginal > 0)) {
+ } else if (slave.skill.vaginal > 0) {
slave.skill.vaginal -= 10;
skillsLost++;
slSlave = slave;
- } else if ((slave.skill.oral > 0)) {
+ } else if (slave.skill.oral > 0) {
slave.skill.oral -= 10;
skillsLost++;
slSlave = slave;
- } else if ((slave.skill.anal > 0)) {
+ } else if (slave.skill.anal > 0) {
slave.skill.anal -= 10;
skillsLost++;
slSlave = slave;
- } else if ((slave.career !== "a bioreactor")) {
+ } else if (slave.career !== "a bioreactor") {
slave.career = "a bioreactor";
careerForgotten++;
cfSlave = slave;
- } else if ((slave.intelligenceImplant > 0)) {
+ } else if (slave.intelligenceImplant > 0) {
slave.intelligenceImplant = Math.clamp(slave.intelligenceImplant - 5, 0, 30);
skillsLost++;
slSlave = slave;
- } else if ((slave.intelligence >= -15)) {
+ } else if (slave.intelligence >= -15) {
slave.intelligence -= 5;
intelligenceLost++;
- } else if ((slave.devotion >= -20)) {
+ } else if (slave.devotion >= -20) {
slave.devotion -= 10;
- } else if ((slave.trust >= -20)) {
+ } else if (slave.trust >= -20) {
slave.trust -= 10;
- } else if ((slave.skill.whoring > 0)) {
+ } else if (slave.skill.whoring > 0) {
slave.skill.whoring -= 10;
skillsLost++;
slSlave = slave;
- } else if ((slave.skill.entertainment > 0)) {
+ } else if (slave.skill.entertainment > 0) {
slave.skill.entertainment -= 10;
skillsLost++;
slSlave = slave;
- } else if ((slave.intelligence >= -50)) {
+ } else if (slave.intelligence >= -50) {
slave.intelligence -= 5;
if (slave.intelligence < -50) {
stupidified++;
stSlave = slave;
}
- } else if ((slave.fetish !== "mindbroken")) {
+ } else if (slave.fetish !== "mindbroken") {
slave.fetish = "mindbroken";
mindbroken++;
}
}
}
- if (((slave.counter.milk > 1000) && (slave.boobs > 12000) || (slave.counter.cum > 1000) && (slave.balls >= 10)) && (slave.career !== "a bioreactor")) {
+ if (slave.career !== "a bioreactor" &&
+ (
+ (slave.counter.milk > 1000 && slave.boobs > 12000) ||
+ (slave.counter.cum > 1000 && slave.balls >= 10)
+ )
+ ) {
slave.career = "a bioreactor";
careerForgotten++;
cfSlave = slave;
}
- if ((V.arcologies[0].FSBodyPuristLaw === 0) && (V.healthyDrugsUpgrade === 0)) {
+ if (V.arcologies[0].FSBodyPuristLaw === 0 && V.healthyDrugsUpgrade === 0) {
slave.chem += 5;
} else {
slave.chem += 2;
@@ -918,58 +942,63 @@ App.EndWeek.dairyReport = function() {
hateFilled++;
hfSlave = slave;
}
- } else if ((slave.trust > -75)) {
+ } else if (slave.trust > -75) {
slave.trust -= 5;
if (slave.trust < -70) {
horrified++;
hrSlave = slave;
}
- } else if ((slave.skill.vaginal >= 20)) {
+ } else if (slave.skill.vaginal >= 20) {
slave.skill.vaginal -= 10;
skillsLost++;
slSlave = slave;
- } else if ((slave.skill.oral >= 20)) {
+ } else if (slave.skill.oral >= 20) {
slave.skill.oral -= 10;
skillsLost++;
slSlave = slave;
- } else if ((slave.skill.anal >= 20)) {
+ } else if (slave.skill.anal >= 20) {
slave.skill.anal -= 10;
skillsLost++;
slSlave = slave;
- } else if ((slave.career !== "a bioreactor")) {
+ } else if (slave.career !== "a bioreactor") {
slave.career = "a bioreactor";
careerForgotten++;
cfSlave = slave;
- } else if ((slave.intelligenceImplant > 0)) {
+ } else if (slave.intelligenceImplant > 0) {
slave.intelligenceImplant = Math.clamp(slave.intelligenceImplant - 5, 0, 30);
skillsLost++;
slSlave = slave;
- } else if ((slave.intelligence >= -15)) {
+ } else if (slave.intelligence >= -15) {
slave.intelligence -= 5;
intelligenceLost++;
- } else if ((slave.devotion >= -20)) {
+ } else if (slave.devotion >= -20) {
slave.devotion -= 8;
- } else if ((slave.trust >= -20)) {
+ } else if (slave.trust >= -20) {
slave.trust -= 8;
- } else if ((slave.skill.whoring >= 20)) {
+ } else if (slave.skill.whoring >= 20) {
slave.skill.whoring -= 10;
skillsLost++;
slSlave = slave;
- } else if ((slave.skill.entertainment >= 20)) {
+ } else if (slave.skill.entertainment >= 20) {
slave.skill.entertainment -= 10;
skillsLost++;
slSlave = slave;
- } else if ((slave.intelligence >= -50)) {
+ } else if (slave.intelligence >= -50) {
slave.intelligence -= 5;
if (slave.intelligence < -50) {
stupidified++;
stSlave = slave;
}
- } else if ((slave.fetish !== "mindbroken")) {
+ } else if (slave.fetish !== "mindbroken") {
slave.fetish = "mindbroken";
mindbroken++;
}
- } else if (((slave.counter.milk > 1000) && (slave.boobs > 12000) || (slave.counter.cum > 1000) && (slave.balls >= 10)) && (slave.career !== "a bioreactor")) {
+ } else if (slave.career !== "a bioreactor" &&
+ (
+ (slave.counter.milk > 1000 && slave.boobs > 12000) ||
+ (slave.counter.cum > 1000 && slave.balls >= 10)
+ )
+ ) {
slave.career = "a bioreactor";
careerForgotten++;
cfSlave = slave;
@@ -995,7 +1024,7 @@ App.EndWeek.dairyReport = function() {
slave.pregKnown = 1;
if (V.dairyPregSetting > 2) {
slave.pregType = random(10, 29);
- } else if ((V.dairyPregSetting > 1)) {
+ } else if (V.dairyPregSetting > 1) {
slave.pregType = random(3, 6);
} else {
slave.pregType = either(1, 1, 1, 1, 2, 2, 2, 3, 3, 4);
@@ -1006,10 +1035,10 @@ App.EndWeek.dairyReport = function() {
if (slave.vagina === 0) {
slave.vagina++;
}
- } else if ((slave.pregKnown === 1)) {
+ } else if (slave.pregKnown === 1) {
if (V.dairyPregSetting > 2) {
cashX(100, "slaveAssignmentDairy", slave);
- } else if ((V.dairyPregSetting > 1)) {
+ } else if (V.dairyPregSetting > 1) {
cashX(50, "slaveAssignmentDairy", slave);
} else {
cashX(25, "slaveAssignmentDairy", slave);
@@ -1019,7 +1048,7 @@ App.EndWeek.dairyReport = function() {
if (slave.vagina === 4) {
vaginasStretched++;
}
- } else if ((slave.vagina < 3)) {
+ } else if (slave.vagina < 3) {
slave.vagina++;
}
}
@@ -1046,40 +1075,34 @@ App.EndWeek.dairyReport = function() {
cumWeek += seed;
if (V.arcologies[0].FSPastoralistLaw === 1) {
cashXvalue = seed * random(40, 50);
- cashX(cashXvalue, "menialBioreactors");
- } else if ((V.arcologies[0].FSPastoralist !== "unset")) {
+ } else if (V.arcologies[0].FSPastoralist !== "unset") {
cashXvalue = seed * (random(25, 35) + Math.trunc(V.arcologies[0].FSPastoralist / 10));
- cashX(cashXvalue, "menialBioreactors");
} else {
cashXvalue = seed * random(25, 35);
- cashX(cashXvalue, "menialBioreactors");
}
+ cashX(cashXvalue, "menialBioreactors");
seed = (BF.XX.femCum * V.bioreactorsXX) + (BF.herm.femCum * V.bioreactorsHerm);
femCumWeek += seed;
if (V.arcologies[0].FSPastoralistLaw === 1) {
cashXvalue = seed * random(40, 50);
- cashX(cashXvalue, "menialBioreactors");
- } else if ((V.arcologies[0].FSPastoralist !== "unset")) {
+ } else if (V.arcologies[0].FSPastoralist !== "unset") {
cashXvalue = seed * (random(25, 35) + Math.trunc(V.arcologies[0].FSPastoralist / 10));
- cashX(cashXvalue, "menialBioreactors");
} else {
cashXvalue = seed * random(25, 35);
- cashX(cashXvalue, "menialBioreactors");
}
+ cashX(cashXvalue, "menialBioreactors");
seed = (BF.XX.milk * V.bioreactorsXX) + (BF.barren.milk * V.bioreactorsBarren) + (BF.XY.milk * V.bioreactorsXY) + (BF.herm.milk * V.bioreactorsHerm);
milkWeek += seed;
if (V.arcologies[0].FSPastoralist !== "unset" && V.arcologies[0].FSPastoralistLaw === 1) {
cashXvalue = seed * (13 + Math.trunc(V.arcologies[0].FSPastoralist / 30));
- cashX(cashXvalue, "menialBioreactors");
- } else if ((V.arcologies[0].FSPastoralist !== "unset")) {
+ } else if (V.arcologies[0].FSPastoralist !== "unset") {
cashXvalue = seed * (8 + Math.trunc(V.arcologies[0].FSPastoralist / 30));
- cashX(cashXvalue, "menialBioreactors");
} else {
cashXvalue = seed * 9;
- cashX(cashXvalue, "menialBioreactors");
}
+ cashX(cashXvalue, "menialBioreactors");
r.push(`${Tadd} permanently converted biological`);
if (Tadd > 1) {
r.push(`"machines" produce`);
@@ -1091,11 +1114,11 @@ App.EndWeek.dairyReport = function() {
}
if (inflatedSlaves.milk > 0) {
- cashXvalue -= Math.trunc(((600 * (inflatedSlaves.milk) + 8) + random(50, 200)));
+ cashXvalue = -Math.trunc((600 * (inflatedSlaves.milk) + 8) + random(50, 200));
cashX(cashXvalue, "slaveAssignmentDairy");
}
if (inflatedSlaves.cum > 0) {
- cashXvalue -= Math.trunc(((300 * (inflatedSlaves.cum + 8)) + random(25, 100)));
+ cashXvalue = -Math.trunc((300 * (inflatedSlaves.cum + 8)) + random(25, 100));
cashX(cashXvalue, "slaveAssignmentDairy");
}
@@ -1199,7 +1222,7 @@ App.EndWeek.dairyReport = function() {
if (V.dairyPregUpgrade === 1) {
if (V.dairyPregSetting >= 2) {
r.push(`Fertile cows make you a significant profit through contract pregnancies.`);
- } else if ((V.dairyPregSetting === 1)) {
+ } else if (V.dairyPregSetting === 1) {
r.push(`Fertile cows make you a small profit through contract pregnancies.`);
}
}
@@ -1285,7 +1308,7 @@ App.EndWeek.dairyReport = function() {
b.profit = b.totalIncome - b.totalExpenses;
if (profits > 0) {
r.push(`The sale of these products makes a profit of <span class="yellowgreen">${cashFormat(profits)}.</span>`);
- } else if ((profits < 0)) {
+ } else if (profits < 0) {
r.push(`Due to`);
if (V.dairyImplantsSetting !== 3) {
r.push(`one-off costs of hormonal implants to encourage fluid production,`);
@@ -1357,21 +1380,21 @@ App.EndWeek.dairyReport = function() {
}
r.push(`body, and mind have been completely adapted to synthesize useful products. ${He} has been reclassified as part of the machine ${he}'s now permanently attached to. This combination is projected to produce approximately`);
if (bioreactor.balls > 0) {
- r.push(commaNum(1000 * Math.trunc((BF[gender].cum * ageInWeeks) / 1000)));
+ r.push(commaNum(1000 * Math.trunc(BF[gender].cum * ageInWeeks) / 1000));
r.push(`liters of cum,`);
}
if (bioreactor.ovaries === 1) {
- r.push(commaNum(100 * Math.trunc((BF[gender].femCum * ageInWeeks) / 100)));
+ r.push(commaNum(100 * Math.trunc(BF[gender].femCum * ageInWeeks) / 100));
r.push(`liters of vaginal secretions,`);
if (V.dairyPregSetting === 3) {
- r.push((13 * (V.retirementAge - bioreactor.physicalAge)).toString());
+ r.push(13 * (V.retirementAge - bioreactor.physicalAge)).toString();
} else {
- r.push((5 * (V.retirementAge - bioreactor.physicalAge)).toString());
+ r.push(5 * (V.retirementAge - bioreactor.physicalAge)).toString();
}
r.push(`slaves,`);
}
r.push(`and`);
- r.push(commaNum(1000 * Math.trunc((BF[gender].milk * ageInWeeks) / 1000)));
+ r.push(commaNum(1000 * Math.trunc(BF[gender].milk * ageInWeeks) / 1000));
r.push(`liters of milk over a ${V.retirementAge - bioreactor.physicalAge} year period before its biological components must be replaced.`);
App.Events.addParagraph(el, r);
removeSlave(bioreactor);