Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sam/health-fix' into 'master'

Browse Source 
Fixed fall damage and sceptre regen.

See merge request veloren/veloren!2840
This commit is contained in:
Joshua Barretto 2021-09-14 11:27:05 +00:00
commit 338e82c36c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/abilities/sceptre/healingaura.ron
View File

@ -5,7 +5,7 @@ BasicAura(
targets: InGroup, targets: InGroup,
aura: ( aura: (
kind: Regeneration, kind: Regeneration,
strength: 2.0, strength: 0.2,
duration: Some(10.0), duration: Some(10.0),
category: Magical, category: Magical,
), ),

2
server/src/events/entity_manipulation.rs
View File

@ -599,7 +599,7 @@ pub fn handle_land_on_ground(server: &Server, entity: EcsEntity, vel: Vec3<f32>)
.copied() .copied()
.unwrap_or_default(); .unwrap_or_default();
let impact_energy = mass.0 * vel.z.powi(2) / 2.0; let impact_energy = mass.0 * vel.z.powi(2) / 2.0;
let falldmg = impact_energy / 100.0; let falldmg = impact_energy / 1000.0;
let inventories = ecs.read_storage::<Inventory>(); let inventories = ecs.read_storage::<Inventory>();
let stats = ecs.read_storage::<Stats>(); let stats = ecs.read_storage::<Stats>();