From d03c4d96f171e9cd49780b401371bb5cf0e55655 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sat, 15 Sep 2018 12:02:19 -0400
Subject: [PATCH] Fix
---
src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw | 6 ++++++
src/uncategorized/neighborsFSAdoption.tw | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw b/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw
index 34f6bef7878..0a7b83112b9 100644
--- a/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw
+++ b/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw
@@ -13,9 +13,15 @@
<<if $arcologies[_i].FSSupremacist != "unset">>
<<set $arcologies[_i].FSSupremacist = Number($arcologies[_i].FSSupremacist) || "unset">>
<</if>>
+ <<if $arcologies[_i].FSSupremacist != "unset" && !["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($arcologies[_i].FSSupremacistRace)>>
+ <<set $arcologies[_i].FSSupremacistRace = either("white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race")>>
+ <</if>>
<<if $arcologies[_i].FSSubjugationist != "unset">>
<<set $arcologies[_i].FSSubjugationist = Number($arcologies[_i].FSSubjugationist) || "unset">>
<</if>>
+ <<if $arcologies[_i].FSSubjugationist != "unset" && !["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($arcologies[_i].FSSubjugationistRace)>>
+ <<set $arcologies[_i].FSSubjugationistRace = either("white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race")>>
+ <</if>>
<<if $arcologies[_i].FSGenderRadicalist != "unset">>
<<set $arcologies[_i].FSGenderRadicalist = Number($arcologies[_i].FSGenderRadicalist) || "unset">>
<<set $arcologies[_i].FSGenderFundamentalist = "unset">>
diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw
index 963e979674c..879685cc2d3 100644
--- a/src/uncategorized/neighborsFSAdoption.tw
+++ b/src/uncategorized/neighborsFSAdoption.tw
@@ -38,7 +38,7 @@ societal development.
<<set $arcologies[$i].FSSupremacistRace = $arcologies[0].FSSubjugationistRace>>
<<case "Racial Supremacism">>
<<if $arcologies[$i].FSSupremacist != "unset">><<set $arcologies[$i].FSSupremacist = "unset">><</if>>
- $desc preoccupied by a racial animus towards $arcologies[0].FSSupremacistRace people, leaing the arcology to @@.yellow;adopt $arcologies[0].FSSupremacistRace Subjugation.@@
+ $desc preoccupied by a racial animus towards $arcologies[0].FSSupremacistRace people, leaving the arcology to @@.yellow;adopt $arcologies[0].FSSupremacistRace Subjugation.@@
<<set $arcologies[$i].FSSubjugationist = 5>><<set _adopted = 1>>
<<set $arcologies[$i].FSSubjugationistRace = $arcologies[0].FSSupremacistRace>>
<<case "Repopulation Focus">>
@@ -966,7 +966,7 @@ societal development.
<<if ($arcologies[$i].FSSupremacist == "unset") || (_subjugationRace != $arcologies[$i].FSSupremacistRace)>>
$desc preoccupied by a racial animus towards _subjugationRace people, leading the arcology to @@.yellow;adopt _subjugationRace Subjugation.@@
<<set $arcologies[$i].FSSubjugationist = 5>><<set _adopted = 1>>
- <<set $arcologies[$i].FSSubjugationistRace = _supremacistRace>>
+ <<set $arcologies[$i].FSSubjugationistRace = _subjugationRace>>
<</if>>
<</if>>
<<case 2>>
--
GitLab