Merge pull request 'Dev/ScriptableObjectsRefactor' (#4 ) from Dev/ScriptableObjectsRefactor into master

Reviewed-on: #4
Added some some more turrets and enemies
2024-10-05 17:34:00 +02:00 · 2024-10-05 17:29:45 +02:00 · 2024-10-05 17:29:27 +02:00 · 2024-10-05 17:19:35 +02:00 · 2024-10-05 17:19:15 +02:00 · 2024-10-05 17:10:03 +02:00
51 changed files with 490 additions and 606 deletions
--- a/Assets/AsteroidGame.asmdef
+++ b/Assets/AsteroidGame.asmdef
@ -5,10 +5,9 @@
        "GUID:6055be8ebefd69e48b49212b09b47b2f",
        "GUID:75469ad4d38634e559750d17036d5f7c",
        "GUID:f008ecc6829887e478aeb5eb004eb01b",
-        "GUID:17a5862fcd6383b4b97bad4dcb1e2e5d",
        "GUID:f26d68a0bdefa1043b120b820f55e190",
-        "GUID:eb3099ff524d60545a136315a154d67b",
-        "GUID:5d38ea13ae8f69a4395d425d401a557a"
+        "GUID:5d38ea13ae8f69a4395d425d401a557a",
+        "GUID:63ebd60d5c68886498ecfee04b5d6a12"
    ],
    "includePlatforms": [],
    "excludePlatforms": [],
--- a/Assets/CoreSystems
+++ b/Assets/CoreSystems
@ -1 +1 @@
-Subproject commit da8824120466499158fc1765333175b865aa0f82
+Subproject commit 813d034fc50bd7359586deea2ba305405a794bde
--- a/Assets/Entities/Enemies/Enemy.prefab
+++ b/Assets/Entities/Enemies/Enemy.prefab
@ -148,6 +148,9 @@ MonoBehaviour:
  <CurrentHealth>k__BackingField: 10
  <MaxHealth>k__BackingField: 10
  <IsInvulnerable>k__BackingField: 0
+  DeathEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1768817052950042673
 GameObject:
  m_ObjectHideFlags: 0
@ -541,8 +544,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 8410932d22e18624787af61d3a4cd191, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _activeTargetableRuntimeSet: {fileID: 11400000, guid: 85e03587d1a940f438ceac70a3d544d5, type: 2}
-  <Damageable>k__BackingField: {fileID: 0}
+  _activeTargetableRuntimeSet: {fileID: 11400000, guid: 7eab5444b4ac7f28badf814659475b35, type: 2}
+  <Damageable>k__BackingField: {fileID: 4299120351774448665}
  _centerPosition: {fileID: 2513054780709503419}
  _basePosition: {fileID: 561887346552595101}
  <Collider>k__BackingField: {fileID: 2425760649276150986}
@ -617,8 +620,6 @@ MonoBehaviour:
  <Damageable>k__BackingField: {fileID: 4299120351774448665}
  <Targetable>k__BackingField: {fileID: 4816616723634589559}
  _uiFriendlyName: Enemy
-  _entityBaseSet: {fileID: 11400000, guid: c5542e77624472441a67b1f34e19a116, type: 2}
-  _enemyBaseSet: {fileID: 11400000, guid: e5f25127d92be074aac6e7b745fae107, type: 2}
  <Weapons>k__BackingField:
  - {fileID: 5154912354327310122}
  - {fileID: 5217425462754499093}
@ -634,7 +635,7 @@ NavMeshAgent:
  m_Enabled: 1
  m_AgentTypeID: 0
  m_Radius: 0.5
-  m_Speed: 3.5
+  m_Speed: 1
  m_Acceleration: 8
  avoidancePriority: 50
  m_AngularSpeed: 120
@ -936,7 +937,7 @@ MonoBehaviour:
  _range: 0
  _targetStrategy: 0
  _activeTargetable: {fileID: 0}
-  _targeterParent: {fileID: 4816616723634589559}
+  _targeterParent: {fileID: 0}
  <TargetEntity>k__BackingField: {fileID: 0}
 --- !u!1 &7670619634857166053
 GameObject:
--- a/Assets/Entities/Enemies/EnemyTargeterConfiguration.asset
+++ b/Assets/Entities/Enemies/EnemyTargeterConfiguration.asset
@ -15,4 +15,4 @@ MonoBehaviour:
  _maxRange: 30
  _minRange: 0.5
  _selectedTargetStrategy: 0
-  _activeEntities: {fileID: 11400000, guid: dda2fd5e970bbd642a5ceead1e82783c, type: 2}
+  _activeEntities: {fileID: 11400000, guid: e4a169ae23d295ff2b9b2a3d4213a0ee, type: 2}
--- a/Assets/Entities/Entities.asmdef
+++ b/Assets/Entities/Entities.asmdef
@ -2,7 +2,8 @@
    "name": "Entities",
    "rootNamespace": "AsteroidGame",
    "references": [
-        "GUID:5d38ea13ae8f69a4395d425d401a557a"
+        "GUID:5d38ea13ae8f69a4395d425d401a557a",
+        "GUID:63ebd60d5c68886498ecfee04b5d6a12"
    ],
    "includePlatforms": [],
    "excludePlatforms": [],
--- a/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset
+++ b/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset
@ -1,15 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9da2d6a0206101c47a22881a0ba2ece2, type: 3}
-  m_Name: ActiveEnemyEntities
-  m_EditorClassIdentifier: 
-  _list: []
--- a/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset.meta
+++ b/Assets/Entities/RuntimeSet/ActiveEnemyEntities.asset.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e5f25127d92be074aac6e7b745fae107
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Entities/RuntimeSet/ActiveEntities.asset
+++ b/Assets/Entities/RuntimeSet/ActiveEntities.asset
@ -1,15 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9da2d6a0206101c47a22881a0ba2ece2, type: 3}
-  m_Name: ActiveEntities
-  m_EditorClassIdentifier: 
-  _list: []
--- a/Assets/Entities/RuntimeSet/ActiveEntities.asset.meta
+++ b/Assets/Entities/RuntimeSet/ActiveEntities.asset.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c5542e77624472441a67b1f34e19a116
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Entities/RuntimeSet/ActivePowerStructures.asset
+++ b/Assets/Entities/RuntimeSet/ActivePowerStructures.asset
@ -9,7 +9,6 @@ MonoBehaviour:
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c46c7dedba14f3da958a2e6a3d3feaa, type: 3}
+  m_Script: {fileID: 11500000, guid: 1e1a04865d154864c97344bae176e489, type: 3}
  m_Name: ActivePowerStructures
  m_EditorClassIdentifier: 
-  _list: []
--- a/Assets/Entities/RuntimeSet/ActiveStructureEntities.asset
+++ b/Assets/Entities/RuntimeSet/ActiveStructureEntities.asset
@ -9,7 +9,6 @@ MonoBehaviour:
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9da2d6a0206101c47a22881a0ba2ece2, type: 3}
+  m_Script: {fileID: 11500000, guid: b73ccf581b4b8ca4fa9c4e0a61cdd6be, type: 3}
  m_Name: ActiveStructureEntities
  m_EditorClassIdentifier: 
-  _list: []
--- a/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset.meta
+++ b/Assets/Entities/RuntimeSet/ActiveTargetableBuildings.asset.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dda2fd5e970bbd642a5ceead1e82783c
+guid: e4a169ae23d295ff2b9b2a3d4213a0ee
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset.meta
+++ b/Assets/Entities/RuntimeSet/ActiveTargetableEnemies.asset.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 85e03587d1a940f438ceac70a3d544d5
+guid: 7eab5444b4ac7f28badf814659475b35
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs
+++ b/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs
@ -1,11 +0,0 @@
-using AsteroidGame.Entities;
-using GameDev.CoreSystems;
-using UnityEngine;
-
-namespace AsteroidGame.ScriptableObjects
-{
-    [CreateAssetMenu(fileName = "newEnemyBaseRuntimeSet", menuName = "RuntimeSet/EnemyBase")]
-    public class SoEnemyBaseRuntimeSet : SoRuntimeSet<EnemyBase>
-    {
-    }
-}
--- a/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs.meta
+++ b/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 33f48df2d03212c4986fe2c47c5de796
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs
+++ b/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs
@ -1,11 +0,0 @@
-using AsteroidGame.Entities;
-using GameDev.CoreSystems;
-using UnityEngine;
-
-namespace AsteroidGame.ScriptableObjects
-{
-    [CreateAssetMenu(fileName = "newEntityBaseRuntimeSet", menuName = "RuntimeSet/EntityBase")]
-    public class SoEntityBaseRuntimeSet : SoRuntimeSet<EntityBase>
-    {
-    }
-}
--- a/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs.meta
+++ b/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 9da2d6a0206101c47a22881a0ba2ece2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs
+++ b/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs
@ -1,11 +0,0 @@
-using AsteroidGame.Entities;
-using GameDev.CoreSystems;
-using UnityEngine;
-
-namespace AsteroidGame.ScriptableObjects
-{
-    [CreateAssetMenu(fileName = "newPowerBaseRuntimeSet", menuName = "RuntimeSet/PowerBase")]
-    public class SoPowerBaseRuntimeSet : SoRuntimeSet<PowerBase>
-    {
-    }
-}
--- a/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs.meta
+++ b/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs.meta
@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 3c46c7dedba14f3da958a2e6a3d3feaa
-timeCreated: 1665006553
--- a/Assets/Entities/ScriptableObjects/SoPowerConfig.cs
+++ b/Assets/Entities/ScriptableObjects/SoPowerConfig.cs
@ -1,13 +0,0 @@
-using UnityEngine;
-
-namespace AsteroidGame.ScriptableObjects
-{
-    [CreateAssetMenu(fileName = "newPowerConfiguration", menuName = "Configuration/Power")]
-    public class SoPowerConfig : ScriptableObject
-    {
-        public SoPowerBaseRuntimeSet _activePowerStructures;
-        public bool isGenerator;
-        public bool isConsumer;
-        public int maxPower;
-    }
-}
--- a/Assets/Entities/ScriptableObjects/SoPowerConfig.cs.meta
+++ b/Assets/Entities/ScriptableObjects/SoPowerConfig.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 87159085b5778b14482ec38673729d95
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs
+++ b/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs
@ -1,11 +0,0 @@
-using AsteroidGame.Entities;
-using GameDev.CoreSystems;
-using UnityEngine;
-
-namespace AsteroidGame.ScriptableObjects
-{
-    [CreateAssetMenu(fileName = "newStructureBaseRuntimeSet", menuName = "RuntimeSet/StructureBase")]
-    public class SoStructureBaseRuntimeSet : SoRuntimeSet<StructureBase>
-    {
-    }
-}
--- a/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs.meta
+++ b/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: fbc6f67c9903cc8448f793da64d840cf
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs
+++ b/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs
@ -1,22 +0,0 @@
-using GameDev.CoreSystems;
-using UnityEngine;
-using UnityEngine.Serialization;
-
-namespace AsteroidGame.ScriptableObjects
-{
-    [CreateAssetMenu(fileName = "newTargeterConfiguration", menuName = "Configuration/Targeter")]
-    public class SoTargeterConfig : ScriptableObject
-    {
-        [FormerlySerializedAs("_range")]
-        public float _maxRange;
-        public float _minRange;
-        public TargetStrategy _selectedTargetStrategy;
-        public SoTargetableRuntimeSet _activeEntities;
-
-        public enum TargetStrategy
-        {
-            LowestRange,
-            LowestHealth
-        };
-    }
-}
--- a/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs.meta
+++ b/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 02781660543c12d4ebddaf334eb0d730
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs
+++ b/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs
@ -1,23 +0,0 @@
-using GameDev.CoreSystems;
-using UnityEngine;
-
-namespace AsteroidGame.ScriptableObjects
-{
-    public class SoWeaponConfig : ScriptableObject, IWeapon
-    {
-        [SerializeField] private float _fireRate;
-        [SerializeField] private float _damage;
-
-        public float FireRate
-        {
-            get => _fireRate;
-            set => _fireRate = value;
-        }
-
-        public float Damage
-        {
-            get => _damage;
-            set => _damage = value;
-        }
-    }
-}
--- a/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs.meta
+++ b/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 19bf3f6dd184a48499aff1db728edfcd
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Entities/Scripts/EnemyBase.cs
+++ b/Assets/Entities/Scripts/EnemyBase.cs
@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using AsteroidGame.ScriptableObjects;
 using GameDev.CoreSystems;
 using UnityEngine;
 using UnityEngine.AI;
@ -8,8 +7,6 @@ namespace AsteroidGame.Entities
 {
    public class EnemyBase : EntityBase
    {
-        [SerializeField] private SoEntityBaseRuntimeSet _enemyBaseSet;
-
        [field: Header("Weapon")]
        [field: SerializeField] public List<Weapon> Weapons { get; set; }

@ -19,12 +16,8 @@ namespace AsteroidGame.Entities
        [field: Header("NavMeshAgent")]
        [SerializeField] private NavMeshAgent _navMeshAgent;

-        protected override void OnEnable()
+        protected void OnEnable()
        {
-            base.OnEnable();
-
-            _enemyBaseSet.Add(this);
-
            InitializeTargeter();

            InitializeNavMeshAgent();
@ -50,15 +43,9 @@ namespace AsteroidGame.Entities
            //_navMeshAgent.speed = 0.1f;
        }

-        protected override void OnDisable()
-        {
-            base.OnDisable();
-            _enemyBaseSet.Remove(this);
-        }
-
        private void Update()
        {
-            if (Targeter.FindTarget())
+            if (Targeter.FoundTarget())
            {
                foreach (var weapon in Weapons)
                {
--- a/Assets/Entities/Scripts/EntityBase.cs
+++ b/Assets/Entities/Scripts/EntityBase.cs
@ -1,4 +1,3 @@
-using AsteroidGame.ScriptableObjects;
 using GameDev.CoreSystems;
 using UnityEngine;

@ -15,9 +14,6 @@ namespace AsteroidGame.Entities
        [Header("UI")]
        [SerializeField] protected string _uiFriendlyName;

-        [Space]
-        [SerializeField] private SoEntityBaseRuntimeSet _entityBaseSet;
-
        #region Props

        public string UiFriendlyName => _uiFriendlyName;
@ -33,26 +29,20 @@ namespace AsteroidGame.Entities
            AssignDamageable();
        }

-        protected virtual void OnEnable()
-        {
-            _entityBaseSet.Add(this);
-        }
-
-        protected virtual void OnDisable()
-        {
-            _entityBaseSet.Remove(this);
-        }
-
        private void InitializeDamageable()
        {
-            if (Damageable != null) return;
-            Damageable = gameObject.AddComponent<Damageable>();
+            Damageable ??= gameObject.AddComponent<Damageable>();
+            Damageable.DeathEvent.AddListener(HandleDeath);
+        }
+
+        private void HandleDeath()
+        {
+            Destroy(gameObject);
        }

        private void InitializeTargetable()
        {
-            if (Targetable != null) return;
-            Targetable = gameObject.AddComponent<Targetable>();
+            Targetable ??= gameObject.AddComponent<Targetable>();
        }

        private void AssignDamageable()
--- a/Assets/Entities/Scripts/PowerBase.cs
+++ b/Assets/Entities/Scripts/PowerBase.cs
@ -1,4 +1,3 @@
-using AsteroidGame.ScriptableObjects;
 using GameDev.CoreSystems;
 using UnityEngine;

@ -12,11 +11,20 @@ namespace AsteroidGame.Entities
        [SerializeField] protected int _maxPower;
        [SerializeField] protected int _currentPower;

-        public void SetConfig(SoPowerConfig config)
+        [SerializeField] private SoPowerSystemRuntimeSet _powerBaseSet;
+
+        public void Initialize(SoPowerConfig config)
        {
            _isGenerator = config.isGenerator;
            _isConsumer = config.isConsumer;
            _maxPower = config.maxPower;
+            _powerBaseSet = config._runtimeSet;
+            _powerBaseSet.Add(this);
+        }
+
+        private void OnDisable()
+        {
+            _powerBaseSet.Remove(this);
        }

        #region Setters
--- a/Assets/Entities/Scripts/Targeter.cs
+++ b/Assets/Entities/Scripts/Targeter.cs
@ -1,4 +1,3 @@
-using AsteroidGame.ScriptableObjects;
 using GameDev.CoreSystems;
 using UnityEngine;
 using UnityEngine.Serialization;
@ -10,8 +9,9 @@ namespace AsteroidGame.Entities
        [SerializeField] private SoTargeterConfig _targeterConfig;

        [SerializeField] private float _range;
+
+        [Header("Config Debug")]
        [SerializeField] private SoTargeterConfig.TargetStrategy _targetStrategy;
-        [FormerlySerializedAs("_activeEntities")]
        [SerializeField] private SoTargetableRuntimeSet _activeTargetable;
        [SerializeField] private Targetable _targeterParent;
        [field: SerializeField] public Targetable TargetEntity { get; set; }
@ -35,12 +35,14 @@ namespace AsteroidGame.Entities
            return TargetEntity;
        }

-        public bool FindTarget()
+        public bool FoundTarget()
        {
+            if (_activeTargetable == null || _activeTargetable.Count == 0) return false;
+
            var currentBestValue = Mathf.Infinity;
            var targetFound = false;

-            foreach (var targetEntity in _activeTargetable._list)
+            foreach (var targetEntity in _activeTargetable)
            {
                var distanceToTarget =
                    Vector3.Magnitude(targetEntity.GetCenterPosition() - _targeterParent.GetCenterPosition());
--- a/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab
+++ b/Assets/Entities/Structures/PowerPlant/PowerPlant.prefab
@ -49,14 +49,11 @@ MonoBehaviour:
  <Damageable>k__BackingField: {fileID: 4803755810606958043}
  <Targetable>k__BackingField: {fileID: 4098794156838288170}
  _uiFriendlyName: Power\nPlant
-  _entityBaseSet: {fileID: 11400000, guid: c5542e77624472441a67b1f34e19a116, type: 2}
  _cost: 100
  _buildPlacementBlocked: 0
  _buildTimer: 0
  _structureBaseSet: {fileID: 11400000, guid: 1925957d2bc2f0c4a9210131f2d2c4e5, type: 2}
-  _powerBaseSet: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2}
  _powerConfig: {fileID: 11400000, guid: 742a00ce6f6a8e04cae160bc40f09e24, type: 2}
-  _power: {fileID: 0}
 --- !u!1 &1139200854042314162
 GameObject:
  m_ObjectHideFlags: 0
@ -102,8 +99,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 8410932d22e18624787af61d3a4cd191, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _activeTargetableRuntimeSet: {fileID: 11400000, guid: dda2fd5e970bbd642a5ceead1e82783c, type: 2}
-  <Damageable>k__BackingField: {fileID: 0}
+  _activeTargetableRuntimeSet: {fileID: 11400000, guid: e4a169ae23d295ff2b9b2a3d4213a0ee, type: 2}
+  <Damageable>k__BackingField: {fileID: 4803755810606958043}
  _centerPosition: {fileID: 4810890945869411434}
  _basePosition: {fileID: 4377705888661834325}
  <Collider>k__BackingField: {fileID: 4863520569015429884}
@ -292,6 +289,9 @@ MonoBehaviour:
  <CurrentHealth>k__BackingField: 10
  <MaxHealth>k__BackingField: 10
  <IsInvulnerable>k__BackingField: 0
+  DeathEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5696605131341260023
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Entities/Structures/PowerPlant/PowerplantPowerConfiguration.asset
+++ b/Assets/Entities/Structures/PowerPlant/PowerplantPowerConfiguration.asset
@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 87159085b5778b14482ec38673729d95, type: 3}
  m_Name: PowerplantPowerConfiguration
  m_EditorClassIdentifier: 
-  _activePowerStructures: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2}
  isGenerator: 1
  isConsumer: 0
  maxPower: 100
+  _runtimeSet: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2}
--- a/Assets/Entities/Structures/Scripts/Disabler.cs
+++ b/Assets/Entities/Structures/Scripts/Disabler.cs
@ -1,29 +1,29 @@
-using AsteroidGame.ScriptableObjects;
 using UnityEngine;
 using UnityEngine.Serialization;
+using ScriptableObjectArchitecture;

 namespace AsteroidGame.Entities
 {
    public class Disabler : MonoBehaviour
    {
        [FormerlySerializedAs("Set")]
-        [SerializeField] private SoStructureBaseRuntimeSet _set;
+        [SerializeField] private GameObjectCollection _set;

        [ContextMenu("Disable All")]
        public void DisableAll()
        {
            // Loop backwards since the list may change when disabling
-            for (int i = _set._list.Count - 1; i >= 0; i--)
+            for (int i = _set.Count - 1; i >= 0; i--)
            {
-                _set._list[i].gameObject.SetActive(false);
+                _set[i].gameObject.SetActive(false);
            }
        }

        [ContextMenu("Disable Random")]
        public void DisableRandom()
        {
-            int index = Random.Range(0, _set._list.Count);
-            _set._list[index].gameObject.SetActive(false);
+            int index = Random.Range(0, _set.Count);
+            _set[index].gameObject.gameObject.SetActive(false);
        }
    }
 }
--- a/Assets/Entities/Structures/Scripts/StructureBase.cs
+++ b/Assets/Entities/Structures/Scripts/StructureBase.cs
@ -1,4 +1,3 @@
-using AsteroidGame.ScriptableObjects;
 using GameDev.CoreSystems;
 using UnityEngine;

@ -12,40 +11,34 @@ namespace AsteroidGame.Entities
        [SerializeField] protected float _buildTimer;

        [Header("Configuration")]
-        [SerializeField] private SoEntityBaseRuntimeSet _structureBaseSet;
-        [SerializeField] private SoPowerBaseRuntimeSet _powerBaseSet;
+        [SerializeField] private SoBuildableRuntimeSet _structureBaseSet;

        [Header("Power")]
        [SerializeField] private SoPowerConfig _powerConfig;
-        [SerializeField] private PowerBase _power;
+        [SerializeField] private IPowerSystem _power;

        #region Publics

-        public PowerBase Power => _power;
+        public IPowerSystem Power => _power;
        public bool BuildPlacementBlocked => _buildPlacementBlocked;

        #endregion

-        protected override void OnEnable()
+        protected virtual void OnEnable()
        {
-            base.OnEnable();
            _structureBaseSet.Add(this);
            InitializePower();
        }

        private void InitializePower()
        {
-            _power = gameObject.AddComponent<PowerBase>();
-            _power.SetConfig(_powerConfig);
-            _powerBaseSet.Add(_power);
-
+            _power ??= gameObject.AddComponent<PowerBase>();
+            _power.Initialize(_powerConfig);
        }

-        protected override void OnDisable()
+        protected void OnDisable()
        {
-            base.OnDisable();
            _structureBaseSet.Remove(this);
-            _powerBaseSet.Remove(_power);
        }

        private void OnTriggerStay(Collider other)
--- a/Assets/Entities/Structures/Turret/Turret.cs
+++ b/Assets/Entities/Structures/Turret/Turret.cs
@ -34,7 +34,7 @@ namespace AsteroidGame.Entities

        private void Update()
        {
-            if (Targeter.FindTarget())
+            if (Targeter.FoundTarget())
            {
                foreach (var weapon in Weapons)
                {
--- a/Assets/Entities/Structures/Turret/Turret.prefab
+++ b/Assets/Entities/Structures/Turret/Turret.prefab
@ -80,8 +80,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 8410932d22e18624787af61d3a4cd191, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _activeTargetableRuntimeSet: {fileID: 11400000, guid: dda2fd5e970bbd642a5ceead1e82783c, type: 2}
-  <Damageable>k__BackingField: {fileID: 0}
+  _activeTargetableRuntimeSet: {fileID: 11400000, guid: e4a169ae23d295ff2b9b2a3d4213a0ee, type: 2}
+  <Damageable>k__BackingField: {fileID: 3620345197547817675}
  _centerPosition: {fileID: 6894291031605712785}
  _basePosition: {fileID: 9116849480152445015}
  <Collider>k__BackingField: {fileID: 6912639667868447711}
@ -351,6 +351,9 @@ MonoBehaviour:
  <CurrentHealth>k__BackingField: 50
  <MaxHealth>k__BackingField: 50
  <IsInvulnerable>k__BackingField: 0
+  DeathEvent:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &4685821586660635131
 GameObject:
  m_ObjectHideFlags: 0
@ -1136,19 +1139,11 @@ MonoBehaviour:
  <Damageable>k__BackingField: {fileID: 3620345197547817675}
  <Targetable>k__BackingField: {fileID: 3738931345656042189}
  _uiFriendlyName: Turret
-  _entityBaseSet: {fileID: 11400000, guid: c5542e77624472441a67b1f34e19a116, type: 2}
  _cost: 10
  _buildPlacementBlocked: 0
  _buildTimer: 0
  _structureBaseSet: {fileID: 11400000, guid: 1925957d2bc2f0c4a9210131f2d2c4e5, type: 2}
-  _powerBaseSet: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2}
  _powerConfig: {fileID: 11400000, guid: 9dc2a0f5f29a11a4d9cabe19e18bdd42, type: 2}
-  _power: {fileID: 0}
-  _damage: 1
-  _fireRate: 1
-  _projectileSpeed: 5
-  _kills: 0
-  _damageDealt: 0
  <Weapons>k__BackingField:
  - {fileID: 5825155873221046368}
  <Targeter>k__BackingField: {fileID: 310569669314672228}
--- a/Assets/Entities/Structures/Turret/TurretPowerConfiguration.asset
+++ b/Assets/Entities/Structures/Turret/TurretPowerConfiguration.asset
@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 87159085b5778b14482ec38673729d95, type: 3}
  m_Name: TurretPowerConfiguration
  m_EditorClassIdentifier: 
-  _activePowerStructures: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2}
  isGenerator: 0
  isConsumer: 1
  maxPower: 10
+  _runtimeSet: {fileID: 11400000, guid: 127d26f1f3536e94da36af662f63fa0b, type: 2}
--- a/Assets/Entities/Structures/Turret/TurretStandardTargeterConfiguration.asset
+++ b/Assets/Entities/Structures/Turret/TurretStandardTargeterConfiguration.asset
@ -15,4 +15,4 @@ MonoBehaviour:
  _maxRange: 15
  _minRange: 0.5
  _selectedTargetStrategy: 0
-  _activeEntities: {fileID: 11400000, guid: 85e03587d1a940f438ceac70a3d544d5, type: 2}
+  _activeEntities: {fileID: 11400000, guid: 7eab5444b4ac7f28badf814659475b35, type: 2}
--- a/Assets/Handlers/EnemyHandler.cs
+++ b/Assets/Handlers/EnemyHandler.cs
@ -1,4 +1,5 @@
 using AsteroidGame.ScriptableObjects;
+using ScriptableObjectArchitecture;
 using UnityEngine;

 namespace AsteroidGame.Handlers
@ -13,6 +14,6 @@ namespace AsteroidGame.Handlers
        [SerializeField] private SoEnemyBaseList _availableEnemies;

        [Header("Lists")]
-        [SerializeField] private SoEntityBaseRuntimeSet _activeEnemies;
+        [SerializeField] private GameObjectCollection _activeEnemies;
    }
 }
--- a/Assets/Handlers/PowerHandler.cs
+++ b/Assets/Handlers/PowerHandler.cs
@ -1,5 +1,6 @@
 using System;
-using AsteroidGame.ScriptableObjects;
+using GameDev.CoreSystems;
+using ScriptableObjectArchitecture;
 using UnityEngine;

 namespace AsteroidGame.Handlers
@ -13,7 +14,7 @@ namespace AsteroidGame.Handlers
        [SerializeField] private float _powerFactor;

        [Header("Connections")]
-        [SerializeField] private SoPowerBaseRuntimeSet _activePowerStructures;
+        [SerializeField] private SoPowerSystemRuntimeSet _activePowerStructures;
        
        
        private void Update()
@ -21,7 +22,7 @@ namespace AsteroidGame.Handlers
            _powerConsumption = 0;
            _powerConsumptionPeak = 0;
            _powerCapacity = 0;
-            foreach (var structure in _activePowerStructures._list)
+            foreach (var structure in _activePowerStructures)
            {
                if (structure.IsConsumer)
                {
--- a/Assets/InputSystem/CameraControllActions.cs
+++ b/Assets/InputSystem/CameraControllActions.cs
@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.7.0
+//     version 1.11.0
 //     from Assets/InputSystem/CameraControllActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@ -145,6 +145,11 @@ public partial class @CameraControllActions: IInputActionCollection2, IDisposabl
        m_Camera_ZoomCamera = m_Camera.FindAction("ZoomCamera", throwIfNotFound: true);
    }

+    ~@CameraControllActions()
+    {
+        UnityEngine.Debug.Assert(!m_Camera.enabled, "This will cause a leak and performance issues, CameraControllActions.Camera.Disable() has not been called.");
+    }
+
    public void Dispose()
    {
        UnityEngine.Object.Destroy(asset);
--- a/Assets/InputSystem/HandlerControls.cs
+++ b/Assets/InputSystem/HandlerControls.cs
@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.7.0
+//     version 1.11.0
 //     from Assets/InputSystem/HandlerControls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@ -921,6 +921,12 @@ namespace AsteroidGame
            m_UI_TrackedDeviceOrientation = m_UI.FindAction("TrackedDeviceOrientation", throwIfNotFound: true);
        }

+        ~@HandlerControls()
+        {
+            UnityEngine.Debug.Assert(!m_Player.enabled, "This will cause a leak and performance issues, HandlerControls.Player.Disable() has not been called.");
+            UnityEngine.Debug.Assert(!m_UI.enabled, "This will cause a leak and performance issues, HandlerControls.UI.Disable() has not been called.");
+        }
+
        public void Dispose()
        {
            UnityEngine.Object.Destroy(asset);
--- a/Assets/Scenes/Playground
+++ b/Assets/Scenes/Playground
@ -38,7 +38,6 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 262.33694, g: 325.04984, b: 430.2193, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@ -157,6 +156,80 @@ Transform:
  - {fileID: 624469242}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &53965603
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 157782261}
+    m_Modifications:
+    - target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: <Damage>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: <FireRate>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 5.03
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -6.06
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_Name
+      value: Turret (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+--- !u!4 &53965604 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+  m_PrefabInstance: {fileID: 53965603}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &95533810
 GameObject:
  m_ObjectHideFlags: 0
@ -205,6 +278,7 @@ MonoBehaviour:
  m_DeselectOnBackgroundClick: 1
  m_PointerBehavior: 0
  m_CursorLockBehavior: 0
+  m_ScrollDeltaPerTick: 6
 --- !u!114 &95533812
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -264,16 +338,157 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 2079460687}
  - {fileID: 577983772}
-  - {fileID: 2037644595}
+  - {fileID: 53965604}
+  - {fileID: 282469291}
+  - {fileID: 1878032910}
  - {fileID: 1715656626}
+  - {fileID: 1762630463}
+  - {fileID: 171128884}
+  - {fileID: 1542755757}
  - {fileID: 991542217}
-  - {fileID: 1495762292}
-  - {fileID: 1421503444}
-  - {fileID: 1494435109}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &171128883
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 157782261}
+    m_Modifications:
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -17.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 5.69
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_Name
+      value: Enemy (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+--- !u!4 &171128884 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+  m_PrefabInstance: {fileID: 171128883}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &282469290
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 157782261}
+    m_Modifications:
+    - target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: <Damage>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5825155873221046368, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: <FireRate>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 10.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -5.45
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_Name
+      value: Turret (3)
+      objectReference: {fileID: 0}
+    - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+--- !u!4 &282469291 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
+  m_PrefabInstance: {fileID: 282469290}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &577983771
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -336,7 +551,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
@ -684,7 +899,7 @@ MonoBehaviour:
  m_IgnoreFromBuild: 0
  m_ApplyToChildren: 1
  m_AffectedAgents: ffffffff
--- !u!1001 &1421503443
+--- !u!1001 &1542755756
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
@ -692,13 +907,9 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 157782261}
    m_Modifications:
-    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_RootOrder
-      value: 3
-      objectReference: {fileID: 0}
    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 7.64
+      value: -16.43
      objectReference: {fileID: 0}
    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
      propertyPath: m_LocalPosition.y
@ -706,7 +917,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 7.63
+      value: 11.38
      objectReference: {fileID: 0}
    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
      propertyPath: m_LocalRotation.w
@ -738,165 +949,21 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
      propertyPath: m_Name
-      value: Enemy (1)
+      value: Enemy (3)
      objectReference: {fileID: 0}
    - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
--- !u!4 &1421503444 stripped
+--- !u!4 &1542755757 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-  m_PrefabInstance: {fileID: 1421503443}
-  m_PrefabAsset: {fileID: 0}
--- !u!1001 &1494435108
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 157782261}
-    m_Modifications:
-    - target: {fileID: 191376514769192977, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 1411216412654489461, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: _health
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.3400004
-      objectReference: {fileID: 0}
-    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 9.68
-      objectReference: {fileID: 0}
-    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_Name
-      value: Enemy (2)
-      objectReference: {fileID: 0}
-    - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
--- !u!4 &1494435109 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-  m_PrefabInstance: {fileID: 1494435108}
-  m_PrefabAsset: {fileID: 0}
--- !u!1001 &1495762291
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 157782261}
-    m_Modifications:
-    - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -8.19
-      objectReference: {fileID: 0}
-    - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -3.67
-      objectReference: {fileID: 0}
-    - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1134055636167264334, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
-      propertyPath: m_Name
-      value: PowerPlant (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 1134055636167264334, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
--- !u!4 &1495762292 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
-  m_PrefabInstance: {fileID: 1495762291}
+  m_PrefabInstance: {fileID: 1542755756}
  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1702078696
 GameObject:
@ -993,10 +1060,6 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 157782261}
    m_Modifications:
-    - target: {fileID: 103375416814990516, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
-      propertyPath: m_Speed
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
      propertyPath: m_LocalPosition.x
      value: -18.15
@ -1055,6 +1118,72 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
  m_PrefabInstance: {fileID: 1715656625}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1762630462
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 157782261}
+    m_Modifications:
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -16.24
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 7.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_Name
+      value: Enemy (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+--- !u!4 &1762630463 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2692714622321691895, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
+  m_PrefabInstance: {fileID: 1762630462}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1779908010
 GameObject:
  m_ObjectHideFlags: 0
@ -1305,7 +1434,7 @@ MonoBehaviour:
  m_IgnoreFromBuild: 0
  m_ApplyToChildren: 1
  m_AffectedAgents: ffffffff
--- !u!1001 &2037644594
+--- !u!1001 &1878032909
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
@ -1323,7 +1452,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -11.32
+      value: 8.44
      objectReference: {fileID: 0}
    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
      propertyPath: m_LocalPosition.y
@ -1331,7 +1460,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
      propertyPath: m_LocalPosition.z
-      value: -2.18
+      value: -9.48
      objectReference: {fileID: 0}
    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
      propertyPath: m_LocalRotation.w
@ -1363,21 +1492,21 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
      propertyPath: m_Name
-      value: Turret (2)
+      value: Turret (4)
      objectReference: {fileID: 0}
    - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
--- !u!4 &2037644595 stripped
+--- !u!4 &1878032910 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
-  m_PrefabInstance: {fileID: 2037644594}
+  m_PrefabInstance: {fileID: 1878032909}
  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2047541735
 GameObject:
@ -1486,6 +1615,14 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  m_Version: 11
+  m_ObsoleteShadowResolutionTier: 1
+  m_ObsoleteUseShadowQualitySettings: 0
+  m_ObsoleteCustomShadowResolution: 512
+  m_ObsoleteContactShadows: 0
+  m_PointlightHDType: 0
+  m_SpotLightShape: 0
+  m_AreaLightShape: 0
  m_Intensity: 100000
  m_EnableSpotReflector: 1
  m_LuxAtDistance: 1
@ -1588,76 +1725,6 @@ MonoBehaviour:
  m_AreaLightEmissiveMeshShadowCastingMode: 0
  m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0
  m_AreaLightEmissiveMeshLayer: -1
-  m_Version: 11
-  m_ObsoleteShadowResolutionTier: 1
-  m_ObsoleteUseShadowQualitySettings: 0
-  m_ObsoleteCustomShadowResolution: 512
-  m_ObsoleteContactShadows: 0
-  m_PointlightHDType: 0
-  m_SpotLightShape: 0
-  m_AreaLightShape: 0
--- !u!4 &2079460687 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
-  m_PrefabInstance: {fileID: 2134547390}
-  m_PrefabAsset: {fileID: 0}
--- !u!1001 &2134547390
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 157782261}
-    m_Modifications:
-    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -3.33
-      objectReference: {fileID: 0}
-    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 3.21
-      objectReference: {fileID: 0}
-    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
-      propertyPath: m_Name
-      value: Turret
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
 --- !u!1001 &664620741625697858
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -1924,7 +1991,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 2.05
+      value: 14.6
      objectReference: {fileID: 0}
    - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
      propertyPath: m_LocalPosition.y
@ -1932,7 +1999,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 2.96
+      value: -11.24
      objectReference: {fileID: 0}
    - target: {fileID: 493861824998956378, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
      propertyPath: m_LocalRotation.w
@ -1966,6 +2033,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: PowerPlant
      objectReference: {fileID: 0}
+    - target: {fileID: 1134055636167264334, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@ -2,14 +2,15 @@
  "dependencies": {
    "com.unity.ai.navigation": "1.1.5",
    "com.unity.feature.development": "1.0.1",
-    "com.unity.ide.rider": "3.0.25",
-    "com.unity.ide.visualstudio": "2.0.21",
+    "com.unity.ide.rider": "3.0.31",
+    "com.unity.ide.visualstudio": "2.0.22",
    "com.unity.ide.vscode": "1.2.5",
-    "com.unity.inputsystem": "1.7.0",
-    "com.unity.render-pipelines.high-definition": "14.0.8",
+    "com.unity.inputsystem": "1.11.0",
+    "com.unity.render-pipelines.high-definition": "14.0.11",
    "com.unity.test-framework": "1.1.33",
-    "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.7.5",
+    "com.unity.textmeshpro": "3.0.7",
+    "com.unity.timeline": "1.7.6",
+    "com.unity.toolchain.linux-x86_64": "2.0.9",
    "com.unity.ugui": "1.0.0",
    "com.unity.ui": "2.0.0",
    "com.unity.ui.builder": "2.0.0",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@ -10,11 +10,12 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.burst": {
-      "version": "1.8.8",
+      "version": "1.8.18",
      "depth": 1,
      "source": "registry",
      "dependencies": {
-        "com.unity.mathematics": "1.2.1"
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.jsonserialize": "1.0.0"
      },
      "url": "https://packages.unity.com"
    },
@ -37,17 +38,17 @@
      "depth": 0,
      "source": "builtin",
      "dependencies": {
-        "com.unity.ide.visualstudio": "2.0.18",
-        "com.unity.ide.rider": "3.0.24",
+        "com.unity.ide.visualstudio": "2.0.22",
+        "com.unity.ide.rider": "3.0.31",
        "com.unity.ide.vscode": "1.2.5",
        "com.unity.editorcoroutines": "1.0.0",
        "com.unity.performance.profile-analyzer": "1.2.2",
        "com.unity.test-framework": "1.1.33",
-        "com.unity.testtools.codecoverage": "1.2.4"
+        "com.unity.testtools.codecoverage": "1.2.6"
      }
    },
    "com.unity.ide.rider": {
-      "version": "3.0.25",
+      "version": "3.0.31",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@ -56,7 +57,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.ide.visualstudio": {
-      "version": "2.0.21",
+      "version": "2.0.22",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@ -72,7 +73,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.inputsystem": {
-      "version": "1.7.0",
+      "version": "1.11.0",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@ -95,7 +96,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.render-pipelines.core": {
-      "version": "14.0.8",
+      "version": "14.0.11",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
@ -106,28 +107,28 @@
      }
    },
    "com.unity.render-pipelines.high-definition": {
-      "version": "14.0.8",
+      "version": "14.0.11",
      "depth": 0,
      "source": "builtin",
      "dependencies": {
        "com.unity.mathematics": "1.2.4",
-        "com.unity.burst": "1.8.4",
+        "com.unity.burst": "1.8.9",
        "com.unity.modules.video": "1.0.0",
        "com.unity.modules.animation": "1.0.0",
        "com.unity.modules.imageconversion": "1.0.0",
        "com.unity.modules.terrain": "1.0.0",
-        "com.unity.render-pipelines.core": "14.0.8",
-        "com.unity.shadergraph": "14.0.8",
-        "com.unity.visualeffectgraph": "14.0.8",
-        "com.unity.render-pipelines.high-definition-config": "14.0.8"
+        "com.unity.render-pipelines.core": "14.0.11",
+        "com.unity.shadergraph": "14.0.11",
+        "com.unity.visualeffectgraph": "14.0.11",
+        "com.unity.render-pipelines.high-definition-config": "14.0.11"
      }
    },
    "com.unity.render-pipelines.high-definition-config": {
-      "version": "14.0.8",
+      "version": "14.0.11",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.8"
+        "com.unity.render-pipelines.core": "14.0.11"
      }
    },
    "com.unity.searcher": {
@ -145,14 +146,30 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.shadergraph": {
-      "version": "14.0.8",
+      "version": "14.0.11",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.8",
+        "com.unity.render-pipelines.core": "14.0.11",
        "com.unity.searcher": "4.9.2"
      }
    },
+    "com.unity.sysroot": {
+      "version": "2.0.10",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.sysroot.linux-x86_64": {
+      "version": "2.0.9",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.sysroot": "2.0.10"
+      },
+      "url": "https://packages.unity.com"
+    },
    "com.unity.test-framework": {
      "version": "1.1.33",
      "depth": 0,
@ -165,7 +182,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.testtools.codecoverage": {
-      "version": "1.2.4",
+      "version": "1.2.6",
      "depth": 1,
      "source": "registry",
      "dependencies": {
@ -175,7 +192,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.textmeshpro": {
-      "version": "3.0.6",
+      "version": "3.0.7",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@ -184,17 +201,27 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.timeline": {
-      "version": "1.7.5",
+      "version": "1.7.6",
      "depth": 0,
      "source": "registry",
      "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
        "com.unity.modules.director": "1.0.0",
        "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.audio": "1.0.0",
        "com.unity.modules.particlesystem": "1.0.0"
      },
      "url": "https://packages.unity.com"
    },
+    "com.unity.toolchain.linux-x86_64": {
+      "version": "2.0.9",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.sysroot": "2.0.10",
+        "com.unity.sysroot.linux-x86_64": "2.0.9"
+      },
+      "url": "https://packages.unity.com"
+    },
    "com.unity.ugui": {
      "version": "1.0.0",
      "depth": 0,
@ -217,12 +244,12 @@
      "dependencies": {}
    },
    "com.unity.visualeffectgraph": {
-      "version": "14.0.8",
+      "version": "14.0.11",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
-        "com.unity.shadergraph": "14.0.8",
-        "com.unity.render-pipelines.core": "14.0.8"
+        "com.unity.shadergraph": "14.0.11",
+        "com.unity.render-pipelines.core": "14.0.11"
      }
    },
    "com.unity.modules.ai": {
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -4,6 +4,9 @@
 EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Scenes/Playground 1.unity
+    guid: ed03459d41048d048963e74a69bba0e0
  m_configObjects:
    com.unity.input.settings: {fileID: 11400000, guid: 2f27ffbbbd54d9c4b9435071982af520, type: 2}
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@ -3,7 +3,7 @@
 --- !u!30 &1
 GraphicsSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 14
+  serializedVersion: 15
  m_Deferred:
    m_Mode: 1
    m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@ -13,9 +13,6 @@ GraphicsSettings:
  m_ScreenSpaceShadows:
    m_Mode: 1
    m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0}
-  m_LegacyDeferred:
-    m_Mode: 1
-    m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0}
  m_DepthNormals:
    m_Mode: 1
    m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0}
@ -48,6 +45,7 @@ GraphicsSettings:
  m_LightmapStripping: 0
  m_FogStripping: 0
  m_InstancingStripping: 0
+  m_BrgStripping: 0
  m_LightmapKeepPlain: 1
  m_LightmapKeepDirCombined: 1
  m_LightmapKeepDynamicPlain: 1
@ -64,3 +62,6 @@ GraphicsSettings:
  m_LogWhenShaderIsCompiled: 0
  m_SRPDefaultSettings:
    UnityEngine.Rendering.HighDefinition.HDRenderPipeline: {fileID: 11400000, guid: f586bf21bdc18374fa13455942bba5cc, type: 2}
+  m_LightProbeOutsideHullStrategy: 0
+  m_CameraRelativeLightCulling: 0
+  m_CameraRelativeShadowCulling: 0
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -48,6 +48,7 @@ PlayerSettings:
  defaultScreenHeightWeb: 600
  m_StereoRenderingPath: 0
  m_ActiveColorSpace: 1
+  unsupportedMSAAFallback: 0
  m_SpriteBatchVertexThreshold: 300
  m_MTRendering: 1
  mipStripping: 0
@ -75,6 +76,7 @@ PlayerSettings:
  androidMinimumWindowWidth: 400
  androidMinimumWindowHeight: 300
  androidFullscreenMode: 1
+  androidAutoRotationBehavior: 1
  defaultIsNativeResolution: 1
  macRetinaSupport: 1
  runInBackground: 1
@ -82,6 +84,7 @@ PlayerSettings:
  muteOtherAudioSources: 0
  Prepare IOS For Recording: 0
  Force IOS Speakers When Recording: 0
+  audioSpatialExperience: 0
  deferSystemGesturesMode: 0
  hideHomeButton: 0
  submitAnalytics: 1
@ -135,6 +138,8 @@ PlayerSettings:
  vulkanEnableLateAcquireNextImage: 0
  vulkanEnableCommandBufferRecycling: 1
  loadStoreDebugModeEnabled: 0
+  visionOSBundleVersion: 1.0
+  tvOSBundleVersion: 1.0
  bundleVersion: 0.1
  preloadedAssets:
  - {fileID: 11400000, guid: 2f27ffbbbd54d9c4b9435071982af520, type: 2}
@ -148,6 +153,7 @@ PlayerSettings:
  isWsaHolographicRemotingEnabled: 0
  enableFrameTimingStats: 0
  enableOpenGLProfilerGPURecorders: 1
+  allowHDRDisplaySupport: 0
  useHDRDisplay: 0
  hdrBitDepth: 0
  m_ColorGamuts: 00000000
@ -156,7 +162,8 @@ PlayerSettings:
  resetResolutionOnWindowResize: 0
  androidSupportedAspectRatio: 1
  androidMaxAspectRatio: 2.1
-  applicationIdentifier: {}
+  applicationIdentifier:
+    Standalone: com.DefaultCompany.AsteroidGame
  buildNumber:
    Standalone: 0
    VisionOS: 0
@ -228,6 +235,7 @@ PlayerSettings:
  iOSMetalForceHardShadows: 0
  metalEditorSupport: 1
  metalAPIValidation: 1
+  metalCompileShaderBinary: 0
  iOSRenderExtraFrameOnPause: 0
  iosCopyPluginsCodeInsteadOfSymlink: 0
  appleDeveloperTeamID: 
@ -341,6 +349,9 @@ PlayerSettings:
  - m_BuildTarget: WebGLSupport
    m_APIs: 0b000000
    m_Automatic: 1
+  - m_BuildTarget: LinuxStandaloneSupport
+    m_APIs: 15000000
+    m_Automatic: 0
  m_BuildTargetVRSettings:
  - m_BuildTarget: Standalone
    m_Enabled: 0
@ -414,7 +425,6 @@ PlayerSettings:
  switchScreenResolutionBehavior: 2
  switchUseCPUProfiler: 0
  switchEnableFileSystemTrace: 0
-  switchUseGOLDLinker: 0
  switchLTOSetting: 0
  switchApplicationID: 0x01004b9000490000
  switchNSODependencies: 
@ -544,7 +554,6 @@ PlayerSettings:
  switchSocketBufferEfficiency: 4
  switchSocketInitializeEnabled: 1
  switchNetworkInterfaceManagerInitializeEnabled: 1
-  switchPlayerConnectionEnabled: 1
  switchUseNewStyleFilepaths: 0
  switchUseLegacyFmodPriorities: 0
  switchUseMicroSleepForYield: 1
@ -707,6 +716,7 @@ PlayerSettings:
  metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0}
  metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1}
  metroSplashScreenUseBackgroundColor: 0
+  syncCapabilities: 0
  platformCapabilities: {}
  metroTargetDeviceFamilies: {}
  metroFTAName: 
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.10f1
-m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62)
+m_EditorVersion: 2022.3.49f1
+m_EditorVersionWithRevision: 2022.3.49f1 (4dae1bb8668d)
--- a/ProjectSettings/VFXManager.asset
+++ b/ProjectSettings/VFXManager.asset
@ -7,6 +7,7 @@ VFXManager:
  m_CopyBufferShader: {fileID: 7200000, guid: 23c51f21a3503f6428b527b01f8a2f4e, type: 3}
  m_SortShader: {fileID: 7200000, guid: ea257ca3cfb12a642a5025e612af6b2a, type: 3}
  m_StripUpdateShader: {fileID: 7200000, guid: 8fa6c4009fe2a4d4486c62736fc30ad8, type: 3}
+  m_EmptyShader: {fileID: 4800000, guid: 33a2079f6a2db4c4eb2e44b33f4ddf6b, type: 3}
  m_RenderPipeSettingsPath: 
  m_FixedTimeStep: 0.016666668
  m_MaxDeltaTime: 0.05
Author	SHA1	Message	Date
Stedd	07eb9bc0d0	Merge pull request 'Dev/ScriptableObjectsRefactor' (#4 ) from Dev/ScriptableObjectsRefactor into master Reviewed-on: #4	2024-10-05 17:34:00 +02:00
Stedd	f42899649c	Added some some more turrets and enemies	2024-10-05 17:29:45 +02:00
Stedd	7ae77b4357	Reduced speed of enemies	2024-10-05 17:29:27 +02:00
Stedd	d762ad7985	Build settings	2024-10-05 17:19:35 +02:00
Stedd	2cfa1da8a7	Added debug functions	2024-10-05 17:19:15 +02:00
Stedd	a43d9f354a	using cleanup	2024-10-05 17:10:03 +02:00
Stedd	fabec89267	Fixed error in target RuntimeSets	2024-10-05 17:09:24 +02:00
Stedd	253f7b78d1	Fixed a mistake in Turret OnEnable method	2024-10-05 17:08:01 +02:00
Stedd	d4e9bde59d	Renamed TargetFinder function	2024-10-05 17:07:38 +02:00
Stedd	1719b56d8a	Fixed null error if there are no targets	2024-10-05 17:07:22 +02:00
Stedd	bb89431807	Added simple death mechanic	2024-10-05 17:06:31 +02:00
Stedd	369c32fe71	A bunch of settings was reverted after the last commit.	2024-10-05 15:58:23 +02:00
Stedd	f7ae5d6549	Merge remote-tracking branch 'origin/Dev/ScriptableObjectsRefactor' into Dev/ScriptableObjectsRefactor # Conflicts: # Assets/Entities/Scripts/EntityBase.cs # Assets/Entities/Scripts/PowerBase.cs # Assets/Entities/Structures/Scripts/StructureBase.cs	2024-10-05 15:39:14 +02:00
Stedd	9e0304fe93	Fixed bug in PowerBase initialization	2024-10-05 15:35:58 +02:00
Stedd	53560fcc6b	Nicer syntax for adding components if null	2024-10-05 15:34:39 +02:00
Stedd	b9d9e52c49	Disabled OpenGL for linux	2024-10-05 15:31:57 +02:00
Stedd	37d0e02368	Updated unity	2024-10-05 15:24:41 +02:00
Stedd	979e631eac	WIP ScriptableObjects Refactor	2023-10-28 18:09:02 +02:00