From 91451c86477ee6bf2aba45e3028d4ada8e510651 Mon Sep 17 00:00:00 2001 From: Blank <okp57855@psoxs.com> Date: Thu, 7 Dec 2017 02:01:35 -0500 Subject: [PATCH] Revert "FS cheat number now can't excede 100." This reverts commit be6d90eeed98e5f3b8d6189f16dfe3a36d0ac84a --- src/cheats/mod_EditFSCheat.tw | 101 +------------------ src/cheats/mod_EditFSCheatDatatypeCleanup.tw | 42 ++++---- src/uncategorized/scheduledEvent.tw | 2 +- 3 files changed, 24 insertions(+), 121 deletions(-) diff --git a/src/cheats/mod_EditFSCheat.tw b/src/cheats/mod_EditFSCheat.tw index a5897bf17ac..4d5bc239439 100644 --- a/src/cheats/mod_EditFSCheat.tw +++ b/src/cheats/mod_EditFSCheat.tw @@ -11,11 +11,6 @@ <<else>> <br>You are ''not pursuing'' Racial Supremacy. <</if>> - - <<if $arcologies[0].FSSupremacist > 100>> - <<set $arcologies[0].FSSupremacist = 100>> - <</if>> - <br>Supremacy (0-100 or unset): <<textbox "$arcologies[0].FSSupremacist" $arcologies[0].FSSupremacist>> <br>Decoration: $arcologies[0].FSSupremacistDecoration @@ -52,10 +47,6 @@ <br>''You are not pursuing'' Racial Subjugationism. <</if>> - <<if $arcologies[0].FSSubjugationist > 100>> - <<set $arcologies[0].FSSubjugationist = 100>> - <</if>> - <br>Subjugationism (0-100 or unset): <<textbox "$arcologies[0].FSSubjugationist" $arcologies[0].FSSubjugationist>> <br>Decoration: $arcologies[0].FSSubjugationistDecoration @@ -92,10 +83,6 @@ <br>''You are not pursuing'' Gender Radicalism. <</if>> - <<if $arcologies[0].FSGenderRadicalist > 100>> - <<set $arcologies[0].FSGenderRadicalist = 100>> - <</if>> - <br>GenderRadicalism (0-100 or unset): <<textbox "$arcologies[0].FSGenderRadicalist" $arcologies[0].FSGenderRadicalist>> <br>Decoration: $arcologies[0].FSGenderRadicalistDecoration @@ -108,7 +95,7 @@ <br>Law: $arcologies[0].FSGenderRadicalistLawBeauty | <<radiobutton "$arcologies[0].FSGenderRadicalistLawBeauty" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSGenderRadicalistLawBeauty" 1>> 1 (Passed.) - + <br>Law: $arcologies[0].FSGenderRadicalistLawFuta | <<radiobutton "$arcologies[0].FSGenderRadicalistLawFuta" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSGenderRadicalistLawFuta" 1>> 1 (Futa pref.) @@ -126,10 +113,6 @@ <br>''You are not pursuing'' Gender Traditionalism. <</if>> - <<if $arcologies[0].FSGenderFundamentalist > 100>> - <<set $arcologies[0].FSGenderFundamentalist = 100>> - <</if>> - <br>Gender Traditionalism (0-100 or unset): <<textbox "$arcologies[0].FSGenderFundamentalist" $arcologies[0].FSGenderFundamentalist>> <br>Decoration: $arcologies[0].FSGenderFundamentalistDecoration @@ -153,10 +136,6 @@ <br>''You are not pursuing'' Repopulation Efforts. <</if>> - <<if $arcologies[0].FSRepopulationFocus > 100>> - <<set $arcologies[0].FSRepopulationFocus = 100>> - <</if>> - <br>Repopulation Efforts (0-100 or unset): <<textbox "$arcologies[0].FSRepopulationFocus" $arcologies[0].FSRepopulationFocus>> <br>Decoration: $arcologies[0].FSRepopulationFocusDecoration @@ -184,10 +163,6 @@ <br>''You are not pursuing'' Eugenics. <</if>> - <<if $arcologies[0].FSRestart > 100>> - <<set $arcologies[0].FSRestart = 100>> - <</if>> - <br>Eugenics (0-100 or unset): <<textbox "$arcologies[0].FSRestart" $arcologies[0].FSRestart>> <br>Decoration: $arcologies[0].FSRestartDecoration @@ -211,10 +186,6 @@ <br>''You are not pursuing'' Paternalism. <</if>> - <<if $arcologies[0].FSPaternalist > 100>> - <<set $arcologies[0].FSPaternalist = 100>> - <</if>> - <br>Paternalism (0-100 or unset): <<textbox "$arcologies[0].FSPaternalist" $arcologies[0].FSPaternalist>> <br>Decoration: $arcologies[0].FSPaternalistDecoration @@ -238,10 +209,6 @@ <br>''You are not pursuing'' Degradationism. <</if>> - <<if $arcologies[0].FSDegradationist > 100>> - <<set $arcologies[0].FSDegradationist = 100>> - <</if>> - <br>Degradationism (0-100 or unset): <<textbox "$arcologies[0].FSDegradationist" $arcologies[0].FSDegradationist>> <br>Decoration: $arcologies[0].FSDegradationistDecoration @@ -265,10 +232,6 @@ <br>You are ''not pursuing'' Body Purism. <</if>> - <<if $arcologies[0].FSBodyPurist > 100>> - <<set $arcologies[0].FSBodyPurist = 100>> - <</if>> - <br>Body Purism (0-100 or unset): <<textbox "$arcologies[0].FSBodyPurist" $arcologies[0].FSBodyPurist>> <br>Decoration: $arcologies[0].FSBodyPuristDecoration @@ -292,10 +255,6 @@ <br>You are ''not pursuing'' Body Transformationism. <</if>> - <<if $arcologies[0].FSTransformationFetishist > 100>> - <<set $arcologies[0].FSTransformationFetishist = 100>> - <</if>> - <br>Body Transformationism (0-100 or unset): <<textbox "$arcologies[0].FSTransformationFetishist" $arcologies[0].FSTransformationFetishist>> <br>Decoration: $arcologies[0].FSTransformationFetishistDecoration @@ -319,10 +278,6 @@ <br>You are ''not pursuing'' Youth Preferentialism. <</if>> - <<if $arcologies[0].FSYouthPreferentialist > 100>> - <<set $arcologies[0].FSYouthPreferentialist = 100>> - <</if>> - <br>(Setting resets Maturity Preferentialism) <br>Youth Preferentialism (0-100 or unset): <<textbox "$arcologies[0].FSYouthPreferentialist" $arcologies[0].FSYouthPreferentialist>> <br>Decoration: $arcologies[0].FSYouthPreferentialistDecoration @@ -347,10 +302,6 @@ <br>You are ''not pursuing'' Maturity Preferentialism. <</if>> - <<if $arcologies[0].FSMaturityPreferentialist > 100>> - <<set $arcologies[0].FSMaturityPreferentialist = 100>> - <</if>> - <br>(Setting resets Youth Preferentialism) <br>Maturity Preferentialism (0-100 or unset): <<textbox "$arcologies[0].FSMaturityPreferentialist" $arcologies[0].FSMaturityPreferentialist>> <br>Decoration: $arcologies[0].FSMaturityPreferentialistDecoration @@ -375,10 +326,6 @@ <br>You are ''not pursuing'' Slimness Enthusiasm. <</if>> - <<if $arcologies[0].FSSlimnessEnthusiast > 100>> - <<set $arcologies[0].FSSlimnessEnthusiast = 100>> - <</if>> - <br>Slimness Enthusiasm (0-100 or unset): <<textbox "$arcologies[0].FSSlimnessEnthusiast" $arcologies[0].FSSlimnessEnthusiast>> <br>Decoration: $arcologies[0].FSSlimnessEnthusiastDecoration @@ -402,10 +349,6 @@ <br>You are ''not pursuing'' Asset Expansionism. <</if>> - <<if $arcologies[0].FSAssetExpansionist > 100>> - <<set $arcologies[0].FSAssetExpansionist = 100>> - <</if>> - <br>(Setting resets Slimness Enthusiasm) <br>Asset Expansionism (0-100 or unset): <<textbox "$arcologies[0].FSAssetExpansionist" $arcologies[0].FSAssetExpansionist>> <br>Decoration: $arcologies[0].FSAssetExpansionistDecoration @@ -430,10 +373,6 @@ <br>You are ''not pursuing'' Pastoralism. <</if>> - <<if $arcologies[0].FSPastoralist > 100>> - <<set $arcologies[0].FSPastoralist = 100>> - <</if>> - <br>Pastoralism (0-100 or unset): <<textbox "$arcologies[0].FSPastoralist" $arcologies[0].FSPastoralist>> <br>Decoration: $arcologies[0].FSPastoralistDecoration @@ -457,10 +396,6 @@ <br>You are ''not pursuing'' Physical Idealism. <</if>> - <<if $arcologies[0].FSPhysicalIdealist > 100>> - <<set $arcologies[0].FSPhysicalIdealist = 100>> - <</if>> - <br>Physical Idealism (0-100 or unset): <<textbox "$arcologies[0].FSPhysicalIdealist" $arcologies[0].FSPhysicalIdealist>> <br>Decoration: $arcologies[0].FSPhysicalIdealistDecoration @@ -484,10 +419,6 @@ <br>''You are not pursuing'' Hedonistic Decadence. <</if>> - <<if $arcologies[0].FSHedonisticDecadence > 100>> - <<set $arcologies[0].FSHedonisticDecadence = 100>> - <</if>> - <br>HedonisticDecadence (0-100 or unset): <<textbox "$arcologies[0].FSHedonisticDecadence" $arcologies[0].FSHedonisticDecadence>> <br>Decoration: $arcologies[0].FSHedonisticDecadenceDecoration @@ -504,7 +435,7 @@ <br>Law: $arcologies[0].FSHedonisticDecadenceLaw | <<radiobutton "$arcologies[0].FSHedonisticDecadenceLaw" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSHedonisticDecadenceLaw" 1>> 1 (Passed.) - + <br>Law: $arcologies[0].FSHedonisticDecadenceLaw2 | <<radiobutton "$arcologies[0].FSHedonisticDecadenceLaw2" 0>> 0 (Not passed.) | <<radiobutton "$arcologies[0].FSHedonisticDecadenceLaw2" 1>> 1 (Passed.) @@ -520,10 +451,6 @@ <br>You are ''not pursuing'' Chattel Religionism. <</if>> - <<if $arcologies[0].FSChattelReligionist > 100>> - <<set $arcologies[0].FSChattelReligionist = 100>> - <</if>> - <br>Chattel Religionism (0-100 or unset): <<textbox "$arcologies[0].FSChattelReligionist" $arcologies[0].FSChattelReligionist>> <br>Decoration: $arcologies[0].FSChattelReligionistDecoration @@ -548,10 +475,6 @@ <br>You are ''not pursuing'' Roman Revivalism. <</if>> - <<if $arcologies[0].FSRomanRevivalist > 100>> - <<set $arcologies[0].FSRomanRevivalist = 100>> - <</if>> - <br>Roman Revivalism (0-100 or unset): <<textbox "$arcologies[0].FSRomanRevivalist" $arcologies[0].FSRomanRevivalist>> <br>Decoration: $arcologies[0].FSRomanRevivalistDecoration @@ -576,10 +499,6 @@ + <br>You are ''not pursuing'' Aztec Revivalism. + <</if>> + - + <<if $arcologies[0].FSAztecRevivalist > 100>> - + <<set $arcologies[0].FSAztecRevivalist = 100>> - + <</if>> - + + <br>Aztec Revivalism (0-100 or unset): <<textbox "$arcologies[0].FSAztecRevivalist" $arcologies[0].FSAztecRevivalist>> + <br>Decoration: $arcologies[0].FSAztecRevivalistDecoration + @@ -603,10 +522,6 @@ <br>You are ''not pursuing'' Egyptian Revivalism. <</if>> - <<if $arcologies[0].FSEgyptianRevivalist > 100>> - <<set $arcologies[0].FSEgyptianRevivalist = 100>> - <</if>> - <br>Egyptian Revivalism (0-100 or unset): <<textbox "$arcologies[0].FSEgyptianRevivalist" $arcologies[0].FSEgyptianRevivalist>> <br>Decoration: $arcologies[0].FSEgyptianRevivalistDecoration @@ -630,10 +545,6 @@ <br>You are ''not pursuing'' Edo Revivalism. <</if>> - <<if $arcologies[0].FSEdoRevivalist > 100>> - <<set $arcologies[0].FSEdoRevivalist = 100>> - <</if>> - <br>Edo Revivalism (0-100 or unset): <<textbox "$arcologies[0].FSEdoRevivalist" $arcologies[0].FSEdoRevivalist>> <br>Decoration: $arcologies[0].FSEdoRevivalistDecoration @@ -657,10 +568,6 @@ <br>You are ''not pursuing'' Arabian Revivalism. <</if>> - <<if $arcologies[0].FSArabianRevivalist > 100>> - <<set $arcologies[0].FSArabianRevivalist = 100>> - <</if>> - <br>Arabian Revivalism (0-100 or unset): <<textbox "$arcologies[0].FSArabianRevivalist" $arcologies[0].FSArabianRevivalist>> <br>Decoration: $arcologies[0].FSArabianRevivalistDecoration @@ -684,10 +591,6 @@ <br>You are ''not pursuing'' Chinese Revivalism. <</if>> - <<if $arcologies[0].FSChineseRevivalist > 100>> - <<set $arcologies[0].FSChineseRevivalist = 100>> - <</if>> - <br>Chinese Revivalism (0-100 or unset): <<textbox "$arcologies[0].FSChineseRevivalist" $arcologies[0].FSChineseRevivalist>> <br>Decoration: $arcologies[0].FSChineseRevivalistDecoration diff --git a/src/cheats/mod_EditFSCheatDatatypeCleanup.tw b/src/cheats/mod_EditFSCheatDatatypeCleanup.tw index babddc1ab41..9fe2b85ac91 100644 --- a/src/cheats/mod_EditFSCheatDatatypeCleanup.tw +++ b/src/cheats/mod_EditFSCheatDatatypeCleanup.tw @@ -3,17 +3,17 @@ <<set $nextButton = "Continue", $nextLink = "Main", $returnTo = "Main">> <<if $arcologies[0].FSSupremacist != "unset">> - <<set $arcologies[0].FSSupremacist = Number($arcologies[0].FSSupremacist) <= 100 || 0>> + <<set $arcologies[0].FSSupremacist = Number($arcologies[0].FSSupremacist) || 0>> <<set $arcologies[0].FSSupremacistDecoration = Number($arcologies[0].FSSupremacistDecoration) || 0>> <<set $arcologies[0].FSSupremacistLawME = Number($arcologies[0].FSSupremacistLawME) || 0>> <</if>> <<if $arcologies[0].FSSubjugationist != "unset">> - <<set $arcologies[0].FSSubjugationist = Number($arcologies[0].FSSubjugationist) <= 100 || 0>> + <<set $arcologies[0].FSSubjugationist = Number($arcologies[0].FSSubjugationist) || 0>> <<set $arcologies[0].FSSubjugationistDecoration = Number($arcologies[0].FSSubjugationistDecoration) || 0>> <<set $arcologies[0].FSSubjugationistLawME = Number($arcologies[0].FSSubjugationistLawME) || 0>> <</if>> <<if $arcologies[0].FSGenderRadicalist != "unset">> - <<set $arcologies[0].FSGenderRadicalist = Number($arcologies[0].FSGenderRadicalist) <= 100 || 0>> + <<set $arcologies[0].FSGenderRadicalist = Number($arcologies[0].FSGenderRadicalist) || 0>> <<set $arcologies[0].FSGenderRadicalistDecoration = Number($arcologies[0].FSGenderRadicalistDecoration) || 0>> <<set $arcologies[0].FSGenderRadicalistLawBeauty = Number($arcologies[0].FSGenderRadicalistLawBeauty) || 0>> <<set $arcologies[0].FSGenderRadicalistLawFuta = Number($arcologies[0].FSGenderRadicalistLawFuta) || 0>> @@ -39,38 +39,38 @@ <<set $arcologies[0].FSHedonisticDecadenceStrongFat = Number($arcologies[0].FSHedonisticDecadenceStrongFat) || 0>> <</if>> <<if $arcologies[0].FSGenderFundamentalist != "unset">> - <<set $arcologies[0].FSGenderFundamentalist = Number($arcologies[0].FSGenderFundamentalist) <= 100 || 0>> + <<set $arcologies[0].FSGenderFundamentalist = Number($arcologies[0].FSGenderFundamentalist) || 0>> <<set $arcologies[0].FSGenderFundamentalistDecoration = Number($arcologies[0].FSGenderFundamentalistDecoration) || 0>> <<set $arcologies[0].FSGenderFundamentalistLaw = Number($arcologies[0].FSGenderFundamentalistLaw) || 0>> <<set $arcologies[0].FSGenderFundamentalistSMR = Number($arcologies[0].FSGenderFundamentalistSMR) || 0>> <</if>> <<if $arcologies[0].FSPaternalist != "unset">> - <<set $arcologies[0].FSPaternalist = Number($arcologies[0].FSPaternalist) <= 100 || 0>> + <<set $arcologies[0].FSPaternalist = Number($arcologies[0].FSPaternalist) || 0>> <<set $arcologies[0].FSPaternalistDecoration = Number($arcologies[0].FSPaternalistDecoration) || 0>> <<set $arcologies[0].FSPaternalistLaw = Number($arcologies[0].FSPaternalistLaw) || 0>> <</if>> <<if $arcologies[0].FSDegradationist != "unset">> - <<set $arcologies[0].FSDegradationist = Number($arcologies[0].FSDegradationist) <= 100 || 0>> + <<set $arcologies[0].FSDegradationist = Number($arcologies[0].FSDegradationist) || 0>> <<set $arcologies[0].FSDegradationistDecoration = Number($arcologies[0].FSDegradationistDecoration) || 0>> <<set $arcologies[0].FSDegradationistLaw = Number($arcologies[0].FSDegradationistLaw) || 0>> <</if>> <<if $arcologies[0].FSBodyPurist != "unset">> - <<set $arcologies[0].FSBodyPurist = Number($arcologies[0].FSBodyPurist) <= 100 || 0>> + <<set $arcologies[0].FSBodyPurist = Number($arcologies[0].FSBodyPurist) || 0>> <<set $arcologies[0].FSBodyPuristDecoration = Number($arcologies[0].FSBodyPuristDecoration) || 0>> <<set $arcologies[0].FSBodyPuristLaw = Number($arcologies[0].FSBodyPuristLaw) || 0>> <</if>> <<if $arcologies[0].FSTransformationFetishist != "unset">> - <<set $arcologies[0].FSTransformationFetishist = Number($arcologies[0].FSTransformationFetishist) <= 100 || 0>> + <<set $arcologies[0].FSTransformationFetishist = Number($arcologies[0].FSTransformationFetishist) || 0>> <<set $arcologies[0].FSTransformationFetishistDecoration = Number($arcologies[0].FSTransformationFetishistDecoration) || 0>> <<set $arcologies[0].FSTransformationFetishistLaw = Number($arcologies[0].FSTransformationFetishistLaw) || 0>> <</if>> <<if $arcologies[0].FSYouthPreferentialist != "unset">> - <<set $arcologies[0].FSYouthPreferentialist = Number($arcologies[0].FSYouthPreferentialist) <= 100 || 0>> + <<set $arcologies[0].FSYouthPreferentialist = Number($arcologies[0].FSYouthPreferentialist) || 0>> <<set $arcologies[0].FSYouthPreferentialistDecoration = Number($arcologies[0].FSYouthPreferentialistDecoration) || 0>> <<set $arcologies[0].FSYouthPreferentialistLaw = Number($arcologies[0].FSYouthPreferentialistLaw) || 0>> <</if>> <<if $arcologies[0].FSMaturityPreferentialist != "unset">> - <<set $arcologies[0].FSMaturityPreferentialist = Number($arcologies[0].FSMaturityPreferentialist) <= 100 || 0>> + <<set $arcologies[0].FSMaturityPreferentialist = Number($arcologies[0].FSMaturityPreferentialist) || 0>> <<set $arcologies[0].FSMaturityPreferentialistDecoration = Number($arcologies[0].FSMaturityPreferentialistDecoration) || 0>> <<set $arcologies[0].FSMaturityPreferentialistLaw = Number($arcologies[0].FSMaturityPreferentialistLaw) || 0>> <</if>> @@ -81,58 +81,58 @@ <<set $arcologies[0].FSSlimnessEnthusiastLaw = Number($arcologies[0].FSSlimnessEnthusiastLaw) || 0>> <</if>> <<if $arcologies[0].FSAssetExpansionist != "unset">> - <<set $arcologies[0].FSAssetExpansionist = Number($arcologies[0].FSAssetExpansionist) <= 100 || 0>> + <<set $arcologies[0].FSAssetExpansionist = Number($arcologies[0].FSAssetExpansionist) || 0>> <<set $arcologies[0].FSAssetExpansionistDecoration = Number($arcologies[0].FSAssetExpansionistDecoration) || 0>> <<set $arcologies[0].FSAssetExpansionistSMR = Number($arcologies[0].FSAssetExpansionistSMR) || 0>> <</if>> <<if $arcologies[0].FSPastoralist != "unset">> - <<set $arcologies[0].FSPastoralist = Number($arcologies[0].FSPastoralist) <= 100 || 0>> + <<set $arcologies[0].FSPastoralist = Number($arcologies[0].FSPastoralist) || 0>> <<set $arcologies[0].FSPastoralistDecoration = Number($arcologies[0].FSPastoralistDecoration) || 0>> <<set $arcologies[0].FSPastoralistLaw = Number($arcologies[0].FSPastoralistLaw) || 0>> <</if>> <<if $arcologies[0].FSPhysicalIdealist != "unset">> - <<set $arcologies[0].FSPhysicalIdealist = Number($arcologies[0].FSPhysicalIdealist) <= 100 || 0>> + <<set $arcologies[0].FSPhysicalIdealist = Number($arcologies[0].FSPhysicalIdealist) || 0>> <<set $arcologies[0].FSPhysicalIdealistDecoration = Number($arcologies[0].FSPhysicalIdealistDecoration) || 0>> <<set $arcologies[0].FSPhysicalIdealistSMR = Number($arcologies[0].FSPhysicalIdealistSMR) || 0>> <<set $arcologies[0].FSPhysicalIdealistStrongFat = Number($arcologies[0].FSPhysicalIdealistStrongFat) || 0>> <</if>> <<if $arcologies[0].FSChattelReligionist != "unset">> - <<set $arcologies[0].FSChattelReligionist = Number($arcologies[0].FSChattelReligionist) <= 100 || 0>> + <<set $arcologies[0].FSChattelReligionist = Number($arcologies[0].FSChattelReligionist) || 0>> <<set $arcologies[0].FSChattelReligionistDecoration = Number($arcologies[0].FSChattelReligionistDecoration) || 0>> <<set $arcologies[0].FSChattelReligionistLaw = Number($arcologies[0].FSChattelReligionistLaw) || 0>> <</if>> <<if $arcologies[0].FSEdoRevivalist != "unset">> - <<set $arcologies[0].FSEdoRevivalist = Number($arcologies[0].FSEdoRevivalist) <= 100 || 0>> + <<set $arcologies[0].FSEdoRevivalist = Number($arcologies[0].FSEdoRevivalist) || 0>> <<set $arcologies[0].FSEdoRevivalistDecoration = Number($arcologies[0].FSEdoRevivalistDecoration) || 0>> <<set $arcologies[0].FSEdoRevivalistLaw = Number($arcologies[0].FSEdoRevivalistLaw) || 0>> <</if>> <<if $arcologies[0].FSRomanRevivalist != "unset">> - <<set $arcologies[0].FSRomanRevivalist = Number($arcologies[0].FSRomanRevivalist) <= 100 || 0>> + <<set $arcologies[0].FSRomanRevivalist = Number($arcologies[0].FSRomanRevivalist) || 0>> <<set $arcologies[0].FSRomanRevivalistDecoration = Number($arcologies[0].FSRomanRevivalistDecoration) || 0>> <<set $arcologies[0].FSRomanRevivalistLaw = Number($arcologies[0].FSRomanRevivalistLaw) || 0>> <</if>> <<if $arcologies[0].FSAztecRevivalist != "unset">> - <<set $arcologies[0].FSAztecRevivalist = Number($arcologies[0].FSAztecRevivalist) <= 100 || 0>> + <<set $arcologies[0].FSAztecRevivalist = Number($arcologies[0].FSAztecRevivalist) || 0>> <<set $arcologies[0].FSAztecRevivalistDecoration = Number($arcologies[0].FSAztecRevivalistDecoration) || 0>> <<set $arcologies[0].FSAztecRevivalistLaw = Number($arcologies[0].FSAztecRevivalistLaw) || 0>> <</if>> <<if $arcologies[0].FSEgyptianRevivalist != "unset">> - <<set $arcologies[0].FSEgyptianRevivalist = Number($arcologies[0].FSEgyptianRevivalist) <= 100 || 0>> + <<set $arcologies[0].FSEgyptianRevivalist = Number($arcologies[0].FSEgyptianRevivalist) || 0>> <<set $arcologies[0].FSEgyptianRevivalistDecoration = Number($arcologies[0].FSEgyptianRevivalistDecoration) || 0>> <<set $arcologies[0].FSEgyptianRevivalistLaw = Number($arcologies[0].FSEgyptianRevivalistLaw) || 0>> <</if>> <<if $arcologies[0].FSEdoRevivalist != "unset">> - <<set $arcologies[0].FSEdoRevivalist = Number($arcologies[0].FSEdoRevivalist) <= 100 || 0>> + <<set $arcologies[0].FSEdoRevivalist = Number($arcologies[0].FSEdoRevivalist) || 0>> <<set $arcologies[0].FSEdoRevivalistDecoration = Number($arcologies[0].FSEdoRevivalistDecoration) || 0>> <<set $arcologies[0].FSEdoRevivalistLaw = Number($arcologies[0].FSEdoRevivalistLaw) || 0>> <</if>> <<if $arcologies[0].FSArabianRevivalist != "unset">> - <<set $arcologies[0].FSArabianRevivalist = Number($arcologies[0].FSArabianRevivalist) <= 100 || 0>> + <<set $arcologies[0].FSArabianRevivalist = Number($arcologies[0].FSArabianRevivalist) || 0>> <<set $arcologies[0].FSArabianRevivalistDecoration = Number($arcologies[0].FSArabianRevivalistDecoration) || 0>> <<set $arcologies[0].FSArabianRevivalistLaw = Number($arcologies[0].FSArabianRevivalistLaw) || 0>> <</if>> <<if $arcologies[0].FSChineseRevivalist != "unset">> - <<set $arcologies[0].FSChineseRevivalist = Number($arcologies[0].FSChineseRevivalist) <= 100 || 0>> + <<set $arcologies[0].FSChineseRevivalist = Number($arcologies[0].FSChineseRevivalist) || 0>> <<set $arcologies[0].FSChineseRevivalistDecoration = Number($arcologies[0].FSChineseRevivalistDecoration) || 0>> <<set $arcologies[0].FSChineseRevivalistLaw = Number($arcologies[0].FSChineseRevivalistLaw) || 0>> <</if>> diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw index 873217a9d97..7b0974296a2 100644 --- a/src/uncategorized/scheduledEvent.tw +++ b/src/uncategorized/scheduledEvent.tw @@ -194,7 +194,7 @@ <<else>> <<if $plot == 1>><<goto "Nonrandom Event">><<else>><<goto "Random Nonindividual Event">><</if>> <</if>> -<<elseif (Math.trunc($week/24) == ($week/24)) && $LieutenantColonel != 0 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>> +<<elseif (Math.trunc($week/24) == ($week/24)) && $LieutenantColonel != 0 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>>> <<goto "securityForceTradeShow">> <<elseif $plot == 1>> <<goto "Nonrandom Event">> -- GitLab