From e764e2481dc4a71a1db73c56e969f00610384fa0 Mon Sep 17 00:00:00 2001 From: hexall90 <hexall90@gmail.com> Date: Mon, 13 Nov 2017 12:15:18 +0100 Subject: [PATCH] SFanon stuff --- src/SecExp/edicts.tw | 2 +- src/SecExp/seeUnit.tw | 6 +++--- src/SecExp/transportHub.tw | 15 +++++++++++---- src/SecExp/weaponsManufacturing.tw | 15 +++++++++------ src/uncategorized/arcologyDescription.tw | 23 +++++++++++++++++++++++ 5 files changed, 47 insertions(+), 14 deletions(-) diff --git a/src/SecExp/edicts.tw b/src/SecExp/edicts.tw index 14368867025..06f5ffb4a2d 100644 --- a/src/SecExp/edicts.tw +++ b/src/SecExp/edicts.tw @@ -273,7 +273,7 @@ <<else>> <br>//Not enough Authority.// <</if>> - <br> //Will provide income based on trade level, but will negatively affect trade trade.// + <br> //Will provide income based on trade level, but will negatively affect trade.// <</if>> <</if>> diff --git a/src/SecExp/seeUnit.tw b/src/SecExp/seeUnit.tw index f9d053ca08f..03aaf8d9712 100644 --- a/src/SecExp/seeUnit.tw +++ b/src/SecExp/seeUnit.tw @@ -114,7 +114,7 @@ Attach $securityForceName advisors to the unit. <br>//Costs <<print ($equipUpgradeCost * $militiaUnits[$targetIndex].maxTroops) + 5000>> and will slightly increase the base stats of the unit.// <<else>> - The unit has a medic detachment following it into battle, decreasing the number of casualties the unit suffers. + The unit has attached advisors from The Department that will help the squad remain tactically aware and active. <</if>> <</if>> <<if $showBattleStatistics == 1>> @@ -200,7 +200,7 @@ Attach $securityForceName advisors to the unit. <br>//Costs <<print ($equipUpgradeCost * $slaveUnits[$targetIndex].maxTroops) + 5000>> and will slightly increase the base stats of the unit.// <<else>> - The unit has a medic detachment following it into battle, decreasing the number of casualties the unit suffers. + The unit has attached advisors from The Department that will help the squad remain tactically aware and active. <</if>> <</if>> <<if $showBattleStatistics == 1>> @@ -286,7 +286,7 @@ Attach $securityForceName advisors to the unit. <br>//Costs <<print ($equipUpgradeCost * $mercUnits[$targetIndex].maxTroops) + 5000>> and will slightly increase the base stats of the unit.// <<else>> - The unit has a medic detachment following it into battle, decreasing the number of casualties the unit suffers. + The unit has attached advisors from The Department that will help the squad remain tactically aware and active. <</if>> <</if>> <<if $showBattleStatistics == 1>> diff --git a/src/SecExp/transportHub.tw b/src/SecExp/transportHub.tw index a96aaa4d870..6561ad99c39 100644 --- a/src/SecExp/transportHub.tw +++ b/src/SecExp/transportHub.tw @@ -2,11 +2,18 @@ <<set $nextButton = "Back", $nextLink = "Main">> -<strong>The transport hub</strong> +<strong>The Transport Hub</strong> <hr> -You quickly reach the transport hub, here a continuos stream of vehicles, people and goods. 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. +<<elseif $openBorders = 1 || $ProImmigrationCash == 1>> + Due to your liberal policies concerning immigration, the transport hub is filled with a flow of new citizens. +<</if>> + <<if $airport == 1>> - The arcology's airport is relatively small and underequipped. It can handle some traffic, but nothing noteworthy. + The arcology's airport is relatively small and poorly equipped. It can handle some traffic, but nothing noteworthy. <<elseif $airport == 2>> The arcology's airport is relatively small, but well equipped. It can handle some traffic, but nothing too serious. <<elseif $airport == 3>> @@ -21,7 +28,7 @@ You quickly reach the transport hub, here a continuos stream of vehicles, people <<if $railway == 1>> The railway network is old and limited. It can handle some traffic, but not sustain commercial activity. <<elseif $railway == 2>> - The railway network is modern and efficient, but limited in reach. It can handle some traffic, but not sustain commercial activity of significant size. + The railway network is modern and efficient, but limited in reach. It can handle some traffic, but not sustain commercial activity of any significant size. <<elseif $railway == 3>> The railway network is modern, efficient and expansive. It can handle a significant amount of traffic. <<else>> diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw index 81980612f3f..9739a1f3c01 100644 --- a/src/SecExp/weaponsManufacturing.tw +++ b/src/SecExp/weaponsManufacturing.tw @@ -96,9 +96,9 @@ You own $helots free menial slaves. This manufacturing complex can house 500 at <<set $weapProductivity++>> <<goto "weaponsManufacturing">> <</link>> - //Will cost <<print 10000 * $weapProductivity>> and will increase the facility income as well as speed up upgrades// -<<else>> - You have automated the complex to the limit. + //Will cost <<print 10000 * $weapProductivity>> and will increase the facility income in addition to speeding up upgrade production.// +<<elseif $weapLab < 3>> + You have fully automated the complex. <</if>> <br> <<if $weapLab < 3>> @@ -108,8 +108,11 @@ You own $helots free menial slaves. This manufacturing complex can house 500 at <<goto "weaponsManufacturing">> <</link>> //Will cost <<print 10000 * $weapLab>> and will increase the facility income as well as unlock upgrades for our troops// -<<else>> - You have upgraded the research facilities of the complex to the limit. +<<elseif $weapProductivity < 5>> + You have fully upgraded and funded the R&D department +<</if>> +<<if $weapLab >= 3 && $weapProductivity >= 5>> + The facility is completely automated and its R&D department is fully upgraded and funded. <</if>> <br> <br> @@ -175,7 +178,7 @@ __Markets__: <br> <<set _time = $baseUpgradeTime / $weapProductivity>> __Upgrades__: -<br>With our current industrial and research capabilities upgrades will be finished in <<print _time>>. +<br>With our current industrial and research capabilities upgrades will be finished in <<print _time>> weeks. <br> <<if $currentUpgrade.time <= 0>> /* Drones upgrades */ diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw index 13497474137..4dda0420329 100644 --- a/src/uncategorized/arcologyDescription.tw +++ b/src/uncategorized/arcologyDescription.tw @@ -366,6 +366,29 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el <</if>> <</if>> +<<if $secExp == 1>> + <<if $propHub == 1>> + The propaganda hub is a surprisingly inconspicuous building that deals with your personal affairs and public image, protection and population control. + <</if>> + <br> + <<if $secHQ == 1>> + The Security HQ deals with building a safe and prosperous arcology. + <</if>> + <br> + <<if $secBarracks == 1>> + The security barracks manages the defense force of $arcologies[0].name. + <</if>> + <<if $weapManu = 1>> + Down in the lower levels of the arcology the weapons manufacturing facility dominates the environment. + <</if>> + <<if $riotCenter == 1>> + The riot control centre helps to manage dissidents and dangerous political forces in $arcologies[0].name. + <</if>> + <<if $transportHub == 1>> + The trasnport hub deals with new arrivals to $arcologies[0].name via <<if $railway == 1>>land<<if $docks == 1>>,sea<<if $airport == 1>>and air<</if>>. + <</if>> +<</if>> + <<if ($arcologies[0].FSSupremacistDecoration >= 60) || ($arcologies[0].FSSubjugationistDecoration >= 60) || ($arcologies[0].FSGenderRadicalistDecoration >= 60) || ($arcologies[0].FSGenderFundamentalistDecoration >= 60) || ($arcologies[0].FSPaternalistDecoration >= 60) || ($arcologies[0].FSDegradationistDecoration >= 60) || ($arcologies[0].FSBodyPuristDecoration >= 60) || ($arcologies[0].FSTransformationFetishistDecoration >= 60) || ($arcologies[0].FSYouthPreferentialistDecoration >= 60) || ($arcologies[0].FSMaturityPreferentialistDecoration >= 60) || ($arcologies[0].FSSlimnessEnthusiastDecoration >= 60) || ($arcologies[0].FSAssetExpansionistDecoration >= 60) || ($arcologies[0].FSPastoralistDecoration >= 60) || ($arcologies[0].FSPhysicalIdealistDecoration >= 60) || ($arcologies[0].FSChattelReligionistDecoration >= 60) || ($arcologies[0].FSRomanRevivalistDecoration >= 60) || ($arcologies[0].FSAztecRevivalistDecoration >= 60) || ($arcologies[0].FSEgyptianRevivalistDecoration >= 60) || ($arcologies[0].FSEdoRevivalistDecoration >= 60) || ($arcologies[0].FSArabianRevivalistDecoration >= 60) || ($arcologies[0].FSChineseRevivalistDecoration >= 60) || ($arcologies[0].FSRepopulationFocusDecoration >= 60) || ($arcologies[0].FSRestartDecoration >= 60) || ($arcologies[0].FSHedonisticDecadenceDecoration >= 60)>> <br> The central plaza is a large open atrium lined with banners. -- GitLab