Changeset 4740 for 2013/30

Timestamp:

2013-07-26 12:32:18 (9 years ago)

Author:

dezhidki

Message:

Talletus.

Location:

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster

Files:

• Ai/AIStates/AgressiveState.cs (modified) (2 diffs)
• Players/PlayerAI.cs (modified) (3 diffs)
• Units/Mobs/MobRanger.cs (modified) (1 diff)
• Units/Mobs/MobWarrior.cs (modified) (1 diff)

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/Ai/AIStates/AgressiveState.cs

@@ -77 +77 @@
         public override void ApplyState()
         {
-            if (!AI.Armory.IsDestroyed && warriors.Count + rangers.Count <= 10 && AI.CoinsAmount >= UnitArmory.PRICE_WARRIOR)
+            if (!AI.Armory.IsDestroyed && warriors.Count + rangers.Count <= 8 && AI.CoinsAmount >= UnitArmory.PRICE_WARRIOR)
             {
                 Type typeToBuy = null;
@@ -124 +124 @@
                 for (int i = 0; i < warriors.Count; i++)
                 {
-                    if (warriors[i].Removed)
-                        warriors.Remove(warriors[i]);
+                    MobWarrior warrior = warriors[i];
+                    if (warrior.Removed)
+                        warriors.Remove(warrior);
+
+                    if (!warrior.HasActiveOrders && warrior.Target == null)
+                        warrior.OnFunctionClick(AI.SpawnPoints[Player.SPAWN_WARRIOR].X * Viewport.TILESIZE, AI.SpawnPoints[Player.SPAWN_WARRIOR].Y * Viewport.TILESIZE, 1, false);
                 }
 
                 for (int i = 0; i < rangers.Count; i++)
                 {
-                    if (rangers[i].Removed)
-                        rangers.Remove(rangers[i]);
+                    MobRanger ranger = rangers[i];
+                    if (ranger.Removed)
+                        rangers.Remove(ranger);
+
+                    if (!ranger.HasActiveOrders && ranger.Target == null)
+                        ranger.OnFunctionClick(AI.SpawnPoints[Player.SPAWN_RANGER].X * Viewport.TILESIZE, AI.SpawnPoints[Player.SPAWN_RANGER].Y * Viewport.TILESIZE, 1, false);
                 }
             }

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/Players/PlayerAI.cs

@@ -47 +47 @@
         public List<Type> AttackerTypes { get { return unitTypes; } }
 
-        public Player Enemy { get { return enemy;} }
+        public Player Enemy { get { return enemy; } }
 
         public Point ForestPoint { get; set; }
@@ -57 +57 @@
         private void ReThinkBestState()
         {
-            
+
 
             AIState newState = null;
@@ -75 +75 @@
                 currentBrain = newState;
                 currentBrain.OnStateChosen();
+#if DEBUG
                 Console.WriteLine("New state:" + currentBrain);
+#endif
             }
             else

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/Units/Mobs/MobRanger.cs

@@ -57 +57 @@
             get { return 1; }
         }
+
+        public Unit Target { get { return target; } }
 
         private void StartAttack()

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/Units/Mobs/MobWarrior.cs

@@ -57 +57 @@
             get { return 2; }
         }
+
+        public Unit Target { get { return target; } }
 
         private void StartAttack()