Skip to content

Commit 430706f

Browse files
LocalIdentityLocalIdentity
committed
1 parent 1c107fe commit 430706f

16 files changed

Lines changed: 1254 additions & 10 deletions

‎src/Classes/GemSelectControl.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ function GemSelectClass:UpdateGem(setText, addUndo)
354354
if setText then
355355
self:SetText(self.gemName)
356356
end
357-
self.gemChangeFunc(self.gemId and self.gemId:gsub("%w+:", ""), self:GetQualityType(self.gemId), addUndo and self.gemName ~= self.initialBuf)
357+
self.gemChangeFunc(self.gemId and self.gemId:gsub("%w+:", ""), addUndo and self.gemName ~= self.initialBuf)
358358
end
359359

360360
function GemSelectClass:ScrollSelIntoView()

‎src/Classes/GemSelectControl.lua.rej‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
diff a/src/Classes/GemSelectControl.lua b/src/Classes/GemSelectControl.lua (rejected hunks)
2+
@@ -61,7 +61,6 @@ function GemSelectClass:CalcOutputWithThisGem(calcFunc, gemData, useFullDPS)
3+
else
4+
gemList[self.index] = {
5+
level = gemData.naturalMaxLevel,
6+
- qualityId = "Default",
7+
quality = self.skillsTab.defaultGemQuality or 0,
8+
count = 1,
9+
enabled = true,
10+
@@ -78,7 +77,6 @@ function GemSelectClass:CalcOutputWithThisGem(calcFunc, gemData, useFullDPS)
11+
gemInstance.level = self.skillsTab:ProcessGemLevel(gemData)
12+
gemInstance.gemData = gemData
13+
gemInstance.displayEffect = nil
14+
- gemInstance.qualityId = "Default"
15+
-- Calculate the impact of using this gem
16+
local output = calcFunc(nil, useFullDPS)
17+
-- Put the original gem back into the list
18+
@@ -471,7 +469,6 @@ function GemSelectClass:Draw(viewPort, noTooltip)
19+
local output= self:CalcOutputWithThisGem(calcFunc, gemData, self.skillsTab.sortGemsByDPSField == "FullDPS")
20+
local gemInstance = {
21+
level = self.skillsTab:ProcessGemLevel(gemData),
22+
- qualityId = "Default",
23+
quality = self.skillsTab.defaultGemQuality or 0,
24+
count = 1,
25+
enabled = true,
26+
@@ -512,7 +509,6 @@ function GemSelectClass:Draw(viewPort, noTooltip)
27+
local cursorX, cursorY = GetCursorPos()
28+
self.tooltip:Clear()
29+
if gemInstance and gemInstance.gemData then
30+
- gemInstance.qualityId = "Default"
31+
self:AddGemTooltip(gemInstance)
32+
else
33+
self.tooltip:AddLine(16, toolTipText)

‎src/Classes/ImportTab.lua.rej‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff a/src/Classes/ImportTab.lua b/src/Classes/ImportTab.lua (rejected hunks)
2+
@@ -1116,11 +1116,11 @@ function ImportTabClass:ImportSocketedItems(item, socketedItems, slotName)
3+
self:ImportItem(socketedItem, slotName .. " Abyssal Socket "..abyssalSocketId)
4+
abyssalSocketId = abyssalSocketId + 1
5+
else
6+
- local normalizedBasename, qualityType = sanitiseText(socketedItem.typeLine)
7+
+ local normalizedBasename = sanitiseText(socketedItem.typeLine)
8+
local gemId = self.build.data.gemForBaseName[normalizedBasename:lower()]
9+
if socketedItem.hybrid then
10+
-- Used by transfigured gems and dual-skill gems (currently just Stormbind)
11+
- normalizedBasename, qualityType = sanitiseText(socketedItem.hybrid.baseTypeName)
12+
+ normalizedBasename = sanitiseText(socketedItem.hybrid.baseTypeName)
13+
gemId = self.build.data.gemForBaseName[normalizedBasename:lower()]
14+
if gemId and socketedItem.hybrid.isVaalGem then
15+
gemId = self.build.data.gemGrantedEffectIdForVaalGemId[self.build.data.gems[gemId].grantedEffectId]
16+
@@ -1130,7 +1130,6 @@ function ImportTabClass:ImportSocketedItems(item, socketedItems, slotName)
17+
local gemInstance = { level = 20, quality = 0, enabled = true, enableGlobal1 = true, gemId = gemId }
18+
gemInstance.nameSpec = self.build.data.gems[gemId].name
19+
gemInstance.support = socketedItem.support
20+
- gemInstance.qualityId = qualityType
21+
for _, property in pairs(socketedItem.properties) do
22+
if property.name == "Level" then
23+
gemInstance.level = tonumber(property.values[1][1]:match("%d+"))

‎src/Classes/SkillsTab.lua‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,6 @@ local sortGemTypeList = {
7070
{ label = "Effective Hit Pool", type = "TotalEHP" },
7171
}
7272

73-
local alternateGemQualityList ={
74-
{ label = "Default", type = "Default" },
75-
{ label = "Anomalous", type = "Alternate1" },
76-
{ label = "Divergent", type = "Alternate2" },
77-
{ label = "Phantasmal", type = "Alternate3" },
78-
}
79-
8073
local SkillsTabClass = newClass("SkillsTab", "UndoHandler", "ControlHost", "Control", function(self, build)
8174
self.UndoHandler()
8275
self.ControlHost()

‎src/Classes/SkillsTab.lua.rej‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
diff a/src/Classes/SkillsTab.lua b/src/Classes/SkillsTab.lua (rejected hunks)
2+
@@ -722,16 +722,20 @@ function SkillsTabClass:CreateGemSlot(index)
3+
end
4+
end
5+
end
6+
- -- Check if there is a quality of this type for the effect
7+
- if gemData and gemData.grantedEffect.qualityStats and gemData.grantedEffect.qualityStats["Default"] then
8+
- local qualityTable = gemData.grantedEffect.qualityStats["Default"]
9+
- addQualityLines(qualityTable, gemData.grantedEffect)
10+
- tooltip:AddSeparator(10)
11+
+ -- Check if there is quality for the effect
12+
+ if gemData and gemData.grantedEffect and gemData.grantedEffect.qualityStats then
13+
+ local qualityTable = gemData.grantedEffect.qualityStats
14+
+ if qualityTable[1] then
15+
+ addQualityLines(qualityTable, gemData.grantedEffect)
16+
+ tooltip:AddSeparator(10)
17+
+ end
18+
end
19+
- if gemData and gemData.secondaryGrantedEffect and gemData.secondaryGrantedEffect.qualityStats and gemData.secondaryGrantedEffect.qualityStats["Default"] then
20+
- local qualityTable = gemData.secondaryGrantedEffect.qualityStats["Default"]
21+
- addQualityLines(qualityTable, gemData.secondaryGrantedEffect)
22+
- tooltip:AddSeparator(10)
23+
+ if gemData and gemData.secondaryGrantedEffect and gemData.secondaryGrantedEffect.qualityStats then
24+
+ local qualityTable = gemData.secondaryGrantedEffect.qualityStats
25+
+ if qualityTable[1] then
26+
+ addQualityLines(qualityTable, gemData.secondaryGrantedEffect)
27+
+ tooltip:AddSeparator(10)
28+
+ end
29+
end
30+
31+
local calcFunc, calcBase = self.build.calcsTab:GetMiscCalculator(self.build)

‎src/Data/Skills/act_dex.lua.rej‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
diff a/src/Data/Skills/act_dex.lua b/src/Data/Skills/act_dex.lua (rejected hunks)
2+
@@ -17718,9 +17718,6 @@ skills["ChannelledSnipeSupport"] = {
3+
baseMods = {
4+
flag("TriggeredBySnipe"),
5+
},
6+
- qualityStats = {
7+
- { "dummy_stat_display_nothing", 0 },
8+
- },
9+
constantStats = {
10+
{ "snipe_triggered_skill_damage_+%_final", -40 },
11+
{ "base_number_of_projectiles", 3 },
12+
@@ -18335,9 +18332,6 @@ skills["SupportIntuitiveLink"] = {
13+
mod("Damage", "MORE", nil),
14+
},
15+
},
16+
- qualityStats = {
17+
- { "dummy_stat_display_nothing", 0 },
18+
- },
19+
stats = {
20+
"support_trigger_link_damage_+%_final",
21+
"trigger_on_trigger_link_target_hit",

‎src/Data/Skills/act_int.lua.rej‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
diff a/src/Data/Skills/act_int.lua b/src/Data/Skills/act_int.lua (rejected hunks)
2+
@@ -645,9 +645,6 @@ skills["SupportBrandSupport"] = {
3+
baseMods = {
4+
skill("triggeredByBrand", true),
5+
},
6+
- qualityStats = {
7+
- { "dummy_stat_display_nothing", 0 },
8+
- },
9+
constantStats = {
10+
{ "support_brand_area_of_effect_+%_final", -40 },
11+
{ "chaining_range_+%", -40 },
12+
@@ -1756,9 +1753,6 @@ skills["SupportDarkRitualAltX"] = {
13+
mod("CurseEffect", "MORE", nil),
14+
},
15+
},
16+
- qualityStats = {
17+
- { "dummy_stat_display_nothing", 0.001 },
18+
- },
19+
constantStats = {
20+
{ "support_bane_curse_effect_+%_final", -25 },
21+
},
22+
@@ -16976,9 +16970,6 @@ skills["Spellslinger"] = {
23+
baseFlags = {
24+
spell = true,
25+
},
26+
- qualityStats = {
27+
- { "dummy_stat_display_nothing", 0 },
28+
- },
29+
stats = {
30+
"spellslinger_mana_reservation",
31+
},

‎src/Data/Skills/act_str.lua.rej‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
diff a/src/Data/Skills/act_str.lua b/src/Data/Skills/act_str.lua (rejected hunks)
2+
@@ -884,9 +884,6 @@ skills["BattlemagesCrySupport"] = {
3+
skill("triggeredByBattleMageCry", true),
4+
},
5+
},
6+
- qualityStats = {
7+
- { "dummy_stat_display_nothing", 0 },
8+
- },
9+
stats = {
10+
"support_divine_cry_damage_+%_final",
11+
"triggered_by_divine_cry",
12+
@@ -4563,9 +4560,6 @@ skills["FrozenSweep"] = {
13+
baseMods = {
14+
skill("radius", 25),
15+
},
16+
- qualityStats = {
17+
- { "dummy_stat_display_nothing", 0 },
18+
- },
19+
constantStats = {
20+
{ "skill_physical_damage_%_to_convert_to_cold", 100 },
21+
{ "skill_disabled_unless_cloned", 1 },
22+
@@ -6705,9 +6699,6 @@ skills["Combust"] = {
23+
baseMods = {
24+
skill("showAverage", true),
25+
},
26+
- qualityStats = {
27+
- { "dummy_stat_display_nothing", 0 },
28+
- },
29+
constantStats = {
30+
{ "skill_physical_damage_%_to_convert_to_fire", 60 },
31+
},

‎src/Data/Skills/other.lua.rej‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
diff a/src/Data/Skills/other.lua b/src/Data/Skills/other.lua (rejected hunks)
2+
@@ -880,10 +880,8 @@ skills["Convocation"] = {
3+
skill("buffNotPlayer", true),
4+
},
5+
qualityStats = {
6+
- Default = {
7+
- { "skill_effect_duration_+%", 1 },
8+
- { "base_cooldown_speed_+%", 1 },
9+
- },
10+
+ { "skill_effect_duration_+%", 1 },
11+
+ { "base_cooldown_speed_+%", 1 },
12+
},
13+
constantStats = {
14+
{ "base_skill_effect_duration", 2000 },
15+
@@ -1183,9 +1181,7 @@ skills["GemDetonateMines"] = {
16+
spell = true,
17+
},
18+
qualityStats = {
19+
- Default = {
20+
- { "mine_detonation_speed_+%", 1 },
21+
- },
22+
+ { "mine_detonation_speed_+%", 1 },
23+
},
24+
constantStats = {
25+
{ "display_mine_deontation_mechanics_detonation_speed_+%_final_per_sequence_mine", 10 },
26+
@@ -1223,9 +1219,7 @@ skills["SupportDivineBlessing"] = {
27+
},
28+
},
29+
qualityStats = {
30+
- Default = {
31+
- { "aura_effect_+%", 0.25 },
32+
- },
33+
+ { "aura_effect_+%", 0.25 },
34+
},
35+
constantStats = {
36+
{ "base_spell_cast_time_ms_override", 500 },
37+
@@ -1406,9 +1400,7 @@ skills["SupportEarthbreaker"] = {
38+
},
39+
},
40+
qualityStats = {
41+
- Default = {
42+
- { "totem_damage_+%", 0.5 },
43+
- },
44+
+ { "totem_damage_+%", 0.5 },
45+
},
46+
constantStats = {
47+
{ "base_totem_duration", 12000 },
48+
@@ -1484,9 +1476,7 @@ skills["SupportEclipse"] = {
49+
supportGemsOnly = true,
50+
statDescriptionScope = "gem_stat_descriptions",
51+
qualityStats = {
52+
- Default = {
53+
- { "local_gem_experience_gain_+%", 5 },
54+
- },
55+
+ { "local_gem_experience_gain_+%", 5 },
56+
},
57+
stats = {
58+
"supported_active_skill_gem_level_+",
59+
@@ -1521,9 +1511,7 @@ skills["SupportElementalPenetration"] = {
60+
statDescriptionScope = "gem_stat_descriptions",
61+
fromItem = true,
62+
qualityStats = {
63+
- Default = {
64+
- { "elemental_damage_+%", 0.5 },
65+
- },
66+
+ { "elemental_damage_+%", 0.5 },
67+
},
68+
stats = {
69+
"reduce_enemy_elemental_resistance_%",
70+
@@ -2671,9 +2659,7 @@ skills["Portal"] = {
71+
spell = true,
72+
},
73+
qualityStats = {
74+
- Default = {
75+
- { "base_cast_speed_+%", 3 },
76+
- },
77+
+ { "base_cast_speed_+%", 3 },
78+
},
79+
stats = {
80+
"base_deal_no_damage",
81+
@@ -4654,9 +4640,7 @@ skills["VaalBreach"] = {
82+
spell = true,
83+
},
84+
qualityStats = {
85+
- Default = {
86+
- { "base_cast_speed_+%", 3 },
87+
- },
88+
+ { "base_cast_speed_+%", 3 },
89+
},
90+
stats = {
91+
"base_deal_no_damage",

0 commit comments

Comments
 (0)