From d0f6564936d78f24f5484aa40860805ed25a64f5 Mon Sep 17 00:00:00 2001 From: Kherae Date: Mon, 18 Dec 2023 17:45:18 -0800 Subject: [PATCH 1/3] shield mastery oops --- items/active/weapons/masteries.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/items/active/weapons/masteries.lua b/items/active/weapons/masteries.lua index da317249d1f..3ee03a125b7 100644 --- a/items/active/weapons/masteries.lua +++ b/items/active/weapons/masteries.lua @@ -241,7 +241,7 @@ function masteries.apply(args) --shortspears: modifiers based on what else is or isn't wielded. none when combo'd. if tagCaching[currentHand.."TagCache"]["shortspear"] then - if not (tagCaching[otherHand.."TagCache"]["weapon"] or tagCaching[otherHand.."TagCache"]["thrown"]) then --solo shortspear, no other weapons: boost crit damage. + if not (tagCaching[otherHand.."TagCache"]["weapon"] or tagCaching[otherHand.."TagCache"]["thrown"] or tagCaching[otherHand.."TagCache"]["shield"]) then --solo shortspear, no other weapons: boost crit damage. masteryBuffer[#masteryBuffer + 1]={stat="critDamage", amount=0.3*(1+masteries.stats.shortspearMastery) } else -- using shortspear with a shield: boost shield and defense tech stats. @@ -273,7 +273,7 @@ function masteries.apply(args) masteryBuffer[#masteryBuffer + 1]={stat="critDamage", amount=0.15*(1+masteries.stats.longswordMastery)*handMultiplier} end -- longsword solo, no other weapons: attack speed. - if not (tagCaching[otherHand.."TagCache"]["weapon"] or tagCaching[otherHand.."TagCache"]["thrown"]) then + if not (tagCaching[otherHand.."TagCache"]["weapon"] or tagCaching[otherHand.."TagCache"]["thrown"]) or tagCaching[otherHand.."TagCache"]["shield"]) then --this would be funny to apply at full value if wielding alongside another longsword. especially with a minor damage penalty. masteryBuffer[#masteryBuffer + 1]={stat="attackSpeedUp", amount=0.7*masteries.stats.longswordMastery} else @@ -311,7 +311,7 @@ function masteries.apply(args) local gritModifier=masteries.stats.shortswordMastery*handMultiplier -- solo shortsword, no other weapons: increased damage, dash/dodge tech bonuses, and knockback resistance - if not (tagCaching[otherHand.."TagCache"]["weapon"] or tagCaching[otherHand.."TagCache"]["thrown"]) then + if not (tagCaching[otherHand.."TagCache"]["weapon"] or tagCaching[otherHand.."TagCache"]["thrown"]) or tagCaching[otherHand.."TagCache"]["shield"]) then powerModifier=(powerModifier/1.5) dashModifier=0.1*dashModifier/2 dodgeModifier=0.1*masteries.stats.shortswordMastery/2 From 4ac7829ddcbcd60e2232b97fc38af0c6983d1e66 Mon Sep 17 00:00:00 2001 From: Kherae Date: Mon, 18 Dec 2023 17:51:34 -0800 Subject: [PATCH 2/3] Update masteries.lua --- items/active/weapons/masteries.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/active/weapons/masteries.lua b/items/active/weapons/masteries.lua index 3ee03a125b7..12d5682e4b0 100644 --- a/items/active/weapons/masteries.lua +++ b/items/active/weapons/masteries.lua @@ -273,7 +273,7 @@ function masteries.apply(args) masteryBuffer[#masteryBuffer + 1]={stat="critDamage", amount=0.15*(1+masteries.stats.longswordMastery)*handMultiplier} end -- longsword solo, no other weapons: attack speed. - if not (tagCaching[otherHand.."TagCache"]["weapon"] or tagCaching[otherHand.."TagCache"]["thrown"]) or tagCaching[otherHand.."TagCache"]["shield"]) then + if not (tagCaching[otherHand.."TagCache"]["weapon"] or tagCaching[otherHand.."TagCache"]["thrown"] or tagCaching[otherHand.."TagCache"]["shield"]) then --this would be funny to apply at full value if wielding alongside another longsword. especially with a minor damage penalty. masteryBuffer[#masteryBuffer + 1]={stat="attackSpeedUp", amount=0.7*masteries.stats.longswordMastery} else From 014b023b38675751d91afb8950e82e5a9c00055f Mon Sep 17 00:00:00 2001 From: Kherae Date: Mon, 18 Dec 2023 17:56:39 -0800 Subject: [PATCH 3/3] Update masteries.lua --- items/active/weapons/masteries.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/active/weapons/masteries.lua b/items/active/weapons/masteries.lua index 12d5682e4b0..e80cf5bd982 100644 --- a/items/active/weapons/masteries.lua +++ b/items/active/weapons/masteries.lua @@ -311,7 +311,7 @@ function masteries.apply(args) local gritModifier=masteries.stats.shortswordMastery*handMultiplier -- solo shortsword, no other weapons: increased damage, dash/dodge tech bonuses, and knockback resistance - if not (tagCaching[otherHand.."TagCache"]["weapon"] or tagCaching[otherHand.."TagCache"]["thrown"]) or tagCaching[otherHand.."TagCache"]["shield"]) then + if not (tagCaching[otherHand.."TagCache"]["weapon"] or tagCaching[otherHand.."TagCache"]["thrown"] or tagCaching[otherHand.."TagCache"]["shield"]) then powerModifier=(powerModifier/1.5) dashModifier=0.1*dashModifier/2 dodgeModifier=0.1*masteries.stats.shortswordMastery/2