lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adds damage types and mods (weak/resist/immune), for all damage events

Browse source
This commit is contained in:
Llywelwyn 2023-09-21 00:52:54 +01:00
parent 66013667d8
commit 8a44c94272
12 changed files with 131 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/melee_combat_system.rs
View file

@ -123,6 +123,7 @@ impl<'a> System<'a> for MeleeCombatSystem {
} else {
attacks.push((
MeleeWeapon {
damage_type: crate::DamageType::Physical,
attribute: WeaponAttribute::Strength,
damage_n_dice: 1,
damage_die_type: 4,
@ -301,7 +302,7 @@ impl<'a> System<'a> for MeleeCombatSystem {
}
add_effect(
Some(entity),
EffectType::Damage { amount: damage },
EffectType::Damage { amount: damage, damage_type: weapon_info.damage_type },
Targets::Entity { target: wants_melee.target }
);
if entity == *player_entity {
@ -392,6 +393,7 @@ fn get_natural_attacks(
for a in nat.attacks.iter() {
attacks.push((
MeleeWeapon {
damage_type: a.damage_type,
attribute: WeaponAttribute::Strength,
hit_bonus: a.hit_bonus,
damage_n_dice: a.damage_n_dice,
@ -409,6 +411,7 @@ fn get_natural_attacks(
};
attacks.push((
MeleeWeapon {
damage_type: nat.attacks[attack_index].damage_type,
attribute: WeaponAttribute::Strength,
hit_bonus: nat.attacks[attack_index].hit_bonus,
damage_n_dice: nat.attacks[attack_index].damage_n_dice,