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

Fix Barrage and Barrage Support ambiguity #5029

Merged
merged 4 commits into from
Sep 14, 2022
Merged

Fix Barrage and Barrage Support ambiguity #5029

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7657713
Fix various errors caused by Barrage / Barrage Support ambiguity
Lothrik Feb 12, 2022
1d5bf6b
Update level requirement fallback behavior
Lothrik Feb 12, 2022
bc94b62
Merge remote-tracking branch 'lothrik/fix-barrage-support-error' into…
Paliak Sep 4, 2022
239f887
FIX: don't strip support from the name of some gems as that causes na…
Paliak Sep 4, 2022
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
Prev Previous commit
Next Next commit
Update level requirement fallback behavior
  • Loading branch information
@Lothrik
Lothrik committed Feb 12, 2022
commit 1d5bf6b21c2826aea188829c4e11028fbe74e04b
2 changes: 1 addition & 1 deletion src/Classes/GemSelectControl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ function GemSelectClass:AddCommonGemInfo(gemInstance, grantedEffect, addReq, mer
end
self.tooltip:AddSeparator(10)
if addReq then
local reqLevel = grantedEffect.levels[gemInstance.level] and grantedEffect.levels[gemInstance.level].levelRequirement or 0
local reqLevel = grantedEffect.levels[gemInstance.level] and grantedEffect.levels[gemInstance.level].levelRequirement or 1
local reqStr = calcLib.getGemStatRequirement(reqLevel, grantedEffect.support, gemInstance.gemData.reqStr)
local reqDex = calcLib.getGemStatRequirement(reqLevel, grantedEffect.support, gemInstance.gemData.reqDex)
local reqInt = calcLib.getGemStatRequirement(reqLevel, grantedEffect.support, gemInstance.gemData.reqInt)
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/CalcTools.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ function calcLib.buildSkillInstanceStats(skillInstance, grantedEffect)
end
local level = grantedEffect.levels[skillInstance.level] or { }
local availableEffectiveness
local actorLevel = skillInstance.actorLevel or level.levelRequirement
local actorLevel = skillInstance.actorLevel or level.levelRequirement or 1
for index, stat in ipairs(grantedEffect.stats) do
local statValue
if level.statInterpolation and level.statInterpolation[index] == 3 then
Expand Down