diff --git a/Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo b/Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo
index 2d7d7b6bb07011afa79495812aea13e801f36c1c..7fc85b1101e3dabb65ca6f9ce55a7fb57c4faf63 100644
Binary files a/Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo and b/Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo differ
diff --git a/Zookeepers Trial/Assets/Scenes/arena.unity b/Zookeepers Trial/Assets/Scenes/arena.unity
index 0e94657e7fb63fa081dd5a988938382c0be35a73..bc4c8e14389c3231b0b1ad1ef23374f1df1782a7 100644
Binary files a/Zookeepers Trial/Assets/Scenes/arena.unity and b/Zookeepers Trial/Assets/Scenes/arena.unity differ
diff --git a/Zookeepers Trial/Assets/Scripts/EnemyHealth.cs b/Zookeepers Trial/Assets/Scripts/EnemyHealth.cs
index a49f7bb9fd2def37e456a25fb30793ad4858dd19..f8122c26fa2a8baeac1151fabd4f165a0387d369 100644
--- a/Zookeepers Trial/Assets/Scripts/EnemyHealth.cs
+++ b/Zookeepers Trial/Assets/Scripts/EnemyHealth.cs
@@ -1,9 +1,9 @@
using UnityEngine;
using System.Collections;
-public class EnemyAttack : MonoBehaviour {
+public class EnemyHealth : MonoBehaviour {
-/*SCRIPT FOR WHEN THE PLAYER IS HIT, NOT THE ENEMY*/
+ /*SCRIPT FOR WHEN THE PLAYER IS HIT, NOT THE ENEMY*/
void Start()
{
GameObject weapon = GameObject.Find("weapon");
diff --git a/Zookeepers Trial/Assets/Scripts/PlayerHealth.cs b/Zookeepers Trial/Assets/Scripts/PlayerHealth.cs
new file mode 100644
index 0000000000000000000000000000000000000000..8c6bc8d3d085258ace8258e2bc83047f9ce7327a
--- /dev/null
+++ b/Zookeepers Trial/Assets/Scripts/PlayerHealth.cs
@@ -0,0 +1,20 @@
+using UnityEngine;
+using System.Collections;
+
+public class PlayerHealth : MonoBehaviour {
+
+ /*SCRIPT FOR WHEN THE ENEMY IS HIT, NOT THE PLAYER*/
+ void Start() {
+ GameObject weapon = GameObject.Find("weapon");
+ Physics2D.IgnoreCollision(weapon.GetComponent<Collider2D>(), GetComponent<Collider2D>());
+ }
+ //apply damage if the collision is the enemy
+ void OnCollisionEnter2D(Collision2D other) {
+ if (other.gameObject.name == "Enemy") {
+ Debug.Log("hit");
+ other.gameObject.SendMessage("ApplyDamageE", 1, SendMessageOptions.DontRequireReceiver);
+ other.gameObject.SendMessage("ChangeHealthBare", 1, SendMessageOptions.DontRequireReceiver);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/Zookeepers Trial/Assets/Scripts/PlayerHealth.cs.meta b/Zookeepers Trial/Assets/Scripts/PlayerHealth.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..bee6b9a310e51178654d1f14918a82eba735baa4
--- /dev/null
+++ b/Zookeepers Trial/Assets/Scripts/PlayerHealth.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: ce84547236e7a12418b5733bfa1b9698
+timeCreated: 1479670072
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Zookeepers Trial/Assets/Scripts/PlayerStats.cs b/Zookeepers Trial/Assets/Scripts/PlayerStats.cs
index 068e9a8bf4e892a24147fc1330e698a0619ca2e0..87a3a3ccc69b2d36afbc4368f91b781de51ef101 100644
--- a/Zookeepers Trial/Assets/Scripts/PlayerStats.cs
+++ b/Zookeepers Trial/Assets/Scripts/PlayerStats.cs
@@ -6,8 +6,9 @@ public class PlayerStats : MonoBehaviour {
private static float maxHealth;
- private static float curHealth;
- private static string playerName;
+ public static float curHealth;
+ public float curHealth1;
+ private static string playerName;
private static int vitality;
private static int strength;
private static int defense;
@@ -19,11 +20,12 @@ public class PlayerStats : MonoBehaviour {
EnterDoor spawn;
void Start () {
- //weaponSpriteRenderer = GetComponent<SpriteRenderer>();
- //to find the weapon sprite
- GameObject weaponSprite = GameObject.FindWithTag("currentWeapon");
+ //weaponSpriteRenderer = GetComponent<SpriteRenderer>();
+ //to find the weapon sprite
+ curHealth1 = curHealth;
+ GameObject weaponSprite = GameObject.FindWithTag("currentWeapon");
weaponSpriteRenderer = weaponSprite.GetComponent<SpriteRenderer>();
- updateWeapon ();
+ updateWeapon();
}
IEnumerator waitandload()
diff --git a/Zookeepers Trial/Library/CurrentLayout.dwlt b/Zookeepers Trial/Library/CurrentLayout.dwlt
index 786f54dc96eefd0b37900fe1995bbce88ca0fe7a..f545f6119a98babb4215b045257bbb0b759dede8 100644
Binary files a/Zookeepers Trial/Library/CurrentLayout.dwlt and b/Zookeepers Trial/Library/CurrentLayout.dwlt differ
diff --git a/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll b/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll
index 80ef6ffa0498a3731282985b9018fc4d5ec62ff1..bc6d0607438e204563287beca5f027750831598b 100644
Binary files a/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll differ
diff --git a/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
index 58c00be3052e6c4f7e4c3732e7deb34eaa8897ba..89640c2b5a02c3ec607537820b21ee50a923ab62 100644
Binary files a/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ
diff --git a/Zookeepers Trial/Library/assetDatabase3 b/Zookeepers Trial/Library/assetDatabase3
index 27db59fb77f14dbfcb956dfdc88eb6a05460e170..e7f9d606e7ea4a6fb8d4ceb386eda43243b68b65 100644
Binary files a/Zookeepers Trial/Library/assetDatabase3 and b/Zookeepers Trial/Library/assetDatabase3 differ
diff --git a/Zookeepers Trial/Library/expandedItems b/Zookeepers Trial/Library/expandedItems
index 81faed16e7ae320d932d16c9581c9c450f3a624c..ec552c943638eb457d7d75f75738a20ef180dfa6 100644
Binary files a/Zookeepers Trial/Library/expandedItems and b/Zookeepers Trial/Library/expandedItems differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000
index 83dbb9c43a545fb966beb464f8d3b458c93c59e6..a6d58062abfd7605ae7a9193242e266b1a16fe77 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000
index 54246c8955f2a00b196a10671ed0dea592dc121a..5defd9c095afd775b32bb6d5055dfbce942afad3 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/0a/0a5410bd5abcd9240a90852252a9b918 b/Zookeepers Trial/Library/metadata/0a/0a5410bd5abcd9240a90852252a9b918
index 8cd62c96da0383eb69618229548fe5d8dcf62ff9..c612e352ff50dc4d204397c181dda4fbbd874437 100644
Binary files a/Zookeepers Trial/Library/metadata/0a/0a5410bd5abcd9240a90852252a9b918 and b/Zookeepers Trial/Library/metadata/0a/0a5410bd5abcd9240a90852252a9b918 differ
diff --git a/Zookeepers Trial/Library/metadata/6c/6c3c5e21234caa3468025629dfa57435 b/Zookeepers Trial/Library/metadata/6c/6c3c5e21234caa3468025629dfa57435
index 05716ad25bed914c7f742934190994e0de1fd31d..68ff930599f6519385a33c0a17e7d17a86af1ead 100644
Binary files a/Zookeepers Trial/Library/metadata/6c/6c3c5e21234caa3468025629dfa57435 and b/Zookeepers Trial/Library/metadata/6c/6c3c5e21234caa3468025629dfa57435 differ
diff --git a/Zookeepers Trial/Library/metadata/ce/ce84547236e7a12418b5733bfa1b9698 b/Zookeepers Trial/Library/metadata/ce/ce84547236e7a12418b5733bfa1b9698
new file mode 100644
index 0000000000000000000000000000000000000000..5186d3e37b0260e7c742e62a1fd225aae755fb2c
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/ce/ce84547236e7a12418b5733bfa1b9698 differ
diff --git a/Zookeepers Trial/Library/metadata/ce/ce84547236e7a12418b5733bfa1b9698.info b/Zookeepers Trial/Library/metadata/ce/ce84547236e7a12418b5733bfa1b9698.info
new file mode 100644
index 0000000000000000000000000000000000000000..1fd9182b4171e576fc0f961ba2730ea75b3ab218
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/ce/ce84547236e7a12418b5733bfa1b9698.info differ
diff --git a/Zookeepers Trial/Zookeepers Trial.CSharp.csproj b/Zookeepers Trial/Zookeepers Trial.CSharp.csproj
index 91892e1b670388c3a4971cf66bc43047fab8765f..5877537edcf8b0d6a65f5782456363556c02d70a 100644
--- a/Zookeepers Trial/Zookeepers Trial.CSharp.csproj
+++ b/Zookeepers Trial/Zookeepers Trial.CSharp.csproj
@@ -79,6 +79,7 @@
<Compile Include="Assets\Scripts\EnemyHealth.cs" />
<Compile Include="Assets\Scripts\EnterDoor.cs" />
<Compile Include="Assets\Scripts\MainMenu.cs" />
+ <Compile Include="Assets\Scripts\PlayerHealth.cs" />
<Compile Include="Assets\Scripts\PlayerMovement.cs" />
<Compile Include="Assets\Scripts\PlayerStats.cs" />
<Compile Include="Assets\Scripts\ShopMenu.cs" />