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

Added healing healthsource logic to shockwave system.

Browse Source
This commit is contained in:
Sam 2020-09-11 13:07:09 -05:00
parent 6a1acd47a1
commit 99aba78422
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/items/npc_weapons/npcweapon/stone_golems_fist.ron
View File

@ -1,4 +1,4 @@
Item( ItemDef(
name: "Stone Golem's Fist", name: "Stone Golem's Fist",
description: "Was attached to a mighty stone golem.", description: "Was attached to a mighty stone golem.",
kind: Tool( kind: Tool(

2
common/src/loadout_builder.rs
View File

@ -74,7 +74,7 @@ impl LoadoutBuilder {
Body::Golem(golem) => match golem.species { Body::Golem(golem) => match golem.species {
golem::Species::StoneGolem => { golem::Species::StoneGolem => {
main_tool = Some(Item::new_from_asset_expect( main_tool = Some(Item::new_from_asset_expect(
"common.items.weapons.bossweapon.stone_golems_fist", "common.items.npc_weapons.npcweapon.stone_golems_fist",
)); ));
}, },
}, },

12
common/src/sys/shockwave.rs
View File

@ -203,7 +203,7 @@ impl<'a> System<'a> for Sys {
damage.modify_damage(block, loadout); damage.modify_damage(block, loadout);
} }
if damage.healthchange != 0.0 { if damage.healthchange < 0.0 {
server_emitter.emit(ServerEvent::Damage { server_emitter.emit(ServerEvent::Damage {
uid: *uid_b, uid: *uid_b,
change: HealthChange { change: HealthChange {
@ -213,6 +213,16 @@ impl<'a> System<'a> for Sys {
}, },
}, },
}); });
} else if damage.healthchange > 0.0 {
server_emitter.emit(ServerEvent::Damage {
uid: *uid_b,
change: HealthChange {
amount: damage.healthchange as i32,
cause: HealthSource::Healing {
by: Some(shockwave.owner.unwrap_or(*uid)),
},
},
});
} }
if shockwave.knockback != 0.0 && damage.healthchange != 0.0 { if shockwave.knockback != 0.0 && damage.healthchange != 0.0 {
if shockwave.knockback < 0.0 { if shockwave.knockback < 0.0 {