Skip to content
Snippets Groups Projects
Commit 4a0a9dca authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-master' into 'pregmod-master' 

Fix FS attack wording for imperialist vs revivalist FSes

See merge request pregmodfan/fc-pregmod!7734
parents 14dd4b9e a706393c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/uncategorized/neighborsDevelopment.tw
+ 13
− 13
View file @ 4a0a9dca
......@@ -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>>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment