Skip to content

Commit b1bd174

Browse files
LocalIdentityLocalIdentity
andauthored
Fix Dual Wield mastery when using thrusting + non-thrusting sword (#9761)
The mastery that grants damage when you are wielding two different weapon types is not meant to work if you are wielding a non-thrusting sword with a thrusting sword as GGG have hard coded these weapons to share the same weapon type Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent 38a9b4e commit b1bd174

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

src/Modules/CalcPerform.lua

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,14 @@ local function doActorAttribsConditions(env, actor)
221221
if (actor.weaponData1.type == "Dagger" or actor.weaponData1.countsAsAll1H) and (actor.weaponData2.type == "Dagger" or actor.weaponData2.countsAsAll1H) then
222222
condList["DualWieldingDaggers"] = true
223223
end
224-
if (env.data.weaponTypeInfo[actor.weaponData1.type].label or actor.weaponData1.subType or actor.weaponData1.type) ~= (env.data.weaponTypeInfo[actor.weaponData2.type].label or actor.weaponData2.subType or actor.weaponData2.type) then
224+
local function getWeaponType(weaponData)
225+
-- GGG treats thrusting one handed swords as the same class as one handed swords
226+
if weaponData.type == "One Handed Sword" and weaponData.subType == "Thrusting" then
227+
return "One Handed Sword"
228+
end
229+
return env.data.weaponTypeInfo[weaponData.type].label or weaponData.subType or weaponData.type
230+
end
231+
if getWeaponType(actor.weaponData1) ~= getWeaponType(actor.weaponData2) then
225232
local info1 = env.data.weaponTypeInfo[actor.weaponData1.type]
226233
local info2 = env.data.weaponTypeInfo[actor.weaponData2.type]
227234
if info1.oneHand and info2.oneHand then

0 commit comments

Comments
 (0)