Skip to content

Commit 78d548f

Browse files
madcowfredmadcowfred
committed
Move some event chores around
1 parent 8628750 commit 78d548f

3 files changed

Lines changed: 160 additions & 58 deletions

File tree

‎Data/Chores/Events/Events.lua‎

Lines changed: 41 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,6 @@ Addon.data.chores.choresEvents = {
1717
name = L['section:events'],
1818
order = 0,
1919
categories = {
20-
{
21-
key = 'special',
22-
quests = {
23-
{
24-
key = 'turboBoost',
25-
minimumLevel = 80,
26-
-- requiredQuest = 86204, -- Liberation of Undermine: The House Loses
27-
entries = {
28-
{ quest = 91205 }, -- Ultra Prime Deluxe Turbo-Boost: Powerhouse Challenges
29-
},
30-
},
31-
{
32-
key = 'prepatchDisruptTheCall',
33-
minimumLevel = 10,
34-
-- requiredQuest = 90768, -- Cult it Out (account?)
35-
entries = {
36-
{ quest = 91795 }, -- Disrupt the Call
37-
},
38-
},
39-
{
40-
key = 'prepatchTwilightsDawn',
41-
minimumLevel = 10,
42-
-- requiredQuest = 90768, -- Cult it Out (account?)
43-
entries = {
44-
{ quest = 87308 }, -- Twilight's Dawn
45-
},
46-
},
47-
},
48-
},
4920
{
5021
key = 'holidays',
5122
quests = {
@@ -81,10 +52,14 @@ Addon.data.chores.choresEvents = {
8152
{ quest = 93605 }, -- The World Awaits
8253
},
8354
},
84-
55+
},
56+
},
57+
{
58+
key = 'timewalking',
59+
quests = {
8560
-- Classic
8661
{
87-
key = 'timewalkingDungeons',
62+
key = 'dungeons',
8863
minimumLevel = 10,
8964
requiredEventIds = classicTimewalkingIds,
9065
entries = {
@@ -93,15 +68,15 @@ Addon.data.chores.choresEvents = {
9368
},
9469
},
9570
-- {
96-
-- key = 'timewalkingRaids',
71+
-- key = 'raid',
9772
-- minimumLevel = 30,
9873
-- requiredEventIds = classicTimewalkingIds,
9974
-- entries = {
10075
-- { quest = 82817 }, -- Disturbance Detected: Blackrock Depths
10176
-- },
10277
-- },
10378
{
104-
key = 'timewalkingTurnIn',
79+
key = 'item',
10580
minimumLevel = 30,
10681
requiredEventIds = classicTimewalkingIds,
10782
entries = {
@@ -110,7 +85,7 @@ Addon.data.chores.choresEvents = {
11085
},
11186
-- TBC
11287
{
113-
key = 'timewalkingDungeons',
88+
key = 'dungeons',
11489
minimumLevel = 10,
11590
requiredEventIds = tbcTimewalkingIds,
11691
entries = {
@@ -119,15 +94,15 @@ Addon.data.chores.choresEvents = {
11994
},
12095
},
12196
{
122-
key = 'timewalkingRaids',
97+
key = 'raid',
12398
minimumLevel = 30,
12499
requiredEventIds = tbcTimewalkingIds,
125100
entries = {
126101
{ quest = 47523 }, -- Disturbance Detected: Black Temple
127102
},
128103
},
129104
{
130-
key = 'timewalkingTurnIn',
105+
key = 'item',
131106
minimumLevel = 30,
132107
requiredEventIds = tbcTimewalkingIds,
133108
entries = {
@@ -136,7 +111,7 @@ Addon.data.chores.choresEvents = {
136111
},
137112
-- WotLK
138113
{
139-
key = 'timewalkingDungeons',
114+
key = 'dungeons',
140115
minimumLevel = 10,
141116
requiredEventIds = wotlkTimewalkingIds,
142117
entries = {
@@ -145,15 +120,15 @@ Addon.data.chores.choresEvents = {
145120
},
146121
},
147122
{
148-
key = 'timewalkingRaids',
123+
key = 'raid',
149124
minimumLevel = 30,
150125
requiredEventIds = wotlkTimewalkingIds,
151126
entries = {
152127
{ quest = 50316 }, -- Disturbance Detected: Ulduar
153128
},
154129
},
155130
{
156-
key = 'timewalkingTurnIn',
131+
key = 'item',
157132
minimumLevel = 30,
158133
requiredEventIds = wotlkTimewalkingIds,
159134
entries = {
@@ -162,7 +137,7 @@ Addon.data.chores.choresEvents = {
162137
},
163138
-- Cata
164139
{
165-
key = 'timewalkingDungeons',
140+
key = 'dungeons',
166141
minimumLevel = 10,
167142
requiredEventIds = cataTimewalkingIds,
168143
entries = {
@@ -171,15 +146,15 @@ Addon.data.chores.choresEvents = {
171146
},
172147
},
173148
{
174-
key = 'timewalkingRaids',
149+
key = 'raid',
175150
minimumLevel = 30,
176151
requiredEventIds = cataTimewalkingIds,
177152
entries = {
178153
{ quest = 57637 }, -- Disturbance Detected: Firelands
179154
},
180155
},
181156
{
182-
key = 'timewalkingTurnIn',
157+
key = 'item',
183158
minimumLevel = 30,
184159
requiredEventIds = cataTimewalkingIds,
185160
entries = {
@@ -189,7 +164,7 @@ Addon.data.chores.choresEvents = {
189164
},
190165
-- MoP
191166
{
192-
key = 'timewalkingDungeons',
167+
key = 'dungeons',
193168
minimumLevel = 10,
194169
requiredEventIds = mopTimewalkingIds,
195170
entries = {
@@ -198,7 +173,7 @@ Addon.data.chores.choresEvents = {
198173
},
199174
},
200175
{
201-
key = 'timewalkingTurnIn',
176+
key = 'item',
202177
minimumLevel = 30,
203178
requiredEventIds = mopTimewalkingIds,
204179
entries = {
@@ -207,7 +182,7 @@ Addon.data.chores.choresEvents = {
207182
},
208183
-- WoD
209184
{
210-
key = 'timewalkingDungeons',
185+
key = 'dungeons',
211186
minimumLevel = 10,
212187
requiredEventIds = wodTimewalkingIds,
213188
entries = {
@@ -216,7 +191,7 @@ Addon.data.chores.choresEvents = {
216191
},
217192
},
218193
{
219-
key = 'timewalkingTurnIn',
194+
key = 'item',
220195
minimumLevel = 30,
221196
requiredEventIds = wodTimewalkingIds,
222197
entries = {
@@ -226,7 +201,7 @@ Addon.data.chores.choresEvents = {
226201
},
227202
-- Legion
228203
{
229-
key = 'timewalkingDungeons',
204+
key = 'dungeons',
230205
minimumLevel = 10,
231206
requiredEventIds = legionTimewalkingIds,
232207
entries = {
@@ -235,7 +210,7 @@ Addon.data.chores.choresEvents = {
235210
},
236211
},
237212
{
238-
key = 'timewalkingTurnIn',
213+
key = 'item',
239214
minimumLevel = 30,
240215
requiredEventIds = legionTimewalkingIds,
241216
entries = {
@@ -244,7 +219,7 @@ Addon.data.chores.choresEvents = {
244219
},
245220
-- Battle for Azeroth
246221
{
247-
key = 'timewalkingDungeons',
222+
key = 'dungeons',
248223
minimumLevel = 10,
249224
requiredEventIds = bfaTimewalkingIds,
250225
entries = {
@@ -253,7 +228,7 @@ Addon.data.chores.choresEvents = {
253228
},
254229
},
255230
{
256-
key = 'timewalkingTurnIn',
231+
key = 'item',
257232
minimumLevel = 30,
258233
requiredEventIds = bfaTimewalkingIds,
259234
entries = {
@@ -263,7 +238,7 @@ Addon.data.chores.choresEvents = {
263238
},
264239
-- Shadowlands
265240
{
266-
key = 'timewalkingDungeons',
241+
key = 'dungeons',
267242
minimumLevel = 10,
268243
requiredEventIds = slTimewalkingIds,
269244
entries = {
@@ -273,7 +248,7 @@ Addon.data.chores.choresEvents = {
273248
},
274249
},
275250
{
276-
key = 'timewalkingTurnIn',
251+
key = 'item',
277252
minimumLevel = 30,
278253
requiredEventIds = slTimewalkingIds,
279254
entries = {
@@ -282,6 +257,20 @@ Addon.data.chores.choresEvents = {
282257
},
283258
},
284259
},
260+
{
261+
key = 'noblegarden',
262+
quests = {
263+
{
264+
key = 'featheredFiend',
265+
minimumLevel = 1,
266+
requiredEventIds = { 181 },
267+
entries = {
268+
{ quest = 73192 }, -- [A] Feathered Fiend
269+
{ quest = 79558 }, -- [H] Feathered Fiend
270+
},
271+
},
272+
},
273+
},
285274
{
286275
key = 'holidays2',
287276
dungeons = {

‎Data/Chores/Events/Holidays.lua‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
local _, Addon = ...
2+
local L = Addon.L
3+
4+
5+
Addon.data.chores.choresEvents = {
6+
key = 'events',
7+
name = L['section:events'],
8+
order = 0,
9+
categories = {
10+
{
11+
key = 'special',
12+
quests = {
13+
{
14+
key = 'turboBoost',
15+
minimumLevel = 80,
16+
-- requiredQuest = 86204, -- Liberation of Undermine: The House Loses
17+
entries = {
18+
{ quest = 91205 }, -- Ultra Prime Deluxe Turbo-Boost: Powerhouse Challenges
19+
},
20+
},
21+
{
22+
key = 'prepatchDisruptTheCall',
23+
minimumLevel = 10,
24+
-- requiredQuest = 90768, -- Cult it Out (account?)
25+
entries = {
26+
{ quest = 91795 }, -- Disrupt the Call
27+
},
28+
},
29+
{
30+
key = 'prepatchTwilightsDawn',
31+
minimumLevel = 10,
32+
-- requiredQuest = 90768, -- Cult it Out (account?)
33+
entries = {
34+
{ quest = 87308 }, -- Twilight's Dawn
35+
},
36+
},
37+
},
38+
},
39+
{
40+
key = 'holidays2',
41+
dungeons = {
42+
{
43+
key = 'crownChemicalCo',
44+
minimumLevel = 60,
45+
requiredEventIds = { 335, 423 },
46+
dungeonId = 288,
47+
},
48+
{
49+
key = 'corenDirebrew',
50+
minimumLevel = 60,
51+
requiredEventIds = { 372 },
52+
dungeonId = 287,
53+
},
54+
{
55+
key = 'headlessHorseman',
56+
minimumLevel = 60,
57+
requiredEventIds = { 324, 1405 },
58+
dungeonId = 285,
59+
},
60+
{
61+
key = 'frostLordAhune',
62+
minimumLevel = 60,
63+
requiredEventIds = { 341 }, -- Midsummer Fire Festival
64+
dungeonId = 286,
65+
},
66+
},
67+
quests = {
68+
{
69+
key = 'meanOne',
70+
minimumLevel = 30,
71+
requiredEventIds = { 141 }, -- Feast of Winter Veil
72+
entries = {
73+
{ quest = 7043 }, -- [A] You're a Mean One...
74+
{ quest = 6983 }, -- [H] You're a Mean One...
75+
}
76+
},
77+
{
78+
key = 'grumpus',
79+
minimumLevel = 40,
80+
requiredEventIds = { 141 }, -- Feast of Winter Veil
81+
entries = {
82+
{ quest = 39651 }, -- Grumpus
83+
}
84+
},
85+
{
86+
key = 'menacingGrumplings',
87+
minimumLevel = 40,
88+
requiredEventIds = { 141 }, -- Feast of Winter Veil
89+
entries = {
90+
{ quest = 39649 }, -- Menacing Grumplings
91+
}
92+
},
93+
{
94+
key = 'whatHorriblePresents',
95+
minimumLevel = 40,
96+
requiredEventIds = { 141 }, -- Feast of Winter Veil
97+
entries = {
98+
{ quest = 39668 }, -- What Horrible Presents!
99+
}
100+
},
101+
{
102+
key = 'whereAreTheChildren',
103+
minimumLevel = 40,
104+
requiredEventIds = { 141 }, -- Feast of Winter Veil
105+
entries = {
106+
{ quest = 39648 }, -- Where Are the Children?
107+
}
108+
},
109+
},
110+
},
111+
},
112+
}

0 commit comments

Comments
 (0)