enemyy 2 still doesn't die

smz11006 · Nov 10, 2015 · 399042d · 399042d
1 parent 1d0e265
commit 399042d
Show file tree

Hide file tree

Showing 24 changed files with 115 additions and 18 deletions.
diff --git a/ShipShooter/Assets/Enemies/-Enemy2-RigidBody.prefab b/ShipShooter/Assets/Enemies/-Enemy2-RigidBody.prefab
diff --git a/ShipShooter/Assets/Enemies/Enemy2Bullet.prefab b/ShipShooter/Assets/Enemies/Enemy2Bullet.prefab
diff --git a/ShipShooter/Assets/Scenes/GameScene.unity b/ShipShooter/Assets/Scenes/GameScene.unity
diff --git a/ShipShooter/Assets/Scripts/BackgroundScroll.cs b/ShipShooter/Assets/Scripts/BackgroundScroll.cs
@@ -5,6 +5,6 @@ public class BackgroundScroll : MonoBehaviour {
 
 	void Start ()
     {
-        iTween.MoveTo(gameObject, iTween.Hash("path", iTweenPath.GetPath("BackgroundTrack"), "time", 30, "transition", "easeinSine"));
+        iTween.MoveTo(gameObject, iTween.Hash("path", iTweenPath.GetPath("BackgroundTrack"), "time", 60));
     }
 }
diff --git a/ShipShooter/Assets/Scripts/Enemy1.cs b/ShipShooter/Assets/Scripts/Enemy1.cs
@@ -31,7 +31,7 @@ public class Enemy1 : MonoBehaviour {
         testInt = Mathf.RoundToInt(test);
     //shooting---------------------------------------------------------------------------------
     posCanon = new Vector3(turret.transform.position.x, turret.transform.position.y - 0.5f, turret.transform.position.z);
-        if (testInt % 2 == 0)
+        if (testInt % 4 == 0)
         {
             newBullet = (GameObject)Instantiate(bullet, posCanon, transform.rotation);
             iTween.MoveTo(newBullet, new Vector3(newBullet.transform.position.x, newBullet.transform.position.y - 40, 5), 1);

diff --git a/ShipShooter/Assets/Scripts/Enemy2.cs b/ShipShooter/Assets/Scripts/Enemy2.cs
@@ -13,23 +13,42 @@ public class Enemy2 : MonoBehaviour {
     public GameObject turret;
     public GameObject bullet;
     public Vector3 posCanon;
-
+
+    public float test;
+    public int testInt;
+    public GameObject newBullet;
+
+    public Vector3 playerPos;
+    public GameObject player;
+
     void OnCollisionEnter(Collision collision)
     {
         if (collision.gameObject.tag == "Bullet")
         {
+            Destroy(gameObject);
 
-            health = health - 1;
         }
     }
 
     void Update()
     {
+
+
+        playerPos = new Vector3(player.transform.position.x, player.transform.position.y - 30, player.transform.position.z);
+
         //Shooting ===================================================
-        posCanon = new Vector3(turret.transform.position.x, turret.transform.position.y - 0.5f, turret.transform.position.z);
+        posCanon = new Vector3(gameObject.transform.position.x, gameObject.transform.position.y - 0.5f, gameObject.transform.position.z);
+        test = gameObject.transform.position.y;
+        testInt = Mathf.RoundToInt(test);
+        //shooting---------------------------------------------------------------------------------
+        if (testInt % 4 == 0)
+        {
+            newBullet = (GameObject)Instantiate(bullet, posCanon, transform.rotation);
+            iTween.MoveTo(newBullet, playerPos, 1);
 
+        }
 
-//Health-----------------------------------------------------------------------------------
+        //Health-----------------------------------------------------------------------------------
         if (health == 0)
             Destroy(gameObject);
         if (health == 1)

diff --git a/ShipShooter/Assets/Scripts/EnemySpawner.cs b/ShipShooter/Assets/Scripts/EnemySpawner.cs
@@ -56,15 +56,15 @@ public class EnemySpawner : MonoBehaviour {
 	public void EdgeSpawn()
 	{
 		enemy1_left1 = (GameObject)Instantiate(enemy1, spawn1, Quaternion.Euler(enemyAngle));
-		enemy1_right1 = (GameObject)Instantiate(enemy1, spawn1, Quaternion.Euler(enemyAngle));
+		enemy1_right1 = (GameObject)Instantiate(enemy1, spawn12, Quaternion.Euler(enemyAngle));
 		iTween.MoveTo(enemy1_left1, iTween.Hash("path", iTweenPath.GetPath("LeftCurve1"), "time", 10));
 		iTween.MoveTo(enemy1_right1, iTween.Hash("path", iTweenPath.GetPath("RightCurve1"), "time", 10));
 
 	}
 	public void EdgeSpawnIn()
 	{
 		enemy1_left2 = (GameObject)Instantiate(enemy1, spawn2, Quaternion.Euler(enemyAngle));
-		enemy1_right2 = (GameObject)Instantiate(enemy1, spawn2, Quaternion.Euler(enemyAngle));
+		enemy1_right2 = (GameObject)Instantiate(enemy1, spawn11, Quaternion.Euler(enemyAngle));
 
 		iTween.MoveTo(enemy1_left2, iTween.Hash("path", iTweenPath.GetPath("LeftCurve2"), "time", 10));
 		iTween.MoveTo(enemy1_right2, iTween.Hash("path", iTweenPath.GetPath("RightCurve2"), "time", 10));
@@ -74,13 +74,30 @@ public class EnemySpawner : MonoBehaviour {
 	public void EdgeSpawnLast()
 	{
 		enemy1_left3 = (GameObject)Instantiate(enemy1, spawn3, Quaternion.Euler(enemyAngle));
-		enemy1_right3 = (GameObject)Instantiate(enemy1, spawn3, Quaternion.Euler(enemyAngle));
+		enemy1_right3 = (GameObject)Instantiate(enemy1, spawn10, Quaternion.Euler(enemyAngle));
 
 		iTween.MoveTo(enemy1_left3, iTween.Hash("path", iTweenPath.GetPath("LeftCurve3"), "time", 10));
 		iTween.MoveTo(enemy1_right3, iTween.Hash("path", iTweenPath.GetPath("RightCurve3"), "time", 10));
 
 	}
 
+    public void MidSpawnEdges()
+    {
+        enemy1_left1 = (GameObject)Instantiate(enemy2, spawn4, Quaternion.Euler(enemyAngle));
+        enemy1_right1 = (GameObject)Instantiate(enemy2, spawn9, Quaternion.Euler(enemyAngle));
+
+        iTween.MoveTo(enemy1_left1, iTween.Hash("path", iTweenPath.GetPath("CrossPath Mid-Left 1"), "time", 10));
+        iTween.MoveTo(enemy1_right1, iTween.Hash("path", iTweenPath.GetPath("CrossPath Mid-Right 1"), "time", 10));
+    }
+    public void MidSpawnMids()
+    {
+        enemy1_left1 = (GameObject)Instantiate(enemy2, spawn5, Quaternion.Euler(enemyAngle));
+        enemy1_right1 = (GameObject)Instantiate(enemy2, spawn8, Quaternion.Euler(enemyAngle));
+
+        iTween.MoveTo(enemy1_left1, iTween.Hash("path", iTweenPath.GetPath("CrossPath Mid-Left 2"), "time", 10));
+        iTween.MoveTo(enemy1_right1, iTween.Hash("path", iTweenPath.GetPath("CrossPath Mid-Right 2"), "time", 10));
+    }
+
     //IEnumerator
     IEnumerator EnemySpawn()
     {
@@ -91,7 +108,7 @@ public class EnemySpawner : MonoBehaviour {
                 Debug.Log("Enumerator Starts");
                 enemy1count = 1;
                 enemy1_left1 = (GameObject)Instantiate(enemy1, spawn1, Quaternion.Euler(enemyAngle));
-                enemy1_right1 = (GameObject)Instantiate(enemy1, spawn1, Quaternion.Euler(enemyAngle));
+                enemy1_right1 = (GameObject)Instantiate(enemy1, spawn12, Quaternion.Euler(enemyAngle));
 
                 iTween.MoveTo(enemy1_left1, iTween.Hash("path", iTweenPath.GetPath("LeftCurve1"), "time", 10));
                 iTween.MoveTo(enemy1_right1, iTween.Hash("path", iTweenPath.GetPath("RightCurve1"), "time", 10));
@@ -100,7 +117,7 @@ public class EnemySpawner : MonoBehaviour {
 
                 yield return new WaitForSeconds(0.2f);
                 enemy1_left2 = (GameObject)Instantiate(enemy1, spawn2, Quaternion.Euler(enemyAngle));
-                enemy1_right2 = (GameObject)Instantiate(enemy1, spawn2, Quaternion.Euler(enemyAngle));
+                enemy1_right2 = (GameObject)Instantiate(enemy1, spawn11, Quaternion.Euler(enemyAngle));
 
                 iTween.MoveTo(enemy1_left2, iTween.Hash("path", iTweenPath.GetPath("LeftCurve2"), "time", 10));
                 iTween.MoveTo(enemy1_right2, iTween.Hash("path", iTweenPath.GetPath("RightCurve2"), "time", 10));
@@ -113,9 +130,22 @@ public class EnemySpawner : MonoBehaviour {
                 iTween.MoveTo(enemy1_left3, iTween.Hash("path", iTweenPath.GetPath("LeftCurve3"), "time", 10));
                 iTween.MoveTo(enemy1_right3, iTween.Hash("path", iTweenPath.GetPath("RightCurve3"), "time", 10));
                 //                EdgeSpawnLast();
+
+                yield return new WaitForSeconds(2f);
+                MidSpawnEdges();
+
+                yield return new WaitForSeconds(2f);
+                MidSpawnMids();
+                yield return new WaitForSeconds(2f);
+
+                EdgeSpawn();
+                MidSpawnEdges();
+                yield return new WaitForSeconds(2f);
+
+
+
                 Debug.Log("enumerator Ends");
-                //randomNum = Random.Range(1, 3);
+
-                //enemy1count = 0;
             }
 
         }

diff --git a/ShipShooter/Assets/Scripts/Legosteroid.cs b/ShipShooter/Assets/Scripts/Legosteroid.cs
@@ -0,0 +1,11 @@
+using UnityEngine;
+using System.Collections;
+
+public class Legosteroid : MonoBehaviour {
+
+    public gameObject legosteroid;
+    public gameObject piece1;
+    public gameObject piece2;
+    public gameObject piece3;
+    public gameObject piece4;
+}
diff --git a/ShipShooter/Assets/Scripts/Legosteroid.cs.meta b/ShipShooter/Assets/Scripts/Legosteroid.cs.meta
diff --git a/ShipShooter/Assets/Scripts/PlayerHealth.cs b/ShipShooter/Assets/Scripts/PlayerHealth.cs
@@ -26,6 +26,12 @@ public class PlayerHealth : MonoBehaviour {
     public GameObject shieldbar9;
     public GameObject shieldbar10;
 
+    //Player Position =====================
+    public Vector3 playerPos;
+    public Vector3 staticPos;
+
+    public float distance;
+    public int distanceInt;
 
 
     public int playerHealth = 100;
@@ -62,21 +68,39 @@ public class PlayerHealth : MonoBehaviour {
         }
     }
 
-    if (playerHealth == 0)
+
-        {
-        }
 
     //Start-----------------------------------------------------------
     void Start()
     {
-
+        staticPos = new Vector3(gameObject.transform.position.x, gameObject.transform.position.y, gameObject.transform.position.z);
     }
 
     // Update----------------------------------------------------------
     void Update ()
     {
+        //Death Condition ----------------------------
+        if (playerHealth <= 0)
+        {
+            Application.LoadLevel(2);
+        }
+        //Shield Regen
+        playerPos = new Vector3(gameObject.transform.position.x, gameObject.transform.position.y, gameObject.transform.position.z);
+        distance = Vector3.Distance(playerPos, staticPos);
+        distanceInt = Mathf.RoundToInt(distance);
+
+        if (playerShields < 100)
+        {
+            if (distanceInt % 10 == 0)
+            {
+                playerShields = playerShields + 10;
+              //  staticPos = new Vector3(gameObject.transform.position.x, gameObject.transform.position.y, gameObject.transform.position.z);
+                staticPos = playerPos;
+            }
+        }
+
         //Shield Switch ------------------------------
-	switch(playerShields)
+        switch (playerShields)
         {
             case 0:
                 shieldbar1.SetActive(false);

diff --git a/ShipShooter/Library/CurrentLayout.dwlt b/ShipShooter/Library/CurrentLayout.dwlt
diff --git a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
diff --git a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/ShipShooter/Library/assetDatabase3 b/ShipShooter/Library/assetDatabase3
diff --git a/ShipShooter/Library/expandedItems b/ShipShooter/Library/expandedItems
diff --git a/ShipShooter/Library/metadata/00/00000000000000004000000000000000 b/ShipShooter/Library/metadata/00/00000000000000004000000000000000
diff --git a/ShipShooter/Library/metadata/3d/3d6f92a605a842645b772002f4f174a9 b/ShipShooter/Library/metadata/3d/3d6f92a605a842645b772002f4f174a9
diff --git a/ShipShooter/Library/metadata/59/5906a6a77aa99d442a84c7cffa7b6507 b/ShipShooter/Library/metadata/59/5906a6a77aa99d442a84c7cffa7b6507
diff --git a/ShipShooter/Library/metadata/59/5906a6a77aa99d442a84c7cffa7b6507.info b/ShipShooter/Library/metadata/59/5906a6a77aa99d442a84c7cffa7b6507.info
diff --git a/ShipShooter/Library/metadata/66/664b40cee94497647a1815c7bd525a6c b/ShipShooter/Library/metadata/66/664b40cee94497647a1815c7bd525a6c
diff --git a/ShipShooter/Library/metadata/b3/b3fbc82f895666d44928830fde115913 b/ShipShooter/Library/metadata/b3/b3fbc82f895666d44928830fde115913
diff --git a/ShipShooter/Library/metadata/b8/b8d9d8ca408b6484eb25aa1be2f7919b b/ShipShooter/Library/metadata/b8/b8d9d8ca408b6484eb25aa1be2f7919b
diff --git a/ShipShooter/Library/metadata/f7/f7772ef56e6010145ace7cd4ac93f07d b/ShipShooter/Library/metadata/f7/f7772ef56e6010145ace7cd4ac93f07d
diff --git a/ShipShooter/ShipShooter.CSharp.csproj b/ShipShooter/ShipShooter.CSharp.csproj
@@ -73,6 +73,7 @@
     <Compile Include="Assets\Scripts\Enemy1.cs" />
     <Compile Include="Assets\Scripts\Enemy2.cs" />
     <Compile Include="Assets\Scripts\EnemySpawner.cs" />
+    <Compile Include="Assets\Scripts\Legosteroid.cs" />
     <Compile Include="Assets\Scripts\PlayerControls.cs" />
     <Compile Include="Assets\Scripts\PlayerHealth.cs" />
     <Compile Include="Assets\iTweenEditor\Examples\StartAndStopTween.cs" />