Potions fixes

assets/common/loot_tables/consumable.ron

@@ -7,8 +7,8 @@
     (0.1, Item("common.items.utility.firework_white")),
     (0.1, Item("common.items.utility.firework_yellow")),
     // Potions
-    (10.0, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)),
+    (3.0, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)),
     // Misc
-    (2.0, Item("common.items.utility.collar")),
+    (0.2, Item("common.items.utility.collar")),
-    (2.0, Item("common.items.utility.bomb")),
+    (0.2, Item("common.items.utility.bomb")),
 ]

assets/common/loot_tables/consumable/good.ron

@@ -1,14 +0,0 @@
-[
-    // Fireworks
-    (0.1, Item("common.items.utility.firework_blue")),
-    (0.1, Item("common.items.utility.firework_green")),
-    (0.1, Item("common.items.utility.firework_purple")),
-    (0.1, Item("common.items.utility.firework_red")),
-    (0.1, Item("common.items.utility.firework_white")),
-    (0.1, Item("common.items.utility.firework_yellow")),
-    // Potions
-    (10.0, MultiDrop(Item("common.items.consumable.potion_big"), 2, 5)),
-    // Misc
-    (2.0, MultiDrop(Item("common.items.utility.collar"), 2, 3)),
-    (2.0, MultiDrop(Item("common.items.utility.bomb"), 8, 10)),
-]

assets/common/loot_tables/consumable/moderate.ron

@@ -1,14 +0,0 @@
-[
-    // Fireworks
-    (0.1, Item("common.items.utility.firework_blue")),
-    (0.1, Item("common.items.utility.firework_green")),
-    (0.1, Item("common.items.utility.firework_purple")),
-    (0.1, Item("common.items.utility.firework_red")),
-    (0.1, Item("common.items.utility.firework_white")),
-    (0.1, Item("common.items.utility.firework_yellow")),
-    // Potions
-    (10.0, MultiDrop(Item("common.items.consumable.potion_med"), 2, 5)),
-    // Misc
-    (2.0, MultiDrop(Item("common.items.utility.collar"), 1, 2)),
-    (2.0, MultiDrop(Item("common.items.utility.bomb"), 3, 5)),
-]

assets/common/loot_tables/dungeon/adlet/chest.ron

@@ -13,7 +13,7 @@
     (1.0, MultiDrop(Item("common.items.mineral.ingot.iron"), 3, 10)),
     (1.0, MultiDrop(Item("common.items.log.bamboo"), 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (2.0, LootTable("common.loot_tables.consumable")),
     // Food
     (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 3)),
 ]

assets/common/loot_tables/dungeon/gnarling/chest.ron

@@ -15,7 +15,7 @@
     (0.1, Item("common.items.mineral.gem.emerald")),
     (0.1, Item("common.items.mineral.gem.ruby")),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (2.0, LootTable("common.loot_tables.consumable")),
     // Food
     (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 2)),
 ]

assets/common/loot_tables/dungeon/gnarling/woodgolem.ron

@@ -2,7 +2,7 @@
     // Food
     (1.0, LootTable("common.loot_tables.food.wild_ingredients")),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (2.0, LootTable("common.loot_tables.consumable")),
     // Crafting ingredients
     (1.0, MultiDrop(Item("common.items.log.wood"), 5, 10)),
     (0.1, MultiDrop(Item("common.items.log.hardwood"), 1, 2)),

assets/common/loot_tables/dungeon/tier-2/chest.ron

@@ -11,7 +11,7 @@
     (1.0, MultiDrop(Item("common.items.mineral.ingot.steel"), 3, 10)),
     (1.0, MultiDrop(Item("common.items.log.hardwood"), 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (2.0, LootTable("common.loot_tables.consumable")),
     // Food
     (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 4)),
 ]

assets/common/loot_tables/dungeon/tier-2/enemy.ron

@@ -1,11 +1,10 @@
 [
     // Consumables
-    (1.0, LootTable("common.loot_tables.consumable.moderate")),
+    (0.5, LootTable("common.loot_tables.consumable")),
     // Food
-    (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 2)),
+    (1.5, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 2)),
-    (1.0, MultiDrop(LootTable("common.loot_tables.food.wild_ingredients"), 1, 2)),
     // Materials
-    (1.0, MultiDrop(Item("common.items.crafting_ing.hide.scales"), 1, 3)),
+    (0.5, MultiDrop(Item("common.items.crafting_ing.hide.scales"), 0, 2)),
     // Nothing
-    (0.75, Nothing),
+    (1.5, Nothing),
 ]

assets/common/loot_tables/dungeon/tier-3/chest.ron

@@ -13,7 +13,7 @@
     (1.0, MultiDrop(Item("common.items.log.ironwood"), 3, 7)),
     (2.0, MultiDrop(Item("common.items.mineral.ore.velorite"), 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (2.0, LootTable("common.loot_tables.consumable")),
     // Food
     (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 4)),
 ]

assets/common/loot_tables/dungeon/tier-3/enemy.ron

@@ -1,9 +1,8 @@
 [
     // Consumables
-    (1.0, LootTable("common.loot_tables.consumable.moderate")),
+    (0.5, LootTable("common.loot_tables.consumable")),
     // Food
-    (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 4)),
+    (1.5, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 4)),
-    (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 4)),
     // Nothing
-    (0.75, Nothing),
+    (2.0, Nothing),
 ]

assets/common/loot_tables/dungeon/tier-4/chest.ron

@@ -13,7 +13,7 @@
     (1.0, MultiDrop(Item("common.items.mineral.ingot.bloodsteel"), 1, 5)),
     (1.0, MultiDrop(Item("common.items.log.frostwood"), 3, 6)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.good")),
+    (2.0, MultiDrop(LootTable("common.loot_tables.consumable"), 1, 2)),
     // Food
     (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 5)),
 ]

assets/common/loot_tables/dungeon/tier-4/miniboss.ron

@@ -5,7 +5,7 @@
     // Food
     (5.0, LootTable("common.loot_tables.food.prepared")),
     // Consumables
-    (5.0, LootTable("common.loot_tables.consumable.good")),
+    (5.0, MultiDrop(LootTable("common.loot_tables.consumable"), 1, 2)),
     // lantern
     (1.0, Item("common.items.lantern.blue_0")),
     // Gear

assets/common/loot_tables/dungeon/tier-5/chest.ron

@@ -12,7 +12,7 @@
     (1.0, MultiDrop(Item("common.items.mineral.ingot.bloodsteel"), 1, 5)),
     (1.0, MultiDrop(Item("common.items.log.frostwood"), 1, 5)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.good")),
+    (2.0, MultiDrop(LootTable("common.loot_tables.consumable"), 1, 2)),
     (0.1, MultiDrop(Item("common.items.food.spore_corruption"), 1, 3)),
     // Food
     (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 3, 6)),

assets/common/loot_tables/dungeon/tier-5/miniboss.ron

@@ -4,7 +4,7 @@
     // Food
     (5.0, LootTable("common.loot_tables.food.prepared")),
     // Consumables
-    (5.0, LootTable("common.loot_tables.consumable.good")),
+    (5.0, MultiDrop(LootTable("common.loot_tables.consumable"), 1, 2)),
     // Back
     (1.0, Item("common.items.armor.misc.back.dungeon_purple")),
     // Ring

common/src/states/dash_melee.rs

@@ -92,7 +92,7 @@ impl CharacterBehavior for Data {
                 if self.timer < self.charge_end_timer
                     && (input_is_pressed(data, self.static_data.ability_info.input)
                         || (self.auto_charge && self.timer < self.static_data.charge_duration))
-                    && update.energy.current() > 0.0
+                    && update.energy.current() >= 0.0
                 {
                     // Forward movement
                     let charge_frac = (self.timer.as_secs_f32()