diff --git a/src/cheats/mod_EditFSCheatDatatypeCleanup.tw b/src/cheats/mod_EditFSCheatDatatypeCleanup.tw index 48e706c9d6af7dea276283b88e659ff8a2a58413..de7bd60a5ceece5ad21a510760b2bfedc3717432 100644 --- a/src/cheats/mod_EditFSCheatDatatypeCleanup.tw +++ b/src/cheats/mod_EditFSCheatDatatypeCleanup.tw @@ -3,35 +3,35 @@ <<set $nextButton = "Continue", $nextLink = "Main", $returnTo = "Main">> <<if $arcologies[0].FSSupremacist != "unset">> - <<set $arcologies[0].FSSupremacist = Number($arcologies[0].FSSupremacist) || 0>> + <<set $arcologies[0].FSSupremacist = Number($arcologies[0].FSSupremacist) || "unset">> <<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) || 0>> + <<set $arcologies[0].FSSubjugationist = Number($arcologies[0].FSSubjugationist) || "unset">> <<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) || 0>> + <<set $arcologies[0].FSGenderRadicalist = Number($arcologies[0].FSGenderRadicalist) || "unset">> <<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>> <</if>> <<if $arcologies[0].FSRepopulationFocus != "unset">> - <<set $arcologies[0].FSRepopulationFocus = Number($arcologies[0].FSRepopulationFocus) || 0>> + <<set $arcologies[0].FSRepopulationFocus = Number($arcologies[0].FSRepopulationFocus) || "unset">> <<set $arcologies[0].FSRepopulationFocusDecoration = Number($arcologies[0].FSRepopulationFocusDecoration) || 0>> <<set $arcologies[0].FSRepopulationFocusSMR = Number($arcologies[0].FSRepopulationFocusSMR) || 0>> <<set $arcologies[0].FSRepopulationFocusLaw = Number($arcologies[0].FSRepopulationFocusLaw) || 0>> <</if>> <<if $arcologies[0].FSRestart != "unset">> - <<set $arcologies[0].FSRestart = Number($arcologies[0].FSRestart) || 0>> + <<set $arcologies[0].FSRestart = Number($arcologies[0].FSRestart) || "unset">> <<set $arcologies[0].FSRestartDecoration = Number($arcologies[0].FSRestartDecoration) || 0>> <<set $arcologies[0].FSRestartSMR = Number($arcologies[0].FSRestartSMR) || 0>> <<set $arcologies[0].FSRestartLaw = Number($arcologies[0].FSRestartLaw) || 0>> <</if>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> - <<set $arcologies[0].FSHedonisticDecadence = Number($arcologies[0].FSHedonisticDecadence) || 0>> + <<set $arcologies[0].FSHedonisticDecadence = Number($arcologies[0].FSHedonisticDecadence) || "unset">> <<set $arcologies[0].FSHedonisticDecadence = Number($arcologies[0].FSHedonisticDecadenceDecoration) || 0>> <<set $arcologies[0].FSHedonisticDecadenceSMR = Number($arcologies[0].FSHedonisticDecadenceSMR) || 0>> <<set $arcologies[0].FSHedonisticDecadenceLaw = Number($arcologies[0].FSHedonisticDecadenceLaw) || 0>> @@ -39,100 +39,100 @@ <<set $arcologies[0].FSHedonisticDecadenceStrongFat = Number($arcologies[0].FSHedonisticDecadenceStrongFat) || 0>> <</if>> <<if $arcologies[0].FSGenderFundamentalist != "unset">> - <<set $arcologies[0].FSGenderFundamentalist = Number($arcologies[0].FSGenderFundamentalist) || 0>> + <<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].FSGenderFundamentalistSMR = Number($arcologies[0].FSGenderFundamentalistSMR) || 0>> <</if>> <<if $arcologies[0].FSPaternalist != "unset">> - <<set $arcologies[0].FSPaternalist = Number($arcologies[0].FSPaternalist) || 0>> + <<set $arcologies[0].FSPaternalist = Number($arcologies[0].FSPaternalist) || "unset">> <<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) || 0>> + <<set $arcologies[0].FSDegradationist = Number($arcologies[0].FSDegradationist) || "unset">> <<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) || 0>> + <<set $arcologies[0].FSBodyPurist = Number($arcologies[0].FSBodyPurist) || "unset">> <<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) || 0>> + <<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>> <</if>> <<if $arcologies[0].FSYouthPreferentialist != "unset">> - <<set $arcologies[0].FSYouthPreferentialist = Number($arcologies[0].FSYouthPreferentialist) || 0>> + <<set $arcologies[0].FSYouthPreferentialist = Number($arcologies[0].FSYouthPreferentialist) || "unset">> <<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) || 0>> + <<set $arcologies[0].FSMaturityPreferentialist = Number($arcologies[0].FSMaturityPreferentialist) || "unset">> <<set $arcologies[0].FSMaturityPreferentialistDecoration = Number($arcologies[0].FSMaturityPreferentialistDecoration) || 0>> <<set $arcologies[0].FSMaturityPreferentialistLaw = Number($arcologies[0].FSMaturityPreferentialistLaw) || 0>> <</if>> <<if $arcologies[0].FSSlimnessEnthusiast != "unset">> - <<set $arcologies[0].FSSlimnessEnthusiast = Number($arcologies[0].FSSlimnessEnthusiast) || 0>> + <<set $arcologies[0].FSSlimnessEnthusiast = Number($arcologies[0].FSSlimnessEnthusiast) || "unset">> <<set $arcologies[0].FSSlimnessEnthusiastDecoration = Number($arcologies[0].FSSlimnessEnthusiastDecoration) || 0>> <<set $arcologies[0].FSSlimnessEnthusiastSMR = Number($arcologies[0].FSSlimnessEnthusiastSMR) || 0>> <<set $arcologies[0].FSSlimnessEnthusiastLaw = Number($arcologies[0].FSSlimnessEnthusiastLaw) || 0>> <</if>> <<if $arcologies[0].FSAssetExpansionist != "unset">> - <<set $arcologies[0].FSAssetExpansionist = Number($arcologies[0].FSAssetExpansionist) || 0>> + <<set $arcologies[0].FSAssetExpansionist = Number($arcologies[0].FSAssetExpansionist) || "unset">> <<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) || 0>> + <<set $arcologies[0].FSPastoralist = Number($arcologies[0].FSPastoralist) || "unset">> <<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) || 0>> + <<set $arcologies[0].FSPhysicalIdealist = Number($arcologies[0].FSPhysicalIdealist) || "unset">> <<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) || 0>> + <<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>> <</if>> <<if $arcologies[0].FSEdoRevivalist != "unset">> - <<set $arcologies[0].FSEdoRevivalist = Number($arcologies[0].FSEdoRevivalist) || 0>> + <<set $arcologies[0].FSEdoRevivalist = Number($arcologies[0].FSEdoRevivalist) || "unset">> <<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) || 0>> + <<set $arcologies[0].FSRomanRevivalist = Number($arcologies[0].FSRomanRevivalist) || "unset">> <<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) || 0>> + <<set $arcologies[0].FSAztecRevivalist = Number($arcologies[0].FSAztecRevivalist) || "unset">> <<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) || 0>> + <<set $arcologies[0].FSEgyptianRevivalist = Number($arcologies[0].FSEgyptianRevivalist) || "unset">> <<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) || 0>> + <<set $arcologies[0].FSEdoRevivalist = Number($arcologies[0].FSEdoRevivalist) || "unset">> <<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) || 0>> + <<set $arcologies[0].FSArabianRevivalist = Number($arcologies[0].FSArabianRevivalist) || "unset">> <<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) || 0>> + <<set $arcologies[0].FSChineseRevivalist = Number($arcologies[0].FSChineseRevivalist) || "unset">> <<set $arcologies[0].FSChineseRevivalistDecoration = Number($arcologies[0].FSChineseRevivalistDecoration) || 0>> <<set $arcologies[0].FSChineseRevivalistLaw = Number($arcologies[0].FSChineseRevivalistLaw) || 0>> <</if>> diff --git a/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw b/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw index 6b73cf2955dfbd14a9820385d8a51f363e76f72e..3e41cb5a69cf59b1ded34f9ad1525f69d4dfb66e 100644 --- a/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw +++ b/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw @@ -11,93 +11,93 @@ <<set $arcologies[_i].PCminority = Number($arcologies[_i].PCminority) || 0>> <<set $arcologies[_i].demandFactor = Number($arcologies[_i].demandFactor) || 0>> <<if $arcologies[_i].FSSupremacist != "unset">> - <<set $arcologies[_i].FSSupremacist = Number($arcologies[_i].FSSupremacist) || 0>> + <<set $arcologies[_i].FSSupremacist = Number($arcologies[_i].FSSupremacist) || "unset">> <</if>> <<if $arcologies[_i].FSSubjugationist != "unset">> - <<set $arcologies[_i].FSSubjugationist = Number($arcologies[_i].FSSubjugationist) || 0>> + <<set $arcologies[_i].FSSubjugationist = Number($arcologies[_i].FSSubjugationist) || "unset">> <</if>> <<if $arcologies[_i].FSGenderRadicalist != "unset">> - <<set $arcologies[_i].FSGenderRadicalist = Number($arcologies[_i].FSGenderRadicalist) || 0>> + <<set $arcologies[_i].FSGenderRadicalist = Number($arcologies[_i].FSGenderRadicalist) || "unset">> <<set $arcologies[_i].FSGenderFundamentalist = "unset">> <</if>> <<if $arcologies[_i].FSGenderFundamentalist != "unset">> - <<set $arcologies[_i].FSGenderFundamentalist = Number($arcologies[_i].FSGenderFundamentalist) || 0>> + <<set $arcologies[_i].FSGenderFundamentalist = Number($arcologies[_i].FSGenderFundamentalist) || "unset">> <<set $arcologies[_i].FSGenderRadicalist = "unset">> <</if>> <<if $arcologies[_i].FSPaternalist != "unset">> - <<set $arcologies[_i].FSPaternalist = Number($arcologies[_i].FSPaternalist) || 0>> + <<set $arcologies[_i].FSPaternalist = Number($arcologies[_i].FSPaternalist) || "unset">> <<set $arcologies[_i].FSDegradationist = "unset">> <</if>> <<if $arcologies[_i].FSDegradationist != "unset">> - <<set $arcologies[_i].FSDegradationist = Number($arcologies[_i].FSDegradationist) || 0>> + <<set $arcologies[_i].FSDegradationist = Number($arcologies[_i].FSDegradationist) || "unset">> <<set $arcologies[_i].FSPaternalist = "unset">> <</if>> <<if $arcologies[_i].FSBodyPurist != "unset">> - <<set $arcologies[_i].FSBodyPurist = Number($arcologies[_i].FSBodyPurist) || 0>> + <<set $arcologies[_i].FSBodyPurist = Number($arcologies[_i].FSBodyPurist) || "unset">> <<set $arcologies[_i].FSTransformationFetishist = "unset">> <</if>> <<if $arcologies[_i].FSTransformationFetishist != "unset">> - <<set $arcologies[_i].FSTransformationFetishist = Number($arcologies[_i].FSTransformationFetishist) || 0>> + <<set $arcologies[_i].FSTransformationFetishist = Number($arcologies[_i].FSTransformationFetishist) || "unset">> <<set $arcologies[_i].FSBodyPurist = "unset">> <</if>> <<if $arcologies[_i].FSYouthPreferentialist != "unset">> - <<set $arcologies[_i].FSYouthPreferentialist = Number($arcologies[_i].FSYouthPreferentialist) || 0>> + <<set $arcologies[_i].FSYouthPreferentialist = Number($arcologies[_i].FSYouthPreferentialist) || "unset">> <<set $arcologies[_i].FSMaturityPreferentialist = "unset">> <</if>> <<if $arcologies[_i].FSMaturityPreferentialist != "unset">> - <<set $arcologies[_i].FSMaturityPreferentialist = Number($arcologies[_i].FSMaturityPreferentialist) || 0>> + <<set $arcologies[_i].FSMaturityPreferentialist = Number($arcologies[_i].FSMaturityPreferentialist) || "unset">> <<set $arcologies[_i].FSYouthPreferentialist = "unset">> <</if>> <<if $arcologies[_i].FSSlimnessEnthusiast != "unset">> - <<set $arcologies[_i].FSSlimnessEnthusiast = Number($arcologies[_i].FSSlimnessEnthusiast) || 0>> + <<set $arcologies[_i].FSSlimnessEnthusiast = Number($arcologies[_i].FSSlimnessEnthusiast) || "unset">> <<set $arcologies[_i].FSAssetExpansionist = "unset">> <</if>> <<if $arcologies[_i].FSAssetExpansionist != "unset">> - <<set $arcologies[_i].FSAssetExpansionist = Number($arcologies[_i].FSAssetExpansionist) || 0>> + <<set $arcologies[_i].FSAssetExpansionist = Number($arcologies[_i].FSAssetExpansionist) || "unset">> <<set $arcologies[_i].FSSlimnessEnthusiast = "unset">> <</if>> <<if $arcologies[_i].FSPastoralist != "unset">> - <<set $arcologies[_i].FSPastoralist = Number($arcologies[_i].FSPastoralist) || 0>> + <<set $arcologies[_i].FSPastoralist = Number($arcologies[_i].FSPastoralist) || "unset">> <</if>> <<if $arcologies[_i].FSPhysicalIdealist != "unset">> - <<set $arcologies[_i].FSPhysicalIdealist = Number($arcologies[_i].FSPhysicalIdealist) || 0>> + <<set $arcologies[_i].FSPhysicalIdealist = Number($arcologies[_i].FSPhysicalIdealist) || "unset">> <</if>> <<if $arcologies[_i].FSChattelReligionist != "unset">> - <<set $arcologies[_i].FSChattelReligionist = Number($arcologies[_i].FSChattelReligionist) || 0>> + <<set $arcologies[_i].FSChattelReligionist = Number($arcologies[_i].FSChattelReligionist) || "unset">> <</if>> <<if $arcologies[_i].FSRomanRevivalist != "unset">> - <<set $arcologies[_i].FSRomanRevivalist = Number($arcologies[_i].FSRomanRevivalist) || 0>> + <<set $arcologies[_i].FSRomanRevivalist = Number($arcologies[_i].FSRomanRevivalist) || "unset">> <<set $arcologies[_i].FSArabianRevivalist = $arcologies[_i].FSAztecRevivalist = $arcologies[_i].FSChineseRevivalist = $arcologies[_i].FSEdoRevivalist = $arcologies[_i].FSEgyptianRevivalist = "unset">> <</if>> <<if $arcologies[_i].FSAztecRevivalist != "unset">> - <<set $arcologies[_i].FSAztecRevivalist = Number($arcologies[_i].FSAztecRevivalist) || 0>> + <<set $arcologies[_i].FSAztecRevivalist = Number($arcologies[_i].FSAztecRevivalist) || "unset">> <<set $arcologies[_i].FSArabianRevivalist = $arcologies[_i].FSChineseRevivalist = $arcologies[_i].FSEdoRevivalist = $arcologies[_i].FSEgyptianRevivalist = $arcologies[_i].FSRomanRevivalist = "unset">> <</if>> <<if $arcologies[_i].FSEgyptianRevivalist != "unset">> - <<set $arcologies[_i].FSEgyptianRevivalist = Number($arcologies[_i].FSEgyptianRevivalist) || 0>> + <<set $arcologies[_i].FSEgyptianRevivalist = Number($arcologies[_i].FSEgyptianRevivalist) || "unset">> <<set $arcologies[_i].FSArabianRevivalist = $arcologies[_i].FSAztecRevivalist = $arcologies[_i].FSChineseRevivalist = $arcologies[_i].FSEdoRevivalist = $arcologies[_i].FSRomanRevivalist = "unset">> <</if>> <<if $arcologies[_i].FSEdoRevivalist != "unset">> - <<set $arcologies[_i].FSEdoRevivalist = Number($arcologies[_i].FSEdoRevivalist) || 0>> + <<set $arcologies[_i].FSEdoRevivalist = Number($arcologies[_i].FSEdoRevivalist) || "unset">> <<set $arcologies[_i].FSArabianRevivalist = $arcologies[_i].FSAztecRevivalist = $arcologies[_i].FSChineseRevivalist = $arcologies[_i].FSEgyptianRevivalist = $arcologies[_i].FSRomanRevivalist = "unset">> <</if>> <<if $arcologies[_i].FSArabianRevivalist != "unset">> - <<set $arcologies[_i].FSArabianRevivalist = Number($arcologies[_i].FSArabianRevivalist) || 0>> + <<set $arcologies[_i].FSArabianRevivalist = Number($arcologies[_i].FSArabianRevivalist) || "unset">> <<set $arcologies[_i].FSAztecRevivalist = $arcologies[_i].FSChineseRevivalist = $arcologies[_i].FSEdoRevivalist = $arcologies[_i].FSEgyptianRevivalist = $arcologies[_i].FSRomanRevivalist = "unset">> <</if>> <<if $arcologies[_i].FSChineseRevivalist != "unset">> - <<set $arcologies[_i].FSChineseRevivalist = Number($arcologies[_i].FSChineseRevivalist) || 0>> + <<set $arcologies[_i].FSChineseRevivalist = Number($arcologies[_i].FSChineseRevivalist) || "unset">> <<set $arcologies[_i].FSArabianRevivalist = $arcologies[_i].FSAztecRevivalist = $arcologies[_i].FSEdoRevivalist = $arcologies[_i].FSEgyptianRevivalist = $arcologies[_i].FSRomanRevivalist = "unset">> <</if>> <<if $arcologies[_i].FSNull != "unset">> - <<set $arcologies[_i].FSNull = Number($arcologies[_i].FSNull) || 0>> + <<set $arcologies[_i].FSNull = Number($arcologies[_i].FSNull) || "unset">> <</if>> <<if $arcologies[_i].FSRepopulationFocus != "unset">> - <<set $arcologies[_i].FSRepopulationFocus = Number($arcologies[_i].FSRepopulationFocus) || 0>> + <<set $arcologies[_i].FSRepopulationFocus = Number($arcologies[_i].FSRepopulationFocus) || "unset">> <<set $arcologies[_i].FSRestart = "unset">> <</if>> <<if $arcologies[_i].FSRestart != "unset">> - <<set $arcologies[_i].FSRestart = Number($arcologies[_i].FSRestart) || 0>> + <<set $arcologies[_i].FSRestart = Number($arcologies[_i].FSRestart) || "unset">> <<set $arcologies[_i].FSRepopulationFocus = "unset">> <</if>> <<set $arcologies[_i].embargo = Number($arcologies[_i].embargo) || 0>> diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw index 94749052fdacaf851aa00b2d9655b8c3595eb0b0..779683e51ecdf6631b508b434f2809ea3b8e1df1 100644 --- a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw +++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw @@ -10,8 +10,8 @@ <<set $activeSlave.father = Number($activeSlave.father) || 0>> <<else>> <<set $activeSlave.relationTarget = Number($activeSlave.relationTarget) || 0>> - <<set $activeSlave.relationshipTarget = Number($activeSlave.relationshipTarget) || 0>> <</if>> +<<set $activeSlave.relationshipTarget = Number($activeSlave.relationshipTarget) || 0>> <<set $activeSlave.indenture = Number($activeSlave.indenture) || 0>> <<set $activeSlave.face = Number($activeSlave.face) || 0>> <<set $activeSlave.hLength = Number($activeSlave.hLength) || 0>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index be4c75f8ac228e4eb619990cfc00fbfdfb93f8cb..679b97792d99069b286cdcb135fc9d3eb52e5fc0 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -169,6 +169,9 @@ <<if def $target1 || def $target2 || def $target3>> <<unset $target1, $target2, $target3>> <</if>> +<<if def $oralCount || def $vaginalCount || def $analCount>> + <<unset $oralCount, $vaginalCount, $analCount>> +<</if>> /* pregmod stuff */ @@ -1526,17 +1529,8 @@ <<set $arcologies[0].FSChineseRevivalistLaw = 0>> <</if>> -<<for _bci = 1; _bci < $arcologies.length; _bci++>> - <<if ndef $arcologies[_bci].FSNull>> - <<set $arcologies[_bci].FSNull = "unset">> - <</if>> - <<if ndef $arcologies[_bci].FSRepopulationFocus>> - <<set $arcologies[_bci].FSRepopulationFocus = "unset">> - <</if>> - <<if ndef $arcologies[_bci].FSRestart>> - <<set $arcologies[_bci].FSRestart = "unset">> - <</if>> -<</for>> +<<include "MOD_Edit FS Cheat Datatype Cleanup">> +<<include "MOD_Edit Neighbor Arcology Cheat Datatype Cleanup">> Setting missing global variables: <<if ndef $assistantPower>> diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw index 3180948ae84e2726cd06f8f2db4a9534b51c9682..93a2d3916edcb8ad00fca9b4f868e7082d32946c 100644 --- a/src/uncategorized/RECI.tw +++ b/src/uncategorized/RECI.tw @@ -369,7 +369,7 @@ She looks pensive, and goes through two false starts before she clears her throa You swing your legs up onto your desk and jump up onto its smooth surface, her eyes tracking the <<if $PC.boobs == 1>>way it makes your breasts move<<else>>powerful way your muscles move your body<</if>>. When you pat the tops of your <<if $PC.title == 1>>hard<<else>>soft<</if>> thighs meaningfully, she giggles happily and skips forward to clamber up and sit on her lap. The bouncing and climbing creates quite a nice spectacle of jiggling tits and waving cock, and she manages to get up on the desk in such a way that you get a solid eyeful of first her wet pussy and then her ready anus. She settles herself onto your lap with a coo, feeling the <<if $PC.dick == 1>>hardness of your erection <<if $PC.vagina == 1>>and the warmth further down<</if>><<else>>warmth of your arousal<</if>> against her hermaphroditic genitalia. She starts to grind herself lasciviously against you, but stops when you seize her face and kiss her deeply. She moans back into you, returning the kiss with intensity. <<if $activeSlave.boobs > 4000>>Her udders are so huge the two of you have to press your torsos hard together to make out, a delightful struggle that stimulates her nipples quite a lot, to go by the way she squeaks and giggles into your mouth.<<elseif $activeSlave.boobs > 2000>>Her bosom is are so big that making out face to face presses it quite hard between your torsos, which stimulates her nipples quite a lot, to go by the way she squeaks and giggles into your mouth.<<elseif $PC.boobs == 1>>You undress without breaking your lip lock, bringing your bare breasts against hers in a warm, loving embrace.<<else>>You strip without breaking your lip lock, bringing your heavily muscled chest against her soft breasts in a tender, loving embrace.<</if>> Her arousal builds rapidly and she goes back to grinding, <<if $PC.dick == 1>>eventually getting herself so hot that your dick slides into her almost without either of you meaning to make it happen. She climaxes with you shortly, cumming all over her own breasts.<<else>>bringing you both to a shaking climax. She cums all over her own breasts, coating them in glistening ejaculate.<</if>> As she relaxes back against the desk, her panting making her cum-glazed tits rise and fall, you reflect that you just lied by omission, letting a pretty girl maintain her delusions and @@.hotpink;her love for you.@@ Of all your sins, this is perhaps the smallest. <<set $activeSlave.devotion += 4>> <<set $activeSlave.vaginalCount += 1>> - <<set $vaginalCount += 1>> + <<set $vaginalTotal += 1>> <</replace>> <</link>> <br><<link "Break her with the truth">> @@ -378,9 +378,9 @@ She looks pensive, and goes through two false starts before she clears her throa You point at the couch, and she skips over to it with a giggle, boobs bouncing. She hops up onto the cushions, kneeling with her butt stuck out invitingly and her torso bent over its back. She reaches around to pull one <<if ($activeSlave.butt > 5)>>massive<<elseif ($activeSlave.butt > 2)>>heavy<<else>>cute<</if>> buttock to one side, <<if $activeSlave.anus > 2>>stretching her lewd backdoor into a gape<<elseif $activeSlave.anus > 1>>stretching her backdoor lewdly<<else>>highlighting her tight anus<</if>> and showing off her <<if $activeSlave.labia > 1>>dangling<<elseif $activeSlave.labia > 0>>generous<<else>>wet<</if>> pussylips. You enter her from behind, your <<if $PC.dick == 1>>turgid dick<<else>>strap-on<</if>> sliding easily into her cunt. Your hands slide around her to hold her shoulders in a gentle lock, and you whisper secrets into her ear. You tell her that the Futanari Sisters here failed because you undermined them. You tell her that she is a slave because you planned and executed her enslavement. And you tell her that no slave will believe her if she tells them the truth, since they love you just like she did. As you pour this poison into her, she remains perfectly still, processing the revelation; the only clue to her feelings is her rapidly softening cock. When it has become completely, pathetically limp, a huge sob tears its way out of her. You switch to her anus and assrape her without mercy, forcing her limp torso halfway around so you can press a kiss on her bawling mouth. She does not resist, even when you begin to taste the salt tears that stream down her pretty face. She will remain devoted to you, mostly from a lack of alternatives, but her trust in you has @@.gold;suffered immensely.@@ <<set $activeSlave.trust = random(-90,-75)>> <<set $activeSlave.vaginalCount += 1>> - <<set $vaginalCount += 1>> + <<set $vaginalTotal += 1>> <<set $activeSlave.analCount += 1>> - <<set $analCount += 1>> + <<set $analTotal += 1>> <</replace>> <</link>> @@ -398,12 +398,12 @@ She looks pensive, and goes through two false starts before she clears her throa You climax there, your tour of her holes completed; she drops down to clean you off again before @@.mediumaquamarine;thanking you earnestly@@ and taking her leave, though not without a final turn in the doorway to steal a final loving glance at <<if ($PC.dick == 0)>>your strap-on<<else>>your junk<</if>>. <<set $activeSlave.trust += 4>> <<set $activeSlave.analCount += 1>> - <<set $analCount += 1>> + <<set $analTotal += 1>> <<set $activeSlave.oralCount += 1>> - <<set $oralCount += 1>> + <<set $oralTotal += 1>> <<if $activeSlave.vagina > -1>> <<set $activeSlave.vaginalCount += 1>> - <<set $vaginalCount += 1>> + <<set $vaginalTotal += 1>> <</if>> <</replace>> <</link>> @@ -413,9 +413,9 @@ She looks pensive, and goes through two false starts before she clears her throa You bring up a schematic of the arcology and point out a public gym to her; you hand her a day pass, tell her to go down there, and let her know she'll spend the rest of the day there. She looks mystified, and when you do not elaborate further, she asks, "What <<sh>>ould I do there, <<Master>>?" Anything she wants, you tell her. She still looks somewhat puzzled, but she heads down to the gym anyway. When she gets there, she sees a steady stream of well-muscled male citizens entering the showers, and gets it. She waves cheerfully to the nearest camera, and blows you a kiss before heading into the locker room. This is the Free Cities, and there isn't much reaction to a naked girl entering a male-dominated gym. That is, until she selects from among the sweaty gentlemen coming in from the weight room, sidles up to one, and says cheerfully, "Hi! Do you wanna fuck me?" He does, and @@.green;so do many of his friends.@@ So many, in fact, that having the showers right there becomes convenient for her as the day goes on. <<set $rep += 250>> <<set $activeSlave.analCount += 5>> - <<set $analCount += 5>> + <<set $analTotal += 5>> <<set $activeSlave.oralCount += 5>> - <<set $oralCount += 5>> + <<set $oralTotal += 5>> <<if ndef $activeSlave.publicCount>> <<set $activeSlave.publicCount = 0>> @@ -424,11 +424,11 @@ She looks pensive, and goes through two false starts before she clears her throa <<if $activeSlave.vagina > -1>> <<set $activeSlave.vaginalCount += 5>> <<set $activeSlave.publicCount += 5>> - <<set $vaginalCount += 5>> + <<set $vaginalTotal += 5>> <<else>> <<set $activeSlave.analCount += 5>> <<set $activeSlave.publicCount += 5>> - <<set $analCount += 5>> + <<set $analTotal += 5>> <</if>> <</replace>> <</link>> @@ -451,7 +451,7 @@ She looks pensive, and goes through two false starts before she clears her throa She periodically manages to get her <<if ($activeSlave.anus > 2)>>loose<<elseif ($activeSlave.anus > 1)>>practiced<<else>>tight<</if>> anus off your thrusting <<if ($PC.dick == 0)>>phallus<<else>>penis<</if>>, but that just gives you the pleasure of forcing it up her ass again to the accompaniment of pretended girlish protests. She does her best to maintain the pretense, but soon the best she can come up with is a ridiculous "<<Master>>, plea<<s>>e don't make me come! Not from anal!" She's a little sore, and winces stiffly when she gets up off the couch, but shakes it off and @@.hotpink;gives you a kiss@@ with surprising shyness for a mature slave whose anus you just fucked. <<set $activeSlave.devotion += 4>> <<set $activeSlave.analCount += 1>> - <<set $analCount += 1>> + <<set $analTotal += 1>> <</replace>> <</link>> <br><<link "Appreciate her body">> @@ -479,9 +479,9 @@ She looks pensive, and goes through two false starts before she clears her throa You tell her that you've hired her out for a party hosted by a prominent citizen's son, home from college, and that she should be saving it for that. She promises that she will, bringing her legs together again and clearly already imagining it. You check in on her later, using the video feeds, and are treated to the sight of her wearing a recently-acquired, too-tight t-shirt with an old world college's mascot on it as she rides a dick young enough to be her son's. There's some drunken yelling, which she responds to by blowing kisses and licking her <<if $activeSlave.lips > 0>>plump <</if>>lips until another cock finds its way into her mouth. Her fee for the night is @@.yellowgreen;substantial,@@ and the student's father attaches a note to the payment. Apparently she got him too, and he's interested in hiring her for a business meeting next month. <<set $cash += 500>> <<set $activeSlave.analCount += 5>> - <<set $analCount += 5>> + <<set $analTotal += 5>> <<set $activeSlave.oralCount += 5>> - <<set $oralCount += 5>> + <<set $oralTotal += 5>> <</replace>> <</link>> @@ -501,7 +501,7 @@ She looks pensive, and goes through two false starts before she clears her throa with a weak orgasm. She giggles self-consciously and keeps humping back into you. She is a @@.hotpink;good slave girl@@ once more before going to rinse herself off in the shower, so much so that you follow her so she can be a good slave girl in the shower, too. <<set $activeSlave.devotion += 4>> <<set $activeSlave.analCount += 2>> - <<set $analCount += 2>> + <<set $analTotal += 2>> <</replace>> <</link>> <br><<link "She's a good slave girl all the time, not just right now">> @@ -518,7 +518,7 @@ She looks pensive, and goes through two false starts before she clears her throa She's so far gone into a state of prostate stimulation induced bliss that she's drooling a little. <<set $activeSlave.trust += 4>> <<set $activeSlave.analCount += 1>> - <<set $analCount += 1>> + <<set $analTotal += 1>> <</replace>> <</link>> <br><<link "Good slave girls earn money">> @@ -527,9 +527,9 @@ She looks pensive, and goes through two false starts before she clears her throa You tell her that you've hired her out for a party a prominent citizen is throwing, and that she should be a good slave girl by saving herself for that. She trips all over herself promising that she will. You check in on her later, using the video feeds, and are treated to the sight of her wearing a slinky cocktail dress, although wearing is perhaps the wrong term. She's bent over a barstool with the top of the dress pulled down <<if ($activeSlave.boobs > 1000)>>over her huge tits<<elseif ($activeSlave.boobs > 300)>>to bare her boobs<<else>>to reveal her sissy chest<</if>> and the bottom of her dress hiked up so a guest can fuck her ass. She's obviously enjoying herself, happy to be getting some at last. Her fee for the night is @@.yellowgreen;substantial,@@ and the host attaches a note to the payment, complimenting her eagerness to get assfucked and her willingness to suck cock, and asking when she'll be available next. <<set $cash += 500>> <<set $activeSlave.analCount += 5>> - <<set $analCount += 5>> + <<set $analTotal += 5>> <<set $activeSlave.oralCount += 5>> - <<set $oralCount += 5>> + <<set $oralTotal += 5>> <</replace>> <</link>> @@ -541,7 +541,7 @@ She looks pensive, and goes through two false starts before she clears her throa You tell her to head down to the wardrobe and put on the outfit that'll be laid out for her there. She obeys promptly, but does not return for some time, having gotten instructions from $assistantName along the way to put extra effort into her grooming. When she finally returns, the effect is striking. <<if $activeSlave.face > 10>>She's a gorgeous girl with or without makeup, dressed up or naked, but she's especially luscious tonight.<<else>>Her face is not flawless, but she's conscious of her transformation, and the new confidence in her beauty adds a special glow that cannot be faked.<</if>> Her evening dress is elegant; it's quite slutty by old world standards, but according to Free Cities fashion, it's just about the most conservative gown a slave can be expected to wear, and quite daring in that it isn't immediately obvious whether she's a slave or not. The tops of her areolae are hardly even visible.<br><br> You take her out to a nice lounge, with blue-toned light and soft music. She clings to your arm, pressing herself against you just the right amount: not enough to demand sex right now, but enough to raise the anticipation of it later. She's a slave, so she does not eat or drink the usual fare on offer, but the establishment is used to slaves and offers flavorful variation on liquid slave food. She drinks the translucent fluid out of a tall glass, carefully maintaining her poise. You circulate, leaving her at the bar when acquaintances appear. She perches on a stool, conscious of and pleased by the discreet admiration of her body, delectably outlined by the tight dress. Once a new arrival who did not see you with her introduces himself to her. He's tall and fit and silver-haired, but he picked her out of the room to approach, and it's with polite disappointment that he reacts to her indication of you, across the room - "I'm <<s>>orry, <<S>>ir, that'<<s>> my <<Master>> there." He offers a nonverbal apology without coming over, which you accept with a wave: it's such a common mistake in Free Cities high society that it's universally brushed off without offense. It happens again later in the night, when a slightly tipsy free woman occupies the barstool next to $activeSlave.slaveName's and keeps trying to relax against her until the flattered slave explains herself again. When you bring her home at the end of the night, her eyes are shining with @@.mediumaquamarine;private assurance,@@ and she presses herself against you more closely than ever. <<set $activeSlave.analCount += 1>> - <<set $analCount += 1>> + <<set $analTotal += 1>> <<set $activeSlave.trust += 4>> <</replace>> <</link>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index abd1ee0cd2914ac636637f3ec76e297f6979da16..df09c48f09f04151b4bcb04b52741b399d5059a6 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -10372,7 +10372,7 @@ You tell her kindly that you understand, and that she'll be trained to address t your leg. <</if>> <<if $PC.dick == 0>>After the momentary pause of your climax, you<<if $PC.vagina == 1>> use a little manual stimulation of your pussy to force yourself to total hardness again and<</if>> resume thrusting<<else>>After the momentary pause of your climax, you pull her face back to your crotch for a second round<</if>>; her acceptance of sexual slavery @@.hotpink;has increased.@@ - <<set $activeSlave.oralCount += 5, $oralCount += 5>> + <<set $activeSlave.oralCount += 5, $oralTotal += 5>> <</if>> <<set $activeSlave.devotion += 4>> <<if ($activeSlave.fetish == "submissive") && ($activeSlave.fetishKnown == 1)>> diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw index b3ee19fb2ab4f69da260508896f3630d1bf90e85..3d86473568b3f6f0cc714ddcf055b8f9e4644d8a 100644 --- a/src/uncategorized/RETS.tw +++ b/src/uncategorized/RETS.tw @@ -1915,7 +1915,7 @@ she adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of <</if>> <<else>> "I know you can't take it up your a<<ss>> right now," says $activeSlave.slaveName, "but can't I rim you for a while fir<<s>>t?" - <<set $activeSlave.oralCount++, $oralCount++>> + <<set $activeSlave.oralCount++, $oralTotal++>> <<set $subSlave.oralCount++, $oralTotal++>> <</if>> <<case "boobs">> @@ -1947,7 +1947,7 @@ she adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of is a slut for pain. "I'll hurt you," <<say>>s $activeSlave.slaveName hesitantly. Seeing that this is well received, she plunges on. "I'll rape you. Come on, I'm going to pound you <<s>>o hard and twi<<s>>t your nipple<<s>> until you don't know what hurt<<s>> wor<<s>>t, your tit<<s>> or your <<if _vaginal>>cunt<<else>>butthole<</if>>." <<default>> is pretty vanilla in bed. "Come on," <<say>>s $activeSlave.slaveName reassuringly. "You'll come more than I do, I promi<<s>>e. Fir<<s>>t I'll <<if $subSlave.dick > 0>>blow you<<else>>eat you out<</if>>. Then we'll make love. <<if $activeSlave.dick > 2>>Thi<<s>> dick will make you shudder<<else>>I'm kind of <<s>>mall down there, but I'll u<<s>>e my hand<<s>> too<</if>>." - <<set $activeSlave.oralCount++, $oralCount++>> + <<set $activeSlave.oralCount++, $oralTotal++>> <<set $subSlave.oralCount++, $oralTotal++>> <</switch>> <br><br> diff --git a/src/uncategorized/arcologyOpinion.tw b/src/uncategorized/arcologyOpinion.tw index 676c8bf799d2314e88249e82f14ecdef7b6ad757..7495c6dba98ab06ad88a28dff399919491477abd 100644 --- a/src/uncategorized/arcologyOpinion.tw +++ b/src/uncategorized/arcologyOpinion.tw @@ -330,5 +330,7 @@ <</if>> <</if>> +<<set $opinion = Number($opinion) || 0>> + <<set $activeArcology = 0>> <<set $targetArcology = 0>> diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw index dca26f556d0dd8fd69c0f3480e5846ea83d32d6d..4e3e23c96add5d04a595ba9d32c90b4d23cd156e 100644 --- a/src/uncategorized/lawCompliance.tw +++ b/src/uncategorized/lawCompliance.tw @@ -219,7 +219,7 @@ <<else>> <<set $activeSlave.oralCount += 10>> <<set $activeSlave.publicCount += 10>> - <<set $oralCount += 10>> + <<set $oralTotal += 10>> <</if>> <<if $activeSlave.anus > 0>> <<set $activeSlave.analCount += 10>> @@ -231,7 +231,7 @@ <<else>> <<set $activeSlave.oralCount += 10>> <<set $activeSlave.publicCount += 10>> - <<set $oralCount += 10>> + <<set $oralTotal += 10>> <</if>> <</if>> <<if $arcologies[0].FSRomanRevivalistSMR == 1>> diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index 8f1d7f4e71942d685821ee45bfc706ef7a3fef22..0ed024214c6ce2c0a0b3e9629844382c64c7d957 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -1925,6 +1925,7 @@ <</if>> <<set $slaveCost = ($slaveCost*_slaveMultiplier*50)>> +<<set $slaveCost = Number($slaveCost) || 0>> <<if $slaveCost < $minimumSlaveCost>> <<set $slaveCost = $minimumSlaveCost>>