Skip to content

Commit

Permalink
PTR: New build - messing around in open world and delves
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexSoft1911 committed Jan 17, 2025
1 parent c21dbf9 commit cd5716a
Show file tree
Hide file tree
Showing 18 changed files with 526 additions and 77 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
local ObjectDB = ObjectDB; for objectID,objectData in pairs({
[469858] = {
readable = "Shiny Trash Can",
text = {
en = "Shiny Trash Can",
es = "Shiny Trash Can",
de = "Shiny Trash Can",
fr = "Shiny Trash Can",
it = "Shiny Trash Can",
pt = "Shiny Trash Can",
ru = "Shiny Trash Can",
ko = "Shiny Trash Can",
cn = "Shiny Trash Can",
},
},
[478435] = {
readable = "Waiting Garbage Can",
text = {
en = "Waiting Garbage Can",
es = "Waiting Garbage Can",
de = "Waiting Garbage Can",
fr = "Waiting Garbage Can",
it = "Waiting Garbage Can",
pt = "Waiting Garbage Can",
ru = "Waiting Garbage Can",
ko = "Waiting Garbage Can",
cn = "Waiting Garbage Can",
},
},
[478436] = {
readable = "Waiting Garbage Can",
text = {
en = "Waiting Garbage Can",
es = "Waiting Garbage Can",
de = "Waiting Garbage Can",
fr = "Waiting Garbage Can",
it = "Waiting Garbage Can",
pt = "Waiting Garbage Can",
ru = "Waiting Garbage Can",
ko = "Waiting Garbage Can",
cn = "Waiting Garbage Can",
},
},
[478437] = {
readable = "Waiting Garbage Can",
text = {
en = "Waiting Garbage Can",
es = "Waiting Garbage Can",
de = "Waiting Garbage Can",
fr = "Waiting Garbage Can",
it = "Waiting Garbage Can",
pt = "Waiting Garbage Can",
ru = "Waiting Garbage Can",
ko = "Waiting Garbage Can",
cn = "Waiting Garbage Can",
},
},
[478438] = {
readable = "Waiting Garbage Can",
text = {
en = "Waiting Garbage Can",
es = "Waiting Garbage Can",
de = "Waiting Garbage Can",
fr = "Waiting Garbage Can",
it = "Waiting Garbage Can",
pt = "Waiting Garbage Can",
ru = "Waiting Garbage Can",
ko = "Waiting Garbage Can",
cn = "Waiting Garbage Can",
},
},
})
do ObjectDB[objectID] = objectData; end
7 changes: 6 additions & 1 deletion .contrib/Parser/DATAS/00 - Item DB/Uncollectible.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2115,21 +2115,26 @@ i(232635); -- Torn Bilgewater Bandage
------------------
-- PATCH 11.1.0 --
------------------
i(234205); -- Bent Lever
i(236638); -- Bundle of Kaja-Scented Incense
i(236922); -- Celebratory Pack of Runed Harbinger Crests
i(233030); -- Charged Cables
i(234203); -- Clay-Speckled Metal Slug
i(233029); -- Cracked Core
i(236636); -- Cracked Crysoberyl
i(236640); -- Cracked Earthen Singing Bowl
i(235038); -- Crumpled Schematic
i(236639); -- Dented Censer
i(234204); -- Depleted Battery
i(236923); -- Glorious Cluster of Gilded Harbinger Crests
i(233031); -- Intact Interlock
i(236634); -- Itty Bitty Bonsai
i(235268); -- Misprinted Card
i(236637); -- Not-Quite-Crystal Ball
i(236926); -- Pack of Runed Harbinger Crests
i(236924); -- Pouch of Weathered Harbinger Crests
i(231899); -- Trash
i(236921); -- Triumphant Satchel of Carved Harbinger Crests
i(236925); -- Satchel of Carved Harbinger Crests
i(236635); -- Uncut Semi-Smoky Quartz
i(236635); -- Uncut Semi-Smoky Quartz
i(229809); -- Weighted Metal Ball
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-----------------------------------------------------
root(ROOTS.Instances, expansion(EXPANSION.TWW, bubbleDownSelf({ ["timeline"] = { ADDED_11_1_0 } }, {
inst(1298, { -- Operation: Floodgate
--["coord"] = { X, Y, THE_RINGING_DEEPS },
["coord"] = { 42.2, 39.6, THE_RINGING_DEEPS },
["maps"] = {
2387, -- The Waterworks
2388, -- The G.R.I.D
Expand Down
116 changes: 104 additions & 12 deletions .contrib/Parser/DATAS/02 - Delves/11 - The War Within/Delves.lua
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,9 @@ root(ROOTS.Delves, expansion(EXPANSION.TWW, bubbleDownSelf({ ["timeline"] = { AD
}),
filter(TRINKET_F, {
i(215170), -- Abyssal Trap
i(232891, { -- Amorphous Relic
["timeline"] = { ADDED_11_1_0 },
}),
i(215174), -- Concoction: Kiss of Death
i(215169), -- Everburning Lantern
i(215171), -- Fungal Friend Flute
Expand All @@ -616,8 +619,10 @@ root(ROOTS.Delves, expansion(EXPANSION.TWW, bubbleDownSelf({ ["timeline"] = { AD
},FILTERFUNC_itemID,{
["provider"] = { "o", 413590 }, -- Bountiful Coffer
["g"] = {
i(220520), -- Radiant Echo
i(228958), -- Radiant Echo (QS!)
i(220520, {["timeline"]={ REMOVED_11_1_0}}), -- Radiant Echo
i(235897, {["timeline"]={ ADDED_11_1_0}}), -- Radiant Echo
i(228958, {["timeline"]={ REMOVED_11_1_0}}), -- Radiant Echo (QS!)
i(235896, {["timeline"]={ ADDED_11_1_0}}), -- Radiant Echo (QS!)
filter(BATTLE_PETS, {
i(221820), -- Chester (PET!)
}),
Expand Down Expand Up @@ -853,24 +858,72 @@ root(ROOTS.Delves, expansion(EXPANSION.TWW, bubbleDownSelf({ ["timeline"] = { AD
i(225903, { -- Amorphous Relic [Rank 4]
["bonusID"] = 11268,
}),
i(234014, { -- Automatic Footbomb Dispenser [Rank 4]
["bonusID"] = 12160,
["timeline"] = { ADDED_11_1_0 },
}),
i(230233, { -- Biofuel Rocket Gear [Rank 4]
["bonusID"] = 12124,
["timeline"] = { ADDED_11_1_0 },
}),
i(225897, { -- Brute Force Idol [Rank 4]
["bonusID"] = 11238
}),
i(230232, { -- Comically Large Magnet [Rank 4]
["bonusID"] = 12120,
["timeline"] = { ADDED_11_1_0 },
}),
i(230227, { -- Goblomagnetic Bouncing Grenade [Rank 4]
["bonusID"] = 12148,
["timeline"] = { ADDED_11_1_0 },
}),
i(225902, { -- Idol of Final Will [Rank 4]
["bonusID"] = 11263,
}),
i(225898, { -- Idol of the Earthmother [Rank 4]
["bonusID"] = 11243,
}),
i(230229, { -- Impact Conversion Matrix [Rank 4]
["bonusID"] = 12156,
["timeline"] = { ADDED_11_1_0 },
}),
i(230225, { -- Kaja'Cola Carrier [Rank 4]
["bonusID"] = 12116,
["timeline"] = { ADDED_11_1_0 },
}),
i(230230, { -- L00T RAID-R [Rank 4]
["bonusID"] = 12105,
["timeline"] = { ADDED_11_1_0 },
}),
i(225906, { -- Lifeless Necrotic Relic [Rank 4]
["bonusID"] = 11283,
}),
i(225900, { -- Light-Touched Idol [Rank 4]
["bonusID"] = 11253,
}),
i(234015, { -- Mechasaur EZ-Build Kit [Rank 4]
["bonusID"] = 12164,
["timeline"] = { ADDED_11_1_0 },
}),
i(225905, { -- Olden Seeker Relic [Rank 4]
["bonusID"] = 11278,
}),
i(230950, { -- Overdrive Pylon [Rank 4]
["bonusID"] = 12132,
["timeline"] = { ADDED_11_1_0 },
}),
i(234013, { -- Pacifist Rig [Rank 4]
["bonusID"] = 12136,
["timeline"] = { ADDED_11_1_0 },
}),
i(230234, { -- Pinged Augment Chip [Rank 4]
["bonusID"] = 12144,
["timeline"] = { ADDED_11_1_0 },
}),
i(230228, { -- Pocket Factory [Rank 4]
["bonusID"] = 12152,
["timeline"] = { ADDED_11_1_0 },
}),
i(218129, { -- Porcelain Arrowhead Idol [Rank 4]
["bonusID"] = 11233,
}),
Expand All @@ -883,9 +936,17 @@ root(ROOTS.Delves, expansion(EXPANSION.TWW, bubbleDownSelf({ ["timeline"] = { AD
i(225908, { -- Relicblood of Zekvir [Rank 4]
["bonusID"] = 11293,
}),
i(230231, { -- Reverse Engineered Goblin Death Bomb [Rank 4]
["bonusID"] = 12140,
["timeline"] = { ADDED_11_1_0 },
}),
i(225901, { -- Streamlined Relic [Rank 4]
["bonusID"] = 11258,
}),
i(230226, { -- Three Dimensional Bioprinter [Rank 4]
["bonusID"] = 12128,
["timeline"] = { ADDED_11_1_0 },
}),
i(225904, { -- Time Lost Relic [Rank 4]
["bonusID"] = 11273,
}),
Expand All @@ -901,6 +962,7 @@ root(ROOTS.Delves, expansion(EXPANSION.TWW, bubbleDownSelf({ ["timeline"] = { AD
i(224411), -- Companion Experience (Tier 3)
i(224412), -- Companion Experience (every tier)
i(227784, {["timeline"]={ REMOVED_11_1_0 }}), -- Delver's Bounty
--i(233071, {["timeline"]={ ADDED_11_1_0, REMOVED_11_2_0 }}), -- Delver's Bounty
i(222922), -- Expeditionary Spoils (Tier 1)
i(222923), -- Expeditionary Spoils (Tier 2)
i(225178), -- Expeditionary Spoils (Tier 3)
Expand All @@ -924,6 +986,12 @@ root(ROOTS.Delves, expansion(EXPANSION.TWW, bubbleDownSelf({ ["timeline"] = { AD
--
i(228560), -- Ancient Curio (QI!/QS!)
i(228581), -- Ancient Curio (QI!/QS!)
i(234329, { -- Ancient Curio (QS!)
["timeline"] = { ADDED_11_1_0 },
}),
i(234330, { -- Ancient Curio (QS!)
["timeline"] = { ADDED_11_1_0 },
}),
--
currency(2803), -- Undercoin
}),
Expand Down Expand Up @@ -1013,9 +1081,15 @@ root(ROOTS.Delves, expansion(EXPANSION.TWW, bubbleDownSelf({ ["timeline"] = { AD
hqt(83330), -- Level 60
}),
n(QUESTS, {
q(84370, { -- The Key to Success
["provider"] = { "i", 227794 }, -- Archaic Cipher Key
["isWeekly"] = true,
}),
-- Season 1 (probably gonna need to sort out stuff out side of it)
q(84519, { -- Ancient Curiosity: Combat
["provider"] = { "i", 228560 }, -- Ancient Curio (TODO: providers ids could be swapped) (TODO: MIGHT CHANGED ITEMID)
["maps"] = ALL_REGULAR_DELVES,
["timeline"] = { REMOVED_11_1_0 },
["g"] = {
-- I don't think this is the curio everyone gets from this quest... is it RNG or only this one
-- that wowhead claims?
Expand All @@ -1029,18 +1103,14 @@ root(ROOTS.Delves, expansion(EXPANSION.TWW, bubbleDownSelf({ ["timeline"] = { AD
q(84520, { -- Ancient Curiosity: Utility
["provider"] = { "i", 228581 }, -- Ancient Curio (TODO: providers ids could be swapped) (TODO: MIGHT CHANGED ITEMID)
["maps"] = ALL_REGULAR_DELVES,
["timeline"] = { REMOVED_11_1_0 },
["g"] = {
i(228582), -- Streamlined Relic
-- i(225901, { -- Streamlined Relic [Rank 1] (only tracking Rank 4 curios)
-- ["bonusID"] = 11255,
-- }),
},
}),
q(84370, { -- The Key to Success
["provider"] = { "i", 227794 }, -- Archaic Cipher Key
["isWeekly"] = true,
}),
-- Season 1 (probably gonna need to sort out stuff out side of it)
q(81514, { -- Bountiful Delves
["sourceQuests"] = { 83315 }, -- Preparing for the Unknown
["provider"] = { "n", 206017 }, -- Brann Bronzebeard
Expand Down Expand Up @@ -1087,6 +1157,16 @@ root(ROOTS.Delves, expansion(EXPANSION.TWW, bubbleDownSelf({ ["timeline"] = { AD
},
}),
-- Season 2
q(86461, { -- Ancient Curiosity: Combat
["provider"] = { "i", 234330 }, -- Ancient Curio
["maps"] = ALL_REGULAR_DELVES, -- s2 delves or all delves?
["timeline"] = { ADDED_11_1_0 },
}),
q(86462, { -- Ancient Curiosity: Utility
["provider"] = { "i", 234329 }, -- Ancient Curio
["maps"] = ALL_REGULAR_DELVES, -- s2 delves or all delves?
["timeline"] = { ADDED_11_1_0 },
}),
q(85242, { -- Seasonal Refresher
--["sourceQuests"] = { xx }, -- ??
["provider"] = { "n", 206017 }, -- Brann Bronzebeard
Expand All @@ -1097,11 +1177,7 @@ root(ROOTS.Delves, expansion(EXPANSION.TWW, bubbleDownSelf({ ["timeline"] = { AD
-- it seems like give you as reward any cosmetic from s1 delves that wasn't looted before
-- was Shadowlit Haversack (itemID 225067) for me
}),
i(233276, { -- Delver's Starter Kit
-- TODO: remove if it is generic s2 delves reward
i(233118), -- Incontinental Takeout
i(233205), -- Go-Go Juice
}),
i(233276), -- Delver's Starter Kit
},
}),
q(85243, { -- I Want My Hat Back
Expand Down Expand Up @@ -1175,6 +1251,12 @@ root(ROOTS.Delves, expansion(EXPANSION.TWW, bubbleDownSelf({ ["timeline"] = { AD
i(232047), -- Chunk of Companion Experience (Uncommon)
i(232046), -- Chunk of Companion Experience (Rare)
i(232045), -- Chunk of Companion Experience (Epic)
-- Misc
-- TODO: move it under delve completion, if it will be here
-- TODO: objectID 478443 for Mislaid Curiosity in s2
i(233118, {["timeline"]={ ADDED_11_1_0}}), -- Incontinental Takeout
i(233205, {["timeline"]={ ADDED_11_1_0}}), -- Go-Go Juice
i(233062, {["timeline"]={ ADDED_11_1_0}}), -- Pocket Pizza
},
}),
o(455759, { -- Hulking Raptorial Claw
Expand Down Expand Up @@ -2603,6 +2685,16 @@ root(ROOTS.HiddenQuestTriggers, expansion(EXPANSION.TWW, bubbleDownSelf({ ["time
q(83156), -- Purchaseable Restored Coffer Key (spellID 453933)
q(83193), -- Trusty Hat (spellID 454301)
-- Season 2 Rewards
--q(, {["timeline"]={ADDED_11_1_0}}), -- Delver's Dirigible Schematic: Flamethrower
--q(, {["timeline"]={ADDED_11_1_0}}), -- Delver's Dirigible Schematic: Pipes
--q(, {["timeline"]={ADDED_11_1_0}}), -- Delver's Dirigible Schematic: Harpoon
--q(, {["timeline"]={ADDED_11_1_0}}), -- Delver's Dirigible Schematic: Baloon
--q(, {["timeline"]={ADDED_11_1_0}}), -- Purchaseable Restored Coffer Keys
--q(, {["timeline"]={ADDED_11_1_0}}), -- Delver's Dirigible Schematic: Green Paint
--q(, {["timeline"]={ADDED_11_1_0}}), -- Delve-O-Bot 7001
--q(, {["timeline"]={ADDED_11_1_0}}), -- Warbound Equipment Set
--q(, {["timeline"]={ADDED_11_1_0}}), -- Discounted Restored Coffer Key
--q(, {["timeline"]={ADDED_11_1_0}}), -- Where We Thrive (camp site)
-- Zekvir
q(84816), -- Zekvir pop in Earthcrawl Mines (first time, unsure what tier it was)
q(84817), -- Zekvir pop in Mycomancer Cavern (unsure, Tier 9)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,16 @@ root(ROOTS.Zones, m(KHAZ_ALGAR, bubbleDown({ ["timeline"] = { ADDED_11_0_2 } },
q(82487), -- Worldsoul: The Stonevault [N]
q(82497), -- Worldsoul: The Stonevault [H]
q(82505), -- Worldsoul: The Stonevault [M]
q(87423, { -- Worldsoul: Undermine Explorer
["timeline"] = { ADDED_11_1_0 },
}),
q(87422, { -- Worldsoul: Undermine World Quests
["timeline"] = { ADDED_11_1_0 },
}),
q(82512), -- Worldsoul: World Boss
q(82512, { -- Worldsoul: World Bosses
["timeline"] = { ADDED_11_1_0 },
}),
q(82452), -- Worldsoul: World Quests
-- Also Fired / Alex: can confirm 82484, 82513, 82514, 82515 too;
q(82484), --
Expand All @@ -67,6 +76,7 @@ root(ROOTS.Zones, m(KHAZ_ALGAR, bubbleDown({ ["timeline"] = { ADDED_11_0_2 } },
q(82515), --
-- only for low level alts
q(84668), -- when pick up any Worldsoul quest on <80s character // I got this on level 80 Char
--q(85395, {["timeline"] = { ADDED_11_1_0 }}), -- after world soul weekly, could be fractured spark of fortune
})),
}),
}),
Expand Down
Loading

0 comments on commit cd5716a

Please sign in to comment.