From 3fb38d2bbe8d6b502bcf9d5bf2f34004243fa6f0 Mon Sep 17 00:00:00 2001 From: Svornost <11434-svornost@users.noreply.gitgud.io> Date: Thu, 16 Jul 2020 14:11:36 -0700 Subject: [PATCH] Fix a few cases where the rival would not correctly abandon an opposing FS before taking the rivalry FS --- src/uncategorized/neighborsFSAdoption.tw | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw index ac1b969e1e8..5f83942e29c 100644 --- a/src/uncategorized/neighborsFSAdoption.tw +++ b/src/uncategorized/neighborsFSAdoption.tw @@ -118,15 +118,15 @@ societal development. $desc devoted to spending time in the gym, leading the arcology to @@.yellow;adopt Physical Idealism.@@ <<set $arcologies[$i].FSPhysicalIdealist = 5>><<set _adopted = 1>> <<case "Physical Idealism">> - <<if $arcologies[$i].FSAssetExpansionist != "unset">><<set $arcologies[$i].FSAssetExpansionist = "unset">><</if>> + <<if $arcologies[$i].FSPhysicalIdealist != "unset">><<set $arcologies[$i].FSPhysicalIdealist = "unset">><</if>> $desc addicted to pleasure, leading the arcology to @@.yellow;adopt Decadent Hedonism.@@ <<set $arcologies[$i].FSHedonisticDecadence = 5>><<set _adopted = 1>> <<case "Chattel Religionism">> - <<if $arcologies[$i].FSNull != "unset">><<set $arcologies[$i].FSNull = "unset">><</if>> + <<if $arcologies[$i].FSChattelReligionist != "unset">><<set $arcologies[$i].FSChattelReligionist = "unset">><</if>> $desc open minded, leading the arcology to @@.yellow;permit cultural freedom.@@ <<set $arcologies[$i].FSNull = 5>><<set _adopted = 1>> <<case "Multiculturalism">> - <<if $arcologies[$i].FSChattelReligionist != "unset">><<set $arcologies[$i].FSChattelReligionist = "unset">><</if>> + <<if $arcologies[$i].FSNull != "unset">><<set $arcologies[$i].FSNull = "unset">><</if>> $desc devoutly religious, and interested in a reformation, leading the arcology to @@.yellow;adopt Chattel Religionism.@@ <<set $arcologies[$i].FSChattelReligionist = 5>><<set _adopted = 1>> <<case "Roman Revivalism">> -- GitLab