diff --git a/src/Mods/SecExp/SecExpBackwardCompatibility.tw b/src/Mods/SecExp/SecExpBackwardCompatibility.tw index eefe11c4748acb9f7c0356d2957f26820970a08d..514aa0743ee19232a18ede4a056665f23252fead 100644 --- a/src/Mods/SecExp/SecExpBackwardCompatibility.tw +++ b/src/Mods/SecExp/SecExpBackwardCompatibility.tw @@ -3,7 +3,7 @@ <<set $nextButton = "Continue", $nextLink = "Main", $returnTo = "Main">> /* base stats */ -<<run App.SecExp.Check.general()>> +<<run App.SecExp.generalBC()>> <<set $lastRebellionWeeks = Number($lastRebellionWeeks) || 0>> <<if ndef $currentUpgrade.ID>> diff --git a/src/Mods/SecExp/js/secExp.js b/src/Mods/SecExp/js/secExp.js index 79e93c44b045c2f4ded930e52a0fb65419585a6a..669cf649f6647360c281b046c3b37f988a137bce 100644 --- a/src/Mods/SecExp/js/secExp.js +++ b/src/Mods/SecExp/js/secExp.js @@ -418,16 +418,11 @@ App.SecExp.battle = (function() { App.SecExp.Check = (function() { "use strict"; return { - general:general, secRestPoint:secRestPoint, crimeCap:crimeCap, reqMenials:reqMenials, }; - function general() { - App.SecExp.generalBC(); - } // Closes general check function. - function secRestPoint() { let rest = 40; diff --git a/src/Mods/SpecialForce/SpecialForceBC.js b/src/Mods/SpecialForce/SpecialForceBC.js index 7bef1436ccb99ae1e3c55de14754b3da0c2cda3c..c29c4757b4bcc5366684e4d7eeef253e250b2d71 100644 --- a/src/Mods/SpecialForce/SpecialForceBC.js +++ b/src/Mods/SpecialForce/SpecialForceBC.js @@ -195,17 +195,17 @@ App.SF.BC = function() { V.SF.FS = V.SF.FS || {}; V.SF.FS.Tension = V.SF.FS.Tension || -1; - const Revivalisms = ['Roman_Revivalism', 'Aztec_Revivalism', 'Egyptian_Revivalism', 'Edo_Revivalism', 'Arabian_Revivalism', 'Chinese_Revivalism', 'Multiculturalism']; - let FS_OPTIONS = ['Repopulation', 'Eugenics', 'Gender_radicalism', 'Gender_traditionalism', 'Paternalism', 'Degradationism', 'Body_Purism', 'Transformation_Fetishism', 'Youth_Preferentialism', 'Maturity_Preferentialism', 'Slimness_Enthusiasm', 'Asset_Expansionism', 'Slave_Pastoralism', 'Physical_Idealism', 'Hedonistic_Decadence', 'Chattel_Religionism']; - FS_OPTIONS = FS_OPTIONS.concat(Revivalisms); - for (let i = 0; i < FS_OPTIONS.length; i++) { - if (V.SF.FS[FS_OPTIONS[i]].vaildOption) { - V.SF.FS[FS_OPTIONS[i]].validOption = V.SF.FS[FS_OPTIONS[i]].vaildOption; - delete V.SF.FS[FS_OPTIONS[i]].vaildOption; - } - } - if (V.SF.Toggle && V.SF.Active >= 1) { + const Revivalisms = ['Roman_Revivalism', 'Aztec_Revivalism', 'Egyptian_Revivalism', 'Edo_Revivalism', 'Arabian_Revivalism', 'Chinese_Revivalism', 'Multiculturalism']; + let FS_OPTIONS = ['Repopulation', 'Eugenics', 'Gender_radicalism', 'Gender_traditionalism', 'Paternalism', 'Degradationism', 'Body_Purism', 'Transformation_Fetishism', 'Youth_Preferentialism', 'Maturity_Preferentialism', 'Slimness_Enthusiasm', 'Asset_Expansionism', 'Slave_Pastoralism', 'Physical_Idealism', 'Hedonistic_Decadence', 'Chattel_Religionism']; + FS_OPTIONS = FS_OPTIONS.concat(Revivalisms); + for (let i = 0; i < FS_OPTIONS.length; i++) { + if (V.SF.FS[FS_OPTIONS[i]].vaildOption) { + V.SF.FS[FS_OPTIONS[i]].validOption = V.SF.FS[FS_OPTIONS[i]].vaildOption; + delete V.SF.FS[FS_OPTIONS[i]].vaildOption; + } + } + V.SF.UC = V.SF.UC || {}; V.SF.Depravity = V.SF.Depravity || 0; V.SF.Upgrade = V.SF.Upgrade || 0; diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js index 7664422fff387655a95ad0b3505faef1adcea877..31c60b45cfcf12450a4c62a1637ac7cf4877e2eb 100644 --- a/src/data/backwardsCompatibility/backwardsCompatibility.js +++ b/src/data/backwardsCompatibility/backwardsCompatibility.js @@ -92,7 +92,7 @@ App.Update.backwardsCompatibility = function() { div = document.createElement('div'); div.append(`Updating Security Expansion... `); jQuery('#backwardsCompatibility').append(div); - App.SecExp.Check.general(); + App.SecExp.generalBC(); if (V.secExpEnabled > 0) { div.append(App.UI.DOM.renderPassage("SecExpBackwardCompatibility")); } diff --git a/src/events/intro/initNationalities.js b/src/events/intro/initNationalities.js index 62e5b3294ffd31972323236daa1108e6cb9be664..b6a93a5c228d88da1f984d310430313884930610 100644 --- a/src/events/intro/initNationalities.js +++ b/src/events/intro/initNationalities.js @@ -2,7 +2,7 @@ App.Intro.initNationalities = function() { function initSecExp() { /* base vars */ V.SecExp = SecExpBase(); - App.SecExp.Check.general(); + App.SecExp.generalBC(); V.secUpgrades = { nanoCams: 0, cyberBots: 0, diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw index 5583b4ce1a0c87783eae893da8445c3f895db269..2a62ac0b99de5e8de26250ea3729654ac68be83f 100644 --- a/src/uncategorized/manageArcology.tw +++ b/src/uncategorized/manageArcology.tw @@ -181,7 +181,7 @@ <p> <div> <<if $SecExp.buildings.propHub.active == 0>> - [[Set up the propaganda Hub|Manage Arcology][cashX(forceNeg(Math.trunc((5000*$upgradeMultiplierArcology*$HackingSkillMultiplier))), "capEx"), $SecExp.buildings.propHub.active = 1, $PC.skill.engineering += 1, $PC.skill.hacking += 1, App.SecExp.Check.general()]] + [[Set up the propaganda Hub|Manage Arcology][cashX(forceNeg(Math.trunc((5000*$upgradeMultiplierArcology*$HackingSkillMultiplier))), "capEx"), $SecExp.buildings.propHub.active = 1, $PC.skill.engineering += 1, $PC.skill.hacking += 1, App.SecExp.generalBC()]] <span class="detail"> Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*$HackingSkillMultiplier)))>>. <div class="indent">Building specialized in the management of authority.</div> @@ -205,7 +205,7 @@ <div> <<if $SecExp.buildings.barracks.active == 0>> - [[Set up the barracks|Manage Arcology][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $SecExp.buildings.barracks.active = 1, $PC.skill.engineering += 1, App.SecExp.Check.general()]] + [[Set up the barracks|Manage Arcology][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $SecExp.buildings.barracks.active = 1, $PC.skill.engineering += 1, App.SecExp.generalBC()]] <span class="detail"> Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>> <div class="indent">Building specialized in the management of armed forces.</div>