formatting, PR feedback

Author: fernando-cortez

Assets/Prefabs/Game/EnemySpawner.prefab

@@ -484,7 +484,7 @@ MonoBehaviour:
   ShowTopMostFoldoutHeaderGroup: 1
   m_BreakableElements: []
   m_DormantCooldown: 180
-  m_Breakable: {fileID: 5343699662503375493}
+  m_PortalBreakable: {fileID: 5343699662503375493}
   m_WaveSpawner: {fileID: 4844841199312666291}
 --- !u!114 &5343699662503375493
 MonoBehaviour:

Assets/Scripts/Gameplay/Action/ConcreteActions/AOEAction.cs

@@ -69,7 +69,7 @@ private void PerformAoE(ServerCharacter parent)
                 if (enemy != null)
                 {
                     // actually deal the damage
-                    enemy.ReceiveHP(parent, -Config.Amount);
+                    enemy.ReceiveHitPoints(parent, -Config.Amount);
                 }
             }
         }

Assets/Scripts/Gameplay/Action/ConcreteActions/DashAttackAction.cs

@@ -103,7 +103,7 @@ private void PerformMeleeAttack(ServerCharacter parent)
 
             if (foe != null)
             {
-                foe.ReceiveHP(parent, -Config.Amount);
+                foe.ReceiveHitPoints(parent, -Config.Amount);
             }
         }
 

Assets/Scripts/Gameplay/Action/ConcreteActions/FXProjectileTargetedAction.cs

@@ -74,7 +74,7 @@ public override bool OnUpdate(ServerCharacter clientCharacter)
                 m_ImpactedTarget = true;
                 if (m_DamageableTarget != null)
                 {
-                    m_DamageableTarget.ReceiveHP(clientCharacter, -Config.Projectiles[0].Damage);
+                    m_DamageableTarget.ReceiveHitPoints(clientCharacter, -Config.Projectiles[0].Damage);
                 }
             }
             return true;

Assets/Scripts/Gameplay/Action/ConcreteActions/MeleeAction.cs

@@ -72,7 +72,7 @@ public override bool OnUpdate(ServerCharacter clientCharacter)
                 var foe = DetectFoe(clientCharacter, m_ProvisionalTarget);
                 if (foe != null)
                 {
-                    foe.ReceiveHP(clientCharacter, -Config.Amount);
+                    foe.ReceiveHitPoints(clientCharacter, -Config.Amount);
                 }
             }
 

Assets/Scripts/Gameplay/Action/ConcreteActions/TrampleAction.cs

@@ -172,7 +172,7 @@ private void CollideWithVictim(ServerCharacter parent, ServerCharacter victim)
 
                 if (victim.gameObject.TryGetComponent(out IDamageable damageable))
                 {
-                    damageable.ReceiveHP(parent, -damage);
+                    damageable.ReceiveHitPoints(parent, -damage);
                 }
             }
 
@@ -209,7 +209,7 @@ private void Collide(ServerCharacter parent, Collider collider)
                 var damageable = collider.gameObject.GetComponent<IDamageable>();
                 if (damageable != null)
                 {
-                    damageable.ReceiveHP(parent, -Config.SplashDamage);
+                    damageable.ReceiveHitPoints(parent, -Config.SplashDamage);
 
                     // lastly, a special case: if the trampler runs into certain breakables, they are stunned!
                     if ((damageable.GetSpecialDamageFlags() & IDamageable.SpecialDamageFlags.StunOnTrample) == IDamageable.SpecialDamageFlags.StunOnTrample)

Assets/Scripts/Gameplay/DebugCheats/DebugCheatsManager.cs

@@ -153,7 +153,7 @@ void ServerKillTargetRpc(RpcParams serverRpcParams = default)
                     var damageable = obj.GetComponent<IDamageable>();
                     if (damageable != null && damageable.IsDamageable())
                     {
-                        damageable.ReceiveHP(playerServerCharacter, int.MinValue);
+                        damageable.ReceiveHitPoints(playerServerCharacter, int.MinValue);
                         PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "KillTarget");
                     }
                     else
@@ -173,7 +173,7 @@ void ServerKillAllEnemiesRpc(RpcParams serverRpcParams = default)
                 {
                     if (serverCharacter.gameObject.TryGetComponent(out IDamageable damageable))
                     {
-                        damageable.ReceiveHP(null, -serverCharacter.HitPoints);
+                        damageable.ReceiveHitPoints(null, -serverCharacter.HitPoints);
                     }
                 }
             }
@@ -209,7 +209,7 @@ void ServerHealPlayerRpc(RpcParams serverRpcParams = default)
                 {
                     if (playerServerCharacter.gameObject.TryGetComponent(out IDamageable damageable))
                     {
-                        damageable.ReceiveHP(null, baseHp);
+                        damageable.ReceiveHitPoints(null, baseHp);
                     }
                 }
 

Assets/Scripts/Gameplay/GameplayObjects/Breakable.cs

@@ -49,8 +49,8 @@ public class Breakable : NetworkBehaviour, IDamageable, ITargetable
         /// Is the item broken or not?
         /// </summary>
         public bool IsBroken => m_NetworkHealthState.HitPoints.Value == 0;
-        
-        public event Action OnBroken;
+
+        public event Action Broken;
 
         public bool IsNpc => true;
 
@@ -70,7 +70,10 @@ public override void OnNetworkSpawn()
 
             if (IsClient)
             {
-                m_NetworkHealthState.HitPoints.OnValueChanged += OnHPChanged;
+                if (m_NetworkHealthState)
+                {
+                    m_NetworkHealthState.HitPoints.OnValueChanged += OnHPChanged;
+                }
 
                 if (IsBroken)
                 {
@@ -81,13 +84,13 @@ public override void OnNetworkSpawn()
 
         public override void OnNetworkDespawn()
         {
-            if (IsClient)
+            if (IsClient && m_NetworkHealthState)
             {
                 m_NetworkHealthState.HitPoints.OnValueChanged -= OnHPChanged;
             }
         }
 
-        public void ReceiveHP(ServerCharacter inflicter, int hitPoints)
+        public void ReceiveHitPoints(ServerCharacter inflicter, int hitPoints)
         {
             if (hitPoints < 0)
             {
@@ -101,7 +104,7 @@ public void ReceiveHP(ServerCharacter inflicter, int hitPoints)
                     }
                 }
 
-                if (m_NetworkHealthState)
+                if (m_NetworkHealthState && m_MaxHealth)
                 {
                     m_NetworkHealthState.HitPoints.Value =
                         Mathf.Clamp(m_NetworkHealthState.HitPoints.Value + hitPoints, 0, m_MaxHealth.Value);
@@ -144,10 +147,10 @@ void OnHPChanged(int previousValue, int newValue)
                     m_Collider.enabled = !IsBroken;
                 }
             }
-            
+
             if (previousValue > 0 && newValue >= 0)
             {
-                OnBroken?.Invoke();
+                Broken?.Invoke();
                 PerformBreakVisualization(false);
             }
             else if (previousValue == 0 && newValue > 0)
@@ -182,6 +185,7 @@ void PerformUnbreakVisualization()
             {
                 Destroy(m_CurrentBrokenVisualization);
             }
+
             foreach (var unbrokenGameObject in m_UnbrokenGameObjects)
             {
                 if (unbrokenGameObject)
@@ -203,7 +207,4 @@ void OnValidate()
         }
 #endif
     }
-
-
 }
-

Assets/Scripts/Gameplay/GameplayObjects/DamageReceiver.cs

@@ -16,11 +16,11 @@ public class DamageReceiver : NetworkBehaviour, IDamageable
         [SerializeField]
         NetworkLifeState m_NetworkLifeState;
 
-        public void ReceiveHP(ServerCharacter inflicter, int HP)
+        public void ReceiveHitPoints(ServerCharacter inflicter, int hitPoints)
         {
             if (IsDamageable())
             {
-                DamageReceived?.Invoke(inflicter, HP);
+                DamageReceived?.Invoke(inflicter, hitPoints);
             }
         }
 

Assets/Scripts/Gameplay/GameplayObjects/EnemyPortal.cs

@@ -4,6 +4,7 @@
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.Assertions;
+using UnityEngine.Serialization;
 
 namespace Unity.BossRoom.Gameplay.GameplayObjects
 {
@@ -31,11 +32,11 @@ public class EnemyPortal : NetworkBehaviour, ITargetable
         float m_DormantCooldown;
 
         [SerializeField]
-        Breakable m_Breakable;
+        Breakable m_PortalBreakable;
 
         public bool IsNpc => true;
 
-        public bool IsValidTarget => !m_Breakable.IsBroken;
+        public bool IsValidTarget => !m_PortalBreakable.IsBroken;
 
         // cached reference to our components
         [SerializeField]
@@ -54,7 +55,7 @@ public override void OnNetworkSpawn()
 
             foreach (var breakable in m_BreakableElements)
             {
-                breakable.OnBroken += OnBreakableBroken;
+                breakable.Broken += OnBreakableBroken;
             }
 
             MaintainState();
@@ -69,7 +70,7 @@ public override void OnNetworkDespawn()
             {
                 if (breakable)
                 {
-                    breakable.OnBroken -= OnBreakableBroken;
+                    breakable.Broken -= OnBreakableBroken;
                 }
             }
         }
@@ -93,11 +94,11 @@ void MaintainState()
 
             if (!hasUnbrokenBreakables)
             {
-                m_Breakable.Break();
+                m_PortalBreakable.Break();
             }
             else
             {
-                m_Breakable.Unbreak();
+                m_PortalBreakable.Unbreak();
             }
             m_WaveSpawner.SetSpawnerEnabled(hasUnbrokenBreakables);
             if (!hasUnbrokenBreakables && m_CoroDormant == null)
@@ -125,7 +126,7 @@ void Restart()
                 }
             }
 
-            m_Breakable.Unbreak();
+            m_PortalBreakable.Unbreak();
             m_WaveSpawner.SetSpawnerEnabled(true);
             m_CoroDormant = null;
         }
@@ -148,7 +149,7 @@ public void ForceDestroy()
                 {
                     var serverComponent = state.GetComponent<Breakable>();
                     Assert.IsNotNull(serverComponent);
-                    serverComponent.ReceiveHP(null, Int32.MinValue);
+                    serverComponent.Break();
                 }
             }
         }