Merge pull request #1633 from wowsims/fixes

Add back support for serpent-coil braid
wowsims · Nov 8, 2022 · 150fdd2 · 150fdd2
2 parents 260f486 + 448c323
commit 150fdd2
Show file tree

Hide file tree

Showing 6 changed files with 495 additions and 491 deletions.
diff --git a/sim/core/items/all_items.go b/sim/core/items/all_items.go
@@ -6182,6 +6182,7 @@ var Items = []Item{
  {Name: "Sergeant's Reinforced Cape", ID: 41591, Type: proto.ItemType_ItemTypeBack, Phase: 0, Quality: proto.ItemQuality_ItemQualityEpic, Ilvl: 156, Stats: stats.Stats{stats.Stamina: 42, stats.SpellPower: 33, stats.SpellCrit: 26, stats.MeleeCrit: 26, stats.Armor: 130, stats.Resilience: 30}},
  {Name: "Serilas, Blood Blade of Invar One-Arm", ID: 45947, Type: proto.ItemType_ItemTypeWeapon, WeaponType: proto.WeaponType_WeaponTypeSword, HandType: proto.HandType_HandTypeOneHand, WeaponDamageMin: 325.0, WeaponDamageMax: 605.0, SwingSpeed: 2.60, Phase: 2, Quality: proto.ItemQuality_ItemQualityEpic, Ilvl: 232, Stats: stats.Stats{stats.Agility: 52, stats.Stamina: 34, stats.SpellHit: 32, stats.AttackPower: 72, stats.MeleeHit: 32, stats.Expertise: 26, stats.RangedAttackPower: 72}, GemSockets: []proto.GemColor{proto.GemColor_GemColorYellow}, SocketBonus: stats.Stats{stats.SpellCrit: 4, stats.MeleeCrit: 4}},
  {Name: "Serpent Spine Longbow", ID: 30105, Type: proto.ItemType_ItemTypeRanged, RangedWeaponType: proto.RangedWeaponType_RangedWeaponTypeBow, WeaponDamageMin: 217.0, WeaponDamageMax: 327.0, SwingSpeed: 3.00, Phase: 1, Quality: proto.ItemQuality_ItemQualityEpic, Ilvl: 141, Stats: stats.Stats{stats.Stamina: 17, stats.SpellCrit: 16, stats.AttackPower: 38, stats.MeleeCrit: 16, stats.RangedAttackPower: 38}},
+ {Name: "Serpent-Coil Braid", ID: 30720, ClassAllowlist: []proto.Class{proto.Class_ClassMage}, Type: proto.ItemType_ItemTypeTrinket, Phase: 1, Quality: proto.ItemQuality_ItemQualityEpic, Unique: true, Ilvl: 128, Stats: stats.Stats{stats.SpellHit: 12, stats.SpellCrit: 30, stats.MeleeHit: 12, stats.MeleeCrit: 30}},
  {Name: "Serrated Cold-Iron Slicer", ID: 39127, Type: proto.ItemType_ItemTypeWeapon, WeaponType: proto.WeaponType_WeaponTypeSword, HandType: proto.HandType_HandTypeOneHand, WeaponDamageMin: 102.0, WeaponDamageMax: 191.0, SwingSpeed: 1.60, Phase: 0, Quality: proto.ItemQuality_ItemQualityUncommon, Ilvl: 154, Stats: stats.Stats{stats.SpellCrit: 21, stats.MeleeCrit: 21, stats.Expertise: 26}},
  {Name: "Seven Stormy Mornings", ID: 49787, Type: proto.ItemType_ItemTypeWrist, ArmorType: proto.ArmorType_ArmorTypeMail, Phase: 4, Quality: proto.ItemQuality_ItemQualityEpic, Ilvl: 219, Stats: stats.Stats{stats.Stamina: 49, stats.Intellect: 44, stats.SpellPower: 70, stats.SpellHit: 42, stats.SpellCrit: 35, stats.MeleeHit: 42, stats.MeleeCrit: 35, stats.Armor: 568}},
  {Name: "Seven-Fingered Claws", ID: 50315, Type: proto.ItemType_ItemTypeWeapon, WeaponType: proto.WeaponType_WeaponTypeFist, HandType: proto.HandType_HandTypeMainHand, WeaponDamageMin: 372.0, WeaponDamageMax: 558.0, SwingSpeed: 2.60, Phase: 4, Quality: proto.ItemQuality_ItemQualityEpic, Ilvl: 232, Stats: stats.Stats{stats.Agility: 52, stats.Stamina: 51, stats.SpellHit: 34, stats.SpellCrit: 25, stats.AttackPower: 80, stats.MeleeHit: 34, stats.MeleeCrit: 25, stats.RangedAttackPower: 80}},