From ccd469cb0a7a321022f9e4cc3cb933594963cd94 Mon Sep 17 00:00:00 2001 From: Michal Sroczynski Date: Tue, 25 Jul 2023 20:37:51 +0200 Subject: [PATCH] Potions fixes --- assets/common/loot_tables/consumable/good.ron | 14 -------------- assets/common/loot_tables/consumable/moderate.ron | 14 -------------- assets/common/loot_tables/consumable/poor.ron | 14 -------------- assets/common/loot_tables/dungeon/adlet/chest.ron | 2 +- .../common/loot_tables/dungeon/gnarling/chest.ron | 2 +- .../loot_tables/dungeon/gnarling/woodgolem.ron | 6 +----- assets/common/loot_tables/dungeon/tier-2/chest.ron | 2 +- assets/common/loot_tables/dungeon/tier-2/enemy.ron | 7 +++---- assets/common/loot_tables/dungeon/tier-3/chest.ron | 2 +- assets/common/loot_tables/dungeon/tier-3/enemy.ron | 5 ++--- assets/common/loot_tables/dungeon/tier-4/chest.ron | 2 +- .../common/loot_tables/dungeon/tier-4/miniboss.ron | 2 +- assets/common/loot_tables/dungeon/tier-5/chest.ron | 2 +- .../common/loot_tables/dungeon/tier-5/miniboss.ron | 2 +- common/src/states/dash_melee.rs | 2 +- 15 files changed, 15 insertions(+), 63 deletions(-) delete mode 100644 assets/common/loot_tables/consumable/good.ron delete mode 100644 assets/common/loot_tables/consumable/moderate.ron delete mode 100644 assets/common/loot_tables/consumable/poor.ron diff --git a/assets/common/loot_tables/consumable/good.ron b/assets/common/loot_tables/consumable/good.ron deleted file mode 100644 index fd77244152..0000000000 --- a/assets/common/loot_tables/consumable/good.ron +++ /dev/null @@ -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)), -] \ No newline at end of file diff --git a/assets/common/loot_tables/consumable/moderate.ron b/assets/common/loot_tables/consumable/moderate.ron deleted file mode 100644 index 882b43cbb0..0000000000 --- a/assets/common/loot_tables/consumable/moderate.ron +++ /dev/null @@ -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)), -] \ No newline at end of file diff --git a/assets/common/loot_tables/consumable/poor.ron b/assets/common/loot_tables/consumable/poor.ron deleted file mode 100644 index d222d9a561..0000000000 --- a/assets/common/loot_tables/consumable/poor.ron +++ /dev/null @@ -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_minor"), 2, 5)), - // Misc - (2.0, Item("common.items.utility.collar")), - (2.0, Item("common.items.utility.bomb")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/adlet/chest.ron b/assets/common/loot_tables/dungeon/adlet/chest.ron index f914679105..034fc49ab7 100644 --- a/assets/common/loot_tables/dungeon/adlet/chest.ron +++ b/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, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)), // Food (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 3)), ] diff --git a/assets/common/loot_tables/dungeon/gnarling/chest.ron b/assets/common/loot_tables/dungeon/gnarling/chest.ron index fb91d2d97f..54c3d9d2de 100644 --- a/assets/common/loot_tables/dungeon/gnarling/chest.ron +++ b/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, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)), // Food (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 2)), ] diff --git a/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron b/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron index ce7fc614fa..0b863b9823 100644 --- a/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron +++ b/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron @@ -1,10 +1,6 @@ [ - // Food - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), - // Consumables - (2.0, LootTable("common.loot_tables.consumable.poor")), // Crafting ingredients - (1.0, MultiDrop(Item("common.items.log.wood"), 5, 10)), + (2.4, MultiDrop(Item("common.items.log.wood"), 5, 10)), (0.1, MultiDrop(Item("common.items.log.hardwood"), 1, 2)), (0.5, LootTable("common.loot_tables.weapons.components.secondary.sceptre")), ] diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron index 5cc206bf31..c5a3260c59 100644 --- a/assets/common/loot_tables/dungeon/tier-2/chest.ron +++ b/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, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)), // Food (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 4)), ] diff --git a/assets/common/loot_tables/dungeon/tier-2/enemy.ron b/assets/common/loot_tables/dungeon/tier-2/enemy.ron index 35ed8ff5e6..90c797098b 100644 --- a/assets/common/loot_tables/dungeon/tier-2/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-2/enemy.ron @@ -1,11 +1,10 @@ [ // Consumables - (1.0, LootTable("common.loot_tables.consumable.moderate")), + (1.0, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)), // Food - (1.0, 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)), + (1.0, MultiDrop(Item("common.items.crafting_ing.hide.scales"), 0, 2)), // Nothing - (0.75, Nothing), + (1.0, Nothing), ] diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron index db5ed55ad4..fe5d9a1988 100644 --- a/assets/common/loot_tables/dungeon/tier-3/chest.ron +++ b/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, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)), // Food (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 4)), ] diff --git a/assets/common/loot_tables/dungeon/tier-3/enemy.ron b/assets/common/loot_tables/dungeon/tier-3/enemy.ron index 788e055816..43cbcecdb5 100644 --- a/assets/common/loot_tables/dungeon/tier-3/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-3/enemy.ron @@ -1,9 +1,8 @@ [ // Consumables - (1.0, LootTable("common.loot_tables.consumable.moderate")), + (1.0, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)), // Food (1.0, 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), ] diff --git a/assets/common/loot_tables/dungeon/tier-4/chest.ron b/assets/common/loot_tables/dungeon/tier-4/chest.ron index 8859498edf..9996fe28ff 100644 --- a/assets/common/loot_tables/dungeon/tier-4/chest.ron +++ b/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(Item("common.items.consumable.potion_minor"), 4, 8)), // Food (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 5)), ] diff --git a/assets/common/loot_tables/dungeon/tier-4/miniboss.ron b/assets/common/loot_tables/dungeon/tier-4/miniboss.ron index 31297a16fa..a5e0fdcc9f 100644 --- a/assets/common/loot_tables/dungeon/tier-4/miniboss.ron +++ b/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(Item("common.items.consumable.potion_minor"), 4, 8)), // lantern (1.0, Item("common.items.lantern.blue_0")), // Gear diff --git a/assets/common/loot_tables/dungeon/tier-5/chest.ron b/assets/common/loot_tables/dungeon/tier-5/chest.ron index 59a571d22c..63d6d29ca7 100644 --- a/assets/common/loot_tables/dungeon/tier-5/chest.ron +++ b/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(Item("common.items.consumable.potion_minor"), 4, 8)), (0.1, MultiDrop(Item("common.items.food.spore_corruption"), 1, 3)), // Food (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 3, 6)), diff --git a/assets/common/loot_tables/dungeon/tier-5/miniboss.ron b/assets/common/loot_tables/dungeon/tier-5/miniboss.ron index 706ff34223..6132bee4c6 100644 --- a/assets/common/loot_tables/dungeon/tier-5/miniboss.ron +++ b/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(Item("common.items.consumable.potion_minor"), 4, 8)), // Back (1.0, Item("common.items.armor.misc.back.dungeon_purple")), // Ring diff --git a/common/src/states/dash_melee.rs b/common/src/states/dash_melee.rs index 6676f8987e..7388915fbc 100644 --- a/common/src/states/dash_melee.rs +++ b/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()