m

01010100b · Nov 14, 2021 · f7e9909 · f7e9909
1 parent bec9db5
commit f7e9909
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/AoE2Lib/Bots/GameElements/Unit.cs b/AoE2Lib/Bots/GameElements/Unit.cs
@@ -50,13 +50,11 @@ public Unit GetTarget()
 
             var id = this[ObjectData.TARGET_ID];
 
-            try
+            if (Bot.GameState.TryGetUnit(id, out Unit unit))
             {
-                var target = Bot.GameState.GetUnit(id);
-
-                return target;
+                return unit;
             }
-            catch (ArgumentOutOfRangeException)
+            else
             {
                 return null;
             }

diff --git a/AoE2Lib/Bots/GameState.cs b/AoE2Lib/Bots/GameState.cs
@@ -91,15 +91,19 @@ public UnitType GetUnitType(int id)
             return UnitTypes[id];
         }
 
-        public Unit GetUnit(int id)
+        public bool TryGetUnit(int id, out Unit unit)
         {
-            if (Units.TryGetValue(id, out Unit unit))
+            if (Units.TryGetValue(id, out Unit u))
             {
-                return unit;
+                unit = u;
+
+                return true;
             }
             else
             {
-                throw new ArgumentOutOfRangeException(nameof(id));
+                unit = null;
+
+                return false;
             }
         }
 

diff --git a/Unary/Managers/UnitsManager.cs b/Unary/Managers/UnitsManager.cs
@@ -76,7 +76,6 @@ private void UpdateControllers()
             var controllers = GetControllers<UnitController>();
             foreach (var controller in controllers)
             {
-                controller.Unit.RequestUpdate();
                 if (controller.Unit.Targetable)
                 {
                     controller.Update();

diff --git a/Unary/UnitControllers/IdlerController.cs b/Unary/UnitControllers/IdlerController.cs
@@ -20,7 +20,7 @@ protected override void Tick()
         {
             if (Unit[ObjectData.CMDID] == (int)CmdId.VILLAGER)
             {
-                if (Unary.UnitsManager.GetControllers<HunterController>().Count == 0)
+                if (Unary.UnitsManager.GetControllers<HunterController>().Count < 3 && Unary.UnitsManager.GetControllers<GathererController>().Count > 0)
                 {
                     new HunterController(Unit, Unary);
                 }

diff --git a/Unary/UnitControllers/MilitaryControllers/DeerPusherController.cs b/Unary/UnitControllers/MilitaryControllers/DeerPusherController.cs
@@ -49,6 +49,10 @@ private void ChooseDeer()
             {
                 Deer = deer[0];
             }
+            else
+            {
+                Deer = null;
+            }
         }
 
         private void PushDeer()

diff --git a/Unary/UnitControllers/MilitaryControllers/ScoutController.cs b/Unary/UnitControllers/MilitaryControllers/ScoutController.cs
@@ -32,9 +32,12 @@ protected override void MilitaryTick()
 
             if (deer > 0)
             {
-                new DeerPusherController(Unit, Unary);
+                if (Unary.UnitsManager.GetControllers<DeerPusherController>().Count == 0)
+                {
+                    new DeerPusherController(Unit, Unary);
 
-                return;
+                    return;
+                }
             }
 
             if (State == null)