From cdbc6cbd87671eb2c66d5e95fc0f32bc5c914fc7 Mon Sep 17 00:00:00 2001 From: Gregory Campbell Date: Wed, 8 Apr 2020 19:23:37 -0400 Subject: [PATCH] Changed white to do healing and set green and lime back to attacking --- Assets/Scripts/GMScript.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Assets/Scripts/GMScript.cs b/Assets/Scripts/GMScript.cs index 882e9e6..7bb338e 100644 --- a/Assets/Scripts/GMScript.cs +++ b/Assets/Scripts/GMScript.cs @@ -266,8 +266,7 @@ public class GMScript : MonoBehaviour //CHECKING IF AN "ATTACK" OR "NON-ATTACK" ROBOT IS GOING if(((Colours)PartyColours[OrderNumbers[i]-1] != Colours.Grey && - (Colours)PartyColours[OrderNumbers[i]-1] != Colours.Green && - (Colours)PartyColours[OrderNumbers[i]-1] != Colours.Lime) + (Colours)PartyColours[OrderNumbers[i]-1] != Colours.White) && sheild != true) { @@ -299,8 +298,7 @@ public class GMScript : MonoBehaviour } //GREEN/LIME ROBOT (HEALTH) IS GOING - if ((Colours)PartyColours[OrderNumbers[i]-1] == Colours.Green || - (Colours)PartyColours[OrderNumbers[i]-1] == Colours.Lime){ + if ((Colours)PartyColours[OrderNumbers[i]-1] == Colours.White){ EnemyHit.transform.GetComponent().color = PartyMembers[OrderNumbers[i]-1].transform.GetComponent().color; @@ -395,7 +393,7 @@ public class GMScript : MonoBehaviour } //ENEMY ATTACKING PARTY (DEFAULT DISPLAY TEXT TO RED FOR NOW) - DamageEnemy(enemyAttack, (Colours)0); + DamageEnemy(enemyAttack, Colours.Red); } @@ -405,12 +403,12 @@ public class GMScript : MonoBehaviour int modifier = 1; int modifiedAttack = 1; - if(partyMember == Colours.Grey || partyMember == Colours.Green || partyMember == Colours.Lime) + if(partyMember == Colours.Grey || partyMember == Colours.White) { modifier = 0; - if(partyMember == Colours.Green || partyMember == Colours.Lime) + if(partyMember == Colours.White) { partyHealth += 4;