Merge branch 'main' into JuliusesNyeSuperBranch

MrBigsock/Assets/Code/Item/Items/ItemCoffee.cs

@@ -14,6 +14,7 @@ namespace BigSock.Item {
 		public override ulong Id => 103;
 		public override string Name => "Caffeinated Coffee";
 		public override string Description => "Increases attack speed by 25%";
+		public override string IconName => "item/coffee";
 
 		public ItemCoffee() {
 			Modifier = new CharacterStats{

MrBigsock/Assets/Code/Item/Items/ItemElixir.cs

@@ -14,6 +14,7 @@ namespace BigSock.Item {
 		public override ulong Id => 105;
 		public override string Name => "Elixir of Speed";
 		public override string Description => "10% increase to all speed and stamina related stats, but at a cost.";
+		public override string IconName => "item/elixirofspeed";
 
 		public ItemElixir() {
 			Modifier = new CharacterStats{

MrBigsock/Assets/Code/Item/Items/ItemFourEyes.cs

@@ -14,7 +14,7 @@ namespace BigSock.Item {
 		public override ulong Id => 201;
 		public override string Name => "Four Eyes";
 		public override string Description => "30% chance to deal double dammage. Has a 2 second cooldown.";
-		public override string IconName => "item/chest";
+		public override string IconName => "item/foureyes";
 
 		public static readonly double CHANCE = 0.3;
 		public static readonly TimeSpan COOLDOWN = new TimeSpan(0, 0, 0, 2, 0);

MrBigsock/Assets/Code/Item/Items/ItemLunch.cs

@@ -14,6 +14,7 @@ namespace BigSock.Item {
 		public override ulong Id => 102;
 		public override string Name => "Lunch";
 		public override string Description => "Increases hp by 20%";
+		public override string IconName => "item/lunch";
 
 		public ItemLunch() {
 			Modifier = new CharacterStats{

MrBigsock/Assets/Code/Item/Items/ItemPlasticStraw.cs

@@ -14,6 +14,7 @@ namespace BigSock.Item {
 		public override ulong Id => 202;
 		public override string Name => "Plastic Straw";
 		public override string Description => "Heal the user on kill.";
+		public override string IconName => "item/plasticstraw";
 
 		public static readonly double CHANCE = 1.0;
 

MrBigsock/Assets/Code/Item/Items/ItemPremature.cs

@@ -14,6 +14,7 @@ namespace BigSock.Item {
 		public override ulong Id => 104;
 		public override string Name => "Premature";
 		public override string Description => "Increases projectile speed by 50%";
+		public override string IconName => "item/premature";
 
 		public ItemPremature() {
 			Modifier = new CharacterStats{

MrBigsock/Assets/Code/Item/Items/ItemRunningShoes.cs

@@ -14,7 +14,7 @@ namespace BigSock.Item {
 		public override ulong Id => 101;
 		public override string Name => "Running Shoes";
 		public override string Description => "Increases movement speed by 50%";
-		public override string IconName => "item/breadwithjamx16";
+		public override string IconName => "item/runningshoes";
 
 
 		public ItemRunningShoes() {

MrBigsock/Assets/Code/UI/ChestDisplay.cs

@@ -28,7 +28,7 @@ namespace BigSock.UI {
             // Gets button gameobjects and adds onClick listener
             for (int i = 0; i < 3; i++) {
                 var button = itemButtonLocation.transform.Find("ButtonItem"+(i+1).ToString()).GetComponent<Button>();
-                button.onClick.AddListener(delegate {ItemPicked(i+1); });
+                button.onClick.AddListener(delegate {ItemPicked(i); });
                 buttons.Add(button);
             }
 
@@ -84,9 +84,8 @@ namespace BigSock.UI {
         }
 
         void ItemPicked(int number) {
-            if (number == 1) {player.TryPickUpItem(ItemService.SINGLETON.Get(items[number-1].Id));}
-            else if (number == 2) {player.TryPickUpItem(ItemService.SINGLETON.Get(items[number-1].Id));}
-            else if (number == 3) {player.TryPickUpItem(ItemService.SINGLETON.Get(items[number-1].Id));}
+            player.TryPickUpItem(ItemService.SINGLETON.Get(items[number].Id));
+            
             Destroy(this.gameObject);
         }
     }

MrBigsock/Assets/Prefabs/MapObjects.meta

+fileFormatVersion: 2
+guid: 9e1bc7e78bdddc349890d9f3e6661a01
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MrBigsock/Assets/Sprites/Item/ClosedChest.prefab → MrBigsock/Assets/Prefabs/MapObjects/ClosedChest.prefab

@@ -102,6 +102,7 @@ MonoBehaviour:
   _prompt: 
   animator: {fileID: 532417261}
   goldenChestOpen: OpeningGoldChest
+  goldenChestClose: ClosingGoldChest
   idleGoldChest: Idle
   spriteRenderer: {fileID: 2084913590679028496}
   closedSprite: {fileID: -1476513711, guid: f236c50a7ec8f3b4cb53217789ea98f4, type: 3}