refactored event invoke conditions

ValentinGurkov · ValentinGurkov · commit ab9c80d3dfdc · 2020-01-02T14:22:50.000+02:00
diff --git a/Attributes/Health.cs b/Attributes/Health.cs
@@ -66,22 +66,18 @@ public void TakeDamage(GameObject instigator, float damage) {
                 return;
             }
             healthPoints.value = Mathf.Max(healthPoints.value - damage, 0);
-            takeDamage.Invoke(damage);
-            if (onHealthUpdate != null) {
-                onHealthUpdate();
-            }
+            takeDamage?.Invoke(damage);
+            onHealthUpdate?.Invoke();
             if (healthPoints.value == 0) {
-                onDie.Invoke(this);
+                onDie?.Invoke(this);
                 Die();
                 AwardExperience(instigator);
             }
         }
 
         public void Heal(float healthPercentToRestore) {
             healthPoints.value = Mathf.Min(healthPoints.value + (MaxHealthPoints * healthPercentToRestore / 100), MaxHealthPoints);
-            if (onHealthUpdate != null) {
-                onHealthUpdate();
-            }
+            onHealthUpdate?.Invoke();
         }
 
         public object CaptureState() {
@@ -110,9 +106,7 @@ private bool RegenerateHealth() {
             }
             float regenHealthPoints = baseStats.GetStat(Stat.Health) * (regenerationPercentage / 100);
             healthPoints.value = Mathf.Max(healthPoints.value, regenHealthPoints);
-            if (onHealthUpdate != null) {
-                onHealthUpdate();
-            }
+            onHealthUpdate?.Invoke();
             return true;
         }
 
diff --git a/Combat/Fighter.cs b/Combat/Fighter.cs
@@ -143,9 +143,8 @@ private void Hit() {
                     target.TakeDamage(gameObject, damage);
                 }
             }
-            if (updateTargetUI != null) {
-                updateTargetUI();
-            }
+            updateTargetUI?.Invoke();
+
         }
 
         // Animation Trigger
@@ -181,9 +180,8 @@ public void Cancel() {
             StopAttack();
             target = null;
             mover.Cancel();
-            if (updateTargetUI != null) {
-                updateTargetUI();
-            }
+            updateTargetUI?.Invoke();
+
         }
 
         public object CaptureState() {
diff --git a/Combat/PickupBase.cs b/Combat/PickupBase.cs
@@ -38,7 +38,7 @@ protected void Pickup(bool respawnable, float respawnTime) {
             } else {
                 Destroy(gameObject);
             }
-            onPickup.Invoke(this);
+            onPickup?.Invoke(this);
         }
 
         public bool HandleRaycast(GameObject callingObject) {
diff --git a/Combat/Projectile.cs b/Combat/Projectile.cs
@@ -86,19 +86,16 @@ private void OnTriggerEnter(Collider other) {
                 toDestroy.SetActive(false);
             }
 
-            onHit.Invoke();
-
-            if (updateUI != null) {
-                updateUI();
-            }
+            onHit?.Invoke();
+            updateUI?.Invoke();
 
             StartCoroutine(ReturnToPoolWithDelay(afterHitTTL));
         }
 
         private void PointTowardsTarget() {
             if (target != null) {
                 transform.LookAt(GetAimLocation());
-                onLaunch.Invoke();
+                onLaunch?.Invoke();
             }
         }
 
diff --git a/Combat/Weapon.cs b/Combat/Weapon.cs
@@ -8,7 +8,7 @@ public class Weapon : MonoBehaviour {
         [SerializeField] private GameObject hitEffect = null;
 
         public void OnHit(Health target) {
-            onHit.Invoke();
+            onHit?.Invoke();
 
             if (hitEffect != null) {
                 GameObject impactObj = Instantiate(hitEffect);
diff --git a/Conversing/DialogueManager.cs b/Conversing/DialogueManager.cs
@@ -53,9 +53,7 @@ public void CloseDialogue() {
             Debug.Log("End of conversation with.");
             animator.SetBool(IS_OPEN_TRIGGER, false);
             dialogLines.Clear();
-            if (onDialogueClose != null) {
-                onDialogueClose();
-            }
+            onDialogueClose?.Invoke();
         }
     }
 
diff --git a/Events/EventSystem.cs b/Events/EventSystem.cs
@@ -17,24 +17,18 @@ public class EventSystem : MonoBehaviour {
         public static event DialogueInitiatedHandler OnTalkedToNPC;
 
         public void EnemyDied(Health enemy) {
-            if (OnEnemyDeath != null) {
-                Debug.Log($"Enemy died: {enemy.name}");
-                OnEnemyDeath(enemy);
-            }
+            Debug.Log($"Enemy died: {enemy.name}");
+            OnEnemyDeath?.Invoke(enemy);
         }
 
         public void ItemPickedUp(PickupBase pickup) {
-            if (OnItemPickedUp != null) {
-                Debug.Log($"Item picked up: {pickup.name}");
-                OnItemPickedUp(pickup);
-            }
+            Debug.Log($"Item picked up: {pickup.name}");
+            OnItemPickedUp?.Invoke(pickup);
         }
 
         public void InitiatedDialogue(DialogueInitiator npc) {
-            if (OnTalkedToNPC != null) {
-                OnTalkedToNPC(npc);
-                GetComponent<ActionScheduler>().CancelCurrentAction();
-            }
+            OnTalkedToNPC?.Invoke(npc);
+            GetComponent<ActionScheduler>().CancelCurrentAction();
         }
     }
 }
diff --git a/NPC/DialogueInitiator.cs b/NPC/DialogueInitiator.cs
@@ -36,7 +36,7 @@ public override void Interact() {
 
         public void StartDialogue(Dialogue dialogue) {
             dialogueManager.StartDialogue(dialogue);
-            onDialogeInitiated.Invoke(this);
+            onDialogeInitiated?.Invoke(this);
             isInteracting = true;
         }
     }
diff --git a/Questing/QuestGiver.cs b/Questing/QuestGiver.cs
@@ -35,7 +35,7 @@ private void AssignQuest() {
         private void CheckQuest() {
             if (quest != null) {
                 Debug.Log("Checking quest");
-                onDialogeInitiated.Invoke(this);
+                onDialogeInitiated?.Invoke(this);
                 if (quest.Completed) {
                     Debug.Log("Quest completed");
                     quest.CompleteQuest();
diff --git a/Questing/QuestManager.cs b/Questing/QuestManager.cs
@@ -39,17 +39,14 @@ private void OnDisable() {
 
         private void UpdateUIOnCompletedGoal(Stage stage, Goal goal) {
             goal.onComplete -= UpdateUIOnCompletedGoal;
-            if (onQuestAdded != null) {
-                onQuestAdded(stage);
-            }
+            onQuestAdded?.Invoke(stage);
+
         }
 
         private void UpdateUIOnCompletedStage(Stage stage) {
             stage.onActive -= UpdateUIOnCompletedStage;
             latestStage = stage;
-            if (onQuestAdded != null) {
-                onQuestAdded(stage);
-            }
+            onQuestAdded?.Invoke(stage);
         }
 
         public Quest AddQuest(string questGiver, string quest) {
@@ -69,10 +66,7 @@ public Quest AddQuest(string questGiver, string quest) {
                     latestQuest.Stages[i].Goals[j].onComplete += UpdateUIOnCompletedGoal;
                 }
             }
-
-            if (onQuestAdded != null) {
-                onQuestAdded(latestStage);
-            }
+            onQuestAdded?.Invoke(latestStage);
 
             return latestQuest;
         }
diff --git a/Stats/BaseStats.cs b/Stats/BaseStats.cs
@@ -41,7 +41,7 @@ private void UpdateLevel() {
             int newLevel = CalculateLevel();
             if (newLevel > currentLevel.value) {
                 currentLevel.value = newLevel;
-                if (onLevelUp != null && onLevelUp()) {
+                if (onLevelUp?.Invoke() == true) {
                     LevelUpEffect();
                 }
             }
diff --git a/Stats/Experience.cs b/Stats/Experience.cs
@@ -12,9 +12,7 @@ public class Experience : MonoBehaviour, ISaveable {
 
     public void GainExperience(float xp) {
       experiencePoints += xp;
-      if (onExperienceGained != null) {
-        onExperienceGained();
-      }
+      onExperienceGained?.Invoke();
     }
     public object CaptureState() {
       return experiencePoints;

Original file line number	Diff line number	Diff line change
`@@ -66,22 +66,18 @@ public void TakeDamage(GameObject instigator, float damage) {`
`66`	`66`	`return;`
`67`	`67`	`}`
`68`	`68`	`healthPoints.value = Mathf.Max(healthPoints.value - damage, 0);`
`69`		`- takeDamage.Invoke(damage);`
`70`		`- if (onHealthUpdate != null) {`
`71`		`- onHealthUpdate();`
`72`		`- }`
	`69`	`+ takeDamage?.Invoke(damage);`
	`70`	`+ onHealthUpdate?.Invoke();`
`73`	`71`	`if (healthPoints.value == 0) {`
`74`		`- onDie.Invoke(this);`
	`72`	`+ onDie?.Invoke(this);`
`75`	`73`	`Die();`
`76`	`74`	`AwardExperience(instigator);`
`77`	`75`	`}`
`78`	`76`	`}`
`79`	`77`
`80`	`78`	`public void Heal(float healthPercentToRestore) {`
`81`	`79`	`healthPoints.value = Mathf.Min(healthPoints.value + (MaxHealthPoints * healthPercentToRestore / 100), MaxHealthPoints);`
`82`		`- if (onHealthUpdate != null) {`
`83`		`- onHealthUpdate();`
`84`		`- }`
	`80`	`+ onHealthUpdate?.Invoke();`
`85`	`81`	`}`
`86`	`82`
`87`	`83`	`public object CaptureState() {`
`@@ -110,9 +106,7 @@ private bool RegenerateHealth() {`
`110`	`106`	`}`
`111`	`107`	`float regenHealthPoints = baseStats.GetStat(Stat.Health) * (regenerationPercentage / 100);`
`112`	`108`	`healthPoints.value = Mathf.Max(healthPoints.value, regenHealthPoints);`
`113`		`- if (onHealthUpdate != null) {`
`114`		`- onHealthUpdate();`
`115`		`- }`
	`109`	`+ onHealthUpdate?.Invoke();`
`116`	`110`	`return true;`
`117`	`111`	`}`
`118`	`112`
Original file line number	Diff line number	Diff line change
`@@ -143,9 +143,8 @@ private void Hit() {`
`143`	`143`	`target.TakeDamage(gameObject, damage);`
`144`	`144`	`}`
`145`	`145`	`}`
`146`		`- if (updateTargetUI != null) {`
`147`		`- updateTargetUI();`
`148`		`- }`
	`146`	`+ updateTargetUI?.Invoke();`
	`147`	`+`
`149`	`148`	`}`
`150`	`149`
`151`	`150`	`// Animation Trigger`
`@@ -181,9 +180,8 @@ public void Cancel() {`
`181`	`180`	`StopAttack();`
`182`	`181`	`target = null;`
`183`	`182`	`mover.Cancel();`
`184`		`- if (updateTargetUI != null) {`
`185`		`- updateTargetUI();`
`186`		`- }`
	`183`	`+ updateTargetUI?.Invoke();`
	`184`	`+`
`187`	`185`	`}`
`188`	`186`
`189`	`187`	`public object CaptureState() {`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected void Pickup(bool respawnable, float respawnTime) {`
`38`	`38`	`} else {`
`39`	`39`	`Destroy(gameObject);`
`40`	`40`	`}`
`41`		`- onPickup.Invoke(this);`
	`41`	`+ onPickup?.Invoke(this);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public bool HandleRaycast(GameObject callingObject) {`
Original file line number	Diff line number	Diff line change
`@@ -86,19 +86,16 @@ private void OnTriggerEnter(Collider other) {`
`86`	`86`	`toDestroy.SetActive(false);`
`87`	`87`	`}`
`88`	`88`
`89`		`- onHit.Invoke();`
`90`		`-`
`91`		`- if (updateUI != null) {`
`92`		`- updateUI();`
`93`		`- }`
	`89`	`+ onHit?.Invoke();`
	`90`	`+ updateUI?.Invoke();`
`94`	`91`
`95`	`92`	`StartCoroutine(ReturnToPoolWithDelay(afterHitTTL));`
`96`	`93`	`}`
`97`	`94`
`98`	`95`	`private void PointTowardsTarget() {`
`99`	`96`	`if (target != null) {`
`100`	`97`	`transform.LookAt(GetAimLocation());`
`101`		`- onLaunch.Invoke();`
	`98`	`+ onLaunch?.Invoke();`
`102`	`99`	`}`
`103`	`100`	`}`
`104`	`101`
Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,7 @@ public void CloseDialogue() {`
`53`	`53`	`Debug.Log("End of conversation with.");`
`54`	`54`	`animator.SetBool(IS_OPEN_TRIGGER, false);`
`55`	`55`	`dialogLines.Clear();`
`56`		`- if (onDialogueClose != null) {`
`57`		`- onDialogueClose();`
`58`		`- }`
	`56`	`+ onDialogueClose?.Invoke();`
`59`	`57`	`}`
`60`	`58`	`}`
`61`	`59`
Original file line number	Diff line number	Diff line change
`@@ -17,24 +17,18 @@ public class EventSystem : MonoBehaviour {`
`17`	`17`	`public static event DialogueInitiatedHandler OnTalkedToNPC;`
`18`	`18`
`19`	`19`	`public void EnemyDied(Health enemy) {`
`20`		`- if (OnEnemyDeath != null) {`
`21`		`- Debug.Log($"Enemy died: {enemy.name}");`
`22`		`- OnEnemyDeath(enemy);`
`23`		`- }`
	`20`	`+ Debug.Log($"Enemy died: {enemy.name}");`
	`21`	`+ OnEnemyDeath?.Invoke(enemy);`
`24`	`22`	`}`
`25`	`23`
`26`	`24`	`public void ItemPickedUp(PickupBase pickup) {`
`27`		`- if (OnItemPickedUp != null) {`
`28`		`- Debug.Log($"Item picked up: {pickup.name}");`
`29`		`- OnItemPickedUp(pickup);`
`30`		`- }`
	`25`	`+ Debug.Log($"Item picked up: {pickup.name}");`
	`26`	`+ OnItemPickedUp?.Invoke(pickup);`
`31`	`27`	`}`
`32`	`28`
`33`	`29`	`public void InitiatedDialogue(DialogueInitiator npc) {`
`34`		`- if (OnTalkedToNPC != null) {`
`35`		`- OnTalkedToNPC(npc);`
`36`		`- GetComponent<ActionScheduler>().CancelCurrentAction();`
`37`		`- }`
	`30`	`+ OnTalkedToNPC?.Invoke(npc);`
	`31`	`+ GetComponent<ActionScheduler>().CancelCurrentAction();`
`38`	`32`	`}`
`39`	`33`	`}`
`40`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public override void Interact() {`
`36`	`36`
`37`	`37`	`public void StartDialogue(Dialogue dialogue) {`
`38`	`38`	`dialogueManager.StartDialogue(dialogue);`
`39`		`- onDialogeInitiated.Invoke(this);`
	`39`	`+ onDialogeInitiated?.Invoke(this);`
`40`	`40`	`isInteracting = true;`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,17 +39,14 @@ private void OnDisable() {`
`39`	`39`
`40`	`40`	`private void UpdateUIOnCompletedGoal(Stage stage, Goal goal) {`
`41`	`41`	`goal.onComplete -= UpdateUIOnCompletedGoal;`
`42`		`- if (onQuestAdded != null) {`
`43`		`- onQuestAdded(stage);`
`44`		`- }`
	`42`	`+ onQuestAdded?.Invoke(stage);`
	`43`	`+`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`private void UpdateUIOnCompletedStage(Stage stage) {`
`48`	`47`	`stage.onActive -= UpdateUIOnCompletedStage;`
`49`	`48`	`latestStage = stage;`
`50`		`- if (onQuestAdded != null) {`
`51`		`- onQuestAdded(stage);`
`52`		`- }`
	`49`	`+ onQuestAdded?.Invoke(stage);`
`53`	`50`	`}`
`54`	`51`
`55`	`52`	`public Quest AddQuest(string questGiver, string quest) {`
`@@ -69,10 +66,7 @@ public Quest AddQuest(string questGiver, string quest) {`
`69`	`66`	`latestQuest.Stages[i].Goals[j].onComplete += UpdateUIOnCompletedGoal;`
`70`	`67`	`}`
`71`	`68`	`}`
`72`		`-`
`73`		`- if (onQuestAdded != null) {`
`74`		`- onQuestAdded(latestStage);`
`75`		`- }`
	`69`	`+ onQuestAdded?.Invoke(latestStage);`
`76`	`70`
`77`	`71`	`return latestQuest;`
`78`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ private void UpdateLevel() {`
`41`	`41`	`int newLevel = CalculateLevel();`
`42`	`42`	`if (newLevel > currentLevel.value) {`
`43`	`43`	`currentLevel.value = newLevel;`
`44`		`- if (onLevelUp != null && onLevelUp()) {`
	`44`	`+ if (onLevelUp?.Invoke() == true) {`
`45`	`45`	`LevelUpEffect();`
`46`	`46`	`}`
`47`	`47`	`}`