Skip to content
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

mastery and shields fix #3522

Merged
merged 4 commits into from
Dec 24, 2023
Merged

mastery and shields fix #3522

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0f6564
shield mastery oops
Kherae Dec 19, 2023
8822902
Merge remote-tracking branch 'upstream/master'
Kherae Dec 19, 2023
4ac7829
Update masteries.lua
Kherae Dec 19, 2023
014b023
Update masteries.lua
Kherae Dec 19, 2023
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
6 changes: 3 additions & 3 deletions items/active/weapons/masteries.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading