diff --git a/Roguelike2d/Assets/Prefabs/Enemies/Megabot_Melee.prefab b/Roguelike2d/Assets/Prefabs/Enemies/Megabot_Melee.prefab index bc238db3..53b50bd1 100644 Binary files a/Roguelike2d/Assets/Prefabs/Enemies/Megabot_Melee.prefab and b/Roguelike2d/Assets/Prefabs/Enemies/Megabot_Melee.prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Enemies/Megabot_Ranged.prefab b/Roguelike2d/Assets/Prefabs/Enemies/Megabot_Ranged.prefab index a9c3dab1..33045b8e 100644 Binary files a/Roguelike2d/Assets/Prefabs/Enemies/Megabot_Ranged.prefab and b/Roguelike2d/Assets/Prefabs/Enemies/Megabot_Ranged.prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Enemies/Projectile.prefab b/Roguelike2d/Assets/Prefabs/Enemies/Projectile.prefab new file mode 100644 index 00000000..001b0520 Binary files /dev/null and b/Roguelike2d/Assets/Prefabs/Enemies/Projectile.prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Enemies/Projectile.prefab.meta b/Roguelike2d/Assets/Prefabs/Enemies/Projectile.prefab.meta new file mode 100644 index 00000000..a86eab87 --- /dev/null +++ b/Roguelike2d/Assets/Prefabs/Enemies/Projectile.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bec9b6150092da244a9982da85522b87 +timeCreated: 1450163419 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Prefabs/Enemies/Skull_Melee.prefab b/Roguelike2d/Assets/Prefabs/Enemies/Skull_Melee.prefab index a45e234d..b71bc95f 100644 Binary files a/Roguelike2d/Assets/Prefabs/Enemies/Skull_Melee.prefab and b/Roguelike2d/Assets/Prefabs/Enemies/Skull_Melee.prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Enemies/Skull_Ranged.prefab b/Roguelike2d/Assets/Prefabs/Enemies/Skull_Ranged.prefab index 58db023e..7864de13 100644 Binary files a/Roguelike2d/Assets/Prefabs/Enemies/Skull_Ranged.prefab and b/Roguelike2d/Assets/Prefabs/Enemies/Skull_Ranged.prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Environment/Coin.prefab b/Roguelike2d/Assets/Prefabs/Environment/Coin.prefab index 7d3e7e3c..18652281 100644 Binary files a/Roguelike2d/Assets/Prefabs/Environment/Coin.prefab and b/Roguelike2d/Assets/Prefabs/Environment/Coin.prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Environment/Health.prefab b/Roguelike2d/Assets/Prefabs/Environment/Health.prefab index b7e0a552..a5813a3a 100644 Binary files a/Roguelike2d/Assets/Prefabs/Environment/Health.prefab and b/Roguelike2d/Assets/Prefabs/Environment/Health.prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Environment/Powerup.prefab b/Roguelike2d/Assets/Prefabs/Environment/Powerup.prefab index eb5ee158..8aed9542 100644 Binary files a/Roguelike2d/Assets/Prefabs/Environment/Powerup.prefab and b/Roguelike2d/Assets/Prefabs/Environment/Powerup.prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Environment/Wall1.prefab b/Roguelike2d/Assets/Prefabs/Environment/Wall1.prefab index d825a74d..ed7288ed 100644 Binary files a/Roguelike2d/Assets/Prefabs/Environment/Wall1.prefab and b/Roguelike2d/Assets/Prefabs/Environment/Wall1.prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Environment/Wall2.prefab b/Roguelike2d/Assets/Prefabs/Environment/Wall2.prefab index 80caa9fd..29949f38 100644 Binary files a/Roguelike2d/Assets/Prefabs/Environment/Wall2.prefab and b/Roguelike2d/Assets/Prefabs/Environment/Wall2.prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Persistence/Charge (1).prefab b/Roguelike2d/Assets/Prefabs/Persistence/Charge (1).prefab new file mode 100644 index 00000000..ae263d5d Binary files /dev/null and b/Roguelike2d/Assets/Prefabs/Persistence/Charge (1).prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Persistence/Charge (1).prefab.meta b/Roguelike2d/Assets/Prefabs/Persistence/Charge (1).prefab.meta new file mode 100644 index 00000000..5a81bddf --- /dev/null +++ b/Roguelike2d/Assets/Prefabs/Persistence/Charge (1).prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d5c31a8add804f24cb16798bca47cde5 +timeCreated: 1450156101 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Prefabs/Persistence/Cores (1).prefab b/Roguelike2d/Assets/Prefabs/Persistence/Cores (1).prefab new file mode 100644 index 00000000..154cebd1 Binary files /dev/null and b/Roguelike2d/Assets/Prefabs/Persistence/Cores (1).prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Persistence/Cores (1).prefab.meta b/Roguelike2d/Assets/Prefabs/Persistence/Cores (1).prefab.meta new file mode 100644 index 00000000..485b57f9 --- /dev/null +++ b/Roguelike2d/Assets/Prefabs/Persistence/Cores (1).prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a30784adb3b7594eb9b343cea95af62 +timeCreated: 1450156105 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Prefabs/Persistence/Health (1).prefab b/Roguelike2d/Assets/Prefabs/Persistence/Health (1).prefab new file mode 100644 index 00000000..03ec096c Binary files /dev/null and b/Roguelike2d/Assets/Prefabs/Persistence/Health (1).prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Persistence/Health (1).prefab.meta b/Roguelike2d/Assets/Prefabs/Persistence/Health (1).prefab.meta new file mode 100644 index 00000000..6e6cff0c --- /dev/null +++ b/Roguelike2d/Assets/Prefabs/Persistence/Health (1).prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9d90cda5ae928c945858c7b854f20514 +timeCreated: 1450156099 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Prefabs/Persistence/Score (1).prefab b/Roguelike2d/Assets/Prefabs/Persistence/Score (1).prefab new file mode 100644 index 00000000..3b4b0b11 Binary files /dev/null and b/Roguelike2d/Assets/Prefabs/Persistence/Score (1).prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Persistence/Score (1).prefab.meta b/Roguelike2d/Assets/Prefabs/Persistence/Score (1).prefab.meta new file mode 100644 index 00000000..2c312b5d --- /dev/null +++ b/Roguelike2d/Assets/Prefabs/Persistence/Score (1).prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2c4551b7fa6c004db42a705bc195aea +timeCreated: 1450156103 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Prefabs/Persistence/UIElementController.prefab b/Roguelike2d/Assets/Prefabs/Persistence/UIElementController.prefab index c573c5c1..7dbebc39 100644 Binary files a/Roguelike2d/Assets/Prefabs/Persistence/UIElementController.prefab and b/Roguelike2d/Assets/Prefabs/Persistence/UIElementController.prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Player/Attack.prefab b/Roguelike2d/Assets/Prefabs/Player/Attack.prefab new file mode 100644 index 00000000..9011af31 Binary files /dev/null and b/Roguelike2d/Assets/Prefabs/Player/Attack.prefab differ diff --git a/Roguelike2d/Assets/Prefabs/Player/Attack.prefab.meta b/Roguelike2d/Assets/Prefabs/Player/Attack.prefab.meta new file mode 100644 index 00000000..1002cae8 --- /dev/null +++ b/Roguelike2d/Assets/Prefabs/Player/Attack.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f6ed7ab402149a4a8069d514f915827 +timeCreated: 1450161641 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Prefabs/Player/Player.prefab b/Roguelike2d/Assets/Prefabs/Player/Player.prefab index 2221f44d..e004149c 100644 Binary files a/Roguelike2d/Assets/Prefabs/Player/Player.prefab and b/Roguelike2d/Assets/Prefabs/Player/Player.prefab differ diff --git a/Roguelike2d/Assets/Scenes/Controls.unity b/Roguelike2d/Assets/Scenes/Controls.unity new file mode 100644 index 00000000..1f21512f Binary files /dev/null and b/Roguelike2d/Assets/Scenes/Controls.unity differ diff --git a/Roguelike2d/Assets/Scenes/Controls.unity.meta b/Roguelike2d/Assets/Scenes/Controls.unity.meta new file mode 100644 index 00000000..18f248ce --- /dev/null +++ b/Roguelike2d/Assets/Scenes/Controls.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93e017a8bcf19f744903f8b58d4b57db +timeCreated: 1450165530 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Scenes/LoseScreen.unity b/Roguelike2d/Assets/Scenes/LoseScreen.unity new file mode 100644 index 00000000..c648c20b Binary files /dev/null and b/Roguelike2d/Assets/Scenes/LoseScreen.unity differ diff --git a/Roguelike2d/Assets/Scenes/LoseScreen.unity.meta b/Roguelike2d/Assets/Scenes/LoseScreen.unity.meta new file mode 100644 index 00000000..dffbf261 --- /dev/null +++ b/Roguelike2d/Assets/Scenes/LoseScreen.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3cbfdf70cef80ad448cc775b8db52b9d +timeCreated: 1450165541 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Scenes/Menu.unity b/Roguelike2d/Assets/Scenes/Menu.unity new file mode 100644 index 00000000..a6bff0f8 Binary files /dev/null and b/Roguelike2d/Assets/Scenes/Menu.unity differ diff --git a/Roguelike2d/Assets/Scenes/Menu.unity.meta b/Roguelike2d/Assets/Scenes/Menu.unity.meta new file mode 100644 index 00000000..dbaabeb8 --- /dev/null +++ b/Roguelike2d/Assets/Scenes/Menu.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 03992e6e0f9ae7d42a04d26f4b27b266 +timeCreated: 1450165258 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Scenes/ProcGenTest.unity b/Roguelike2d/Assets/Scenes/ProcGenTest.unity index fb039f12..4e2b0a1c 100644 Binary files a/Roguelike2d/Assets/Scenes/ProcGenTest.unity and b/Roguelike2d/Assets/Scenes/ProcGenTest.unity differ diff --git a/Roguelike2d/Assets/Script/Archer.cs b/Roguelike2d/Assets/Script/Archer.cs new file mode 100644 index 00000000..d9b0f769 --- /dev/null +++ b/Roguelike2d/Assets/Script/Archer.cs @@ -0,0 +1,50 @@ +using UnityEngine; +using System.Collections; + +public class Archer : MonoBehaviour +{ + public int ammo = 5; + + public Transform target;//set target from inspector instead of looking in Update + public float speed = 1f; + public GameObject player = GameObject.Find("Player"); + // public Vector2 playerSpot; + public Vector2 enemySpot; + public float distance; + + public GameObject projectile; + + public Transform player2; + // Use this for initialization + void Start() + { + + } + + // Update is called once per frame + void Update() + { + //rotate to look at the player + transform.LookAt(target.position); + transform.Rotate(new Vector3(0, -90, 0), Space.Self);//correcting the original rotation + + + //move towards the player + if (Vector3.Distance(transform.position, target.position) > 3f) + {//move if distance from target is greater than 1 + transform.Translate(new Vector3(speed * Time.deltaTime, 0, 0)); + if (ammo > 0) + { + GameObject spawn = Instantiate(projectile, new Vector2(transform.position.x, transform.position.y), Quaternion.Euler(0, 0, 0)) as GameObject; + ammo = ammo - 1; + } + + } + + + + + + + } +} diff --git a/Roguelike2d/Assets/Script/Archer.cs.meta b/Roguelike2d/Assets/Script/Archer.cs.meta new file mode 100644 index 00000000..9c0a4155 --- /dev/null +++ b/Roguelike2d/Assets/Script/Archer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: bb5b1d9cdeaacd84d902b7e6f2de3a35 +timeCreated: 1450163173 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Script/LargeArcher.cs b/Roguelike2d/Assets/Script/LargeArcher.cs new file mode 100644 index 00000000..65e2a51d --- /dev/null +++ b/Roguelike2d/Assets/Script/LargeArcher.cs @@ -0,0 +1,61 @@ +using UnityEngine; +using System.Collections; + +public class LargeArcher : MonoBehaviour { + public int ammo = 10; + + public Transform target;//set target from inspector instead of looking in Update + public float speed = 1f; + public GameObject player = GameObject.Find("Player"); + // public Vector2 playerSpot; + public Vector2 enemySpot; + public float distance; + + public GameObject projectile; + + public Vector2 backupPos = new Vector2(7,7); + + public Transform player2; + // Use this for initialization + void Start() + { + + } + + // Update is called once per frame + void Update() + { + //rotate to look at the player + transform.LookAt(target.position); + transform.Rotate(new Vector3(0, -90, 0), Space.Self);//correcting the original rotation + + + //move towards the player + if (Vector3.Distance(transform.position, target.position) > 3f) + {//move if distance from target is greater than 1 + transform.Translate(new Vector3(speed * Time.deltaTime, 0, 0)); + if (ammo > 0) + { + GameObject spawn = Instantiate(projectile, new Vector2(transform.position.x, transform.position.y), Quaternion.Euler(0, 0, 0)) as GameObject; + ammo = ammo - 1; + } + + } + //if (Vector3.Distance(transform.position, target.position) < 2f) + //{ + // transform.Translate(new Vector3(speed * Time.deltaTime, 7, 7)); + + //} + //if (Vector3.Distance(transform.position, target.position) > 7f) + //{ + // ammo = 10; + //} + + + + + + + + } +} diff --git a/Roguelike2d/Assets/Script/LargeArcher.cs.meta b/Roguelike2d/Assets/Script/LargeArcher.cs.meta new file mode 100644 index 00000000..6b237992 --- /dev/null +++ b/Roguelike2d/Assets/Script/LargeArcher.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: fd6419715fc15344e8059ab7ca81a23f +timeCreated: 1450163748 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Script/LargeRobot.cs b/Roguelike2d/Assets/Script/LargeRobot.cs new file mode 100644 index 00000000..7f2ff63e --- /dev/null +++ b/Roguelike2d/Assets/Script/LargeRobot.cs @@ -0,0 +1,38 @@ +using UnityEngine; +using System.Collections; + +public class LargeRobot : MonoBehaviour { + + public Transform target;//set target from inspector instead of looking in Update + public float speed = 1f; + public GameObject player = GameObject.Find("Player"); + // public Vector2 playerSpot; + public Vector2 enemySpot; + public float distance; + + public Transform player2; + // Use this for initialization + void Start() + { + + } + + // Update is called once per frame + void Update() + { + //rotate to look at the player + transform.LookAt(target.position); + transform.Rotate(new Vector3(0, -90, 0), Space.Self);//correcting the original rotation + + + //move towards the player + if (Vector3.Distance(transform.position, target.position) > 2f) + {//move if distance from target is greater than 1 + transform.Translate(new Vector3(speed * Time.deltaTime, 0, 0)); + } + + + + + } +} diff --git a/Roguelike2d/Assets/Script/LargeRobot.cs.meta b/Roguelike2d/Assets/Script/LargeRobot.cs.meta new file mode 100644 index 00000000..2cd917cc --- /dev/null +++ b/Roguelike2d/Assets/Script/LargeRobot.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: a72a4e81874fd834e87f4d949d15dd51 +timeCreated: 1450163756 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Script/MenuScript.cs b/Roguelike2d/Assets/Script/MenuScript.cs new file mode 100644 index 00000000..d009080c --- /dev/null +++ b/Roguelike2d/Assets/Script/MenuScript.cs @@ -0,0 +1,29 @@ +using UnityEngine; +using System.Collections; + +public class MenuScript : MonoBehaviour { + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } + + public void StartGame() + { + Application.LoadLevel(1); + } + public void ControlMenu() + { + Application.LoadLevel(2); + } + public void ReturnToMenu() + { + Application.LoadLevel(0); + } + +} diff --git a/Roguelike2d/Assets/Script/MenuScript.cs.meta b/Roguelike2d/Assets/Script/MenuScript.cs.meta new file mode 100644 index 00000000..37db4cd1 --- /dev/null +++ b/Roguelike2d/Assets/Script/MenuScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: e13c044964c552e449f5cae79bbde095 +timeCreated: 1450165479 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Script/NextLevel.cs b/Roguelike2d/Assets/Script/NextLevel.cs index bafa5828..e4ffc8ae 100644 --- a/Roguelike2d/Assets/Script/NextLevel.cs +++ b/Roguelike2d/Assets/Script/NextLevel.cs @@ -11,7 +11,7 @@ public class NextLevel : MonoBehaviour { { checker = checker + 1; Debug.Log("HitExit"); - Application.LoadLevel(0); + Application.LoadLevel(1); } } } diff --git a/Roguelike2d/Assets/Script/Pickups.cs b/Roguelike2d/Assets/Script/Pickups.cs index 17e5ef39..882aeb98 100644 --- a/Roguelike2d/Assets/Script/Pickups.cs +++ b/Roguelike2d/Assets/Script/Pickups.cs @@ -3,9 +3,17 @@ using System.Collections; public class Pickups : MonoBehaviour { + public int isVulnerable = 0; + + public int score = 0; + public int charge = 0; public GameObject exit; + public int health = 100; + + public int power = 0; + public GameObject gameObjects; void OnCollisionEnter2D(Collision2D col) { @@ -14,11 +22,60 @@ public class Pickups : MonoBehaviour { Destroy(col.gameObject); Debug.Log("Charge Pickup"); charge = charge + 1; + score = score + 10; + } + if (col.gameObject.tag == "Coin") + { + Destroy(col.gameObject); + Debug.Log("Coin Pickup"); + score = score + 5; + } + if (col.gameObject.tag == "Health") + { + Destroy(col.gameObject); + Debug.Log("HP Pickup"); + score = score + 2; + health = health + 15; + } + if (col.gameObject.tag == "Powerup") + { + Destroy(col.gameObject); + Debug.Log("nuke Pickup"); + score = score + 20; + power = power + 50; } + + if (col.gameObject.tag == "Enemy") + { + if (isVulnerable == 0) + { + StartCoroutine(TakeDamage()); + } + } + if (col.gameObject.tag == "Hazard") + { + if (isVulnerable == 0) + { + StartCoroutine(TakeDamage()); + } + } + } + + public IEnumerator TakeDamage() + { + isVulnerable = 1; + health = health - 10; + yield return new WaitForSeconds(0.2f); + isVulnerable = 0; } + void Update() { + if (health <= 0) + { + Application.LoadLevel(3); + } //Batteries activating exit if (charge == 4) { @@ -29,5 +86,24 @@ public class Pickups : MonoBehaviour { Debug.Log("ExitOpened"); } + if(Input.GetKeyDown(KeyCode.Space)) + { + if (power >= 100) + { + power = power - 100; + DestroyGameObjectsWithTag("Hazard"); + DestroyGameObjectsWithTag("Enemy"); + } + } } + + public static void DestroyGameObjectsWithTag(string tag) + { + GameObject[] gameObjects = GameObject.FindGameObjectsWithTag(tag); + foreach (GameObject target in gameObjects) + { + GameObject.Destroy(target); + } + } + } diff --git a/Roguelike2d/Assets/Script/PlayerAttack.cs b/Roguelike2d/Assets/Script/PlayerAttack.cs new file mode 100644 index 00000000..16fcdbed --- /dev/null +++ b/Roguelike2d/Assets/Script/PlayerAttack.cs @@ -0,0 +1,49 @@ +using UnityEngine; +using System.Collections; + +public class PlayerAttack : MonoBehaviour +{ + public GameObject attackbox; + public GameObject hitter; + public GameObject player; + + public int attackMode = 0; + + + // Use this for initialization + void Start() + { + + } + + // Update is called once per frame + void Update() + { + if (Input.GetKeyDown(KeyCode.Mouse0)) + { + //attackbox = (GameObject)Instantiate(hitter, new Vector2(player.transform.position.x, player.transform.position.y), Quaternion.identity) as GameObject; + StartCoroutine(AttackMode()); + + } + } + + public IEnumerator AttackMode() + { + attackMode = 1; + yield return new WaitForSeconds(.15f); + attackMode = 0; + } + + void OnCollisionEnter2D(Collision2D col) + { + if (col.gameObject.tag == "Enemy") + { + if (attackMode == 1) + { + Destroy(col.gameObject); + Debug.Log("Attack Successful"); + + } + } + } +} diff --git a/Roguelike2d/Assets/Script/PlayerAttack.cs.meta b/Roguelike2d/Assets/Script/PlayerAttack.cs.meta new file mode 100644 index 00000000..f8f52999 --- /dev/null +++ b/Roguelike2d/Assets/Script/PlayerAttack.cs.meta @@ -0,0 +1,15 @@ +fileFormatVersion: 2 +guid: 1479c12e9bb9e364cb4808e47a88162f +timeCreated: 1450161660 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: + - attackbox: {fileID: 174972, guid: 0f6ed7ab402149a4a8069d514f915827, type: 2} + - hitter: {instanceID: 0} + - player: {fileID: 135352, guid: af642ff3cd5e7ad43a77840be8f4e697, type: 2} + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Script/PlayerMovement.cs b/Roguelike2d/Assets/Script/PlayerMovement.cs index bb31309a..78e00114 100644 --- a/Roguelike2d/Assets/Script/PlayerMovement.cs +++ b/Roguelike2d/Assets/Script/PlayerMovement.cs @@ -9,6 +9,7 @@ public class PlayerMovement : MonoBehaviour { void Update() { + //AMOves if (Input.GetKey(KeyCode.D)) { transform.Translate(Vector2.right * speed * Time.deltaTime); diff --git a/Roguelike2d/Assets/Script/PlayerSpawn.cs b/Roguelike2d/Assets/Script/PlayerSpawn.cs new file mode 100644 index 00000000..c355e6f7 --- /dev/null +++ b/Roguelike2d/Assets/Script/PlayerSpawn.cs @@ -0,0 +1,19 @@ +using UnityEngine; +using System.Collections; + +public class PlayerSpawn : MonoBehaviour { + public GameObject player; + public GameObject thePlayer; + + // Use this for initialization + void Start () + { + thePlayer = (GameObject)Instantiate(player, new Vector2(0,0), Quaternion.identity); + + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/Roguelike2d/Assets/Script/PlayerSpawn.cs.meta b/Roguelike2d/Assets/Script/PlayerSpawn.cs.meta new file mode 100644 index 00000000..52efcb11 --- /dev/null +++ b/Roguelike2d/Assets/Script/PlayerSpawn.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: bb8ea862fc67984439b65a645ef7e02b +timeCreated: 1450160532 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Script/Projectile.cs b/Roguelike2d/Assets/Script/Projectile.cs new file mode 100644 index 00000000..ef1fd8b0 --- /dev/null +++ b/Roguelike2d/Assets/Script/Projectile.cs @@ -0,0 +1,42 @@ +using UnityEngine; +using System.Collections; + +public class Projectile : MonoBehaviour +{ + + + public Transform target;//set target from inspector instead of looking in Update + public float speed = 3f; + public GameObject player = GameObject.Find("Player"); + // public Vector2 playerSpot; + public Vector2 enemySpot; + public float distance; + + public Transform player2; + // Use this for initialization + void Start() + { + + } + + // Update is called once per frame + void Update() + { + //rotate to look at the player + transform.LookAt(target.position); + transform.Rotate(new Vector3(0, -90, 0), Space.Self);//correcting the original rotation + + + //move towards the player + if (Vector3.Distance(transform.position, target.position) > 0.5f) + {//move if distance from target is greater than 1 + transform.Translate(new Vector3(speed * Time.deltaTime, 0, 0)); + } + + + + + + } +} + diff --git a/Roguelike2d/Assets/Script/Projectile.cs.meta b/Roguelike2d/Assets/Script/Projectile.cs.meta new file mode 100644 index 00000000..844f5e5a --- /dev/null +++ b/Roguelike2d/Assets/Script/Projectile.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 5c930cd5c6cffa249898e40a549e5990 +timeCreated: 1450163740 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Script/TextCore.cs b/Roguelike2d/Assets/Script/TextCore.cs index e8ba5f1a..d14667a7 100644 --- a/Roguelike2d/Assets/Script/TextCore.cs +++ b/Roguelike2d/Assets/Script/TextCore.cs @@ -29,7 +29,7 @@ public class TextCore : MonoBehaviour { //Awake void Awake() { - DontDestroyOnLoad(gameObject); + //DontDestroyOnLoad(gameObject); Persistence persistence = persistentStats.GetComponent(); @@ -63,6 +63,9 @@ public class TextCore : MonoBehaviour { { cores = 4; } + score = pickups.score; + health = pickups.health; + power = pickups.power; // cores = nextlevel.checker; diff --git a/Roguelike2d/Assets/Script/Zombie.cs b/Roguelike2d/Assets/Script/Zombie.cs new file mode 100644 index 00000000..2c9211ba --- /dev/null +++ b/Roguelike2d/Assets/Script/Zombie.cs @@ -0,0 +1,39 @@ +using UnityEngine; +using System.Collections; + +public class Zombie : MonoBehaviour +{ + + public Transform target;//set target from inspector instead of looking in Update + public float speed = 1f; + public GameObject player = GameObject.Find("Player"); + // public Vector2 playerSpot; + public Vector2 enemySpot; + public float distance; + + public Transform player2; + // Use this for initialization + void Start() + { + + } + + // Update is called once per frame + void Update() + { + //rotate to look at the player + transform.LookAt(target.position); + transform.Rotate(new Vector3(0, -90, 0), Space.Self);//correcting the original rotation + + + //move towards the player + if (Vector3.Distance(transform.position, target.position) > 1f) + {//move if distance from target is greater than 1 + transform.Translate(new Vector3(speed * Time.deltaTime, 0, 0)); + } + + + + + } +} diff --git a/Roguelike2d/Assets/Script/Zombie.cs.meta b/Roguelike2d/Assets/Script/Zombie.cs.meta new file mode 100644 index 00000000..2bb1bc5e --- /dev/null +++ b/Roguelike2d/Assets/Script/Zombie.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: ebeeed46d4b46cd4eb241f3850d8c70d +timeCreated: 1450158892 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Assets/Sprites/Enemy/Projectile.png b/Roguelike2d/Assets/Sprites/Enemy/Projectile.png new file mode 100644 index 00000000..72453ec9 Binary files /dev/null and b/Roguelike2d/Assets/Sprites/Enemy/Projectile.png differ diff --git a/Roguelike2d/Assets/Sprites/Enemy/Projectile.png.meta b/Roguelike2d/Assets/Sprites/Enemy/Projectile.png.meta new file mode 100644 index 00000000..1eb7074d --- /dev/null +++ b/Roguelike2d/Assets/Sprites/Enemy/Projectile.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 6fae5bd5e300af948a34cf4d3caebd2c +timeCreated: 1450163314 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Roguelike2d/Library/CurrentLayout.dwlt b/Roguelike2d/Library/CurrentLayout.dwlt index ba230c74..f12c71a2 100644 Binary files a/Roguelike2d/Library/CurrentLayout.dwlt and b/Roguelike2d/Library/CurrentLayout.dwlt differ diff --git a/Roguelike2d/Library/InspectorExpandedItems.asset b/Roguelike2d/Library/InspectorExpandedItems.asset index 37378484..69a28fea 100644 Binary files a/Roguelike2d/Library/InspectorExpandedItems.asset and b/Roguelike2d/Library/InspectorExpandedItems.asset differ diff --git a/Roguelike2d/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Roguelike2d/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb index 31880609..e61ea449 100644 Binary files a/Roguelike2d/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/Roguelike2d/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ diff --git a/Roguelike2d/Library/assetDatabase3 b/Roguelike2d/Library/assetDatabase3 index c84b54f1..97125d85 100644 Binary files a/Roguelike2d/Library/assetDatabase3 and b/Roguelike2d/Library/assetDatabase3 differ diff --git a/Roguelike2d/Library/expandedItems b/Roguelike2d/Library/expandedItems index a4b83f7c..1177ecc2 100644 Binary files a/Roguelike2d/Library/expandedItems and b/Roguelike2d/Library/expandedItems differ diff --git a/Roguelike2d/Library/metadata/00/00000000000000003000000000000000 b/Roguelike2d/Library/metadata/00/00000000000000003000000000000000 index de76c1d9..a132e68e 100644 Binary files a/Roguelike2d/Library/metadata/00/00000000000000003000000000000000 and b/Roguelike2d/Library/metadata/00/00000000000000003000000000000000 differ diff --git a/Roguelike2d/Library/metadata/00/00000000000000004000000000000000 b/Roguelike2d/Library/metadata/00/00000000000000004000000000000000 index d401cc97..e3ea39a8 100644 Binary files a/Roguelike2d/Library/metadata/00/00000000000000004000000000000000 and b/Roguelike2d/Library/metadata/00/00000000000000004000000000000000 differ diff --git a/Roguelike2d/Library/metadata/00/0000000000000000b000000000000000 b/Roguelike2d/Library/metadata/00/0000000000000000b000000000000000 index b45d6de2..088c120b 100644 Binary files a/Roguelike2d/Library/metadata/00/0000000000000000b000000000000000 and b/Roguelike2d/Library/metadata/00/0000000000000000b000000000000000 differ diff --git a/Roguelike2d/ProjectSettings/EditorBuildSettings.asset b/Roguelike2d/ProjectSettings/EditorBuildSettings.asset index 37934f34..9bdf020c 100644 Binary files a/Roguelike2d/ProjectSettings/EditorBuildSettings.asset and b/Roguelike2d/ProjectSettings/EditorBuildSettings.asset differ diff --git a/Roguelike2d/ProjectSettings/TagManager.asset b/Roguelike2d/ProjectSettings/TagManager.asset index 1b93da4b..5d436876 100644 Binary files a/Roguelike2d/ProjectSettings/TagManager.asset and b/Roguelike2d/ProjectSettings/TagManager.asset differ