Skip to content

Commit 7fb75b8

Browse files
fernando-cortezfernando-cortez
committed
formatting, PR feedback
1 parent da16486 commit 7fb75b8

File tree

13 files changed

+37
-35
lines changed

13 files changed

+37
-35
lines changed

‎Assets/Prefabs/Game/EnemySpawner.prefab

+1-1
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ MonoBehaviour:
484484
ShowTopMostFoldoutHeaderGroup: 1
485485
m_BreakableElements: []
486486
m_DormantCooldown: 180
487-
m_Breakable: {fileID: 5343699662503375493}
487+
m_PortalBreakable: {fileID: 5343699662503375493}
488488
m_WaveSpawner: {fileID: 4844841199312666291}
489489
--- !u!114 &5343699662503375493
490490
MonoBehaviour:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private void PerformAoE(ServerCharacter parent)
6969
if (enemy != null)
7070
{
7171
// actually deal the damage
72-
enemy.ReceiveHP(parent, -Config.Amount);
72+
enemy.ReceiveHitPoints(parent, -Config.Amount);
7373
}
7474
}
7575
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private void PerformMeleeAttack(ServerCharacter parent)
103103

104104
if (foe != null)
105105
{
106-
foe.ReceiveHP(parent, -Config.Amount);
106+
foe.ReceiveHitPoints(parent, -Config.Amount);
107107
}
108108
}
109109

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public override bool OnUpdate(ServerCharacter clientCharacter)
7474
m_ImpactedTarget = true;
7575
if (m_DamageableTarget != null)
7676
{
77-
m_DamageableTarget.ReceiveHP(clientCharacter, -Config.Projectiles[0].Damage);
77+
m_DamageableTarget.ReceiveHitPoints(clientCharacter, -Config.Projectiles[0].Damage);
7878
}
7979
}
8080
return true;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public override bool OnUpdate(ServerCharacter clientCharacter)
7272
var foe = DetectFoe(clientCharacter, m_ProvisionalTarget);
7373
if (foe != null)
7474
{
75-
foe.ReceiveHP(clientCharacter, -Config.Amount);
75+
foe.ReceiveHitPoints(clientCharacter, -Config.Amount);
7676
}
7777
}
7878

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private void CollideWithVictim(ServerCharacter parent, ServerCharacter victim)
172172

173173
if (victim.gameObject.TryGetComponent(out IDamageable damageable))
174174
{
175-
damageable.ReceiveHP(parent, -damage);
175+
damageable.ReceiveHitPoints(parent, -damage);
176176
}
177177
}
178178

@@ -209,7 +209,7 @@ private void Collide(ServerCharacter parent, Collider collider)
209209
var damageable = collider.gameObject.GetComponent<IDamageable>();
210210
if (damageable != null)
211211
{
212-
damageable.ReceiveHP(parent, -Config.SplashDamage);
212+
damageable.ReceiveHitPoints(parent, -Config.SplashDamage);
213213

214214
// lastly, a special case: if the trampler runs into certain breakables, they are stunned!
215215
if ((damageable.GetSpecialDamageFlags() & IDamageable.SpecialDamageFlags.StunOnTrample) == IDamageable.SpecialDamageFlags.StunOnTrample)

‎Assets/Scripts/Gameplay/DebugCheats/DebugCheatsManager.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ void ServerKillTargetRpc(RpcParams serverRpcParams = default)
153153
var damageable = obj.GetComponent<IDamageable>();
154154
if (damageable != null && damageable.IsDamageable())
155155
{
156-
damageable.ReceiveHP(playerServerCharacter, int.MinValue);
156+
damageable.ReceiveHitPoints(playerServerCharacter, int.MinValue);
157157
PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "KillTarget");
158158
}
159159
else
@@ -173,7 +173,7 @@ void ServerKillAllEnemiesRpc(RpcParams serverRpcParams = default)
173173
{
174174
if (serverCharacter.gameObject.TryGetComponent(out IDamageable damageable))
175175
{
176-
damageable.ReceiveHP(null, -serverCharacter.HitPoints);
176+
damageable.ReceiveHitPoints(null, -serverCharacter.HitPoints);
177177
}
178178
}
179179
}
@@ -209,7 +209,7 @@ void ServerHealPlayerRpc(RpcParams serverRpcParams = default)
209209
{
210210
if (playerServerCharacter.gameObject.TryGetComponent(out IDamageable damageable))
211211
{
212-
damageable.ReceiveHP(null, baseHp);
212+
damageable.ReceiveHitPoints(null, baseHp);
213213
}
214214
}
215215

‎Assets/Scripts/Gameplay/GameplayObjects/Breakable.cs

+12-11
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public class Breakable : NetworkBehaviour, IDamageable, ITargetable
4949
/// Is the item broken or not?
5050
/// </summary>
5151
public bool IsBroken => m_NetworkHealthState.HitPoints.Value == 0;
52-
53-
public event Action OnBroken;
52+
53+
public event Action Broken;
5454

5555
public bool IsNpc => true;
5656

@@ -70,7 +70,10 @@ public override void OnNetworkSpawn()
7070

7171
if (IsClient)
7272
{
73-
m_NetworkHealthState.HitPoints.OnValueChanged += OnHPChanged;
73+
if (m_NetworkHealthState)
74+
{
75+
m_NetworkHealthState.HitPoints.OnValueChanged += OnHPChanged;
76+
}
7477

7578
if (IsBroken)
7679
{
@@ -81,13 +84,13 @@ public override void OnNetworkSpawn()
8184

8285
public override void OnNetworkDespawn()
8386
{
84-
if (IsClient)
87+
if (IsClient && m_NetworkHealthState)
8588
{
8689
m_NetworkHealthState.HitPoints.OnValueChanged -= OnHPChanged;
8790
}
8891
}
8992

90-
public void ReceiveHP(ServerCharacter inflicter, int hitPoints)
93+
public void ReceiveHitPoints(ServerCharacter inflicter, int hitPoints)
9194
{
9295
if (hitPoints < 0)
9396
{
@@ -101,7 +104,7 @@ public void ReceiveHP(ServerCharacter inflicter, int hitPoints)
101104
}
102105
}
103106

104-
if (m_NetworkHealthState)
107+
if (m_NetworkHealthState && m_MaxHealth)
105108
{
106109
m_NetworkHealthState.HitPoints.Value =
107110
Mathf.Clamp(m_NetworkHealthState.HitPoints.Value + hitPoints, 0, m_MaxHealth.Value);
@@ -144,10 +147,10 @@ void OnHPChanged(int previousValue, int newValue)
144147
m_Collider.enabled = !IsBroken;
145148
}
146149
}
147-
150+
148151
if (previousValue > 0 && newValue >= 0)
149152
{
150-
OnBroken?.Invoke();
153+
Broken?.Invoke();
151154
PerformBreakVisualization(false);
152155
}
153156
else if (previousValue == 0 && newValue > 0)
@@ -182,6 +185,7 @@ void PerformUnbreakVisualization()
182185
{
183186
Destroy(m_CurrentBrokenVisualization);
184187
}
188+
185189
foreach (var unbrokenGameObject in m_UnbrokenGameObjects)
186190
{
187191
if (unbrokenGameObject)
@@ -203,7 +207,4 @@ void OnValidate()
203207
}
204208
#endif
205209
}
206-
207-
208210
}
209-

‎Assets/Scripts/Gameplay/GameplayObjects/DamageReceiver.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ public class DamageReceiver : NetworkBehaviour, IDamageable
1616
[SerializeField]
1717
NetworkLifeState m_NetworkLifeState;
1818

19-
public void ReceiveHP(ServerCharacter inflicter, int HP)
19+
public void ReceiveHitPoints(ServerCharacter inflicter, int hitPoints)
2020
{
2121
if (IsDamageable())
2222
{
23-
DamageReceived?.Invoke(inflicter, HP);
23+
DamageReceived?.Invoke(inflicter, hitPoints);
2424
}
2525
}
2626

‎Assets/Scripts/Gameplay/GameplayObjects/EnemyPortal.cs

+9-8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Unity.Netcode;
55
using UnityEngine;
66
using UnityEngine.Assertions;
7+
using UnityEngine.Serialization;
78

89
namespace Unity.BossRoom.Gameplay.GameplayObjects
910
{
@@ -31,11 +32,11 @@ public class EnemyPortal : NetworkBehaviour, ITargetable
3132
float m_DormantCooldown;
3233

3334
[SerializeField]
34-
Breakable m_Breakable;
35+
Breakable m_PortalBreakable;
3536

3637
public bool IsNpc => true;
3738

38-
public bool IsValidTarget => !m_Breakable.IsBroken;
39+
public bool IsValidTarget => !m_PortalBreakable.IsBroken;
3940

4041
// cached reference to our components
4142
[SerializeField]
@@ -54,7 +55,7 @@ public override void OnNetworkSpawn()
5455

5556
foreach (var breakable in m_BreakableElements)
5657
{
57-
breakable.OnBroken += OnBreakableBroken;
58+
breakable.Broken += OnBreakableBroken;
5859
}
5960

6061
MaintainState();
@@ -69,7 +70,7 @@ public override void OnNetworkDespawn()
6970
{
7071
if (breakable)
7172
{
72-
breakable.OnBroken -= OnBreakableBroken;
73+
breakable.Broken -= OnBreakableBroken;
7374
}
7475
}
7576
}
@@ -93,11 +94,11 @@ void MaintainState()
9394

9495
if (!hasUnbrokenBreakables)
9596
{
96-
m_Breakable.Break();
97+
m_PortalBreakable.Break();
9798
}
9899
else
99100
{
100-
m_Breakable.Unbreak();
101+
m_PortalBreakable.Unbreak();
101102
}
102103
m_WaveSpawner.SetSpawnerEnabled(hasUnbrokenBreakables);
103104
if (!hasUnbrokenBreakables && m_CoroDormant == null)
@@ -125,7 +126,7 @@ void Restart()
125126
}
126127
}
127128

128-
m_Breakable.Unbreak();
129+
m_PortalBreakable.Unbreak();
129130
m_WaveSpawner.SetSpawnerEnabled(true);
130131
m_CoroDormant = null;
131132
}
@@ -148,7 +149,7 @@ public void ForceDestroy()
148149
{
149150
var serverComponent = state.GetComponent<Breakable>();
150151
Assert.IsNotNull(serverComponent);
151-
serverComponent.ReceiveHP(null, Int32.MinValue);
152+
serverComponent.Break();
152153
}
153154
}
154155
}

‎Assets/Scripts/Gameplay/GameplayObjects/IDamageable.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public interface IDamageable
1414
/// Receives HP damage or healing.
1515
/// </summary>
1616
/// <param name="inflicter">The Character responsible for the damage. May be null.</param>
17-
/// <param name="HP">The damage done. Negative value is damage, positive is healing.</param>
18-
void ReceiveHP(ServerCharacter inflicter, int HP);
17+
/// <param name="hitPoints">The damage done. Negative value is damage, positive is healing.</param>
18+
void ReceiveHitPoints(ServerCharacter inflicter, int hitPoints);
1919

2020
/// <summary>
2121
/// Get the total damage value.

‎Assets/Scripts/Gameplay/GameplayObjects/Projectiles/PhysicsProjectile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ void DetectCollisions()
212212

213213
if (m_CollisionCache[i].TryGetComponent(out IDamageable damageable))
214214
{
215-
damageable.ReceiveHP(spawnerObj, -m_ProjectileInfo.Damage);
215+
damageable.ReceiveHitPoints(spawnerObj, -m_ProjectileInfo.Damage);
216216
}
217217
}
218218

‎Assets/Scripts/Gameplay/GameplayObjects/TossedItem.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ void Detonate()
102102
{
103103
if (m_CollisionCache[i].gameObject.TryGetComponent(out IDamageable damageReceiver))
104104
{
105-
damageReceiver.ReceiveHP(null, -m_DamagePoints);
105+
damageReceiver.ReceiveHitPoints(null, -m_DamagePoints);
106106

107107
var serverCharacter = m_CollisionCache[i].gameObject.GetComponentInParent<ServerCharacter>();
108108
if (serverCharacter)

0 commit comments

Comments
 (0)