Jesus, how late is it?

smz11006 · Oct 6, 2015 · ef75701 · ef75701
1 parent 4d2b55d
commit ef75701
Show file tree

Hide file tree

Showing 36 changed files with 200 additions and 17 deletions.
diff --git a/Test_CYOA/Assembly-CSharp.csproj b/Test_CYOA/Assembly-CSharp.csproj
@@ -51,18 +51,12 @@
      <Compile Include="Assets\Scripts\LeftyRighty.cs" />
      <Compile Include="Assets\Scripts\Puzzle_231.cs" />
      <Compile Include="Assets\Scripts\WorldUpdates.cs" />
- <Reference Include="UnityEngine.Advertisements">
- <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
- </Reference>
  <Reference Include="UnityEngine.UI">
  <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.Networking">
  <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
  </Reference>
- <Reference Include="UnityEngine.Analytics">
- <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
- </Reference>
  <Reference Include="Mono.Cecil">
  <HintPath>C:/Program Files/Unity/Editor/Data/Managed/Mono.Cecil.dll</HintPath>
  </Reference>

diff --git a/Test_CYOA/Assets/CYO_Layout.unity b/Test_CYOA/Assets/CYO_Layout.unity
diff --git a/Test_CYOA/Assets/Materials/CYO_XP.jpg b/Test_CYOA/Assets/Materials/CYO_XP.jpg
diff --git a/Test_CYOA/Assets/Materials/CYO_XP.jpg.meta b/Test_CYOA/Assets/Materials/CYO_XP.jpg.meta
diff --git a/Test_CYOA/Assets/Materials/Materials/CYO_XP.mat b/Test_CYOA/Assets/Materials/Materials/CYO_XP.mat
diff --git a/Test_CYOA/Assets/Materials/Materials/CYO_XP.mat.meta b/Test_CYOA/Assets/Materials/Materials/CYO_XP.mat.meta
diff --git a/Test_CYOA/Assets/Scripts/Combat.cs b/Test_CYOA/Assets/Scripts/Combat.cs
@@ -26,6 +26,11 @@ public class Combat : MonoBehaviour {
     public int enemy1HP = 75;
     public int enemy2HP = 100;
 
+    //Collectables
+    public GameObject healthPickup;
+    public GameObject xpCube;
+    public GameObject gunPickup;
+
 
 
 
@@ -41,11 +46,92 @@ public class Combat : MonoBehaviour {
     void Update()
     {
         ray = Camera.main.ScreenPointToRay(Input.mousePosition);
-
 
+        //Combat
+        if (Physics.Raycast(ray, out hit))
+        {
+            if (Input.GetKeyDown(KeyCode.Mouse0))
+            {
+                if (hit.transform.name == "Enemy1")
+                {
+                    hpValue = hpValue - damageEnemy;
+                    enemy1HP = enemy1HP - damage;
+                    Debug.Log("attack registered");
+                }
+
+            }
+        }
+        if(enemy1HP <= 0)
+        {
+            Destroy(enemy1);
+
+        }
+        if (Physics.Raycast(ray, out hit))
+        {
+            if (Input.GetKeyDown(KeyCode.Mouse0))
+            {
+                if (hit.transform.name == "Enemy2")
+                {
+                    hpValue = hpValue - damageEnemy;
+                    enemy2HP = enemy2HP - damage;
+                    Debug.Log("attack registered");
+                }
+
+            }
+        }
+        if (enemy2HP <= 0)
+        {
+            Destroy(enemy2);
 
+        }
+        //Level Up
+        if (Physics.Raycast(ray, out hit))
+        {
+            if (Input.GetKeyDown(KeyCode.Mouse0))
+            {
+                if (hit.transform.name == "XPCube")
+                {
+                    Destroy(xpCube);
+                    xp = 1;                }
+
+            }
+        }
 
+        if(xp > 0)
+        {
+            damageEnemy = 12;
+        }
+
+
+
+        //HP Pickup
+        if (Physics.Raycast(ray, out hit))
+        {
+            if (Input.GetKeyDown(KeyCode.Mouse0))
+            {
+                if (hit.transform.name == "HealthKit")
+                {
+                    Destroy(healthPickup);
+                    hpValue = hpValue + 30;
+                }
+
+            }
+        }
+
+        //Mega Gun
 
+        if (Physics.Raycast(ray, out hit))
+        {
+            if (Input.GetKeyDown(KeyCode.Mouse0))
+            {
+                if (hit.transform.name == "MegaGun")
+                {
+                    Destroy(gunPickup);
+                    damage = 100;
+                }
+
+            }
+        }
         //HP Display
         hpText.text = "health: " + hpValue;
 

diff --git a/Test_CYOA/Assets/Scripts/Combat.cs.meta b/Test_CYOA/Assets/Scripts/Combat.cs.meta
diff --git a/Test_CYOA/Assets/Scripts/LeftyRighty.cs b/Test_CYOA/Assets/Scripts/LeftyRighty.cs
@@ -24,14 +24,12 @@ public class LeftyRighty : MonoBehaviour {
 			STFU = true;
             yAngle = yAngle + 30;
             gameObject.transform.localEulerAngles = new Vector3(0, yAngle, 0);
-            Debug.Log ("right");
 		}
         if (Input.GetKeyDown(KeyCode.LeftArrow))
         {
             STFU = true;
             yAngle = yAngle - 30;
             gameObject.transform.localEulerAngles = new Vector3(0, yAngle , 0);
-            Debug.Log("left");
         }
     }
 

diff --git a/Test_CYOA/Assets/Scripts/Puzzle_231.cs b/Test_CYOA/Assets/Scripts/Puzzle_231.cs
@@ -109,7 +109,6 @@ public class Puzzle_231 : MonoBehaviour {
 
         if (total == 3)
         {
-            Debug.Log("Puzzle Complete!");
             Destroy(button1);
             Destroy(button2);
             Destroy(button3);

diff --git a/Test_CYOA/Assets/Scripts/WorldUpdates.cs b/Test_CYOA/Assets/Scripts/WorldUpdates.cs
@@ -14,7 +14,8 @@ public class WorldUpdates : MonoBehaviour
     public RaycastHit hit;
 
     //Assets, all of them
-
+    public GameObject enemy1;
+    public GameObject enemy2;
 
     //Initialize Game
     void Awake ()
@@ -29,7 +30,6 @@ public class WorldUpdates : MonoBehaviour
 
     }
 
-
     void Update()
     {
         ray = Camera.main.ScreenPointToRay(Input.mousePosition);
@@ -140,7 +140,7 @@ public class WorldUpdates : MonoBehaviour
             {
                 if (hit.transform.name == "PlayerPos10")
                 {
-                    updateField = "update: moved";
+                    updateField = "could this be the end?";
                 }
 
             }
@@ -176,7 +176,7 @@ public class WorldUpdates : MonoBehaviour
             {
                 if (hit.transform.name == "HealthKit")
                 {
-                    updateField = "update: healt restored to full!";
+                    updateField = "update: health restored!";
                 }
 
             }
@@ -279,6 +279,21 @@ public class WorldUpdates : MonoBehaviour
         }
 
 
+        //Level up
+        if (Physics.Raycast(ray, out hit))
+        {
+            if (Input.GetKeyDown(KeyCode.Mouse0))
+            {
+                if (hit.transform.name == "XPCube")
+                {
+                    updateField = "level up! your durability has increased.";
+                }
+
+            }
+        }
+
+
+
         //Text - Update Field -- Keep Last
         updates.text = updateField;
 

diff --git a/Test_CYOA/Assets/WorldAssets.meta b/Test_CYOA/Assets/WorldAssets.meta
diff --git a/Test_CYOA/Assets/WorldAssets/Enemy1.prefab b/Test_CYOA/Assets/WorldAssets/Enemy1.prefab
diff --git a/Test_CYOA/Assets/WorldAssets/Enemy1.prefab.meta b/Test_CYOA/Assets/WorldAssets/Enemy1.prefab.meta
diff --git a/Test_CYOA/Assets/WorldAssets/Enemy2.prefab b/Test_CYOA/Assets/WorldAssets/Enemy2.prefab
diff --git a/Test_CYOA/Assets/WorldAssets/Enemy2.prefab.meta b/Test_CYOA/Assets/WorldAssets/Enemy2.prefab.meta
diff --git a/Test_CYOA/Library/CurrentLayout.dwlt b/Test_CYOA/Library/CurrentLayout.dwlt
diff --git a/Test_CYOA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Test_CYOA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/Test_CYOA/Library/assetDatabase3 b/Test_CYOA/Library/assetDatabase3
diff --git a/Test_CYOA/Library/expandedItems b/Test_CYOA/Library/expandedItems
diff --git a/Test_CYOA/Library/metadata/00/00000000000000004000000000000000 b/Test_CYOA/Library/metadata/00/00000000000000004000000000000000
diff --git a/Test_CYOA/Library/metadata/2c/2c3ed818d51f9004a95b726b7e336964 b/Test_CYOA/Library/metadata/2c/2c3ed818d51f9004a95b726b7e336964
diff --git a/Test_CYOA/Library/metadata/2c/2c3ed818d51f9004a95b726b7e336964.info b/Test_CYOA/Library/metadata/2c/2c3ed818d51f9004a95b726b7e336964.info
diff --git a/Test_CYOA/Library/metadata/45/45dd86d0e6597e046a3784238f7e6fe2 b/Test_CYOA/Library/metadata/45/45dd86d0e6597e046a3784238f7e6fe2
diff --git a/Test_CYOA/Library/metadata/45/45dd86d0e6597e046a3784238f7e6fe2.info b/Test_CYOA/Library/metadata/45/45dd86d0e6597e046a3784238f7e6fe2.info
diff --git a/Test_CYOA/Library/metadata/56/56ecf65543a85284c8c5ef7c823fdc01 b/Test_CYOA/Library/metadata/56/56ecf65543a85284c8c5ef7c823fdc01
diff --git a/Test_CYOA/Library/metadata/56/56ecf65543a85284c8c5ef7c823fdc01.info b/Test_CYOA/Library/metadata/56/56ecf65543a85284c8c5ef7c823fdc01.info
diff --git a/Test_CYOA/Library/metadata/5e/5e433defd08610a46ac0f36f1de0119a b/Test_CYOA/Library/metadata/5e/5e433defd08610a46ac0f36f1de0119a
diff --git a/Test_CYOA/Library/metadata/5e/5e433defd08610a46ac0f36f1de0119a.info b/Test_CYOA/Library/metadata/5e/5e433defd08610a46ac0f36f1de0119a.info
diff --git a/Test_CYOA/Library/metadata/66/668bb59cd49a7cd4688d0d7307381946 b/Test_CYOA/Library/metadata/66/668bb59cd49a7cd4688d0d7307381946
diff --git a/Test_CYOA/Library/metadata/66/668bb59cd49a7cd4688d0d7307381946.info b/Test_CYOA/Library/metadata/66/668bb59cd49a7cd4688d0d7307381946.info
diff --git a/Test_CYOA/Library/metadata/9f/9f1a7051343fb0945bd017cf40955ea6 b/Test_CYOA/Library/metadata/9f/9f1a7051343fb0945bd017cf40955ea6
diff --git a/Test_CYOA/Library/metadata/c2/c258fce83fd3dd24bbb58cbb8bbe504e b/Test_CYOA/Library/metadata/c2/c258fce83fd3dd24bbb58cbb8bbe504e
diff --git a/Test_CYOA/Library/metadata/d9/d928191460a3b3146888f7b669385d64 b/Test_CYOA/Library/metadata/d9/d928191460a3b3146888f7b669385d64
diff --git a/Test_CYOA/Library/metadata/e8/e89b08af6b41f2f428ba26892718a73d b/Test_CYOA/Library/metadata/e8/e89b08af6b41f2f428ba26892718a73d
diff --git a/Test_CYOA/Test_CYOA.sln b/Test_CYOA/Test_CYOA.sln
@@ -17,7 +17,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																										GlobalSection(MonoDevelopProperties) = preSolution
+																																												GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1