From c82e4960a869641c6937967614cb667e1f232380 Mon Sep 17 00:00:00 2001
From: Stedd <toanpa+git@pm.me>
Date: Sat, 28 Oct 2023 16:33:02 +0200
Subject: [PATCH] Modified existing RuntimeSets to be compatible with
 SOArchitecture

---
 .../ScriptableObjects/RuntimeSets.meta        |  8 --------
 .../RuntimeSets/SoRuntimeSet.cs               | 20 -------------------
 .../RuntimeSets/SoRuntimeSet.cs.meta          | 11 ----------
 .../SoDamageableRuntimeSet.cs                 |  5 +++--
 .../SoDamageableRuntimeSet.cs.meta            |  0
 .../SoTargetableRuntimeSet.cs                 |  3 ++-
 .../SoTargetableRuntimeSet.cs.meta            |  0
 Scripts/Damageable.cs                         |  4 ++--
 Scripts/Targetable.cs                         |  4 ++--
 9 files changed, 9 insertions(+), 46 deletions(-)
 delete mode 100644 Architecture/ScriptableObjects/RuntimeSets.meta
 delete mode 100644 Architecture/ScriptableObjects/RuntimeSets/SoRuntimeSet.cs
 delete mode 100644 Architecture/ScriptableObjects/RuntimeSets/SoRuntimeSet.cs.meta
 rename {Architecture/ScriptableObjects/RuntimeSets => Interfaces}/SoDamageableRuntimeSet.cs (60%)
 rename {Architecture/ScriptableObjects/RuntimeSets => Interfaces}/SoDamageableRuntimeSet.cs.meta (100%)
 rename {Architecture/ScriptableObjects/RuntimeSets => Interfaces}/SoTargetableRuntimeSet.cs (61%)
 rename {Architecture/ScriptableObjects/RuntimeSets => Interfaces}/SoTargetableRuntimeSet.cs.meta (100%)

diff --git a/Architecture/ScriptableObjects/RuntimeSets.meta b/Architecture/ScriptableObjects/RuntimeSets.meta
deleted file mode 100644
index 8af21cc..0000000
--- a/Architecture/ScriptableObjects/RuntimeSets.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5d4aeffddee253346bece1700851153d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Architecture/ScriptableObjects/RuntimeSets/SoRuntimeSet.cs b/Architecture/ScriptableObjects/RuntimeSets/SoRuntimeSet.cs
deleted file mode 100644
index cf4a2b8..0000000
--- a/Architecture/ScriptableObjects/RuntimeSets/SoRuntimeSet.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace GameDev.CoreSystems
-{
-    public abstract class SoRuntimeSet<T> : ScriptableObject
-    {
-        public List<T> _list;
-
-        public void Add(T component)
-        {
-            _list.Add(component);
-        }
-
-        public void Remove(T component)
-        {
-            _list.Remove(component);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Architecture/ScriptableObjects/RuntimeSets/SoRuntimeSet.cs.meta b/Architecture/ScriptableObjects/RuntimeSets/SoRuntimeSet.cs.meta
deleted file mode 100644
index 483e99a..0000000
--- a/Architecture/ScriptableObjects/RuntimeSets/SoRuntimeSet.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 1e81b384c7f010b4fa3c1b8f293a4c42
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Architecture/ScriptableObjects/RuntimeSets/SoDamageableRuntimeSet.cs b/Interfaces/SoDamageableRuntimeSet.cs
similarity index 60%
rename from Architecture/ScriptableObjects/RuntimeSets/SoDamageableRuntimeSet.cs
rename to Interfaces/SoDamageableRuntimeSet.cs
index f5b21b0..f971e43 100644
--- a/Architecture/ScriptableObjects/RuntimeSets/SoDamageableRuntimeSet.cs
+++ b/Interfaces/SoDamageableRuntimeSet.cs
@@ -1,10 +1,11 @@
+
+using ScriptableObjectArchitecture;
 using UnityEngine;
 
 namespace GameDev.CoreSystems
 {
     [CreateAssetMenu(fileName = "newDamageableRuntimeSet", menuName = "RuntimeSet/Damageable")]
-    public class SoDamageableRuntimeSet : SoRuntimeSet<Damageable>
+    public class SoDamageableRuntimeSet : Collection<Damageable>
     {
-        //asdf
     }
 }
\ No newline at end of file
diff --git a/Architecture/ScriptableObjects/RuntimeSets/SoDamageableRuntimeSet.cs.meta b/Interfaces/SoDamageableRuntimeSet.cs.meta
similarity index 100%
rename from Architecture/ScriptableObjects/RuntimeSets/SoDamageableRuntimeSet.cs.meta
rename to Interfaces/SoDamageableRuntimeSet.cs.meta
diff --git a/Architecture/ScriptableObjects/RuntimeSets/SoTargetableRuntimeSet.cs b/Interfaces/SoTargetableRuntimeSet.cs
similarity index 61%
rename from Architecture/ScriptableObjects/RuntimeSets/SoTargetableRuntimeSet.cs
rename to Interfaces/SoTargetableRuntimeSet.cs
index 47598cd..9f8c164 100644
--- a/Architecture/ScriptableObjects/RuntimeSets/SoTargetableRuntimeSet.cs
+++ b/Interfaces/SoTargetableRuntimeSet.cs
@@ -1,9 +1,10 @@
+using ScriptableObjectArchitecture;
 using UnityEngine;
 
 namespace GameDev.CoreSystems
 {
     [CreateAssetMenu(fileName = "newTargetableRuntimeSet", menuName = "RuntimeSet/Targetable")]
-    public class SoTargetableRuntimeSet : SoRuntimeSet<Targetable>
+    public class SoTargetableRuntimeSet : Collection<Targetable>
     {
     }
 }
\ No newline at end of file
diff --git a/Architecture/ScriptableObjects/RuntimeSets/SoTargetableRuntimeSet.cs.meta b/Interfaces/SoTargetableRuntimeSet.cs.meta
similarity index 100%
rename from Architecture/ScriptableObjects/RuntimeSets/SoTargetableRuntimeSet.cs.meta
rename to Interfaces/SoTargetableRuntimeSet.cs.meta
diff --git a/Scripts/Damageable.cs b/Scripts/Damageable.cs
index 1bdceaf..2f011f8 100644
--- a/Scripts/Damageable.cs
+++ b/Scripts/Damageable.cs
@@ -16,12 +16,12 @@ namespace GameDev.CoreSystems
 
         private void OnEnable()
         {
-            _activeDamageableRuntimeSet._list.Add(this);
+            _activeDamageableRuntimeSet.Add(this);
         }
 
         private void OnDisable()
         {
-            _activeDamageableRuntimeSet._list.Remove(this);
+            _activeDamageableRuntimeSet.Remove(this);
         }
 
         #region Methods
diff --git a/Scripts/Targetable.cs b/Scripts/Targetable.cs
index de72aec..09d8e9f 100644
--- a/Scripts/Targetable.cs
+++ b/Scripts/Targetable.cs
@@ -19,12 +19,12 @@ namespace GameDev.CoreSystems
 
         private void OnEnable()
         {
-            _activeTargetableRuntimeSet._list.Add(this);
+            _activeTargetableRuntimeSet.Add(this);
         }
 
         private void OnDisable()
         {
-            _activeTargetableRuntimeSet._list.Remove(this);
+            _activeTargetableRuntimeSet.Remove(this);
         }
 
         public Vector3 GetCenterPosition() => _centerPosition.transform.position;