Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Potions fixes"

Browse Source 
This reverts commit 1a52c4d24d.
This commit is contained in:
Michal Sroczynski 2023-07-25 20:03:56 +02:00
parent 1a52c4d24d
commit 74a0c9caa3
15 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assets/common/loot_tables/consumable/good.ron Normal file
View File

@ -0,0 +1,14 @@
[
// 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)),
]

14
assets/common/loot_tables/consumable/moderate.ron Normal file
View File

@ -0,0 +1,14 @@
[
// 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)),
]

6
assets/common/loot_tables/consumable.ron → assets/common/loot_tables/consumable/poor.ron
View File

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

2
assets/common/loot_tables/dungeon/adlet/chest.ron
View File

@ -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")),
(2.0, LootTable("common.loot_tables.consumable.poor")),
// Food
(1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 3)),
]

2
assets/common/loot_tables/dungeon/gnarling/chest.ron
View File

@ -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")),
(2.0, LootTable("common.loot_tables.consumable.poor")),
// Food
(1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 2)),
]

2
assets/common/loot_tables/dungeon/gnarling/woodgolem.ron
View File

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

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

@ -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")),
(2.0, LootTable("common.loot_tables.consumable.moderate")),
// Food
(1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 4)),
]

9
assets/common/loot_tables/dungeon/tier-2/enemy.ron
View File

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

2
assets/common/loot_tables/dungeon/tier-3/chest.ron
View File

@ -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")),
(2.0, LootTable("common.loot_tables.consumable.moderate")),
// Food
(1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 4)),
]

7
assets/common/loot_tables/dungeon/tier-3/enemy.ron
View File

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

2
assets/common/loot_tables/dungeon/tier-4/chest.ron
View File

@ -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, MultiDrop(LootTable("common.loot_tables.consumable"), 1, 2)),
(2.0, LootTable("common.loot_tables.consumable.good")),
// Food
(1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 5)),
]

2
assets/common/loot_tables/dungeon/tier-4/miniboss.ron
View File

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

2
assets/common/loot_tables/dungeon/tier-5/chest.ron
View File

@ -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, MultiDrop(LootTable("common.loot_tables.consumable"), 1, 2)),
(2.0, LootTable("common.loot_tables.consumable.good")),
(0.1, MultiDrop(Item("common.items.food.spore_corruption"), 1, 3)),
// Food
(1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 3, 6)),

2
assets/common/loot_tables/dungeon/tier-5/miniboss.ron
View File

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

2
common/src/states/dash_melee.rs
View File

@ -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()