From 86e26cbb7603c3df2832d1a483667d31a30bfc52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Mon, 18 Jul 2022 22:19:07 +0200
Subject: [PATCH 01/38] GH-91 Simplify own fleets & defenses object generation

---
 simulator.php                            | 45 ++++++++++++++----------
 templates/default_template/simulator.tpl |  2 +-
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/simulator.php b/simulator.php
index 1de3cad65..fc4a053bd 100644
--- a/simulator.php
+++ b/simulator.php
@@ -7,6 +7,8 @@
 
 use UniEngine\Engine\Modules\Flights;
 
+use UniEngine\Engine\Includes\Helpers\World;
+
 loggedCheck();
 
 includeLang('simulator');
@@ -669,30 +671,37 @@ function ($matches) use ($Offsets) {
 );
 
 $_Lang['fill_with_mytechs'] = "var MyTechs = new Array();\nMyTechs[1] = ".(string)($_User['tech_weapons'] + 0).";\nMyTechs[3] = ".(string)($_User['tech_shielding'] + 0).";\nMyTechs[2] = ".(string)($_User['tech_armour'] + 0).";\nMyTechs[4] = ".(string)($_User['tech_laser'] + 0).";\nMyTechs[5] = ".(string)($_User['tech_ion'] + 0).";\nMyTechs[6] = ".(string)($_User['tech_plasma'] + 0).";\nMyTechs[7] = ".(string)($_User['tech_antimatter'] + 0).";\nMyTechs[8] = ".(string)($_User['tech_disintegration'] + 0).";\nMyTechs[9] = ".(string)($_User['tech_graviton'] + 0).";\n";
-$_Lang['fill_with_myfleets'] = "var MyFleets = new Array();\n";
 
 $UsingPrettyInputBox = ($_User['settings_useprettyinputbox'] == 1 ? true : false);
 
-foreach($_Vars_ElementCategories['fleet'] as $ID)
-{
-    if($_Planet[$_Vars_GameElements[$ID]] > 0)
-    {
-        $_Lang['fill_with_myfleets'] .= "MyFleets[{$ID}] = '".($UsingPrettyInputBox === true ? prettyNumber($_Planet[$_Vars_GameElements[$ID]]) : $_Planet[$_Vars_GameElements[$ID]])."';\n";
+$fleetsAndDefenses = array_filter(
+    array_merge($_Vars_ElementCategories['fleet'], $_Vars_ElementCategories['defense']),
+    function ($elementId) {
+        return (
+            World\Elements\isShip($elementId) ||
+            World\Elements\isDefenseSystem($elementId)
+        );
     }
-}
-foreach($_Vars_ElementCategories['defense'] as $ID)
-{
-    if(in_array($ID, $_Vars_ElementCategories['rockets']))
-    {
-        continue;
+);
+$ownFleetsAndDefenses = object_map(
+    $fleetsAndDefenses,
+    function ($elementId) use (&$_Planet, &$_User, $UsingPrettyInputBox) {
+        $currentCount = World\Elements\getElementCurrentCount($elementId, $_Planet, $_User);
+        $currentCountDisplay = (
+            $UsingPrettyInputBox ?
+                prettyNumber($currentCount) :
+                $currentCount
+        );
+
+        return [
+            $currentCountDisplay,
+            $elementId
+        ];
     }
+);
+
+$_Lang['fill_with_myfleets'] = json_encode($ownFleetsAndDefenses);
 
-    if($_Planet[$_Vars_GameElements[$ID]] > 0)
-    {
-        $_Lang['fill_with_myfleets'] .= "MyFleets[{$ID}] = '".($UsingPrettyInputBox === true ? prettyNumber($_Planet[$_Vars_GameElements[$ID]]) : $_Planet[$_Vars_GameElements[$ID]])."';\n";
-    }
-}
-$_Lang['fill_with_myfleets'] .= "\n";
 $_Lang['AllowPrettyInputBox'] = ($_User['settings_useprettyinputbox'] == 1 ? 'true' : 'false');
 
 //Display page
diff --git a/templates/default_template/simulator.tpl b/templates/default_template/simulator.tpl
index 874918b4d..f20789387 100644
--- a/templates/default_template/simulator.tpl
+++ b/templates/default_template/simulator.tpl
@@ -1,7 +1,7 @@
 <script>
 var CurrentSlot = 1;
 {fill_with_mytechs}
-{fill_with_myfleets}
+const MyFleets = {fill_with_myfleets};
 var PlanetOwnerTxt = '{PlanetOwner}';
 var AllowPrettyInputBox = {AllowPrettyInputBox};
 </script>

From ba69b406ea89c34bfb3d51fd31b7d770da94b74c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Mon, 18 Jul 2022 22:23:11 +0200
Subject: [PATCH 02/38] GH-91 Simplify setting AllowPrettyInputBox for template

---
 simulator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simulator.php b/simulator.php
index fc4a053bd..de01dc59b 100644
--- a/simulator.php
+++ b/simulator.php
@@ -702,7 +702,7 @@ function ($elementId) use (&$_Planet, &$_User, $UsingPrettyInputBox) {
 
 $_Lang['fill_with_myfleets'] = json_encode($ownFleetsAndDefenses);
 
-$_Lang['AllowPrettyInputBox'] = ($_User['settings_useprettyinputbox'] == 1 ? 'true' : 'false');
+$_Lang['AllowPrettyInputBox'] = ($UsingPrettyInputBox ? 'true' : 'false');
 
 //Display page
 $page = parsetemplate(gettemplate('simulator'), $_Lang);

From 2e408bf6efa0d068870d02972d3476423487e8ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Mon, 18 Jul 2022 22:47:05 +0200
Subject: [PATCH 03/38] GH-91 Simplify own techs object generation

---
 simulator.php                            | 16 +++++++++++++---
 templates/default_template/simulator.tpl |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/simulator.php b/simulator.php
index de01dc59b..3f43a9d80 100644
--- a/simulator.php
+++ b/simulator.php
@@ -670,10 +670,20 @@ function ($matches) use ($Offsets) {
     $_Lang['rows']
 );
 
-$_Lang['fill_with_mytechs'] = "var MyTechs = new Array();\nMyTechs[1] = ".(string)($_User['tech_weapons'] + 0).";\nMyTechs[3] = ".(string)($_User['tech_shielding'] + 0).";\nMyTechs[2] = ".(string)($_User['tech_armour'] + 0).";\nMyTechs[4] = ".(string)($_User['tech_laser'] + 0).";\nMyTechs[5] = ".(string)($_User['tech_ion'] + 0).";\nMyTechs[6] = ".(string)($_User['tech_plasma'] + 0).";\nMyTechs[7] = ".(string)($_User['tech_antimatter'] + 0).";\nMyTechs[8] = ".(string)($_User['tech_disintegration'] + 0).";\nMyTechs[9] = ".(string)($_User['tech_graviton'] + 0).";\n";
-
 $UsingPrettyInputBox = ($_User['settings_useprettyinputbox'] == 1 ? true : false);
 
+$ownTechLevels = object_map(
+    $TechEquivalents,
+    function ($elementId, $idx) use (&$_Planet, &$_User) {
+        $currentLevel = World\Elements\getElementCurrentLevel($elementId, $_Planet, $_User);
+
+        return [
+            $currentLevel,
+            $idx
+        ];
+    }
+);
+
 $fleetsAndDefenses = array_filter(
     array_merge($_Vars_ElementCategories['fleet'], $_Vars_ElementCategories['defense']),
     function ($elementId) {
@@ -700,8 +710,8 @@ function ($elementId) use (&$_Planet, &$_User, $UsingPrettyInputBox) {
     }
 );
 
+$_Lang['fill_with_mytechs'] = json_encode($ownTechLevels);
 $_Lang['fill_with_myfleets'] = json_encode($ownFleetsAndDefenses);
-
 $_Lang['AllowPrettyInputBox'] = ($UsingPrettyInputBox ? 'true' : 'false');
 
 //Display page
diff --git a/templates/default_template/simulator.tpl b/templates/default_template/simulator.tpl
index f20789387..6829fd541 100644
--- a/templates/default_template/simulator.tpl
+++ b/templates/default_template/simulator.tpl
@@ -1,6 +1,6 @@
 <script>
 var CurrentSlot = 1;
-{fill_with_mytechs}
+const MyTechs = {fill_with_mytechs};
 const MyFleets = {fill_with_myfleets};
 var PlanetOwnerTxt = '{PlanetOwner}';
 var AllowPrettyInputBox = {AllowPrettyInputBox};

From e8277b0773820e13f7900fd4c41ec3e61a4a001d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Mon, 18 Jul 2022 22:49:57 +0200
Subject: [PATCH 04/38] GH-91 Simplify pretty inputs flag even more

---
 simulator.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/simulator.php b/simulator.php
index 3f43a9d80..65c43d691 100644
--- a/simulator.php
+++ b/simulator.php
@@ -670,7 +670,7 @@ function ($matches) use ($Offsets) {
     $_Lang['rows']
 );
 
-$UsingPrettyInputBox = ($_User['settings_useprettyinputbox'] == 1 ? true : false);
+$isUsingPrettyInputs = ($_User['settings_useprettyinputbox'] == 1);
 
 $ownTechLevels = object_map(
     $TechEquivalents,
@@ -695,10 +695,10 @@ function ($elementId) {
 );
 $ownFleetsAndDefenses = object_map(
     $fleetsAndDefenses,
-    function ($elementId) use (&$_Planet, &$_User, $UsingPrettyInputBox) {
+    function ($elementId) use (&$_Planet, &$_User, $isUsingPrettyInputs) {
         $currentCount = World\Elements\getElementCurrentCount($elementId, $_Planet, $_User);
         $currentCountDisplay = (
-            $UsingPrettyInputBox ?
+            $isUsingPrettyInputs ?
                 prettyNumber($currentCount) :
                 $currentCount
         );
@@ -712,7 +712,7 @@ function ($elementId) use (&$_Planet, &$_User, $UsingPrettyInputBox) {
 
 $_Lang['fill_with_mytechs'] = json_encode($ownTechLevels);
 $_Lang['fill_with_myfleets'] = json_encode($ownFleetsAndDefenses);
-$_Lang['AllowPrettyInputBox'] = ($UsingPrettyInputBox ? 'true' : 'false');
+$_Lang['AllowPrettyInputBox'] = ($isUsingPrettyInputs ? 'true' : 'false');
 
 //Display page
 $page = parsetemplate(gettemplate('simulator'), $_Lang);

From 311c5f7d920832034464a50976a20f88cf05caa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Tue, 19 Jul 2022 00:32:17 +0200
Subject: [PATCH 05/38] GH-91 Simplify techs handling by using their Ids as
 array keys

---
 simulator.php | 58 +++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/simulator.php b/simulator.php
index 65c43d691..b703b3ac9 100644
--- a/simulator.php
+++ b/simulator.php
@@ -34,6 +34,7 @@
 if(!empty($_POST['spyreport']))
 {
     $_POST['spyreport'] = json_decode(stripslashes($_POST['spyreport']), true);
+    // TODO: provide compat layer
     $_POST['def_techs'][1] = (isset($_POST['spyreport']['tech']) ? $_POST['spyreport']['tech'] : null);
     $_POST['def_ships'][1] = (isset($_POST['spyreport']['ships']) ? $_POST['spyreport']['ships'] : null);
     $_POST['spyreport'] = null;
@@ -48,18 +49,17 @@
         foreach($_POST['atk_techs'] as $User => $Vals)
         {
             $UserTemp = $User - 1;
-            foreach($TechEquivalents as $TechID => $TechKey)
-            {
-                if(!isset($Vals[$TechID]) || $Vals[$TechID] <= 0)
-                {
-                    $Value = 0;
-                }
-                else
-                {
-                    $Value = intval($Vals[$TechID]);
+
+            foreach ($Vals as $elementId => $elementValue) {
+                if (!World\Elements\isTechnology($elementId)) {
+                    continue;
                 }
-                $AttackingTechs[$UserTemp][$TechKey] = $Value;
+
+                $safeElementValue = intval($elementValue, 10);
+
+                $AttackingTechs[$UserTemp][$elementId] = $safeElementValue;
             }
+
             $AttackersData[$UserTemp] = array
             (
                 'username' => $_Lang['Attacker_Txt'].$User,
@@ -73,18 +73,17 @@
         foreach($_POST['def_techs'] as $User => $Vals)
         {
             $UserTemp = $User - 1;
-            foreach($TechEquivalents as $TechID => $TechKey)
-            {
-                if(!isset($Vals[$TechID]) || $Vals[$TechID] <= 0)
-                {
-                    $Value = 0;
-                }
-                else
-                {
-                    $Value = intval($Vals[$TechID]);
+
+            foreach ($Vals as $elementId => $elementValue) {
+                if (!World\Elements\isTechnology($elementId)) {
+                    continue;
                 }
-                $DefendingTechs[$UserTemp][$TechKey] = $Value;
+
+                $safeElementValue = intval($elementValue, 10);
+
+                $DefendingTechs[$UserTemp][$elementId] = $safeElementValue;
             }
+
             $DefendersData[$UserTemp] = array
             (
                 'username' => $_Lang['Defender_Txt'].$User,
@@ -582,15 +581,14 @@
     $parse['RowText2'] = '<a class="orange point fillTech_def">'.$_Lang['FillMyTechs'].'</a> / <a class="orange point clnTech_def">'.$_Lang['Fill_Clean'].'</a>';
     $ThisSlot['txt'] .= parsetemplate($TPL_NoBoth, $parse);
 
-    for($techs = 1; $techs <= $TechCount; $techs += 1)
-    {
-        $ThisRow_InsertValue_Atk = isset($_POST['atk_techs'][$i][$techs]) ? $_POST['atk_techs'][$i][$techs] : null;
-        $ThisRow_InsertValue_Def = isset($_POST['def_techs'][$i][$techs]) ? $_POST['def_techs'][$i][$techs] : null;
+    foreach ($TechEquivalents as $elementId) {
+        $ThisRow_InsertValue_Atk = isset($_POST['atk_techs'][$i][$elementId]) ? $_POST['atk_techs'][$i][$elementId] : null;
+        $ThisRow_InsertValue_Def = isset($_POST['def_techs'][$i][$elementId]) ? $_POST['def_techs'][$i][$elementId] : null;
 
-        $parse['RowText'] = $_Lang['Techs'][$techs];
-        $parse['RowInput'] = "<input type=\"text\" tabindex=\"{REP1_O{$i}_{$InsertTabIndex1}}\" name=\"atk_techs[{$i}][{$techs}]\" value=\"{$ThisRow_InsertValue_Atk}\" autocomplete=\"off\" />";
-        $parse['RowText2'] = $_Lang['Techs'][$techs];
-        $parse['RowInput2'] = "<input type=\"text\" tabindex=\"{REP2_O{$i}_{$InsertTabIndex2}}\" name=\"def_techs[{$i}][{$techs}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" />";
+        $parse['RowText'] = $_Lang['tech'][$elementId];
+        $parse['RowInput'] = "<input type=\"text\" tabindex=\"{REP1_O{$i}_{$InsertTabIndex1}}\" name=\"atk_techs[{$i}][{$elementId}]\" value=\"{$ThisRow_InsertValue_Atk}\" autocomplete=\"off\" />";
+        $parse['RowText2'] = $_Lang['tech'][$elementId];
+        $parse['RowInput2'] = "<input type=\"text\" tabindex=\"{REP2_O{$i}_{$InsertTabIndex2}}\" name=\"def_techs[{$i}][{$elementId}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" />";
 
         $ThisSlot['txt'] .= parsetemplate($TPL_Row, $parse);
         $InsertTabIndex1 += 1;
@@ -674,12 +672,12 @@ function ($matches) use ($Offsets) {
 
 $ownTechLevels = object_map(
     $TechEquivalents,
-    function ($elementId, $idx) use (&$_Planet, &$_User) {
+    function ($elementId) use (&$_Planet, &$_User) {
         $currentLevel = World\Elements\getElementCurrentLevel($elementId, $_Planet, $_User);
 
         return [
             $currentLevel,
-            $idx
+            $elementId
         ];
     }
 );

From cf50ef2c3ffd30997b0543416818a6ec987d0d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Tue, 19 Jul 2022 00:36:02 +0200
Subject: [PATCH 06/38] GH-91 Remove unused tech names from simulator's
 translation files

---
 language/en/simulator.lang | 10 ----------
 language/pl/simulator.lang |  9 ---------
 2 files changed, 19 deletions(-)

diff --git a/language/en/simulator.lang b/language/en/simulator.lang
index fb339e61f..9fbd4eecb 100644
--- a/language/en/simulator.lang
+++ b/language/en/simulator.lang
@@ -21,16 +21,6 @@ $_Lang['Morale_Level']           = 'Morale level';
 $_Lang['Technology']             = 'Technologies';
 $_Lang['Fleets']                 = 'Fleet';
 $_Lang['Defense']                = 'Defenses';
-// FIXME: get this from a shared lang file
-$_Lang['Techs'][1]               = 'Weapons technology';
-$_Lang['Techs'][2]               = 'Shielding technology';
-$_Lang['Techs'][3]               = 'Armour technology';
-$_Lang['Techs'][4]               = 'Laser technology';
-$_Lang['Techs'][5]               = 'Ion technology';
-$_Lang['Techs'][6]               = 'Plasma technology';
-$_Lang['Techs'][7]               = 'Anti-matter technology';
-$_Lang['Techs'][8]               = 'Disintegration stream technology';
-$_Lang['Techs'][9]               = 'Graviton technology';
 
 $_Lang['FillMyTechs']            = 'Fill with my tech levels';
 $_Lang['FillMyFleets']           = 'Fill with my fleets (and defenses)';
diff --git a/language/pl/simulator.lang b/language/pl/simulator.lang
index db364df61..d3649fb66 100644
--- a/language/pl/simulator.lang
+++ b/language/pl/simulator.lang
@@ -21,15 +21,6 @@ $_Lang['Morale_Level']           = 'Poziom morali';
 $_Lang['Technology']             = 'Technologie';
 $_Lang['Fleets']                 = 'Flota';
 $_Lang['Defense']                = 'Obrona';
-$_Lang['Techs'][1]               = 'Technologia bojowa';
-$_Lang['Techs'][2]               = 'Technologia ochronna';
-$_Lang['Techs'][3]               = 'Opancerzenie';
-$_Lang['Techs'][4]               = 'Technologia laserowa';
-$_Lang['Techs'][5]               = 'Technologia jonowa';
-$_Lang['Techs'][6]               = 'Technologia plazmowa';
-$_Lang['Techs'][7]               = 'Technologia Antymaterii';
-$_Lang['Techs'][8]               = 'Strumień Dezintegracyjny';
-$_Lang['Techs'][9]               = 'Rozwój grawitonów';
 
 $_Lang['FillMyTechs']            = 'Wypełnij moim poziomem technologii';
 $_Lang['FillMyFleets']           = 'Wypełnij moją flotą';

From e264d4ace0a6d1845154effed5392ff1db671b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Tue, 19 Jul 2022 00:41:50 +0200
Subject: [PATCH 07/38] GH-91 Translate espionage report's tech data to new
 simulator data format

---
 simulator.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/simulator.php b/simulator.php
index b703b3ac9..282f86a53 100644
--- a/simulator.php
+++ b/simulator.php
@@ -34,8 +34,18 @@
 if(!empty($_POST['spyreport']))
 {
     $_POST['spyreport'] = json_decode(stripslashes($_POST['spyreport']), true);
-    // TODO: provide compat layer
     $_POST['def_techs'][1] = (isset($_POST['spyreport']['tech']) ? $_POST['spyreport']['tech'] : null);
+    $_POST['def_techs'][1] = object_map(
+        $_POST['def_techs'][1],
+        function ($value, $key) use ($TechEquivalents) {
+            $safeKey = intval($key, 10);
+
+            return [
+                $value,
+                $TechEquivalents[$safeKey],
+            ];
+        }
+    );
     $_POST['def_ships'][1] = (isset($_POST['spyreport']['ships']) ? $_POST['spyreport']['ships'] : null);
     $_POST['spyreport'] = null;
 }

From 08332a8e7740337a23a013cea4184ee8c836ac52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Wed, 20 Jul 2022 23:01:32 +0200
Subject: [PATCH 08/38] GH-91 Share techs & userdata setters for attackers &
 defenders

---
 simulator.php | 71 ++++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/simulator.php b/simulator.php
index 282f86a53..d79062724 100644
--- a/simulator.php
+++ b/simulator.php
@@ -54,54 +54,55 @@ function ($value, $key) use ($TechEquivalents) {
 {
     $Calculate = true;
 
-    if(!empty($_POST['atk_techs']))
-    {
-        foreach($_POST['atk_techs'] as $User => $Vals)
-        {
-            $UserTemp = $User - 1;
-
-            foreach ($Vals as $elementId => $elementValue) {
-                if (!World\Elements\isTechnology($elementId)) {
-                    continue;
-                }
-
-                $safeElementValue = intval($elementValue, 10);
-
-                $AttackingTechs[$UserTemp][$elementId] = $safeElementValue;
-            }
-
-            $AttackersData[$UserTemp] = array
-            (
-                'username' => $_Lang['Attacker_Txt'].$User,
-                'techs' => Array2String($AttackingTechs[$UserTemp]),
-                'pos' => '0:0:0'
-            );
+    $AttackingTechs = [];
+    $DefendingTechs = [];
+    $AttackersData = [];
+    $DefendersData = [];
+
+    $techMappings = [
+        [
+            'inputKey' => 'atk_techs',
+            'techsAccumulatorObject' => &$AttackingTechs,
+            'usersAccumulatorObject' => &$AttackersData,
+            'usernamePrefix' => $_Lang['Attacker_Txt'],
+        ],
+        [
+            'inputKey' => 'def_techs',
+            'techsAccumulatorObject' => &$DefendingTechs,
+            'usersAccumulatorObject' => &$DefendersData,
+            'usernamePrefix' => $_Lang['Defender_Txt'],
+        ],
+    ];
+
+    foreach ($techMappings as $techMapping) {
+        if (empty($_POST[$techMapping['inputKey']])) {
+            continue;
         }
-    }
-    if(!empty($_POST['def_techs']))
-    {
-        foreach($_POST['def_techs'] as $User => $Vals)
-        {
-            $UserTemp = $User - 1;
 
-            foreach ($Vals as $elementId => $elementValue) {
+        foreach ($_POST[$techMapping['inputKey']] as $userSlotIdx => $userSlotData) {
+            $userIdx = $userSlotIdx - 1;
+
+            foreach ($userSlotData as $elementId => $elementValue) {
                 if (!World\Elements\isTechnology($elementId)) {
                     continue;
                 }
+                if (!isset($techMapping['techsAccumulatorObject'][$userIdx])) {
+                    $techMapping['techsAccumulatorObject'][$userIdx] = [];
+                }
 
                 $safeElementValue = intval($elementValue, 10);
 
-                $DefendingTechs[$UserTemp][$elementId] = $safeElementValue;
+                $techMapping['techsAccumulatorObject'][$userIdx][$elementId] = $safeElementValue;
             }
 
-            $DefendersData[$UserTemp] = array
-            (
-                'username' => $_Lang['Defender_Txt'].$User,
-                'techs' => Array2String($DefendingTechs[$UserTemp]),
+            $techMapping['usersAccumulatorObject'][$userIdx] = [
+                'username' => "{$techMapping['usernamePrefix']}{$userSlotIdx}",
+                'techs' => Array2String($techMapping['techsAccumulatorObject'][$userIdx]),
                 'pos' => '0:0:0'
-            );
+            ];
         }
     }
+
     if(!empty($_POST['atk_ships']))
     {
         foreach($_POST['atk_ships'] as $User => $Vals)

From b2d99eedcce928e4fb16256672a0f121542eaaf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Wed, 20 Jul 2022 23:18:00 +0200
Subject: [PATCH 09/38] GH-91 Share ships & defenses setters for attackers &
 defenders

---
 simulator.php | 175 ++++++++++++++++++--------------------------------
 1 file changed, 62 insertions(+), 113 deletions(-)

diff --git a/simulator.php b/simulator.php
index d79062724..781e60398 100644
--- a/simulator.php
+++ b/simulator.php
@@ -58,159 +58,108 @@ function ($value, $key) use ($TechEquivalents) {
     $DefendingTechs = [];
     $AttackersData = [];
     $DefendersData = [];
+    $AttackingFleets = [];
+    $DefendingFleets = [];
 
-    $techMappings = [
+    $inputMappingGroups = [
         [
-            'inputKey' => 'atk_techs',
+            'techInputKey' => 'atk_techs',
+            'fleetInputKey' => 'atk_ships',
             'techsAccumulatorObject' => &$AttackingTechs,
+            'fleetAccumulatorObject' => &$AttackingFleets,
             'usersAccumulatorObject' => &$AttackersData,
             'usernamePrefix' => $_Lang['Attacker_Txt'],
         ],
         [
-            'inputKey' => 'def_techs',
+            'techInputKey' => 'def_techs',
+            'fleetInputKey' => 'def_ships',
             'techsAccumulatorObject' => &$DefendingTechs,
+            'fleetAccumulatorObject' => &$DefendingFleets,
             'usersAccumulatorObject' => &$DefendersData,
             'usernamePrefix' => $_Lang['Defender_Txt'],
         ],
     ];
 
-    foreach ($techMappings as $techMapping) {
-        if (empty($_POST[$techMapping['inputKey']])) {
+    foreach ($inputMappingGroups as $inputMappingGroup) {
+        if (empty($_POST[$inputMappingGroup['techInputKey']])) {
             continue;
         }
 
-        foreach ($_POST[$techMapping['inputKey']] as $userSlotIdx => $userSlotData) {
+        foreach ($_POST[$inputMappingGroup['techInputKey']] as $userSlotIdx => $userSlotData) {
             $userIdx = $userSlotIdx - 1;
 
             foreach ($userSlotData as $elementId => $elementValue) {
                 if (!World\Elements\isTechnology($elementId)) {
                     continue;
                 }
-                if (!isset($techMapping['techsAccumulatorObject'][$userIdx])) {
-                    $techMapping['techsAccumulatorObject'][$userIdx] = [];
+                if (!isset($inputMappingGroup['techsAccumulatorObject'][$userIdx])) {
+                    $inputMappingGroup['techsAccumulatorObject'][$userIdx] = [];
                 }
 
                 $safeElementValue = intval($elementValue, 10);
 
-                $techMapping['techsAccumulatorObject'][$userIdx][$elementId] = $safeElementValue;
+                $inputMappingGroup['techsAccumulatorObject'][$userIdx][$elementId] = $safeElementValue;
             }
 
-            $techMapping['usersAccumulatorObject'][$userIdx] = [
-                'username' => "{$techMapping['usernamePrefix']}{$userSlotIdx}",
-                'techs' => Array2String($techMapping['techsAccumulatorObject'][$userIdx]),
+            $inputMappingGroup['usersAccumulatorObject'][$userIdx] = [
+                'username' => "{$inputMappingGroup['usernamePrefix']}{$userSlotIdx}",
+                'techs' => Array2String($inputMappingGroup['techsAccumulatorObject'][$userIdx]),
                 'pos' => '0:0:0'
             ];
         }
     }
 
-    if(!empty($_POST['atk_ships']))
-    {
-        foreach($_POST['atk_ships'] as $User => $Vals)
-        {
-            $UserTemp = $User - 1;
-            foreach($Vals as $ID => $Count)
-            {
-                $Count = str_replace(array('.', ','), '', $Count);
-                if($Count > 0)
-                {
-                    if(strlen($Count) > $MaxStringLength)
-                    {
-                        $Count = substr($Count, 0, $MaxStringLength);
-                    }
-                    $AttackingFleets[$UserTemp][$ID] = floor($Count);
-                }
-            }
-            if(empty($AttackingFleets[$UserTemp]))
-            {
-                unset($AttackingFleets[$UserTemp]);
-                unset($AttackingTechs[$UserTemp]);
-                unset($AttackersData[$UserTemp]);
-            }
-            else
-            {
-                if(empty($AttackersData[$UserTemp]))
-                {
-                    foreach($TechEquivalents as $TechID => $TechKey)
-                    {
-                        if(!isset($Vals[$TechID]) || $Vals[$TechID] <= 0)
-                        {
-                            $Value = 0;
-                        }
-                        else
-                        {
-                            $Value = intval($Vals[$TechID]);
-                        }
-                        $AttackingTechs[$UserTemp][$TechKey] = $Value;
-                    }
-                    $AttackersData[$UserTemp] = array
+    foreach ($inputMappingGroups as $inputMappingGroup) {
+        if (empty($_POST[$inputMappingGroup['fleetInputKey']])) {
+            $Calculate = false;
+            $BreakMSG = (
+                $inputMappingGroup['fleetInputKey'] === 'atk_ships' ?
+                    $_Lang['Break_noATKShips'] :
+                    $_Lang['Break_noDEFShips']
+            );
+
+            break;
+        }
+
+        foreach ($_POST[$inputMappingGroup['fleetInputKey']] as $userSlotIdx => $userSlotData) {
+            $userIdx = $userSlotIdx - 1;
+
+            foreach ($userSlotData as $elementId => $elementValue) {
+                $elementCount = str_replace([ '.', ',' ], '', $elementValue);
+                $elementCount = substr($elementCount, 0, $MaxStringLength);
+                $safeElementCount = floor($elementCount);
+
+                if (
                     (
-                        'username' => $_Lang['Attacker_Txt'].$User,
-                        'techs' => Array2String($AttackingTechs[$UserTemp]),
-                        'pos' => '0:0:0'
-                    );
+                        !World\Elements\isShip($elementId) &&
+                        !World\Elements\isDefenseSystem($elementId)
+                    ) ||
+                    $safeElementCount <= 0
+                ) {
+                    continue;
                 }
-            }
-        }
-    }
-    else
-    {
-        $Calculate = false;
-        $BreakMSG = $_Lang['Break_noATKShips'];
-    }
-    if(!empty($_POST['def_ships']))
-    {
-        foreach($_POST['def_ships'] as $User => $Vals)
-        {
-            $UserTemp = $User - 1;
-            foreach($Vals as $ID => $Count)
-            {
-                $Count = str_replace(array('.', ','), '', $Count);
-                if($Count > 0)
-                {
-                    if(strlen($Count) > $MaxStringLength)
-                    {
-                        $Count = substr($Count, 0, $MaxStringLength);
-                    }
-                    $DefendingFleets[$UserTemp][$ID] = floor($Count);
+                if (!isset($inputMappingGroup['fleetAccumulatorObject'][$userIdx])) {
+                    $inputMappingGroup['fleetAccumulatorObject'][$userIdx] = [];
                 }
+
+                $inputMappingGroup['fleetAccumulatorObject'][$userIdx][$elementId] = $safeElementCount;
             }
-            if(empty($DefendingFleets[$UserTemp]))
-            {
-                unset($DefendingFleets[$UserTemp]);
-                unset($DefendingTechs[$UserTemp]);
-                unset($DefendersData[$UserTemp]);
-            }
-            else
-            {
-                if(empty($DefendersData[$UserTemp]))
-                {
-                    foreach($TechEquivalents as $TechID => $TechKey)
-                    {
-                        if(!isset($Vals[$TechID]) || $Vals[$TechID] <= 0)
-                        {
-                            $Value = 0;
-                        }
-                        else
-                        {
-                            $Value = intval($Vals[$TechID]);
-                        }
-                        $DefendingTechs[$UserTemp][$TechKey] = $Value;
-                    }
-                    $DefendersData[$UserTemp] = array
-                    (
-                        'username' => $_Lang['Defender_Txt'].$User,
-                        'techs' => Array2String($DefendingTechs[$UserTemp]),
-                        'pos' => '0:0:0'
-                    );
-                }
+
+            if (empty($inputMappingGroup['fleetAccumulatorObject'][$userIdx])) {
+                // Unset user's techs & details
+                unset($inputMappingGroup['techsAccumulatorObject'][$userIdx]);
+                unset($inputMappingGroup['usersAccumulatorObject'][$userIdx]);
+            } else if (empty($inputMappingGroup['techsAccumulatorObject'][$userIdx])) {
+                // Fill user techs (with zeros) & details
+                $inputMappingGroup['techsAccumulatorObject'][$userIdx] = [];
+                $inputMappingGroup['usersAccumulatorObject'][$userIdx] = [
+                    'username' => "{$inputMappingGroup['usernamePrefix']}{$userSlotIdx}",
+                    'techs' => Array2String($inputMappingGroup['techsAccumulatorObject'][$userIdx]),
+                    'pos' => '0:0:0'
+                ];
             }
         }
     }
-    else
-    {
-        $Calculate = false;
-        $BreakMSG = $_Lang['Break_noDEFShips'];
-    }
 
     if(isset($AttackersData))
     {

From 9fc6a3e539f3155161c79c12a035b208da488a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Thu, 21 Jul 2022 00:31:18 +0200
Subject: [PATCH 10/38] [GH-91] Greatly simplify tabindex management

---
 simulator.php | 44 ++++++++------------------------------------
 1 file changed, 8 insertions(+), 36 deletions(-)

diff --git a/simulator.php b/simulator.php
index 781e60398..68eb282f3 100644
--- a/simulator.php
+++ b/simulator.php
@@ -504,16 +504,12 @@ function ($value, $key) use ($TechEquivalents) {
 $TPL_Row = gettemplate('simulator_row');
 $TPL_NoLeft = gettemplate('simulator_row_noleft');
 
-$Offsets;
-
 for($i = 1; $i <= $MaxACSSlots; $i += 1)
 {
     $ThisSlot = array();
     $ThisSlot['SlotID'] = $i;
     $ThisSlot['txt'] = '';
 
-    $InsertTabIndex1 = 1;
-    $InsertTabIndex2 = 1;
     $parse = $_Lang;
     $parse['i'] = $i;
     if($i > 1)
@@ -526,13 +522,11 @@ function ($value, $key) use ($TechEquivalents) {
         $parse['RowText'] = $_Lang['Morale'];
         $ThisSlot['txt'] .= parsetemplate($TPL_SingleRow, $parse);
         $parse['RowText'] = $_Lang['Morale_Level'];
-        $parse['RowInput'] = "<input type=\"text\" tabindex=\"{REP1_O{$i}_{$InsertTabIndex1}}\" name=\"atk_morale[{$i}]\" value=\"{$_POST['atk_morale'][$i]}\" autocomplete=\"off\" />%";
+        $parse['RowInput'] = "<input type=\"text\" tabindex=\"1\" name=\"atk_morale[{$i}]\" value=\"{$_POST['atk_morale'][$i]}\" autocomplete=\"off\" />%";
         $parse['RowText2'] = $_Lang['Morale_Level'];
-        $parse['RowInput2'] = "<input type=\"text\" tabindex=\"{REP2_O{$i}_{$InsertTabIndex2}}\" name=\"def_morale[{$i}]\" value=\"{$_POST['def_morale'][$i]}\" autocomplete=\"off\" />%";
+        $parse['RowInput2'] = "<input type=\"text\" tabindex=\"2\" name=\"def_morale[{$i}]\" value=\"{$_POST['def_morale'][$i]}\" autocomplete=\"off\" />%";
 
         $ThisSlot['txt'] .= parsetemplate($TPL_Row, $parse);
-        $InsertTabIndex1 += 1;
-        $InsertTabIndex2 += 1;
     }
 
     $parse['RowText'] = $_Lang['Technology'];
@@ -546,13 +540,11 @@ function ($value, $key) use ($TechEquivalents) {
         $ThisRow_InsertValue_Def = isset($_POST['def_techs'][$i][$elementId]) ? $_POST['def_techs'][$i][$elementId] : null;
 
         $parse['RowText'] = $_Lang['tech'][$elementId];
-        $parse['RowInput'] = "<input type=\"text\" tabindex=\"{REP1_O{$i}_{$InsertTabIndex1}}\" name=\"atk_techs[{$i}][{$elementId}]\" value=\"{$ThisRow_InsertValue_Atk}\" autocomplete=\"off\" />";
+        $parse['RowInput'] = "<input type=\"text\" tabindex=\"1\" name=\"atk_techs[{$i}][{$elementId}]\" value=\"{$ThisRow_InsertValue_Atk}\" autocomplete=\"off\" />";
         $parse['RowText2'] = $_Lang['tech'][$elementId];
-        $parse['RowInput2'] = "<input type=\"text\" tabindex=\"{REP2_O{$i}_{$InsertTabIndex2}}\" name=\"def_techs[{$i}][{$elementId}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" />";
+        $parse['RowInput2'] = "<input type=\"text\" tabindex=\"2\" name=\"def_techs[{$i}][{$elementId}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" />";
 
         $ThisSlot['txt'] .= parsetemplate($TPL_Row, $parse);
-        $InsertTabIndex1 += 1;
-        $InsertTabIndex2 += 1;
     }
 
     $parse['RowText'] = $_Lang['Fleets'];
@@ -569,20 +561,17 @@ function ($value, $key) use ($TechEquivalents) {
             $ThisRow_InsertValue_Atk = isset($_POST['atk_ships'][$i][$Ships]) ? $_POST['atk_ships'][$i][$Ships] : null;
 
             $parse['RowText'] = $_Lang['tech'][$Ships];
-            $parse['RowInput'] = "<input type=\"text\" tabindex=\"{REP1_O{$i}_{$InsertTabIndex1}}\" name=\"atk_ships[{$i}][{$Ships}]\" value=\"{$ThisRow_InsertValue_Atk}\" autocomplete=\"off\" class=\"pad2 fl\" /> <span class=\"fr\">(<span class=\"clnOne point\">{$_Lang['Button_Min']}</span> / <span class=\"maxOne point\">{$_Lang['Button_Max']}</span>)</span>";
+            $parse['RowInput'] = "<input type=\"text\" tabindex=\"1\" name=\"atk_ships[{$i}][{$Ships}]\" value=\"{$ThisRow_InsertValue_Atk}\" autocomplete=\"off\" class=\"pad2 fl\" /> <span class=\"fr\">(<span class=\"clnOne point\">{$_Lang['Button_Min']}</span> / <span class=\"maxOne point\">{$_Lang['Button_Max']}</span>)</span>";
             $parse['RowText2'] = $_Lang['tech'][$Ships];
-            $parse['RowInput2'] = "<input type=\"text\" tabindex=\"{REP2_O{$i}_{$InsertTabIndex2}}\" name=\"def_ships[{$i}][{$Ships}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" class=\"pad2 fl\" /> <span class=\"fr\">(<span class=\"clnOne point\">{$_Lang['Button_Min']}</span> / <span class=\"maxOne point\">{$_Lang['Button_Max']}</span>)</span>";
+            $parse['RowInput2'] = "<input type=\"text\" tabindex=\"2\" name=\"def_ships[{$i}][{$Ships}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" class=\"pad2 fl\" /> <span class=\"fr\">(<span class=\"clnOne point\">{$_Lang['Button_Min']}</span> / <span class=\"maxOne point\">{$_Lang['Button_Max']}</span>)</span>";
 
             $ThisSlot['txt'] .= parsetemplate($TPL_Row, $parse);
-            $InsertTabIndex1 += 1;
-            $InsertTabIndex2 += 1;
         } else {
             $parse['RowText'] = '-';
             $parse['RowText2'] = $_Lang['tech'][$Ships];
-            $parse['RowInput2'] = "<input type=\"text\" tabindex=\"{REP2_O{$i}_{$InsertTabIndex2}}\" name=\"def_ships[{$i}][{$Ships}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" class=\"pad2 fl\" /> <span class=\"fr\">(<span class=\"clnOne point\">{$_Lang['Button_Min']}</span> / <span class=\"maxOne point\">{$_Lang['Button_Max']}</span>)</span>";
+            $parse['RowInput2'] = "<input type=\"text\" tabindex=\"2\" name=\"def_ships[{$i}][{$Ships}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" class=\"pad2 fl\" /> <span class=\"fr\">(<span class=\"clnOne point\">{$_Lang['Button_Min']}</span> / <span class=\"maxOne point\">{$_Lang['Button_Max']}</span>)</span>";
 
             $ThisSlot['txt'] .= parsetemplate($TPL_NoLeft, $parse);
-            $InsertTabIndex2 += 1;
         }
     }
 
@@ -602,32 +591,15 @@ function ($value, $key) use ($TechEquivalents) {
 
             $parse['RowText'] = '-';
             $parse['RowText2'] = $_Lang['tech'][$Ships];
-            $parse['RowInput2'] = "<input type=\"text\" tabindex=\"{REP2_O{$i}_{$InsertTabIndex2}}\" name=\"def_ships[{$i}][{$Ships}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" class=\"pad2 fl\" /> <span class=\"fr\">(<span class=\"clnOne point\">{$_Lang['Button_Min']}</span> / <span class=\"maxOne point\">{$_Lang['Button_Max']}</span>)</span>";
+            $parse['RowInput2'] = "<input type=\"text\" tabindex=\"2\" name=\"def_ships[{$i}][{$Ships}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" class=\"pad2 fl\" /> <span class=\"fr\">(<span class=\"clnOne point\">{$_Lang['Button_Min']}</span> / <span class=\"maxOne point\">{$_Lang['Button_Max']}</span>)</span>";
 
             $ThisSlot['txt'] .= parsetemplate($TPL_NoLeft, $parse);
-            $InsertTabIndex2 += 1;
         }
     }
-    $Offsets[$i] = $InsertTabIndex1 - 1;
 
     $_Lang['rows'] .= parsetemplate($TPL_Slot, $ThisSlot);
 }
 
-$_Lang['rows'] = preg_replace_callback(
-    '#\{REP1_O([0-9]{1,})_([0-9]{1,})\}#Ssi',
-    function ($matches) {
-        return ($matches[1] * 1000) + $matches[2];
-    },
-    $_Lang['rows']
-);
-$_Lang['rows'] = preg_replace_callback(
-    '#\{REP2_O([0-9]{1,})_([0-9]{1,})\}#Ssi',
-    function ($matches) use ($Offsets) {
-        return ($matches[1] * 1000) + $Offsets[$matches[1]] + $matches[2];
-    },
-    $_Lang['rows']
-);
-
 $isUsingPrettyInputs = ($_User['settings_useprettyinputbox'] == 1);
 
 $ownTechLevels = object_map(

From 471d2b5b7fe07cca15c4e27525a3785faec6450d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Thu, 21 Jul 2022 00:37:02 +0200
Subject: [PATCH 11/38] [GH-91] Remove old-style array ctors

---
 simulator.php | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/simulator.php b/simulator.php
index 68eb282f3..30975d74c 100644
--- a/simulator.php
+++ b/simulator.php
@@ -15,8 +15,7 @@
 $_Lang['rows'] = '';
 $_Lang['SimResult'] = '';
 
-$TechEquivalents = array
-(
+$TechEquivalents = [
     1 => 109,
     2 => 110,
     3 => 111,
@@ -26,7 +25,7 @@
     7 => 125,
     8 => 126,
     9 => 199,
-);
+];
 $TechCount = count($TechEquivalents);
 $MaxACSSlots = ACS_MAX_JOINED_FLEETS + 1;
 $MaxStringLength = 30;
@@ -254,8 +253,16 @@ function ($value, $key) use ($TechEquivalents) {
         $SimData['max_rounds'] = 0;
         $SimData['min_rounds'] = 99;
 
-        $SimData['total_lost_atk'] = array('met' => 0, 'cry' => 0, 'deu' => 0);
-        $SimData['total_lost_def'] = array('met' => 0, 'cry' => 0, 'deu' => 0);
+        $SimData['total_lost_atk'] = [
+            'met' => 0,
+            'cry' => 0,
+            'deu' => 0,
+        ];
+        $SimData['total_lost_def'] = [
+            'met' => 0,
+            'cry' => 0,
+            'deu' => 0,
+        ];
         $SimData['ship_lost_atk'] = 0;
         $SimData['ship_lost_def'] = 0;
         $SimData['ship_lost_atk_min'] = 99999999999999999999.0;
@@ -391,7 +398,7 @@ function ($value, $key) use ($TechEquivalents) {
                 'totalDebris' => ($TotalLostMetal + $TotalLostCrystal),
             ]);
 
-            $ReportData = array();
+            $ReportData = [];
 
             $ReportData['init']['usr']['atk'] = $AttackersData;
             $ReportData['init']['usr']['def'] = $DefendersData;
@@ -432,7 +439,15 @@ function ($value, $key) use ($TechEquivalents) {
             }
             $ReportData['rounds'] = $RoundsData;
 
-            $ReportID = CreateBattleReport($ReportData, array('atk' => $_User['id'], 'def' => 0), 0, true);
+            $ReportID = CreateBattleReport(
+                $ReportData,
+                [
+                    'atk' => $_User['id'],
+                    'def' => 0,
+                ],
+                0,
+                true
+            );
 
             $parse = $_Lang;
             $parse['id'] = $ReportID;
@@ -506,7 +521,7 @@ function ($value, $key) use ($TechEquivalents) {
 
 for($i = 1; $i <= $MaxACSSlots; $i += 1)
 {
-    $ThisSlot = array();
+    $ThisSlot = [];
     $ThisSlot['SlotID'] = $i;
     $ThisSlot['txt'] = '';
 

From 3fd70aa693e0b3120229c28ef5b9b1b94cba54f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Fri, 22 Jul 2022 21:07:23 +0200
Subject: [PATCH 12/38] [GH-91] Move ship input rendering to a component

---
 modules/attackSimulator/_includes.php         | 13 +++++
 .../ShipInput/ShipInput.component.php         | 47 +++++++++++++++++++
 .../components/ShipInput/body.tpl             | 11 +++++
 .../components/ShipInput/index.php            |  5 ++
 modules/attackSimulator/components/index.php  |  5 ++
 modules/attackSimulator/index.php             |  5 ++
 simulator.php                                 | 25 ++++++++--
 7 files changed, 107 insertions(+), 4 deletions(-)
 create mode 100644 modules/attackSimulator/_includes.php
 create mode 100644 modules/attackSimulator/components/ShipInput/ShipInput.component.php
 create mode 100644 modules/attackSimulator/components/ShipInput/body.tpl
 create mode 100644 modules/attackSimulator/components/ShipInput/index.php
 create mode 100644 modules/attackSimulator/components/index.php
 create mode 100644 modules/attackSimulator/index.php

diff --git a/modules/attackSimulator/_includes.php b/modules/attackSimulator/_includes.php
new file mode 100644
index 000000000..52dce636b
--- /dev/null
+++ b/modules/attackSimulator/_includes.php
@@ -0,0 +1,13 @@
+<?php
+
+// TODO: Migrate to IIFE once PHP 5 support is removed
+call_user_func(function () {
+    global $_EnginePath;
+
+    $includePath = $_EnginePath . 'modules/attackSimulator/';
+
+    include($includePath . './components/ShipInput/ShipInput.component.php');
+
+});
+
+?>
diff --git a/modules/attackSimulator/components/ShipInput/ShipInput.component.php b/modules/attackSimulator/components/ShipInput/ShipInput.component.php
new file mode 100644
index 000000000..ebaa4ddd5
--- /dev/null
+++ b/modules/attackSimulator/components/ShipInput/ShipInput.component.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace UniEngine\Engine\Modules\AttackSimulator\Components\ShipInput;
+
+/**
+ * @param array $props
+ * @param number $props['slotIdx']
+ * @param number $props['elementId']
+ * @param enum ("attacker" | "defender") $props['columnType']
+ * @param number $props['initialValue']
+ */
+function render($props) {
+    global $_Lang;
+
+    $slotIdx = $props['slotIdx'];
+    $elementId = $props['elementId'];
+
+    $inputNamePrefix = (
+        $props['columnType'] === 'attacker' ?
+            'atk_ships' :
+            'def_ships'
+    );
+
+    $templateBodyProps = [
+        'prop_tabIndex'     => (
+            $props['columnType'] === 'attacker' ?
+                '1' :
+                '2'
+        ),
+        'prop_inputName'    => "{$inputNamePrefix}[{$slotIdx}][{$elementId}]",
+        'prop_initialValue' => $props['initialValue'],
+        'lang_Button_Min'   => $_Lang['Button_Min'],
+        'lang_Button_Max'   => $_Lang['Button_Max'],
+    ];
+
+    $localTemplateLoader = createLocalTemplateLoader(__DIR__);
+    $componentHTML = parsetemplate(
+        $localTemplateLoader('body'),
+        $templateBodyProps
+    );
+
+    return [
+        'componentHTML' => $componentHTML,
+    ];
+}
+
+?>
diff --git a/modules/attackSimulator/components/ShipInput/body.tpl b/modules/attackSimulator/components/ShipInput/body.tpl
new file mode 100644
index 000000000..106870058
--- /dev/null
+++ b/modules/attackSimulator/components/ShipInput/body.tpl
@@ -0,0 +1,11 @@
+<input
+    type="text"
+    tabindex="{prop_tabIndex}"
+    name="{prop_inputName}"
+    value="{prop_initialValue}"
+    autocomplete="off"
+    class="pad2 fl"
+/>
+<span class="fr">
+    (<span class="clnOne point">{lang_Button_Min}</span> / <span class="maxOne point">{lang_Button_Max}</span>)
+</span>
diff --git a/modules/attackSimulator/components/ShipInput/index.php b/modules/attackSimulator/components/ShipInput/index.php
new file mode 100644
index 000000000..bc99142d1
--- /dev/null
+++ b/modules/attackSimulator/components/ShipInput/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/modules/attackSimulator/components/index.php b/modules/attackSimulator/components/index.php
new file mode 100644
index 000000000..bc99142d1
--- /dev/null
+++ b/modules/attackSimulator/components/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/modules/attackSimulator/index.php b/modules/attackSimulator/index.php
new file mode 100644
index 000000000..bc99142d1
--- /dev/null
+++ b/modules/attackSimulator/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/simulator.php b/simulator.php
index 30975d74c..a3847a512 100644
--- a/simulator.php
+++ b/simulator.php
@@ -4,10 +4,11 @@
 
 $_EnginePath = './';
 include($_EnginePath.'common.php');
+include_once($_EnginePath . 'modules/attackSimulator/_includes.php');
 
 use UniEngine\Engine\Modules\Flights;
-
 use UniEngine\Engine\Includes\Helpers\World;
+use UniEngine\Engine\Modules\AttackSimulator;
 
 loggedCheck();
 
@@ -576,15 +577,31 @@ function ($value, $key) use ($TechEquivalents) {
             $ThisRow_InsertValue_Atk = isset($_POST['atk_ships'][$i][$Ships]) ? $_POST['atk_ships'][$i][$Ships] : null;
 
             $parse['RowText'] = $_Lang['tech'][$Ships];
-            $parse['RowInput'] = "<input type=\"text\" tabindex=\"1\" name=\"atk_ships[{$i}][{$Ships}]\" value=\"{$ThisRow_InsertValue_Atk}\" autocomplete=\"off\" class=\"pad2 fl\" /> <span class=\"fr\">(<span class=\"clnOne point\">{$_Lang['Button_Min']}</span> / <span class=\"maxOne point\">{$_Lang['Button_Max']}</span>)</span>";
+            $parse['RowInput'] = AttackSimulator\Components\ShipInput\render([
+                'slotIdx' => $i,
+                'elementId' => $Ships,
+                'columnType' => 'attacker',
+                'initialValue' => $ThisRow_InsertValue_Atk,
+            ])['componentHTML'];
+
             $parse['RowText2'] = $_Lang['tech'][$Ships];
-            $parse['RowInput2'] = "<input type=\"text\" tabindex=\"2\" name=\"def_ships[{$i}][{$Ships}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" class=\"pad2 fl\" /> <span class=\"fr\">(<span class=\"clnOne point\">{$_Lang['Button_Min']}</span> / <span class=\"maxOne point\">{$_Lang['Button_Max']}</span>)</span>";
+            $parse['RowInput2'] = AttackSimulator\Components\ShipInput\render([
+                'slotIdx' => $i,
+                'elementId' => $Ships,
+                'columnType' => 'defender',
+                'initialValue' => $ThisRow_InsertValue_Def,
+            ])['componentHTML'];
 
             $ThisSlot['txt'] .= parsetemplate($TPL_Row, $parse);
         } else {
             $parse['RowText'] = '-';
             $parse['RowText2'] = $_Lang['tech'][$Ships];
-            $parse['RowInput2'] = "<input type=\"text\" tabindex=\"2\" name=\"def_ships[{$i}][{$Ships}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" class=\"pad2 fl\" /> <span class=\"fr\">(<span class=\"clnOne point\">{$_Lang['Button_Min']}</span> / <span class=\"maxOne point\">{$_Lang['Button_Max']}</span>)</span>";
+            $parse['RowInput2'] = AttackSimulator\Components\ShipInput\render([
+                'slotIdx' => $i,
+                'elementId' => $Ships,
+                'columnType' => 'defender',
+                'initialValue' => $ThisRow_InsertValue_Def,
+            ])['componentHTML'];
 
             $ThisSlot['txt'] .= parsetemplate($TPL_NoLeft, $parse);
         }

From a33e500de186054b9082432cd1f8db4a1759b8e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Fri, 22 Jul 2022 21:20:19 +0200
Subject: [PATCH 13/38] [GH-91] Deduplicate ship input rendering for defs

---
 simulator.php | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/simulator.php b/simulator.php
index a3847a512..5bf1b35af 100644
--- a/simulator.php
+++ b/simulator.php
@@ -573,6 +573,14 @@ function ($value, $key) use ($TechEquivalents) {
     {
         $ThisRow_InsertValue_Def = isset($_POST['def_ships'][$i][$Ships]) ? $_POST['def_ships'][$i][$Ships] : null;
 
+        $parse['RowText2'] = $_Lang['tech'][$Ships];
+        $parse['RowInput2'] = AttackSimulator\Components\ShipInput\render([
+            'slotIdx' => $i,
+            'elementId' => $Ships,
+            'columnType' => 'defender',
+            'initialValue' => $ThisRow_InsertValue_Def,
+        ])['componentHTML'];
+
         if (hasAnyEngine($Ships)) {
             $ThisRow_InsertValue_Atk = isset($_POST['atk_ships'][$i][$Ships]) ? $_POST['atk_ships'][$i][$Ships] : null;
 
@@ -584,24 +592,10 @@ function ($value, $key) use ($TechEquivalents) {
                 'initialValue' => $ThisRow_InsertValue_Atk,
             ])['componentHTML'];
 
-            $parse['RowText2'] = $_Lang['tech'][$Ships];
-            $parse['RowInput2'] = AttackSimulator\Components\ShipInput\render([
-                'slotIdx' => $i,
-                'elementId' => $Ships,
-                'columnType' => 'defender',
-                'initialValue' => $ThisRow_InsertValue_Def,
-            ])['componentHTML'];
-
             $ThisSlot['txt'] .= parsetemplate($TPL_Row, $parse);
         } else {
             $parse['RowText'] = '-';
-            $parse['RowText2'] = $_Lang['tech'][$Ships];
-            $parse['RowInput2'] = AttackSimulator\Components\ShipInput\render([
-                'slotIdx' => $i,
-                'elementId' => $Ships,
-                'columnType' => 'defender',
-                'initialValue' => $ThisRow_InsertValue_Def,
-            ])['componentHTML'];
+            $parse['RowInput'] = '';
 
             $ThisSlot['txt'] .= parsetemplate($TPL_NoLeft, $parse);
         }

From ab878d9e0f150f73989eff6d61552f390fae70a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Fri, 22 Jul 2022 21:27:03 +0200
Subject: [PATCH 14/38] [GH-91] Use better name for element id

---
 simulator.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/simulator.php b/simulator.php
index 5bf1b35af..85209e701 100644
--- a/simulator.php
+++ b/simulator.php
@@ -569,25 +569,25 @@ function ($value, $key) use ($TechEquivalents) {
     $parse['RowText2'] = '<a class="orange point fillShip_def">'.$_Lang['FillMyFleets'].'</a> / <a class="orange point clnShip_def">'.$_Lang['Fill_Clean'].'</a>';
     $ThisSlot['txt'] .= parsetemplate($TPL_NoBoth, $parse);
 
-    foreach($_Vars_ElementCategories['fleet'] as $Ships)
+    foreach($_Vars_ElementCategories['fleet'] as $elementId)
     {
-        $ThisRow_InsertValue_Def = isset($_POST['def_ships'][$i][$Ships]) ? $_POST['def_ships'][$i][$Ships] : null;
+        $ThisRow_InsertValue_Def = isset($_POST['def_ships'][$i][$elementId]) ? $_POST['def_ships'][$i][$elementId] : null;
 
-        $parse['RowText2'] = $_Lang['tech'][$Ships];
+        $parse['RowText2'] = $_Lang['tech'][$elementId];
         $parse['RowInput2'] = AttackSimulator\Components\ShipInput\render([
             'slotIdx' => $i,
-            'elementId' => $Ships,
+            'elementId' => $elementId,
             'columnType' => 'defender',
             'initialValue' => $ThisRow_InsertValue_Def,
         ])['componentHTML'];
 
-        if (hasAnyEngine($Ships)) {
-            $ThisRow_InsertValue_Atk = isset($_POST['atk_ships'][$i][$Ships]) ? $_POST['atk_ships'][$i][$Ships] : null;
+        if (hasAnyEngine($elementId)) {
+            $ThisRow_InsertValue_Atk = isset($_POST['atk_ships'][$i][$elementId]) ? $_POST['atk_ships'][$i][$elementId] : null;
 
-            $parse['RowText'] = $_Lang['tech'][$Ships];
+            $parse['RowText'] = $_Lang['tech'][$elementId];
             $parse['RowInput'] = AttackSimulator\Components\ShipInput\render([
                 'slotIdx' => $i,
-                'elementId' => $Ships,
+                'elementId' => $elementId,
                 'columnType' => 'attacker',
                 'initialValue' => $ThisRow_InsertValue_Atk,
             ])['componentHTML'];
@@ -606,18 +606,18 @@ function ($value, $key) use ($TechEquivalents) {
         $parse['RowText'] = $_Lang['Defense'];
         $ThisSlot['txt'] .= parsetemplate($TPL_SingleRow, $parse);
 
-        foreach($_Vars_ElementCategories['defense'] as $Ships)
+        foreach($_Vars_ElementCategories['defense'] as $elementId)
         {
-            if(in_array($Ships, $_Vars_ElementCategories['rockets']))
+            if(in_array($elementId, $_Vars_ElementCategories['rockets']))
             {
                 continue;
             }
 
-            $ThisRow_InsertValue_Def = isset($_POST['def_ships'][$i][$Ships]) ? $_POST['def_ships'][$i][$Ships] : null;
+            $ThisRow_InsertValue_Def = isset($_POST['def_ships'][$i][$elementId]) ? $_POST['def_ships'][$i][$elementId] : null;
 
             $parse['RowText'] = '-';
-            $parse['RowText2'] = $_Lang['tech'][$Ships];
-            $parse['RowInput2'] = "<input type=\"text\" tabindex=\"2\" name=\"def_ships[{$i}][{$Ships}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" class=\"pad2 fl\" /> <span class=\"fr\">(<span class=\"clnOne point\">{$_Lang['Button_Min']}</span> / <span class=\"maxOne point\">{$_Lang['Button_Max']}</span>)</span>";
+            $parse['RowText2'] = $_Lang['tech'][$elementId];
+            $parse['RowInput2'] = "<input type=\"text\" tabindex=\"2\" name=\"def_ships[{$i}][{$elementId}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" class=\"pad2 fl\" /> <span class=\"fr\">(<span class=\"clnOne point\">{$_Lang['Button_Min']}</span> / <span class=\"maxOne point\">{$_Lang['Button_Max']}</span>)</span>";
 
             $ThisSlot['txt'] .= parsetemplate($TPL_NoLeft, $parse);
         }

From e2b13a6efb8e5f95e827214b38f7f8d7bc111e57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Fri, 22 Jul 2022 21:35:48 +0200
Subject: [PATCH 15/38] [GH-91] Use component in defs as well

---
 simulator.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/simulator.php b/simulator.php
index 85209e701..c975a7539 100644
--- a/simulator.php
+++ b/simulator.php
@@ -601,23 +601,27 @@ function ($value, $key) use ($TechEquivalents) {
         }
     }
 
-    if($i == 1)
-    {
+    if ($i == 1) {
         $parse['RowText'] = $_Lang['Defense'];
         $ThisSlot['txt'] .= parsetemplate($TPL_SingleRow, $parse);
 
-        foreach($_Vars_ElementCategories['defense'] as $elementId)
-        {
-            if(in_array($elementId, $_Vars_ElementCategories['rockets']))
-            {
+        foreach ($_Vars_ElementCategories['defense'] as $elementId) {
+            if (in_array($elementId, $_Vars_ElementCategories['rockets'])) {
                 continue;
             }
 
             $ThisRow_InsertValue_Def = isset($_POST['def_ships'][$i][$elementId]) ? $_POST['def_ships'][$i][$elementId] : null;
 
             $parse['RowText'] = '-';
+            $parse['RowInput'] = '';
+
             $parse['RowText2'] = $_Lang['tech'][$elementId];
-            $parse['RowInput2'] = "<input type=\"text\" tabindex=\"2\" name=\"def_ships[{$i}][{$elementId}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" class=\"pad2 fl\" /> <span class=\"fr\">(<span class=\"clnOne point\">{$_Lang['Button_Min']}</span> / <span class=\"maxOne point\">{$_Lang['Button_Max']}</span>)</span>";
+            $parse['RowInput2'] = AttackSimulator\Components\ShipInput\render([
+                'slotIdx' => $i,
+                'elementId' => $elementId,
+                'columnType' => 'defender',
+                'initialValue' => $ThisRow_InsertValue_Def,
+            ])['componentHTML'];
 
             $ThisSlot['txt'] .= parsetemplate($TPL_NoLeft, $parse);
         }

From b0fdef7055cb5a615956687be11f40abd23274ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Fri, 22 Jul 2022 21:39:01 +0200
Subject: [PATCH 16/38] [GH-91] Use existing util to determine if def is rocket

---
 simulator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simulator.php b/simulator.php
index c975a7539..b35412cbd 100644
--- a/simulator.php
+++ b/simulator.php
@@ -606,7 +606,7 @@ function ($value, $key) use ($TechEquivalents) {
         $ThisSlot['txt'] .= parsetemplate($TPL_SingleRow, $parse);
 
         foreach ($_Vars_ElementCategories['defense'] as $elementId) {
-            if (in_array($elementId, $_Vars_ElementCategories['rockets'])) {
+            if (World\Elements\isMissile($elementId)) {
                 continue;
             }
 

From 8cab0070c39e98af6871a53dfa4af2ae9b754b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Sat, 23 Jul 2022 17:01:39 +0200
Subject: [PATCH 17/38] [GH-91] Move tech input rendering to a component

---
 modules/attackSimulator/_includes.php         |  1 +
 .../TechInput/TechInput.component.php         | 43 +++++++++++++++++++
 .../components/TechInput/body.tpl             |  7 +++
 .../components/TechInput/index.php            |  5 +++
 simulator.php                                 | 15 ++++++-
 5 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 modules/attackSimulator/components/TechInput/TechInput.component.php
 create mode 100644 modules/attackSimulator/components/TechInput/body.tpl
 create mode 100644 modules/attackSimulator/components/TechInput/index.php

diff --git a/modules/attackSimulator/_includes.php b/modules/attackSimulator/_includes.php
index 52dce636b..c7dc03177 100644
--- a/modules/attackSimulator/_includes.php
+++ b/modules/attackSimulator/_includes.php
@@ -7,6 +7,7 @@
     $includePath = $_EnginePath . 'modules/attackSimulator/';
 
     include($includePath . './components/ShipInput/ShipInput.component.php');
+    include($includePath . './components/TechInput/TechInput.component.php');
 
 });
 
diff --git a/modules/attackSimulator/components/TechInput/TechInput.component.php b/modules/attackSimulator/components/TechInput/TechInput.component.php
new file mode 100644
index 000000000..56098a006
--- /dev/null
+++ b/modules/attackSimulator/components/TechInput/TechInput.component.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace UniEngine\Engine\Modules\AttackSimulator\Components\TechInput;
+
+/**
+ * @param array $props
+ * @param number $props['slotIdx']
+ * @param number $props['elementId']
+ * @param enum ("attacker" | "defender") $props['columnType']
+ * @param number $props['initialValue']
+ */
+function render($props) {
+    $slotIdx = $props['slotIdx'];
+    $elementId = $props['elementId'];
+
+    $inputNamePrefix = (
+        $props['columnType'] === 'attacker' ?
+            'atk_techs' :
+            'def_techs'
+    );
+
+    $templateBodyProps = [
+        'prop_tabIndex'     => (
+            $props['columnType'] === 'attacker' ?
+                '1' :
+                '2'
+        ),
+        'prop_inputName'    => "{$inputNamePrefix}[{$slotIdx}][{$elementId}]",
+        'prop_initialValue' => $props['initialValue'],
+    ];
+
+    $localTemplateLoader = createLocalTemplateLoader(__DIR__);
+    $componentHTML = parsetemplate(
+        $localTemplateLoader('body'),
+        $templateBodyProps
+    );
+
+    return [
+        'componentHTML' => $componentHTML,
+    ];
+}
+
+?>
diff --git a/modules/attackSimulator/components/TechInput/body.tpl b/modules/attackSimulator/components/TechInput/body.tpl
new file mode 100644
index 000000000..b41d77096
--- /dev/null
+++ b/modules/attackSimulator/components/TechInput/body.tpl
@@ -0,0 +1,7 @@
+<input
+    type="text"
+    tabindex="{prop_tabIndex}"
+    name="{prop_inputName}"
+    value="{prop_initialValue}"
+    autocomplete="off"
+/>
diff --git a/modules/attackSimulator/components/TechInput/index.php b/modules/attackSimulator/components/TechInput/index.php
new file mode 100644
index 000000000..bc99142d1
--- /dev/null
+++ b/modules/attackSimulator/components/TechInput/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/simulator.php b/simulator.php
index b35412cbd..9d2577a15 100644
--- a/simulator.php
+++ b/simulator.php
@@ -556,9 +556,20 @@ function ($value, $key) use ($TechEquivalents) {
         $ThisRow_InsertValue_Def = isset($_POST['def_techs'][$i][$elementId]) ? $_POST['def_techs'][$i][$elementId] : null;
 
         $parse['RowText'] = $_Lang['tech'][$elementId];
-        $parse['RowInput'] = "<input type=\"text\" tabindex=\"1\" name=\"atk_techs[{$i}][{$elementId}]\" value=\"{$ThisRow_InsertValue_Atk}\" autocomplete=\"off\" />";
+        $parse['RowInput'] = AttackSimulator\Components\TechInput\render([
+            'slotIdx' => $i,
+            'elementId' => $elementId,
+            'columnType' => 'attacker',
+            'initialValue' => $ThisRow_InsertValue_Atk,
+        ])['componentHTML'];
+
         $parse['RowText2'] = $_Lang['tech'][$elementId];
-        $parse['RowInput2'] = "<input type=\"text\" tabindex=\"2\" name=\"def_techs[{$i}][{$elementId}]\" value=\"{$ThisRow_InsertValue_Def}\" autocomplete=\"off\" />";
+        $parse['RowInput2'] = AttackSimulator\Components\TechInput\render([
+            'slotIdx' => $i,
+            'elementId' => $elementId,
+            'columnType' => 'defender',
+            'initialValue' => $ThisRow_InsertValue_Def,
+        ])['componentHTML'];
 
         $ThisSlot['txt'] .= parsetemplate($TPL_Row, $parse);
     }

From 523bfe74e6936b7668ba9cd233f46459aab9425d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Sat, 23 Jul 2022 17:21:07 +0200
Subject: [PATCH 18/38] [GH-91] Move morale input rendering to a component

---
 modules/attackSimulator/_includes.php         |  1 +
 .../MoraleInput/MoraleInput.component.php     | 41 +++++++++++++++++++
 .../components/MoraleInput/body.tpl           |  7 ++++
 .../components/MoraleInput/index.php          |  5 +++
 simulator.php                                 | 14 ++++++-
 5 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 modules/attackSimulator/components/MoraleInput/MoraleInput.component.php
 create mode 100644 modules/attackSimulator/components/MoraleInput/body.tpl
 create mode 100644 modules/attackSimulator/components/MoraleInput/index.php

diff --git a/modules/attackSimulator/_includes.php b/modules/attackSimulator/_includes.php
index c7dc03177..42f87b7f6 100644
--- a/modules/attackSimulator/_includes.php
+++ b/modules/attackSimulator/_includes.php
@@ -6,6 +6,7 @@
 
     $includePath = $_EnginePath . 'modules/attackSimulator/';
 
+    include($includePath . './components/MoraleInput/MoraleInput.component.php');
     include($includePath . './components/ShipInput/ShipInput.component.php');
     include($includePath . './components/TechInput/TechInput.component.php');
 
diff --git a/modules/attackSimulator/components/MoraleInput/MoraleInput.component.php b/modules/attackSimulator/components/MoraleInput/MoraleInput.component.php
new file mode 100644
index 000000000..32211cbba
--- /dev/null
+++ b/modules/attackSimulator/components/MoraleInput/MoraleInput.component.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace UniEngine\Engine\Modules\AttackSimulator\Components\MoraleInput;
+
+/**
+ * @param array $props
+ * @param number $props['slotIdx']
+ * @param enum ("attacker" | "defender") $props['columnType']
+ * @param number $props['initialValue']
+ */
+function render($props) {
+    $slotIdx = $props['slotIdx'];
+
+    $inputNamePrefix = (
+        $props['columnType'] === 'attacker' ?
+            'atk_morale' :
+            'def_morale'
+    );
+
+    $templateBodyProps = [
+        'prop_tabIndex'     => (
+            $props['columnType'] === 'attacker' ?
+                '1' :
+                '2'
+        ),
+        'prop_inputName'    => "{$inputNamePrefix}[{$slotIdx}]",
+        'prop_initialValue' => $props['initialValue'],
+    ];
+
+    $localTemplateLoader = createLocalTemplateLoader(__DIR__);
+    $componentHTML = parsetemplate(
+        $localTemplateLoader('body'),
+        $templateBodyProps
+    );
+
+    return [
+        'componentHTML' => $componentHTML,
+    ];
+}
+
+?>
diff --git a/modules/attackSimulator/components/MoraleInput/body.tpl b/modules/attackSimulator/components/MoraleInput/body.tpl
new file mode 100644
index 000000000..261d9bb11
--- /dev/null
+++ b/modules/attackSimulator/components/MoraleInput/body.tpl
@@ -0,0 +1,7 @@
+<input
+    type="text"
+    tabindex="{prop_tabIndex}"
+    name="{prop_inputName}"
+    value="{prop_initialValue}"
+    autocomplete="off"
+/>%
diff --git a/modules/attackSimulator/components/MoraleInput/index.php b/modules/attackSimulator/components/MoraleInput/index.php
new file mode 100644
index 000000000..bc99142d1
--- /dev/null
+++ b/modules/attackSimulator/components/MoraleInput/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/simulator.php b/simulator.php
index 9d2577a15..2cdcd2550 100644
--- a/simulator.php
+++ b/simulator.php
@@ -537,10 +537,20 @@ function ($value, $key) use ($TechEquivalents) {
     {
         $parse['RowText'] = $_Lang['Morale'];
         $ThisSlot['txt'] .= parsetemplate($TPL_SingleRow, $parse);
+
         $parse['RowText'] = $_Lang['Morale_Level'];
-        $parse['RowInput'] = "<input type=\"text\" tabindex=\"1\" name=\"atk_morale[{$i}]\" value=\"{$_POST['atk_morale'][$i]}\" autocomplete=\"off\" />%";
+        $parse['RowInput'] = AttackSimulator\Components\MoraleInput\render([
+            'slotIdx' => $i,
+            'columnType' => 'attacker',
+            'initialValue' => $_POST['atk_morale'][$i],
+        ])['componentHTML'];
+
         $parse['RowText2'] = $_Lang['Morale_Level'];
-        $parse['RowInput2'] = "<input type=\"text\" tabindex=\"2\" name=\"def_morale[{$i}]\" value=\"{$_POST['def_morale'][$i]}\" autocomplete=\"off\" />%";
+        $parse['RowInput2'] = AttackSimulator\Components\MoraleInput\render([
+            'slotIdx' => $i,
+            'columnType' => 'defender',
+            'initialValue' => $_POST['def_morale'][$i],
+        ])['componentHTML'];
 
         $ThisSlot['txt'] .= parsetemplate($TPL_Row, $parse);
     }

From ee2d6b92d64162cb3f86d0f6c3054734a93d81e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Sun, 24 Jul 2022 18:12:57 +0200
Subject: [PATCH 19/38] GH-91 Use existing combat report factory

---
 simulator.php | 121 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 72 insertions(+), 49 deletions(-)

diff --git a/simulator.php b/simulator.php
index 2cdcd2550..ca93481c2 100644
--- a/simulator.php
+++ b/simulator.php
@@ -87,6 +87,7 @@ function ($value, $key) use ($TechEquivalents) {
 
         foreach ($_POST[$inputMappingGroup['techInputKey']] as $userSlotIdx => $userSlotData) {
             $userIdx = $userSlotIdx - 1;
+            $userTechs = [];
 
             foreach ($userSlotData as $elementId => $elementValue) {
                 if (!World\Elements\isTechnology($elementId)) {
@@ -96,15 +97,27 @@ function ($value, $key) use ($TechEquivalents) {
                     $inputMappingGroup['techsAccumulatorObject'][$userIdx] = [];
                 }
 
+                $elementKey = World\Elements\getElementKey($elementId);
                 $safeElementValue = intval($elementValue, 10);
 
                 $inputMappingGroup['techsAccumulatorObject'][$userIdx][$elementId] = $safeElementValue;
+                $userTechs[$elementKey] = $safeElementValue;
             }
 
             $inputMappingGroup['usersAccumulatorObject'][$userIdx] = [
-                'username' => "{$inputMappingGroup['usernamePrefix']}{$userSlotIdx}",
-                'techs' => Array2String($inputMappingGroup['techsAccumulatorObject'][$userIdx]),
-                'pos' => '0:0:0'
+                'fleetRow' => [
+                    'fleet_owner' => '0',
+                    'fleet_start_galaxy' => '0',
+                    'fleet_start_system' => '0',
+                    'fleet_start_planet' => '0',
+                ],
+                'user' => array_merge(
+                    [
+                        'username' => "{$inputMappingGroup['usernamePrefix']}{$userSlotIdx}",
+                    ],
+                    $userTechs
+                ),
+                'moraleData' => null,
             ];
         }
     }
@@ -151,11 +164,23 @@ function ($value, $key) use ($TechEquivalents) {
                 unset($inputMappingGroup['usersAccumulatorObject'][$userIdx]);
             } else if (empty($inputMappingGroup['techsAccumulatorObject'][$userIdx])) {
                 // Fill user techs (with zeros) & details
+                $userTechs = [];
+
                 $inputMappingGroup['techsAccumulatorObject'][$userIdx] = [];
                 $inputMappingGroup['usersAccumulatorObject'][$userIdx] = [
-                    'username' => "{$inputMappingGroup['usernamePrefix']}{$userSlotIdx}",
-                    'techs' => Array2String($inputMappingGroup['techsAccumulatorObject'][$userIdx]),
-                    'pos' => '0:0:0'
+                    'fleetRow' => [
+                        'fleet_owner' => '0',
+                        'fleet_start_galaxy' => '0',
+                        'fleet_start_system' => '0',
+                        'fleet_start_planet' => '0',
+                    ],
+                    'user' => array_merge(
+                        [
+                            'username' => "{$inputMappingGroup['usernamePrefix']}{$userSlotIdx}",
+                        ],
+                        $userTechs
+                    ),
+                    'moraleData' => null,
                 ];
             }
         }
@@ -205,7 +230,10 @@ function ($value, $key) use ($TechEquivalents) {
                 $ThisMoraleLevel = intval($_POST['atk_morale'][($ThisUser + 1)]);
                 $ThisMoraleLevel = keepInRange($ThisMoraleLevel, -100, 100);
 
-                $AttackersData[$ThisUser]['morale'] = $ThisMoraleLevel;
+                $AttackersData[$ThisUser]['moraleData'] = [
+                    'morale_level' => $ThisMoraleLevel,
+                    'morale_points' => 0,
+                ];
 
                 $moraleCombatModifiers = Flights\Utils\Modifiers\calculateMoraleCombatModifiers([
                     'moraleLevel' => $ThisMoraleLevel,
@@ -222,7 +250,10 @@ function ($value, $key) use ($TechEquivalents) {
                 $ThisMoraleLevel = intval($_POST['def_morale'][($ThisUser + 1)]);
                 $ThisMoraleLevel = keepInRange($ThisMoraleLevel, -100, 100);
 
-                $DefendersData[$ThisUser]['morale'] = $ThisMoraleLevel;
+                $DefendersData[$ThisUser]['moraleData'] = [
+                    'morale_level' => $ThisMoraleLevel,
+                    'morale_points' => 0,
+                ];
 
                 $moraleCombatModifiers = Flights\Utils\Modifiers\calculateMoraleCombatModifiers([
                     'moraleLevel' => $ThisMoraleLevel,
@@ -399,49 +430,41 @@ function ($value, $key) use ($TechEquivalents) {
                 'totalDebris' => ($TotalLostMetal + $TotalLostCrystal),
             ]);
 
-            $ReportData = [];
-
-            $ReportData['init']['usr']['atk'] = $AttackersData;
-            $ReportData['init']['usr']['def'] = $DefendersData;
-
-            $ReportData['init']['time'] = $totaltime;
-            $ReportData['init']['date'] = time();
-
-            $ReportData['init']['result'] = $Result;
-            $ReportData['init']['met'] = 0;
-            $ReportData['init']['cry'] = 0;
-            $ReportData['init']['deu'] = 0;
-            $ReportData['init']['deb_met'] = $TotalLostMetal;
-            $ReportData['init']['deb_cry'] = $TotalLostCrystal;
-            $ReportData['init']['moon_chance'] = $moonCreationRollResult['boundedMoonChance'];
-            $ReportData['init']['total_moon_chance'] = $moonCreationRollResult['totalMoonChance'];
-            $ReportData['init']['moon_created'] = false;
-            $ReportData['init']['moon_destroyed'] = false;
-            $ReportData['init']['moon_des_chance'] = '0';
-            $ReportData['init']['fleet_destroyed'] = false;
-            $ReportData['init']['fleet_des_chance'] = '0';
-            $ReportData['init']['planet_name'] = 'Planeta';
-            $ReportData['init']['onMoon'] = false;
-            $ReportData['init']['atk_lost'] = $RealDebrisMetalAtk + $RealDebrisCrystalAtk + $RealDebrisDeuteriumAtk;
-            $ReportData['init']['def_lost'] = $RealDebrisMetalDef + $RealDebrisCrystalDef + $RealDebrisDeuteriumDef;
-
-            foreach($RoundsData as $RoundKey => $RoundData)
-            {
-                foreach($RoundData as $MainKey => $RoundData2)
-                {
-                    if(!empty($RoundData2['ships']))
-                    {
-                        foreach($RoundData2['ships'] as $UserKey => $UserData)
-                        {
-                            $RoundsData[$RoundKey][$MainKey]['ships'][$UserKey] = Array2String($UserData);
-                        }
-                    }
-                }
-            }
-            $ReportData['rounds'] = $RoundsData;
+            $combatReportData = Flights\Utils\Factories\createCombatReportData([
+                'fleetRow' => [
+                    'fleet_start_time' => time(),
+                ],
+                'targetPlanet' => [
+                    // TODO: this should be localised
+                    'name' => 'Planeta',
+                    'fleet_end_type' => 1,
+                ],
+                'usersData' => [
+                    'attackers' => $AttackersData,
+                    'defenders' => $DefendersData,
+                ],
+                'combatData' => $Combat,
+                'combatCalculationTime' => $totaltime,
+                'moraleData' => null,
+                'totalResourcesPillage' => [
+                    'metal' => 0,
+                    'crystal' => 0,
+                    'deuterium' => 0,
+                ],
+                'resourceLosses' => [
+                    'attackers' => $attackersResourceLosses,
+                    'defenders' => $defendersResourceLosses,
+                ],
+                'moonCreationData' => [
+                    'hasBeenCreated' => false,
+                    'normalizedChance' => $moonCreationRollResult['boundedMoonChance'],
+                    'totalChance' => $moonCreationRollResult['totalMoonChance'],
+                ],
+                'moonDestructionData' => null,
+            ]);
 
             $ReportID = CreateBattleReport(
-                $ReportData,
+                $combatReportData,
                 [
                     'atk' => $_User['id'],
                     'def' => 0,

From 1fb04a1dc7708cabe9f6eb68df9d514926aadcc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Mon, 25 Jul 2022 23:07:11 +0200
Subject: [PATCH 20/38] GH-91 Overall loop code cleanup

---
 simulator.php | 74 +++++++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 41 deletions(-)

diff --git a/simulator.php b/simulator.php
index ca93481c2..5a564cb74 100644
--- a/simulator.php
+++ b/simulator.php
@@ -302,41 +302,41 @@ function ($value, $key) use ($TechEquivalents) {
         $SimData['ship_lost_def_min'] = 99999999999999999999.0;
         $SimData['ship_lost_def_max'] = 0;
 
-        $TotalTime = 0;
-        for($i = 1; $i <= $Loop; $i += 1)
-        {
-            $Temp['ship_lost_atk'] = 0;
-            $Temp['ship_lost_def'] = 0;
+        $allSimulationsTotalTime = 0;
+
+        for (
+            $i = 1;
+            $i <= $Loop;
+            $i += 1
+        ) {
+            $Temp = [
+                'ship_lost_atk' => 0,
+                'ship_lost_def' => 0,
+            ];
 
-            $StartTime = microtime(true);
+            $simulationStartTimestamp = microtime(true);
 
-            // Now start Combat calculations
             $Combat = Combat($AttackingFleets, $DefendingFleets, $AttackingTechs, $DefendingTechs, true);
 
-            $EndTime = microtime(true);
-            $TimeNow = $EndTime - $StartTime;
-            $TotalTime += $TimeNow;
-            $totaltime = sprintf('%0.6f', $TimeNow);
+            $simulationEndTimestamp = microtime(true);
 
-            $RoundsData = $Combat['rounds'];
+            $combatSimulationTime = $simulationEndTimestamp - $simulationStartTimestamp;
+            $combatSimulationTimeFormatted = sprintf('%0.6f', $combatSimulationTime);
+            $allSimulationsTotalTime += $combatSimulationTime;
 
-            $RoundCount = count($RoundsData) - 1;
-            if($RoundCount > $SimData['max_rounds'])
-            {
+            $RoundCount = count($Combat['rounds']) - 1;
+
+            if ($RoundCount > $SimData['max_rounds']) {
                 $SimData['max_rounds'] = $RoundCount;
             }
-            if($RoundCount < $SimData['min_rounds'])
-            {
+            if ($RoundCount < $SimData['min_rounds']) {
                 $SimData['min_rounds'] = $RoundCount;
             }
             $SimData['rounds'] += $RoundCount;
 
             $Result = $Combat['result'];
-            $AtkShips = $Combat['AttackerShips'];
-            $DefShips = $Combat['DefenderShips'];
             $AtkLost = $Combat['AtkLose'];
             $DefLost = $Combat['DefLose'];
-            $DefSysLost = $Combat['DefSysLost'];
 
             $debrisRecoveryPercentages = [
                 'ships' => ($_GameConfig['Fleet_Cdr'] / 100),
@@ -397,8 +397,7 @@ function ($value, $key) use ($TechEquivalents) {
                 $defendersResourceLosses['recoverableLoss']['crystal']
             );
 
-            switch($Result)
-            {
+            switch ($Result) {
                 case COMBAT_ATK:
                     $SimData['atk_win'] += 1;
                     break;
@@ -410,8 +409,7 @@ function ($value, $key) use ($TechEquivalents) {
                     break;
             }
 
-            switch($Result)
-            {
+            switch ($Result) {
                 case COMBAT_ATK:
                     $_Lang['Winner_Color'] = 'red';
                     $_Lang['Winner_Name'] = $_Lang['WonBy_Attacker'];
@@ -444,7 +442,7 @@ function ($value, $key) use ($TechEquivalents) {
                     'defenders' => $DefendersData,
                 ],
                 'combatData' => $Combat,
-                'combatCalculationTime' => $totaltime,
+                'combatCalculationTime' => $combatSimulationTimeFormatted,
                 'moraleData' => null,
                 'totalResourcesPillage' => [
                     'metal' => 0,
@@ -477,30 +475,24 @@ function ($value, $key) use ($TechEquivalents) {
             $parse['id'] = $ReportID;
 
             $AllReports[] = $ReportID;
-            if($i == $Loop)
-            {
-                $parse['time'] = sprintf('%0.6f', $TotalTime);
-            }
-            else
-            {
-                $parse['time'] = $totaltime;
-            }
 
-            if($Temp['ship_lost_atk'] < $SimData['ship_lost_atk_min'])
-            {
+            $parse['time'] = (
+                ($i == $Loop) ?
+                    sprintf('%0.6f', $allSimulationsTotalTime) :
+                    $combatSimulationTimeFormatted
+            );
+
+            if ($Temp['ship_lost_atk'] < $SimData['ship_lost_atk_min']) {
                 $SimData['ship_lost_atk_min'] = $Temp['ship_lost_atk'];
             }
-            if($Temp['ship_lost_atk'] > $SimData['ship_lost_atk_max'])
-            {
+            if ($Temp['ship_lost_atk'] > $SimData['ship_lost_atk_max']) {
                 $SimData['ship_lost_atk_max'] = $Temp['ship_lost_atk'];
             }
 
-            if($Temp['ship_lost_def'] < $SimData['ship_lost_def_min'])
-            {
+            if ($Temp['ship_lost_def'] < $SimData['ship_lost_def_min']) {
                 $SimData['ship_lost_def_min'] = $Temp['ship_lost_def'];
             }
-            if($Temp['ship_lost_def'] > $SimData['ship_lost_def_max'])
-            {
+            if ($Temp['ship_lost_def'] > $SimData['ship_lost_def_max']) {
                 $SimData['ship_lost_def_max'] = $Temp['ship_lost_def'];
             }
         }

From c4de36a7a7cbbd514990a642cbe3be56bb1a3d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Mon, 25 Jul 2022 23:15:00 +0200
Subject: [PATCH 21/38] GH-91 Use existing helper to determine if element is
 ship

---
 simulator.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/simulator.php b/simulator.php
index 5a564cb74..5c1d990da 100644
--- a/simulator.php
+++ b/simulator.php
@@ -354,11 +354,13 @@ function ($value, $key) use ($TechEquivalents) {
             $RealDebrisDeuteriumAtk = $attackersResourceLosses['realLoss']['deuterium'];
 
             if (!empty($AtkLost)) {
-                foreach ($AtkLost as $ID => $Count) {
-                    if ($ID > 200 && $ID < 300) {
-                        $SimData['ship_lost_atk'] += $Count;
-                        $Temp['ship_lost_atk'] += $Count;
+                foreach ($AtkLost as $shipId => $shipCount) {
+                    if (!World\Elements\isShip($shipId)) {
+                        continue;
                     }
+
+                    $SimData['ship_lost_atk'] += $shipCount;
+                    $Temp['ship_lost_atk'] += $shipCount;
                 }
             }
 
@@ -377,9 +379,9 @@ function ($value, $key) use ($TechEquivalents) {
             $RealDebrisDeuteriumDef = $defendersResourceLosses['realLoss']['deuterium'];
 
             if (!empty($DefLost)) {
-                foreach ($DefLost as $ID => $Count) {
-                    $SimData['ship_lost_def'] += $Count;
-                    $Temp['ship_lost_def'] += $Count;
+                foreach ($DefLost as $shipId => $shipCount) {
+                    $SimData['ship_lost_def'] += $shipCount;
+                    $Temp['ship_lost_def'] += $shipCount;
                 }
             }
 

From c65cf83e58a93f299f5fc4952b01ea07ef77ff43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Mon, 25 Jul 2022 23:19:17 +0200
Subject: [PATCH 22/38] GH-91 Localise planet name

---
 simulator.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/simulator.php b/simulator.php
index 5c1d990da..50717800c 100644
--- a/simulator.php
+++ b/simulator.php
@@ -435,8 +435,7 @@ function ($value, $key) use ($TechEquivalents) {
                     'fleet_start_time' => time(),
                 ],
                 'targetPlanet' => [
-                    // TODO: this should be localised
-                    'name' => 'Planeta',
+                    'name' => $_Lang['BR_Target_1'],
                     'fleet_end_type' => 1,
                 ],
                 'usersData' => [

From 8a311a76b1a8f76d8c81672479d57b7b08cb81bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Tue, 26 Jul 2022 00:13:54 +0200
Subject: [PATCH 23/38] GH-91 Simplify cleanup code

---
 simulator.php | 50 ++++++++++++++++++++------------------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/simulator.php b/simulator.php
index 50717800c..4deb8fc37 100644
--- a/simulator.php
+++ b/simulator.php
@@ -186,41 +186,31 @@ function ($value, $key) use ($TechEquivalents) {
         }
     }
 
-    if(isset($AttackersData))
-    {
-        foreach($AttackersData as $UserTemp => $Data)
-        {
-            if(empty($AttackingFleets[$UserTemp]))
-            {
-                unset($AttackingFleets[$UserTemp]);
-                unset($AttackingTechs[$UserTemp]);
-                unset($AttackersData[$UserTemp]);
-            }
+    foreach ($AttackersData as $userSlotIdx => $userData) {
+        if (empty($AttackingFleets[$userSlotIdx])) {
+            unset($AttackingFleets[$userSlotIdx]);
+            unset($AttackingTechs[$userSlotIdx]);
+            unset($AttackersData[$userSlotIdx]);
         }
     }
-    if(isset($DefendersData))
-    {
-        foreach($DefendersData as $UserTemp => $Data)
-        {
-            if(empty($DefendingFleets[$UserTemp]))
-            {
-                unset($DefendingFleets[$UserTemp]);
-                unset($DefendingTechs[$UserTemp]);
-                unset($DefendersData[$UserTemp]);
-            }
+    foreach ($DefendersData as $userSlotIdx => $userData) {
+        if (empty($DefendingFleets[$userSlotIdx])) {
+            unset($DefendingFleets[$userSlotIdx]);
+            unset($DefendingTechs[$userSlotIdx]);
+            unset($DefendersData[$userSlotIdx]);
         }
     }
 
-    if(empty($AttackingFleets) OR (empty($DefendingFleets)))
-    {
-        if(empty($AttackingFleets))
-        {
-            $BreakMSG = $_Lang['Break_noATKShips'];
-        }
-        else if(empty($DefendingFleets))
-        {
-            $BreakMSG = $_Lang['Break_noDEFShips'];
-        }
+    if (
+        empty($AttackingFleets) ||
+        empty($DefendingFleets)
+    ) {
+        $BreakMSG = (
+            empty($AttackingFleets) ?
+                $_Lang['Break_noATKShips'] :
+                $_Lang['Break_noDEFShips']
+        );
+
         $Calculate = false;
     }
 

From b4c616f7a7863f4043b82884f4f7e9931c29a1fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Tue, 26 Jul 2022 00:19:22 +0200
Subject: [PATCH 24/38] GH-91 Simplify morale details init code a bit

---
 simulator.php | 65 ++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/simulator.php b/simulator.php
index 4deb8fc37..086d5382f 100644
--- a/simulator.php
+++ b/simulator.php
@@ -215,45 +215,42 @@ function ($value, $key) use ($TechEquivalents) {
     }
 
     if (MORALE_ENABLED) {
-        if (!empty($AttackingFleets)) {
-            foreach ($AttackingFleets as $ThisUser => $ThisData) {
-                $ThisMoraleLevel = intval($_POST['atk_morale'][($ThisUser + 1)]);
-                $ThisMoraleLevel = keepInRange($ThisMoraleLevel, -100, 100);
-
-                $AttackersData[$ThisUser]['moraleData'] = [
-                    'morale_level' => $ThisMoraleLevel,
-                    'morale_points' => 0,
-                ];
+        foreach ($AttackingFleets as $ThisUser => $ThisData) {
+            $ThisMoraleLevel = intval($_POST['atk_morale'][($ThisUser + 1)]);
+            $ThisMoraleLevel = keepInRange($ThisMoraleLevel, -100, 100);
 
-                $moraleCombatModifiers = Flights\Utils\Modifiers\calculateMoraleCombatModifiers([
-                    'moraleLevel' => $ThisMoraleLevel,
-                ]);
+            $AttackersData[$ThisUser]['moraleData'] = [
+                'morale_level' => $ThisMoraleLevel,
+                'morale_points' => 0,
+            ];
 
-                $AttackingTechs[$ThisUser] = array_merge(
-                    $AttackingTechs[$ThisUser],
-                    $moraleCombatModifiers
-                );
-            }
+            $moraleCombatModifiers = Flights\Utils\Modifiers\calculateMoraleCombatModifiers([
+                'moraleLevel' => $ThisMoraleLevel,
+            ]);
+
+            $AttackingTechs[$ThisUser] = array_merge(
+                $AttackingTechs[$ThisUser],
+                $moraleCombatModifiers
+            );
         }
-        if (!empty($DefendingFleets)) {
-            foreach ($DefendingFleets as $ThisUser => $ThisData) {
-                $ThisMoraleLevel = intval($_POST['def_morale'][($ThisUser + 1)]);
-                $ThisMoraleLevel = keepInRange($ThisMoraleLevel, -100, 100);
-
-                $DefendersData[$ThisUser]['moraleData'] = [
-                    'morale_level' => $ThisMoraleLevel,
-                    'morale_points' => 0,
-                ];
 
-                $moraleCombatModifiers = Flights\Utils\Modifiers\calculateMoraleCombatModifiers([
-                    'moraleLevel' => $ThisMoraleLevel,
-                ]);
+        foreach ($DefendingFleets as $ThisUser => $ThisData) {
+            $ThisMoraleLevel = intval($_POST['def_morale'][($ThisUser + 1)]);
+            $ThisMoraleLevel = keepInRange($ThisMoraleLevel, -100, 100);
 
-                $DefendingTechs[$ThisUser] = array_merge(
-                    $DefendingTechs[$ThisUser],
-                    $moraleCombatModifiers
-                );
-            }
+            $DefendersData[$ThisUser]['moraleData'] = [
+                'morale_level' => $ThisMoraleLevel,
+                'morale_points' => 0,
+            ];
+
+            $moraleCombatModifiers = Flights\Utils\Modifiers\calculateMoraleCombatModifiers([
+                'moraleLevel' => $ThisMoraleLevel,
+            ]);
+
+            $DefendingTechs[$ThisUser] = array_merge(
+                $DefendingTechs[$ThisUser],
+                $moraleCombatModifiers
+            );
         }
     }
 

From 5d2a95c95684fee5ae4e07e60d6fbd79f6f3784f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Wed, 27 Jul 2022 19:07:38 +0200
Subject: [PATCH 25/38] GH-91 Share morale init code between atk & def groups

---
 simulator.php | 59 ++++++++++++++++++++++-----------------------------
 1 file changed, 25 insertions(+), 34 deletions(-)

diff --git a/simulator.php b/simulator.php
index 086d5382f..8a44416ed 100644
--- a/simulator.php
+++ b/simulator.php
@@ -65,6 +65,7 @@ function ($value, $key) use ($TechEquivalents) {
         [
             'techInputKey' => 'atk_techs',
             'fleetInputKey' => 'atk_ships',
+            'moraleInputKey' => 'atk_morale',
             'techsAccumulatorObject' => &$AttackingTechs,
             'fleetAccumulatorObject' => &$AttackingFleets,
             'usersAccumulatorObject' => &$AttackersData,
@@ -73,6 +74,7 @@ function ($value, $key) use ($TechEquivalents) {
         [
             'techInputKey' => 'def_techs',
             'fleetInputKey' => 'def_ships',
+            'moraleInputKey' => 'def_morale',
             'techsAccumulatorObject' => &$DefendingTechs,
             'fleetAccumulatorObject' => &$DefendingFleets,
             'usersAccumulatorObject' => &$DefendersData,
@@ -215,42 +217,31 @@ function ($value, $key) use ($TechEquivalents) {
     }
 
     if (MORALE_ENABLED) {
-        foreach ($AttackingFleets as $ThisUser => $ThisData) {
-            $ThisMoraleLevel = intval($_POST['atk_morale'][($ThisUser + 1)]);
-            $ThisMoraleLevel = keepInRange($ThisMoraleLevel, -100, 100);
-
-            $AttackersData[$ThisUser]['moraleData'] = [
-                'morale_level' => $ThisMoraleLevel,
-                'morale_points' => 0,
-            ];
-
-            $moraleCombatModifiers = Flights\Utils\Modifiers\calculateMoraleCombatModifiers([
-                'moraleLevel' => $ThisMoraleLevel,
-            ]);
-
-            $AttackingTechs[$ThisUser] = array_merge(
-                $AttackingTechs[$ThisUser],
-                $moraleCombatModifiers
-            );
-        }
-
-        foreach ($DefendingFleets as $ThisUser => $ThisData) {
-            $ThisMoraleLevel = intval($_POST['def_morale'][($ThisUser + 1)]);
-            $ThisMoraleLevel = keepInRange($ThisMoraleLevel, -100, 100);
+        foreach ($inputMappingGroups as $inputMappingGroup) {
+            $groupFleets = &$inputMappingGroup['fleetAccumulatorObject'];
+            $groupTechs = &$inputMappingGroup['techsAccumulatorObject'];
+            $groupUsersData = &$inputMappingGroup['usersAccumulatorObject'];
+            $inputKey = $inputMappingGroup['moraleInputKey'];
+            $moraleInputSlots = $_POST[$inputKey];
+
+            foreach ($groupFleets as $userSlotIdx => $userFleets) {
+                $userMoraleLevel = intval($moraleInputSlots[($userSlotIdx + 1)]);
+                $userMoraleLevel = keepInRange($userMoraleLevel, -100, 100);
+
+                $groupUsersData[$userSlotIdx]['moraleData'] = [
+                    'morale_level' => $userMoraleLevel,
+                    'morale_points' => 0,
+                ];
 
-            $DefendersData[$ThisUser]['moraleData'] = [
-                'morale_level' => $ThisMoraleLevel,
-                'morale_points' => 0,
-            ];
+                $moraleCombatModifiers = Flights\Utils\Modifiers\calculateMoraleCombatModifiers([
+                    'moraleLevel' => $userMoraleLevel,
+                ]);
 
-            $moraleCombatModifiers = Flights\Utils\Modifiers\calculateMoraleCombatModifiers([
-                'moraleLevel' => $ThisMoraleLevel,
-            ]);
-
-            $DefendingTechs[$ThisUser] = array_merge(
-                $DefendingTechs[$ThisUser],
-                $moraleCombatModifiers
-            );
+                $groupTechs[$userSlotIdx] = array_merge(
+                    $groupTechs[$userSlotIdx],
+                    $moraleCombatModifiers
+                );
+            }
         }
     }
 

From 270de9d606b7339c654b6729afdcd2240b3ba3a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Wed, 27 Jul 2022 19:19:02 +0200
Subject: [PATCH 26/38] GH-91 Make sure that the input field exists

---
 simulator.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/simulator.php b/simulator.php
index 8a44416ed..a774b478e 100644
--- a/simulator.php
+++ b/simulator.php
@@ -225,7 +225,11 @@ function ($value, $key) use ($TechEquivalents) {
             $moraleInputSlots = $_POST[$inputKey];
 
             foreach ($groupFleets as $userSlotIdx => $userFleets) {
-                $userMoraleLevel = intval($moraleInputSlots[($userSlotIdx + 1)]);
+                $userMoraleLevel = (
+                    isset($moraleInputSlots[($userSlotIdx + 1)]) ?
+                        intval($moraleInputSlots[($userSlotIdx + 1)]) :
+                        0
+                );
                 $userMoraleLevel = keepInRange($userMoraleLevel, -100, 100);
 
                 $groupUsersData[$userSlotIdx]['moraleData'] = [

From 4d81c52037d5a9cc20f9b9410e2e8fd1a695ee0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Thu, 28 Jul 2022 01:57:13 +0200
Subject: [PATCH 27/38] GH-91 Create shared user data object creator

---
 simulator.php | 66 ++++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/simulator.php b/simulator.php
index a774b478e..3c6077a67 100644
--- a/simulator.php
+++ b/simulator.php
@@ -82,6 +82,30 @@ function ($value, $key) use ($TechEquivalents) {
         ],
     ];
 
+    /**
+     * @param array $params
+     * @param number $params['userSlotIdx']
+     * @param string $params['usernamePrefix']
+     * @param array $params['userKeyedTechs']
+     */
+    $createSimulationUserData = function ($params) {
+        return [
+            'fleetRow' => [
+                'fleet_owner' => '0',
+                'fleet_start_galaxy' => '0',
+                'fleet_start_system' => '0',
+                'fleet_start_planet' => '0',
+            ],
+            'user' => array_merge(
+                [
+                    'username' => "{$params['usernamePrefix']}{$params['userSlotIdx']}",
+                ],
+                $params['userKeyedTechs']
+            ),
+            'moraleData' => null,
+        ];
+    };
+
     foreach ($inputMappingGroups as $inputMappingGroup) {
         if (empty($_POST[$inputMappingGroup['techInputKey']])) {
             continue;
@@ -106,21 +130,11 @@ function ($value, $key) use ($TechEquivalents) {
                 $userTechs[$elementKey] = $safeElementValue;
             }
 
-            $inputMappingGroup['usersAccumulatorObject'][$userIdx] = [
-                'fleetRow' => [
-                    'fleet_owner' => '0',
-                    'fleet_start_galaxy' => '0',
-                    'fleet_start_system' => '0',
-                    'fleet_start_planet' => '0',
-                ],
-                'user' => array_merge(
-                    [
-                        'username' => "{$inputMappingGroup['usernamePrefix']}{$userSlotIdx}",
-                    ],
-                    $userTechs
-                ),
-                'moraleData' => null,
-            ];
+            $inputMappingGroup['usersAccumulatorObject'][$userIdx] = $createSimulationUserData([
+                'userSlotIdx' => $userSlotIdx,
+                'usernamePrefix' => $inputMappingGroup['usernamePrefix'],
+                'userKeyedTechs' => $userTechs,
+            ]);
         }
     }
 
@@ -166,24 +180,12 @@ function ($value, $key) use ($TechEquivalents) {
                 unset($inputMappingGroup['usersAccumulatorObject'][$userIdx]);
             } else if (empty($inputMappingGroup['techsAccumulatorObject'][$userIdx])) {
                 // Fill user techs (with zeros) & details
-                $userTechs = [];
-
                 $inputMappingGroup['techsAccumulatorObject'][$userIdx] = [];
-                $inputMappingGroup['usersAccumulatorObject'][$userIdx] = [
-                    'fleetRow' => [
-                        'fleet_owner' => '0',
-                        'fleet_start_galaxy' => '0',
-                        'fleet_start_system' => '0',
-                        'fleet_start_planet' => '0',
-                    ],
-                    'user' => array_merge(
-                        [
-                            'username' => "{$inputMappingGroup['usernamePrefix']}{$userSlotIdx}",
-                        ],
-                        $userTechs
-                    ),
-                    'moraleData' => null,
-                ];
+                $inputMappingGroup['usersAccumulatorObject'][$userIdx] = $createSimulationUserData([
+                    'userSlotIdx' => $userSlotIdx,
+                    'usernamePrefix' => $inputMappingGroup['usernamePrefix'],
+                    'userKeyedTechs' => [],
+                ]);
             }
         }
     }

From 1be882770f4579d4ff74dfc0ac93a5db0bbbe551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Fri, 29 Jul 2022 20:53:49 +0200
Subject: [PATCH 28/38] GH-91 Move combat techs mapping to utils

---
 modules/attackSimulator/_includes.php         |  2 ++
 .../utils/combatTechs.utils.php               | 36 +++++++++++++++++++
 modules/attackSimulator/utils/index.php       |  5 +++
 simulator.php                                 | 22 ++++--------
 4 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100644 modules/attackSimulator/utils/combatTechs.utils.php
 create mode 100644 modules/attackSimulator/utils/index.php

diff --git a/modules/attackSimulator/_includes.php b/modules/attackSimulator/_includes.php
index 42f87b7f6..7f7f3fbea 100644
--- a/modules/attackSimulator/_includes.php
+++ b/modules/attackSimulator/_includes.php
@@ -10,6 +10,8 @@
     include($includePath . './components/ShipInput/ShipInput.component.php');
     include($includePath . './components/TechInput/TechInput.component.php');
 
+    include($includePath . './utils/combatTechs.utils.php');
+
 });
 
 ?>
diff --git a/modules/attackSimulator/utils/combatTechs.utils.php b/modules/attackSimulator/utils/combatTechs.utils.php
new file mode 100644
index 000000000..65b8e94b1
--- /dev/null
+++ b/modules/attackSimulator/utils/combatTechs.utils.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace UniEngine\Engine\Modules\AttackSimulator\Utils\CombatTechs;
+
+/**
+ * Returns a list of combat techs with their "packed counterpart mapping"
+ *
+ * Note: should be synced with $_Vars_ElementCategories['techPurpose']['combat']
+ */
+function _getTechsMapping() {
+    return [
+        109 => 1,
+        110 => 2,
+        111 => 3,
+        120 => 4,
+        121 => 5,
+        122 => 6,
+        125 => 7,
+        126 => 8,
+        199 => 9,
+    ];
+}
+
+function getTechsList() {
+    return array_keys(_getTechsMapping());
+}
+
+function getTechPackedKey($elementId) {
+    return _getTechsMapping()[$elementId];
+}
+
+function getTechStandardKey($packedId) {
+    return array_flip(_getTechsMapping())[$packedId];
+}
+
+?>
diff --git a/modules/attackSimulator/utils/index.php b/modules/attackSimulator/utils/index.php
new file mode 100644
index 000000000..bc99142d1
--- /dev/null
+++ b/modules/attackSimulator/utils/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/simulator.php b/simulator.php
index 3c6077a67..f04923450 100644
--- a/simulator.php
+++ b/simulator.php
@@ -16,18 +16,8 @@
 $_Lang['rows'] = '';
 $_Lang['SimResult'] = '';
 
-$TechEquivalents = [
-    1 => 109,
-    2 => 110,
-    3 => 111,
-    4 => 120,
-    5 => 121,
-    6 => 122,
-    7 => 125,
-    8 => 126,
-    9 => 199,
-];
-$TechCount = count($TechEquivalents);
+$combatTechs = AttackSimulator\Utils\CombatTechs\getTechsList();
+
 $MaxACSSlots = ACS_MAX_JOINED_FLEETS + 1;
 $MaxStringLength = 30;
 
@@ -37,12 +27,12 @@
     $_POST['def_techs'][1] = (isset($_POST['spyreport']['tech']) ? $_POST['spyreport']['tech'] : null);
     $_POST['def_techs'][1] = object_map(
         $_POST['def_techs'][1],
-        function ($value, $key) use ($TechEquivalents) {
+        function ($value, $key) {
             $safeKey = intval($key, 10);
 
             return [
                 $value,
-                $TechEquivalents[$safeKey],
+                AttackSimulator\Utils\CombatTechs\getTechStandardKey($safeKey),
             ];
         }
     );
@@ -561,7 +551,7 @@ function ($value, $key) use ($TechEquivalents) {
     $parse['RowText2'] = '<a class="orange point fillTech_def">'.$_Lang['FillMyTechs'].'</a> / <a class="orange point clnTech_def">'.$_Lang['Fill_Clean'].'</a>';
     $ThisSlot['txt'] .= parsetemplate($TPL_NoBoth, $parse);
 
-    foreach ($TechEquivalents as $elementId) {
+    foreach ($combatTechs as $elementId) {
         $ThisRow_InsertValue_Atk = isset($_POST['atk_techs'][$i][$elementId]) ? $_POST['atk_techs'][$i][$elementId] : null;
         $ThisRow_InsertValue_Def = isset($_POST['def_techs'][$i][$elementId]) ? $_POST['def_techs'][$i][$elementId] : null;
 
@@ -654,7 +644,7 @@ function ($value, $key) use ($TechEquivalents) {
 $isUsingPrettyInputs = ($_User['settings_useprettyinputbox'] == 1);
 
 $ownTechLevels = object_map(
-    $TechEquivalents,
+    $combatTechs,
     function ($elementId) use (&$_Planet, &$_User) {
         $currentLevel = World\Elements\getElementCurrentLevel($elementId, $_Planet, $_User);
 

From 5a5190fb769d94ad22b8b3e83bf325d82c46ca20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Fri, 29 Jul 2022 21:04:07 +0200
Subject: [PATCH 29/38] GH-91 Use existing utils in message details creation

---
 admin/messagelist.php                         |  1 +
 messages.php                                  |  1 +
 .../utils/buildMessageDetails.utils.php       | 30 ++++---------------
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/admin/messagelist.php b/admin/messagelist.php
index 23fe891bb..a7071d979 100644
--- a/admin/messagelist.php
+++ b/admin/messagelist.php
@@ -15,6 +15,7 @@
 }
 
 include($_EnginePath . 'modules/messages/_includes.php');
+include($_EnginePath . 'modules/attackSimulator/_includes.php');
 
 use UniEngine\Engine\Modules\Messages;
 
diff --git a/messages.php b/messages.php
index cdb38af08..ff73bffb9 100644
--- a/messages.php
+++ b/messages.php
@@ -9,6 +9,7 @@
 include($_EnginePath.'common.php');
 
 include($_EnginePath . 'modules/messages/_includes.php');
+include($_EnginePath . 'modules/attackSimulator/_includes.php');
 
 use UniEngine\Engine\Modules\Messages;
 
diff --git a/modules/messages/utils/buildMessageDetails.utils.php b/modules/messages/utils/buildMessageDetails.utils.php
index 7d48ebf31..99cdc72af 100644
--- a/modules/messages/utils/buildMessageDetails.utils.php
+++ b/modules/messages/utils/buildMessageDetails.utils.php
@@ -3,6 +3,7 @@
 namespace UniEngine\Engine\Modules\Messages\Utils;
 
 use UniEngine\Engine\Modules\Messages;
+use UniEngine\Engine\Modules\AttackSimulator;
 
 function _buildBasicMessageDetails($dbMessageData, $params) {
     global $_Lang;
@@ -183,28 +184,7 @@ function _buildTypedSystemMessageContent($dbMessageData, $params = []) {
 function _buildBattleSimulationDetails($simulationDataString) {
     global $_Lang;
 
-    $SimTechs = [
-        109,
-        110,
-        111,
-        120,
-        121,
-        122,
-        125,
-        126,
-        199,
-    ];
-    $SimTechsRep = [
-        109 => 1,
-        110 => 2,
-        111 => 3,
-        120 => 4,
-        121 => 5,
-        122 => 6,
-        125 => 7,
-        126 => 8,
-        199 => 9,
-    ];
+    $combatTechs = AttackSimulator\Utils\CombatTechs\getTechsList();
 
     $battleSimulationData = [
         'tech' => [],
@@ -226,8 +206,10 @@ function _buildBattleSimulationDetails($simulationDataString) {
         $elementId = $simulationElement[0];
         $elementData = $simulationElement[1];
 
-        if (in_array($elementId, $SimTechs)) {
-            $battleSimulationData['tech'][$SimTechsRep[$elementId]] = $elementData;
+        if (in_array($elementId, $combatTechs)) {
+            $elementPackedKey = AttackSimulator\Utils\CombatTechs\getTechPackedKey($elementId);
+
+            $battleSimulationData['tech'][$elementPackedKey] = $elementData;
         } else {
             $battleSimulationData['ships'][$elementId] = $elementData;
         }

From 2ca3b4cb7a0baed5ab1f0973c33e17cd3ee39942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Sat, 30 Jul 2022 00:37:11 +0200
Subject: [PATCH 30/38] GH-91 Move morale inputs section to a component

---
 modules/attackSimulator/_includes.php         |  1 +
 .../MoraleInputsSection.component.php         | 45 +++++++++++++++++++
 .../components/MoraleInputsSection/body.tpl   | 19 ++++++++
 .../components/MoraleInputsSection/index.php  |  5 +++
 simulator.php                                 | 21 ++-------
 5 files changed, 73 insertions(+), 18 deletions(-)
 create mode 100644 modules/attackSimulator/components/MoraleInputsSection/MoraleInputsSection.component.php
 create mode 100644 modules/attackSimulator/components/MoraleInputsSection/body.tpl
 create mode 100644 modules/attackSimulator/components/MoraleInputsSection/index.php

diff --git a/modules/attackSimulator/_includes.php b/modules/attackSimulator/_includes.php
index 7f7f3fbea..dc0189756 100644
--- a/modules/attackSimulator/_includes.php
+++ b/modules/attackSimulator/_includes.php
@@ -7,6 +7,7 @@
     $includePath = $_EnginePath . 'modules/attackSimulator/';
 
     include($includePath . './components/MoraleInput/MoraleInput.component.php');
+    include($includePath . './components/MoraleInputsSection/MoraleInputsSection.component.php');
     include($includePath . './components/ShipInput/ShipInput.component.php');
     include($includePath . './components/TechInput/TechInput.component.php');
 
diff --git a/modules/attackSimulator/components/MoraleInputsSection/MoraleInputsSection.component.php b/modules/attackSimulator/components/MoraleInputsSection/MoraleInputsSection.component.php
new file mode 100644
index 000000000..a6f9d931b
--- /dev/null
+++ b/modules/attackSimulator/components/MoraleInputsSection/MoraleInputsSection.component.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace UniEngine\Engine\Modules\AttackSimulator\Components\MoraleInputsSection;
+
+use UniEngine\Engine\Modules\AttackSimulator;
+
+/**
+ * @param array $props
+ * @param number $props['slotIdx']
+ * @param arrayRef $props['input']
+ */
+function render($props) {
+    global $_Lang;
+
+    $slotIdx = $props['slotIdx'];
+    $input = &$props['input'];
+
+    $templateBodyProps = [
+        'lang_Morale'           => $_Lang['Morale'],
+        'lang_Morale_Level'     => $_Lang['Morale_Level'],
+
+        'prop_AttackerInput'    => AttackSimulator\Components\MoraleInput\render([
+            'slotIdx'       => $slotIdx,
+            'columnType'    => 'attacker',
+            'initialValue'  => $input['atk_morale'][$slotIdx],
+        ])['componentHTML'],
+        'prop_DefenderInput'    => AttackSimulator\Components\MoraleInput\render([
+            'slotIdx'       => $slotIdx,
+            'columnType'    => 'defender',
+            'initialValue'  => $input['def_morale'][$slotIdx],
+        ])['componentHTML'],
+    ];
+
+    $localTemplateLoader = createLocalTemplateLoader(__DIR__);
+    $componentHTML = parsetemplate(
+        $localTemplateLoader('body'),
+        $templateBodyProps
+    );
+
+    return [
+        'componentHTML' => $componentHTML,
+    ];
+}
+
+?>
diff --git a/modules/attackSimulator/components/MoraleInputsSection/body.tpl b/modules/attackSimulator/components/MoraleInputsSection/body.tpl
new file mode 100644
index 000000000..5e1811dfe
--- /dev/null
+++ b/modules/attackSimulator/components/MoraleInputsSection/body.tpl
@@ -0,0 +1,19 @@
+<tr>
+    <th colspan="4" class="c">
+        {lang_Morale}
+    </th>
+</tr>
+<tr>
+    <th class="c pad5 ta_r r_l">
+        {lang_Morale_Level}:
+    </th>
+    <th class="c pad5 ta_l r_i">
+        {prop_AttackerInput}
+    </th>
+    <th class="c pad5 ta_r r_l">
+        {lang_Morale_Level}:
+    </th>
+    <th class="c pad5 ta_l r_i">
+        {prop_DefenderInput}
+    </th>
+</tr>
diff --git a/modules/attackSimulator/components/MoraleInputsSection/index.php b/modules/attackSimulator/components/MoraleInputsSection/index.php
new file mode 100644
index 000000000..bc99142d1
--- /dev/null
+++ b/modules/attackSimulator/components/MoraleInputsSection/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/simulator.php b/simulator.php
index f04923450..b45ba60b2 100644
--- a/simulator.php
+++ b/simulator.php
@@ -523,26 +523,11 @@ function ($value, $key) {
         $ThisSlot['SlotHidden'] = 'hide';
     }
 
-    if(MORALE_ENABLED)
-    {
-        $parse['RowText'] = $_Lang['Morale'];
-        $ThisSlot['txt'] .= parsetemplate($TPL_SingleRow, $parse);
-
-        $parse['RowText'] = $_Lang['Morale_Level'];
-        $parse['RowInput'] = AttackSimulator\Components\MoraleInput\render([
-            'slotIdx' => $i,
-            'columnType' => 'attacker',
-            'initialValue' => $_POST['atk_morale'][$i],
-        ])['componentHTML'];
-
-        $parse['RowText2'] = $_Lang['Morale_Level'];
-        $parse['RowInput2'] = AttackSimulator\Components\MoraleInput\render([
+    if (MORALE_ENABLED) {
+        $ThisSlot['txt'] .= AttackSimulator\Components\MoraleInputsSection\render([
             'slotIdx' => $i,
-            'columnType' => 'defender',
-            'initialValue' => $_POST['def_morale'][$i],
+            'input' => &$_POST,
         ])['componentHTML'];
-
-        $ThisSlot['txt'] .= parsetemplate($TPL_Row, $parse);
     }
 
     $parse['RowText'] = $_Lang['Technology'];

From 9599d92a02bdd4ef863099d7d2efa73cdc64e859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Sat, 30 Jul 2022 00:49:12 +0200
Subject: [PATCH 31/38] GH-91 Move tech inputs section to a component

---
 modules/attackSimulator/_includes.php         |  1 +
 .../TechInputsSection.component.php           | 81 +++++++++++++++++++
 .../components/TechInputsSection/body.tpl     | 26 ++++++
 .../components/TechInputsSection/index.php    |  5 ++
 .../components/TechInputsSection/techRow.tpl  | 14 ++++
 simulator.php                                 | 32 +-------
 6 files changed, 131 insertions(+), 28 deletions(-)
 create mode 100644 modules/attackSimulator/components/TechInputsSection/TechInputsSection.component.php
 create mode 100644 modules/attackSimulator/components/TechInputsSection/body.tpl
 create mode 100644 modules/attackSimulator/components/TechInputsSection/index.php
 create mode 100644 modules/attackSimulator/components/TechInputsSection/techRow.tpl

diff --git a/modules/attackSimulator/_includes.php b/modules/attackSimulator/_includes.php
index dc0189756..edf663e2a 100644
--- a/modules/attackSimulator/_includes.php
+++ b/modules/attackSimulator/_includes.php
@@ -10,6 +10,7 @@
     include($includePath . './components/MoraleInputsSection/MoraleInputsSection.component.php');
     include($includePath . './components/ShipInput/ShipInput.component.php');
     include($includePath . './components/TechInput/TechInput.component.php');
+    include($includePath . './components/TechInputsSection/TechInputsSection.component.php');
 
     include($includePath . './utils/combatTechs.utils.php');
 
diff --git a/modules/attackSimulator/components/TechInputsSection/TechInputsSection.component.php b/modules/attackSimulator/components/TechInputsSection/TechInputsSection.component.php
new file mode 100644
index 000000000..79ea7614a
--- /dev/null
+++ b/modules/attackSimulator/components/TechInputsSection/TechInputsSection.component.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace UniEngine\Engine\Modules\AttackSimulator\Components\TechInputsSection;
+
+use UniEngine\Engine\Modules\AttackSimulator;
+
+/**
+ * @param array $props
+ * @param number $props['slotIdx']
+ * @param arrayRef $props['input']
+ */
+function render($props) {
+    global $_Lang;
+
+    $slotIdx = $props['slotIdx'];
+    $input = &$props['input'];
+
+    $combatTechs = AttackSimulator\Utils\CombatTechs\getTechsList();
+
+    $localTemplateLoader = createLocalTemplateLoader(__DIR__);
+    $tplBodyCache = [
+        'body' => $localTemplateLoader('body'),
+        'techRow' => $localTemplateLoader('techRow'),
+    ];
+
+    $techRows = array_map_withkeys(
+        $combatTechs,
+        function ($elementId) use ($slotIdx, &$input, &$_Lang, &$tplBodyCache) {
+            $formInputValueAttacker = (
+                isset($input['atk_techs'][$slotIdx][$elementId]) ?
+                    $input['atk_techs'][$slotIdx][$elementId] :
+                    null
+            );
+            $formInputValueDefender = (
+                isset($input['def_techs'][$slotIdx][$elementId]) ?
+                    $input['def_techs'][$slotIdx][$elementId] :
+                    null
+            );
+
+            $rowTemplateBodyProps = [
+                'prop_techName'         => $_Lang['tech'][$elementId],
+                'prop_AttackerInput'    => AttackSimulator\Components\TechInput\render([
+                    'slotIdx'       => $slotIdx,
+                    'elementId'     => $elementId,
+                    'columnType'    => 'attacker',
+                    'initialValue'  => $formInputValueAttacker,
+                ])['componentHTML'],
+                'prop_DefenderInput'    => AttackSimulator\Components\TechInput\render([
+                    'slotIdx'       => $slotIdx,
+                    'elementId'     => $elementId,
+                    'columnType'    => 'defender',
+                    'initialValue'  => $formInputValueDefender,
+                ])['componentHTML'],
+            ];
+
+            return parsetemplate(
+                $tplBodyCache['techRow'],
+                $rowTemplateBodyProps
+            );
+        }
+    );
+
+    $templateBodyProps = [
+        'lang_Technology'   => $_Lang['Technology'],
+        'lang_FillMyTechs'  => $_Lang['FillMyTechs'],
+        'lang_Fill_Clean'   => $_Lang['Fill_Clean'],
+
+        'prop_techRowsHTML' => implode('', $techRows),
+    ];
+
+    $componentHTML = parsetemplate(
+        $tplBodyCache['body'],
+        $templateBodyProps
+    );
+
+    return [
+        'componentHTML' => $componentHTML,
+    ];
+}
+
+?>
diff --git a/modules/attackSimulator/components/TechInputsSection/body.tpl b/modules/attackSimulator/components/TechInputsSection/body.tpl
new file mode 100644
index 000000000..e1593145b
--- /dev/null
+++ b/modules/attackSimulator/components/TechInputsSection/body.tpl
@@ -0,0 +1,26 @@
+<tr>
+    <th colspan="4" class="c">
+        {lang_Technology}
+    </th>
+</tr>
+<tr>
+    <th class="c pad5 r_b" colspan="2">
+        <a class="orange point fillTech_atk">
+            {lang_FillMyTechs}
+        </a>
+        /
+        <a class="orange point clnTech_atk">
+            {lang_Fill_Clean}
+        </a>
+    </th>
+    <th class="c pad5 r_b" colspan="2">
+        <a class="orange point fillTech_def">
+            {lang_FillMyTechs}
+        </a>
+        /
+        <a class="orange point clnTech_def">
+            {lang_Fill_Clean}
+        </a>
+    </th>
+</tr>
+{prop_techRowsHTML}
diff --git a/modules/attackSimulator/components/TechInputsSection/index.php b/modules/attackSimulator/components/TechInputsSection/index.php
new file mode 100644
index 000000000..bc99142d1
--- /dev/null
+++ b/modules/attackSimulator/components/TechInputsSection/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/modules/attackSimulator/components/TechInputsSection/techRow.tpl b/modules/attackSimulator/components/TechInputsSection/techRow.tpl
new file mode 100644
index 000000000..635e19715
--- /dev/null
+++ b/modules/attackSimulator/components/TechInputsSection/techRow.tpl
@@ -0,0 +1,14 @@
+<tr>
+    <th class="c pad5 ta_r r_l">
+        {prop_techName}:
+    </th>
+    <th class="c pad5 ta_l r_i">
+        {prop_AttackerInput}
+    </th>
+    <th class="c pad5 ta_r r_l">
+        {prop_techName}:
+    </th>
+    <th class="c pad5 ta_l r_i">
+        {prop_DefenderInput}
+    </th>
+</tr>
diff --git a/simulator.php b/simulator.php
index b45ba60b2..2ad3572a0 100644
--- a/simulator.php
+++ b/simulator.php
@@ -530,34 +530,10 @@ function ($value, $key) {
         ])['componentHTML'];
     }
 
-    $parse['RowText'] = $_Lang['Technology'];
-    $ThisSlot['txt'] .= parsetemplate($TPL_SingleRow, $parse);
-    $parse['RowText'] = '<a class="orange point fillTech_atk">'.$_Lang['FillMyTechs'].'</a> / <a class="orange point clnTech_atk">'.$_Lang['Fill_Clean'].'</a>';
-    $parse['RowText2'] = '<a class="orange point fillTech_def">'.$_Lang['FillMyTechs'].'</a> / <a class="orange point clnTech_def">'.$_Lang['Fill_Clean'].'</a>';
-    $ThisSlot['txt'] .= parsetemplate($TPL_NoBoth, $parse);
-
-    foreach ($combatTechs as $elementId) {
-        $ThisRow_InsertValue_Atk = isset($_POST['atk_techs'][$i][$elementId]) ? $_POST['atk_techs'][$i][$elementId] : null;
-        $ThisRow_InsertValue_Def = isset($_POST['def_techs'][$i][$elementId]) ? $_POST['def_techs'][$i][$elementId] : null;
-
-        $parse['RowText'] = $_Lang['tech'][$elementId];
-        $parse['RowInput'] = AttackSimulator\Components\TechInput\render([
-            'slotIdx' => $i,
-            'elementId' => $elementId,
-            'columnType' => 'attacker',
-            'initialValue' => $ThisRow_InsertValue_Atk,
-        ])['componentHTML'];
-
-        $parse['RowText2'] = $_Lang['tech'][$elementId];
-        $parse['RowInput2'] = AttackSimulator\Components\TechInput\render([
-            'slotIdx' => $i,
-            'elementId' => $elementId,
-            'columnType' => 'defender',
-            'initialValue' => $ThisRow_InsertValue_Def,
-        ])['componentHTML'];
-
-        $ThisSlot['txt'] .= parsetemplate($TPL_Row, $parse);
-    }
+    $ThisSlot['txt'] .= AttackSimulator\Components\TechInputsSection\render([
+        'slotIdx' => $i,
+        'input' => &$_POST,
+    ])['componentHTML'];
 
     $parse['RowText'] = $_Lang['Fleets'];
     $ThisSlot['txt'] .= parsetemplate($TPL_SingleRow, $parse);

From 2760c761105226da09628eee8cb1c55a2f9055aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Sun, 31 Jul 2022 16:28:51 +0200
Subject: [PATCH 32/38] GH-91 Reuse existing code to render defenses

---
 simulator.php | 60 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/simulator.php b/simulator.php
index 2ad3572a0..de67d6c1d 100644
--- a/simulator.php
+++ b/simulator.php
@@ -541,8 +541,35 @@ function ($value, $key) {
     $parse['RowText2'] = '<a class="orange point fillShip_def">'.$_Lang['FillMyFleets'].'</a> / <a class="orange point clnShip_def">'.$_Lang['Fill_Clean'].'</a>';
     $ThisSlot['txt'] .= parsetemplate($TPL_NoBoth, $parse);
 
-    foreach($_Vars_ElementCategories['fleet'] as $elementId)
-    {
+    $unitRows = [
+        'ships' => [],
+        'defenses' => [],
+    ];
+
+    $units = array_merge(
+        $_Vars_ElementCategories['fleet'],
+        $_Vars_ElementCategories['defense']
+    );
+    $units = array_filter($units, function ($elementId) {
+        return !World\Elements\isMissile($elementId);
+    });
+
+    foreach ($units as $elementId) {
+        $isDefenseSystem = World\Elements\isDefenseSystem($elementId);
+
+        if (
+            $i !== 1 &&
+            $isDefenseSystem
+        ) {
+            continue;
+        }
+
+        $groupElementsKey = (
+            !$isDefenseSystem ?
+                'ships' :
+                'defenses'
+        );
+
         $ThisRow_InsertValue_Def = isset($_POST['def_ships'][$i][$elementId]) ? $_POST['def_ships'][$i][$elementId] : null;
 
         $parse['RowText2'] = $_Lang['tech'][$elementId];
@@ -564,39 +591,22 @@ function ($value, $key) {
                 'initialValue' => $ThisRow_InsertValue_Atk,
             ])['componentHTML'];
 
-            $ThisSlot['txt'] .= parsetemplate($TPL_Row, $parse);
+            $unitRows[$groupElementsKey][] = parsetemplate($TPL_Row, $parse);
         } else {
             $parse['RowText'] = '-';
             $parse['RowInput'] = '';
 
-            $ThisSlot['txt'] .= parsetemplate($TPL_NoLeft, $parse);
+            $unitRows[$groupElementsKey][] = parsetemplate($TPL_NoLeft, $parse);
         }
     }
 
-    if ($i == 1) {
+    $ThisSlot['txt'] .= implode('', $unitRows['ships']);
+
+    if ($i === 1) {
         $parse['RowText'] = $_Lang['Defense'];
         $ThisSlot['txt'] .= parsetemplate($TPL_SingleRow, $parse);
 
-        foreach ($_Vars_ElementCategories['defense'] as $elementId) {
-            if (World\Elements\isMissile($elementId)) {
-                continue;
-            }
-
-            $ThisRow_InsertValue_Def = isset($_POST['def_ships'][$i][$elementId]) ? $_POST['def_ships'][$i][$elementId] : null;
-
-            $parse['RowText'] = '-';
-            $parse['RowInput'] = '';
-
-            $parse['RowText2'] = $_Lang['tech'][$elementId];
-            $parse['RowInput2'] = AttackSimulator\Components\ShipInput\render([
-                'slotIdx' => $i,
-                'elementId' => $elementId,
-                'columnType' => 'defender',
-                'initialValue' => $ThisRow_InsertValue_Def,
-            ])['componentHTML'];
-
-            $ThisSlot['txt'] .= parsetemplate($TPL_NoLeft, $parse);
-        }
+        $ThisSlot['txt'] .= implode('', $unitRows['defenses']);
     }
 
     $_Lang['rows'] .= parsetemplate($TPL_Slot, $ThisSlot);

From 68a7a73be529b1123822e06999111ad1094d6037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Sun, 31 Jul 2022 16:31:12 +0200
Subject: [PATCH 33/38] GH-91 Reorganise the code a bit

---
 simulator.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/simulator.php b/simulator.php
index de67d6c1d..0c557903e 100644
--- a/simulator.php
+++ b/simulator.php
@@ -535,12 +535,6 @@ function ($value, $key) {
         'input' => &$_POST,
     ])['componentHTML'];
 
-    $parse['RowText'] = $_Lang['Fleets'];
-    $ThisSlot['txt'] .= parsetemplate($TPL_SingleRow, $parse);
-    $parse['RowText'] = '<a class="orange point fillShip_atk">'.$_Lang['FillMyFleets'].'</a> / <a class="orange point clnShip_atk">'.$_Lang['Fill_Clean'].'</a>';
-    $parse['RowText2'] = '<a class="orange point fillShip_def">'.$_Lang['FillMyFleets'].'</a> / <a class="orange point clnShip_def">'.$_Lang['Fill_Clean'].'</a>';
-    $ThisSlot['txt'] .= parsetemplate($TPL_NoBoth, $parse);
-
     $unitRows = [
         'ships' => [],
         'defenses' => [],
@@ -600,6 +594,13 @@ function ($value, $key) {
         }
     }
 
+    $parse['RowText'] = $_Lang['Fleets'];
+    $ThisSlot['txt'] .= parsetemplate($TPL_SingleRow, $parse);
+
+    $parse['RowText'] = '<a class="orange point fillShip_atk">'.$_Lang['FillMyFleets'].'</a> / <a class="orange point clnShip_atk">'.$_Lang['Fill_Clean'].'</a>';
+    $parse['RowText2'] = '<a class="orange point fillShip_def">'.$_Lang['FillMyFleets'].'</a> / <a class="orange point clnShip_def">'.$_Lang['Fill_Clean'].'</a>';
+    $ThisSlot['txt'] .= parsetemplate($TPL_NoBoth, $parse);
+
     $ThisSlot['txt'] .= implode('', $unitRows['ships']);
 
     if ($i === 1) {

From 95cb39fb48e9550877550eae35fe64640aa5f333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Sun, 31 Jul 2022 17:02:53 +0200
Subject: [PATCH 34/38] GH-91 Move unit inputs section to a component

---
 modules/attackSimulator/_includes.php         |   1 +
 .../UnitInputsSection.component.php           | 130 ++++++++++++++++++
 .../UnitInputsSection/defenseUnitRow.tpl      |  11 ++
 .../UnitInputsSection/dualUnitRow.tpl         |  14 ++
 .../components/UnitInputsSection/index.php    |   5 +
 .../UnitInputsSection/mainFleetsBody.tpl      |  32 +++++
 .../UnitInputsSection/unitedFleetsBody.tpl    |  26 ++++
 simulator.php                                 |  81 +----------
 8 files changed, 224 insertions(+), 76 deletions(-)
 create mode 100644 modules/attackSimulator/components/UnitInputsSection/UnitInputsSection.component.php
 create mode 100644 modules/attackSimulator/components/UnitInputsSection/defenseUnitRow.tpl
 create mode 100644 modules/attackSimulator/components/UnitInputsSection/dualUnitRow.tpl
 create mode 100644 modules/attackSimulator/components/UnitInputsSection/index.php
 create mode 100644 modules/attackSimulator/components/UnitInputsSection/mainFleetsBody.tpl
 create mode 100644 modules/attackSimulator/components/UnitInputsSection/unitedFleetsBody.tpl

diff --git a/modules/attackSimulator/_includes.php b/modules/attackSimulator/_includes.php
index edf663e2a..f361d375c 100644
--- a/modules/attackSimulator/_includes.php
+++ b/modules/attackSimulator/_includes.php
@@ -11,6 +11,7 @@
     include($includePath . './components/ShipInput/ShipInput.component.php');
     include($includePath . './components/TechInput/TechInput.component.php');
     include($includePath . './components/TechInputsSection/TechInputsSection.component.php');
+    include($includePath . './components/UnitInputsSection/UnitInputsSection.component.php');
 
     include($includePath . './utils/combatTechs.utils.php');
 
diff --git a/modules/attackSimulator/components/UnitInputsSection/UnitInputsSection.component.php b/modules/attackSimulator/components/UnitInputsSection/UnitInputsSection.component.php
new file mode 100644
index 000000000..bbc21dc91
--- /dev/null
+++ b/modules/attackSimulator/components/UnitInputsSection/UnitInputsSection.component.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace UniEngine\Engine\Modules\AttackSimulator\Components\UnitInputsSection;
+
+use UniEngine\Engine\Includes\Helpers\World;
+use UniEngine\Engine\Modules\AttackSimulator;
+
+/**
+ * @param array $props
+ * @param number $props['slotIdx']
+ * @param arrayRef $props['input']
+ */
+function render($props) {
+    global $_Lang, $_Vars_ElementCategories;
+
+    $slotIdx = $props['slotIdx'];
+    $input = &$props['input'];
+
+    $isMainFleetsSlot = $slotIdx === 1;
+
+    $units = array_merge(
+        $_Vars_ElementCategories['fleet'],
+        (
+            $isMainFleetsSlot ?
+                $_Vars_ElementCategories['defense'] :
+                []
+        )
+    );
+    $units = array_filter($units, function ($elementId) {
+        return !World\Elements\isMissile($elementId);
+    });
+
+    $localTemplateLoader = createLocalTemplateLoader(__DIR__);
+    $tplBodyCache = [
+        'mainFleetsBody'    => $localTemplateLoader('mainFleetsBody'),
+        'unitedFleetsBody'  => $localTemplateLoader('unitedFleetsBody'),
+        'defenseUnitRow'    => $localTemplateLoader('defenseUnitRow'),
+        'dualUnitRow'       => $localTemplateLoader('dualUnitRow'),
+    ];
+
+    $unitRows = object_map(
+        $units,
+        function ($elementId) use ($slotIdx, &$input, &$_Lang, &$tplBodyCache) {
+            $formInputValueAttacker = (
+                isset($input['atk_ships'][$slotIdx][$elementId]) ?
+                    $input['atk_ships'][$slotIdx][$elementId] :
+                    null
+            );
+            $formInputValueDefender = (
+                isset($input['def_ships'][$slotIdx][$elementId]) ?
+                    $input['def_ships'][$slotIdx][$elementId] :
+                    null
+            );
+
+            $rowTemplateBodyCommonProps = [
+                'prop_unitName' => $_Lang['tech'][$elementId],
+
+                'prop_DefenderInput'    => AttackSimulator\Components\ShipInput\render([
+                    'slotIdx'       => $slotIdx,
+                    'elementId'     => $elementId,
+                    'columnType'    => 'defender',
+                    'initialValue'  => $formInputValueDefender,
+                ])['componentHTML'],
+            ];
+
+            if (!hasAnyEngine($elementId)) {
+                return [
+                    parsetemplate(
+                        $tplBodyCache['defenseUnitRow'],
+                        $rowTemplateBodyCommonProps
+                    ),
+                    $elementId
+                ];
+            }
+
+            $rowTemplateBodyProps = [
+                'prop_AttackerInput'    => AttackSimulator\Components\ShipInput\render([
+                    'slotIdx'       => $slotIdx,
+                    'elementId'     => $elementId,
+                    'columnType'    => 'attacker',
+                    'initialValue'  => $formInputValueAttacker,
+                ])['componentHTML'],
+            ];
+
+            return [
+                parsetemplate(
+                    $tplBodyCache['dualUnitRow'],
+                    array_merge(
+                        $rowTemplateBodyCommonProps,
+                        $rowTemplateBodyProps
+                    )
+                ),
+                $elementId
+            ];
+        }
+    );
+    $shipRows = array_filter_withkeys($unitRows, function ($elementHTML, $elementId) {
+        return World\Elements\isShip($elementId);
+    });
+    $defenseRows = array_filter_withkeys($unitRows, function ($elementHTML, $elementId) {
+        return World\Elements\isDefenseSystem($elementId);
+    });
+
+    $templateBodyProps = [
+        'lang_Fleets'               => $_Lang['Fleets'],
+        'lang_Defense'              => $_Lang['Defense'],
+        'lang_FillMyFleets'         => $_Lang['FillMyFleets'],
+        'lang_Fill_Clean'           => $_Lang['Fill_Clean'],
+
+        'prop_shipUnitRowsHTML'     => implode('', $shipRows),
+        'prop_defenseUnitRowsHTML'  => implode('', $defenseRows),
+    ];
+
+    $bodyTpl = (
+        $isMainFleetsSlot ?
+            $tplBodyCache['mainFleetsBody'] :
+            $tplBodyCache['unitedFleetsBody']
+    );
+
+    $componentHTML = parsetemplate(
+        $bodyTpl,
+        $templateBodyProps
+    );
+
+    return [
+        'componentHTML' => $componentHTML,
+    ];
+}
+
+?>
diff --git a/modules/attackSimulator/components/UnitInputsSection/defenseUnitRow.tpl b/modules/attackSimulator/components/UnitInputsSection/defenseUnitRow.tpl
new file mode 100644
index 000000000..037e52d66
--- /dev/null
+++ b/modules/attackSimulator/components/UnitInputsSection/defenseUnitRow.tpl
@@ -0,0 +1,11 @@
+<tr>
+    <th class="c pad5 r_b" colspan="2">
+        {RowText}
+    </th>
+    <th class="c pad5 ta_r r_l">
+        {prop_unitName}:
+    </th>
+    <th class="c pad5 ta_l r_i">
+        {prop_DefenderInput}
+    </th>
+</tr>
diff --git a/modules/attackSimulator/components/UnitInputsSection/dualUnitRow.tpl b/modules/attackSimulator/components/UnitInputsSection/dualUnitRow.tpl
new file mode 100644
index 000000000..fc704974c
--- /dev/null
+++ b/modules/attackSimulator/components/UnitInputsSection/dualUnitRow.tpl
@@ -0,0 +1,14 @@
+<tr>
+    <th class="c pad5 ta_r r_l">
+        {prop_unitName}:
+    </th>
+    <th class="c pad5 ta_l r_i">
+        {prop_AttackerInput}
+    </th>
+    <th class="c pad5 ta_r r_l">
+        {prop_unitName}:
+    </th>
+    <th class="c pad5 ta_l r_i">
+        {prop_DefenderInput}
+    </th>
+</tr>
diff --git a/modules/attackSimulator/components/UnitInputsSection/index.php b/modules/attackSimulator/components/UnitInputsSection/index.php
new file mode 100644
index 000000000..bc99142d1
--- /dev/null
+++ b/modules/attackSimulator/components/UnitInputsSection/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/modules/attackSimulator/components/UnitInputsSection/mainFleetsBody.tpl b/modules/attackSimulator/components/UnitInputsSection/mainFleetsBody.tpl
new file mode 100644
index 000000000..b64020509
--- /dev/null
+++ b/modules/attackSimulator/components/UnitInputsSection/mainFleetsBody.tpl
@@ -0,0 +1,32 @@
+<tr>
+    <th colspan="4" class="c">
+        {lang_Fleets}
+    </th>
+</tr>
+<tr>
+    <th class="c pad5 r_b" colspan="2">
+        <a class="orange point fillShip_atk">
+            {lang_FillMyFleets}
+        </a>
+        /
+        <a class="orange point clnShip_atk">
+            {lang_Fill_Clean}
+        </a>
+    </th>
+    <th class="c pad5 r_b" colspan="2">
+        <a class="orange point fillShip_def">
+            {lang_FillMyFleets}
+        </a>
+        /
+        <a class="orange point clnShip_def">
+            {lang_Fill_Clean}
+        </a>
+    </th>
+</tr>
+{prop_shipUnitRowsHTML}
+<tr>
+    <th colspan="4" class="c">
+        {lang_Defense}
+    </th>
+</tr>
+{prop_defenseUnitRowsHTML}
diff --git a/modules/attackSimulator/components/UnitInputsSection/unitedFleetsBody.tpl b/modules/attackSimulator/components/UnitInputsSection/unitedFleetsBody.tpl
new file mode 100644
index 000000000..812772503
--- /dev/null
+++ b/modules/attackSimulator/components/UnitInputsSection/unitedFleetsBody.tpl
@@ -0,0 +1,26 @@
+<tr>
+    <th colspan="4" class="c">
+        {lang_Fleets}
+    </th>
+</tr>
+<tr>
+    <th class="c pad5 r_b" colspan="2">
+        <a class="orange point fillShip_atk">
+            {lang_FillMyFleets}
+        </a>
+        /
+        <a class="orange point clnShip_atk">
+            {lang_Fill_Clean}
+        </a>
+    </th>
+    <th class="c pad5 r_b" colspan="2">
+        <a class="orange point fillShip_def">
+            {lang_FillMyFleets}
+        </a>
+        /
+        <a class="orange point clnShip_def">
+            {lang_Fill_Clean}
+        </a>
+    </th>
+</tr>
+{prop_shipUnitRowsHTML}
diff --git a/simulator.php b/simulator.php
index 0c557903e..437ef7892 100644
--- a/simulator.php
+++ b/simulator.php
@@ -6,8 +6,8 @@
 include($_EnginePath.'common.php');
 include_once($_EnginePath . 'modules/attackSimulator/_includes.php');
 
-use UniEngine\Engine\Modules\Flights;
 use UniEngine\Engine\Includes\Helpers\World;
+use UniEngine\Engine\Modules\Flights;
 use UniEngine\Engine\Modules\AttackSimulator;
 
 loggedCheck();
@@ -534,81 +534,10 @@ function ($value, $key) {
         'slotIdx' => $i,
         'input' => &$_POST,
     ])['componentHTML'];
-
-    $unitRows = [
-        'ships' => [],
-        'defenses' => [],
-    ];
-
-    $units = array_merge(
-        $_Vars_ElementCategories['fleet'],
-        $_Vars_ElementCategories['defense']
-    );
-    $units = array_filter($units, function ($elementId) {
-        return !World\Elements\isMissile($elementId);
-    });
-
-    foreach ($units as $elementId) {
-        $isDefenseSystem = World\Elements\isDefenseSystem($elementId);
-
-        if (
-            $i !== 1 &&
-            $isDefenseSystem
-        ) {
-            continue;
-        }
-
-        $groupElementsKey = (
-            !$isDefenseSystem ?
-                'ships' :
-                'defenses'
-        );
-
-        $ThisRow_InsertValue_Def = isset($_POST['def_ships'][$i][$elementId]) ? $_POST['def_ships'][$i][$elementId] : null;
-
-        $parse['RowText2'] = $_Lang['tech'][$elementId];
-        $parse['RowInput2'] = AttackSimulator\Components\ShipInput\render([
-            'slotIdx' => $i,
-            'elementId' => $elementId,
-            'columnType' => 'defender',
-            'initialValue' => $ThisRow_InsertValue_Def,
-        ])['componentHTML'];
-
-        if (hasAnyEngine($elementId)) {
-            $ThisRow_InsertValue_Atk = isset($_POST['atk_ships'][$i][$elementId]) ? $_POST['atk_ships'][$i][$elementId] : null;
-
-            $parse['RowText'] = $_Lang['tech'][$elementId];
-            $parse['RowInput'] = AttackSimulator\Components\ShipInput\render([
-                'slotIdx' => $i,
-                'elementId' => $elementId,
-                'columnType' => 'attacker',
-                'initialValue' => $ThisRow_InsertValue_Atk,
-            ])['componentHTML'];
-
-            $unitRows[$groupElementsKey][] = parsetemplate($TPL_Row, $parse);
-        } else {
-            $parse['RowText'] = '-';
-            $parse['RowInput'] = '';
-
-            $unitRows[$groupElementsKey][] = parsetemplate($TPL_NoLeft, $parse);
-        }
-    }
-
-    $parse['RowText'] = $_Lang['Fleets'];
-    $ThisSlot['txt'] .= parsetemplate($TPL_SingleRow, $parse);
-
-    $parse['RowText'] = '<a class="orange point fillShip_atk">'.$_Lang['FillMyFleets'].'</a> / <a class="orange point clnShip_atk">'.$_Lang['Fill_Clean'].'</a>';
-    $parse['RowText2'] = '<a class="orange point fillShip_def">'.$_Lang['FillMyFleets'].'</a> / <a class="orange point clnShip_def">'.$_Lang['Fill_Clean'].'</a>';
-    $ThisSlot['txt'] .= parsetemplate($TPL_NoBoth, $parse);
-
-    $ThisSlot['txt'] .= implode('', $unitRows['ships']);
-
-    if ($i === 1) {
-        $parse['RowText'] = $_Lang['Defense'];
-        $ThisSlot['txt'] .= parsetemplate($TPL_SingleRow, $parse);
-
-        $ThisSlot['txt'] .= implode('', $unitRows['defenses']);
-    }
+    $ThisSlot['txt'] .= AttackSimulator\Components\UnitInputsSection\render([
+        'slotIdx' => $i,
+        'input' => &$_POST,
+    ])['componentHTML'];
 
     $_Lang['rows'] .= parsetemplate($TPL_Slot, $ThisSlot);
 }

From 4a999650805258bea01c7693b7392155fda2abaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Sun, 31 Jul 2022 17:05:18 +0200
Subject: [PATCH 35/38] GH-91 Add missing sigil

---
 .../components/UnitInputsSection/defenseUnitRow.tpl             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/attackSimulator/components/UnitInputsSection/defenseUnitRow.tpl b/modules/attackSimulator/components/UnitInputsSection/defenseUnitRow.tpl
index 037e52d66..86a9ca569 100644
--- a/modules/attackSimulator/components/UnitInputsSection/defenseUnitRow.tpl
+++ b/modules/attackSimulator/components/UnitInputsSection/defenseUnitRow.tpl
@@ -1,6 +1,6 @@
 <tr>
     <th class="c pad5 r_b" colspan="2">
-        {RowText}
+        -
     </th>
     <th class="c pad5 ta_r r_l">
         {prop_unitName}:

From de6fe86ca58cf3b3d78893a723f379c8ec1c7d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Sun, 31 Jul 2022 17:11:07 +0200
Subject: [PATCH 36/38] GH-91 Add missing filter function

---
 includes/unlocalised.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/includes/unlocalised.php b/includes/unlocalised.php
index 9213d6c98..6647e46fc 100644
--- a/includes/unlocalised.php
+++ b/includes/unlocalised.php
@@ -7,6 +7,13 @@ function array_map_withkeys(array $inputArray, callable $callback) {
     return array_map($callback, $inputArray, array_keys($inputArray));
 }
 
+/**
+ * Filters an array, allowing to access the key of each value
+ */
+function array_filter_withkeys(array $inputArray, callable $callback) {
+    return array_filter($inputArray, $callback, ARRAY_FILTER_USE_BOTH);
+}
+
 function array_find(array $inputArray, callable $callback) {
     foreach ($inputArray as $item) {
         if ($callback($item)) {

From d15f4cd48bcf7f1e02fb220f58263b3006fef5c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Mon, 1 Aug 2022 23:18:54 +0200
Subject: [PATCH 37/38] GH-91 Cleanup slot renderer

---
 simulator.php                                 | 62 ++++++++++---------
 templates/default_template/simulator_slot.tpl |  2 +-
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/simulator.php b/simulator.php
index 437ef7892..803b7690b 100644
--- a/simulator.php
+++ b/simulator.php
@@ -510,36 +510,42 @@ function ($value, $key) {
 $TPL_Row = gettemplate('simulator_row');
 $TPL_NoLeft = gettemplate('simulator_row_noleft');
 
-for($i = 1; $i <= $MaxACSSlots; $i += 1)
-{
-    $ThisSlot = [];
-    $ThisSlot['SlotID'] = $i;
-    $ThisSlot['txt'] = '';
-
-    $parse = $_Lang;
-    $parse['i'] = $i;
-    if($i > 1)
-    {
-        $ThisSlot['SlotHidden'] = 'hide';
-    }
-
-    if (MORALE_ENABLED) {
-        $ThisSlot['txt'] .= AttackSimulator\Components\MoraleInputsSection\render([
-            'slotIdx' => $i,
+for (
+    $slotIdx = 1;
+    $slotIdx <= $MaxACSSlots;
+    $slotIdx += 1
+) {
+    $thisSlotElements = [
+        (
+            MORALE_ENABLED ?
+                AttackSimulator\Components\MoraleInputsSection\render([
+                    'slotIdx' => $slotIdx,
+                    'input' => &$_POST,
+                ])['componentHTML'] :
+                ''
+        ),
+        AttackSimulator\Components\TechInputsSection\render([
+            'slotIdx' => $slotIdx,
             'input' => &$_POST,
-        ])['componentHTML'];
-    }
-
-    $ThisSlot['txt'] .= AttackSimulator\Components\TechInputsSection\render([
-        'slotIdx' => $i,
-        'input' => &$_POST,
-    ])['componentHTML'];
-    $ThisSlot['txt'] .= AttackSimulator\Components\UnitInputsSection\render([
-        'slotIdx' => $i,
-        'input' => &$_POST,
-    ])['componentHTML'];
+        ])['componentHTML'],
+        AttackSimulator\Components\UnitInputsSection\render([
+            'slotIdx' => $slotIdx,
+            'input' => &$_POST,
+        ])['componentHTML'],
+    ];
+    $isMainFleetsSlot = ($slotIdx === 1);
+
+    $thisSlotProps = [
+        'SlotID' => $slotIdx,
+        'SlotInitiallyHidden' => (
+            !$isMainFleetsSlot ?
+                'hide' :
+                ''
+        ),
+        'txt' => implode('', $thisSlotElements),
+    ];
 
-    $_Lang['rows'] .= parsetemplate($TPL_Slot, $ThisSlot);
+    $_Lang['rows'] .= parsetemplate($TPL_Slot, $thisSlotProps);
 }
 
 $isUsingPrettyInputs = ($_User['settings_useprettyinputbox'] == 1);
diff --git a/templates/default_template/simulator_slot.tpl b/templates/default_template/simulator_slot.tpl
index 7562d8342..e753c3cbf 100644
--- a/templates/default_template/simulator_slot.tpl
+++ b/templates/default_template/simulator_slot.tpl
@@ -1 +1 @@
-<tbody id="slot_{SlotID}" class="{SlotHidden}">{txt}</tbody>
+<tbody id="slot_{SlotID}" class="{SlotInitiallyHidden}">{txt}</tbody>

From 46ea4ac54afd86fb5410d5c7f8cdb9fb3081abae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Tue, 2 Aug 2022 02:35:53 +0200
Subject: [PATCH 38/38] GH-91 Start using TaskType enum

---
 includes/functions/TasksFunctions.php | 4 ++++
 simulator.php                         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/includes/functions/TasksFunctions.php b/includes/functions/TasksFunctions.php
index 859177bc0..604e8efa8 100644
--- a/includes/functions/TasksFunctions.php
+++ b/includes/functions/TasksFunctions.php
@@ -1,5 +1,9 @@
 <?php
 
+abstract class TaskType {
+    const UseSimulator = 'USE_SIMULATOR';
+}
+
 function Tasks_CheckUservar(&$UserVar)
 {
     if(empty($UserVar['tasks_done_parsed']))
diff --git a/simulator.php b/simulator.php
index 803b7690b..38df57758 100644
--- a/simulator.php
+++ b/simulator.php
@@ -493,7 +493,7 @@ function ($value, $key) {
         $_Lang['SimResult'] .= parsetemplate(gettemplate('simulator_result'), $parse);
 
         // Trigger Tasks Check
-        Tasks_TriggerTask($_User, 'USE_SIMULATOR');
+        Tasks_TriggerTask($_User, TaskType::UseSimulator);
     }
     else
     {