From 357e02ff4fd709103938b8704faa2ae4e0e8d940 Mon Sep 17 00:00:00 2001 From: Stedd Date: Sun, 8 Oct 2023 14:06:15 +0200 Subject: [PATCH] Changed naming scheme of ScriptableObjects --- Assets/Entities/Enemies/Scripts/EnemyBase.cs | 4 ++-- .../{SEnemyBaseList.cs => SoEnemyBaseList.cs} | 2 +- ...{SEnemyBaseList.cs.meta => SoEnemyBaseList.cs.meta} | 0 ...EnemyBaseRuntimeSet.cs => SoEnemyBaseRuntimeSet.cs} | 2 +- ...untimeSet.cs.meta => SoEnemyBaseRuntimeSet.cs.meta} | 0 ...tityBaseRuntimeSet.cs => SoEntityBaseRuntimeSet.cs} | 2 +- ...ntimeSet.cs.meta => SoEntityBaseRuntimeSet.cs.meta} | 0 ...PowerBaseRuntimeSet.cs => SoPowerBaseRuntimeSet.cs} | 2 +- ...untimeSet.cs.meta => SoPowerBaseRuntimeSet.cs.meta} | 0 .../{SPowerConfig.cs => SoPowerConfig.cs} | 5 ++--- .../{SPowerConfig.cs.meta => SoPowerConfig.cs.meta} | 0 .../{SStructureBaseList.cs => SoStructureBaseList.cs} | 2 +- ...ureBaseList.cs.meta => SoStructureBaseList.cs.meta} | 0 ...eBaseRuntimeSet.cs => SoStructureBaseRuntimeSet.cs} | 2 +- ...meSet.cs.meta => SoStructureBaseRuntimeSet.cs.meta} | 0 .../{STargeterConfig.cs => SoTargeterConfig.cs} | 6 +++--- ...TargeterConfig.cs.meta => SoTargeterConfig.cs.meta} | 0 .../{SWeaponConfig.cs => SoWeaponConfig.cs} | 4 ++-- .../{SWeaponConfig.cs.meta => SoWeaponConfig.cs.meta} | 0 Assets/Entities/Scripts/EntityBase.cs | 2 +- Assets/Entities/Scripts/PowerBase.cs | 2 +- Assets/Entities/Scripts/Targeter.cs | 10 +++++----- Assets/Entities/Structures/Scripts/Disabler.cs | 2 +- Assets/Entities/Structures/Scripts/StructureBase.cs | 6 +++--- Assets/Entities/Structures/Turret/Turret.cs | 2 +- Assets/Handlers/BuildingHandler.cs | 7 ++++--- Assets/Handlers/EnemyHandler.cs | 4 ++-- Assets/Handlers/PowerHandler.cs | 2 +- Assets/UI/BuildMenuUiController.cs | 5 +++-- 29 files changed, 37 insertions(+), 36 deletions(-) rename Assets/Entities/ScriptableObjects/{SEnemyBaseList.cs => SoEnemyBaseList.cs} (83%) rename Assets/Entities/ScriptableObjects/{SEnemyBaseList.cs.meta => SoEnemyBaseList.cs.meta} (100%) rename Assets/Entities/ScriptableObjects/{SEnemyBaseRuntimeSet.cs => SoEnemyBaseRuntimeSet.cs} (78%) rename Assets/Entities/ScriptableObjects/{SEnemyBaseRuntimeSet.cs.meta => SoEnemyBaseRuntimeSet.cs.meta} (100%) rename Assets/Entities/ScriptableObjects/{SEntityBaseRuntimeSet.cs => SoEntityBaseRuntimeSet.cs} (74%) rename Assets/Entities/ScriptableObjects/{SEntityBaseRuntimeSet.cs.meta => SoEntityBaseRuntimeSet.cs.meta} (100%) rename Assets/Entities/ScriptableObjects/{SPowerBaseRuntimeSet.cs => SoPowerBaseRuntimeSet.cs} (75%) rename Assets/Entities/ScriptableObjects/{SPowerBaseRuntimeSet.cs.meta => SoPowerBaseRuntimeSet.cs.meta} (100%) rename Assets/Entities/ScriptableObjects/{SPowerConfig.cs => SoPowerConfig.cs} (64%) rename Assets/Entities/ScriptableObjects/{SPowerConfig.cs.meta => SoPowerConfig.cs.meta} (100%) rename Assets/Entities/ScriptableObjects/{SStructureBaseList.cs => SoStructureBaseList.cs} (81%) rename Assets/Entities/ScriptableObjects/{SStructureBaseList.cs.meta => SoStructureBaseList.cs.meta} (100%) rename Assets/Entities/ScriptableObjects/{SStructureBaseRuntimeSet.cs => SoStructureBaseRuntimeSet.cs} (73%) rename Assets/Entities/ScriptableObjects/{SStructureBaseRuntimeSet.cs.meta => SoStructureBaseRuntimeSet.cs.meta} (100%) rename Assets/Entities/ScriptableObjects/{STargeterConfig.cs => SoTargeterConfig.cs} (71%) rename Assets/Entities/ScriptableObjects/{STargeterConfig.cs.meta => SoTargeterConfig.cs.meta} (100%) rename Assets/Entities/ScriptableObjects/{SWeaponConfig.cs => SoWeaponConfig.cs} (80%) rename Assets/Entities/ScriptableObjects/{SWeaponConfig.cs.meta => SoWeaponConfig.cs.meta} (100%) diff --git a/Assets/Entities/Enemies/Scripts/EnemyBase.cs b/Assets/Entities/Enemies/Scripts/EnemyBase.cs index e6fdd79..f2d192e 100644 --- a/Assets/Entities/Enemies/Scripts/EnemyBase.cs +++ b/Assets/Entities/Enemies/Scripts/EnemyBase.cs @@ -6,14 +6,14 @@ namespace AsteroidGame.Entities { public class EnemyBase : EntityBase { - [SerializeField] private SEntityBaseRuntimeSet _enemyBaseSet; + [SerializeField] private SoEntityBaseRuntimeSet _enemyBaseSet; [Header("Targeter")] - [SerializeField] private STargeterConfig _targeterConfig; [SerializeField] private Targeter _targeter; [SerializeField] private EntityBase _target; [Header("NavMeshAgent")] + [SerializeField] private SoTargeterConfig _targeterConfig; [SerializeField] private NavMeshAgent _navMeshAgent; protected override void OnEnable() diff --git a/Assets/Entities/ScriptableObjects/SEnemyBaseList.cs b/Assets/Entities/ScriptableObjects/SoEnemyBaseList.cs similarity index 83% rename from Assets/Entities/ScriptableObjects/SEnemyBaseList.cs rename to Assets/Entities/ScriptableObjects/SoEnemyBaseList.cs index 1737136..98bf112 100644 --- a/Assets/Entities/ScriptableObjects/SEnemyBaseList.cs +++ b/Assets/Entities/ScriptableObjects/SoEnemyBaseList.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace AsteroidGame.Entities { [CreateAssetMenu(fileName = "newEnemyList", menuName = "Enemies/EnemyList")] - public class SEnemyBaseList : ScriptableObject + public class SoEnemyBaseList : ScriptableObject { public List _list; } diff --git a/Assets/Entities/ScriptableObjects/SEnemyBaseList.cs.meta b/Assets/Entities/ScriptableObjects/SoEnemyBaseList.cs.meta similarity index 100% rename from Assets/Entities/ScriptableObjects/SEnemyBaseList.cs.meta rename to Assets/Entities/ScriptableObjects/SoEnemyBaseList.cs.meta diff --git a/Assets/Entities/ScriptableObjects/SEnemyBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs similarity index 78% rename from Assets/Entities/ScriptableObjects/SEnemyBaseRuntimeSet.cs rename to Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs index c0d4478..1598031 100644 --- a/Assets/Entities/ScriptableObjects/SEnemyBaseRuntimeSet.cs +++ b/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace AsteroidGame.Entities { [CreateAssetMenu(fileName = "newEnemyBaseRuntimeSet", menuName = "RuntimeSet/EnemyBase")] - public class SEnemyBaseRuntimeSet : SRuntimeSet + public class SoEnemyBaseRuntimeSet : SRuntimeSet { } } \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SEnemyBaseRuntimeSet.cs.meta b/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs.meta similarity index 100% rename from Assets/Entities/ScriptableObjects/SEnemyBaseRuntimeSet.cs.meta rename to Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs.meta diff --git a/Assets/Entities/ScriptableObjects/SEntityBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs similarity index 74% rename from Assets/Entities/ScriptableObjects/SEntityBaseRuntimeSet.cs rename to Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs index 371c740..2a8532c 100644 --- a/Assets/Entities/ScriptableObjects/SEntityBaseRuntimeSet.cs +++ b/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace AsteroidGame.Entities { [CreateAssetMenu(fileName = "newEntityBaseRuntimeSet", menuName = "RuntimeSet/EntityBase")] - public class SEntityBaseRuntimeSet : SRuntimeSet + public class SoEntityBaseRuntimeSet : SRuntimeSet { } } \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SEntityBaseRuntimeSet.cs.meta b/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs.meta similarity index 100% rename from Assets/Entities/ScriptableObjects/SEntityBaseRuntimeSet.cs.meta rename to Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs.meta diff --git a/Assets/Entities/ScriptableObjects/SPowerBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs similarity index 75% rename from Assets/Entities/ScriptableObjects/SPowerBaseRuntimeSet.cs rename to Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs index c87013f..f416b5f 100644 --- a/Assets/Entities/ScriptableObjects/SPowerBaseRuntimeSet.cs +++ b/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace AsteroidGame.Entities { [CreateAssetMenu(fileName = "newPowerBaseRuntimeSet", menuName = "RuntimeSet/PowerBase")] - public class SPowerBaseRuntimeSet : SRuntimeSet + public class SoPowerBaseRuntimeSet : SRuntimeSet { } } \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SPowerBaseRuntimeSet.cs.meta b/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs.meta similarity index 100% rename from Assets/Entities/ScriptableObjects/SPowerBaseRuntimeSet.cs.meta rename to Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs.meta diff --git a/Assets/Entities/ScriptableObjects/SPowerConfig.cs b/Assets/Entities/ScriptableObjects/SoPowerConfig.cs similarity index 64% rename from Assets/Entities/ScriptableObjects/SPowerConfig.cs rename to Assets/Entities/ScriptableObjects/SoPowerConfig.cs index 9c7c072..3d2295d 100644 --- a/Assets/Entities/ScriptableObjects/SPowerConfig.cs +++ b/Assets/Entities/ScriptableObjects/SoPowerConfig.cs @@ -1,12 +1,11 @@ -using AsteroidGame.Interfaces; using UnityEngine; namespace AsteroidGame.Entities { [CreateAssetMenu(fileName = "newPowerConfiguration", menuName = "Configuration/Power")] - public class SPowerConfig : ScriptableObject + public class SoPowerConfig : ScriptableObject { - public SPowerBaseRuntimeSet _activePowerStructures; + public SoPowerBaseRuntimeSet _activePowerStructures; public bool isGenerator; public bool isConsumer; public int maxPower; diff --git a/Assets/Entities/ScriptableObjects/SPowerConfig.cs.meta b/Assets/Entities/ScriptableObjects/SoPowerConfig.cs.meta similarity index 100% rename from Assets/Entities/ScriptableObjects/SPowerConfig.cs.meta rename to Assets/Entities/ScriptableObjects/SoPowerConfig.cs.meta diff --git a/Assets/Entities/ScriptableObjects/SStructureBaseList.cs b/Assets/Entities/ScriptableObjects/SoStructureBaseList.cs similarity index 81% rename from Assets/Entities/ScriptableObjects/SStructureBaseList.cs rename to Assets/Entities/ScriptableObjects/SoStructureBaseList.cs index 6eb1d0d..564cc35 100644 --- a/Assets/Entities/ScriptableObjects/SStructureBaseList.cs +++ b/Assets/Entities/ScriptableObjects/SoStructureBaseList.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace AsteroidGame.Entities { [CreateAssetMenu(fileName = "newStructureList", menuName = "Structures/StructureList")] - public class SStructureBaseList : ScriptableObject + public class SoStructureBaseList : ScriptableObject { public List _structureList; } diff --git a/Assets/Entities/ScriptableObjects/SStructureBaseList.cs.meta b/Assets/Entities/ScriptableObjects/SoStructureBaseList.cs.meta similarity index 100% rename from Assets/Entities/ScriptableObjects/SStructureBaseList.cs.meta rename to Assets/Entities/ScriptableObjects/SoStructureBaseList.cs.meta diff --git a/Assets/Entities/ScriptableObjects/SStructureBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs similarity index 73% rename from Assets/Entities/ScriptableObjects/SStructureBaseRuntimeSet.cs rename to Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs index 4f43567..06bbc75 100644 --- a/Assets/Entities/ScriptableObjects/SStructureBaseRuntimeSet.cs +++ b/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace AsteroidGame.Entities { [CreateAssetMenu(fileName = "newStructureBaseRuntimeSet", menuName = "RuntimeSet/StructureBase")] - public class SStructureBaseRuntimeSet : SRuntimeSet + public class SoStructureBaseRuntimeSet : SRuntimeSet { } } \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SStructureBaseRuntimeSet.cs.meta b/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs.meta similarity index 100% rename from Assets/Entities/ScriptableObjects/SStructureBaseRuntimeSet.cs.meta rename to Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs.meta diff --git a/Assets/Entities/ScriptableObjects/STargeterConfig.cs b/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs similarity index 71% rename from Assets/Entities/ScriptableObjects/STargeterConfig.cs rename to Assets/Entities/ScriptableObjects/SoTargeterConfig.cs index 461c31f..edc8e95 100644 --- a/Assets/Entities/ScriptableObjects/STargeterConfig.cs +++ b/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs @@ -1,14 +1,14 @@ -using AsteroidGame.Interfaces; using UnityEngine; namespace AsteroidGame.Entities { [CreateAssetMenu(fileName = "newTargeterConfiguration", menuName = "Configuration/Targeter")] - public class STargeterConfig : ScriptableObject + public class SoTargeterConfig : ScriptableObject { public float _range; public TargetStrategy _selectedTargetStrategy; - public SEntityBaseRuntimeSet _activeEntities; + public SoEntityBaseRuntimeSet _activeEntities; + public enum TargetStrategy { LowestRange, diff --git a/Assets/Entities/ScriptableObjects/STargeterConfig.cs.meta b/Assets/Entities/ScriptableObjects/SoTargeterConfig.cs.meta similarity index 100% rename from Assets/Entities/ScriptableObjects/STargeterConfig.cs.meta rename to Assets/Entities/ScriptableObjects/SoTargeterConfig.cs.meta diff --git a/Assets/Entities/ScriptableObjects/SWeaponConfig.cs b/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs similarity index 80% rename from Assets/Entities/ScriptableObjects/SWeaponConfig.cs rename to Assets/Entities/ScriptableObjects/SoWeaponConfig.cs index 29d4104..3cd4700 100644 --- a/Assets/Entities/ScriptableObjects/SWeaponConfig.cs +++ b/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs @@ -1,9 +1,9 @@ -using AsteroidGame.Interfaces; +using AsteroidGame.CoreSystems; using UnityEngine; namespace AsteroidGame.Entities { - public class SWeaponConfig : ScriptableObject, IWeapon + public class SoWeaponConfig : ScriptableObject, IWeapon { [SerializeField] private float _fireRate; [SerializeField] private float _damage; diff --git a/Assets/Entities/ScriptableObjects/SWeaponConfig.cs.meta b/Assets/Entities/ScriptableObjects/SoWeaponConfig.cs.meta similarity index 100% rename from Assets/Entities/ScriptableObjects/SWeaponConfig.cs.meta rename to Assets/Entities/ScriptableObjects/SoWeaponConfig.cs.meta diff --git a/Assets/Entities/Scripts/EntityBase.cs b/Assets/Entities/Scripts/EntityBase.cs index b4ed7ca..3afcb4d 100644 --- a/Assets/Entities/Scripts/EntityBase.cs +++ b/Assets/Entities/Scripts/EntityBase.cs @@ -18,7 +18,7 @@ namespace AsteroidGame.Entities [SerializeField] protected string _uiFriendlyName; [Space] - [SerializeField] private SEntityBaseRuntimeSet _entityBaseSet; + [SerializeField] private SoEntityBaseRuntimeSet _entityBaseSet; #region Props diff --git a/Assets/Entities/Scripts/PowerBase.cs b/Assets/Entities/Scripts/PowerBase.cs index 5291f94..fa579c5 100644 --- a/Assets/Entities/Scripts/PowerBase.cs +++ b/Assets/Entities/Scripts/PowerBase.cs @@ -12,7 +12,7 @@ namespace AsteroidGame.Entities [SerializeField] protected int _maxPower; [SerializeField] protected int _currentPower; - public void SetConfig(SPowerConfig config) + public void SetConfig(SoPowerConfig config) { _isGenerator = config.isGenerator; _isConsumer = config.isConsumer; diff --git a/Assets/Entities/Scripts/Targeter.cs b/Assets/Entities/Scripts/Targeter.cs index 2885c8d..ca0d3c5 100644 --- a/Assets/Entities/Scripts/Targeter.cs +++ b/Assets/Entities/Scripts/Targeter.cs @@ -5,14 +5,14 @@ namespace AsteroidGame.Entities public class Targeter : MonoBehaviour { [SerializeField] private float _range; - [SerializeField] private STargeterConfig.TargetStrategy _targetStrategy; - [SerializeField] private SEntityBaseRuntimeSet _activeEntities; [SerializeField] private EntityBase _targeterParent; [SerializeField] private EntityBase _targetEntity; + [SerializeField] private SoTargeterConfig.TargetStrategy _targetStrategy; + [SerializeField] private SoEntityBaseRuntimeSet _activeEntities; public void SetParent(EntityBase newParent) => _targeterParent = newParent; - public void SetConfig(STargeterConfig config) + public void SetConfig(SoTargeterConfig config) { _range = config._range; _targetStrategy = config._selectedTargetStrategy; @@ -39,7 +39,7 @@ namespace AsteroidGame.Entities { switch (_targetStrategy) { - case STargeterConfig.TargetStrategy.LowestRange: + case SoTargeterConfig.TargetStrategy.LowestRange: { bool isClosest = distanceToTarget < currentBestValue; if (isClosest) @@ -51,7 +51,7 @@ namespace AsteroidGame.Entities break; } - case STargeterConfig.TargetStrategy.LowestHealth: + case SoTargeterConfig.TargetStrategy.LowestHealth: { float enemyHealth = targetEntity.GetHealth(); diff --git a/Assets/Entities/Structures/Scripts/Disabler.cs b/Assets/Entities/Structures/Scripts/Disabler.cs index 34c7410..09e52c8 100644 --- a/Assets/Entities/Structures/Scripts/Disabler.cs +++ b/Assets/Entities/Structures/Scripts/Disabler.cs @@ -6,7 +6,7 @@ namespace AsteroidGame.Entities public class Disabler : MonoBehaviour { [FormerlySerializedAs("Set")] - [SerializeField] private SStructureBaseRuntimeSet _set; + [SerializeField] private SoStructureBaseRuntimeSet _set; [ContextMenu("Disable All")] public void DisableAll() diff --git a/Assets/Entities/Structures/Scripts/StructureBase.cs b/Assets/Entities/Structures/Scripts/StructureBase.cs index fcc3ee8..e1c69d5 100644 --- a/Assets/Entities/Structures/Scripts/StructureBase.cs +++ b/Assets/Entities/Structures/Scripts/StructureBase.cs @@ -12,11 +12,11 @@ namespace AsteroidGame.Entities [SerializeField] protected float _buildTimer; [Header("Configuration")] - [SerializeField] private SEntityBaseRuntimeSet _structureBaseSet; - [SerializeField] private SPowerBaseRuntimeSet _powerBaseSet; + [SerializeField] private SoEntityBaseRuntimeSet _structureBaseSet; + [SerializeField] private SoPowerBaseRuntimeSet _powerBaseSet; [Header("Power")] - [SerializeField] private SPowerConfig _powerConfig; + [SerializeField] private SoPowerConfig _powerConfig; [SerializeField] private PowerBase _power; #region Publics diff --git a/Assets/Entities/Structures/Turret/Turret.cs b/Assets/Entities/Structures/Turret/Turret.cs index bd57a4c..574392c 100644 --- a/Assets/Entities/Structures/Turret/Turret.cs +++ b/Assets/Entities/Structures/Turret/Turret.cs @@ -20,7 +20,7 @@ namespace AsteroidGame.Entities [SerializeField] private Transform _barrel; [Header("Targeter")] - [SerializeField] private STargeterConfig _targeterConfig; + [SerializeField] private SoTargeterConfig _targeterConfig; [SerializeField] private Targeter _targeter; [SerializeField] private EntityBase _target; diff --git a/Assets/Handlers/BuildingHandler.cs b/Assets/Handlers/BuildingHandler.cs index 48b8a57..e93edca 100644 --- a/Assets/Handlers/BuildingHandler.cs +++ b/Assets/Handlers/BuildingHandler.cs @@ -16,9 +16,10 @@ namespace AsteroidGame.Handlers [SerializeField] private bool _isBuilding; [SerializeField] private int _buildingSelector; + [FormerlySerializedAs("_availableSStructures")] [FormerlySerializedAs("_availableStructures")] [Header("Structures")] - [SerializeField] private SStructureBaseList _availableSStructures; + [SerializeField] private SoStructureBaseList _availableSoStructures; #region Private @@ -103,7 +104,7 @@ namespace AsteroidGame.Handlers private void SpawnGhostStructure() { - _ghostStructure = Instantiate(_availableSStructures._structureList[_buildingSelector], GetPlanePoint(), + _ghostStructure = Instantiate(_availableSoStructures._structureList[_buildingSelector], GetPlanePoint(), Quaternion.identity, transform); _ghostStructure.name = "GhostStructure"; @@ -128,7 +129,7 @@ namespace AsteroidGame.Handlers private void SpawnStructure() { - _tempStructure = Instantiate(_availableSStructures._structureList[_buildingSelector], GetPlanePoint(), + _tempStructure = Instantiate(_availableSoStructures._structureList[_buildingSelector], GetPlanePoint(), Quaternion.identity, transform); } diff --git a/Assets/Handlers/EnemyHandler.cs b/Assets/Handlers/EnemyHandler.cs index 302e223..5130fdf 100644 --- a/Assets/Handlers/EnemyHandler.cs +++ b/Assets/Handlers/EnemyHandler.cs @@ -10,9 +10,9 @@ namespace AsteroidGame.Handlers [SerializeField] private int _objectPoolSize = 15; [Header("Configuration")] - [SerializeField] private SEnemyBaseList _availableEnemies; + [SerializeField] private SoEnemyBaseList _availableEnemies; [Header("Lists")] - [SerializeField] private SEntityBaseRuntimeSet _activeEnemies; + [SerializeField] private SoEntityBaseRuntimeSet _activeEnemies; } } \ No newline at end of file diff --git a/Assets/Handlers/PowerHandler.cs b/Assets/Handlers/PowerHandler.cs index 5b3ecf1..1e7bbcb 100644 --- a/Assets/Handlers/PowerHandler.cs +++ b/Assets/Handlers/PowerHandler.cs @@ -13,7 +13,7 @@ namespace AsteroidGame.Handlers [SerializeField] private float _powerFactor; [Header("Connections")] - [SerializeField] private SPowerBaseRuntimeSet _activePowerStructures; + [SerializeField] private SoPowerBaseRuntimeSet _activePowerStructures; private void Update() diff --git a/Assets/UI/BuildMenuUiController.cs b/Assets/UI/BuildMenuUiController.cs index 1e8b3a1..6c1a1cc 100644 --- a/Assets/UI/BuildMenuUiController.cs +++ b/Assets/UI/BuildMenuUiController.cs @@ -9,9 +9,10 @@ namespace AsteroidGame.UI { public class BuildMenuUiController : MonoBehaviour { + [FormerlySerializedAs("_availableSStructuresObject")] [FormerlySerializedAs("_availableStructuresObject")] [Header("Structures")] - [SerializeField] private SStructureBaseList _availableSStructuresObject; + [SerializeField] private SoStructureBaseList _availableSoStructuresObject; private VisualElement _mRoot; private VisualElement _mSlotContainer; @@ -20,7 +21,7 @@ namespace AsteroidGame.UI private void OnEnable() { - _buildings = _availableSStructuresObject._structureList; + _buildings = _availableSoStructuresObject._structureList; _buildingHandler = FindObjectOfType(); //Store the root from the UI Document component