From 78f1916af6c0a7e45730d7f204522d2a3c2acabe Mon Sep 17 00:00:00 2001 From: Gregory Campbell Date: Sat, 8 Aug 2020 19:44:16 -0400 Subject: [PATCH] Removed camera shake and hit effect for attacks that do 0 damage for both party memebers and enemy attacks --- Assets/Scripts/GMScript.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/Scripts/GMScript.cs b/Assets/Scripts/GMScript.cs index e0a70f0..1345755 100644 --- a/Assets/Scripts/GMScript.cs +++ b/Assets/Scripts/GMScript.cs @@ -489,7 +489,7 @@ public class GMScript : MonoBehaviour }else if(PlayerPrefs.GetInt("GameMode") == 2 && level > PlayerPrefs.GetInt("ChallengeHighScore")){ PlayerPrefs.SetInt("ChallengeHighScore", level-1); } - + audioPlayer.PlayOneShot(SoundEffects[1]); SceneManager.LoadScene("Mode Select Scene"); } @@ -730,7 +730,7 @@ public class GMScript : MonoBehaviour DisplayDamageText((int)damage, display, partyMember); - if(!shield && !enemyShield) + if(!shield && !enemyShield && damage != 0) { Hit.SetActive(true); @@ -745,7 +745,7 @@ public class GMScript : MonoBehaviour Hit.SetActive(false); } else { - yield return new WaitForSeconds(1); + yield return new WaitForSeconds(1.5f); } @@ -857,7 +857,7 @@ public class GMScript : MonoBehaviour DisplayDamageText(attack, PartyDamageText, (Colours)attackColour); - if(!shield && !enemyShield) + if(!shield && !enemyShield && attack != 0) { EnemyHit.SetActive(true); @@ -872,7 +872,7 @@ public class GMScript : MonoBehaviour EnemyHit.SetActive(false); } else { - yield return new WaitForSeconds(1); + yield return new WaitForSeconds(1.5f); }