Skip to content

Commit

Permalink
Merge pull request #90 from InDebt/cata-buffs
Browse files Browse the repository at this point in the history
[Buffs] Fixup spell IDs
  • Loading branch information
InDebt authored Apr 16, 2024
2 parents 88d1ad6 + 1fdad3e commit a7a0c09
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion sim/core/debuffs.go
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ func HemorrhageAura(target *Unit) *Aura {
func StampedeAura(target *Unit) *Aura {
return bleedDamageAura(target, Aura{
Label: "Stampede",
ActionID: ActionID{SpellID: 57393},
ActionID: ActionID{SpellID: 57386},
Duration: time.Second * 30,
}, 1.3)
}
Expand Down
2 changes: 1 addition & 1 deletion sim/hunter/pet_abilities.go
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ func (hp *HunterPet) newStampede() *core.Spell {
Type: Stampede,
Cost: 0,
CD: time.Second * 60,
SpellID: 57393,
SpellID: 57386,
School: core.SpellSchoolPhysical,
MinDmg: 182,
MaxDmg: 264,
Expand Down
2 changes: 1 addition & 1 deletion tools/database/overrides.go
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ var SharedSpellsIcons = []int32{

48566,
46855,
57393,
57386,

30706,
20337,
Expand Down
8 changes: 4 additions & 4 deletions ui/core/components/inputs/buffs_debuffs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ export const AllStatsBuff = InputHelpers.makeMultiIconInput(

export const ArmorBuff = InputHelpers.makeMultiIconInput(
[
makeTristateRaidBuffInput({ actionId: ActionId.fromSpellId(48942), impId: ActionId.fromSpellId(465), fieldName: 'devotionAura' }),
makeTristateRaidBuffInput({ actionId: ActionId.fromSpellId(58753), impId: ActionId.fromSpellId(8071), fieldName: 'stoneskinTotem' }),
makeBooleanRaidBuffInput({ actionId: ActionId.fromSpellId(465), fieldName: 'devotionAura' }),
makeBooleanRaidBuffInput({ actionId: ActionId.fromSpellId(8071), fieldName: 'stoneskinTotem' }),
],
'Armor',
);
Expand Down Expand Up @@ -177,7 +177,7 @@ export const StrengthAndAgilityBuff = InputHelpers.makeMultiIconInput(
);

// Misc Buffs
export const RetributionAura = makeBooleanRaidBuffInput({ actionId: ActionId.fromSpellId(54043), fieldName: 'retributionAura' });
export const RetributionAura = makeBooleanRaidBuffInput({ actionId: ActionId.fromSpellId(7294), fieldName: 'retributionAura' });
export const ManaTideTotem = makeMultistateRaidBuffInput({actionId: ActionId.fromSpellId(16190), numStates: 5, fieldName: 'manaTideTotemCount'});
export const Innervate = makeMultistateIndividualBuffInput({ actionId: ActionId.fromSpellId(29166), numStates: 11, fieldName: 'innervateCount' });
export const PowerInfusion = makeMultistateIndividualBuffInput({ actionId: ActionId.fromSpellId(10060), numStates: 11, fieldName: 'powerInfusionCount' });
Expand Down Expand Up @@ -214,7 +214,7 @@ export const BleedDebuff = InputHelpers.makeMultiIconInput(
[
makeBooleanDebuffInput({ actionId: ActionId.fromSpellId(29859), fieldName: 'bloodFrenzy' }),
makeBooleanDebuffInput({ actionId: ActionId.fromSpellId(33878), fieldName: 'mangle' }),
makeBooleanDebuffInput({ actionId: ActionId.fromSpellId(57393), fieldName: 'stampede' }),
makeBooleanDebuffInput({ actionId: ActionId.fromSpellId(57386), fieldName: 'stampede' }),
makeBooleanDebuffInput({ actionId: ActionId.fromSpellId(16511), fieldName: 'hemorrhage' }),
],
'Bleed',
Expand Down
2 changes: 1 addition & 1 deletion ui/core/components/inputs/consumables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ export const makeBattleElixirsInput = makeConsumeInputFactory({

// Guardian Elixirs
export const ElixirOfDeepEarth = {
actionId: ActionId.fromItemId(80488),
actionId: ActionId.fromItemId(58093),
value: GuardianElixir.ElixirOfDeepEarth,
};
export const PrismaticElixir = {
Expand Down
2 changes: 1 addition & 1 deletion ui/paladin/inputs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const AuraSelection = <SpecType extends PaladinSpecs>() =>
fieldName: 'aura',
values: [
{ value: PaladinAura.NoPaladinAura, tooltip: 'No Aura' },
{ actionId: ActionId.fromSpellId(54043), value: PaladinAura.RetributionAura },
{ actionId: ActionId.fromSpellId(7294), value: PaladinAura.RetributionAura },
],
});

Expand Down

0 comments on commit a7a0c09

Please sign in to comment.