Skip to content

Commit

Permalink
Removed listing of Pet Charms under a general category
Browse files Browse the repository at this point in the history
Added class-tagging for Revendreth Zone Boots since the BoP component will only drop for the respective class
Adjusted 'Collectible As Cost' logic to prevent showing Items which are under 'saved' Things (fixes #723)
  • Loading branch information
ImUnicke committed Mar 13, 2021
1 parent 4694118 commit 3e5e30b
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,35 +73,47 @@ _.Zones =
},
}),
i(183420, { -- Hopebreaker's Right Boot
i(183418, { -- Hopebreaker's Boots
["cost"] = {
{ "i", 183419, 1 }, -- Hopebreaker's Left Boot
},
}),
["classes"] = { DEMONHUNTER, DRUID, MONK, ROGUE },
["g"] = {
i(183418, { -- Hopebreaker's Boots
["cost"] = {
{ "i", 183419, 1 }, -- Hopebreaker's Left Boot
},
}),
},
}),
i(183417, { -- Mail Courier's Right Runner
i(182719, { -- Mail Courier's Runners
["cost"] = {
{ "i", 183416, 1 }, -- Mail Courier's Left Runner
},
}),
["classes"] = { HUNTER, SHAMAN },
["g"] = {
i(182719, { -- Mail Courier's Runners
["cost"] = {
{ "i", 183416, 1 }, -- Mail Courier's Left Runner
},
}),
},
}),
i(183430, { -- Researcher's Right Slipper
i(183425, { -- Researcher's Slippers
["cost"] = {
{ "i", 183427, 1 }, -- Researcher's Left Slipper
},
})
,}),
["classes"] = { MAGE, PRIEST, WARLOCK },
["g"] = {
i(183425, { -- Researcher's Slippers
["cost"] = {
{ "i", 183427, 1 }, -- Researcher's Left Slipper
},
}),
},
}),
i(183970, { -- Royal Arcanist's Ritual Blade
["crs"] = { 165270 }, -- Royal Arcanist
}),
i(183423, { -- Stone Legion Right Sabaton
i(183421, { -- Stone Legion Sabatons
["cost"] = {
{ "i", 183422, 1 }, -- Stone Legion Left Sabaton
},
}),
["classes"] = { DEATHKNIGHT, PALADIN, WARRIOR },
["g"] = {
i(183421, { -- Stone Legion Sabatons
["cost"] = {
{ "i", 183422, 1 }, -- Stone Legion Left Sabaton
},
}),
},
}),
i(177772), -- Avowed Tormenter's Cord
i(177769), -- Avowed Tormenter's Handwraps
Expand Down
6 changes: 0 additions & 6 deletions .contrib/Parser/DATAS/08 - Pet Battles/Rewards.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
_.PetBattles =
{
n(-34, { -- World Quests
tier(7, { -- Legion
i(116415), -- Shining Pet Charm
}),
tier(8, { -- BFA
i(163036), -- Polished pet charm
}),
i(86143), -- Battle Pet Bandage
}),
i(94207, { -- Fabled Pandaren Pet Supplies
Expand Down
9 changes: 7 additions & 2 deletions AllTheThings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8752,7 +8752,8 @@ app.CollectibleAsQuest = function(t)
end
app.CollectibleAsCost = function(t)
-- items can only be a cost via 'itemID'
if t.modItemID then
-- ignore anything which is directly under something which is 'saved' == 1, since that means the character cannot obtain it currently
if t.modItemID and (not t.parent or t.parent.saved ~= 1) then
-- get all the Things referenced by this item
local references = app.SearchForField("itemID", t.modItemID, true);
if references then
Expand All @@ -8771,7 +8772,11 @@ app.CollectibleAsCost = function(t)
if c[1] == "i" and c[2] == t.modItemID then
-- return true: this item is required as a 'cost' to something else collectible which has not been collected
-- print(t.modItemID,"Item Required as Cost for",ref.key,ref[ref.key]);
return app.RecursiveGroupRequirementsFilter(ref); -- can be obtained on this character
-- if can be obtained on this character
if app.RecursiveGroupRequirementsFilter(ref) then
-- print(t.modItemID,"Item Required as Cost for",ref.key,ref[ref.key]);
return true; -- this item is a cost for something collectible on this character
end
end
end
end
Expand Down

0 comments on commit 3e5e30b

Please sign in to comment.