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

* Set the KillType to Other for HealthSource::Healing

Browse Source 
* Extend logic to projectiles and explosions
This commit is contained in:
Matthew Martin 2020-09-09 21:26:59 +02:00
parent a9086b27a0
commit 57c6160b72
4 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/comp/stats.rs
View File

@ -25,7 +25,7 @@ pub enum HealthSource {
Command, Command,
LevelUp, LevelUp,
Item, Item,
Healing { by: Uid }, Healing { by: Option<Uid> },
Unknown, Unknown,
} }

2
common/src/sys/combat.rs
View File

@ -142,7 +142,7 @@ impl<'a> System<'a> for Sys {
uid: *uid_b, uid: *uid_b,
change: HealthChange { change: HealthChange {
amount: damage.healthchange as i32, amount: damage.healthchange as i32,
cause: HealthSource::Healing { by: *uid }, cause: HealthSource::Healing { by: Some(*uid) },
}, },
}); });
} }

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

@ -82,6 +82,7 @@ impl<'a> System<'a> for Sys {
} }
if other != owner_uid { if other != owner_uid {
if damage.healthchange < 0.0 {
server_emitter.emit(ServerEvent::Damage { server_emitter.emit(ServerEvent::Damage {
uid: other, uid: other,
change: HealthChange { change: HealthChange {
@ -91,6 +92,17 @@ impl<'a> System<'a> for Sys {
}, },
}, },
}); });
} else if damage.healthchange > 0.0 {
server_emitter.emit(ServerEvent::Damage {
uid: other,
change: HealthChange {
amount: damage.healthchange as i32,
cause: HealthSource::Healing {
by: Some(owner_uid),
},
},
});
}
} }
}, },
projectile::Effect::Knockback(knockback) => { projectile::Effect::Knockback(knockback) => {

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

@ -60,7 +60,7 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
if let Some(_player) = state.ecs().read_storage::<Player>().get(entity) { if let Some(_player) = state.ecs().read_storage::<Player>().get(entity) {
if let Some(uid) = state.ecs().read_storage::<Uid>().get(entity) { if let Some(uid) = state.ecs().read_storage::<Uid>().get(entity) {
let kill_source = match cause { let kill_source = match cause {
HealthSource::Attack { by } | HealthSource::Healing { by } => { HealthSource::Attack { by } => {
// Get attacker entity // Get attacker entity
if let Some(char_entity) = state.ecs().entity_from_uid(by.into()) { if let Some(char_entity) = state.ecs().entity_from_uid(by.into()) {
// Check if attacker is another player or entity with stats (npc) // Check if attacker is another player or entity with stats (npc)
@ -135,6 +135,7 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
| HealthSource::Command | HealthSource::Command
| HealthSource::LevelUp | HealthSource::LevelUp
| HealthSource::Item | HealthSource::Item
| HealthSource::Healing { by: _ }
| HealthSource::Unknown => KillSource::Other, | HealthSource::Unknown => KillSource::Other,
}; };
state.notify_registered_clients( state.notify_registered_clients(
@ -450,7 +451,6 @@ pub fn handle_explosion(
power, power,
reagent, reagent,
}); });
let owner_entity = owner.and_then(|uid| { let owner_entity = owner.and_then(|uid| {
ecs.read_resource::<UidAllocator>() ecs.read_resource::<UidAllocator>()
.retrieve_entity_internal(uid.into()) .retrieve_entity_internal(uid.into())
@ -493,10 +493,17 @@ pub fn handle_explosion(
damage.modify_damage(block, loadout); damage.modify_damage(block, loadout);
} }
if damage.healthchange < 0.0 {
stats_b.health.change_by(HealthChange { stats_b.health.change_by(HealthChange {
amount: damage.healthchange as i32, amount: damage.healthchange as i32,
cause: HealthSource::Explosion { owner }, cause: HealthSource::Explosion { owner },
}); });
} else if damage.healthchange > 0.0 {
stats_b.health.change_by(HealthChange {
amount: damage.healthchange as i32,
cause: HealthSource::Healing { by: owner },
});
}
} }
} }