diff --git a/CHANGELOG.md b/CHANGELOG.md index 6872edafaa..86e12adcb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Allow plugins to add recipes and item images - `SnowGlitter` experimental shader. - Crafting recipe for Cloverleaf glider. +- Burning Potion that applies the Burning effect to the user ### Changed diff --git a/assets/common/items/consumable/potion_burning.ron b/assets/common/items/consumable/potion_burning.ron new file mode 100644 index 0000000000..2efca88089 --- /dev/null +++ b/assets/common/items/consumable/potion_burning.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Burning Potion", + description: "Sets the user ablaze", + kind: Consumable( + kind: Drink, + effects: All([ + Buff(( + kind: Burning, + data: ( + strength: 1.0, + duration: Some(10) + ), + cat_ids: [Natural], + )) + ]) + ), + quality: Moderate, + tags: [Potion], +) diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 41be5457c8..701913e9aa 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -31,6 +31,15 @@ ], craft_sprite: Some(Anvil), ), + "potion_burning": ( + output: ("common.items.consumable.potion_burning", 1), + inputs: [ + (Item("common.items.crafting_ing.empty_vial"), 1, false), + (Item("common.items.crafting_ing.living_embers"), 3, false), + (Item("common.items.crafting_ing.animal_misc.viscous_ooze"), 1, false), + ], + craft_sprite: Some(Cauldron), + ), "potion_s": ( output: ("common.items.consumable.potion_minor", 1), inputs: [ diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 1ea9ca1937..2bb9671c4b 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -3199,6 +3199,10 @@ "voxel.object.curious_potion", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), + Simple("common.items.consumable.potion_burning"): VoxTrans( + "voxel.object.potion_burning", + (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, + ), Simple("common.items.charms.burning_charm"): VoxTrans( "voxel.object.burning_charm", (0.0, 0.0, 0.0), (-80.0, 15.0, 15.0), 1.0, diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index c0399cb8cd..9f05d84d7f 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/assets/voxygen/voxel/item_drop_manifest.ron @@ -809,6 +809,7 @@ Simple("common.items.consumable.potion_minor"): "voxel.object.potion_red", Simple("common.items.consumable.potion_big"): "voxel.object.potion_red", Simple("common.items.consumable.curious_potion"): "voxel.object.curious_potion", + Simple("common.items.consumable.potion_burning"): "voxel.object.potion_burning", Simple("common.items.charms.burning_charm"): "voxel.object.burning_charm", Simple("common.items.charms.frozen_charm"): "voxel.object.frozen_charm", Simple("common.items.charms.lifesteal_charm"): "voxel.object.lifesteal_charm", diff --git a/assets/voxygen/voxel/object/potion_burning.vox b/assets/voxygen/voxel/object/potion_burning.vox new file mode 100644 index 0000000000..3bb1239613 --- /dev/null +++ b/assets/voxygen/voxel/object/potion_burning.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d73fe5092235ab37251d9f3e5d2bab62a6e58c78c311b4d1d655de728c3489e +size 1800