Skip to content

Commit eedd79e

Browse files
author
LocalIdentity
committed
Merge branch 'dev' into mace-stuff
2 parents 950a16d + 6f0a70a commit eedd79e

29 files changed

Lines changed: 88 additions & 570 deletions

‎src/Classes/CalcBreakdownControl.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ function CalcBreakdownClass:AddBreakdownSection(sectionData)
183183
{ label = "More/less", key = "more" },
184184
{ label = "Inc/red", key = "inc" },
185185
{ label = "Efficiency", key = "efficiency" },
186+
{ label = "Efficiency More/less", key = "efficiencyMore" },
186187
{ label = "Count", key = "count" },
187188
{ label = "Reservation", key = "total" },
188189
}

‎src/Classes/GemSelectControl.lua‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ function GemSelectClass:BuildList(buf)
159159
tagName = "strength"
160160
elseif tagName == "dex" then
161161
tagName = "dexterity"
162+
elseif tagName == "aoe" then
163+
tagName = "area"
162164
end
163165
-- for :melee we want to exclude gems that DON'T have this tag
164166
-- for :-melee we want to exclude gems that DO have this tag

‎src/Classes/ImportTab.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ local ImportTabClass = newClass("ImportTab", "ControlHost", "Control", function(
9595
self.controls.charSelect.enabled = function()
9696
return self.charImportMode == "SELECTCHAR"
9797
end
98-
self.controls.charImportHeader = new("LabelControl", {"TOPLEFT",self.controls.charSelect,"BOTTOMLEFT"}, {0, 16, 200, 16}, "Import:")
98+
self.controls.charImportHeader = new("LabelControl", {"TOPLEFT",self.controls.charSelect,"BOTTOMLEFT"}, {0, 16, 200, 16}, "^7Import:")
9999
self.controls.charImportTree = new("ButtonControl", {"LEFT",self.controls.charImportHeader, "RIGHT"}, {8, 0, 170, 20}, "Passive Tree and Jewels", function()
100100
if self.build.spec:CountAllocNodes() > 0 then
101101
main:OpenConfirmPopup("Character Import", "Importing the passive tree will overwrite your current tree.", "Import", function()
@@ -1057,6 +1057,7 @@ function ImportTabClass:ImportItem(itemData, slotName)
10571057
end
10581058
item.mirrored = itemData.mirrored
10591059
item.corrupted = itemData.corrupted
1060+
item.sanctified = itemData.sanctified
10601061
item.doubleCorrupted = itemData.doubleCorrupted
10611062
item.fractured = itemData.fractured
10621063
item.desecrated = itemData.desecrated

‎src/Classes/Item.lua‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,9 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
380380
charmBuffLines[line] = nil
381381
elseif line == "--------" then
382382
self.checkSection = true
383+
elseif line == "Sanctified" then
384+
self.sanctified = true
385+
self.corruptible = false
383386
elseif line == "Mirrored" then
384387
self.mirrored = true
385388
elseif line == "Corrupted" then
@@ -713,7 +716,6 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
713716
or data.itemMods[self.base.type]
714717
or data.itemMods.Item
715718
self.corruptible = self.base.type ~= "Flask" and self.base.type ~= "Charm" and self.base.type ~= "Rune" and self.base.type ~= "SoulCore" and self.base.type ~= "Transcendent Limb"
716-
self.clusterJewel = data.clusterJewels and data.clusterJewels.jewels[self.baseName]
717719
self.requirements.str = self.base.req.str or 0
718720
self.requirements.dex = self.base.req.dex or 0
719721
self.requirements.int = self.base.req.int or 0
@@ -1297,6 +1299,9 @@ function ItemClass:BuildRaw()
12971299
if self.mirrored then
12981300
t_insert(rawLines, "Mirrored")
12991301
end
1302+
if self.sanctified then
1303+
t_insert(rawLines, "Sanctified")
1304+
end
13001305
if self.doubleCorrupted then
13011306
t_insert(rawLines, "Twice Corrupted")
13021307
elseif self.corrupted then

‎src/Classes/ItemsTab.lua‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ holding Shift will put it in the second.]])
403403
self:AnointDisplayItem(1)
404404
end)
405405
self.controls.displayItemAnoint.shown = function()
406-
return self.displayItem and (self.displayItem.base.type == "Amulet" or self.displayItem.canBeAnointed)
406+
return self.displayItem and ((self.displayItem.base.type == "Amulet" or self.displayItem.canBeAnointed) and not self.displayItem.sanctified)
407407
end
408408
self.controls.displayItemCorrupt = new("ButtonControl", {"TOPLEFT",self.controls.displayItemAnoint,"TOPRIGHT",true}, {8, 0, 100, 20}, "Corrupt...", function()
409409
self:CorruptDisplayItem()
@@ -2067,14 +2067,14 @@ function ItemsTabClass:CraftItem()
20672067
item:BuildAndParseRaw()
20682068
return item
20692069
end
2070-
controls.rarityLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {50, 20, 0, 16}, "Rarity:")
2070+
controls.rarityLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {50, 20, 0, 16}, "^7Rarity:")
20712071
controls.rarity = new("DropDownControl", nil, {-80, 20, 100, 18}, rarityDropList)
20722072
controls.rarity.selIndex = self.lastCraftRaritySel or 3
20732073
controls.title = new("EditControl", nil, {70, 20, 190, 18}, "", "Name")
20742074
controls.title.shown = function()
20752075
return controls.rarity.selIndex >= 3
20762076
end
2077-
controls.typeLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {50, 45, 0, 16}, "Type:")
2077+
controls.typeLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {50, 45, 0, 16}, "^7Type:")
20782078
controls.type = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, {55, 45, 295, 18}, self.build.data.itemBaseTypeList, function(index, value)
20792079
controls.base.list = self.build.data.itemBaseLists[self.build.data.itemBaseTypeList[index]]
20802080
controls.base.selIndex = 1
@@ -3055,13 +3055,16 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
30553055
end
30563056

30573057
-- Corrupted item label
3058-
if item.corrupted or item.mirrored or item.doubleCorrupted then
3058+
if item.corrupted or item.mirrored or item.doubleCorrupted or item.sanctified then
30593059
if #item.explicitModLines == 0 then
30603060
tooltip:AddSeparator(10)
30613061
end
30623062
if item.mirrored then
30633063
tooltip:AddLine(fontSizeBig, colorCodes.NEGATIVE.."Mirrored", "FONTIN SC")
30643064
end
3065+
if item.sanctified then
3066+
tooltip:AddLine(fontSizeBig, colorCodes.FRACTURED.."Sanctified", "FONTIN SC")
3067+
end
30653068
if item.doubleCorrupted then
30663069
tooltip:AddLine(fontSizeBig, colorCodes.NEGATIVE.."Twice Corrupted", "FONTIN SC")
30673070
elseif item.corrupted then

‎src/Classes/TradeQueryRequests.lua‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,10 +413,14 @@ function TradeQueryRequestsClass:FetchResultBlock(url, callback)
413413
if item.mirrored then
414414
t_insert(rawLines, "Mirrored")
415415
end
416-
if item.corrupted then
416+
if item.doubleCorrupted then
417+
t_insert(rawLines, "Twice Corrupted")
418+
elseif item.corrupted then
417419
t_insert(rawLines, "Corrupted")
418420
end
419-
421+
if item.sanctified then
422+
t_insert(rawLines, "Sanctified")
423+
end
420424

421425
table.insert(items, {
422426
amount = trade_entry.listing.price.amount,

‎src/Data/Bases/axe.lua‎

Lines changed: 0 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -123,78 +123,6 @@ itemBases["Dread Hatchet"] = {
123123
weapon = { PhysicalMin = 34, PhysicalMax = 79, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
124124
req = { level = 65, str = 89, dex = 36, },
125125
}
126-
itemBases["[DNT] Callous Hatchet"] = {
127-
type = "One Hand Axe",
128-
quality = 20,
129-
socketLimit = 3,
130-
tags = { axe = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
131-
implicitModTypes = { },
132-
weapon = { PhysicalMin = 35, PhysicalMax = 81, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
133-
req = { level = 67, str = 89, dex = 36, },
134-
}
135-
itemBases["[DNT] Catcher Axe"] = {
136-
type = "One Hand Axe",
137-
quality = 20,
138-
socketLimit = 3,
139-
tags = { axe = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
140-
implicitModTypes = { },
141-
weapon = { PhysicalMin = 37, PhysicalMax = 86, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
142-
req = { level = 72, str = 89, dex = 36, },
143-
}
144-
itemBases["[DNT] Aged Axe"] = {
145-
type = "One Hand Axe",
146-
quality = 20,
147-
socketLimit = 3,
148-
tags = { axe = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
149-
implicitModTypes = { },
150-
weapon = { PhysicalMin = 39, PhysicalMax = 91, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
151-
req = { level = 77, str = 89, dex = 36, },
152-
}
153-
itemBases["[DNT] Towering Axe"] = {
154-
type = "One Hand Axe",
155-
quality = 20,
156-
socketLimit = 3,
157-
tags = { axe = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
158-
implicitModTypes = { },
159-
weapon = { PhysicalMin = 39, PhysicalMax = 91, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
160-
req = { level = 78, str = 89, dex = 36, },
161-
}
162-
itemBases["[DNT] Vagabond Axe"] = {
163-
type = "One Hand Axe",
164-
quality = 20,
165-
socketLimit = 3,
166-
tags = { axe = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
167-
implicitModTypes = { },
168-
weapon = { PhysicalMin = 39, PhysicalMax = 91, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
169-
req = { level = 79, str = 89, dex = 36, },
170-
}
171-
itemBases["[DNT] Moonlight Axe"] = {
172-
type = "One Hand Axe",
173-
quality = 20,
174-
socketLimit = 3,
175-
tags = { axe = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
176-
implicitModTypes = { },
177-
weapon = { PhysicalMin = 39, PhysicalMax = 91, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
178-
req = { level = 77, str = 89, dex = 36, },
179-
}
180-
itemBases["[DNT] Hacking Hatchet"] = {
181-
type = "One Hand Axe",
182-
quality = 20,
183-
socketLimit = 3,
184-
tags = { axe = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
185-
implicitModTypes = { },
186-
weapon = { PhysicalMin = 38, PhysicalMax = 89, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
187-
req = { level = 75, str = 89, dex = 36, },
188-
}
189-
itemBases["[DNT] Ritualistic Axe"] = {
190-
type = "One Hand Axe",
191-
quality = 20,
192-
socketLimit = 3,
193-
tags = { axe = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
194-
implicitModTypes = { },
195-
weapon = { PhysicalMin = 39, PhysicalMax = 91, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
196-
req = { level = 78, str = 89, dex = 36, },
197-
}
198126

199127
itemBases["Splitting Greataxe"] = {
200128
type = "Two Hand Axe",
@@ -317,75 +245,3 @@ itemBases["Vile Greataxe"] = {
317245
weapon = { PhysicalMin = 59, PhysicalMax = 155, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
318246
req = { level = 65, str = 89, dex = 36, },
319247
}
320-
itemBases["[DNT] Dividing Greataxe"] = {
321-
type = "Two Hand Axe",
322-
quality = 20,
323-
socketLimit = 4,
324-
tags = { axe = true, default = true, two_hand_weapon = true, twohand = true, weapon = true, },
325-
implicitModTypes = { },
326-
weapon = { PhysicalMin = 60, PhysicalMax = 159, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
327-
req = { level = 67, str = 89, dex = 36, },
328-
}
329-
itemBases["[DNT] Feathersteel Halberd"] = {
330-
type = "Two Hand Axe",
331-
quality = 20,
332-
socketLimit = 4,
333-
tags = { axe = true, default = true, two_hand_weapon = true, twohand = true, weapon = true, },
334-
implicitModTypes = { },
335-
weapon = { PhysicalMin = 64, PhysicalMax = 170, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
336-
req = { level = 72, str = 89, dex = 36, },
337-
}
338-
itemBases["[DNT] Grimhold Axe"] = {
339-
type = "Two Hand Axe",
340-
quality = 20,
341-
socketLimit = 4,
342-
tags = { axe = true, default = true, two_hand_weapon = true, twohand = true, weapon = true, },
343-
implicitModTypes = { },
344-
weapon = { PhysicalMin = 68, PhysicalMax = 180, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
345-
req = { level = 77, str = 89, dex = 36, },
346-
}
347-
itemBases["[DNT] Notched Greataxe"] = {
348-
type = "Two Hand Axe",
349-
quality = 20,
350-
socketLimit = 4,
351-
tags = { axe = true, default = true, two_hand_weapon = true, twohand = true, weapon = true, },
352-
implicitModTypes = { },
353-
weapon = { PhysicalMin = 68, PhysicalMax = 180, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
354-
req = { level = 78, str = 89, dex = 36, },
355-
}
356-
itemBases["[DNT] Intricate Greataxe"] = {
357-
type = "Two Hand Axe",
358-
quality = 20,
359-
socketLimit = 4,
360-
tags = { axe = true, default = true, two_hand_weapon = true, twohand = true, weapon = true, },
361-
implicitModTypes = { },
362-
weapon = { PhysicalMin = 68, PhysicalMax = 180, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
363-
req = { level = 79, str = 89, dex = 36, },
364-
}
365-
itemBases["[DNT] Violent Greataxe"] = {
366-
type = "Two Hand Axe",
367-
quality = 20,
368-
socketLimit = 4,
369-
tags = { axe = true, default = true, two_hand_weapon = true, twohand = true, weapon = true, },
370-
implicitModTypes = { },
371-
weapon = { PhysicalMin = 68, PhysicalMax = 180, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
372-
req = { level = 77, str = 89, dex = 36, },
373-
}
374-
itemBases["[DNT] Severing Halberd"] = {
375-
type = "Two Hand Axe",
376-
quality = 20,
377-
socketLimit = 4,
378-
tags = { axe = true, default = true, two_hand_weapon = true, twohand = true, weapon = true, },
379-
implicitModTypes = { },
380-
weapon = { PhysicalMin = 67, PhysicalMax = 176, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
381-
req = { level = 75, str = 89, dex = 36, },
382-
}
383-
itemBases["[DNT] Clawed Greataxe"] = {
384-
type = "Two Hand Axe",
385-
quality = 20,
386-
socketLimit = 4,
387-
tags = { axe = true, default = true, two_hand_weapon = true, twohand = true, weapon = true, },
388-
implicitModTypes = { },
389-
weapon = { PhysicalMin = 68, PhysicalMax = 180, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
390-
req = { level = 78, str = 89, dex = 36, },
391-
}

‎src/Data/Bases/dagger.lua‎

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -131,75 +131,3 @@ itemBases["Cinquedea"] = {
131131
weapon = { PhysicalMin = 21, PhysicalMax = 62, CritChanceBase = 15, AttackRateBase = 1.55, Range = 10, },
132132
req = { level = 65, dex = 63, int = 63, },
133133
}
134-
itemBases["[DNT] Crystalline Dagger"] = {
135-
type = "Dagger",
136-
quality = 20,
137-
socketLimit = 3,
138-
tags = { dagger = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
139-
implicitModTypes = { },
140-
weapon = { PhysicalMin = 21, PhysicalMax = 63, CritChanceBase = 15, AttackRateBase = 1.55, Range = 10, },
141-
req = { level = 67, dex = 63, int = 63, },
142-
}
143-
itemBases["[DNT] Hag Knife"] = {
144-
type = "Dagger",
145-
quality = 20,
146-
socketLimit = 3,
147-
tags = { dagger = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
148-
implicitModTypes = { },
149-
weapon = { PhysicalMin = 22, PhysicalMax = 66, CritChanceBase = 15, AttackRateBase = 1.55, Range = 10, },
150-
req = { level = 72, dex = 63, int = 63, },
151-
}
152-
itemBases["[DNT] Prominent Dagger"] = {
153-
type = "Dagger",
154-
quality = 20,
155-
socketLimit = 3,
156-
tags = { dagger = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
157-
implicitModTypes = { },
158-
weapon = { PhysicalMin = 23, PhysicalMax = 69, CritChanceBase = 15, AttackRateBase = 1.55, Range = 10, },
159-
req = { level = 77, dex = 63, int = 63, },
160-
}
161-
itemBases["[DNT] Carving Knife"] = {
162-
type = "Dagger",
163-
quality = 20,
164-
socketLimit = 3,
165-
tags = { dagger = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
166-
implicitModTypes = { },
167-
weapon = { PhysicalMin = 23, PhysicalMax = 69, CritChanceBase = 15, AttackRateBase = 1.55, Range = 10, },
168-
req = { level = 78, dex = 63, int = 63, },
169-
}
170-
itemBases["[DNT] Crescent Dagger"] = {
171-
type = "Dagger",
172-
quality = 20,
173-
socketLimit = 3,
174-
tags = { dagger = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
175-
implicitModTypes = { },
176-
weapon = { PhysicalMin = 23, PhysicalMax = 69, CritChanceBase = 15, AttackRateBase = 1.55, Range = 10, },
177-
req = { level = 79, dex = 63, int = 63, },
178-
}
179-
itemBases["[DNT] Intricade Knife"] = {
180-
type = "Dagger",
181-
quality = 20,
182-
socketLimit = 3,
183-
tags = { dagger = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
184-
implicitModTypes = { },
185-
weapon = { PhysicalMin = 23, PhysicalMax = 69, CritChanceBase = 15, AttackRateBase = 1.55, Range = 10, },
186-
req = { level = 77, dex = 63, int = 63, },
187-
}
188-
itemBases["[DNT] Midnight Dagger"] = {
189-
type = "Dagger",
190-
quality = 20,
191-
socketLimit = 3,
192-
tags = { dagger = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
193-
implicitModTypes = { },
194-
weapon = { PhysicalMin = 23, PhysicalMax = 68, CritChanceBase = 15, AttackRateBase = 1.55, Range = 10, },
195-
req = { level = 75, dex = 63, int = 63, },
196-
}
197-
itemBases["[DNT] Ritualistic Dagger"] = {
198-
type = "Dagger",
199-
quality = 20,
200-
socketLimit = 3,
201-
tags = { dagger = true, default = true, one_hand_weapon = true, onehand = true, weapon = true, },
202-
implicitModTypes = { },
203-
weapon = { PhysicalMin = 23, PhysicalMax = 69, CritChanceBase = 15, AttackRateBase = 1.55, Range = 10, },
204-
req = { level = 78, dex = 63, int = 63, },
205-
}

0 commit comments

Comments
 (0)