From 3dec06b54f916fa7973be5e2d773a5160c936275 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 7 Dec 2020 11:23:24 -0500
Subject: [PATCH] fix missing independence days
---
src/endWeek/economics/fsDevelopments.js | 142 ++++++------------------
1 file changed, 36 insertions(+), 106 deletions(-)
diff --git a/src/endWeek/economics/fsDevelopments.js b/src/endWeek/economics/fsDevelopments.js
index d75cb5671bd..60df04b69e9 100644
--- a/src/endWeek/economics/fsDevelopments.js
+++ b/src/endWeek/economics/fsDevelopments.js
@@ -538,7 +538,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSSupremacist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSSupremacist"));
+ r.push(arcSupport("FSSupremacist"));
if (V.arcologies[0].FSSupremacist >= V.FSLockinLevel * 0.6) {
V.independenceDay = 1;
}
@@ -562,10 +562,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSSubjugationist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSSubjugationist"));
- if (V.arcologies[0].FSSubjugationist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSSubjugationist"));
if (V.arcologies[0].FSSubjugationist < 0) {
FutureSocieties.remove("FSSubjugationist");
if (V.assistant.fsAppearance === "subjugationist") {
@@ -586,10 +583,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSRepopulationFocus !== "unset") {
- r.push(FutureSocieties.arcSupport("FSRepopulationFocus"));
- if (V.arcologies[0].FSRepopulationFocus >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSRepopulationFocus"));
if (V.arcologies[0].FSRepopulationFocus < 0) {
FutureSocieties.remove("FSRepopulationFocus");
if (V.assistant.fsAppearance === "repopulation focus") {
@@ -610,10 +604,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSRestart !== "unset") {
- r.push(FutureSocieties.arcSupport("FSRestart"));
- if (V.arcologies[0].FSRestart >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSRestart"));
if (V.arcologies[0].FSRestart < 0 && V.arcologies[0].FSRestartDecoration !== 100) {
FutureSocieties.remove("FSRestart");
if (V.assistant.fsAppearance === "eugenics") {
@@ -634,10 +625,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSGenderRadicalist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSGenderRadicalist"));
- if (V.arcologies[0].FSGenderRadicalist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSGenderRadicalist"));
if (V.arcologies[0].FSGenderRadicalist < 0) {
FutureSocieties.remove("FSGenderRadicalist");
if (V.assistant.fsAppearance === "gender radicalist") {
@@ -662,10 +650,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSGenderFundamentalist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSGenderFundamentalist"));
- if (V.arcologies[0].FSGenderFundamentalist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSGenderFundamentalist"));
if (V.arcologies[0].FSGenderFundamentalist < 0) {
FutureSocieties.remove("FSGenderFundamentalist");
if (V.assistant.fsAppearance === "gender fundamentalist") {
@@ -686,10 +671,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSPaternalist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSPaternalist"));
- if (V.arcologies[0].FSPaternalist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSPaternalist"));
if (V.arcologies[0].FSPaternalist < 0) {
FutureSocieties.remove("FSPaternalist");
if (V.assistant.fsAppearance === "paternalist") {
@@ -710,10 +692,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSDegradationist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSDegradationist"));
- if (V.arcologies[0].FSDegradationist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSDegradationist"));
if (V.arcologies[0].FSDegradationist < 0) {
FutureSocieties.remove("FSDegradationist");
if (V.assistant.fsAppearance === "degradationist") {
@@ -734,10 +713,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSIntellectualDependency !== "unset") {
- r.push(FutureSocieties.arcSupport("FSIntellectualDependency"));
- if (V.arcologies[0].FSIntellectualDependency >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSIntellectualDependency"));
if (V.arcologies[0].FSIntellectualDependency < 0) {
FutureSocieties.remove("FSIntellectualDependency");
if (V.assistant.fsAppearance === "intellectual dependency") {
@@ -758,10 +734,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSSlaveProfessionalism !== "unset") {
- r.push(FutureSocieties.arcSupport("FSSlaveProfessionalism"));
- if (V.arcologies[0].FSSlaveProfessionalism >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSSlaveProfessionalism"));
if (V.arcologies[0].FSSlaveProfessionalism < 0) {
FutureSocieties.remove("FSSlaveProfessionalism");
if (V.assistant.fsAppearance === "slave professionalism") {
@@ -782,10 +755,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSBodyPurist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSBodyPurist"));
- if (V.arcologies[0].FSBodyPurist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSBodyPurist"));
if (V.arcologies[0].FSBodyPurist < 0) {
FutureSocieties.remove("FSBodyPurist");
if (V.assistant.fsAppearance === "body purist") {
@@ -806,8 +776,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSTransformationFetishist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSTransformationFetishist"));
- // TODO: no independence day?
+ r.push(arcSupport("FSTransformationFetishist"));
if (V.arcologies[0].FSTransformationFetishist < 0) {
FutureSocieties.remove("FSTransformationFetishist");
if (V.assistant.fsAppearance === "transformation fetishist") {
@@ -828,8 +797,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSMaturityPreferentialist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSMaturityPreferentialist"));
- // TODO: no independence day?
+ r.push(arcSupport("FSMaturityPreferentialist"));
if (V.arcologies[0].FSMaturityPreferentialist < 0) {
FutureSocieties.remove("FSMaturityPreferentialist");
if (V.assistant.fsAppearance === "maturity preferentialist") {
@@ -850,8 +818,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSYouthPreferentialist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSYouthPreferentialist"));
- // TODO: no independence day?
+ r.push(arcSupport("FSYouthPreferentialist"));
if (V.arcologies[0].FSYouthPreferentialist < 0) {
FutureSocieties.remove("FSYouthPreferentialist");
if (V.assistant.fsAppearance === "youth preferentialist") {
@@ -872,10 +839,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSPetiteAdmiration !== "unset") {
- r.push(FutureSocieties.arcSupport("FSPetiteAdmiration"));
- if (V.arcologies[0].FSPetiteAdmiration >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSPetiteAdmiration"));
if (V.arcologies[0].FSPetiteAdmiration < 0) {
FutureSocieties.remove("FSPetiteAdmiration");
if (V.assistant.fsAppearance === "petite admiration") {
@@ -896,10 +860,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSStatuesqueGlorification !== "unset") {
- r.push(FutureSocieties.arcSupport("FSStatuesqueGlorification"));
- if (V.arcologies[0].FSStatuesqueGlorification >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSStatuesqueGlorification"));
if (V.arcologies[0].FSStatuesqueGlorification < 0) {
FutureSocieties.remove("FSStatuesqueGlorification");
if (V.assistant.fsAppearance === "statuesque glorification") {
@@ -920,8 +881,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSSlimnessEnthusiast !== "unset") {
- r.push(FutureSocieties.arcSupport("FSSlimnessEnthusiast"));
- // TODO: no independence day?
+ r.push(arcSupport("FSSlimnessEnthusiast"));
if (V.arcologies[0].FSSlimnessEnthusiast < 0) {
FutureSocieties.remove("FSSlimnessEnthusiast");
if (V.assistant.fsAppearance === "slimness enthusiast") {
@@ -942,10 +902,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSAssetExpansionist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSAssetExpansionist"));
- if (V.arcologies[0].FSAssetExpansionist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSAssetExpansionist"));
if (V.arcologies[0].FSAssetExpansionist < 0) {
FutureSocieties.remove("FSAssetExpansionist");
if (V.assistant.fsAppearance === "asset expansionist") {
@@ -966,10 +923,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSPastoralist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSPastoralist"));
- if (V.arcologies[0].FSPastoralist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSPastoralist"));
if (V.arcologies[0].FSPastoralist < 0) {
FutureSocieties.remove("FSPastoralist");
if (V.assistant.fsAppearance === "pastoralist") {
@@ -990,10 +944,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSPhysicalIdealist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSPhysicalIdealist"));
- if (V.arcologies[0].FSPhysicalIdealist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSPhysicalIdealist"));
if (V.arcologies[0].FSPhysicalIdealist < 0) {
FutureSocieties.remove("FSPhysicalIdealist");
if (V.assistant.fsAppearance === "physical idealist") {
@@ -1014,10 +965,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSHedonisticDecadence !== "unset") {
- r.push(FutureSocieties.arcSupport("FSHedonisticDecadence"));
- if (V.arcologies[0].FSHedonisticDecadence >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSHedonisticDecadence"));
if (V.arcologies[0].FSHedonisticDecadence < 0) {
FutureSocieties.remove("FSHedonisticDecadence");
if (V.assistant.fsAppearance === "hedonistic decadence") {
@@ -1038,12 +986,9 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSChattelReligionist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSChattelReligionist"));
+ r.push(arcSupport("FSChattelReligionist"));
if (V.arcologies[0].FSChattelReligionist >= V.FSLockinLevel) {
- V.independenceDay = 1;
V.nicaea.announceable = 1;
- } else if (V.arcologies[0].FSChattelReligionist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
}
if (V.arcologies[0].FSChattelReligionist < 0) {
FutureSocieties.remove("FSChattelReligionist");
@@ -1065,10 +1010,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSRomanRevivalist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSRomanRevivalist"));
- if (V.arcologies[0].FSRomanRevivalist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSRomanRevivalist"));
if (V.arcologies[0].FSRomanRevivalist < 0) {
FutureSocieties.remove("FSRomanRevivalist");
if (V.assistant.fsAppearance === "roman revivalist") {
@@ -1089,10 +1031,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSNeoImperialist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSNeoImperialist"));
- if (V.arcologies[0].FSNeoImperialist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSNeoImperialist"));
if (V.arcologies[0].FSNeoImperialist < 0) {
FutureSocieties.remove("FSNeoImperialist");
if (V.assistant.fsAppearance === "neoimperialist") {
@@ -1113,10 +1052,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSAztecRevivalist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSAztecRevivalist"));
- if (V.arcologies[0].FSAztecRevivalist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSAztecRevivalist"));
if (V.arcologies[0].FSAztecRevivalist < 0) {
FutureSocieties.remove("FSAztecRevivalist");
if (V.assistant.fsAppearance === "aztec revivalist") {
@@ -1137,10 +1073,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSEgyptianRevivalist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSEgyptianRevivalist"));
- if (V.arcologies[0].FSEgyptianRevivalist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSEgyptianRevivalist"));
if (V.arcologies[0].FSEgyptianRevivalist < 0) {
FutureSocieties.remove("FSEgyptianRevivalist");
if (V.assistant.fsAppearance === "egyptian revivalist") {
@@ -1161,11 +1094,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSEdoRevivalist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSEdoRevivalist"));
- if (V.arcologies[0].FSEdoRevivalist >= V.FSLockinLevel * 0.6) {
- r.push(`${V.arcologies[0].name} agrees strongly with your project to build a new Edo Japan.`);
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSEdoRevivalist"));
if (V.arcologies[0].FSEdoRevivalist < 0) {
FutureSocieties.remove("FSEdoRevivalist");
if (V.assistant.fsAppearance === "edo revivalist") {
@@ -1186,10 +1115,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSArabianRevivalist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSArabianRevivalist"));
- if (V.arcologies[0].FSArabianRevivalist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSArabianRevivalist"));
if (V.arcologies[0].FSArabianRevivalist < 0) {
FutureSocieties.remove("FSArabianRevivalist");
if (V.assistant.fsAppearance === "arabian revivalist") {
@@ -1210,10 +1136,7 @@ App.EndWeek.FSDevelopments = function() {
}
if (V.arcologies[0].FSChineseRevivalist !== "unset") {
- r.push(FutureSocieties.arcSupport("FSChineseRevivalist"));
- if (V.arcologies[0].FSChineseRevivalist >= V.FSLockinLevel * 0.6) {
- V.independenceDay = 1;
- }
+ r.push(arcSupport("FSChineseRevivalist"));
if (V.arcologies[0].FSChineseRevivalist < 0) {
FutureSocieties.remove("FSChineseRevivalist");
if (V.assistant.fsAppearance === "chinese revivalist") {
@@ -1236,4 +1159,11 @@ App.EndWeek.FSDevelopments = function() {
App.UI.SlaveSummary.societyChanged();
App.Events.addNode(el, r, "div");
return el;
+
+ function arcSupport(FS) {
+ if (V.arcologies[0][FS] >= V.FSLockinLevel * 0.6) {
+ V.independenceDay = 1;
+ }
+ return FutureSocieties.arcSupport(FS);
+ }
};
--
GitLab