From b043440827590aaae78f8e9a2499f138c07583f6 Mon Sep 17 00:00:00 2001 From: Stedd Date: Sun, 8 Oct 2023 16:50:59 +0200 Subject: [PATCH] Reorganizing and renaming --- Assets/Entities/Enemies/Drone.meta | 8 --- Assets/Entities/Enemies/Scripts.meta | 8 --- .../Entities/Enemies/Scripts/EnemyHealth.cs | 63 ------------------- .../Enemies/Scripts/EnemyHealth.cs.meta | 11 ---- .../Entities/Enemies/Scripts/EnemyMovement.cs | 61 ------------------ .../Enemies/Scripts/EnemyMovement.cs.meta | 11 ---- .../SoEnemyBaseRuntimeSet.cs | 2 +- .../SoEntityBaseRuntimeSet.cs | 2 +- .../SoPowerBaseRuntimeSet.cs | 2 +- .../SoStructureBaseRuntimeSet.cs | 2 +- .../{Enemies => }/Scripts/EnemyBase.cs | 0 .../{Enemies => }/Scripts/EnemyBase.cs.meta | 0 12 files changed, 4 insertions(+), 166 deletions(-) delete mode 100644 Assets/Entities/Enemies/Drone.meta delete mode 100644 Assets/Entities/Enemies/Scripts.meta delete mode 100644 Assets/Entities/Enemies/Scripts/EnemyHealth.cs delete mode 100644 Assets/Entities/Enemies/Scripts/EnemyHealth.cs.meta delete mode 100644 Assets/Entities/Enemies/Scripts/EnemyMovement.cs delete mode 100644 Assets/Entities/Enemies/Scripts/EnemyMovement.cs.meta rename Assets/Entities/{Enemies => }/Scripts/EnemyBase.cs (100%) rename Assets/Entities/{Enemies => }/Scripts/EnemyBase.cs.meta (100%) diff --git a/Assets/Entities/Enemies/Drone.meta b/Assets/Entities/Enemies/Drone.meta deleted file mode 100644 index 17a280a..0000000 --- a/Assets/Entities/Enemies/Drone.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 22c766fdadc55c449b5311282a681a64 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/Enemies/Scripts.meta b/Assets/Entities/Enemies/Scripts.meta deleted file mode 100644 index e6385d4..0000000 --- a/Assets/Entities/Enemies/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7e3f0ef7b0919344e82d2052fbe05143 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/Enemies/Scripts/EnemyHealth.cs b/Assets/Entities/Enemies/Scripts/EnemyHealth.cs deleted file mode 100644 index 324e0e2..0000000 --- a/Assets/Entities/Enemies/Scripts/EnemyHealth.cs +++ /dev/null @@ -1,63 +0,0 @@ -using UnityEngine; - -namespace AsteroidGame.Entities.Enemies.Scripts -{ - public class EnemyHealth : MonoBehaviour - { - [Header("Assigned on start")] - // [SerializeField] EnemyHandler enemyHandler; - // [SerializeField] ScoreHandler scoreHandler; - - [Header("Parameters")] - [SerializeField] int _maxHealth = 5; - [SerializeField] int _difficultyRamp = 1; - - [SerializeField] int _wealthValue = 5; - - [Header("Stats")] - [SerializeField] int _currentHealth; - - #region Public - public int Health { get=> _currentHealth;} - #endregion - - void OnEnable() - { - // enemyHandler = FindObjectOfType(); - // scoreHandler = FindObjectOfType(); - _currentHealth = _maxHealth; - } - - private void OnParticleCollision(GameObject damager) - { - ProcessHitFrom(damager); - } - - private void ProcessHitFrom(GameObject damager) - { - // SpawnFX(damageVFX); - - // Debug.Log(damager.GetComponentInParent().GetDamage()); - _currentHealth -= damager.GetComponentInParent().Damage; - - //UpdateHealthText(health); - - if(_currentHealth <= 0) - { - ProcessDeathFrom(damager); - } - } - - private void ProcessDeathFrom(GameObject damager) - { - //damager.GetComponentInParent().UpdateScore(1f); - - // SpawnFX(deathFX); - // scoreHandler.ModifyWealth(wealthValue); - // enemyHandler.RemoveEnemy(gameObject); - // Destroy(gameObject); - gameObject.SetActive(false); - _maxHealth += _difficultyRamp; - } - } -} diff --git a/Assets/Entities/Enemies/Scripts/EnemyHealth.cs.meta b/Assets/Entities/Enemies/Scripts/EnemyHealth.cs.meta deleted file mode 100644 index a893b1c..0000000 --- a/Assets/Entities/Enemies/Scripts/EnemyHealth.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ac0f42db9d6c21540a5ef3107e36946a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/Enemies/Scripts/EnemyMovement.cs b/Assets/Entities/Enemies/Scripts/EnemyMovement.cs deleted file mode 100644 index cf8b3fd..0000000 --- a/Assets/Entities/Enemies/Scripts/EnemyMovement.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System.Collections; -using UnityEngine; - -namespace AsteroidGame.Entities.Enemies -{ - public class EnemyMovement : MonoBehaviour - { - [Header("Parameters")] - [SerializeField] [Range(0f, 5f)] float _speed = 1f; - [SerializeField] int _damage = 1; - - - // [SerializeField] EnemyHandler enemyHandler; - // [SerializeField] ScoreHandler scoreHandler; - - - Vector3 _startPosition; - Vector3 _endPosition; - float _travelPercent = 0f; - - private IEnumerator _followPath; - - void Awake() - { - // enemyHandler = FindObjectOfType(); - // scoreHandler = FindObjectOfType(); - - } - - void OnEnable() - { - // enemyHandler.AddEnemyToAllEnemies(gameObject); - } - - - void RecalculatePath() - { - if (_followPath != null) - { - //Debug.Log("Stopping Coroutine"); - StopCoroutine(_followPath); - - } - } - - void HandleReachedEndOfPath() - { - // scoreHandler.ModifyHealth(-damage); - // scoreHandler.ModifyWealth(-100); - // enemyHandler.RemoveEnemy(gameObject); - //Destroy(gameObject); - gameObject.SetActive(false); - } - - private Vector3 GetVector3(Vector2Int coord) - { - return new Vector3((float)coord.x, 0f, (float)coord.y) * 10f; - } - - } -} diff --git a/Assets/Entities/Enemies/Scripts/EnemyMovement.cs.meta b/Assets/Entities/Enemies/Scripts/EnemyMovement.cs.meta deleted file mode 100644 index d52ce13..0000000 --- a/Assets/Entities/Enemies/Scripts/EnemyMovement.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8e691044df4c75f4cb07af0551efa2c6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs index 5c67086..1d778cb 100644 --- a/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs +++ b/Assets/Entities/ScriptableObjects/SoEnemyBaseRuntimeSet.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace AsteroidGame.ScriptableObjects { [CreateAssetMenu(fileName = "newEnemyBaseRuntimeSet", menuName = "RuntimeSet/EnemyBase")] - public class SoEnemyBaseRuntimeSet : SRuntimeSet + public class SoEnemyBaseRuntimeSet : SoRuntimeSet { } } \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs index 7c3ace8..8b76909 100644 --- a/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs +++ b/Assets/Entities/ScriptableObjects/SoEntityBaseRuntimeSet.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace AsteroidGame.ScriptableObjects { [CreateAssetMenu(fileName = "newEntityBaseRuntimeSet", menuName = "RuntimeSet/EntityBase")] - public class SoEntityBaseRuntimeSet : SRuntimeSet + public class SoEntityBaseRuntimeSet : SoRuntimeSet { } } \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs index ebc04bd..dab8630 100644 --- a/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs +++ b/Assets/Entities/ScriptableObjects/SoPowerBaseRuntimeSet.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace AsteroidGame.ScriptableObjects { [CreateAssetMenu(fileName = "newPowerBaseRuntimeSet", menuName = "RuntimeSet/PowerBase")] - public class SoPowerBaseRuntimeSet : SRuntimeSet + public class SoPowerBaseRuntimeSet : SoRuntimeSet { } } \ No newline at end of file diff --git a/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs b/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs index 9680470..0d01258 100644 --- a/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs +++ b/Assets/Entities/ScriptableObjects/SoStructureBaseRuntimeSet.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace AsteroidGame.ScriptableObjects { [CreateAssetMenu(fileName = "newStructureBaseRuntimeSet", menuName = "RuntimeSet/StructureBase")] - public class SoStructureBaseRuntimeSet : SRuntimeSet + public class SoStructureBaseRuntimeSet : SoRuntimeSet { } } \ No newline at end of file diff --git a/Assets/Entities/Enemies/Scripts/EnemyBase.cs b/Assets/Entities/Scripts/EnemyBase.cs similarity index 100% rename from Assets/Entities/Enemies/Scripts/EnemyBase.cs rename to Assets/Entities/Scripts/EnemyBase.cs diff --git a/Assets/Entities/Enemies/Scripts/EnemyBase.cs.meta b/Assets/Entities/Scripts/EnemyBase.cs.meta similarity index 100% rename from Assets/Entities/Enemies/Scripts/EnemyBase.cs.meta rename to Assets/Entities/Scripts/EnemyBase.cs.meta