Merge pull request #24 from hmlendea/units

New unit icons

Author: hmlendea

Content/World/Assets/narivia/units/knight.png

@@ -24,6 +24,7 @@ public class GuiRecruitmentPanel : GuiPanel
 
         GuiImage unitBackground;
         GuiImage unitImage;
+        GuiImage unitImageFrame;
         GuiImage paper;
         GuiText unitText;
         GuiText troopsText;
@@ -77,18 +78,24 @@ protected override void DoLoadContent()
                 ContentFile = "ScreenManager/FillImage",
                 TextureLayout = TextureLayout.Tile,
                 TintColour = Colour.Black,
-                Size = new Size2D(100, 100),
+                Size = new Size2D(100, 136),
                 Location = new Point2D((Size.Width - 100) / 2, 64)
             };
             unitImage = new GuiImage
             {
                 Id = $"{Id}_{nameof(unitImage)}",
                 ContentFile = $"World/Assets/{world.AssetsPack}/units/{units[currentUnitIndex].Id}",
-                SourceRectangle = new Rectangle2D(0, 0, 64, 64),
-                Size = new Size2D(64, 64),
+                Size = new Size2D(100, 100),
                 Location = new Point2D(
-                    unitBackground.Location.X + (unitBackground.Size.Width - 64) / 2,
-                    unitBackground.Location.Y + (unitBackground.Size.Height - 64) / 2)
+                    unitBackground.Location.X + (unitBackground.Size.Width - 100) / 2,
+                    unitBackground.Location.Y + (unitBackground.Size.Height - 100) / 2)
+            };
+            unitImageFrame = new GuiImage
+            {
+                Id = $"{Id}_{nameof(unitImageFrame)}",
+                ContentFile = "Interface/ProvincePanel/holding-frame",
+                Size = unitImage.Size,
+                Location = unitImage.Location
             };
             paper = new GuiImage
             {
@@ -104,9 +111,19 @@ protected override void DoLoadContent()
             {
                 Id = $"{Id}_{nameof(unitText)}",
                 ForegroundColour = Colour.Gold,
-                Size = new Size2D(unitBackground.Size.Width, 18),
+                Size = new Size2D(unitBackground.Size.Width, (unitBackground.Size.Height - unitImage.Size.Height) / 2),
                 Location = unitBackground.Location
             };
+            troopsText = new GuiText
+            {
+                Id = $"{Id}_{nameof(troopsText)}",
+                HorizontalAlignment = Alignment.Middle,
+                ForegroundColour = Colour.Gold,
+                Size = new Size2D(unitBackground.Size.Width, (unitBackground.Size.Height - unitImage.Size.Height) / 2),
+                Location = new Point2D(
+                    unitBackground.ClientRectangle.Left,
+                    unitBackground.ClientRectangle.Bottom - 18)
+            };
 
             healthIcon = new GuiImage
             {
@@ -185,15 +202,6 @@ protected override void DoLoadContent()
                     maintenanceIcon.Size.Height),
                 Location = maintenanceIcon.Location - new Point2D(maintenanceIcon.Size.Width * 2 + GameDefines.GuiSpacing, 0)
             };
-            troopsText = new GuiText
-            {
-                Id = $"{Id}_{nameof(troopsText)}",
-                ForegroundColour = Colour.Gold,
-                Size = new Size2D(unitBackground.Size.Height, 18),
-                Location = new Point2D(
-                    unitBackground.ClientRectangle.Left,
-                    unitBackground.ClientRectangle.Bottom - 18)
-            };
 
             previousUnitButton = new GuiButton
             {
@@ -243,7 +251,7 @@ protected override void DoLoadContent()
                     Size.Height - 42 - GameDefines.GuiSpacing)
             };
 
-            RegisterChildren(unitBackground, unitImage, paper);
+            RegisterChildren(unitBackground, unitImage, unitImageFrame, paper);
             RegisterChildren(unitText, troopsText);
             RegisterChildren(healthIcon, powerIcon, priceIcon, maintenanceIcon);
             RegisterChildren(healthText, powerText, priceText, maintenanceText);