diff --git a/Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo b/Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo
index 41b42f94a6f0934ba4b6ddcf671c09503ee91d00..2d7d7b6bb07011afa79495812aea13e801f36c1c 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/Scripts/DecisionTree.cs b/Zookeepers Trial/Assets/Scripts/DecisionTree.cs
index f0876299a811212415aeeb8ec1610230f555ff5b..5424ad4f79726a2ca9ed86fbd07c4571bbef94d0 100644
--- a/Zookeepers Trial/Assets/Scripts/DecisionTree.cs
+++ b/Zookeepers Trial/Assets/Scripts/DecisionTree.cs
@@ -37,6 +37,7 @@ public class DecisionTree {
right = node;
}
+
public void search() {
if (isLeaf()) {
action();
diff --git a/Zookeepers Trial/Assets/Scripts/EnemyAI.cs b/Zookeepers Trial/Assets/Scripts/EnemyAI.cs
index 9747bf927070374e40ac3789af31ade2a7114644..266dea0c6f22bc775d9af8756c85e5ded58a224c 100644
--- a/Zookeepers Trial/Assets/Scripts/EnemyAI.cs
+++ b/Zookeepers Trial/Assets/Scripts/EnemyAI.cs
@@ -12,10 +12,18 @@ public class EnemyAI : MonoBehaviour {
private bool LookRight = false;
public bool set;
private float speed = 1;
+ private float attackSpeed;
+ private float randomSpeed;
+ private float coolDown = 0;
+ public bool actionDelay = false;
+ public float searchDelay = 0.2f;
+ public float searchCoolDown = 0;
void Start() {
+ randomSpeed = Random.Range(0f, 6f);
+ attackSpeed = randomSpeed;
enemyHealth = Random.Range(50, 500);
original = enemyHealth;
playerHealth = PlayerStats.getHealth();
@@ -31,11 +39,28 @@ public class EnemyAI : MonoBehaviour {
}
void Update() {
+ coolDown -= Time.deltaTime;
+
+ if (actionDelay == true) {
+ searchCoolDown -= Time.deltaTime;
+ if (searchCoolDown <= 0) {
+ searchCoolDown = searchDelay;
+ root.search();
+ }
+
+ }
+ else {
+ root.search();
+ actionDelay = false;
+ }
+
+
- root.search();
}
+
+
public void ChangeHealthBare(int damage)
{
GameObject healthbar = GameObject.Find("healthbarFulle");
@@ -106,27 +131,37 @@ public class EnemyAI : MonoBehaviour {
// Actions
public void a_attack() {
- Debug.Log("attacking");
+ actionDelay = true;
myAnimator.SetFloat("speed", 0f);
- myAnimator.SetBool("attack", true);
- Enemy.velocity = Vector2.zero;
+ if (coolDown <= 0) {
+ coolDown = attackSpeed;
+ Debug.Log("attacking");
+ myAnimator.SetBool("attack", true);
+ Enemy.velocity = Vector2.zero;
+ }
+ else {
+ myAnimator.SetBool("attack", false);
+ }
}
public void a_block() {
+ actionDelay = true;
Debug.Log("run");
- float option = Random.Range(0, 2);
- if (option == 1) {
+ // float option = Random.Range(0, 2);
+ // if (option == 1) {
myAnimator.SetBool("attack", false);
myAnimator.SetBool("block", true);
- Enemy.velocity = Vector2.zero;
- }
+ Enemy.velocity = Vector2.zero;
+ // }
- if (option == 2) {
- Enemy.AddForce(new Vector2(-50, 500));
- }
+ // if (option == 2) {
+ // Enemy.AddForce(new Vector2(50, 500));
+
+ // }
}
-
+
+
//template for a 'poison' special attack. Will slowly and gradually drain players health over time.
public void poison()
{
diff --git a/Zookeepers Trial/Library/CurrentLayout.dwlt b/Zookeepers Trial/Library/CurrentLayout.dwlt
index 2160256abda444e8158af156bfa8f02fdcd6cc01..786f54dc96eefd0b37900fe1995bbce88ca0fe7a 100644
Binary files a/Zookeepers Trial/Library/CurrentLayout.dwlt and b/Zookeepers Trial/Library/CurrentLayout.dwlt differ
diff --git a/Zookeepers Trial/Library/LastSceneManagerSetup.txt b/Zookeepers Trial/Library/LastSceneManagerSetup.txt
index 9e6c3d18d794f5fbfe3b633a90fbe806fbd994c2..029e47d17cd0c7d94a149576cc18b03ed93ee680 100644
--- a/Zookeepers Trial/Library/LastSceneManagerSetup.txt
+++ b/Zookeepers Trial/Library/LastSceneManagerSetup.txt
@@ -1,4 +1,4 @@
sceneSetups:
-- path: Assets/Scenes/shopBlacksmith.unity
+- path: Assets/Scenes/arena.unity
isLoaded: 1
isActive: 1
diff --git a/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll b/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll
index 8169f5ed69cbf2afef22be2ca6d0188d15d5bf71..80ef6ffa0498a3731282985b9018fc4d5ec62ff1 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 2c4683e21aa14d7321859e609269ed676f66bd39..58c00be3052e6c4f7e4c3732e7deb34eaa8897ba 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 ceed288a2c46298bc940783bc333f08da80ad5da..27db59fb77f14dbfcb956dfdc88eb6a05460e170 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 4fe3653d7b9a8ac082c9cea352aa8f4e18823364..81faed16e7ae320d932d16c9581c9c450f3a624c 100644
Binary files a/Zookeepers Trial/Library/expandedItems and b/Zookeepers Trial/Library/expandedItems differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000002000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000002000000000000000
index b1d4067ce7a638fa865c703aaa3d8cac3021b4fe..111269ce693295299d14c90523d5059e368ac884 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000002000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000002000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000003000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000003000000000000000
index c57303d6e60a312fa14a4a434f5f46f493a09233..6b2cb2f573598f504c2f9d8e4d0c813b767f6846 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000003000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000003000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000
index 49f62655458dc7e717d7127eb7fa93038480e8f9..83dbb9c43a545fb966beb464f8d3b458c93c59e6 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/00000000000000004100000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000004100000000000000
index 1ca8c605d1c655950bf42a075ad8c5dde2c77860..da045a6862f4c0e4ef384c7d99b312f72eee869f 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000004100000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000004100000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000005000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000005000000000000000
index 11503774e4b559532a3f620120bdb418d0360afe..ff8607d91ded1f414a77580208b68eb407416dfa 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000005000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000005000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000005100000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000005100000000000000
index b7908e5a11b6ef8d07745a18b1c5d7cdf44c9aa2..d7493bb3c3228f489e04fbd939ecfa0435b73e08 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000005100000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000005100000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000006000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000006000000000000000
index 57fd8919b42dbf241d4dc92ede58b6f58e8716e2..32e01506becc4c931a8cc2291a38b6233f469689 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000006000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000006000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000
index f0646d864de20cd6e10c7f3a7fef6d276396a992..54246c8955f2a00b196a10671ed0dea592dc121a 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/00/00000000000000007000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000007000000000000000
index d4fb155184df1c6f2092778acb6987a19486d1ff..458f2efc312f3192b54085ee726e52f7bfdc904b 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000007000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000007000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000007100000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000007100000000000000
index 02fc45fc7947f8263199bd951477a30688f78b77..3dd69fd86cfd4c59393f8b653e7addaefaa8f07c 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000007100000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000007100000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000008000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000008000000000000000
index 9e30f12597fc657edc6f7152a674b7956da4ff04..c639460033e6c1e44fd802c322dadb8bc0cb4056 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000008000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000008000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000008100000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000008100000000000000
index 35ff64149e8ddcc06fdf4bd11279c28c5d62c3a0..f58681d105d767ea99ef4da58e7f046ee84e9ad7 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000008100000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000008100000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000009000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000009000000000000000
index 57d900a62dcdb452d5415d2336982f1fc3108aa4..a5ef8b8b3278e13f0ab844ac6522376add807b09 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000009000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000009000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/0000000000000000a000000000000000 b/Zookeepers Trial/Library/metadata/00/0000000000000000a000000000000000
index 6fd5a4e40eb2fe80e5402e25417ea174287090bd..f800bf3ddf25b543e0428f1e9952738e4df1d470 100644
Binary files a/Zookeepers Trial/Library/metadata/00/0000000000000000a000000000000000 and b/Zookeepers Trial/Library/metadata/00/0000000000000000a000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/0000000000000000a100000000000000 b/Zookeepers Trial/Library/metadata/00/0000000000000000a100000000000000
index 5fa9df4c006e0775b19167a36e3d0620b6fc0778..9c482a78690a91adb55447cace7d87bb05dbebe3 100644
Binary files a/Zookeepers Trial/Library/metadata/00/0000000000000000a100000000000000 and b/Zookeepers Trial/Library/metadata/00/0000000000000000a100000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/0000000000000000b000000000000000 b/Zookeepers Trial/Library/metadata/00/0000000000000000b000000000000000
index 1cccae0581e4ade92f17e95dff36d38978c6c44d..22f1b1e0f304b5ba873b6ba19e908cfbdf87f439 100644
Binary files a/Zookeepers Trial/Library/metadata/00/0000000000000000b000000000000000 and b/Zookeepers Trial/Library/metadata/00/0000000000000000b000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/0000000000000000c000000000000000 b/Zookeepers Trial/Library/metadata/00/0000000000000000c000000000000000
index caeb4e96c7ee7676185d94e88e2c6940c914dc22..6ebc6e21a7250233e68fb20307ae629545f59414 100644
Binary files a/Zookeepers Trial/Library/metadata/00/0000000000000000c000000000000000 and b/Zookeepers Trial/Library/metadata/00/0000000000000000c000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/18/183aac3cb7b9cce40938a4081d217e6c b/Zookeepers Trial/Library/metadata/00/001cf4af9d97a8d4d99d3d1d2e5fdf2f
similarity index 88%
rename from Zookeepers Trial/Library/metadata/18/183aac3cb7b9cce40938a4081d217e6c
rename to Zookeepers Trial/Library/metadata/00/001cf4af9d97a8d4d99d3d1d2e5fdf2f
index c31d57362dd7c1829535a3d980068b49051d49d4..58faf13a06caedb79d3698f0ee9e03de4538067c 100644
Binary files a/Zookeepers Trial/Library/metadata/18/183aac3cb7b9cce40938a4081d217e6c and b/Zookeepers Trial/Library/metadata/00/001cf4af9d97a8d4d99d3d1d2e5fdf2f differ
diff --git a/Zookeepers Trial/Library/metadata/18/183aac3cb7b9cce40938a4081d217e6c.info b/Zookeepers Trial/Library/metadata/00/001cf4af9d97a8d4d99d3d1d2e5fdf2f.info
similarity index 63%
rename from Zookeepers Trial/Library/metadata/18/183aac3cb7b9cce40938a4081d217e6c.info
rename to Zookeepers Trial/Library/metadata/00/001cf4af9d97a8d4d99d3d1d2e5fdf2f.info
index c16ee2791baa7e7ccd104edd4c528bca957a5f57..51aff9ad40d5cb7e8f6caa7f415a67d88faecafc 100644
Binary files a/Zookeepers Trial/Library/metadata/18/183aac3cb7b9cce40938a4081d217e6c.info and b/Zookeepers Trial/Library/metadata/00/001cf4af9d97a8d4d99d3d1d2e5fdf2f.info differ
diff --git a/Zookeepers Trial/Library/metadata/2a/2a9e11f9ca975cc4f924ffb6f878f848 b/Zookeepers Trial/Library/metadata/2a/2a9e11f9ca975cc4f924ffb6f878f848
index 14fd4c9bf72a70d59849f38a1152b3c260fac187..ae4ac2c291a2be402ca7e90e05e5fa592633a44c 100644
Binary files a/Zookeepers Trial/Library/metadata/2a/2a9e11f9ca975cc4f924ffb6f878f848 and b/Zookeepers Trial/Library/metadata/2a/2a9e11f9ca975cc4f924ffb6f878f848 differ
diff --git a/Zookeepers Trial/Library/metadata/2a/2a9e11f9ca975cc4f924ffb6f878f848.info b/Zookeepers Trial/Library/metadata/2a/2a9e11f9ca975cc4f924ffb6f878f848.info
index 86faadaba56934f105d6afd2f3bf9ba6add5cecc..1e4dfef6099ca8a819e81dd15878dd2890014fc0 100644
Binary files a/Zookeepers Trial/Library/metadata/2a/2a9e11f9ca975cc4f924ffb6f878f848.info and b/Zookeepers Trial/Library/metadata/2a/2a9e11f9ca975cc4f924ffb6f878f848.info differ
diff --git a/Zookeepers Trial/Library/metadata/2b/2b08fea0269ed2142b0547cb62e3699d b/Zookeepers Trial/Library/metadata/2b/2b08fea0269ed2142b0547cb62e3699d
new file mode 100644
index 0000000000000000000000000000000000000000..e5694e661198997e2226d35518a9261b9b4dbfdf
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/2b/2b08fea0269ed2142b0547cb62e3699d differ
diff --git a/Zookeepers Trial/Library/metadata/2b/2b08fea0269ed2142b0547cb62e3699d.info b/Zookeepers Trial/Library/metadata/2b/2b08fea0269ed2142b0547cb62e3699d.info
new file mode 100644
index 0000000000000000000000000000000000000000..5972e915c147e6f99ddf564e1e49d2897becdcc6
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/2b/2b08fea0269ed2142b0547cb62e3699d.info differ
diff --git a/Zookeepers Trial/Library/metadata/3d/3d04d9d59033e4a4182b37d1769255e0 b/Zookeepers Trial/Library/metadata/3d/3d04d9d59033e4a4182b37d1769255e0
new file mode 100644
index 0000000000000000000000000000000000000000..ac51feb25869e11ffcd7e8605d3043a54e1d3f15
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/3d/3d04d9d59033e4a4182b37d1769255e0 differ
diff --git a/Zookeepers Trial/Library/metadata/3d/3d04d9d59033e4a4182b37d1769255e0.info b/Zookeepers Trial/Library/metadata/3d/3d04d9d59033e4a4182b37d1769255e0.info
new file mode 100644
index 0000000000000000000000000000000000000000..8719f22d50a085e73f3579795e897cce0ec5b18b
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/3d/3d04d9d59033e4a4182b37d1769255e0.info differ
diff --git a/Zookeepers Trial/Library/metadata/7d/7dd1f6a4965f3444fa835e2ae6c4da64 b/Zookeepers Trial/Library/metadata/7d/7dd1f6a4965f3444fa835e2ae6c4da64
index 47f67496b1dd55e561dc8db1e05e841c43dc296e..6f135fca7634eb95aef544cbfe37e7a6f3b00018 100644
Binary files a/Zookeepers Trial/Library/metadata/7d/7dd1f6a4965f3444fa835e2ae6c4da64 and b/Zookeepers Trial/Library/metadata/7d/7dd1f6a4965f3444fa835e2ae6c4da64 differ
diff --git a/Zookeepers Trial/Library/metadata/7e/7e1b8e768782f8446a59dd9eb570ffb3 b/Zookeepers Trial/Library/metadata/7e/7e1b8e768782f8446a59dd9eb570ffb3
new file mode 100644
index 0000000000000000000000000000000000000000..861da63135ab6249713581e2b52e3d6b07d915ec
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/7e/7e1b8e768782f8446a59dd9eb570ffb3 differ
diff --git a/Zookeepers Trial/Library/metadata/7e/7e1b8e768782f8446a59dd9eb570ffb3.info b/Zookeepers Trial/Library/metadata/7e/7e1b8e768782f8446a59dd9eb570ffb3.info
new file mode 100644
index 0000000000000000000000000000000000000000..980cc1c516a024804d8893a96ca458139176960f
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/7e/7e1b8e768782f8446a59dd9eb570ffb3.info differ
diff --git a/Zookeepers Trial/Library/metadata/80/80691144c6050904c8a4a5558bc24ce9 b/Zookeepers Trial/Library/metadata/80/80691144c6050904c8a4a5558bc24ce9
deleted file mode 100644
index ec34fe971f0564bf6929238ba867e08804bb8e23..0000000000000000000000000000000000000000
Binary files a/Zookeepers Trial/Library/metadata/80/80691144c6050904c8a4a5558bc24ce9 and /dev/null differ
diff --git a/Zookeepers Trial/Library/metadata/80/80691144c6050904c8a4a5558bc24ce9.info b/Zookeepers Trial/Library/metadata/80/80691144c6050904c8a4a5558bc24ce9.info
deleted file mode 100644
index 0db1a0c07e7eb9b3b2046717da8bc6e7d84738b4..0000000000000000000000000000000000000000
Binary files a/Zookeepers Trial/Library/metadata/80/80691144c6050904c8a4a5558bc24ce9.info and /dev/null differ
diff --git a/Zookeepers Trial/Library/metadata/80/80d294a2c1aaa774482f792fb618d4a1 b/Zookeepers Trial/Library/metadata/80/80d294a2c1aaa774482f792fb618d4a1
new file mode 100644
index 0000000000000000000000000000000000000000..e8ac75b922bff00344c557361c675ef60ecfceac
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/80/80d294a2c1aaa774482f792fb618d4a1 differ
diff --git a/Zookeepers Trial/Library/metadata/80/80d294a2c1aaa774482f792fb618d4a1.info b/Zookeepers Trial/Library/metadata/80/80d294a2c1aaa774482f792fb618d4a1.info
new file mode 100644
index 0000000000000000000000000000000000000000..4fde20581effc78861d5161595673ca7d647506d
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/80/80d294a2c1aaa774482f792fb618d4a1.info differ
diff --git a/Zookeepers Trial/Library/metadata/89/8985ddadf7639b64bb7bd2f1140e9447 b/Zookeepers Trial/Library/metadata/89/8985ddadf7639b64bb7bd2f1140e9447
new file mode 100644
index 0000000000000000000000000000000000000000..cead786d756686a67a652ee6e0c215f859b27586
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/89/8985ddadf7639b64bb7bd2f1140e9447 differ
diff --git a/Zookeepers Trial/Library/metadata/89/8985ddadf7639b64bb7bd2f1140e9447.info b/Zookeepers Trial/Library/metadata/89/8985ddadf7639b64bb7bd2f1140e9447.info
new file mode 100644
index 0000000000000000000000000000000000000000..03d3dcb31fb4fa6b7909f4cf6ccf8dc109e3704d
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/89/8985ddadf7639b64bb7bd2f1140e9447.info differ
diff --git a/Zookeepers Trial/Library/metadata/93/931736a8035c8f249a10d6c9f71fc5eb b/Zookeepers Trial/Library/metadata/93/931736a8035c8f249a10d6c9f71fc5eb
new file mode 100644
index 0000000000000000000000000000000000000000..5b6a32e38c480c2151f4cd9c54963019cb65660f
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/93/931736a8035c8f249a10d6c9f71fc5eb differ
diff --git a/Zookeepers Trial/Library/metadata/93/931736a8035c8f249a10d6c9f71fc5eb.info b/Zookeepers Trial/Library/metadata/93/931736a8035c8f249a10d6c9f71fc5eb.info
new file mode 100644
index 0000000000000000000000000000000000000000..691e39fe797280559fb4bd02eea7ee8973298d2f
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/93/931736a8035c8f249a10d6c9f71fc5eb.info differ
diff --git a/Zookeepers Trial/Library/metadata/94/94dfe3e2bff851640bd2b8e35b6286d7 b/Zookeepers Trial/Library/metadata/94/94dfe3e2bff851640bd2b8e35b6286d7
new file mode 100644
index 0000000000000000000000000000000000000000..4aa728d9fff2b35246fc73792e071ea559aa2800
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/94/94dfe3e2bff851640bd2b8e35b6286d7 differ
diff --git a/Zookeepers Trial/Library/metadata/94/94dfe3e2bff851640bd2b8e35b6286d7.info b/Zookeepers Trial/Library/metadata/94/94dfe3e2bff851640bd2b8e35b6286d7.info
new file mode 100644
index 0000000000000000000000000000000000000000..0bd077be5036fc8cb386f0905497eda004b2b6a1
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/94/94dfe3e2bff851640bd2b8e35b6286d7.info differ
diff --git a/Zookeepers Trial/Library/metadata/9a/9a52fcc930b0ed44684ca20e7f020697 b/Zookeepers Trial/Library/metadata/9a/9a52fcc930b0ed44684ca20e7f020697
new file mode 100644
index 0000000000000000000000000000000000000000..7510a9b05646f3865e2450d65cac1dfb9b14a04a
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/9a/9a52fcc930b0ed44684ca20e7f020697 differ
diff --git a/Zookeepers Trial/Library/metadata/9a/9a52fcc930b0ed44684ca20e7f020697.info b/Zookeepers Trial/Library/metadata/9a/9a52fcc930b0ed44684ca20e7f020697.info
new file mode 100644
index 0000000000000000000000000000000000000000..217bddfc31593b63c5bc000c1f2c84706e5e2d5b
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/9a/9a52fcc930b0ed44684ca20e7f020697.info differ
diff --git a/Zookeepers Trial/Library/metadata/ae/ae80e2caed0f6a8479ba3b3604e39ce4 b/Zookeepers Trial/Library/metadata/ae/ae80e2caed0f6a8479ba3b3604e39ce4
index ccfbf9e15ffc0995491fc24e584a22521441c58d..3618723f3139ba41ee5c0053f6f5b8dbb5a5c22e 100644
Binary files a/Zookeepers Trial/Library/metadata/ae/ae80e2caed0f6a8479ba3b3604e39ce4 and b/Zookeepers Trial/Library/metadata/ae/ae80e2caed0f6a8479ba3b3604e39ce4 differ
diff --git a/Zookeepers Trial/Library/metadata/bb/bba5c57c69dff4b4c9b308b689dbe2b7 b/Zookeepers Trial/Library/metadata/bb/bba5c57c69dff4b4c9b308b689dbe2b7
new file mode 100644
index 0000000000000000000000000000000000000000..a7bb96e9a9e19e34110c0bb5f883b60902f8ed7b
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/bb/bba5c57c69dff4b4c9b308b689dbe2b7 differ
diff --git a/Zookeepers Trial/Library/metadata/bb/bba5c57c69dff4b4c9b308b689dbe2b7.info b/Zookeepers Trial/Library/metadata/bb/bba5c57c69dff4b4c9b308b689dbe2b7.info
new file mode 100644
index 0000000000000000000000000000000000000000..80e042dbc0a3c293aea43afebe53b29c283ced29
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/bb/bba5c57c69dff4b4c9b308b689dbe2b7.info differ
diff --git a/Zookeepers Trial/Library/metadata/c1/c1c29cc771a6a814b95726a36015c06c b/Zookeepers Trial/Library/metadata/c1/c1c29cc771a6a814b95726a36015c06c
deleted file mode 100644
index a20bd04778d8f9b2ca607146fc71964e5a7a86bb..0000000000000000000000000000000000000000
Binary files a/Zookeepers Trial/Library/metadata/c1/c1c29cc771a6a814b95726a36015c06c and /dev/null differ
diff --git a/Zookeepers Trial/Library/metadata/c1/c1c29cc771a6a814b95726a36015c06c.info b/Zookeepers Trial/Library/metadata/c1/c1c29cc771a6a814b95726a36015c06c.info
deleted file mode 100644
index 77443a916e9feac7da18a3a8f2879fae52fb70e5..0000000000000000000000000000000000000000
Binary files a/Zookeepers Trial/Library/metadata/c1/c1c29cc771a6a814b95726a36015c06c.info and /dev/null differ
diff --git a/Zookeepers Trial/Library/metadata/d6/d65ff60b4a6e1784a838d5b64c491eb4 b/Zookeepers Trial/Library/metadata/d6/d65ff60b4a6e1784a838d5b64c491eb4
new file mode 100644
index 0000000000000000000000000000000000000000..22d3fbc08b69407d18d1ad8561e28bf775a751bf
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/d6/d65ff60b4a6e1784a838d5b64c491eb4 differ
diff --git a/Zookeepers Trial/Library/metadata/d6/d65ff60b4a6e1784a838d5b64c491eb4.info b/Zookeepers Trial/Library/metadata/d6/d65ff60b4a6e1784a838d5b64c491eb4.info
new file mode 100644
index 0000000000000000000000000000000000000000..040a0337494f6a2b8f0422329020bbc28f35e642
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/d6/d65ff60b4a6e1784a838d5b64c491eb4.info differ
diff --git a/Zookeepers Trial/Library/metadata/df/df0e0d6ef48b81843bc092439ea69522 b/Zookeepers Trial/Library/metadata/df/df0e0d6ef48b81843bc092439ea69522
new file mode 100644
index 0000000000000000000000000000000000000000..ccc39f2e3cd39e6347b9f19e40ebc819fe42c096
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/df/df0e0d6ef48b81843bc092439ea69522 differ
diff --git a/Zookeepers Trial/Library/metadata/df/df0e0d6ef48b81843bc092439ea69522.info b/Zookeepers Trial/Library/metadata/df/df0e0d6ef48b81843bc092439ea69522.info
new file mode 100644
index 0000000000000000000000000000000000000000..669d06cb413bd82a4d62e11acbd79507550dd421
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/df/df0e0d6ef48b81843bc092439ea69522.info differ
diff --git a/Zookeepers Trial/Library/metadata/e5/e5911be54faa1c4479adf69b102faada b/Zookeepers Trial/Library/metadata/e5/e5911be54faa1c4479adf69b102faada
new file mode 100644
index 0000000000000000000000000000000000000000..6daeec347c9e84cd2c79ee4d792a4f7f8168b408
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/e5/e5911be54faa1c4479adf69b102faada differ
diff --git a/Zookeepers Trial/Library/metadata/e5/e5911be54faa1c4479adf69b102faada.info b/Zookeepers Trial/Library/metadata/e5/e5911be54faa1c4479adf69b102faada.info
new file mode 100644
index 0000000000000000000000000000000000000000..d6187f40edbab386c315fa08ffdbc3da335b835e
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/e5/e5911be54faa1c4479adf69b102faada.info differ
diff --git a/Zookeepers Trial/Library/metadata/ea/ea4099334592f9b438b00b490fca1868 b/Zookeepers Trial/Library/metadata/ea/ea4099334592f9b438b00b490fca1868
new file mode 100644
index 0000000000000000000000000000000000000000..fcc72a84488665a5b59008a3732ca1aa057768bd
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/ea/ea4099334592f9b438b00b490fca1868 differ
diff --git a/Zookeepers Trial/Library/metadata/ea/ea4099334592f9b438b00b490fca1868.info b/Zookeepers Trial/Library/metadata/ea/ea4099334592f9b438b00b490fca1868.info
new file mode 100644
index 0000000000000000000000000000000000000000..aa764c29e04f78ae7d83069f9c0b71e1af841e56
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/ea/ea4099334592f9b438b00b490fca1868.info differ
diff --git a/Zookeepers Trial/Zookeepers Trial.CSharp.csproj b/Zookeepers Trial/Zookeepers Trial.CSharp.csproj
index 50cbef5f277cc263f49ea1155a4ebc9b0ce9d5b4..91892e1b670388c3a4971cf66bc43047fab8765f 100644
--- a/Zookeepers Trial/Zookeepers Trial.CSharp.csproj
+++ b/Zookeepers Trial/Zookeepers Trial.CSharp.csproj
@@ -71,7 +71,6 @@
<ItemGroup>
<Compile Include="Assets\Scripts\ArenaCombatControl.cs" />
<Compile Include="Assets\Scripts\CameraMovement.cs" />
- <Compile Include="Assets\Scripts\CharacterStats.cs" />
<Compile Include="Assets\Scripts\Collisions.cs" />
<Compile Include="Assets\Scripts\CreateWeapon.cs" />
<Compile Include="Assets\Scripts\CurrentWeapon.cs" />
@@ -79,13 +78,15 @@
<Compile Include="Assets\Scripts\EnemyAI.cs" />
<Compile Include="Assets\Scripts\EnemyHealth.cs" />
<Compile Include="Assets\Scripts\EnterDoor.cs" />
- <Compile Include="Assets\Scripts\PlayerHealth.cs" />
+ <Compile Include="Assets\Scripts\MainMenu.cs" />
<Compile Include="Assets\Scripts\PlayerMovement.cs" />
+ <Compile Include="Assets\Scripts\PlayerStats.cs" />
<Compile Include="Assets\Scripts\ShopMenu.cs" />
+ <Compile Include="Assets\Scripts\WeaponList.cs" />
<Compile Include="Assets\Scripts\WeaponShopButton.cs" />
<Compile Include="Assets\Scripts\WeaponStats.cs" />
+ <Compile Include="Assets\Scripts\characterCreation\ChooseCharLook.cs" />
<Compile Include="Assets\Scripts\characterCreation\ChooseCharStats.cs" />
- <Compile Include="Assets\Scripts\characterCreation\chooseCharLook.cs" />
<Compile Include="Assets\Scripts\characterCreation\setAppearance.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\SyntaxTree\UnityVS\2015\UnityVS.CSharp.targets" />
diff --git a/Zookeepers Trial/Zookeepers Trial.sln b/Zookeepers Trial/Zookeepers Trial.sln
index 19cd81b140d080ba64db87c8cf46cf6a85ebc4fa..62a37f218a53fae88dde07d0540b132fa68fa057 100644
--- a/Zookeepers Trial/Zookeepers Trial.sln
+++ b/Zookeepers Trial/Zookeepers Trial.sln
@@ -1,7 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2008
-
-Project("{EB5C7B1C-EAE6-17E3-2D49-132C46FA7A42}") = "Zookeepers Trial", "Assembly-CSharp.csproj", "{A6B8DDDF-E196-1FCB-6D57-7F9F959D6FCF}"
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2015
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zookeepers Trial.CSharp", "Zookeepers Trial.CSharp.csproj", "{D55A8806-DC1A-C11C-2984-9B6CACEB1C5B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -9,15 +9,12 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A6B8DDDF-E196-1FCB-6D57-7F9F959D6FCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A6B8DDDF-E196-1FCB-6D57-7F9F959D6FCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A6B8DDDF-E196-1FCB-6D57-7F9F959D6FCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A6B8DDDF-E196-1FCB-6D57-7F9F959D6FCF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D55A8806-DC1A-C11C-2984-9B6CACEB1C5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D55A8806-DC1A-C11C-2984-9B6CACEB1C5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D55A8806-DC1A-C11C-2984-9B6CACEB1C5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D55A8806-DC1A-C11C-2984-9B6CACEB1C5B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = Assembly-CSharp.csproj
- EndGlobalSection
EndGlobal