Skip to content

Commit

Permalink
add magnificent trollshine
Browse files Browse the repository at this point in the history
  • Loading branch information
kayla-glick committed Sep 27, 2024
1 parent a93c935 commit c6294d0
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 2 deletions.
3 changes: 2 additions & 1 deletion proto/common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ enum MageScroll {
MageScrollFrostProtection = 5;
}

// NextIndex: 29
// NextIndex: 30
enum WeaponImbue {
// Weapon Oils
WeaponImbueUnknown = 0;
Expand Down Expand Up @@ -555,6 +555,7 @@ enum WeaponImbue {

// Shield Oil
ConductiveShieldCoating = 26;
MagnificentTrollshine = 29;
}

// NextIndex: 13
Expand Down
5 changes: 5 additions & 0 deletions sim/core/consumes.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@ func addImbueStats(character *Character, imbue proto.WeaponImbue, isMh bool, sha
// Shield Oil
case proto.WeaponImbue_ConductiveShieldCoating:
character.AddStat(stats.SpellPower, 24)
case proto.WeaponImbue_MagnificentTrollshine:
character.AddStats(stats.Stats{
stats.SpellPower: 36,
stats.SpellCrit: 1 * CritRatingPerCritChance,
})

// Sharpening Stones
case proto.WeaponImbue_SolidSharpeningStone:
Expand Down
9 changes: 9 additions & 0 deletions ui/core/components/inputs/consumables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1136,6 +1136,14 @@ export const ConductiveShieldCoating = (slot: ItemSlot): ConsumableInputConfig<W
slot === ItemSlot.ItemSlotOffHand && player.getEquippedItem(ItemSlot.ItemSlotOffHand)?.item?.weaponType === WeaponType.WeaponTypeShield,
};
};
export const MagnificentTrollshine = (slot: ItemSlot): ConsumableInputConfig<WeaponImbue> => {
return {
actionId: player => player.getMatchingItemActionId([{ id: 232611, minLevel: 45 }]),
value: WeaponImbue.MagnificentTrollshine,
showWhen: player =>
slot === ItemSlot.ItemSlotOffHand && player.getEquippedItem(ItemSlot.ItemSlotOffHand)?.item?.weaponType === WeaponType.WeaponTypeShield,
};
};

const SHAMAN_IMBUES = (slot: ItemSlot): ConsumableStatOption<WeaponImbue>[] => [
{ config: RockbiterWeaponImbue(slot), stats: [] },
Expand All @@ -1154,6 +1162,7 @@ const ROGUE_IMBUES: ConsumableStatOption<WeaponImbue>[] = [
];

const CONSUMABLES_IMBUES = (slot: ItemSlot): ConsumableStatOption<WeaponImbue>[] => [
{ config: MagnificentTrollshine(slot), stats: [Stat.StatSpellPower] },
{ config: ConductiveShieldCoating(slot), stats: [Stat.StatSpellPower] },
{ config: BrillianWizardOil(slot), stats: [Stat.StatSpellPower] },
{ config: WizardOil(slot), stats: [Stat.StatSpellPower] },
Expand Down
2 changes: 1 addition & 1 deletion ui/elemental_shaman/presets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export const DefaultConsumes = Consumes.create({
mainHandImbue: WeaponImbue.FlametongueWeapon,
manaRegenElixir: ManaRegenElixir.MagebloodPotion,
mildlyIrradiatedRejuvPot: true,
offHandImbue: WeaponImbue.ConductiveShieldCoating,
offHandImbue: WeaponImbue.MagnificentTrollshine,
spellPowerBuff: SpellPowerBuff.GreaterArcaneElixir,
strengthBuff: StrengthBuff.JujuPower,
zanzaBuff: ZanzaBuff.CerebralCortexCompound,
Expand Down

0 comments on commit c6294d0

Please sign in to comment.