Changeset 4751 for 2013

Timestamp:

2013-07-28 23:40:27 (10 years ago)

Author:

dezhidki

Message:

Lisätty vihollisen kunikaan elämäpalkki

Location:

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster

Files:

• Game.cs (modified) (2 diffs)
• Guis/GuiPlayer.cs (modified) (7 diffs)

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/Game.cs

@@ -89 +89 @@
         private Camera camera;
         private LevelForest level;
-        private Player[] players;
+        private static Player[] players;
         private static GuiManager guiManager;
         private GuiDebug debugScreen;
@@ -222 +222 @@
         }
 
+        public static Player GetEnemyPlayer(Player player)
+        {
+            return player.Team == TEAM1 ? players[1] : players[0];
+        }
+
         protected override void LoadContent()
         {

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/Guis/GuiPlayer.cs

@@ -21 +21 @@
             private int oldUnitHealthBarWidth = HEALTH_BAR_WIDTH;
             private string text;
+            private Color textColor;
 
-            public HealthMeter(Unit unit, Vector2 renderPos, string text)
+            public HealthMeter(Unit unit, Vector2 renderPos, string text, Color textColor)
             {
                 this.text = text;
                 this.unit = unit;
+                this.textColor = textColor;
                 unitHealthGreenRectangle = new Rectangle(0, 0, HEALTH_BAR_WIDTH, 4);
                 unitHealthRedRectangle = new Rectangle(HEALTH_BAR_WIDTH, 4, 0, 4);
@@ -47 +49 @@
             public void Render(RenderHelper renderer)
             {
-                renderer.SpriteBatch.DrawString(Resources.FONT, text, unitTextPos, Color.White);
+                renderer.SpriteBatch.DrawString(Resources.FONT, text, unitTextPos, textColor);
                 if (unitHealthGreenRectangle.Width > 0)
                     renderer.SpriteBatch.Draw(renderer.RegisteredSpriteSheets[Resources.SPRITESHEET_HEALTH].SheetTexture, unitHealthPos, unitHealthGreenRectangle, Color.White, 0.0F, Vector2.Zero, SCALE, SpriteEffects.None, 0);
@@ -59 +61 @@
         private const string ICON_WOOD = "#";
         private const string KING_TEXT = "KING HEALTH: ";
+        private const string KING_ENEMY_TEXT = "ENEMY KING HEALTH: ";
         private const string STORE_TEXT = "STORE HEALTH: ";
         private const string ARMORY_TEXT = "ARMORY HEALTH: ";
@@ -71 +74 @@
         private Vector2 itemStatsPos;
 
-        private HealthMeter kingHealthMeter, storeHealthMeter, armoryHealthMeter;
+        private HealthMeter kingHealthMeter, storeHealthMeter, armoryHealthMeter, enemyKingHealth;
 
         public GuiPlayer(GuiManager manager, Player player)
@@ -82 +85 @@
             itemStatsPos = new Vector2(0, Game.HEIGHT - GUI_BAR_HEIGHT + 5);
 
-            kingHealthMeter = new HealthMeter(player.King, new Vector2(Game.WIDTH - HEALTH_BAR_WIDTH * SCALE - 10, Game.HEIGHT - GUI_BAR_HEIGHT + 20), KING_TEXT);
-            storeHealthMeter = new HealthMeter(player.Store, new Vector2(Game.WIDTH - HEALTH_BAR_WIDTH * SCALE - 10, Game.HEIGHT - GUI_BAR_HEIGHT + 40), STORE_TEXT);
-            armoryHealthMeter = new HealthMeter(player.Armory, new Vector2(Game.WIDTH - HEALTH_BAR_WIDTH * SCALE - 10, Game.HEIGHT - GUI_BAR_HEIGHT + 60), ARMORY_TEXT);
+            kingHealthMeter = new HealthMeter(player.King, new Vector2(Game.WIDTH - HEALTH_BAR_WIDTH * SCALE - 10, Game.HEIGHT - GUI_BAR_HEIGHT + 20), KING_TEXT, Color.White);
+            enemyKingHealth = new HealthMeter(Game.GetEnemyPlayer(player).King, new Vector2(Game.WIDTH - HEALTH_BAR_WIDTH * SCALE - 10, Game.HEIGHT - GUI_BAR_HEIGHT + 40), KING_ENEMY_TEXT, new Color(160, 0, 0));
+            storeHealthMeter = new HealthMeter(player.Store, new Vector2(Game.WIDTH - HEALTH_BAR_WIDTH * SCALE - 10, Game.HEIGHT - GUI_BAR_HEIGHT + 60), STORE_TEXT, Color.White);
+            armoryHealthMeter = new HealthMeter(player.Armory, new Vector2(Game.WIDTH - HEALTH_BAR_WIDTH * SCALE - 10, Game.HEIGHT - GUI_BAR_HEIGHT + 80), ARMORY_TEXT, Color.White);
         }
 
@@ -104 +108 @@
             storeHealthMeter.Update();
             armoryHealthMeter.Update();
+            enemyKingHealth.Update();
         }
 
@@ -112 +117 @@
 
             kingHealthMeter.Render(renderer);
-
             storeHealthMeter.Render(renderer);
-
             armoryHealthMeter.Render(renderer);
+            enemyKingHealth.Render(renderer);
         }
     }