Skip to content

Commit 2adbfca

Browse files
marcustyphoonmarcustyphoon
committed
feat: Specify infusion types in templates
1 parent c4b3635 commit 2adbfca

File tree

11 files changed

+142
-20
lines changed

11 files changed

+142
-20
lines changed

‎locales/en/translation.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -920,10 +920,12 @@
920920
"preset_extra_Quickness Condi Untamed": "Quickness Condi Untamed",
921921
"preset_female": "female",
922922
"preset_infusion_Condition Damage + Expertise": "Condition Damage + Expertise",
923+
"preset_infusion_Condition Damage + Expertise + Concentration": "Condition Damage + Expertise + Concentration",
923924
"preset_infusion_Condition Damage + Precision": "Condition Damage + Precision",
924925
"preset_infusion_Healing Power + Concentration": "Healing Power + Concentration",
925926
"preset_infusion_None": "None",
926927
"preset_infusion_Power + Precision": "Power + Precision",
928+
"preset_infusion_Power + Precision + Concentration": "Power + Precision + Concentration",
927929
"preset_male": "male",
928930
"preset_trait_Alacrity Condi Amalgam 2 Kit": "Alacrity Condi Amalgam 2 Kit",
929931
"preset_trait_Alacrity Condi Amalgam 4 Kit": "Alacrity Condi Amalgam 4 Kit",

‎src/assets/presetdata/metadata.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ export interface PresetBuffs {
5151

5252
export type PresetAffixesEntry = Exclude<PresetEntry, 'profession'> & {
5353
value: Partial<PrioritiesSlice>;
54+
infusions: string;
5455
};
5556
export interface PresetAffixes {
5657
'GraphQL ID': string;

‎src/assets/presetdata/preset-affixes.yaml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ list:
88
"minBoonDuration": "0",
99
"minQuicknessDuration": "0"
1010
}
11+
infusions: Power + Precision
1112

1213
- name: Power DPS (no dragon)
1314
hidden: true
@@ -18,6 +19,7 @@ list:
1819
"minBoonDuration": "0",
1920
"minQuicknessDuration": "0"
2021
}
22+
infusions: Power + Precision
2123

2224
- name: Condi DPS
2325
value:
@@ -27,6 +29,7 @@ list:
2729
"minBoonDuration": "0",
2830
"minQuicknessDuration": "0"
2931
}
32+
infusions: Condition Damage + Expertise
3033

3134
- name: Condi DPS Rampager
3235
value:
@@ -36,6 +39,7 @@ list:
3639
"minBoonDuration": "0",
3740
"minQuicknessDuration": "0"
3841
}
42+
infusions: Condition Damage + Precision
3943

4044
- name: Hybrid DPS
4145
value:
@@ -45,6 +49,7 @@ list:
4549
"minBoonDuration": "0",
4650
"minQuicknessDuration": "0"
4751
}
52+
infusions: Condition Damage + Expertise
4853

4954
- name: Power Boon
5055
value:
@@ -54,6 +59,7 @@ list:
5459
"minBoonDuration": "84.5",
5560
"minQuicknessDuration": "0"
5661
}
62+
infusions: Power + Precision # + Concentration
5763

5864
- name: Condi Boon
5965
value:
@@ -63,6 +69,7 @@ list:
6369
"minBoonDuration": "0",
6470
"minQuicknessDuration": "0"
6571
}
72+
infusions: Condition Damage + Expertise # + Concentration
6673

6774
- name: Condi Boon/Support
6875
value:
@@ -72,6 +79,7 @@ list:
7279
"minBoonDuration": "79",
7380
"minQuicknessDuration": "0"
7481
}
82+
infusions: None
7583

7684
- name: Heal (Raid)
7785
value:
@@ -81,6 +89,7 @@ list:
8189
"minBoonDuration": "100",
8290
"minQuicknessDuration": "0"
8391
}
92+
infusions: Healing Power + Concentration
8493

8594
- name: Heal (Fractal)
8695
value:
@@ -90,6 +99,7 @@ list:
9099
"minBoonDuration": "100",
91100
"minQuicknessDuration": "0"
92101
}
102+
infusions: Healing Power + Concentration
93103

94104
# -------------------------------------------------------------------------------------------- #
95105

@@ -102,6 +112,7 @@ list:
102112
"minBoonDuration": "0",
103113
"minQuicknessDuration": "0"
104114
}
115+
infusions: Power + Precision
105116

106117
- name: Trailblazer/Dire
107118
hidden: true
@@ -112,6 +123,7 @@ list:
112123
"minBoonDuration": "0",
113124
"minQuicknessDuration": "0"
114125
}
126+
infusions: Condition Damage + Expertise
115127

116128
- name: Condi Barrier Specter
117129
hidden: true
@@ -122,6 +134,7 @@ list:
122134
"minBoonDuration": "0",
123135
"minQuicknessDuration": "0"
124136
}
137+
infusions: Condition Damage + Expertise
125138

126139
- name: Power Alacrity Willbender 14%
127140
hidden: true
@@ -132,6 +145,7 @@ list:
132145
"minBoonDuration": "14",
133146
"minQuicknessDuration": "0"
134147
}
148+
infusions: Power + Precision # + Concentration
135149

136150
- name: Power Alacrity Luminary 24%
137151
hidden: true
@@ -142,6 +156,7 @@ list:
142156
"minBoonDuration": "24",
143157
"minQuicknessDuration": "0"
144158
}
159+
infusions: Power + Precision # + Concentration
145160

146161
- name: Power Quickbrand 25%
147162
hidden: true
@@ -152,6 +167,7 @@ list:
152167
"minBoonDuration": "0",
153168
"minQuicknessDuration": "25"
154169
}
170+
infusions: Power + Precision # + Concentration
155171

156172
- name: Condi Quickness Herald 0%
157173
hidden: true
@@ -162,6 +178,7 @@ list:
162178
"minBoonDuration": "0",
163179
"minQuicknessDuration": "0"
164180
}
181+
infusions: Condition Damage + Expertise # + Concentration
165182

166183
- name: Power Boon Daredevil 99.7%
167184
hidden: true
@@ -172,6 +189,7 @@ list:
172189
"minBoonDuration": "0",
173190
"minQuicknessDuration": "99.7"
174191
}
192+
infusions: Power + Precision # + Concentration
175193

176194
- name: Condi Hybrid Firebrand 40%
177195
hidden: true
@@ -182,6 +200,7 @@ list:
182200
"minBoonDuration": "0",
183201
"minQuicknessDuration": "40"
184202
}
203+
infusions: Condition Damage + Expertise # + Concentration
185204

186205
- name: Condi Hybrid Firebrand 78%
187206
hidden: true
@@ -192,6 +211,7 @@ list:
192211
"minBoonDuration": "0",
193212
"minQuicknessDuration": "78"
194213
}
214+
infusions: Condition Damage + Expertise # + Concentration
195215

196216
- name: Condi Alacrity Scourge 28.8%
197217
hidden: true
@@ -202,6 +222,7 @@ list:
202222
"minBoonDuration": "28.8",
203223
"minQuicknessDuration": "0"
204224
}
225+
infusions: Condition Damage + Expertise # + Concentration
205226

206227
- name: Condi Quickness Harbinger 12.8%
207228
hidden: true
@@ -212,6 +233,7 @@ list:
212233
"minBoonDuration": "0",
213234
"minQuicknessDuration": "12.8"
214235
}
236+
infusions: Condition Damage + Expertise # + Concentration
215237

216238
- name: Condi Boon 0%
217239
hidden: true
@@ -222,6 +244,7 @@ list:
222244
"minBoonDuration": "0",
223245
"minQuicknessDuration": "0"
224246
}
247+
infusions: Condition Damage + Expertise # + Concentration
225248

226249
- name: Condi Quickness Berserker 44.7%
227250
hidden: true
@@ -232,6 +255,7 @@ list:
232255
"minBoonDuration": "0",
233256
"minQuicknessDuration": "44.7"
234257
}
258+
infusions: Condition Damage + Expertise # + Concentration
235259

236260
- name: Quickness Condi Untamed 42%
237261
hidden: true
@@ -242,6 +266,7 @@ list:
242266
"minBoonDuration": "0",
243267
"minQuicknessDuration": "42"
244268
}
269+
infusions: Condition Damage + Expertise # + Concentration
245270

246271
- name: Alacrity Power Renegade 37.4%
247272
hidden: true
@@ -252,6 +277,7 @@ list:
252277
"minBoonDuration": "37.4",
253278
"minQuicknessDuration": "0"
254279
}
280+
infusions: Power + Precision # + Concentration
255281

256282
- name: Alacrity Condi Renegade 42%
257283
hidden: true
@@ -262,6 +288,7 @@ list:
262288
"minBoonDuration": "42",
263289
"minQuicknessDuration": "0"
264290
}
291+
infusions: Condition Damage + Expertise # + Concentration
265292

266293
- name: Condi Quickbrand 40%
267294
hidden: true
@@ -272,6 +299,7 @@ list:
272299
"minBoonDuration": "0",
273300
"minQuicknessDuration": "40"
274301
}
302+
infusions: Condition Damage + Expertise # + Concentration
275303

276304
- name: Alacrity Condi Specter 32.8%
277305
hidden: true
@@ -282,6 +310,7 @@ list:
282310
"minBoonDuration": "32.8",
283311
"minQuicknessDuration": "0"
284312
}
313+
infusions: Condition Damage + Expertise # + Concentration
285314

286315
- name: Condi Alacrity Willbender 14%
287316
hidden: true
@@ -292,6 +321,7 @@ list:
292321
"minBoonDuration": "14",
293322
"minQuicknessDuration": "0"
294323
}
324+
infusions: Condition Damage + Expertise # + Concentration
295325

296326
- name: Alacrity Power Tempest 34%
297327
hidden: true
@@ -302,6 +332,7 @@ list:
302332
"minBoonDuration": "34.4",
303333
"minQuicknessDuration": "0"
304334
}
335+
infusions: Power + Precision # + Concentration
305336

306337
- name: Alacrity Power Tempest 31%
307338
hidden: true
@@ -312,6 +343,7 @@ list:
312343
"minBoonDuration": "31.7",
313344
"minQuicknessDuration": "0"
314345
}
346+
infusions: Power + Precision # + Concentration
315347

316348
- name: Alacrity Fire Tempest Inferno 22%
317349
hidden: true
@@ -322,6 +354,7 @@ list:
322354
"minBoonDuration": "22",
323355
"minQuicknessDuration": "0"
324356
}
357+
infusions: Power + Precision # + Concentration
325358

326359
- name: Alacrity Condi Tempest 31%
327360
hidden: true
@@ -332,6 +365,7 @@ list:
332365
"minBoonDuration": "31",
333366
"minQuicknessDuration": "0"
334367
}
368+
infusions: Condition Damage + Expertise # + Concentration
335369

336370
- name: Condi Tempest
337371
hidden: true
@@ -342,6 +376,7 @@ list:
342376
"minBoonDuration": "0",
343377
"minQuicknessDuration": "0"
344378
}
379+
infusions: Condition Damage + Expertise
345380

346381
- name: Heal Specter 88%
347382
hidden: true
@@ -352,6 +387,7 @@ list:
352387
"minBoonDuration": "88",
353388
"minQuicknessDuration": "0"
354389
}
390+
infusions: Healing Power + Concentration
355391

356392
- name: Power Quickness Untamed 40%
357393
hidden: true
@@ -362,6 +398,7 @@ list:
362398
"minBoonDuration": "0",
363399
"minQuicknessDuration": "40"
364400
}
401+
infusions: Power + Precision # + Concentration
365402

366403
- name: Alacrity Power Antiquary 13%
367404
value:
@@ -371,3 +408,4 @@ list:
371408
"minBoonDuration": "13",
372409
"minQuicknessDuration": "0"
373410
}
411+
infusions: Power + Precision # + Concentration

‎src/assets/presetdata/preset-infusions.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,19 @@ list:
2525
value:
2626
- { type: "Healing Power", count: "" }
2727
- { type: "Concentration", count: "" }
28+
29+
# -------------------------------------------------------------------------------------------- #
30+
31+
- name: Power + Precision + Concentration
32+
hidden: true
33+
value:
34+
- { type: "Power", count: "" }
35+
- { type: "Precision", count: "" }
36+
- { type: "Concentration", count: "" }
37+
38+
- name: Condition Damage + Expertise + Concentration
39+
hidden: true
40+
value:
41+
- { type: "Condition Damage", count: "" }
42+
- { type: "Expertise", count: "" }
43+
- { type: "Concentration", count: "" }

‎src/assets/presetdata/templateTransform.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,12 @@ export function getBuildTemplateData({
5050
presetDistribution,
5151
presetExtras,
5252
presetTraits,
53-
presetAffixes: prioritiesPresets,
53+
presetInfusions,
54+
presetAffixes,
5455
} = data;
5556

57+
const prioritiesPresetEntry = presetAffixes.list.find((pre) => pre.name === build.priority);
58+
5659
return {
5760
build,
5861
specialization: build.specialization,
@@ -61,9 +64,12 @@ export function getBuildTemplateData({
6164
selectedDistribution: build.distribution,
6265
distributionPreset: presetDistribution.list.find((pre) => pre.name === build.distribution)
6366
?.value,
64-
prioritiesPreset: prioritiesPresets.list.find((pre) => pre.name === build.priority)?.value,
67+
prioritiesPreset: prioritiesPresetEntry?.value,
6568
extrasPreset: presetExtras.list.find((pre) => pre.name === build.extras)?.value,
6669
traitsPreset: presetTraits.list.find((pre) => pre.name === build.traits)?.traits,
6770
skillsPreset: presetTraits.list.find((pre) => pre.name === build.traits)?.skills,
71+
infusionsPreset: presetInfusions.list.find(
72+
(pre) => pre.name === prioritiesPresetEntry?.infusions,
73+
)?.value,
6874
};
6975
}

‎src/assets/testData.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,10 @@ const testPresets = async () => {
687687
}
688688
});
689689
}
690+
if (type === 'priority') {
691+
const infusionsMatch = data.infusions.find((pre) => pre.name === entry.infusions);
692+
gentleAssert(infusionsMatch, `err: ${entry.name}'s infusions is not found!`);
693+
}
690694
}
691695
}
692696

0 commit comments

Comments
 (0)