diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 63c6056c02915467cd48eb2cd4b183d1713a6e74..2eb39ccd93200d2cfb7a55ad2c5481ab251d87ef 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4836,4 +4836,11 @@ Pregmod 0.10.3.0 -secEx tweaks 189 - -fixes and tweaks \ No newline at end of file + -fixes and tweaks + + 190 + -SFanon's fixes + + 191 + -SFanon's fixes + -Crimeanon's fixes \ No newline at end of file diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw index cbf802c5c74f5d1e00e4dfeb2efa63e82d419d31..595f6120c0d4ba1fe2c67bb89749141e6e1d809d 100644 --- a/src/SecExp/securityReport.tw +++ b/src/SecExp/securityReport.tw @@ -17,13 +17,13 @@ <strong>Security</strong>: <<if $secHelots > 0>> - <<print $secHelots>> slaves work to improve the security of your arcology + <<print $secHelots>> slaves work to improve the security of your arcology, <<if $mercenaries >= 1 && $arcologyUpgrade.drones == 1>> - , while your mercenaries and security drones tirelessly patrol the streets to keep them safe. + while your mercenaries and security drones tirelessly patrol the streets to keep them safe. <<elseif $arcologyUpgrade.drones == 1>> - , while your security drones tirelessly patrol the arcology to keep it safe. + while your security drones tirelessly patrol the arcology to keep it safe. <<else>> - , while your loyal subordinates try to keep the arcology safe to the best of their abilites. + while your loyal subordinates try to keep the arcology safe to the best of their abilites. <</if>> <<else>> <<if $mercenaries >= 1 && $arcologyUpgrade.drones == 1>> diff --git a/src/cheats/mod_EditFSCheat.tw b/src/cheats/mod_EditFSCheat.tw index a5897bf17ace4c231384f2cfbcca010f2517a245..49918d3a407df84e94352a589b9e7b789eb1ef75 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 @@ -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 @@ -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 @@ -567,33 +490,29 @@ <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalist = "unset",$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]] <</nobr>> - + - +<<nobr>> - + - + <<if $arcologies[0].FSAztecRevivalist != "unset">> - + <br>You are ''pursuing'' Aztec Revivalism. - + <<else>> - + <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 - + - + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 20>> 20 (Minimum) - + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 40>> 40 (Media support.) - + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 60>> 60 (Decorated public spaces.) - + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 80>> 80 (Slaves stationed in public spaces.) - + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 100>> 100 (Remodeled exterior; Fully customized.) - + - + <br>Law: $arcologies[0].FSAztecRevivalistLaw | - + <<radiobutton "$arcologies[0].FSAztecRevivalistLaw" 0>> 0 (Not passed.) - + | <<radiobutton "$arcologies[0].FSAztecRevivalistLaw" 1>> 1 (Passed.) - + - + <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalist = "unset",$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]] + + <<nobr>> + + <<if $arcologies[0].FSAztecRevivalist != "unset">> + <br>You are ''pursuing'' Aztec Revivalism. + <<else>> + <br>You are ''not pursuing'' Aztec Revivalism. + <</if>> + + <br>Aztec Revivalism (0-100 or unset): <<textbox "$arcologies[0].FSAztecRevivalist" $arcologies[0].FSAztecRevivalist>> + <br>Decoration: $arcologies[0].FSAztecRevivalistDecoration + + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 20>> 20 (Minimum) + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 40>> 40 (Media support.) + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 60>> 60 (Decorated public spaces.) + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 80>> 80 (Slaves stationed in public spaces.) + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 100>> 100 (Remodeled exterior; Fully customized.) + + <br>Law: $arcologies[0].FSAztecRevivalistLaw | + <<radiobutton "$arcologies[0].FSAztecRevivalistLaw" 0>> 0 (Not passed.) + | <<radiobutton "$arcologies[0].FSAztecRevivalistLaw" 1>> 1 (Passed.) + + <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalist = "unset",$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]] <</nobr>> <<nobr>> @@ -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/pregmod/SFMBarracksSlaveSupport.tw b/src/pregmod/SecForceEX/SFMBarracksSlaveSupport.tw similarity index 100% rename from src/pregmod/SFMBarracksSlaveSupport.tw rename to src/pregmod/SecForceEX/SFMBarracksSlaveSupport.tw diff --git a/src/pregmod/SlaveSupport.tw b/src/pregmod/SecForceEX/SlaveSupport.tw similarity index 100% rename from src/pregmod/SlaveSupport.tw rename to src/pregmod/SecForceEX/SlaveSupport.tw diff --git a/src/pregmod/SlaveSupportReport.tw b/src/pregmod/SecForceEX/SlaveSupportReport.tw similarity index 100% rename from src/pregmod/SlaveSupportReport.tw rename to src/pregmod/SecForceEX/SlaveSupportReport.tw diff --git a/src/pregmod/SpecialForceUpgradeDec.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw similarity index 100% rename from src/pregmod/SpecialForceUpgradeDec.tw rename to src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw diff --git a/src/pregmod/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw similarity index 100% rename from src/pregmod/SpecialForceUpgradeOptions.tw rename to src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw diff --git a/src/pregmod/SpecialForceUpgradeTree.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw similarity index 100% rename from src/pregmod/SpecialForceUpgradeTree.tw rename to src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw diff --git a/src/pregmod/securityForceTradeShow.tw b/src/pregmod/SecForceEX/securityForceTradeShow.tw similarity index 100% rename from src/pregmod/securityForceTradeShow.tw rename to src/pregmod/SecForceEX/securityForceTradeShow.tw diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw index 124644242f62709d754abf71112648eea064f72c..ce30e57fc28a26b3202f3725c35f3bb66fb5ca42 100644 --- a/src/uncategorized/nonRandomEvent.tw +++ b/src/uncategorized/nonRandomEvent.tw @@ -158,7 +158,7 @@ <<goto "secExpSmilingMan">> <<elseif $rivalOwner == 0 && $smilingManProgress == 3 && $secExp == 1>> <<goto "secExpSmilingMan">> -<<elseif (_effectiveWeek > 84) && $LieutenantColonel != 0 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance == 0>>> +<<elseif (_effectiveWeek > 84) && $LieutenantColonel != 0 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance == 0>> <<goto "securityForceTradeShow">> <<else>> <<if random(1,100) > _effectiveWeek+25>> diff --git a/src/uncategorized/pSchoolSuggestion.tw b/src/uncategorized/pSchoolSuggestion.tw index f1a90999f3a9f3c5cb420028066d4d9af7f78fd2..67d42d33779c02d1037e8261f901732d3c8eb913 100644 --- a/src/uncategorized/pSchoolSuggestion.tw +++ b/src/uncategorized/pSchoolSuggestion.tw @@ -28,7 +28,7 @@ An older woman standing across from him sniffs. "St. Claver's knows how to do bo The unusually competent young heiress standing next to him snickers. "If you're going to bring up refinement, um, hello, the Futanari Sisters. I have four futas in my apartment having sex with each other right now. How do I know? Because they're always having sex with each other. They never stop." Her eyes take on a faraway look and she pauses. "Um, haha, I know what I'm doing later." <</if>> <br><br> -"If you like them soft and mellow, you got to go with The Cattle Ranch," a portly man blurts loudly while slamming down his emtpy mug. "I've got a pair of 'em for my bedroom; they are so loving after a good milking. Taste good too." His drinking budy retorts, "Too much work is what they are. They might as well be animals with how they act." +"If you like them soft and mellow, you got to go with The Cattle Ranch," a buff man blurts loudly while slamming down his emtpy mug. "I've got a pair of 'em for my bedroom; they are so loving after a good milking. Taste good too." His drinking budy retorts, "Too much work is what they are. They might as well be animals with how they act." <br><br> "I see good taste is scarce within this walls" suddenly stated a young man previously quiet in his corner. "I say quality and strength is where the game should be played and there's nothing better than the girls from the Hippolyta Academy. <br><br>