From 8cf3327a96c8af285c6dd8b8bea87bee50b91e0a Mon Sep 17 00:00:00 2001
From: Blank_Alt <>
Date: Wed, 19 Aug 2020 10:15:57 +1200
Subject: [PATCH] Fixes
---
js/003-data/gameVariableData.js | 10 ----------
src/002-config/fc-version.js | 2 +-
src/Mods/SecExp/edicts.tw | 2 +-
src/Mods/SecExp/js/buildingsJS.js | 1 +
src/uncategorized/fsDevelopments.tw | 2 +-
5 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 5a3a69c62c5..f2845b09c08 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -460,16 +460,6 @@ App.Data.resetOnNGPlus = {
lastSelection: [],
/* units */
- /** @type {FC.SecExp.PlayerUnitData} */
- secBots: {
- active: 0,
- ID: -1,
- isDeployed: 0,
- troops: 0,
- maxTroops: 0,
- equip: 0
- },
-
/** @type {FC.SecExp.PlayerHumanUnitData[]} */
militiaUnits: [],
/** @type {FC.SecExp.PlayerHumanUnitData[]} */
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index d6aeb9e1c1b..0d4546fe01f 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -2,5 +2,5 @@ App.Version = {
base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
pmod: "3.6.2",
commitHash: null,
- release: 1088
+ release: 1089
};
diff --git a/src/Mods/SecExp/edicts.tw b/src/Mods/SecExp/edicts.tw
index e5b288c13b9..d2b33f923bd 100644
--- a/src/Mods/SecExp/edicts.tw
+++ b/src/Mods/SecExp/edicts.tw
@@ -51,7 +51,7 @@
<br> //Will generate income dependent on the amount of upgrades installed in the security HQ, but will cost a small amount of authority each week.//
<</if>>
- <<if $SecExp.buildings.propHub.active == 1>>
+ <<if $SecExp.buildings.propHub>>
<<if $SecExp.edicts.propCampaignBoost == 1>>
<br>''Obligatory educational material:'' you are forcing residents to read curated educational material about the arcology.
[[Repeal|edicts][$SecExp.edicts.propCampaignBoost = 0]]
diff --git a/src/Mods/SecExp/js/buildingsJS.js b/src/Mods/SecExp/js/buildingsJS.js
index 32d5c7f8f19..505208bf5a8 100644
--- a/src/Mods/SecExp/js/buildingsJS.js
+++ b/src/Mods/SecExp/js/buildingsJS.js
@@ -162,6 +162,7 @@ App.SecExp.barracks = (function() {
V.SecExp.buildings.barracks.luxury = V.SecExp.buildings.barracks.luxury || 0;
V.SecExp.buildings.barracks.training = V.SecExp.buildings.barracks.training || 0;
V.SecExp.buildings.barracks.loyaltyMod = V.SecExp.buildings.barracks.loyaltyMod || 0;
+ delete V.SecExp.buildings.barracks.upgrades;
}
}
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index c0a2c588d5a..d21de06c79b 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -74,7 +74,7 @@
<</if>>
<<if $secExpEnabled > 0>>
- <<if $SecExp.buildings.propHub.active > 0 && $SecExp.buildings.propHub.campaign >= 1 && $SecExp.buildings.propHub.focus == "social engineering">>
+ <<if $SecExp.buildings.propHub && $SecExp.buildings.propHub.campaign >= 1 && $SecExp.buildings.propHub.focus == "social engineering">>
Your propaganda campaign helps further your societal engineering efforts.
<<if $SecExp.buildings.propHub.recruiterOffice == 0 || $RecruiterID == 0>>
<<if $SecExp.edicts.propCampaignBoost == 1>>
--
GitLab