From 557ca7935a7eefb60e1df423663483620a10e916 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 2 Mar 2017 19:48:10 -0500
Subject: [PATCH] 0.9.9.2
---
src/events/intro/initNationalities.tw | 14 +++++---------
src/events/intro/introSummary.tw | 14 ++------------
src/uncategorized/main.tw | 2 +-
3 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 06912423c99..bae41320894 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -81,15 +81,11 @@
/*Nationalities Setup*/
-<<set $basenationalities to []>>
-<<set $basenationalities.push("American", "Afghan", "Algerian","Argentinian", "Armenian", "Australian", "Austrian", "Bangladeshi", "Belarusian", "Belgian", "Bolivian", "Brazilian", "British", "Burmese", "Canadian", "Chilean", "Chinese", "Czech", "Colombian", "Congolese", "Cuban", "Danish", "Dominican", "Dutch", "Egyptian", "Emirati", "Estonian", "Ethiopian", "Filipina", "Finnish", "French", "German", "Ghanan", "Greek", "Guatemalan", "Haitian", "Hungarian", "Icelandic", "Indonesian", "Indian", "Iranian", "Iraqi", "Italian", "Irish", "Israeli", "Jamaican", "Japanese", "Jordanian", "Kazakh", "Kenyan", "Korean", "Lebanese", "Libyan", "Lithuanian", "Malaysian", "Malian", "Mexican", "Moroccan", "Nepalese", "a New Zealander", "Nigerian", "Norwegian", "Omani", "Pakistani", "Peruvian", "Polish", "Portuguese", "Puerto Rican", "Romanian", "Russian", "Saudi", "Scottish", "Serbian", "Slovak", "South African", "Spanish", "Sudanese", "Swedish", "Swiss", "Tanzanian", "Thai", "Tunisian", "Turkish", "Ugandan", "Ukrainian", "Uzbek", "Venezuelan", "Vietnamese", "Yemeni", "Zimbabwean")>>
+<<set $basenationalities = ["American", "Afghan", "Algerian","Argentinian", "Armenian", "Australian", "Austrian", "Bangladeshi", "Belarusian", "Belgian", "Bolivian", "Brazilian", "British", "Burmese", "Canadian", "Chilean", "Chinese", "Czech", "Colombian", "Congolese", "Cuban", "Danish", "Dominican", "Dutch", "Egyptian", "Emirati", "Estonian", "Ethiopian", "Filipina", "Finnish", "French", "German", "Ghanan", "Greek", "Guatemalan", "Haitian", "Hungarian", "Icelandic", "Indonesian", "Indian", "Iranian", "Iraqi", "Italian", "Irish", "Israeli", "Jamaican", "Japanese", "Jordanian", "Kazakh", "Kenyan", "Korean", "Lebanese", "Libyan", "Lithuanian", "Malaysian", "Malian", "Mexican", "Moroccan", "Nepalese", "a New Zealander", "Nigerian", "Norwegian", "Omani", "Pakistani", "Peruvian", "Polish", "Portuguese", "Puerto Rican", "Romanian", "Russian", "Saudi", "Scottish", "Serbian", "Slovak", "South African", "Spanish", "Sudanese", "Swedish", "Swiss", "Tanzanian", "Thai", "Tunisian", "Turkish", "Ugandan", "Ukrainian", "Uzbek", "Venezuelan", "Vietnamese", "Yemeni", "Zimbabwean"]>>
+<<set $nationalities = $basenationalities>>
-<<set $nationalities to []>>
-
-<<if ($internationalTrade != 0) || ($terrain == "oceanic")>>
-<<if $internationalVariety == 1>>
- <<set $nationalities.push("American", "Chinese", "Korean", "Indonesian", "Japanese", "Bangladeshi", "Pakistani", "Filipina", "Indian", "Belarusian", "Russian", "Egyptian", "Nigerian", "Saudi", "Turkish", "Brazilian", "Argentinian", "Colombian", "Nigerian", "Australian", "Ethiopian", "German", "Mexican", "Dominican", "Vietnamese", "Iranian", "Congolese", "French", "Thai", "British", "Italian", "Spanish", "Kenyan", "Ukrainian", "Canadian", "Peruvian", "Venezuelan", "a New Zealander", "Irish", "Scottish", "Icelandic", "Finnish", "Polish", "Israeli", "Armenian", "Greek", "Moroccan", "Romanian", "Swedish", "Lithuanian", "Bolivian", "Haitian", "Cuban", "South African", "Chilean", "Belgian", "Danish", "Czech", "Serbian", "Slovak", "Norwegian", "Dutch", "Austrian", "Swiss", "Portuguese", "Hungarian", "Estonian", "Puerto Rican", "Jamaican", "Kazakh", "Zimbabwean", "Tanzanian", "Ugandan", "Malaysian", "Guatemalan", "Ghanan", "Lebanese", "Tunisian", "Emirati", "Libyan", "Jordanian", "Omani", "Malian")>>
-<<else>>
+<<if $internationalTrade != 0>>
+<<if $internationalVariety == 0>>
<<set $nationalities.push("Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese")>>
<<set $nationalities.push("Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian")>>
<<set $nationalities.push("American","American","American","American")>>
@@ -324,7 +320,7 @@
<<set $activeArcology.FSSupremacistDecoration to 20, $activeArcology.FSSubjugationistDecoration to 20, $activeArcology.FSGenderRadicalistDecoration to 20, $activeArcology.FSGenderFundamentalistDecoration to 20, $activeArcology.FSPaternalistDecoration to 20, $activeArcology.FSDegradationistDecoration to 20, $activeArcology.FSBodyPuristDecoration to 20, $activeArcology.FSTransformationFetishistDecoration to 20, $activeArcology.FSYouthPreferentialistDecoration to 20, $activeArcology.FSMaturityPreferentialistDecoration to 20, $activeArcology.FSSlimnessEnthusiastDecoration to 20, $activeArcology.FSAssetExpansionistDecoration to 20, $activeArcology.FSPastoralistDecoration to 20, $activeArcology.FSPhysicalIdealistDecoration to 20, $activeArcology.FSChattelReligionistDecoration to 20, $activeArcology.FSRomanRevivalistDecoration to 20, $activeArcology.FSEgyptianRevivalistDecoration to 20, $activeArcology.FSEdoRevivalistDecoration to 20, $activeArcology.FSArabianRevivalistDecoration to 20, $activeArcology.FSChineseRevivalistDecoration to 20, $activeArcology.FSRepopulationFocusDecoration to 20, $activeArcology.FSRestartDecoration to 20>>
<<if $targetArcology.type != "New">>
<<set $FSAnnounced = 1>>
- <<set $activeArcology.name = $targetArcology.name, $activeArcology.prosperity = $targetArcology.prosperity, $ACitizens += $activeArcology.citizens*500>>
+ <<set $activeArcology.name = $targetArcology.name, $activeArcology.prosperity = $targetArcology.prosperity, $ACitizens += $targetArcology.citizens*500>>
<<set _decoration = $targetArcology.FSProgress + 10>>
<<switch $targetArcology.type>>
<<case "Supremacist">>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 81f05220063..331a8fd6848 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -304,16 +304,6 @@ Girls will not be able to impregnate others if their age is under <<textbox "$po
[[Enable non-erotic events|Intro Summary][$plot to 1]]
<</if>>
-<br>
-
-<<if $SFMODToggle == 1>>
- The Security Force Mod is ''enabled.''
- [[Disable|Intro Summary][$SFMODToggle to 0]]
-<<else>>
- The Security Force Mod is ''disabled.''
- [[Enable|Intro Summary][$SFMODToggle to 1]]
-<</if>>
-
<br>
/% Begin mod section: toggle whether slaves lisp. %/
@@ -704,10 +694,10 @@ Image display
<<if $SFMODToggle == 1>>
The Security Force Mod is ''enabled.''
-[[Disable|PC Body Intro][$SFMODToggle to 0]]
+[[Disable|Intro Summary][$SFMODToggle to 0]]
<<else>>
The Security Force Mod is ''disabled.''
-[[Enable|PC Body Intro][$SFMODToggle to 1]]
+[[Enable|Intro Summary][$SFMODToggle to 1]]
<</if>>
<br>
// This mod from anon1888 offers a lategame security force, triggered around week 80. It is non-canon where it conflicts with canonical updates to the base game.//
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 0c00926d022..b6ae51bf7f0 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -1,5 +1,5 @@
:: Main [nobr]
-<<set $FSAnnounced = 1>>
+
<<if $ver.contains("0.9") or $ver.contains("0.8") or $ver.contains("0.7") or $ver.contains("0.6")>>
<<if ($ver != "0.9.7") && ($ver != "0.9.8") && ($ver != "0.9.9")>>
''@@color:red;INCOMPATIBLE SAVE WARNING:@@'' your saved game was created using version $ver and you are using version 0.9.8. Please select New Game Plus from the Options menu or start a new game.
--
GitLab