More data, and minor updates to Build Calculator for June 2025 Playtest

Model/Hotkeys/HotKeyType.cs

@@ -4,6 +4,12 @@ public enum KeyType
 {
     Action,
     ControlGroup,
+
+    Army,
+    Train,
+    Research,
+    Construct,
+    
     Cancel,
     Advance,
     Economy,

Model/Hotkeys/HotkeyModel.cs

@@ -4,22 +4,31 @@ namespace Model.Hotkeys;
 
 public class HotkeyModel
 {
-    public static readonly string[] KeyGroups = { "Z", "1", "2", "TAB", "CONTROL", "SHIFT", "C" };
-    public static readonly string[] HotKeys = { "`", "Q", "W", "E", "R", "A", "S", "F", "X", "V", "CAPSLOCK" };
+    public static readonly string[] KeyGroups = { "Z", "1", "2", "X", "CONTROL", "SHIFT", "C" };
+    public static readonly string[] HotKeys = { "`", "Q", "W", "E", "R", "A", "S", "F", "X", "V", "CAPSLOCK", "TAB" };
     public string KeyText { get; set; }
     public KeyType KeyType { get; set; }
     public int PositionX { get; set; }
     public int PositionY { get; set; }
     public bool IsHidden { get; set; }
 
+    public int Width { get; set; } = 1;
+
     public string GetColor()
     {
         return KeyType == KeyType.Action ? "#404146"
             : KeyType == KeyType.Cancel ? "#621b1b"
             : KeyType == KeyType.ControlGroup ? "#443512"
+                
+            : KeyType == KeyType.Army ? "#443512"
+            : KeyType == KeyType.Train ? "#124443"
+            : KeyType == KeyType.Research ? "#221244"
+            : KeyType == KeyType.Construct ? "#122844"
+            : KeyType == KeyType.Pyre ? "#441212"    
+                
             : KeyType == KeyType.Advance ? "#23262c"
             : KeyType == KeyType.Economy ? "#262c23"
-            : KeyType == KeyType.Pyre ? "#440e2c"
+            
             : "#37393F";
     }
 
@@ -30,45 +39,51 @@ public class HotkeyModel
             new()
             {
                 KeyText = "Z",
-                KeyType = KeyType.ControlGroup,
-                PositionX = 0,
-                PositionY = 0
+                KeyType = KeyType.Train,
+                PositionX = 1,
+                PositionY = 3
             },
             new()
             {
                 KeyText = "D",
-                KeyType = KeyType.ControlGroup,
-                PositionX = 1,
-                PositionY = 0
+                KeyType = KeyType.Army,
+                PositionX = 3,
+                PositionY = 2
             },
             new()
             {
                 KeyText = "C",
-                KeyType = KeyType.ControlGroup,
-                PositionX = 2,
-                PositionY = 0
+                KeyType = KeyType.Construct,
+                PositionX = 3,
+                PositionY = 3
             },
             new()
             {
                 KeyText = "V",
                 KeyType = KeyType.Pyre,
-                PositionX = 3,
-                PositionY = 0
+                PositionX = 4,
+                PositionY = 3
             },
             new()
             {
-                KeyText = "TAB",
-                KeyType = KeyType.ControlGroup,
-                PositionX = 4,
-                PositionY = 0
+                KeyText = "X",
+                KeyType = KeyType.Research,
+                PositionX = 2,
+                PositionY = 3
             },
-
-
             new()
             {
                 KeyText = "`",
                 KeyType = KeyType.Cancel,
                 PositionX = 0,
+                PositionY = 0
+            },
+            
+            new()
+            {
+                KeyText = "TAB",
+                KeyType = KeyType.Action,
+                PositionX = 0,
                 PositionY = 1
             },
 
@@ -143,7 +158,8 @@ public class HotkeyModel
                 KeyText = "SPACE",
                 KeyType = KeyType.Advance,
                 PositionX = 1,
-                PositionY = 3
+                PositionY = 4,
+                Width = 4
             },
             // Economy
             new()