From db19ee9723e9170c79606641b50aef3e05745dc8 Mon Sep 17 00:00:00 2001
From: "s3607057 (Angus Niven)" <s3607057@student.rmit.edu.au>
Date: Thu, 17 Oct 2019 18:36:56 +1100
Subject: [PATCH] Made the cannons able to start at different points in their
 countdowns. Made falling off things cost lives (player is currently notified
 a turn late).

---
 .../Map Sections/Width 7/Two-part 7-1.prefab  | 90 +++++++++++++++++++
 .../ColorGameMode/RacetrackGameMode.cs        |  1 +
 Assets/Scripts/Traps/ShootingCannon.cs        |  4 +-
 3 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/Assets/Prefabs/Map Sections/Width 7/Two-part 7-1.prefab b/Assets/Prefabs/Map Sections/Width 7/Two-part 7-1.prefab
index 87acf1a..764c4f5 100644
--- a/Assets/Prefabs/Map Sections/Width 7/Two-part 7-1.prefab	
+++ b/Assets/Prefabs/Map Sections/Width 7/Two-part 7-1.prefab	
@@ -1461,6 +1461,16 @@ PrefabInstance:
       propertyPath: countdowntimer
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: shootingRight
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdown
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -2843,6 +2853,11 @@ PrefabInstance:
       propertyPath: countdowntimer
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdown
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -3356,6 +3371,11 @@ PrefabInstance:
       propertyPath: countdowntimer
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdown
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -3880,6 +3900,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdown
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -4403,6 +4428,16 @@ PrefabInstance:
       propertyPath: countdowntimer
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: shootingRight
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdown
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -5629,6 +5664,16 @@ PrefabInstance:
       propertyPath: countdowntimer
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: shootingRight
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdown
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -6882,6 +6927,16 @@ PrefabInstance:
       propertyPath: countdowntimer
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: shootingRight
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdown
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -7460,6 +7515,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdown
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -9899,6 +9959,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: shootingRight
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdown
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -10273,6 +10343,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: shootingRight
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdown
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -10930,6 +11010,11 @@ PrefabInstance:
       propertyPath: countdowntimer
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdown
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -11030,6 +11115,11 @@ PrefabInstance:
       propertyPath: countdowntimer
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdown
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
diff --git a/Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs b/Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs
index e7a0d01..3b0cb5e 100644
--- a/Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs
+++ b/Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs
@@ -70,6 +70,7 @@ public class RacetrackGameMode : GameMode
                 if (player.character.respawnNeeded)
                 {
                     respawningPlayers.Add(player);
+                    player.client.Lives--;
                 }
                 else
                 {
diff --git a/Assets/Scripts/Traps/ShootingCannon.cs b/Assets/Scripts/Traps/ShootingCannon.cs
index 22d9942..53d7811 100644
--- a/Assets/Scripts/Traps/ShootingCannon.cs
+++ b/Assets/Scripts/Traps/ShootingCannon.cs
@@ -13,7 +13,7 @@ public class ShootingCannon : ActiveBlock
     public TextMeshPro counter;
     public TextMeshPro counter2;
     int countdowntimer = 3;
-    int countdown;
+    public int countdown = 3;
 
     public override int GetInitative()
     {
@@ -23,7 +23,7 @@ public class ShootingCannon : ActiveBlock
 
     private void Start()
     {
-        countdown = countdowntimer;
+        //countdown = countdowntimer;
     }
     private void Update()
     {