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

Addressed review comments.

Browse Source
This commit is contained in:
Sam
2022-01-19 00:56:44 -05:00
parent b0644ca767
commit f93b85368d
2 changed files with 9 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
common/src/comp/ability.rs
View File

@ -1190,23 +1190,13 @@ impl CharacterAbility {
if let Ok(level) = skillset.skill_level(Sword(DDrain)) { if let Ok(level) = skillset.skill_level(Sword(DDrain)) {
*energy_drain *= modifiers.energy_drain.powi(level.into()); *energy_drain *= modifiers.energy_drain.powi(level.into());
} }
if let MeleeConstructorKind::Slash { if let MeleeConstructorKind::Slash { ref mut damage, .. } = melee_constructor.kind {
ref mut damage,
poise: _,
knockback: _,
energy_regen: _,
} = melee_constructor.kind
{
if let Ok(level) = skillset.skill_level(Sword(DDamage)) { if let Ok(level) = skillset.skill_level(Sword(DDamage)) {
*damage *= modifiers.base_damage.powi(level.into()); *damage *= modifiers.base_damage.powi(level.into());
} }
} }
if let Some(MeleeConstructorKind::Slash { if let Some(MeleeConstructorKind::Slash { ref mut damage, .. }) =
ref mut damage, melee_constructor.scaled
poise: _,
knockback: _,
energy_regen: _,
}) = melee_constructor.scaled
{ {
if let Ok(level) = skillset.skill_level(Sword(DScaling)) { if let Ok(level) = skillset.skill_level(Sword(DScaling)) {
*damage *= modifiers.scaled_damage.powi(level.into()); *damage *= modifiers.scaled_damage.powi(level.into());
@ -1227,13 +1217,7 @@ impl CharacterAbility {
} => { } => {
let modifiers = SKILL_MODIFIERS.sword_tree.spin; let modifiers = SKILL_MODIFIERS.sword_tree.spin;
*is_interruptible = skillset.has_skill(Sword(InterruptingAttacks)); *is_interruptible = skillset.has_skill(Sword(InterruptingAttacks));
if let MeleeConstructorKind::Slash { if let MeleeConstructorKind::Slash { ref mut damage, .. } = melee_constructor.kind {
ref mut damage,
poise: _,
knockback: _,
energy_regen: _,
} = melee_constructor.kind
{
if let Ok(level) = skillset.skill_level(Sword(SDamage)) { if let Ok(level) = skillset.skill_level(Sword(SDamage)) {
*damage *= modifiers.base_damage.powi(level.into()); *damage *= modifiers.base_damage.powi(level.into());
} }
@ -1299,13 +1283,7 @@ impl CharacterAbility {
} else { } else {
spin_melee::MovementBehavior::ForwardGround spin_melee::MovementBehavior::ForwardGround
}; };
if let MeleeConstructorKind::Slash { if let MeleeConstructorKind::Slash { ref mut damage, .. } = melee_constructor.kind {
ref mut damage,
poise: _,
knockback: _,
energy_regen: _,
} = melee_constructor.kind
{
if let Ok(level) = skillset.skill_level(Axe(SDamage)) { if let Ok(level) = skillset.skill_level(Axe(SDamage)) {
*damage *= modifiers.base_damage.powi(level.into()); *damage *= modifiers.base_damage.powi(level.into());
} }
@ -1328,8 +1306,7 @@ impl CharacterAbility {
if let MeleeConstructorKind::Slash { if let MeleeConstructorKind::Slash {
ref mut damage, ref mut damage,
ref mut knockback, ref mut knockback,
poise: _, ..
energy_regen: _,
} = melee_constructor.kind } = melee_constructor.kind
{ {
if let Ok(level) = skillset.skill_level(Axe(LDamage)) { if let Ok(level) = skillset.skill_level(Axe(LDamage)) {
@ -1400,8 +1377,7 @@ impl CharacterAbility {
if let Some(MeleeConstructorKind::Bash { if let Some(MeleeConstructorKind::Bash {
ref mut damage, ref mut damage,
ref mut knockback, ref mut knockback,
poise: _, ..
energy_regen: _,
}) = melee_constructor.scaled }) = melee_constructor.scaled
{ {
if let Ok(level) = skillset.skill_level(Hammer(CDamage)) { if let Ok(level) = skillset.skill_level(Hammer(CDamage)) {

8
common/src/comp/melee.rs
View File

@ -347,12 +347,8 @@ impl MeleeConstructor {
if let Some(ref mut scaled) = &mut self.scaled { if let Some(ref mut scaled) = &mut self.scaled {
*scaled = scaled.adjusted_by_stats(stats, regen); *scaled = scaled.adjusted_by_stats(stats, regen);
} }
if let Some(CombatEffect::Buff(combat::CombatBuff { if let Some(CombatEffect::Buff(combat::CombatBuff { strength, .. })) =
kind: _, &mut self.damage_effect
dur_secs: _,
strength,
chance: _,
})) = &mut self.damage_effect
{ {
*strength *= stats.buff_strength; *strength *= stats.buff_strength;
} }