Merge branch 'ygor/fix-axe-energy-reward' into 'master'

Allow axe combo to reward energy without skillpoint

See merge request veloren/veloren!2722

CHANGELOG.md

@@ -66,6 +66,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Players no longer spawn underground if their waypoint is underground
 - Map will now zoom around the cursor's position and drag correctly
 - No more jittering while running down slopes with the glider out
+- Axe normal attack rewards energy without skill points
 
 ## [0.10.0] - 2021-06-12
 

common/src/comp/ability.rs

@@ -1021,9 +1021,9 @@ impl CharacterAbility {
                                 0
                             };
                         *max_energy_gain = *max_energy_gain
-                            * ((energy_level + 1) * stage_data.len() as u16 - 1) as f32
+                            * ((energy_level + 1) * stage_data.len() as u16 - 1).max(1) as f32
                             / (Axe(DsRegen).max_level().unwrap() + 1) as f32
-                            * (stage_data.len() - 1) as f32;
+                            * (stage_data.len() - 1).max(1) as f32;
                         *scales_from_combo = skillset
                             .skill_level(Axe(DsDamage))
                             .unwrap_or(None)