Fixed iron curtain icon available and activated state

Author: dlweatherhead

Assets/EC2018/ColorUtil.cs

@@ -4,19 +4,25 @@
 
 public static class ColorUtil {
 
-    public static Color playerA = new Color(1f, 0f, 0f);
+    public static Color playerA = new Color(0.96f, 0.26f, 0.21f);
+    public static Color playerA_light = new Color(0.5f, 0.1f, 0.1f);
 
-    public static Color playerB = new Color(0f, 0f, 0.5f);
+    public static Color playerB = new Color(0.13f, 0.59f, 0.95f);
+    public static Color playerB_light = new Color(0.1f, 0.3f, 0.5f);
+
+    public static Color yellow = new Color(1f, 0.9f, 0.05f);
+
+    public static Color orange = new Color(1f, 0.6f, 0f);
 
     public static Color lightGrey = new Color(0.7f, 0.7f, 0.7f);
 
     public static Color white = Color.white;
 
 
-    // Entelect colours     - Hex   - RGB
-    // Blue     - #2196f3   -  33, 150, 243
-    // Red      - #f44336   - 244,  67,  54
-    // Yellow   - #fee50e   - 254, 229,  14
-    // Oraneg   - #ff9800   - 255, 152,   0
+    // Entelect colours     - Hex   - RGB       - RBG_norm
+    // Blue     - #2196f3   -  33, 150, 243     - 0.13, 0.59, 0.95
+    // Red      - #f44336   - 244,  67,  54     - 0.96, 0.26, 0.21
+    // Yellow   - #fee50e   - 254, 229,  14     - 1   , 0.9 , 0.05
+    // Orange   - #ff9800   - 255, 152,   0     - 1   , 0.6 , 0
 
 }

Assets/EC2018/GameStateManager.cs

@@ -127,7 +127,7 @@ void ProcessIronCurtainHitList(List<Player> players) {
             for (int i = 0; i < players.Count; i++) {
                 var available = players[i].IronCurtainAvailable;
                 var lifetime = players[i].ActiveIronCurtainLifetime;
-                if (available && lifetime <= 0 && lifetime > -6) {
+                if (available && lifetime >= 0) {
                     instantiator.ActivateIronCurtain(players[i].PlayerType);
                 } else {
                     instantiator.DeactivateIronCurtain(players[i].PlayerType);

Assets/EC2018/UIManager.cs

@@ -57,11 +57,11 @@ void Update() {
 			}
 
 			if(pulseIronCurtainPlayerA) {
-				ironCurtainPlayerA.color = Color.Lerp (ColorUtil.playerA, ColorUtil.white, Mathf.PingPong (Time.time, 1f));
+                ironCurtainPlayerA.color = Color.Lerp (ColorUtil.playerA, ColorUtil.lightGrey, Mathf.PingPong (Time.time, 1f));
 			}
 
 			if(pulseIronCurtainPlayerB) {
-				ironCurtainPlayerB.color = Color.Lerp (ColorUtil.playerB, ColorUtil.white, Mathf.PingPong (Time.time, 1f));
+                ironCurtainPlayerB.color = Color.Lerp (ColorUtil.playerB, ColorUtil.lightGrey, Mathf.PingPong (Time.time, 1f));
 			}
 		}
 
@@ -90,14 +90,24 @@ public void UpdateUI(GameDetails gameDetails, Player playerA, Player playerB) {
 			ScoreB.text = GetScore (playerB);
 
 			if(playerA.IronCurtainAvailable) {
-				pulseIronCurtainPlayerA = true;
+                if (playerA.ActiveIronCurtainLifetime <= 0) {
+                    pulseIronCurtainPlayerA = true;
+                } else {
+                    pulseIronCurtainPlayerA = false;
+                    ironCurtainPlayerA.color = ColorUtil.playerA;
+                }
 			} else {
 				pulseIronCurtainPlayerA = false;
 				ironCurtainPlayerA.color = ColorUtil.lightGrey;
 			}
 
 			if(playerB.IronCurtainAvailable) {
-				pulseIronCurtainPlayerB = true;
+                if (playerB.ActiveIronCurtainLifetime <= 0) {
+                    pulseIronCurtainPlayerB = true;
+                } else {
+                    pulseIronCurtainPlayerB = false;
+                    ironCurtainPlayerB.color = ColorUtil.playerB;
+                }
 			} else {
 				pulseIronCurtainPlayerB = false;
 				ironCurtainPlayerB.color = ColorUtil.lightGrey;