shaga/AtlasLoot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some crafted AR gear recipes, fixed overlapping tooltips

Browse Source
This commit is contained in:
Spit
2025-07-11 22:12:41 +03:00
parent 9de4d816df
commit 4529f2022a
4 changed files with 178 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/AtlasLoot.lua
+50 -27
View File
@@ -1377,7 +1377,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
if droprate and string.find(droprate, "%%") then itemButton.droprate = droprate end
end
itemButton:Show();
if MouseIsOver(itemButton) then
if GetMouseFocus() == itemButton then
itemButton:Hide()
itemButton:Show()
end
@@ -1852,7 +1852,7 @@ function AtlasLoot_NavButton_OnClick()
AtlasLootCharDB.LastBoss = this.lootpage;
AtlasLootCharDB.LastBossText = this.title;
AtlasLoot_ShowItemsFrame(this.lootpage, AtlasLootItemsFrame.refresh[2], this.title, AtlasLoot_AnchorPoint);
if AtlasLootDefaultFrame_SelectedTable:GetText()~=nil then
if AtlasLootDefaultFrame_SelectedTable:GetText()~=nil then
AtlasLootDefaultFrame_SelectedTable:SetText(AtlasLoot_BossName:GetText())
else
AtlasLootDefaultFrame_SelectedCategory:SetText(AtlasLoot_BossName:GetText())
@@ -2991,7 +2991,8 @@ function AtlasLootItem_OnEnter()
end
elseif isEnchant then
local spellID = tonumber(string.sub(this.itemID, 2));
AtlasLootTooltip:SetOwner(this, "ANCHOR_RIGHT", -(this:GetWidth() / 2), 24);
AtlasLootTooltip:SetOwner(this, "ANCHOR_NONE");
AtlasLootTooltip:SetPoint("BOTTOMLEFT", this, "TOPRIGHT", -(this:GetWidth() / 2), 24)
AtlasLootTooltip:ClearLines();
if SetAutoloot == nil or (SUPERWOW_VERSION and (tonumber(SUPERWOW_VERSION)) >= 1.2) then
AtlasLootTooltip:SetHyperlink("enchant:"..spellID)
@@ -3007,7 +3008,8 @@ function AtlasLootItem_OnEnter()
end
AtlasLootTooltip:Show();
if GetSpellInfoAtlasLootDB["enchants"][spellID]["item"] and GetSpellInfoAtlasLootDB["enchants"][spellID]["item"] ~= nil and GetSpellInfoAtlasLootDB["enchants"][spellID]["item"] ~= "" then
AtlasLootTooltip2:SetOwner(AtlasLootTooltip, "ANCHOR_BOTTOMRIGHT", -(AtlasLootTooltip:GetWidth()), 0);
AtlasLootTooltip2:SetOwner(this, "ANCHOR_NONE");
AtlasLootTooltip2:SetPoint("TOPLEFT", AtlasLootTooltip, "BOTTOMLEFT", 0, 0)
AtlasLootTooltip2:ClearLines();
AtlasLootTooltip2:SetHyperlink("item:"..GetSpellInfoAtlasLootDB["enchants"][spellID]["item"]..":0:0:0");
if GetSpellInfoAtlasLootDB["enchants"][spellID]["extra"] and GetSpellInfoAtlasLootDB["enchants"][spellID]["extra"] ~= nil and GetSpellInfoAtlasLootDB["enchants"][spellID]["extra"] ~= "" then
@@ -3017,6 +3019,13 @@ function AtlasLootItem_OnEnter()
AtlasLootTooltip2:AddLine(AL["ItemID:"].." "..GetSpellInfoAtlasLootDB["enchants"][spellID]["item"], nil, nil, nil, 1);
end
AtlasLootTooltip2:Show();
-- Reposition if tooltips overlap
if AtlasLootTooltip:GetBottom() < AtlasLootTooltip2:GetTop() then
AtlasLootTooltip2:ClearAllPoints()
AtlasLootTooltip2:SetPoint("TOPLEFT", this, "TOPRIGHT", -(this:GetWidth() / 2), 24)
AtlasLootTooltip:ClearAllPoints()
AtlasLootTooltip:SetPoint("BOTTOMLEFT", AtlasLootTooltip2, "TOPLEFT", 0, 0)
end
end
elseif isSpell then
local spellID = tonumber(string.sub(this.itemID, 2));
@@ -3035,7 +3044,8 @@ function AtlasLootItem_OnEnter()
end
TooltipReagents = string.sub(TooltipReagents, 1, -3)
end
AtlasLootTooltip:SetOwner(this, "ANCHOR_RIGHT", -(this:GetWidth() / 2), 24);
AtlasLootTooltip:SetOwner(this, "ANCHOR_NONE");
AtlasLootTooltip:SetPoint("BOTTOMLEFT", this, "TOPRIGHT", -(this:GetWidth() / 2), 24)
AtlasLootTooltip:ClearLines();
AtlasLootTooltip:AddLine(GetSpellInfoAtlasLootDB["craftspells"][spellID]["name"]);
AtlasLootTooltip:AddLine(WHITE..GetSpellInfoAtlasLootDB["craftspells"][spellID]["castTime"].." sec cast");
@@ -3068,7 +3078,8 @@ function AtlasLootItem_OnEnter()
AtlasLootTooltip:Show();
local craftitem2 = GetSpellInfoAtlasLootDB["craftspells"][spellID]["craftItem"]
if craftitem2 ~= nil and craftitem2 ~= "" then
AtlasLootTooltip2:SetOwner(AtlasLootTooltip, "ANCHOR_BOTTOMRIGHT", -(AtlasLootTooltip:GetWidth()), 0);
AtlasLootTooltip2:SetOwner(this, "ANCHOR_NONE");
AtlasLootTooltip2:SetPoint("TOPLEFT", AtlasLootTooltip, "BOTTOMLEFT", 0, 0)
AtlasLootTooltip2:ClearLines();
AtlasLootTooltip2:SetHyperlink("item:"..GetSpellInfoAtlasLootDB["craftspells"][spellID]["craftItem"]..":0:0:0");
if GetSpellInfoAtlasLootDB["craftspells"][spellID]["extra"] and GetSpellInfoAtlasLootDB["craftspells"][spellID]["extra"] ~= nil then
@@ -3078,6 +3089,13 @@ function AtlasLootItem_OnEnter()
AtlasLootTooltip2:AddLine(AL["ItemID:"].." "..GetSpellInfoAtlasLootDB["craftspells"][spellID]["craftItem"], nil, nil, nil, 1);
end
AtlasLootTooltip2:Show();
-- Reposition if tooltips overlap
if AtlasLootTooltip:GetBottom() < AtlasLootTooltip2:GetTop() then
AtlasLootTooltip2:ClearAllPoints()
AtlasLootTooltip2:SetPoint("TOPLEFT", this, "TOPRIGHT", -(this:GetWidth() / 2), 24)
AtlasLootTooltip:ClearAllPoints()
AtlasLootTooltip:SetPoint("BOTTOMLEFT", AtlasLootTooltip2, "TOPLEFT", 0, 0)
end
end
end
end
@@ -3088,26 +3106,31 @@ end
-- Called when the mouse cursor leaves a loot item
--------------------------------------------------------------------------------
function AtlasLootItem_OnLeave()
--Hide the necessary tooltips
if( AtlasLootCharDB.LootlinkTT ) then
AtlasLootTooltip:Hide();
AtlasLootTooltip2:Hide();
elseif( AtlasLootCharDB.ItemSyncTT ) then
if(GameTooltip:IsVisible()) then
GameTooltip:Hide();
AtlasLootTooltip2:Hide();
end
else
if(this.itemID ~= nil) then
AtlasLootTooltip:Hide();
GameTooltip:Hide();
AtlasLootTooltip2:Hide();
end
end
if ( ShoppingTooltip2:IsVisible() or ShoppingTooltip1.IsVisible) then
ShoppingTooltip2:Hide();
ShoppingTooltip1:Hide();
end
-- --Hide the necessary tooltips
-- if( AtlasLootCharDB.LootlinkTT ) then
-- AtlasLootTooltip:Hide();
-- AtlasLootTooltip2:Hide();
-- elseif( AtlasLootCharDB.ItemSyncTT ) then
-- if(GameTooltip:IsVisible()) then
-- GameTooltip:Hide();
-- AtlasLootTooltip2:Hide();
-- end
-- else
-- if(this.itemID ~= nil) then
-- AtlasLootTooltip:Hide();
-- GameTooltip:Hide();
-- AtlasLootTooltip2:Hide();
-- end
-- end
-- if ( ShoppingTooltip2:IsVisible() or ShoppingTooltip1.IsVisible) then
-- ShoppingTooltip2:Hide();
-- ShoppingTooltip1:Hide();
-- end
AtlasLootTooltip:Hide();
AtlasLootTooltip2:Hide();
GameTooltip:Hide();
ShoppingTooltip1:Hide();
ShoppingTooltip2:Hide();
end
--------------------------------------------------------------------------------
@@ -3414,7 +3437,7 @@ function AtlasLoot_AddContainerItemTooltip(frame ,itemID)
local numLines = AtlasLootTooltip:NumLines()
if AtlasLootCharDB.ItemIDs then
if numLines and numLines > 0 then
local lastLine = getglobal("AtlasLootTooltipTextLeft"..numLines)
local lastLine = getglobal("AtlasLootTooltipTextLeft"..numLines)
if lastLine:GetText() then
lastLine:SetText(lastLine:GetText().."\n\n"..DEFAULT..AL["ItemID:"].." "..itemID)
end
Core/Spells.lua
+64 -64
View File
@@ -654,35 +654,35 @@ GetSpellInfoAtlasLootDB = {
["name"] = "Eternal Dreamstone Shard",
["icon"] = "Interface\\Icons\\inv_misc_gem_pearl_04",
},
[57127] = {
[57127] = {
["name"] = "Enchant Boots - Superior Stamina",
["icon"] = "Interface\\Icons\\Spell_Holy_GreaterHeal",
},
[57148] = {
[57148] = {
["name"] = "Enchant Boots - Vampirism",
["icon"] = "Interface\\Icons\\Spell_Holy_GreaterHeal",
},
[57144] = {
[57144] = {
["name"] = "Enchant Bracer - Greater Deflection",
["icon"] = "Interface\\Icons\\Spell_Holy_GreaterHeal",
},
[57119] = {
[57119] = {
["name"] = "Enchant Chest - Mighty Mana",
["icon"] = "Interface\\Icons\\Spell_Holy_GreaterHeal",
},
[57117] = {
[57117] = {
["name"] = "Enchant Cloak - Greater Arcane Resistance",
["icon"] = "Interface\\Icons\\Spell_Holy_GreaterHeal",
},
[46601] = {
[46601] = {
["name"] = "Enchant Gloves - Arcane Power",
["icon"] = "Interface\\Icons\\Spell_Holy_GreaterHeal",
},
[46602] = {
[46602] = {
["name"] = "Enchant Gloves - Nature Power",
["icon"] = "Interface\\Icons\\Spell_Holy_GreaterHeal",
},
[46086] = {
[46086] = {
["name"] = "Enchant Gloves - Major Strength",
["icon"] = "Interface\\Icons\\Spell_Holy_GreaterHeal",
},
@@ -6224,7 +6224,7 @@ GetSpellInfoAtlasLootDB = {
[3] = {7910, 2},
[4] = {14341, 2},
},
},
},
[57024] = {
["name"] = "Tailoring: Windbinder Gloves",
["requires"] = "",
@@ -12504,7 +12504,7 @@ GetSpellInfoAtlasLootDB = {
["reagents"] = {
[1] = {2841, 4},
},
},
},
[3491] = {
["name"] = "Blacksmithing: Big Bronze Knife",
["requires"] = AL["Anvil"],
@@ -13299,128 +13299,128 @@ GetSpellInfoAtlasLootDB = {
[4] = {12810, 2},
},
},
[55526] = {
[57617] = {
["name"] = "Blacksmithing: Otherworldly Coif",
["requires"] = AL["Anvil"],
["tools"] = {5956},
["castTime"] = 60,
["castTime"] = 5.125,
["text"] = "",
["craftItem"] = 55526,
["craftQuantityMin"] = "",
["craftQuantityMax"] = "",
["reagents"] = {
[1] = {12359, 6},
[2] = {12655, 1},
[3] = {12360, 1},
[1] = {15407, 1},
[2] = {12360, 1},
[3] = {61673, 6},
[4] = {12607, 1},
},
},
[55527] = {
[57619] = {
["name"] = "Blacksmithing: Otherworldly Spaulders",
["requires"] = AL["Anvil"],
["tools"] = {5956},
["castTime"] = 60,
["castTime"] = 5.125,
["text"] = "",
["craftItem"] = 55527,
["craftQuantityMin"] = "",
["craftQuantityMax"] = "",
["reagents"] = {
[1] = {12359, 5},
[2] = {12655, 1},
[3] = {12360, 1},
[1] = {15407, 1},
[2] = {12360, 1},
[3] = {61673, 6},
[4] = {12607, 3},
},
},
[55528] = {
[57621] = {
["name"] = "Blacksmithing: Otherworldly Breastplate",
["requires"] = AL["Anvil"],
["tools"] = {5956},
["castTime"] = 60,
["castTime"] = 5.125,
["text"] = "",
["craftItem"] = 55528,
["craftQuantityMin"] = "",
["craftQuantityMax"] = "",
["reagents"] = {
[1] = {12359, 6},
[2] = {12655, 1},
[3] = {12360, 2},
[1] = {15407, 2},
[2] = {12360, 1},
[3] = {61673, 6},
[4] = {12607, 2},
},
},
[55529] = {
[57623] = {
["name"] = "Blacksmithing: Otherworldly Leggings",
["requires"] = AL["Anvil"],
["tools"] = {5956},
["castTime"] = 60,
["castTime"] = 5.125,
["text"] = "",
["craftItem"] = 55529,
["craftQuantityMin"] = "",
["craftQuantityMax"] = "",
["reagents"] = {
[1] = {12359, 7},
[2] = {12655, 1},
[3] = {12360, 2},
[1] = {15407, 2},
[2] = {12360, 1},
[3] = {61673, 7},
[4] = {12607, 2},
},
},
[55530] = {
[57625] = {
["name"] = "Blacksmithing: Reflective Helmet",
["requires"] = AL["Anvil"],
["tools"] = {5956},
["castTime"] = 60,
["castTime"] = 5.125,
["text"] = "",
["craftItem"] = 55530,
["craftQuantityMin"] = "",
["craftQuantityMax"] = "",
["reagents"] = {
[1] = {12359, 6},
[2] = {12360, 2},
[3] = {12655, 7},
[1] = {12360, 2},
[2] = {12655, 7},
[3] = {61673, 6},
},
},
[55531] = {
[57627] = {
["name"] = "Blacksmithing: Reflective Pauldrons",
["requires"] = AL["Anvil"],
["tools"] = {5956},
["castTime"] = 60,
["castTime"] = 5.125,
["text"] = "",
["craftItem"] = 55531,
["craftQuantityMin"] = "",
["craftQuantityMax"] = "",
["reagents"] = {
[1] = {12359, 7},
[2] = {12360, 2},
[3] = {12655, 9},
[1] = {12360, 2},
[2] = {12655, 9},
[3] = {61673, 7},
},
},
[55532] = {
[57629] = {
["name"] = "Blacksmithing: Reflective Breastplate",
["requires"] = AL["Anvil"],
["tools"] = {5956},
["castTime"] = 60,
["castTime"] = 5.125,
["text"] = "",
["craftItem"] = 55532,
["craftQuantityMin"] = "",
["craftQuantityMax"] = "",
["reagents"] = {
[1] = {12359, 5},
[2] = {12360, 2},
[3] = {12655, 10},
[1] = {12360, 2},
[2] = {12655, 10},
[3] = {61673, 5},
},
},
[55533] = {
[57631] = {
["name"] = "Blacksmithing: Reflective Leggings",
["requires"] = AL["Anvil"],
["tools"] = {5956},
["castTime"] = 60,
["castTime"] = 5.125,
["text"] = "",
["craftItem"] = 55533,
["craftQuantityMin"] = "",
["craftQuantityMax"] = "",
["reagents"] = {
[1] = {12359, 7},
[2] = {12360, 2},
[3] = {12655, 12},
[1] = {12360, 2},
[2] = {12655, 12},
[3] = {61673, 7},
},
},
[15296] = {
@@ -15488,7 +15488,7 @@ GetSpellInfoAtlasLootDB = {
[5] = {12644, 8},
[6] = {12800, 2},
},
},
},
[16654] = {
["name"] = "Blacksmithing: Radiant Gloves",
["requires"] = AL["Anvil"],
@@ -18982,7 +18982,7 @@ GetSpellInfoAtlasLootDB = {
[3] = {7082, 2},
[4] = {7076},
},
},
},
[24850] = {
["name"] = "Leatherworking: Sandstalker Gauntlets",
["requires"] = "",
@@ -19046,11 +19046,11 @@ GetSpellInfoAtlasLootDB = {
[4] = {15407},
},
},
[55522] = {
["name"] = "Leatherworking: Etheral Helmet",
[57609] = {
["name"] = "Leatherworking: Ethereal Helmet",
["requires"] = "",
["tools"] = "",
["castTime"] = 60,
["castTime"] = 5.125,
["text"] = "",
["craftItem"] = 55522,
["craftQuantityMin"] = "",
@@ -19062,11 +19062,11 @@ GetSpellInfoAtlasLootDB = {
[4] = {14227, 1},
},
},
[55523] = {
["name"] = "Leatherworking: Etheral Shoulder Pads",
[57611] = {
["name"] = "Leatherworking: Ethereal Shoulder Pads",
["requires"] = "",
["tools"] = "",
["castTime"] = 60,
["castTime"] = 5.125,
["text"] = "",
["craftItem"] = 55523,
["craftQuantityMin"] = "",
@@ -19078,11 +19078,11 @@ GetSpellInfoAtlasLootDB = {
[4] = {14227, 2},
},
},
[55524] = {
["name"] = "Leatherworking: Etheral Tunic",
[57613] = {
["name"] = "Leatherworking: Ethereal Tunic",
["requires"] = "",
["tools"] = "",
["castTime"] = 60,
["castTime"] = 5.125,
["text"] = "",
["craftItem"] = 55524,
["craftQuantityMin"] = "",
@@ -19094,11 +19094,11 @@ GetSpellInfoAtlasLootDB = {
[4] = {14227, 1},
},
},
[55525] = {
["name"] = "Leatherworking: Etheral Leggings",
[57615] = {
["name"] = "Leatherworking: Ethereal Leggings",
["requires"] = "",
["tools"] = "",
["castTime"] = 60,
["castTime"] = 5.125,
["text"] = "",
["craftItem"] = 55525,
["craftQuantityMin"] = "",