From a706393c0188dcc401fca41d397d76e3f8c3e00b Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sat, 12 Sep 2020 16:25:17 -0700
Subject: [PATCH] Fix incompatibility wording (it's the incompatible FS, not
the active one)
---
src/uncategorized/neighborsDevelopment.tw | 26 +++++++++++------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index ba3259bd0e8..98790d40133 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -1631,7 +1631,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh
<<set $desc.push("helping to advance its Roman Revivalism")>>
<<elseif $arcologies[$i].FSNeoImperialist != "unset">>
<<set $arcologies[$i].FSNeoImperialist -= Math.trunc(($arcologies[$j].FSRomanRevivalist-60)/4)+_appliedInfluenceBonus>>
- <<set $desc.push("attacking its incompatible Revivalism")>>
+ <<set $desc.push("attacking its incompatible Imperialism")>>
<<elseif $arcologies[$i].FSAztecRevivalist != "unset">>
<<set $arcologies[$i].FSAztecRevivalist -= Math.trunc(($arcologies[$j].FSRomanRevivalist-60)/4)+_appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
@@ -1653,9 +1653,9 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh
<<set $arcologies[$i].FSAztecRevivalist += Math.trunc(($arcologies[$j].FSAztecRevivalist-60)/4)+_appliedInfluenceBonus>>
<<if $arcologies[$i].FSAztecRevivalist > $FSLockinLevel>><<set _alignment += 1>><</if>>
<<set $desc.push("helping to advance its Aztec Revivalism")>>
- <<elseif $arcologies[$i].FSNeoImperialist != "unset">>
+ <<elseif $arcologies[$i].FSNeoImperialist != "unset">>
<<set $arcologies[$i].FSNeoImperialist -= Math.trunc(($arcologies[$j].FSAztecRevivalist-60)/4)+_appliedInfluenceBonus>>
- <<set $desc.push("attacking its incompatible Revivalism")>>
+ <<set $desc.push("attacking its incompatible Imperialism")>>
<<elseif $arcologies[$i].FSRomanRevivalist != "unset">>
<<set $arcologies[$i].FSRomanRevivalist -= Math.trunc(($arcologies[$j].FSAztecRevivalist-60)/4)+_appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
@@ -1682,7 +1682,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh
<<set $desc.push("attacking its incompatible Revivalism")>>
<<elseif $arcologies[$i].FSNeoImperialist != "unset">>
<<set $arcologies[$i].FSNeoImperialist -= Math.trunc(($arcologies[$j].FSEgyptianRevivalist-60)/4)+_appliedInfluenceBonus>>
- <<set $desc.push("attacking its incompatible Revivalism")>>
+ <<set $desc.push("attacking its incompatible Imperialism")>>
<<elseif $arcologies[$i].FSAztecRevivalist != "unset">>
<<set $arcologies[$i].FSAztecRevivalist -= Math.trunc(($arcologies[$j].FSEgyptianRevivalist-60)/4)+_appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
@@ -1706,7 +1706,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh
<<set $desc.push("attacking its incompatible Revivalism")>>
<<elseif $arcologies[$i].FSNeoImperialist != "unset">>
<<set $arcologies[$i].FSNeoImperialist -= Math.trunc(($arcologies[$j].FSEdoRevivalist-60)/4)+_appliedInfluenceBonus>>
- <<set $desc.push("attacking its incompatible Revivalism")>>
+ <<set $desc.push("attacking its incompatible Imperialism")>>
<<elseif $arcologies[$i].FSRomanRevivalist != "unset">>
<<set $arcologies[$i].FSRomanRevivalist -= Math.trunc(($arcologies[$j].FSEdoRevivalist-60)/4)+_appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
@@ -1730,7 +1730,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh
<<set $desc.push("attacking its incompatible Revivalism")>>
<<elseif $arcologies[$i].FSNeoImperialist != "unset">>
<<set $arcologies[$i].FSNeoImperialist -= Math.trunc(($arcologies[$j].FSArabianRevivalist-60)/4)+_appliedInfluenceBonus>>
- <<set $desc.push("attacking its incompatible Revivalism")>>
+ <<set $desc.push("attacking its incompatible Imperialism")>>
<<elseif $arcologies[$i].FSEdoRevivalist != "unset">>
<<set $arcologies[$i].FSEdoRevivalist -= Math.trunc(($arcologies[$j].FSArabianRevivalist-60)/4)+_appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
@@ -1754,7 +1754,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh
<<set $desc.push("attacking its incompatible Revivalism")>>
<<elseif $arcologies[$i].FSNeoImperialist != "unset">>
<<set $arcologies[$i].FSNeoImperialist -= Math.trunc(($arcologies[$j].FSChineseRevivalist-60)/4)+_appliedInfluenceBonus>>
- <<set $desc.push("attacking its incompatible Revivalism")>>
+ <<set $desc.push("attacking its incompatible Imperialism")>>
<<elseif $arcologies[$i].FSEdoRevivalist != "unset">>
<<set $arcologies[$i].FSEdoRevivalist -= Math.trunc(($arcologies[$j].FSChineseRevivalist-60)/4)+_appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
@@ -1776,22 +1776,22 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh
<<set $desc.push("helping to advance its Neo-Imperialism")>>
<<elseif $arcologies[$i].FSEgyptianRevivalist != "unset">>
<<set $arcologies[$i].FSEgyptianRevivalist -= Math.trunc(($arcologies[$j].FSChineseRevivalist-60)/4)+_appliedInfluenceBonus>>
- <<set $desc.push("attacking its incompatible Imperialism")>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
<<elseif $arcologies[$i].FSChineseRevivalist != "unset">>
<<set $arcologies[$i].FSChineseRevivalist -= Math.trunc(($arcologies[$j].FSChineseRevivalist-60)/4)+_appliedInfluenceBonus>>
- <<set $desc.push("attacking its incompatible Imperialism")>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
<<elseif $arcologies[$i].FSEdoRevivalist != "unset">>
<<set $arcologies[$i].FSEdoRevivalist -= Math.trunc(($arcologies[$j].FSChineseRevivalist-60)/4)+_appliedInfluenceBonus>>
- <<set $desc.push("attacking its incompatible Imperialism")>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
<<elseif $arcologies[$i].FSArabianRevivalist != "unset">>
<<set $arcologies[$i].FSArabianRevivalist -= Math.trunc(($arcologies[$j].FSChineseRevivalist-60)/4)+_appliedInfluenceBonus>>
- <<set $desc.push("attacking its incompatible Imperialism")>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
<<elseif $arcologies[$i].FSRomanRevivalist != "unset">>
<<set $arcologies[$i].FSRomanRevivalist -= Math.trunc(($arcologies[$j].FSChineseRevivalist-60)/4)+_appliedInfluenceBonus>>
- <<set $desc.push("attacking its incompatible Imperialism")>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
<<elseif $arcologies[$i].FSAztecRevivalist != "unset">>
<<set $arcologies[$i].FSAztecRevivalist -= Math.trunc(($arcologies[$j].FSChineseRevivalist-60)/4)+_appliedInfluenceBonus>>
- <<set $desc.push("attacking its incompatible Imperialism")>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
<</if>>
<</if>>
--
GitLab