Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions spec/System/TestAttacks_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ describe("TestAttacks", function()
it("creates an item and has the correct crit chance", function()
assert.are.equals(build.calcsTab.mainOutput.CritChance, 0)
build.itemsTab:CreateDisplayItemFromRaw([[
New Item
Heavy Bow
]])
New Item
Heavy Bow
]])
build.itemsTab:AddDisplayItem()
runCallback("OnFrame")
assert.are.equals(build.calcsTab.mainOutput.CritChance, 5 * build.calcsTab.mainOutput.HitChance / 100)
Expand All @@ -21,10 +21,10 @@ describe("TestAttacks", function()
it("creates an item and has the correct crit multi", function()
assert.are.equals(2, build.calcsTab.mainOutput.CritMultiplier)
build.itemsTab:CreateDisplayItemFromRaw([[
New Item
New Item
Heavy Bow
25% increased Critical Damage Bonus
]])
]])
build.itemsTab:AddDisplayItem()
runCallback("OnFrame")
assert.are.equals(2 + 0.25, build.calcsTab.mainOutput.CritMultiplier)
Expand Down Expand Up @@ -57,7 +57,7 @@ describe("TestAttacks", function()
end)


local integratedEfficenyLoadout = function(modLine)
local integratedEfficiencyLoadout = function(modLine)
-- Activate via custom mod text to simplify testing
build.configTab.input.customMods = modLine
build.configTab:BuildModList()
Expand All @@ -76,26 +76,26 @@ describe("TestAttacks", function()
runCallback("OnFrame")
build.skillsTab:PasteSocketGroup("Falling Thunder 1/0 1\nIgnition 1/0 1\nDiscombobulate 1/0 1\nCoursing Current 1/0 1")
runCallback("OnFrame")

build.configTab:BuildModList()
runCallback("OnFrame")
build.calcsTab:BuildOutput()
runCallback("OnFrame")
end
it("correctly calculates increased damage with gemling integrated efficency", function()
integratedEfficenyLoadout("skills gain 99% increased damage per socketed red support gem")
it("correctly calculates increased damage with gemling integrated efficiency", function()
integratedEfficiencyLoadout("skills gain 99% increased damage per socketed red support gem")
local incDmg = build.calcsTab.mainEnv.player.activeSkillList[1].skillModList:Sum("INC", nil, "Damage")
assert.are.equals(incDmg, 99)
end)

it("correctly calculates crit chance with gemling integrated efficency", function()
integratedEfficenyLoadout("skills gain 99% increased critical hit chance per socketed blue support gem")
it("correctly calculates crit chance with gemling integrated efficiency", function()
integratedEfficiencyLoadout("skills gain 99% increased critical hit chance per socketed blue support gem")
local incCritChance = build.calcsTab.mainEnv.player.activeSkillList[1].skillModList:Sum("INC", nil, "CritChance")
assert.are.equals(incCritChance, 99)
end)

it("correctly calculates increased skill speed with gemling integrated efficency", function()
integratedEfficenyLoadout("skills gain 99% increased skill speed per socketed green support gem")
it("correctly calculates increased skill speed with gemling integrated efficiency", function()
integratedEfficiencyLoadout("skills gain 99% increased skill speed per socketed green support gem")
local incSpeed = build.calcsTab.mainEnv.player.activeSkillList[1].skillModList:Sum("INC", nil, "Speed")
assert.are.equals(incSpeed, 99)
end)
Expand Down
2 changes: 1 addition & 1 deletion src/Data/FlavourText.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1945,7 +1945,7 @@ return {
},
[245] = {
id = "FourUniqueBelt6",
name = "Brynabas",
name = "Byrnabas",
text = {
"The Brinerot sail without fear of storms.",
},
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Uniques/belt.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Has (1-3) Charm Slot
Life Flasks used while on Low Life apply Recovery Instantly
Mana Flasks used while on Low Mana apply Recovery Instantly
]],[[
Brynabas
Byrnabas
Wide Belt
Variant: Pre 0.1.1
Variant: Current
Expand Down
2 changes: 1 addition & 1 deletion src/Export/Uniques/belt.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ UniqueIncreasedFlaskChargesGained2
UniqueInstantLifeFlaskOnLowLife1
UniqueInstantManaFlaskOnLowMana1
]],[[
Brynabas
Byrnabas
Wide Belt
Variant: Pre 0.1.1
Variant: Current
Expand Down
6 changes: 3 additions & 3 deletions src/Modules/CalcOffence.lua
Original file line number Diff line number Diff line change
Expand Up @@ -637,11 +637,11 @@ function calcs.offence(env, actor, activeSkill)
end
end
end
-- Apply Gemling's "Integrated Efficency" Passive
-- Apply Gemling's "Integrated Efficiency" Passive
if skillModList:Flag(nil, "SkillDamageIncreasedPerRedSupport") or
skillModList:Flag(nil, "SkillSpeedIncreasedPerGreenSupport") or
skillModList:Flag(nil, "SkillCritChanceIncreasedPerBlueSupport") then

local redSupportCount = 0
local greenSupportCount = 0
local blueSupportCount = 0
Expand All @@ -655,7 +655,7 @@ function calcs.offence(env, actor, activeSkill)
end
end

local lookupModData = function(flag)
local lookupModData = function(flag)
local result = actor.modDB:Tabulate("FLAG", nil, flag)
return { source = result[1].mod.source, value = result[1].mod.value }
end
Expand Down