party (#15)

Resolves #6.
Updates #3.

Co-authored-by: Branden J Brown <zephyrtronium@gmail.com>
Reviewed-on: #15
Reviewed-by: madxmike <madxmike@noreply.localhost>

Assets/Prefabs/Hero.prefab

@@ -50,7 +50,7 @@ MonoBehaviour:
   level: 0
   xp: 0
   attrs: {fileID: 0}
-  _party: {fileID: 11400000, guid: 2fdb3d0bb73994d4ba32eb41950b8f15, type: 2}
+  _party: {fileID: 11400000, guid: c9a46588e6ec04d4d91bb80fdffd7869, type: 2}
 --- !u!1 &4632618406133265053
 GameObject:
   m_ObjectHideFlags: 0

Assets/Runtime Sets/PlayerParty.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: 0ec1a0df7a5949a2959596c722680f76, type: 3}
-  m_Name: PlayerParty
-  m_EditorClassIdentifier: 
-  items: []

Assets/Runtime Sets/PlayerParty.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2fdb3d0bb73994d4ba32eb41950b8f15
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/ZephyrDev.unity

@@ -1,311 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!29 &1
-OcclusionCullingSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_OcclusionBakeSettings:
-    smallestOccluder: 5
-    smallestHole: 0.25
-    backfaceThreshold: 100
-  m_SceneGUID: 00000000000000000000000000000000
-  m_OcclusionCullingData: {fileID: 0}
---- !u!104 &2
-RenderSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 9
-  m_Fog: 0
-  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  m_FogMode: 3
-  m_FogDensity: 0.01
-  m_LinearFogStart: 0
-  m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
-  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
-  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
-  m_AmbientIntensity: 1
-  m_AmbientMode: 0
-  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
-  m_HaloStrength: 0.5
-  m_FlareStrength: 1
-  m_FlareFadeSpeed: 3
-  m_HaloTexture: {fileID: 0}
-  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
-  m_DefaultReflectionMode: 0
-  m_DefaultReflectionResolution: 128
-  m_ReflectionBounces: 1
-  m_ReflectionIntensity: 1
-  m_CustomReflection: {fileID: 0}
-  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
-  m_UseRadianceAmbientProbe: 0
---- !u!157 &3
-LightmapSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 12
-  m_GIWorkflowMode: 1
-  m_GISettings:
-    serializedVersion: 2
-    m_BounceScale: 1
-    m_IndirectOutputScale: 1
-    m_AlbedoBoost: 1
-    m_EnvironmentLightingMode: 0
-    m_EnableBakedLightmaps: 1
-    m_EnableRealtimeLightmaps: 0
-  m_LightmapEditorSettings:
-    serializedVersion: 12
-    m_Resolution: 2
-    m_BakeResolution: 40
-    m_AtlasSize: 1024
-    m_AO: 0
-    m_AOMaxDistance: 1
-    m_CompAOExponent: 1
-    m_CompAOExponentDirect: 0
-    m_ExtractAmbientOcclusion: 0
-    m_Padding: 2
-    m_LightmapParameters: {fileID: 0}
-    m_LightmapsBakeMode: 1
-    m_TextureCompression: 1
-    m_FinalGather: 0
-    m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 256
-    m_ReflectionCompression: 2
-    m_MixedBakeMode: 2
-    m_BakeBackend: 1
-    m_PVRSampling: 1
-    m_PVRDirectSampleCount: 32
-    m_PVRSampleCount: 512
-    m_PVRBounces: 2
-    m_PVREnvironmentSampleCount: 256
-    m_PVREnvironmentReferencePointCount: 2048
-    m_PVRFilteringMode: 1
-    m_PVRDenoiserTypeDirect: 1
-    m_PVRDenoiserTypeIndirect: 1
-    m_PVRDenoiserTypeAO: 1
-    m_PVRFilterTypeDirect: 0
-    m_PVRFilterTypeIndirect: 0
-    m_PVRFilterTypeAO: 0
-    m_PVREnvironmentMIS: 1
-    m_PVRCulling: 1
-    m_PVRFilteringGaussRadiusDirect: 1
-    m_PVRFilteringGaussRadiusIndirect: 5
-    m_PVRFilteringGaussRadiusAO: 2
-    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
-    m_PVRFilteringAtrousPositionSigmaIndirect: 2
-    m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ExportTrainingData: 0
-    m_TrainingDataDestination: TrainingData
-    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 0}
-  m_LightingSettings: {fileID: 0}
---- !u!196 &4
-NavMeshSettings:
-  serializedVersion: 2
-  m_ObjectHideFlags: 0
-  m_BuildSettings:
-    serializedVersion: 3
-    agentTypeID: 0
-    agentRadius: 0.5
-    agentHeight: 2
-    agentSlope: 45
-    agentClimb: 0.4
-    ledgeDropHeight: 0
-    maxJumpAcrossDistance: 0
-    minRegionArea: 2
-    manualCellSize: 0
-    cellSize: 0.16666667
-    manualTileSize: 0
-    tileSize: 256
-    buildHeightMesh: 0
-    maxJobWorkers: 0
-    preserveTilesOutsideBounds: 0
-    debug:
-      m_Flags: 0
-  m_NavMeshData: {fileID: 0}
---- !u!1 &908666545
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 908666548}
-  - component: {fileID: 908666547}
-  - component: {fileID: 908666546}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!81 &908666546
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 908666545}
-  m_Enabled: 1
---- !u!20 &908666547
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 908666545}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_Iso: 200
-  m_ShutterSpeed: 0.005
-  m_Aperture: 16
-  m_FocusDistance: 10
-  m_FocalLength: 50
-  m_BladeCount: 5
-  m_Curvature: {x: 2, y: 11}
-  m_BarrelClipping: 0.25
-  m_Anamorphism: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!4 &908666548
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 908666545}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1497259212
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1497259214}
-  - component: {fileID: 1497259213}
-  m_Layer: 0
-  m_Name: Directional Light
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!108 &1497259213
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1497259212}
-  m_Enabled: 1
-  serializedVersion: 10
-  m_Type: 1
-  m_Shape: 0
-  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
-  m_Intensity: 1
-  m_Range: 10
-  m_SpotAngle: 30
-  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 2
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-    m_CullingMatrixOverride:
-      e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    m_UseCullingMatrixOverride: 0
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingLayerMask: 1
-  m_Lightmapping: 4
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_UseBoundingSphereOverride: 0
-  m_UseViewFrustumForShadowCasterCull: 1
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
---- !u!4 &1497259214
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1497259212}
-  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
-  m_LocalPosition: {x: 0, y: 3, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}

Assets/Scenes/ZephyrDev.unity.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1d308f2ef17118e4fa742eb845bbad04
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/test.unity

@@ -527,9 +527,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bb718e52728142e4a8db081fd6a36a70, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  startNewSpawnWaveEvent: {fileID: 11400000, guid: 3f9039af54fd5d240b144e1ab3bbeb72, type: 2}
-  endSpawnWaveEventEvent: {fileID: 11400000, guid: b8a8049e92364834ebac76909a03324b, type: 2}
-  activeEnemies: {fileID: 11400000, guid: 7c32c32e039cdda409e8a56d2e320f2d, type: 2}
+  startNewSpawnWaveEventChannel: {fileID: 11400000, guid: 3f9039af54fd5d240b144e1ab3bbeb72, type: 2}
+  endSpawnWaveEventChannel: {fileID: 11400000, guid: b8a8049e92364834ebac76909a03324b, type: 2}
+  enemyRuntimeSet: {fileID: 11400000, guid: 7c32c32e039cdda409e8a56d2e320f2d, type: 2}
   spawnCenter: {fileID: 19609788}
   minimumSpawnRadius: 10
   timeBetweenClearedWaves: 0

Assets/Scripts/EnemyRuntimeSetSO.cs

@@ -0,0 +1,11 @@
+using UnityEngine;
+
+namespace DefaultNamespace
+{
+    [CreateAssetMenu(menuName = "Enemy Runtime Set", fileName =
+        "EnemyRuntimeSet")]
+    public class EnemyRuntimeSetSO : RuntimeSetSO<Enemy>
+    {
+        
+    }
+}

Assets/Scripts/Events/SpawnWaveSOEventChannelSO.cs

@@ -4,8 +4,8 @@ using Wave;
 
 namespace Events
 {
-    [CreateAssetMenu(menuName = "Events/Spawn Wave Event")]
-    public class SpawnWaveEventSO : ScriptableObject
+    [CreateAssetMenu(menuName = "Events/Spawn Wave SO Event Channel")]
+    public class SpawnWaveSOEventChannelSO : ScriptableObject
     {
         public event UnityAction<SpawnWaveSO> OnEventRaised;
 

Assets/Scripts/HeroPartySO.cs

@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using UnityEngine;
+
+[CreateAssetMenu(fileName = "HeroParty", menuName = "Hero Party")]
+public class HeroPartySO : ScriptableObject
+{
+    [SerializeField]
+    private List<HeroUnit> unitList = new List<HeroUnit>();
+    public ReadOnlyCollection<HeroUnit> UnitList => unitList.AsReadOnly();
+
+    public void Add(HeroUnit unit) { unitList.Add(unit); }
+    public void Remove(HeroUnit unit) { unitList.Remove(unit); }
+    public int Count => unitList.Count;
+}

Assets/Scripts/HeroPartySO.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f0603cf6e7f1d884e89c3eb6a478a96c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/HeroUnit.cs

@@ -1,8 +1,9 @@
-using System.Runtime.CompilerServices;
-using RuntimeSet;
+using System.Collections;
+using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Assertions;
 
+using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("TestsPlaymode")]
 
 /// <summary>
@@ -16,8 +17,8 @@ public class HeroUnit : MonoBehaviour
     [SerializeField] private long level;
     [SerializeField] private long xp;
     [SerializeField] private HeroAttributesSO attrs;
-    [SerializeField] private HeroUnitRuntimeSetSO _party;
-    internal HeroUnitRuntimeSetSO party => _party;
+    [SerializeField] private HeroPartySO _party;
+    internal HeroPartySO party => _party;
 
     private void OnEnable()
     {

Assets/Scripts/RuntimeSet.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: e9f6f30f3d8e4445a4a25d03245b2645
-timeCreated: 1691632737

Assets/Scripts/RuntimeSet/EnemyRuntimeSetSO.cs

@@ -1,10 +0,0 @@
-using DefaultNamespace;
-using UnityEngine;
-
-namespace RuntimeSet
-{
-    [CreateAssetMenu(fileName = "EnemyRuntimeSet",menuName = "Runtime Set/Enemy")]
-    public class EnemyRuntimeSetSO : RuntimeSetSO<Enemy>
-    {
-    }
-}

Assets/Scripts/RuntimeSet/HeroUnitRuntimeSet.cs

@@ -1,9 +0,0 @@
-using UnityEngine;
-
-namespace RuntimeSet
-{
-    [CreateAssetMenu(fileName = "EnemyRuntimeSet",menuName = "Runtime Set/Hero Unit")]
-    public class HeroUnitRuntimeSetSO : RuntimeSetSO<HeroUnit>
-    {
-    }
-}

Assets/Scripts/RuntimeSet/HeroUnitRuntimeSet.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 0ec1a0df7a5949a2959596c722680f76
-timeCreated: 1691632762

Assets/Scripts/RuntimeSet/RuntimeSetSO.cs

@@ -1,41 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace RuntimeSet
-{
-    public abstract class RuntimeSetSO<T> : ScriptableObject, IEnumerable<T>
-    {
-        [HideInInspector] [SerializeField] private List<T> items = new();
-    
-        protected IReadOnlyCollection<T> Items => items;
-        public bool IsEmpty => items.Count == 0;
-        public int Count => items.Count;
-    
-        public void Add(T item)
-        {
-            if (!items.Contains(item))
-            {
-                items.Add(item);
-            }
-        }
-    
-        public void Remove(T item)
-        {
-            if (items.Contains(item))
-            {
-                items.Remove(item);
-            }
-        }
-
-        public IEnumerator<T> GetEnumerator()
-        {
-            return items.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}

Assets/Scripts/RuntimeSetSO.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+public abstract class RuntimeSetSO<T> : ScriptableObject
+{
+    [HideInInspector] [SerializeField] private List<T> items = new();
+    
+    public IReadOnlyCollection<T> Items => items;
+    public bool IsEmpty => items.Count == 0;
+    
+    public void Add(T thing)
+    {
+        if (!items.Contains(thing))
+        {
+            items.Add(thing);
+        }
+    }
+    
+    public void Remove(T thing)
+    {
+        if (items.Contains(thing))
+        {
+            items.Remove(thing);
+        }
+    }
+}

Assets/Scripts/Wave/SpawnWaveSO.cs

@@ -4,7 +4,7 @@ using UnityEngine.Serialization;
 
 namespace Wave
 {
-    [CreateAssetMenu(fileName = "SpawnWave", menuName = "Spawn/Wave", order = 0)]
+    [CreateAssetMenu(fileName = "SpawnWave", menuName = "Spawn Wave", order = 0)]
     public class SpawnWaveSO : ScriptableObject
     {
         [SerializeField] private List<SpawnPackSO> packs;

Assets/Scripts/Wave/WaveSpawner.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Linq;
 using DefaultNamespace;
 using Events;
-using RuntimeSet;
 using UnityEngine;
 using UnityEngine.Assertions;
 using Random = UnityEngine.Random;
@@ -13,8 +12,8 @@ namespace Wave
 {
     public class WaveSpawner : MonoBehaviour
     {
-        [SerializeField] private SpawnWaveEventSO startNewSpawnWaveEventChannel;
-        [SerializeField] private SpawnWaveEventSO endSpawnWaveEventChannel;
+        [SerializeField] private SpawnWaveSOEventChannelSO startNewSpawnWaveEventChannel;
+        [SerializeField] private SpawnWaveSOEventChannelSO endSpawnWaveEventChannel;
 
         [SerializeField] private EnemyRuntimeSetSO enemyRuntimeSet;
         [SerializeField] private Transform spawnCenter;

Assets/TestsPlaymode/HeroPartyTest.cs

@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Collections.Generic;
 using NUnit.Framework;
 using UnityEditor;
 using UnityEngine;
@@ -17,6 +18,6 @@ public class HeroPartyTest
         Assert.AreEqual(1, hero.party.Count);
         Object.Destroy(instance);
         yield return null;
-        Assert.IsEmpty(hero.party);
+        Assert.IsEmpty(hero.party.UnitList);
     }
 }