diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw index 61e88d89868156bc43aa2a8f9ecea54ce3e85131..11a0d89a82663de1be3b81780ceff03d197413c5 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 166bb6cff7cad9458b78ab55c30ed0ce6b3d81ff..d0a9c9dcef3f32c12ee18a24d3780eaace9fb697 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 f60f4a15781f8409b2620ba4d081d3935bfd944b..c425feb4c73a01c9db9d48ff99a4d03350c110a0 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