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

support quantity display for items

Browse Source
This commit is contained in:
Spit
2026-07-09 11:50:39 +03:00
parent f522eed87d
commit b301b6b24e
4 changed files with 382 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/AtlasLoot.lua
+14 -11
View File
@@ -1727,7 +1727,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss)
end end
text = AtlasLoot_FixText(dataSource[dataID][i][3]) text = AtlasLoot_FixText(dataSource[dataID][i][3])
end end
quantity:SetText("") quantity:SetText(dataSource[dataID][i][8])
itemButton.dressingroomID = dataSource[dataID][i][1] itemButton.dressingroomID = dataSource[dataID][i][1]
elseif isEnchant then elseif isEnchant then
local spellID = tonumber(string.sub(dataSource[dataID][i][1], 2)) local spellID = tonumber(string.sub(dataSource[dataID][i][1], 2))
@@ -1854,16 +1854,19 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss)
_G["AtlasLootItem_"..i.."_PriceIcon"..j]:Hide() _G["AtlasLootItem_"..i.."_PriceIcon"..j]:Hide()
end end
local index = 1 local index = 1
for j = 6, 14, 2 do local prices = dataSource[dataID][i][6]
local pricetext = _G["AtlasLootItem_"..i.."_PriceText"..index] if type(prices) == "table" then
local priceicon = _G["AtlasLootItem_"..i.."_PriceIcon"..index] for j = 1, getn(prices), 2 do
if dataSource[dataID][i][j] and dataSource[dataID][i][j] ~= "" then local pricetext = _G["AtlasLootItem_"..i.."_PriceText"..index]
pricetext:SetText(dataSource[dataID][i][j]) local priceicon = _G["AtlasLootItem_"..i.."_PriceIcon"..index]
priceicon:SetTexture(AtlasLoot_FixText(dataSource[dataID][i][j + 1])) if prices[j] and prices[j + 1] and prices[j] ~= "" and prices[j + 1] ~= "" then
pricetext:Show() pricetext:SetText(prices[j])
priceicon:Show() priceicon:SetTexture(AtlasLoot_FixText(prices[j + 1]))
pricetext:Show()
priceicon:Show()
end
index = index + 1
end end
index = index + 1
end end
if (dataID == "SearchResult" or dataID == "WishList") and dataSource[dataID][i][5] then if (dataID == "SearchResult" or dataID == "WishList") and dataSource[dataID][i][5] then
local _, _, wishDataID, wishDataSource = strfind(dataSource[dataID][i][5], "(.+)|(.+)") local _, _, wishDataID, wishDataSource = strfind(dataSource[dataID][i][5], "(.+)|(.+)")
@@ -1906,7 +1909,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss)
itemButton.itemID = dataSource[dataID][i][1] itemButton.itemID = dataSource[dataID][i][1]
itemButton.itemIDName = dataSource[dataID][i][3] itemButton.itemIDName = dataSource[dataID][i][3]
itemButton.itemIDExtra = dataSource[dataID][i][4] itemButton.itemIDExtra = dataSource[dataID][i][4]
itemButton.container = dataSource[dataID][i][16] itemButton.container = dataSource[dataID][i][7]
if type(itemButton.container) == "table" then if type(itemButton.container) == "table" then
iconBorder:SetVertexColor(1, 0.82, 0) iconBorder:SetVertexColor(1, 0.82, 0)
for row = 1, getn(itemButton.container) do for row = 1, getn(itemButton.container) do
Database/Factions.lua
+30 -30
View File
@@ -205,9 +205,9 @@ AtlasLoot_Data["AtlasLootRepItems"] = {
{ 0, "", "", "" }, { 0, "", "", "" },
{ 0, "", "", "" }, { 0, "", "", "" },
{ 0, "", "", "" }, { 0, "", "", "" },
{ 21187, "INV_Misc_Cape_07", "=q3=Earthweave Cloak", "=ds=#s4#", "", "", "", "5", "#ccombat#", "3", "#clogistics#", "7", "#ctactical#" }, { 21187, "INV_Misc_Cape_07", "=q3=Earthweave Cloak", "=ds=#s4#", "", { "", "", "5", "#ccombat#", "3", "#clogistics#", "7", "#ctactical#" } },
{ 21178, "INV_Gauntlets_18", "=q3=Gloves of Earthen Power", "=ds=#s9#, #a2#", "", "", "", "5", "#ccombat#", "3", "#clogistics#", "7", "#ctactical#" }, { 21178, "INV_Gauntlets_18", "=q3=Gloves of Earthen Power", "=ds=#s9#, #a2#", "", { "", "", "5", "#ccombat#", "3", "#clogistics#", "7", "#ctactical#" } },
{ 21179, "INV_Jewelry_Ring_18", "=q3=Band of Earthen Wrath", "=ds=#s13#", "", "", "", "5", "#ccombat#", "3", "#clogistics#", "7", "#ctactical#" }, { 21179, "INV_Jewelry_Ring_18", "=q3=Band of Earthen Wrath", "=ds=#s13#", "", { "", "", "5", "#ccombat#", "3", "#clogistics#", "7", "#ctactical#" } },
}, },
Cenarion2 = { Cenarion2 = {
{ 0, "", "", "" }, { 0, "", "", "" },
@@ -226,9 +226,9 @@ AtlasLoot_Data["AtlasLootRepItems"] = {
{ 0, "", "", "" }, { 0, "", "", "" },
{ 0, "", "", "" }, { 0, "", "", "" },
{ 0, "", "", "" }, { 0, "", "", "" },
{ 21183, "INV_Chest_Cloth_06", "=q3=Earthpower Vest", "=ds=#s5#, #a1#", "", "", "", "7", "#ccombat#", "4", "#clogistics#", "4", "#ctactical#" }, { 21183, "INV_Chest_Cloth_06", "=q3=Earthpower Vest", "=ds=#s5#, #a1#", "", { "", "", "7", "#ccombat#", "4", "#clogistics#", "4", "#ctactical#" } },
{ 21182, "INV_Jewelry_Ring_19", "=q3=Band of Earthen Might", "=ds=#s13#", "", "", "", "7", "#ccombat#", "4", "#clogistics#", "4", "#ctactical#" }, { 21182, "INV_Jewelry_Ring_19", "=q3=Band of Earthen Might", "=ds=#s13#", "", { "", "", "7", "#ccombat#", "4", "#clogistics#", "4", "#ctactical#" } },
{ 21181, "INV_Misc_Herb_02", "=q3=Grace of Earth", "=ds=#s14#", "", "", "", "7", "#ccombat#", "4", "#clogistics#", "4", "#ctactical#" }, { 21181, "INV_Misc_Herb_02", "=q3=Grace of Earth", "=ds=#s14#", "", { "", "", "7", "#ccombat#", "4", "#clogistics#", "4", "#ctactical#" } },
}, },
Cenarion3 = { Cenarion3 = {
{ 0, "", "", "" }, { 0, "", "", "" },
@@ -247,10 +247,10 @@ AtlasLoot_Data["AtlasLootRepItems"] = {
{ 0, "", "", "" }, { 0, "", "", "" },
{ 0, "", "", "" }, { 0, "", "", "" },
{ 0, "", "", "" }, { 0, "", "", "" },
{ 21186, "INV_Bracer_12", "=q4=Rockfury Bracers", "=ds=#s8#, #a1#", "", "", "", "15", "#ccombat#", "20", "#clogistics#", "17", "#ctactical#", "1", "#cremulos#" }, { 21186, "INV_Bracer_12", "=q4=Rockfury Bracers", "=ds=#s8#, #a1#", "", { "", "", "15", "#ccombat#", "20", "#clogistics#", "17", "#ctactical#", "1", "#cremulos#" } },
{ 21184, "INV_Bracer_07", "=q4=Deeprock Bracers", "=ds=#s8#, #a4#", "", "", "", "15", "#ccombat#", "20", "#clogistics#", "17", "#ctactical#", "1", "#cremulos#" }, { 21184, "INV_Bracer_07", "=q4=Deeprock Bracers", "=ds=#s8#, #a4#", "", { "", "", "15", "#ccombat#", "20", "#clogistics#", "17", "#ctactical#", "1", "#cremulos#" } },
{ 21189, "INV_Jewelry_Ring_41", "=q4=Might of Cenarius", "=ds=#s13#", "", "", "", "15", "#ccombat#", "20", "#clogistics#", "17", "#ctactical#", "1", "#cremulos#" }, { 21189, "INV_Jewelry_Ring_41", "=q4=Might of Cenarius", "=ds=#s13#", "", { "", "", "15", "#ccombat#", "20", "#clogistics#", "17", "#ctactical#", "1", "#cremulos#" } },
{ 21185, "INV_Misc_Gem_Pearl_06", "=q4=Earthcalm Orb", "=ds=#s15#", "", "", "", "15", "#ccombat#", "20", "#clogistics#", "17", "#ctactical#", "1", "#cremulos#" }, { 21185, "INV_Misc_Gem_Pearl_06", "=q4=Earthcalm Orb", "=ds=#s15#", "", { "", "", "15", "#ccombat#", "20", "#clogistics#", "17", "#ctactical#", "1", "#cremulos#" } },
}, },
Cenarion4 = { Cenarion4 = {
{ 0, "", "", "" }, { 0, "", "", "" },
@@ -269,9 +269,9 @@ AtlasLoot_Data["AtlasLootRepItems"] = {
{ 0, "", "", "" }, { 0, "", "", "" },
{ 0, "", "", "" }, { 0, "", "", "" },
{ 0, "", "", "" }, { 0, "", "", "" },
{ 21190, "INV_Jewelry_Ring_40", "=q4=Wrath of Cenarius", "=ds=#s13#", "", "", "", "15", "#ccombat#", "20", "#clogistics#", "20", "#ctactical#", "1", "#ccenarius#" }, { 21190, "INV_Jewelry_Ring_40", "=q4=Wrath of Cenarius", "=ds=#s13#", "", { "", "", "15", "#ccombat#", "20", "#clogistics#", "20", "#ctactical#", "1", "#ccenarius#" } },
{ 21180, "Spell_Nature_AbolishMagic", "=q4=Earthstrike", "=ds=#s14#", "", "", "", "15", "#ccombat#", "20", "#clogistics#", "20", "#ctactical#", "1", "#ccenarius#" }, { 21180, "Spell_Nature_AbolishMagic", "=q4=Earthstrike", "=ds=#s14#", "", { "", "", "15", "#ccombat#", "20", "#clogistics#", "20", "#ctactical#", "1", "#ccenarius#" } },
{ 21188, "INV_Hammer_23", "=q4=Fist of Cenarius", "=ds=#h2#, #w6#", "", "", "", "15", "#ccombat#", "20", "#clogistics#", "20", "#ctactical#", "1", "#ccenarius#" }, { 21188, "INV_Hammer_23", "=q4=Fist of Cenarius", "=ds=#h2#, #w6#", "", { "", "", "15", "#ccombat#", "20", "#clogistics#", "20", "#ctactical#", "1", "#ccenarius#" } },
}, },
Darkmoon = { Darkmoon = {
{ 0, "", "", "" }, { 0, "", "", "" },
@@ -279,15 +279,15 @@ AtlasLoot_Data["AtlasLootRepItems"] = {
{ 19289, "INV_Misc_Ticket_Tarot_Maelstrom_01", "=q4=Darkmoon Card: Maelstrom", "=ds=#s14#" }, { 19289, "INV_Misc_Ticket_Tarot_Maelstrom_01", "=q4=Darkmoon Card: Maelstrom", "=ds=#s14#" },
{ 19287, "INV_Misc_Ticket_Tarot_Heroism_01", "=q4=Darkmoon Card: Heroism", "=ds=#s14#" }, { 19287, "INV_Misc_Ticket_Tarot_Heroism_01", "=q4=Darkmoon Card: Heroism", "=ds=#s14#" },
{ 19290, "INV_Misc_Ticket_Tarot_TwistingNether_01", "=q4=Darkmoon Card: Twisting Nether", "=ds=#s14#" }, { 19290, "INV_Misc_Ticket_Tarot_TwistingNether_01", "=q4=Darkmoon Card: Twisting Nether", "=ds=#s14#" },
{ 19491, "INV_Jewelry_Necklace_14", "=q4=Amulet of the Darkmoon", "=ds=#s2#", "", "1200", "#darkmoon#" }, { 19491, "INV_Jewelry_Necklace_14", "=q4=Amulet of the Darkmoon", "=ds=#s2#", "", { "1200", "#darkmoon#" } },
{ 19426, "INV_Jewelry_Necklace_16", "=q4=Orb of the Darkmoon", "=ds=#s2#", "", "1200", "#darkmoon#" }, { 19426, "INV_Jewelry_Necklace_16", "=q4=Orb of the Darkmoon", "=ds=#s2#", "", { "1200", "#darkmoon#" } },
{ 19296, "INV_Misc_Bag_21", "=q2=Greater Darkmoon Prize", "", "", "40", "#darkmoon#" }, { 19296, "INV_Misc_Bag_21", "=q2=Greater Darkmoon Prize", "", "", { "40", "#darkmoon#" } },
{ 19297, "INV_Misc_Bag_07_Black", "=q2=Lesser Darkmoon Prize", "", "", "12", "#darkmoon#" }, { 19297, "INV_Misc_Bag_07_Black", "=q2=Lesser Darkmoon Prize", "", "", { "12", "#darkmoon#" } },
{ 19298, "INV_Misc_Bag_04", "=q2=Minor Darkmoon Prize", "", "", "5", "#darkmoon#" }, { 19298, "INV_Misc_Bag_04", "=q2=Minor Darkmoon Prize", "", "", { "5", "#darkmoon#" } },
{ 19291, "INV_Box_04", "=q1=Darkmoon Storage Box", "", "", "50", "#darkmoon#" }, { 19291, "INV_Box_04", "=q1=Darkmoon Storage Box", "", "", { "50", "#darkmoon#" } },
{ 19293, "INV_Misc_Food_18", "=q1=Last Year's Mutton", "", "", "50", "#darkmoon#" }, { 19293, "INV_Misc_Food_18", "=q1=Last Year's Mutton", "", "", { "50", "#darkmoon#" } },
{ 19292, "INV_Misc_Food_18", "=q1=Last Month's Mutton", "", "", "10", "#darkmoon#" }, { 19292, "INV_Misc_Food_18", "=q1=Last Month's Mutton", "", "", { "10", "#darkmoon#" } },
{ 19295, "INV_Misc_Herb_19", "=q1=Darkmoon Flower", "", "", "5", "#darkmoon#" }, { 19295, "INV_Misc_Herb_19", "=q1=Darkmoon Flower", "", "", { "5", "#darkmoon#" } },
}, },
Zandalar1 = { Zandalar1 = {
{ 0, "", "", "" }, { 0, "", "", "" },
@@ -316,14 +316,14 @@ AtlasLoot_Data["AtlasLootRepItems"] = {
{ 19780, "INV_Scroll_03", "=q1=Plans: Darksoul Leggings", "=ds=#p2# (300)" }, { 19780, "INV_Scroll_03", "=q1=Plans: Darksoul Leggings", "=ds=#p2# (300)" },
{ 20014, "INV_Scroll_03", "=q1=Recipe: Major Troll's Blood Potion", "=ds=#p1# (290)" }, { 20014, "INV_Scroll_03", "=q1=Recipe: Major Troll's Blood Potion", "=ds=#p1# (290)" },
{ 20756, "INV_Misc_Note_01", "=q1=Formula: Brilliant Wizard Oil", "=ds=#p4# (300)" }, { 20756, "INV_Misc_Note_01", "=q1=Formula: Brilliant Wizard Oil", "=ds=#p4# (300)" },
{ 20031, "INV_Misc_Food_42", "=q1=Essence Mango", "=ds=#e2#", "", "1", "#zandalar#" }, { 20031, "INV_Misc_Food_42", "=q1=Essence Mango", "=ds=#e2#", "", { "1", "#zandalar#" } },
}, },
Zandalar2 = { Zandalar2 = {
{ 0, "", "", "" }, { 0, "", "", "" },
{ 0, "INV_Misc_Coin_08", "=q6=#r4#", "" }, { 0, "INV_Misc_Coin_08", "=q6=#r4#", "" },
{ 20080, "INV_Potion_29", "=q2=Sheen of Zanza", "=ds=#e1#", "", "3", "#zandalar#" }, { 20080, "INV_Potion_29", "=q2=Sheen of Zanza", "=ds=#e1#", "", { "3", "#zandalar#" } },
{ 20079, "INV_Potion_30", "=q2=Spirit of Zanza", "=ds=#e1#", "", "3", "#zandalar#" }, { 20079, "INV_Potion_30", "=q2=Spirit of Zanza", "=ds=#e1#", "", { "3", "#zandalar#" } },
{ 20081, "INV_Potion_31", "=q2=Swiftness of Zanza", "=ds=#e1#", "", "3", "#zandalar#" }, { 20081, "INV_Potion_31", "=q2=Swiftness of Zanza", "=ds=#e1#", "", { "3", "#zandalar#" } },
{ 19764, "INV_Scroll_03", "=q1=Pattern: Bloodvine Vest", "=ds=#p8# (300)" }, { 19764, "INV_Scroll_03", "=q1=Pattern: Bloodvine Vest", "=ds=#p8# (300)" },
{ 19769, "INV_Scroll_03", "=q1=Pattern: Primal Batskin Jerkin", "=ds=#p7# (300)" }, { 19769, "INV_Scroll_03", "=q1=Pattern: Primal Batskin Jerkin", "=ds=#p7# (300)" },
{ 19772, "INV_Scroll_03", "=q1=Pattern: Blood Tiger Breastplate", "=ds=#p7# (300)" }, { 19772, "INV_Scroll_03", "=q1=Pattern: Blood Tiger Breastplate", "=ds=#p7# (300)" },
@@ -336,10 +336,10 @@ AtlasLoot_Data["AtlasLootRepItems"] = {
{ 0, "", "", "" }, { 0, "", "", "" },
{ 0, "", "", "" }, { 0, "", "", "" },
{ 0, "INV_Misc_Coin_08", "=q6=#r5#", "" }, { 0, "INV_Misc_Coin_08", "=q6=#r5#", "" },
{ 20077, "INV_Misc_ArmorKit_08", "=q3=Zandalar Signet of Might", "=ds=#s3# #e11#", "", "", "", "", "", "15", "#zandalar#" }, { 20077, "INV_Misc_ArmorKit_08", "=q3=Zandalar Signet of Might", "=ds=#s3# #e11#", "", { "", "", "", "", "15", "#zandalar#" } },
{ 20076, "INV_Jewelry_Ring_46", "=q3=Zandalar Signet of Mojo", "=ds=#s3# #e11#", "", "", "", "", "", "15", "#zandalar#" }, { 20076, "INV_Jewelry_Ring_46", "=q3=Zandalar Signet of Mojo", "=ds=#s3# #e11#", "", { "", "", "", "", "15", "#zandalar#" } },
{ 20078, "Spell_Holy_PowerWordShield", "=q3=Zandalar Signet of Serenity", "=ds=#s3# #e11#", "", "", "", "", "", "15", "#zandalar#" }, { 20078, "Spell_Holy_PowerWordShield", "=q3=Zandalar Signet of Serenity", "=ds=#s3# #e11#", "", { "", "", "", "", "15", "#zandalar#" } },
{ 65033, "spell_holy_devotionaura", "=q3=Zandalar Signet of Tenacity", "=ds=#s3# #e11#", "", "", "", "", "", "15", "#zandalar#" }, { 65033, "spell_holy_devotionaura", "=q3=Zandalar Signet of Tenacity", "=ds=#s3# #e11#", "", { "", "", "", "", "15", "#zandalar#" } },
{ 20013, "INV_Scroll_03", "=q1=Recipe: Living Action Potion", "=ds=#p1# (285)" }, { 20013, "INV_Scroll_03", "=q1=Recipe: Living Action Potion", "=ds=#p1# (285)" },
}, },
Wintersaber1 = { Wintersaber1 = {
Database/Instances.lua
+324 -324
View File
File diff suppressed because it is too large Load Diff
Database/WorldBosses.lua
+14 -14
View File
@@ -188,20 +188,20 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
{ 0, "", "", "" }, { 0, "", "", "" },
{ 0, "", "", "" }, { 0, "", "", "" },
{ 83236, "inv_misc_bag_corefelclothbag", "=q4=Void-Linked Satchel of Goods", "=ds=#m23#", "100%" }, { 83236, "inv_misc_bag_corefelclothbag", "=q4=Void-Linked Satchel of Goods", "=ds=#m23#", "100%" },
{ 7076, "spell_nature_strengthofearthtotem02", "=q2=Essence of Earth", "Group 1", "[1-2] 25%" }, { 7076, "spell_nature_strengthofearthtotem02", "=q2=Essence of Earth", "", "25%", nil, nil, "1-2" },
{ 7078, "spell_fire_volcano", "=q2=Essence of Fire", "Group 1", "[1-2] 25%" }, { 7078, "spell_fire_volcano", "=q2=Essence of Fire", "", "25%", nil, nil, "1-2" },
{ 7080, "spell_nature_acid_01", "=q2=Essence of Water", "Group 1", "[1-2] 25%" }, { 7080, "spell_nature_acid_01", "=q2=Essence of Water", "", "25%", nil, nil, "1-2" },
{ 7082, "spell_nature_earthbind", "=q2=Essence of Air", "Group 1", "[1-2] 25%" }, { 7082, "spell_nature_earthbind", "=q2=Essence of Air", "", "25%", nil, nil, "1-2" },
{ 7971, "inv_misc_gem_pearl_01", "=q2=Black Pearl", "Group 2", "[2-3] 20%" }, { 7971, "inv_misc_gem_pearl_01", "=q2=Black Pearl", "", "20%", nil, nil, "2-3" },
{ 12361, "inv_misc_gem_sapphire_02", "=q2=Blue Sapphire", "Group 2", "[1-2] 20%" }, { 12361, "inv_misc_gem_sapphire_02", "=q2=Blue Sapphire", "", "20%", nil, nil, "1-2" },
{ 12363, "inv_misc_gem_topaz_01", "=q2=Arcane Crystal", "Group 2", "[1-2] 20%" }, { 12363, "inv_misc_gem_topaz_01", "=q2=Arcane Crystal", "", "20%", nil, nil, "1-2" },
{ 12364, "inv_misc_gem_emerald_01", "=q2=Huge Emerald", "Group 2", "[1-2] 20%" }, { 12364, "inv_misc_gem_emerald_01", "=q2=Huge Emerald", "", "20%", nil, nil, "1-2" },
{ 12800, "inv_misc_gem_diamond_01", "=q2=Azerothian Diamond", "Group 2", "[1-3] 20%" }, { 12800, "inv_misc_gem_diamond_01", "=q2=Azerothian Diamond", "", "20%", nil, nil, "1-3" },
{ 11370, "inv_ore_mithril_01", "=q1=Dark Iron Ore", "Group 3", "[3-6] 20%" }, { 11370, "inv_ore_mithril_01", "=q1=Dark Iron Ore", "", "20%", nil, nil, "3-6" },
{ 13468, "inv_misc_herb_blacklotus", "=q2=Black Lotus", "Group 3", "[1-3] 20%" }, { 13468, "inv_misc_herb_blacklotus", "=q2=Black Lotus", "", "20%", nil, nil, "1-3" },
{ 14256, "inv_fabric_felrag", "=q1=Felcloth", "Group 3", "[2-4] 20%" }, { 14256, "inv_fabric_felrag", "=q1=Felcloth", "", "20%", nil, nil, "2-4" },
{ 15416, "inv_misc_monsterscales_07", "=q1=Black Dragonscale", "Group 3", "[2-5] 20%" }, { 15416, "inv_misc_monsterscales_07", "=q1=Black Dragonscale", "", "20%", nil, nil, "2-5" },
{ 20520, "spell_shadow_sealofkings", "=q2=Dark Rune", "Group 3", "[2-4] 20%" }, { 20520, "spell_shadow_sealofkings", "=q2=Dark Rune", "", "20%", nil, nil, "2-4" },
}, },
CowKing = { CowKing = {
{ 60486, "inv_misc_fish_02", "=q4=Fishbringer", "#h3#, #w6#", "25%" }, { 60486, "inv_misc_fish_02", "=q4=Fishbringer", "#h3#, #w6#", "25%" },