From a93023ec3eb1c7eac5e617eb2d559bd0a0c8fc2c Mon Sep 17 00:00:00 2001 From: hexall90 <hexall90@gmail.com> Date: Sat, 11 Nov 2017 08:45:24 +0100 Subject: [PATCH] adjustmentd --- src/SecExp/widgets/miscSecExpWidgets.tw | 42 +++++-------------------- 1 file changed, 7 insertions(+), 35 deletions(-) diff --git a/src/SecExp/widgets/miscSecExpWidgets.tw b/src/SecExp/widgets/miscSecExpWidgets.tw index 04d727fb3c1..e9e71edac01 100644 --- a/src/SecExp/widgets/miscSecExpWidgets.tw +++ b/src/SecExp/widgets/miscSecExpWidgets.tw @@ -204,48 +204,20 @@ <<widget "fixBrokenUnits">> <<for _i = 0; _i < $militiaUnits.length; _i++>> - <<if ndef $militiaUnits[_i].ID || $militiaUnits[_i].ID == 0>> - <<set _newMilitiaUnit = { - ID: 0, - platoonName: $militiaUnits[_i].platoonName, - active: $militiaUnits[_i].active, - isDeployed: 0, - troops: 0, - maxTroops: $militiaUnits[_i].maxTroops, - equip: $militiaUnits[_i].equip, - training: $militiaUnits[_i].training, - loyalty: $militiaUnits[_i].loyalty, - medics: $militiaUnits[_i],medics, - SF: 0, - commissars: 0, - battlesFought: $militiaUnits[_i].battlesFought}>> - <<generateUnitID _newMilitiaUnit>> - <<else>> - <<set _newMilitiaUnit = { - ID: $militiaUnits[_i].ID, - platoonName: $militiaUnits[_i].platoonName, - active: $militiaUnits[_i].active, - isDeployed: 0, - troops: 0, - maxTroops: $militiaUnits[_i].maxTroops, - equip: $militiaUnits[_i].equip, - training: $militiaUnits[_i].training, - loyalty: $militiaUnits[_i].loyalty, - medics: $militiaUnits[_i],medics, - SF: 0, - commissars: 0, - battlesFought: $militiaUnits[_i].battlesFought}>> - <</if>> <<if ndef $militiaUnits[_i].SF>> <br>Set militia missing flag - <<set _newMilitiaUnit.SF = 0>> + <<set $militiaUnits[_i].SF = 0>> + <</if>> + <<if ndef $militiaUnits[_i].ID>> + <br>Set militia missing ID + <<generateUnitID $militiaUnits[_i]>> <</if>> <<if ndef $militiaUnits[_i].commissars>> <br>Set militia missing flag - <<set _newMilitiaUnit.commissars = 0>> + <<set $militiaUnits[_i].commissars = 0>> <</if>> <<if !isInt($militiaUnits[_i].troops)>> - <<set _newMilitiaUnit.troops = _newMilitiaUnit.maxTroops>> + <<set $militiaUnits[_i].troops = $militiaUnits[_i].maxTroops>> <br>Fixed militia unit wrong troop count. <</if>> <</for>> -- GitLab