Merge branch 'knarkzel/fix-op-hammer' into 'master'

Don't allow spamming hammer or bow special when stamina is 0

See merge request veloren/veloren!1530

CHANGELOG.md

@@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Deselecting when the selected character is deleted
 - Upscaling support
 - Added "Persist Combo from Combo Melee State" when rolling mid-combo
+- You can no longer spam hammer and bow special when stamina is 0
 
 ### Changed
 

assets/common/abilities/bow/charged.ron

@@ -1,5 +1,5 @@
 ChargedRanged(
-    energy_cost: 0,
+    energy_cost: 1,
     energy_drain: 300,
     initial_damage: 40,
     max_damage: 200,
@@ -14,4 +14,4 @@ ChargedRanged(
     projectile_gravity: Some(Gravity(0.2)),
     initial_projectile_speed: 100.0,
     max_projectile_speed: 500.0,
-)
+)

assets/common/abilities/hammer/charged.ron

@@ -1,5 +1,5 @@
 ChargedMelee(
-    energy_cost: 0,
+    energy_cost: 1,
     energy_drain: 300,
     initial_damage: 10,
     max_damage: 170,
@@ -11,4 +11,4 @@ ChargedMelee(
     charge_duration: 1200,
     swing_duration: 200,
     recover_duration: 300,
-)
+)