Remove now-unused Slots field from ProcStatBonusEffect and

ProcDamageEffect configs. On branch feature/add-trinket-swapping Changes to be committed: modified: sim/common/cata/damage_procs.go modified: sim/common/cata/enchant_effects.go modified: sim/common/shared/shared_utils.go modified: sim/common/wotlk/enchant_effects.go
wowsims · Jan 12, 2025 · e16fb89 · e16fb89
1 parent a583b31
commit e16fb89
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 21 deletions.
diff --git a/sim/common/cata/damage_procs.go b/sim/common/cata/damage_procs.go
@@ -16,7 +16,6 @@ func init() {
 		MaxDmg:  8750,
 		Flags:   core.SpellFlagNoSpellMods | core.SpellFlagIgnoreModifiers | core.SpellFlagNoOnDamageDealt,
 		Outcome: shared.OutcomeMeleeNoBlockDodgeParryCrit,
-		Slots:   core.TrinketSlots(),
 		Trigger: core.ProcTrigger{
 			Name:     "Darkmoon Card: Hurricane",
 			ProcMask: core.ProcMaskMeleeOrRanged,
@@ -34,7 +33,6 @@ func init() {
 		MaxDmg:  8750,
 		Flags:   core.SpellFlagNoSpellMods | core.SpellFlagIgnoreModifiers | core.SpellFlagNoOnDamageDealt,
 		Outcome: shared.OutcomeMeleeNoBlockDodgeParryCrit,
-		Slots:   core.TrinketSlots(),
 		Trigger: core.ProcTrigger{
 			Name:     "Darkmoon Card: Hurricane",
 			ProcMask: core.ProcMaskMeleeOrRanged,

diff --git a/sim/common/cata/enchant_effects.go b/sim/common/cata/enchant_effects.go
@@ -248,7 +248,6 @@ func init() {
 		ProcChance: 0.25,
 		Bonus:      stats.Stats{stats.Spirit: 200},
 		Duration:   time.Second * 15,
-		Slots:      core.MeleeWeaponSlots(),
 	})
 
 	// Enchant: 4097, Spell: 74242 - Enchant Weapon - Power Torrent
@@ -263,7 +262,6 @@ func init() {
 		ProcChance: 1.0 / 3.0,
 		Bonus:      stats.Stats{stats.Intellect: 500},
 		Duration:   time.Second * 12,
-		Slots:      core.MeleeWeaponSlots(),
 	})
 
 	// Enchant: 4098, Spell: 74244 - Enchant Weapon - Windwalk
@@ -276,7 +274,6 @@ func init() {
 		PPM:       1, // based on old Wowhead comments, TODO: measure in Classic
 		Bonus:     stats.Stats{stats.DodgeRating: 600},
 		Duration:  time.Second * 10,
-		Slots:     core.MeleeWeaponSlots(),
 	})
 
 	// Enchant: 4099, Spell: 74246 - Enchant Weapon - Landslide
@@ -326,7 +323,6 @@ func init() {
 		ProcChance: 0.25,
 		Bonus:      stats.Stats{stats.Intellect: 580},
 		Duration:   time.Second * 15,
-		Slots:      []proto.ItemSlot{proto.ItemSlot_ItemSlotBack},
 	})
 
 	// Enchant: 4116, Spell: 75175 - Darkglow Embroidery
@@ -341,7 +337,6 @@ func init() {
 		ProcChance: 0.30,
 		Bonus:      stats.Stats{stats.Spirit: 580},
 		Duration:   time.Second * 15,
-		Slots:      []proto.ItemSlot{proto.ItemSlot_ItemSlotBack},
 	})
 
 	// Enchant: 4118, Spell: 75178 - Swordguard Embroidery
@@ -356,7 +351,6 @@ func init() {
 		ProcChance: 0.15,
 		Bonus:      stats.Stats{stats.AttackPower: 1000, stats.RangedAttackPower: 1000},
 		Duration:   time.Second * 15,
-		Slots:      []proto.ItemSlot{proto.ItemSlot_ItemSlotBack},
 	})
 
 	// Enchant: 4175, Spell: 81932, Item: 59594 - Gnomish X-Ray Scope
@@ -372,7 +366,6 @@ func init() {
 		ProcChance: 0.1,
 		Bonus:      stats.Stats{stats.RangedAttackPower: 800},
 		Duration:   time.Second * 10,
-		Slots:      []proto.ItemSlot{proto.ItemSlot_ItemSlotRanged},
 	})
 
 	// Enchant: 4176, Item: 59595 - R19 Threatfinder
@@ -404,7 +397,6 @@ func init() {
 		MaxDmg:  133,
 		Outcome: shared.OutcomeMeleeCanCrit,
 		IsMelee: true,
-		Slots:   []proto.ItemSlot{proto.ItemSlot_ItemSlotOffHand},
 	})
 
 	// Enchant: 4216, Spell: 92437, Item: 55056  - Pyrium Shield Spike
@@ -422,7 +414,6 @@ func init() {
 		MinDmg:  210,
 		MaxDmg:  350,
 		IsMelee: true,
-		Slots:   []proto.ItemSlot{proto.ItemSlot_ItemSlotOffHand},
 	})
 
 	// Enchant: 4267, Spell: 99623, Item: 70139 - Flintlocke's Woodchucker
@@ -438,7 +429,6 @@ func init() {
 		ProcChance: 0.1,
 		Bonus:      stats.Stats{stats.Agility: 300},
 		Duration:   time.Second * 10,
-		Slots:      []proto.ItemSlot{proto.ItemSlot_ItemSlotRanged},
 	},
 		shared.DamageEffect{
 			SpellID:  99621,

diff --git a/sim/common/shared/shared_utils.go b/sim/common/shared/shared_utils.go
@@ -29,10 +29,6 @@ type ProcStatBonusEffect struct {
 
 	// Any other custom proc conditions not covered by the above fields.
 	CustomProcCondition core.CustomStatBuffProcCondition
-
-	// Used to register for Item Swapping when the effect is not an equippable Item by itself.
-	// For example a Weapon or Back enchant.
-	Slots []proto.ItemSlot
 }
 
 type DamageEffect struct {
@@ -463,7 +459,6 @@ type ProcDamageEffect struct {
 	ItemID    int32
 	SpellID   int32
 	EnchantID int32
-	Slots     []proto.ItemSlot
 	Trigger   core.ProcTrigger
 
 	School  core.SpellSchool

diff --git a/sim/common/wotlk/enchant_effects.go b/sim/common/wotlk/enchant_effects.go
@@ -125,7 +125,6 @@ func init() {
 		MaxDmg:  67,
 		Outcome: shared.OutcomeMeleeCanCrit,
 		IsMelee: true,
-		Slots:   []proto.ItemSlot{proto.ItemSlot_ItemSlotOffHand},
 	})
 
 	// Enchant: 3247, Spell: 44595 - Scourgebane
@@ -225,7 +224,6 @@ func init() {
 		Bonus:          stats.Stats{stats.HasteRating: 250},
 		Duration:       time.Second * 10,
 		IgnoreSpellIDs: []int32{47465, 12867},
-		Slots:          core.MeleeWeaponSlots(),
 	})
 
 	// Enchant: 3843, Spell: 61471 - Diamond-cut Refractor Scope
@@ -323,7 +321,6 @@ func init() {
 		ProcChance: 0.35,
 		Bonus:      stats.Stats{stats.SpellPower: 295},
 		Duration:   time.Second * 15,
-		Slots:      []proto.ItemSlot{proto.ItemSlot_ItemSlotBack},
 	})
 
 	// Enchant: 3728, Spell: 55769 - Darkglow Embroidery
@@ -371,7 +368,6 @@ func init() {
 		ProcChance: 0.2,
 		Bonus:      stats.Stats{stats.AttackPower: 400, stats.RangedAttackPower: 400},
 		Duration:   time.Second * 15,
-		Slots:      []proto.ItemSlot{proto.ItemSlot_ItemSlotBack},
 	})
 
 	// Enchant: 3870, Spell: 64568 - Blood Draining