diff --git a/Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo b/Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo
index 5e0467517b5e351e354e2eb97e80ba4ab5b0727a..41b42f94a6f0934ba4b6ddcf671c09503ee91d00 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/Art/maps/map.png.meta b/Zookeepers Trial/Assets/Art/maps/map.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..a29f01d782132108ed5bc311e94fb946d71600e9
--- /dev/null
+++ b/Zookeepers Trial/Assets/Art/maps/map.png.meta
@@ -0,0 +1,59 @@
+fileFormatVersion: 2
+guid: 3590bd84105653a48a7e1671d16ef2f8
+timeCreated: 1478793659
+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: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 0
+ cubemapConvolution: 0
+ cubemapConvolutionSteps: 7
+ 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: 0.5, y: 0.5}
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spritePixelsToUnits: 100
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ buildTargetSettings: []
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ spritePackingTag:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Zookeepers Trial/Assets/Art/oldArt/SimpleBlockWithAxe/SimpleBlock0002.controller b/Zookeepers Trial/Assets/Art/oldArt/SimpleBlockWithAxe/SimpleBlock0002.controller
new file mode 100644
index 0000000000000000000000000000000000000000..9948ad280ecfc722c29ff7de3a3b7894116113b6
Binary files /dev/null and b/Zookeepers Trial/Assets/Art/oldArt/SimpleBlockWithAxe/SimpleBlock0002.controller differ
diff --git a/Zookeepers Trial/Assets/Art/oldArt/SimpleBlockWithAxe/SimpleBlock0002.controller.meta b/Zookeepers Trial/Assets/Art/oldArt/SimpleBlockWithAxe/SimpleBlock0002.controller.meta
new file mode 100644
index 0000000000000000000000000000000000000000..10f9090f280dbd5f5081ea4840366a37a528475a
--- /dev/null
+++ b/Zookeepers Trial/Assets/Art/oldArt/SimpleBlockWithAxe/SimpleBlock0002.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9024a1dd7db9cbf44909b09e93574a82
+timeCreated: 1478798521
+licenseType: Free
+NativeFormatImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Zookeepers Trial/Assets/Art/oldArt/SimpleBlockWithAxe/SimpleBlockWithAxe.anim b/Zookeepers Trial/Assets/Art/oldArt/SimpleBlockWithAxe/SimpleBlockWithAxe.anim
index 84c11eaa34a585c75a8aeff06002b45edec92471..0499f7a700ef60ad1272a9d5325c0b2b034c7ade 100644
Binary files a/Zookeepers Trial/Assets/Art/oldArt/SimpleBlockWithAxe/SimpleBlockWithAxe.anim and b/Zookeepers Trial/Assets/Art/oldArt/SimpleBlockWithAxe/SimpleBlockWithAxe.anim differ
diff --git a/Zookeepers Trial/Assets/Art/oldArt/idle/Enemy.controller b/Zookeepers Trial/Assets/Art/oldArt/idle/Enemy.controller
index 4bba8fe6e29629e7469800ef074ca82476ae00a8..8b1c1563ffadd9f722f61c537db1ca489693fcdc 100644
Binary files a/Zookeepers Trial/Assets/Art/oldArt/idle/Enemy.controller and b/Zookeepers Trial/Assets/Art/oldArt/idle/Enemy.controller differ
diff --git a/Zookeepers Trial/Assets/Scenes/arena.unity b/Zookeepers Trial/Assets/Scenes/arena.unity
index dc145cb26f00f8ab76b0b3a557f286c358a89da7..0c7fb3f0aa727638a0516806ab5666127f247e3e 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/Scenes/mainScene2.unity.meta b/Zookeepers Trial/Assets/Scenes/mainScene2.unity.meta
new file mode 100644
index 0000000000000000000000000000000000000000..0a307678a4bdf67fb599103fcb24877bce8ea6d3
--- /dev/null
+++ b/Zookeepers Trial/Assets/Scenes/mainScene2.unity.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dbe5a1e831173234a8e861bb68c93f2f
+timeCreated: 1478793653
+licenseType: Free
+DefaultImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Zookeepers Trial/Assets/Scripts/CharacterLook.cs b/Zookeepers Trial/Assets/Scripts/CharacterLook.cs
deleted file mode 100644
index ac686593594c94f4451f7c4675dddf3d53198e71..0000000000000000000000000000000000000000
--- a/Zookeepers Trial/Assets/Scripts/CharacterLook.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using UnityEngine;
-using System.Collections;
-
-public class CharacterLook : MonoBehaviour {
-
- /*
- * This script will contain integers referring to which sprite to load. This script will be filled out after character creation is over
- * */
- public int head;
- public int body;
- public int weapon;
-
- // Use this for initialization
- void Start () {
-
- }
-
- // Update is called once per frame
- void Update () {
-
- }
-}
diff --git a/Zookeepers Trial/Assets/Scripts/CharacterStats.cs b/Zookeepers Trial/Assets/Scripts/CharacterStats.cs
index e1186e0686820a447ed506a37d934bdf22b5568b..896fdfa8d49ab3e3868fa47ab75624e63d21dd54 100644
--- a/Zookeepers Trial/Assets/Scripts/CharacterStats.cs
+++ b/Zookeepers Trial/Assets/Scripts/CharacterStats.cs
@@ -4,7 +4,7 @@ using System.Collections;
/*
* This script stores the stats of the player at any point in the game
* */
-public class CharacterLook : MonoBehaviour {
+public class CharacterStats : MonoBehaviour {
/*
* This script will contain integers referring to which sprite to load. This script will be filled out after character creation is over
* */
diff --git a/Zookeepers Trial/Assets/Scripts/CharacterStats.cs.meta b/Zookeepers Trial/Assets/Scripts/CharacterStats.cs.meta
index 8dcab52c63e31c675c01ed7aed7d8273c3c4ed3b..86d09cc3b5d5038fb85baf3876ed719ec8e91040 100644
--- a/Zookeepers Trial/Assets/Scripts/CharacterStats.cs.meta
+++ b/Zookeepers Trial/Assets/Scripts/CharacterStats.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 13f47185ab4757947a0e9368c09d9561
+guid: d75682e2eeef4d44e8ef95860e233ba5
timeCreated: 1478631117
licenseType: Free
MonoImporter:
diff --git a/Zookeepers Trial/Assets/Scripts/EnemyAI.cs b/Zookeepers Trial/Assets/Scripts/EnemyAI.cs
index 2c75811408cefff5ccedffcff0c85f1ece55e01b..10ddb6a3a72836a0608b917850cb1b72d070bebc 100644
--- a/Zookeepers Trial/Assets/Scripts/EnemyAI.cs
+++ b/Zookeepers Trial/Assets/Scripts/EnemyAI.cs
@@ -9,6 +9,7 @@ public class EnemyAI : MonoBehaviour {
private Animator myAnimator;
float enemyHealth;
float playerHealth;
+ float spaceBarCounter = 0; //check for how aggresive the player is being
private bool LookRight = false;
public bool set;
private float speed = 1;
@@ -27,6 +28,7 @@ public class EnemyAI : MonoBehaviour {
Enemy = GetComponent<Rigidbody2D>();
BuildDecisionTree();
+
}
void Update() {
@@ -38,6 +40,10 @@ public class EnemyAI : MonoBehaviour {
public bool d_inAttackRange() {
+ if (Input.GetKeyDown(KeyCode.Space)) {
+ spaceBarCounter++;
+ }
+
if (Vector3.Distance(transform.position, target.position) < 1.5f) {
myAnimator.SetBool("speed", false);
return true;
@@ -52,39 +58,48 @@ public class EnemyAI : MonoBehaviour {
public bool d_isPlayerAttacking() {
if (Input.GetKeyDown(KeyCode.Space) && Vector3.Distance(transform.position, target.position) < 6f) {
- return false;
+ spaceBarCounter++;
+ return true;
}
- return true;
+ return false;
+ }
+
+
+ public bool d_isPlayerAggresive() {
+ if (spaceBarCounter > 5) {
+ Debug.Log("Aggressive");
+ return true;
+ }
+ return false;
}
public bool d_isPlayerHpLow() {
- if ((PlayerHealth.health/2) < playerHealth) {
+ if ((PlayerHealth.health / 2) < playerHealth) {
return true;
}
return false;
}
-
+
public bool d_isHpLow() {
- if ((EnemyHealth.health/2) < enemyHealth) {
+ if ((EnemyHealth.health / 2) < enemyHealth) {
return true;
}
return false;
}
-
+
//makes a random decision with a 75% true return and a 25% false return
- public bool randomDecision75()
- {
+ public bool d_randomDecision75() {
int x = Random.Range(1, 4);
- if (x == 1)
- {
+ if (x == 1) {
return false;
}
- else return true;
+
+ return true;
}
-
-
+
+
// Actions
public void a_attack() {
Debug.Log("attacking");
@@ -95,22 +110,22 @@ public class EnemyAI : MonoBehaviour {
public void a_block() {
Debug.Log("run");
- float option = Random.Range(0, 2);
- if (option == 1) {
- myAnimator.SetBool("attack", false);
- myAnimator.SetBool("block", true);
- Enemy.velocity = Vector2.zero;
- }
+ // float option = Random.Range(0, 5000);
+ // if (option <= 2500) {
+ myAnimator.SetBool("attack", false);
+ myAnimator.SetBool("block", true);
+ myAnimator.SetBool("speed", false);
+ Enemy.velocity = Vector2.zero;
+ // }
- if (option == 2) {
- Enemy.AddForce(new Vector2(-50, 500));
- }
+ // if (option > 2500) {
+ // Enemy.AddForce(new Vector2(-50, 500));
+ // }
}
-
+
//template for a 'poison' special attack. Will slowly and gradually drain players health over time.
- public void poison()
- {
+ public void poison() {
Debug.Log("Performing Poison Attack");
}
@@ -137,7 +152,7 @@ public class EnemyAI : MonoBehaviour {
//rotate to look at the player
//transform.LookAt(target.position);
myAnimator.SetBool("speed", true);
- transform.position = Vector2.MoveTowards(-transform.position, target.position, speed * Time.deltaTime);
+ transform.position = Vector2.MoveTowards(transform.position, target.position, -speed * Time.deltaTime);
if (target.transform.position.x <= transform.position.x) //players spot in world space as opposed to enemy "self" spot
{
@@ -169,30 +184,56 @@ public class EnemyAI : MonoBehaviour {
// Decisions
- DecisionTree EnemyHP = new DecisionTree();
- EnemyHP.setDecision(d_isHpLow);
- EnemyHP.setLeft(MoveAway);
- EnemyHP.setRight(Attack);
+ DecisionTree GettingAttacked = new DecisionTree();
+ GettingAttacked.setDecision(d_isPlayerAttacking);
+ GettingAttacked.setLeft(Block);
+ GettingAttacked.setRight(Attack);
DecisionTree PlayerHP = new DecisionTree();
PlayerHP.setDecision(d_isPlayerHpLow);
PlayerHP.setLeft(Attack);
- PlayerHP.setRight(EnemyHP);
+ PlayerHP.setRight(Block);
+ DecisionTree PlayerHP2 = new DecisionTree();
+ PlayerHP2.setDecision(d_isPlayerHpLow);
+ PlayerHP2.setLeft(Attack);
+ PlayerHP2.setRight(MoveAway);
+
+
+ DecisionTree EnemyHP = new DecisionTree();
+ EnemyHP.setDecision(d_isHpLow);
+ EnemyHP.setLeft(PlayerHP2);
+ EnemyHP.setRight(Attack);
+
+
+
+ //Random Action Trees
+ DecisionTree Random01 = new DecisionTree();
+ Random01.setDecision(d_randomDecision75);
+ Random01.setLeft(PlayerHP);
+ Random01.setRight(Attack);
+
+ //Random Action Trees
+ DecisionTree Random02 = new DecisionTree();
+ Random02.setDecision(d_randomDecision75);
+ Random02.setLeft(EnemyHP);
+ Random02.setRight(Block);
+
+
+ DecisionTree Aggressiveness = new DecisionTree();
+ Aggressiveness.setDecision(d_isPlayerAggresive);
+ Aggressiveness.setLeft(Random01);
+ Aggressiveness.setRight(Random02);
- DecisionTree GettingAttacked = new DecisionTree();
- GettingAttacked.setDecision(d_isPlayerAttacking);
- GettingAttacked.setLeft(Attack);
- GettingAttacked.setRight(Block);
root.setDecision(d_inAttackRange);
- root.setLeft(GettingAttacked);
+ root.setLeft(Aggressiveness);
root.setRight(MoveToPlayer);
-
-
-
+
+
+
}
diff --git a/Zookeepers Trial/Library/CurrentLayout.dwlt b/Zookeepers Trial/Library/CurrentLayout.dwlt
index 47a1c419239c4e4c65164c9a19b33aee445fe564..f143085c50fa87064566da088367aace7cb2fa93 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 33274b798f66d826d473b15290877990db87bbcf..475fcf6d501941711de109d0697a532db682ec1d 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 8cc5c44350f239649af35af41844989e8ef3240d..9b06f131d43ea384cedeed25af953bd9bda283a9 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 9a2e9f18980c37372dd4137727c2e4388ead26cf..14ce8b7adf1644775e842d335ca25087099b8607 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 04f6aaccbe0f74e94c71207663e594fd0ee9cca8..7024d72086cd59d1624023c6f670eb319996e7c1 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 f2528b948aeb2d93c41007cf7cd3bcb34ee75eae..8d95961d60b21cb43b19625a448796f96da8cda5 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 06340eef419202d5a58c4dd4043cdff3237b8886..fd0c189e7bb645650aec70c62290326047c069a1 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 85e3a02599c30f79adc0a25d71b0bc06c300842c..b0ac9785c48636ac8f79b9354156d988716df013 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 e4674b27d38dd1ae0c8b83292d697f4040568d45..158d9c53c8ad6dc629831b20142ad59ea353d20d 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 3265de3f1afde3d08e46efefe53297fceeb573c9..8eada95a790f9c4635f832d01f563691035094ce 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 afe99f3e295f476bf4e8bdd9cb1eaea1731fa913..832719ef6501747a16b7ac31fb00eb5db1114028 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 c724e2cbcd9af0c122a61139272c1b38859c961c..60a123f575fd9469ffd902afc554221140d65c19 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 242057ff73d8e8f4e2b72947b2466a3d44f67cba..d47f2374ccdf6fa4a424a5c74966f3e9ba16f7e5 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 a63ac900739d4da4d9a571deffbebcb14928c507..09e4bff496b65a17a14983b666fa86c0c2602390 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 182c63bf4bfffbf4aea9c45579e054db11c346b6..ec601b28b7de6f841b7ace6ec099de4e5ccab9e9 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 af3260f88db00b16250efa5cf6b9e20f2d1f3951..e6c746f588097f4ccaa5988357060ea1f77ac937 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 a3c93bf49570f75ac96ff8341d6ef664c3f5681a..b71d2ff4b92eebcc19abe3627a4dfaaa01b412d7 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 b30bb1503b16df25479a2fa3bda57a4356d0a035..7b4292449c41ea192682c9d986418f036021432f 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 22eea7cc20a9de24f28f73cd3f9e14d109fa87b0..8c82c7ffc99f660a7037fcad2ac8039dcb2fd597 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 a0869e5379f4dd289cd481625ba2c0747ac067b6..82064cf805c01768b83c68ce9a23d6bc0681d54f 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 23ed9d4ffe6fc65fa56d08a3cdbf6661f98fc954..57f840d041bdd640b9100ab2e079207394a4af0c 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 807d4bf3ce3736372523d4197d4b233104ba4500..ee09f39acdbbcd557b4b25eb5baa6f53cf36d2a0 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/03/03fea8c035fe9b84d83ff53d72c919b6 b/Zookeepers Trial/Library/metadata/03/03fea8c035fe9b84d83ff53d72c919b6
index e6bf741f09c43672eb799242630a698714ee1c7c..90bd0b18498ac8ed4ff6f6c17a158b6b2603f655 100644
Binary files a/Zookeepers Trial/Library/metadata/03/03fea8c035fe9b84d83ff53d72c919b6 and b/Zookeepers Trial/Library/metadata/03/03fea8c035fe9b84d83ff53d72c919b6 differ
diff --git a/Zookeepers Trial/Library/metadata/03/03fea8c035fe9b84d83ff53d72c919b6.info b/Zookeepers Trial/Library/metadata/03/03fea8c035fe9b84d83ff53d72c919b6.info
index ff797f2997fba6131a74df368fbc56489a72253e..49a97ba6efa02fbf9690ce9aed220afc31f0a99a 100644
Binary files a/Zookeepers Trial/Library/metadata/03/03fea8c035fe9b84d83ff53d72c919b6.info and b/Zookeepers Trial/Library/metadata/03/03fea8c035fe9b84d83ff53d72c919b6.info differ
diff --git a/Zookeepers Trial/Library/metadata/0a/0a0993049e42c8b41b1c6d4b9753a4d0 b/Zookeepers Trial/Library/metadata/0a/0a0993049e42c8b41b1c6d4b9753a4d0
new file mode 100644
index 0000000000000000000000000000000000000000..f197b4a69bfecd276c665b17f0703154c8ecc165
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/0a/0a0993049e42c8b41b1c6d4b9753a4d0 differ
diff --git a/Zookeepers Trial/Library/metadata/0a/0a0993049e42c8b41b1c6d4b9753a4d0.info b/Zookeepers Trial/Library/metadata/0a/0a0993049e42c8b41b1c6d4b9753a4d0.info
new file mode 100644
index 0000000000000000000000000000000000000000..c807ac1eb9d42fee147639aa9493d5d161608f60
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/0a/0a0993049e42c8b41b1c6d4b9753a4d0.info differ
diff --git a/Zookeepers Trial/Library/metadata/0a/0a5410bd5abcd9240a90852252a9b918 b/Zookeepers Trial/Library/metadata/0a/0a5410bd5abcd9240a90852252a9b918
index 8d784fdfd93c24e5a945af71a87169247cda654d..fd616e6447776564331e0788714273978e27c92a 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/12/12224ec9a1bc45e4f9600af81f374c71 b/Zookeepers Trial/Library/metadata/12/12224ec9a1bc45e4f9600af81f374c71
index 35e642b308cc00cc8890fc5ff2fb0f471afa4d31..29e29f92e2b584ee2585ec0e887f7ab82fc6b2c8 100644
Binary files a/Zookeepers Trial/Library/metadata/12/12224ec9a1bc45e4f9600af81f374c71 and b/Zookeepers Trial/Library/metadata/12/12224ec9a1bc45e4f9600af81f374c71 differ
diff --git a/Zookeepers Trial/Library/metadata/12/12224ec9a1bc45e4f9600af81f374c71.info b/Zookeepers Trial/Library/metadata/12/12224ec9a1bc45e4f9600af81f374c71.info
index beec22ad681d5af647fe2557b3995cfd6585dbf6..b2f17717f9014fe1234e92e78596e1b76ab4e507 100644
Binary files a/Zookeepers Trial/Library/metadata/12/12224ec9a1bc45e4f9600af81f374c71.info and b/Zookeepers Trial/Library/metadata/12/12224ec9a1bc45e4f9600af81f374c71.info differ
diff --git a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info~origin_master b/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info~origin_master
deleted file mode 100644
index 430c24dd520f773d5b0d3494477e9677c410290d..0000000000000000000000000000000000000000
Binary files a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info~origin_master and /dev/null differ
diff --git a/Zookeepers Trial/Library/metadata/35/3590bd84105653a48a7e1671d16ef2f8 b/Zookeepers Trial/Library/metadata/35/3590bd84105653a48a7e1671d16ef2f8
new file mode 100644
index 0000000000000000000000000000000000000000..da7ec2c6dc1a19d5a08eb19a2b7fc3b13aa2aea3
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/35/3590bd84105653a48a7e1671d16ef2f8 differ
diff --git a/Zookeepers Trial/Library/metadata/35/3590bd84105653a48a7e1671d16ef2f8.info b/Zookeepers Trial/Library/metadata/35/3590bd84105653a48a7e1671d16ef2f8.info
new file mode 100644
index 0000000000000000000000000000000000000000..9d1b9e7f9afd0ccd572875bd26998dd7b8de50c2
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/35/3590bd84105653a48a7e1671d16ef2f8.info differ
diff --git a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561~HEAD b/Zookeepers Trial/Library/metadata/3f/3fe0717995857f84293c5a545a0182d0
similarity index 84%
rename from Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561~HEAD
rename to Zookeepers Trial/Library/metadata/3f/3fe0717995857f84293c5a545a0182d0
index 8886fa3acff3d2e9960c671152ace6c3dd04e255..60f7cf350609a98d6c46aa2e7bc89438e4022d76 100644
Binary files a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561~HEAD and b/Zookeepers Trial/Library/metadata/3f/3fe0717995857f84293c5a545a0182d0 differ
diff --git a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info~HEAD b/Zookeepers Trial/Library/metadata/3f/3fe0717995857f84293c5a545a0182d0.info
similarity index 70%
rename from Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info~HEAD
rename to Zookeepers Trial/Library/metadata/3f/3fe0717995857f84293c5a545a0182d0.info
index 430c24dd520f773d5b0d3494477e9677c410290d..c259737148705684c3b152a23536306e1179d6a3 100644
Binary files a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info~HEAD and b/Zookeepers Trial/Library/metadata/3f/3fe0717995857f84293c5a545a0182d0.info differ
diff --git a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561~More Shop Tweaks b/Zookeepers Trial/Library/metadata/52/5249f18a50a612e4f9786623c6ce0d0e
similarity index 61%
rename from Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561~More Shop Tweaks
rename to Zookeepers Trial/Library/metadata/52/5249f18a50a612e4f9786623c6ce0d0e
index 0bb4cd81d6be442fddee259e14ef735e21a0cbf8..eb9d66aa8a48329b440091e1f3b14575036905d7 100644
Binary files a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561~More Shop Tweaks and b/Zookeepers Trial/Library/metadata/52/5249f18a50a612e4f9786623c6ce0d0e differ
diff --git a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info~HEAD_0 b/Zookeepers Trial/Library/metadata/52/5249f18a50a612e4f9786623c6ce0d0e.info
similarity index 70%
rename from Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info~HEAD_0
rename to Zookeepers Trial/Library/metadata/52/5249f18a50a612e4f9786623c6ce0d0e.info
index 430c24dd520f773d5b0d3494477e9677c410290d..5e1389ff0191639311710824748fde659ba34d63 100644
Binary files a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info~HEAD_0 and b/Zookeepers Trial/Library/metadata/52/5249f18a50a612e4f9786623c6ce0d0e.info differ
diff --git a/Zookeepers Trial/Library/metadata/59/59cca7e513aa58c4894de8c9f40bde51 b/Zookeepers Trial/Library/metadata/59/59cca7e513aa58c4894de8c9f40bde51
index 3fc6f2b4507bd6a7b6390f49a4dd1cfb7d373c86..8a697af948951ec5dd493bd927e347523f5bd492 100644
Binary files a/Zookeepers Trial/Library/metadata/59/59cca7e513aa58c4894de8c9f40bde51 and b/Zookeepers Trial/Library/metadata/59/59cca7e513aa58c4894de8c9f40bde51 differ
diff --git a/Zookeepers Trial/Library/metadata/59/59cca7e513aa58c4894de8c9f40bde51.info b/Zookeepers Trial/Library/metadata/59/59cca7e513aa58c4894de8c9f40bde51.info
index f7427dd709b80a2c27050ba5431f7e710f5225f2..c10bd9f32e40261ecd9a775171abd448758ae3d1 100644
Binary files a/Zookeepers Trial/Library/metadata/59/59cca7e513aa58c4894de8c9f40bde51.info and b/Zookeepers Trial/Library/metadata/59/59cca7e513aa58c4894de8c9f40bde51.info differ
diff --git a/Zookeepers Trial/Library/metadata/5b/5bd3320daa8fb3d43846ffc2b20d403b b/Zookeepers Trial/Library/metadata/5b/5bd3320daa8fb3d43846ffc2b20d403b
index 0706636b1b9a7058a3602bc0e144386c996c5d91..59070ddbcc37c96aa4dafc852c7f041a270c6d77 100644
Binary files a/Zookeepers Trial/Library/metadata/5b/5bd3320daa8fb3d43846ffc2b20d403b and b/Zookeepers Trial/Library/metadata/5b/5bd3320daa8fb3d43846ffc2b20d403b differ
diff --git a/Zookeepers Trial/Library/metadata/5b/5bd3320daa8fb3d43846ffc2b20d403b.info b/Zookeepers Trial/Library/metadata/5b/5bd3320daa8fb3d43846ffc2b20d403b.info
index 7a09bc0579116596ae7812afad4161d2426abc34..a1e4edfc728ceb1db671ad658718f5024b8536fd 100644
Binary files a/Zookeepers Trial/Library/metadata/5b/5bd3320daa8fb3d43846ffc2b20d403b.info and b/Zookeepers Trial/Library/metadata/5b/5bd3320daa8fb3d43846ffc2b20d403b.info differ
diff --git a/Zookeepers Trial/Library/metadata/6c/6c3c5e21234caa3468025629dfa57435 b/Zookeepers Trial/Library/metadata/6c/6c3c5e21234caa3468025629dfa57435
index af6ee3d6a4b4094dc14ef65e1b6bd6dfcf6e618a..a37beea3f8f852540af3e138cb63b13be69ea259 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/83/8349f9df539e16045bf2f5eb8352e1b3 b/Zookeepers Trial/Library/metadata/83/8349f9df539e16045bf2f5eb8352e1b3
new file mode 100644
index 0000000000000000000000000000000000000000..335a6ee31347ec0a197f9df71b806fb90fd7c740
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/83/8349f9df539e16045bf2f5eb8352e1b3 differ
diff --git a/Zookeepers Trial/Library/metadata/83/8349f9df539e16045bf2f5eb8352e1b3.info b/Zookeepers Trial/Library/metadata/83/8349f9df539e16045bf2f5eb8352e1b3.info
new file mode 100644
index 0000000000000000000000000000000000000000..0a81364e7261dc7318fa97dd16d533446a952fca
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/83/8349f9df539e16045bf2f5eb8352e1b3.info differ
diff --git a/Zookeepers Trial/Library/metadata/98/9892297dde0528c4295ae5165c79615f~HEAD b/Zookeepers Trial/Library/metadata/90/9024a1dd7db9cbf44909b09e93574a82
similarity index 90%
rename from Zookeepers Trial/Library/metadata/98/9892297dde0528c4295ae5165c79615f~HEAD
rename to Zookeepers Trial/Library/metadata/90/9024a1dd7db9cbf44909b09e93574a82
index c85559bc4b317db652095ab3a057b2fc3dccf3df..a4f82d58da119c7ea3847fc75c8628a86c48ba47 100644
Binary files a/Zookeepers Trial/Library/metadata/98/9892297dde0528c4295ae5165c79615f~HEAD and b/Zookeepers Trial/Library/metadata/90/9024a1dd7db9cbf44909b09e93574a82 differ
diff --git a/Zookeepers Trial/Library/metadata/90/9024a1dd7db9cbf44909b09e93574a82.info b/Zookeepers Trial/Library/metadata/90/9024a1dd7db9cbf44909b09e93574a82.info
new file mode 100644
index 0000000000000000000000000000000000000000..2dcb79c317248d53e556cfbf03ca3cc1b1b16e2a
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/90/9024a1dd7db9cbf44909b09e93574a82.info differ
diff --git a/Zookeepers Trial/Library/metadata/98/9892297dde0528c4295ae5165c79615f~HEAD_0 b/Zookeepers Trial/Library/metadata/98/9892297dde0528c4295ae5165c79615f~HEAD_0
deleted file mode 100644
index c85559bc4b317db652095ab3a057b2fc3dccf3df..0000000000000000000000000000000000000000
Binary files a/Zookeepers Trial/Library/metadata/98/9892297dde0528c4295ae5165c79615f~HEAD_0 and /dev/null differ
diff --git a/Zookeepers Trial/Library/metadata/98/9892297dde0528c4295ae5165c79615f~More Shop Tweaks b/Zookeepers Trial/Library/metadata/98/9892297dde0528c4295ae5165c79615f~More Shop Tweaks
deleted file mode 100644
index c85559bc4b317db652095ab3a057b2fc3dccf3df..0000000000000000000000000000000000000000
Binary files a/Zookeepers Trial/Library/metadata/98/9892297dde0528c4295ae5165c79615f~More Shop Tweaks and /dev/null differ
diff --git a/Zookeepers Trial/Library/metadata/98/9892297dde0528c4295ae5165c79615f~More Shop Tweaks_0 b/Zookeepers Trial/Library/metadata/98/9892297dde0528c4295ae5165c79615f~More Shop Tweaks_0
deleted file mode 100644
index c85559bc4b317db652095ab3a057b2fc3dccf3df..0000000000000000000000000000000000000000
Binary files a/Zookeepers Trial/Library/metadata/98/9892297dde0528c4295ae5165c79615f~More Shop Tweaks_0 and /dev/null differ
diff --git a/Zookeepers Trial/Library/metadata/99/99614d0d55059a44182971f91ab4d248~HEAD b/Zookeepers Trial/Library/metadata/99/99614d0d55059a44182971f91ab4d248~HEAD
deleted file mode 100644
index c215c75599a557880e54295a91aca40c55685225..0000000000000000000000000000000000000000
Binary files a/Zookeepers Trial/Library/metadata/99/99614d0d55059a44182971f91ab4d248~HEAD and /dev/null differ
diff --git a/Zookeepers Trial/Library/metadata/99/99614d0d55059a44182971f91ab4d248~More Shop Tweaks b/Zookeepers Trial/Library/metadata/99/99614d0d55059a44182971f91ab4d248~More Shop Tweaks
deleted file mode 100644
index c215c75599a557880e54295a91aca40c55685225..0000000000000000000000000000000000000000
Binary files a/Zookeepers Trial/Library/metadata/99/99614d0d55059a44182971f91ab4d248~More Shop Tweaks and /dev/null differ
diff --git a/Zookeepers Trial/Library/metadata/ae/ae80e2caed0f6a8479ba3b3604e39ce4 b/Zookeepers Trial/Library/metadata/ae/ae80e2caed0f6a8479ba3b3604e39ce4
index 4985fbceebc10f50d0a4ba5f82ceb33a56b7f0e2..3d2e72f13dabc71b7b3045119819da22c172b11b 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/cc/cc7a8626b3629154cbee2ff6b3e5827b~HEAD b/Zookeepers Trial/Library/metadata/b5/b5e3a260810af2243a6fe07ec1b8f26b
similarity index 89%
rename from Zookeepers Trial/Library/metadata/cc/cc7a8626b3629154cbee2ff6b3e5827b~HEAD
rename to Zookeepers Trial/Library/metadata/b5/b5e3a260810af2243a6fe07ec1b8f26b
index 54a70ee86c80fe8f6e51a9b30698e2456836353e..ce5e5c1d65243cc576f941465728f670dc037e76 100644
Binary files a/Zookeepers Trial/Library/metadata/cc/cc7a8626b3629154cbee2ff6b3e5827b~HEAD and b/Zookeepers Trial/Library/metadata/b5/b5e3a260810af2243a6fe07ec1b8f26b differ
diff --git a/Zookeepers Trial/Library/metadata/17/179d04fb04280f8429417b12b388e6ad.info~More Shop Tweaks b/Zookeepers Trial/Library/metadata/b5/b5e3a260810af2243a6fe07ec1b8f26b.info
similarity index 80%
rename from Zookeepers Trial/Library/metadata/17/179d04fb04280f8429417b12b388e6ad.info~More Shop Tweaks
rename to Zookeepers Trial/Library/metadata/b5/b5e3a260810af2243a6fe07ec1b8f26b.info
index 2fa6789919ab25d15f0782d14d2d9665dab0d4c6..6a2486120140d2bd79a62ca592e6128d75435746 100644
Binary files a/Zookeepers Trial/Library/metadata/17/179d04fb04280f8429417b12b388e6ad.info~More Shop Tweaks and b/Zookeepers Trial/Library/metadata/b5/b5e3a260810af2243a6fe07ec1b8f26b.info differ
diff --git a/Zookeepers Trial/Library/metadata/b6/b699ef9062cb0884da5525aa4f8beb02 b/Zookeepers Trial/Library/metadata/b6/b699ef9062cb0884da5525aa4f8beb02
new file mode 100644
index 0000000000000000000000000000000000000000..62da6e4b49d601567cbdc1af1794b01db48a89d2
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/b6/b699ef9062cb0884da5525aa4f8beb02 differ
diff --git a/Zookeepers Trial/Library/metadata/b6/b699ef9062cb0884da5525aa4f8beb02.info b/Zookeepers Trial/Library/metadata/b6/b699ef9062cb0884da5525aa4f8beb02.info
new file mode 100644
index 0000000000000000000000000000000000000000..a0cdf96a81b09c3b9c495520ff0fe852d01841eb
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/b6/b699ef9062cb0884da5525aa4f8beb02.info differ
diff --git a/Zookeepers Trial/Library/metadata/17/179d04fb04280f8429417b12b388e6ad~HEAD b/Zookeepers Trial/Library/metadata/ba/ba0eaad5f5efa66409bee81b67fdbf24
similarity index 91%
rename from Zookeepers Trial/Library/metadata/17/179d04fb04280f8429417b12b388e6ad~HEAD
rename to Zookeepers Trial/Library/metadata/ba/ba0eaad5f5efa66409bee81b67fdbf24
index 53966627e45862e103d8ede2de4b255cd28f5b48..936bba97f8a19f5b1444d0eeaba4f6269f23e86b 100644
Binary files a/Zookeepers Trial/Library/metadata/17/179d04fb04280f8429417b12b388e6ad~HEAD and b/Zookeepers Trial/Library/metadata/ba/ba0eaad5f5efa66409bee81b67fdbf24 differ
diff --git a/Zookeepers Trial/Library/metadata/17/179d04fb04280f8429417b12b388e6ad.info~HEAD b/Zookeepers Trial/Library/metadata/ba/ba0eaad5f5efa66409bee81b67fdbf24.info
similarity index 83%
rename from Zookeepers Trial/Library/metadata/17/179d04fb04280f8429417b12b388e6ad.info~HEAD
rename to Zookeepers Trial/Library/metadata/ba/ba0eaad5f5efa66409bee81b67fdbf24.info
index 2fa6789919ab25d15f0782d14d2d9665dab0d4c6..13bff747e84d762be094b862ed7da86ccc553ff8 100644
Binary files a/Zookeepers Trial/Library/metadata/17/179d04fb04280f8429417b12b388e6ad.info~HEAD and b/Zookeepers Trial/Library/metadata/ba/ba0eaad5f5efa66409bee81b67fdbf24.info differ
diff --git a/Zookeepers Trial/Library/metadata/bc/bc6493b8d428e1f43a38f1b85f48cfeb b/Zookeepers Trial/Library/metadata/bc/bc6493b8d428e1f43a38f1b85f48cfeb
index 5af24854f67af6cd1f2c4174d54239813eb07bb9..e77b57bf42cbce72d5c3f0be4e57d35af2f9474e 100644
Binary files a/Zookeepers Trial/Library/metadata/bc/bc6493b8d428e1f43a38f1b85f48cfeb and b/Zookeepers Trial/Library/metadata/bc/bc6493b8d428e1f43a38f1b85f48cfeb differ
diff --git a/Zookeepers Trial/Library/metadata/bc/bc6493b8d428e1f43a38f1b85f48cfeb.info b/Zookeepers Trial/Library/metadata/bc/bc6493b8d428e1f43a38f1b85f48cfeb.info
index 727f9d6d4e43c1fc24f7498cd0ad840b8cd18610..90e3efc0aafd0bcd9cf522aaae1f311ddca1d354 100644
Binary files a/Zookeepers Trial/Library/metadata/bc/bc6493b8d428e1f43a38f1b85f48cfeb.info and b/Zookeepers Trial/Library/metadata/bc/bc6493b8d428e1f43a38f1b85f48cfeb.info differ
diff --git a/Zookeepers Trial/Library/metadata/17/179d04fb04280f8429417b12b388e6ad~More Shop Tweaks b/Zookeepers Trial/Library/metadata/be/be1227d6a2670be4ca73a3543e25fd18
similarity index 89%
rename from Zookeepers Trial/Library/metadata/17/179d04fb04280f8429417b12b388e6ad~More Shop Tweaks
rename to Zookeepers Trial/Library/metadata/be/be1227d6a2670be4ca73a3543e25fd18
index 53966627e45862e103d8ede2de4b255cd28f5b48..4613cbbe8766849dac2d1151b729dbc22a35bd60 100644
Binary files a/Zookeepers Trial/Library/metadata/17/179d04fb04280f8429417b12b388e6ad~More Shop Tweaks and b/Zookeepers Trial/Library/metadata/be/be1227d6a2670be4ca73a3543e25fd18 differ
diff --git a/Zookeepers Trial/Library/metadata/be/be1227d6a2670be4ca73a3543e25fd18.info b/Zookeepers Trial/Library/metadata/be/be1227d6a2670be4ca73a3543e25fd18.info
new file mode 100644
index 0000000000000000000000000000000000000000..2b9e8181f3858d4a5e9aa0553d02884f69f70bd8
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/be/be1227d6a2670be4ca73a3543e25fd18.info differ
diff --git a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561~HEAD_0 b/Zookeepers Trial/Library/metadata/d2/d2fac1114ff93e6498296dd02ae466cc
similarity index 74%
rename from Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561~HEAD_0
rename to Zookeepers Trial/Library/metadata/d2/d2fac1114ff93e6498296dd02ae466cc
index 0bb4cd81d6be442fddee259e14ef735e21a0cbf8..762e4d241ea48a32b55d148b44b3a272150bd521 100644
Binary files a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561~HEAD_0 and b/Zookeepers Trial/Library/metadata/d2/d2fac1114ff93e6498296dd02ae466cc differ
diff --git a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info b/Zookeepers Trial/Library/metadata/d2/d2fac1114ff93e6498296dd02ae466cc.info
similarity index 70%
rename from Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info
rename to Zookeepers Trial/Library/metadata/d2/d2fac1114ff93e6498296dd02ae466cc.info
index 430c24dd520f773d5b0d3494477e9677c410290d..1c51f877f515e9c14033c455f3d43059068280b1 100644
Binary files a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info and b/Zookeepers Trial/Library/metadata/d2/d2fac1114ff93e6498296dd02ae466cc.info differ
diff --git a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561~origin_master b/Zookeepers Trial/Library/metadata/d7/d75682e2eeef4d44e8ef95860e233ba5
similarity index 82%
rename from Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561~origin_master
rename to Zookeepers Trial/Library/metadata/d7/d75682e2eeef4d44e8ef95860e233ba5
index 8886fa3acff3d2e9960c671152ace6c3dd04e255..4a1f6a70382f67d34fddd9dedff19dca84f32cbb 100644
Binary files a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561~origin_master and b/Zookeepers Trial/Library/metadata/d7/d75682e2eeef4d44e8ef95860e233ba5 differ
diff --git a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info~More Shop Tweaks b/Zookeepers Trial/Library/metadata/d7/d75682e2eeef4d44e8ef95860e233ba5.info
similarity index 72%
rename from Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info~More Shop Tweaks
rename to Zookeepers Trial/Library/metadata/d7/d75682e2eeef4d44e8ef95860e233ba5.info
index 430c24dd520f773d5b0d3494477e9677c410290d..3c6b3b9f8f2ac876ed432bddb4aa84570cc5877c 100644
Binary files a/Zookeepers Trial/Library/metadata/13/13f47185ab4757947a0e9368c09d9561.info~More Shop Tweaks and b/Zookeepers Trial/Library/metadata/d7/d75682e2eeef4d44e8ef95860e233ba5.info differ
diff --git a/Zookeepers Trial/Library/metadata/d7/d76088f679622834287b91fb41989d50 b/Zookeepers Trial/Library/metadata/d7/d76088f679622834287b91fb41989d50
new file mode 100644
index 0000000000000000000000000000000000000000..6b1e7c1045cbe88dade8bd99c27f2fc185bdd8f1
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/d7/d76088f679622834287b91fb41989d50 differ
diff --git a/Zookeepers Trial/Library/metadata/d7/d76088f679622834287b91fb41989d50.info b/Zookeepers Trial/Library/metadata/d7/d76088f679622834287b91fb41989d50.info
new file mode 100644
index 0000000000000000000000000000000000000000..587223f5adc31e1608424865772a02b497619de3
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/d7/d76088f679622834287b91fb41989d50.info differ
diff --git a/Zookeepers Trial/Library/metadata/d8/d87bf88348e9e324e8507d931b8b335e b/Zookeepers Trial/Library/metadata/d8/d87bf88348e9e324e8507d931b8b335e
index b1921a6f3a0564eb5d7ea094d5358db9fa0bf83f..d9261a20744c7d3f3528db5e43072854d3eb4bc8 100644
Binary files a/Zookeepers Trial/Library/metadata/d8/d87bf88348e9e324e8507d931b8b335e and b/Zookeepers Trial/Library/metadata/d8/d87bf88348e9e324e8507d931b8b335e differ
diff --git a/Zookeepers Trial/Library/metadata/d8/d87bf88348e9e324e8507d931b8b335e.info b/Zookeepers Trial/Library/metadata/d8/d87bf88348e9e324e8507d931b8b335e.info
index da572b4a145bb1e79dda6f897f04fd594543db09..b1001a76b79d9b03075c443473f37b9dfa357f2c 100644
Binary files a/Zookeepers Trial/Library/metadata/d8/d87bf88348e9e324e8507d931b8b335e.info and b/Zookeepers Trial/Library/metadata/d8/d87bf88348e9e324e8507d931b8b335e.info differ
diff --git a/Zookeepers Trial/Library/metadata/db/dbe5a1e831173234a8e861bb68c93f2f b/Zookeepers Trial/Library/metadata/db/dbe5a1e831173234a8e861bb68c93f2f
new file mode 100644
index 0000000000000000000000000000000000000000..68fdbbb81311463b1fa2ab0229648f1dc1fc3853
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/db/dbe5a1e831173234a8e861bb68c93f2f differ
diff --git a/Zookeepers Trial/Library/metadata/db/dbe5a1e831173234a8e861bb68c93f2f.info b/Zookeepers Trial/Library/metadata/db/dbe5a1e831173234a8e861bb68c93f2f.info
new file mode 100644
index 0000000000000000000000000000000000000000..cf516a579c411a9e224174a94e31be3c6a2c701f
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/db/dbe5a1e831173234a8e861bb68c93f2f.info differ
diff --git a/Zookeepers Trial/Library/metadata/cc/cc7a8626b3629154cbee2ff6b3e5827b~More Shop Tweaks b/Zookeepers Trial/Library/metadata/e6/e6da16f230a5f0c49b6cd1c051ad4dde
similarity index 89%
rename from Zookeepers Trial/Library/metadata/cc/cc7a8626b3629154cbee2ff6b3e5827b~More Shop Tweaks
rename to Zookeepers Trial/Library/metadata/e6/e6da16f230a5f0c49b6cd1c051ad4dde
index 54a70ee86c80fe8f6e51a9b30698e2456836353e..676f5a94b37da7c10d7dcbc814e4e781d27e2e66 100644
Binary files a/Zookeepers Trial/Library/metadata/cc/cc7a8626b3629154cbee2ff6b3e5827b~More Shop Tweaks and b/Zookeepers Trial/Library/metadata/e6/e6da16f230a5f0c49b6cd1c051ad4dde differ
diff --git a/Zookeepers Trial/Library/metadata/e6/e6da16f230a5f0c49b6cd1c051ad4dde.info b/Zookeepers Trial/Library/metadata/e6/e6da16f230a5f0c49b6cd1c051ad4dde.info
new file mode 100644
index 0000000000000000000000000000000000000000..9a3b2f02c2370a17484edbaf618a44199f1be594
Binary files /dev/null and b/Zookeepers Trial/Library/metadata/e6/e6da16f230a5f0c49b6cd1c051ad4dde.info differ
diff --git a/Zookeepers Trial/Library/metadata/ed/ed873f4d8ad56d448b084f8d14baffdf b/Zookeepers Trial/Library/metadata/ed/ed873f4d8ad56d448b084f8d14baffdf
index 2bf3c7fd4aa29e5a0c844364303848bb433f46f9..3894ef7ecb37fd22137329bce0b6708bd94b46c7 100644
Binary files a/Zookeepers Trial/Library/metadata/ed/ed873f4d8ad56d448b084f8d14baffdf and b/Zookeepers Trial/Library/metadata/ed/ed873f4d8ad56d448b084f8d14baffdf differ
diff --git a/Zookeepers Trial/Library/metadata/ed/ed873f4d8ad56d448b084f8d14baffdf.info b/Zookeepers Trial/Library/metadata/ed/ed873f4d8ad56d448b084f8d14baffdf.info
index 2642ba26f2d83a97935154ac9fe4c255dd455a4d..0d93155f21cb3a11d3c752da6c8b13eaeb586c0c 100644
Binary files a/Zookeepers Trial/Library/metadata/ed/ed873f4d8ad56d448b084f8d14baffdf.info and b/Zookeepers Trial/Library/metadata/ed/ed873f4d8ad56d448b084f8d14baffdf.info differ
diff --git a/Zookeepers Trial/Zookeepers Trial.CSharp.csproj b/Zookeepers Trial/Zookeepers Trial.CSharp.csproj
index 057ca1c07e879e9a3f1dea986f9e526e4357c7d1..50cbef5f277cc263f49ea1155a4ebc9b0ce9d5b4 100644
--- a/Zookeepers Trial/Zookeepers Trial.CSharp.csproj
+++ b/Zookeepers Trial/Zookeepers Trial.CSharp.csproj
@@ -71,7 +71,7 @@
<ItemGroup>
<Compile Include="Assets\Scripts\ArenaCombatControl.cs" />
<Compile Include="Assets\Scripts\CameraMovement.cs" />
- <Compile Include="Assets\Scripts\CharacterLook.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" />
@@ -84,6 +84,9 @@
<Compile Include="Assets\Scripts\ShopMenu.cs" />
<Compile Include="Assets\Scripts\WeaponShopButton.cs" />
<Compile Include="Assets\Scripts\WeaponStats.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" />
</Project>
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