mirror of
https://github.com/parnic/breakables.git
synced 2025-06-17 01:41:51 -05:00
Compare commits
24 Commits
Author | SHA1 | Date | |
---|---|---|---|
aeaac05586
|
|||
8553efb4a6
|
|||
0c89d98639
|
|||
4d0b368ba6
|
|||
ca215c2382
|
|||
66c35b8277
|
|||
e3d271e0ff
|
|||
7b3cca585f
|
|||
bcc53b8ed0
|
|||
9775e3c30e
|
|||
9595af7979
|
|||
5ae7a5efb1
|
|||
bd0d8b51f8
|
|||
0dbf1d7705
|
|||
a94cba6c34
|
|||
d000f77a53
|
|||
3c50d6fab5
|
|||
b4416d6daa
|
|||
e904b2c12f | |||
5c44d9ae23 | |||
d73336f725 | |||
3897e6378d | |||
5e0cafd2c3 | |||
33e8bfd9b8 |
1
.mailmap
1
.mailmap
@ -1,3 +1,4 @@
|
||||
parnic <parnic@parnic.com> Parnic <chris@parnic.com>
|
||||
parnic <parnic@parnic.com> Parnic <parnic@parnic.com>
|
||||
parnic <parnic@parnic.com> Chris Pickett <cpickett@perniciousgames.com>
|
||||
parnic <parnic@parnic.com> root <root@parnic.com>
|
||||
|
172
Breakables.lua
172
Breakables.lua
@ -5,6 +5,9 @@ local LBF = LibStub("Masque", true)
|
||||
|
||||
local lbfGroup
|
||||
|
||||
local WowVer = select(4, GetBuildInfo())
|
||||
local IsClassic = WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
|
||||
|
||||
local MillingId = 51005
|
||||
local MillingItemSubType = babbleInv["Herb"]
|
||||
local MillingItemSecondarySubType = babbleInv["Other"]
|
||||
@ -26,12 +29,28 @@ local AdditionalMillableItems = {
|
||||
124105,
|
||||
124106,
|
||||
128304,
|
||||
151565,
|
||||
-- BfA herbs
|
||||
152505,
|
||||
152506,
|
||||
152507,
|
||||
152508,
|
||||
152509,
|
||||
152510,
|
||||
152511,
|
||||
168487,
|
||||
}
|
||||
|
||||
local AdditionalProspectableItems = {
|
||||
-- Legion ore
|
||||
123918,
|
||||
123919,
|
||||
151564,
|
||||
-- BfA ore
|
||||
152512,
|
||||
152513,
|
||||
152579,
|
||||
168185,
|
||||
}
|
||||
|
||||
local MassMilling = {
|
||||
@ -50,6 +69,7 @@ local MassMilling = {
|
||||
[124105] = 209662,
|
||||
[124106] = 209664,
|
||||
[128304] = 210116,
|
||||
[151565] = 247861,
|
||||
}
|
||||
|
||||
local HerbCombineItems = {
|
||||
@ -92,6 +112,10 @@ local DisenchantTypes = {babbleInv["Armor"], babbleInv["Weapon"]}
|
||||
local CanDisenchant = false
|
||||
local EnchantingProfessionId = 333
|
||||
|
||||
local AdditionalDisenchantableItems = {
|
||||
137195, -- highmountain armor
|
||||
}
|
||||
|
||||
local PickLockId = 1804
|
||||
local PickableItems = {
|
||||
16882, -- battered junkbox
|
||||
@ -119,6 +143,8 @@ local PickableItems = {
|
||||
68729, -- elementium lockbox
|
||||
88567, -- ghost iron lockbox
|
||||
116920, -- true steel lockbox
|
||||
121331, -- leystone lockbox
|
||||
169475, -- barnacled lockbox
|
||||
}
|
||||
local CanPickLock = false
|
||||
|
||||
@ -314,7 +340,7 @@ function Breakables:RegisterEvents()
|
||||
|
||||
self:RegisterEvent("MODIFIER_STATE_CHANGED", "FindBreakables")
|
||||
|
||||
if CanDisenchant then
|
||||
if CanDisenchant and WowVer < 80000 then
|
||||
self:RegisterEvent("TRADE_SKILL_UPDATE", "OnTradeSkillUpdate")
|
||||
end
|
||||
|
||||
@ -386,7 +412,7 @@ function Breakables:OnTradeSkillUpdate()
|
||||
end
|
||||
|
||||
function Breakables:OnBagItemLockPicked()
|
||||
nextCheck[1] = GetTime() + BagUpdateCheckDelay
|
||||
self:FindBreakables()
|
||||
end
|
||||
|
||||
function Breakables:FindLevelOfProfessionIndex(idx)
|
||||
@ -397,15 +423,17 @@ function Breakables:FindLevelOfProfessionIndex(idx)
|
||||
end
|
||||
|
||||
function Breakables:GetEnchantingLevel()
|
||||
local prof1, prof2 = GetProfessions()
|
||||
if GetProfessions then
|
||||
local prof1, prof2 = GetProfessions()
|
||||
|
||||
local skillId, rank = self:FindLevelOfProfessionIndex(prof1)
|
||||
if skillId ~= nil and skillId == EnchantingProfessionId then
|
||||
self.EnchantingLevel = rank
|
||||
else
|
||||
skillId, rank = self:FindLevelOfProfessionIndex(prof2)
|
||||
local skillId, rank = self:FindLevelOfProfessionIndex(prof1)
|
||||
if skillId ~= nil and skillId == EnchantingProfessionId then
|
||||
self.EnchantingLevel = rank
|
||||
else
|
||||
skillId, rank = self:FindLevelOfProfessionIndex(prof2)
|
||||
if skillId ~= nil and skillId == EnchantingProfessionId then
|
||||
self.EnchantingLevel = rank
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -415,7 +443,9 @@ local function GetIgnoreListOptions()
|
||||
|
||||
for k,v in pairs(Breakables.settings.ignoreList) do
|
||||
local name, _, _, _, _, _, _, _, _, texture = GetItemInfo(k)
|
||||
ret[k] = ("|T%s:0|t %s"):format(texture, name)
|
||||
if texture ~= nil and name ~= nil then
|
||||
ret[k] = ("|T%s:0|t %s"):format(texture, name)
|
||||
end
|
||||
end
|
||||
|
||||
return ret
|
||||
@ -617,41 +647,45 @@ function Breakables:GetOptions()
|
||||
end,
|
||||
order = 20,
|
||||
}
|
||||
opts.args.hideEqManagerItems = {
|
||||
type = "toggle",
|
||||
name = L["Hide Eq. Mgr items"],
|
||||
desc = L["Whether or not to hide items that are part of an equipment set in the game's equipment manager."],
|
||||
get = function(info)
|
||||
return self.settings.hideEqManagerItems
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.settings.hideEqManagerItems = v
|
||||
if info.uiType == "cmd" then
|
||||
print("|cff33ff99Breakables|r: set |cffffff78hideEqManagerItems|r to " .. tostring(self.settings.hideEqManagerItems))
|
||||
end
|
||||
self:FindBreakables()
|
||||
end,
|
||||
hidden = function()
|
||||
return not self.settings.showSoulbound
|
||||
end,
|
||||
order = 21,
|
||||
}
|
||||
opts.args.hideTabards = {
|
||||
type = "toggle",
|
||||
name = L["Hide Tabards"],
|
||||
desc = L["Whether or not to hide tabards from the disenchantable items list."],
|
||||
get = function(info)
|
||||
return self.settings.hideTabards
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.settings.hideTabards = v
|
||||
if info.uiType == "cmd" then
|
||||
print("|cff33ff99Breakables|r: set |cffffff78hideTabards|r to " .. tostring(self.settings.hideTabards))
|
||||
end
|
||||
self:FindBreakables()
|
||||
end,
|
||||
order = 22,
|
||||
}
|
||||
if GetNumEquipmentSets or C_EquipmentSet then
|
||||
opts.args.hideEqManagerItems = {
|
||||
type = "toggle",
|
||||
name = L["Hide Eq. Mgr items"],
|
||||
desc = L["Whether or not to hide items that are part of an equipment set in the game's equipment manager."],
|
||||
get = function(info)
|
||||
return self.settings.hideEqManagerItems
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.settings.hideEqManagerItems = v
|
||||
if info.uiType == "cmd" then
|
||||
print("|cff33ff99Breakables|r: set |cffffff78hideEqManagerItems|r to " .. tostring(self.settings.hideEqManagerItems))
|
||||
end
|
||||
self:FindBreakables()
|
||||
end,
|
||||
hidden = function()
|
||||
return not self.settings.showSoulbound
|
||||
end,
|
||||
order = 21,
|
||||
}
|
||||
end
|
||||
if WowVer >= 80000 then
|
||||
opts.args.hideTabards = {
|
||||
type = "toggle",
|
||||
name = L["Hide Tabards"],
|
||||
desc = L["Whether or not to hide tabards from the disenchantable items list."],
|
||||
get = function(info)
|
||||
return self.settings.hideTabards
|
||||
end,
|
||||
set = function(info, v)
|
||||
self.settings.hideTabards = v
|
||||
if info.uiType == "cmd" then
|
||||
print("|cff33ff99Breakables|r: set |cffffff78hideTabards|r to " .. tostring(self.settings.hideTabards))
|
||||
end
|
||||
self:FindBreakables()
|
||||
end,
|
||||
order = 22,
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
return opts
|
||||
@ -1047,7 +1081,8 @@ function Breakables:FindBreakablesInSlot(bagId, slotId)
|
||||
local texture, itemCount, locked, quality, readable = GetContainerItemInfo(bagId, slotId)
|
||||
if texture then
|
||||
local itemLink = GetContainerItemLink(bagId, slotId)
|
||||
if self.settings.ignoreList[self:GetItemIdFromLink(itemLink)] then
|
||||
local itemId = self:GetItemIdFromLink(itemLink)
|
||||
if self.settings.ignoreList[itemId] then
|
||||
return nil
|
||||
end
|
||||
|
||||
@ -1056,7 +1091,7 @@ function Breakables:FindBreakablesInSlot(bagId, slotId)
|
||||
self.myTooltip:SetBagItem(bagId, slotId)
|
||||
|
||||
if CanDisenchant and itemRarity and itemRarity >= RARITY_UNCOMMON and itemRarity < RARITY_HEIRLOOM
|
||||
and self:BreakableIsDisenchantable(itemType, itemLevel, itemRarity, itemLink) then
|
||||
and self:BreakableIsDisenchantable(itemType, itemLevel, itemRarity, itemLink, itemId) then
|
||||
local i = 1
|
||||
local soulbound = false
|
||||
for i=1,15 do
|
||||
@ -1071,7 +1106,7 @@ function Breakables:FindBreakablesInSlot(bagId, slotId)
|
||||
|
||||
local isInEquipmentSet = false
|
||||
if self.settings.hideEqManagerItems then
|
||||
isInEquipmentSet = self:IsInEquipmentSet(self:GetItemIdFromLink(itemLink))
|
||||
isInEquipmentSet = self:IsInEquipmentSet(itemId)
|
||||
end
|
||||
|
||||
local isTabard = false
|
||||
@ -1104,7 +1139,6 @@ function Breakables:FindBreakablesInSlot(bagId, slotId)
|
||||
end
|
||||
end
|
||||
|
||||
local itemId = self:GetItemIdFromLink(itemLink)
|
||||
if CanMill and not millable then
|
||||
for i=1,#AdditionalMillableItems do
|
||||
if AdditionalMillableItems[i] == itemId then
|
||||
@ -1206,13 +1240,26 @@ do
|
||||
end
|
||||
|
||||
function Breakables:IsInEquipmentSet(itemId)
|
||||
for setIdx=1, GetNumEquipmentSets() do
|
||||
local set = GetEquipmentSetInfo(setIdx)
|
||||
local itemArray = GetEquipmentSetItemIDs(set)
|
||||
if WowVer < 80000 and GetNumEquipmentSets then
|
||||
for setIdx=1, GetNumEquipmentSets() do
|
||||
local set = GetEquipmentSetInfo(setIdx)
|
||||
local itemArray = GetEquipmentSetItemIDs(set)
|
||||
|
||||
for i=1, EQUIPPED_LAST do
|
||||
if itemArray[i] and itemArray[i] == itemId then
|
||||
return true
|
||||
for i=1, EQUIPPED_LAST do
|
||||
if itemArray[i] and itemArray[i] == itemId then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
elseif C_EquipmentSet then
|
||||
local sets = C_EquipmentSet.GetEquipmentSetIDs()
|
||||
for k, v in ipairs(sets) do
|
||||
local itemArray = C_EquipmentSet.GetItemIDs(v)
|
||||
|
||||
for i=1, EQUIPPED_LAST do
|
||||
if itemArray[i] and itemArray[i] == itemId then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -1226,10 +1273,8 @@ function Breakables:GetItemIdFromLink(itemLink)
|
||||
end
|
||||
|
||||
function Breakables:MergeBreakables(foundBreakable, breakableList)
|
||||
local foundItemId = self:GetItemIdFromLink(foundBreakable[IDX_LINK])
|
||||
for n=1,#breakableList do
|
||||
local listItemId = self:GetItemIdFromLink(breakableList[n][IDX_LINK])
|
||||
if foundItemId == listItemId then
|
||||
if foundBreakable[IDX_LINK] == breakableList[n][IDX_LINK] then
|
||||
-- always prefer the larger stack
|
||||
if foundBreakable[IDX_COUNT] > breakableList[n][IDX_COUNT] then
|
||||
breakableList[n][IDX_BAG] = foundBreakable[IDX_BAG]
|
||||
@ -1257,9 +1302,14 @@ function Breakables:SortBreakables(foundBreakables)
|
||||
end
|
||||
end
|
||||
|
||||
function Breakables:BreakableIsDisenchantable(itemType, itemLevel, itemRarity, itemLink)
|
||||
function Breakables:BreakableIsDisenchantable(itemType, itemLevel, itemRarity, itemLink, itemId)
|
||||
for i=1,#DisenchantTypes do
|
||||
if DisenchantTypes[i] == itemType or IsArtifactRelicItem(itemLink) then
|
||||
-- temp hack for bfa until disenchant item level scales are identified. and for classic until finding the profession level api
|
||||
if WowVer >= 80000 or IsClassic then
|
||||
return true
|
||||
end
|
||||
|
||||
-- account for WoD and higher no longer needing specific ilvl. numbers from http://wow.gamepedia.com/Item_level
|
||||
if (itemRarity == RARITY_UNCOMMON and itemLevel >= 483)
|
||||
or (itemRarity == RARITY_RARE and itemLevel >= 515)
|
||||
@ -1355,5 +1405,11 @@ function Breakables:BreakableIsDisenchantable(itemType, itemLevel, itemRarity, i
|
||||
end
|
||||
end
|
||||
|
||||
for i=1,#AdditionalDisenchantableItems do
|
||||
if AdditionalDisenchantableItems[i] == itemId then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
|
@ -1,4 +1,4 @@
|
||||
## Interface: 70100
|
||||
## Interface: 80300
|
||||
## Author: Parnic
|
||||
## Name: Breakables
|
||||
## Title: Breakables |cff7fff7f-Ace3-|r
|
||||
@ -6,7 +6,7 @@
|
||||
## Version: @project-version@ (Revision: @project-revision@)
|
||||
## SavedVariables: BreakablesDB
|
||||
## OptionalDeps: Ace3, LibBabble-Inventory-3.0, Masque
|
||||
## X-Compatible-With: 60200
|
||||
## X-Compatible-With: 80200
|
||||
|
||||
#@no-lib-strip@
|
||||
embeds.xml
|
||||
|
@ -1,3 +1,38 @@
|
||||
v1.6.4:
|
||||
- Updated TOC for 8.3
|
||||
|
||||
v1.6.3:
|
||||
- (Classic) Made all items display as disenchantable whether you have the skill for it or not. I have not yet found the correct way to access the player's Enchanting profession level to check against item level for disenchant validity.
|
||||
|
||||
v1.6.2:
|
||||
- Added 8.2's lockboxes
|
||||
|
||||
v1.6.1:
|
||||
- Added patch 8.2's new herb and ore
|
||||
|
||||
v1.6:
|
||||
- Updated TOC for 8.2
|
||||
|
||||
v1.5.1:
|
||||
- Updated TOC for 8.1
|
||||
- Added Highmountain Armor as a disenchantable item
|
||||
|
||||
v1.5:
|
||||
- Updated TOC for 8.0
|
||||
- Added BfA herbs and ore
|
||||
- Fixed separate items sometimes showing up as one breakable
|
||||
- Added Leystone Lockbox
|
||||
|
||||
v1.4.9.1:
|
||||
- Added 7.3 herbs and ore
|
||||
|
||||
v1.4.9:
|
||||
- Updated TOC for 7.3
|
||||
|
||||
v1.4.8:
|
||||
- Fixed error in ignored items when the ignored item had not been loaded by the server since the last restart.
|
||||
- Updated TOC for 7.2
|
||||
|
||||
v1.4.7:
|
||||
- Fixed up milling herbs that the player knows Mass Milling for. Since Mass Mill is a profession ability and not a player ability/"spell", the addon can't currently automatically cast Mass Milling.
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
<Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
|
||||
<!--@non-debug@
|
||||
<Script file="libs\LibStub\LibStub.lua"/>
|
||||
<Script file="libs\CallbackHandler-1.0\CallbackHandler-1.0.lua"/>
|
||||
<Include file="libs\AceAddon-3.0\AceAddon-3.0.xml"/>
|
||||
@ -10,4 +11,5 @@
|
||||
<Include file="libs\AceEvent-3.0\AceEvent-3.0.xml"/>
|
||||
<Include file="libs\AceLocale-3.0\AceLocale-3.0.xml"/>
|
||||
<Include file="libs\LibBabble-Inventory-3.0\lib.xml"/>
|
||||
</Ui>
|
||||
@end-non-debug@-->
|
||||
</Ui>
|
||||
|
Reference in New Issue
Block a user