Merge remote-tracking branch 'origin/master'

Zookeepers Trial/Assembly-CSharp.csproj

@@ -55,6 +55,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" />

Zookeepers Trial/Assets/Scripts/WeaponShopButton.cs

@@ -10,6 +10,7 @@ public class WeaponShopButton : MonoBehaviour {
     public Text wepName;
     public Text description;
     public Text cost;
+    public Image imageDisplay;
 	private WeaponStats[] weapons;
 
 	// Use this for initialization
@@ -31,6 +32,7 @@ public class WeaponShopButton : MonoBehaviour {
         wepName.text = weapons[weaponNumber].weaponName;
         description.text = weapons[weaponNumber].weaponDescription;
         cost.text = costToString;
+        imageDisplay.sprite = weapons[weaponNumber].image;
     }
 
     public void OnClick() {
@@ -39,4 +41,14 @@ public class WeaponShopButton : MonoBehaviour {
         // WILL DO LATER - for now, just change weapon
 		stats.setWeapon(weapons[weaponNumber]);
     }
+
+    // to display weapon stats when you hover over a weapon
+    public void HoverEnter() {
+
+    }
+
+    // to revert back to the original button
+    public void HoverExit() {
+
+    }
 }

Zookeepers Trial/Library/LastSceneManagerSetup.txt

 sceneSetups:
-- path: Assets/Scenes/arena.unity
+- path: Assets/Scenes/shopBlacksmith.unity
   isLoaded: 1
   isActive: 1