From 70577584ab834e74e59e11a253a90bc620957d98 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Sun, 5 Jul 2015 03:33:16 -0400 Subject: [PATCH] Make SPECATK_QUAD == SPECATK_INNATE_DW when Combat:UseLiveCombatRounds is true --- zone/attack.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zone/attack.cpp b/zone/attack.cpp index 3714bb8e2..02b16c64e 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -5157,7 +5157,10 @@ void Mob::DoOffHandAttackRounds(Mob *target, ExtraAttackOptions *opts) if (!target) return; // 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()) { Attack(target, MainSecondary, false, false, false, opts); if (CanThisClassDoubleAttack() && GetLevel() > 35 && CheckDoubleAttack())