Started UI

smz11006 · Dec 15, 2015 · 13bc366381331a31823de8aa90ea2cca1ca034bf · 13bc366
1 parent 614415c
commit 13bc366381331a31823de8aa90ea2cca1ca034bf
diff --git a/HelloWorld/Assets/HelloWorld.cs b/HelloWorld/Assets/HelloWorld.cs
@@ -13,9 +13,11 @@ public class HelloWorld : MonoBehaviour {
         Debug.Log("Hello World");
         text.text = "Hello World";
 	}
-
-	// Update is called once per frame
-	void Update () {
+
+
+
+    // Update is called once per frame
+    void Update () {
 
 	}
 }
diff --git a/Roguelike2d/Assets/Font.meta b/Roguelike2d/Assets/Font.meta
diff --git a/Roguelike2d/Assets/Font/Science Fair.otf b/Roguelike2d/Assets/Font/Science Fair.otf
diff --git a/Roguelike2d/Assets/Font/Science Fair.otf.meta b/Roguelike2d/Assets/Font/Science Fair.otf.meta
diff --git a/Roguelike2d/Assets/Prefabs/Environment/Battery.prefab b/Roguelike2d/Assets/Prefabs/Environment/Battery.prefab
diff --git a/Roguelike2d/Assets/Prefabs/Environment/Exit.prefab b/Roguelike2d/Assets/Prefabs/Environment/Exit.prefab
diff --git a/Roguelike2d/Assets/Prefabs/Player/Player.prefab b/Roguelike2d/Assets/Prefabs/Player/Player.prefab
diff --git a/Roguelike2d/Assets/Scenes/ProcGenTest.unity b/Roguelike2d/Assets/Scenes/ProcGenTest.unity
diff --git a/Roguelike2d/Assets/Script/NextLevel.cs b/Roguelike2d/Assets/Script/NextLevel.cs
@@ -4,9 +4,9 @@ using System.Collections;
 public class NextLevel : MonoBehaviour {
     public GameObject player;
 
-    void OnCollisionEnter(Collision col)
+    void OnCollisionEnter2D(Collision2D col)
     {
-        if (col.gameObject.tag == "Exit")
+        if (col.gameObject.tag == "Player")
         {
             Debug.Log("HitExit");
             Application.LoadLevel(0);

diff --git a/Roguelike2d/Assets/Script/Persistence.cs b/Roguelike2d/Assets/Script/Persistence.cs
@@ -0,0 +1,38 @@
+using UnityEngine;
+using System.Collections;
+
+public class Persistence : MonoBehaviour {
+
+    public int health = 100;
+    public int score = 0;
+    public int cores = 0;
+    public int power = 0;
+
+
+    //Awake
+    void Awake()
+    {
+        //DontDestroyOnLoad(health);
+        //DontDestroyOnLoad(score);
+        //DontDestroyOnLoad(power);
+        DontDestroyOnLoad(gameObject);
+    }
+    //Collisoin Detection
+    void OnCollisionEnter2D(Collision2D col)
+    {
+        if (col.gameObject.tag == "EscapeCharge")
+        {
+            Debug.Log("Charge Counted");
+            power = power + 1;
+        }
+    }
+    // Use this for initialization
+    void Start () {
+
+	}
+
+	// Update is called once per frame
+	void Update () {
+
+	}
+}
diff --git a/Roguelike2d/Assets/Script/Persistence.cs.meta b/Roguelike2d/Assets/Script/Persistence.cs.meta
diff --git a/Roguelike2d/Assets/Script/Pickups.cs b/Roguelike2d/Assets/Script/Pickups.cs
@@ -0,0 +1,32 @@
+using UnityEngine;
+using System.Collections;
+
+public class Pickups : MonoBehaviour {
+
+    public int charge = 0;
+    public GameObject exit;
+
+    void OnCollisionEnter2D(Collision2D col)
+    {
+        if (col.gameObject.tag == "EscapeCharge")
+        {
+            Destroy(col.gameObject);
+            Debug.Log("Charge Pickup");
+            charge = charge + 1;
+        }
+    }
+
+    void Update()
+    {
+        //Batteries activating exit
+        if (charge == 4)
+        {
+            GameObject spawn = Instantiate(exit, new Vector2(7, 7), Quaternion.Euler(0, 0, 0)) as GameObject;
+            charge = 6;
+
+            //    exit.SetActive(true);
+            Debug.Log("ExitOpened");
+
+        }
+    }
+}
diff --git a/Roguelike2d/Assets/Script/Pickups.cs.meta b/Roguelike2d/Assets/Script/Pickups.cs.meta
diff --git a/Roguelike2d/Assets/Script/ProdGen/BoardManager.cs b/Roguelike2d/Assets/Script/ProdGen/BoardManager.cs
@@ -149,7 +149,7 @@ public class BoardManager : MonoBehaviour {
             //Instanciate arndom number of enmies based on min/max, at random positions
             LayoutObjectAtRandom(enemyTiles, enemyCount, enemyCount);
             //Instanciate the xtilre til in the upper right hand corner of our game board
-            Instantiate(exit, new Vector3(columns - 1, rows - 1, 0f), Quaternion.identity);
+   //         Instantiate(exit, new Vector3(columns - 1, rows - 1, 0f), Quaternion.identity);
         }
 
     }

diff --git a/Roguelike2d/Assets/Script/TextCore.cs b/Roguelike2d/Assets/Script/TextCore.cs
@@ -0,0 +1,18 @@
+using UnityEngine;
+using System.Collections;
+using UnityEngine.UI;
+
+
+public class TextCore : MonoBehaviour {
+    public Text text;
+
+    // Use this for initialization
+    void Start () {
+
+	}
+
+	// Update is called once per frame
+	void Update () {
+
+	}
+}
diff --git a/Roguelike2d/Assets/Script/TextCore.cs.meta b/Roguelike2d/Assets/Script/TextCore.cs.meta
diff --git a/Roguelike2d/Library/CurrentLayout.dwlt b/Roguelike2d/Library/CurrentLayout.dwlt
diff --git a/Roguelike2d/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Roguelike2d/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/Roguelike2d/Library/assetDatabase3 b/Roguelike2d/Library/assetDatabase3
diff --git a/Roguelike2d/Library/expandedItems b/Roguelike2d/Library/expandedItems
diff --git a/Roguelike2d/Library/metadata/00/00000000000000004000000000000000 b/Roguelike2d/Library/metadata/00/00000000000000004000000000000000
diff --git a/Roguelike2d/Library/metadata/d1/d10aa5ca016ed594dbaf0d44a8063a91 b/Roguelike2d/Library/metadata/d1/d10aa5ca016ed594dbaf0d44a8063a91