AI improvement

Author: EpicSharpCode

Assets/ScriptableObjects/Databases/TeamDatabase.asset

@@ -15,15 +15,22 @@ MonoBehaviour:
   _teams:
   - _teamName: Player
     _allyTeams:
-    - Aliance
+    - _teamName: Aliance
+      _inSightBehaviour: 0
     _enemiesTeams:
-    - Enemy
+    - _teamName: Corp
+      _inSightBehaviour: 0
   - _teamName: Aliance
     _allyTeams:
-    - Player
+    - _teamName: Player
+      _inSightBehaviour: 5
     _enemiesTeams:
-    - Enemy
-  - _teamName: Enemy
+    - _teamName: Corp
+      _inSightBehaviour: 3
+  - _teamName: Corp
     _allyTeams: []
     _enemiesTeams:
-    - Player
+    - _teamName: Aliance
+      _inSightBehaviour: 3
+    - _teamName: Player
+      _inSightBehaviour: 3

Assets/Scripts/Editor/BoxEntityEditor.cs

@@ -16,7 +16,7 @@ public override void OnInspectorGUI()
         {
             base.OnInspectorGUI();
 
-            FindObjectOfType<GameVariables>().Awake();
+            FindObjectOfType<GameController>().Awake();
             EditorGUI.BeginChangeCheck();
 
             BoxEntity box = target.GetComponent<BoxEntity>();

Assets/Scripts/Entities/Bullet.cs

@@ -40,9 +40,9 @@ private void TryDamage(RaycastHit hit)
 
             var unit = hit.collider.GetComponent<Unit>();
             unit?.Damage(_damage);
-            if (GameVariables.hitBoxPopupState)
+            if (GameController.hitBoxPopupState)
             {
-                var hitPopup = Instantiate(GameVariables.gamePrefabDatabase.hitPopupPrefab) as HitPopup;
+                var hitPopup = Instantiate(GameController.gamePrefabDatabase.hitPopupPrefab) as HitPopup;
                 hitPopup.transform.position = hit.point;
                 hitPopup.Setup(_damage);
             }

Assets/Scripts/Entities/ItemBox.cs

@@ -13,15 +13,15 @@ public class ItemBox : BoxEntity
         ItemObject _itemObject;
 
         public ItemBox(ItemObject itemObject) => _itemObject = itemObject;
-        public override List<ItemObject> boxContent => GameVariables.GetAllItems();
+        public override List<ItemObject> boxContent => GameController.GetAllItems();
         public override string boxContentName => "Item";
 
 
         void Start() => Setup(_selectedIndex);
         public override void Setup(int itemIndex) 
         { 
             if(itemIndex < 1) return;
-            _itemObject = GameVariables.GetItem(itemIndex - 1);
+            _itemObject = GameController.GetItem(itemIndex - 1);
             _nameText.text = _itemObject.localizedName;
         }
 

Assets/Scripts/Entities/WeaponBox.cs

@@ -12,15 +12,15 @@ public class WeaponBox : BoxEntity
 
         public WeaponBox(WeaponObject weaponObject) => _weaponObject = weaponObject;
 
-        public override List<ItemObject> boxContent => GameVariables.GetAllWeapons().Cast<ItemObject>().ToList();
+        public override List<ItemObject> boxContent => GameController.GetAllWeapons().Cast<ItemObject>().ToList();
         public override string boxContentName => "Weapon";
 
 
         void Start() => Setup(_selectedIndex);
         public override void Setup(int itemIndex)
         {
             if(itemIndex < 1) return;
-            _weaponObject = GameVariables.GetWeapon(itemIndex - 1);
+            _weaponObject = GameController.GetWeapon(itemIndex - 1);
             _nameText.text = _weaponObject.localizedName;
         }
         public override void Pickup(Unit player)

Assets/Scripts/GameController.cs

@@ -1,21 +1,37 @@
+using Reckless.Items;
 using System.Collections;
 using System.Collections.Generic;
+using Reckless.Entities;
 using UnityEngine;
+using UnityEngine.Serialization;
 
 namespace Reckless
 {
     public class GameController : MonoBehaviour
     {
-        // Start is called before the first frame update
-        void Start()
-        {
+        public static GameController instance { get; private set; }
 
-        }
+        [SerializeField] ItemsDatabase _itemsDatabase;
+        [SerializeField] WeaponsDatabase _weaponsDatabase;
+        [SerializeField] GamePrefabDatabase _gamePrefabDatabase;
+        [SerializeField] UnitTeamDatabase _unitTeamDatabase;
+        [SerializeField] bool _hitBoxPopupState = true;
+        
+        
+        public static GamePrefabDatabase gamePrefabDatabase => instance._gamePrefabDatabase;
+        public static bool hitBoxPopupState => instance._hitBoxPopupState;
 
-        // Update is called once per frame
-        void Update()
+        public void Awake()
         {
-
+            instance = this;
         }
+
+        public static ItemObject GetItem(string id) => instance._itemsDatabase?.GetItem(id);
+        public static UnitTeam GetTeam(string name) => instance._unitTeamDatabase?.teams.Find(x => x.teamName == name);
+        public static ItemObject GetItem(int index) => instance._itemsDatabase?.GetItem(index);
+        public static List<ItemObject> GetAllItems() => instance._itemsDatabase?.GetAllItems();
+        public static WeaponObject GetWeapon(string id) => instance._weaponsDatabase?.GetWeapon(id);
+        public static WeaponObject GetWeapon(int index) => instance._weaponsDatabase?.GetWeapon(index);
+        public static List<WeaponObject> GetAllWeapons() => instance._weaponsDatabase?.GetAllWeapons();
     }
-}
+}

Assets/Scripts/GameController.cs.meta

@@ -13,6 +13,8 @@ public class Npc : Unit
         [SerializeField] List<NpcAbility> _abilities;
 
         [SerializeField] NpcState _npcState;
+        [SerializeField] string _npcTeam;
+        public UnitTeam npcTeam => GameController.GetTeam(_npcTeam);
         public NpcState npcState => _npcState;
 
         [SerializeField] Unit _goal;

Assets/Scripts/GameVariables.cs

@@ -10,6 +10,8 @@ public class NpcSightAbility : NpcAbility
         [SerializeField] float _sightAngle = 120;
         [SerializeField] List<Unit> _unitsInSight;
         [SerializeField] Vector3 _scanOffset;
+
+        [SerializeField] NpcState _stateOnSeeAnyone;
 
         public List<Unit> unitsInSight => _unitsInSight;
         public override void PerformUpdate(Npc npc)

Assets/Scripts/GameVariables.cs.meta

@@ -1,3 +1,4 @@
+using Reckless.Units.AI;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -8,7 +9,15 @@ namespace Reckless
     public class UnitTeam
     {
         [SerializeField] string _teamName;
-        [SerializeField] List<string> _allyTeams;
-        [SerializeField] List<string> _enemiesTeams;
+        public string teamName => _teamName;
+        [SerializeField] List<TeamRule> _allyTeams;
+        [SerializeField] List<TeamRule> _enemiesTeams;
+
+        [System.Serializable]
+        public class TeamRule
+        {
+            [SerializeField] string _teamName;
+            [SerializeField] NpcState _inSightBehaviour;
+        }
     }
 }