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

fix "Npcs can't be healed anymore"

Browse Source
This commit is contained in:
timokoesters 2020-03-25 22:23:03 +01:00
parent 5f10cdf0c6
commit 74eacbe27c
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,12 +72,23 @@ impl<'a> System<'a> for Sys {
attack.applied = true;
// Go through all other entities
for (b, uid_b, pos_b, ori_b, scale_b_maybe, character_b, stats_b, body_b) in (
for (
b,
uid_b,
pos_b,
ori_b,
scale_b_maybe,
agent_b_maybe,
character_b,
stats_b,
body_b,
) in (
&entities,
&uids,
&positions,
&orientations,
scales.maybe(),
agents.maybe(),
&character_states,
&stats,
&bodies,
@ -106,11 +117,12 @@ impl<'a> System<'a> for Sys {
// NPCs do less damage:
if agent_maybe.is_some() {
if healthchange > 0 {
healthchange = 0;
} else if healthchange < 0 {
healthchange = (healthchange / 2).min(-1);
}
healthchange = (healthchange / 2).min(-1);
}
// Don't heal npc's hp
if agent_b_maybe.is_some() && healthchange > 0 {
healthchange = 0;
}
if rand::random() {