From c8813845edabfe23ce9171b2f01bfe34ac06ddab Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 6 Dec 2017 18:05:20 -0500 Subject: [PATCH] Fixes --- src/SecExp/securityReport.tw | 2 +- src/SecExp/tradeReport.tw | 2 +- src/SecExp/transportHub.tw | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw index aad8825bfde..230be15cbd9 100644 --- a/src/SecExp/securityReport.tw +++ b/src/SecExp/securityReport.tw @@ -100,7 +100,7 @@ <</if>> <<if $transportHub == 1>> - <<if $terrain != "oceanic" || $terrain != "marine">> + <<if $terrain != "oceanic" && $terrain != "marine">> <<set _secGrowth += ($airport + $railway - $hubSecurity * 3) / 2>> <<else>> <<set _secGrowth += ($airport + $docks - $hubSecurity * 3) / 2>> diff --git a/src/SecExp/tradeReport.tw b/src/SecExp/tradeReport.tw index d08c807307a..16c308cc882 100644 --- a/src/SecExp/tradeReport.tw +++ b/src/SecExp/tradeReport.tw @@ -76,7 +76,7 @@ The arcology's airport is an incredible boon to the commercial development of the arcology.<<set _tradeChange += 3>> <</if>> - <<if $terrain != "oceanic" || $terrain != "marine">> + <<if $terrain != "oceanic" && $terrain != "marine">> <<if $railway == 1>> The railway network's age and limited extension limit commercial activity. <<elseif $railway == 2>> diff --git a/src/SecExp/transportHub.tw b/src/SecExp/transportHub.tw index f83f9aeb042..d813ed19796 100644 --- a/src/SecExp/transportHub.tw +++ b/src/SecExp/transportHub.tw @@ -4,7 +4,7 @@ <strong>The Transport Hub</strong> <hr> -You quickly reach the transport hub, where a constant stream of vehicles, people and goods greets you. Part of the structure is dedicated to air travel and the other is mainly occupied by <<if $terrain != "oceanic" || $terrain != "marine">>the rail station.<<else>> the docks.<</if>> +You quickly reach the transport hub, where a constant stream of vehicles, people and goods greets you. Part of the structure is dedicated to air travel and the other is mainly occupied by <<if $terrain != "oceanic" && $terrain != "marine">>the rail station.<<else>> the docks.<</if>> <<if $limitImmigration == 1 || $AntiImmigrationRep == 1>> Due to your strict policies concerning immigration, very few new citizens arrive in the transport hub. @@ -24,7 +24,7 @@ You quickly reach the transport hub, where a constant stream of vehicles, people The arcology's airport is huge and very well equipped. It can handle an impressive amount of traffic. <</if>> -<<if $terrain != "oceanic" || $terrain != "marine">> +<<if $terrain != "oceanic" && $terrain != "marine">> <<if $railway == 1>> The railway network is old and limited. It can handle some traffic, but not sustain commercial activity. <<elseif $railway == 2>> @@ -107,7 +107,7 @@ You quickly reach the transport hub, where a constant stream of vehicles, people <</if>> <br> /* trainyard/dockyard */ -<<if $terrain != "oceanic" || $terrain != "marine">> +<<if $terrain != "oceanic" && $terrain != "marine">> <<if $railway == 1>> <br> <<link "Modernize the railway">> -- GitLab