diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index dd375c62b423a54bd59a4dce463901e838f71e8d..3b265bd89cd6f0965235cc976112385833eac60d 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -1069,7 +1069,6 @@ window.resetFSCredits = function() { activeFS++; } } - console.log(activeFS); if (V.arcologies[0].FSNull > 0) { /* possibly recalculate for multiculturalism */ activeFS--; if (V.FSCreditCount === 4) { @@ -1082,7 +1081,6 @@ window.resetFSCredits = function() { activeFS += V.arcologies[0].FSNull/20; } } - console.log(activeFS); V.FSCredits = Math.max(Math.trunc(V.FSGotRepCredits - activeFS), 0); }; diff --git a/src/cheats/mod_EditFSCheatDatatypeCleanup.tw b/src/cheats/mod_EditFSCheatDatatypeCleanup.tw index de7bd60a5ceece5ad21a510760b2bfedc3717432..460a79ba8d52f964b4d619b9359b8b8c59e4b866 100644 --- a/src/cheats/mod_EditFSCheatDatatypeCleanup.tw +++ b/src/cheats/mod_EditFSCheatDatatypeCleanup.tw @@ -32,7 +32,7 @@ <</if>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set $arcologies[0].FSHedonisticDecadence = Number($arcologies[0].FSHedonisticDecadence) || "unset">> - <<set $arcologies[0].FSHedonisticDecadence = Number($arcologies[0].FSHedonisticDecadenceDecoration) || 0>> + <<set $arcologies[0].FSHedonisticDecadenceDecoration = Number($arcologies[0].FSHedonisticDecadenceDecoration) || 0>> <<set $arcologies[0].FSHedonisticDecadenceSMR = Number($arcologies[0].FSHedonisticDecadenceSMR) || 0>> <<set $arcologies[0].FSHedonisticDecadenceLaw = Number($arcologies[0].FSHedonisticDecadenceLaw) || 0>> <<set $arcologies[0].FSHedonisticDecadenceLaw2 = Number($arcologies[0].FSHedonisticDecadenceLaw2) || 0>> @@ -41,7 +41,8 @@ <<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set $arcologies[0].FSGenderFundamentalist = Number($arcologies[0].FSGenderFundamentalist) || "unset">> <<set $arcologies[0].FSGenderFundamentalistDecoration = Number($arcologies[0].FSGenderFundamentalistDecoration) || 0>> - <<set $arcologies[0].FSGenderFundamentalistLaw = Number($arcologies[0].FSGenderFundamentalistLaw) || 0>> + <<set $arcologies[0].FSGenderFundamentalistLawBeauty = Number($arcologies[0].FSGenderFundamentalistLawBeauty) || 0>> + <<set $arcologies[0].FSGenderFundamentalistLawBimbo = Number($arcologies[0].FSGenderFundamentalistLawBimbo) || 0>> <<set $arcologies[0].FSGenderFundamentalistSMR = Number($arcologies[0].FSGenderFundamentalistSMR) || 0>> <</if>> <<if $arcologies[0].FSPaternalist != "unset">> @@ -62,7 +63,7 @@ <<if $arcologies[0].FSTransformationFetishist != "unset">> <<set $arcologies[0].FSTransformationFetishist = Number($arcologies[0].FSTransformationFetishist) || "unset">> <<set $arcologies[0].FSTransformationFetishistDecoration = Number($arcologies[0].FSTransformationFetishistDecoration) || 0>> - <<set $arcologies[0].FSTransformationFetishistLaw = Number($arcologies[0].FSTransformationFetishistLaw) || 0>> + <<set $arcologies[0].FSTransformationFetishistSMR = Number($arcologies[0].FSTransformationFetishistSMR) || 0>> <</if>> <<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set $arcologies[0].FSYouthPreferentialist = Number($arcologies[0].FSYouthPreferentialist) || "unset">> @@ -93,6 +94,7 @@ <<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set $arcologies[0].FSPhysicalIdealist = Number($arcologies[0].FSPhysicalIdealist) || "unset">> <<set $arcologies[0].FSPhysicalIdealistDecoration = Number($arcologies[0].FSPhysicalIdealistDecoration) || 0>> + <<set $arcologies[0].FSPhysicalIdealistLaw = Number($arcologies[0].FSPhysicalIdealistLaw) || 0>> <<set $arcologies[0].FSPhysicalIdealistSMR = Number($arcologies[0].FSPhysicalIdealistSMR) || 0>> <<set $arcologies[0].FSPhysicalIdealistStrongFat = Number($arcologies[0].FSPhysicalIdealistStrongFat) || 0>> <</if>> @@ -100,6 +102,7 @@ <<set $arcologies[0].FSChattelReligionist = Number($arcologies[0].FSChattelReligionist) || "unset">> <<set $arcologies[0].FSChattelReligionistDecoration = Number($arcologies[0].FSChattelReligionistDecoration) || 0>> <<set $arcologies[0].FSChattelReligionistLaw = Number($arcologies[0].FSChattelReligionistLaw) || 0>> + <<set $arcologies[0].FSChattelReligionistCreed = Number($arcologies[0].FSChattelReligionistCreed) || 0>> <</if>> <<if $arcologies[0].FSEdoRevivalist != "unset">> <<set $arcologies[0].FSEdoRevivalist = Number($arcologies[0].FSEdoRevivalist) || "unset">> @@ -136,6 +139,11 @@ <<set $arcologies[0].FSChineseRevivalistDecoration = Number($arcologies[0].FSChineseRevivalistDecoration) || 0>> <<set $arcologies[0].FSChineseRevivalistLaw = Number($arcologies[0].FSChineseRevivalistLaw) || 0>> <</if>> +<<for _fscdc = 0; _fscdc < setup.FutureSocieties.length; _fscdc++>> + <<if !($arcologies[0][setup.FutureSocieties[_fscdc]] > 0)>> + <<run removeFS(setup.FutureSocieties[_fscdc])>> + <</if>> +<</for>> You perform the dark rituals, pray to the chaos gods and sold your CHEATING SOUL for the power to change and mold the Future Society to your will. diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw index 6376241112816719558e5613a4d1f5e3ae66b4ad..67180b8780d750a9c8507e3a6f20c38c84f5632b 100644 --- a/src/js/storyJS.tw +++ b/src/js/storyJS.tw @@ -1067,7 +1067,6 @@ window.resetFSCredits = function() { activeFS++; } } - console.log(activeFS); if (V.arcologies[0].FSNull > 0) { /* possibly recalculate for multiculturalism */ activeFS--; if (V.FSCreditCount === 4) { @@ -1080,6 +1079,5 @@ window.resetFSCredits = function() { activeFS += V.arcologies[0].FSNull/20; } } - console.log(activeFS); V.FSCredits = Math.max(Math.trunc(V.FSGotRepCredits - activeFS), 0); }; diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index f3c4ab2c874d824c06763f8f033bcf5289c9d988..67b5b634cb2ad97d9fd26be6cb0bbf68c640ab31 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -1540,6 +1540,9 @@ <<elseif ndef $arcologies[0].FSGenderFundamentalistSMR>> <<set $arcologies[0].FSGenderFundamentalistSMR = 0>> <</if>> +<<if def $arcologies[0].FSGenderFundamentalistLaw>> + <<run delete $arcologies[0].FSGenderFundamentalistLaw>> +<</if>> <<if def $FSGenderRadicalist && $FSGenderRadicalist != "unset">> <<set $arcologies[0].FSGenderRadicalist = $FSGenderRadicalist>>