Skip to content

Fix attack type multiplier #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kenedos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix attack type multiplier #358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions system/scripts/zone/core/calc_combat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,16 +387,6 @@ public float SCR_AttackTypeMultiplier(ICombatEntity attacker, ICombatEntity targ
var attackType = skill.Data.AttackType;
var targetArmor = target.ArmorMaterial;

// Use the right-hand weapon's attack type if a weapon is equipped.
// This doesn't necessarily take into account off-hand attacks,
// but it's currently unclear if/how those would be handled.
if (attacker.Components.TryGet<InventoryComponent>(out var inventory))
{
var rhItem = inventory.GetEquip(EquipSlot.RightHand);
if (rhItem is not DummyEquipItem)
attackType = rhItem.Data.AttackType;
}

if (Feature.IsEnabled("AttackTypeBonusRevamp2"))
{
if (attackType == SkillAttackType.Slash)
Expand Down