Make SPECATK_QUAD == SPECATK_INNATE_DW when Combat:UseLiveCombatRounds is true

This commit is contained in:
Michael Cook (mackal) 2015-07-05 03:33:16 -04:00
parent dcd1a07553
commit 70577584ab

View File

@ -5157,7 +5157,10 @@ void Mob::DoOffHandAttackRounds(Mob *target, ExtraAttackOptions *opts)
if (!target) if (!target)
return; return;
// Mobs will only dual wield w/ the flag or have a secondary weapon // Mobs will only dual wield w/ the flag or have a secondary weapon
if (GetSpecialAbility(SPECATK_INNATE_DW) || GetEquipment(MaterialSecondary) != 0) { // For now, SPECATK_QUAD means innate DW when Combat:UseLiveCombatRounds is true
if ((GetSpecialAbility(SPECATK_INNATE_DW) ||
(RuleB(Combat, UseLiveCombatRounds) && GetSpecialAbility(SPECATK_QUAD))) ||
GetEquipment(MaterialSecondary) != 0) {
if (CheckDualWield()) { if (CheckDualWield()) {
Attack(target, MainSecondary, false, false, false, opts); Attack(target, MainSecondary, false, false, false, opts);
if (CanThisClassDoubleAttack() && GetLevel() > 35 && CheckDoubleAttack()) if (CanThisClassDoubleAttack() && GetLevel() > 35 && CheckDoubleAttack())