From 1fe2da5455b9f520c6fac7386de6d28c3305eb8f Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Thu, 22 Oct 2020 16:34:18 -0400 Subject: [PATCH] initial --- src/endWeek/economics/arcmgmt.js | 607 ++++++++++++++++--------------- 1 file changed, 316 insertions(+), 291 deletions(-) diff --git a/src/endWeek/economics/arcmgmt.js b/src/endWeek/economics/arcmgmt.js index a0118a1dc9f..91ea49d5b1f 100644 --- a/src/endWeek/economics/arcmgmt.js +++ b/src/endWeek/economics/arcmgmt.js @@ -4,6 +4,7 @@ if (V.useTabs === 0) { App.UI.DOM.appendNewElement("h2", el, "Arcology Management"); } const _schools = App.Utils.schoolCounter(); +let r =[]; el.append(ownershipReport(false)); @@ -332,7 +333,7 @@ if (V.arcologies[0].FSNull !== "unset") { _upperClass += Math.trunc(Math.min(V.arcologies[0].FSNull, 100) / 20) * -21.6, _upperClassP *= 1 + Math.trunc(Math.min(V.arcologies[0].FSNull, 100) / 20) * -0.008, _topClass += Math.trunc(Math.min(V.arcologies[0].FSNull, 100) / 20) * -8, - _topClassP *= 1 + Math.trunc(Math.min(V.arcologies[0].FSNull, 100) / 20) * -0.016>> + _topClassP *= 1 + Math.trunc(Math.min(V.arcologies[0].FSNull, 100) / 20) * -0.016; r.push(`Your arcology's vibrant, open culture helps everyone succeed, preventing many struggling citizens from falling into slavery.`); } if (V.arcologies[0].FSRepopulationFocus !== "unset") { @@ -469,7 +470,7 @@ if (V.policies.enslavementRep === 1) { _lowerClass += -200, _lowerClassP *= 0.99, _topClass += 5, - _topClass *= 1.01>> + _topClass *= 1.01; r.push(`You <span class="green">make friends</span> by tacitly supporting enslavement of upstart citizens.`); repX(100, "policies"); } @@ -479,7 +480,7 @@ if (V.policies.enslavementCash === -1) { _lowerClass += 200, _lowerClassP *= 1.02, _topClass += -5, - _topClass *= 0.98>> + _topClass *= 0.98; r.push(`Your charity purse prevents a few citizens from falling into slavery.`); } if (V.policies.enslavementRep === -1) { @@ -488,7 +489,7 @@ if (V.policies.enslavementRep === -1) { _lowerClass += 200, _lowerClassP *= 1.01, _topClass += -5, - _topClass *= 0.99>> + _topClass *= 0.99; r.push(`You use your personal influence to help struggling citizens.`); repX(forceNeg(100), "policies"); } @@ -502,7 +503,7 @@ if (V.arcologies[0].FSSupremacistLawME === 1) { _upperClass += 27, _upperClassP *= 1.01, _topClass += 10, - _topClassP *= 1.02>> + _topClassP *= 1.02; if (V.FSSupLawTrigger === 1) { _slavesSupLaw = 0, _slavesSupLaw += Math.trunc((V.lowerClass + V.middleClass + V.upperClass) * 0.65), @@ -511,7 +512,7 @@ if (V.arcologies[0].FSSupremacistLawME === 1) { r.push(`${V.lowerClass} = Math.trunc(V.lowerClass * 0.35),`); r.push(`${V.middleClass} = Math.trunc(V.middleClass * 0.35),`); r.push(`${V.upperClass} = Math.trunc(V.upperClass * 0.35),`); - r.push(`${V.FSSupLawTrigger} = 2>>`); + r.push(`${V.FSSupLawTrigger} = 2;`); } } if (V.arcologies[0].FSSubjugationistLawME === 1) { @@ -524,7 +525,7 @@ if (V.arcologies[0].FSSubjugationistLawME === 1) { _upperClass += 13.5, _upperClassP *= 1.005, _topClass += 5, - _topClassP *= 1.01>> + _topClassP *= 1.01; if (V.FSSubLawTrigger === 1) { _slavesSubLaw = Math.trunc((V.lowerClass + V.middleClass + V.upperClass) * 0.2), r.push(`${V.NPCSlaves} += Math.trunc(_slavesSubLaw * 0.7),`); @@ -532,26 +533,26 @@ if (V.arcologies[0].FSSubjugationistLawME === 1) { r.push(`${V.lowerClass} = Math.trunc(V.lowerClass * 0.8),`); r.push(`${V.middleClass} = Math.trunc(V.middleClass * 0.8),`); r.push(`${V.upperClass} = Math.trunc(V.upperClass * 0.8),`); - r.push(`${V.FSSubLawTrigger} = 2>>`); + r.push(`${V.FSSubLawTrigger} = 2;`); } } if (V.arcologies[0].FSRepopulationFocusLaw === 1) { _lowerClass += 100, _lowerClassP *= 1.005, _topClass += -2.5, - _topClassP *= 0.995>> + _topClassP *= 0.995; r.push(`The rent promotion for pregnant women attracts several gravid ladies and a few girls eager to become mothers to enroll as citizens in your arcology.`); } if (V.arcologies[0].FSRestartLaw === 1) { _lowerClass += -100, _lowerClassP *= 0.99, _topClass += 2.5, - _topClassP *= 1.01>> + _topClassP *= 1.01; r.push(`Your sterilization program drives several disloyal citizens out of the arcology.`); } if (V.arcologies[0].FSHedonisticDecadenceLaw === 1) { _middleClass += 80, - _middleClassP *= 1.01>> + _middleClassP *= 1.01; } if (V.arcologies[0].FSDegradationistLaw === 1) { _slaveProductivity += -0.05; @@ -562,25 +563,25 @@ if (V.arcologies[0].FSPaternalistLaw === 1) { _upperClass += -13.5, _upperClassP *= 1.005, _topClass += -2.5, - _topClassP *= 1.005>> + _topClassP *= 1.005; } if (V.arcologies[0].FSYouthPreferentialistLaw === 1) { _lowerClass += 200, _lowerClassP *= 1.01, _middleClass += -80, - _middleClassP *= 0.99>> + _middleClassP *= 0.99; } if (V.arcologies[0].FSMaturityPreferentialistLaw === 1) { _lowerClass += -200, _lowerClassP *= 0.99, _middleClass += 80, - _middleClassP *= 1.01>> + _middleClassP *= 1.01; } if (V.arcologies[0].FSPetiteAdmirationLaw === 1) { _lowerClass += -200, _lowerClassP *= 0.99, _middleClass += 80, - _middleClassP *= 1.01>> + _middleClassP *= 1.01; } if (V.arcologies[0].FSStatuesqueGlorificationLaw === 1) { _lowerClass += -400, @@ -588,7 +589,7 @@ if (V.arcologies[0].FSStatuesqueGlorificationLaw === 1) { _middleClass += 40, _middleClassP *= 1.01, _upperClass += -10, - _upperClassP *= .99>> + _upperClassP *= .99; } if (V.arcologies[0].FSIntellectualDependencyLaw === 1) { _slaveDemandU *= 1.24, @@ -598,7 +599,7 @@ if (V.arcologies[0].FSIntellectualDependencyLaw === 1) { _middleClass += -40, _middleClassP *= 0.90, _upperClass += -1, - _upperClassP *= .99>> + _upperClassP *= .99; } if (V.arcologies[0].FSSlaveProfessionalismLaw === 1) { _slaveDemandU *= 1.4, @@ -610,12 +611,12 @@ if (V.arcologies[0].FSSlaveProfessionalismLaw === 1) { _upperClass += -5, _upperClassP *= .99, _topClass += 7, - _topClassP *= 1.05>> + _topClassP *= 1.05; if (V.FSSlaveProfLawTrigger === 1) { V.lowerClass = Math.trunc(V.lowerClass * 0.8), r.push(`${V.middleClass} = Math.trunc(V.middleClass * 0.8),`); r.push(`${V.upperClass} = Math.trunc(V.upperClass * 0.8),`); - r.push(`${V.FSSlaveProfLawTrigger} = 2>>`); + r.push(`${V.FSSlaveProfLawTrigger} = 2;`); } } if (V.arcologies[0].FSChattelReligionistCreed === 1) { @@ -627,7 +628,7 @@ if (V.arcologies[0].FSChattelReligionistCreed === 1) { _lowerClass += V.nicaea.power * 100, _lowerClassP *= 1 + V.nicaea.power * 0.005, _topClass += V.nicaea.power * -2.5, - _topClassP *= 1 + V.nicaea.power * -0.005>> + _topClassP *= 1 + V.nicaea.power * -0.005; } else if (V.nicaea.focus === "owners") { _slaveDemandU *= 1 + V.nicaea.power * 0.05, _slaveDemandT *= 1 + V.nicaea.power * 0.0625, @@ -638,18 +639,18 @@ if (V.arcologies[0].FSChattelReligionistCreed === 1) { _upperClass += V.nicaea.power * 6.75, _upperClassP *= 1 + V.nicaea.power * 0.0025, _topClass += V.nicaea.power * 2.5, - _topClassP *= 1 + V.nicaea.power * 0.005>> + _topClassP *= 1 + V.nicaea.power * 0.005; } if (V.nicaea.assignment === "whore") { _upperClass += V.nicaea.power * 6.75, _upperClassP *= 1 + V.nicaea.power * 0.0025, _topClass += V.nicaea.power * 1.25, - _topClassP *= 1 + V.nicaea.power * 0.0025>> + _topClassP *= 1 + V.nicaea.power * 0.0025; } else if (V.nicaea.assignment === "serve the public") { _lowerClass += V.nicaea.power * 50, _lowerClassP *= 1 + V.nicaea.power * 0.0025, _middleClass += V.nicaea.power * 20, - _middleClassP *= 1 + V.nicaea.power * 0.0025>> + _middleClassP *= 1 + V.nicaea.power * 0.0025; } else { _slaveDemandU *= 1 + V.nicaea.power * 0.05, _slaveDemandT *= 1 + V.nicaea.power * 0.0625, @@ -660,13 +661,13 @@ if (V.arcologies[0].FSChattelReligionistCreed === 1) { _upperClass += V.nicaea.power * 13.5, _upperClassP *= 1 + V.nicaea.power * 0.005, _topClass += V.nicaea.power * 2.5, - _topClassP *= 1 + V.nicaea.power * 0.005>> + _topClassP *= 1 + V.nicaea.power * 0.005; } if (V.nicaea.achievement === "slaves") { _slaveDemandU *= 1 + V.nicaea.power * 0.2, _slaveDemandT *= 1 + V.nicaea.power * 0.25, _lowerClass += V.nicaea.power * -200, - _lowerClassP *= 1 + V.nicaea.power * -0.01>> + _lowerClassP *= 1 + V.nicaea.power * -0.01; } } if (V.arcologies[0].FSAztecRevivalistLaw === 1) { @@ -675,10 +676,10 @@ if (V.arcologies[0].FSAztecRevivalistLaw === 1) { _middleClass += -40, _middleClassP *= 0.995, _upperClass += -13.5, - _upperClassP *= 0.995>> + _upperClassP *= 0.995; } _middleClass += (V.TSS.subsidize + V.GRI.subsidize + V.SCP.subsidize + V.LDE.subsidize + V.TGA.subsidize + V.TCR.subsidize + V.TFS.subsidize + V.HA.subsidize + V.NUL.subsidize) * 40, -_middleClass *= 1 + (V.TSS.subsidize + V.GRI.subsidize + V.SCP.subsidize + V.LDE.subsidize + V.TGA.subsidize + V.TCR.subsidize + V.TFS.subsidize + V.HA.subsidize + V.NUL.subsidize) * 0.005>> +_middleClass *= 1 + (V.TSS.subsidize + V.GRI.subsidize + V.SCP.subsidize + V.LDE.subsidize + V.TGA.subsidize + V.TCR.subsidize + V.TFS.subsidize + V.HA.subsidize + V.NUL.subsidize) * 0.005; /*Slave retirement trigger pulled (one time only)*/ if (V.citizenRetirementTrigger === 1) { @@ -692,21 +693,21 @@ if (V.citizenRetirementTrigger === 1) { } V.lowerClass += Math.trunc((V.NPCSlaves + V.menials) * (0.05 + _citizenRetirementImpact)), _menialsRetirement = Math.trunc(V.menials * (0.05 + _citizenRetirementImpact)), - r.push(`${V.menials} = Math.trunc(V.menials * (0.95 -${ _citizenRetirementImpact))},`); + V.menials = Math.trunc(V.menials * (0.95 -_citizenRetirementImpact)); _ASlavesRetirement = Math.trunc(V.NPCSlaves * (0.05 + _citizenRetirementImpact)), - r.push(`${V.NPCSlaves} = Math.trunc(V.NPCSlaves * (0.95 -${ _citizenRetirementImpact))},`); - r.push(`${V.citizenRetirementTrigger} = 2>>`); + V.NPCSlaves = Math.trunc(V.NPCSlaves * (0.95 -_citizenRetirementImpact)); + V.citizenRetirementTrigger = 2; r.push(`You have enacted citizen retirement, the slaves of eligible age are granted freedom.`); if (_menialsRetirement > 1) { r.push(`<span class="red">`); -V._menialsRetirement +_menialsRetirement r.push(` of your menial slaves</span> were retired.`); } else if (_menialsRetirements > 0) { r.push(`<span class="red">One of your menial slaves</span> was retired.`); } if (_ASlavesRetirement > 1) { r.push(`<span class="red">`); -V._ASlavesRetirement +_ASlavesRetirement r.push(` slaves</span> in your arcology were given a citizen retirement.`); } r.push(` /*I could bother with a single slave retirement message, but that's never going to get used*/`); @@ -721,20 +722,20 @@ _expiration = _expirationPC + _expirationNPC + _expirationFD + _expirationBR, V.NPCSlaves -= _expirationNPC, V.menials -= _expirationPC, V.fuckdolls -= _expirationFD, -V.menialBioreactors -= _expirationBR>> +V.menialBioreactors -= _expirationBR; if (_expiration > 1) { if (_expirationFS <= 0.5) { r.push(`<span class="red">`); -V._expiration +_expiration r.push(` slaves passed away</span> due to natural causes.`); } else { r.push(`<span class="red">`); -V._expiration +_expiration r.push(` slaves died</span> due to the tough working conditions in your arcology.`); } if (_expirationPC > 1) { r.push(`Of which <span class="red">`); -V._expirationPC +_expirationPC r.push(` were yours.</span>`); } else if (_expirationPC > 0) { r.push(`<span class="red">One of them was yours.</span>`); @@ -753,10 +754,10 @@ if (V.policies.retirement.menial2Citizen === 1) { } _banished = Math.trunc((V.lowerClass * _welfareFS) * (0.05 + _banishedRatio)), _enslaved = Math.trunc(V.lowerClass * _welfareFS) - _banished, - r.push(`${V.lowerClass} -=${ _banished>>}`); - <br><span class="red"> -V._banished - r.push(` citizens were banished</span> from your arcology, they committed enslavable offenses but were too old to be enslaved.`); + V.lowerClass -=_banished; + +//<br> + r.push(`<span class="red"> ${_banished} citizens were banished</span> from your arcology, they committed enslavable offenses but were too old to be enslaved.`); } else { _enslaved = Math.trunc(V.lowerClass * _welfareFS); } @@ -768,13 +769,15 @@ if (V.weatherToday.severity > 3) { if (V.SecExp.buildings.transportHub.surfaceTransport < 4) { _weatherFreeze = 1; V.weatherAwareness = 1; - <br>//The terrible weather is <span class="red">preventing people from entering or leaving</span> your arcology. Improving your transport infrastructure will prevent this from happening.// + //<br> + //The terrible weather is <span class="red">preventing people from entering or leaving</span> your arcology. Improving your transport infrastructure will prevent this from happening.// } else { _weatherFreeze = 0; } } else if (V.antiWeatherFreeze < 2) { _weatherFreeze = 1; - <br>//The terrible weather is <span class="red">preventing people from entering or leaving</span> your arcology. Improving your transport infrastructure will prevent this from happening.// + //<br> + //The terrible weather is <span class="red">preventing people from entering or leaving</span> your arcology. Improving your transport infrastructure will prevent this from happening.// } else { _weatherFreeze = 0; } @@ -782,14 +785,16 @@ if (V.weatherToday.severity > 3) { if (V.secExpEnabled > 0 && V.SecExp.buildings.transportHub) { if (V.SecExp.buildings.transportHub.surfaceTransport < 3) { _weatherFreeze = 1; - <br>//The terrible weather is <span class="red">preventing people from entering or leaving</span> your arcology. Improving your transport infrastructure will prevent this from happening.// + //<br> + //The terrible weather is <span class="red">preventing people from entering or leaving</span> your arcology. Improving your transport infrastructure will prevent this from happening.// } else { _weatherFreeze = 0; } } else if (V.antiWeatherFreeze < 1) { _weatherFreeze = 1; V.weatherAwareness = 1; - <br>//The terrible weather is <span class="red">preventing people from entering or leaving</span> your arcology. Improving your transport infrastructure will prevent this from happening.// + //<br + //The terrible weather is <span class="red">preventing people from entering or leaving</span> your arcology. Improving your transport infrastructure will prevent this from happening.// } else { _weatherFreeze = 0; } @@ -802,25 +807,26 @@ if (_weatherFreeze === 1) { if (_enslaved > 0) { if (_enslaved < 4) { _enslavedPC = 1, - _enslavedNPC = _enslaved - 1>> + _enslavedNPC = _enslaved - 1; } else { _enslavedPC = Math.trunc(_enslaved / 4), - _enslavedNPC = _enslaved - _enslavedPC>> + _enslavedNPC = _enslaved - _enslavedPC; } V.menials += _enslavedPC, - r.push(`${V.NPCSlaves} +=${ _enslavedNPC>>}`); + V.NPCSlaves +=_enslavedNPC; } if (_enslaved > 1) { - <br>In total <span class="green"> -V._enslaved - r.push(` lower class citizens</span> were enslaved for failing to pay their debts.`); - <br><span class="green">You enslaved -V._enslavedPC - r.push(`</span> of them while other debtholders in the arcology enslaved the remaining `); -V._enslavedNPC - r.push(`.`); + //<br> + + + r.push(`In total <span class="green"> ${_enslaved} lower class citizens</span> were enslaved for failing to pay their debts.`); + //<br> + + + r.push(`<span class="green">You enslaved ${_enslavedPC}</span> of them while other debtholders in the arcology enslaved the remaining ${_enslavedNPC}.`); } else if (_enslaved > 0) { - <br><span class="green">As arcology owner you claimed the slave.</span> + //<br> + r.push(`<span class="green">As arcology owner you claimed the slave.</span>`); } } @@ -846,39 +852,42 @@ if (V.arcologies[0].honeymoon > 0) { _honeymoon = 10 * V.arcologies[0].honeymoon; } _oldVisitors = V.visitors, -V.visitors = Math.trunc(((V.arcologies[0].prosperity + _FSScore * 5 + _honeymoon) * _transportHub * _terrain * _crime) * (V.localEcon / 100))>> +V.visitors = Math.trunc(((V.arcologies[0].prosperity + _FSScore * 5 + _honeymoon) * _transportHub * _terrain * _crime) * (V.localEcon / 100)); if (V.visitors < 50) { V.visitors = normalRandInt(50, 2); } if (isNaN(V.visitors)) { - <br><span class="red">Visitors is NaN, report this issue!</span> + //<br> + r.push(`<span class="red">Visitors is NaN, report this issue!</span>`); V.visitors = _oldVisitors; } -<br><span class="green"> -V.V.visitors - r.push(` traders and tourists</span> visited your arcology this week.`); +//<br> + r.push(`<span class="green"> V.visitors traders and tourists</span> visited your arcology this week.`); /*slaves*/ /*Slaves getting retired*/ if (V.policies.retirement.menial2Citizen === 1) { _weeklyRetiredMenials = V.menials / ((V.customMenialRetirementAge - 15) * 52), - _weeklyRetiredNPCMenials = V.NPCSlaves / ((V.customMenialRetirementAge - 15) * 52)>> - r.push(` /*This implies a minimum menial age of 15. Even if the player sets minimum ages lower, there's no point having a 3 year old menial slave. 15 seems alright while being nice and round. This also implies ages are distributed evenly, no easy way around that.*/`); + _weeklyRetiredNPCMenials = V.NPCSlaves / ((V.customMenialRetirementAge - 15) * 52); + /*This implies a minimum menial age of 15. Even if the player sets minimum ages lower, there's no point having a 3 year old menial slave. 15 seems alright while being nice and round. This also implies ages are distributed evenly, no easy way around that.*/ if (_weeklyRetiredMenials > 1) { _weeklyRetiredMenials = Math.trunc(_weeklyRetiredMenials); if (_weeklyRetiredMenials > 1) { - <br><span class="red"> -V._weeklyRetiredMenials - r.push(` of your menial slaves</span> retired as free citizens this week.`); + //<br> + + + r.push(`<span class="red"> ${_weeklyRetiredMenialsof} your menial slaves</span> retired as free citizens this week.`); } else { - <br><span class="red">One of your menial slaves</span> retired as a free citizen this week. + //<br> + r.push(`<span class="red">One of your menial slaves</span> retired as a free citizen this week.`); } } else { _weeklyRetiredMenials *= 100, - _retirementChance = random(1,100)>> + _retirementChance = random(1,100); if (_weeklyRetiredMenials > _retirementChance) { _weeklyRetiredMenials = 1; - <br><span class="red">One of your menial slaves</span> retired as a free citizen this week. + //<br> + r.push(`<span class="red">One of your menial slaves</span> retired as a free citizen this week.`); } else { _weeklyRetiredMenials = 0; } @@ -886,85 +895,97 @@ V._weeklyRetiredMenials if (_weeklyRetiredNPCMenials > 1) { _weeklyRetiredNPCMenials = Math.trunc(_weeklyRetiredNPCMenials); if (_weeklyRetiredNPCMenials > 1) { - <br><span class="red"> -V._weeklyRetiredNPCMenials - r.push(` menial slaves</span> were retired as free citizens by other slave owners in your arcology this week.`); + //<br> + + r.push(`<span class="red"> ${_weeklyRetiredNPCMenials} menial slaves</span> were retired as free citizens by other slave owners in your arcology this week.`); } else { - <br><span class="red">One menial slave</span> was retired as a free citizen by another slave owner in your arcology this week. + //<br> + r.push(`<span class="red">One menial slave</span> was retired as a free citizen by another slave owner in your arcology this week.`); } } else { _weeklyRetiredNPCMenials *= 100, - _retirementChance2 = random(1,100)>> + _retirementChance2 = random(1,100); if (_weeklyRetiredNPCMenials > _retirementChance2) { _weeklyRetiredNPCMenials = 1; - <br><span class="red">One menial slave</span> was retired as a free citizen by another slave owner in your arcology this week. + //<br> + r.push(`<span class="red">One menial slave</span> was retired as a free citizen by another slave owner in your arcology this week.`); } else { _weeklyRetiredNPCMenials = 0; } } V.menials -= _weeklyRetiredMenials, r.push(`${V.NPCSlaves} -=${ _weeklyRetiredNPCMenials},`); - r.push(`${V.lowerClass} +=${ _weeklyRetiredMenials} + _weeklyRetiredNPCMenials>>`); + r.push(`${V.lowerClass} +=${ _weeklyRetiredMenials} + _weeklyRetiredNPCMenials;`); } /*Demand for simple labor*/ _LSCD = Math.trunc((V.LSCBase * (V.localEcon / 100)) + (V.arcologies[0].prosperity * 4) + ((V.middleClass + V.visitors * 0.6) * 1.5) + ((V.upperClass + V.visitors * 0.2) * 3.5) + (V.topClass * 18)), /*Demand for owning slaves*/ -_SCD = Math.trunc((V.upperClass * (2 + _slaveDemandU)) + (V.topClass * (12 + _slaveDemandT)))>> +_SCD = Math.trunc((V.upperClass * (2 + _slaveDemandU)) + (V.topClass * (12 + _slaveDemandT))); if (isNaN(_LSCD)) { - <br><span class="red">LSCD is NaN, report this issue!</span> + //<br> + r.push(`<span class="red">LSCD is NaN, report this issue!</span>`); } else if (isNaN(_SCD)) { - <br><span class="red">SCD is NaN, report this issue!</span> + //<br> + r.push(`<span class="red">SCD is NaN, report this issue!</span>`); } else { - r.push(` /*More slaves than they know what to do with*/`); + /*More slaves than they know what to do with*/ if (V.NPCSlaves > _SCD * 1.6) { _NPCSlavesSold = V.NPCSlaves - Math.trunc(_SCD * 1.6), r.push(`${V.menialDemandFactor} -=${ _NPCSlavesSold},`); - r.push(`${V.NPCSlaves} = Math.trunc(_SCD * 1.6)>>`); + r.push(`${V.NPCSlaves} = Math.trunc(_SCD * 1.6);`); if (_NPCSlavesSold > 1) { - <br><span class="red"> -V._NPCSlavesSold - r.push(` slaves</span> were sold by your inhabitants. They've got more than enough of them already.`); + //<br> + + + r.push(`<span class="red"> ${_NPCSlavesSoldslaves}</span> were sold by your inhabitants. They've got more than enough of them already.`); } else if (_NPCSlavesSold > 0) { - <br><span class="red">One slave</span> was sold by your inhabitants. They've got more than enough of them already. + //<br> + r.push(`<span class="red">One slave</span> was sold by your inhabitants. They've got more than enough of them already.`); } /*More slaves than there is work*/ } else if (V.NPCSlaves > (_LSCD / _slaveProductivity) - V.menials + _SCD) { _NPCSlavesSold = V.NPCSlaves - Math.trunc(_LSCD / _slaveProductivity - V.menials + _SCD), - r.push(`${V.menialDemandFactor} -=${ _NPCSlavesSold},`); - r.push(`${V.NPCSlaves} = Math.trunc(_LSCD /${ _slaveProductivity)>>}`); + V.menialDemandFactor -=_NPCSlavesSold; + V.NPCSlaves = Math.trunc(_LSCD/_slaveProductivity); if (_NPCSlavesSold > 1) { - <br><span class="red"> -V._NPCSlavesSold - r.push(` slaves</span> were sold by your inhabitants. There was so little work that they failed to earn their keep.`); + //<br> + + + r.push(`<span class="red"> ${_NPCSlavesSoldslaves}</span> were sold by your inhabitants. There was so little work that they failed to earn their keep.`); } else if (_NPCSlavesSold > 0) { - <br><span class="red">One slave</span> was sold by your inhabitants. There was so little work that it failed to earn its keep. + //<br> + r.push(`<span class="red">One slave</span> was sold by your inhabitants. There was so little work that it failed to earn its keep.`); } /*Cutting back on slaves*/ } else if (V.NPCSlaves > _SCD * 1.4) { if (V.slaveCostFactor > 0.95) { _NPCSlavesSold = Math.trunc((V.NPCSlaves - _SCD) * 0.4), - r.push(`${V.menialDemandFactor} -=${ _NPCSlavesSold},`); - r.push(`${V.NPCSlaves} -=${ _NPCSlavesSold>>}`); + V.menialDemandFactor -= _NPCSlavesSold; + V.NPCSlaves -= _NPCSlavesSold; if (_NPCSlavesSold > 1) { - <br><span class="red"> -V._NPCSlavesSold - r.push(` slaves</span> were sold by your inhabitants. They've got more than enough of them already.`); + //<br> + + + r.push(`<span class="red"> ${_NPCSlavesSoldslaves}</span> were sold by your inhabitants. They've got more than enough of them already.`); } else if (_NPCSlavesSold > 0) { - <br><span class="red">One slave</span> was sold by your inhabitants. They've got more than enough of them already. + //<br> + r.push(`<span class="red">One slave</span> was sold by your inhabitants. They've got more than enough of them already.`); } } /*Selling excess slaves for profit*/ } else if (V.NPCSlaves > _SCD * 1.2) { if (V.slaveCostFactor > 1.1) { _NPCSlavesSold = Math.trunc((V.NPCSlaves - _SCD) * 0.4), - r.push(`${V.menialDemandFactor} -=${ _NPCSlavesSold},`); - r.push(`${V.NPCSlaves} -=${ _NPCSlavesSold>>}`); + V.menialDemandFactor -= _NPCSlavesSold; + V.NPCSlaves -= _NPCSlavesSold; if (_NPCSlavesSold > 1) { - <br><span class="red"> -V._NPCSlavesSold - r.push(` slaves</span> were sold by your inhabitants. They saw an opportunity for profit.`); + //<br> + + + r.push(`<span class="red"> ${_NPCSlavesSoldslaves}</span> were sold by your inhabitants. They saw an opportunity for profit.`); } else if (_NPCSlavesSold > 0) { - <br><span class="red">One slave</span> was sold by your inhabitants. They saw an opportunity for profit. + //<br> + r.push(`<span class="red">One slave</span> was sold by your inhabitants. They saw an opportunity for profit.`); } } } @@ -972,14 +993,13 @@ V._NPCSlavesSold if (V.slaveCostFactor < 0.8) { if (V.NPCSlaves < _SCD * 1.5) { _NPCSlavesBought = Math.trunc(_SCD * 0.05), - r.push(`${V.menialSupplyFactor} -=${ _NPCSlavesBought},`); - r.push(`${V.NPCSlaves} +=${ _NPCSlavesBought>>}`); + V.menialSupplyFactor -= _NPCSlavesBought; + V.NPCSlaves += _NPCSlavesBought; if (_NPCSlavesBought > 1) { - <br><span class="green"> -V._NPCSlavesBought - r.push(` slaves</span> were bought by your inhabitants. They were too cheap to pass up on.`); + //<br> + r.push(`<span class="green">${_NPCSlavesBought} slaves</span> were bought by your inhabitants. They were too cheap to pass up on.`); } - r.push(` /*there's no way this ever ends up needing a 1 slave version*/`); + /*there's no way this ever ends up needing a 1 slave version*/ } } } @@ -994,33 +1014,29 @@ if (_LCD < 0) { _LCD = 0; } if (isNaN(_LCD)) { - <br><span class="red">LCD is NaN, report this issue!</span> + //<br> + r.push(`<span class="red">LCD is NaN, report this issue!</span>`); } else {/*Changing population depending on work available*/ - <br> + //<br> if (V.classSatisfied.lowerClass < 0) { r.push(`Your lower class is <span class="red">sexually frustrated</span> and would rather live elsewhere.`); } else if (V.classSatisfied.lowerClass > 0) { r.push(`Your lower class is <span class="green">sexually satiated</span> and their happiness attracts others.`); } if (V.lowerClass < _LCD) { - if (V.arcologies[0].FSIntellectualDependencyLaw === 1) { - r.push(` /*Enslaving the dumb lower class immigrants*/`); + if (V.arcologies[0].FSIntellectualDependencyLaw === 1) {/*Enslaving the dumb lower class immigrants*/ _LCImmigration = Math.trunc((_LCD - V.lowerClass) * (0.3 * _terrain)) + 1, _intellectualDependencyEnslaved = Math.trunc(_LCImmigration * 0.25), _LCImmigration -= _intellectualDependencyEnslaved, _enslaved += _intellectualDependencyEnslaved, - r.push(`${V.lowerClass} +=${ _LCImmigration>>}`); - r.push(`<span class="green">`); -V._intellectualDependencyEnslaved - r.push(` dumb immigrants</span> were enslaved for their own good.`); + V.lowerClass += _LCImmigration; + r.push(`<span class="green">${_intellectualDependencyEnslaved} dumb immigrants</span> were enslaved for their own good.`); } else { _LCImmigration = Math.trunc((_LCD - V.lowerClass) * (0.3 * _terrain)) + 1, - r.push(`${V.lowerClass} +=${ _LCImmigration>>}`); + V.lowerClass += _LCImmigration; } if (_LCImmigration > 1) { - r.push(`<span class="green">`); -V._LCImmigration - r.push(` lower class citizens</span> moved to your arcology.`); + r.push(`<span class="green">${_LCImmigration} lower class citizens</span> moved to your arcology.`); } else if (_LCImmigration > 0) { r.push(`<span class="green">One lower class citizen</span> moved to your arcology.`); } @@ -1032,15 +1048,11 @@ V._LCImmigration _enslavedEmigrants = Math.trunc(((V.lowerClass - _LCD) * 0.6) * _enslaveChance); } V.lowerClass -= _LCEmigration, - _enslaved += _enslavedEmigrants>> + _enslaved += _enslavedEmigrants; if (_LCEmigration > 1) { - r.push(`<span class="red">`); -V._LCEmigration - r.push(` lower class citizens</span> had no work and tried to leave your arcology.`); + r.push(`<span class="red">${_LCEmigration} lower class citizens</span> had no work and tried to leave your arcology.`); if (_enslavedEmigrants > 1) { - r.push(`<span class="green">`); -V._enslavedEmigrants - r.push(` of them were enslaved instead.</span>`); + r.push(`<span class="green"> ${_enslavedEmigrants} of them were enslaved instead.</span>`); } else if (_enslavedEmigrants > 0) { r.push(`<span class="green">One of them was enslaved instead.</span>`); } @@ -1051,37 +1063,36 @@ V._enslavedEmigrants if (_enslaved > 0) { if (_enslaved < 4) { _enslavedPC = 1, - _enslavedNPC = _enslaved - 1>> + _enslavedNPC = _enslaved - 1; } else { _enslavedPC = Math.trunc(_enslaved / 4), - _enslavedNPC = _enslaved - _enslavedPC>> + _enslavedNPC = _enslaved - _enslavedPC; } V.menials += _enslavedPC, - r.push(`${V.NPCSlaves} +=${ _enslavedNPC>>}`); + V.NPCSlaves += _enslavedNPC; } if (_enslaved > 1) { - <br>In total <span class="green"> -V._enslaved - r.push(` lower class citizens</span> were enslaved for failing to pay their debts.`); - <br><span class="green">You enslaved -V._enslavedPC - r.push(`</span> of them while other debtholders in the arcology enslaved the remaining `); -V._enslavedNPC - r.push(`.`); + //<br> + r.push(`In total <span class="green">${_enslaved} lower class citizens</span> were enslaved for failing to pay their debts.`); + //<br> + + r.push(`<span class="green">You enslaved ${_enslavedPC}</span> of them while other debtholders in the arcology enslaved the remaining ${_enslavedNPC}.`); } else if (_enslaved > 0) { - <br><span class="green">As arcology owner you claimed the slave.</span> + //<br> + r.push(`<span class="green">As arcology owner you claimed the slave.</span>`); } /*Need more slaves still*/ if (V.NPCSlaves < _SCD) { _NPCSlavesBought = Math.trunc((_SCD - V.NPCSlaves) * 0.75) + 1, - r.push(`${V.menialSupplyFactor} -=${ _NPCSlavesBought},`); - r.push(`${V.NPCSlaves} +=${ _NPCSlavesBought>>}`); + V.menialSupplyFactor -= _NPCSlavesBought; + V.NPCSlaves += _NPCSlavesBought; if (_NPCSlavesBought > 1) { - <br><span class="green"> -V._NPCSlavesBought - r.push(` slaves</span> were bought by your inhabitants. They did not have enough of them to satisfy their needs.`); + //<br> + + r.push(`<span class="green">${_NPCSlavesBought} slaves</span> were bought by your inhabitants. They did not have enough of them to satisfy their needs.`); } else if (_NPCSlavesBought > 0) { - <br><span class="green">One slave</span> was bought by your inhabitants. They did not quite have enough of them to satisfy their needs. + //<br> + r.push(`<span class="green">One slave</span> was bought by your inhabitants. They did not quite have enough of them to satisfy their needs.`); } } } @@ -1096,34 +1107,39 @@ if (_MCD < 200) { _MCD = 200; } if (isNaN(_MCD)) { - <br><span class="red">MCD is NaN, report this issue!</span> + //<br> + r.push(`<span class="red">MCD is NaN, report this issue!</span>`); } else { - r.push(` /*Middle Class Citizens immigrating*/`); + /*Middle Class Citizens immigrating*/ if (V.classSatisfied.middleClass < 0) { - <br>Your middle class is <span class="red">sexually frustrated</span> and would rather live elsewhere. + //<br> + r.push(`Your middle class is <span class="red">sexually frustrated</span> and would rather live elsewhere.`); } else if (V.classSatisfied.middleClass > 0) { - <br>Your middle class is <span class="green">sexually satiated</span> and their happiness attracts others. + //<br> + r.push(`Your middle class is <span class="green">sexually satiated</span> and their happiness attracts others.`); } if (V.middleClass < _MCD) { _MCImmigration = Math.trunc((_MCD - V.middleClass) * (0.3 * _terrain)) + 1, - r.push(`${V.middleClass} +=${ _MCImmigration>>}`); + V.middleClass += _MCImmigration; if (_MCImmigration > 1) { - <br><span class="green"> -V._MCImmigration - r.push(` middle class citizens</span> moved to your arcology.`); + //<br> + + r.push(`<span class="green">${_MCImmigration} middle class citizens</span> moved to your arcology.`); } else if (_MCImmigration > 0) { - <br><span class="green">One middle class citizen</span> moved to your arcology. + //<br> + r.push(`<span class="green">One middle class citizen</span> moved to your arcology.`); } /*Middle Class Citizens emigrating*/ } else if (V.middleClass > _MCD) { _MCEmigration = Math.trunc((V.middleClass - _MCD) * 0.6), - r.push(`${V.middleClass} -=${ _MCEmigration>>}`); + V.middleClass -= _MCEmigration; if (_MCEmigration > 1) { - <br><span class="red"> -V._MCEmigration - r.push(` middle class citizens</span> left your arcology.`); + //<br> + + r.push(`<span class="red">${_MCEmigration} middle class citizens</span> left your arcology.`); } else if (_MCEmigration > 0) { - <br><span class="red">One middle class citizen</span> left your arcology. + //<br> + r.push(`<span class="red">One middle class citizen</span> left your arcology.`); } } } @@ -1138,34 +1154,39 @@ if (_UCD < 50) { _UCD = 50; } if (isNaN(_UCD)) { - <br><span class="red">UCD is NaN, report this issue!</span> + //<br> + r.push(`<span class="red">UCD is NaN, report this issue!</span>`); } else { - r.push(` /*Upper Class Citizens immigrating*/`); + /*Upper Class Citizens immigrating*/ if (V.classSatisfied.upperClass < 0) { - <br>Your upper class is <span class="red">sexually frustrated</span> and would rather live elsewhere. + //<br> + r.push(`Your upper class is <span class="red">sexually frustrated</span> and would rather live elsewhere.`); } else if (V.classSatisfied.upperClass > 0) { - <br>Your upper class is <span class="green">sexually satiated</span> and their happiness attracts others. + //<br> + r.push(`Your upper class is <span class="green">sexually satiated</span> and their happiness attracts others.`); } if (V.upperClass < _UCD) { _UCImmigration = Math.trunc((_UCD - V.upperClass) * (0.3 * _terrain)) + 1, - r.push(`${V.upperClass} +=${ _UCImmigration>>}`); + V.upperClass += _UCImmigration; if (_UCImmigration > 1) { - <br><span class="green"> -V._UCImmigration - r.push(` upper class citizens</span> moved to your arcology.`); + //<br> + + r.push(`<span class="green">${_UCImmigration} upper class citizens</span> moved to your arcology.`); } else if (_UCImmigration > 0) { - <br><span class="green">One upper class citizen</span> moved to your arcology. + //<br> + r.push(`<span class="green">One upper class citizen</span> moved to your arcology.`); } /*Upper Class Citizens Emigrating*/ } else if (V.upperClass > _UCD) { _UCEmigration = Math.trunc((V.upperClass - _UCD) * 0.6), - r.push(`${V.upperClass} -=${ _UCEmigration>>}`); + V.upperClass -= _UCEmigration; if (_UCEmigration > 1) { - <br><span class="red"> -V._UCEmigration - r.push(` upper class citizens</span> left your arcology.`); + //<br> + + r.push(`<span class="red">${_UCEmigration} upper class citizens</span> left your arcology.`); } else if (_UCEmigration > 0) { - <br><span class="red">One upper class citizen</span> left your arcology. + //<br> + r.push(`<span class="red">One upper class citizen</span> left your arcology.`); } } } @@ -1175,9 +1196,9 @@ V._UCEmigration V.GDP = Math.trunc(((V.NPCSlaves + V.menials) * 0.35 * _slaveProductivity) + (V.lowerClass * 0.35) + (V.middleClass * 0.75) + (V.upperClass * 2) + (V.topClass * 10)) / 10; /*Top Class Interest in living in your arcology*/ if (V.eliteFailTimer > 0) { - r.push(` /*when you fail the eugenics Elite and they leave this triggers*/`); + /*when you fail the eugenics Elite and they leave this triggers*/ _TCD = Math.trunc((V.GDP / 15 + _topClass) * V.rentEffectT * _topClassP + V.TCBase - (V.eliteFail / 15 * V.eliteFailTimer)), - r.push(`${V.eliteFailTimer} -= 1>>`); + V.eliteFailTimer -= 1; if (V.classSatisfied.topClass !== 0) { _TCD *= 1 + V.classSatisfied.topClass * 0.06; } @@ -1191,40 +1212,45 @@ if (_TCD < 15) { _TCD = 15; } if (isNaN(_TCD)) { - <br><span class="red">TCD is NaN, report this issue!</span> + //<br> + r.push(`<span class="red">TCD is NaN, report this issue!</span>`); } else { - r.push(` /*Top Class Citizens immigrating*/`); + /*Top Class Citizens immigrating*/ if (V.classSatisfied.topClass < 0) { - <br>Your millionaires are <span class="red">sexually frustrated</span> and would rather live elsewhere. + //<br> + r.push(`Your millionaires are <span class="red">sexually frustrated</span> and would rather live elsewhere.`); } else if (V.classSatisfied.topClass > 0) { - <br>Your millionaires are <span class="green">sexually satiated</span> and their happiness attracts others. + //<br> + r.push(`Your millionaires are <span class="green">sexually satiated</span> and their happiness attracts others.`); } if (V.topClass < _TCD) { _TCImmigration = Math.trunc((_TCD - V.topClass) * (0.3 * _terrain)) + 1, - r.push(`${V.topClass} +=${ _TCImmigration>>}`); + V.topClass += _TCImmigration; if (_TCImmigration > 1) { - <br><span class="green"> -V._TCImmigration - r.push(` millionaires</span> moved to your arcology. /*Fat Cat? One-Percenter?*/`); + //<br> + + r.push(`<span class="green">${_TCImmigration} millionaires</span> moved to your arcology. /*Fat Cat? One-Percenter?*/`); } else if (_TCImmigration > 0) { - <br><span class="green">One millionaire</span> moved to your arcology. + //<br> + r.push(`<span class="green">One millionaire</span> moved to your arcology.`); } /*Top Class Citizens emigrating*/ } else if (V.topClass > _TCD) { _TCEmigration = Math.trunc((V.topClass - _TCD) * 0.6) + 1, - r.push(`${V.topClass} -=${ _TCEmigration>>}`); + V.topClass -= _TCEmigration; if (_TCEmigration > 1) { - <br><span class="red"> -V._TCEmigration - r.push(` millionaires</span> left your arcology.`); + //<br> + + r.push(`<span class="red">${_TCEmigration} millionaires</span> left your arcology.`); } else if (_TCEmigration > 0) { - <br><span class="red">One millionaire</span> left your arcology. + //<br> + r.push(`<span class="red">One millionaire</span> left your arcology.`); } } } } - r.push(` /*ends${ _weatherFreeze*/}`); + /*ends _weatherFreeze*/ V.ASlaves = V.NPCSlaves + V.menials + V.fuckdolls + V.menialBioreactors; if (V.secExpEnabled > 0) { @@ -1236,74 +1262,79 @@ _percASlaves = Math.trunc((V.ASlaves / (V.ACitizens + V.ASlaves)) * 1000) / 10, _percLowerClass = Math.trunc((V.lowerClass / (V.ACitizens + V.ASlaves)) * 1000) / 10, _percMiddleClass = Math.trunc((V.middleClass / (V.ACitizens + V.ASlaves)) * 1000) / 10, _percUpperClass = Math.trunc((V.upperClass / (V.ACitizens + V.ASlaves)) * 1000) / 10, -_percTopClass = Math.trunc((V.topClass / (V.ACitizens + V.ASlaves)) * 1000) / 10>> +_percTopClass = Math.trunc((V.topClass / (V.ACitizens + V.ASlaves)) * 1000) / 10; if (V.cheatMode === 1) { - <br><br> -V.V.arcologies[0].prosperity + //<br><br> +V.arcologies[0].prosperity r.push(` Prosperity | `); -V._FSScore +_FSScore r.push(` FS Score | `); -V._honeymoon +_honeymoon r.push(` Honeymoon | `); -V._transportHub +_transportHub r.push(` Transporthub | `); -V._terrain +_terrain r.push(` Terrain | `); -V._crime +_crime r.push(` Crime`); - <br> -V._LSCD + //<br> +_LSCD r.push(` Lower + Slave Class Demand | `); -V._SCD +_SCD r.push(` Slave Class Demand | `); -V._slaveProductivity +_slaveProductivity r.push(` Slave Productivity`); - <br> -V._LCD + //<br> +_LCD r.push(` Lower Class Demand | `); -V._lowerClassP +_lowerClassP r.push(` LC Multiplier`); - <br> -V._MCD + //<br> +_MCD r.push(` Middle Class Demand | `); -V._middleClassP +_middleClassP r.push(` MC Multiplier`); - <br> -V._UCD + //<br> +_UCD r.push(` Upper Class Demand | `); -V._upperClassP +_upperClassP r.push(` UC Multiplier`); - <br> -V._TCD + //<br> +_TCD r.push(` Top Class Demand | `); -V._topClassP +_topClassP r.push(` TC Multiplier`); } -<br> -V.V.arcologies[0].name +//<br> +V.arcologies[0].name r.push(` is home to the following:`); -<br>Lower Class Citizens | -V.V.lowerClass +//<br> +Lower Class Citizens | +V.lowerClass r.push(` | `); -V._percLowerClass% -<br>Middle Class Citizens | -V.V.middleClass +_percLowerClass% +//<br> +Middle Class Citizens | +V.middleClass r.push(` | `); -V._percMiddleClass% -<br>Upper Class Citizens | -V.V.upperClass +_percMiddleClass% +//<br> +Upper Class Citizens | +V.upperClass r.push(` | `); -V._percUpperClass% -<br>Millionaires r.push(` | `); -V.V.topClass +_percUpperClass% +//<br> +Millionaires r.push(` | `); +V.topClass r.push(` | `); -V._percTopClass% -<br>Slaves | -V.V.ASlaves +_percTopClass% +//<br> +Slaves | +V.ASlaves r.push(` | `); -V._percASlaves% -<br> -<br> +//_percASlaves% +//<br> +//<br> if (V.arcologies[0].FSSupremacistLawME === 1) { r.push(`The citizenry is entirely ${V.arcologies[0].FSSupremacistRace}.`); } @@ -1397,7 +1428,7 @@ if (V.arcologies[0].FSHedonisticDecadenceSMR === 1) { } if (V.ACitizens > V.ASlaves*2) { - r.push(` /*This will need to go away Eventually*/`); + /*This will need to go away Eventually*/ r.push(`Since most citizens do not own sex slaves, <span class="yellowgreen">demand for sexual services is intense.</span>`); } else if (V.ACitizens > V.ASlaves) { r.push(`Since many citizens do not own sex slaves, <span class="yellowgreen">demand for sexual services is healthy.</span>`); @@ -1409,7 +1440,7 @@ if (V.ACitizens > V.ASlaves*2) { r.push(`Since most of your citizens now keep private harems of sex slaves, <span class="gold">local demand for sexual services is very low,</span> though visitors to the arcology will always keep it above a certain minimum.`); } -<br> +//<br> _rentMultiplier = 1; if (V.arcologies[0].FSPaternalistLaw === 1) { _rentMultiplier *= 0.95; @@ -1442,7 +1473,7 @@ if (V.arcologies[0].FSHedonisticDecadenceLaw === 1) { } if (V.secExpEnabled > 0) { if (V.SecExp.edicts.alternativeRents === 1) { - r.push(` /*A silly policy*/`); + /*A silly policy*/ r.push(`Your citizens are allowed to pay their rents in slaves rather than cash and a few financially challenged individuals make use of this.`); _rentMultiplier *= 0.95; _movement = random(0,3), V.menials += _movement, V.NPCSlaves -= _movement; @@ -1467,24 +1498,21 @@ if (V.arcologies[0].FSNeoImperialistLaw2 === 1) { _rentMultiplier *= 1 + (5 - V.baseDifficulty) / 20; _rents = Math.trunc((V.lowerClass * V.rent.lowerClass + V.middleClass * V.rent.middleClass + V.upperClass * V.rent.upperClass + V.topClass * V.rent.topClass) * _rentMultiplier / 25); if (!Number.isInteger(_rents)) { - <br><span class="red">Error: rents is outside accepted range, please report this issue</span> + //<br> + r.push(`<span class="red">Error: rents is outside accepted range, please report this issue</span>`); } else { cashX(_rents, "rents"); } -This week, rents from V.arcologies[0].name came to <span class="yellowgreen"> -V.cashFormat(_rents) - r.push(`.</span>`); +r.push(`This week, rents from V.arcologies[0].name came to <span class="yellowgreen"> ${cashFormat(_rents)}.</span>`); if (V.difficultySwitch === 0) { if (V.localEcon < 100) { _bribes = (V.week*100)+random(-100,100); if (V.cash > 1000) { _bribes += Math.trunc(V.cash*0.02); } - r.push(`The <span class="red">degenerating world economy</span> makes supplying and maintaining ${V.arcologies[0].name} extremely difficult. This week, bribes and other costs to keep it running came to <span class="yellowgreen">`); -V.cashFormat(_bribes) - r.push(`.</span>`); + r.push(`The <span class="red">degenerating world economy</span> makes supplying and maintaining ${V.arcologies[0].name} extremely difficult. This week, bribes and other costs to keep it running came to <span class="yellowgreen">${cashFormat(_bribes)}.</span>`); _bribes = forceNeg(_bribes); cashX(_bribes, "rents"); } @@ -1492,7 +1520,7 @@ V.cashFormat(_bribes) if (V.menials+V.menialBioreactors+V.fuckdolls > 0) { _menialEarnings = 0,_bioreactorEarnings = 0,_fuckdollsEarnings = 0; -You own +r.push(`You own`); if (V.menials > 0) { if (V.menials > Math.trunc(_LSCD / _slaveProductivity - _SCD)) { _menialEarnings += Math.trunc(_LSCD / _slaveProductivity - _SCD) * 10; @@ -1515,14 +1543,14 @@ if (V.menials > 0) { r.push(` `); V.num(V.menials) r.push(` menial slaves`); -if (V.menialBioreactors > 0) && (V.fuckdolls === 0) { +if ((V.menialBioreactors > 0) && (V.fuckdolls === 0)) { r.push(` and`); } else { r.push(`,`); } } else { r.push(`one menial slave`); -if (V.menialBioreactors > 0) && (V.fuckdolls === 0) { +if ((V.menialBioreactors > 0) && (V.fuckdolls === 0)) { r.push(` and`); } else { r.push(`,`); @@ -1552,7 +1580,7 @@ V.num(V.menialBioreactors) if (V.fuckdolls > 0) { _AL = App.Entity.facilities.arcade.employeesIDs().size; - if (V.fuckdolls > V.arcade - _AL) && (V.arcade > _AL) { + if ((V.fuckdolls > V.arcade - _AL) && (V.arcade > _AL)) { _fuckdollsArcade = V.arcade - _AL; } else if (V.fuckdolls < V.arcade - _AL) { _fuckdollsArcade = V.fuckdolls; @@ -1567,11 +1595,9 @@ if (V.fuckdolls > 0) { _arcadeUpgradeInjectors = 1.5; } _fuckdollsEarnings = Math.trunc(((V.fuckdolls - _fuckdollsArcade) * 140 + _fuckdollsArcade * (175 + 35 * _arcadeUpgradeInjectors)) * (V.arcadePrice - 0.5) / 10); - r.push(` /*The "/ 10" at the end is just there to keep the price in line with other current prices, hopefully prices will get to a spot where this can be dropped*/`); + /*The "/ 10" at the end is just there to keep the price in line with other current prices, hopefully prices will get to a spot where this can be dropped*/ if (V.fuckdolls > 1) { - r.push(` `); -V.num(V.fuckdolls) - r.push(` standard Fuckdolls,`); + r.push(`${num(V.fuckdolls)} standard Fuckdolls,`); } else if (V.fuckdolls === 1) { r.push(`one Fuckdoll,`); } @@ -1587,7 +1613,7 @@ V.num(_fuckdollsArcade) if (V.policies.publicFuckdolls === 1) { repX(_fuckdollsEarnings / 5, "fuckdolls"); _fuckdollsEarnings = Math.trunc(V.fuckdolls * -0.5); - r.push(` /*The upkeep of a Fuckdoll*/`); + /*The upkeep of a Fuckdoll*/ } cashX(_fuckdollsEarnings, "fuckdolls"); } @@ -1650,7 +1676,7 @@ if (_AWeekGrowth+V.arcologies[0].prosperity > V.AProsperityCap) { } } if (V.personalAttention === "business") { - if (V.PC.skill.trading >= 100) || (V.PC.career === "arcology owner") { + if ((V.PC.skill.trading >= 100) || (V.PC.career === "arcology owner")) { r.push(`Your <span class="springgreen">business focus and your experience</span> allow you to greatly assist in advancing the arcology's prosperity.`); _AWeekGrowth += 2; } else { @@ -1702,7 +1728,7 @@ if (_AWeekGrowth+V.arcologies[0].prosperity > V.AProsperityCap) { r.push(`This week, your tightly hierarchical Imperial society's efficient organization has attracted traders and increased prosperity.`); _AWeekGrowth++; } else if (V.arcologies[0].FSChineseRevivalist !== "unset") { - if (V.HeadGirlID !== 0) && (V.RecruiterID !== 0) && (V.BodyguardID !== 0) { + if ((V.HeadGirlID !== 0) && (V.RecruiterID !== 0) && (V.BodyguardID !== 0)) { r.push(`This week, your imperial administration, staffed with a Head Girl, a Recruiter, and a Bodyguard, has improved prosperity.`); _AWeekGrowth += 2; } @@ -1760,17 +1786,17 @@ if (_AWeekGrowth+V.arcologies[0].prosperity > V.AProsperityCap) { _desc = []; _descNeg = []; - <<for V.i = 1; V.i < V.arcologies.length; V.i++>> + for (let V.i = 1; V.i < V.arcologies.length; V.i++) { _opinion = App.Neighbor.opinion(0, V.i); if (_opinion >= 100) { _desc.push(V.arcologies[V.i].name); } else if (_opinion <= -100) { _descNeg.push(V.arcologies[V.i].name); } - <</for>> + }; if (_desc.length > 0) { r.push(`Your arcology's economy benefits from close social alignment with`); - r.push(`${V._desc.reduce((res}, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch)`); + _desc.reduce((res, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch); if (_descNeg.length > 0) { r.push(`, but`); } else { @@ -1780,10 +1806,8 @@ if (_descNeg.length > 0) { } if (_descNeg.length > 0) { if (_desc.length === 0) { - r.push(`Your arcology's economy`); -} - r.push(`is hindered by social conflicts with`); - r.push(`${V._descNeg.reduce((res}, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch)`); + r.push(`Your arcology's economy is hindered by social conflicts with`); + _descNeg.reduce((res, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch); r.push(`.`); _AWeekGrowth -= _descNeg.length; } @@ -1815,14 +1839,14 @@ if (_descNeg.length > 0) { _AWeekGrowth++; } if (V.SecExp.smilingMan.progress >= 2) { - if (def V.SecExp.smilingMan.globalCrisisWeeks) && V.SecExp.smilingMan.globalCrisisWeeks > 0 { + if (V.SecExp.smilingMan.globalCrisisWeeks && V.SecExp.smilingMan.globalCrisisWeeks > 0) { r.push(`The great global crisis ignited by The Smiling Man plan is a great weight on the shoulders of everyone, causing great harm to the prosperity of the arcology.`); _AWeekGrowth -= random(2,4), V.SecExp.smilingMan.globalCrisisWeeks--; } else if (V.SecExp.smilingMan.progress >= 3) { r.push(`With the global economy recovering from the great crisis unleashed by the Smiling Man, there is plenty of room to grow. Your arcology's prosperity benefits from this greatly.`); _AWeekGrowth++; } - if (def V.SecExp.smilingMan.globalCrisisWeeks) && V.SecExp.smilingMan.globalCrisisWeeks === 0 { + if ((V.SecExp.smilingMan.globalCrisisWeeks) && V.SecExp.smilingMan.globalCrisisWeeks === 0) { delete V.SecExp.smilingMan.globalCrisisWeeks; } } @@ -1848,23 +1872,24 @@ if (V.garrison.reactorTime> 1) { r.push(`Though ${V.arcologies[0].name} can support more citizens and more activity, <span class="red">it lost prosperity this week.</span>`); } if (isNaN(_AWeekGrowth)) { - <br><span class="red">Error: AWeekGrowth is NaN</span> + //<br> + r.push(`<span class="red">Error: AWeekGrowth is NaN</span>`); } else { V.arcologies[0].prosperity += _AWeekGrowth; } } if (V.secExpEnabled > 0) { - <br><br> -<<include "tradeReport">> + //<br><br> +//<<include "tradeReport"; } if (_schools > 0) { -<br> +//<br> if (V.TSS.schoolPresent === 1) { - <br> + //<br> r.push(`The Slave School has a `); if (V.TSS.schoolProsperity > 4) { r.push(`very prosperous`); @@ -1895,7 +1920,7 @@ repX(200, "policies"); } if (V.TUO.schoolPresent === 1) { - <br> + //<br> r.push(`The Utopian Orphanage has a `); if (V.TUO.schoolProsperity > 4) { r.push(`very prosperous`); @@ -1927,7 +1952,7 @@ repX(200, "policies"); if (V.GRI.schoolPresent === 1) { - <br> + //<br> r.push(`The Growth Research Institute has a `); if (V.GRI.schoolProsperity > 4) { r.push(`very prosperous`); @@ -1957,7 +1982,7 @@ repX(200, "policies"); } if (V.TCR.schoolPresent === 1) { - <br> + //<br> r.push(`The Cattle Ranch has a `); if (V.TCR.schoolProsperity > 4) { r.push(`very prosperous`); @@ -1987,7 +2012,7 @@ repX(200, "policies"); } if (V.SCP.schoolPresent === 1) { - <br> + //<br> r.push(`St. Claver Preparatory has a `); if (V.SCP.schoolProsperity > 4) { r.push(`very prosperous`); @@ -2017,7 +2042,7 @@ repX(200, "policies"); } if (V.LDE.schoolPresent === 1) { - <br> + //<br> r.push(`L'École des Enculées has a `); if (V.LDE.schoolProsperity > 4) { r.push(`very prosperous`); @@ -2047,7 +2072,7 @@ repX(200, "policies"); } if (V.TGA.schoolPresent === 1) { - <br> + //<br> r.push(`The Gymnasium-Academy has a `); if (V.TGA.schoolProsperity > 4) { r.push(`very prosperous`); @@ -2077,7 +2102,7 @@ repX(200, "policies"); } if (V.TFS.schoolPresent === 1) { - <br> + //<br> r.push(`The Futanari Sisters have a `); if (V.TFS.schoolProsperity > 4) { r.push(`very prosperous`); @@ -2099,7 +2124,7 @@ repX(200, "policies"); } if (V.TFS.subsidize === 1) { r.push(`You have a policy of subsidizing them`); -if (V.PC.dick !== 0) && (V.PC.vagina !== -1) && (V.PC.boobs >= 300) { +if ((V.PC.dick !== 0) && (V.PC.vagina !== -1) && (V.PC.boobs >= 300)) { r.push(`, which is more effective due to your close relationship with them and your physical resemblance to them`); V.TFS.schoolProsperity++; } @@ -2112,7 +2137,7 @@ V.TFS.schoolProsperity++; } if (V.HA.schoolPresent === 1) { - <br> + //<br> r.push(`The Hippolyta Academy has a `); if (V.HA.schoolProsperity > 4) { r.push(`very prosperous`); @@ -2142,7 +2167,7 @@ repX(200, "policies"); } if (V.NUL.schoolPresent === 1) { - <br> + //<br> r.push(`Nueva Universidad de Libertad has a `); if (V.NUL.schoolProsperity > 4) { r.push(`very prosperous`); @@ -2170,15 +2195,15 @@ repX(200, "policies"); V.NUL.schoolProsperity--; } } -<br> +//<br> } -<<setAssistantPronouns>> +//setAssistantPronouns; if (V.assistant.market && V.assistant.market.limit > 0) { _popCap = menialPopCap(); _menialSlaveValue = menialSlaveCost(); -<br> -Your ''business assistant'' manages the menial slave market. +//<br> +r.push(`Your ''business assistant'' manages the menial slave market.`); if (_menialSlaveValue <= 900+V.assistant.market.aggressiveness) {/* BUY */ _bulkMax = _popCap.value-V.menials-V.fuckdolls-V.menialBioreactors; if (_bulkMax <= 0) { @@ -2186,8 +2211,8 @@ if (_menialSlaveValue <= 900+V.assistant.market.aggressiveness) {/* BUY */ } else { if (V.cash > V.assistant.market.limit+_menialSlaveValue) { _menialBulkPremium = Math.trunc(1+Math.clamp((V.cash-V.assistant.market.limit)/_menialSlaveValue,0,_bulkMax)/400); - _HeM acquires more chattel, since it's a buyers' market. - if (V.arcologies[0].FSPastoralist !== "unset") && (V.arcologies[0].FSPaternalist === "unset") { + r.push(`${_HeM} acquires more chattel, since it's a buyers' market.`); + if ((V.arcologies[0].FSPastoralist !== "unset") && (V.arcologies[0].FSPaternalist === "unset")) { V.menialBioreactors += Math.trunc(Math.clamp((V.cash-V.assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), V.menialSupplyFactor -= Math.trunc(Math.clamp((V.cash-V.assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp((V.cash-V.assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax))*(_menialSlaveValue+_menialBulkPremium-100)), "menialBioreactorsTransferA"); } else if ((V.arcologies[0].FSDegradationist !== "unset")) { V.fuckdolls += Math.trunc(Math.clamp((V.cash-V.assistant.market.limit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), V.menialSupplyFactor -= Math.trunc(Math.clamp((V.cash-V.assistant.market.limit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp((V.cash-V.assistant.market.limit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax))*((_menialSlaveValue+_menialBulkPremium)*2)), "fuckdollsTransferA"); @@ -2198,7 +2223,7 @@ if (_menialSlaveValue <= 900+V.assistant.market.aggressiveness) {/* BUY */ } } else if (_menialSlaveValue >= 1100-V.assistant.market.aggressiveness) {/* SELL */ if (V.menials+V.fuckdolls+V.menialBioreactors > 0) { - _HeM liquidates your chattel holdings, since it's a sellers' market. + r.push(`${_HeM} liquidates your chattel holdings, since it's a sellers' market.`); } if (V.menials > 0) { _cashX = V.menials*(menialSlaveCost(-V.menials)), V.menialDemandFactor -= V.menials, V.menials = 0; @@ -2213,14 +2238,14 @@ if (_menialSlaveValue <= 900+V.assistant.market.aggressiveness) {/* BUY */ cashX(_cashX, "menialBioreactorsTransferA"); } } else { - r.push(`Prices are average, so${ _heM} does not make any significant moves.`); + r.push(`Prices are average, so${_heM} does not make any significant moves.`); } } -<br> +//<br> -<span id="food"> +//<span id="food"> if (V.foodMarket > 0) { - <<include "Food Report">> + //<<include "Food Report"; } -</span> +//</span> } \ No newline at end of file -- GitLab