From 9d0cebf3cf5b2d8368f703a907de5f7d2c72ec01 Mon Sep 17 00:00:00 2001
From: Gregory Campbell <gjcampbell777@gmail.com>
Date: Fri, 10 Apr 2020 12:59:15 -0400
Subject: [PATCH] Fixed bug that caused enemy robot attacks to only nullify the
 modification when a sheild was up instead of the whole attack caused by the
 implementation of colours strengths/weaknesses

---
 Assets/Scripts/GMScript.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Assets/Scripts/GMScript.cs b/Assets/Scripts/GMScript.cs
index 48e69d8..203479f 100644
--- a/Assets/Scripts/GMScript.cs
+++ b/Assets/Scripts/GMScript.cs
@@ -475,19 +475,19 @@ public class GMScript : MonoBehaviour
 
     	}
 
+    	modifiedAttack = enemyAttack + modifier;
+
     	//HIT ONLY DAMAGES IF THERE IS NO SHEILD UP
     	if(sheild == true)
     	{
 
-    		modifier = 0;
+    		modifiedAttack = 0;
     		print("Sheild Hit!");
     		Sheild.SetActive(false);
     		sheild = false;
 
     	}
 
-    	modifiedAttack = enemyAttack + modifier;
-
     	StartCoroutine(DisplayDamageText(modifiedAttack, PartyDamageText, enemyColour));
 
     	partyHealth -= modifiedAttack;