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

Effects now work when not tied to a damage.

Browse Source
This commit is contained in:
Sam 2021-01-27 21:15:25 -05:00
parent 18aa315f0d
commit c77f263cd1
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
common/src/combat.rs
View File

@ -90,6 +90,8 @@ impl Attack {
is_crit,
self.crit_multiplier,
);
let damage_damage = -change.amount as f32;
accumulated_damage += damage_damage;
if change.amount != 0 {
server_events.push(ServerEvent::Damage {
entity: target_entity,
@ -120,7 +122,7 @@ impl Attack {
server_events.push(ServerEvent::Buff {
entity: target_entity,
buff_change: BuffChange::Add(
b.to_buff(attacker_uid, -change.amount as f32),
b.to_buff(attacker_uid, damage_damage),
),
});
}
@ -129,6 +131,43 @@ impl Attack {
}
}
}
for effect in self
.effects
.iter()
.filter(|e| e.target.map_or(true, |t| t == target_group))
.filter(|e| !(matches!(e.target, Some(GroupTarget::OutOfGroup)) && target_dodging))
{
match effect.effect {
AttackEffect::Knockback(kb) => {
let impulse = kb.calculate_impulse(dir);
if !impulse.is_approx_zero() {
server_events.push(ServerEvent::Knockback {
entity: target_entity,
impulse,
});
}
},
AttackEffect::EnergyReward(ec) => {
server_events.push(ServerEvent::EnergyChange {
entity: attacker_entity,
change: EnergyChange {
amount: ec as i32,
source: EnergySource::HitEnemy,
},
});
},
AttackEffect::Buff(b) => {
if thread_rng().gen::<f32>() < b.chance {
server_events.push(ServerEvent::Buff {
entity: target_entity,
buff_change: BuffChange::Add(
b.to_buff(attacker_uid, accumulated_damage),
),
});
}
},
}
}
server_events
}
}