diff --git a/Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo b/Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo index e058d188b27930a5eedda847f4e469f90050c8a1..a4184601f26c872b127cef80912cecdbe0573004 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/shopBlacksmith.unity b/Zookeepers Trial/Assets/Scenes/shopBlacksmith.unity index ff4d575e15c661918f9dbf04fad7a1eebd2c5b73..4647699ae5ddfd6f34f88563e214858e3c011334 100644 Binary files a/Zookeepers Trial/Assets/Scenes/shopBlacksmith.unity and b/Zookeepers Trial/Assets/Scenes/shopBlacksmith.unity differ diff --git a/Zookeepers Trial/Assets/Scripts/WeaponShopButton.cs b/Zookeepers Trial/Assets/Scripts/WeaponShopButton.cs index b13e25ee0fe850d26c7055f0451bbea01ad04059..8f650d4817e7474952415f4c62e4cf9c25946e18 100644 --- a/Zookeepers Trial/Assets/Scripts/WeaponShopButton.cs +++ b/Zookeepers Trial/Assets/Scripts/WeaponShopButton.cs @@ -38,17 +38,23 @@ public class WeaponShopButton : MonoBehaviour { public void OnClick() { // this is where we will implement buying the weapons based on currency // i.e. : if coins >= weaponCost, then .... + // if ( && cost.text != "PURCHASED"){ + // coins -= weaponCost + // } // WILL DO LATER - for now, just change weapon stats.setWeapon(weapons[weaponNumber]); + cost.text = "PURCHASED"; } // to display weapon stats when you hover over a weapon public void HoverEnter() { - + description.text = "Damage:\n" + weapons[weaponNumber].damageMin.ToString() + " - " + + weapons[weaponNumber].damageMax.ToString() + "\n\n" + "Attack Speed:\n" + + weapons[weaponNumber].attackSpeed.ToString(); } - // to revert back to the original button + // to revert back to the original description public void HoverExit() { - + description.text = weapons[weaponNumber].weaponDescription; } } diff --git a/Zookeepers Trial/Assets/Weapons/Heavy Axe.asset b/Zookeepers Trial/Assets/Weapons/Heavy Axe.asset index e9342481aeed2dc36d65887317ee7a83d8884792..d0f9a74f8fa50151a71456f61bcecfe3a1715f38 100644 Binary files a/Zookeepers Trial/Assets/Weapons/Heavy Axe.asset and b/Zookeepers Trial/Assets/Weapons/Heavy Axe.asset differ diff --git a/Zookeepers Trial/Library/CurrentLayout.dwlt b/Zookeepers Trial/Library/CurrentLayout.dwlt index 1f348b17c66b8c9367776800b47ccd41192dcf58..1c08ffec8d3679889975c5de9d59bbc0586dabe2 100644 Binary files a/Zookeepers Trial/Library/CurrentLayout.dwlt and b/Zookeepers Trial/Library/CurrentLayout.dwlt differ diff --git a/Zookeepers Trial/Library/CurrentMaximizeLayout.dwlt b/Zookeepers Trial/Library/CurrentMaximizeLayout.dwlt index 80f912c5baec36e89f4d49a2649afe95cf633c7d..0052bd8b105b8248a06f7c1aeb77a9dc028d9599 100644 Binary files a/Zookeepers Trial/Library/CurrentMaximizeLayout.dwlt and b/Zookeepers Trial/Library/CurrentMaximizeLayout.dwlt differ diff --git a/Zookeepers Trial/Library/InspectorExpandedItems.asset b/Zookeepers Trial/Library/InspectorExpandedItems.asset index d09a70ca583aa74827272ed2ff3b05dd1820a4bd..cd1b326677c51a713bdfe75d86bcfae914d02db1 100644 Binary files a/Zookeepers Trial/Library/InspectorExpandedItems.asset and b/Zookeepers Trial/Library/InspectorExpandedItems.asset differ diff --git a/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll b/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll index 8036c7fd2d67abb7abbae54d51a238467cdf87d6..af5b0c952c3adbb7684a7ff284b82ab5801a3e69 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 44ff14dae256462268d195ad4231a5ae64d6641c..d1f48d16a5e100c48e2092bec0067c59fd366ec1 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 db2ca7bae882a3d5d0492ccceea5231a12db5036..280ee29150da52d880f1aecc416c01b42dfde6b3 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 48412bfbc7f030ac074e40083f56548150cd953d..25ef70ed643ea56289bf2cae9d9b3b336153d730 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 5f07896cf7599a7b6e0558bfd93b504791d87450..27ca98dc5e133c1a085c1ee3abb6dfed8e5c8ea2 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 aba0203a9259f83a0ec10a4f009964fcf53a3bd3..747f350778b094530093002c53437181d388bcf1 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/a0/a0c28240c3bf98d4d94d9af7641b5298 b/Zookeepers Trial/Library/metadata/a0/a0c28240c3bf98d4d94d9af7641b5298 index 7b73661b1766c847ba8e826e6c4eed5cfdb297cb..2bdf6125e8af1dd94ee8bb550056f0982e048497 100644 Binary files a/Zookeepers Trial/Library/metadata/a0/a0c28240c3bf98d4d94d9af7641b5298 and b/Zookeepers Trial/Library/metadata/a0/a0c28240c3bf98d4d94d9af7641b5298 differ