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
17 changes: 13 additions & 4 deletions src/Classes/GemSelectControl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -552,19 +552,25 @@ function GemSelectClass:AddCommonGemInfo(gemInstance, grantedEffect, addReq, mer
end
local cost
for _, res in ipairs(self.costs) do
if grantedEffectLevel.cost[res.Resource] then
if grantedEffectLevel.cost and grantedEffectLevel.cost[res.Resource] then
cost = (cost and (cost..", ") or "")..res.ResourceString:gsub("{0}", string.format("%g", round(grantedEffectLevel.cost[res.Resource] / res.Divisor, 2)))
end
end
if cost then
self.tooltip:AddLine(16, "^x7F7F7FCost: ^7"..cost)
end
if grantedEffectLevel.soulCost then
self.tooltip:AddLine(16, string.format("^x7F7F7FSouls Per Use: ^7%d", grantedEffectLevel.soulCost))
end
if grantedEffectLevel.skillUseStorage then
self.tooltip:AddLine(16, string.format("^x7F7F7FCan Store ^7%d ^x7F7F7FUse (%d Souls)", grantedEffectLevel.skillUseStorage, grantedEffectLevel.skillUseStorage * grantedEffectLevel.soulCost))
end
if grantedEffectLevel.soulPreventionDuration then
self.tooltip:AddLine(16, string.format("^x7F7F7FSoul Gain Prevention: ^7%d sec", grantedEffectLevel.soulPreventionDuration))
end
if grantedEffectLevel.cooldown then
self.tooltip:AddLine(16, string.format("^x7F7F7FCooldown Time: ^7%.2f sec", grantedEffectLevel.cooldown))
end
if grantedEffectLevel.critChance then
self.tooltip:AddLine(16, string.format("^x7F7F7FCritical Strike Chance: ^7%.2f%%", grantedEffectLevel.critChance))
end
if gemInstance.gemData.tags.attack then
if grantedEffectLevel.attackSpeedMultiplier then
self.tooltip:AddLine(16, string.format("^x7F7F7FAttack Speed: ^7%d%% of base", grantedEffectLevel.attackSpeedMultiplier + 100))
Expand All @@ -582,6 +588,9 @@ function GemSelectClass:AddCommonGemInfo(gemInstance, grantedEffect, addReq, mer
self.tooltip:AddLine(16, "^x7F7F7FCast Time: ^7Instant")
end
end
if grantedEffectLevel.critChance then
self.tooltip:AddLine(16, string.format("^x7F7F7FCritical Strike Chance: ^7%.2f%%", grantedEffectLevel.critChance))
end
if grantedEffectLevel.damageEffectiveness then
self.tooltip:AddLine(16, string.format("^x7F7F7FEffectiveness of Added Damage: ^7%d%%", grantedEffectLevel.damageEffectiveness * 100))
end
Expand Down
6 changes: 4 additions & 2 deletions src/Classes/ModList.lua
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,10 @@ function ModListClass:MergeMod(mod)
end

function ModListClass:AddList(modList)
for i = 1, #modList do
t_insert(self, modList[i])
if modList then
for i = 1, #modList do
t_insert(self, modList[i])
end
end
end

Expand Down
8,770 changes: 4,438 additions & 4,332 deletions src/Data/Skills/act_dex.lua

Large diffs are not rendered by default.

11,008 changes: 5,589 additions & 5,419 deletions src/Data/Skills/act_int.lua

Large diffs are not rendered by default.

7,200 changes: 3,663 additions & 3,537 deletions src/Data/Skills/act_str.lua

Large diffs are not rendered by default.

Loading