From 5d06b0772b0efd0966e71bfa507b4098415cc18f Mon Sep 17 00:00:00 2001
From: hexall90 <hexall90@gmail.com>
Date: Sat, 25 Nov 2017 10:41:24 +0100
Subject: [PATCH] required adjustments to persAttention and barracks
---
src/uncategorized/barracks.tw | 4 ++--
src/uncategorized/buildingWidgets.tw | 2 +-
src/uncategorized/personalAttentionSelect.tw | 7 +++++--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/uncategorized/barracks.tw b/src/uncategorized/barracks.tw
index 8e5d3952961..70e421db904 100644
--- a/src/uncategorized/barracks.tw
+++ b/src/uncategorized/barracks.tw
@@ -8,7 +8,7 @@ The mercenaries you retain to protect $arcologies[0].name are housed in this sec
<<else>>
they don't resent an unannounced visit from their employer.
<</if>>
-As you enter the main bay of the armoury, lined with modern arms and armor and a few muscular, scarred men and women looking after their gear or suiting up to stand post, you're greeted respectfully, with<<if $personalArms > 0 && $invasionVictory > 0>> jaunty salutes and<</if>> formal <<if $PC.title == 1>>"Sir"s.<<else>>"Ma'am"s<</if>><<if $personalArms > 0 && $invasionVictory > 0>>, but also with smiles and nods<</if>>.
+As you enter the main bay of the armory, lined with modern arms and armor and a few muscular, scarred men and women looking after their gear or suiting up to stand post, you're greeted respectfully, with<<if $personalArms > 0 && $invasionVictory > 0>> jaunty salutes and<</if>> formal <<if $PC.title == 1>>"Sir"s.<<else>>"Ma'am"s<</if>><<if $personalArms > 0 && $invasionVictory > 0>>, but also with smiles and nods<</if>>.
<<if $mercenaries >= 3>>
Though few of the mercenaries are visible,
<<if $mercenaries >= 5>>
@@ -139,7 +139,7 @@ You head up a deck, to the staff area, and up one more, to look into the living
<br><br>
-<<link "Decommission the armoury and return this sector to manufacturing">>
+<<link "Decommission the armory and return this sector to manufacturing">>
<<set $barracks = 0>>
<<for _i = 0; _i < $sectors.length; _i++>>
<<if $sectors[_i].type == "Barracks">><<set $sectors[_i].type = "Manufacturing">><<break>><</if>>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index 46f49463d9c..3d2a637e2b3 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -80,7 +80,7 @@ if(!Macro.has('sectorblock')) {
Sweatshops: { base: 'Manufacturing' },
weapManu: { base: 'weaponsManufacturing', name: 'Weapons manufacturing', cls: 'weapManu' },
transportHub: { base: 'transportHub', name: 'Transport Hub', cls: 'transportHub' },
- Barracks: { base: 'Barracks', name: 'Armoury' },
+ Barracks: { base: 'Barracks', name: 'Armory' },
/* speciality shop types */
'Subjugationist': { base: 'Shops', name: 'Subjugationist Shops', cls: 'FSShops' },
'Supremacist': { base: 'Shops', name: 'Supremacist Shops', cls: 'FSShops' },
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index dcbc0e3b50b..aba36963527 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -17,11 +17,14 @@
<</if>>
<br>[[Have as much sex with your slaves as possible|Main][$personalAttention = "sex", $personalAttentionChanged = 1]]
<<if $proclamationsCooldown == 0 && $secExp == 1>>
- <br>[[Issue a proclamation|proclamations]]<br><br>
+ <br>[[Issue a proclamation|proclamations]]
<<elseif $secExp == 1>>
- <br>It's too early to issue another proclamation. Another will be available in <<if $proclamationsCooldown == 1>> one week.<<else>> $proclamationsCooldown weeks.<</if>><br><br>
+ <br>It's too early to issue another proclamation. Another will be available in <<if $proclamationsCooldown == 1>> one week.<<else>> $proclamationsCooldown weeks.<</if>>
<</if>>
+<br>
+<br>
+
<<if $PC.trading >= 100>>
//You are a master trader.//
<<else>>
--
GitLab