Merge pull request #1058 from wowsims/feature/shaman-p3

[SHAMAN][UI] Elemental Shaman P3
wowsims · Sep 26, 2024 · 1eb0e26 · 1eb0e26
2 parents 3bd1b55 + 87b4fbb
commit 1eb0e26
Show file tree

Hide file tree

Showing 11 changed files with 4,229 additions and 702 deletions.
diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results
diff --git a/sim/shaman/elemental/elemental_test.go b/sim/shaman/elemental/elemental_test.go
@@ -19,9 +19,18 @@ func TestElemental(t *testing.T) {
 		OtherRaces: []proto.Race{proto.Race_RaceOrc},
 
 		GearSet: core.GetGearSet("../../../ui/shaman/elemental/gear_sets", "p1"),
+		OtherGearSets: []core.GearSetCombo{
+			core.GetGearSet("../../../ui/shaman/elemental/gear_sets", "p3.default"),
+			core.GetGearSet("../../../ui/shaman/elemental/gear_sets", "p3.cleave-aoe"),
+		},
 		Talents: TalentsTotemDuration,
 		Glyphs:  StandardGlyphs,
 		OtherTalentSets: []core.TalentsCombo{
+			{
+				Label:   "TalentsAoE",
+				Talents: TalentsImprovedShields,
+				Glyphs:  AoEGlyphs,
+			},
 			{
 				Label:   "TalentsImprovedShields",
 				Talents: TalentsImprovedShields,
@@ -61,16 +70,24 @@ var StandardGlyphs = &proto.Glyphs{
 	Prime2: int32(proto.ShamanPrimeGlyph_GlyphOfLavaBurst),
 	Prime3: int32(proto.ShamanPrimeGlyph_GlyphOfLightningBolt),
 	Major1: int32(proto.ShamanMajorGlyph_GlyphOfLightningShield),
-	Major2: int32(proto.ShamanMajorGlyph_GlyphOfThunder),
-	Major3: int32(proto.ShamanMajorGlyph_GlyphOfFireNova),
+	Major2: int32(proto.ShamanMajorGlyph_GlyphOfHealingStreamTotem),
+	Major3: int32(proto.ShamanMajorGlyph_GlyphOfStoneclawTotem),
+}
+var AoEGlyphs = &proto.Glyphs{
+	Prime1: int32(proto.ShamanPrimeGlyph_GlyphOfFlameShock),
+	Prime2: int32(proto.ShamanPrimeGlyph_GlyphOfLavaBurst),
+	Prime3: int32(proto.ShamanPrimeGlyph_GlyphOfLightningBolt),
+	Major1: int32(proto.ShamanMajorGlyph_GlyphOfLightningShield),
+	Major2: int32(proto.ShamanMajorGlyph_GlyphOfChainLightning),
+	Major3: int32(proto.ShamanMajorGlyph_GlyphOfStoneclawTotem),
 }
 var AlternateGlyphs = &proto.Glyphs{
 	Prime1: int32(proto.FireTotem_FireElementalTotem),
 	Prime2: int32(proto.ShamanImbue_FlametongueWeapon),
 	Prime3: int32(proto.ShamanPrimeGlyph_GlyphOfUnleashedLightning),
 	Major1: int32(proto.ShamanMajorGlyph_GlyphOfLightningShield),
-	Major2: int32(proto.ShamanMajorGlyph_GlyphOfThunder),
-	Major3: int32(proto.ShamanMajorGlyph_GlyphOfChainLightning),
+	Major2: int32(proto.ShamanMajorGlyph_GlyphOfHealingStreamTotem),
+	Major3: int32(proto.ShamanMajorGlyph_GlyphOfStoneclawTotem),
 }
 
 var NoTotems = &proto.ShamanTotems{}
@@ -121,4 +138,5 @@ var FullConsumes = &proto.Consumes{
 	DefaultPotion:   proto.Potions_VolcanicPotion,
 	PrepopPotion:    proto.Potions_VolcanicPotion,
 	DefaultConjured: proto.Conjured_ConjuredDarkRune,
+	TinkerHands:     proto.TinkerHands_TinkerHandsSynapseSprings,
 }
diff --git a/sim/shaman/talents.go b/sim/shaman/talents.go
@@ -231,7 +231,7 @@ func (shaman *Shaman) applyRollingThunder() {
 			aura.Activate(sim)
 		},
 		OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
-			if (spell == shaman.LightningBolt || spell == shaman.ChainLightning || spell == shaman.LightningBoltOverload) && shaman.SelfBuffs.Shield == proto.ShamanShield_LightningShield {
+			if (spell.Matches(SpellMaskLightningBolt | SpellMaskLightningBoltOverload | SpellMaskChainLightning | SpellMaskChainLightningOverload)) && shaman.SelfBuffs.Shield == proto.ShamanShield_LightningShield {
 				// for _, allowedSpell := range allowedSpells {
 				// 	if spell == allowedSpell {
 				if sim.RandomFloat("Rolling Thunder") < 0.3*float64(shaman.Talents.RollingThunder) {

diff --git a/ui/core/components/individual_sim_ui/preset_configuration_picker.tsx b/ui/core/components/individual_sim_ui/preset_configuration_picker.tsx
@@ -3,8 +3,8 @@ import { ref } from 'tsx-vanilla';
 
 import { IndividualSimUI } from '../../individual_sim_ui';
 import { PresetBuild } from '../../preset_utils';
-import { APLRotation } from '../../proto/apl';
-import { Encounter, EquipmentSpec, HealingModel, Spec } from '../../proto/common';
+import { APLRotation, APLRotation_Type } from '../../proto/apl';
+import { Encounter, EquipmentSpec, Glyphs, HealingModel, Spec } from '../../proto/common';
 import { TypedEvent } from '../../typed_event';
 import { Component } from '../component';
 import { ContentBlock } from '../content_block';
@@ -86,7 +86,10 @@ export class PresetConfigurationPicker extends Component {
 		const eventID = TypedEvent.nextEventID();
 		TypedEvent.freezeAllAndDo(() => {
 			if (gear) this.simUI.player.setGear(eventID, this.simUI.sim.db.lookupEquipmentSpec(gear.gear));
-			if (talents) this.simUI.player.setTalentsString(eventID, talents.data.talentsString);
+			if (talents) {
+				this.simUI.player.setTalentsString(eventID, talents.data.talentsString);
+				if (talents.data.glyphs) this.simUI.player.setGlyphs(eventID, talents.data.glyphs);
+			}
 			if (rotation?.rotation.rotation) {
 				this.simUI.player.setAplRotation(eventID, rotation.rotation.rotation);
 			}
@@ -106,11 +109,18 @@ export class PresetConfigurationPicker extends Component {
 	private isBuildActive({ gear, rotation, talents, epWeights, encounter }: PresetBuild): boolean {
 		const hasGear = gear ? EquipmentSpec.equals(gear.gear, this.simUI.player.getGear().asSpec()) : true;
 		const hasTalents = talents ? talents.data.talentsString == this.simUI.player.getTalentsString() : true;
-		const hasRotation = rotation ? APLRotation.equals(rotation.rotation.rotation, this.simUI.player.aplRotation) : true;
+		const hasGlyphs = talents?.data.glyphs ? Glyphs.equals(this.simUI.player.getGlyphs(), talents.data.glyphs) : true;
+		let hasRotation = true;
+		if (rotation) {
+			const activeRotation = this.simUI.player.getResolvedAplRotation();
+			// Ensure that the auto rotation can be matched with a preset
+			if (activeRotation.type === APLRotation_Type.TypeAuto) activeRotation.type = APLRotation_Type.TypeAPL;
+			hasRotation = APLRotation.equals(rotation.rotation.rotation, activeRotation);
+		}
 		const hasEpWeights = epWeights ? this.simUI.player.getEpWeights().equals(epWeights.epWeights) : true;
 		const hasEncounter = encounter?.encounter ? Encounter.equals(encounter.encounter, this.simUI.sim.encounter.toProto()) : true;
 		const hasHealingModel = encounter?.healingModel ? HealingModel.equals(encounter.healingModel, this.simUI.player.getHealingModel()) : true;
 
-		return hasGear && hasTalents && hasRotation && hasEpWeights && hasEncounter && hasHealingModel;
+		return hasGear && hasTalents && hasGlyphs && hasRotation && hasEpWeights && hasEncounter && hasHealingModel;
 	}
 }