#6: Update to fix only equipable weapon show up under weapon choices …

…and bot will not stuck
danilko · Mar 14, 2021 · 4e0a444 · 4e0a444
1 parent a11b3b9
commit 4e0a444
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 40 deletions.
diff --git a/agents/Agent.cs b/agents/Agent.cs
@@ -39,9 +39,6 @@ public class Agent : KinematicBody2D
 
     public int RightWeaponAction { set; get; }
     public int LeftWeaponAction { set; get; }
-    public bool RightWeaponReloading { set; get; }
-    public bool LeftWeaponReloading { set; get; }
-
     protected Godot.Collections.Array<Weapon> RightWeapons = new Godot.Collections.Array<Weapon>();
     protected Godot.Collections.Array<Weapon> LeftWeapons = new Godot.Collections.Array<Weapon>();
 
@@ -498,7 +495,6 @@ public void DamageEffectTimerTimeout()
     public void ReloadWeapon(Weapon.WeaponOrder weaponOrder)
     {
         ((Weapon)GetWeapons(weaponOrder)[CurrentWeaponIndex[weaponOrder]]).StartReload();
-        RightWeaponReloading = false;
     }
 
     public void Heal(int amount)

diff --git a/ai/AI.cs b/ai/AI.cs
@@ -166,7 +166,7 @@ public void Control(float delta)
                 break;
 
             case State.ENGAGE:
-                if (IsInstanceValid(_targetAgent))
+                if (_targetAgent != null && IsInstanceValid(_targetAgent))
                 {
                     _agent.RotateToward(_targetAgent.GlobalPosition, delta);
 
@@ -193,6 +193,10 @@ public void Control(float delta)
                         _agent.MoveToward(_agent.GlobalPosition.DirectionTo(_targetAgent.GlobalPosition), delta);
                     }
                 }
+                else
+                {
+                    _checkTarget();
+                }
                 break;
 
             case State.ADVANCE:
@@ -289,40 +293,53 @@ private void _onDetectionZoneBodyExited(Node body)
                 }
             }
 
-            Godot.Collections.Array<String> removeTargetList = new Godot.Collections.Array<String>();
-
-            foreach (String targetAgentUnitName in _targetAgents.Keys)
+            // If target is not vaild, then will try to check for next target
+            if (_targetAgent == null || IsInstanceValid(_targetAgent))
             {
-                Agent targetAgent = _gameWorld.GetTeamMapAIs()[(int)_targetAgents[targetAgentUnitName]].GetUnit(targetAgentUnitName);
-
-                if (targetAgent != null && IsInstanceValid(targetAgent))
-                {
-                    _targetAgent = targetAgent;
-                }
-                else
-                {
-                    // Remove this target from list as it is no longer valid
-                    removeTargetList.Add(targetAgentUnitName);
-                }
+                // Compute target
+                _checkTarget();
             }
+        }
+    }
+
+    private void _checkTarget()
+    {
+        _targetAgent = null;
+
+        Godot.Collections.Array<String> removeTargetList = new Godot.Collections.Array<String>();
+
+        foreach (String targetAgentUnitName in _targetAgents.Keys)
+        {
+            Agent targetAgent = _gameWorld.GetTeamMapAIs()[(int)_targetAgents[targetAgentUnitName]].GetUnit(targetAgentUnitName);
 
-            foreach (String targetAgentUnitName in removeTargetList)
+            if (targetAgent != null && IsInstanceValid(targetAgent))
             {
-                _targetAgents.Remove(targetAgentUnitName);
+                SetState(State.ENGAGE);
+                _targetAgent = targetAgent;
             }
+            else
+            {
+                // Remove this target from list as it is no longer valid
+                removeTargetList.Add(targetAgentUnitName);
+            }
+        }
 
-            // If no possible target, then set to ADVANCE
-            if (_targetAgent == null)
+        foreach (String targetAgentUnitName in removeTargetList)
+        {
+            _targetAgents.Remove(targetAgentUnitName);
+        }
+
+        // If no possible target, then set to ADVANCE
+        if (_targetAgent == null)
+        {
+            // Set advance if next target is available
+            if (_nextBasePosition != Vector2.Zero)
             {
-                // Set advance if next target is available
-                if (_nextBasePosition != Vector2.Zero)
-                {
-                    SetState(State.ADVANCE);
-                }
-                else
-                {
-                    SetState(State.PATROL);
-                }
+                SetState(State.ADVANCE);
+            }
+            else
+            {
+                SetState(State.PATROL);
             }
         }
     }

diff --git a/inventory/Inventory.cs b/inventory/Inventory.cs
@@ -149,12 +149,6 @@ public void EquipItem(int itemIndex, Weapon.WeaponOrder weaponOrder, int weaponI
         _usedIndex.Add(itemIndex);
         _agent.EquipWeapon(_items[itemIndex].ReferencePackedScene, weaponOrder, weaponIndex);
 
-        if (weaponOrder == Weapon.WeaponOrder.Left && weaponIndex == 1)
-        {
-            GD.Print("EQUIP " + _agent.GetUnitName() + " " + weaponOrder + weaponIndex + (_agent.GetWeapons(weaponOrder)[weaponIndex] != null));
-
-        }
-
         EmitSignal(nameof(WeaponChangeSignal), weaponOrder, weaponIndex);
         EmitSignal(nameof(InventoryChangeSignal));
     }

diff --git a/ui/InventoryUI.cs b/ui/InventoryUI.cs
@@ -118,7 +118,7 @@ private void _populateWeaponChoices(Weapon.WeaponOrder weaponOrder, int weaponIn
         int inventoryItemIndex = 0;
         foreach (ItemResource itemResource in _inventory.GetItems())
         {
-            if (itemResource != null)
+            if (itemResource != null && itemResource.CurrentItemType == ItemResource.ItemType.EQUIPABLE)
             {
                 ItemPanel panel = (ItemPanel)_itemPanel.Duplicate();
 

diff --git a/ui/TitleScreen.tscn b/ui/TitleScreen.tscn
@@ -290,7 +290,7 @@ margin_left = 168.411
 margin_top = 111.168
 margin_right = 242.411
 margin_bottom = 135.168
-value = 5.0
+value = 10.0
 __meta__ = {
 "_edit_use_anchors_": false
 }