Skip to content

Commit 662b2f3

Browse files
committed
feat(db): added toys of 12.0
1 parent c67cbed commit 662b2f3

File tree

2 files changed

+145
-7
lines changed

2 files changed

+145
-7
lines changed

Database/Database.lua

Lines changed: 112 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,20 @@ if isClassic then
1111
["whitelist"] = { },
1212
}
1313
else
14-
ADDON.db.Recent = {
15-
["minID"] = 256881,
16-
["blacklist"] = {},
17-
["whitelist"] = {242520,243304,245580},
18-
}
14+
local build = select(4, GetBuildInfo())
15+
if build < 120000 then
16+
ADDON.db.Recent = {
17+
["minID"] = 256881,
18+
["blacklist"] = {},
19+
["whitelist"] = {242520,243304,245580},
20+
}
21+
else
22+
ADDON.db.Recent = {
23+
["minID"] = 258963,
24+
["blacklist"] = {},
25+
["whitelist"] = {243146, 249468, 250319, 250320, 250974, 251491, 251633, 251903, 252265, 253629, 256552, 257736,},
26+
}
27+
end
1928
end
2029

2130
ADDON.db.worldEvent = {
@@ -448,6 +457,15 @@ ADDON.db.source = {
448457
[225659] = true, -- Arathi Book Collection
449458
[234951] = true, -- Uncracked Cold Ones
450459
[245970] = true, -- P.O.S.T. Master's Express Hearthstone
460+
461+
-- Midnight
462+
[250319] = true, -- Researcher's Shadowgraft
463+
[252265] = true, -- Hexed Potatoad Mucus
464+
[258963] = true, -- Shroom Jumper's Parachute
465+
[259084] = true, -- Gift of the Cycle
466+
[264805] = true, -- Brann-O-Vision 3000
467+
[267139] = true, -- Hungry Black Hole
468+
451469
},
452470

453471
["Drop"] = {
@@ -765,6 +783,16 @@ ADDON.db.source = {
765783
[244470] = true, -- Etheric Victory
766784
[249713] = true, -- Cartel Transmorpher
767785
[242520] = true, -- Festival Hot Air Balloon
786+
787+
-- Midnight
788+
[243146] = true, -- Ren'dorei Struggle
789+
[253629] = true, -- Personal Key to the Arcantina
790+
[257736] = true, -- Lightcalled Hearthstone
791+
[263198] = true, -- Valdekar's Special
792+
[263871] = true, -- Holy Pet Leash
793+
[264413] = true, -- Dominating Victory
794+
[267456] = true, -- Lil' Scoots' Pillow
795+
768796
},
769797

770798
["Vendor"] = {
@@ -928,6 +956,22 @@ ADDON.db.source = {
928956
[246907] = true, -- Broker Supply Crate
929957
[246908] = true, -- K'areshi Supply Crate
930958
[250722] = true, -- Ethereal Stall
959+
960+
-- Midnight
961+
[250974] = true, -- Akil'zon's Updraft
962+
[249468] = true, -- Twilight's Blade Top Secret Strategy Training Guide
963+
[251633] = true, -- Bursting Bounty Bundle
964+
[256552] = true, -- Verdant Rutaani Seed
965+
[259240] = true, -- Sin'dorei Wine
966+
[262431] = true, -- Bouncy Mushroom
967+
[263244] = true, -- Enigmatic Fountain
968+
[263933] = true, -- Astalor's Summons
969+
[264414] = true, -- Midnight Delver's Flare Gun
970+
[264517] = true, -- Galactic Flag of Victory
971+
[265100] = true, -- Corewarden's Hearthstone
972+
[266370] = true, -- Dundun's Abundant Travel Method
973+
[267291] = true, -- Coffer Key Glue
974+
931975
},
932976

933977
["Instance"] = {
@@ -1082,6 +1126,14 @@ ADDON.db.source = {
10821126
[238850] = true, -- Arathi Entertainer's Flame
10831127
[238852] = true, -- Flame's Radiance Banner
10841128
[239693] = true, -- Radiant Lynx Whistle
1129+
1130+
-- Midnight
1131+
[256552] = true, -- Verdant Rutaani Seed
1132+
[259240] = true, -- Sin'dorei Wine
1133+
[263244] = true, -- Enigmatic Fountain
1134+
[263933] = true, -- Astalor's Summons
1135+
[264517] = true, -- Galactic Flag of Victory
1136+
10851137
},
10861138

10871139
["Achievement"] = {
@@ -1152,6 +1204,8 @@ ADDON.db.source = {
11521204
[235519] = true, -- Prized Legend's Pennant
11531205
[236769] = true, -- Gallagio Pipeline Rerouter
11541206

1207+
-- Midnight
1208+
[251491] = true, -- Magical Pet Clicker
11551209
},
11561210

11571211
["PvP"] = {
@@ -1172,6 +1226,7 @@ ADDON.db.source = {
11721226
[232306] = true, -- Prized Champion's Prestigious Banner -- AWC War Within S2
11731227
[232307] = true, -- Astral Champion's Prestigious Banner -- AWC War Within S3
11741228
[242636] = true, -- Astral Legend's Pennant
1229+
[264517] = true, -- Galactic Flag of Victory
11751230
},
11761231

11771232
["Garrison"] = {
@@ -1373,7 +1428,6 @@ ADDON.db.source = {
13731428
}
13741429

13751430
if isClassic then
1376-
ADDON.db.source["Black Market"] = {}
13771431
ADDON.db.source["Trading Post"] = {}
13781432
end
13791433

@@ -1450,12 +1504,29 @@ ADDON.db.expansion = {
14501504
},
14511505
[10] = { -- War Within
14521506
["minID"] = 218310,
1453-
["maxID"] = 999999,
1507+
["maxID"] = 258962,
14541508
[208704] = true, -- Deepdweller's Earthen Hearthstone - War Within Epic Edition
14551509
[208883] = true, -- Sandbox Storm Gryphon - War Within Epic Edition
14561510
[211931] = true, -- Abyss Caller Horn
14571511
[215145] = true, -- Remembrance Stone
14581512
[215147] = true, -- Beautification Iris
1513+
[263489] = true, -- Naaru's Enfold
1514+
},
1515+
[11] = { -- Midnight
1516+
["minID"] = 258963,
1517+
["maxID"] = 999999,
1518+
[243146] = true, -- Ren'dorei Struggle
1519+
[249468] = true, -- Twilight's Blade Top Secret Strategy Training Guide
1520+
[250319] = true, -- Researcher's Shadowgraft
1521+
[250320] = true, -- Lightgraft
1522+
[250974] = true, -- Akil'zon's Updraft
1523+
[251491] = true, -- Magical Pet Clicker
1524+
[251633] = true, -- Bursting Bounty Bundle
1525+
[251903] = true, -- Potatoad Egg
1526+
[252265] = true, -- Hexed Potatoad Mucus
1527+
[253629] = true, -- Personal Key to the Arcantina
1528+
[256552] = true, -- Verdant Rutaani Seed
1529+
[257736] = true, -- Lightcalled Hearthstone
14591530
}
14601531
}
14611532

@@ -1597,6 +1668,9 @@ ADDON.db.effect = {
15971668
[256881] = true, -- Steward's Bauble
15981669
[256893] = true, -- Wretched Dredger's Brand
15991670
[265786] = true, -- Demon Hunter's Aspect
1671+
[252265] = true, -- Hexed Potatoad Mucus
1672+
[256552] = true, -- Verdant Rutaani Seed
1673+
16001674
},
16011675

16021676
-- Add to or slightly change the existing character model, keeping the same model
@@ -1704,6 +1778,8 @@ ADDON.db.effect = {
17041778
[246903] = true, -- Guise of the Phase Diver
17051779
[246907] = true, -- Broker Supply Crate
17061780
[246908] = true, -- K'areshi Supply Crate
1781+
[250319] = true, -- Researcher's Shadowgraft
1782+
17071783
},
17081784

17091785
["Bigger"] = {
@@ -1735,6 +1811,8 @@ ADDON.db.effect = {
17351811
[173984] = true, -- Scroll of Aeons
17361812
[174830] = true, -- Shadowy Disguise
17371813
[206993] = true, -- Investi-gator's Pocketwatch
1814+
[243146] = true, -- Ren'dorei Struggle
1815+
17381816
},
17391817

17401818
-- Banners the character wears on their back
@@ -1869,6 +1947,8 @@ ADDON.db.effect = {
18691947
[199337] = true, -- Bag of Furious Winds
18701948
[206043] = true, -- Fyrakk's Frenzy
18711949
[215147] = true, -- Beautification Iris
1950+
[251491] = true, -- Magical Pet Clicker
1951+
18721952
},
18731953

18741954
["Summon"] = {
@@ -1916,6 +1996,9 @@ ADDON.db.effect = {
19161996
[209859] = true, -- Festive Trans-Dimensional Bird Whistle
19171997
[254666] = true, -- Exodar Replica
19181998
[260622] = true, -- Exodar Replica (MoP classic)
1999+
[251633] = true, -- Bursting Bounty Bundle
2000+
[263244] = true, -- Enigmatic Fountain
2001+
19192002
},
19202003
},
19212004

@@ -2007,6 +2090,9 @@ ADDON.db.effect = {
20072090
[235050] = true, -- Desk-in-a-Box
20082091
[236749] = true, -- Take-Home Torq
20092092
[236751] = true, -- Take-Home Flarendo
2093+
[259240] = true, -- Sin'dorei Wine
2094+
[263198] = true, -- Valdekar's Special
2095+
20102096
},
20112097

20122098
["Corpse"] = {
@@ -2021,6 +2107,7 @@ ADDON.db.effect = {
20212107
[194052] = true, -- Forlorn Funeral Pall
20222108
[200469] = true, -- Khadgar's Disenchanting Rod
20232109
[215145] = true, -- Remembrance Stone
2110+
[264517] = true, -- Galactic Flag of Victory
20242111
},
20252112

20262113
["Roll"] = {
@@ -2310,6 +2397,7 @@ ADDON.db.effect = {
23102397
[183876] = true, -- Quill of Correspondence
23112398
[194885] = true, -- Ohuna Perch
23122399
[239693] = true, -- Radiant Lynx Whistle
2400+
[264695] = true, -- Interdimensional Parcel Signal
23132401
},
23142402

23152403
["NPC"] = {
@@ -2358,6 +2446,8 @@ ADDON.db.effect = {
23582446
[166788] = true, -- Twiddle Twirler: Shredder Blade
23592447
[206696] = true, -- Tricked-Out Thinking Cap
23602448
[238850] = true, -- Arathi Entertainer's Flame
2449+
[267139] = true, -- Hungry Black Hole
2450+
23612451
},
23622452

23632453
["Co-op"] = {
@@ -2569,6 +2659,9 @@ ADDON.db.effect = {
25692659
[224554] = true, -- Silver Linin' Scepter
25702660
[226373] = true, -- Everlasting Noggenfogger Elixir
25712661
[242520] = true, -- Festival Hot Air Balloon
2662+
[250974] = true, -- Akil'zon's Updraft
2663+
[258963] = true, -- Shroom Jumper's Parachute
2664+
25722665
},
25732666

25742667
-- Unlocks flight paths
@@ -2626,6 +2719,9 @@ ADDON.db.effect = {
26262719
[246565] = true, -- Cosmic Hearthstone
26272720
[260221] = true, -- Naaru's Embrace
26282721
[263489] = true, -- Naaru's Enfold
2722+
[257736] = true, -- Lightcalled Hearthstone
2723+
[265100] = true, -- Corewarden's Hearthstone
2724+
26292725
},
26302726

26312727
["Jump"] = {
@@ -2636,6 +2732,8 @@ ADDON.db.effect = {
26362732
[134023] = true, -- Bottled Tornado
26372733
[139773] = true, -- Emerald Winds
26382734
[140336] = true, -- Brulfist Idol
2735+
[262431] = true, -- Bouncy Mushroom
2736+
26392737
},
26402738

26412739
-- faster or slower ground movement
@@ -2696,6 +2794,9 @@ ADDON.db.effect = {
26962794
[221966] = true, -- Wormhole Generator: Khaz Algar
26972795
[230850] = true, -- Delve-O-Bot 7001
26982796
[243056] = true, -- Delver's Mana-Bound Ethergate
2797+
[253629] = true, -- Personal Key to the Arcantina
2798+
[263933] = true, -- Astalor's Summons
2799+
26992800
},
27002801

27012802
["Water Walking"] = {
@@ -2740,6 +2841,8 @@ ADDON.db.effect = {
27402841
[228914] = true, -- Arachnophile Spectacles
27412842
[228966] = true, -- Starry-Eyed Goggles
27422843
[246905] = true, -- Overtuned K'areshi Goggles
2844+
[264805] = true, -- Brann-O-Vision 3000
2845+
27432846
},
27442847

27452848
["Companion"] = {
@@ -2777,6 +2880,8 @@ ADDON.db.effect = {
27772880
[187051] = true, -- Forgotten Feather
27782881
[224643] = true, -- Pet-Sized Candle
27792882
[226191] = true, -- Web Pet Leash
2883+
[263871] = true, -- Holy Pet Leash
2884+
27802885
},
27812886

27822887
["Hunter Pet"] = {

Database/toys.db.lua

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,6 +1036,7 @@ ADDON.db.ingameList = {
10361036
[242520] = false, -- Festival Hot Air Balloon
10371037
[242636] = false, -- Astral Legend's Pennant
10381038
[243056] = false, -- Delver's Mana-Bound Ethergate
1039+
[243146] = false, -- Ren'dorei Struggle
10391040
[243304] = false, -- Jubilant Snowman Costume
10401041
[244470] = false, -- Etheric Victory
10411042
[244792] = false, -- Etheric Brannmorpher
@@ -1054,20 +1055,48 @@ ADDON.db.ingameList = {
10541055
[246908] = false, -- K'areshi Supply Crate
10551056
[247893] = false, -- Fandral's Eternal Seed
10561057
[248263] = false, -- Azure Sea Boat
1058+
[249468] = false, -- Twilight's Blade Top Secret Strategy Training Guide
10571059
[249713] = false, -- Cartel Transmorpher
1060+
[250319] = false, -- Researcher's Shadowgraft
1061+
[250320] = false, -- Lightgraft
10581062
[250722] = false, -- Ethereal Stall
1063+
[250974] = false, -- Akil'zon's Updraft
1064+
[251491] = false, -- Magical Pet Clicker
1065+
[251633] = false, -- Bursting Bounty Bundle
1066+
[251903] = false, -- Potatoad Egg
1067+
[252265] = false, -- Hexed Potatoad Mucus
1068+
[253629] = false, -- Personal Key to the Arcantina
10591069
[254666] = false, -- Exodar Replica
10601070
[255973] = false, -- Sandbox Horse
10611071
[256141] = false, -- Fortune's Waving Cat
1072+
[256552] = false, -- Verdant Rutaani Seed
10621073
[256881] = false, -- Steward's Bauble
10631074
[256893] = false, -- Wretched Dredger's Brand
1075+
[257736] = false, -- Lightcalled Hearthstone
10641076
[258129] = false, -- Jade Monument
10651077
[258135] = false, -- Gilded Coil Spire
10661078
[258136] = false, -- Azure Thunder Coil Pillar
10671079
[258840] = false, -- Gilded Fountain
1080+
[258963] = false, -- Shroom Jumper's Parachute
1081+
[259084] = false, -- Gift of the Cycle
1082+
[259240] = false, -- Sin'dorei Wine
10681083
[260221] = false, -- Naaru's Embrace
10691084
[260622] = false, -- Exodar Replica
1085+
[262431] = false, -- Bouncy Mushroom
1086+
[263198] = false, -- Valdekar's Special
1087+
[263244] = false, -- Enigmatic Fountain
10701088
[263489] = false, -- Naaru's Enfold
1089+
[263871] = false, -- Holy Pet Leash
1090+
[263933] = false, -- Astalor's Summons
1091+
[263975] = false, -- Feeling Fielder Mk. 7
1092+
[264413] = false, -- Dominating Victory
1093+
[264414] = false, -- Midnight Delver's Flare Gun
1094+
[264517] = false, -- Galactic Flag of Victory
1095+
[264666] = false, -- Rod of Exanguishation
1096+
[264672] = false, -- Cosmic Ritual Stone
1097+
[264695] = false, -- Interdimensional Parcel Signal
1098+
[264805] = false, -- Brann-O-Vision 3000
1099+
[265100] = false, -- Corewarden's Hearthstone
10711100
[265414] = false, -- Platinum Amber
10721101
[265415] = false, -- Platinum Vial of Polyformic Acid
10731102
[265416] = false, -- Platinum Battle Banner
@@ -1079,7 +1108,11 @@ ADDON.db.ingameList = {
10791108
[265780] = false, -- Platinum "Little Ale"
10801109
[265786] = false, -- Demon Hunter's Aspect
10811110
[265851] = false, -- Platinum Drums of Speed
1111+
[266370] = false, -- Dundun's Abundant Travel Method
10821112
[266999] = false, -- Swift Yak Pelt
1113+
[267139] = false, -- Hungry Black Hole
10831114
[267279] = false, -- Embers of Al'ar
1115+
[267291] = false, -- Coffer Key Glue
10841116
[267302] = false, -- [PH] CN LNY Dragon Firework Toy
1117+
[267456] = false, -- Lil' Scoots' Pillow
10851118
}

0 commit comments

Comments
 (0)