Merge branch 'poperigby/fire-potion' into 'master'

Add Burning Potion that applies the Burning effect to the user

See merge request veloren/veloren!4174
This commit is contained in:
Samuel Keiffer 2023-11-14 02:00:52 +00:00
commit 9b878586bf
6 changed files with 37 additions and 0 deletions

View File

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

View File

@ -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],
)

View File

@ -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: [

View File

@ -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,

View File

@ -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",

BIN
assets/voxygen/voxel/object/potion_burning.vox (Stored with Git LFS) Normal file

Binary file not shown.