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

Overhauled health component, making it a float to outer interfaces.

Browse Source
This commit is contained in:
Sam
2021-09-09 00:07:17 -04:00
parent 6cdc620c5d
commit 42012fddcb
175 changed files with 691 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server/src/cmd.rs
View File

@ -837,27 +837,17 @@ fn handle_home(
fn handle_kill(
server: &mut Server,
client: EcsEntity,
_client: EcsEntity,
target: EcsEntity,
_args: Vec<String>,
_action: &ChatCommand,
) -> CmdResult<()> {
let reason = if client == target {
comp::HealthSource::Suicide
} else if let Some(uid) = server.state.read_storage::<Uid>().get(client) {
comp::HealthSource::Damage {
kind: DamageSource::Other,
by: Some(*uid),
}
} else {
comp::HealthSource::Command
};
server
.state
.ecs_mut()
.write_storage::<comp::Health>()
.get_mut(target)
.map(|mut h| h.set_to(0, reason));
.map(|mut h| h.kill());
Ok(())
}
@ -1014,14 +1004,19 @@ fn handle_health(
args: Vec<String>,
_action: &ChatCommand,
) -> CmdResult<()> {
if let Some(hp) = parse_args!(args, u32) {
if let Some(hp) = parse_args!(args, f32) {
if let Some(mut health) = server
.state
.ecs()
.write_storage::<comp::Health>()
.get_mut(target)
{
health.set_to(hp * 10, comp::HealthSource::Command);
let change = comp::HealthChange {
amount: hp - health.current(),
by: None,
cause: None,
};
health.change_by(change);
Ok(())
} else {
Err("You have no health".into())
@ -1693,7 +1688,7 @@ fn handle_kill_npcs(
if should_kill {
count += 1;
health.set_to(0, comp::HealthSource::Command);
health.kill();
}
}