From 587b33f5da6932dd00a2e2423d8df0c5a9a1666e Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Thu, 29 Oct 2020 02:34:17 -0400 Subject: [PATCH] fixes --- src/endWeek/economics/neighborsDevelopment.js | 385 +++++++++--------- 1 file changed, 189 insertions(+), 196 deletions(-) diff --git a/src/endWeek/economics/neighborsDevelopment.js b/src/endWeek/economics/neighborsDevelopment.js index 47c7855c7ec..997f71f1a89 100644 --- a/src/endWeek/economics/neighborsDevelopment.js +++ b/src/endWeek/economics/neighborsDevelopment.js @@ -3,7 +3,6 @@ */ App.EndWeek.neighborsDevelopment = function() { const el = document.createElement("p"); - let r = []; let He, his; V.averageProsperity = 0; @@ -20,7 +19,7 @@ App.EndWeek.neighborsDevelopment = function() { } V.averageProsperity += V.arcologies[i].prosperity; } - V.averageProsperity = V.averageProsperity/V.arcologies.length; + V.averageProsperity = V.averageProsperity / V.arcologies.length; if (V.corp.Incorporated === 1) { _corpBonus = Math.trunc(1000 * Math.pow(App.Corporate.value, 0.1)); @@ -31,8 +30,8 @@ App.EndWeek.neighborsDevelopment = function() { } for (let i = 0; i < V.arcologies.length; i++) { - const arc = V.arcologies[V.i]; - // <br> + const arc = V.arcologies[i]; + const r = []; r.push(`'' ${arc.name}'', your `); if (arc.direction === 0) { r.push(`arcology`); @@ -95,20 +94,20 @@ App.EndWeek.neighborsDevelopment = function() { } else { _error = 10; } - _error -= Math.min(2*V.assistant.power, _error); - const _prosperity = (Math.trunc((0.1*arc.prosperity*random(100-_error, 100+_error))/100)); - r.push(`has an estimated GSP of <span class="yellowgreen">${cashFormat(_prosperity)}`); + _error -= Math.min(2 * V.assistant.power, _error); + const _prosperity = (Math.trunc((0.1 * arc.prosperity * random(100 - _error, 100 + _error)) / 100)); + let millions = ``; if (V.showNumbers !== 2) { if (V.showNumbers === 1 && _prosperity > V.showNumbersMax) { - r.push(`m`); + millions = `m`; } else { - r.push(` million`); + millions = `million`; } } else { - r.push(`m`); + millions = `m`; } - r.push(`,</span>`); - + millions += `,</span>`; + r.push(`has an estimated GSP of <span class="yellowgreen">${cashFormat(_prosperity)}${millions}`); if (arc.rival === 1 && arc.government !== "an individual") { r.push(`but it is undergoing some internal turmoil. <span class="red">Resentment that has been quietly building among the arcology's elite turns into open rebellion!</span>`); if (arc.PCminority > 0) { @@ -227,9 +226,7 @@ App.EndWeek.neighborsDevelopment = function() { } _desc = FutureSocieties.decay(i).map((fs) => FutureSocieties.displayName(fs)); if (_desc.length > 2) { - r.push(`Its citizens take the opportunity to make radical social changes, <span class="cyan">purging the `); - _desc.reduce((res, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch); - r.push(`</span> favored by the old government.`); + r.push(`Its citizens take the opportunity to make radical social changes, <span class="cyan">purging the ${_desc.reduce((res, ch, i, arr) => res + (i === arr.length - 1 ? ' and ' : ', ') + ch)}</span> favored by the old government.`); } else if (_desc.length === 2) { r.push(`Its citizens take the opportunity to make social changes, <span class="cyan">discarding the${_desc[0]} and _desc[1]</span> favored by the old government.`); } else if (_desc.length === 1) { @@ -263,16 +260,16 @@ App.EndWeek.neighborsDevelopment = function() { if ((arc.government === "your agent") || (arc.government === "your trustees")) { arc.ownership = 0; } - let _owned = arc.minority+arc.ownership+arc.PCminority; + let _owned = arc.minority + arc.ownership + arc.PCminority; if (arc.minority < 10) { arc.minority = 0; } else if (arc.minority < arc.PCminority) { arc.minority = 0; } else if (_owned >= 95) { arc.minority -= random(3, 5); - } else if (arc.minority > (100 - _owned)*5) { + } else if (arc.minority > (100 - _owned) * 5) { arc.minority -= random(3, 5); - } else if (arc.minority < (100 - _owned)*4) { + } else if (arc.minority < (100 - _owned) * 4) { if (arc.minority < 10) { if (arc.ownership + arc.PCminority <= 90) { arc.minority = 10; @@ -292,14 +289,14 @@ App.EndWeek.neighborsDevelopment = function() { if (arc.government !== "your agent") { if (arc.government !== "your trustees") { if (arc.minority + arc.ownership + arc.PCminority < 100) { - _prosperityDiff = arc.prosperity-V.averageProsperity; + _prosperityDiff = arc.prosperity - V.averageProsperity; if (_prosperityDiff > random(-10, 50)) { r.push(`Its leadership acquires an increased share of its ownership.`); arc.ownership += 1; arc.prosperity -= 5; - r.push(`This places its government in control of approximately <span class="orange">${Math.trunc(arc.ownership*_economicUncertainty)}%</span> of the arcology`); + r.push(`This places its government in control of approximately <span class="orange">${Math.trunc(arc.ownership * _economicUncertainty)}%</span> of the arcology`); if (arc.minority > 0) { - r.push(`, against its most prominent competition with a <span class="tan">${Math.trunc(arc.minority*_economicUncertainty)}%</span> share`); + r.push(`, against its most prominent competition with a <span class="tan">${Math.trunc(arc.minority * _economicUncertainty)}%</span> share`); } r.push(`.`); } else if (_prosperityDiff < random(-50, 10)) { @@ -308,17 +305,17 @@ App.EndWeek.neighborsDevelopment = function() { r.push(`Its leadership sells off some of its ownership to stay afloat.`); arc.ownership -= 1; arc.prosperity += 5; - r.push(`This leaves its government in control of approximately <span class="orange">${Math.trunc(arc.ownership*_economicUncertainty)}%</span> of the arcology`); + r.push(`This leaves its government in control of approximately <span class="orange">${Math.trunc(arc.ownership * _economicUncertainty)}%</span> of the arcology`); if (arc.minority > 0) { - r.push(`, against its most prominent competition, with a <span class="tan">${Math.trunc(arc.minority*_economicUncertainty)}%</span> share`); + r.push(`, against its most prominent competition, with a <span class="tan">${Math.trunc(arc.minority * _economicUncertainty)}%</span> share`); } r.push(`.`); } } } - if (arc.minority+arc.ownership > 100) { - arc.minority = 100-arc.ownership; + if (arc.minority + arc.ownership > 100) { + arc.minority = 100 - arc.ownership; } } else { if (((arc.ownership + arc.PCminority) >= 99) && arc.rival !== 1) { @@ -333,7 +330,7 @@ App.EndWeek.neighborsDevelopment = function() { /* AI ARCOLOGY RENTS TO PC */ if (arc.PCminority > 0) { - const _rents = (arc.prosperity*arc.PCminority*2)+random(1, 100); + const _rents = (arc.prosperity * arc.PCminority * 2) + random(1, 100); cashX(_rents, "rents"); r.push(`This week, you made <span class="yellowgreen">${cashFormat(_rents)}</span> from your holdings in this arcology.`); } @@ -360,16 +357,16 @@ App.EndWeek.neighborsDevelopment = function() { } else if (V.PC.skill.hacking >= 100) { _Catchchance = 100; } - const _weekModifier = Math.max(1, (100-(V.week*2))); - arc.prosperity -= V.arcologies[0].CyberEconomic*2; - const _WarSpoils = Math.ceil(10+Math.max(((100/_weekModifier)*arc.prosperity*V.arcologies[0].CyberEconomic), 0)); + const _weekModifier = Math.max(1, (100 - (V.week * 2))); + arc.prosperity -= V.arcologies[0].CyberEconomic * 2; + const _WarSpoils = Math.ceil(10 + Math.max(((100 / _weekModifier) * arc.prosperity * V.arcologies[0].CyberEconomic), 0)); arc.prosperity = Math.clamp(arc.prosperity, 1, V.AProsperityCap); - if (random(0, 100) >= _Catchchance-(10*V.arcologies[0].CyberEconomic)) { - V.arcologies[0].prosperity -= V.arcologies[0].CyberEconomic*3; + if (random(0, 100) >= _Catchchance - (10 * V.arcologies[0].CyberEconomic)) { + V.arcologies[0].prosperity -= V.arcologies[0].CyberEconomic * 3; _redHanded = 1; repX(forceNeg(random(100, 200)), "war"); if (V.secExpEnabled > 0) { - V.SecExp.core.authority -= random(100, 500)*V.arcologies[0].CyberEconomic; + V.SecExp.core.authority -= random(100, 500) * V.arcologies[0].CyberEconomic; V.SecExp.core.crimeLow += random(10, 25); } V.arcologies[0].prosperity = Math.clamp(V.arcologies[0].prosperity, 1, V.AProsperityCap); @@ -411,12 +408,12 @@ App.EndWeek.neighborsDevelopment = function() { arc.prosperity = Math.clamp(arc.prosperity, 1, 300); arc.ownership = Math.clamp(arc.ownership, 0, 100); _redHanded; - if (random(0, 100) >= _Catchchance-(10*V.arcologies[0].CyberReputation)) { - V.arcologies[0].prosperity -= V.arcologies[0].CyberReputation*3; + if (random(0, 100) >= _Catchchance - (10 * V.arcologies[0].CyberReputation)) { + V.arcologies[0].prosperity -= V.arcologies[0].CyberReputation * 3; _redHanded = 1; repX(forceNeg(random(100, 200)), "war"); if (V.secExpEnabled > 0) { - V.SecExp.core.authority -= random(100, 500)*V.arcologies[0].CyberReputation; + V.SecExp.core.authority -= random(100, 500) * V.arcologies[0].CyberReputation; V.SecExp.core.crimeLow += random(10, 25); } V.arcologies[0].prosperity = Math.clamp(V.arcologies[0].prosperity, 1, 300); @@ -436,7 +433,7 @@ App.EndWeek.neighborsDevelopment = function() { const arc2 = V.arcologies[j]; if (arc.direction !== arc2.direction) { if (arc.name === arc2.name) { - arc.name = "Arcology X-"+(i < 4 ? i : i + 1); + arc.name = "Arcology X-" + (i < 4 ? i : i + 1); /* X-4 is reserved for player's arcology, so X-1 is available */ r.push(`It resumes its original name, '' ${arc.name}'', since the arcology to the arc.direction of yours is also named arc2.name.`); break; @@ -450,9 +447,9 @@ App.EndWeek.neighborsDevelopment = function() { for (let j = 0; j < V.arcologies.length; j++) { const arc2 = V.arcologies[j]; if (arc.direction === arc2.embargoTarget) { - arc.prosperity -= arc2.embargo*2; + arc.prosperity -= arc2.embargo * 2; if (arc2.direction !== 0) { - arc2.prosperity -= arc2.embargo*2; + arc2.prosperity -= arc2.embargo * 2; } arc.prosperity = Math.clamp(arc.prosperity, 1, 300); r.push(`${arc2.name} targets ${arc.name} for <span class="red">economic warfare.</span>`); @@ -668,7 +665,7 @@ App.EndWeek.neighborsDevelopment = function() { if (V.corp.SpecBalls === -1) { r.push(`It's an <span class="lightgreen">excellent market</span> for your corporation's neutered slavegirls, improving sales and helping social progress.`); arc.FSRestart += 2; - App.Corporate.earnRevenue(_corpBonus*2, 'foreign'); + App.Corporate.earnRevenue(_corpBonus * 2, 'foreign'); } else if (V.corp.SpecSexEd === 2) { r.push(`It's a <span class="lightgreen">good market</span> for your corporation's well trained toys, improving sales and helping social progress.`); arc.FSRestart += 1; @@ -830,7 +827,7 @@ App.EndWeek.neighborsDevelopment = function() { if (V.corp.SpecIntelligence === 1) { r.push(`It's an <span class="lightgreen">excellent market</span> for your corporation's idiotic sluts, improving sales and helping social progress.`); arc.FSIntellectualDependency += 2; - App.Corporate.earnRevenue(_corpBonus*2, 'foreign'); + App.Corporate.earnRevenue(_corpBonus * 2, 'foreign'); } else if (V.corp.SpecEducation === 0) { r.push(`It's a <span class="lightgreen">good market</span> for your corporation's uneducated slaves, improving sales and helping social progress.`); arc.FSIntellectualDependency += 1; @@ -858,7 +855,7 @@ App.EndWeek.neighborsDevelopment = function() { if (V.corp.SpecIntelligence === 3) { r.push(`It's an <span class="lightgreen">excellent market</span> for your corporation's smarter captures, improving sales and helping social progress.`); arc.FSSlaveProfessionalism += 2; - App.Corporate.earnRevenue(_corpBonus*2, 'foreign'); + App.Corporate.earnRevenue(_corpBonus * 2, 'foreign'); } if (V.corp.SpecEducation > 1) { r.push(`It's a <span class="lightgreen">good market</span> for your corporation's well educated ladies, improving sales and helping social progress.`); @@ -931,7 +928,7 @@ App.EndWeek.neighborsDevelopment = function() { } else if (V.corp.SpecImplants === 2) { r.push(`It's an <span class="lightgreen">excellent market</span> for your corporation's absurdly implanted slaves, improving sales and helping social progress.`); arc.FSTransformationFetishist += 2; - App.Corporate.earnRevenue(_corpBonus*2, 'foreign'); + App.Corporate.earnRevenue(_corpBonus * 2, 'foreign'); } } } @@ -1011,7 +1008,7 @@ App.EndWeek.neighborsDevelopment = function() { if (V.corp.SpecHeight === 1) { r.push(`It's an <span class="lightgreen">excellent market</span> for your corporation's minuscule slaves, improving sales and helping social progress.`); arc.FSPetiteAdmiration += 2; - App.Corporate.earnRevenue(_corpBonus*2, 'foreign'); + App.Corporate.earnRevenue(_corpBonus * 2, 'foreign'); } else if (V.corp.SpecHeight === 2) { r.push(`It's a <span class="lightgreen">good market</span> for your corporation's shorter captures, improving sales and helping social progress.`); arc.FSPetiteAdmiration += 1; @@ -1038,7 +1035,7 @@ App.EndWeek.neighborsDevelopment = function() { if (V.corp.SpecHeight === 5) { r.push(`It's an <span class="lightgreen">excellent market</span> for your corporation's gigantic slaves, improving sales and helping social progress.`); arc.FSStatuesqueGlorification += 2; - App.Corporate.earnRevenue(_corpBonus*2, 'foreign'); + App.Corporate.earnRevenue(_corpBonus * 2, 'foreign'); } else if (V.corp.SpecHeight === 4) { r.push(`It's a <span class="lightgreen">good market</span> for your corporation's taller captures, improving sales and helping social progress.`); arc.FSStatuesqueGlorification += 1; @@ -1094,7 +1091,7 @@ App.EndWeek.neighborsDevelopment = function() { if (V.corp.SPecInjection === 4) { r.push(`It's an <span class="lightgreen">excellent market</span> for your corporation's world-class tits and ass, improving sales and helping social progress.`); arc.FSAssetExpansionist += 2; - App.Corporate.earnRevenue(_corpBonus*2, 'foreign'); + App.Corporate.earnRevenue(_corpBonus * 2, 'foreign'); } else if (V.corp.SpecInjection === 5) { r.push(`It's a <span class="lightgreen">good market</span> for your corporation's hugely endowed cows, improving sales and helping social progress.`); arc.FSAssetExpansionist += 1; @@ -1127,11 +1124,11 @@ App.EndWeek.neighborsDevelopment = function() { if (V.corp.SpecInjection === 5) { r.push(`It's an <span class="lightgreen">excellent market</span> for your corporation's world-class milk producers, improving sales and helping social progress.`); arc.FSPastoralist += 2; - App.Corporate.earnRevenue(_corpBonus*2, 'foreign'); + App.Corporate.earnRevenue(_corpBonus * 2, 'foreign'); } else if (V.corp.SpecMilk > 0) { r.push(`It's an <span class="lightgreen">excellent market</span> for your corporation's world-class milk producers, improving sales and helping social progress.`); arc.FSPastoralist += 2; - App.Corporate.earnRevenue(_corpBonus*2, 'foreign'); + App.Corporate.earnRevenue(_corpBonus * 2, 'foreign'); } } } @@ -1154,7 +1151,7 @@ App.EndWeek.neighborsDevelopment = function() { if (V.corp.SpecInjection === 5) { r.push(`It's an <span class="lightgreen">excellent market</span> for your corporation's world-class cum producers, improving sales and helping social progress.`); arc.FSCummunism += 2; - App.Corporate.earnRevenue(_corpBonus*2, 'foreign'); + App.Corporate.earnRevenue(_corpBonus * 2, 'foreign'); } else if (V.corp.SpecHormones === 2) { r.push(`It's a <span class="lightgreen">good market</span> for your corporation's masculinized slaves, improving sales and helping social progress.`); arc.FSCummunism += 1; @@ -1184,10 +1181,10 @@ App.EndWeek.neighborsDevelopment = function() { } if (arc.FSPhysicalIdealist !== "unset") { if (V.corp.Incorporated === 1) { - if (V.corp.SpecMuscle === 5 ) { + if (V.corp.SpecMuscle === 5) { r.push(`It's an <span class="lightgreen">excellent market</span> for your corporation's ripped chicks, improving sales and helping social progress.`); arc.FSPhysicalIdealist += 2; - App.Corporate.earnRevenue(_corpBonus*2, 'foreign'); + App.Corporate.earnRevenue(_corpBonus * 2, 'foreign'); } else if (V.corp.SpecMuscle === 4) { r.push(`It's a <span class="lightgreen">good market</span> for your corporation's toned ladies, improving sales and helping social progress.`); arc.FSPhysicalIdealist += 1; @@ -1219,7 +1216,7 @@ App.EndWeek.neighborsDevelopment = function() { if (V.corp.SpecTrust > 3) { r.push(`It's an <span class="lightgreen">excellent market</span> for your corporation's well kept, happy slaves, improving sales and helping social progress.`); arc.FSHedonisticDecadence += 2; - App.Corporate.earnRevenue(_corpBonus*2, 'foreign'); + App.Corporate.earnRevenue(_corpBonus * 2, 'foreign'); } else if (V.corp.SpecSexEd === 2) { r.push(`It's a <span class="lightgreen">good market</span> for your corporation's skilled slaves, improving sales and helping social progress.`); arc.FSHedonisticDecadence += 1; @@ -1273,7 +1270,7 @@ App.EndWeek.neighborsDevelopment = function() { if (V.corp.SpecSexEd === 2) { r.push(`It's an <span class="lightgreen">excellent market</span> for your corporation's holy sex slaves, improving sales and helping social progress.`); arc.FSChattelReligionist += 2; - App.Corporate.earnRevenue(_corpBonus*2, 'foreign'); + App.Corporate.earnRevenue(_corpBonus * 2, 'foreign'); } else if (V.corp.SpecSexEd === 1) { r.push(`It's a <span class="lightgreen">good market</span> for your corporation's aspiring sexual acolytes, improving sales and helping social progress.`); arc.FSChattelReligionist += 1; @@ -1417,7 +1414,7 @@ App.EndWeek.neighborsDevelopment = function() { if (V.corp.SpecDevotion === 5) { r.push(`It's an <span class="lightgreen">excellent market</span> for your corporation's harem-ready devotees, improving sales and helping social progress.`); arc.FSArabianRevivalist += 2; - App.Corporate.earnRevenue(_corpBonus*2, 'foreign'); + App.Corporate.earnRevenue(_corpBonus * 2, 'foreign'); } else if (V.corp.SpecDevotion === 4) { r.push(`It's a <span class="lightgreen">good market</span> for your corporation's properly broken girls, improving sales and helping social progress.`); arc.FSArabianRevivalist += 1; @@ -1455,7 +1452,7 @@ App.EndWeek.neighborsDevelopment = function() { if (arc.direction !== 0) { if (_societiesAdopted < V.FSCreditCount) { - if ((arc.rival === 1) || (_societiesAdopted < (arc.prosperity/25)+(V.week/25)-3)) { + if ((arc.rival === 1) || (_societiesAdopted < (arc.prosperity / 25) + (V.week / 25) - 3)) { r.push(App.UI.DOM.renderPassage("Neighbors FS Adoption")); } } @@ -1468,8 +1465,8 @@ App.EndWeek.neighborsDevelopment = function() { if (arc2.direction !== arc.direction) { if (arc2.influenceTarget === arc.direction) { arc2.influenceBonus = Math.clamp(arc2.influenceBonus, 0, V.FSLockinLevel); - let _appliedInfluenceBonus = Math.trunc(arc2.influenceBonus*0.1); - arc2.influenceBonus -= _appliedInfluenceBonus*2; + let _appliedInfluenceBonus = Math.trunc(arc2.influenceBonus * 0.1); + arc2.influenceBonus -= _appliedInfluenceBonus * 2; if (V.policies.culturalOpenness === 1) { if ((arc.direction === 0) || (arc2.direction === 0)) { _appliedInfluenceBonus *= 2; @@ -1488,270 +1485,270 @@ App.EndWeek.neighborsDevelopment = function() { if (arc2.FSSubjugationist !== "unset" && arc2.FSSubjugationist > 60) { if (arc.FSSubjugationist !== "unset") { if (arc2.FSSubjugationistRace === arc.FSSubjugationistRace) { - arc.FSSubjugationist += Math.trunc((arc2.FSSubjugationist-60)/4)+_appliedInfluenceBonus; + arc.FSSubjugationist += Math.trunc((arc2.FSSubjugationist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSSubjugationist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its racially aligned Subjugationism"); } else { - arc.FSSubjugationist -= Math.trunc((arc2.FSSubjugationist-60)/4)+_appliedInfluenceBonus; + arc.FSSubjugationist -= Math.trunc((arc2.FSSubjugationist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Subjugationism"); } } else if ((arc.FSSupremacist !== "unset") && (arc2.FSSubjugationistRace === arc.FSSupremacistRace)) { - arc.FSSupremacist -= Math.trunc((arc2.FSSubjugationist-60)/4)+_appliedInfluenceBonus; + arc.FSSupremacist -= Math.trunc((arc2.FSSubjugationist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its opposing Supremacism"); } } if (arc2.FSSupremacist !== "unset" && arc2.FSSupremacist > 60) { if (arc.FSSupremacist !== "unset") { if (arc2.FSSupremacistRace === arc.FSSupremacistRace) { - arc.FSSupremacist += Math.trunc((arc2.FSSupremacist-60)/4)+_appliedInfluenceBonus; + arc.FSSupremacist += Math.trunc((arc2.FSSupremacist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSSupremacist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its racially aligned Supremacism"); } else { - arc.FSSupremacist -= Math.trunc((arc2.FSSupremacist-60)/4)+_appliedInfluenceBonus; + arc.FSSupremacist -= Math.trunc((arc2.FSSupremacist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Supremacism"); } } else if ((arc.FSSubjugationist !== "unset") && (arc2.FSSupremacistRace === arc.FSSubjugationistRace)) { - arc.FSSubjugationist -= Math.trunc((arc2.FSSupremacist-60)/4)+_appliedInfluenceBonus; + arc.FSSubjugationist -= Math.trunc((arc2.FSSupremacist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its opposing Subjugationism"); } } if (arc2.FSRepopulationFocus !== "unset" && arc2.FSRepopulationFocus > 60) { if (arc.FSRepopulationFocus !== "unset") { - arc.FSRepopulationFocus += Math.trunc((arc2.FSRepopulationFocus-60)/4)+_appliedInfluenceBonus; + arc.FSRepopulationFocus += Math.trunc((arc2.FSRepopulationFocus - 60) / 4) + _appliedInfluenceBonus; if (arc.FSRepopulationFocus > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Repopulationism"); } else if (arc.FSRestart !== "unset") { - arc.FSRestart -= Math.trunc((arc2.FSRepopulationFocus-60)/4)+_appliedInfluenceBonus; + arc.FSRestart -= Math.trunc((arc2.FSRepopulationFocus - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Eugenics"); } } else if (arc2.FSRestart !== "unset" && arc2.FSRestart > 60) { if (arc.FSRestart !== "unset") { - arc.FSRestart += Math.trunc((arc2.FSRestart-60)/4)+_appliedInfluenceBonus; + arc.FSRestart += Math.trunc((arc2.FSRestart - 60) / 4) + _appliedInfluenceBonus; if (arc.FSRestart > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Eugenics"); } else if (arc.FSRepopulationFocus !== "unset") { - arc.FSRepopulationFocus -= Math.trunc((arc2.FSRestart-60)/4)+_appliedInfluenceBonus; + arc.FSRepopulationFocus -= Math.trunc((arc2.FSRestart - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Repopulation Efforts"); } } if (arc2.FSGenderRadicalist !== "unset" && arc2.FSGenderRadicalist > 60) { if (arc.FSGenderRadicalist !== "unset") { - arc.FSGenderRadicalist += Math.trunc((arc2.FSGenderRadicalist-60)/4)+_appliedInfluenceBonus; + arc.FSGenderRadicalist += Math.trunc((arc2.FSGenderRadicalist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSGenderRadicalist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Gender Radicalism"); } else if (arc.FSGenderFundamentalist !== "unset") { - arc.FSGenderFundamentalist -= Math.trunc((arc2.FSGenderRadicalist-60)/4)+_appliedInfluenceBonus; + arc.FSGenderFundamentalist -= Math.trunc((arc2.FSGenderRadicalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Gender Fundamentalism"); } } else if (arc2.FSGenderFundamentalist !== "unset" && arc2.FSGenderFundamentalist > 60) { if (arc.FSGenderFundamentalist !== "unset") { - arc.FSGenderFundamentalist += Math.trunc((arc2.FSGenderFundamentalist-60)/4)+_appliedInfluenceBonus; + arc.FSGenderFundamentalist += Math.trunc((arc2.FSGenderFundamentalist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSGenderFundamentalist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Gender Fundamentalism"); } else if (arc.FSGenderRadicalist !== "unset") { - arc.FSGenderRadicalist -= Math.trunc((arc2.FSGenderFundamentalist-60)/4)+_appliedInfluenceBonus; + arc.FSGenderRadicalist -= Math.trunc((arc2.FSGenderFundamentalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Gender Radicalism"); } } if (arc2.FSPaternalist !== "unset" && arc2.FSPaternalist > 60) { if (arc.FSPaternalist !== "unset") { - arc.FSPaternalist += Math.trunc((arc2.FSPaternalist-60)/4)+_appliedInfluenceBonus; + arc.FSPaternalist += Math.trunc((arc2.FSPaternalist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSPaternalist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Paternalism"); } else if (arc.FSDegradationist !== "unset") { - arc.FSDegradationist -= Math.trunc((arc2.FSPaternalist-60)/4)+_appliedInfluenceBonus; + arc.FSDegradationist -= Math.trunc((arc2.FSPaternalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Degradationism"); } } else if (arc2.FSDegradationist !== "unset" && arc2.FSDegradationist > 60) { if (arc.FSDegradationist !== "unset") { - arc.FSDegradationist += Math.trunc((arc2.FSDegradationist-60)/4)+_appliedInfluenceBonus; + arc.FSDegradationist += Math.trunc((arc2.FSDegradationist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSDegradationist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Degradationism"); } else if (arc.FSPaternalist !== "unset") { - arc.FSPaternalist -= Math.trunc((arc2.FSDegradationist-60)/4)+_appliedInfluenceBonus; + arc.FSPaternalist -= Math.trunc((arc2.FSDegradationist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Paternalism"); } } if (arc2.FSIntellectualDependency !== "unset" && arc2.FSIntellectualDependency > 60) { if (arc.FSIntellectualDependency !== "unset") { - arc.FSIntellectualDependency += Math.trunc((arc2.FSIntellectualDependency-60)/4)+_appliedInfluenceBonus; + arc.FSIntellectualDependency += Math.trunc((arc2.FSIntellectualDependency - 60) / 4) + _appliedInfluenceBonus; if (arc.FSIntellectualDependency > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Intellectual Dependency"); } else if (arc.FSSlaveProfessionalism !== "unset") { - arc.FSSlaveProfessionalism -= Math.trunc((arc2.FSIntellectualDependency-60)/4)+_appliedInfluenceBonus; + arc.FSSlaveProfessionalism -= Math.trunc((arc2.FSIntellectualDependency - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Slave Professionalism"); } } else if (arc2.FSSlaveProfessionalism !== "unset" && arc2.FSSlaveProfessionalism > 60) { if (arc.FSSlaveProfessionalism !== "unset") { - arc.FSSlaveProfessionalism += Math.trunc((arc2.FSSlaveProfessionalism-60)/4)+_appliedInfluenceBonus; + arc.FSSlaveProfessionalism += Math.trunc((arc2.FSSlaveProfessionalism - 60) / 4) + _appliedInfluenceBonus; if (arc.FSSlaveProfessionalism > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Slave Professionalism"); } else if (arc.FSIntellectualDependency !== "unset") { - arc.FSIntellectualDependency -= Math.trunc((arc2.FSSlaveProfessionalism-60)/4)+_appliedInfluenceBonus; + arc.FSIntellectualDependency -= Math.trunc((arc2.FSSlaveProfessionalism - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Intellectual Dependency"); } } if (arc2.FSBodyPurist !== "unset" && arc2.FSBodyPurist > 60) { if (arc.FSBodyPurist !== "unset") { - arc.FSBodyPurist += Math.trunc((arc2.FSBodyPurist-60)/4)+_appliedInfluenceBonus; + arc.FSBodyPurist += Math.trunc((arc2.FSBodyPurist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSBodyPurist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Body Purism"); } else if (arc.FSTransformationFetishist !== "unset") { - arc.FSTransformationFetishist -= Math.trunc((arc2.FSBodyPurist-60)/4)+_appliedInfluenceBonus; + arc.FSTransformationFetishist -= Math.trunc((arc2.FSBodyPurist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Transformation Fetishism"); } } else if (arc2.FSTransformationFetishist !== "unset" && arc2.FSTransformationFetishist > 60) { if (arc.FSTransformationFetishist !== "unset") { - arc.FSTransformationFetishist += Math.trunc((arc2.FSTransformationFetishist-60)/4)+_appliedInfluenceBonus; + arc.FSTransformationFetishist += Math.trunc((arc2.FSTransformationFetishist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSTransformationFetishist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Transformation Fetishism"); } else if (arc.FSBodyPurist !== "unset") { - arc.FSBodyPurist -= Math.trunc((arc2.FSTransformationFetishist-60)/4)+_appliedInfluenceBonus; + arc.FSBodyPurist -= Math.trunc((arc2.FSTransformationFetishist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Body Purism"); } } if (arc2.FSYouthPreferentialist !== "unset" && arc2.FSYouthPreferentialist > 60) { if (arc.FSYouthPreferentialist !== "unset") { - arc.FSYouthPreferentialist += Math.trunc((arc2.FSYouthPreferentialist-60)/4)+_appliedInfluenceBonus; + arc.FSYouthPreferentialist += Math.trunc((arc2.FSYouthPreferentialist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSYouthPreferentialist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Youth Preferentialism"); } else if (arc.FSMaturityPreferentialist !== "unset") { - arc.FSMaturityPreferentialist -= Math.trunc((arc2.FSYouthPreferentialist-60)/4)+_appliedInfluenceBonus; + arc.FSMaturityPreferentialist -= Math.trunc((arc2.FSYouthPreferentialist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Maturity Preferentialism"); } } else if (arc2.FSMaturityPreferentialist !== "unset" && arc2.FSMaturityPreferentialist > 60) { if (arc.FSMaturityPreferentialist !== "unset") { - arc.FSMaturityPreferentialist += Math.trunc((arc2.FSMaturityPreferentialist-60)/4)+_appliedInfluenceBonus; + arc.FSMaturityPreferentialist += Math.trunc((arc2.FSMaturityPreferentialist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSMaturityPreferentialist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Maturity Preferentialism"); } else if (arc.FSYouthPreferentialist !== "unset") { - arc.FSYouthPreferentialist -= Math.trunc((arc2.FSMaturityPreferentialist-60)/4)+_appliedInfluenceBonus; + arc.FSYouthPreferentialist -= Math.trunc((arc2.FSMaturityPreferentialist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Youth Preferentialism"); } } if (arc2.FSPetiteAdmiration !== "unset" && arc2.FSPetiteAdmiration > 60) { if (arc.FSPetiteAdmiration !== "unset") { - arc.FSPetiteAdmiration += Math.trunc((arc2.FSPetiteAdmiration-60)/4)+_appliedInfluenceBonus; + arc.FSPetiteAdmiration += Math.trunc((arc2.FSPetiteAdmiration - 60) / 4) + _appliedInfluenceBonus; if (arc.FSPetiteAdmiration > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Petite Admiration"); } else if (arc.FSStatuesqueGlorification !== "unset") { - arc.FSStatuesqueGlorification -= Math.trunc((arc2.FSPetiteAdmiration-60)/4)+_appliedInfluenceBonus; + arc.FSStatuesqueGlorification -= Math.trunc((arc2.FSPetiteAdmiration - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Statuesque Glorification"); } } else if (arc2.FSStatuesqueGlorification !== "unset" && arc2.FSStatuesqueGlorification > 60) { if (arc.FSStatuesqueGlorification !== "unset") { - arc.FSStatuesqueGlorification += Math.trunc((arc2.FSStatuesqueGlorification-60)/4)+_appliedInfluenceBonus; + arc.FSStatuesqueGlorification += Math.trunc((arc2.FSStatuesqueGlorification - 60) / 4) + _appliedInfluenceBonus; if (arc.FSStatuesqueGlorification > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Statuesque Glorification"); } else if (arc.FSPetiteAdmiration !== "unset") { - arc.FSPetiteAdmiration -= Math.trunc((arc2.FSStatuesqueGlorification-60)/4)+_appliedInfluenceBonus; + arc.FSPetiteAdmiration -= Math.trunc((arc2.FSStatuesqueGlorification - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Petite Admiration"); } } if (arc2.FSSlimnessEnthusiast !== "unset" && arc2.FSSlimnessEnthusiast > 60) { if (arc.FSSlimnessEnthusiast !== "unset") { - arc.FSSlimnessEnthusiast += Math.trunc((arc2.FSSlimnessEnthusiast-60)/4)+_appliedInfluenceBonus; + arc.FSSlimnessEnthusiast += Math.trunc((arc2.FSSlimnessEnthusiast - 60) / 4) + _appliedInfluenceBonus; if (arc.FSSlimnessEnthusiast > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Slimness Enthusiasm"); } else if (arc.FSAssetExpansionist !== "unset") { - arc.FSAssetExpansionist -= Math.trunc((arc2.FSSlimnessEnthusiast-60)/4)+_appliedInfluenceBonus; + arc.FSAssetExpansionist -= Math.trunc((arc2.FSSlimnessEnthusiast - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Asset Expansionism"); } } else if (arc2.FSAssetExpansionist !== "unset" && arc2.FSAssetExpansionist > 60) { if (arc.FSAssetExpansionist !== "unset") { - arc.FSAssetExpansionist += Math.trunc((arc2.FSAssetExpansionist-60)/4)+_appliedInfluenceBonus; + arc.FSAssetExpansionist += Math.trunc((arc2.FSAssetExpansionist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSAssetExpansionist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Asset Expansionism"); } else if (arc.FSSlimnessEnthusiast !== "unset") { - arc.FSSlimnessEnthusiast -= Math.trunc((arc2.FSAssetExpansionist-60)/4)+_appliedInfluenceBonus; + arc.FSSlimnessEnthusiast -= Math.trunc((arc2.FSAssetExpansionist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Slimness Enthusiasm"); } } if (arc2.FSPastoralist !== "unset" && arc2.FSPastoralist > 60) { if (arc.FSPastoralist !== "unset") { - arc.FSPastoralist += Math.trunc((arc2.FSPastoralist-60)/4)+_appliedInfluenceBonus; + arc.FSPastoralist += Math.trunc((arc2.FSPastoralist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSPastoralist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Pastoralism"); } else if (arc.FSCummunism !== "unset") { - arc.FSCummunism -= Math.trunc((arc2.FSPastoralist-60)/4)+_appliedInfluenceBonus; + arc.FSCummunism -= Math.trunc((arc2.FSPastoralist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Cummunism"); } } else if (arc2.FSCummunism !== "unset" && arc2.FSCummunism > 60) { if (arc.FSCummunism !== "unset") { - arc.FSCummunism += Math.trunc((arc2.FSCummunism-60)/4)+_appliedInfluenceBonus; + arc.FSCummunism += Math.trunc((arc2.FSCummunism - 60) / 4) + _appliedInfluenceBonus; if (arc.FSCummunism > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Cummunism"); } else if (arc.FSPastoralist !== "unset") { - arc.FSPastoralist -= Math.trunc((arc2.FSCummunism-60)/4)+_appliedInfluenceBonus; + arc.FSPastoralist -= Math.trunc((arc2.FSCummunism - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Pastoralism"); } } if (arc2.FSPhysicalIdealist !== "unset" && arc2.FSPhysicalIdealist > 60) { if (arc.FSPhysicalIdealist !== "unset") { - arc.FSPhysicalIdealist += Math.trunc((arc2.FSPhysicalIdealist-60)/4)+_appliedInfluenceBonus; + arc.FSPhysicalIdealist += Math.trunc((arc2.FSPhysicalIdealist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSPhysicalIdealist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Physical Idealism"); } else if (arc.FSHedonisticDecadence !== "unset") { - arc.FSHedonisticDecadence -= Math.trunc((arc2.FSPhysicalIdealist-60)/4)+_appliedInfluenceBonus; + arc.FSHedonisticDecadence -= Math.trunc((arc2.FSPhysicalIdealist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Hedonism"); } } else if (arc2.FSHedonisticDecadence !== "unset" && arc2.FSHedonisticDecadence > 60) { if (arc.FSHedonisticDecadence !== "unset") { - arc.FSHedonisticDecadence += Math.trunc((arc2.FSHedonisticDecadence-60)/4)+_appliedInfluenceBonus; + arc.FSHedonisticDecadence += Math.trunc((arc2.FSHedonisticDecadence - 60) / 4) + _appliedInfluenceBonus; if (arc.FSHedonisticDecadence > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Hedonism"); } else if (arc.FSPhysicalIdealist !== "unset") { - arc.FSPhysicalIdealist -= Math.trunc((arc2.FSHedonisticDecadence-60)/4)+_appliedInfluenceBonus; + arc.FSPhysicalIdealist -= Math.trunc((arc2.FSHedonisticDecadence - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its Physical Idealism"); } } if (arc2.FSIncestFetishist !== "unset" && arc2.FSIncestFetishist > 60) { if (arc.FSIncestFetishist !== "unset") { - arc.FSIncestFetishist += Math.trunc((arc2.FSIncestFetishist-60)/4)+_appliedInfluenceBonus; + arc.FSIncestFetishist += Math.trunc((arc2.FSIncestFetishist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSIncestFetishist > V.FSLockinLevel) { _alignment += 1; } @@ -1760,7 +1757,7 @@ App.EndWeek.neighborsDevelopment = function() { } if (arc2.FSChattelReligionist !== "unset" && arc2.FSChattelReligionist > 60) { if (arc.FSChattelReligionist !== "unset") { - arc.FSChattelReligionist += Math.trunc((arc2.FSChattelReligionist-60)/4)+_appliedInfluenceBonus; + arc.FSChattelReligionist += Math.trunc((arc2.FSChattelReligionist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSChattelReligionist > V.FSLockinLevel) { _alignment += 1; } @@ -1769,184 +1766,184 @@ App.EndWeek.neighborsDevelopment = function() { } if (arc2.FSRomanRevivalist !== "unset" && arc2.FSRomanRevivalist > 60) { if (arc.FSRomanRevivalist !== "unset") { - arc.FSRomanRevivalist += Math.trunc((arc2.FSRomanRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSRomanRevivalist += Math.trunc((arc2.FSRomanRevivalist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSRomanRevivalist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Roman Revivalism"); } else if (arc.FSNeoImperialist !== "unset") { - arc.FSNeoImperialist -= Math.trunc((arc2.FSRomanRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSNeoImperialist -= Math.trunc((arc2.FSRomanRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Imperialism"); } else if (arc.FSAztecRevivalist !== "unset") { - arc.FSAztecRevivalist -= Math.trunc((arc2.FSRomanRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSAztecRevivalist -= Math.trunc((arc2.FSRomanRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSEgyptianRevivalist !== "unset") { - arc.FSEgyptianRevivalist -= Math.trunc((arc2.FSRomanRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSEgyptianRevivalist -= Math.trunc((arc2.FSRomanRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSEdoRevivalist !== "unset") { - arc.FSEdoRevivalist -= Math.trunc((arc2.FSRomanRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSEdoRevivalist -= Math.trunc((arc2.FSRomanRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSArabianRevivalist !== "unset") { - arc.FSArabianRevivalist -= Math.trunc((arc2.FSRomanRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSArabianRevivalist -= Math.trunc((arc2.FSRomanRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSChineseRevivalist !== "unset") { - arc.FSChineseRevivalist -= Math.trunc((arc2.FSRomanRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSChineseRevivalist -= Math.trunc((arc2.FSRomanRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } } else if (arc2.FSAztecRevivalist !== "unset" && arc2.FSAztecRevivalist > 60) { if (arc.FSAztecRevivalist !== "unset") { - arc.FSAztecRevivalist += Math.trunc((arc2.FSAztecRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSAztecRevivalist += Math.trunc((arc2.FSAztecRevivalist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSAztecRevivalist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Aztec Revivalism"); } else if (arc.FSNeoImperialist !== "unset") { - arc.FSNeoImperialist -= Math.trunc((arc2.FSAztecRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSNeoImperialist -= Math.trunc((arc2.FSAztecRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Imperialism"); } else if (arc.FSRomanRevivalist !== "unset") { - arc.FSRomanRevivalist -= Math.trunc((arc2.FSAztecRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSRomanRevivalist -= Math.trunc((arc2.FSAztecRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSEgyptianRevivalist !== "unset") { - arc.FSEgyptianRevivalist -= Math.trunc((arc2.FSAztecRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSEgyptianRevivalist -= Math.trunc((arc2.FSAztecRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSEdoRevivalist !== "unset") { - arc.FSEdoRevivalist -= Math.trunc((arc2.FSAztecRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSEdoRevivalist -= Math.trunc((arc2.FSAztecRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSArabianRevivalist !== "unset") { - arc.FSArabianRevivalist -= Math.trunc((arc2.FSAztecRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSArabianRevivalist -= Math.trunc((arc2.FSAztecRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSChineseRevivalist !== "unset") { - arc.FSChineseRevivalist -= Math.trunc((arc2.FSAztecRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSChineseRevivalist -= Math.trunc((arc2.FSAztecRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } } else if (arc2.FSEgyptianRevivalist !== "unset" && arc2.FSEgyptianRevivalist > 60) { if (arc.FSEgyptianRevivalist !== "unset") { - arc.FSEgyptianRevivalist += Math.trunc((arc2.FSEgyptianRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSEgyptianRevivalist += Math.trunc((arc2.FSEgyptianRevivalist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSEgyptianRevivalist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Egyptian Revivalism"); } else if (arc.FSRomanRevivalist !== "unset") { - arc.FSRomanRevivalist -= Math.trunc((arc2.FSEgyptianRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSRomanRevivalist -= Math.trunc((arc2.FSEgyptianRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSNeoImperialist !== "unset") { - arc.FSNeoImperialist -= Math.trunc((arc2.FSEgyptianRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSNeoImperialist -= Math.trunc((arc2.FSEgyptianRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Imperialism"); } else if (arc.FSAztecRevivalist !== "unset") { - arc.FSAztecRevivalist -= Math.trunc((arc2.FSEgyptianRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSAztecRevivalist -= Math.trunc((arc2.FSEgyptianRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSEdoRevivalist !== "unset") { - arc.FSEdoRevivalist -= Math.trunc((arc2.FSEgyptianRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSEdoRevivalist -= Math.trunc((arc2.FSEgyptianRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSArabianRevivalist !== "unset") { - arc.FSArabianRevivalist -= Math.trunc((arc2.FSEgyptianRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSArabianRevivalist -= Math.trunc((arc2.FSEgyptianRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSChineseRevivalist !== "unset") { - arc.FSChineseRevivalist -= Math.trunc((arc2.FSEgyptianRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSChineseRevivalist -= Math.trunc((arc2.FSEgyptianRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } } else if (arc2.FSEdoRevivalist !== "unset" && arc2.FSEdoRevivalist > 60) { if (arc.FSEdoRevivalist !== "unset") { - arc.FSEdoRevivalist += Math.trunc((arc2.FSEdoRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSEdoRevivalist += Math.trunc((arc2.FSEdoRevivalist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSEdoRevivalist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Edo Revivalism"); } else if (arc.FSEgyptianRevivalist !== "unset") { - arc.FSEgyptianRevivalist -= Math.trunc((arc2.FSEdoRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSEgyptianRevivalist -= Math.trunc((arc2.FSEdoRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSNeoImperialist !== "unset") { - arc.FSNeoImperialist -= Math.trunc((arc2.FSEdoRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSNeoImperialist -= Math.trunc((arc2.FSEdoRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Imperialism"); } else if (arc.FSRomanRevivalist !== "unset") { - arc.FSRomanRevivalist -= Math.trunc((arc2.FSEdoRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSRomanRevivalist -= Math.trunc((arc2.FSEdoRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSAztecRevivalist !== "unset") { - arc.FSAztecRevivalist -= Math.trunc((arc2.FSEdoRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSAztecRevivalist -= Math.trunc((arc2.FSEdoRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSArabianRevivalist !== "unset") { - arc.FSArabianRevivalist -= Math.trunc((arc2.FSEdoRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSArabianRevivalist -= Math.trunc((arc2.FSEdoRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSChineseRevivalist !== "unset") { - arc.FSChineseRevivalist -= Math.trunc((arc2.FSEdoRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSChineseRevivalist -= Math.trunc((arc2.FSEdoRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } } else if (arc2.FSArabianRevivalist !== "unset" && arc2.FSArabianRevivalist > 60) { if (arc.FSArabianRevivalist !== "unset") { - arc.FSArabianRevivalist += Math.trunc((arc2.FSArabianRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSArabianRevivalist += Math.trunc((arc2.FSArabianRevivalist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSArabianRevivalist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Arabian Revivalism"); } else if (arc.FSEgyptianRevivalist !== "unset") { - arc.FSEgyptianRevivalist -= Math.trunc((arc2.FSArabianRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSEgyptianRevivalist -= Math.trunc((arc2.FSArabianRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSNeoImperialist !== "unset") { - arc.FSNeoImperialist -= Math.trunc((arc2.FSArabianRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSNeoImperialist -= Math.trunc((arc2.FSArabianRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Imperialism"); } else if (arc.FSEdoRevivalist !== "unset") { - arc.FSEdoRevivalist -= Math.trunc((arc2.FSArabianRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSEdoRevivalist -= Math.trunc((arc2.FSArabianRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSRomanRevivalist !== "unset") { - arc.FSRomanRevivalist -= Math.trunc((arc2.FSArabianRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSRomanRevivalist -= Math.trunc((arc2.FSArabianRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSAztecRevivalist !== "unset") { - arc.FSAztecRevivalist -= Math.trunc((arc2.FSArabianRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSAztecRevivalist -= Math.trunc((arc2.FSArabianRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSChineseRevivalist !== "unset") { - arc.FSChineseRevivalist -= Math.trunc((arc2.FSArabianRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSChineseRevivalist -= Math.trunc((arc2.FSArabianRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } } else if (arc2.FSChineseRevivalist !== "unset" && arc2.FSChineseRevivalist > 60) { if (arc.FSChineseRevivalist !== "unset") { - arc.FSChineseRevivalist += Math.trunc((arc2.FSChineseRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSChineseRevivalist += Math.trunc((arc2.FSChineseRevivalist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSChineseRevivalist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Chinese Revivalism"); } else if (arc.FSEgyptianRevivalist !== "unset") { - arc.FSEgyptianRevivalist -= Math.trunc((arc2.FSChineseRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSEgyptianRevivalist -= Math.trunc((arc2.FSChineseRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSNeoImperialist !== "unset") { - arc.FSNeoImperialist -= Math.trunc((arc2.FSChineseRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSNeoImperialist -= Math.trunc((arc2.FSChineseRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Imperialism"); } else if (arc.FSEdoRevivalist !== "unset") { - arc.FSEdoRevivalist -= Math.trunc((arc2.FSChineseRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSEdoRevivalist -= Math.trunc((arc2.FSChineseRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSArabianRevivalist !== "unset") { - arc.FSArabianRevivalist -= Math.trunc((arc2.FSChineseRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSArabianRevivalist -= Math.trunc((arc2.FSChineseRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSRomanRevivalist !== "unset") { - arc.FSRomanRevivalist -= Math.trunc((arc2.FSChineseRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSRomanRevivalist -= Math.trunc((arc2.FSChineseRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSAztecRevivalist !== "unset") { - arc.FSAztecRevivalist -= Math.trunc((arc2.FSChineseRevivalist-60)/4)+_appliedInfluenceBonus; + arc.FSAztecRevivalist -= Math.trunc((arc2.FSChineseRevivalist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } } else if (arc2.FSNeoImperialist !== "unset" && arc2.FSNeoImperialist > 60) { if (arc.FSNeoImperialist !== "unset") { - arc.FSNeoImperialist += Math.trunc((arc2.FSNeoImperialist-60)/4)+_appliedInfluenceBonus; + arc.FSNeoImperialist += Math.trunc((arc2.FSNeoImperialist - 60) / 4) + _appliedInfluenceBonus; if (arc.FSNeoImperialist > V.FSLockinLevel) { _alignment += 1; } desc.push("helping to advance its Neo-Imperialism"); } else if (arc.FSEgyptianRevivalist !== "unset") { - arc.FSEgyptianRevivalist -= Math.trunc((arc2.FSNeoImperialist-60)/4)+_appliedInfluenceBonus; + arc.FSEgyptianRevivalist -= Math.trunc((arc2.FSNeoImperialist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSChineseRevivalist !== "unset") { - arc.FSChineseRevivalist -= Math.trunc((arc2.FSNeoImperialist-60)/4)+_appliedInfluenceBonus; + arc.FSChineseRevivalist -= Math.trunc((arc2.FSNeoImperialist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSEdoRevivalist !== "unset") { - arc.FSEdoRevivalist -= Math.trunc((arc2.FSNeoImperialist-60)/4)+_appliedInfluenceBonus; + arc.FSEdoRevivalist -= Math.trunc((arc2.FSNeoImperialist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSArabianRevivalist !== "unset") { - arc.FSArabianRevivalist -= Math.trunc((arc2.FSNeoImperialist-60)/4)+_appliedInfluenceBonus; + arc.FSArabianRevivalist -= Math.trunc((arc2.FSNeoImperialist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSRomanRevivalist !== "unset") { - arc.FSRomanRevivalist -= Math.trunc((arc2.FSNeoImperialist-60)/4)+_appliedInfluenceBonus; + arc.FSRomanRevivalist -= Math.trunc((arc2.FSNeoImperialist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } else if (arc.FSAztecRevivalist !== "unset") { - arc.FSAztecRevivalist -= Math.trunc((arc2.FSNeoImperialist-60)/4)+_appliedInfluenceBonus; + arc.FSAztecRevivalist -= Math.trunc((arc2.FSNeoImperialist - 60) / 4) + _appliedInfluenceBonus; desc.push("attacking its incompatible Revivalism"); } } @@ -1956,7 +1953,7 @@ App.EndWeek.neighborsDevelopment = function() { } else if (desc.length > 2) { r.push(`'' ${arc2.name}'''s mature culture influences arc.name, desc[0],`); for (let _k = 1; _k < desc.length; _k++) { - if (_k < desc.length-1) { + if (_k < desc.length - 1) { r.push(`${desc[_k]},`); } else { r.push(`and ${desc[_k]}.`); @@ -2019,56 +2016,52 @@ App.EndWeek.neighborsDevelopment = function() { } } } - - // <br> + App.Events.addParagraph(el, r); } /* PEACEKEEPERS */ - if (V.plot) { - if (V.peacekeepers !== 0) { - let _prisoners; - // <br> - if (V.peacekeepers.strength >= 50) { - _prisoners = Math.trunc(V.peacekeepers.attitude/10)+random(0, 10); - r.push(`General ${V.peacekeepers.generalName}'s little empire near the arcology`); - if (V.peacekeepers.attitude >= 100) { - r.push(`offers${_prisoners} menial slaves as tribute; having the area as an avowed client state <span class="green">improves your reputation.</span>`); - V.peacekeepers.attitude = 100; - repX(100, "peacekeepers"); - } else { - r.push(`delivers${_prisoners} menial slaves to you in payment for your past support.`); - } - V.menials += _prisoners; - } else if (V.peacekeepers.strength < 0) { - r.push(`<span class="yellow">The peacekeeping force led by General ${V.peacekeepers.generalName} in the troubled area near the Free City has been withdrawn.</span>`); - if (V.peacekeepers.undermining) { - r.push(`Your misinformation campaign against it in the old world media was successful. Before long, everyone in the Free City is confident that you're somehow responsible, <span class="green">greatly improving your reputation.</span>`); - V.peacekeepers = 0; - V.peacekeepersGone = 1; - repX(2000, "peacekeepers"); - } else { - r.push(`The cost was ultimately too high. The time when old world countries could afford to waste billions on military adventurism is gone. It will not return.`); - V.peacekeepers = 0; - V.peacekeepersGone = 1; - } + if (V.plot && V.peacekeepers !== 0) { + let _prisoners; + let r = []; + if (V.peacekeepers.strength >= 50) { + _prisoners = Math.trunc(V.peacekeepers.attitude / 10) + random(0, 10); + r.push(`General ${V.peacekeepers.generalName}'s little empire near the arcology`); + if (V.peacekeepers.attitude >= 100) { + r.push(`offers${_prisoners} menial slaves as tribute; having the area as an avowed client state <span class="green">improves your reputation.</span>`); + V.peacekeepers.attitude = 100; + repX(100, "peacekeepers"); } else { - r.push(`There's a peacekeeping force led by General ${V.peacekeepers.generalName} in the troubled area near the Free City.`); - if (V.peacekeepers.undermining) { - r.push(`You're paying for a media misinformation campaign in the old world country that sent him. It`); - V.peacekeepers.strength -= V.peacekeepers.undermining/10000; - if (V.peacekeepers.strength < 10) { - r.push(`has had a significant impact; one of the nation's two major political parties now favors withdrawing the peacekeepers.`); - } else { - r.push(`has not had a significant impact yet; only a few fringe figures are arguing against the mission.`); - } + r.push(`delivers${_prisoners} menial slaves to you in payment for your past support.`); + } + V.menials += _prisoners; + } else if (V.peacekeepers.strength < 0) { + r.push(`<span class="yellow">The peacekeeping force led by General ${V.peacekeepers.generalName} in the troubled area near the Free City has been withdrawn.</span>`); + if (V.peacekeepers.undermining) { + r.push(`Your misinformation campaign against it in the old world media was successful. Before long, everyone in the Free City is confident that you're somehow responsible, <span class="green">greatly improving your reputation.</span>`); + V.peacekeepers = 0; + V.peacekeepersGone = 1; + repX(2000, "peacekeepers"); + } else { + r.push(`The cost was ultimately too high. The time when old world countries could afford to waste billions on military adventurism is gone. It will not return.`); + V.peacekeepers = 0; + V.peacekeepersGone = 1; + } + } else { + r.push(`There's a peacekeeping force led by General ${V.peacekeepers.generalName} in the troubled area near the Free City.`); + if (V.peacekeepers.undermining) { + r.push(`You're paying for a media misinformation campaign in the old world country that sent him. It`); + V.peacekeepers.strength -= V.peacekeepers.undermining / 10000; + if (V.peacekeepers.strength < 10) { + r.push(`has had a significant impact; one of the nation's two major political parties now favors withdrawing the peacekeepers.`); + } else { + r.push(`has not had a significant impact yet; only a few fringe figures are arguing against the mission.`); } - r.push(`Unfortunately, the presence of so much old world military power near the Free City causes <span class="red">public concern.</span>`); - repX(-100, "peacekeepers"); } - // <br> + r.push(`Unfortunately, the presence of so much old world military power near the Free City causes <span class="red">public concern.</span>`); + repX(-100, "peacekeepers"); } + App.Events.addParagraph(el, r); } - App.Events.addNode(el, r); return el; }; -- GitLab