Skip to content

Commit f0f788e

Browse files
committed
remove some overly niche equivalencies, update existing common ones with additional spells
1 parent c54118a commit f0f788e

File tree

2 files changed

+64
-103
lines changed

2 files changed

+64
-103
lines changed

Components/Core/Spells/Equivalencies-Vanilla.lua

Lines changed: 63 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -174,35 +174,29 @@ TMW.BE = {
174174

175175
},
176176
buffs = {
177-
IncreasedAgility = {
178-
17538, -- Elixir of the Mongoose
179-
-11328, -- Agility
180-
-11334, -- Greater Agility
181-
-2374, -- Lesser Agility
182-
1213904, -- Elixir of the Honey Badger
183-
},
184177
IncreasedStats = {
185178
-16878, -- Mark of the Wild
186179
-21849, -- Gift of the Wild
187180
25898, -- Greater Blessing of Kings
188181
20217, -- Blessing of Kings
189182
409583, -- Heart of the Lion
183+
-15366, -- Songflower Serenade
184+
-1218071, -- Songflower Lullaby
190185
},
191-
IncreasedArmor = {
192-
-11349, -- Armor
193-
-673, -- Lesser Armor
194-
1213917, -- Elixir of the Ironside
195-
11348, -- Greater Armor
196-
15233, -- Crystal Ward
197-
},
198-
IncreasedAP = {
199-
-17038, -- Winterfall Firewater
200-
16329, -- Juju Might
201-
473469, -- Cleansed Firewater
186+
BonusStamina = {
187+
-11767, -- Blood Pact
188+
403215, -- Commanding Shout
189+
-21562, -- Prayer of Fortitude
190+
-10938, -- Power Word: Fortitude
191+
-8099, -- Stamina
202192
},
203-
IncreasedHealth = {
204-
3593, -- Health II
205-
2378, -- Health
193+
IncreasedAgility = {
194+
17538, -- Elixir of the Mongoose
195+
-11328, -- Agility
196+
-11334, -- Greater Agility
197+
-2374, -- Lesser Agility
198+
1213904, -- Elixir of the Honey Badger
199+
425600, -- Horn of Lordaeron
206200
},
207201
IncreasedIntellect = {
208202
-1459, -- Arcane Intellect
@@ -214,13 +208,14 @@ TMW.BE = {
214208
-3167, -- Intellect
215209
16888, -- Intellect IX
216210
},
217-
IncreasedSP = {
218-
-17539, -- Greater Arcane Elixir
219-
11390, -- Arcane Elixir
220-
439959, -- Lesser Arcane Elixir
221-
1213914, -- Elixir of the Mage-Lord
222-
15288, -- Fury of Ragnaros
223-
17150, -- Arcane Might
211+
IncreasedStrength = {
212+
16323, -- Juju Power
213+
17537, -- Elixir of Brute Force
214+
-3164, -- Strength
215+
-2367, -- Lesser Strength
216+
-8212, -- Enlarge
217+
-16883, -- Elixir of the Giants
218+
425600, -- Horn of Lordaeron
224219
},
225220
IncreasedSpirit = {
226221
27681, -- Prayer of Spirit
@@ -230,13 +225,41 @@ TMW.BE = {
230225
15231, -- Crystal Force
231226
-8112, -- Spirit
232227
},
233-
IncreasedStrength = {
234-
16323, -- Juju Power
235-
17537, -- Elixir of Brute Force
236-
-3164, -- Strength
237-
-2367, -- Lesser Strength
238-
-8212, -- Enlarge
239-
-16883, -- Elixir of the Giants
228+
IncreasedAP = {
229+
-25916, -- Greater Blessing of Might
230+
-25291, -- Blessing of Might
231+
-17038, -- Winterfall Firewater
232+
16329, -- Juju Might
233+
473469, -- Cleansed Firewater
234+
},
235+
IncreasedSP = {
236+
-17539, -- Greater Arcane Elixir
237+
11390, -- Arcane Elixir
238+
439959, -- Lesser Arcane Elixir
239+
1213914, -- Elixir of the Mage-Lord
240+
15288, -- Fury of Ragnaros
241+
17150, -- Arcane Might
242+
},
243+
IncreasedCrit = {
244+
-15366, -- Songflower Serenade
245+
-1218071, -- Songflower Lullaby
246+
},
247+
IncreasedPhysHaste = {
248+
-16609, -- Warchief's Blessing
249+
-460940, -- Might of Stormwind
250+
-1218074, -- Might of Blackrock
251+
},
252+
253+
IncreasedArmor = {
254+
-11349, -- Armor
255+
-673, -- Lesser Armor
256+
1213917, -- Elixir of the Ironside
257+
11348, -- Greater Armor
258+
15233, -- Crystal Ward
259+
},
260+
IncreasedHealth = {
261+
3593, -- Health II
262+
2378, -- Health
240263
},
241264
-- BurstHaste = {
242265
-- 2825, -- Bloodlust (shaman, horde)
@@ -286,10 +309,6 @@ TMW.BE = {
286309
1022, -- Blessing of Protection (paladin)
287310
6615, -- Free Action (vanilla potion)
288311
},
289-
FireSpellPower = {
290-
26276, -- Greater Firepower
291-
7844, -- Fire Power
292-
},
293312
FlaskBuffs = {
294313
17628, -- Supreme Power
295314
17626, -- Flask of the Titans
@@ -329,66 +348,30 @@ TMW.BE = {
329348
-642, -- Divine Shield (paladin, general)
330349
1044, -- Blessing of Freedom (paladin, general)
331350
},
332-
Kings = {
333-
25898, -- Greater Blessing of Kings
334-
20217, -- Blessing of Kings
335-
409583, -- Heart of the Lion
336-
},
337-
Might = {
338-
-25916, -- Greater Blessing of Might
339-
-25291, -- Blessing of Might
340-
425600, -- Horn of Lordaeron
341-
409583, -- Heart of the Lion
342-
},
343-
ResistAll = {
351+
Resistances = {
344352
27652, -- Elixir of Resistance
345353
-16878, -- Mark of the Wild
346354
-21849, -- Gift of the Wild
347-
},
348-
ResistFire = {
355+
349356
-10534, -- Fire Resistance (Totem)
350357
-19900, -- Fire Resistance Aura
351-
},
352-
ResistFrost = {
358+
353359
-19897, -- Frost Resistance Aura
354360
-8182, -- Frost Resistance (Totem)
355-
},
356-
ResistNature = {
361+
357362
-20190, -- Aspect of the Nature
358363
-10599, -- Nature Resistance (Totem)
359-
},
360-
ResistShadow = {
364+
361365
-16874, -- Shadow Protection
362366
27683, -- Prayer of Shadow Protection
363367
},
364-
ShadowSpellPower = {
365-
11474, -- Shadow Power
366-
16587, -- Dark Whispers
367-
},
368-
Sigils = {
369-
439155, -- Sigil of Innovation
370-
446240, -- Sigil of Living Dreams
371-
463864, -- Sigil of Flowing Waters
372-
1214001, -- Scroll: Wrath of the Swarm
373-
},
374-
Songflower = {
375-
-15366, -- Songflower Serenade
376-
-1218071, -- Songflower Lullaby
377-
},
378368
SpeedBoosts = {
379369
783, -- Travel Form (druid, baseline)
380370
-2983, -- Sprint (rogue, baseline)
381371
-2379, -- Speed (generic speed buff)
382372
2645, -- Ghost Wolf (shaman, general)
383373
7840, -- Swim Speed (Swim Speed Potion)
384374
},
385-
BonusStamina = {
386-
-11767, -- Blood Pact
387-
403215, -- Commanding Shout
388-
-21562, -- Prayer of Fortitude
389-
-10938, -- Power Word: Fortitude
390-
-8099, -- Stamina
391-
},
392375
DamageReflect = {
393376
-467, -- Thorns
394377
-2947, -- Fire Shield
@@ -398,33 +381,22 @@ TMW.BE = {
398381
15279, -- Crystal Spire
399382
16610, -- Razorhide
400383
},
401-
WarchiefsBlessing = {
402-
-16609, -- Warchief's Blessing
403-
-460940, -- Might of Stormwind
404-
-1218074, -- Might of Blackrock
405-
},
406384
WaterBreathing = {
407385
5697, -- Unending Breath
408386
16591, -- Noggenfogger Elixir
409-
413548, -- Degreelessness Mode
410387
-131, -- Water Breathing
411-
425284, -- Spirit of the Redeemer
412388
461137, -- Oath of the Sea
413389
405688, -- Riptide Bubbles
414390
-17443, -- Air Bubbles
415-
1234, -- Tony's God Mode
416391
5421, -- Aquatic Form (Passive)
417392
22807, -- Greater Water Breathing
418393
24347, -- Master Angler
419394
24925, -- Hallow's End Candy
420-
27827, -- Spirit of Redemption
421395
},
422396
WaterWalking = {
423397
-546, -- Water Walking
424398
-1706, -- Levitate
425399
10665, -- Water Walk
426-
440804, -- Frozen Orb
427-
460591, -- Chaos Chopper
428400
461120, -- Treading Water
429401
24927, -- Hallow's End Candy
430402
},

Localization/TellMeWhen-enUS.lua

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2898,7 +2898,6 @@ L["DefensiveBuffsSingle"] = "Targeted Defensive Buffs"
28982898
L["Disarmed"] = "Disarmed"
28992899
L["Disoriented"] = "Disoriented"
29002900
L["Feared"] = "Fear"
2901-
L["FireSpellPower"] = "Fire Spell Power"
29022901
L["FlaskBuffs"] = "Flask Buffs"
29032902
L["FoodBuffs"] = "Food Buffs"
29042903
L["Heals"] = "Player Heals"
@@ -2924,31 +2923,21 @@ L["IncreasedSpirit"] = "Increased Spirit"
29242923
L["IncreasedStats"] = "Increased Stats"
29252924
L["IncreasedStrength"] = "Increased Strength"
29262925
L["IncreasedVersatility"] = "Increased Versatility"
2927-
L["Kings"] = "Kings"
2928-
L["Might"] = "Might"
29292926
L["MiscHelpfulBuffs"] = "Misc. Helpful Buffs"
29302927
L["PhysicalDmgTaken"] = "Physical Damage Taken"
29312928
L["PvPSpells"] = "PvP Crowd Control, etc."
29322929
L["ReducedArmor"] = "Reduced Armor"
29332930
L["ReducedCastingSpeed"] = "Reduced Casting Speed"
29342931
L["ReducedHealing"] = "Reduced Healing"
29352932
L["ReducedPhysicalDone"] = "Reduced Physical Damage Done"
2936-
L["ResistAll"] = "All Resistances"
2937-
L["ResistFire"] = "Fire Resistance"
2938-
L["ResistFrost"] = "Frost Resistance"
2939-
L["ResistNature"] = "Nature Resistance"
2940-
L["ResistShadow"] = "Shadow Resistance"
2933+
L["Resistances"] = "Spell Resistance"
29412934
L["Rooted"] = "Rooted"
2942-
L["ShadowSpellPower"] = "Shadow Spell Power"
29432935
L["Shatterable"] = "Shatterable"
2944-
L["Sigils"] = "Sigils"
29452936
L["Silenced"] = "Silenced"
29462937
L["Slowed"] = "Slowed"
2947-
L["Songflower"] = "Songflower"
29482938
L["SpeedBoosts"] = "Speed Boosts"
29492939
L["SpellDamageTaken"] = "Increased Spell Damage Taken"
29502940
L["Stunned"] = "Stunned"
2951-
L["WarchiefsBlessing"] = "Warchief's Blessing"
29522941
L["WaterBreathing"] = "Water Breathing"
29532942
L["WaterWalking"] = "Water Walking"
29542943
L["Zanza"] = "Zanza"

0 commit comments

Comments
 (0)