From b01c146481710de1cb072d625c04678a26bc3155 Mon Sep 17 00:00:00 2001
From: steven2gleal <steven2gleal@tamu.edu>
Date: Thu, 7 Sep 2017 14:21:58 -0500
Subject: [PATCH] fixed shooting rockets when dead

---
 Game 1/Assets/Scripts/Explosion.cs           |  2 +-
 Game 1/Assets/Scripts/LevelController.cs     |  5 ++-
 Game 1/Assets/Scripts/PlayerController.cs    | 40 ++++++++++++++++++--
 Game 1/Assets/Sprites.meta                   |  9 +++++
 Game 1/ProjectSettings/ProjectSettings.asset |  3 ++
 Game 1/ProjectSettings/ProjectVersion.txt    |  2 +-
 6 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 Game 1/Assets/Sprites.meta

diff --git a/Game 1/Assets/Scripts/Explosion.cs b/Game 1/Assets/Scripts/Explosion.cs
index fe5ca14..0e8d515 100644
--- a/Game 1/Assets/Scripts/Explosion.cs	
+++ b/Game 1/Assets/Scripts/Explosion.cs	
@@ -6,7 +6,7 @@ public class Explosion : MonoBehaviour {
 
     public PlayerController player;
     private float MAX_PLAYER_DIST = 3.0f;
-    private float EXPLOSION_FORCE = 10.0f;
+    private float EXPLOSION_FORCE = 15.0f;
 
 	void Start () {
         Vector3 playerPos = player.transform.position;
diff --git a/Game 1/Assets/Scripts/LevelController.cs b/Game 1/Assets/Scripts/LevelController.cs
index 307fa73..f3e155f 100755
--- a/Game 1/Assets/Scripts/LevelController.cs	
+++ b/Game 1/Assets/Scripts/LevelController.cs	
@@ -37,6 +37,7 @@ public class LevelController : MonoBehaviour {
     {
         if (wonLevel)
             return;
+        PlayerController.GetController().KillPlayer();
         winText.text = "TRY AGAIN!";
         StartCoroutine(DelayLoadLevel(SceneManager.GetActiveScene().name, 2.0f));
     }
@@ -50,8 +51,10 @@ public class LevelController : MonoBehaviour {
 			GameObject start = GameObject.FindGameObjectWithTag ("Start");
 			player.transform.position = start.transform.position;
 			winText.text = "";
+            PlayerController.GetController().RevivePlayer();
 		} else {
-			SceneManager.LoadScene (levelName);
+            levelController = null;
+            SceneManager.LoadScene (levelName);
 		}
         yield return null;
     }
diff --git a/Game 1/Assets/Scripts/PlayerController.cs b/Game 1/Assets/Scripts/PlayerController.cs
index f2738b7..c80521d 100644
--- a/Game 1/Assets/Scripts/PlayerController.cs	
+++ b/Game 1/Assets/Scripts/PlayerController.cs	
@@ -12,10 +12,44 @@ public class PlayerController : MonoBehaviour {
     public GameObject rocketPrefab;
     private float reloadTime = 0.25f;
     private bool reloading = false;
-	
-	// Update is called once per frame
-	void Update () {
+    private static PlayerController controller;
+    private bool alive = true;
 
+    private void Start()
+    {
+        if (controller)
+        {
+            Debug.LogError("More than one player controller in the scene! Deleting this controller.");
+            Destroy(this);
+        }
+        controller = this;
+        alive = true;
+    }
+
+    public static PlayerController GetController()
+    {
+        if (!controller)
+        {
+            Debug.LogError("No player controller currently in the scene.");
+            return null;
+        }
+        return controller;
+    }
+
+    public void KillPlayer()
+    {
+        alive = false;
+    }
+
+    public void RevivePlayer()
+    {
+        alive = true;
+    }
+
+    // Update is called once per frame
+    void Update () {
+        if (!alive)
+            return;
         /*//  Basic jumping
 		if (Input.GetKeyDown (KeyCode.Space)) {
 			GetComponent<Rigidbody2D> ().velocity = new Vector2 (0, jumpPower);
diff --git a/Game 1/Assets/Sprites.meta b/Game 1/Assets/Sprites.meta
new file mode 100644
index 0000000..3eeaedb
--- /dev/null
+++ b/Game 1/Assets/Sprites.meta	
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 1884be5a55d87e54689bff928b40ee6d
+folderAsset: yes
+timeCreated: 1504642159
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Game 1/ProjectSettings/ProjectSettings.asset b/Game 1/ProjectSettings/ProjectSettings.asset
index b5b30e8..60f5057 100644
--- a/Game 1/ProjectSettings/ProjectSettings.asset	
+++ b/Game 1/ProjectSettings/ProjectSettings.asset	
@@ -374,6 +374,9 @@ PlayerSettings:
   switchUdpSendBufferSize: 9
   switchUdpReceiveBufferSize: 42
   switchSocketBufferEfficiency: 4
+  switchSocketInitializeEnabled: 1
+  switchNetworkInterfaceManagerInitializeEnabled: 1
+  switchPlayerConnectionEnabled: 1
   ps4NPAgeRating: 12
   ps4NPTitleSecret: 
   ps4NPTrophyPackPath: 
diff --git a/Game 1/ProjectSettings/ProjectVersion.txt b/Game 1/ProjectSettings/ProjectVersion.txt
index ca1aa05..a211ccd 100644
--- a/Game 1/ProjectSettings/ProjectVersion.txt	
+++ b/Game 1/ProjectSettings/ProjectVersion.txt	
@@ -1 +1 @@
-m_EditorVersion: 2017.1.0f3
+m_EditorVersion: 2017.1.1f1