Merge branch 'crabman/buff-stacking' into 'master'

Re-enable buff stacking for short buffs

See merge request veloren/veloren!4181
This commit is contained in:
Samuel Keiffer 2023-11-12 16:56:10 +00:00
commit ef858ef72b
3 changed files with 3 additions and 0 deletions

View File

@ -8,4 +8,5 @@ SelfBuff(
combo_cost: 1,
combo_scaling: Some(Linear),
energy_cost: 0,
enforced_limit: false,
)

View File

@ -6,4 +6,5 @@ SelfBuff(
buff_strength: 1.0,
buff_duration: Some(3.0),
energy_cost: 20,
enforced_limit: false,
)

View File

@ -6,4 +6,5 @@ SelfBuff(
buff_strength: 1.0,
buff_duration: Some(15.0),
energy_cost: 20,
enforced_limit: false,
)