From cc504e3c11983439e514685ed8d6ef2ea0b2520a Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Sat, 1 Feb 2020 19:06:35 -0800
Subject: [PATCH] re-enableBattles
---
src/SecExp/attackReport.tw | 17 +++++++++++++----
src/SecExp/js/secExp.js | 2 +-
src/uncategorized/options.tw | 4 ----
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 61e88d89868..11a0d89a826 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -1549,11 +1549,20 @@
<<set $SFIntervention = 0>>
<<set $secBots.isDeployed = 0>>
<<for _i = 0; _i < $militiaUnits.length; _i++>>
- <<set $militiaUnits[_i].isDeployed = 0>>
+ <<if $militiaUnits[_i].isDeployed > 0>>
+ <<set $militiaUnits[_i].battlesFought++>>
+ <<set $militiaUnits[_i].isDeployed = 0>>
+ <</if>>
<</for>>
<<for _i = 0; _i < $slaveUnits.length; _i++>>
- <<set $slaveUnits[_i].isDeployed = 0>>
+ <<if $slaveUnits[_i].isDeployed > 0>>
+ <<set $slaveUnits[_i].battlesFought++>>
+ <<set $slaveUnits[_i].isDeployed = 0>>
+ <</if>>
<</for>>
<<for _i = 0; _i < $mercUnits.length; _i++>>
- <<set $mercUnits[_i].isDeployed = 0>>
-<</for>>
+ <<if $mercUnits[_i].isDeployed > 0>>
+ <<set $slaveUnits[_i].battlesFought++>>
+ <<set $mercUnits[_i].isDeployed = 0>>
+ <</if>>
+<</for>>
\ No newline at end of file
diff --git a/src/SecExp/js/secExp.js b/src/SecExp/js/secExp.js
index 166bb6cff7c..d0a9c9dcef3 100644
--- a/src/SecExp/js/secExp.js
+++ b/src/SecExp/js/secExp.js
@@ -459,7 +459,7 @@ App.SecExp.Check = (function() {
}
V.SecExp.settings.battle = V.SecExp.settings.battle || {};
- V.SecExp.settings.battle.enabled = 0;
+ V.SecExp.settings.battle.enabled = V.SecExp.settings.battle.enabled || 1;
if (jsDef(V.battlesEnabled)) {
V.SecExp.settings.battle.enabled = V.battlesEnabled;
delete V.battlesEnabled;
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index f60f4a15781..c425feb4c73 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -670,15 +670,11 @@ This save was created using FC version $ver build $releaseID.
<br>
<</if>>
- <<set $SecExp.settings.battle.enabled = 0>>
- /*
<<options $SecExp.settings.battle.enabled>>
Battles are
<<option 1 "Enabled">>
<<option 0 "Disabled">>
<</options>>
- */
- To assist fixing, battles are hard disabled until further notice.
<<options $SecExp.settings.rebellion.enabled>>
Rebellions are
--
GitLab