Merge pull request #1253 from wowsims/feature/add-trinket-swapping

[UI][CORE] Add ability to item swap all gear
wowsims · Jan 16, 2025 · c67de86 · c67de86
2 parents 62bd44c + 0c9ae89
commit c67de86
Show file tree

Hide file tree

Showing 219 changed files with 8,155 additions and 7,933 deletions.
diff --git a/proto/common.proto b/proto/common.proto
@@ -1037,9 +1037,11 @@ message CustomSpell {
 }
 
 message ItemSwap {
-	ItemSpec mh_item = 1;
-	ItemSpec oh_item = 2;
-	ItemSpec ranged_item = 3;
+	ItemSpec mh_item = 1 [deprecated=true];
+	ItemSpec oh_item = 2 [deprecated=true];
+	ItemSpec ranged_item = 3 [deprecated=true];
+	repeated ItemSpec items = 4;
+	UnitStats prepull_bonus_stats = 5;
 }
 
 message Duration {

diff --git a/proto/shaman.proto b/proto/shaman.proto
@@ -177,17 +177,15 @@ message ShamanTotems {
 	FireTotem fire = 10;
 	WaterTotem water = 11;
 
-	// If set, will use fire elemental totem at the start and revert to regular
-	// fire totems when it expires.
-	bool use_fire_elemental = 12;
+	bool use_fire_elemental = 12 [deprecated=true];
 
 	// Bonus spell power for fire elemental snapshotting.
-	int32 bonus_spellpower = 13;
+	int32 bonus_spellpower = 13 [deprecated=true]; // No longer used in favor of Item Swapping
 	// Bonus intellect for fire elemental snapshotting.
-	int32 bonus_intellect = 15;
+	int32 bonus_intellect = 15 [deprecated=true]; // No longer used in favor of Item Swapping
 
 	// Snapshot fire elemental using Tier 10 4 set bonus.
-	bool enh_tier_ten_bonus = 14;
+	bool enh_tier_ten_bonus = 14 [deprecated=true]; // No longer used in favor of Item Swapping
 }
 
 enum ShamanShield {

diff --git a/proto/warlock.proto b/proto/warlock.proto
@@ -124,8 +124,9 @@ message WarlockOptions {
 
 	Summon summon = 1;
 	bool detonate_seed = 2;
-	int32 prepull_mastery = 3;
-	int32 prepull_post_snapshot_mana = 4;
+	int32 prepull_mastery = 3 [deprecated=true]; // Use Item Swap sets instead
+	int32 prepull_post_snapshot_mana = 4 [deprecated=true]; // Use Item Swap sets instead
+	bool use_item_swap_bonus_stats = 5;
 }
 
 message AfflictionWarlock {

diff --git a/proto/warrior.proto b/proto/warrior.proto
@@ -137,7 +137,8 @@ message FuryWarrior {
 		WarriorOptions class_options = 1;
 		bool stance_snapshot = 2;
 		WarriorSyncType sync_type = 3;
-		int32 prepull_mastery = 4;
+		int32 prepull_mastery = 4 [deprecated=true]; // Use Item Swap sets instead
+		bool use_item_swap_bonus_stats = 5;
 	}
 	Options options = 1;
 }

diff --git a/sim/common/cata/damage_procs.go b/sim/common/cata/damage_procs.go
@@ -31,8 +31,8 @@ func init() {
 		School:  core.SpellSchoolNature,
 		MinDmg:  5250,
 		MaxDmg:  8750,
-		Outcome: shared.OutcomeMeleeNoBlockDodgeParryCrit,
 		Flags:   core.SpellFlagNoSpellMods | core.SpellFlagIgnoreModifiers | core.SpellFlagNoOnDamageDealt,
+		Outcome: shared.OutcomeMeleeNoBlockDodgeParryCrit,
 		Trigger: core.ProcTrigger{
 			Name:     "Darkmoon Card: Hurricane",
 			ProcMask: core.ProcMaskMeleeOrRanged,
@@ -74,7 +74,7 @@ func init() {
 			},
 		})
 
-		core.MakePermanent(core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
+		aura := core.MakePermanent(core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
 			Name:       "Electrical Charge Aura",
 			ActionID:   core.ActionID{ItemID: 68925},
 			Callback:   core.CallbackOnSpellHitDealt | core.CallbackOnPeriodicDamageDealt,
@@ -92,6 +92,8 @@ func init() {
 				}
 			},
 		}))
+
+		character.ItemSwap.RegisterProc(68925, aura)
 	})
 
 	core.NewItemEffect(69110, func(agent core.Agent) {
@@ -124,7 +126,7 @@ func init() {
 			},
 		})
 
-		core.MakePermanent(core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
+		aura := core.MakePermanent(core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
 			Name:       "Electrical Charge Aura",
 			ActionID:   core.ActionID{ItemID: 69110},
 			Callback:   core.CallbackOnSpellHitDealt | core.CallbackOnPeriodicDamageDealt,
@@ -142,6 +144,8 @@ func init() {
 				}
 			},
 		}))
+
+		character.ItemSwap.RegisterProc(69110, aura)
 	})
 
 }
diff --git a/sim/common/cata/dragonwrath.go b/sim/common/cata/dragonwrath.go
@@ -194,7 +194,8 @@ func GetDRTSpellConfig(spell *core.Spell) core.SpellConfig {
 
 func init() {
 	core.NewItemEffect(71086, func(a core.Agent) {
-		unit := &a.GetCharacter().Unit
+		character := a.GetCharacter()
+		unit := &character.Unit
 		registerSpells(unit)
 
 		unit.OnSpellRegistered(func(spell *core.Spell) {
@@ -209,13 +210,18 @@ func init() {
 
 		lastTimestamp := time.Duration(0)
 		spellList := map[*core.Spell]bool{}
-		core.MakePermanent(unit.RegisterAura(core.Aura{
+
+		aura := core.MakePermanent(unit.RegisterAura(core.Aura{
 			ActionID: core.ActionID{ItemID: 71086},
 			Label:    "Dragonwrath, Tarecgosa's Rest - Handler",
 			OnReset: func(aura *core.Aura, sim *core.Simulation) {
 				lastTimestamp = time.Duration(0)
 				spellList = map[*core.Spell]bool{}
 			},
+			OnExpire: func(aura *core.Aura, sim *core.Simulation) {
+				lastTimestamp = sim.CurrentTime
+				spellList = map[*core.Spell]bool{}
+			},
 			OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 
 				// Handle direct damage only and make sure we're not proccing of our own spell
@@ -322,6 +328,8 @@ func init() {
 				config.getDoTHandler(spell.SpellID)(sim, spell, result)
 			},
 		}))
+
+		character.ItemSwap.RegisterProc(71086, aura)
 	})
 
 	// register custom global spell handlers